diff --git a/.github/workflows/ci_builds.yml b/.github/workflows/ci_builds.yml
deleted file mode 100644
index 7fa07fe09d9..00000000000
--- a/.github/workflows/ci_builds.yml
+++ /dev/null
@@ -1,74 +0,0 @@
-name: CI Builds
-
-permissions:
-  contents: read
-
-on:
-  push:
-    branches: [master, develop]
-  workflow_dispatch:
-    inputs:
-      branch:
-        type: choice
-        description: 'Branch to build'
-        options: [master, develop]
-
-concurrency: ci_build-${{ github.event.inputs.branch || github.ref_name }}
-
-jobs:
-  ci_builds:
-    if: github.repository == 'qmk/qmk_firmware'
-    name: "CI Build"
-    runs-on: self-hosted
-    timeout-minutes: 1380
-
-    strategy:
-      fail-fast: false
-      matrix:
-        keymap: [default, via]
-
-    container: ghcr.io/qmk/qmk_cli
-
-    steps:
-    - name: Disable safe.directory check
-      run : git config --global --add safe.directory '*'
-
-    - uses: actions/checkout@v4
-      with:
-        submodules: recursive
-        ref: ${{ github.event.inputs.branch || github.ref }}
-
-    - name: Install dependencies
-      run: pip3 install -r requirements.txt
-
-    - name: Run `qmk mass-compile` (keymap ${{ matrix.keymap }})
-      run: |
-        export NCPUS=$(nproc 2>/dev/null || sysctl -n hw.ncpu 2>/dev/null || getconf _NPROCESSORS_ONLN 2>/dev/null)
-        qmk mass-compile -t -j $NCPUS -km ${{ matrix.keymap }} -e DUMP_CI_METADATA=yes || touch .failed
-        # Generate the step summary markdown
-        ./util/ci/generate_failure_markdown.sh > $GITHUB_STEP_SUMMARY || true
-        # Truncate to a maximum of 1MB to deal with GitHub workflow limit
-        truncate --size='<960K' $GITHUB_STEP_SUMMARY || true
-        # Exit with failure if the compilation stage failed
-        [ ! -f .failed ] || exit 1
-
-    - name: 'Upload artifacts'
-      uses: actions/upload-artifact@v4
-      if: always()
-      with:
-        name: artifacts-${{ github.event.inputs.branch || github.ref_name }}-${{ matrix.keymap }}
-        if-no-files-found: ignore
-        path: |
-          *.bin
-          *.hex
-          *.uf2
-          .build/failed.*
-
-    - name: 'CI Discord Notification'
-      if: always()
-      working-directory: util/ci/
-      env:
-        DISCORD_WEBHOOK: ${{ secrets.CI_DISCORD_WEBHOOK }}
-      run: |
-        python3 -m pip install -r requirements.txt
-        python3 ./discord-results.py --branch ${{ github.event.inputs.branch || github.ref_name }} --keymap ${{ matrix.keymap }} --url ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
index fc0ed11c43f..3f7fbbe7aff 100644
--- a/.github/workflows/docs.yml
+++ b/.github/workflows/docs.yml
@@ -37,7 +37,7 @@ jobs:
         qmk --verbose generate-docs
 
     - name: Deploy
-      uses: JamesIves/github-pages-deploy-action@v4.5.0
+      uses: JamesIves/github-pages-deploy-action@v4.6.0
       with:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         BASE_BRANCH: master
diff --git a/data/constants/keycodes/extras/keycodes_czech_mac_ansi_0.0.1.hjson b/data/constants/keycodes/extras/keycodes_czech_mac_ansi_0.0.1.hjson
new file mode 100644
index 00000000000..d0eb554126d
--- /dev/null
+++ b/data/constants/keycodes/extras/keycodes_czech_mac_ansi_0.0.1.hjson
@@ -0,0 +1,580 @@
+{
+    "aliases": {
+/*
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬─────┐
+ * │ \ │ + │ ě │ š │ č │ ř │ ž │ ý │ á │ í │ é │ = │ ' │     │
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬───┤
+ * │     │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ ú │ ) │ ¨ │
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴───┤
+ * │      │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ů │ § │      │
+ * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴──────┤
+ * │        │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ - │        │
+ * ├─────┬──┴─┬─┴───┼───┴───┴───┴───┴───┴───┼───┴─┬─┴──┬─────┤
+ * │     │    │     │                       │     │    │     │
+ * └─────┴────┴─────┴───────────────────────┴─────┴────┴─────┘
+ */
+       "KC_GRV": {
+            "key": "CZ_BSLS",
+            "label": "\\",
+        }
+        "KC_1": {
+            "key": "CZ_PLUS",
+            "label": "+",
+        }
+        "KC_2": {
+            "key": "CZ_ECAR",
+            "label": "ě",
+        }
+        "KC_3": {
+            "key": "CZ_SCAR",
+            "label": "š",
+        }
+        "KC_4": {
+            "key": "CZ_CCAR",
+            "label": "č",
+        }
+        "KC_5": {
+            "key": "CZ_RCAR",
+            "label": "ř",
+        }
+        "KC_6": {
+            "key": "CZ_ZCAR",
+            "label": "ž",
+        }
+        "KC_7": {
+            "key": "CZ_YACU",
+            "label": "ý",
+        }
+        "KC_8": {
+            "key": "CZ_AACU",
+            "label": "á",
+        }
+        "KC_9": {
+            "key": "CZ_IACU",
+            "label": "í",
+        }
+        "KC_0": {
+            "key": "CZ_EACU",
+            "label": "é",
+        }
+        "KC_MINS": {
+            "key": "CZ_EQL",
+            "label": "=",
+        }
+        "KC_EQL": {
+            "key": "CZ_ACUT",
+            "label": "' (dead)",
+        }
+        "KC_Q": {
+            "key": "CZ_Q",
+            "label": "Q",
+        }
+        "KC_W": {
+            "key": "CZ_W",
+            "label": "W",
+        }
+        "KC_E": {
+            "key": "CZ_E",
+            "label": "E",
+        }
+        "KC_R": {
+            "key": "CZ_R",
+            "label": "R",
+        }
+        "KC_T": {
+            "key": "CZ_T",
+            "label": "T",
+        }
+        "KC_Y": {
+            "key": "CZ_Z",
+            "label": "Z",
+        }
+        "KC_U": {
+            "key": "CZ_U",
+            "label": "U",
+        }
+        "KC_I": {
+            "key": "CZ_I",
+            "label": "I",
+        }
+        "KC_O": {
+            "key": "CZ_O",
+            "label": "O",
+        }
+        "KC_P": {
+            "key": "CZ_P",
+            "label": "P",
+        }
+        "KC_LBRC": {
+            "key": "CZ_UACU",
+            "label": "ú",
+        }
+        "KC_RBRC": {
+            "key": "CZ_RPRN",
+            "label": ")",
+        }
+        "KC_NUHS": {
+            "key": "CZ_DIAE",
+            "label": "¨ (dead)",
+        }
+        "KC_A": {
+            "key": "CZ_A",
+            "label": "A",
+        }
+        "KC_S": {
+            "key": "CZ_S",
+            "label": "S",
+        }
+        "KC_D": {
+            "key": "CZ_D",
+            "label": "D",
+        }
+        "KC_F": {
+            "key": "CZ_F",
+            "label": "F",
+        }
+        "KC_G": {
+            "key": "CZ_G",
+            "label": "G",
+        }
+        "KC_H": {
+            "key": "CZ_H",
+            "label": "H",
+        }
+        "KC_J": {
+            "key": "CZ_J",
+            "label": "J",
+        }
+        "KC_K": {
+            "key": "CZ_K",
+            "label": "K",
+        }
+        "KC_L": {
+            "key": "CZ_L",
+            "label": "L",
+        }
+        "KC_SCLN": {
+            "key": "CZ_URNG",
+            "label": "ů",
+        }
+        "KC_QUOT": {
+            "key": "CZ_SECT",
+            "label": "§",
+        }
+        "KC_Z": {
+            "key": "CZ_Y",
+            "label": "Y",
+        }
+        "KC_X": {
+            "key": "CZ_X",
+            "label": "X",
+        }
+        "KC_C": {
+            "key": "CZ_C",
+            "label": "C",
+        }
+        "KC_V": {
+            "key": "CZ_V",
+            "label": "V",
+        }
+        "KC_B": {
+            "key": "CZ_B",
+            "label": "B",
+        }
+        "KC_N": {
+            "key": "CZ_N",
+            "label": "N",
+        }
+        "KC_M": {
+            "key": "CZ_M",
+            "label": "M",
+        }
+        "KC_COMM": {
+            "key": "CZ_COMM",
+            "label": ",",
+        }
+        "KC_DOT": {
+            "key": "CZ_DOT",
+            "label": ".",
+        }
+        "KC_SLSH": {
+            "key": "CZ_MINS",
+            "label": "-",
+        }
+/* Shifted symbols
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬─────┐
+ * │ | │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ % │ ˇ │     │
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬───┤
+ * │     │   │   │   │   │   │   │   │   │   │   │ / │ ( │ ` │
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴───┤
+ * │      │   │   │   │   │   │   │   │   │   │ " │ ! │      │
+ * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴──────┤
+ * │        │   │   │   │   │   │   │   │ ? │ : │ _ │        │
+ * ├─────┬──┴─┬─┴───┼───┴───┴───┴───┴───┴───┼───┴─┬─┴──┬─────┤
+ * │     │    │     │                       │     │    │     │
+ * └─────┴────┴─────┴───────────────────────┴─────┴────┴─────┘
+ */
+        "S(CZ_BSLS)": {
+            "key": "CZ_PIPE",
+            "label": "|",
+        }
+        "S(CZ_PLUS)": {
+            "key": "CZ_1",
+            "label": "1",
+        }
+        "S(CZ_ECAR)": {
+            "key": "CZ_2",
+            "label": "2",
+        }
+        "S(CZ_SCAR)": {
+            "key": "CZ_3",
+            "label": "3",
+        }
+        "S(CZ_CCAR)": {
+            "key": "CZ_4",
+            "label": "4",
+        }
+        "S(CZ_RCAR)": {
+            "key": "CZ_5",
+            "label": "5",
+        }
+        "S(CZ_ZCAR)": {
+            "key": "CZ_6",
+            "label": "6",
+        }
+        "S(CZ_YACU)": {
+            "key": "CZ_7",
+            "label": "7",
+        }
+        "S(CZ_AACU)": {
+            "key": "CZ_8",
+            "label": "8",
+        }
+        "S(CZ_IACU)": {
+            "key": "CZ_9",
+            "label": "9",
+        }
+        "S(CZ_EACU)": {
+            "key": "CZ_0",
+            "label": "0",
+        }
+        "S(CZ_EQL)": {
+            "key": "CZ_PERC",
+            "label": "%",
+        }
+        "S(CZ_ACUT)": {
+            "key": "CZ_CARN",
+            "label": "ˇ (dead)",
+        }
+        "S(CZ_UACU)": {
+            "key": "CZ_SLSH",
+            "label": "/",
+        }
+        "S(CZ_RPRN)": {
+            "key": "CZ_LPRN",
+            "label": "(",
+        }
+         "S(CZ_DIAE)": {
+            "key": "CZ_GRV",
+            "label": "`",
+        }
+        "S(CZ_URNG)": {
+            "key": "CZ_DQUO",
+            "label": "\"",
+        }
+        "S(CZ_SECT)": {
+            "key": "CZ_EXLM",
+            "label": "!",
+        }
+        "S(CZ_COMM)": {
+            "key": "CZ_QUES",
+            "label": "?",
+        }
+        "S(CZ_DOT)": {
+            "key": "CZ_COLN",
+            "label": ":",
+        }
+        "S(CZ_MINS)": {
+            "key": "CZ_UNDS",
+            "label": "_",
+        }
+/* Alted symbols
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬─────┐
+ * │   │   │ @ │ # │ $ │ ~ │ ^ │ & │ * │ { │ } │ ° │ ^ │     │
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬───┤
+ * │     │   │ ė │ ę │ € │   │   │   │   │   │   │ [ │ ] │   │
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴───┤
+ * │      │ ą │ ß │ ∂ │   │   │ ‘ │ ’ │   │ ł │ ; │ ' │      │
+ * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴──────┤
+ * │        │   │   │   │   │   │ ‚ │   │ < │ > │ – │        │
+ * ├─────┬──┴─┬─┴───┼───┴───┴───┴───┴───┴───┼───┴─┬─┴──┬─────┤
+ * │     │    │     │                       │     │    │     │
+ * └─────┴────┴─────┴───────────────────────┴─────┴────┴─────┘
+ */
+        "A(CZ_ECAR)": {
+            "key": "CZ_AT",
+            "label": "@",
+        }
+        "A(CZ_SCAR)": {
+            "key": "CZ_HASH",
+            "label": "#",
+        }
+        "A(CZ_CCAR)": {
+            "key": "CZ_DLR",
+            "label": "$",
+        }
+        "A(CZ_RCAR)": {
+            "key": "CZ_TILD",
+            "label": "~",
+        }
+        "A(CZ_ZCAR)": {
+            "key": "CZ_CIRC",
+            "label": "^",
+        }
+        "A(CZ_YACU)": {
+            "key": "CZ_AMPR",
+            "label": "&",
+        }
+        "A(CZ_AACU)": {
+            "key": "CZ_ASTR",
+            "label": "*",
+        }
+        "A(CZ_IACU)": {
+            "key": "CZ_LCBR",
+            "label": "{",
+        }
+        "A(CZ_EACU)": {
+            "key": "CZ_RCBR",
+            "label": "}",
+        }
+        "A(CZ_EQL)": {
+            "key": "CZ_RNGA",
+            "label": "° (dead)",
+        }
+        "A(CZ_ACUT)": {
+            "key": "CZ_DCIR",
+            "label": "^ (dead)",
+        }
+        "A(CZ_W)": {
+            "key": "CZ_LEDT",
+            "label": "ė",
+        }
+        "A(CZ_E)": {
+            "key": "CZ_LEOG",
+            "label": "ę",
+        }
+        "A(CZ_R)": {
+            "key": "CZ_EURO",
+            "label": "€",
+        }
+        "A(CZ_Z)": {
+            "key": "CZ_LZDT",
+            "label": "ż",
+        }
+        "A(CZ_UACU)": {
+            "key": "CZ_LBRC",
+            "label": "[",
+        }
+        "A(CZ_RPRN)": {
+            "key": "CZ_RBRC",
+            "label": "]",
+        }
+        "A(CZ_A)": {
+            "key": "CZ_LAOG",
+            "label": "ą",
+        }
+        "A(CZ_S)": {
+            "key": "CZ_SS",
+            "label": "ß",
+        }
+        "A(CZ_D)": {
+            "key": "CZ_PDIF",
+            "label": "∂",
+        }
+        "A(CZ_H)": {
+            "key": "CZ_LSQU",
+            "label": "‘",
+        }
+        "A(CZ_J)": {
+            "key": "CZ_RSQU",
+            "label": "’",
+        }
+        "A(CZ_L)": {
+            "key": "CZ_LLST",
+            "label": "ł",
+        }
+        "A(CZ_URNG)": {
+            "key": "CZ_SCLN",
+            "label": ";",
+        }
+        "A(CZ_SECT)": {
+            "key": "CZ_QUOT",
+            "label": "'",
+        }
+        "A(CZ_N)": {
+            "key": "CZ_SLQU",
+            "label": "‚",
+        }
+        "A(CZ_COMM)": {
+            "key": "CZ_LABK",
+            "label": "<",
+        }
+        "A(CZ_DOT)": {
+            "key": "CZ_RABK",
+            "label": ">",
+        }
+        "A(CZ_MINS)": {
+            "key": "CZ_NDSH",
+            "label": "–",
+        }
+/* Shift+Alted symbols
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬─────┐
+ * │   │ ¬ │ • │ ≠ │ £ │ ◊ │ † │ ¶ │ ÷ │ « │ » │ , │ - │     │
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬───┤
+ * │     │   │ Ė │ Ę │ ® │ ™ │ Ż │   │   │   │   │ ‹ │ › │ " │
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴───┤
+ * │      │ Ą │ ∑ │ ∆ │   │   │ “ │ ” │   │ Ł │ … │ ~ │      │
+ * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴──────┤
+ * │        │   │   │ © │ √ │   │ „ │   │ ≤ │ ≥ │ — │        │
+ * ├─────┬──┴─┬─┴───┼───┴───┴───┴───┴───┴───┼───┴─┬─┴──┬─────┤
+ * │     │    │     │                       │     │    │     │
+ * └─────┴────┴─────┴───────────────────────┴─────┴────┴─────┘
+ */
+        "S(A(CZ_1))": {
+            "key": "CZ_NOT",
+            "label": "¬",
+        }
+        "S(A(CZ_2))": {
+            "key": "CZ_BULT",
+            "label": "•",
+        }
+        "S(A(CZ_3))": {
+            "key": "CZ_NEQL",
+            "label": "≠",
+        }
+        "S(A(CZ_4))": {
+            "key": "CZ_PND",
+            "label": "£",
+        }
+        "S(A(CZ_5))": {
+            "key": "CZ_LOZN",
+            "label": "◊",
+        }
+        "S(A(CZ_6))": {
+            "key": "CZ_DAGG",
+            "label": "†",
+        }
+        "S(A(CZ_7))": {
+            "key": "CZ_PARA",
+            "label": "¶",
+        }
+        "S(A(CZ_8))": {
+            "key": "CZ_DIV",
+            "label": "÷",
+        }
+        "S(A(CZ_9))": {
+            "key": "CZ_LDAQ",
+            "label": "«",
+        }
+        "S(A(CZ_0))": {
+            "key": "CZ_RDAQ",
+            "label": "»",
+        }
+        "S(A(CZ_EQL))": {
+            "key": "CZ_DCOM",
+            "label": ", (dead)",
+        }
+        "S(A(CZ_ACUT))": {
+            "key": "CZ_DHPN",
+            "label": "- (dead)",
+        }
+        "S(A(CZ_W))": {
+            "key": "CZ_CEDT",
+            "label": "Ė",
+        }
+        "S(A(CZ_E))": {
+            "key": "CZ_CEOG",
+            "label": "Ę",
+        }
+        "S(A(CZ_R))": {
+            "key": "CZ_REGD",
+            "label": "®",
+        }
+        "S(A(CZ_T))": {
+            "key": "CZ_TM",
+            "label": "™",
+        }
+        "S(A(CZ_Z))": {
+            "key": "CZ_CZDT",
+            "label": "Ż",
+        }
+        "S(A(CZ_UACU))": {
+            "key": "CZ_LSAQ",
+            "label": "‹",
+        }
+        "S(A(CZ_RPRN))": {
+            "key": "CZ_RSAQ",
+            "label": "›",
+        }
+        "S(A(CZ_DIAE))": {
+            "key": "CZ_DDQT",
+            "label": "\" (dead)",
+        }
+        "S(A(CZ_A))": {
+            "key": "CZ_CAOG",
+            "label": "Ą",
+        }
+        "S(A(CZ_S))": {
+            "key": "CZ_NARS",
+            "label": "∑",
+        }
+        "S(A(CZ_D))": {
+            "key": "CZ_INCR",
+            "label": "∆",
+        }
+        "S(A(CZ_H))": {
+            "key": "CZ_LDQU",
+            "label": "“",
+        }
+        "S(A(CZ_J))": {
+            "key": "CZ_RDQU",
+            "label": "”",
+        }
+        "S(A(CZ_L))": {
+            "key": "CZ_CLST",
+            "label": "Ł",
+        }
+        "S(A(CZ_URNG))": {
+            "key": "CZ_ELLP",
+            "label": "…",
+        }
+        "S(A(CZ_SECT))": {
+            "key": "CZ_DTIL",
+            "label": "~ (dead)",
+        }
+        "S(A(CZ_C))": {
+            "key": "CZ_COPY",
+            "label": "©",
+        }
+        "S(A(CZ_V))": {
+            "key": "CZ_SQRT",
+            "label": "√",
+        }
+        "S(A(CZ_N))": {
+            "key": "CZ_DLQU",
+            "label": "„",
+        }
+        "S(A(CZ_COMM))": {
+            "key": "CZ_LEQL",
+            "label": "≤",
+        }
+        "S(A(CZ_DOT))": {
+            "key": "CZ_GEQL",
+            "label": "≥",
+        }
+        "S(A(CZ_MINS))": {
+            "key": "CZ_MDSH",
+            "label": "—",
+        }
+    }
+}
diff --git a/data/constants/keycodes/extras/keycodes_czech_mac_iso_0.0.1.hjson b/data/constants/keycodes/extras/keycodes_czech_mac_iso_0.0.1.hjson
new file mode 100644
index 00000000000..5158ea16d8d
--- /dev/null
+++ b/data/constants/keycodes/extras/keycodes_czech_mac_iso_0.0.1.hjson
@@ -0,0 +1,580 @@
+{
+    "aliases": {
+/*
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬─────┐
+ * │   │ + │ ě │ š │ č │ ř │ ž │ ý │ á │ í │ é │ = │ ' │     │
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬───┤
+ * │     │ Q │ W │ E │ R │ T │ Z │ U │ I │ O │ P │ ú │ ) │   │
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐  │
+ * │      │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ů │ § │ ¨ │  │
+ * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴──┤
+ * │    │ \ │ Y │ X │ C │ V │ B │ N │ M │ , │ . │ - │        │
+ * ├────┴┬──┴─┬─┴───┼───┴───┴───┴───┴───┴───┼───┴─┬─┴──┬─────┤
+ * │     │    │     │                       │     │    │     │
+ * └─────┴────┴─────┴───────────────────────┴─────┴────┴─────┘
+ */
+        "KC_1": {
+            "key": "CZ_PLUS",
+            "label": "+",
+        }
+        "KC_2": {
+            "key": "CZ_ECAR",
+            "label": "ě",
+        }
+        "KC_3": {
+            "key": "CZ_SCAR",
+            "label": "š",
+        }
+        "KC_4": {
+            "key": "CZ_CCAR",
+            "label": "č",
+        }
+        "KC_5": {
+            "key": "CZ_RCAR",
+            "label": "ř",
+        }
+        "KC_6": {
+            "key": "CZ_ZCAR",
+            "label": "ž",
+        }
+        "KC_7": {
+            "key": "CZ_YACU",
+            "label": "ý",
+        }
+        "KC_8": {
+            "key": "CZ_AACU",
+            "label": "á",
+        }
+        "KC_9": {
+            "key": "CZ_IACU",
+            "label": "í",
+        }
+        "KC_0": {
+            "key": "CZ_EACU",
+            "label": "é",
+        }
+        "KC_MINS": {
+            "key": "CZ_EQL",
+            "label": "=",
+        }
+        "KC_EQL": {
+            "key": "CZ_ACUT",
+            "label": "' (dead)",
+        }
+        "KC_Q": {
+            "key": "CZ_Q",
+            "label": "Q",
+        }
+        "KC_W": {
+            "key": "CZ_W",
+            "label": "W",
+        }
+        "KC_E": {
+            "key": "CZ_E",
+            "label": "E",
+        }
+        "KC_R": {
+            "key": "CZ_R",
+            "label": "R",
+        }
+        "KC_T": {
+            "key": "CZ_T",
+            "label": "T",
+        }
+        "KC_Y": {
+            "key": "CZ_Z",
+            "label": "Z",
+        }
+        "KC_U": {
+            "key": "CZ_U",
+            "label": "U",
+        }
+        "KC_I": {
+            "key": "CZ_I",
+            "label": "I",
+        }
+        "KC_O": {
+            "key": "CZ_O",
+            "label": "O",
+        }
+        "KC_P": {
+            "key": "CZ_P",
+            "label": "P",
+        }
+        "KC_LBRC": {
+            "key": "CZ_UACU",
+            "label": "ú",
+        }
+        "KC_RBRC": {
+            "key": "CZ_RPRN",
+            "label": ")",
+        }
+        "KC_A": {
+            "key": "CZ_A",
+            "label": "A",
+        }
+        "KC_S": {
+            "key": "CZ_S",
+            "label": "S",
+        }
+        "KC_D": {
+            "key": "CZ_D",
+            "label": "D",
+        }
+        "KC_F": {
+            "key": "CZ_F",
+            "label": "F",
+        }
+        "KC_G": {
+            "key": "CZ_G",
+            "label": "G",
+        }
+        "KC_H": {
+            "key": "CZ_H",
+            "label": "H",
+        }
+        "KC_J": {
+            "key": "CZ_J",
+            "label": "J",
+        }
+        "KC_K": {
+            "key": "CZ_K",
+            "label": "K",
+        }
+        "KC_L": {
+            "key": "CZ_L",
+            "label": "L",
+        }
+        "KC_SCLN": {
+            "key": "CZ_URNG",
+            "label": "ů",
+        }
+        "KC_QUOT": {
+            "key": "CZ_SECT",
+            "label": "§",
+        }
+        "KC_NUHS": {
+            "key": "CZ_DIAE",
+            "label": "¨ (dead)",
+        }
+        "KC_NUBS": {
+            "key": "CZ_BSLS",
+            "label": "\\",
+        }
+        "KC_Z": {
+            "key": "CZ_Y",
+            "label": "Y",
+        }
+        "KC_X": {
+            "key": "CZ_X",
+            "label": "X",
+        }
+        "KC_C": {
+            "key": "CZ_C",
+            "label": "C",
+        }
+        "KC_V": {
+            "key": "CZ_V",
+            "label": "V",
+        }
+        "KC_B": {
+            "key": "CZ_B",
+            "label": "B",
+        }
+        "KC_N": {
+            "key": "CZ_N",
+            "label": "N",
+        }
+        "KC_M": {
+            "key": "CZ_M",
+            "label": "M",
+        }
+        "KC_COMM": {
+            "key": "CZ_COMM",
+            "label": ",",
+        }
+        "KC_DOT": {
+            "key": "CZ_DOT",
+            "label": ".",
+        }
+        "KC_SLSH": {
+            "key": "CZ_MINS",
+            "label": "-",
+        }
+/* Shifted symbols
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬─────┐
+ * │   │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ % │ ˇ │     │
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬───┤
+ * │     │   │   │   │   │   │   │   │   │   │   │ / │ ( │   │
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐  │
+ * │      │   │   │   │   │   │   │   │   │   │ " │ ! │ ` │  │
+ * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴──┤
+ * │    │ | │   │   │   │   │   │   │   │ ? │ : │ _ │        │
+ * ├────┴┬──┴─┬─┴───┼───┴───┴───┴───┴───┴───┼───┴─┬─┴──┬─────┤
+ * │     │    │     │                       │     │    │     │
+ * └─────┴────┴─────┴───────────────────────┴─────┴────┴─────┘
+ */
+        "S(CZ_PLUS)": {
+            "key": "CZ_1",
+            "label": "1",
+        }
+        "S(CZ_ECAR)": {
+            "key": "CZ_2",
+            "label": "2",
+        }
+        "S(CZ_SCAR)": {
+            "key": "CZ_3",
+            "label": "3",
+        }
+        "S(CZ_CCAR)": {
+            "key": "CZ_4",
+            "label": "4",
+        }
+        "S(CZ_RCAR)": {
+            "key": "CZ_5",
+            "label": "5",
+        }
+        "S(CZ_ZCAR)": {
+            "key": "CZ_6",
+            "label": "6",
+        }
+        "S(CZ_YACU)": {
+            "key": "CZ_7",
+            "label": "7",
+        }
+        "S(CZ_AACU)": {
+            "key": "CZ_8",
+            "label": "8",
+        }
+        "S(CZ_IACU)": {
+            "key": "CZ_9",
+            "label": "9",
+        }
+        "S(CZ_EACU)": {
+            "key": "CZ_0",
+            "label": "0",
+        }
+        "S(CZ_EQL)": {
+            "key": "CZ_PERC",
+            "label": "%",
+        }
+        "S(CZ_ACUT)": {
+            "key": "CZ_CARN",
+            "label": "ˇ (dead)",
+        }
+        "S(CZ_UACU)": {
+            "key": "CZ_SLSH",
+            "label": "/",
+        }
+        "S(CZ_RPRN)": {
+            "key": "CZ_LPRN",
+            "label": "(",
+        }
+        "S(CZ_URNG)": {
+            "key": "CZ_DQUO",
+            "label": "\"",
+        }
+        "S(CZ_SECT)": {
+            "key": "CZ_EXLM",
+            "label": "!",
+        }
+        "S(CZ_DIAE)": {
+            "key": "CZ_GRV",
+            "label": "`",
+        }
+        "S(CZ_BSLS)": {
+            "key": "CZ_PIPE",
+            "label": "|",
+        }
+        "S(CZ_COMM)": {
+            "key": "CZ_QUES",
+            "label": "?",
+        }
+        "S(CZ_DOT)": {
+            "key": "CZ_COLN",
+            "label": ":",
+        }
+        "S(CZ_MINS)": {
+            "key": "CZ_UNDS",
+            "label": "_",
+        }
+/* Alted symbols
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬─────┐
+ * │   │   │ @ │ # │ $ │ ~ │ ^ │ & │ * │ { │ } │ ° │ ^ │     │
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬───┤
+ * │     │   │ ė │ ę │ € │   │ ż │   │   │   │   │ [ │ ] │   │
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐  │
+ * │      │ ą │ ß │ ∂ │   │   │ ‘ │ ’ │   │ ł │ ; │ ' │   │  │
+ * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴──┤
+ * │    │   │   │   │   │   │   │ ‚ │   │ < │ > │ – │        │
+ * ├────┴┬──┴─┬─┴───┼───┴───┴───┴───┴───┴───┼───┴─┬─┴──┬─────┤
+ * │     │    │     │                       │     │    │     │
+ * └─────┴────┴─────┴───────────────────────┴─────┴────┴─────┘
+ */
+        "A(CZ_ECAR)": {
+            "key": "CZ_AT",
+            "label": "@",
+        }
+        "A(CZ_SCAR)": {
+            "key": "CZ_HASH",
+            "label": "#",
+        }
+        "A(CZ_CCAR)": {
+            "key": "CZ_DLR",
+            "label": "$",
+        }
+        "A(CZ_RCAR)": {
+            "key": "CZ_TILD",
+            "label": "~",
+        }
+        "A(CZ_ZCAR)": {
+            "key": "CZ_CIRC",
+            "label": "^",
+        }
+        "A(CZ_YACU)": {
+            "key": "CZ_AMPR",
+            "label": "&",
+        }
+        "A(CZ_AACU)": {
+            "key": "CZ_ASTR",
+            "label": "*",
+        }
+        "A(CZ_IACU)": {
+            "key": "CZ_LCBR",
+            "label": "{",
+        }
+        "A(CZ_EACU)": {
+            "key": "CZ_RCBR",
+            "label": "}",
+        }
+        "A(CZ_EQL)": {
+            "key": "CZ_RNGA",
+            "label": "° (dead)",
+        }
+        "A(CZ_ACUT)": {
+            "key": "CZ_DCIR",
+            "label": "^ (dead)",
+        }
+        "A(CZ_W)": {
+            "key": "CZ_LEDT",
+            "label": "ė",
+        }
+        "A(CZ_E)": {
+            "key": "CZ_LEOG",
+            "label": "ę",
+        }
+        "A(CZ_R)": {
+            "key": "CZ_EURO",
+            "label": "€",
+        }
+        "A(CZ_Z)": {
+            "key": "CZ_LZDT",
+            "label": "ż",
+        }
+        "A(CZ_UACU)": {
+            "key": "CZ_LBRC",
+            "label": "[",
+        }
+        "A(CZ_RPRN)": {
+            "key": "CZ_RBRC",
+            "label": "]",
+        }
+        "A(CZ_A)": {
+            "key": "CZ_LAOG",
+            "label": "ą",
+        }
+        "A(CZ_S)": {
+            "key": "CZ_SS",
+            "label": "ß",
+        }
+        "A(CZ_D)": {
+            "key": "CZ_PDIF",
+            "label": "∂",
+        }
+        "A(CZ_H)": {
+            "key": "CZ_LSQU",
+            "label": "‘",
+        }
+        "A(CZ_J)": {
+            "key": "CZ_RSQU",
+            "label": "’",
+        }
+        "A(CZ_L)": {
+            "key": "CZ_LLST",
+            "label": "ł",
+        }
+        "A(CZ_URNG)": {
+            "key": "CZ_SCLN",
+            "label": ";",
+        }
+        "A(CZ_SECT)": {
+            "key": "CZ_QUOT",
+            "label": "'",
+        }
+        "A(CZ_N)": {
+            "key": "CZ_SLQU",
+            "label": "‚",
+        }
+        "A(CZ_COMM)": {
+            "key": "CZ_LABK",
+            "label": "<",
+        }
+        "A(CZ_DOT)": {
+            "key": "CZ_RABK",
+            "label": ">",
+        }
+        "A(CZ_MINS)": {
+            "key": "CZ_NDSH",
+            "label": "–",
+        }
+/* Shift+Alted symbols
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬─────┐
+ * │   │ ¬ │ • │ ≠ │ £ │ ◊ │ † │ ¶ │ ÷ │ « │ » │ , │ - │     │
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬───┤
+ * │     │   │ Ė │ Ę │ ® │ ™ │ Ż │   │   │   │   │ ‹ │ › │   │
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐  │
+ * │      │ Ą │ ∑ │ ∆ │   │   │ “ │ ” │   │ Ł │ … │ ~ │ " │  │
+ * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴──┤
+ * │    │   │   │   │ © │ √ │   │ „ │   │ ≤ │ ≥ │ — │        │
+ * ├────┴┬──┴─┬─┴───┼───┴───┴───┴───┴───┴───┼───┴─┬─┴──┬─────┤
+ * │     │    │     │                       │     │    │     │
+ * └─────┴────┴─────┴───────────────────────┴─────┴────┴─────┘
+ */
+        "S(A(CZ_1))": {
+            "key": "CZ_NOT",
+            "label": "¬",
+        }
+        "S(A(CZ_2))": {
+            "key": "CZ_BULT",
+            "label": "•",
+        }
+        "S(A(CZ_3))": {
+            "key": "CZ_NEQL",
+            "label": "≠",
+        }
+        "S(A(CZ_4))": {
+            "key": "CZ_PND",
+            "label": "£",
+        }
+        "S(A(CZ_5))": {
+            "key": "CZ_LOZN",
+            "label": "◊",
+        }
+        "S(A(CZ_6))": {
+            "key": "CZ_DAGG",
+            "label": "†",
+        }
+        "S(A(CZ_7))": {
+            "key": "CZ_PARA",
+            "label": "¶",
+        }
+        "S(A(CZ_8))": {
+            "key": "CZ_DIV",
+            "label": "÷",
+        }
+        "S(A(CZ_9))": {
+            "key": "CZ_LDAQ",
+            "label": "«",
+        }
+        "S(A(CZ_0))": {
+            "key": "CZ_RDAQ",
+            "label": "»",
+        }
+        "S(A(CZ_EQL))": {
+            "key": "CZ_DCOM",
+            "label": ", (dead)",
+        }
+        "S(A(CZ_ACUT))": {
+            "key": "CZ_DHPN",
+            "label": "- (dead)",
+        }
+        "S(A(CZ_W))": {
+            "key": "CZ_CEDT",
+            "label": "Ė",
+        }
+        "S(A(CZ_E))": {
+            "key": "CZ_CEOG",
+            "label": "Ę",
+        }
+        "S(A(CZ_R))": {
+            "key": "CZ_REGD",
+            "label": "®",
+        }
+        "S(A(CZ_T))": {
+            "key": "CZ_TM",
+            "label": "™",
+        }
+        "S(A(CZ_Z))": {
+            "key": "CZ_CZDT",
+            "label": "Ż",
+        }
+        "S(A(CZ_UACU))": {
+            "key": "CZ_LSAQ",
+            "label": "‹",
+        }
+        "S(A(CZ_RPRN))": {
+            "key": "CZ_RSAQ",
+            "label": "›",
+        }
+        "S(A(CZ_A))": {
+            "key": "CZ_CAOG",
+            "label": "Ą",
+        }
+        "S(A(CZ_S))": {
+            "key": "CZ_NARS",
+            "label": "∑",
+        }
+        "S(A(CZ_D))": {
+            "key": "CZ_INCR",
+            "label": "∆",
+        }
+        "S(A(CZ_H))": {
+            "key": "CZ_LDQU",
+            "label": "“",
+        }
+        "S(A(CZ_J))": {
+            "key": "CZ_RDQU",
+            "label": "”",
+        }
+        "S(A(CZ_L))": {
+            "key": "CZ_CLST",
+            "label": "Ł",
+        }
+        "S(A(CZ_URNG))": {
+            "key": "CZ_ELLP",
+            "label": "…",
+        }
+        "S(A(CZ_SECT))": {
+            "key": "CZ_DTIL",
+            "label": "~ (dead)",
+        }
+        "S(A(CZ_DIAE))": {
+            "key": "CZ_DDQT",
+            "label": "\" (dead)",
+        }
+        "S(A(CZ_C))": {
+            "key": "CZ_COPY",
+            "label": "©",
+        }
+        "S(A(CZ_V))": {
+            "key": "CZ_SQRT",
+            "label": "√",
+        }
+        "S(A(CZ_N))": {
+            "key": "CZ_DLQU",
+            "label": "„",
+        }
+        "S(A(CZ_COMM))": {
+            "key": "CZ_LEQL",
+            "label": "≤",
+        }
+        "S(A(CZ_DOT))": {
+            "key": "CZ_GEQL",
+            "label": "≥",
+        }
+        "S(A(CZ_MINS))": {
+            "key": "CZ_MDSH",
+            "label": "—",
+        }
+    }
+}
diff --git a/data/mappings/info_config.hjson b/data/mappings/info_config.hjson
index c0417b88396..b61ca040714 100644
--- a/data/mappings/info_config.hjson
+++ b/data/mappings/info_config.hjson
@@ -164,7 +164,6 @@
     "RGBLIGHT_DEFAULT_SAT": {"info_key": "rgblight.default.sat", "value_type": "int"},
     "RGBLIGHT_DEFAULT_VAL": {"info_key": "rgblight.default.val", "value_type": "int"},
     "RGBLIGHT_DEFAULT_SPD": {"info_key": "rgblight.default.speed", "value_type": "int"},
-    "RGBW": {"info_key": "rgblight.rgbw", "value_type": "flag"},
 
     // Secure
     "SECURE_IDLE_TIMEOUT": {"info_key": "secure.idle_timeout", "value_type": "int"},
@@ -215,6 +214,7 @@
     "WS2812_DI_PIN": {"info_key": "ws2812.pin"},
     "WS2812_I2C_ADDRESS": {"info_key": "ws2812.i2c_address", "value_type": "hex"},
     "WS2812_I2C_TIMEOUT": {"info_key": "ws2812.i2c_timeout", "value_type": "int"},
+    "WS2812_RGBW": {"info_key": "ws2812.rgbw", "value_type": "flag"},
 
     "LAYOUTS": {"info_key": "layout_aliases", "value_type": "mapping"},
 
@@ -229,6 +229,7 @@
     "PREVENT_STUCK_MODIFIERS": {"info_key": "_invalid.prevent_stuck_mods", "invalid": true},
     "QMK_KEYS_PER_SCAN": {"info_key": "qmk.keys_per_scan", "value_type": "int", "deprecated": true},
     "RGB_DI_PIN": {"info_key": "rgblight.pin", "invalid": true, "replace_with": "WS2812_DI_PIN or APA102_DI_PIN"},
+    "RGBW": {"info_key": "rgblight.rgbw", "invalid": true, "replace_with": "WS2812_RGBW"},
     "RGB_DISABLE_WHEN_USB_SUSPENDED": {"info_key": "_invalid.rgb_matrix_sleep", "invalid": true, "replace_with": "RGB_MATRIX_SLEEP"},
     "RGBLIGHT_ANIMATIONS": {"info_key": "_invalid.rgblight.animations.all", "value_type": "flag", "invalid": true},
     "TAPPING_FORCE_HOLD": {"info_key": "tapping.force_hold", "value_type": "flag", "deprecated": true},
diff --git a/data/mappings/info_rules.hjson b/data/mappings/info_rules.hjson
index fc25eb3328b..97611bcf587 100644
--- a/data/mappings/info_rules.hjson
+++ b/data/mappings/info_rules.hjson
@@ -11,6 +11,7 @@
     // invalid: Default `false`. Set to `true` to generate errors when a value exists
     // replace_with: use with a key marked deprecated or invalid to designate a replacement
 
+    "AUDIO_DRIVER": {"info_key": "audio.driver"},
     "BACKLIGHT_DRIVER": {"info_key": "backlight.driver"},
     "BLUETOOTH_DRIVER": {"info_key": "bluetooth.driver"},
     "BOARD": {"info_key": "board"},
@@ -23,6 +24,7 @@
     "ENCODER_ENABLE": {"info_key": "encoder.enabled", "value_type": "bool"},
     "ENCODER_DRIVER": {"info_key": "encoder.driver"},
     "FIRMWARE_FORMAT": {"info_key": "build.firmware_format"},
+    "HAPTIC_DRIVER": {"info_key": "haptic.driver"},
     "KEYBOARD_SHARED_EP": {"info_key": "usb.shared_endpoint.keyboard", "value_type": "bool"},
     "LAYOUTS": {"info_key": "community_layouts", "value_type": "list"},
     "LED_MATRIX_DRIVER": {"info_key": "led_matrix.driver"},
@@ -43,7 +45,7 @@
     "SPLIT_TRANSPORT": {"info_key": "split.transport.protocol", "to_c": false},
     "STENO_ENABLE": {"info_key": "stenography.enabled", "value_type": "bool"},
     "STENO_PROTOCOL": {"info_key": "stenography.protocol"},
-    "WAIT_FOR_USB": {"info_key": "usb.wait_for", "value_type": "bool"},
+    "USB_WAIT_FOR_ENUMERATION": {"info_key": "usb.wait_for_enumeration", "value_type": "bool"},
     "WEAR_LEVELING_DRIVER": {"info_key": "eeprom.wear_leveling.driver"},
     "WS2812_DRIVER": {"info_key": "ws2812.driver"},
 
diff --git a/data/schemas/keyboard.jsonschema b/data/schemas/keyboard.jsonschema
index 25aaabcf4a3..de01809b43d 100644
--- a/data/schemas/keyboard.jsonschema
+++ b/data/schemas/keyboard.jsonschema
@@ -133,6 +133,10 @@
                         "clicky": {"type": "boolean"}
                     }
                 },
+                "driver": {
+                    "type": "string",
+                    "enum": ["dac_additive", "dac_basic", "pwm_software", "pwm_hardware"]
+                },
                 "macro_beep": {"type": "boolean"},
                 "pins": {"$ref": "qmk.definitions.v1#/mcu_pin_array"},
                 "power_control": {
@@ -387,6 +391,15 @@
                 }
             }
         },
+        "haptic": {
+            "type": "object",
+            "properties": {
+                "driver": {
+                    "type": "string",
+                    "enum": ["drv2605l", "solenoid"]
+                }
+            }
+        },
         "leader_key": {
             "type": "object",
             "properties": {
@@ -648,7 +661,10 @@
                     "$ref": "qmk.definitions.v1#/mcu_pin",
                     "$comment": "Deprecated: use ws2812.pin instead"
                 },
-                "rgbw": {"type": "boolean"},
+                "rgbw": {
+                    "type": "boolean",
+                    "$comment": "Deprecated: use ws2812.rgbw instead"
+                },
                 "saturation_steps": {"$ref": "qmk.definitions.v1#/unsigned_int"},
                 "sleep": {"type": "boolean"},
                 "split": {"type": "boolean"},
@@ -885,7 +901,7 @@
                     }
                 },
                 "suspend_wakeup_delay": {"$ref": "qmk.definitions.v1#/unsigned_int"},
-                "wait_for": {"type": "boolean"}
+                "wait_for_enumeration": {"type": "boolean"}
             }
         },
         "qmk": {
@@ -924,6 +940,7 @@
                     "enum": ["bitbang", "custom", "i2c", "pwm", "spi", "vendor"]
                 },
                 "pin": {"$ref": "qmk.definitions.v1#/mcu_pin"},
+                "rgbw": {"type": "boolean"},
                 "i2c_address": {"$ref": "qmk.definitions.v1#/hex_number_2d"},
                 "i2c_timeout": {"$ref": "qmk.definitions.v1#/unsigned_int"}
             }
diff --git a/docs/ChangeLog/20240526/PR23309.md b/docs/ChangeLog/20240526/PR23309.md
new file mode 100644
index 00000000000..b5ca5f1e4d0
--- /dev/null
+++ b/docs/ChangeLog/20240526/PR23309.md
@@ -0,0 +1,35 @@
+# MechKeys ACR60 Layout Updates
+
+This PR removed and changed some of the layouts that were configured for
+the ACR60. If you use one of the following layouts, you will need to
+update your keymap:
+
+- [`LAYOUT_hhkb`](#layout-hhkb)
+- [`LAYOUT_true_hhkb`](#layout-true-hhkb)
+- [`LAYOUT_directional`](#layout-directional)
+- [`LAYOUT_mitchsplit`](#layout-mitchsplit)
+
+## `LAYOUT_hhkb` :id=layout-hhkb
+
+1. Change your layout macro to `LAYOUT_60_hhkb`.
+2. Remove any keycodes for the key between Left Shift and QWERTY Z.
+
+## `LAYOUT_true_hhkb` :id=layout-true-hhkb
+
+1. Change your layout macro to `LAYOUT_60_true_hhkb`.
+2. Remove any keycodes for the key between Left Shift and QWERTY Z.
+
+## `LAYOUT_directional` :id=layout-directional
+
+1. Change your layout macro to `LAYOUT_60_ansi_arrow_split_bs`.
+2. Remove any keycodes for the key between Left Shift and QWERTY Z.
+3. Remove any keycodes for the keys immediately before *and* after the
+1.25u key of Split Spacebar.
+
+If you need split spacebars, you may implement
+`LAYOUT_60_ansi_arrow_split_space_split_bs` and change your layout to
+it, removing the keycode between Left Shift and QWERTY Z.
+
+## `LAYOUT_mitchsplit` :id=layout-mitchsplit
+
+1. Use `LAYOUT_60_ansi_split_space_split_rshift`.
diff --git a/docs/config_options.md b/docs/config_options.md
index 045d9c07479..046429a5875 100644
--- a/docs/config_options.md
+++ b/docs/config_options.md
@@ -237,7 +237,7 @@ If you define these options you will enable the associated feature, which may in
   * units to step when in/decreasing saturation
 * `#define RGBLIGHT_VAL_STEP 12`
   * units to step when in/decreasing value (brightness)
-* `#define RGBW`
+* `#define WS2812_RGBW`
   * Enables RGBW LED support
 
 ## Mouse Key Options
@@ -446,7 +446,7 @@ Use these to enable or disable building certain features. The more you have enab
   * Allows replacing the standard matrix scanning routine with a custom one.
 * `DEBOUNCE_TYPE`
   * Allows replacing the standard key debouncing routine with an alternative or custom one.
-* `WAIT_FOR_USB`
+* `USB_WAIT_FOR_ENUMERATION`
   * Forces the keyboard to wait for a USB connection to be established before it starts up
 * `NO_USB_STARTUP_CHECK`
   * Disables usb suspend check after keyboard startup. Usually the keyboard waits for the host to wake it up before any tasks are performed. This is useful for split keyboards as one half will not get a wakeup call but must send commands to the master.
diff --git a/docs/feature_rgblight.md b/docs/feature_rgblight.md
index a6a89d1d00c..ae37ceca92f 100644
--- a/docs/feature_rgblight.md
+++ b/docs/feature_rgblight.md
@@ -6,7 +6,7 @@ QMK has the ability to control RGB LEDs attached to your keyboard. This is commo
 
 Some keyboards come with RGB LEDs preinstalled. Others must have them installed after the fact. See the [Hardware Modification](#hardware-modification) section for information on adding RGB lighting to your keyboard.
 
-Currently QMK supports the following addressable LEDs (however, the white LED in RGBW variants is not supported):
+Currently QMK supports the following addressable LEDs:
 
  * WS2811, WS2812, WS2812B, WS2812C, etc.
  * SK6812, SK6812MINI, SK6805
diff --git a/docs/ja/config_options.md b/docs/ja/config_options.md
index a349081d6a2..6cc1b6bfcd7 100644
--- a/docs/ja/config_options.md
+++ b/docs/ja/config_options.md
@@ -378,7 +378,7 @@ QMK での全ての利用可能な設定にはデフォルトがあります。
   * 標準マトリックス走査ルーチンを独自のものに置き換えることができます。
 * `DEBOUNCE_TYPE`
   * 標準キーデバウンスルーチンを代替または独自のものに置き換えることができます。
-* `WAIT_FOR_USB`
+* `USB_WAIT_FOR_ENUMERATION`
   * キーボードが起動する前に、USB 接続が確立されるのをキーボードに待機させます
 * `NO_USB_STARTUP_CHECK`
   * キーボードの起動後の usb サスペンドチェックを無効にします。通常、キーボードはタスクが実行される前にホストがウェイク アップするのを待ちます。分割キーボードは半分はウェイクアップコールを取得できませんが、マスタにコマンドを送信する必要があるため、役に立ちます。
diff --git a/docs/pr_checklist.md b/docs/pr_checklist.md
index 0d503ab4177..94ff7eed665 100644
--- a/docs/pr_checklist.md
+++ b/docs/pr_checklist.md
@@ -148,6 +148,13 @@ https://github.com/qmk/qmk_firmware/pulls?q=is%3Apr+is%3Aclosed+label%3Akeyboard
   - For instance, only `wilba_tech` boards shall include `keyboards/wilba_tech/wt_main.c` and  `keyboards/wilba_tech/wt_rgb_backlight.c`. But including `drivers/sensors/pmw3360.c` is absolutely fine for any and all boards that require it.
   - Code that needs to be used by multiple boards is a candidate for core code changes, and should be separated out.
 
+Wireless-capable boards:
+- Given license abuse from vendors, QMK does not accept any vendor PRs for wireless- or Bluetooth-capable keyboards without wireless and/or Bluetooth code
+    - Historically, vendors have done this in bad faith in order to attain downstream VIA compatibility with no intention of releasing wireless sources
+    - QMK's license, the GPL2+, requires full source disclosure for any distributed binary -- including full sources for any keyboard shipped by vendors containing QMK and/or firmware-side VIA code
+    - If a vendor's wireless-capable keyboard PR submission is lacking wireless capability, then the PR will be left on-hold and unmergeable until wireless bindings are provided
+    - If a vendor's wireless-capable keyboard is merged into QMK before it's known that the board is wireless, then all existing and future PRs from the same vendor will be put on hold until wireless bindings for the offending keyboard are provided
+
 Also, specific to ChibiOS:
 - **strong** preference to using existing ChibiOS board definitions.
     - a lot of the time, an equivalent Nucleo board can be used with a different flash size or slightly different model in the same family
diff --git a/docs/reference_info_json.md b/docs/reference_info_json.md
index e6bc34e79ec..5b06e9a3268 100644
--- a/docs/reference_info_json.md
+++ b/docs/reference_info_json.md
@@ -118,6 +118,8 @@ Configures the [Audio](feature_audio.md) feature.
         * `clicky`
             * The default audio clicky enabled state.
             * Default: `true`
+    * `driver`
+        * The driver to use. Must be one of `dac_additive`, `dac_basic`, `pwm_software`, `pwm_hardware`.
     * `macro_beep`
         * Play a short beep for `\a` (ASCII `BEL`) characters in Send String macros.
         * Default: `false`
@@ -586,9 +588,6 @@ Configures the [RGB Lighting](feature_rgblight.md) feature.
     * `max_brightness`
         * The maximum value which the HSV "V" component is scaled to, from 0 to 255.
         * Default: `255`
-    * `rgbw`
-        * Enable RGBW LEDs.
-        * Default: `false`
     * `saturation_steps`
         * The number of saturation adjustment steps.
         * Default: `17`
@@ -833,7 +832,7 @@ Configures the [Stenography](feature_stenography.md) feature.
     * `suspend_wakeup_delay`
         * The amount of time to wait after sending a wakeup packet, in milliseconds.
         * Default: `0` (disabled)
-    * `wait_for`
+    * `wait_for_enumeration`
         * Force the keyboard to wait for USB enumeration before starting up.
         * Default: `false`
 
@@ -853,3 +852,6 @@ Configures the [WS2812](ws2812_driver.md) driver.
     * `i2c_timeout`
         * The I²C timeout in milliseconds (`i2c` driver only).
         * Default: `100` (100 ms)
+    * `rgbw`
+        * Enable RGBW LEDs.
+        * Default: `false`
diff --git a/docs/reference_keymap_extras.md b/docs/reference_keymap_extras.md
index cf2ab288761..191e0d4ea8d 100644
--- a/docs/reference_keymap_extras.md
+++ b/docs/reference_keymap_extras.md
@@ -23,6 +23,8 @@ These headers are located in [`quantum/keymap_extras/`](https://github.com/qmk/q
 |Canadian Multilingual (CSA)      |`keymap_canadian_multilingual.h` |`sendstring_canadian_multilingual.h`|
 |Croatian                         |`keymap_croatian.h`              |`sendstring_croatian.h`             |
 |Czech                            |`keymap_czech.h`                 |`sendstring_czech.h`                |
+|Czech (macOS, ANSI)              |`keymap_czech_mac_ansi.h`        |`sendstring_czech_mac_ansi.h`       |
+|Czech (macOS, ISO)               |`keymap_czech_mac_iso.h`         |`sendstring_czech_mac_iso.h`        |
 |Danish                           |`keymap_danish.h`                |`sendstring_danish.h`               |
 |Dutch (Belgium)                  |`keymap_belgian.h`               |`sendstring_belgian.h`              |
 |English (Ireland)                |`keymap_irish.h`                 |                                    |
diff --git a/docs/ws2812_driver.md b/docs/ws2812_driver.md
index 006529cc8ae..8851c042f04 100644
--- a/docs/ws2812_driver.md
+++ b/docs/ws2812_driver.md
@@ -33,6 +33,7 @@ Add the following to your `config.h`:
 |`WS2812_T0H`       |`350`                  |The length of a "0" bit's high phase in nanoseconds                                             |
 |`WS2812_TRST_US`   |`280`                  |The length of the reset phase in microseconds                                                   |
 |`WS2812_BYTE_ORDER`|`WS2812_BYTE_ORDER_GRB`|The byte order of the RGB data                                                                  |
+|`WS2812_RGBW`      |*Not defined*          |Enables RGBW support (except `i2c` driver)                                                      |
 
 ### Timing Adjustment :id=timing-adjustment
 
@@ -58,6 +59,27 @@ Where the byte order may be one of:
 |`RGB`     |WS2812B-2020                |
 |`BGR`     |TM1812                      |
 
+### RGBW Support :id=rgbw-support
+
+Rendering the color white with RGB LEDs is typically inconsistent due to inherent variations between each individual LED die. However, some WS2812 variants (such as SK6812RGBW) also possess a white LED along with the red, green, and blue channels, which allows for a more accurate white to be displayed.
+
+QMK can automatically convert the RGB data to be sent to the LEDs to mix in the white channel:
+
+```
+w = min(r, g, b)
+r -= w
+g -= w
+b -= w
+```
+
+Thus, an RGB triplet of `255,255,255` will simply turn on the white LED fully (`0,0,0,255`).
+
+To enable RGBW conversion, add the following to your `config.h`:
+
+```c
+#define WS2812_RGBW
+```
+
 ## Driver Configuration :id=driver-configuration
 
 Driver selection can be configured in `rules.mk` as `WS2812_DRIVER`, or in `info.json` as `ws2812.driver`. Valid values are `bitbang` (default), `i2c`, `spi`, `pwm`, `vendor`, or `custom`. See below for information on individual drivers.
diff --git a/keyboards/adafruit/macropad/keyboard.json b/keyboards/adafruit/macropad/keyboard.json
index 86601c0167f..94f2673f98f 100644
--- a/keyboards/adafruit/macropad/keyboard.json
+++ b/keyboards/adafruit/macropad/keyboard.json
@@ -19,6 +19,7 @@
         "oled": true
     },
     "audio": {
+        "driver": "pwm_hardware",
         "power_control": {
             "pin": "GP14"
         }
diff --git a/keyboards/adafruit/macropad/rules.mk b/keyboards/adafruit/macropad/rules.mk
index 1630b74ceae..d7ca5b3b90f 100644
--- a/keyboards/adafruit/macropad/rules.mk
+++ b/keyboards/adafruit/macropad/rules.mk
@@ -1,2 +1 @@
-AUDIO_DRIVER = pwm_hardware
 OLED_TRANSPORT = spi
diff --git a/keyboards/ai03/lunar_ii/keyboard.json b/keyboards/ai03/lunar_ii/keyboard.json
index 38729595a29..badf9240aba 100644
--- a/keyboards/ai03/lunar_ii/keyboard.json
+++ b/keyboards/ai03/lunar_ii/keyboard.json
@@ -22,6 +22,9 @@
             "resync": true
         }
     },
+    "haptic": {
+        "driver": "solenoid"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "diode_direction": "COL2ROW",
diff --git a/keyboards/ai03/lunar_ii/rules.mk b/keyboards/ai03/lunar_ii/rules.mk
deleted file mode 100644
index a521203b326..00000000000
--- a/keyboards/ai03/lunar_ii/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-HAPTIC_DRIVER = solenoid
diff --git a/keyboards/arrowmechanics/wings/keyboard.json b/keyboards/arrowmechanics/wings/keyboard.json
index fca38314c9b..0f1e6696f75 100644
--- a/keyboards/arrowmechanics/wings/keyboard.json
+++ b/keyboards/arrowmechanics/wings/keyboard.json
@@ -17,6 +17,9 @@
         "mousekey": true,
         "rgb_matrix": true
     },
+    "audio": {
+        "driver": "pwm_hardware"
+    },
     "matrix_pins": {
         "cols": ["GP8", "GP9", "GP10", "GP11", "GP12", "GP13", "GP14", "GP15", "GP16"],
         "rows": ["GP22", "GP21", "GP20", "GP19", "GP18", "GP17"]
diff --git a/keyboards/arrowmechanics/wings/rules.mk b/keyboards/arrowmechanics/wings/rules.mk
index 22ce54190c8..161ec22b16e 100644
--- a/keyboards/arrowmechanics/wings/rules.mk
+++ b/keyboards/arrowmechanics/wings/rules.mk
@@ -1,2 +1 @@
 SERIAL_DRIVER = vendor
-AUDIO_DRIVER = pwm_hardware
diff --git a/keyboards/bastardkb/charybdis/3x5/blackpill/info.json b/keyboards/bastardkb/charybdis/3x5/blackpill/info.json
deleted file mode 100644
index 1e77de54e94..00000000000
--- a/keyboards/bastardkb/charybdis/3x5/blackpill/info.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-    "keyboard_name": "Charybdis Nano (3x5) Blackpill",
-    "usb": {
-        "device_version": "1.0.0"
-    },
-    "eeprom": {
-        "driver": "spi"
-    },
-    "split": {
-        "enabled": true
-    },
-    "rgb_matrix": {
-        "driver": "ws2812"
-    },
-    "ws2812": {
-        "pin": "A1",
-        "driver": "pwm"
-    },
-    "build": {
-        "debounce_type": "asym_eager_defer_pk"
-    },
-    "matrix_pins": {
-        "cols": ["B1", "B10", "B3", "B4", "B5"],
-        "rows": ["A2", "B8", "A8", "B9"]
-    },
-    "diode_direction": "ROW2COL",
-    "processor": "STM32F411",
-    "bootloader": "stm32-dfu",
-    "board": "BLACKPILL_STM32_F411"
-}
diff --git a/keyboards/bastardkb/charybdis/3x5/blackpill/keyboard.json b/keyboards/bastardkb/charybdis/3x5/blackpill/keyboard.json
new file mode 100644
index 00000000000..bcc57981b51
--- /dev/null
+++ b/keyboards/bastardkb/charybdis/3x5/blackpill/keyboard.json
@@ -0,0 +1,38 @@
+{
+    "keyboard_name": "Charybdis Nano (3x5) Blackpill",
+    "usb": {
+        "device_version": "1.0.0",
+        "shared_endpoint": {
+            "keyboard": true
+        }
+    },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "rgb_matrix": true,
+        "pointing_device": true
+    },
+    "eeprom": {
+        "driver": "spi"
+    },
+    "split": {
+        "enabled": true
+    },
+    "rgb_matrix": {
+        "driver": "ws2812"
+    },
+    "ws2812": {
+        "pin": "A1",
+        "driver": "pwm"
+    },
+    "build": {
+        "debounce_type": "asym_eager_defer_pk"
+    },
+    "matrix_pins": {
+        "cols": ["B1", "B10", "B3", "B4", "B5"],
+        "rows": ["A2", "B8", "A8", "B9"]
+    },
+    "diode_direction": "ROW2COL",
+    "development_board": "blackpill_f411"
+}
diff --git a/keyboards/bastardkb/charybdis/3x5/blackpill/rules.mk b/keyboards/bastardkb/charybdis/3x5/blackpill/rules.mk
index 1bf0d489a97..c8d355efb78 100644
--- a/keyboards/bastardkb/charybdis/3x5/blackpill/rules.mk
+++ b/keyboards/bastardkb/charybdis/3x5/blackpill/rules.mk
@@ -1,24 +1,5 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
 AUDIO_SUPPORTED = no        # Audio is not supported
-RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
-RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
-RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
 
-POINTING_DEVICE_ENABLE = yes # Enable trackball
 POINTING_DEVICE_DRIVER = pmw3360
 MOUSE_SHARED_EP = no # Unify multiple HID interfaces into a single Endpoint
-KEYBOARD_SHARED_EP = yes
-
 SERIAL_DRIVER = usart
diff --git a/keyboards/bastardkb/charybdis/3x5/v1/elitec/info.json b/keyboards/bastardkb/charybdis/3x5/v1/elitec/info.json
deleted file mode 100644
index 05be6acde22..00000000000
--- a/keyboards/bastardkb/charybdis/3x5/v1/elitec/info.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-    "keyboard_name": "Charybdis Nano (3x5) Elite-C",
-    "usb": {
-        "device_version": "1.0.0"
-    },
-    "ws2812": {
-        "pin": "D3"
-    },
-    "rgb_matrix": {
-        "driver": "ws2812"
-    },
-    "matrix_pins": {
-        "cols": ["C7", "F0", "D7", "E6", "B4"],
-        "rows": ["B7", "C6", "D4", "B5"]
-    },
-    "diode_direction": "ROW2COL",
-    "split": {
-        "enabled": true,
-        "soft_serial_pin": "D2",
-        "matrix_pins": {
-            "right": {
-                "cols": ["C7", "B7", "D7", "E6", "B4"],
-                "rows": ["F0", "C6", "D4", "B5"]
-            }
-        }
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu"
-}
diff --git a/keyboards/bastardkb/charybdis/3x5/v1/elitec/keyboard.json b/keyboards/bastardkb/charybdis/3x5/v1/elitec/keyboard.json
new file mode 100644
index 00000000000..4a94d023d46
--- /dev/null
+++ b/keyboards/bastardkb/charybdis/3x5/v1/elitec/keyboard.json
@@ -0,0 +1,39 @@
+{
+    "keyboard_name": "Charybdis Nano (3x5) Elite-C",
+    "usb": {
+        "device_version": "1.0.0"
+    },
+    "features": {
+        "bootmagic": true,
+        "mousekey": false,
+        "extrakey": true,
+        "rgb_matrix": true,
+        "pointing_device": true
+    },
+    "build": {
+        "lto": true
+    },
+    "ws2812": {
+        "pin": "D3"
+    },
+    "rgb_matrix": {
+        "driver": "ws2812"
+    },
+    "matrix_pins": {
+        "cols": ["C7", "F0", "D7", "E6", "B4"],
+        "rows": ["B7", "C6", "D4", "B5"]
+    },
+    "diode_direction": "ROW2COL",
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "D2",
+        "matrix_pins": {
+            "right": {
+                "cols": ["C7", "B7", "D7", "E6", "B4"],
+                "rows": ["F0", "C6", "D4", "B5"]
+            }
+        }
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu"
+}
diff --git a/keyboards/bastardkb/charybdis/3x5/v1/elitec/rules.mk b/keyboards/bastardkb/charybdis/3x5/v1/elitec/rules.mk
index 0869ac07972..17dae28bd1c 100644
--- a/keyboards/bastardkb/charybdis/3x5/v1/elitec/rules.mk
+++ b/keyboards/bastardkb/charybdis/3x5/v1/elitec/rules.mk
@@ -1,25 +1,4 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
 AUDIO_SUPPORTED = no        # Audio is not supported
-RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
-RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
-RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
 
-POINTING_DEVICE_ENABLE = yes # Enable trackball
 POINTING_DEVICE_DRIVER = pmw3360
 MOUSE_SHARED_EP = no # Unify multiple HID interfaces into a single Endpoint
-
-# Enable link-time optimization by default.  The Charybdis packs a lot of
-# features (RGB, Via, trackball) in a small atmega32u4 package.
-LTO_ENABLE = yes
diff --git a/keyboards/bastardkb/charybdis/3x5/v2/elitec/info.json b/keyboards/bastardkb/charybdis/3x5/v2/elitec/info.json
deleted file mode 100644
index 61d953ec8f6..00000000000
--- a/keyboards/bastardkb/charybdis/3x5/v2/elitec/info.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "keyboard_name": "Charybdis Nano (3x5) Elite-C",
-    "usb": {
-        "device_version": "2.0.0"
-    },
-    "ws2812": {
-        "pin": "D3"
-    },
-    "rgb_matrix": {
-        "driver": "ws2812"
-    },
-    "matrix_pins": {
-        "cols": ["F5", "B6", "D7", "E6", "B4"],
-        "rows": ["F7", "C6", "D4", "B5"]
-    },
-    "diode_direction": "ROW2COL",
-    "split": {
-        "enabled": true,
-        "soft_serial_pin": "D2"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu"
-}
diff --git a/keyboards/bastardkb/charybdis/3x5/v2/elitec/keyboard.json b/keyboards/bastardkb/charybdis/3x5/v2/elitec/keyboard.json
new file mode 100644
index 00000000000..bc95061ced9
--- /dev/null
+++ b/keyboards/bastardkb/charybdis/3x5/v2/elitec/keyboard.json
@@ -0,0 +1,33 @@
+{
+    "keyboard_name": "Charybdis Nano (3x5) Elite-C",
+    "usb": {
+        "device_version": "2.0.0"
+    },
+    "features": {
+        "bootmagic": true,
+        "mousekey": false,
+        "extrakey": true,
+        "rgb_matrix": true,
+        "pointing_device": true
+    },
+    "build": {
+        "lto": true
+    },
+    "ws2812": {
+        "pin": "D3"
+    },
+    "rgb_matrix": {
+        "driver": "ws2812"
+    },
+    "matrix_pins": {
+        "cols": ["F5", "B6", "D7", "E6", "B4"],
+        "rows": ["F7", "C6", "D4", "B5"]
+    },
+    "diode_direction": "ROW2COL",
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "D2"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu"
+}
diff --git a/keyboards/bastardkb/charybdis/3x5/v2/elitec/rules.mk b/keyboards/bastardkb/charybdis/3x5/v2/elitec/rules.mk
index 0869ac07972..17dae28bd1c 100644
--- a/keyboards/bastardkb/charybdis/3x5/v2/elitec/rules.mk
+++ b/keyboards/bastardkb/charybdis/3x5/v2/elitec/rules.mk
@@ -1,25 +1,4 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
 AUDIO_SUPPORTED = no        # Audio is not supported
-RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
-RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
-RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
 
-POINTING_DEVICE_ENABLE = yes # Enable trackball
 POINTING_DEVICE_DRIVER = pmw3360
 MOUSE_SHARED_EP = no # Unify multiple HID interfaces into a single Endpoint
-
-# Enable link-time optimization by default.  The Charybdis packs a lot of
-# features (RGB, Via, trackball) in a small atmega32u4 package.
-LTO_ENABLE = yes
diff --git a/keyboards/bastardkb/charybdis/3x5/v2/splinky_2/info.json b/keyboards/bastardkb/charybdis/3x5/v2/splinky_2/info.json
deleted file mode 100644
index f7dd9d2c7e2..00000000000
--- a/keyboards/bastardkb/charybdis/3x5/v2/splinky_2/info.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-    "keyboard_name": "Charybdis Nano (3x5) Splinky",
-    "usb": {
-        "device_version": "2.0.0"
-    },
-    "rgb_matrix": {
-        "driver": "ws2812"
-    },
-    "matrix_pins": {
-        "cols": ["GP28", "GP15", "GP6", "GP7", "GP8"],
-        "rows": ["GP26", "GP5", "GP4", "GP9"]
-    },
-    "diode_direction": "ROW2COL",
-    "split": {
-        "enabled": true,
-        "soft_serial_pin": "GP1"
-    },
-    "ws2812": {
-        "pin": "GP0",
-        "driver": "vendor"
-    },
-    "processor": "RP2040",
-    "bootloader": "rp2040"
-}
diff --git a/keyboards/bastardkb/charybdis/3x5/v2/splinky_2/keyboard.json b/keyboards/bastardkb/charybdis/3x5/v2/splinky_2/keyboard.json
new file mode 100644
index 00000000000..cc990d3f210
--- /dev/null
+++ b/keyboards/bastardkb/charybdis/3x5/v2/splinky_2/keyboard.json
@@ -0,0 +1,31 @@
+{
+    "keyboard_name": "Charybdis Nano (3x5) Splinky",
+    "usb": {
+        "device_version": "2.0.0"
+    },
+    "features": {
+        "bootmagic": true,
+        "mousekey": false,
+        "extrakey": true,
+        "rgb_matrix": true,
+        "pointing_device": true
+    },
+    "rgb_matrix": {
+        "driver": "ws2812"
+    },
+    "matrix_pins": {
+        "cols": ["GP28", "GP15", "GP6", "GP7", "GP8"],
+        "rows": ["GP26", "GP5", "GP4", "GP9"]
+    },
+    "diode_direction": "ROW2COL",
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "GP1"
+    },
+    "ws2812": {
+        "pin": "GP0",
+        "driver": "vendor"
+    },
+    "processor": "RP2040",
+    "bootloader": "rp2040"
+}
diff --git a/keyboards/bastardkb/charybdis/3x5/v2/splinky_2/rules.mk b/keyboards/bastardkb/charybdis/3x5/v2/splinky_2/rules.mk
index 03b7e8ca31a..db29cb6789b 100644
--- a/keyboards/bastardkb/charybdis/3x5/v2/splinky_2/rules.mk
+++ b/keyboards/bastardkb/charybdis/3x5/v2/splinky_2/rules.mk
@@ -1,22 +1,5 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
 AUDIO_SUPPORTED = no        # Audio is not supported
-RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
-RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
-RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
 
-POINTING_DEVICE_ENABLE = yes # Enable trackball
 POINTING_DEVICE_DRIVER = pmw3360
 
 SERIAL_DRIVER = vendor
diff --git a/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/info.json b/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/info.json
deleted file mode 100644
index 33fda9c2a47..00000000000
--- a/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/info.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-    "keyboard_name": "Charybdis Nano (3x5) Splinky",
-    "usb": {
-        "device_version": "2.0.0"
-    },
-    "rgb_matrix": {
-        "driver": "ws2812"
-    },
-    "matrix_pins": {
-        "cols": ["GP28", "GP21", "GP6", "GP7", "GP8"],
-        "rows": ["GP26", "GP5", "GP4", "GP9"]
-    },
-    "diode_direction": "ROW2COL",
-    "split": {
-        "enabled": true,
-        "soft_serial_pin": "GP1"
-    },
-    "ws2812": {
-        "pin": "GP0",
-        "driver": "vendor"
-    },
-    "processor": "RP2040",
-    "bootloader": "rp2040"
-}
diff --git a/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/keyboard.json b/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/keyboard.json
new file mode 100644
index 00000000000..6719b211968
--- /dev/null
+++ b/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/keyboard.json
@@ -0,0 +1,31 @@
+{
+    "keyboard_name": "Charybdis Nano (3x5) Splinky",
+    "usb": {
+        "device_version": "2.0.0"
+    },
+    "features": {
+        "bootmagic": true,
+        "mousekey": false,
+        "extrakey": true,
+        "rgb_matrix": true,
+        "pointing_device": true
+    },
+    "rgb_matrix": {
+        "driver": "ws2812"
+    },
+    "matrix_pins": {
+        "cols": ["GP28", "GP21", "GP6", "GP7", "GP8"],
+        "rows": ["GP26", "GP5", "GP4", "GP9"]
+    },
+    "diode_direction": "ROW2COL",
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "GP1"
+    },
+    "ws2812": {
+        "pin": "GP0",
+        "driver": "vendor"
+    },
+    "processor": "RP2040",
+    "bootloader": "rp2040"
+}
diff --git a/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/rules.mk b/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/rules.mk
index 03b7e8ca31a..db29cb6789b 100644
--- a/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/rules.mk
+++ b/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/rules.mk
@@ -1,22 +1,5 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
 AUDIO_SUPPORTED = no        # Audio is not supported
-RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
-RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
-RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
 
-POINTING_DEVICE_ENABLE = yes # Enable trackball
 POINTING_DEVICE_DRIVER = pmw3360
 
 SERIAL_DRIVER = vendor
diff --git a/keyboards/bastardkb/charybdis/3x5/v2/stemcell/info.json b/keyboards/bastardkb/charybdis/3x5/v2/stemcell/info.json
deleted file mode 100644
index cf9cf2eb62d..00000000000
--- a/keyboards/bastardkb/charybdis/3x5/v2/stemcell/info.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-    "keyboard_name": "Charybdis Nano (3x5) STeMCell",
-    "usb": {
-        "device_version": "2.0.0"
-    },
-    "rgb_matrix": {
-        "driver": "ws2812"
-    },
-    "ws2812": {
-        "pin": "A2",
-        "driver": "pwm"
-    },
-    "build": {
-        "debounce_type": "asym_eager_defer_pk"
-    },
-    "matrix_pins": {
-        "cols": ["B2", "A4", "B4", "B5", "B8"],
-        "rows": ["B0", "B3", "A15", "B9"]
-    },
-    "diode_direction": "ROW2COL",
-    "split": {
-        "enabled": true,
-        "soft_serial_pin": "A3"
-    },
-    "development_board": "stemcell"
-}
diff --git a/keyboards/bastardkb/charybdis/3x5/v2/stemcell/keyboard.json b/keyboards/bastardkb/charybdis/3x5/v2/stemcell/keyboard.json
new file mode 100644
index 00000000000..2de77b07f0c
--- /dev/null
+++ b/keyboards/bastardkb/charybdis/3x5/v2/stemcell/keyboard.json
@@ -0,0 +1,36 @@
+{
+    "keyboard_name": "Charybdis Nano (3x5) STeMCell",
+    "usb": {
+        "device_version": "2.0.0",
+        "shared_endpoint": {
+            "keyboard": true
+        }
+    },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "rgb_matrix": true,
+        "pointing_device": true
+    },
+    "rgb_matrix": {
+        "driver": "ws2812"
+    },
+    "ws2812": {
+        "pin": "A2",
+        "driver": "pwm"
+    },
+    "build": {
+        "debounce_type": "asym_eager_defer_pk"
+    },
+    "matrix_pins": {
+        "cols": ["B2", "A4", "B4", "B5", "B8"],
+        "rows": ["B0", "B3", "A15", "B9"]
+    },
+    "diode_direction": "ROW2COL",
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "A3"
+    },
+    "development_board": "stemcell"
+}
diff --git a/keyboards/bastardkb/charybdis/3x5/v2/stemcell/rules.mk b/keyboards/bastardkb/charybdis/3x5/v2/stemcell/rules.mk
index 1bf0d489a97..4373b9c33d2 100644
--- a/keyboards/bastardkb/charybdis/3x5/v2/stemcell/rules.mk
+++ b/keyboards/bastardkb/charybdis/3x5/v2/stemcell/rules.mk
@@ -1,24 +1,6 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
 AUDIO_SUPPORTED = no        # Audio is not supported
-RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
-RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
-RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
 
-POINTING_DEVICE_ENABLE = yes # Enable trackball
 POINTING_DEVICE_DRIVER = pmw3360
 MOUSE_SHARED_EP = no # Unify multiple HID interfaces into a single Endpoint
-KEYBOARD_SHARED_EP = yes
 
 SERIAL_DRIVER = usart
diff --git a/keyboards/bastardkb/charybdis/3x6/blackpill/info.json b/keyboards/bastardkb/charybdis/3x6/blackpill/info.json
deleted file mode 100644
index 1dbfdb53452..00000000000
--- a/keyboards/bastardkb/charybdis/3x6/blackpill/info.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-    "keyboard_name": "Charybdis Mini (3x6) Blackpill",
-    "usb": {
-        "device_version": "1.0.0"
-    },
-    "eeprom": {
-        "driver": "spi"
-    },
-    "split": {
-        "enabled": true
-    },
-    "rgb_matrix": {
-        "driver": "ws2812"
-    },
-    "ws2812": {
-        "pin": "A1",
-        "driver": "pwm"
-    },
-    "build": {
-        "debounce_type": "asym_eager_defer_pk"
-    },
-    "matrix_pins": {
-        "cols": ["B0", "B1", "B10", "B3", "B4", "B5"],
-        "rows": ["A2", "B8", "A8", "B9"]
-    },
-    "diode_direction": "ROW2COL",
-    "processor": "STM32F411",
-    "bootloader": "stm32-dfu",
-    "board": "BLACKPILL_STM32_F411"
-}
diff --git a/keyboards/bastardkb/charybdis/3x6/blackpill/keyboard.json b/keyboards/bastardkb/charybdis/3x6/blackpill/keyboard.json
new file mode 100644
index 00000000000..ecefbbeb999
--- /dev/null
+++ b/keyboards/bastardkb/charybdis/3x6/blackpill/keyboard.json
@@ -0,0 +1,38 @@
+{
+    "keyboard_name": "Charybdis Mini (3x6) Blackpill",
+    "usb": {
+        "device_version": "1.0.0",
+        "shared_endpoint": {
+            "keyboard": true
+        }
+    },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "rgb_matrix": true,
+        "pointing_device": true
+    },
+    "eeprom": {
+        "driver": "spi"
+    },
+    "split": {
+        "enabled": true
+    },
+    "rgb_matrix": {
+        "driver": "ws2812"
+    },
+    "ws2812": {
+        "pin": "A1",
+        "driver": "pwm"
+    },
+    "build": {
+        "debounce_type": "asym_eager_defer_pk"
+    },
+    "matrix_pins": {
+        "cols": ["B0", "B1", "B10", "B3", "B4", "B5"],
+        "rows": ["A2", "B8", "A8", "B9"]
+    },
+    "diode_direction": "ROW2COL",
+    "development_board": "blackpill_f411"
+}
diff --git a/keyboards/bastardkb/charybdis/3x6/blackpill/rules.mk b/keyboards/bastardkb/charybdis/3x6/blackpill/rules.mk
index 1bf0d489a97..4373b9c33d2 100644
--- a/keyboards/bastardkb/charybdis/3x6/blackpill/rules.mk
+++ b/keyboards/bastardkb/charybdis/3x6/blackpill/rules.mk
@@ -1,24 +1,6 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
 AUDIO_SUPPORTED = no        # Audio is not supported
-RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
-RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
-RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
 
-POINTING_DEVICE_ENABLE = yes # Enable trackball
 POINTING_DEVICE_DRIVER = pmw3360
 MOUSE_SHARED_EP = no # Unify multiple HID interfaces into a single Endpoint
-KEYBOARD_SHARED_EP = yes
 
 SERIAL_DRIVER = usart
diff --git a/keyboards/bastardkb/charybdis/3x6/v1/elitec/info.json b/keyboards/bastardkb/charybdis/3x6/v1/elitec/info.json
deleted file mode 100644
index 8bc6a86eaf1..00000000000
--- a/keyboards/bastardkb/charybdis/3x6/v1/elitec/info.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-    "keyboard_name": "Charybdis Mini (3x6) Elite-C",
-    "usb": {
-        "device_version": "1.0.0"
-    },
-    "ws2812": {
-        "pin": "D3"
-    },
-    "rgb_matrix": {
-        "driver": "ws2812"
-    },
-    "matrix_pins": {
-        "cols": ["D5", "C7", "F0", "D7", "E6", "B4"],
-        "rows": ["B7", "C6", "D4", "B5"]
-    },
-    "diode_direction": "ROW2COL",
-    "split": {
-        "enabled": true,
-        "soft_serial_pin": "D2",
-        "matrix_pins": {
-            "right": {
-                "cols": ["F1", "C7", "B7", "D7", "E6", "B4"],
-                "rows": ["F0", "C6", "D4", "B5"]
-            }
-        }
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu"
-}
diff --git a/keyboards/bastardkb/charybdis/3x6/v1/elitec/keyboard.json b/keyboards/bastardkb/charybdis/3x6/v1/elitec/keyboard.json
new file mode 100644
index 00000000000..dcc454366c6
--- /dev/null
+++ b/keyboards/bastardkb/charybdis/3x6/v1/elitec/keyboard.json
@@ -0,0 +1,39 @@
+{
+    "keyboard_name": "Charybdis Mini (3x6) Elite-C",
+    "usb": {
+        "device_version": "1.0.0"
+    },
+    "features": {
+        "bootmagic": true,
+        "mousekey": false,
+        "extrakey": true,
+        "rgb_matrix": true,
+        "pointing_device": true
+    },
+    "build": {
+        "lto": true
+    },
+    "ws2812": {
+        "pin": "D3"
+    },
+    "rgb_matrix": {
+        "driver": "ws2812"
+    },
+    "matrix_pins": {
+        "cols": ["D5", "C7", "F0", "D7", "E6", "B4"],
+        "rows": ["B7", "C6", "D4", "B5"]
+    },
+    "diode_direction": "ROW2COL",
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "D2",
+        "matrix_pins": {
+            "right": {
+                "cols": ["F1", "C7", "B7", "D7", "E6", "B4"],
+                "rows": ["F0", "C6", "D4", "B5"]
+            }
+        }
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu"
+}
diff --git a/keyboards/bastardkb/charybdis/3x6/v1/elitec/rules.mk b/keyboards/bastardkb/charybdis/3x6/v1/elitec/rules.mk
index 0869ac07972..17dae28bd1c 100644
--- a/keyboards/bastardkb/charybdis/3x6/v1/elitec/rules.mk
+++ b/keyboards/bastardkb/charybdis/3x6/v1/elitec/rules.mk
@@ -1,25 +1,4 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
 AUDIO_SUPPORTED = no        # Audio is not supported
-RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
-RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
-RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
 
-POINTING_DEVICE_ENABLE = yes # Enable trackball
 POINTING_DEVICE_DRIVER = pmw3360
 MOUSE_SHARED_EP = no # Unify multiple HID interfaces into a single Endpoint
-
-# Enable link-time optimization by default.  The Charybdis packs a lot of
-# features (RGB, Via, trackball) in a small atmega32u4 package.
-LTO_ENABLE = yes
diff --git a/keyboards/bastardkb/charybdis/3x6/v2/elitec/info.json b/keyboards/bastardkb/charybdis/3x6/v2/elitec/info.json
deleted file mode 100644
index 13283d5b8fa..00000000000
--- a/keyboards/bastardkb/charybdis/3x6/v2/elitec/info.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "keyboard_name": "Charybdis Mini (3x6) Elite-C",
-    "usb": {
-        "device_version": "2.0.0"
-    },
-    "ws2812": {
-        "pin": "D3"
-    },
-    "rgb_matrix": {
-        "driver": "ws2812"
-    },
-    "matrix_pins": {
-        "cols": ["F6", "F5", "B6", "D7", "E6", "B4"],
-        "rows": ["F7", "C6", "D4", "B5"]
-    },
-    "diode_direction": "ROW2COL",
-    "split": {
-        "enabled": true,
-        "soft_serial_pin": "D2"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu"
-}
diff --git a/keyboards/bastardkb/charybdis/3x6/v2/elitec/keyboard.json b/keyboards/bastardkb/charybdis/3x6/v2/elitec/keyboard.json
new file mode 100644
index 00000000000..ce74b2dc6df
--- /dev/null
+++ b/keyboards/bastardkb/charybdis/3x6/v2/elitec/keyboard.json
@@ -0,0 +1,33 @@
+{
+    "keyboard_name": "Charybdis Mini (3x6) Elite-C",
+    "usb": {
+        "device_version": "2.0.0"
+    },
+    "features": {
+        "bootmagic": true,
+        "mousekey": false,
+        "extrakey": true,
+        "rgb_matrix": true,
+        "pointing_device": true
+    },
+    "build": {
+        "lto": true
+    },
+    "ws2812": {
+        "pin": "D3"
+    },
+    "rgb_matrix": {
+        "driver": "ws2812"
+    },
+    "matrix_pins": {
+        "cols": ["F6", "F5", "B6", "D7", "E6", "B4"],
+        "rows": ["F7", "C6", "D4", "B5"]
+    },
+    "diode_direction": "ROW2COL",
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "D2"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu"
+}
diff --git a/keyboards/bastardkb/charybdis/3x6/v2/elitec/rules.mk b/keyboards/bastardkb/charybdis/3x6/v2/elitec/rules.mk
index 0869ac07972..17dae28bd1c 100644
--- a/keyboards/bastardkb/charybdis/3x6/v2/elitec/rules.mk
+++ b/keyboards/bastardkb/charybdis/3x6/v2/elitec/rules.mk
@@ -1,25 +1,4 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
 AUDIO_SUPPORTED = no        # Audio is not supported
-RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
-RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
-RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
 
-POINTING_DEVICE_ENABLE = yes # Enable trackball
 POINTING_DEVICE_DRIVER = pmw3360
 MOUSE_SHARED_EP = no # Unify multiple HID interfaces into a single Endpoint
-
-# Enable link-time optimization by default.  The Charybdis packs a lot of
-# features (RGB, Via, trackball) in a small atmega32u4 package.
-LTO_ENABLE = yes
diff --git a/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/info.json b/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/info.json
deleted file mode 100644
index 8dcc8187abb..00000000000
--- a/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/info.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-    "keyboard_name": "Charybdis Mini (3x6) Splinky",
-    "usb": {
-        "device_version": "2.0.0"
-    },
-    "rgb_matrix": {
-        "driver": "ws2812"
-    },
-    "matrix_pins": {
-        "cols": ["GP27", "GP28", "GP15", "GP6", "GP7", "GP8"],
-        "rows": ["GP26", "GP5", "GP4", "GP9"]
-    },
-    "diode_direction": "ROW2COL",
-    "split": {
-        "enabled": true,
-        "soft_serial_pin": "GP1"
-    },
-    "ws2812": {
-        "pin": "GP0",
-        "driver": "vendor"
-    },
-    "processor": "RP2040",
-    "bootloader": "rp2040"
-}
diff --git a/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/keyboard.json b/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/keyboard.json
new file mode 100644
index 00000000000..825508475c9
--- /dev/null
+++ b/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/keyboard.json
@@ -0,0 +1,31 @@
+{
+    "keyboard_name": "Charybdis Mini (3x6) Splinky",
+    "usb": {
+        "device_version": "2.0.0"
+    },
+    "features": {
+        "bootmagic": true,
+        "mousekey": false,
+        "extrakey": true,
+        "rgb_matrix": true,
+        "pointing_device": true
+    },
+    "rgb_matrix": {
+        "driver": "ws2812"
+    },
+    "matrix_pins": {
+        "cols": ["GP27", "GP28", "GP15", "GP6", "GP7", "GP8"],
+        "rows": ["GP26", "GP5", "GP4", "GP9"]
+    },
+    "diode_direction": "ROW2COL",
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "GP1"
+    },
+    "ws2812": {
+        "pin": "GP0",
+        "driver": "vendor"
+    },
+    "processor": "RP2040",
+    "bootloader": "rp2040"
+}
diff --git a/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/rules.mk b/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/rules.mk
index 03b7e8ca31a..db29cb6789b 100644
--- a/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/rules.mk
+++ b/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/rules.mk
@@ -1,22 +1,5 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
 AUDIO_SUPPORTED = no        # Audio is not supported
-RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
-RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
-RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
 
-POINTING_DEVICE_ENABLE = yes # Enable trackball
 POINTING_DEVICE_DRIVER = pmw3360
 
 SERIAL_DRIVER = vendor
diff --git a/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/info.json b/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/info.json
deleted file mode 100644
index 288e08b9ee9..00000000000
--- a/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/info.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-    "keyboard_name": "Charybdis Mini (3x6) Splinky",
-    "usb": {
-        "device_version": "2.0.0"
-    },
-    "rgb_matrix": {
-        "driver": "ws2812"
-    },
-    "matrix_pins": {
-        "cols": ["GP27", "GP28", "GP21", "GP6", "GP7", "GP8"],
-        "rows": ["GP26", "GP5", "GP4", "GP9"]
-    },
-    "diode_direction": "ROW2COL",
-    "split": {
-        "enabled": true,
-        "soft_serial_pin": "GP1"
-    },
-    "ws2812": {
-        "pin": "GP0",
-        "driver": "vendor"
-    },
-    "processor": "RP2040",
-    "bootloader": "rp2040"
-}
diff --git a/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/keyboard.json b/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/keyboard.json
new file mode 100644
index 00000000000..4d9cfb616d8
--- /dev/null
+++ b/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/keyboard.json
@@ -0,0 +1,31 @@
+{
+    "keyboard_name": "Charybdis Mini (3x6) Splinky",
+    "usb": {
+        "device_version": "2.0.0"
+    },
+    "features": {
+        "bootmagic": true,
+        "mousekey": false,
+        "extrakey": true,
+        "rgb_matrix": true,
+        "pointing_device": true
+    },
+    "rgb_matrix": {
+        "driver": "ws2812"
+    },
+    "matrix_pins": {
+        "cols": ["GP27", "GP28", "GP21", "GP6", "GP7", "GP8"],
+        "rows": ["GP26", "GP5", "GP4", "GP9"]
+    },
+    "diode_direction": "ROW2COL",
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "GP1"
+    },
+    "ws2812": {
+        "pin": "GP0",
+        "driver": "vendor"
+    },
+    "processor": "RP2040",
+    "bootloader": "rp2040"
+}
diff --git a/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/rules.mk b/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/rules.mk
index 03b7e8ca31a..db29cb6789b 100644
--- a/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/rules.mk
+++ b/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/rules.mk
@@ -1,22 +1,5 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
 AUDIO_SUPPORTED = no        # Audio is not supported
-RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
-RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
-RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
 
-POINTING_DEVICE_ENABLE = yes # Enable trackball
 POINTING_DEVICE_DRIVER = pmw3360
 
 SERIAL_DRIVER = vendor
diff --git a/keyboards/bastardkb/charybdis/3x6/v2/stemcell/info.json b/keyboards/bastardkb/charybdis/3x6/v2/stemcell/info.json
deleted file mode 100644
index c09c9c90ca0..00000000000
--- a/keyboards/bastardkb/charybdis/3x6/v2/stemcell/info.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-    "keyboard_name": "Charybdis Mini (3x6) STeMCell",
-    "usb": {
-        "device_version": "2.0.0"
-    },
-    "rgb_matrix": {
-        "driver": "ws2812"
-    },
-    "ws2812": {
-        "pin": "A2",
-        "driver": "pwm"
-    },
-    "build": {
-        "debounce_type": "asym_eager_defer_pk"
-    },
-    "matrix_pins": {
-        "cols": ["B1", "B2", "A4", "B4", "B5", "B8"],
-        "rows": ["B0", "B3", "A15", "B9"]
-    },
-    "diode_direction": "ROW2COL",
-    "split": {
-        "enabled": true,
-        "soft_serial_pin": "A3"
-    },
-    "development_board": "stemcell"
-}
diff --git a/keyboards/bastardkb/charybdis/3x6/v2/stemcell/keyboard.json b/keyboards/bastardkb/charybdis/3x6/v2/stemcell/keyboard.json
new file mode 100644
index 00000000000..05d82b2445b
--- /dev/null
+++ b/keyboards/bastardkb/charybdis/3x6/v2/stemcell/keyboard.json
@@ -0,0 +1,36 @@
+{
+    "keyboard_name": "Charybdis Mini (3x6) STeMCell",
+    "usb": {
+        "device_version": "2.0.0",
+        "shared_endpoint": {
+            "keyboard": true
+        }
+    },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "rgb_matrix": true,
+        "pointing_device": true
+    },
+    "rgb_matrix": {
+        "driver": "ws2812"
+    },
+    "ws2812": {
+        "pin": "A2",
+        "driver": "pwm"
+    },
+    "build": {
+        "debounce_type": "asym_eager_defer_pk"
+    },
+    "matrix_pins": {
+        "cols": ["B1", "B2", "A4", "B4", "B5", "B8"],
+        "rows": ["B0", "B3", "A15", "B9"]
+    },
+    "diode_direction": "ROW2COL",
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "A3"
+    },
+    "development_board": "stemcell"
+}
diff --git a/keyboards/bastardkb/charybdis/3x6/v2/stemcell/rules.mk b/keyboards/bastardkb/charybdis/3x6/v2/stemcell/rules.mk
index 1bf0d489a97..4373b9c33d2 100644
--- a/keyboards/bastardkb/charybdis/3x6/v2/stemcell/rules.mk
+++ b/keyboards/bastardkb/charybdis/3x6/v2/stemcell/rules.mk
@@ -1,24 +1,6 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
 AUDIO_SUPPORTED = no        # Audio is not supported
-RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
-RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
-RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
 
-POINTING_DEVICE_ENABLE = yes # Enable trackball
 POINTING_DEVICE_DRIVER = pmw3360
 MOUSE_SHARED_EP = no # Unify multiple HID interfaces into a single Endpoint
-KEYBOARD_SHARED_EP = yes
 
 SERIAL_DRIVER = usart
diff --git a/keyboards/bastardkb/charybdis/4x6/blackpill/info.json b/keyboards/bastardkb/charybdis/4x6/blackpill/info.json
deleted file mode 100644
index 5c0b65b7c3d..00000000000
--- a/keyboards/bastardkb/charybdis/4x6/blackpill/info.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-    "keyboard_name": "Charybdis (4x6) Blackpill",
-    "usb": {
-        "device_version": "1.0.0"
-    },
-    "eeprom": {
-        "driver": "spi"
-    },
-    "split": {
-        "enabled": true
-    },
-    "rgb_matrix": {
-        "driver": "ws2812"
-    },
-    "ws2812": {
-        "pin": "A1",
-        "driver": "pwm"
-    },
-    "build": {
-        "debounce_type": "asym_eager_defer_pk"
-    },
-    "matrix_pins": {
-        "cols": ["B0", "B1", "B10", "B3", "B4", "B5"],
-        "rows": ["B15", "A2", "B8", "A8", "B9"]
-    },
-    "diode_direction": "ROW2COL",
-    "processor": "STM32F411",
-    "bootloader": "stm32-dfu",
-    "board": "BLACKPILL_STM32_F411"
-}
diff --git a/keyboards/bastardkb/charybdis/4x6/blackpill/keyboard.json b/keyboards/bastardkb/charybdis/4x6/blackpill/keyboard.json
new file mode 100644
index 00000000000..b55dc29445b
--- /dev/null
+++ b/keyboards/bastardkb/charybdis/4x6/blackpill/keyboard.json
@@ -0,0 +1,38 @@
+{
+    "keyboard_name": "Charybdis (4x6) Blackpill",
+    "usb": {
+        "device_version": "1.0.0",
+        "shared_endpoint": {
+            "keyboard": true
+        }
+    },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "rgb_matrix": true,
+        "pointing_device": true
+    },
+    "eeprom": {
+        "driver": "spi"
+    },
+    "split": {
+        "enabled": true
+    },
+    "rgb_matrix": {
+        "driver": "ws2812"
+    },
+    "ws2812": {
+        "pin": "A1",
+        "driver": "pwm"
+    },
+    "build": {
+        "debounce_type": "asym_eager_defer_pk"
+    },
+    "matrix_pins": {
+        "cols": ["B0", "B1", "B10", "B3", "B4", "B5"],
+        "rows": ["B15", "A2", "B8", "A8", "B9"]
+    },
+    "diode_direction": "ROW2COL",
+    "development_board": "blackpill_f411"
+}
diff --git a/keyboards/bastardkb/charybdis/4x6/blackpill/rules.mk b/keyboards/bastardkb/charybdis/4x6/blackpill/rules.mk
index e2a00339775..3caafdef92b 100644
--- a/keyboards/bastardkb/charybdis/4x6/blackpill/rules.mk
+++ b/keyboards/bastardkb/charybdis/4x6/blackpill/rules.mk
@@ -1,24 +1,6 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
 AUDIO_SUPPORTED = no        # Audio is not supported.
-RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default.
-RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default.
-RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
 
-POINTING_DEVICE_ENABLE = yes # Enable trackball
 POINTING_DEVICE_DRIVER = pmw3360
 MOUSE_SHARED_EP = no # Unify multiple HID interfaces into a single Endpoint
-KEYBOARD_SHARED_EP = yes
 
 SERIAL_DRIVER = usart
diff --git a/keyboards/bastardkb/charybdis/4x6/v1/elitec/info.json b/keyboards/bastardkb/charybdis/4x6/v1/elitec/info.json
deleted file mode 100644
index 3419eaea8b7..00000000000
--- a/keyboards/bastardkb/charybdis/4x6/v1/elitec/info.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-    "keyboard_name": "Charybdis (4x6) Elite-C",
-    "usb": {
-        "device_version": "1.0.0"
-    },
-    "ws2812": {
-        "pin": "D3"
-    },
-    "rgb_matrix": {
-        "driver": "ws2812"
-    },
-    "matrix_pins": {
-        "cols": ["D5", "C7", "F0", "D7", "E6", "B4"],
-        "rows": ["F1", "B7", "C6", "D4", "B5"]
-    },
-    "diode_direction": "ROW2COL",
-    "split": {
-        "enabled": true,
-        "soft_serial_pin": "D2",
-        "matrix_pins": {
-            "right": {
-                "cols": ["F1", "C7", "B7", "D7", "E6", "B4"],
-                "rows": ["D5", "F0", "C6", "D4", "B5"]
-            }
-        }
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu"
-}
diff --git a/keyboards/bastardkb/charybdis/4x6/v1/elitec/keyboard.json b/keyboards/bastardkb/charybdis/4x6/v1/elitec/keyboard.json
new file mode 100644
index 00000000000..b90b144c8b8
--- /dev/null
+++ b/keyboards/bastardkb/charybdis/4x6/v1/elitec/keyboard.json
@@ -0,0 +1,39 @@
+{
+    "keyboard_name": "Charybdis (4x6) Elite-C",
+    "usb": {
+        "device_version": "1.0.0"
+    },
+    "features": {
+        "bootmagic": true,
+        "mousekey": false,
+        "extrakey": true,
+        "rgb_matrix": true,
+        "pointing_device": true
+    },
+    "build": {
+        "lto": true
+    },
+    "ws2812": {
+        "pin": "D3"
+    },
+    "rgb_matrix": {
+        "driver": "ws2812"
+    },
+    "matrix_pins": {
+        "cols": ["D5", "C7", "F0", "D7", "E6", "B4"],
+        "rows": ["F1", "B7", "C6", "D4", "B5"]
+    },
+    "diode_direction": "ROW2COL",
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "D2",
+        "matrix_pins": {
+            "right": {
+                "cols": ["F1", "C7", "B7", "D7", "E6", "B4"],
+                "rows": ["D5", "F0", "C6", "D4", "B5"]
+            }
+        }
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu"
+}
diff --git a/keyboards/bastardkb/charybdis/4x6/v1/elitec/rules.mk b/keyboards/bastardkb/charybdis/4x6/v1/elitec/rules.mk
index e1f2bf81f8f..0e4d15d5bc8 100644
--- a/keyboards/bastardkb/charybdis/4x6/v1/elitec/rules.mk
+++ b/keyboards/bastardkb/charybdis/4x6/v1/elitec/rules.mk
@@ -1,25 +1,4 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
 AUDIO_SUPPORTED = no        # Audio is not supported.
-RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default.
-RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default.
-RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
 
-POINTING_DEVICE_ENABLE = yes # Enable trackball
 POINTING_DEVICE_DRIVER = pmw3360
 MOUSE_SHARED_EP = no # Unify multiple HID interfaces into a single Endpoint
-
-# Enable link-time optimization by default.  The Charybdis packs a lot of
-# features (RGB, Via, trackball) in a small atmega32u4 package.
-LTO_ENABLE = yes
diff --git a/keyboards/bastardkb/charybdis/4x6/v2/elitec/info.json b/keyboards/bastardkb/charybdis/4x6/v2/elitec/info.json
deleted file mode 100644
index bb892c4e6ec..00000000000
--- a/keyboards/bastardkb/charybdis/4x6/v2/elitec/info.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "keyboard_name": "Charybdis (4x6) Elite-C",
-    "usb": {
-        "device_version": "2.0.0"
-    },
-    "ws2812": {
-        "pin": "D3"
-    },
-    "rgb_matrix": {
-        "driver": "ws2812"
-    },
-    "matrix_pins": {
-        "cols": ["F6", "F5", "B6", "D7", "E6", "B4"],
-        "rows": ["F4", "F7", "C6", "D4", "B5"]
-    },
-    "diode_direction": "ROW2COL",
-    "split": {
-        "enabled": true,
-        "soft_serial_pin": "D2"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu"
-}
diff --git a/keyboards/bastardkb/charybdis/4x6/v2/elitec/keyboard.json b/keyboards/bastardkb/charybdis/4x6/v2/elitec/keyboard.json
new file mode 100644
index 00000000000..8ae66d083b4
--- /dev/null
+++ b/keyboards/bastardkb/charybdis/4x6/v2/elitec/keyboard.json
@@ -0,0 +1,33 @@
+{
+    "keyboard_name": "Charybdis (4x6) Elite-C",
+    "usb": {
+        "device_version": "2.0.0"
+    },
+    "features": {
+        "bootmagic": true,
+        "mousekey": false,
+        "extrakey": true,
+        "rgb_matrix": true,
+        "pointing_device": true
+    },
+    "build": {
+        "lto": true
+    },
+    "ws2812": {
+        "pin": "D3"
+    },
+    "rgb_matrix": {
+        "driver": "ws2812"
+    },
+    "matrix_pins": {
+        "cols": ["F6", "F5", "B6", "D7", "E6", "B4"],
+        "rows": ["F4", "F7", "C6", "D4", "B5"]
+    },
+    "diode_direction": "ROW2COL",
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "D2"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu"
+}
diff --git a/keyboards/bastardkb/charybdis/4x6/v2/elitec/rules.mk b/keyboards/bastardkb/charybdis/4x6/v2/elitec/rules.mk
index e1f2bf81f8f..0e4d15d5bc8 100644
--- a/keyboards/bastardkb/charybdis/4x6/v2/elitec/rules.mk
+++ b/keyboards/bastardkb/charybdis/4x6/v2/elitec/rules.mk
@@ -1,25 +1,4 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
 AUDIO_SUPPORTED = no        # Audio is not supported.
-RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default.
-RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default.
-RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
 
-POINTING_DEVICE_ENABLE = yes # Enable trackball
 POINTING_DEVICE_DRIVER = pmw3360
 MOUSE_SHARED_EP = no # Unify multiple HID interfaces into a single Endpoint
-
-# Enable link-time optimization by default.  The Charybdis packs a lot of
-# features (RGB, Via, trackball) in a small atmega32u4 package.
-LTO_ENABLE = yes
diff --git a/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/info.json b/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/info.json
deleted file mode 100644
index 48a2eb51584..00000000000
--- a/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/info.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-    "keyboard_name": "Charybdis (4x6) Splinky",
-    "usb": {
-        "device_version": "2.0.0"
-    },
-    "rgb_matrix": {
-        "driver": "ws2812"
-    },
-    "matrix_pins": {
-        "cols": ["GP27", "GP28", "GP15", "GP6", "GP7", "GP8"],
-        "rows": ["GP29", "GP26", "GP5", "GP4", "GP9"]
-    },
-    "diode_direction": "ROW2COL",
-    "split": {
-        "enabled": true,
-        "soft_serial_pin": "GP1"
-    },
-    "ws2812": {
-        "pin": "GP0",
-        "driver": "vendor"
-    },
-    "processor": "RP2040",
-    "bootloader": "rp2040"
-}
diff --git a/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/keyboard.json b/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/keyboard.json
new file mode 100644
index 00000000000..b0c98389f7f
--- /dev/null
+++ b/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/keyboard.json
@@ -0,0 +1,31 @@
+{
+    "keyboard_name": "Charybdis (4x6) Splinky",
+    "usb": {
+        "device_version": "2.0.0"
+    },
+    "features": {
+        "bootmagic": true,
+        "mousekey": false,
+        "extrakey": true,
+        "rgb_matrix": true,
+        "pointing_device": true
+    },
+    "rgb_matrix": {
+        "driver": "ws2812"
+    },
+    "matrix_pins": {
+        "cols": ["GP27", "GP28", "GP15", "GP6", "GP7", "GP8"],
+        "rows": ["GP29", "GP26", "GP5", "GP4", "GP9"]
+    },
+    "diode_direction": "ROW2COL",
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "GP1"
+    },
+    "ws2812": {
+        "pin": "GP0",
+        "driver": "vendor"
+    },
+    "processor": "RP2040",
+    "bootloader": "rp2040"
+}
diff --git a/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/rules.mk b/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/rules.mk
index 03b7e8ca31a..db29cb6789b 100644
--- a/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/rules.mk
+++ b/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/rules.mk
@@ -1,22 +1,5 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
 AUDIO_SUPPORTED = no        # Audio is not supported
-RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
-RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
-RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
 
-POINTING_DEVICE_ENABLE = yes # Enable trackball
 POINTING_DEVICE_DRIVER = pmw3360
 
 SERIAL_DRIVER = vendor
diff --git a/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/info.json b/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/info.json
deleted file mode 100644
index 72aa8b59c6e..00000000000
--- a/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/info.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-    "keyboard_name": "Charybdis (4x6) Splinky",
-    "usb": {
-        "device_version": "2.0.0"
-    },
-    "rgb_matrix": {
-        "driver": "ws2812"
-    },
-    "matrix_pins": {
-        "cols": ["GP27", "GP28", "GP21", "GP6", "GP7", "GP8"],
-        "rows": ["GP29", "GP26", "GP5", "GP4", "GP9"]
-    },
-    "diode_direction": "ROW2COL",
-    "split": {
-        "enabled": true,
-        "soft_serial_pin": "GP1"
-    },
-    "ws2812": {
-        "pin": "GP0",
-        "driver": "vendor"
-    },
-    "processor": "RP2040",
-    "bootloader": "rp2040"
-}
diff --git a/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/keyboard.json b/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/keyboard.json
new file mode 100644
index 00000000000..1e072db85b0
--- /dev/null
+++ b/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/keyboard.json
@@ -0,0 +1,31 @@
+{
+    "keyboard_name": "Charybdis (4x6) Splinky",
+    "usb": {
+        "device_version": "2.0.0"
+    },
+    "features": {
+        "bootmagic": true,
+        "mousekey": false,
+        "extrakey": true,
+        "rgb_matrix": true,
+        "pointing_device": true
+    },
+    "rgb_matrix": {
+        "driver": "ws2812"
+    },
+    "matrix_pins": {
+        "cols": ["GP27", "GP28", "GP21", "GP6", "GP7", "GP8"],
+        "rows": ["GP29", "GP26", "GP5", "GP4", "GP9"]
+    },
+    "diode_direction": "ROW2COL",
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "GP1"
+    },
+    "ws2812": {
+        "pin": "GP0",
+        "driver": "vendor"
+    },
+    "processor": "RP2040",
+    "bootloader": "rp2040"
+}
diff --git a/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/rules.mk b/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/rules.mk
index 03b7e8ca31a..db29cb6789b 100644
--- a/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/rules.mk
+++ b/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/rules.mk
@@ -1,22 +1,5 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
 AUDIO_SUPPORTED = no        # Audio is not supported
-RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
-RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
-RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
 
-POINTING_DEVICE_ENABLE = yes # Enable trackball
 POINTING_DEVICE_DRIVER = pmw3360
 
 SERIAL_DRIVER = vendor
diff --git a/keyboards/bastardkb/charybdis/4x6/v2/stemcell/info.json b/keyboards/bastardkb/charybdis/4x6/v2/stemcell/info.json
deleted file mode 100644
index d49755a861a..00000000000
--- a/keyboards/bastardkb/charybdis/4x6/v2/stemcell/info.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-    "keyboard_name": "Charybdis (4x6) STeMCell",
-    "usb": {
-        "device_version": "2.0.0"
-    },
-    "rgb_matrix": {
-        "driver": "ws2812"
-    },
-    "ws2812": {
-        "pin": "A2",
-        "driver": "pwm"
-    },
-    "build": {
-        "debounce_type": "asym_eager_defer_pk"
-    },
-    "matrix_pins": {
-        "cols": ["B1", "B2", "A4", "B4", "B5", "B8"],
-        "rows": ["B10", "B0", "B3", "A15", "B9"]
-    },
-    "diode_direction": "ROW2COL",
-    "split": {
-        "enabled": true,
-        "soft_serial_pin": "A3"
-    },
-    "development_board": "stemcell"
-}
diff --git a/keyboards/bastardkb/charybdis/4x6/v2/stemcell/keyboard.json b/keyboards/bastardkb/charybdis/4x6/v2/stemcell/keyboard.json
new file mode 100644
index 00000000000..ab145e0f95c
--- /dev/null
+++ b/keyboards/bastardkb/charybdis/4x6/v2/stemcell/keyboard.json
@@ -0,0 +1,36 @@
+{
+    "keyboard_name": "Charybdis (4x6) STeMCell",
+    "usb": {
+        "device_version": "2.0.0",
+        "shared_endpoint": {
+            "keyboard": true
+        }
+    },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "rgb_matrix": true,
+        "pointing_device": true
+    },
+    "rgb_matrix": {
+        "driver": "ws2812"
+    },
+    "ws2812": {
+        "pin": "A2",
+        "driver": "pwm"
+    },
+    "build": {
+        "debounce_type": "asym_eager_defer_pk"
+    },
+    "matrix_pins": {
+        "cols": ["B1", "B2", "A4", "B4", "B5", "B8"],
+        "rows": ["B10", "B0", "B3", "A15", "B9"]
+    },
+    "diode_direction": "ROW2COL",
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "A3"
+    },
+    "development_board": "stemcell"
+}
diff --git a/keyboards/bastardkb/charybdis/4x6/v2/stemcell/rules.mk b/keyboards/bastardkb/charybdis/4x6/v2/stemcell/rules.mk
index 1bf0d489a97..4373b9c33d2 100644
--- a/keyboards/bastardkb/charybdis/4x6/v2/stemcell/rules.mk
+++ b/keyboards/bastardkb/charybdis/4x6/v2/stemcell/rules.mk
@@ -1,24 +1,6 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
 AUDIO_SUPPORTED = no        # Audio is not supported
-RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
-RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
-RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
 
-POINTING_DEVICE_ENABLE = yes # Enable trackball
 POINTING_DEVICE_DRIVER = pmw3360
 MOUSE_SHARED_EP = no # Unify multiple HID interfaces into a single Endpoint
-KEYBOARD_SHARED_EP = yes
 
 SERIAL_DRIVER = usart
diff --git a/keyboards/bastardkb/dilemma/3x5_2/assembled/info.json b/keyboards/bastardkb/dilemma/3x5_2/assembled/info.json
deleted file mode 100644
index 2190d542c2c..00000000000
--- a/keyboards/bastardkb/dilemma/3x5_2/assembled/info.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-    "keyboard_name": "Dilemma (3x5+2) Assembled",
-    "matrix_pins": {
-        "cols": ["GP8", "GP9", "GP7", "GP6", "GP27"],
-        "rows": ["GP4", "GP5", "GP28", "GP26"]
-    },
-    "diode_direction": "ROW2COL",
-    "split": {
-        "enabled": true,
-        "soft_serial_pin": "GP1"
-    },
-    "processor": "RP2040",
-    "bootloader": "rp2040"
-}
diff --git a/keyboards/bastardkb/dilemma/3x5_2/assembled/keyboard.json b/keyboards/bastardkb/dilemma/3x5_2/assembled/keyboard.json
new file mode 100644
index 00000000000..ac52a86eb51
--- /dev/null
+++ b/keyboards/bastardkb/dilemma/3x5_2/assembled/keyboard.json
@@ -0,0 +1,20 @@
+{
+    "keyboard_name": "Dilemma (3x5+2) Assembled",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "pointing_device": true
+    },
+    "matrix_pins": {
+        "cols": ["GP8", "GP9", "GP7", "GP6", "GP27"],
+        "rows": ["GP4", "GP5", "GP28", "GP26"]
+    },
+    "diode_direction": "ROW2COL",
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "GP1"
+    },
+    "processor": "RP2040",
+    "bootloader": "rp2040"
+}
diff --git a/keyboards/bastardkb/dilemma/3x5_2/assembled/rules.mk b/keyboards/bastardkb/dilemma/3x5_2/assembled/rules.mk
index b54403222b4..48216ee8b71 100644
--- a/keyboards/bastardkb/dilemma/3x5_2/assembled/rules.mk
+++ b/keyboards/bastardkb/dilemma/3x5_2/assembled/rules.mk
@@ -1,22 +1,7 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
 AUDIO_SUPPORTED = no        # Audio is not supported
 RGB_MATRIX_SUPPORTED = no   # RGB matrix is supported and enabled by default
 RGBLIGHT_SUPPORTED = no     # RGB underglow is supported, but not enabled by default
-RGB_MATRIX_ENABLE = no      # Enable keyboard RGB matrix functionality
 
 SERIAL_DRIVER = vendor
 
-POINTING_DEVICE_ENABLE = yes
 POINTING_DEVICE_DRIVER = cirque_pinnacle_spi # Assembled version uses SPI.
diff --git a/keyboards/bastardkb/dilemma/3x5_2/splinky/info.json b/keyboards/bastardkb/dilemma/3x5_2/splinky/info.json
deleted file mode 100644
index 9e07843788f..00000000000
--- a/keyboards/bastardkb/dilemma/3x5_2/splinky/info.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-    "keyboard_name": "Dilemma (3x5+2) Splinky",
-    "matrix_pins": {
-        "cols": ["GP8", "GP9", "GP7", "GP6", "GP27"],
-        "rows": ["GP4", "GP5", "GP28", "GP26"]
-    },
-    "diode_direction": "ROW2COL",
-    "split": {
-        "enabled": true,
-        "soft_serial_pin": "GP1"
-    },
-    "processor": "RP2040",
-    "bootloader": "rp2040"
-}
diff --git a/keyboards/bastardkb/dilemma/3x5_2/splinky/keyboard.json b/keyboards/bastardkb/dilemma/3x5_2/splinky/keyboard.json
new file mode 100644
index 00000000000..3c4c559cb6e
--- /dev/null
+++ b/keyboards/bastardkb/dilemma/3x5_2/splinky/keyboard.json
@@ -0,0 +1,20 @@
+{
+    "keyboard_name": "Dilemma (3x5+2) Splinky",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "pointing_device": true
+    },
+    "matrix_pins": {
+        "cols": ["GP8", "GP9", "GP7", "GP6", "GP27"],
+        "rows": ["GP4", "GP5", "GP28", "GP26"]
+    },
+    "diode_direction": "ROW2COL",
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "GP1"
+    },
+    "processor": "RP2040",
+    "bootloader": "rp2040"
+}
diff --git a/keyboards/bastardkb/dilemma/3x5_2/splinky/rules.mk b/keyboards/bastardkb/dilemma/3x5_2/splinky/rules.mk
index 0de2c9a8071..942028da2c0 100644
--- a/keyboards/bastardkb/dilemma/3x5_2/splinky/rules.mk
+++ b/keyboards/bastardkb/dilemma/3x5_2/splinky/rules.mk
@@ -1,22 +1,7 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
 AUDIO_SUPPORTED = no        # Audio is not supported
 RGB_MATRIX_SUPPORTED = no   # RGB matrix is supported and enabled by default
 RGBLIGHT_SUPPORTED = no     # RGB underglow is supported, but not enabled by default
-RGB_MATRIX_ENABLE = no      # Enable keyboard RGB matrix functionality
 
 SERIAL_DRIVER = vendor
 
-POINTING_DEVICE_ENABLE = yes
 POINTING_DEVICE_DRIVER = cirque_pinnacle_i2c # DIY version uses I2C.
diff --git a/keyboards/bastardkb/dilemma/3x5_3/info.json b/keyboards/bastardkb/dilemma/3x5_3/info.json
deleted file mode 100644
index 2da4f1785e2..00000000000
--- a/keyboards/bastardkb/dilemma/3x5_3/info.json
+++ /dev/null
@@ -1,244 +0,0 @@
-{
-    "keyboard_name": "Dilemma (3x5+3) Assembled",
-    "usb": {
-        "device_version": "2.0.0",
-        "pid": "0x1836"
-    },
-    "processor": "RP2040",
-    "bootloader": "rp2040",
-    "board": "GENERIC_RP_RP2040",
-    "matrix_pins": {
-        "cols": ["GP8", "GP9", "GP7", "GP6", "GP28"],
-        "rows": ["GP4", "GP5", "GP27", "GP26"]
-    },
-    "diode_direction": "ROW2COL",
-    "split": {
-        "enabled": true,
-        "soft_serial_pin": "GP1",
-        "bootmagic": {
-            "matrix": [4, 0]
-        },
-        "transport":{
-            "sync": {
-                "matrix_state": true
-            }
-        }
-    },
-    "encoder": {
-        "enabled" : true,
-        "rotary" : [
-            {"pin_a": "GP25", "pin_b": "GP24"}
-        ]
-    },
-    "features": {
-        "bootmagic": true,
-        "command": false,
-        "console": false,
-        "extrakey": true,
-        "mousekey": true,
-        "nkro": true,
-        "rgb_matrix": true,
-        "caps_word": true,
-        "tri_layer": true
-    },
-    "ws2812": {
-        "pin": "GP10",
-        "driver": "vendor"
-    },
-    "rgb_matrix": {
-        "driver": "ws2812",
-        "split_count": [36, 36],
-        "max_brightness": 176,
-        "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
-        },
-        "default": {
-            "speed": 32,
-            "val": 128
-        },
-        "layout": [
-            {"x": 82, "y": 0, "flags": 2},
-            {"x": 60, "y": 0, "flags": 2},
-            {"x": 22, "y": 0, "flags": 2},
-            {"x": 15, "y": 0, "flags": 2},
-
-            {"x": 0, "y": 25, "flags": 2},
-            {"x": 0, "y": 40, "flags": 2},
-            {"x": 0, "y": 55, "flags": 2},
-
-            {"x": 15, "y": 45, "flags": 2},
-            {"x": 30, "y": 45, "flags": 2},
-            {"x": 35, "y": 60, "flags": 2},
-            {"x": 55, "y": 62, "flags": 2},
-
-            {"x": 72, "y": 64, "flags": 2},
-            {"x": 90, "y": 64, "flags": 2},
-            {"x": 98, "y": 47, "flags": 2},
-            {"x": 107, "y": 40, "flags": 2},
-
-            {"x": 110, "y": 33, "flags": 2},
-            {"x": 110, "y": 19, "flags": 2},
-            {"x": 110, "y": 5, "flags": 2},
-
-            {"matrix": [0, 4], "x": 73, "y": 11, "flags": 4},
-            {"matrix": [0, 3], "x": 56, "y": 9, "flags": 4},
-            {"matrix": [0, 2], "x": 39, "y": 5, "flags": 4},
-            {"matrix": [0, 1], "x": 22, "y": 10, "flags": 4},
-            {"matrix": [0, 0], "x": 5, "y": 15, "flags": 1},
-
-            {"matrix": [1, 0], "x": 5, "y": 30, "flags": 1},
-            {"matrix": [1, 1], "x": 22, "y": 25, "flags": 4},
-            {"matrix": [1, 2], "x": 39, "y": 20, "flags": 4},
-            {"matrix": [1, 3], "x": 56, "y": 24, "flags": 4},
-            {"matrix": [1, 4], "x": 73, "y": 26, "flags": 4},
-
-            {"matrix": [2, 4], "x": 73, "y": 41, "flags": 4},
-            {"matrix": [2, 3], "x": 56, "y": 39, "flags": 4},
-            {"matrix": [2, 2], "x": 39, "y": 35, "flags": 4},
-            {"matrix": [2, 1], "x": 22, "y": 40, "flags": 4},
-            {"matrix": [2, 0], "x": 5, "y": 45, "flags": 1},
-
-            {"matrix": [3, 2], "x": 45, "y": 51, "flags": 4},
-            {"matrix": [3, 0], "x": 64, "y": 53, "flags": 4},
-            {"matrix": [3, 1], "x": 81, "y": 60, "flags": 4},
-
-            {"x": 142, "y": 0, "flags": 2},
-            {"x": 164, "y": 0, "flags": 2},
-            {"x": 202, "y": 0, "flags": 2},
-            {"x": 209, "y": 0, "flags": 2},
-
-            {"x": 224, "y": 25, "flags": 2},
-            {"x": 224, "y": 40, "flags": 2},
-            {"x": 224, "y": 55, "flags": 2},
-
-            {"x": 209, "y": 45, "flags": 2},
-            {"x": 194, "y": 45, "flags": 2},
-            {"x": 189, "y": 60, "flags": 2},
-            {"x": 169, "y": 62, "flags": 2},
-
-            {"x": 152, "y": 64, "flags": 2},
-            {"x": 134, "y": 64, "flags": 2},
-            {"x": 126, "y": 47, "flags": 2},
-            {"x": 117, "y": 40, "flags": 2},
-
-            {"x": 114, "y": 33, "flags": 2},
-            {"x": 114, "y": 19, "flags": 2},
-            {"x": 114, "y": 5, "flags": 2},
-
-            {"matrix": [4, 4], "x": 151, "y": 11, "flags": 4},
-            {"matrix": [4, 3], "x": 168, "y": 9, "flags": 4},
-            {"matrix": [4, 2], "x": 185, "y": 5, "flags": 4},
-            {"matrix": [4, 1], "x": 202, "y": 10, "flags": 4},
-            {"matrix": [4, 0], "x": 219, "y": 15, "flags": 1},
-
-            {"matrix": [5, 0], "x": 219, "y": 30, "flags": 1},
-            {"matrix": [5, 1], "x": 202, "y": 25, "flags": 4},
-            {"matrix": [5, 2], "x": 185, "y": 20, "flags": 4},
-            {"matrix": [5, 3], "x": 168, "y": 24, "flags": 4},
-            {"matrix": [5, 4], "x": 151, "y": 26, "flags": 4},
-
-            {"matrix": [6, 4], "x": 151, "y": 41, "flags": 4},
-            {"matrix": [6, 3], "x": 168, "y": 39, "flags": 4},
-            {"matrix": [6, 2], "x": 185, "y": 35, "flags": 4},
-            {"matrix": [6, 1], "x": 202, "y": 40, "flags": 4},
-            {"matrix": [6, 0], "x": 219, "y": 45, "flags": 1},
-
-            {"matrix": [7, 2], "x": 179, "y": 51, "flags": 4},
-            {"matrix": [7, 0], "x": 160, "y": 53, "flags": 4},
-            {"matrix": [7, 1], "x": 143, "y": 60, "flags": 4}
-        ],
-        "sleep": true
-    },
-    "community_layouts": ["split_3x5_3"],
-    "layouts": {
-        "LAYOUT_split_3x5_3": {
-            "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": [4, 4], "x": 11, "y": 0},
-                {"matrix": [4, 3], "x": 12, "y": 0},
-                {"matrix": [4, 2], "x": 13, "y": 0},
-                {"matrix": [4, 1], "x": 14, "y": 0},
-                {"matrix": [4, 0], "x": 15, "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": [1, 4], "x": 4, "y": 1},
-
-                {"matrix": [5, 4], "x": 11, "y": 1},
-                {"matrix": [5, 3], "x": 12, "y": 1},
-                {"matrix": [5, 2], "x": 13, "y": 1},
-                {"matrix": [5, 1], "x": 14, "y": 1},
-                {"matrix": [5, 0], "x": 15, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2},
-                {"matrix": [2, 1], "x": 1, "y": 2},
-                {"matrix": [2, 2], "x": 2, "y": 2},
-                {"matrix": [2, 3], "x": 3, "y": 2},
-                {"matrix": [2, 4], "x": 4, "y": 2},
-
-                {"matrix": [6, 4], "x": 11, "y": 2},
-                {"matrix": [6, 3], "x": 12, "y": 2},
-                {"matrix": [6, 2], "x": 13, "y": 2},
-                {"matrix": [6, 1], "x": 14, "y": 2},
-                {"matrix": [6, 0], "x": 15, "y": 2},
-
-                {"matrix": [3, 2], "x": 4, "y": 3},
-                {"matrix": [3, 0], "x": 5, "y": 3},
-                {"matrix": [3, 1], "x": 6, "y": 3},
-
-                {"matrix": [7, 1], "x": 11, "y": 3},
-                {"matrix": [7, 0], "x": 10, "y": 3},
-                {"matrix": [7, 2], "x": 9, "y": 3}
-            ]
-        }
-    }
-}
diff --git a/keyboards/bastardkb/dilemma/3x5_3/keyboard.json b/keyboards/bastardkb/dilemma/3x5_3/keyboard.json
new file mode 100644
index 00000000000..12e336f023b
--- /dev/null
+++ b/keyboards/bastardkb/dilemma/3x5_3/keyboard.json
@@ -0,0 +1,245 @@
+{
+    "keyboard_name": "Dilemma (3x5+3) Assembled",
+    "usb": {
+        "device_version": "2.0.0",
+        "pid": "0x1836"
+    },
+    "processor": "RP2040",
+    "bootloader": "rp2040",
+    "board": "GENERIC_RP_RP2040",
+    "matrix_pins": {
+        "cols": ["GP8", "GP9", "GP7", "GP6", "GP28"],
+        "rows": ["GP4", "GP5", "GP27", "GP26"]
+    },
+    "diode_direction": "ROW2COL",
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "GP1",
+        "bootmagic": {
+            "matrix": [4, 0]
+        },
+        "transport":{
+            "sync": {
+                "matrix_state": true
+            }
+        }
+    },
+    "encoder": {
+        "enabled" : true,
+        "rotary" : [
+            {"pin_a": "GP25", "pin_b": "GP24"}
+        ]
+    },
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgb_matrix": true,
+        "pointing_device": true,
+        "caps_word": true,
+        "tri_layer": true
+    },
+    "ws2812": {
+        "pin": "GP10",
+        "driver": "vendor"
+    },
+    "rgb_matrix": {
+        "driver": "ws2812",
+        "split_count": [36, 36],
+        "max_brightness": 176,
+        "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
+        },
+        "default": {
+            "speed": 32,
+            "val": 128
+        },
+        "layout": [
+            {"x": 82, "y": 0, "flags": 2},
+            {"x": 60, "y": 0, "flags": 2},
+            {"x": 22, "y": 0, "flags": 2},
+            {"x": 15, "y": 0, "flags": 2},
+
+            {"x": 0, "y": 25, "flags": 2},
+            {"x": 0, "y": 40, "flags": 2},
+            {"x": 0, "y": 55, "flags": 2},
+
+            {"x": 15, "y": 45, "flags": 2},
+            {"x": 30, "y": 45, "flags": 2},
+            {"x": 35, "y": 60, "flags": 2},
+            {"x": 55, "y": 62, "flags": 2},
+
+            {"x": 72, "y": 64, "flags": 2},
+            {"x": 90, "y": 64, "flags": 2},
+            {"x": 98, "y": 47, "flags": 2},
+            {"x": 107, "y": 40, "flags": 2},
+
+            {"x": 110, "y": 33, "flags": 2},
+            {"x": 110, "y": 19, "flags": 2},
+            {"x": 110, "y": 5, "flags": 2},
+
+            {"matrix": [0, 4], "x": 73, "y": 11, "flags": 4},
+            {"matrix": [0, 3], "x": 56, "y": 9, "flags": 4},
+            {"matrix": [0, 2], "x": 39, "y": 5, "flags": 4},
+            {"matrix": [0, 1], "x": 22, "y": 10, "flags": 4},
+            {"matrix": [0, 0], "x": 5, "y": 15, "flags": 1},
+
+            {"matrix": [1, 0], "x": 5, "y": 30, "flags": 1},
+            {"matrix": [1, 1], "x": 22, "y": 25, "flags": 4},
+            {"matrix": [1, 2], "x": 39, "y": 20, "flags": 4},
+            {"matrix": [1, 3], "x": 56, "y": 24, "flags": 4},
+            {"matrix": [1, 4], "x": 73, "y": 26, "flags": 4},
+
+            {"matrix": [2, 4], "x": 73, "y": 41, "flags": 4},
+            {"matrix": [2, 3], "x": 56, "y": 39, "flags": 4},
+            {"matrix": [2, 2], "x": 39, "y": 35, "flags": 4},
+            {"matrix": [2, 1], "x": 22, "y": 40, "flags": 4},
+            {"matrix": [2, 0], "x": 5, "y": 45, "flags": 1},
+
+            {"matrix": [3, 2], "x": 45, "y": 51, "flags": 4},
+            {"matrix": [3, 0], "x": 64, "y": 53, "flags": 4},
+            {"matrix": [3, 1], "x": 81, "y": 60, "flags": 4},
+
+            {"x": 142, "y": 0, "flags": 2},
+            {"x": 164, "y": 0, "flags": 2},
+            {"x": 202, "y": 0, "flags": 2},
+            {"x": 209, "y": 0, "flags": 2},
+
+            {"x": 224, "y": 25, "flags": 2},
+            {"x": 224, "y": 40, "flags": 2},
+            {"x": 224, "y": 55, "flags": 2},
+
+            {"x": 209, "y": 45, "flags": 2},
+            {"x": 194, "y": 45, "flags": 2},
+            {"x": 189, "y": 60, "flags": 2},
+            {"x": 169, "y": 62, "flags": 2},
+
+            {"x": 152, "y": 64, "flags": 2},
+            {"x": 134, "y": 64, "flags": 2},
+            {"x": 126, "y": 47, "flags": 2},
+            {"x": 117, "y": 40, "flags": 2},
+
+            {"x": 114, "y": 33, "flags": 2},
+            {"x": 114, "y": 19, "flags": 2},
+            {"x": 114, "y": 5, "flags": 2},
+
+            {"matrix": [4, 4], "x": 151, "y": 11, "flags": 4},
+            {"matrix": [4, 3], "x": 168, "y": 9, "flags": 4},
+            {"matrix": [4, 2], "x": 185, "y": 5, "flags": 4},
+            {"matrix": [4, 1], "x": 202, "y": 10, "flags": 4},
+            {"matrix": [4, 0], "x": 219, "y": 15, "flags": 1},
+
+            {"matrix": [5, 0], "x": 219, "y": 30, "flags": 1},
+            {"matrix": [5, 1], "x": 202, "y": 25, "flags": 4},
+            {"matrix": [5, 2], "x": 185, "y": 20, "flags": 4},
+            {"matrix": [5, 3], "x": 168, "y": 24, "flags": 4},
+            {"matrix": [5, 4], "x": 151, "y": 26, "flags": 4},
+
+            {"matrix": [6, 4], "x": 151, "y": 41, "flags": 4},
+            {"matrix": [6, 3], "x": 168, "y": 39, "flags": 4},
+            {"matrix": [6, 2], "x": 185, "y": 35, "flags": 4},
+            {"matrix": [6, 1], "x": 202, "y": 40, "flags": 4},
+            {"matrix": [6, 0], "x": 219, "y": 45, "flags": 1},
+
+            {"matrix": [7, 2], "x": 179, "y": 51, "flags": 4},
+            {"matrix": [7, 0], "x": 160, "y": 53, "flags": 4},
+            {"matrix": [7, 1], "x": 143, "y": 60, "flags": 4}
+        ],
+        "sleep": true
+    },
+    "community_layouts": ["split_3x5_3"],
+    "layouts": {
+        "LAYOUT_split_3x5_3": {
+            "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": [4, 4], "x": 11, "y": 0},
+                {"matrix": [4, 3], "x": 12, "y": 0},
+                {"matrix": [4, 2], "x": 13, "y": 0},
+                {"matrix": [4, 1], "x": 14, "y": 0},
+                {"matrix": [4, 0], "x": 15, "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": [1, 4], "x": 4, "y": 1},
+
+                {"matrix": [5, 4], "x": 11, "y": 1},
+                {"matrix": [5, 3], "x": 12, "y": 1},
+                {"matrix": [5, 2], "x": 13, "y": 1},
+                {"matrix": [5, 1], "x": 14, "y": 1},
+                {"matrix": [5, 0], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+
+                {"matrix": [6, 4], "x": 11, "y": 2},
+                {"matrix": [6, 3], "x": 12, "y": 2},
+                {"matrix": [6, 2], "x": 13, "y": 2},
+                {"matrix": [6, 1], "x": 14, "y": 2},
+                {"matrix": [6, 0], "x": 15, "y": 2},
+
+                {"matrix": [3, 2], "x": 4, "y": 3},
+                {"matrix": [3, 0], "x": 5, "y": 3},
+                {"matrix": [3, 1], "x": 6, "y": 3},
+
+                {"matrix": [7, 1], "x": 11, "y": 3},
+                {"matrix": [7, 0], "x": 10, "y": 3},
+                {"matrix": [7, 2], "x": 9, "y": 3}
+            ]
+        }
+    }
+}
diff --git a/keyboards/bastardkb/dilemma/3x5_3/rules.mk b/keyboards/bastardkb/dilemma/3x5_3/rules.mk
index 4923c2c84a5..60776009483 100644
--- a/keyboards/bastardkb/dilemma/3x5_3/rules.mk
+++ b/keyboards/bastardkb/dilemma/3x5_3/rules.mk
@@ -1,4 +1,3 @@
 SERIAL_DRIVER = vendor
 
-POINTING_DEVICE_ENABLE = yes
 POINTING_DEVICE_DRIVER = cirque_pinnacle_spi
diff --git a/keyboards/bastardkb/dilemma/4x6_4/info.json b/keyboards/bastardkb/dilemma/4x6_4/info.json
deleted file mode 100644
index cc8c30b5105..00000000000
--- a/keyboards/bastardkb/dilemma/4x6_4/info.json
+++ /dev/null
@@ -1,275 +0,0 @@
-{
-    "keyboard_name": "Dilemma Max",
-    "usb": {
-        "device_version": "1.0.0",
-        "pid": "0x1837"
-    },
-    "processor": "RP2040",
-    "bootloader": "rp2040",
-    "board": "GENERIC_RP_RP2040",
-    "matrix_pins": {
-        "cols": ["GP14", "GP8", "GP9", "GP7", "GP6", "GP28"],
-        "rows": ["GP15", "GP4", "GP5", "GP27", "GP26"]
-    },
-    "diode_direction": "ROW2COL",
-    "split": {
-        "enabled": true,
-        "soft_serial_pin": "GP1",
-        "bootmagic": {
-            "matrix": [5, 0]
-        },
-        "transport":{
-            "sync": {
-                "matrix_state": true
-            }
-        }
-    },
-    "encoder": {
-        "enabled" : true,
-        "rotary" : [
-            {"pin_a": "GP25", "pin_b": "GP24"}
-        ]
-    },
-    "features": {
-        "bootmagic": true,
-        "command": false,
-        "console": false,
-        "extrakey": true,
-        "mousekey": true,
-        "nkro": true,
-        "rgb_matrix": true,
-        "caps_word": true,
-        "tri_layer": true
-    },
-    "ws2812": {
-        "pin": "GP10",
-        "driver": "vendor"
-    },
-    "rgb_matrix": {
-        "driver": "ws2812",
-        "split_count": [52, 52],
-        "max_brightness": 176,
-        "center_point": [112, 28],
-        "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
-        },
-        "default": {
-            "speed": 32,
-            "val": 128
-        },
-        "layout": [
-            {"x": 81, "y": 4, "flags": 2},
-            {"x": 65, "y": 2, "flags": 2},
-            {"x": 40, "y": 0, "flags": 2},
-            {"x": 29, "y": 9, "flags": 2},
-            {"x": 16, "y": 9, "flags": 2},
-            {"x": 0, "y": 16, "flags": 2},
-            {"x": 0, "y": 29, "flags": 2},
-            {"x": 0, "y": 40, "flags": 2},
-            {"x": 5, "y": 50, "flags": 2},
-            {"x": 17, "y": 49, "flags": 2},
-            {"x": 28, "y": 44, "flags": 2},
-            {"x": 40, "y": 43, "flags": 2},
-            {"x": 49, "y": 51, "flags": 2},
-            {"x": 62, "y": 53, "flags": 2},
-            {"x": 73, "y": 56, "flags": 2},
-            {"x": 85, "y": 59, "flags": 2},
-            {"x": 100, "y": 64, "flags": 2},
-            {"x": 106, "y": 55, "flags": 2},
-            {"x": 107, "y": 45, "flags": 2},
-            {"x": 91, "y": 51, "flags": 2},
-            {"x": 94, "y": 40, "flags": 2},
-            {"x": 108, "y": 33, "flags": 2},
-            {"x": 106, "y": 25, "flags": 2},
-            {"x": 108, "y": 16, "flags": 2},
-
-            {"matrix": [0, 5], "x": 75, "y": 10, "flags": 4},
-            {"matrix": [0, 4], "x": 62, "y": 9, "flags": 4},
-            {"matrix": [0, 3], "x": 49, "y": 6, "flags": 4},
-            {"matrix": [0, 2], "x": 35, "y": 10, "flags": 4},
-            {"matrix": [0, 1], "x": 22, "y": 16, "flags": 4},
-            {"matrix": [0, 0], "x": 9, "y": 16, "flags": 1},
-            {"matrix": [1, 0], "x": 9, "y": 27, "flags": 1},
-            {"matrix": [1, 1], "x": 22, "y": 27, "flags": 4},
-            {"matrix": [1, 2], "x": 35, "y": 20, "flags": 4},
-            {"matrix": [1, 3], "x": 49, "y": 17, "flags": 4},
-            {"matrix": [1, 4], "x": 62, "y": 19, "flags": 4},
-            {"matrix": [1, 5], "x": 75, "y": 21, "flags": 4},
-            {"matrix": [2, 5], "x": 75, "y": 31, "flags": 4},
-            {"matrix": [2, 4], "x": 62, "y": 30, "flags": 4},
-            {"matrix": [2, 3], "x": 49, "y": 27, "flags": 4},
-            {"matrix": [2, 2], "x": 35, "y": 31, "flags": 4},
-            {"matrix": [2, 1], "x": 22, "y": 37, "flags": 4},
-            {"matrix": [2, 0], "x": 9, "y": 37, "flags": 1},
-            {"matrix": [3, 0], "x": 9, "y": 48, "flags": 1},
-            {"matrix": [3, 1], "x": 22, "y": 48, "flags": 4},
-            {"matrix": [3, 2], "x": 35, "y": 41, "flags": 4},
-            {"matrix": [3, 3], "x": 49, "y": 38, "flags": 4},
-            {"matrix": [3, 4], "x": 62, "y": 40, "flags": 4},
-            {"matrix": [3, 5], "x": 75, "y": 42, "flags": 4},
-            {"matrix": [4, 3], "x": 54, "y": 51, "flags": 4},
-            {"matrix": [4, 1], "x": 68, "y": 53, "flags": 4},
-            {"matrix": [4, 2], "x": 81, "y": 57, "flags": 4},
-            {"matrix": [4, 4], "x": 92, "y": 64, "flags": 4},
-
-            {"x": 143, "y": 4, "flags": 2},
-            {"x": 159, "y": 2, "flags": 2},
-            {"x": 184, "y": 0, "flags": 2},
-            {"x": 195, "y": 9, "flags": 2},
-            {"x": 208, "y": 9, "flags": 2},
-            {"x": 224, "y": 16, "flags": 2},
-            {"x": 224, "y": 29, "flags": 2},
-            {"x": 224, "y": 40, "flags": 2},
-            {"x": 219, "y": 50, "flags": 2},
-            {"x": 207, "y": 49, "flags": 2},
-            {"x": 196, "y": 44, "flags": 2},
-            {"x": 184, "y": 43, "flags": 2},
-            {"x": 176, "y": 51, "flags": 2},
-            {"x": 162, "y": 53, "flags": 2},
-            {"x": 151, "y": 56, "flags": 2},
-            {"x": 139, "y": 59, "flags": 2},
-            {"x": 124, "y": 64, "flags": 2},
-            {"x": 118, "y": 55, "flags": 2},
-            {"x": 117, "y": 45, "flags": 2},
-            {"x": 133, "y": 51, "flags": 2},
-            {"x": 130, "y": 40, "flags": 2},
-            {"x": 116, "y": 33, "flags": 2},
-            {"x": 118, "y": 25, "flags": 2},
-            {"x": 116, "y": 16, "flags": 2},
-
-            {"matrix": [5, 5], "x": 149, "y": 10, "flags": 4},
-            {"matrix": [5, 4], "x": 162, "y": 9, "flags": 4},
-            {"matrix": [5, 3], "x": 175, "y": 6, "flags": 4},
-            {"matrix": [5, 2], "x": 189, "y": 10, "flags": 4},
-            {"matrix": [5, 1], "x": 202, "y": 16, "flags": 4},
-            {"matrix": [5, 0], "x": 215, "y": 16, "flags": 1},
-            {"matrix": [6, 0], "x": 215, "y": 27, "flags": 1},
-            {"matrix": [6, 1], "x": 202, "y": 27, "flags": 4},
-            {"matrix": [6, 2], "x": 189, "y": 20, "flags": 4},
-            {"matrix": [6, 3], "x": 175, "y": 17, "flags": 4},
-            {"matrix": [6, 4], "x": 162, "y": 19, "flags": 4},
-            {"matrix": [6, 5], "x": 149, "y": 21, "flags": 4},
-            {"matrix": [7, 5], "x": 149, "y": 31, "flags": 4},
-            {"matrix": [7, 4], "x": 162, "y": 30, "flags": 4},
-            {"matrix": [7, 3], "x": 175, "y": 27, "flags": 4},
-            {"matrix": [7, 2], "x": 189, "y": 31, "flags": 4},
-            {"matrix": [7, 1], "x": 202, "y": 37, "flags": 4},
-            {"matrix": [7, 0], "x": 215, "y": 37, "flags": 1},
-            {"matrix": [8, 0], "x": 215, "y": 48, "flags": 1},
-            {"matrix": [8, 1], "x": 202, "y": 48, "flags": 4},
-            {"matrix": [8, 2], "x": 189, "y": 41, "flags": 4},
-            {"matrix": [8, 3], "x": 175, "y": 38, "flags": 4},
-            {"matrix": [8, 4], "x": 162, "y": 40, "flags": 4},
-            {"matrix": [8, 5], "x": 149, "y": 42, "flags": 4},
-            {"matrix": [9, 4], "x": 170, "y": 51, "flags": 4},
-            {"matrix": [9, 2], "x": 156, "y": 53, "flags": 4},
-            {"matrix": [9, 1], "x": 143, "y": 57, "flags": 4},
-            {"matrix": [9, 3], "x": 132, "y": 64, "flags": 4}
-        ],
-        "sleep": true
-    },
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"label":"L00", "matrix": [0, 0], "x":0, "y":0},
-                {"label":"L01", "matrix": [0, 1], "x":1, "y":0},
-                {"label":"L02", "matrix": [0, 2], "x":2, "y":0},
-                {"label":"L03", "matrix": [0, 3], "x":3, "y":0},
-                {"label":"L04", "matrix": [0, 4], "x":4, "y":0},
-                {"label":"L05", "matrix": [0, 5], "x":5, "y":0},
-                {"label":"R05", "matrix": [5, 5], "x":8, "y":0},
-                {"label":"R04", "matrix": [5, 4], "x":9, "y":0},
-                {"label":"R03", "matrix": [5, 3], "x":10, "y":0},
-                {"label":"R02", "matrix": [5, 2], "x":11, "y":0},
-                {"label":"R01", "matrix": [5, 1], "x":12, "y":0},
-                {"label":"R00", "matrix": [5, 0], "x":13, "y":0},
-                {"label":"L10", "matrix": [1, 0], "x":0, "y":1},
-                {"label":"L11", "matrix": [1, 1], "x":1, "y":1},
-                {"label":"L12", "matrix": [1, 2], "x":2, "y":1},
-                {"label":"L13", "matrix": [1, 3], "x":3, "y":1},
-                {"label":"L14", "matrix": [1, 4], "x":4, "y":1},
-                {"label":"L15", "matrix": [1, 5], "x":5, "y":1},
-                {"label":"R15", "matrix": [6, 5], "x":8, "y":1},
-                {"label":"R14", "matrix": [6, 4], "x":9, "y":1},
-                {"label":"R13", "matrix": [6, 3], "x":10, "y":1},
-                {"label":"R12", "matrix": [6, 2], "x":11, "y":1},
-                {"label":"R11", "matrix": [6, 1], "x":12, "y":1},
-                {"label":"R10", "matrix": [6, 0], "x":13, "y":1},
-                {"label":"L20", "matrix": [2, 0], "x":0, "y":2},
-                {"label":"L21", "matrix": [2, 1], "x":1, "y":2},
-                {"label":"L22", "matrix": [2, 2], "x":2, "y":2},
-                {"label":"L23", "matrix": [2, 3], "x":3, "y":2},
-                {"label":"L24", "matrix": [2, 4], "x":4, "y":2},
-                {"label":"L25", "matrix": [2, 5], "x":5, "y":2},
-                {"label":"R25", "matrix": [7, 5], "x":8, "y":2},
-                {"label":"R24", "matrix": [7, 4], "x":9, "y":2},
-                {"label":"R23", "matrix": [7, 3], "x":10, "y":2},
-                {"label":"R22", "matrix": [7, 2], "x":11, "y":2},
-                {"label":"R21", "matrix": [7, 1], "x":12, "y":2},
-                {"label":"R20", "matrix": [7, 0], "x":13, "y":2},
-                {"label":"L30", "matrix": [3, 0], "x":0, "y":3},
-                {"label":"L31", "matrix": [3, 1], "x":1, "y":3},
-                {"label":"L32", "matrix": [3, 2], "x":2, "y":3},
-                {"label":"L33", "matrix": [3, 3], "x":3, "y":3},
-                {"label":"L34", "matrix": [3, 4], "x":4, "y":3},
-                {"label":"L35", "matrix": [3, 5], "x":5, "y":3},
-                {"label":"R35", "matrix": [8, 5], "x":8, "y":3},
-                {"label":"R34", "matrix": [8, 4], "x":9, "y":3},
-                {"label":"R33", "matrix": [8, 3], "x":10, "y":3},
-                {"label":"R32", "matrix": [8, 2], "x":11, "y":3},
-                {"label":"R31", "matrix": [8, 1], "x":12, "y":3},
-                {"label":"R30", "matrix": [8, 0], "x":13, "y":3},
-                {"label":"L43", "matrix": [4, 3], "x":2.5, "y":4},
-                {"label":"L41", "matrix": [4, 1], "x":3.5, "y":4},
-                {"label":"L42", "matrix": [4, 2], "x":4.5, "y":4},
-                {"label":"L44", "matrix": [4, 4], "x":5.5, "y":4},
-                {"label":"R44", "matrix": [9, 4], "x":7.5, "y":4},
-                {"label":"R42", "matrix": [9, 2], "x":8.5, "y":4},
-                {"label":"R41", "matrix": [9, 1], "x":9.5, "y":4},
-                {"label":"R43", "matrix": [9, 3], "x":10.5, "y":4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/bastardkb/dilemma/4x6_4/keyboard.json b/keyboards/bastardkb/dilemma/4x6_4/keyboard.json
new file mode 100644
index 00000000000..7e40208a5db
--- /dev/null
+++ b/keyboards/bastardkb/dilemma/4x6_4/keyboard.json
@@ -0,0 +1,276 @@
+{
+    "keyboard_name": "Dilemma Max",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x1837"
+    },
+    "processor": "RP2040",
+    "bootloader": "rp2040",
+    "board": "GENERIC_RP_RP2040",
+    "matrix_pins": {
+        "cols": ["GP14", "GP8", "GP9", "GP7", "GP6", "GP28"],
+        "rows": ["GP15", "GP4", "GP5", "GP27", "GP26"]
+    },
+    "diode_direction": "ROW2COL",
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "GP1",
+        "bootmagic": {
+            "matrix": [5, 0]
+        },
+        "transport":{
+            "sync": {
+                "matrix_state": true
+            }
+        }
+    },
+    "encoder": {
+        "enabled" : true,
+        "rotary" : [
+            {"pin_a": "GP25", "pin_b": "GP24"}
+        ]
+    },
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgb_matrix": true,
+        "pointing_device": true,
+        "caps_word": true,
+        "tri_layer": true
+    },
+    "ws2812": {
+        "pin": "GP10",
+        "driver": "vendor"
+    },
+    "rgb_matrix": {
+        "driver": "ws2812",
+        "split_count": [52, 52],
+        "max_brightness": 176,
+        "center_point": [112, 28],
+        "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
+        },
+        "default": {
+            "speed": 32,
+            "val": 128
+        },
+        "layout": [
+            {"x": 81, "y": 4, "flags": 2},
+            {"x": 65, "y": 2, "flags": 2},
+            {"x": 40, "y": 0, "flags": 2},
+            {"x": 29, "y": 9, "flags": 2},
+            {"x": 16, "y": 9, "flags": 2},
+            {"x": 0, "y": 16, "flags": 2},
+            {"x": 0, "y": 29, "flags": 2},
+            {"x": 0, "y": 40, "flags": 2},
+            {"x": 5, "y": 50, "flags": 2},
+            {"x": 17, "y": 49, "flags": 2},
+            {"x": 28, "y": 44, "flags": 2},
+            {"x": 40, "y": 43, "flags": 2},
+            {"x": 49, "y": 51, "flags": 2},
+            {"x": 62, "y": 53, "flags": 2},
+            {"x": 73, "y": 56, "flags": 2},
+            {"x": 85, "y": 59, "flags": 2},
+            {"x": 100, "y": 64, "flags": 2},
+            {"x": 106, "y": 55, "flags": 2},
+            {"x": 107, "y": 45, "flags": 2},
+            {"x": 91, "y": 51, "flags": 2},
+            {"x": 94, "y": 40, "flags": 2},
+            {"x": 108, "y": 33, "flags": 2},
+            {"x": 106, "y": 25, "flags": 2},
+            {"x": 108, "y": 16, "flags": 2},
+
+            {"matrix": [0, 5], "x": 75, "y": 10, "flags": 4},
+            {"matrix": [0, 4], "x": 62, "y": 9, "flags": 4},
+            {"matrix": [0, 3], "x": 49, "y": 6, "flags": 4},
+            {"matrix": [0, 2], "x": 35, "y": 10, "flags": 4},
+            {"matrix": [0, 1], "x": 22, "y": 16, "flags": 4},
+            {"matrix": [0, 0], "x": 9, "y": 16, "flags": 1},
+            {"matrix": [1, 0], "x": 9, "y": 27, "flags": 1},
+            {"matrix": [1, 1], "x": 22, "y": 27, "flags": 4},
+            {"matrix": [1, 2], "x": 35, "y": 20, "flags": 4},
+            {"matrix": [1, 3], "x": 49, "y": 17, "flags": 4},
+            {"matrix": [1, 4], "x": 62, "y": 19, "flags": 4},
+            {"matrix": [1, 5], "x": 75, "y": 21, "flags": 4},
+            {"matrix": [2, 5], "x": 75, "y": 31, "flags": 4},
+            {"matrix": [2, 4], "x": 62, "y": 30, "flags": 4},
+            {"matrix": [2, 3], "x": 49, "y": 27, "flags": 4},
+            {"matrix": [2, 2], "x": 35, "y": 31, "flags": 4},
+            {"matrix": [2, 1], "x": 22, "y": 37, "flags": 4},
+            {"matrix": [2, 0], "x": 9, "y": 37, "flags": 1},
+            {"matrix": [3, 0], "x": 9, "y": 48, "flags": 1},
+            {"matrix": [3, 1], "x": 22, "y": 48, "flags": 4},
+            {"matrix": [3, 2], "x": 35, "y": 41, "flags": 4},
+            {"matrix": [3, 3], "x": 49, "y": 38, "flags": 4},
+            {"matrix": [3, 4], "x": 62, "y": 40, "flags": 4},
+            {"matrix": [3, 5], "x": 75, "y": 42, "flags": 4},
+            {"matrix": [4, 3], "x": 54, "y": 51, "flags": 4},
+            {"matrix": [4, 1], "x": 68, "y": 53, "flags": 4},
+            {"matrix": [4, 2], "x": 81, "y": 57, "flags": 4},
+            {"matrix": [4, 4], "x": 92, "y": 64, "flags": 4},
+
+            {"x": 143, "y": 4, "flags": 2},
+            {"x": 159, "y": 2, "flags": 2},
+            {"x": 184, "y": 0, "flags": 2},
+            {"x": 195, "y": 9, "flags": 2},
+            {"x": 208, "y": 9, "flags": 2},
+            {"x": 224, "y": 16, "flags": 2},
+            {"x": 224, "y": 29, "flags": 2},
+            {"x": 224, "y": 40, "flags": 2},
+            {"x": 219, "y": 50, "flags": 2},
+            {"x": 207, "y": 49, "flags": 2},
+            {"x": 196, "y": 44, "flags": 2},
+            {"x": 184, "y": 43, "flags": 2},
+            {"x": 176, "y": 51, "flags": 2},
+            {"x": 162, "y": 53, "flags": 2},
+            {"x": 151, "y": 56, "flags": 2},
+            {"x": 139, "y": 59, "flags": 2},
+            {"x": 124, "y": 64, "flags": 2},
+            {"x": 118, "y": 55, "flags": 2},
+            {"x": 117, "y": 45, "flags": 2},
+            {"x": 133, "y": 51, "flags": 2},
+            {"x": 130, "y": 40, "flags": 2},
+            {"x": 116, "y": 33, "flags": 2},
+            {"x": 118, "y": 25, "flags": 2},
+            {"x": 116, "y": 16, "flags": 2},
+
+            {"matrix": [5, 5], "x": 149, "y": 10, "flags": 4},
+            {"matrix": [5, 4], "x": 162, "y": 9, "flags": 4},
+            {"matrix": [5, 3], "x": 175, "y": 6, "flags": 4},
+            {"matrix": [5, 2], "x": 189, "y": 10, "flags": 4},
+            {"matrix": [5, 1], "x": 202, "y": 16, "flags": 4},
+            {"matrix": [5, 0], "x": 215, "y": 16, "flags": 1},
+            {"matrix": [6, 0], "x": 215, "y": 27, "flags": 1},
+            {"matrix": [6, 1], "x": 202, "y": 27, "flags": 4},
+            {"matrix": [6, 2], "x": 189, "y": 20, "flags": 4},
+            {"matrix": [6, 3], "x": 175, "y": 17, "flags": 4},
+            {"matrix": [6, 4], "x": 162, "y": 19, "flags": 4},
+            {"matrix": [6, 5], "x": 149, "y": 21, "flags": 4},
+            {"matrix": [7, 5], "x": 149, "y": 31, "flags": 4},
+            {"matrix": [7, 4], "x": 162, "y": 30, "flags": 4},
+            {"matrix": [7, 3], "x": 175, "y": 27, "flags": 4},
+            {"matrix": [7, 2], "x": 189, "y": 31, "flags": 4},
+            {"matrix": [7, 1], "x": 202, "y": 37, "flags": 4},
+            {"matrix": [7, 0], "x": 215, "y": 37, "flags": 1},
+            {"matrix": [8, 0], "x": 215, "y": 48, "flags": 1},
+            {"matrix": [8, 1], "x": 202, "y": 48, "flags": 4},
+            {"matrix": [8, 2], "x": 189, "y": 41, "flags": 4},
+            {"matrix": [8, 3], "x": 175, "y": 38, "flags": 4},
+            {"matrix": [8, 4], "x": 162, "y": 40, "flags": 4},
+            {"matrix": [8, 5], "x": 149, "y": 42, "flags": 4},
+            {"matrix": [9, 4], "x": 170, "y": 51, "flags": 4},
+            {"matrix": [9, 2], "x": 156, "y": 53, "flags": 4},
+            {"matrix": [9, 1], "x": 143, "y": 57, "flags": 4},
+            {"matrix": [9, 3], "x": 132, "y": 64, "flags": 4}
+        ],
+        "sleep": true
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"label":"L00", "matrix": [0, 0], "x":0, "y":0},
+                {"label":"L01", "matrix": [0, 1], "x":1, "y":0},
+                {"label":"L02", "matrix": [0, 2], "x":2, "y":0},
+                {"label":"L03", "matrix": [0, 3], "x":3, "y":0},
+                {"label":"L04", "matrix": [0, 4], "x":4, "y":0},
+                {"label":"L05", "matrix": [0, 5], "x":5, "y":0},
+                {"label":"R05", "matrix": [5, 5], "x":8, "y":0},
+                {"label":"R04", "matrix": [5, 4], "x":9, "y":0},
+                {"label":"R03", "matrix": [5, 3], "x":10, "y":0},
+                {"label":"R02", "matrix": [5, 2], "x":11, "y":0},
+                {"label":"R01", "matrix": [5, 1], "x":12, "y":0},
+                {"label":"R00", "matrix": [5, 0], "x":13, "y":0},
+                {"label":"L10", "matrix": [1, 0], "x":0, "y":1},
+                {"label":"L11", "matrix": [1, 1], "x":1, "y":1},
+                {"label":"L12", "matrix": [1, 2], "x":2, "y":1},
+                {"label":"L13", "matrix": [1, 3], "x":3, "y":1},
+                {"label":"L14", "matrix": [1, 4], "x":4, "y":1},
+                {"label":"L15", "matrix": [1, 5], "x":5, "y":1},
+                {"label":"R15", "matrix": [6, 5], "x":8, "y":1},
+                {"label":"R14", "matrix": [6, 4], "x":9, "y":1},
+                {"label":"R13", "matrix": [6, 3], "x":10, "y":1},
+                {"label":"R12", "matrix": [6, 2], "x":11, "y":1},
+                {"label":"R11", "matrix": [6, 1], "x":12, "y":1},
+                {"label":"R10", "matrix": [6, 0], "x":13, "y":1},
+                {"label":"L20", "matrix": [2, 0], "x":0, "y":2},
+                {"label":"L21", "matrix": [2, 1], "x":1, "y":2},
+                {"label":"L22", "matrix": [2, 2], "x":2, "y":2},
+                {"label":"L23", "matrix": [2, 3], "x":3, "y":2},
+                {"label":"L24", "matrix": [2, 4], "x":4, "y":2},
+                {"label":"L25", "matrix": [2, 5], "x":5, "y":2},
+                {"label":"R25", "matrix": [7, 5], "x":8, "y":2},
+                {"label":"R24", "matrix": [7, 4], "x":9, "y":2},
+                {"label":"R23", "matrix": [7, 3], "x":10, "y":2},
+                {"label":"R22", "matrix": [7, 2], "x":11, "y":2},
+                {"label":"R21", "matrix": [7, 1], "x":12, "y":2},
+                {"label":"R20", "matrix": [7, 0], "x":13, "y":2},
+                {"label":"L30", "matrix": [3, 0], "x":0, "y":3},
+                {"label":"L31", "matrix": [3, 1], "x":1, "y":3},
+                {"label":"L32", "matrix": [3, 2], "x":2, "y":3},
+                {"label":"L33", "matrix": [3, 3], "x":3, "y":3},
+                {"label":"L34", "matrix": [3, 4], "x":4, "y":3},
+                {"label":"L35", "matrix": [3, 5], "x":5, "y":3},
+                {"label":"R35", "matrix": [8, 5], "x":8, "y":3},
+                {"label":"R34", "matrix": [8, 4], "x":9, "y":3},
+                {"label":"R33", "matrix": [8, 3], "x":10, "y":3},
+                {"label":"R32", "matrix": [8, 2], "x":11, "y":3},
+                {"label":"R31", "matrix": [8, 1], "x":12, "y":3},
+                {"label":"R30", "matrix": [8, 0], "x":13, "y":3},
+                {"label":"L43", "matrix": [4, 3], "x":2.5, "y":4},
+                {"label":"L41", "matrix": [4, 1], "x":3.5, "y":4},
+                {"label":"L42", "matrix": [4, 2], "x":4.5, "y":4},
+                {"label":"L44", "matrix": [4, 4], "x":5.5, "y":4},
+                {"label":"R44", "matrix": [9, 4], "x":7.5, "y":4},
+                {"label":"R42", "matrix": [9, 2], "x":8.5, "y":4},
+                {"label":"R41", "matrix": [9, 1], "x":9.5, "y":4},
+                {"label":"R43", "matrix": [9, 3], "x":10.5, "y":4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/bastardkb/dilemma/4x6_4/rules.mk b/keyboards/bastardkb/dilemma/4x6_4/rules.mk
index 4923c2c84a5..60776009483 100644
--- a/keyboards/bastardkb/dilemma/4x6_4/rules.mk
+++ b/keyboards/bastardkb/dilemma/4x6_4/rules.mk
@@ -1,4 +1,3 @@
 SERIAL_DRIVER = vendor
 
-POINTING_DEVICE_ENABLE = yes
 POINTING_DEVICE_DRIVER = cirque_pinnacle_spi
diff --git a/keyboards/bastardkb/scylla/blackpill/info.json b/keyboards/bastardkb/scylla/blackpill/info.json
deleted file mode 100644
index 30f3688cad1..00000000000
--- a/keyboards/bastardkb/scylla/blackpill/info.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-    "keyboard_name": "Scylla Blackpill",
-    "usb": {
-        "device_version": "1.0.0"
-    },
-    "eeprom": {
-        "driver": "spi"
-    },
-    "split": {
-        "enabled": true
-    },
-    "rgb_matrix": {
-        "driver": "ws2812"
-    },
-    "ws2812": {
-        "pin": "A1",
-        "driver": "pwm"
-    },
-    "build": {
-        "debounce_type": "asym_eager_defer_pk"
-    },
-    "matrix_pins": {
-        "cols": ["B0", "B1", "B10", "B3", "B4", "B5"],
-        "rows": ["B15", "A2", "B8", "A8", "B9"]
-    },
-    "diode_direction": "ROW2COL",
-    "processor": "STM32F411",
-    "bootloader": "stm32-dfu",
-    "board": "BLACKPILL_STM32_F411"
-}
diff --git a/keyboards/bastardkb/scylla/blackpill/keyboard.json b/keyboards/bastardkb/scylla/blackpill/keyboard.json
new file mode 100644
index 00000000000..5294976fd34
--- /dev/null
+++ b/keyboards/bastardkb/scylla/blackpill/keyboard.json
@@ -0,0 +1,37 @@
+{
+    "keyboard_name": "Scylla Blackpill",
+    "usb": {
+        "device_version": "1.0.0",
+        "shared_endpoint": {
+            "keyboard": true
+        }
+    },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "rgb_matrix": true
+    },
+    "eeprom": {
+        "driver": "spi"
+    },
+    "split": {
+        "enabled": true
+    },
+    "rgb_matrix": {
+        "driver": "ws2812"
+    },
+    "ws2812": {
+        "pin": "A1",
+        "driver": "pwm"
+    },
+    "build": {
+        "debounce_type": "asym_eager_defer_pk"
+    },
+    "matrix_pins": {
+        "cols": ["B0", "B1", "B10", "B3", "B4", "B5"],
+        "rows": ["B15", "A2", "B8", "A8", "B9"]
+    },
+    "diode_direction": "ROW2COL",
+    "development_board": "blackpill_f411"
+}
diff --git a/keyboards/bastardkb/scylla/blackpill/rules.mk b/keyboards/bastardkb/scylla/blackpill/rules.mk
index 20c87fca307..48c904dd644 100644
--- a/keyboards/bastardkb/scylla/blackpill/rules.mk
+++ b/keyboards/bastardkb/scylla/blackpill/rules.mk
@@ -1,22 +1,5 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
 AUDIO_SUPPORTED = no        # Audio is not supported
-RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
-RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
-RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
 
 MOUSE_SHARED_EP = no # Unify multiple HID interfaces into a single Endpoint
-KEYBOARD_SHARED_EP = yes
 
 SERIAL_DRIVER = usart
diff --git a/keyboards/bastardkb/scylla/v1/elitec/info.json b/keyboards/bastardkb/scylla/v1/elitec/info.json
deleted file mode 100644
index 4b7e5092199..00000000000
--- a/keyboards/bastardkb/scylla/v1/elitec/info.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "keyboard_name": "Scylla Elite-C",
-    "usb": {
-        "device_version": "1.0.0"
-    },
-    "ws2812": {
-        "pin": "D2"
-    },
-    "rgb_matrix": {
-        "driver": "ws2812"
-    },
-    "matrix_pins": {
-        "cols": ["B4", "E6", "C6", "B1", "B3", "B2"],
-        "rows": ["D7", "B5", "F7", "F6", "B6"]
-    },
-    "diode_direction": "ROW2COL",
-    "split": {
-        "enabled": true,
-        "soft_serial_pin": "D0"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu"
-}
diff --git a/keyboards/bastardkb/scylla/v1/elitec/keyboard.json b/keyboards/bastardkb/scylla/v1/elitec/keyboard.json
new file mode 100644
index 00000000000..17b6b7fc367
--- /dev/null
+++ b/keyboards/bastardkb/scylla/v1/elitec/keyboard.json
@@ -0,0 +1,29 @@
+{
+    "keyboard_name": "Scylla Elite-C",
+    "usb": {
+        "device_version": "1.0.0"
+    },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "rgb_matrix": true
+    },
+    "ws2812": {
+        "pin": "D2"
+    },
+    "rgb_matrix": {
+        "driver": "ws2812"
+    },
+    "matrix_pins": {
+        "cols": ["B4", "E6", "C6", "B1", "B3", "B2"],
+        "rows": ["D7", "B5", "F7", "F6", "B6"]
+    },
+    "diode_direction": "ROW2COL",
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "D0"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu"
+}
diff --git a/keyboards/bastardkb/scylla/v1/elitec/rules.mk b/keyboards/bastardkb/scylla/v1/elitec/rules.mk
index 6221b2ef6a5..1868c4bb027 100644
--- a/keyboards/bastardkb/scylla/v1/elitec/rules.mk
+++ b/keyboards/bastardkb/scylla/v1/elitec/rules.mk
@@ -1,17 +1 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
 AUDIO_SUPPORTED = no        # Audio is not supported
-RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
-RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
-RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix (do not use together with RGBLIGHT_ENABLE)
diff --git a/keyboards/bastardkb/scylla/v2/elitec/info.json b/keyboards/bastardkb/scylla/v2/elitec/info.json
deleted file mode 100644
index a7c68fb628a..00000000000
--- a/keyboards/bastardkb/scylla/v2/elitec/info.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "keyboard_name": "Scylla Elite-C",
-    "usb": {
-        "device_version": "2.0.0"
-    },
-    "ws2812": {
-        "pin": "D3"
-    },
-    "rgb_matrix": {
-        "driver": "ws2812"
-    },
-    "matrix_pins": {
-        "cols": ["F6", "F5", "B6", "D7", "E6", "B4"],
-        "rows": ["F4", "F7", "C6", "D4", "B5"]
-    },
-    "diode_direction": "ROW2COL",
-    "split": {
-        "enabled": true,
-        "soft_serial_pin": "D2"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu"
-}
diff --git a/keyboards/bastardkb/scylla/v2/elitec/keyboard.json b/keyboards/bastardkb/scylla/v2/elitec/keyboard.json
new file mode 100644
index 00000000000..7bfb7ff5a4e
--- /dev/null
+++ b/keyboards/bastardkb/scylla/v2/elitec/keyboard.json
@@ -0,0 +1,29 @@
+{
+    "keyboard_name": "Scylla Elite-C",
+    "usb": {
+        "device_version": "2.0.0"
+    },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "rgb_matrix": true
+    },
+    "ws2812": {
+        "pin": "D3"
+    },
+    "rgb_matrix": {
+        "driver": "ws2812"
+    },
+    "matrix_pins": {
+        "cols": ["F6", "F5", "B6", "D7", "E6", "B4"],
+        "rows": ["F4", "F7", "C6", "D4", "B5"]
+    },
+    "diode_direction": "ROW2COL",
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "D2"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu"
+}
diff --git a/keyboards/bastardkb/scylla/v2/elitec/rules.mk b/keyboards/bastardkb/scylla/v2/elitec/rules.mk
index 6221b2ef6a5..1868c4bb027 100644
--- a/keyboards/bastardkb/scylla/v2/elitec/rules.mk
+++ b/keyboards/bastardkb/scylla/v2/elitec/rules.mk
@@ -1,17 +1 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
 AUDIO_SUPPORTED = no        # Audio is not supported
-RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
-RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
-RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix (do not use together with RGBLIGHT_ENABLE)
diff --git a/keyboards/bastardkb/scylla/v2/splinky_2/info.json b/keyboards/bastardkb/scylla/v2/splinky_2/info.json
deleted file mode 100644
index 83cfd06ca79..00000000000
--- a/keyboards/bastardkb/scylla/v2/splinky_2/info.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-    "keyboard_name": "Scylla Splinky",
-    "usb": {
-        "device_version": "2.0.0"
-    },
-    "rgb_matrix": {
-        "driver": "ws2812"
-    },
-    "matrix_pins": {
-        "cols": ["GP27", "GP28", "GP15", "GP6", "GP7", "GP8"],
-        "rows": ["GP29", "GP26", "GP5", "GP4", "GP9"]
-    },
-    "diode_direction": "ROW2COL",
-    "split": {
-        "enabled": true,
-        "soft_serial_pin": "GP1"
-    },
-    "ws2812": {
-        "pin": "GP0",
-        "driver": "vendor"
-    },
-    "processor": "RP2040",
-    "bootloader": "rp2040"
-}
diff --git a/keyboards/bastardkb/scylla/v2/splinky_2/keyboard.json b/keyboards/bastardkb/scylla/v2/splinky_2/keyboard.json
new file mode 100644
index 00000000000..2b9022d24ef
--- /dev/null
+++ b/keyboards/bastardkb/scylla/v2/splinky_2/keyboard.json
@@ -0,0 +1,30 @@
+{
+    "keyboard_name": "Scylla Splinky",
+    "usb": {
+        "device_version": "2.0.0"
+    },
+    "features": {
+        "bootmagic": true,
+        "mousekey": false,
+        "extrakey": true,
+        "rgb_matrix": true
+    },
+    "rgb_matrix": {
+        "driver": "ws2812"
+    },
+    "matrix_pins": {
+        "cols": ["GP27", "GP28", "GP15", "GP6", "GP7", "GP8"],
+        "rows": ["GP29", "GP26", "GP5", "GP4", "GP9"]
+    },
+    "diode_direction": "ROW2COL",
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "GP1"
+    },
+    "ws2812": {
+        "pin": "GP0",
+        "driver": "vendor"
+    },
+    "processor": "RP2040",
+    "bootloader": "rp2040"
+}
diff --git a/keyboards/bastardkb/scylla/v2/splinky_2/rules.mk b/keyboards/bastardkb/scylla/v2/splinky_2/rules.mk
index 83407eef806..077573eb763 100644
--- a/keyboards/bastardkb/scylla/v2/splinky_2/rules.mk
+++ b/keyboards/bastardkb/scylla/v2/splinky_2/rules.mk
@@ -1,19 +1,3 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
 AUDIO_SUPPORTED = no        # Audio is not supported
-RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
-RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
-RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
 
 SERIAL_DRIVER = vendor
diff --git a/keyboards/bastardkb/scylla/v2/splinky_3/info.json b/keyboards/bastardkb/scylla/v2/splinky_3/info.json
deleted file mode 100644
index 14386303dc5..00000000000
--- a/keyboards/bastardkb/scylla/v2/splinky_3/info.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-    "keyboard_name": "Scylla Splinky",
-    "usb": {
-        "device_version": "2.0.0"
-    },
-    "rgb_matrix": {
-        "driver": "ws2812"
-    },
-    "matrix_pins": {
-        "cols": ["GP27", "GP28", "GP21", "GP6", "GP7", "GP8"],
-        "rows": ["GP29", "GP26", "GP5", "GP4", "GP9"]
-    },
-    "diode_direction": "ROW2COL",
-    "split": {
-        "enabled": true,
-        "soft_serial_pin": "GP1"
-    },
-    "ws2812": {
-        "pin": "GP0",
-        "driver": "vendor"
-    },
-    "processor": "RP2040",
-    "bootloader": "rp2040"
-}
diff --git a/keyboards/bastardkb/scylla/v2/splinky_3/keyboard.json b/keyboards/bastardkb/scylla/v2/splinky_3/keyboard.json
new file mode 100644
index 00000000000..cd4da3ac415
--- /dev/null
+++ b/keyboards/bastardkb/scylla/v2/splinky_3/keyboard.json
@@ -0,0 +1,30 @@
+{
+    "keyboard_name": "Scylla Splinky",
+    "usb": {
+        "device_version": "2.0.0"
+    },
+    "features": {
+        "bootmagic": true,
+        "mousekey": false,
+        "extrakey": true,
+        "rgb_matrix": true
+    },
+    "rgb_matrix": {
+        "driver": "ws2812"
+    },
+    "matrix_pins": {
+        "cols": ["GP27", "GP28", "GP21", "GP6", "GP7", "GP8"],
+        "rows": ["GP29", "GP26", "GP5", "GP4", "GP9"]
+    },
+    "diode_direction": "ROW2COL",
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "GP1"
+    },
+    "ws2812": {
+        "pin": "GP0",
+        "driver": "vendor"
+    },
+    "processor": "RP2040",
+    "bootloader": "rp2040"
+}
diff --git a/keyboards/bastardkb/scylla/v2/splinky_3/rules.mk b/keyboards/bastardkb/scylla/v2/splinky_3/rules.mk
index 83407eef806..077573eb763 100644
--- a/keyboards/bastardkb/scylla/v2/splinky_3/rules.mk
+++ b/keyboards/bastardkb/scylla/v2/splinky_3/rules.mk
@@ -1,19 +1,3 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
 AUDIO_SUPPORTED = no        # Audio is not supported
-RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
-RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
-RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
 
 SERIAL_DRIVER = vendor
diff --git a/keyboards/bastardkb/scylla/v2/stemcell/info.json b/keyboards/bastardkb/scylla/v2/stemcell/info.json
deleted file mode 100644
index d6bea6463ac..00000000000
--- a/keyboards/bastardkb/scylla/v2/stemcell/info.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-    "keyboard_name": "Scylla STeMCell",
-    "usb": {
-        "device_version": "2.0.0"
-    },
-    "rgb_matrix": {
-        "driver": "ws2812"
-    },
-    "ws2812": {
-        "pin": "A2",
-        "driver": "pwm"
-    },
-    "build": {
-        "debounce_type": "asym_eager_defer_pk"
-    },
-    "matrix_pins": {
-        "cols": ["B1", "B2", "A4", "B4", "B5", "B8"],
-        "rows": ["B10", "B0", "B3", "A15", "B9"]
-    },
-    "diode_direction": "ROW2COL",
-    "split": {
-        "enabled": true,
-        "soft_serial_pin": "A3"
-    },
-    "development_board": "stemcell"
-}
diff --git a/keyboards/bastardkb/scylla/v2/stemcell/keyboard.json b/keyboards/bastardkb/scylla/v2/stemcell/keyboard.json
new file mode 100644
index 00000000000..06bfeda7d28
--- /dev/null
+++ b/keyboards/bastardkb/scylla/v2/stemcell/keyboard.json
@@ -0,0 +1,32 @@
+{
+    "keyboard_name": "Scylla STeMCell",
+    "usb": {
+        "device_version": "2.0.0"
+    },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "rgb_matrix": true
+    },
+    "rgb_matrix": {
+        "driver": "ws2812"
+    },
+    "ws2812": {
+        "pin": "A2",
+        "driver": "pwm"
+    },
+    "build": {
+        "debounce_type": "asym_eager_defer_pk"
+    },
+    "matrix_pins": {
+        "cols": ["B1", "B2", "A4", "B4", "B5", "B8"],
+        "rows": ["B10", "B0", "B3", "A15", "B9"]
+    },
+    "diode_direction": "ROW2COL",
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "A3"
+    },
+    "development_board": "stemcell"
+}
diff --git a/keyboards/bastardkb/scylla/v2/stemcell/rules.mk b/keyboards/bastardkb/scylla/v2/stemcell/rules.mk
index ef125eb2fea..3fe3e4ffbea 100644
--- a/keyboards/bastardkb/scylla/v2/stemcell/rules.mk
+++ b/keyboards/bastardkb/scylla/v2/stemcell/rules.mk
@@ -1,19 +1,3 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
 AUDIO_SUPPORTED = no        # Audio is not supported
-RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
-RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
-RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
 
 SERIAL_DRIVER = usart
diff --git a/keyboards/bastardkb/skeletyl/blackpill/info.json b/keyboards/bastardkb/skeletyl/blackpill/info.json
deleted file mode 100644
index 34ca3ff0b2c..00000000000
--- a/keyboards/bastardkb/skeletyl/blackpill/info.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-    "keyboard_name": "Skeletyl Blackpill",
-    "usb": {
-        "device_version": "1.0.0"
-    },
-    "eeprom": {
-        "driver": "spi"
-    },
-    "split": {
-        "enabled": true
-    },
-    "rgb_matrix": {
-        "driver": "ws2812"
-    },
-    "ws2812": {
-        "pin": "A1",
-        "driver": "pwm"
-    },
-    "build": {
-        "debounce_type": "asym_eager_defer_pk"
-    },
-    "matrix_pins": {
-        "cols": ["B1", "B10", "B3", "B4", "B5"],
-        "rows": ["A2", "B8", "A8", "B9"]
-    },
-    "diode_direction": "ROW2COL",
-    "processor": "STM32F411",
-    "bootloader": "stm32-dfu",
-    "board": "BLACKPILL_STM32_F411"
-}
diff --git a/keyboards/bastardkb/skeletyl/blackpill/keyboard.json b/keyboards/bastardkb/skeletyl/blackpill/keyboard.json
new file mode 100644
index 00000000000..16fa2b24121
--- /dev/null
+++ b/keyboards/bastardkb/skeletyl/blackpill/keyboard.json
@@ -0,0 +1,37 @@
+{
+    "keyboard_name": "Skeletyl Blackpill",
+    "usb": {
+        "device_version": "1.0.0",
+        "shared_endpoint": {
+            "keyboard": true
+        }
+    },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "rgb_matrix": true
+    },
+    "eeprom": {
+        "driver": "spi"
+    },
+    "split": {
+        "enabled": true
+    },
+    "rgb_matrix": {
+        "driver": "ws2812"
+    },
+    "ws2812": {
+        "pin": "A1",
+        "driver": "pwm"
+    },
+    "build": {
+        "debounce_type": "asym_eager_defer_pk"
+    },
+    "matrix_pins": {
+        "cols": ["B1", "B10", "B3", "B4", "B5"],
+        "rows": ["A2", "B8", "A8", "B9"]
+    },
+    "diode_direction": "ROW2COL",
+    "development_board": "blackpill_f411"
+}
diff --git a/keyboards/bastardkb/skeletyl/blackpill/rules.mk b/keyboards/bastardkb/skeletyl/blackpill/rules.mk
index 20c87fca307..48c904dd644 100644
--- a/keyboards/bastardkb/skeletyl/blackpill/rules.mk
+++ b/keyboards/bastardkb/skeletyl/blackpill/rules.mk
@@ -1,22 +1,5 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
 AUDIO_SUPPORTED = no        # Audio is not supported
-RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
-RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
-RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
 
 MOUSE_SHARED_EP = no # Unify multiple HID interfaces into a single Endpoint
-KEYBOARD_SHARED_EP = yes
 
 SERIAL_DRIVER = usart
diff --git a/keyboards/bastardkb/skeletyl/v1/elitec/info.json b/keyboards/bastardkb/skeletyl/v1/elitec/info.json
deleted file mode 100644
index cc5d2adfadd..00000000000
--- a/keyboards/bastardkb/skeletyl/v1/elitec/info.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "keyboard_name": "Skeletyl Elite-C",
-    "usb": {
-        "device_version": "1.0.0"
-    },
-    "ws2812": {
-        "pin": "D2"
-    },
-    "rgb_matrix": {
-        "driver": "ws2812"
-    },
-    "matrix_pins": {
-        "cols": ["E6", "C6", "B1", "B3", "B2"],
-        "rows": ["B5", "F7", "F6", "B6"]
-    },
-    "diode_direction": "ROW2COL",
-    "split": {
-        "enabled": true,
-        "soft_serial_pin": "D0"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu"
-}
diff --git a/keyboards/bastardkb/skeletyl/v1/elitec/keyboard.json b/keyboards/bastardkb/skeletyl/v1/elitec/keyboard.json
new file mode 100644
index 00000000000..2910d80b2f5
--- /dev/null
+++ b/keyboards/bastardkb/skeletyl/v1/elitec/keyboard.json
@@ -0,0 +1,29 @@
+{
+    "keyboard_name": "Skeletyl Elite-C",
+    "usb": {
+        "device_version": "1.0.0"
+    },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "rgb_matrix": true
+    },
+    "ws2812": {
+        "pin": "D2"
+    },
+    "rgb_matrix": {
+        "driver": "ws2812"
+    },
+    "matrix_pins": {
+        "cols": ["E6", "C6", "B1", "B3", "B2"],
+        "rows": ["B5", "F7", "F6", "B6"]
+    },
+    "diode_direction": "ROW2COL",
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "D0"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu"
+}
diff --git a/keyboards/bastardkb/skeletyl/v1/elitec/rules.mk b/keyboards/bastardkb/skeletyl/v1/elitec/rules.mk
index 6221b2ef6a5..1868c4bb027 100644
--- a/keyboards/bastardkb/skeletyl/v1/elitec/rules.mk
+++ b/keyboards/bastardkb/skeletyl/v1/elitec/rules.mk
@@ -1,17 +1 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
 AUDIO_SUPPORTED = no        # Audio is not supported
-RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
-RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
-RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix (do not use together with RGBLIGHT_ENABLE)
diff --git a/keyboards/bastardkb/skeletyl/v2/elitec/info.json b/keyboards/bastardkb/skeletyl/v2/elitec/info.json
deleted file mode 100644
index 4f245663bce..00000000000
--- a/keyboards/bastardkb/skeletyl/v2/elitec/info.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "keyboard_name": "Skeletyl Elite-C",
-    "usb": {
-        "device_version": "2.0.0"
-    },
-    "ws2812": {
-        "pin": "D3"
-    },
-    "rgb_matrix": {
-        "driver": "ws2812"
-    },
-    "matrix_pins": {
-        "cols": ["F5", "B6", "D7", "E6", "B4"],
-        "rows": ["F7", "C6", "D4", "B5"]
-    },
-    "diode_direction": "ROW2COL",
-    "split": {
-        "enabled": true,
-        "soft_serial_pin": "D2"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu"
-}
diff --git a/keyboards/bastardkb/skeletyl/v2/elitec/keyboard.json b/keyboards/bastardkb/skeletyl/v2/elitec/keyboard.json
new file mode 100644
index 00000000000..dec2537b65c
--- /dev/null
+++ b/keyboards/bastardkb/skeletyl/v2/elitec/keyboard.json
@@ -0,0 +1,29 @@
+{
+    "keyboard_name": "Skeletyl Elite-C",
+    "usb": {
+        "device_version": "2.0.0"
+    },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "rgb_matrix": true
+    },
+    "ws2812": {
+        "pin": "D3"
+    },
+    "rgb_matrix": {
+        "driver": "ws2812"
+    },
+    "matrix_pins": {
+        "cols": ["F5", "B6", "D7", "E6", "B4"],
+        "rows": ["F7", "C6", "D4", "B5"]
+    },
+    "diode_direction": "ROW2COL",
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "D2"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu"
+}
diff --git a/keyboards/bastardkb/skeletyl/v2/elitec/rules.mk b/keyboards/bastardkb/skeletyl/v2/elitec/rules.mk
index 6221b2ef6a5..1868c4bb027 100644
--- a/keyboards/bastardkb/skeletyl/v2/elitec/rules.mk
+++ b/keyboards/bastardkb/skeletyl/v2/elitec/rules.mk
@@ -1,17 +1 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
 AUDIO_SUPPORTED = no        # Audio is not supported
-RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
-RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
-RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix (do not use together with RGBLIGHT_ENABLE)
diff --git a/keyboards/bastardkb/skeletyl/v2/splinky_2/info.json b/keyboards/bastardkb/skeletyl/v2/splinky_2/info.json
deleted file mode 100644
index fa15c27148e..00000000000
--- a/keyboards/bastardkb/skeletyl/v2/splinky_2/info.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-    "keyboard_name": "Skeletyl Splinky",
-    "usb": {
-        "device_version": "2.0.0"
-    },
-    "rgb_matrix": {
-        "driver": "ws2812"
-    },
-    "matrix_pins": {
-        "cols": ["GP28", "GP15", "GP6", "GP7", "GP8"],
-        "rows": ["GP26", "GP5", "GP4", "GP9"]
-    },
-    "diode_direction": "ROW2COL",
-    "split": {
-        "enabled": true,
-        "soft_serial_pin": "GP1"
-    },
-    "ws2812": {
-        "pin": "GP0",
-        "driver": "vendor"
-    },
-    "processor": "RP2040",
-    "bootloader": "rp2040"
-}
diff --git a/keyboards/bastardkb/skeletyl/v2/splinky_2/keyboard.json b/keyboards/bastardkb/skeletyl/v2/splinky_2/keyboard.json
new file mode 100644
index 00000000000..897f195a315
--- /dev/null
+++ b/keyboards/bastardkb/skeletyl/v2/splinky_2/keyboard.json
@@ -0,0 +1,30 @@
+{
+    "keyboard_name": "Skeletyl Splinky",
+    "usb": {
+        "device_version": "2.0.0"
+    },
+    "features": {
+        "bootmagic": true,
+        "mousekey": false,
+        "extrakey": true,
+        "rgb_matrix": true
+    },
+    "rgb_matrix": {
+        "driver": "ws2812"
+    },
+    "matrix_pins": {
+        "cols": ["GP28", "GP15", "GP6", "GP7", "GP8"],
+        "rows": ["GP26", "GP5", "GP4", "GP9"]
+    },
+    "diode_direction": "ROW2COL",
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "GP1"
+    },
+    "ws2812": {
+        "pin": "GP0",
+        "driver": "vendor"
+    },
+    "processor": "RP2040",
+    "bootloader": "rp2040"
+}
diff --git a/keyboards/bastardkb/skeletyl/v2/splinky_2/rules.mk b/keyboards/bastardkb/skeletyl/v2/splinky_2/rules.mk
index 83407eef806..077573eb763 100644
--- a/keyboards/bastardkb/skeletyl/v2/splinky_2/rules.mk
+++ b/keyboards/bastardkb/skeletyl/v2/splinky_2/rules.mk
@@ -1,19 +1,3 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
 AUDIO_SUPPORTED = no        # Audio is not supported
-RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
-RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
-RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
 
 SERIAL_DRIVER = vendor
diff --git a/keyboards/bastardkb/skeletyl/v2/splinky_3/info.json b/keyboards/bastardkb/skeletyl/v2/splinky_3/info.json
deleted file mode 100644
index b34581757ba..00000000000
--- a/keyboards/bastardkb/skeletyl/v2/splinky_3/info.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-    "keyboard_name": "Skeletyl Splinky",
-    "usb": {
-        "device_version": "2.0.0"
-    },
-    "rgb_matrix": {
-        "driver": "ws2812"
-    },
-    "matrix_pins": {
-        "cols": ["GP28", "GP21", "GP6", "GP7", "GP8"],
-        "rows": ["GP26", "GP5", "GP4", "GP9"]
-    },
-    "diode_direction": "ROW2COL",
-    "split": {
-        "enabled": true,
-        "soft_serial_pin": "GP1"
-    },
-    "ws2812": {
-        "pin": "GP0",
-        "driver": "vendor"
-    },
-    "processor": "RP2040",
-    "bootloader": "rp2040"
-}
diff --git a/keyboards/bastardkb/skeletyl/v2/splinky_3/keyboard.json b/keyboards/bastardkb/skeletyl/v2/splinky_3/keyboard.json
new file mode 100644
index 00000000000..06a93dfbeb7
--- /dev/null
+++ b/keyboards/bastardkb/skeletyl/v2/splinky_3/keyboard.json
@@ -0,0 +1,30 @@
+{
+    "keyboard_name": "Skeletyl Splinky",
+    "usb": {
+        "device_version": "2.0.0"
+    },
+    "features": {
+        "bootmagic": true,
+        "mousekey": false,
+        "extrakey": true,
+        "rgb_matrix": true
+    },
+    "rgb_matrix": {
+        "driver": "ws2812"
+    },
+    "matrix_pins": {
+        "cols": ["GP28", "GP21", "GP6", "GP7", "GP8"],
+        "rows": ["GP26", "GP5", "GP4", "GP9"]
+    },
+    "diode_direction": "ROW2COL",
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "GP1"
+    },
+    "ws2812": {
+        "pin": "GP0",
+        "driver": "vendor"
+    },
+    "processor": "RP2040",
+    "bootloader": "rp2040"
+}
diff --git a/keyboards/bastardkb/skeletyl/v2/splinky_3/rules.mk b/keyboards/bastardkb/skeletyl/v2/splinky_3/rules.mk
index 83407eef806..077573eb763 100644
--- a/keyboards/bastardkb/skeletyl/v2/splinky_3/rules.mk
+++ b/keyboards/bastardkb/skeletyl/v2/splinky_3/rules.mk
@@ -1,19 +1,3 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
 AUDIO_SUPPORTED = no        # Audio is not supported
-RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
-RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
-RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
 
 SERIAL_DRIVER = vendor
diff --git a/keyboards/bastardkb/skeletyl/v2/stemcell/info.json b/keyboards/bastardkb/skeletyl/v2/stemcell/info.json
deleted file mode 100644
index d7b1fc5cdb4..00000000000
--- a/keyboards/bastardkb/skeletyl/v2/stemcell/info.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-    "keyboard_name": "Skeletyl STeMCell",
-    "usb": {
-        "device_version": "2.0.0"
-    },
-    "rgb_matrix": {
-        "driver": "ws2812"
-    },
-    "ws2812": {
-        "pin": "A2",
-        "driver": "pwm"
-    },
-    "build": {
-        "debounce_type": "asym_eager_defer_pk"
-    },
-    "matrix_pins": {
-        "cols": ["B2", "A4", "B4", "B5", "B8"],
-        "rows": ["B0", "B3", "A15", "B9"]
-    },
-    "diode_direction": "ROW2COL",
-    "split": {
-        "enabled": true,
-        "soft_serial_pin": "A3"
-    },
-    "development_board": "stemcell"
-}
diff --git a/keyboards/bastardkb/skeletyl/v2/stemcell/keyboard.json b/keyboards/bastardkb/skeletyl/v2/stemcell/keyboard.json
new file mode 100644
index 00000000000..6dd86bcc126
--- /dev/null
+++ b/keyboards/bastardkb/skeletyl/v2/stemcell/keyboard.json
@@ -0,0 +1,32 @@
+{
+    "keyboard_name": "Skeletyl STeMCell",
+    "usb": {
+        "device_version": "2.0.0"
+    },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "rgb_matrix": true
+    },
+    "rgb_matrix": {
+        "driver": "ws2812"
+    },
+    "ws2812": {
+        "pin": "A2",
+        "driver": "pwm"
+    },
+    "build": {
+        "debounce_type": "asym_eager_defer_pk"
+    },
+    "matrix_pins": {
+        "cols": ["B2", "A4", "B4", "B5", "B8"],
+        "rows": ["B0", "B3", "A15", "B9"]
+    },
+    "diode_direction": "ROW2COL",
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "A3"
+    },
+    "development_board": "stemcell"
+}
diff --git a/keyboards/bastardkb/skeletyl/v2/stemcell/rules.mk b/keyboards/bastardkb/skeletyl/v2/stemcell/rules.mk
index ef125eb2fea..3fe3e4ffbea 100644
--- a/keyboards/bastardkb/skeletyl/v2/stemcell/rules.mk
+++ b/keyboards/bastardkb/skeletyl/v2/stemcell/rules.mk
@@ -1,19 +1,3 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
 AUDIO_SUPPORTED = no        # Audio is not supported
-RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
-RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
-RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
 
 SERIAL_DRIVER = usart
diff --git a/keyboards/bastardkb/tbkmini/blackpill/info.json b/keyboards/bastardkb/tbkmini/blackpill/info.json
deleted file mode 100644
index bb6e9bb7e9e..00000000000
--- a/keyboards/bastardkb/tbkmini/blackpill/info.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-    "keyboard_name": "TBK Mini Blackpill",
-    "usb": {
-        "device_version": "1.0.0"
-    },
-    "eeprom": {
-        "driver": "spi"
-    },
-    "split": {
-        "enabled": true
-    },
-    "rgb_matrix": {
-        "driver": "ws2812"
-    },
-    "ws2812": {
-        "pin": "A1",
-        "driver": "pwm"
-    },
-    "build": {
-        "debounce_type": "asym_eager_defer_pk"
-    },
-    "matrix_pins": {
-        "cols": ["B0", "B1", "B10", "B3", "B4", "B5"],
-        "rows": ["A2", "B8", "A8", "B9"]
-    },
-    "diode_direction": "ROW2COL",
-    "processor": "STM32F411",
-    "bootloader": "stm32-dfu",
-    "board": "BLACKPILL_STM32_F411"
-}
diff --git a/keyboards/bastardkb/tbkmini/blackpill/keyboard.json b/keyboards/bastardkb/tbkmini/blackpill/keyboard.json
new file mode 100644
index 00000000000..61d0e741fef
--- /dev/null
+++ b/keyboards/bastardkb/tbkmini/blackpill/keyboard.json
@@ -0,0 +1,37 @@
+{
+    "keyboard_name": "TBK Mini Blackpill",
+    "usb": {
+        "device_version": "1.0.0",
+        "shared_endpoint": {
+            "keyboard": true
+        }
+    },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "rgb_matrix": true
+    },
+    "eeprom": {
+        "driver": "spi"
+    },
+    "split": {
+        "enabled": true
+    },
+    "rgb_matrix": {
+        "driver": "ws2812"
+    },
+    "ws2812": {
+        "pin": "A1",
+        "driver": "pwm"
+    },
+    "build": {
+        "debounce_type": "asym_eager_defer_pk"
+    },
+    "matrix_pins": {
+        "cols": ["B0", "B1", "B10", "B3", "B4", "B5"],
+        "rows": ["A2", "B8", "A8", "B9"]
+    },
+    "diode_direction": "ROW2COL",
+    "development_board": "blackpill_f411"
+}
diff --git a/keyboards/bastardkb/tbkmini/blackpill/rules.mk b/keyboards/bastardkb/tbkmini/blackpill/rules.mk
index 20c87fca307..48c904dd644 100644
--- a/keyboards/bastardkb/tbkmini/blackpill/rules.mk
+++ b/keyboards/bastardkb/tbkmini/blackpill/rules.mk
@@ -1,22 +1,5 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
 AUDIO_SUPPORTED = no        # Audio is not supported
-RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
-RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
-RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
 
 MOUSE_SHARED_EP = no # Unify multiple HID interfaces into a single Endpoint
-KEYBOARD_SHARED_EP = yes
 
 SERIAL_DRIVER = usart
diff --git a/keyboards/bastardkb/tbkmini/v1/elitec/info.json b/keyboards/bastardkb/tbkmini/v1/elitec/info.json
deleted file mode 100644
index 54433f39bf3..00000000000
--- a/keyboards/bastardkb/tbkmini/v1/elitec/info.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "keyboard_name": "TBK Mini Elite-C",
-    "usb": {
-        "device_version": "1.0.0"
-    },
-    "ws2812": {
-        "pin": "D2"
-    },
-    "rgb_matrix": {
-        "driver": "ws2812"
-    },
-    "matrix_pins": {
-        "cols": ["B4", "E6", "C6", "B1", "B3", "B2"],
-        "rows": ["B5", "F7", "F6", "B6"]
-    },
-    "diode_direction": "ROW2COL",
-    "split": {
-        "enabled": true,
-        "soft_serial_pin": "D0"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu"
-}
diff --git a/keyboards/bastardkb/tbkmini/v1/elitec/keyboard.json b/keyboards/bastardkb/tbkmini/v1/elitec/keyboard.json
new file mode 100644
index 00000000000..59988074baa
--- /dev/null
+++ b/keyboards/bastardkb/tbkmini/v1/elitec/keyboard.json
@@ -0,0 +1,29 @@
+{
+    "keyboard_name": "TBK Mini Elite-C",
+    "usb": {
+        "device_version": "1.0.0"
+    },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "rgb_matrix": true
+    },
+    "ws2812": {
+        "pin": "D2"
+    },
+    "rgb_matrix": {
+        "driver": "ws2812"
+    },
+    "matrix_pins": {
+        "cols": ["B4", "E6", "C6", "B1", "B3", "B2"],
+        "rows": ["B5", "F7", "F6", "B6"]
+    },
+    "diode_direction": "ROW2COL",
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "D0"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu"
+}
diff --git a/keyboards/bastardkb/tbkmini/v1/elitec/rules.mk b/keyboards/bastardkb/tbkmini/v1/elitec/rules.mk
index 6221b2ef6a5..1868c4bb027 100644
--- a/keyboards/bastardkb/tbkmini/v1/elitec/rules.mk
+++ b/keyboards/bastardkb/tbkmini/v1/elitec/rules.mk
@@ -1,17 +1 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
 AUDIO_SUPPORTED = no        # Audio is not supported
-RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
-RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
-RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix (do not use together with RGBLIGHT_ENABLE)
diff --git a/keyboards/bastardkb/tbkmini/v2/elitec/info.json b/keyboards/bastardkb/tbkmini/v2/elitec/info.json
deleted file mode 100644
index 57c7399c01d..00000000000
--- a/keyboards/bastardkb/tbkmini/v2/elitec/info.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "keyboard_name": "TBK Mini Elite-C",
-    "usb": {
-        "device_version": "2.0.0"
-    },
-    "ws2812": {
-        "pin": "D3"
-    },
-    "rgb_matrix": {
-        "driver": "ws2812"
-    },
-    "matrix_pins": {
-        "cols": ["F6", "F5", "B6", "D7", "E6", "B4"],
-        "rows": ["F7", "C6", "D4", "B5"]
-    },
-    "diode_direction": "ROW2COL",
-    "split": {
-        "enabled": true,
-        "soft_serial_pin": "D2"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu"
-}
diff --git a/keyboards/bastardkb/tbkmini/v2/elitec/keyboard.json b/keyboards/bastardkb/tbkmini/v2/elitec/keyboard.json
new file mode 100644
index 00000000000..01679bcff9f
--- /dev/null
+++ b/keyboards/bastardkb/tbkmini/v2/elitec/keyboard.json
@@ -0,0 +1,29 @@
+{
+    "keyboard_name": "TBK Mini Elite-C",
+    "usb": {
+        "device_version": "2.0.0"
+    },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "rgb_matrix": true
+    },
+    "ws2812": {
+        "pin": "D3"
+    },
+    "rgb_matrix": {
+        "driver": "ws2812"
+    },
+    "matrix_pins": {
+        "cols": ["F6", "F5", "B6", "D7", "E6", "B4"],
+        "rows": ["F7", "C6", "D4", "B5"]
+    },
+    "diode_direction": "ROW2COL",
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "D2"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu"
+}
diff --git a/keyboards/bastardkb/tbkmini/v2/elitec/rules.mk b/keyboards/bastardkb/tbkmini/v2/elitec/rules.mk
index 6221b2ef6a5..1868c4bb027 100644
--- a/keyboards/bastardkb/tbkmini/v2/elitec/rules.mk
+++ b/keyboards/bastardkb/tbkmini/v2/elitec/rules.mk
@@ -1,17 +1 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
 AUDIO_SUPPORTED = no        # Audio is not supported
-RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
-RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
-RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix (do not use together with RGBLIGHT_ENABLE)
diff --git a/keyboards/bastardkb/tbkmini/v2/splinky_2/info.json b/keyboards/bastardkb/tbkmini/v2/splinky_2/info.json
deleted file mode 100644
index 2f64d2b51bf..00000000000
--- a/keyboards/bastardkb/tbkmini/v2/splinky_2/info.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-    "keyboard_name": "TBK Mini Splinky",
-    "usb": {
-        "device_version": "2.0.0"
-    },
-    "rgb_matrix": {
-        "driver": "ws2812"
-    },
-    "matrix_pins": {
-        "cols": ["GP27", "GP28", "GP15", "GP6", "GP7", "GP8"],
-        "rows": ["GP26", "GP5", "GP4", "GP9"]
-    },
-    "diode_direction": "ROW2COL",
-    "split": {
-        "enabled": true,
-        "soft_serial_pin": "GP1"
-    },
-    "ws2812": {
-        "pin": "GP0",
-        "driver": "vendor"
-    },
-    "processor": "RP2040",
-    "bootloader": "rp2040"
-}
diff --git a/keyboards/bastardkb/tbkmini/v2/splinky_2/keyboard.json b/keyboards/bastardkb/tbkmini/v2/splinky_2/keyboard.json
new file mode 100644
index 00000000000..2048db62515
--- /dev/null
+++ b/keyboards/bastardkb/tbkmini/v2/splinky_2/keyboard.json
@@ -0,0 +1,30 @@
+{
+    "keyboard_name": "TBK Mini Splinky",
+    "usb": {
+        "device_version": "2.0.0"
+    },
+    "features": {
+        "bootmagic": true,
+        "mousekey": false,
+        "extrakey": true,
+        "rgb_matrix": true
+    },
+    "rgb_matrix": {
+        "driver": "ws2812"
+    },
+    "matrix_pins": {
+        "cols": ["GP27", "GP28", "GP15", "GP6", "GP7", "GP8"],
+        "rows": ["GP26", "GP5", "GP4", "GP9"]
+    },
+    "diode_direction": "ROW2COL",
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "GP1"
+    },
+    "ws2812": {
+        "pin": "GP0",
+        "driver": "vendor"
+    },
+    "processor": "RP2040",
+    "bootloader": "rp2040"
+}
diff --git a/keyboards/bastardkb/tbkmini/v2/splinky_2/rules.mk b/keyboards/bastardkb/tbkmini/v2/splinky_2/rules.mk
index 83407eef806..077573eb763 100644
--- a/keyboards/bastardkb/tbkmini/v2/splinky_2/rules.mk
+++ b/keyboards/bastardkb/tbkmini/v2/splinky_2/rules.mk
@@ -1,19 +1,3 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
 AUDIO_SUPPORTED = no        # Audio is not supported
-RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
-RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
-RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
 
 SERIAL_DRIVER = vendor
diff --git a/keyboards/bastardkb/tbkmini/v2/splinky_3/info.json b/keyboards/bastardkb/tbkmini/v2/splinky_3/info.json
deleted file mode 100644
index b67bc1d744c..00000000000
--- a/keyboards/bastardkb/tbkmini/v2/splinky_3/info.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-    "keyboard_name": "TBK Mini Splinky",
-    "usb": {
-        "device_version": "2.0.0"
-    },
-    "rgb_matrix": {
-        "driver": "ws2812"
-    },
-    "matrix_pins": {
-        "cols": ["GP27", "GP28", "GP21", "GP6", "GP7", "GP8"],
-        "rows": ["GP26", "GP5", "GP4", "GP9"]
-    },
-    "diode_direction": "ROW2COL",
-    "split": {
-        "enabled": true,
-        "soft_serial_pin": "GP1"
-    },
-    "ws2812": {
-        "pin": "GP0",
-        "driver": "vendor"
-    },
-    "processor": "RP2040",
-    "bootloader": "rp2040"
-}
diff --git a/keyboards/bastardkb/tbkmini/v2/splinky_3/keyboard.json b/keyboards/bastardkb/tbkmini/v2/splinky_3/keyboard.json
new file mode 100644
index 00000000000..8dd21b75910
--- /dev/null
+++ b/keyboards/bastardkb/tbkmini/v2/splinky_3/keyboard.json
@@ -0,0 +1,30 @@
+{
+    "keyboard_name": "TBK Mini Splinky",
+    "usb": {
+        "device_version": "2.0.0"
+    },
+    "features": {
+        "bootmagic": true,
+        "mousekey": false,
+        "extrakey": true,
+        "rgb_matrix": true
+    },
+    "rgb_matrix": {
+        "driver": "ws2812"
+    },
+    "matrix_pins": {
+        "cols": ["GP27", "GP28", "GP21", "GP6", "GP7", "GP8"],
+        "rows": ["GP26", "GP5", "GP4", "GP9"]
+    },
+    "diode_direction": "ROW2COL",
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "GP1"
+    },
+    "ws2812": {
+        "pin": "GP0",
+        "driver": "vendor"
+    },
+    "processor": "RP2040",
+    "bootloader": "rp2040"
+}
diff --git a/keyboards/bastardkb/tbkmini/v2/splinky_3/rules.mk b/keyboards/bastardkb/tbkmini/v2/splinky_3/rules.mk
index 83407eef806..077573eb763 100644
--- a/keyboards/bastardkb/tbkmini/v2/splinky_3/rules.mk
+++ b/keyboards/bastardkb/tbkmini/v2/splinky_3/rules.mk
@@ -1,19 +1,3 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
 AUDIO_SUPPORTED = no        # Audio is not supported
-RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
-RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
-RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
 
 SERIAL_DRIVER = vendor
diff --git a/keyboards/bastardkb/tbkmini/v2/stemcell/info.json b/keyboards/bastardkb/tbkmini/v2/stemcell/info.json
deleted file mode 100644
index d08c89ec574..00000000000
--- a/keyboards/bastardkb/tbkmini/v2/stemcell/info.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-    "keyboard_name": "TBK Mini STeMCell",
-    "usb": {
-        "device_version": "2.0.0"
-    },
-    "rgb_matrix": {
-        "driver": "ws2812"
-    },
-    "ws2812": {
-        "pin": "A2",
-        "driver": "pwm"
-    },
-    "build": {
-        "debounce_type": "asym_eager_defer_pk"
-    },
-    "matrix_pins": {
-        "cols": ["B1", "B2", "A4", "B4", "B5", "B8"],
-        "rows": ["B0", "B3", "A15", "B9"]
-    },
-    "diode_direction": "ROW2COL",
-    "split": {
-        "enabled": true,
-        "soft_serial_pin": "A3"
-    },
-    "development_board": "stemcell"
-}
diff --git a/keyboards/bastardkb/tbkmini/v2/stemcell/keyboard.json b/keyboards/bastardkb/tbkmini/v2/stemcell/keyboard.json
new file mode 100644
index 00000000000..41abba96cb9
--- /dev/null
+++ b/keyboards/bastardkb/tbkmini/v2/stemcell/keyboard.json
@@ -0,0 +1,32 @@
+{
+    "keyboard_name": "TBK Mini STeMCell",
+    "usb": {
+        "device_version": "2.0.0"
+    },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "rgb_matrix": true
+    },
+    "rgb_matrix": {
+        "driver": "ws2812"
+    },
+    "ws2812": {
+        "pin": "A2",
+        "driver": "pwm"
+    },
+    "build": {
+        "debounce_type": "asym_eager_defer_pk"
+    },
+    "matrix_pins": {
+        "cols": ["B1", "B2", "A4", "B4", "B5", "B8"],
+        "rows": ["B0", "B3", "A15", "B9"]
+    },
+    "diode_direction": "ROW2COL",
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "A3"
+    },
+    "development_board": "stemcell"
+}
diff --git a/keyboards/bastardkb/tbkmini/v2/stemcell/rules.mk b/keyboards/bastardkb/tbkmini/v2/stemcell/rules.mk
index ef125eb2fea..3fe3e4ffbea 100644
--- a/keyboards/bastardkb/tbkmini/v2/stemcell/rules.mk
+++ b/keyboards/bastardkb/tbkmini/v2/stemcell/rules.mk
@@ -1,19 +1,3 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
 AUDIO_SUPPORTED = no        # Audio is not supported
-RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
-RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
-RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
 
 SERIAL_DRIVER = usart
diff --git a/keyboards/boardsource/equals/48/keyboard.json b/keyboards/boardsource/equals/48/keyboard.json
index 5b633559313..13bc0d80ab7 100644
--- a/keyboards/boardsource/equals/48/keyboard.json
+++ b/keyboards/boardsource/equals/48/keyboard.json
@@ -10,6 +10,9 @@
         "cols": ["GP0", "GP1", "GP2", "GP3", "GP4", "GP5", "GP6", "GP7", "GP8", "GP9", "GP10", "GP11"],
         "rows": ["GP12", "GP13", "GP16", "GP17"]
     },
+    "audio": {
+        "driver": "pwm_hardware"
+    },
     "ws2812": {
         "driver": "vendor",
         "pin": "GP21"
diff --git a/keyboards/boardsource/equals/48/rules.mk b/keyboards/boardsource/equals/48/rules.mk
index 2f75fc139fc..ec94c118ee1 100644
--- a/keyboards/boardsource/equals/48/rules.mk
+++ b/keyboards/boardsource/equals/48/rules.mk
@@ -1,2 +1 @@
-AUDIO_DRIVER = pwm_hardware
 QUANTUM_PAINTER_DRIVERS += st7735_spi
diff --git a/keyboards/boardsource/equals/60/keyboard.json b/keyboards/boardsource/equals/60/keyboard.json
index 3bc1f49be38..63cb4717e57 100644
--- a/keyboards/boardsource/equals/60/keyboard.json
+++ b/keyboards/boardsource/equals/60/keyboard.json
@@ -10,6 +10,9 @@
         "cols": ["GP0", "GP1", "GP2", "GP3", "GP4", "GP5", "GP6", "GP7", "GP8", "GP9", "GP10", "GP11"],
         "rows": ["GP12", "GP13", "GP16", "GP17", "GP18"]
     },
+    "audio": {
+        "driver": "pwm_hardware"
+    },
     "ws2812": {
         "driver": "vendor",
         "pin": "GP21"
diff --git a/keyboards/boardsource/equals/60/rules.mk b/keyboards/boardsource/equals/60/rules.mk
index 2f75fc139fc..ec94c118ee1 100644
--- a/keyboards/boardsource/equals/60/rules.mk
+++ b/keyboards/boardsource/equals/60/rules.mk
@@ -1,2 +1 @@
-AUDIO_DRIVER = pwm_hardware
 QUANTUM_PAINTER_DRIVERS += st7735_spi
diff --git a/keyboards/boardsource/unicorne/keyboard.json b/keyboards/boardsource/unicorne/keyboard.json
index 6afbcc044cb..4fb63de9e32 100644
--- a/keyboards/boardsource/unicorne/keyboard.json
+++ b/keyboards/boardsource/unicorne/keyboard.json
@@ -32,6 +32,9 @@
         "pid": "0x7563",
         "vid": "0x4273"
     },
+    "audio": {
+        "driver": "pwm_hardware"
+    },
     "ws2812": {
         "driver": "vendor",
         "pin": "GP29"
diff --git a/keyboards/boardsource/unicorne/rules.mk b/keyboards/boardsource/unicorne/rules.mk
index d123b2a2fa8..48b30dcd51a 100644
--- a/keyboards/boardsource/unicorne/rules.mk
+++ b/keyboards/boardsource/unicorne/rules.mk
@@ -1,3 +1,2 @@
 SERIAL_DRIVER = vendor
-AUDIO_DRIVER = pwm_hardware
 POINTING_DEVICE_DRIVER = analog_joystick
diff --git a/keyboards/boston_meetup/2019/keyboard.json b/keyboards/boston_meetup/2019/keyboard.json
index 97990bb5030..40a390b0a8c 100644
--- a/keyboards/boston_meetup/2019/keyboard.json
+++ b/keyboards/boston_meetup/2019/keyboard.json
@@ -17,6 +17,9 @@
         "haptic": true,
         "oled": true
     },
+    "haptic": {
+        "driver": "drv2605l"
+    },
     "rgb_matrix": {
         "driver": "ws2812"
     },
diff --git a/keyboards/boston_meetup/2019/rules.mk b/keyboards/boston_meetup/2019/rules.mk
deleted file mode 100644
index dea510c2ab3..00000000000
--- a/keyboards/boston_meetup/2019/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-HAPTIC_DRIVER = drv2605l
diff --git a/keyboards/bt66tech/bt66tech60/keyboard.json b/keyboards/bt66tech/bt66tech60/keyboard.json
index 26e4964d458..778e27fe67a 100644
--- a/keyboards/bt66tech/bt66tech60/keyboard.json
+++ b/keyboards/bt66tech/bt66tech60/keyboard.json
@@ -55,8 +55,7 @@
         "pin": "B15",
         "driver": "spi"
     },
-    "processor": "STM32F103",
-    "bootloader": "stm32duino",
+    "development_board": "bluepill",
     "community_layouts": ["60_ansi"],
     "layouts": {
         "LAYOUT_60_ansi": {
diff --git a/keyboards/cablecardesigns/phoenix/info.json b/keyboards/cablecardesigns/phoenix/keyboard.json
similarity index 100%
rename from keyboards/cablecardesigns/phoenix/info.json
rename to keyboards/cablecardesigns/phoenix/keyboard.json
diff --git a/keyboards/cannonkeys/aella/info.json b/keyboards/cannonkeys/aella/keyboard.json
similarity index 100%
rename from keyboards/cannonkeys/aella/info.json
rename to keyboards/cannonkeys/aella/keyboard.json
diff --git a/keyboards/cannonkeys/an_c/info.json b/keyboards/cannonkeys/an_c/keyboard.json
similarity index 100%
rename from keyboards/cannonkeys/an_c/info.json
rename to keyboards/cannonkeys/an_c/keyboard.json
diff --git a/keyboards/cannonkeys/bakeneko60_iso_hs/info.json b/keyboards/cannonkeys/bakeneko60_iso_hs/keyboard.json
similarity index 100%
rename from keyboards/cannonkeys/bakeneko60_iso_hs/info.json
rename to keyboards/cannonkeys/bakeneko60_iso_hs/keyboard.json
diff --git a/keyboards/cannonkeys/bakeneko65_iso_hs/info.json b/keyboards/cannonkeys/bakeneko65_iso_hs/keyboard.json
similarity index 100%
rename from keyboards/cannonkeys/bakeneko65_iso_hs/info.json
rename to keyboards/cannonkeys/bakeneko65_iso_hs/keyboard.json
diff --git a/keyboards/cannonkeys/balance/info.json b/keyboards/cannonkeys/balance/keyboard.json
similarity index 100%
rename from keyboards/cannonkeys/balance/info.json
rename to keyboards/cannonkeys/balance/keyboard.json
diff --git a/keyboards/cannonkeys/brutalv2_65/info.json b/keyboards/cannonkeys/brutalv2_65/keyboard.json
similarity index 100%
rename from keyboards/cannonkeys/brutalv2_65/info.json
rename to keyboards/cannonkeys/brutalv2_65/keyboard.json
diff --git a/keyboards/cannonkeys/chimera65_hs/info.json b/keyboards/cannonkeys/chimera65_hs/keyboard.json
similarity index 100%
rename from keyboards/cannonkeys/chimera65_hs/info.json
rename to keyboards/cannonkeys/chimera65_hs/keyboard.json
diff --git a/keyboards/cannonkeys/cloudline/info.json b/keyboards/cannonkeys/cloudline/keyboard.json
similarity index 100%
rename from keyboards/cannonkeys/cloudline/info.json
rename to keyboards/cannonkeys/cloudline/keyboard.json
diff --git a/keyboards/cannonkeys/crin/info.json b/keyboards/cannonkeys/crin/keyboard.json
similarity index 100%
rename from keyboards/cannonkeys/crin/info.json
rename to keyboards/cannonkeys/crin/keyboard.json
diff --git a/keyboards/cannonkeys/devastatingtkl/info.json b/keyboards/cannonkeys/devastatingtkl/keyboard.json
similarity index 100%
rename from keyboards/cannonkeys/devastatingtkl/info.json
rename to keyboards/cannonkeys/devastatingtkl/keyboard.json
diff --git a/keyboards/cannonkeys/ellipse/info.json b/keyboards/cannonkeys/ellipse/keyboard.json
similarity index 100%
rename from keyboards/cannonkeys/ellipse/info.json
rename to keyboards/cannonkeys/ellipse/keyboard.json
diff --git a/keyboards/cannonkeys/ellipse_hs/info.json b/keyboards/cannonkeys/ellipse_hs/keyboard.json
similarity index 100%
rename from keyboards/cannonkeys/ellipse_hs/info.json
rename to keyboards/cannonkeys/ellipse_hs/keyboard.json
diff --git a/keyboards/cannonkeys/gentoo/info.json b/keyboards/cannonkeys/gentoo/keyboard.json
similarity index 100%
rename from keyboards/cannonkeys/gentoo/info.json
rename to keyboards/cannonkeys/gentoo/keyboard.json
diff --git a/keyboards/cannonkeys/gentoo_hs/info.json b/keyboards/cannonkeys/gentoo_hs/keyboard.json
similarity index 100%
rename from keyboards/cannonkeys/gentoo_hs/info.json
rename to keyboards/cannonkeys/gentoo_hs/keyboard.json
diff --git a/keyboards/cannonkeys/instant60/info.json b/keyboards/cannonkeys/instant60/keyboard.json
similarity index 100%
rename from keyboards/cannonkeys/instant60/info.json
rename to keyboards/cannonkeys/instant60/keyboard.json
diff --git a/keyboards/cannonkeys/instant65/info.json b/keyboards/cannonkeys/instant65/keyboard.json
similarity index 100%
rename from keyboards/cannonkeys/instant65/info.json
rename to keyboards/cannonkeys/instant65/keyboard.json
diff --git a/keyboards/cannonkeys/is0gr/info.json b/keyboards/cannonkeys/is0gr/keyboard.json
similarity index 100%
rename from keyboards/cannonkeys/is0gr/info.json
rename to keyboards/cannonkeys/is0gr/keyboard.json
diff --git a/keyboards/cannonkeys/leviatan/info.json b/keyboards/cannonkeys/leviatan/keyboard.json
similarity index 100%
rename from keyboards/cannonkeys/leviatan/info.json
rename to keyboards/cannonkeys/leviatan/keyboard.json
diff --git a/keyboards/cannonkeys/malicious_ergo/info.json b/keyboards/cannonkeys/malicious_ergo/keyboard.json
similarity index 100%
rename from keyboards/cannonkeys/malicious_ergo/info.json
rename to keyboards/cannonkeys/malicious_ergo/keyboard.json
diff --git a/keyboards/cannonkeys/meetuppad2023/info.json b/keyboards/cannonkeys/meetuppad2023/keyboard.json
similarity index 100%
rename from keyboards/cannonkeys/meetuppad2023/info.json
rename to keyboards/cannonkeys/meetuppad2023/keyboard.json
diff --git a/keyboards/cannonkeys/moment/info.json b/keyboards/cannonkeys/moment/keyboard.json
similarity index 100%
rename from keyboards/cannonkeys/moment/info.json
rename to keyboards/cannonkeys/moment/keyboard.json
diff --git a/keyboards/cannonkeys/moment_hs/info.json b/keyboards/cannonkeys/moment_hs/keyboard.json
similarity index 100%
rename from keyboards/cannonkeys/moment_hs/info.json
rename to keyboards/cannonkeys/moment_hs/keyboard.json
diff --git a/keyboards/cannonkeys/obliterated75/info.json b/keyboards/cannonkeys/obliterated75/keyboard.json
similarity index 100%
rename from keyboards/cannonkeys/obliterated75/info.json
rename to keyboards/cannonkeys/obliterated75/keyboard.json
diff --git a/keyboards/cannonkeys/onyx/info.json b/keyboards/cannonkeys/onyx/keyboard.json
similarity index 100%
rename from keyboards/cannonkeys/onyx/info.json
rename to keyboards/cannonkeys/onyx/keyboard.json
diff --git a/keyboards/cannonkeys/ortho48/keyboard.json b/keyboards/cannonkeys/ortho48/keyboard.json
index 1f35187e291..facd47633d0 100644
--- a/keyboards/cannonkeys/ortho48/keyboard.json
+++ b/keyboards/cannonkeys/ortho48/keyboard.json
@@ -48,8 +48,7 @@
     "pin": "B15",
     "driver": "spi"
   },
-  "processor": "STM32F103",
-  "bootloader": "stm32duino",
+  "development_board": "bluepill",
   "community_layouts": ["ortho_4x12"],
   "layouts": {
     "LAYOUT_ortho_4x12": {
diff --git a/keyboards/cannonkeys/ortho60/keyboard.json b/keyboards/cannonkeys/ortho60/keyboard.json
index f429bd9f405..d8eea8a6ae9 100644
--- a/keyboards/cannonkeys/ortho60/keyboard.json
+++ b/keyboards/cannonkeys/ortho60/keyboard.json
@@ -48,8 +48,7 @@
     "pin": "B15",
     "driver": "spi"
   },
-  "processor": "STM32F103",
-  "bootloader": "stm32duino",
+  "development_board": "bluepill",
   "community_layouts": ["ortho_5x12"],
   "layouts": {
     "LAYOUT_ortho_5x12": {
diff --git a/keyboards/cannonkeys/ortho75/keyboard.json b/keyboards/cannonkeys/ortho75/keyboard.json
index 236334c5985..49595685ef3 100644
--- a/keyboards/cannonkeys/ortho75/keyboard.json
+++ b/keyboards/cannonkeys/ortho75/keyboard.json
@@ -54,8 +54,7 @@
     "pin": "B15",
     "driver": "spi"
   },
-  "processor": "STM32F103",
-  "bootloader": "stm32duino",
+  "development_board": "bluepill",
   "community_layouts": ["ortho_5x15"],
   "layouts": {
     "LAYOUT_ortho_5x15": {
diff --git a/keyboards/cannonkeys/practice60/keyboard.json b/keyboards/cannonkeys/practice60/keyboard.json
index 3254b1702fa..ff8cf00cb04 100644
--- a/keyboards/cannonkeys/practice60/keyboard.json
+++ b/keyboards/cannonkeys/practice60/keyboard.json
@@ -48,8 +48,7 @@
     "pin": "B15",
     "driver": "spi"
   },
-  "processor": "STM32F103",
-  "bootloader": "stm32duino",
+  "development_board": "bluepill",
   "community_layouts": ["60_ansi"],
   "layouts": {
     "LAYOUT_60_ansi": {
diff --git a/keyboards/cannonkeys/practice65/keyboard.json b/keyboards/cannonkeys/practice65/keyboard.json
index 950d1bae9ff..36fb46dd518 100644
--- a/keyboards/cannonkeys/practice65/keyboard.json
+++ b/keyboards/cannonkeys/practice65/keyboard.json
@@ -48,9 +48,8 @@
         "pin": "B15",
         "driver": "spi"
     },
-    "processor": "STM32F103",
-    "bootloader": "stm32duino",
-   "layouts": {
+    "development_board": "bluepill",
+    "layouts": {
         "LAYOUT_default": {
             "layout": [
                 {"matrix": [0, 0], "x": 0, "y": 0},
diff --git a/keyboards/cannonkeys/rekt1800/info.json b/keyboards/cannonkeys/rekt1800/keyboard.json
similarity index 100%
rename from keyboards/cannonkeys/rekt1800/info.json
rename to keyboards/cannonkeys/rekt1800/keyboard.json
diff --git a/keyboards/cannonkeys/ripple/info.json b/keyboards/cannonkeys/ripple/keyboard.json
similarity index 100%
rename from keyboards/cannonkeys/ripple/info.json
rename to keyboards/cannonkeys/ripple/keyboard.json
diff --git a/keyboards/cannonkeys/ripple_hs/info.json b/keyboards/cannonkeys/ripple_hs/keyboard.json
similarity index 100%
rename from keyboards/cannonkeys/ripple_hs/info.json
rename to keyboards/cannonkeys/ripple_hs/keyboard.json
diff --git a/keyboards/cannonkeys/sagittarius/info.json b/keyboards/cannonkeys/sagittarius/keyboard.json
similarity index 100%
rename from keyboards/cannonkeys/sagittarius/info.json
rename to keyboards/cannonkeys/sagittarius/keyboard.json
diff --git a/keyboards/cannonkeys/satisfaction75_hs/info.json b/keyboards/cannonkeys/satisfaction75_hs/keyboard.json
similarity index 100%
rename from keyboards/cannonkeys/satisfaction75_hs/info.json
rename to keyboards/cannonkeys/satisfaction75_hs/keyboard.json
diff --git a/keyboards/cannonkeys/savage65/info.json b/keyboards/cannonkeys/savage65/keyboard.json
similarity index 100%
rename from keyboards/cannonkeys/savage65/info.json
rename to keyboards/cannonkeys/savage65/keyboard.json
diff --git a/keyboards/cannonkeys/serenity/info.json b/keyboards/cannonkeys/serenity/keyboard.json
similarity index 100%
rename from keyboards/cannonkeys/serenity/info.json
rename to keyboards/cannonkeys/serenity/keyboard.json
diff --git a/keyboards/cannonkeys/tmov2/info.json b/keyboards/cannonkeys/tmov2/keyboard.json
similarity index 100%
rename from keyboards/cannonkeys/tmov2/info.json
rename to keyboards/cannonkeys/tmov2/keyboard.json
diff --git a/keyboards/cannonkeys/tsukuyomi/info.json b/keyboards/cannonkeys/tsukuyomi/keyboard.json
similarity index 100%
rename from keyboards/cannonkeys/tsukuyomi/info.json
rename to keyboards/cannonkeys/tsukuyomi/keyboard.json
diff --git a/keyboards/cannonkeys/vector/info.json b/keyboards/cannonkeys/vector/keyboard.json
similarity index 100%
rename from keyboards/cannonkeys/vector/info.json
rename to keyboards/cannonkeys/vector/keyboard.json
diff --git a/keyboards/cannonkeys/vicious40/info.json b/keyboards/cannonkeys/vicious40/keyboard.json
similarity index 100%
rename from keyboards/cannonkeys/vicious40/info.json
rename to keyboards/cannonkeys/vicious40/keyboard.json
diff --git a/keyboards/cantor/info.json b/keyboards/cantor/info.json
deleted file mode 100644
index e401b2ce972..00000000000
--- a/keyboards/cantor/info.json
+++ /dev/null
@@ -1,95 +0,0 @@
-{
-    "manufacturer": "Diego Palacios",
-    "keyboard_name": "cantor",
-    "maintainer": "diepala",
-    "bootloader": "stm32-dfu",
-    "features": {
-        "bootmagic": true,
-        "command": false,
-        "console": false,
-        "extrakey": true,
-        "mousekey": true,
-        "nkro": true
-    },
-    "processor": "STM32F401",
-    "board": "BLACKPILL_STM32_F401",
-    "url": "https://github.com/diepala/cantor",
-    "usb": {
-        "device_version": "1.0.0",
-        "pid": "0x0000",
-        "vid": "0xFEED"
-    },
-    "matrix_pins": {
-        "direct": [
-            ["B1", "B10", "A8", "B15", "B14", "B13"],
-            ["B9", "B8", "B5", "B4", "B3", "A15"],
-            ["A3", "A4", "A5", "A6", "A7", "B0"],
-            ["A2", "A1", "A0", null, null, null]
-        ]
-    },
-    "split": {
-        "enabled": true,
-        "bootmagic": {
-            "matrix": [4, 5]
-        },
-        "matrix_pins": {
-            "right": {
-                "direct": [
-                    ["B13", "B14", "B15", "A8", "B10", "B1"],
-                    ["A15", "B3", "B4", "B5", "B8", "B9"],
-                    ["B0", "A7", "A6", "A5", "A4", "A3"],
-                    ["A0", "A1", "A2", null, null, null]
-                ]
-            }
-        }
-    },
-    "community_layouts": ["split_3x6_3"],
-    "layouts": {
-        "LAYOUT_split_3x6_3": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0.25},
-                {"matrix": [0, 1], "x": 1, "y": 0.25},
-                {"matrix": [0, 2], "x": 2, "y": 0.125},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0.125},
-                {"matrix": [0, 5], "x": 5, "y": 0.25},
-                {"matrix": [4, 0], "x": 8, "y": 0.25},
-                {"matrix": [4, 1], "x": 9, "y": 0.125},
-                {"matrix": [4, 2], "x": 10, "y": 0},
-                {"matrix": [4, 3], "x": 11, "y": 0.125},
-                {"matrix": [4, 4], "x": 12, "y": 0.25},
-                {"matrix": [4, 5], "x": 13, "y": 0.25},
-                {"matrix": [1, 0], "x": 0, "y": 1.25},
-                {"matrix": [1, 1], "x": 1, "y": 1.25},
-                {"matrix": [1, 2], "x": 2, "y": 1.125},
-                {"matrix": [1, 3], "x": 3, "y": 1},
-                {"matrix": [1, 4], "x": 4, "y": 1.125},
-                {"matrix": [1, 5], "x": 5, "y": 1.25},
-                {"matrix": [5, 0], "x": 8, "y": 1.25},
-                {"matrix": [5, 1], "x": 9, "y": 1.125},
-                {"matrix": [5, 2], "x": 10, "y": 1},
-                {"matrix": [5, 3], "x": 11, "y": 1.125},
-                {"matrix": [5, 4], "x": 12, "y": 1.25},
-                {"matrix": [5, 5], "x": 13, "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.125},
-                {"matrix": [2, 3], "x": 3, "y": 2},
-                {"matrix": [2, 4], "x": 4, "y": 2.125},
-                {"matrix": [2, 5], "x": 5, "y": 2.25},
-                {"matrix": [6, 0], "x": 8, "y": 2.25},
-                {"matrix": [6, 1], "x": 9, "y": 2.125},
-                {"matrix": [6, 2], "x": 10, "y": 2},
-                {"matrix": [6, 3], "x": 11, "y": 2.125},
-                {"matrix": [6, 4], "x": 12, "y": 2.25},
-                {"matrix": [6, 5], "x": 13, "y": 2.25},
-                {"matrix": [3, 0], "x": 3.5, "y": 3.25},
-                {"matrix": [3, 1], "x": 4.5, "y": 3.5},
-                {"matrix": [3, 2], "x": 5.5, "y": 3.75},
-                {"matrix": [7, 0], "x": 7.5, "y": 3.75},
-                {"matrix": [7, 1], "x": 8.5, "y": 3.5},
-                {"matrix": [7, 2], "x": 9.5, "y": 3.25}
-            ]
-        }
-    }
-}
diff --git a/keyboards/cantor/keyboard.json b/keyboards/cantor/keyboard.json
new file mode 100644
index 00000000000..a9d84e6c8f4
--- /dev/null
+++ b/keyboards/cantor/keyboard.json
@@ -0,0 +1,93 @@
+{
+    "manufacturer": "Diego Palacios",
+    "keyboard_name": "cantor",
+    "maintainer": "diepala",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "development_board": "blackpill_f401",
+    "url": "https://github.com/diepala/cantor",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x0000",
+        "vid": "0xFEED"
+    },
+    "matrix_pins": {
+        "direct": [
+            ["B1", "B10", "A8", "B15", "B14", "B13"],
+            ["B9", "B8", "B5", "B4", "B3", "A15"],
+            ["A3", "A4", "A5", "A6", "A7", "B0"],
+            ["A2", "A1", "A0", null, null, null]
+        ]
+    },
+    "split": {
+        "enabled": true,
+        "bootmagic": {
+            "matrix": [4, 5]
+        },
+        "matrix_pins": {
+            "right": {
+                "direct": [
+                    ["B13", "B14", "B15", "A8", "B10", "B1"],
+                    ["A15", "B3", "B4", "B5", "B8", "B9"],
+                    ["B0", "A7", "A6", "A5", "A4", "A3"],
+                    ["A0", "A1", "A2", null, null, null]
+                ]
+            }
+        }
+    },
+    "community_layouts": ["split_3x6_3"],
+    "layouts": {
+        "LAYOUT_split_3x6_3": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0.25},
+                {"matrix": [0, 1], "x": 1, "y": 0.25},
+                {"matrix": [0, 2], "x": 2, "y": 0.125},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0.125},
+                {"matrix": [0, 5], "x": 5, "y": 0.25},
+                {"matrix": [4, 0], "x": 8, "y": 0.25},
+                {"matrix": [4, 1], "x": 9, "y": 0.125},
+                {"matrix": [4, 2], "x": 10, "y": 0},
+                {"matrix": [4, 3], "x": 11, "y": 0.125},
+                {"matrix": [4, 4], "x": 12, "y": 0.25},
+                {"matrix": [4, 5], "x": 13, "y": 0.25},
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.125},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1.125},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [5, 0], "x": 8, "y": 1.25},
+                {"matrix": [5, 1], "x": 9, "y": 1.125},
+                {"matrix": [5, 2], "x": 10, "y": 1},
+                {"matrix": [5, 3], "x": 11, "y": 1.125},
+                {"matrix": [5, 4], "x": 12, "y": 1.25},
+                {"matrix": [5, 5], "x": 13, "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.125},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2.125},
+                {"matrix": [2, 5], "x": 5, "y": 2.25},
+                {"matrix": [6, 0], "x": 8, "y": 2.25},
+                {"matrix": [6, 1], "x": 9, "y": 2.125},
+                {"matrix": [6, 2], "x": 10, "y": 2},
+                {"matrix": [6, 3], "x": 11, "y": 2.125},
+                {"matrix": [6, 4], "x": 12, "y": 2.25},
+                {"matrix": [6, 5], "x": 13, "y": 2.25},
+                {"matrix": [3, 0], "x": 3.5, "y": 3.25},
+                {"matrix": [3, 1], "x": 4.5, "y": 3.5},
+                {"matrix": [3, 2], "x": 5.5, "y": 3.75},
+                {"matrix": [7, 0], "x": 7.5, "y": 3.75},
+                {"matrix": [7, 1], "x": 8.5, "y": 3.5},
+                {"matrix": [7, 2], "x": 9.5, "y": 3.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/centromere/info.json b/keyboards/centromere/keyboard.json
similarity index 100%
rename from keyboards/centromere/info.json
rename to keyboards/centromere/keyboard.json
diff --git a/keyboards/checkerboards/phoenix45_ortho/info.json b/keyboards/checkerboards/phoenix45_ortho/keyboard.json
similarity index 100%
rename from keyboards/checkerboards/phoenix45_ortho/info.json
rename to keyboards/checkerboards/phoenix45_ortho/keyboard.json
diff --git a/keyboards/checkerboards/quark/info.json b/keyboards/checkerboards/quark/keyboard.json
similarity index 100%
rename from keyboards/checkerboards/quark/info.json
rename to keyboards/checkerboards/quark/keyboard.json
diff --git a/keyboards/checkerboards/quark_squared/info.json b/keyboards/checkerboards/quark_squared/keyboard.json
similarity index 100%
rename from keyboards/checkerboards/quark_squared/info.json
rename to keyboards/checkerboards/quark_squared/keyboard.json
diff --git a/keyboards/chew/config.h b/keyboards/chew/config.h
new file mode 100644
index 00000000000..22b43cf799d
--- /dev/null
+++ b/keyboards/chew/config.h
@@ -0,0 +1,11 @@
+// Copyright 2024 Florent (@FLinguenheld)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+/* Flash */
+#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET              // Activates the double-tap behavior
+#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 200U // In ms in which the double tap can occur
+
+#define EE_HANDS
+#define SERIAL_USART_TX_PIN GP11
diff --git a/keyboards/chew/info.json b/keyboards/chew/info.json
new file mode 100644
index 00000000000..f6ddaa627d8
--- /dev/null
+++ b/keyboards/chew/info.json
@@ -0,0 +1,84 @@
+{
+    "manufacturer": "florent@linguenheld.fr",
+    "keyboard_name": "chew",
+    "maintainer": "florent@linguenheld.fr",
+    "bootloader": "rp2040",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "matrix_pins": {
+        "direct": [
+            ["GP4", "GP3", "GP2", "GP1", "GP0"],
+            ["GP15", "GP26", "GP27", "GP28", "GP29"],
+            ["GP14", "GP13", "GP9", "GP8", "NO_PIN"],
+            ["GP7", "GP6", "GP5", "NO_PIN", "NO_PIN"]
+        ]
+    },
+    "processor": "RP2040",
+    "split": {
+        "enabled": true,
+        "matrix_pins": {
+            "right": {
+                "direct": [
+                    ["GP0", "GP1", "GP2", "GP3", "GP4"],
+                    ["GP29", "GP28", "GP27", "GP26", "GP15"],
+                    ["GP8", "GP9", "GP13", "GP14", "NO_PIN"],
+                    ["GP5", "GP6", "GP7", "NO_PIN", "NO_PIN"]
+                ]
+            }
+        },
+        "transport": {
+            "watchdog": true
+        }
+    },
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x0000",
+        "vid": "0xFEED"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0.25},
+                {"matrix": [0, 1], "x": 1, "y": 0.125},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0.125},
+                {"matrix": [0, 4], "x": 4, "y": 0.25},
+                {"matrix": [4, 0], "x": 7, "y": 0.25},
+                {"matrix": [4, 1], "x": 8, "y": 0.125},
+                {"matrix": [4, 2], "x": 9, "y": 0},
+                {"matrix": [4, 3], "x": 10, "y": 0.125},
+                {"matrix": [4, 4], "x": 11, "y": 0.25},
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.125},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1.125},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [5, 0], "x": 7, "y": 1.25},
+                {"matrix": [5, 1], "x": 8, "y": 1.125},
+                {"matrix": [5, 2], "x": 9, "y": 1},
+                {"matrix": [5, 3], "x": 10, "y": 1.125},
+                {"matrix": [5, 4], "x": 11, "y": 1.25},
+                {"matrix": [2, 0], "x": 0, "y": 2.25},
+                {"matrix": [2, 1], "x": 1, "y": 2.125},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2.125},
+                {"matrix": [6, 0], "x": 8, "y": 2.125},
+                {"matrix": [6, 1], "x": 9, "y": 2},
+                {"matrix": [6, 2], "x": 10, "y": 2.125},
+                {"matrix": [6, 3], "x": 11, "y": 2.25},
+                {"matrix": [3, 0], "x": 2.5, "y": 3.25},
+                {"matrix": [3, 1], "x": 3.5, "y": 3.5},
+                {"matrix": [3, 2], "x": 4.5, "y": 3.75},
+                {"matrix": [7, 0], "x": 6.5, "y": 3.75},
+                {"matrix": [7, 1], "x": 7.5, "y": 3.5},
+                {"matrix": [7, 2], "x": 8.5, "y": 3.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/chew/keymaps/default/keymap.c b/keyboards/chew/keymaps/default/keymap.c
new file mode 100644
index 00000000000..541ddbdf1c3
--- /dev/null
+++ b/keyboards/chew/keymaps/default/keymap.c
@@ -0,0 +1,27 @@
+// Copyright 2024 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+     /*
+      * ┌───┬───┬───┬───┬───┐       ┌───┬───┬───┬───┬───┐
+      * │ Q │ W │ E │ R │ T │       │ Y │ U │ I │ O │ P │
+      * ├───┼───┼───┼───┼───┤       ├───┼───┼───┼───┼───┤
+      * │ A │ S │ D │ F │ G │       │ H │ J │ K │ L │ ; │
+      * ├───┼───┼───┼───┼───┘       └───┼───┼───┼───┼───┤
+      * │ Z │ X │ C │ V │               │ M │ , │ . │ / │
+      * └───┴───┴───┴───┘               └───┴───┴───┴───┘
+      *           ┌───┐                   ┌───┐
+      *           │ B ├───┐           ┌───┤ N │
+      *           └───┤Bsp├───┐   ┌───┤Ent├───┘
+      *               └───┤Alt│   │   ├───┘
+      *                   └───┘   └───┘
+      */
+    [0] = LAYOUT(
+        KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                               KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,
+        KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                               KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN,
+        KC_Z,    KC_X,    KC_C,    KC_V,                                                 KC_M,    KC_COMM, KC_DOT,  KC_SLSH,
+                                     KC_B, KC_BSPC, KC_RALT,           KC_SPC,  KC_ENT,  KC_N
+    )
+};
diff --git a/keyboards/chew/readme.md b/keyboards/chew/readme.md
new file mode 100644
index 00000000000..a08398ea0fa
--- /dev/null
+++ b/keyboards/chew/readme.md
@@ -0,0 +1,38 @@
+## Chew
+
+![Chew front photo](https://live.staticflickr.com/65535/53681212617_90e4eebaf9_o.jpg)
+![Chew front photo](https://live.staticflickr.com/65535/53682442119_1fcea26fef_o.jpg)
+
+A humble 34 key choc-spaced keyboard.
+
+- Keyboard Maintainer: [Florent Linguenheld](https://github.com/flinguenheld/)
+- Visit the repository to get the last release: [Chew](https://github.com/flinguenheld/chew)
+- Read the wiki to have some help or information: [Chew wiki](https://github.com/flinguenheld/chew/wiki)
+
+
+![squirrel](https://github.com/flinguenheld/chew/blob/main/images/squirrel_brown.png?raw=true)
+
+### Requirements
+
+- 2x PCB
+- 2x MCU board [RP2040-Zero](https://www.waveshare.com/wiki/RP2040-Zero)
+- 2x TRRS jack
+- 34 switches Choc V1 **only**
+- 34 keycaps Choc V1
+
+Optional:
+- 23 [Mill Max sockets](https://splitkb.com/collections/keyboard-parts/products/mill-max-low-profile-sockets)
+- 34 [kailh hotswap sockets](https://cdn.shopify.com/s/files/1/0588/1108/9090/files/5118-Choc-Socket.pdf?v=1686715063)
+- 2x Back PCB + screws and bolts
+- 2x [Tenting pucks](https://splitkb.com/collections/keyboard-parts/products/tenting-puck)
+- 2x [Tripods](https://www.manfrotto.com/us-en/pocket-support-large-black-mp3-bk/)
+
+### Bootloader
+
+The controller has two buttons, so you can enter the bootloader in 2 ways:
+
+- Maintain the **boot** button and plug the usb cable in.
+- Press twice the **reset** button.
+
+![hazelnuts](https://github.com/flinguenheld/chew/blob/main/images/hazelnuts.png?raw=true)
+![Chew back photo](https://live.staticflickr.com/65535/53682442124_677ffa6cb5_o.jpg)
diff --git a/keyboards/chew/rules.mk b/keyboards/chew/rules.mk
new file mode 100644
index 00000000000..161ec22b16e
--- /dev/null
+++ b/keyboards/chew/rules.mk
@@ -0,0 +1 @@
+SERIAL_DRIVER = vendor
diff --git a/keyboards/cipulot/chroma/info.json b/keyboards/cipulot/chroma/info.json
new file mode 100644
index 00000000000..5d418fdce1f
--- /dev/null
+++ b/keyboards/cipulot/chroma/info.json
@@ -0,0 +1,679 @@
+{
+    "manufacturer": "Cipulot",
+    "keyboard_name": "Chroma",
+    "maintainer": "Cipulot",
+    "bootloader": "stm32-dfu",
+    "build": {
+        "lto": true
+    },
+    "diode_direction": "COL2ROW",
+    "features": {
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "matrix_pins": {
+        "cols": ["A5", "A6", "A7", "B0", "B1", "B2", "B10", "B11", "B12", "A15", "B3", "B4", "B5", "B7", "B6"],
+        "rows": ["F0", "A2", "A3", "A4", "C15"]
+    },
+    "processor": "STM32F072",
+    "usb": {
+        "device_version": "0.0.1",
+        "pid": "0x6BBF",
+        "shared_endpoint": {
+            "keyboard": true
+        },
+        "vid": "0x6369"
+    },
+    "community_layouts": ["60_ansi_tsangan", "60_tsangan_hhkb", "60_ansi_wkl", "60_ansi_wkl_split_bs_rshift", "60_hhkb", "60_iso_tsangan", "60_iso_tsangan_split_bs_rshift", "60_iso_wkl", "60_iso_wkl_split_bs_rshift"],
+    "layouts": {
+        "LAYOUT_60_ansi_tsangan": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 14], "x": 13, "y": 0, "w": 2},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 7], "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_ansi_wkl": {
+            "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, 14], "x": 13, "y": 0, "w": 2},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 7], "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_ansi_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": [0, 14], "x": 14, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 7], "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_hhkb": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 7], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 12], "x": 12.5, "y": 4}
+            ]
+        },
+        "LAYOUT_60_iso_tsangan": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 14], "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, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"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": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 7], "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": [0, 14], "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, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"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": [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, 7], "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": {
+            "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, 14], "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, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"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": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 7], "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": [0, 14], "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, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"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": [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, 7], "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_tsangan_hhkb": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 7], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 12], "x": 12.5, "y": 4},
+                {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_all": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"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, 14], "x": 14, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.25},
+                {"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, 7], "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}
+            ]
+        }
+    }
+}
diff --git a/keyboards/cipulot/chroma/keymaps/60_ansi_tsangan/keymap.c b/keyboards/cipulot/chroma/keymaps/60_ansi_tsangan/keymap.c
new file mode 100644
index 00000000000..df27a14861a
--- /dev/null
+++ b/keyboards/cipulot/chroma/keymaps/60_ansi_tsangan/keymap.c
@@ -0,0 +1,43 @@
+/* Copyright 2023 Cipulot
+ *
+ * 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 3 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] = {
+    // clang-format off
+    [0] = LAYOUT_60_ansi_tsangan(
+        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, 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_UP,   _______,  _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUSE, _______, _______, _______,
+        _______, KC_LEFT, KC_DOWN, KC_RIGHT, _______, _______, _______, _______, _______, _______, _______,  _______,          _______,
+        _______,          _______, _______,  _______, _______, _______, _______, _______, _______, _______,  _______, _______,
+        _______, _______, _______,                             _______,                                      _______, _______, _______
+    ),
+    [2] = LAYOUT_60_ansi_tsangan(
+        QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______,                            _______,                                     _______, _______, _______
+    )
+    // clang-format on
+};
diff --git a/keyboards/cipulot/chroma/keymaps/60_ansi_wkl/keymap.c b/keyboards/cipulot/chroma/keymaps/60_ansi_wkl/keymap.c
new file mode 100644
index 00000000000..4bc80d1d24b
--- /dev/null
+++ b/keyboards/cipulot/chroma/keymaps/60_ansi_wkl/keymap.c
@@ -0,0 +1,43 @@
+/* Copyright 2023 Cipulot
+ *
+ * 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 3 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] = {
+    // clang-format off
+    [0] = LAYOUT_60_ansi_wkl(
+        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_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_UP,   _______,  _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUSE, _______, _______, _______,
+        _______, KC_LEFT, KC_DOWN, KC_RIGHT, _______, _______, _______, _______, _______, _______, _______,  _______,          _______,
+        _______,          _______, _______,  _______, _______, _______, _______, _______, _______, _______,  _______, _______,
+        _______,          _______,                             _______,                                      _______,          _______
+    ),
+    [2] = LAYOUT_60_ansi_wkl(
+        QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______,          _______,                            _______,                                     _______,          _______
+    )
+    // clang-format on
+};
diff --git a/keyboards/cipulot/chroma/keymaps/60_ansi_wkl_split_bs_rshift/keymap.c b/keyboards/cipulot/chroma/keymaps/60_ansi_wkl_split_bs_rshift/keymap.c
new file mode 100644
index 00000000000..e9cdf26567f
--- /dev/null
+++ b/keyboards/cipulot/chroma/keymaps/60_ansi_wkl_split_bs_rshift/keymap.c
@@ -0,0 +1,43 @@
+/* Copyright 2023 Cipulot
+ *
+ * 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 3 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] = {
+    // clang-format off
+    [0] = LAYOUT_60_ansi_wkl_split_bs_rshift(
+        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC,
+        KC_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_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_UP,   _______,  _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUSE, _______, _______, _______,
+        _______, KC_LEFT, KC_DOWN, KC_RIGHT, _______, _______, _______, _______, _______, _______, _______,  _______,          _______,
+        _______,          _______, _______,  _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______,
+        _______,          _______,                             _______,                                      _______,          MO(2)
+    ),
+    [2] = LAYOUT_60_ansi_wkl_split_bs_rshift(
+        QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______,          _______,                            _______,                                     _______,          _______
+    )
+    // clang-format on
+};
diff --git a/keyboards/cipulot/chroma/keymaps/60_iso_tsangan/keymap.c b/keyboards/cipulot/chroma/keymaps/60_iso_tsangan/keymap.c
new file mode 100644
index 00000000000..55492c3e4d4
--- /dev/null
+++ b/keyboards/cipulot/chroma/keymaps/60_iso_tsangan/keymap.c
@@ -0,0 +1,43 @@
+/* Copyright 2023 Cipulot
+ *
+ * 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 3 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] = {
+    // clang-format off
+    [0] = LAYOUT_60_iso_tsangan(
+        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_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_RCTL
+    ),
+    [1] = LAYOUT_60_iso_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_UP,   _______,  _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUSE, _______, _______,
+        _______, KC_LEFT, KC_DOWN, KC_RIGHT, _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______,
+        _______, _______, _______, _______,  _______, _______, _______, _______, _______, _______, _______,  _______, _______,
+        _______, _______, _______,                             _______,                                      _______, _______, _______
+    ),
+    [2] = LAYOUT_60_iso_tsangan(
+        QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______,                            _______,                                     _______, _______, _______
+    )
+    // clang-format on
+};
diff --git a/keyboards/cipulot/chroma/keymaps/60_iso_tsangan_split_bs_rshift/keymap.c b/keyboards/cipulot/chroma/keymaps/60_iso_tsangan_split_bs_rshift/keymap.c
new file mode 100644
index 00000000000..3cce7112447
--- /dev/null
+++ b/keyboards/cipulot/chroma/keymaps/60_iso_tsangan_split_bs_rshift/keymap.c
@@ -0,0 +1,43 @@
+/* Copyright 2023 Cipulot
+ *
+ * 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 3 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] = {
+    // clang-format off
+    [0] = LAYOUT_60_iso_tsangan_split_bs_rshift(
+        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC,
+        KC_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_RALT, KC_RGUI, KC_RCTL
+    ),
+    [1] = LAYOUT_60_iso_tsangan_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_UP,   _______,  _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUSE, _______, _______,
+        _______, KC_LEFT, KC_DOWN, KC_RIGHT, _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______,
+        _______, _______, _______, _______,  _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______,
+        _______, _______, _______,                             _______,                                      _______, _______, MO(2)
+    ),
+    [2] = LAYOUT_60_iso_tsangan_split_bs_rshift(
+        QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______,                            _______,                                     _______, _______, _______
+    )
+    // clang-format on
+};
diff --git a/keyboards/cipulot/chroma/keymaps/60_iso_wkl/keymap.c b/keyboards/cipulot/chroma/keymaps/60_iso_wkl/keymap.c
new file mode 100644
index 00000000000..01bb84f50d4
--- /dev/null
+++ b/keyboards/cipulot/chroma/keymaps/60_iso_wkl/keymap.c
@@ -0,0 +1,43 @@
+/* Copyright 2023 Cipulot
+ *
+ * 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 3 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] = {
+    // clang-format off
+    [0] = LAYOUT_60_iso_wkl(
+        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_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_LALT,                            KC_SPC,                                      KC_RALT,          KC_RCTL
+    ),
+    [1] = LAYOUT_60_iso_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_UP,   _______,  _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUSE, _______, _______,
+        _______, KC_LEFT, KC_DOWN, KC_RIGHT, _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______,
+        _______, _______, _______, _______,  _______, _______, _______, _______, _______, _______, _______,  _______, _______,
+        _______,          _______,                             _______,                                      _______,          _______
+    ),
+    [2] = LAYOUT_60_iso_wkl(
+        QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______,          _______,                            _______,                                     _______,          _______
+    )
+    // clang-format on
+};
diff --git a/keyboards/cipulot/chroma/keymaps/60_iso_wkl_split_bs_rshift/keymap.c b/keyboards/cipulot/chroma/keymaps/60_iso_wkl_split_bs_rshift/keymap.c
new file mode 100644
index 00000000000..d412f2a977d
--- /dev/null
+++ b/keyboards/cipulot/chroma/keymaps/60_iso_wkl_split_bs_rshift/keymap.c
@@ -0,0 +1,43 @@
+/* Copyright 2023 Cipulot
+ *
+ * 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 3 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] = {
+    // clang-format off
+    [0] = LAYOUT_60_iso_wkl_split_bs_rshift(
+        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC,
+        KC_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_LALT,                            KC_SPC,                                      KC_RALT,          KC_RCTL
+    ),
+    [1] = LAYOUT_60_iso_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_UP,   _______,  _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUSE, _______, _______,
+        _______, KC_LEFT, KC_DOWN, KC_RIGHT, _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______,
+        _______, _______, _______, _______,  _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______,
+        _______,          _______,                             _______,                                      _______,          MO(2)
+    ),
+    [2] = LAYOUT_60_iso_wkl_split_bs_rshift(
+        QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______,          _______,                            _______,                                     _______,          _______
+    )
+    // clang-format on
+};
diff --git a/keyboards/cipulot/chroma/keymaps/default/keymap.c b/keyboards/cipulot/chroma/keymaps/default/keymap.c
new file mode 100644
index 00000000000..c93d9110efe
--- /dev/null
+++ b/keyboards/cipulot/chroma/keymaps/default/keymap.c
@@ -0,0 +1,43 @@
+/* Copyright 2023 Cipulot
+ *
+ * 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 3 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] = {
+    // clang-format off
+    [0] = LAYOUT_all(
+        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_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_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_RALT, KC_RGUI, 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_UP,   _______,  _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUSE, _______, _______, _______,
+        _______, KC_LEFT, KC_DOWN, KC_RIGHT, _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______,
+        _______, _______, _______, _______,  _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______,
+        _______, _______, _______,                            _______,                                       _______, _______, MO(2)
+    ),
+    [2] = LAYOUT_all(
+        QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______,                            _______,                                     _______, _______, _______
+    )
+    // clang-format on
+};
diff --git a/keyboards/cipulot/chroma/keymaps/via/keymap.c b/keyboards/cipulot/chroma/keymaps/via/keymap.c
new file mode 100644
index 00000000000..c93d9110efe
--- /dev/null
+++ b/keyboards/cipulot/chroma/keymaps/via/keymap.c
@@ -0,0 +1,43 @@
+/* Copyright 2023 Cipulot
+ *
+ * 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 3 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] = {
+    // clang-format off
+    [0] = LAYOUT_all(
+        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_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_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_RALT, KC_RGUI, 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_UP,   _______,  _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUSE, _______, _______, _______,
+        _______, KC_LEFT, KC_DOWN, KC_RIGHT, _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______,
+        _______, _______, _______, _______,  _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______,
+        _______, _______, _______,                            _______,                                       _______, _______, MO(2)
+    ),
+    [2] = LAYOUT_all(
+        QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______,                            _______,                                     _______, _______, _______
+    )
+    // clang-format on
+};
diff --git a/keyboards/cipulot/chroma/keymaps/via/rules.mk b/keyboards/cipulot/chroma/keymaps/via/rules.mk
new file mode 100644
index 00000000000..1e5b99807cb
--- /dev/null
+++ b/keyboards/cipulot/chroma/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/cipulot/chroma/readme.md b/keyboards/cipulot/chroma/readme.md
new file mode 100644
index 00000000000..9a08bbecac1
--- /dev/null
+++ b/keyboards/cipulot/chroma/readme.md
@@ -0,0 +1,27 @@
+# Chroma
+
+![Chroma](https://i.imgur.com/clhRkDDh.png)
+
+A 60% hot swap PCB for MX switches.
+
+* Keyboard Maintainer: [cipulot](https://github.com/cipulot)
+* Hardware Supported: Chroma
+* Hardware Availability: [Eloquent Clicks](https://eloquentclicks.com/)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make cipulot/chroma:default
+
+Flashing example for this keyboard:
+
+    make cipulot/chroma: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:
+
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is configured.
+* **Physical reset button**: Long press the reset button soldered on the PCB.
+* **Bootmagic reset**: Hold down the top left key and plug in the controller.
diff --git a/keyboards/ferris/0_2/bling/rules.mk b/keyboards/cipulot/chroma/rules.mk
similarity index 100%
rename from keyboards/ferris/0_2/bling/rules.mk
rename to keyboards/cipulot/chroma/rules.mk
diff --git a/keyboards/cipulot/ec_23u/config.h b/keyboards/cipulot/ec_23u/config.h
index 3a3d482e3d3..f5b74b9e600 100644
--- a/keyboards/cipulot/ec_23u/config.h
+++ b/keyboards/cipulot/ec_23u/config.h
@@ -62,8 +62,3 @@
 
 #define EECONFIG_KB_DATA_SIZE 57
 
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/cipulot/ec_23u/info.json b/keyboards/cipulot/ec_23u/info.json
deleted file mode 100644
index 0f656f8e8ca..00000000000
--- a/keyboards/cipulot/ec_23u/info.json
+++ /dev/null
@@ -1,104 +0,0 @@
-{
-    "manufacturer": "Cipulot",
-    "keyboard_name": "EC 23U",
-    "maintainer": "Cipulot",
-    "bootloader": "stm32-dfu",
-    "build": {
-        "lto": true
-    },
-    "diode_direction": "COL2ROW",
-    "features": {
-        "bootmagic": false,
-        "console": true,
-        "extrakey": true,
-        "mousekey": true,
-        "nkro": true,
-        "rgblight": true
-    },
-    "indicators": {
-        "num_lock": "B14"
-    },
-    "processor": "STM32F401",
-    "rgblight": {
-        "led_count": 21,
-        "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
-        }
-    },
-    "ws2812": {
-        "pin": "B5"
-    },
-    "url": "https://www.github.com/Cipulot/EC23U",
-    "usb": {
-        "device_version": "0.0.1",
-        "pid": "0x6B95",
-        "shared_endpoint": {
-            "keyboard": true
-        },
-        "vid": "0x6369"
-    },
-    "layouts": {
-        "LAYOUT_all": {
-            "layout": [
-                {"label": "0,0", "matrix": [0, 0], "x": 0.0, "y": 0.0},
-                {"label": "0,1", "matrix": [0, 1], "x": 1.0, "y": 0.0},
-                {"label": "0,2", "matrix": [0, 2], "x": 2.0, "y": 0.0},
-                {"label": "0,3", "matrix": [0, 3], "x": 3.0, "y": 0.0},
-                {"label": "1,0", "matrix": [1, 0], "x": 0.0, "y": 1.5},
-                {"label": "1,1", "matrix": [1, 1], "x": 1.0, "y": 1.5},
-                {"label": "1,2", "matrix": [1, 2], "x": 2.0, "y": 1.5},
-                {"label": "1,3", "matrix": [1, 3], "x": 3.0, "y": 1.5},
-                {"label": "2,0", "matrix": [2, 0], "x": 0.0, "y": 2.5},
-                {"label": "2,1", "matrix": [2, 1], "x": 1.0, "y": 2.5},
-                {"label": "2,2", "matrix": [2, 2], "x": 2.0, "y": 2.5},
-                {"label": "2,3", "matrix": [2, 3], "x": 3.0, "y": 2.5},
-                {"label": "3,0", "matrix": [3, 0], "x": 0.0, "y": 3.5},
-                {"label": "3,1", "matrix": [3, 1], "x": 1.0, "y": 3.5},
-                {"label": "3,2", "matrix": [3, 2], "x": 2.0, "y": 3.5},
-                {"label": "3,3", "matrix": [3, 3], "x": 3.0, "y": 3.5},
-                {"label": "2,4", "matrix": [2, 4], "x": 0.0, "y": 4.5},
-                {"label": "0,4", "matrix": [0, 4], "x": 1.0, "y": 4.5},
-                {"label": "1,4", "matrix": [1, 4], "x": 2.0, "y": 4.5},
-                {"label": "3,4", "matrix": [3, 4], "x": 3.0, "y": 4.5},
-                {"label": "2,5", "matrix": [2, 5], "x": 0.0, "y": 5.5},
-                {"label": "0,5", "matrix": [0, 5], "x": 1.0, "y": 5.5},
-                {"label": "1,5", "matrix": [1, 5], "x": 2.0, "y": 5.5},
-                {"label": "3,5", "matrix": [3, 5], "x": 3.0, "y": 5.5}
-            ]
-        },
-        "LAYOUT_numpad_6x4": {
-            "layout": [
-                {"label": "0,0", "matrix": [0, 0], "x": 0.0, "y": 0.0},
-                {"label": "0,1", "matrix": [0, 1], "x": 1.0, "y": 0.0},
-                {"label": "0,2", "matrix": [0, 2], "x": 2.0, "y": 0.0},
-                {"label": "0,3", "matrix": [0, 3], "x": 3.0, "y": 0.0},
-                {"label": "1,0", "matrix": [1, 0], "x": 0.0, "y": 1.5},
-                {"label": "1,1", "matrix": [1, 1], "x": 1.0, "y": 1.5},
-                {"label": "1,2", "matrix": [1, 2], "x": 2.0, "y": 1.5},
-                {"label": "1,3", "matrix": [1, 3], "x": 3.0, "y": 1.5},
-                {"label": "2,0", "matrix": [2, 0], "x": 0.0, "y": 2.5},
-                {"label": "2,1", "matrix": [2, 1], "x": 1.0, "y": 2.5},
-                {"label": "2,2", "matrix": [2, 2], "x": 2.0, "y": 2.5},
-                {"h": 2, "label": "3,3", "matrix": [3, 3], "x": 3.0, "y": 2.5},
-                {"label": "3,0", "matrix": [3, 0], "x": 0.0, "y": 3.5},
-                {"label": "3,1", "matrix": [3, 1], "x": 1.0, "y": 3.5},
-                {"label": "3,2", "matrix": [3, 2], "x": 2.0, "y": 3.5},
-                {"label": "2,4", "matrix": [2, 4], "x": 0.0, "y": 4.5},
-                {"label": "0,4", "matrix": [0, 4], "x": 1.0, "y": 4.5},
-                {"label": "1,4", "matrix": [1, 4], "x": 2.0, "y": 4.5},
-                {"h": 2, "label": "3,4", "matrix": [3, 4], "x": 3.0, "y": 4.5},
-                {"label": "2,5", "matrix": [2, 5], "w": 2, "x": 0.0, "y": 5.5},
-                {"label": "1,5", "matrix": [1, 5], "x": 2.0, "y": 5.5}
-            ]
-        }
-    }
-}
diff --git a/keyboards/cipulot/ec_23u/keyboard.json b/keyboards/cipulot/ec_23u/keyboard.json
new file mode 100644
index 00000000000..17aa5eb6e7a
--- /dev/null
+++ b/keyboards/cipulot/ec_23u/keyboard.json
@@ -0,0 +1,110 @@
+{
+    "manufacturer": "Cipulot",
+    "keyboard_name": "EC 23U",
+    "maintainer": "Cipulot",
+    "bootloader": "stm32-dfu",
+    "build": {
+        "lto": true
+    },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": false,
+        "console": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgblight": true
+    },
+    "indicators": {
+        "num_lock": "B14"
+    },
+    "processor": "STM32F401",
+    "rgblight": {
+        "led_count": 21,
+        "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
+        }
+    },
+    "ws2812": {
+        "pin": "B5"
+    },
+    "url": "https://www.github.com/Cipulot/EC23U",
+    "usb": {
+        "device_version": "0.0.1",
+        "pid": "0x6B95",
+        "shared_endpoint": {
+            "keyboard": true
+        },
+        "vid": "0x6369"
+    },
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                {"label": "0,0", "matrix": [0, 0], "x": 0.0, "y": 0.0},
+                {"label": "0,1", "matrix": [0, 1], "x": 1.0, "y": 0.0},
+                {"label": "0,2", "matrix": [0, 2], "x": 2.0, "y": 0.0},
+                {"label": "0,3", "matrix": [0, 3], "x": 3.0, "y": 0.0},
+                {"label": "1,0", "matrix": [1, 0], "x": 0.0, "y": 1.5},
+                {"label": "1,1", "matrix": [1, 1], "x": 1.0, "y": 1.5},
+                {"label": "1,2", "matrix": [1, 2], "x": 2.0, "y": 1.5},
+                {"label": "1,3", "matrix": [1, 3], "x": 3.0, "y": 1.5},
+                {"label": "2,0", "matrix": [2, 0], "x": 0.0, "y": 2.5},
+                {"label": "2,1", "matrix": [2, 1], "x": 1.0, "y": 2.5},
+                {"label": "2,2", "matrix": [2, 2], "x": 2.0, "y": 2.5},
+                {"label": "2,3", "matrix": [2, 3], "x": 3.0, "y": 2.5},
+                {"label": "3,0", "matrix": [3, 0], "x": 0.0, "y": 3.5},
+                {"label": "3,1", "matrix": [3, 1], "x": 1.0, "y": 3.5},
+                {"label": "3,2", "matrix": [3, 2], "x": 2.0, "y": 3.5},
+                {"label": "3,3", "matrix": [3, 3], "x": 3.0, "y": 3.5},
+                {"label": "2,4", "matrix": [2, 4], "x": 0.0, "y": 4.5},
+                {"label": "0,4", "matrix": [0, 4], "x": 1.0, "y": 4.5},
+                {"label": "1,4", "matrix": [1, 4], "x": 2.0, "y": 4.5},
+                {"label": "3,4", "matrix": [3, 4], "x": 3.0, "y": 4.5},
+                {"label": "2,5", "matrix": [2, 5], "x": 0.0, "y": 5.5},
+                {"label": "0,5", "matrix": [0, 5], "x": 1.0, "y": 5.5},
+                {"label": "1,5", "matrix": [1, 5], "x": 2.0, "y": 5.5},
+                {"label": "3,5", "matrix": [3, 5], "x": 3.0, "y": 5.5}
+            ]
+        },
+        "LAYOUT_numpad_6x4": {
+            "layout": [
+                {"label": "0,0", "matrix": [0, 0], "x": 0.0, "y": 0.0},
+                {"label": "0,1", "matrix": [0, 1], "x": 1.0, "y": 0.0},
+                {"label": "0,2", "matrix": [0, 2], "x": 2.0, "y": 0.0},
+                {"label": "0,3", "matrix": [0, 3], "x": 3.0, "y": 0.0},
+                {"label": "1,0", "matrix": [1, 0], "x": 0.0, "y": 1.5},
+                {"label": "1,1", "matrix": [1, 1], "x": 1.0, "y": 1.5},
+                {"label": "1,2", "matrix": [1, 2], "x": 2.0, "y": 1.5},
+                {"label": "1,3", "matrix": [1, 3], "x": 3.0, "y": 1.5},
+                {"label": "2,0", "matrix": [2, 0], "x": 0.0, "y": 2.5},
+                {"label": "2,1", "matrix": [2, 1], "x": 1.0, "y": 2.5},
+                {"label": "2,2", "matrix": [2, 2], "x": 2.0, "y": 2.5},
+                {"h": 2, "label": "3,3", "matrix": [3, 3], "x": 3.0, "y": 2.5},
+                {"label": "3,0", "matrix": [3, 0], "x": 0.0, "y": 3.5},
+                {"label": "3,1", "matrix": [3, 1], "x": 1.0, "y": 3.5},
+                {"label": "3,2", "matrix": [3, 2], "x": 2.0, "y": 3.5},
+                {"label": "2,4", "matrix": [2, 4], "x": 0.0, "y": 4.5},
+                {"label": "0,4", "matrix": [0, 4], "x": 1.0, "y": 4.5},
+                {"label": "1,4", "matrix": [1, 4], "x": 2.0, "y": 4.5},
+                {"h": 2, "label": "3,4", "matrix": [3, 4], "x": 3.0, "y": 4.5},
+                {"label": "2,5", "matrix": [2, 5], "w": 2, "x": 0.0, "y": 5.5},
+                {"label": "1,5", "matrix": [1, 5], "x": 2.0, "y": 5.5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/cipulot/ec_23u/rules.mk b/keyboards/cipulot/ec_23u/rules.mk
index ab6c37cad43..318e0215ce9 100644
--- a/keyboards/cipulot/ec_23u/rules.mk
+++ b/keyboards/cipulot/ec_23u/rules.mk
@@ -1,4 +1,5 @@
 CUSTOM_MATRIX = lite
 ANALOG_DRIVER_REQUIRED = yes
-SRC += keyboards/cipulot/common/matrix.c keyboards/cipulot/common/ec_board.c keyboards/cipulot/common/ec_switch_matrix.c
+VPATH += keyboards/cipulot/common
+SRC += matrix.c ec_board.c ec_switch_matrix.c
 OPT = 2
diff --git a/keyboards/cipulot/ec_60/config.h b/keyboards/cipulot/ec_60/config.h
index c936b248c45..24525501439 100644
--- a/keyboards/cipulot/ec_60/config.h
+++ b/keyboards/cipulot/ec_60/config.h
@@ -64,9 +64,3 @@
 // #define DEBUG_MATRIX_SCAN_RATE
 
 #define EECONFIG_KB_DATA_SIZE 159
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/cipulot/ec_60/info.json b/keyboards/cipulot/ec_60/info.json
deleted file mode 100644
index a86b20bfd63..00000000000
--- a/keyboards/cipulot/ec_60/info.json
+++ /dev/null
@@ -1,302 +0,0 @@
-{
-    "manufacturer": "Cipulot",
-    "keyboard_name": "EC 60",
-    "maintainer": "Cipulot",
-    "bootloader": "stm32-dfu",
-    "build": {
-        "lto": true
-    },
-    "diode_direction": "COL2ROW",
-    "features": {
-        "bootmagic": false,
-        "console": true,
-        "extrakey": true,
-        "mousekey": true,
-        "nkro": true
-    },
-    "processor": "STM32F401",
-    "url": "https://www.github.com/Cipulot/EC60",
-    "usb": {
-        "device_version": "0.0.1",
-        "pid": "0x6B84",
-        "shared_endpoint": {
-            "keyboard": true
-        },
-        "vid": "0x6369"
-    },
-    "layouts": {
-        "LAYOUT_all": {
-            "layout": [
-                {"label": "0,0", "matrix": [0, 0], "x": 0.0, "y": 0.0},
-                {"label": "0,1", "matrix": [0, 1], "x": 1.0, "y": 0.0},
-                {"label": "0,2", "matrix": [0, 2], "x": 2.0, "y": 0.0},
-                {"label": "0,3", "matrix": [0, 3], "x": 3.0, "y": 0.0},
-                {"label": "0,4", "matrix": [0, 4], "x": 4.0, "y": 0.0},
-                {"label": "0,5", "matrix": [0, 5], "x": 5.0, "y": 0.0},
-                {"label": "0,6", "matrix": [0, 6], "x": 6.0, "y": 0.0},
-                {"label": "0,7", "matrix": [0, 7], "x": 7.0, "y": 0.0},
-                {"label": "0,8", "matrix": [0, 8], "x": 8.0, "y": 0.0},
-                {"label": "0,9", "matrix": [0, 9], "x": 9.0, "y": 0.0},
-                {"label": "0,10", "matrix": [0, 10], "x": 10.0, "y": 0.0},
-                {"label": "0,11", "matrix": [0, 11], "x": 11.0, "y": 0.0},
-                {"label": "0,12", "matrix": [0, 12], "x": 12.0, "y": 0.0},
-                {"label": "0,13", "matrix": [0, 13], "x": 13.0, "y": 0.0},
-                {"label": "0,14", "matrix": [0, 14], "x": 14.0, "y": 0.0},
-                {"label": "1,0", "matrix": [1, 0], "w": 1.5, "x": 0.0, "y": 1.0},
-                {"label": "1,1", "matrix": [1, 1], "x": 1.5, "y": 1.0},
-                {"label": "1,2", "matrix": [1, 2], "x": 2.5, "y": 1.0},
-                {"label": "1,3", "matrix": [1, 3], "x": 3.5, "y": 1.0},
-                {"label": "1,4", "matrix": [1, 4], "x": 4.5, "y": 1.0},
-                {"label": "1,5", "matrix": [1, 5], "x": 5.5, "y": 1.0},
-                {"label": "1,6", "matrix": [1, 6], "x": 6.5, "y": 1.0},
-                {"label": "1,7", "matrix": [1, 7], "x": 7.5, "y": 1.0},
-                {"label": "1,8", "matrix": [1, 8], "x": 8.5, "y": 1.0},
-                {"label": "1,9", "matrix": [1, 9], "x": 9.5, "y": 1.0},
-                {"label": "1,10", "matrix": [1, 10], "x": 10.5, "y": 1.0},
-                {"label": "1,11", "matrix": [1, 11], "x": 11.5, "y": 1.0},
-                {"label": "1,12", "matrix": [1, 12], "x": 12.5, "y": 1.0},
-                {"label": "1,13", "matrix": [1, 13], "w": 1.5, "x": 13.5, "y": 1.0},
-                {"label": "2,0", "matrix": [2, 0], "w": 1.75, "x": 0.0, "y": 2.0},
-                {"label": "2,1", "matrix": [2, 1], "x": 1.75, "y": 2.0},
-                {"label": "2,2", "matrix": [2, 2], "x": 2.75, "y": 2.0},
-                {"label": "2,3", "matrix": [2, 3], "x": 3.75, "y": 2.0},
-                {"label": "2,4", "matrix": [2, 4], "x": 4.75, "y": 2.0},
-                {"label": "2,5", "matrix": [2, 5], "x": 5.75, "y": 2.0},
-                {"label": "2,6", "matrix": [2, 6], "x": 6.75, "y": 2.0},
-                {"label": "2,7", "matrix": [2, 7], "x": 7.75, "y": 2.0},
-                {"label": "2,8", "matrix": [2, 8], "x": 8.75, "y": 2.0},
-                {"label": "2,9", "matrix": [2, 9], "x": 9.75, "y": 2.0},
-                {"label": "2,10", "matrix": [2, 10], "x": 10.75, "y": 2.0},
-                {"label": "2,11", "matrix": [2, 11], "x": 11.75, "y": 2.0},
-                {"label": "2,12", "matrix": [2, 12], "x": 12.75, "y": 2.0},
-                {"label": "2,13", "matrix": [2, 13], "w": 1.25, "x": 13.75, "y": 2.0},
-                {"label": "3,0", "matrix": [3, 0], "w": 1.25, "x": 0.0, "y": 3.0},
-                {"label": "3,1", "matrix": [3, 1], "x": 1.25, "y": 3.0},
-                {"label": "3,2", "matrix": [3, 2], "x": 2.25, "y": 3.0},
-                {"label": "3,3", "matrix": [3, 3], "x": 3.25, "y": 3.0},
-                {"label": "3,4", "matrix": [3, 4], "x": 4.25, "y": 3.0},
-                {"label": "3,5", "matrix": [3, 5], "x": 5.25, "y": 3.0},
-                {"label": "3,6", "matrix": [3, 6], "x": 6.25, "y": 3.0},
-                {"label": "3,7", "matrix": [3, 7], "x": 7.25, "y": 3.0},
-                {"label": "3,8", "matrix": [3, 8], "x": 8.25, "y": 3.0},
-                {"label": "3,9", "matrix": [3, 9], "x": 9.25, "y": 3.0},
-                {"label": "3,10", "matrix": [3, 10], "x": 10.25, "y": 3.0},
-                {"label": "3,11", "matrix": [3, 11], "x": 11.25, "y": 3.0},
-                {"label": "3,12", "matrix": [3, 12], "w": 0.75, "x": 12.25, "y": 3.0},
-                {"label": "3,13", "matrix": [3, 13], "w": 0.5, "x": 13.0, "y": 3.0},
-                {"label": "3,14", "matrix": [3, 14], "w": 0.5, "x": 13.5, "y": 3.0},
-                {"label": "4,13", "matrix": [4, 13], "w": 0.5, "x": 14.0, "y": 3.0},
-                {"label": "4,14", "matrix": [4, 14], "w": 0.5, "x": 14.5, "y": 3.0},
-                {"label": "4,0", "matrix": [4, 0], "w": 1.5, "x": 0.0, "y": 4.0},
-                {"label": "4,1", "matrix": [4, 1], "x": 1.5, "y": 4.0},
-                {"label": "4,2", "matrix": [4, 2], "w": 1.5, "x": 2.5, "y": 4.0},
-                {"label": "4,4", "matrix": [4, 4], "w": 1.5, "x": 4.0, "y": 4.0},
-                {"label": "4,5", "matrix": [4, 5], "w": 1.25, "x": 5.5, "y": 4.0},
-                {"label": "4,6", "matrix": [4, 6], "w": 1.25, "x": 6.75, "y": 4.0},
-                {"label": "4,7", "matrix": [4, 7], "w": 1.5, "x": 8.0, "y": 4.0},
-                {"label": "4,9", "matrix": [4, 9], "w": 1.5, "x": 9.5, "y": 4.0},
-                {"label": "4,10", "matrix": [4, 10], "w": 1.5, "x": 11.0, "y": 4.0},
-                {"label": "4,11", "matrix": [4, 11], "x": 12.5, "y": 4.0},
-                {"label": "4,12", "matrix": [4, 12], "w": 1.5, "x": 13.5, "y": 4.0}
-            ]
-        },
-        "LAYOUT_60_ansi_tsangan": {
-            "layout": [
-                {"label": "0,0", "matrix": [0, 0], "x": 0.0, "y": 0.0},
-                {"label": "0,1", "matrix": [0, 1], "x": 1.0, "y": 0.0},
-                {"label": "0,2", "matrix": [0, 2], "x": 2.0, "y": 0.0},
-                {"label": "0,3", "matrix": [0, 3], "x": 3.0, "y": 0.0},
-                {"label": "0,4", "matrix": [0, 4], "x": 4.0, "y": 0.0},
-                {"label": "0,5", "matrix": [0, 5], "x": 5.0, "y": 0.0},
-                {"label": "0,6", "matrix": [0, 6], "x": 6.0, "y": 0.0},
-                {"label": "0,7", "matrix": [0, 7], "x": 7.0, "y": 0.0},
-                {"label": "0,8", "matrix": [0, 8], "x": 8.0, "y": 0.0},
-                {"label": "0,9", "matrix": [0, 9], "x": 9.0, "y": 0.0},
-                {"label": "0,10", "matrix": [0, 10], "x": 10.0, "y": 0.0},
-                {"label": "0,11", "matrix": [0, 11], "x": 11.0, "y": 0.0},
-                {"label": "0,12", "matrix": [0, 12], "x": 12.0, "y": 0.0},
-                {"label": "0,14", "matrix": [0, 14], "w": 2, "x": 13.0, "y": 0.0},
-                {"label": "1,0", "matrix": [1, 0], "w": 1.5, "x": 0.0, "y": 1.0},
-                {"label": "1,1", "matrix": [1, 1], "x": 1.5, "y": 1.0},
-                {"label": "1,2", "matrix": [1, 2], "x": 2.5, "y": 1.0},
-                {"label": "1,3", "matrix": [1, 3], "x": 3.5, "y": 1.0},
-                {"label": "1,4", "matrix": [1, 4], "x": 4.5, "y": 1.0},
-                {"label": "1,5", "matrix": [1, 5], "x": 5.5, "y": 1.0},
-                {"label": "1,6", "matrix": [1, 6], "x": 6.5, "y": 1.0},
-                {"label": "1,7", "matrix": [1, 7], "x": 7.5, "y": 1.0},
-                {"label": "1,8", "matrix": [1, 8], "x": 8.5, "y": 1.0},
-                {"label": "1,9", "matrix": [1, 9], "x": 9.5, "y": 1.0},
-                {"label": "1,10", "matrix": [1, 10], "x": 10.5, "y": 1.0},
-                {"label": "1,11", "matrix": [1, 11], "x": 11.5, "y": 1.0},
-                {"label": "1,12", "matrix": [1, 12], "x": 12.5, "y": 1.0},
-                {"label": "1,13", "matrix": [1, 13], "w": 1.5, "x": 13.5, "y": 1.0},
-                {"label": "2,0", "matrix": [2, 0], "w": 1.75, "x": 0.0, "y": 2.0},
-                {"label": "2,1", "matrix": [2, 1], "x": 1.75, "y": 2.0},
-                {"label": "2,2", "matrix": [2, 2], "x": 2.75, "y": 2.0},
-                {"label": "2,3", "matrix": [2, 3], "x": 3.75, "y": 2.0},
-                {"label": "2,4", "matrix": [2, 4], "x": 4.75, "y": 2.0},
-                {"label": "2,5", "matrix": [2, 5], "x": 5.75, "y": 2.0},
-                {"label": "2,6", "matrix": [2, 6], "x": 6.75, "y": 2.0},
-                {"label": "2,7", "matrix": [2, 7], "x": 7.75, "y": 2.0},
-                {"label": "2,8", "matrix": [2, 8], "x": 8.75, "y": 2.0},
-                {"label": "2,9", "matrix": [2, 9], "x": 9.75, "y": 2.0},
-                {"label": "2,10", "matrix": [2, 10], "x": 10.75, "y": 2.0},
-                {"label": "2,11", "matrix": [2, 11], "x": 11.75, "y": 2.0},
-                {"label": "2,13", "matrix": [2, 13], "w": 2.25, "x": 12.75, "y": 2.0},
-                {"label": "3,0", "matrix": [3, 0], "w": 2.25, "x": 0.0, "y": 3.0},
-                {"label": "3,2", "matrix": [3, 2], "x": 2.25, "y": 3.0},
-                {"label": "3,3", "matrix": [3, 3], "x": 3.25, "y": 3.0},
-                {"label": "3,4", "matrix": [3, 4], "x": 4.25, "y": 3.0},
-                {"label": "3,5", "matrix": [3, 5], "x": 5.25, "y": 3.0},
-                {"label": "3,6", "matrix": [3, 6], "x": 6.25, "y": 3.0},
-                {"label": "3,7", "matrix": [3, 7], "x": 7.25, "y": 3.0},
-                {"label": "3,8", "matrix": [3, 8], "x": 8.25, "y": 3.0},
-                {"label": "3,9", "matrix": [3, 9], "x": 9.25, "y": 3.0},
-                {"label": "3,10", "matrix": [3, 10], "x": 10.25, "y": 3.0},
-                {"label": "3,11", "matrix": [3, 11], "x": 11.25, "y": 3.0},
-                {"label": "4,13", "matrix": [4, 13], "w": 2.75, "x": 12.25, "y": 3.0},
-                {"label": "4,0", "matrix": [4, 0], "w": 1.5, "x": 0.0, "y": 4.0},
-                {"label": "4,1", "matrix": [4, 1], "x": 1.5, "y": 4.0},
-                {"label": "4,2", "matrix": [4, 2], "w": 1.5, "x": 2.5, "y": 4.0},
-                {"label": "4,6", "matrix": [4, 6], "w": 7, "x": 4.0, "y": 4.0},
-                {"label": "4,10", "matrix": [4, 10], "w": 1.5, "x": 11.0, "y": 4.0},
-                {"label": "4,11", "matrix": [4, 11], "x": 12.5, "y": 4.0},
-                {"label": "4,12", "matrix": [4, 12], "w": 1.5, "x": 13.5, "y": 4.0}
-            ]
-        },
-        "LAYOUT_60_iso_tsangan": {
-            "layout": [
-                {"label": "0,0", "matrix": [0, 0], "x": 0.0, "y": 0.0},
-                {"label": "0,1", "matrix": [0, 1], "x": 1.0, "y": 0.0},
-                {"label": "0,2", "matrix": [0, 2], "x": 2.0, "y": 0.0},
-                {"label": "0,3", "matrix": [0, 3], "x": 3.0, "y": 0.0},
-                {"label": "0,4", "matrix": [0, 4], "x": 4.0, "y": 0.0},
-                {"label": "0,5", "matrix": [0, 5], "x": 5.0, "y": 0.0},
-                {"label": "0,6", "matrix": [0, 6], "x": 6.0, "y": 0.0},
-                {"label": "0,7", "matrix": [0, 7], "x": 7.0, "y": 0.0},
-                {"label": "0,8", "matrix": [0, 8], "x": 8.0, "y": 0.0},
-                {"label": "0,9", "matrix": [0, 9], "x": 9.0, "y": 0.0},
-                {"label": "0,10", "matrix": [0, 10], "x": 10.0, "y": 0.0},
-                {"label": "0,11", "matrix": [0, 11], "x": 11.0, "y": 0.0},
-                {"label": "0,12", "matrix": [0, 12], "x": 12.0, "y": 0.0},
-                {"label": "0,14", "matrix": [0, 14], "w": 2, "x": 13.0, "y": 0.0},
-                {"label": "1,0", "matrix": [1, 0], "w": 1.5, "x": 0.0, "y": 1.0},
-                {"label": "1,1", "matrix": [1, 1], "x": 1.5, "y": 1.0},
-                {"label": "1,2", "matrix": [1, 2], "x": 2.5, "y": 1.0},
-                {"label": "1,3", "matrix": [1, 3], "x": 3.5, "y": 1.0},
-                {"label": "1,4", "matrix": [1, 4], "x": 4.5, "y": 1.0},
-                {"label": "1,5", "matrix": [1, 5], "x": 5.5, "y": 1.0},
-                {"label": "1,6", "matrix": [1, 6], "x": 6.5, "y": 1.0},
-                {"label": "1,7", "matrix": [1, 7], "x": 7.5, "y": 1.0},
-                {"label": "1,8", "matrix": [1, 8], "x": 8.5, "y": 1.0},
-                {"label": "1,9", "matrix": [1, 9], "x": 9.5, "y": 1.0},
-                {"label": "1,10", "matrix": [1, 10], "x": 10.5, "y": 1.0},
-                {"label": "1,11", "matrix": [1, 11], "x": 11.5, "y": 1.0},
-                {"label": "1,12", "matrix": [1, 12], "x": 12.5, "y": 1.0},
-                {"h": 2, "label": "1,13", "matrix": [1, 13], "w": 1.25, "x": 13.75, "y": 1.0},
-                {"label": "2,0", "matrix": [2, 0], "w": 1.75, "x": 0.0, "y": 2.0},
-                {"label": "2,1", "matrix": [2, 1], "x": 1.75, "y": 2.0},
-                {"label": "2,2", "matrix": [2, 2], "x": 2.75, "y": 2.0},
-                {"label": "2,3", "matrix": [2, 3], "x": 3.75, "y": 2.0},
-                {"label": "2,4", "matrix": [2, 4], "x": 4.75, "y": 2.0},
-                {"label": "2,5", "matrix": [2, 5], "x": 5.75, "y": 2.0},
-                {"label": "2,6", "matrix": [2, 6], "x": 6.75, "y": 2.0},
-                {"label": "2,7", "matrix": [2, 7], "x": 7.75, "y": 2.0},
-                {"label": "2,8", "matrix": [2, 8], "x": 8.75, "y": 2.0},
-                {"label": "2,9", "matrix": [2, 9], "x": 9.75, "y": 2.0},
-                {"label": "2,10", "matrix": [2, 10], "x": 10.75, "y": 2.0},
-                {"label": "2,11", "matrix": [2, 11], "x": 11.75, "y": 2.0},
-                {"label": "2,12", "matrix": [2, 12], "x": 12.75, "y": 2.0},
-                {"label": "3,0", "matrix": [3, 0], "w": 1.25, "x": 0.0, "y": 3.0},
-                {"label": "3,1", "matrix": [3, 1], "x": 1.25, "y": 3.0},
-                {"label": "3,2", "matrix": [3, 2], "x": 2.25, "y": 3.0},
-                {"label": "3,3", "matrix": [3, 3], "x": 3.25, "y": 3.0},
-                {"label": "3,4", "matrix": [3, 4], "x": 4.25, "y": 3.0},
-                {"label": "3,5", "matrix": [3, 5], "x": 5.25, "y": 3.0},
-                {"label": "3,6", "matrix": [3, 6], "x": 6.25, "y": 3.0},
-                {"label": "3,7", "matrix": [3, 7], "x": 7.25, "y": 3.0},
-                {"label": "3,8", "matrix": [3, 8], "x": 8.25, "y": 3.0},
-                {"label": "3,9", "matrix": [3, 9], "x": 9.25, "y": 3.0},
-                {"label": "3,10", "matrix": [3, 10], "x": 10.25, "y": 3.0},
-                {"label": "3,11", "matrix": [3, 11], "x": 11.25, "y": 3.0},
-                {"label": "4,13", "matrix": [4, 13], "w": 2.75, "x": 12.25, "y": 3.0},
-                {"label": "4,0", "matrix": [4, 0], "w": 1.5, "x": 0.0, "y": 4.0},
-                {"label": "4,1", "matrix": [4, 1], "x": 1.5, "y": 4.0},
-                {"label": "4,2", "matrix": [4, 2], "w": 1.5, "x": 2.5, "y": 4.0},
-                {"label": "4,6", "matrix": [4, 6], "w": 7, "x": 4.0, "y": 4.0},
-                {"label": "4,10", "matrix": [4, 10], "w": 1.5, "x": 11.0, "y": 4.0},
-                {"label": "4,11", "matrix": [4, 11], "x": 12.5, "y": 4.0},
-                {"label": "4,12", "matrix": [4, 12], "w": 1.5, "x": 13.5, "y": 4.0}
-            ]
-        },
-        "LAYOUT_60_jis": {
-            "layout": [
-                {"label": "0,0", "matrix": [0, 0], "x": 0.0, "y": 0.0},
-                {"label": "0,1", "matrix": [0, 1], "x": 1.0, "y": 0.0},
-                {"label": "0,2", "matrix": [0, 2], "x": 2.0, "y": 0.0},
-                {"label": "0,3", "matrix": [0, 3], "x": 3.0, "y": 0.0},
-                {"label": "0,4", "matrix": [0, 4], "x": 4.0, "y": 0.0},
-                {"label": "0,5", "matrix": [0, 5], "x": 5.0, "y": 0.0},
-                {"label": "0,6", "matrix": [0, 6], "x": 6.0, "y": 0.0},
-                {"label": "0,7", "matrix": [0, 7], "x": 7.0, "y": 0.0},
-                {"label": "0,8", "matrix": [0, 8], "x": 8.0, "y": 0.0},
-                {"label": "0,9", "matrix": [0, 9], "x": 9.0, "y": 0.0},
-                {"label": "0,10", "matrix": [0, 10], "x": 10.0, "y": 0.0},
-                {"label": "0,11", "matrix": [0, 11], "x": 11.0, "y": 0.0},
-                {"label": "0,12", "matrix": [0, 12], "x": 12.0, "y": 0.0},
-                {"label": "0,13", "matrix": [0, 13], "x": 13.0, "y": 0.0},
-                {"label": "0,14", "matrix": [0, 14], "x": 14.0, "y": 0.0},
-                {"label": "1,0", "matrix": [1, 0], "w": 1.5, "x": 0.0, "y": 1.0},
-                {"label": "1,1", "matrix": [1, 1], "x": 1.5, "y": 1.0},
-                {"label": "1,2", "matrix": [1, 2], "x": 2.5, "y": 1.0},
-                {"label": "1,3", "matrix": [1, 3], "x": 3.5, "y": 1.0},
-                {"label": "1,4", "matrix": [1, 4], "x": 4.5, "y": 1.0},
-                {"label": "1,5", "matrix": [1, 5], "x": 5.5, "y": 1.0},
-                {"label": "1,6", "matrix": [1, 6], "x": 6.5, "y": 1.0},
-                {"label": "1,7", "matrix": [1, 7], "x": 7.5, "y": 1.0},
-                {"label": "1,8", "matrix": [1, 8], "x": 8.5, "y": 1.0},
-                {"label": "1,9", "matrix": [1, 9], "x": 9.5, "y": 1.0},
-                {"label": "1,10", "matrix": [1, 10], "x": 10.5, "y": 1.0},
-                {"label": "1,11", "matrix": [1, 11], "x": 11.5, "y": 1.0},
-                {"label": "1,12", "matrix": [1, 12], "x": 12.5, "y": 1.0},
-                {"h": 2, "label": "1,13", "matrix": [1, 13], "w": 1.25, "x": 13.75, "y": 1.0},
-                {"label": "2,0", "matrix": [2, 0], "w": 1.75, "x": 0.0, "y": 2.0},
-                {"label": "2,1", "matrix": [2, 1], "x": 1.75, "y": 2.0},
-                {"label": "2,2", "matrix": [2, 2], "x": 2.75, "y": 2.0},
-                {"label": "2,3", "matrix": [2, 3], "x": 3.75, "y": 2.0},
-                {"label": "2,4", "matrix": [2, 4], "x": 4.75, "y": 2.0},
-                {"label": "2,5", "matrix": [2, 5], "x": 5.75, "y": 2.0},
-                {"label": "2,6", "matrix": [2, 6], "x": 6.75, "y": 2.0},
-                {"label": "2,7", "matrix": [2, 7], "x": 7.75, "y": 2.0},
-                {"label": "2,8", "matrix": [2, 8], "x": 8.75, "y": 2.0},
-                {"label": "2,9", "matrix": [2, 9], "x": 9.75, "y": 2.0},
-                {"label": "2,10", "matrix": [2, 10], "x": 10.75, "y": 2.0},
-                {"label": "2,11", "matrix": [2, 11], "x": 11.75, "y": 2.0},
-                {"label": "2,12", "matrix": [2, 12], "x": 12.75, "y": 2.0},
-                {"label": "3,0", "matrix": [3, 0], "w": 2.25, "x": 0.0, "y": 3.0},
-                {"label": "3,2", "matrix": [3, 2], "x": 2.25, "y": 3.0},
-                {"label": "3,3", "matrix": [3, 3], "x": 3.25, "y": 3.0},
-                {"label": "3,4", "matrix": [3, 4], "x": 4.25, "y": 3.0},
-                {"label": "3,5", "matrix": [3, 5], "x": 5.25, "y": 3.0},
-                {"label": "3,6", "matrix": [3, 6], "x": 6.25, "y": 3.0},
-                {"label": "3,7", "matrix": [3, 7], "x": 7.25, "y": 3.0},
-                {"label": "3,8", "matrix": [3, 8], "x": 8.25, "y": 3.0},
-                {"label": "3,9", "matrix": [3, 9], "x": 9.25, "y": 3.0},
-                {"label": "3,10", "matrix": [3, 10], "x": 10.25, "y": 3.0},
-                {"label": "3,11", "matrix": [3, 11], "x": 11.25, "y": 3.0},
-                {"label": "3,12", "matrix": [3, 12], "x": 12.25, "y": 3.0},
-                {"label": "4,14", "matrix": [4, 14], "w": 1.75, "x": 13.25, "y": 3.0},
-                {"label": "4,0", "matrix": [4, 0], "w": 1.5, "x": 0.0, "y": 4.0},
-                {"label": "4,1", "matrix": [4, 1], "x": 1.5, "y": 4.0},
-                {"label": "4,2", "matrix": [4, 2], "w": 1.5, "x": 2.5, "y": 4.0},
-                {"label": "4,4", "matrix": [4, 4], "w": 1.5, "x": 4.0, "y": 4.0},
-                {"label": "4,6", "matrix": [4, 6], "w": 2.5, "x": 5.5, "y": 4.0},
-                {"label": "4,7", "matrix": [4, 7], "w": 1.5, "x": 8.0, "y": 4.0},
-                {"label": "4,9", "matrix": [4, 9], "w": 1.5, "x": 9.5, "y": 4.0},
-                {"label": "4,10", "matrix": [4, 10], "w": 1.5, "x": 11.0, "y": 4.0},
-                {"label": "4,11", "matrix": [4, 11], "x": 12.5, "y": 4.0},
-                {"label": "4,12", "matrix": [4, 12], "w": 1.5, "x": 13.5, "y": 4.0}
-            ]
-        }
-    }
-}
diff --git a/keyboards/cipulot/ec_60/keyboard.json b/keyboards/cipulot/ec_60/keyboard.json
new file mode 100644
index 00000000000..860594f611a
--- /dev/null
+++ b/keyboards/cipulot/ec_60/keyboard.json
@@ -0,0 +1,308 @@
+{
+    "manufacturer": "Cipulot",
+    "keyboard_name": "EC 60",
+    "maintainer": "Cipulot",
+    "bootloader": "stm32-dfu",
+    "build": {
+        "lto": true
+    },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": false,
+        "console": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "processor": "STM32F401",
+    "url": "https://www.github.com/Cipulot/EC60",
+    "usb": {
+        "device_version": "0.0.1",
+        "pid": "0x6B84",
+        "shared_endpoint": {
+            "keyboard": true
+        },
+        "vid": "0x6369"
+    },
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                {"label": "0,0", "matrix": [0, 0], "x": 0.0, "y": 0.0},
+                {"label": "0,1", "matrix": [0, 1], "x": 1.0, "y": 0.0},
+                {"label": "0,2", "matrix": [0, 2], "x": 2.0, "y": 0.0},
+                {"label": "0,3", "matrix": [0, 3], "x": 3.0, "y": 0.0},
+                {"label": "0,4", "matrix": [0, 4], "x": 4.0, "y": 0.0},
+                {"label": "0,5", "matrix": [0, 5], "x": 5.0, "y": 0.0},
+                {"label": "0,6", "matrix": [0, 6], "x": 6.0, "y": 0.0},
+                {"label": "0,7", "matrix": [0, 7], "x": 7.0, "y": 0.0},
+                {"label": "0,8", "matrix": [0, 8], "x": 8.0, "y": 0.0},
+                {"label": "0,9", "matrix": [0, 9], "x": 9.0, "y": 0.0},
+                {"label": "0,10", "matrix": [0, 10], "x": 10.0, "y": 0.0},
+                {"label": "0,11", "matrix": [0, 11], "x": 11.0, "y": 0.0},
+                {"label": "0,12", "matrix": [0, 12], "x": 12.0, "y": 0.0},
+                {"label": "0,13", "matrix": [0, 13], "x": 13.0, "y": 0.0},
+                {"label": "0,14", "matrix": [0, 14], "x": 14.0, "y": 0.0},
+                {"label": "1,0", "matrix": [1, 0], "w": 1.5, "x": 0.0, "y": 1.0},
+                {"label": "1,1", "matrix": [1, 1], "x": 1.5, "y": 1.0},
+                {"label": "1,2", "matrix": [1, 2], "x": 2.5, "y": 1.0},
+                {"label": "1,3", "matrix": [1, 3], "x": 3.5, "y": 1.0},
+                {"label": "1,4", "matrix": [1, 4], "x": 4.5, "y": 1.0},
+                {"label": "1,5", "matrix": [1, 5], "x": 5.5, "y": 1.0},
+                {"label": "1,6", "matrix": [1, 6], "x": 6.5, "y": 1.0},
+                {"label": "1,7", "matrix": [1, 7], "x": 7.5, "y": 1.0},
+                {"label": "1,8", "matrix": [1, 8], "x": 8.5, "y": 1.0},
+                {"label": "1,9", "matrix": [1, 9], "x": 9.5, "y": 1.0},
+                {"label": "1,10", "matrix": [1, 10], "x": 10.5, "y": 1.0},
+                {"label": "1,11", "matrix": [1, 11], "x": 11.5, "y": 1.0},
+                {"label": "1,12", "matrix": [1, 12], "x": 12.5, "y": 1.0},
+                {"label": "1,13", "matrix": [1, 13], "w": 1.5, "x": 13.5, "y": 1.0},
+                {"label": "2,0", "matrix": [2, 0], "w": 1.75, "x": 0.0, "y": 2.0},
+                {"label": "2,1", "matrix": [2, 1], "x": 1.75, "y": 2.0},
+                {"label": "2,2", "matrix": [2, 2], "x": 2.75, "y": 2.0},
+                {"label": "2,3", "matrix": [2, 3], "x": 3.75, "y": 2.0},
+                {"label": "2,4", "matrix": [2, 4], "x": 4.75, "y": 2.0},
+                {"label": "2,5", "matrix": [2, 5], "x": 5.75, "y": 2.0},
+                {"label": "2,6", "matrix": [2, 6], "x": 6.75, "y": 2.0},
+                {"label": "2,7", "matrix": [2, 7], "x": 7.75, "y": 2.0},
+                {"label": "2,8", "matrix": [2, 8], "x": 8.75, "y": 2.0},
+                {"label": "2,9", "matrix": [2, 9], "x": 9.75, "y": 2.0},
+                {"label": "2,10", "matrix": [2, 10], "x": 10.75, "y": 2.0},
+                {"label": "2,11", "matrix": [2, 11], "x": 11.75, "y": 2.0},
+                {"label": "2,12", "matrix": [2, 12], "x": 12.75, "y": 2.0},
+                {"label": "2,13", "matrix": [2, 13], "w": 1.25, "x": 13.75, "y": 2.0},
+                {"label": "3,0", "matrix": [3, 0], "w": 1.25, "x": 0.0, "y": 3.0},
+                {"label": "3,1", "matrix": [3, 1], "x": 1.25, "y": 3.0},
+                {"label": "3,2", "matrix": [3, 2], "x": 2.25, "y": 3.0},
+                {"label": "3,3", "matrix": [3, 3], "x": 3.25, "y": 3.0},
+                {"label": "3,4", "matrix": [3, 4], "x": 4.25, "y": 3.0},
+                {"label": "3,5", "matrix": [3, 5], "x": 5.25, "y": 3.0},
+                {"label": "3,6", "matrix": [3, 6], "x": 6.25, "y": 3.0},
+                {"label": "3,7", "matrix": [3, 7], "x": 7.25, "y": 3.0},
+                {"label": "3,8", "matrix": [3, 8], "x": 8.25, "y": 3.0},
+                {"label": "3,9", "matrix": [3, 9], "x": 9.25, "y": 3.0},
+                {"label": "3,10", "matrix": [3, 10], "x": 10.25, "y": 3.0},
+                {"label": "3,11", "matrix": [3, 11], "x": 11.25, "y": 3.0},
+                {"label": "3,12", "matrix": [3, 12], "w": 0.75, "x": 12.25, "y": 3.0},
+                {"label": "3,13", "matrix": [3, 13], "w": 0.5, "x": 13.0, "y": 3.0},
+                {"label": "3,14", "matrix": [3, 14], "w": 0.5, "x": 13.5, "y": 3.0},
+                {"label": "4,13", "matrix": [4, 13], "w": 0.5, "x": 14.0, "y": 3.0},
+                {"label": "4,14", "matrix": [4, 14], "w": 0.5, "x": 14.5, "y": 3.0},
+                {"label": "4,0", "matrix": [4, 0], "w": 1.5, "x": 0.0, "y": 4.0},
+                {"label": "4,1", "matrix": [4, 1], "x": 1.5, "y": 4.0},
+                {"label": "4,2", "matrix": [4, 2], "w": 1.5, "x": 2.5, "y": 4.0},
+                {"label": "4,4", "matrix": [4, 4], "w": 1.5, "x": 4.0, "y": 4.0},
+                {"label": "4,5", "matrix": [4, 5], "w": 1.25, "x": 5.5, "y": 4.0},
+                {"label": "4,6", "matrix": [4, 6], "w": 1.25, "x": 6.75, "y": 4.0},
+                {"label": "4,7", "matrix": [4, 7], "w": 1.5, "x": 8.0, "y": 4.0},
+                {"label": "4,9", "matrix": [4, 9], "w": 1.5, "x": 9.5, "y": 4.0},
+                {"label": "4,10", "matrix": [4, 10], "w": 1.5, "x": 11.0, "y": 4.0},
+                {"label": "4,11", "matrix": [4, 11], "x": 12.5, "y": 4.0},
+                {"label": "4,12", "matrix": [4, 12], "w": 1.5, "x": 13.5, "y": 4.0}
+            ]
+        },
+        "LAYOUT_60_ansi_tsangan": {
+            "layout": [
+                {"label": "0,0", "matrix": [0, 0], "x": 0.0, "y": 0.0},
+                {"label": "0,1", "matrix": [0, 1], "x": 1.0, "y": 0.0},
+                {"label": "0,2", "matrix": [0, 2], "x": 2.0, "y": 0.0},
+                {"label": "0,3", "matrix": [0, 3], "x": 3.0, "y": 0.0},
+                {"label": "0,4", "matrix": [0, 4], "x": 4.0, "y": 0.0},
+                {"label": "0,5", "matrix": [0, 5], "x": 5.0, "y": 0.0},
+                {"label": "0,6", "matrix": [0, 6], "x": 6.0, "y": 0.0},
+                {"label": "0,7", "matrix": [0, 7], "x": 7.0, "y": 0.0},
+                {"label": "0,8", "matrix": [0, 8], "x": 8.0, "y": 0.0},
+                {"label": "0,9", "matrix": [0, 9], "x": 9.0, "y": 0.0},
+                {"label": "0,10", "matrix": [0, 10], "x": 10.0, "y": 0.0},
+                {"label": "0,11", "matrix": [0, 11], "x": 11.0, "y": 0.0},
+                {"label": "0,12", "matrix": [0, 12], "x": 12.0, "y": 0.0},
+                {"label": "0,14", "matrix": [0, 14], "w": 2, "x": 13.0, "y": 0.0},
+                {"label": "1,0", "matrix": [1, 0], "w": 1.5, "x": 0.0, "y": 1.0},
+                {"label": "1,1", "matrix": [1, 1], "x": 1.5, "y": 1.0},
+                {"label": "1,2", "matrix": [1, 2], "x": 2.5, "y": 1.0},
+                {"label": "1,3", "matrix": [1, 3], "x": 3.5, "y": 1.0},
+                {"label": "1,4", "matrix": [1, 4], "x": 4.5, "y": 1.0},
+                {"label": "1,5", "matrix": [1, 5], "x": 5.5, "y": 1.0},
+                {"label": "1,6", "matrix": [1, 6], "x": 6.5, "y": 1.0},
+                {"label": "1,7", "matrix": [1, 7], "x": 7.5, "y": 1.0},
+                {"label": "1,8", "matrix": [1, 8], "x": 8.5, "y": 1.0},
+                {"label": "1,9", "matrix": [1, 9], "x": 9.5, "y": 1.0},
+                {"label": "1,10", "matrix": [1, 10], "x": 10.5, "y": 1.0},
+                {"label": "1,11", "matrix": [1, 11], "x": 11.5, "y": 1.0},
+                {"label": "1,12", "matrix": [1, 12], "x": 12.5, "y": 1.0},
+                {"label": "1,13", "matrix": [1, 13], "w": 1.5, "x": 13.5, "y": 1.0},
+                {"label": "2,0", "matrix": [2, 0], "w": 1.75, "x": 0.0, "y": 2.0},
+                {"label": "2,1", "matrix": [2, 1], "x": 1.75, "y": 2.0},
+                {"label": "2,2", "matrix": [2, 2], "x": 2.75, "y": 2.0},
+                {"label": "2,3", "matrix": [2, 3], "x": 3.75, "y": 2.0},
+                {"label": "2,4", "matrix": [2, 4], "x": 4.75, "y": 2.0},
+                {"label": "2,5", "matrix": [2, 5], "x": 5.75, "y": 2.0},
+                {"label": "2,6", "matrix": [2, 6], "x": 6.75, "y": 2.0},
+                {"label": "2,7", "matrix": [2, 7], "x": 7.75, "y": 2.0},
+                {"label": "2,8", "matrix": [2, 8], "x": 8.75, "y": 2.0},
+                {"label": "2,9", "matrix": [2, 9], "x": 9.75, "y": 2.0},
+                {"label": "2,10", "matrix": [2, 10], "x": 10.75, "y": 2.0},
+                {"label": "2,11", "matrix": [2, 11], "x": 11.75, "y": 2.0},
+                {"label": "2,13", "matrix": [2, 13], "w": 2.25, "x": 12.75, "y": 2.0},
+                {"label": "3,0", "matrix": [3, 0], "w": 2.25, "x": 0.0, "y": 3.0},
+                {"label": "3,2", "matrix": [3, 2], "x": 2.25, "y": 3.0},
+                {"label": "3,3", "matrix": [3, 3], "x": 3.25, "y": 3.0},
+                {"label": "3,4", "matrix": [3, 4], "x": 4.25, "y": 3.0},
+                {"label": "3,5", "matrix": [3, 5], "x": 5.25, "y": 3.0},
+                {"label": "3,6", "matrix": [3, 6], "x": 6.25, "y": 3.0},
+                {"label": "3,7", "matrix": [3, 7], "x": 7.25, "y": 3.0},
+                {"label": "3,8", "matrix": [3, 8], "x": 8.25, "y": 3.0},
+                {"label": "3,9", "matrix": [3, 9], "x": 9.25, "y": 3.0},
+                {"label": "3,10", "matrix": [3, 10], "x": 10.25, "y": 3.0},
+                {"label": "3,11", "matrix": [3, 11], "x": 11.25, "y": 3.0},
+                {"label": "4,13", "matrix": [4, 13], "w": 2.75, "x": 12.25, "y": 3.0},
+                {"label": "4,0", "matrix": [4, 0], "w": 1.5, "x": 0.0, "y": 4.0},
+                {"label": "4,1", "matrix": [4, 1], "x": 1.5, "y": 4.0},
+                {"label": "4,2", "matrix": [4, 2], "w": 1.5, "x": 2.5, "y": 4.0},
+                {"label": "4,6", "matrix": [4, 6], "w": 7, "x": 4.0, "y": 4.0},
+                {"label": "4,10", "matrix": [4, 10], "w": 1.5, "x": 11.0, "y": 4.0},
+                {"label": "4,11", "matrix": [4, 11], "x": 12.5, "y": 4.0},
+                {"label": "4,12", "matrix": [4, 12], "w": 1.5, "x": 13.5, "y": 4.0}
+            ]
+        },
+        "LAYOUT_60_iso_tsangan": {
+            "layout": [
+                {"label": "0,0", "matrix": [0, 0], "x": 0.0, "y": 0.0},
+                {"label": "0,1", "matrix": [0, 1], "x": 1.0, "y": 0.0},
+                {"label": "0,2", "matrix": [0, 2], "x": 2.0, "y": 0.0},
+                {"label": "0,3", "matrix": [0, 3], "x": 3.0, "y": 0.0},
+                {"label": "0,4", "matrix": [0, 4], "x": 4.0, "y": 0.0},
+                {"label": "0,5", "matrix": [0, 5], "x": 5.0, "y": 0.0},
+                {"label": "0,6", "matrix": [0, 6], "x": 6.0, "y": 0.0},
+                {"label": "0,7", "matrix": [0, 7], "x": 7.0, "y": 0.0},
+                {"label": "0,8", "matrix": [0, 8], "x": 8.0, "y": 0.0},
+                {"label": "0,9", "matrix": [0, 9], "x": 9.0, "y": 0.0},
+                {"label": "0,10", "matrix": [0, 10], "x": 10.0, "y": 0.0},
+                {"label": "0,11", "matrix": [0, 11], "x": 11.0, "y": 0.0},
+                {"label": "0,12", "matrix": [0, 12], "x": 12.0, "y": 0.0},
+                {"label": "0,14", "matrix": [0, 14], "w": 2, "x": 13.0, "y": 0.0},
+                {"label": "1,0", "matrix": [1, 0], "w": 1.5, "x": 0.0, "y": 1.0},
+                {"label": "1,1", "matrix": [1, 1], "x": 1.5, "y": 1.0},
+                {"label": "1,2", "matrix": [1, 2], "x": 2.5, "y": 1.0},
+                {"label": "1,3", "matrix": [1, 3], "x": 3.5, "y": 1.0},
+                {"label": "1,4", "matrix": [1, 4], "x": 4.5, "y": 1.0},
+                {"label": "1,5", "matrix": [1, 5], "x": 5.5, "y": 1.0},
+                {"label": "1,6", "matrix": [1, 6], "x": 6.5, "y": 1.0},
+                {"label": "1,7", "matrix": [1, 7], "x": 7.5, "y": 1.0},
+                {"label": "1,8", "matrix": [1, 8], "x": 8.5, "y": 1.0},
+                {"label": "1,9", "matrix": [1, 9], "x": 9.5, "y": 1.0},
+                {"label": "1,10", "matrix": [1, 10], "x": 10.5, "y": 1.0},
+                {"label": "1,11", "matrix": [1, 11], "x": 11.5, "y": 1.0},
+                {"label": "1,12", "matrix": [1, 12], "x": 12.5, "y": 1.0},
+                {"h": 2, "label": "1,13", "matrix": [1, 13], "w": 1.25, "x": 13.75, "y": 1.0},
+                {"label": "2,0", "matrix": [2, 0], "w": 1.75, "x": 0.0, "y": 2.0},
+                {"label": "2,1", "matrix": [2, 1], "x": 1.75, "y": 2.0},
+                {"label": "2,2", "matrix": [2, 2], "x": 2.75, "y": 2.0},
+                {"label": "2,3", "matrix": [2, 3], "x": 3.75, "y": 2.0},
+                {"label": "2,4", "matrix": [2, 4], "x": 4.75, "y": 2.0},
+                {"label": "2,5", "matrix": [2, 5], "x": 5.75, "y": 2.0},
+                {"label": "2,6", "matrix": [2, 6], "x": 6.75, "y": 2.0},
+                {"label": "2,7", "matrix": [2, 7], "x": 7.75, "y": 2.0},
+                {"label": "2,8", "matrix": [2, 8], "x": 8.75, "y": 2.0},
+                {"label": "2,9", "matrix": [2, 9], "x": 9.75, "y": 2.0},
+                {"label": "2,10", "matrix": [2, 10], "x": 10.75, "y": 2.0},
+                {"label": "2,11", "matrix": [2, 11], "x": 11.75, "y": 2.0},
+                {"label": "2,12", "matrix": [2, 12], "x": 12.75, "y": 2.0},
+                {"label": "3,0", "matrix": [3, 0], "w": 1.25, "x": 0.0, "y": 3.0},
+                {"label": "3,1", "matrix": [3, 1], "x": 1.25, "y": 3.0},
+                {"label": "3,2", "matrix": [3, 2], "x": 2.25, "y": 3.0},
+                {"label": "3,3", "matrix": [3, 3], "x": 3.25, "y": 3.0},
+                {"label": "3,4", "matrix": [3, 4], "x": 4.25, "y": 3.0},
+                {"label": "3,5", "matrix": [3, 5], "x": 5.25, "y": 3.0},
+                {"label": "3,6", "matrix": [3, 6], "x": 6.25, "y": 3.0},
+                {"label": "3,7", "matrix": [3, 7], "x": 7.25, "y": 3.0},
+                {"label": "3,8", "matrix": [3, 8], "x": 8.25, "y": 3.0},
+                {"label": "3,9", "matrix": [3, 9], "x": 9.25, "y": 3.0},
+                {"label": "3,10", "matrix": [3, 10], "x": 10.25, "y": 3.0},
+                {"label": "3,11", "matrix": [3, 11], "x": 11.25, "y": 3.0},
+                {"label": "4,13", "matrix": [4, 13], "w": 2.75, "x": 12.25, "y": 3.0},
+                {"label": "4,0", "matrix": [4, 0], "w": 1.5, "x": 0.0, "y": 4.0},
+                {"label": "4,1", "matrix": [4, 1], "x": 1.5, "y": 4.0},
+                {"label": "4,2", "matrix": [4, 2], "w": 1.5, "x": 2.5, "y": 4.0},
+                {"label": "4,6", "matrix": [4, 6], "w": 7, "x": 4.0, "y": 4.0},
+                {"label": "4,10", "matrix": [4, 10], "w": 1.5, "x": 11.0, "y": 4.0},
+                {"label": "4,11", "matrix": [4, 11], "x": 12.5, "y": 4.0},
+                {"label": "4,12", "matrix": [4, 12], "w": 1.5, "x": 13.5, "y": 4.0}
+            ]
+        },
+        "LAYOUT_60_jis": {
+            "layout": [
+                {"label": "0,0", "matrix": [0, 0], "x": 0.0, "y": 0.0},
+                {"label": "0,1", "matrix": [0, 1], "x": 1.0, "y": 0.0},
+                {"label": "0,2", "matrix": [0, 2], "x": 2.0, "y": 0.0},
+                {"label": "0,3", "matrix": [0, 3], "x": 3.0, "y": 0.0},
+                {"label": "0,4", "matrix": [0, 4], "x": 4.0, "y": 0.0},
+                {"label": "0,5", "matrix": [0, 5], "x": 5.0, "y": 0.0},
+                {"label": "0,6", "matrix": [0, 6], "x": 6.0, "y": 0.0},
+                {"label": "0,7", "matrix": [0, 7], "x": 7.0, "y": 0.0},
+                {"label": "0,8", "matrix": [0, 8], "x": 8.0, "y": 0.0},
+                {"label": "0,9", "matrix": [0, 9], "x": 9.0, "y": 0.0},
+                {"label": "0,10", "matrix": [0, 10], "x": 10.0, "y": 0.0},
+                {"label": "0,11", "matrix": [0, 11], "x": 11.0, "y": 0.0},
+                {"label": "0,12", "matrix": [0, 12], "x": 12.0, "y": 0.0},
+                {"label": "0,13", "matrix": [0, 13], "x": 13.0, "y": 0.0},
+                {"label": "0,14", "matrix": [0, 14], "x": 14.0, "y": 0.0},
+                {"label": "1,0", "matrix": [1, 0], "w": 1.5, "x": 0.0, "y": 1.0},
+                {"label": "1,1", "matrix": [1, 1], "x": 1.5, "y": 1.0},
+                {"label": "1,2", "matrix": [1, 2], "x": 2.5, "y": 1.0},
+                {"label": "1,3", "matrix": [1, 3], "x": 3.5, "y": 1.0},
+                {"label": "1,4", "matrix": [1, 4], "x": 4.5, "y": 1.0},
+                {"label": "1,5", "matrix": [1, 5], "x": 5.5, "y": 1.0},
+                {"label": "1,6", "matrix": [1, 6], "x": 6.5, "y": 1.0},
+                {"label": "1,7", "matrix": [1, 7], "x": 7.5, "y": 1.0},
+                {"label": "1,8", "matrix": [1, 8], "x": 8.5, "y": 1.0},
+                {"label": "1,9", "matrix": [1, 9], "x": 9.5, "y": 1.0},
+                {"label": "1,10", "matrix": [1, 10], "x": 10.5, "y": 1.0},
+                {"label": "1,11", "matrix": [1, 11], "x": 11.5, "y": 1.0},
+                {"label": "1,12", "matrix": [1, 12], "x": 12.5, "y": 1.0},
+                {"h": 2, "label": "1,13", "matrix": [1, 13], "w": 1.25, "x": 13.75, "y": 1.0},
+                {"label": "2,0", "matrix": [2, 0], "w": 1.75, "x": 0.0, "y": 2.0},
+                {"label": "2,1", "matrix": [2, 1], "x": 1.75, "y": 2.0},
+                {"label": "2,2", "matrix": [2, 2], "x": 2.75, "y": 2.0},
+                {"label": "2,3", "matrix": [2, 3], "x": 3.75, "y": 2.0},
+                {"label": "2,4", "matrix": [2, 4], "x": 4.75, "y": 2.0},
+                {"label": "2,5", "matrix": [2, 5], "x": 5.75, "y": 2.0},
+                {"label": "2,6", "matrix": [2, 6], "x": 6.75, "y": 2.0},
+                {"label": "2,7", "matrix": [2, 7], "x": 7.75, "y": 2.0},
+                {"label": "2,8", "matrix": [2, 8], "x": 8.75, "y": 2.0},
+                {"label": "2,9", "matrix": [2, 9], "x": 9.75, "y": 2.0},
+                {"label": "2,10", "matrix": [2, 10], "x": 10.75, "y": 2.0},
+                {"label": "2,11", "matrix": [2, 11], "x": 11.75, "y": 2.0},
+                {"label": "2,12", "matrix": [2, 12], "x": 12.75, "y": 2.0},
+                {"label": "3,0", "matrix": [3, 0], "w": 2.25, "x": 0.0, "y": 3.0},
+                {"label": "3,2", "matrix": [3, 2], "x": 2.25, "y": 3.0},
+                {"label": "3,3", "matrix": [3, 3], "x": 3.25, "y": 3.0},
+                {"label": "3,4", "matrix": [3, 4], "x": 4.25, "y": 3.0},
+                {"label": "3,5", "matrix": [3, 5], "x": 5.25, "y": 3.0},
+                {"label": "3,6", "matrix": [3, 6], "x": 6.25, "y": 3.0},
+                {"label": "3,7", "matrix": [3, 7], "x": 7.25, "y": 3.0},
+                {"label": "3,8", "matrix": [3, 8], "x": 8.25, "y": 3.0},
+                {"label": "3,9", "matrix": [3, 9], "x": 9.25, "y": 3.0},
+                {"label": "3,10", "matrix": [3, 10], "x": 10.25, "y": 3.0},
+                {"label": "3,11", "matrix": [3, 11], "x": 11.25, "y": 3.0},
+                {"label": "3,12", "matrix": [3, 12], "x": 12.25, "y": 3.0},
+                {"label": "4,14", "matrix": [4, 14], "w": 1.75, "x": 13.25, "y": 3.0},
+                {"label": "4,0", "matrix": [4, 0], "w": 1.5, "x": 0.0, "y": 4.0},
+                {"label": "4,1", "matrix": [4, 1], "x": 1.5, "y": 4.0},
+                {"label": "4,2", "matrix": [4, 2], "w": 1.5, "x": 2.5, "y": 4.0},
+                {"label": "4,4", "matrix": [4, 4], "w": 1.5, "x": 4.0, "y": 4.0},
+                {"label": "4,6", "matrix": [4, 6], "w": 2.5, "x": 5.5, "y": 4.0},
+                {"label": "4,7", "matrix": [4, 7], "w": 1.5, "x": 8.0, "y": 4.0},
+                {"label": "4,9", "matrix": [4, 9], "w": 1.5, "x": 9.5, "y": 4.0},
+                {"label": "4,10", "matrix": [4, 10], "w": 1.5, "x": 11.0, "y": 4.0},
+                {"label": "4,11", "matrix": [4, 11], "x": 12.5, "y": 4.0},
+                {"label": "4,12", "matrix": [4, 12], "w": 1.5, "x": 13.5, "y": 4.0}
+            ]
+        }
+    }
+}
diff --git a/keyboards/cipulot/ec_60/rules.mk b/keyboards/cipulot/ec_60/rules.mk
index 70494b635f6..ce525670a68 100644
--- a/keyboards/cipulot/ec_60/rules.mk
+++ b/keyboards/cipulot/ec_60/rules.mk
@@ -1,4 +1,5 @@
 CUSTOM_MATRIX = lite
 ANALOG_DRIVER_REQUIRED = yes
-SRC += keyboards/cipulot/common/matrix.c keyboards/cipulot/common/ec_board.c keyboards/cipulot/common/ec_switch_matrix.c
+VPATH += keyboards/cipulot/common
+SRC += matrix.c ec_board.c ec_switch_matrix.c
 OPT = 3
diff --git a/keyboards/cipulot/ec_660c/config.h b/keyboards/cipulot/ec_660c/config.h
new file mode 100644
index 00000000000..9e883c40da2
--- /dev/null
+++ b/keyboards/cipulot/ec_660c/config.h
@@ -0,0 +1,66 @@
+/* Copyright 2023 Cipulot
+ *
+ * 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 3 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 MATRIX_ROWS 5
+#define MATRIX_COLS 15
+
+#define MATRIX_ROW_PINS \
+    { B1, B10, B0, A1, A0 }
+
+#define AMUX_COUNT 2
+#define AMUX_MAX_COLS_COUNT 8
+
+#define AMUX_EN_PINS \
+    { B7, B6 }
+
+#define AMUX_SEL_PINS \
+    { B5, B4, B3 }
+
+#define AMUX_COL_CHANNELS_SIZES \
+    { 8, 7 }
+
+#define AMUX_0_COL_CHANNELS \
+    { 3, 0, 1, 2, 4, 6, 7, 5 }
+
+#define AMUX_1_COL_CHANNELS \
+    { 3, 0, 1, 2, 4, 6, 7 }
+
+#define AMUX_COL_CHANNELS AMUX_0_COL_CHANNELS, AMUX_1_COL_CHANNELS
+
+#define DISCHARGE_PIN A5
+#define ANALOG_PORT A4
+
+#define DEFAULT_ACTUATION_MODE 0
+#define DEFAULT_MODE_0_ACTUATION_LEVEL 550
+#define DEFAULT_MODE_0_RELEASE_LEVEL 500
+#define DEFAULT_MODE_1_INITIAL_DEADZONE_OFFSET DEFAULT_MODE_0_ACTUATION_LEVEL
+#define DEFAULT_MODE_1_ACTUATION_OFFSET 70
+#define DEFAULT_MODE_1_RELEASE_OFFSET 70
+#define DEFAULT_EXTREMUM 1023
+#define EXPECTED_NOISE_FLOOR 0
+#define NOISE_FLOOR_THRESHOLD 50
+#define BOTTOMING_CALIBRATION_THRESHOLD 100
+#define DEFAULT_NOISE_FLOOR_SAMPLING_COUNT 30
+#define DEFAULT_BOTTOMING_READING 1023
+#define DEFAULT_CALIBRATION_STARTER true
+
+#define DISCHARGE_TIME 10
+
+// #define DEBUG_MATRIX_SCAN_RATE
+
+#define EECONFIG_KB_DATA_SIZE 159
diff --git a/keyboards/cipulot/ec_660c/halconf.h b/keyboards/cipulot/ec_660c/halconf.h
new file mode 100644
index 00000000000..835d43b6a0a
--- /dev/null
+++ b/keyboards/cipulot/ec_660c/halconf.h
@@ -0,0 +1,21 @@
+/* Copyright 2023 Cipulot
+ *
+ * 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 3 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_ADC TRUE
+
+#include_next <halconf.h>
diff --git a/keyboards/cipulot/ec_660c/info.json b/keyboards/cipulot/ec_660c/info.json
new file mode 100644
index 00000000000..32ac397b6bf
--- /dev/null
+++ b/keyboards/cipulot/ec_660c/info.json
@@ -0,0 +1,111 @@
+{
+    "manufacturer": "Cipulot",
+    "keyboard_name": "EC 660C",
+    "maintainer": "Cipulot",
+    "bootloader": "stm32-dfu",
+    "build": {
+        "lto": true
+    },
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": false,
+        "console": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "indicators": {
+        "caps_lock": "B14",
+        "scroll_lock": "B15"
+    },
+    "processor": "STM32F401",
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
+    "usb": {
+        "device_version": "0.0.1",
+        "pid": "0x6BA6",
+        "shared_endpoint": {
+            "keyboard": true
+        },
+        "vid": "0x6369"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"label": "0,0", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "0,1", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "0,2", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "0,3", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "0,4", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "0,5", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "0,6", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "0,7", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "0,8", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "0,9", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "0,10", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "0,11", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "0,12", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "0,13", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "0,14", "matrix": [0, 14], "x": 14, "y": 0},
+                {"label": "1,14", "matrix": [1, 14], "x": 15.5, "y": 0},
+                {"label": "1,0", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "1,1", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "1,2", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "1,3", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "1,4", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "1,5", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "1,6", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "1,7", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "1,8", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "1,9", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "1,10", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "1,11", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "1,12", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "1,13", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"label": "2,14", "matrix": [2, 14], "x": 15.5, "y": 1},
+                {"label": "2,0", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "2,1", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "2,2", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "2,3", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "2,4", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "2,5", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "2,6", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "2,7", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "2,8", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "2,9", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": "2,10", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "2,11", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "2,12", "matrix": [2, 12], "x": 12.75, "y": 2},
+                {"label": "2,13", "matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.25},
+                {"label": "3,0", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"label": "3,1", "matrix": [3, 1], "x": 1.25, "y": 3},
+                {"label": "3,2", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "3,3", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "3,4", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "3,5", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "3,6", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "3,7", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "3,8", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": "3,9", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": "3,10", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "3,11", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "3,12", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.25},
+                {"label": "3,13", "matrix": [3, 13], "x": 14.5, "y": 3},
+                {"label": "4,0", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "4,1", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "4,2", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "4,6", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6},
+                {"label": "4,9", "matrix": [4, 9], "x": 9.75, "y": 4, "w": 1.25},
+                {"label": "4,10", "matrix": [4, 10], "x": 11, "y": 4, "w": 1.25},
+                {"label": "4,11", "matrix": [4, 11], "x": 12.25, "y": 4, "w": 1.25},
+                {"label": "4,12", "matrix": [4, 12], "x": 13.5, "y": 4},
+                {"label": "4,13", "matrix": [4, 13], "x": 14.5, "y": 4},
+                {"label": "4,14", "matrix": [4, 14], "x": 15.5, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/cipulot/ec_660c/keymaps/default/keymap.c b/keyboards/cipulot/ec_660c/keymaps/default/keymap.c
new file mode 100644
index 00000000000..5d82bdc3abd
--- /dev/null
+++ b/keyboards/cipulot/ec_660c/keymaps/default/keymap.c
@@ -0,0 +1,43 @@
+/* Copyright 2023 Cipulot
+ *
+ * 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 3 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] = {
+    // clang-format off
+    [0] = LAYOUT(
+        KC_ESC,   KC_1,     KC_2,     KC_3,  KC_4,  KC_5,    KC_6,  KC_7,  KC_8,    KC_9,     KC_0,     KC_MINS,  KC_EQL,   KC_BSPC, KC_BSPC,   KC_INS,
+        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_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_BSLS,  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_RCTL,  MO(1),                        KC_LEFT,  KC_DOWN,  KC_RGHT
+    ),
+    [1] = LAYOUT(
+        KC_GRV,   KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   _______,  _______,  _______,
+        KC_CAPS,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  KC_PSCR,  KC_SCRL,  KC_PAUS,  _______,  _______,  _______,            _______,
+        _______,  KC_VOLD,  KC_VOLU,  KC_MUTE,  _______,  _______,  _______,  _______,  KC_HOME,  KC_PGUP,  _______,  _______,  _______,  _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  KC_END,   KC_PGDN,  _______,  _______,            _______,
+        _______,  _______,  _______,                      _______,                      _______,  MO(2),    _______,                      _______,  _______,  _______
+    ),
+    [2] = LAYOUT(
+        QK_BOOT,  NK_TOGG,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,
+        _______,  _______,  _______,                      _______,                      _______,  _______,  _______,                      _______,  _______,  _______
+    )
+    // clang-format on
+};
diff --git a/keyboards/cipulot/ec_660c/keymaps/via/keymap.c b/keyboards/cipulot/ec_660c/keymaps/via/keymap.c
new file mode 100644
index 00000000000..5d82bdc3abd
--- /dev/null
+++ b/keyboards/cipulot/ec_660c/keymaps/via/keymap.c
@@ -0,0 +1,43 @@
+/* Copyright 2023 Cipulot
+ *
+ * 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 3 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] = {
+    // clang-format off
+    [0] = LAYOUT(
+        KC_ESC,   KC_1,     KC_2,     KC_3,  KC_4,  KC_5,    KC_6,  KC_7,  KC_8,    KC_9,     KC_0,     KC_MINS,  KC_EQL,   KC_BSPC, KC_BSPC,   KC_INS,
+        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_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_BSLS,  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_RCTL,  MO(1),                        KC_LEFT,  KC_DOWN,  KC_RGHT
+    ),
+    [1] = LAYOUT(
+        KC_GRV,   KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   _______,  _______,  _______,
+        KC_CAPS,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  KC_PSCR,  KC_SCRL,  KC_PAUS,  _______,  _______,  _______,            _______,
+        _______,  KC_VOLD,  KC_VOLU,  KC_MUTE,  _______,  _______,  _______,  _______,  KC_HOME,  KC_PGUP,  _______,  _______,  _______,  _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  KC_END,   KC_PGDN,  _______,  _______,            _______,
+        _______,  _______,  _______,                      _______,                      _______,  MO(2),    _______,                      _______,  _______,  _______
+    ),
+    [2] = LAYOUT(
+        QK_BOOT,  NK_TOGG,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,
+        _______,  _______,  _______,                      _______,                      _______,  _______,  _______,                      _______,  _______,  _______
+    )
+    // clang-format on
+};
diff --git a/keyboards/cipulot/ec_660c/keymaps/via/rules.mk b/keyboards/cipulot/ec_660c/keymaps/via/rules.mk
new file mode 100644
index 00000000000..1e5b99807cb
--- /dev/null
+++ b/keyboards/cipulot/ec_660c/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/cipulot/ec_660c/mcuconf.h b/keyboards/cipulot/ec_660c/mcuconf.h
new file mode 100644
index 00000000000..fa3c955e0d8
--- /dev/null
+++ b/keyboards/cipulot/ec_660c/mcuconf.h
@@ -0,0 +1,22 @@
+/* Copyright 2023 Cipulot
+ *
+ * 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 3 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_ADC_USE_ADC1
+#define STM32_ADC_USE_ADC1 TRUE
diff --git a/keyboards/cipulot/ec_660c/post_rules.mk b/keyboards/cipulot/ec_660c/post_rules.mk
new file mode 100644
index 00000000000..d726a112a8c
--- /dev/null
+++ b/keyboards/cipulot/ec_660c/post_rules.mk
@@ -0,0 +1,3 @@
+ifeq ($(strip $(VIA_ENABLE)), yes)
+    SRC += keyboards/cipulot/common/via_ec.c
+endif
diff --git a/keyboards/cipulot/ec_660c/readme.md b/keyboards/cipulot/ec_660c/readme.md
new file mode 100644
index 00000000000..c01bb3252e0
--- /dev/null
+++ b/keyboards/cipulot/ec_660c/readme.md
@@ -0,0 +1,26 @@
+# EC660C
+
+![EC660C PCB](https://i.imgur.com/HfTvrkph.jpg)
+
+Replacement PCB for the  Leopold FC660C.
+
+* Keyboard Maintainer: [cipulot](https://github.com/cipulot)
+* Hardware Supported: EC660C PCB
+* Hardware Availability: TBD
+
+Make example for this keyboard (after setting up your build environment):
+
+    make cipulot/ec_660c:default
+
+Flashing example for this keyboard:
+
+    make cipulot/ec_660c: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:
+
+* **Physical reset**: Long short the exposed pads on the top of the PCB
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
diff --git a/keyboards/cipulot/ec_660c/rules.mk b/keyboards/cipulot/ec_660c/rules.mk
new file mode 100644
index 00000000000..ce525670a68
--- /dev/null
+++ b/keyboards/cipulot/ec_660c/rules.mk
@@ -0,0 +1,5 @@
+CUSTOM_MATRIX = lite
+ANALOG_DRIVER_REQUIRED = yes
+VPATH += keyboards/cipulot/common
+SRC += matrix.c ec_board.c ec_switch_matrix.c
+OPT = 3
diff --git a/keyboards/cipulot/ec_980c/config.h b/keyboards/cipulot/ec_980c/config.h
new file mode 100644
index 00000000000..e3723822e33
--- /dev/null
+++ b/keyboards/cipulot/ec_980c/config.h
@@ -0,0 +1,86 @@
+/* Copyright 2023 Cipulot
+ *
+ * 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 3 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 MATRIX_ROWS 6
+#define MATRIX_COLS 19
+
+#define MATRIX_ROW_PINS \
+    { B13, B12, B14, A9, B6, B7 }
+
+#define AMUX_COUNT 3
+#define AMUX_MAX_COLS_COUNT 8
+
+#define AMUX_EN_PINS \
+    { A0, A1, A8 }
+
+#define AMUX_SEL_PINS \
+    { A4, A3, A2 }
+
+#define AMUX_COL_CHANNELS_SIZES \
+    { 8, 7, 4 }
+
+#define AMUX_0_COL_CHANNELS \
+    { 0, 3, 1, 2, 4, 6, 7, 5 }
+
+#define AMUX_1_COL_CHANNELS \
+    { 1, 0, 3, 2, 4, 6, 7 }
+
+#define AMUX_2_COL_CHANNELS \
+    { 4, 6, 7, 5 }
+
+#define AMUX_COL_CHANNELS AMUX_0_COL_CHANNELS, AMUX_1_COL_CHANNELS, AMUX_2_COL_CHANNELS
+
+#define DISCHARGE_PIN A6
+#define ANALOG_PORT A7
+
+#define DEFAULT_ACTUATION_MODE 0
+#define DEFAULT_MODE_0_ACTUATION_LEVEL 550
+#define DEFAULT_MODE_0_RELEASE_LEVEL 500
+#define DEFAULT_MODE_1_INITIAL_DEADZONE_OFFSET DEFAULT_MODE_0_ACTUATION_LEVEL
+#define DEFAULT_MODE_1_ACTUATION_OFFSET 70
+#define DEFAULT_MODE_1_RELEASE_OFFSET 70
+#define DEFAULT_EXTREMUM 1023
+#define EXPECTED_NOISE_FLOOR 0
+#define NOISE_FLOOR_THRESHOLD 50
+#define BOTTOMING_CALIBRATION_THRESHOLD 100
+#define DEFAULT_NOISE_FLOOR_SAMPLING_COUNT 30
+#define DEFAULT_BOTTOMING_READING 1023
+#define DEFAULT_CALIBRATION_STARTER true
+
+#define DISCHARGE_TIME 10
+
+//#define DEBUG_MATRIX_SCAN_RATE
+
+#define EECONFIG_KB_DATA_SIZE 249
+
+// Indicators
+// PWM driver with direct memory access (DMA) support
+#define WS2812_PWM_COMPLEMENTARY_OUTPUT
+#define WS2812_PWM_DRIVER PWMD1
+#define WS2812_PWM_CHANNEL 3
+#define WS2812_PWM_PAL_MODE 1
+#define WS2812_DMA_STREAM STM32_DMA2_STREAM5
+#define WS2812_DMA_CHANNEL 6
+
+#define NUM_INDICATOR_INDEX 0
+#define CAPS_INDICATOR_INDEX 1
+#define SCROLL_INDICATOR_INDEX 2
+
+#define RGB_MATRIX_DEFAULT_VAL 60
+#define RGB_MATRIX_SLEEP
+#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_SOLID_COLOR
diff --git a/keyboards/cipulot/ec_980c/ec_980c.c b/keyboards/cipulot/ec_980c/ec_980c.c
new file mode 100644
index 00000000000..2b40d5a5e69
--- /dev/null
+++ b/keyboards/cipulot/ec_980c/ec_980c.c
@@ -0,0 +1,116 @@
+/* Copyright 2023 Cipulot
+ *
+ * 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 3 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 "ec_switch_matrix.h"
+#include "quantum.h"
+
+void eeconfig_init_kb(void) {
+    // Default values
+    eeprom_ec_config.num.h                          = 0;
+    eeprom_ec_config.num.s                          = 0;
+    eeprom_ec_config.num.v                          = 60;
+    eeprom_ec_config.num.enabled                    = true;
+    eeprom_ec_config.caps.h                         = 0;
+    eeprom_ec_config.caps.s                         = 0;
+    eeprom_ec_config.caps.v                         = 60;
+    eeprom_ec_config.caps.enabled                   = true;
+    eeprom_ec_config.scroll.h                       = 0;
+    eeprom_ec_config.scroll.s                       = 0;
+    eeprom_ec_config.scroll.v                       = 60;
+    eeprom_ec_config.scroll.enabled                 = true;
+    eeprom_ec_config.actuation_mode                 = DEFAULT_ACTUATION_MODE;
+    eeprom_ec_config.mode_0_actuation_threshold     = DEFAULT_MODE_0_ACTUATION_LEVEL;
+    eeprom_ec_config.mode_0_release_threshold       = DEFAULT_MODE_0_RELEASE_LEVEL;
+    eeprom_ec_config.mode_1_initial_deadzone_offset = DEFAULT_MODE_1_INITIAL_DEADZONE_OFFSET;
+    eeprom_ec_config.mode_1_actuation_offset        = DEFAULT_MODE_1_ACTUATION_OFFSET;
+    eeprom_ec_config.mode_1_release_offset          = DEFAULT_MODE_1_RELEASE_OFFSET;
+
+    for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
+        for (uint8_t col = 0; col < MATRIX_COLS; col++) {
+            eeprom_ec_config.bottoming_reading[row][col] = DEFAULT_BOTTOMING_READING;
+        }
+    }
+    // Write default value to EEPROM now
+    eeconfig_update_kb_datablock(&eeprom_ec_config);
+
+    eeconfig_init_user();
+}
+
+// On Keyboard startup
+void keyboard_post_init_kb(void) {
+    // Read custom menu variables from memory
+    eeconfig_read_kb_datablock(&eeprom_ec_config);
+
+    // Set runtime values to EEPROM values
+    ec_config.actuation_mode                 = eeprom_ec_config.actuation_mode;
+    ec_config.mode_0_actuation_threshold     = eeprom_ec_config.mode_0_actuation_threshold;
+    ec_config.mode_0_release_threshold       = eeprom_ec_config.mode_0_release_threshold;
+    ec_config.mode_1_initial_deadzone_offset = eeprom_ec_config.mode_1_initial_deadzone_offset;
+    ec_config.mode_1_actuation_offset        = eeprom_ec_config.mode_1_actuation_offset;
+    ec_config.mode_1_release_offset          = eeprom_ec_config.mode_1_release_offset;
+    ec_config.bottoming_calibration          = false;
+    for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
+        for (uint8_t col = 0; col < MATRIX_COLS; col++) {
+            ec_config.bottoming_calibration_starter[row][col]           = true;
+            ec_config.bottoming_reading[row][col]                       = eeprom_ec_config.bottoming_reading[row][col];
+            ec_config.rescaled_mode_0_actuation_threshold[row][col]     = rescale(ec_config.mode_0_actuation_threshold, 0, 1023, ec_config.noise_floor[row][col], eeprom_ec_config.bottoming_reading[row][col]);
+            ec_config.rescaled_mode_0_release_threshold[row][col]       = rescale(ec_config.mode_0_release_threshold, 0, 1023, ec_config.noise_floor[row][col], eeprom_ec_config.bottoming_reading[row][col]);
+            ec_config.rescaled_mode_1_initial_deadzone_offset[row][col] = rescale(ec_config.mode_1_initial_deadzone_offset, 0, 1023, ec_config.noise_floor[row][col], eeprom_ec_config.bottoming_reading[row][col]);
+        }
+    }
+
+    // Call the indicator callback to set the indicator color
+    rgb_matrix_indicators_kb();
+
+    keyboard_post_init_user();
+}
+
+// INDICATOR CALLBACK ------------------------------------------------------------------------------
+/* LED index to physical position
+ *
+ * LED0 | LED1 |  LED2
+ * -----+------+--------
+ * Num  | Caps | Scroll |
+ */
+bool rgb_matrix_indicators_kb(void) {
+    if (eeprom_ec_config.num.enabled) {
+        // The rgb_matrix_set_color function needs an RGB code to work, so first the indicator color is cast to an HSV value and then translated to RGB
+        HSV hsv_num_indicator_color = {eeprom_ec_config.num.h, eeprom_ec_config.num.s, eeprom_ec_config.num.v};
+        RGB rgb_num_indicator_color = hsv_to_rgb(hsv_num_indicator_color);
+        if (host_keyboard_led_state().num_lock)
+            rgb_matrix_set_color(NUM_INDICATOR_INDEX, rgb_num_indicator_color.r, rgb_num_indicator_color.g, rgb_num_indicator_color.b);
+        else
+            rgb_matrix_set_color(NUM_INDICATOR_INDEX, 0, 0, 0);
+    }
+    if (eeprom_ec_config.caps.enabled) {
+        HSV hsv_caps_indicator_color = {eeprom_ec_config.caps.h, eeprom_ec_config.caps.s, eeprom_ec_config.caps.v};
+        RGB rgb_caps_indicator_color = hsv_to_rgb(hsv_caps_indicator_color);
+        if (host_keyboard_led_state().caps_lock)
+            rgb_matrix_set_color(CAPS_INDICATOR_INDEX, rgb_caps_indicator_color.r, rgb_caps_indicator_color.g, rgb_caps_indicator_color.b);
+        else
+            rgb_matrix_set_color(CAPS_INDICATOR_INDEX, 0, 0, 0);
+    }
+    if (eeprom_ec_config.scroll.enabled) {
+        HSV hsv_scroll_indicator_color = {eeprom_ec_config.scroll.h, eeprom_ec_config.scroll.s, eeprom_ec_config.scroll.v};
+        RGB rgb_scroll_indicator_color = hsv_to_rgb(hsv_scroll_indicator_color);
+        if (host_keyboard_led_state().scroll_lock)
+            rgb_matrix_set_color(SCROLL_INDICATOR_INDEX, rgb_scroll_indicator_color.r, rgb_scroll_indicator_color.g, rgb_scroll_indicator_color.b);
+        else
+            rgb_matrix_set_color(SCROLL_INDICATOR_INDEX, 0, 0, 0);
+    }
+
+    return true;
+}
diff --git a/keyboards/cipulot/ec_980c/ec_switch_matrix.c b/keyboards/cipulot/ec_980c/ec_switch_matrix.c
new file mode 100644
index 00000000000..33123bd236e
--- /dev/null
+++ b/keyboards/cipulot/ec_980c/ec_switch_matrix.c
@@ -0,0 +1,318 @@
+/* Copyright 2023 Cipulot
+ *
+ * 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 3 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 "ec_switch_matrix.h"
+#include "analog.h"
+#include "atomic_util.h"
+#include "math.h"
+#include "print.h"
+#include "wait.h"
+
+#if defined(__AVR__)
+#    error "AVR platforms not supported due to a variety of reasons. Among them there are limited memory, limited number of pins and ADC not being able to give satisfactory results."
+#endif
+
+#define OPEN_DRAIN_SUPPORT defined(PAL_MODE_OUTPUT_OPENDRAIN)
+
+eeprom_ec_config_t eeprom_ec_config;
+ec_config_t        ec_config;
+
+// Pin and port array
+const pin_t row_pins[]                                 = MATRIX_ROW_PINS;
+const pin_t amux_sel_pins[]                            = AMUX_SEL_PINS;
+const pin_t amux_en_pins[]                             = AMUX_EN_PINS;
+const pin_t amux_n_col_sizes[]                         = AMUX_COL_CHANNELS_SIZES;
+const pin_t amux_n_col_channels[][AMUX_MAX_COLS_COUNT] = {AMUX_COL_CHANNELS};
+
+#define AMUX_SEL_PINS_COUNT ARRAY_SIZE(amux_sel_pins)
+#define EXPECTED_AMUX_SEL_PINS_COUNT ceil(log2(AMUX_MAX_COLS_COUNT)
+// Checks for the correctness of the configuration
+_Static_assert(ARRAY_SIZE(amux_en_pins) == AMUX_COUNT, "AMUX_EN_PINS doesn't have the minimum number of bits required to enable all the multiplexers available");
+// Check that number of select pins is enough to select all the channels
+_Static_assert(AMUX_SEL_PINS_COUNT == EXPECTED_AMUX_SEL_PINS_COUNT), "AMUX_SEL_PINS doesn't have the minimum number of bits required address all the channels");
+// Check that number of elements in AMUX_COL_CHANNELS_SIZES is enough to specify the number of channels for all the multiplexers available
+_Static_assert(ARRAY_SIZE(amux_n_col_sizes) == AMUX_COUNT, "AMUX_COL_CHANNELS_SIZES doesn't have the minimum number of elements required to specify the number of channels for all the multiplexers available");
+
+static uint16_t sw_value[MATRIX_ROWS][MATRIX_COLS];
+
+static adc_mux adcMux;
+
+// Initialize the row pins
+void init_row(void) {
+    // Set all row pins as output and low
+    for (uint8_t idx = 0; idx < MATRIX_ROWS; idx++) {
+        gpio_set_pin_output(row_pins[idx]);
+        gpio_write_pin_low(row_pins[idx]);
+    }
+}
+
+// Initialize the multiplexers
+void init_amux(void) {
+    for (uint8_t idx = 0; idx < AMUX_COUNT; idx++) {
+        gpio_set_pin_output(amux_en_pins[idx]);
+        gpio_write_pin_low(amux_en_pins[idx]);
+    }
+    for (uint8_t idx = 0; idx < AMUX_SEL_PINS_COUNT; idx++) {
+        gpio_set_pin_output(amux_sel_pins[idx]);
+    }
+}
+
+// Select the multiplexer channel of the specified multiplexer
+void select_amux_channel(uint8_t channel, uint8_t col) {
+    // Get the channel for the specified multiplexer
+    uint8_t ch = amux_n_col_channels[channel][col];
+    // momentarily disable specified multiplexer
+    gpio_write_pin_high(amux_en_pins[channel]);
+    // Select the multiplexer channel
+    for (uint8_t i = 0; i < AMUX_SEL_PINS_COUNT; i++) {
+        gpio_write_pin(amux_sel_pins[i], ch & (1 << i));
+    }
+    // re enable specified multiplexer
+    gpio_write_pin_low(amux_en_pins[channel]);
+}
+
+// Disable all the unused multiplexers
+void disable_unused_amux(uint8_t channel) {
+    // disable all the other multiplexers apart from the current selected one
+    for (uint8_t idx = 0; idx < AMUX_COUNT; idx++) {
+        if (idx != channel) {
+            gpio_write_pin_high(amux_en_pins[idx]);
+        }
+    }
+}
+// Discharge the peak hold capacitor
+void discharge_capacitor(void) {
+#ifdef OPEN_DRAIN_SUPPORT
+    gpio_write_pin_low(DISCHARGE_PIN);
+#else
+    gpio_write_pin_low(DISCHARGE_PIN);
+    gpio_set_pin_output(DISCHARGE_PIN);
+#endif
+}
+
+// Charge the peak hold capacitor
+void charge_capacitor(uint8_t row) {
+#ifdef OPEN_DRAIN_SUPPORT
+    gpio_write_pin_high(DISCHARGE_PIN);
+#else
+    gpio_set_pin_input(DISCHARGE_PIN);
+#endif
+    gpio_write_pin_high(row_pins[row]);
+}
+
+// Initialize the peripherals pins
+int ec_init(void) {
+    // Initialize ADC
+    palSetLineMode(ANALOG_PORT, PAL_MODE_INPUT_ANALOG);
+    adcMux = pinToMux(ANALOG_PORT);
+
+    // Dummy call to make sure that adcStart() has been called in the appropriate state
+    adc_read(adcMux);
+
+    // Initialize discharge pin as discharge mode
+    gpio_write_pin_low(DISCHARGE_PIN);
+#ifdef OPEN_DRAIN_SUPPORT
+    gpio_set_pin_output_open_drain(DISCHARGE_PIN);
+#else
+    gpio_set_pin_output(DISCHARGE_PIN);
+#endif
+
+    // Initialize drive lines
+    init_row();
+
+    // Initialize AMUXs
+    init_amux();
+
+    return 0;
+}
+
+// Get the noise floor
+void ec_noise_floor(void) {
+    // Initialize the noise floor
+    for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
+        for (uint8_t col = 0; col < MATRIX_COLS; col++) {
+            ec_config.noise_floor[row][col] = 0;
+        }
+    }
+
+    // Sample the noise floor
+    for (uint8_t i = 0; i < DEFAULT_NOISE_FLOOR_SAMPLING_COUNT; i++) {
+        for (uint8_t amux = 0; amux < AMUX_COUNT; amux++) {
+            disable_unused_amux(amux);
+            for (uint8_t col = 0; col < amux_n_col_sizes[amux]; col++) {
+                uint8_t sum = 0;
+                for (uint8_t i = 0; i < (amux > 0 ? amux : 0); i++)
+                    sum += amux_n_col_sizes[i];
+                uint8_t adjusted_col = col + sum;
+                for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
+                    ec_config.noise_floor[row][adjusted_col] += ec_readkey_raw(amux, row, col);
+                }
+            }
+        }
+        wait_ms(5);
+    }
+
+    // Average the noise floor
+    for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
+        for (uint8_t col = 0; col < MATRIX_COLS; col++) {
+            ec_config.noise_floor[row][col] /= DEFAULT_NOISE_FLOOR_SAMPLING_COUNT;
+        }
+    }
+}
+
+// Scan key values and update matrix state
+bool ec_matrix_scan(matrix_row_t current_matrix[]) {
+    bool updated = false;
+
+    for (uint8_t amux = 0; amux < AMUX_COUNT; amux++) {
+        disable_unused_amux(amux);
+        for (uint8_t col = 0; col < amux_n_col_sizes[amux]; col++) {
+            for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
+                uint8_t sum = 0;
+                for (uint8_t i = 0; i < (amux > 0 ? amux : 0); i++)
+                    sum += amux_n_col_sizes[i];
+                uint8_t adjusted_col        = col + sum;
+                sw_value[row][adjusted_col] = ec_readkey_raw(amux, row, col);
+
+                if (ec_config.bottoming_calibration) {
+                    if (ec_config.bottoming_calibration_starter[row][adjusted_col]) {
+                        ec_config.bottoming_reading[row][adjusted_col]             = sw_value[row][adjusted_col];
+                        ec_config.bottoming_calibration_starter[row][adjusted_col] = false;
+                    } else if (sw_value[row][adjusted_col] > ec_config.bottoming_reading[row][adjusted_col]) {
+                        ec_config.bottoming_reading[row][adjusted_col] = sw_value[row][adjusted_col];
+                    }
+                } else {
+                    updated |= ec_update_key(&current_matrix[row], row, adjusted_col, sw_value[row][adjusted_col]);
+                }
+            }
+        }
+    }
+
+    return ec_config.bottoming_calibration ? false : updated;
+}
+
+// Read the capacitive sensor value
+uint16_t ec_readkey_raw(uint8_t channel, uint8_t row, uint8_t col) {
+    uint16_t sw_value = 0;
+
+    // Select the multiplexer
+    select_amux_channel(channel, col);
+
+    // Set the row pin to low state to avoid ghosting
+    gpio_write_pin_low(row_pins[row]);
+
+    ATOMIC_BLOCK_FORCEON {
+        // Set the row pin to high state and have capacitor charge
+        charge_capacitor(row);
+        // Read the ADC value
+        sw_value = adc_read(adcMux);
+    }
+    // Discharge peak hold capacitor
+    discharge_capacitor();
+    // Waiting for the ghost capacitor to discharge fully
+    wait_us(DISCHARGE_TIME);
+
+    return sw_value;
+}
+
+// Update press/release state of key
+bool ec_update_key(matrix_row_t* current_row, uint8_t row, uint8_t col, uint16_t sw_value) {
+    bool current_state = (*current_row >> col) & 1;
+
+    // Real Time Noise Floor Calibration
+    if (sw_value < (ec_config.noise_floor[row][col] - NOISE_FLOOR_THRESHOLD)) {
+        uprintf("Noise Floor Change: %d, %d, %d\n", row, col, sw_value);
+        ec_config.noise_floor[row][col]                             = sw_value;
+        ec_config.rescaled_mode_0_actuation_threshold[row][col]     = rescale(ec_config.mode_0_actuation_threshold, 0, 1023, ec_config.noise_floor[row][col], eeprom_ec_config.bottoming_reading[row][col]);
+        ec_config.rescaled_mode_0_release_threshold[row][col]       = rescale(ec_config.mode_0_release_threshold, 0, 1023, ec_config.noise_floor[row][col], eeprom_ec_config.bottoming_reading[row][col]);
+        ec_config.rescaled_mode_1_initial_deadzone_offset[row][col] = rescale(ec_config.mode_1_initial_deadzone_offset, 0, 1023, ec_config.noise_floor[row][col], eeprom_ec_config.bottoming_reading[row][col]);
+    }
+
+    // Normal board-wide APC
+    if (ec_config.actuation_mode == 0) {
+        if (current_state && sw_value < ec_config.rescaled_mode_0_release_threshold[row][col]) {
+            *current_row &= ~(1 << col);
+            uprintf("Key released: %d, %d, %d\n", row, col, sw_value);
+            return true;
+        }
+        if ((!current_state) && sw_value > ec_config.rescaled_mode_0_actuation_threshold[row][col]) {
+            *current_row |= (1 << col);
+            uprintf("Key pressed: %d, %d, %d\n", row, col, sw_value);
+            return true;
+        }
+    }
+    // Rapid Trigger
+    else if (ec_config.actuation_mode == 1) {
+        // Is key in active zone?
+        if (sw_value > ec_config.rescaled_mode_1_initial_deadzone_offset[row][col]) {
+            // Is key pressed while in active zone?
+            if (current_state) {
+                // Is the key still moving down?
+                if (sw_value > ec_config.extremum[row][col]) {
+                    ec_config.extremum[row][col] = sw_value;
+                    uprintf("Key pressed: %d, %d, %d\n", row, col, sw_value);
+                }
+                // Has key moved up enough to be released?
+                else if (sw_value < ec_config.extremum[row][col] - ec_config.mode_1_release_offset) {
+                    ec_config.extremum[row][col] = sw_value;
+                    *current_row &= ~(1 << col);
+                    uprintf("Key released: %d, %d, %d\n", row, col, sw_value);
+                    return true;
+                }
+            }
+            // Key is not pressed while in active zone
+            else {
+                // Is the key still moving up?
+                if (sw_value < ec_config.extremum[row][col]) {
+                    ec_config.extremum[row][col] = sw_value;
+                }
+                // Has key moved down enough to be pressed?
+                else if (sw_value > ec_config.extremum[row][col] + ec_config.mode_1_actuation_offset) {
+                    ec_config.extremum[row][col] = sw_value;
+                    *current_row |= (1 << col);
+                    uprintf("Key pressed: %d, %d, %d\n", row, col, sw_value);
+                    return true;
+                }
+            }
+        }
+        // Key is not in active zone
+        else {
+            // Check to avoid key being stuck in pressed state near the active zone threshold
+            if (sw_value < ec_config.extremum[row][col]) {
+                ec_config.extremum[row][col] = sw_value;
+                *current_row &= ~(1 << col);
+                return true;
+            }
+        }
+    }
+    return false;
+}
+
+// Print the matrix values
+void ec_print_matrix(void) {
+    for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
+        for (uint8_t col = 0; col < MATRIX_COLS - 1; col++) {
+            uprintf("%4d,", sw_value[row][col]);
+        }
+        uprintf("%4d\n", sw_value[row][MATRIX_COLS - 1]);
+    }
+    print("\n");
+}
+
+// Rescale the value to a different range
+uint16_t rescale(uint16_t x, uint16_t in_min, uint16_t in_max, uint16_t out_min, uint16_t out_max) {
+    return (x - in_min) * (out_max - out_min) / (in_max - in_min) + out_min;
+}
diff --git a/keyboards/cipulot/ec_980c/ec_switch_matrix.h b/keyboards/cipulot/ec_980c/ec_switch_matrix.h
new file mode 100644
index 00000000000..8a75b5de5fb
--- /dev/null
+++ b/keyboards/cipulot/ec_980c/ec_switch_matrix.h
@@ -0,0 +1,83 @@
+/* Copyright 2023 Cipulot
+ *
+ * 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 3 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 <stdint.h>
+#include <stdbool.h>
+#include "matrix.h"
+#include "eeconfig.h"
+#include "util.h"
+
+typedef struct _indicator_config_t {
+    uint8_t h;
+    uint8_t s;
+    uint8_t v;
+    bool    enabled;
+} indicator_config;
+
+typedef struct PACKED {
+    indicator_config num;
+    indicator_config caps;
+    indicator_config scroll;
+    uint8_t          actuation_mode;                              // 0: normal board-wide APC, 1: Rapid trigger from specific board-wide actuation point, 2: Rapid trigger from resting point
+    uint16_t         mode_0_actuation_threshold;                  // threshold for key press in mode 0
+    uint16_t         mode_0_release_threshold;                    // threshold for key release in mode 0
+    uint16_t         mode_1_initial_deadzone_offset;              // threshold for key press in mode 1
+    uint8_t          mode_1_actuation_offset;                     // offset for key press in mode 1 and 2 (1-255)
+    uint8_t          mode_1_release_offset;                       // offset for key release in mode 1 and 2 (1-255)
+    uint16_t         bottoming_reading[MATRIX_ROWS][MATRIX_COLS]; // bottoming reading
+} eeprom_ec_config_t;
+
+typedef struct {
+    uint8_t  actuation_mode;                                                    // 0: normal board-wide APC, 1: Rapid trigger from specific board-wide actuation point (it can be very near that baseline noise and be "full travel")
+    uint16_t mode_0_actuation_threshold;                                        // threshold for key press in mode 0
+    uint16_t mode_0_release_threshold;                                          // threshold for key release in mode 0
+    uint16_t mode_1_initial_deadzone_offset;                                    // threshold for key press in mode 1 (initial deadzone)
+    uint16_t rescaled_mode_0_actuation_threshold[MATRIX_ROWS][MATRIX_COLS];     // threshold for key press in mode 0 rescaled to actual scale
+    uint16_t rescaled_mode_0_release_threshold[MATRIX_ROWS][MATRIX_COLS];       // threshold for key release in mode 0 rescaled to actual scale
+    uint16_t rescaled_mode_1_initial_deadzone_offset[MATRIX_ROWS][MATRIX_COLS]; // threshold for key press in mode 1 (initial deadzone) rescaled to actual scale
+    uint8_t  mode_1_actuation_offset;                                           // offset for key press in mode 1 (1-255)
+    uint8_t  mode_1_release_offset;                                             // offset for key release in mode 1 (1-255)
+    uint16_t extremum[MATRIX_ROWS][MATRIX_COLS];                                // extremum values for mode 1
+    uint16_t noise_floor[MATRIX_ROWS][MATRIX_COLS];                             // noise floor detected during startup
+    bool     bottoming_calibration;                                             // calibration mode for bottoming out values (true: calibration mode, false: normal mode)
+    bool     bottoming_calibration_starter[MATRIX_ROWS][MATRIX_COLS];           // calibration mode for bottoming out values (true: calibration mode, false: normal mode)
+    uint16_t bottoming_reading[MATRIX_ROWS][MATRIX_COLS];                       // bottoming reading
+} ec_config_t;
+
+// Check if the size of the reserved persistent memory is the same as the size of struct eeprom_ec_config_t
+_Static_assert(sizeof(eeprom_ec_config_t) == EECONFIG_KB_DATA_SIZE, "Mismatch in keyboard EECONFIG stored data");
+
+extern eeprom_ec_config_t eeprom_ec_config;
+
+extern ec_config_t ec_config;
+
+void init_row(void);
+void init_amux(void);
+void select_amux_channel(uint8_t channel, uint8_t col);
+void disable_unused_amux(uint8_t channel);
+void discharge_capacitor(void);
+void charge_capacitor(uint8_t row);
+
+int      ec_init(void);
+void     ec_noise_floor(void);
+bool     ec_matrix_scan(matrix_row_t current_matrix[]);
+uint16_t ec_readkey_raw(uint8_t channel, uint8_t row, uint8_t col);
+bool     ec_update_key(matrix_row_t* current_row, uint8_t row, uint8_t col, uint16_t sw_value);
+void     ec_print_matrix(void);
+
+uint16_t rescale(uint16_t x, uint16_t in_min, uint16_t in_max, uint16_t out_min, uint16_t out_max);
diff --git a/keyboards/cipulot/ec_980c/halconf.h b/keyboards/cipulot/ec_980c/halconf.h
new file mode 100644
index 00000000000..24de0954858
--- /dev/null
+++ b/keyboards/cipulot/ec_980c/halconf.h
@@ -0,0 +1,23 @@
+/* Copyright 2023 Cipulot
+ *
+ * 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 3 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_ADC TRUE
+#define HAL_USE_PWM TRUE
+#define HAL_USE_PAL TRUE
+
+#include_next <halconf.h>
diff --git a/keyboards/cipulot/ec_980c/info.json b/keyboards/cipulot/ec_980c/info.json
new file mode 100644
index 00000000000..6d3cb22719c
--- /dev/null
+++ b/keyboards/cipulot/ec_980c/info.json
@@ -0,0 +1,170 @@
+{
+    "manufacturer": "Cipulot",
+    "keyboard_name": "EC 980C",
+    "maintainer": "Cipulot",
+    "bootloader": "stm32-dfu",
+    "build": {
+        "lto": true
+    },
+    "diode_direction": "COL2ROW",
+    "eeprom": {
+        "wear_leveling": {
+            "backing_size": 4096
+        }
+    },
+    "features": {
+        "bootmagic": false,
+        "console": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgb_matrix": true
+    },
+    "processor": "STM32F411",
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
+    "rgb_matrix": {
+        "animations": {
+            "breathing": true,
+            "cycle_left_right": true,
+            "solid_color": true
+        },
+        "driver": "ws2812",
+        "layout": [
+            {"matrix": [0, 15], "x": 16.25, "y": 1, "flags": 4},
+            {"matrix": [0, 16], "x": 17.25, "y": 1, "flags": 4},
+            {"matrix": [0, 17], "x": 18.25, "y": 1, "flags": 4}
+        ],
+        "led_count": 3,
+        "max_brightness": 255
+    },
+    "usb": {
+        "device_version": "0.0.1",
+        "pid": "0x6BBE",
+        "shared_endpoint": {
+            "keyboard": true
+        },
+        "vid": "0x6369"
+    },
+    "ws2812": {
+        "driver": "pwm",
+        "pin": "B15"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "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.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.5, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15.5, "y": 0},
+                {"matrix": [0, 16], "x": 16.5, "y": 0},
+                {"matrix": [0, 17], "x": 17.5, "y": 0},
+                {"matrix": [0, 18], "x": 18.5, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1.5},
+                {"matrix": [1, 4], "x": 4, "y": 1.5},
+                {"matrix": [1, 5], "x": 5, "y": 1.5},
+                {"matrix": [1, 6], "x": 6, "y": 1.5},
+                {"matrix": [1, 7], "x": 7, "y": 1.5},
+                {"matrix": [1, 8], "x": 8, "y": 1.5},
+                {"matrix": [1, 9], "x": 9, "y": 1.5},
+                {"matrix": [1, 10], "x": 10, "y": 1.5},
+                {"matrix": [1, 11], "x": 11, "y": 1.5},
+                {"matrix": [1, 12], "x": 12, "y": 1.5},
+                {"matrix": [1, 13], "x": 13, "y": 1.5},
+                {"matrix": [1, 14], "x": 14, "y": 1.5},
+                {"matrix": [1, 15], "x": 15.5, "y": 1.5},
+                {"matrix": [1, 16], "x": 16.5, "y": 1.5},
+                {"matrix": [1, 17], "x": 17.5, "y": 1.5},
+                {"matrix": [1, 18], "x": 18.5, "y": 1.5},
+                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.5},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.5},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.5},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.5, "w": 0.75},
+                {"matrix": [2, 14], "x": 14.25, "y": 2.5, "w": 0.75},
+                {"matrix": [2, 15], "x": 15.5, "y": 2.5},
+                {"matrix": [2, 16], "x": 16.5, "y": 2.5},
+                {"matrix": [2, 17], "x": 17.5, "y": 2.5},
+                {"matrix": [2, 18], "x": 18.5, "y": 2.5},
+                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.5},
+                {"matrix": [3, 12], "x": 12.75, "y": 3.5},
+                {"matrix": [3, 13], "x": 13.75, "y": 3.5, "w": 1.25},
+                {"matrix": [3, 15], "x": 15.5, "y": 3.5},
+                {"matrix": [3, 16], "x": 16.5, "y": 3.5},
+                {"matrix": [3, 17], "x": 17.5, "y": 3.5},
+                {"matrix": [3, 18], "x": 18.5, "y": 3.5},
+                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.5},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.5},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.5},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.5},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.5},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.5},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.5},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.5},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.5},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.5},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.5},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 1.75},
+                {"matrix": [4, 14], "x": 14.25, "y": 4.75},
+                {"matrix": [4, 15], "x": 15.5, "y": 4.5},
+                {"matrix": [4, 16], "x": 16.5, "y": 4.5},
+                {"matrix": [4, 17], "x": 17.5, "y": 4.5},
+                {"matrix": [4, 18], "x": 18.5, "y": 4.5},
+                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.5},
+                {"matrix": [5, 2], "x": 2.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 3], "x": 3.5, "y": 5.5},
+                {"matrix": [5, 5], "x": 4.5, "y": 5.5, "w": 2.5},
+                {"matrix": [5, 6], "x": 7, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 8], "x": 8.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 9], "x": 9.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 10], "x": 10.75, "y": 5.5},
+                {"matrix": [5, 11], "x": 11.75, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.25, "y": 5.75},
+                {"matrix": [5, 14], "x": 14.25, "y": 5.75},
+                {"matrix": [5, 15], "x": 15.25, "y": 5.75},
+                {"matrix": [5, 16], "x": 16.5, "y": 5.5},
+                {"matrix": [5, 17], "x": 17.5, "y": 5.5},
+                {"matrix": [5, 18], "x": 18.5, "y": 5.5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/cipulot/ec_980c/keymaps/default/keymap.c b/keyboards/cipulot/ec_980c/keymaps/default/keymap.c
new file mode 100644
index 00000000000..c60db783528
--- /dev/null
+++ b/keyboards/cipulot/ec_980c/keymaps/default/keymap.c
@@ -0,0 +1,48 @@
+/* Copyright 2023 Cipulot
+ *
+ * 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 3 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 "keymap_japanese.h"
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    // clang-format off
+    [0] = LAYOUT(
+        KC_ESC,             KC_F1,    KC_F2,    KC_F3,  KC_F4,   KC_F5,   KC_F6,    KC_F7,  KC_F8,              KC_F9,    KC_F10,   KC_F11,   KC_F12,                KC_DEL,  KC_INS,   KC_PGUP,  KC_PGDN,
+        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,   JP_YEN,   KC_BSPC,               KC_NUM,  KC_PSLS,  KC_PAST,  KC_PMNS,
+        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_ENT,                KC_P7,   KC_P8,    KC_P9,    KC_PPLS,
+        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_P4,   KC_P5,    KC_P6,    KC_PPLS,
+        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_UP,                 KC_P1,   KC_P2,    KC_P3,    KC_PENT,
+        KC_LCTL,  KC_LGUI,  KC_LALT,  _______,                   KC_SPC,  KC_SPC,           _______,  KC_RALT,  KC_RCTL,  MO(1),    KC_LEFT,  KC_DOWN,  KC_RIGHT,             KC_P0,    KC_PDOT,  KC_PENT
+	),
+    [1] = LAYOUT(
+        _______,            _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,             _______,  _______,  _______,  _______,            _______,  _______,  _______, _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,  _______,  _______,  _______,            _______,  _______,  _______,  _______,
+        KC_CAPS,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  KC_PSCR,  KC_SCRL,  KC_PAUSE,  _______,  _______,  _______,  _______,            _______,  _______,  _______,  _______,
+        _______,  KC_VOLD,  KC_VOLU,  KC_MUTE,  _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,  _______,  _______,                      _______,  _______,  _______,  _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,  _______,            _______,            _______,  _______,  _______,  _______,
+        _______,  _______,  _______,  _______,                      _______,  _______,            _______,  _______,   MO(2),    _______,  _______,  _______,  _______,            _______,  _______,  _______
+	),
+    [2] = LAYOUT(
+        QK_BOOT,            NK_TOGG,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,  _______,  _______,  _______,            _______,  _______,  _______, _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,  _______,  _______,  _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,  _______,  _______,  _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,                      _______,  _______,  _______,  _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,            _______,  _______,  _______,  _______,
+        _______,  _______,  _______,  _______,                      _______,  _______,            _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,  _______,  _______
+	),
+    // clang-format on
+};
diff --git a/keyboards/cipulot/ec_980c/keymaps/via/keymap.c b/keyboards/cipulot/ec_980c/keymaps/via/keymap.c
new file mode 100644
index 00000000000..c60db783528
--- /dev/null
+++ b/keyboards/cipulot/ec_980c/keymaps/via/keymap.c
@@ -0,0 +1,48 @@
+/* Copyright 2023 Cipulot
+ *
+ * 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 3 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 "keymap_japanese.h"
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    // clang-format off
+    [0] = LAYOUT(
+        KC_ESC,             KC_F1,    KC_F2,    KC_F3,  KC_F4,   KC_F5,   KC_F6,    KC_F7,  KC_F8,              KC_F9,    KC_F10,   KC_F11,   KC_F12,                KC_DEL,  KC_INS,   KC_PGUP,  KC_PGDN,
+        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,   JP_YEN,   KC_BSPC,               KC_NUM,  KC_PSLS,  KC_PAST,  KC_PMNS,
+        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_ENT,                KC_P7,   KC_P8,    KC_P9,    KC_PPLS,
+        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_P4,   KC_P5,    KC_P6,    KC_PPLS,
+        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_UP,                 KC_P1,   KC_P2,    KC_P3,    KC_PENT,
+        KC_LCTL,  KC_LGUI,  KC_LALT,  _______,                   KC_SPC,  KC_SPC,           _______,  KC_RALT,  KC_RCTL,  MO(1),    KC_LEFT,  KC_DOWN,  KC_RIGHT,             KC_P0,    KC_PDOT,  KC_PENT
+	),
+    [1] = LAYOUT(
+        _______,            _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,             _______,  _______,  _______,  _______,            _______,  _______,  _______, _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,  _______,  _______,  _______,            _______,  _______,  _______,  _______,
+        KC_CAPS,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  KC_PSCR,  KC_SCRL,  KC_PAUSE,  _______,  _______,  _______,  _______,            _______,  _______,  _______,  _______,
+        _______,  KC_VOLD,  KC_VOLU,  KC_MUTE,  _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,  _______,  _______,                      _______,  _______,  _______,  _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,  _______,            _______,            _______,  _______,  _______,  _______,
+        _______,  _______,  _______,  _______,                      _______,  _______,            _______,  _______,   MO(2),    _______,  _______,  _______,  _______,            _______,  _______,  _______
+	),
+    [2] = LAYOUT(
+        QK_BOOT,            NK_TOGG,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,  _______,  _______,  _______,            _______,  _______,  _______, _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,  _______,  _______,  _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,  _______,  _______,  _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,                      _______,  _______,  _______,  _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,            _______,  _______,  _______,  _______,
+        _______,  _______,  _______,  _______,                      _______,  _______,            _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,  _______,  _______
+	),
+    // clang-format on
+};
diff --git a/keyboards/cipulot/ec_980c/keymaps/via/rules.mk b/keyboards/cipulot/ec_980c/keymaps/via/rules.mk
new file mode 100644
index 00000000000..b870b6349c0
--- /dev/null
+++ b/keyboards/cipulot/ec_980c/keymaps/via/rules.mk
@@ -0,0 +1,3 @@
+VIA_ENABLE = yes
+
+SRC += via_ec_indicators.c
diff --git a/keyboards/cipulot/ec_980c/keymaps/via/via_ec_indicators.c b/keyboards/cipulot/ec_980c/keymaps/via/via_ec_indicators.c
new file mode 100644
index 00000000000..f885e794357
--- /dev/null
+++ b/keyboards/cipulot/ec_980c/keymaps/via/via_ec_indicators.c
@@ -0,0 +1,499 @@
+/* Copyright 2023 Cipulot
+ *
+ * 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 3 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 "keyboards/cipulot/common/eeprom_tools.h"
+#include "ec_switch_matrix.h"
+#include "action.h"
+#include "print.h"
+#include "via.h"
+
+#ifdef VIA_ENABLE
+
+void ec_rescale_values(uint8_t item);
+void ec_save_threshold_data(uint8_t option);
+void ec_save_bottoming_reading(void);
+void ec_show_calibration_data(void);
+void ec_clear_bottoming_calibration_data(void);
+
+// Declaring enums for VIA config menu
+enum via_enums {
+    // clang-format off
+    id_num_indicator_enabled    = 1,
+    id_num_indicator_brightness = 2,
+    id_num_indicator_color      = 3,
+    id_caps_indicator_enabled    = 4,
+    id_caps_indicator_brightness = 5,
+    id_caps_indicator_color      = 6,
+    id_scroll_indicator_enabled    = 7,
+    id_scroll_indicator_brightness = 8,
+    id_scroll_indicator_color      = 9,
+    id_actuation_mode = 10,
+    id_mode_0_actuation_threshold = 11,
+    id_mode_0_release_threshold = 12,
+    id_save_threshold_data = 13,
+    id_mode_1_initial_deadzone_offset = 14,
+    id_mode_1_actuation_offset = 15,
+    id_mode_1_release_offset = 16,
+    id_bottoming_calibration = 17,
+    id_noise_floor_calibration = 18,
+    id_show_calibration_data = 19,
+    id_clear_bottoming_calibration_data = 20
+    // clang-format on
+};
+
+// Handle the data received by the keyboard from the VIA menus
+void via_config_set_value(uint8_t *data) {
+    // data = [ value_id, value_data ]
+    uint8_t *value_id   = &(data[0]);
+    uint8_t *value_data = &(data[1]);
+
+    switch (*value_id) {
+        case id_num_indicator_enabled: {
+            if (value_data[0] == 1) {
+                eeprom_ec_config.num.enabled = true;
+                uprintf("#########################\n");
+                uprintf("# Num indicator enabled #\n");
+                uprintf("#########################\n");
+            } else {
+                eeprom_ec_config.num.enabled = false;
+                uprintf("##########################\n");
+                uprintf("# Num indicator disabled #\n");
+                uprintf("##########################\n");
+            }
+            EEPROM_KB_PARTIAL_UPDATE(eeprom_ec_config, num.enabled);
+            break;
+        }
+        case id_num_indicator_brightness: {
+            eeprom_ec_config.num.v = value_data[0];
+            uprintf("Num indicator brightness: %d\n", eeprom_ec_config.num.v);
+            EEPROM_KB_PARTIAL_UPDATE(eeprom_ec_config, num.v);
+            break;
+        }
+        case id_num_indicator_color: {
+            eeprom_ec_config.num.h = value_data[0];
+            eeprom_ec_config.num.s = value_data[1];
+            uprintf("Num indicator color: %d, %d\n", eeprom_ec_config.num.h, eeprom_ec_config.num.s);
+            EEPROM_KB_PARTIAL_UPDATE(eeprom_ec_config, num.h);
+            EEPROM_KB_PARTIAL_UPDATE(eeprom_ec_config, num.s);
+            break;
+        }
+        case id_caps_indicator_enabled: {
+            if (value_data[0] == 1) {
+                eeprom_ec_config.caps.enabled = true;
+                uprintf("##########################\n");
+                uprintf("# Caps indicator enabled #\n");
+                uprintf("##########################\n");
+            } else {
+                eeprom_ec_config.caps.enabled = false;
+                uprintf("###########################\n");
+                uprintf("# Caps indicator disabled #\n");
+                uprintf("###########################\n");
+            }
+            EEPROM_KB_PARTIAL_UPDATE(eeprom_ec_config, caps.enabled);
+            break;
+        }
+        case id_caps_indicator_brightness: {
+            eeprom_ec_config.caps.v = value_data[0];
+            uprintf("Caps indicator brightness: %d\n", eeprom_ec_config.caps.v);
+            EEPROM_KB_PARTIAL_UPDATE(eeprom_ec_config, caps.v);
+            break;
+        }
+        case id_caps_indicator_color: {
+            eeprom_ec_config.caps.h = value_data[0];
+            eeprom_ec_config.caps.s = value_data[1];
+            uprintf("Caps indicator color: %d, %d\n", eeprom_ec_config.caps.h, eeprom_ec_config.caps.s);
+            EEPROM_KB_PARTIAL_UPDATE(eeprom_ec_config, caps.h);
+            EEPROM_KB_PARTIAL_UPDATE(eeprom_ec_config, caps.s);
+            break;
+        }
+        case id_scroll_indicator_enabled: {
+            if (value_data[0] == 1) {
+                eeprom_ec_config.scroll.enabled = true;
+                uprintf("############################\n");
+                uprintf("# Scroll indicator enabled #\n");
+                uprintf("############################\n");
+            } else {
+                eeprom_ec_config.scroll.enabled = false;
+                uprintf("#############################\n");
+                uprintf("# Scroll indicator disabled #\n");
+                uprintf("#############################\n");
+            }
+            EEPROM_KB_PARTIAL_UPDATE(eeprom_ec_config, scroll.enabled);
+            break;
+        }
+        case id_scroll_indicator_brightness: {
+            eeprom_ec_config.scroll.v = value_data[0];
+            uprintf("Scroll indicator brightness: %d\n", eeprom_ec_config.scroll.v);
+            EEPROM_KB_PARTIAL_UPDATE(eeprom_ec_config, scroll.v);
+            break;
+        }
+        case id_scroll_indicator_color: {
+            eeprom_ec_config.scroll.h = value_data[0];
+            eeprom_ec_config.scroll.s = value_data[1];
+            uprintf("Scroll indicator color: %d, %d\n", eeprom_ec_config.scroll.h, eeprom_ec_config.scroll.s);
+            EEPROM_KB_PARTIAL_UPDATE(eeprom_ec_config, scroll.h);
+            EEPROM_KB_PARTIAL_UPDATE(eeprom_ec_config, scroll.s);
+            break;
+        }
+        case id_actuation_mode: {
+            eeprom_ec_config.actuation_mode = value_data[0];
+            ec_config.actuation_mode        = eeprom_ec_config.actuation_mode;
+            if (ec_config.actuation_mode == 0) {
+                uprintf("#########################\n");
+                uprintf("#  Actuation Mode: APC  #\n");
+                uprintf("#########################\n");
+            } else if (ec_config.actuation_mode == 1) {
+                uprintf("#################################\n");
+                uprintf("# Actuation Mode: Rapid Trigger #\n");
+                uprintf("#################################\n");
+            }
+            EEPROM_KB_PARTIAL_UPDATE(eeprom_ec_config, actuation_mode);
+            break;
+        }
+        case id_mode_0_actuation_threshold: {
+            ec_config.mode_0_actuation_threshold = value_data[1] | (value_data[0] << 8);
+            uprintf("APC Mode Actuation Threshold: %d\n", ec_config.mode_0_actuation_threshold);
+            break;
+        }
+        case id_mode_0_release_threshold: {
+            ec_config.mode_0_release_threshold = value_data[1] | (value_data[0] << 8);
+            uprintf("APC Mode Release Threshold: %d\n", ec_config.mode_0_release_threshold);
+            break;
+        }
+        case id_mode_1_initial_deadzone_offset: {
+            ec_config.mode_1_initial_deadzone_offset = value_data[1] | (value_data[0] << 8);
+            uprintf("Rapid Trigger Mode Initial Deadzone Offset: %d\n", ec_config.mode_1_initial_deadzone_offset);
+            break;
+        }
+        case id_mode_1_actuation_offset: {
+            ec_config.mode_1_actuation_offset = value_data[0];
+            uprintf("Rapid Trigger Mode Actuation Offset: %d\n", ec_config.mode_1_actuation_offset);
+            break;
+        }
+        case id_mode_1_release_offset: {
+            ec_config.mode_1_release_offset = value_data[0];
+            uprintf("Rapid Trigger Mode Release Offset: %d\n", ec_config.mode_1_release_offset);
+            break;
+        }
+        case id_bottoming_calibration: {
+            if (value_data[0] == 1) {
+                ec_config.bottoming_calibration = true;
+                uprintf("##############################\n");
+                uprintf("# Bottoming calibration mode #\n");
+                uprintf("##############################\n");
+            } else {
+                ec_config.bottoming_calibration = false;
+                ec_save_bottoming_reading();
+                uprintf("## Bottoming calibration done ##\n");
+                ec_show_calibration_data();
+            }
+            break;
+        }
+        case id_save_threshold_data: {
+            ec_save_threshold_data(value_data[0]);
+            break;
+        }
+        case id_noise_floor_calibration: {
+            if (value_data[0] == 0) {
+                ec_noise_floor();
+                ec_rescale_values(0);
+                ec_rescale_values(1);
+                ec_rescale_values(2);
+                uprintf("#############################\n");
+                uprintf("# Noise floor data acquired #\n");
+                uprintf("#############################\n");
+                break;
+            }
+        }
+        case id_show_calibration_data: {
+            if (value_data[0] == 0) {
+                ec_show_calibration_data();
+                break;
+            }
+        }
+        case id_clear_bottoming_calibration_data: {
+            if (value_data[0] == 0) {
+                ec_clear_bottoming_calibration_data();
+            }
+        }
+        default: {
+            // Unhandled value.
+            break;
+        }
+    }
+}
+
+// Handle the data sent by the keyboard to the VIA menus
+void via_config_get_value(uint8_t *data) {
+    // data = [ value_id, value_data ]
+    uint8_t *value_id   = &(data[0]);
+    uint8_t *value_data = &(data[1]);
+
+    switch (*value_id) {
+        case id_num_indicator_enabled: {
+            value_data[0] = eeprom_ec_config.num.enabled;
+            break;
+        }
+        case id_num_indicator_brightness: {
+            value_data[0] = eeprom_ec_config.num.v;
+            break;
+        }
+        case id_num_indicator_color: {
+            value_data[0] = eeprom_ec_config.num.h;
+            value_data[1] = eeprom_ec_config.num.s;
+            break;
+        }
+        case id_caps_indicator_enabled: {
+            value_data[0] = eeprom_ec_config.caps.enabled;
+            break;
+        }
+        case id_caps_indicator_brightness: {
+            value_data[0] = eeprom_ec_config.caps.v;
+            break;
+        }
+        case id_caps_indicator_color: {
+            value_data[0] = eeprom_ec_config.caps.h;
+            value_data[1] = eeprom_ec_config.caps.s;
+            break;
+        }
+        case id_scroll_indicator_enabled: {
+            value_data[0] = eeprom_ec_config.scroll.enabled;
+            break;
+        }
+        case id_scroll_indicator_brightness: {
+            value_data[0] = eeprom_ec_config.scroll.v;
+            break;
+        }
+        case id_scroll_indicator_color: {
+            value_data[0] = eeprom_ec_config.scroll.h;
+            value_data[1] = eeprom_ec_config.scroll.s;
+            break;
+        }
+        case id_actuation_mode: {
+            value_data[0] = eeprom_ec_config.actuation_mode;
+            break;
+        }
+        case id_mode_0_actuation_threshold: {
+            value_data[0] = eeprom_ec_config.mode_0_actuation_threshold >> 8;
+            value_data[1] = eeprom_ec_config.mode_0_actuation_threshold & 0xFF;
+            break;
+        }
+        case id_mode_0_release_threshold: {
+            value_data[0] = eeprom_ec_config.mode_0_release_threshold >> 8;
+            value_data[1] = eeprom_ec_config.mode_0_release_threshold & 0xFF;
+            break;
+        }
+        case id_mode_1_initial_deadzone_offset: {
+            value_data[0] = eeprom_ec_config.mode_1_initial_deadzone_offset >> 8;
+            value_data[1] = eeprom_ec_config.mode_1_initial_deadzone_offset & 0xFF;
+            break;
+        }
+        case id_mode_1_actuation_offset: {
+            value_data[0] = eeprom_ec_config.mode_1_actuation_offset;
+            break;
+        }
+        case id_mode_1_release_offset: {
+            value_data[0] = eeprom_ec_config.mode_1_release_offset;
+            break;
+        }
+        default: {
+            // Unhandled value.
+            break;
+        }
+    }
+}
+
+// Handle the commands sent and received by the keyboard with VIA
+void via_custom_value_command_kb(uint8_t *data, uint8_t length) {
+    // data = [ command_id, channel_id, value_id, value_data ]
+    uint8_t *command_id        = &(data[0]);
+    uint8_t *channel_id        = &(data[1]);
+    uint8_t *value_id_and_data = &(data[2]);
+
+    if (*channel_id == id_custom_channel) {
+        switch (*command_id) {
+            case id_custom_set_value: {
+                via_config_set_value(value_id_and_data);
+                break;
+            }
+            case id_custom_get_value: {
+                via_config_get_value(value_id_and_data);
+                break;
+            }
+            case id_custom_save: {
+                // Bypass the save function in favor of pinpointed saves
+                break;
+            }
+            default: {
+                // Unhandled message.
+                *command_id = id_unhandled;
+                break;
+            }
+        }
+        return;
+    }
+
+    *command_id = id_unhandled;
+}
+
+// Rescale the values received by VIA to fit the new range
+void ec_rescale_values(uint8_t item) {
+    switch (item) {
+        // Rescale the APC mode actuation thresholds
+        case 0:
+            for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
+                for (uint8_t col = 0; col < MATRIX_COLS; col++) {
+                    ec_config.rescaled_mode_0_actuation_threshold[row][col] = rescale(ec_config.mode_0_actuation_threshold, 0, 1023, ec_config.noise_floor[row][col], eeprom_ec_config.bottoming_reading[row][col]);
+                }
+            }
+            break;
+        // Rescale the APC mode release thresholds
+        case 1:
+            for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
+                for (uint8_t col = 0; col < MATRIX_COLS; col++) {
+                    ec_config.rescaled_mode_0_release_threshold[row][col] = rescale(ec_config.mode_0_release_threshold, 0, 1023, ec_config.noise_floor[row][col], eeprom_ec_config.bottoming_reading[row][col]);
+                }
+            }
+            break;
+        // Rescale the Rapid Trigger mode initial deadzone offsets
+        case 2:
+            for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
+                for (uint8_t col = 0; col < MATRIX_COLS; col++) {
+                    ec_config.rescaled_mode_1_initial_deadzone_offset[row][col] = rescale(ec_config.mode_1_initial_deadzone_offset, 0, 1023, ec_config.noise_floor[row][col], eeprom_ec_config.bottoming_reading[row][col]);
+                }
+            }
+            break;
+
+        default:
+            // Unhandled item.
+            break;
+    }
+}
+
+void ec_save_threshold_data(uint8_t option) {
+    // Save APC mode thresholds and rescale them for runtime usage
+    if (option == 0) {
+        eeprom_ec_config.mode_0_actuation_threshold = ec_config.mode_0_actuation_threshold;
+        eeprom_ec_config.mode_0_release_threshold   = ec_config.mode_0_release_threshold;
+        ec_rescale_values(0);
+        ec_rescale_values(1);
+    }
+    // Save Rapid Trigger mode thresholds and rescale them for runtime usage
+    else if (option == 1) {
+        eeprom_ec_config.mode_1_initial_deadzone_offset = ec_config.mode_1_initial_deadzone_offset;
+        eeprom_ec_config.mode_1_actuation_offset        = ec_config.mode_1_actuation_offset;
+        eeprom_ec_config.mode_1_release_offset          = ec_config.mode_1_release_offset;
+        ec_rescale_values(2);
+    }
+    eeconfig_update_kb_datablock(&eeprom_ec_config);
+    uprintf("####################################\n");
+    uprintf("# New thresholds applied and saved #\n");
+    uprintf("####################################\n");
+}
+
+// Save the bottoming reading
+void ec_save_bottoming_reading(void) {
+    for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
+        for (uint8_t col = 0; col < MATRIX_COLS; col++) {
+            // If the bottom reading doesn't go over the noise floor by BOTTOMING_CALIBRATION_THRESHOLD, it is likely that:
+            // 1. The key is not actually in the matrix
+            // 2. The key is on an alternative layout, therefore not being pressed
+            // 3. The key in in the current layout but not being pressed
+            if (ec_config.bottoming_reading[row][col] < (ec_config.noise_floor[row][col] + BOTTOMING_CALIBRATION_THRESHOLD)) {
+                eeprom_ec_config.bottoming_reading[row][col] = 1023;
+            } else {
+                eeprom_ec_config.bottoming_reading[row][col] = ec_config.bottoming_reading[row][col];
+            }
+        }
+    }
+    // Rescale the values to fit the new range for runtime usage
+    ec_rescale_values(0);
+    ec_rescale_values(1);
+    ec_rescale_values(2);
+    eeconfig_update_kb_datablock(&eeprom_ec_config);
+}
+
+// Show the calibration data
+void ec_show_calibration_data(void) {
+    uprintf("\n###############\n");
+    uprintf("# Noise Floor #\n");
+    uprintf("###############\n");
+    for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
+        for (uint8_t col = 0; col < MATRIX_COLS - 1; col++) {
+            uprintf("%4d,", ec_config.noise_floor[row][col]);
+        }
+        uprintf("%4d\n", ec_config.noise_floor[row][MATRIX_COLS - 1]);
+    }
+
+    uprintf("\n######################\n");
+    uprintf("# Bottoming Readings #\n");
+    uprintf("######################\n");
+    for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
+        for (uint8_t col = 0; col < MATRIX_COLS - 1; col++) {
+            uprintf("%4d,", eeprom_ec_config.bottoming_reading[row][col]);
+        }
+        uprintf("%4d\n", eeprom_ec_config.bottoming_reading[row][MATRIX_COLS - 1]);
+    }
+
+    uprintf("\n######################################\n");
+    uprintf("# Rescaled APC Mode Actuation Points #\n");
+    uprintf("######################################\n");
+    uprintf("Original APC Mode Actuation Point: %4d\n", ec_config.mode_0_actuation_threshold);
+    for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
+        for (uint8_t col = 0; col < MATRIX_COLS - 1; col++) {
+            uprintf("%4d,", ec_config.rescaled_mode_0_actuation_threshold[row][col]);
+        }
+        uprintf("%4d\n", ec_config.rescaled_mode_0_actuation_threshold[row][MATRIX_COLS - 1]);
+    }
+
+    uprintf("\n######################################\n");
+    uprintf("# Rescaled APC Mode Release Points   #\n");
+    uprintf("######################################\n");
+    uprintf("Original APC Mode Release Point: %4d\n", ec_config.mode_0_release_threshold);
+    for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
+        for (uint8_t col = 0; col < MATRIX_COLS - 1; col++) {
+            uprintf("%4d,", ec_config.rescaled_mode_0_release_threshold[row][col]);
+        }
+        uprintf("%4d\n", ec_config.rescaled_mode_0_release_threshold[row][MATRIX_COLS - 1]);
+    }
+
+    uprintf("\n#######################################################\n");
+    uprintf("# Rescaled Rapid Trigger Mode Initial Deadzone Offset #\n");
+    uprintf("#######################################################\n");
+    uprintf("Original Rapid Trigger Mode Initial Deadzone Offset: %4d\n", ec_config.mode_1_initial_deadzone_offset);
+    for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
+        for (uint8_t col = 0; col < MATRIX_COLS - 1; col++) {
+            uprintf("%4d,", ec_config.rescaled_mode_1_initial_deadzone_offset[row][col]);
+        }
+        uprintf("%4d\n", ec_config.rescaled_mode_1_initial_deadzone_offset[row][MATRIX_COLS - 1]);
+    }
+    print("\n");
+}
+
+// Clear the calibration data
+void ec_clear_bottoming_calibration_data(void) {
+    // Clear the EEPROM data
+    eeconfig_init_kb();
+
+    // Reset the runtime values to the EEPROM values
+    keyboard_post_init_kb();
+
+    uprintf("######################################\n");
+    uprintf("# Bottoming calibration data cleared #\n");
+    uprintf("######################################\n");
+}
+
+#endif // VIA_ENABLE
diff --git a/keyboards/cipulot/ec_980c/matrix.c b/keyboards/cipulot/ec_980c/matrix.c
new file mode 100644
index 00000000000..cfa2efe0506
--- /dev/null
+++ b/keyboards/cipulot/ec_980c/matrix.c
@@ -0,0 +1,42 @@
+/* Copyright 2023 Cipulot
+ *
+ * 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 3 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 "ec_switch_matrix.h"
+#include "matrix.h"
+
+extern matrix_row_t raw_matrix[MATRIX_ROWS]; // raw values
+extern matrix_row_t matrix[MATRIX_ROWS];     // debounced values
+
+// Custom matrix init function
+void matrix_init_custom(void) {
+    // Initialize EC
+    ec_init();
+
+    // Get the noise floor at boot
+    ec_noise_floor();
+}
+
+// Custom matrix scan function
+bool matrix_scan_custom(matrix_row_t current_matrix[]) {
+    bool updated = ec_matrix_scan(current_matrix);
+
+    return updated;
+}
+
+// Bootmagic overriden to avoid conflicts with EC
+void bootmagic_scan(void) {
+    ;
+}
diff --git a/keyboards/cipulot/ec_980c/mcuconf.h b/keyboards/cipulot/ec_980c/mcuconf.h
new file mode 100644
index 00000000000..5f9ecca48dd
--- /dev/null
+++ b/keyboards/cipulot/ec_980c/mcuconf.h
@@ -0,0 +1,28 @@
+/* Copyright 2023 Cipulot
+ *
+ * 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 3 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_ADC_USE_ADC1
+#define STM32_ADC_USE_ADC1 TRUE
+
+#undef STM32_PWM_USE_ADVANCED
+#define STM32_PWM_USE_ADVANCED TRUE
+
+#undef STM32_PWM_USE_TIM1
+#define STM32_PWM_USE_TIM1 TRUE
diff --git a/keyboards/cipulot/ec_980c/readme.md b/keyboards/cipulot/ec_980c/readme.md
new file mode 100644
index 00000000000..20be2d4928b
--- /dev/null
+++ b/keyboards/cipulot/ec_980c/readme.md
@@ -0,0 +1,26 @@
+# EC980C
+
+![EC980C PCB](https://i.imgur.com/KcnLdVFh.png)
+
+Replacement PCB for the Leopold FC980C.
+
+* Keyboard Maintainer: [cipulot](https://github.com/cipulot)
+* Hardware Supported: EC980C PCB
+* Hardware Availability: TBD
+
+Make example for this keyboard (after setting up your build environment):
+
+    make cipulot/ec_980c:default
+
+Flashing example for this keyboard:
+
+    make cipulot/ec_980c: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:
+
+* **Physical reset**: Long short the exposed pads on the top of the PCB
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
diff --git a/keyboards/cipulot/ec_980c/rules.mk b/keyboards/cipulot/ec_980c/rules.mk
new file mode 100644
index 00000000000..1ff311f102d
--- /dev/null
+++ b/keyboards/cipulot/ec_980c/rules.mk
@@ -0,0 +1,4 @@
+CUSTOM_MATRIX = lite
+ANALOG_DRIVER_REQUIRED = yes
+SRC += matrix.c ec_switch_matrix.c
+OPT = 2
diff --git a/keyboards/cipulot/ec_alveus/1_0_0/config.h b/keyboards/cipulot/ec_alveus/1_0_0/config.h
index ea43ba348d5..ab51289c023 100644
--- a/keyboards/cipulot/ec_alveus/1_0_0/config.h
+++ b/keyboards/cipulot/ec_alveus/1_0_0/config.h
@@ -63,9 +63,3 @@
 // #define DEBUG_MATRIX_SCAN_RATE
 
 #define EECONFIG_KB_DATA_SIZE 169
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/cipulot/ec_alveus/1_0_0/info.json b/keyboards/cipulot/ec_alveus/1_0_0/info.json
deleted file mode 100644
index 4652166cc5e..00000000000
--- a/keyboards/cipulot/ec_alveus/1_0_0/info.json
+++ /dev/null
@@ -1,174 +0,0 @@
-{
-    "manufacturer": "Cipulot",
-    "keyboard_name": "EC Alveus 1.0.0",
-    "maintainer": "Cipulot",
-    "bootloader": "stm32-dfu",
-    "build": {
-        "lto": true
-    },
-    "diode_direction": "COL2ROW",
-    "features": {
-        "bootmagic": false,
-        "console": true,
-        "extrakey": true,
-        "mousekey": true,
-        "nkro": true
-    },
-    "processor": "STM32F401",
-    "usb": {
-        "device_version": "1.0.0",
-        "pid": "0x6BA4",
-        "shared_endpoint": {
-            "keyboard": true
-        },
-        "vid": "0x6369"
-    },
-    "layouts": {
-        "LAYOUT_all": {
-            "layout": [
-                { "label": "0,0", "matrix": [0, 0], "x": 0, "y": 0 },
-                { "label": "0,1", "matrix": [0, 1], "x": 1, "y": 0 },
-                { "label": "0,2", "matrix": [0, 2], "x": 2, "y": 0 },
-                { "label": "0,3", "matrix": [0, 3], "x": 3, "y": 0 },
-                { "label": "0,4", "matrix": [0, 4], "x": 4, "y": 0 },
-                { "label": "0,5", "matrix": [0, 5], "x": 5, "y": 0 },
-                { "label": "0,6", "matrix": [0, 6], "x": 6, "y": 0 },
-                { "label": "0,7", "matrix": [0, 7], "x": 7, "y": 0 },
-                { "label": "0,8", "matrix": [0, 8], "x": 8, "y": 0 },
-                { "label": "0,9", "matrix": [0, 9], "x": 9, "y": 0 },
-                { "label": "0,10", "matrix": [0, 10], "x": 10, "y": 0 },
-                { "label": "0,11", "matrix": [0, 11], "x": 11, "y": 0 },
-                { "label": "0,12", "matrix": [0, 12], "x": 12, "y": 0 },
-                { "label": "0,13", "matrix": [0, 13], "w": 2, "x": 13, "y": 0 },
-                { "label": "0,14", "matrix": [0, 14], "x": 15.25, "y": 0 },
-                { "label": "0,15", "matrix": [0, 15], "x": 16.25, "y": 0 },
-                { "label": "1,15", "matrix": [1, 15], "x": 17.25, "y": 0 },
-                { "label": "1,0", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 },
-                { "label": "1,1", "matrix": [1, 1], "x": 1.5, "y": 1 },
-                { "label": "1,2", "matrix": [1, 2], "x": 2.5, "y": 1 },
-                { "label": "1,3", "matrix": [1, 3], "x": 3.5, "y": 1 },
-                { "label": "1,4", "matrix": [1, 4], "x": 4.5, "y": 1 },
-                { "label": "1,5", "matrix": [1, 5], "x": 5.5, "y": 1 },
-                { "label": "1,6", "matrix": [1, 6], "x": 6.5, "y": 1 },
-                { "label": "1,7", "matrix": [1, 7], "x": 7.5, "y": 1 },
-                { "label": "1,8", "matrix": [1, 8], "x": 8.5, "y": 1 },
-                { "label": "1,9", "matrix": [1, 9], "x": 9.5, "y": 1 },
-                { "label": "1,10", "matrix": [1, 10], "x": 10.5, "y": 1 },
-                { "label": "1,11", "matrix": [1, 11], "x": 11.5, "y": 1 },
-                { "label": "1,12", "matrix": [1, 12], "x": 12.5, "y": 1 },
-                { "label": "1,13", "matrix": [1, 13], "w": 1.5, "x": 13.5, "y": 1 },
-                { "label": "1,14", "matrix": [1, 14], "x": 15.25, "y": 1 },
-                { "label": "2,14", "matrix": [2, 14], "x": 16.25, "y": 1 },
-                { "label": "2,15", "matrix": [2, 15], "x": 17.25, "y": 1 },
-                { "label": "2,0", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
-                { "label": "2,1", "matrix": [2, 1], "x": 1.75, "y": 2 },
-                { "label": "2,2", "matrix": [2, 2], "x": 2.75, "y": 2 },
-                { "label": "2,3", "matrix": [2, 3], "x": 3.75, "y": 2 },
-                { "label": "2,4", "matrix": [2, 4], "x": 4.75, "y": 2 },
-                { "label": "2,5", "matrix": [2, 5], "x": 5.75, "y": 2 },
-                { "label": "2,6", "matrix": [2, 6], "x": 6.75, "y": 2 },
-                { "label": "2,7", "matrix": [2, 7], "x": 7.75, "y": 2 },
-                { "label": "2,8", "matrix": [2, 8], "x": 8.75, "y": 2 },
-                { "label": "2,9", "matrix": [2, 9], "x": 9.75, "y": 2 },
-                { "label": "2,10", "matrix": [2, 10], "x": 10.75, "y": 2 },
-                { "label": "2,11", "matrix": [2, 11], "x": 11.75, "y": 2 },
-                { "label": "2,13", "matrix": [2, 13], "w": 2.25, "x": 12.75, "y": 2 },
-                { "label": "3,0", "matrix": [3, 0], "w": 2.25, "x": 0, "y": 3 },
-                { "label": "3,1", "matrix": [3, 1], "x": 2.25, "y": 3 },
-                { "label": "3,2", "matrix": [3, 2], "x": 3.25, "y": 3 },
-                { "label": "3,3", "matrix": [3, 3], "x": 4.25, "y": 3 },
-                { "label": "3,4", "matrix": [3, 4], "x": 5.25, "y": 3 },
-                { "label": "3,5", "matrix": [3, 5], "x": 6.25, "y": 3 },
-                { "label": "3,6", "matrix": [3, 6], "x": 7.25, "y": 3 },
-                { "label": "3,7", "matrix": [3, 7], "x": 8.25, "y": 3 },
-                { "label": "3,8", "matrix": [3, 8], "x": 9.25, "y": 3 },
-                { "label": "3,9", "matrix": [3, 9], "x": 10.25, "y": 3 },
-                { "label": "3,10", "matrix": [3, 10], "x": 11.25, "y": 3 },
-                { "label": "3,13", "matrix": [3, 13], "w": 2.75, "x": 12.25, "y": 3 },
-                { "label": "3,14", "matrix": [3, 14], "x": 16.25, "y": 3 },
-                { "label": "4,0", "matrix": [4, 0], "w": 1.5, "x": 0, "y": 4 },
-                { "label": "4,1", "matrix": [4, 1], "x": 1.5, "y": 4 },
-                { "label": "4,2", "matrix": [4, 2], "w": 1.5, "x": 2.5, "y": 4 },
-                { "label": "4,5", "matrix": [4, 5], "w": 7, "x": 4, "y": 4 },
-                { "label": "4,11", "matrix": [4, 11], "w": 1.5, "x": 11, "y": 4 },
-                { "label": "4,12", "matrix": [4, 12], "x": 12.5, "y": 4 },
-                { "label": "4,13", "matrix": [4, 13], "w": 1.5, "x": 13.5, "y": 4 },
-                { "label": "4,14", "matrix": [4, 14], "x": 15.25, "y": 4 },
-                { "label": "4,15", "matrix": [4, 15], "x": 16.25, "y": 4 },
-                { "label": "3,15", "matrix": [3, 15], "x": 17.25, "y": 4 }
-            ]
-        },
-        "LAYOUT_tkl_nofrow_ansi_tsangan_wkl": {
-            "layout": [
-                { "label": "0,0", "matrix": [0, 0], "x": 0, "y": 0 },
-                { "label": "0,1", "matrix": [0, 1], "x": 1, "y": 0 },
-                { "label": "0,2", "matrix": [0, 2], "x": 2, "y": 0 },
-                { "label": "0,3", "matrix": [0, 3], "x": 3, "y": 0 },
-                { "label": "0,4", "matrix": [0, 4], "x": 4, "y": 0 },
-                { "label": "0,5", "matrix": [0, 5], "x": 5, "y": 0 },
-                { "label": "0,6", "matrix": [0, 6], "x": 6, "y": 0 },
-                { "label": "0,7", "matrix": [0, 7], "x": 7, "y": 0 },
-                { "label": "0,8", "matrix": [0, 8], "x": 8, "y": 0 },
-                { "label": "0,9", "matrix": [0, 9], "x": 9, "y": 0 },
-                { "label": "0,10", "matrix": [0, 10], "x": 10, "y": 0 },
-                { "label": "0,11", "matrix": [0, 11], "x": 11, "y": 0 },
-                { "label": "0,12", "matrix": [0, 12], "x": 12, "y": 0 },
-                { "label": "0,13", "matrix": [0, 13], "w": 2, "x": 13, "y": 0 },
-                { "label": "0,14", "matrix": [0, 14], "x": 15.25, "y": 0 },
-                { "label": "0,15", "matrix": [0, 15], "x": 16.25, "y": 0 },
-                { "label": "1,15", "matrix": [1, 15], "x": 17.25, "y": 0 },
-                { "label": "1,0", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 },
-                { "label": "1,1", "matrix": [1, 1], "x": 1.5, "y": 1 },
-                { "label": "1,2", "matrix": [1, 2], "x": 2.5, "y": 1 },
-                { "label": "1,3", "matrix": [1, 3], "x": 3.5, "y": 1 },
-                { "label": "1,4", "matrix": [1, 4], "x": 4.5, "y": 1 },
-                { "label": "1,5", "matrix": [1, 5], "x": 5.5, "y": 1 },
-                { "label": "1,6", "matrix": [1, 6], "x": 6.5, "y": 1 },
-                { "label": "1,7", "matrix": [1, 7], "x": 7.5, "y": 1 },
-                { "label": "1,8", "matrix": [1, 8], "x": 8.5, "y": 1 },
-                { "label": "1,9", "matrix": [1, 9], "x": 9.5, "y": 1 },
-                { "label": "1,10", "matrix": [1, 10], "x": 10.5, "y": 1 },
-                { "label": "1,11", "matrix": [1, 11], "x": 11.5, "y": 1 },
-                { "label": "1,12", "matrix": [1, 12], "x": 12.5, "y": 1 },
-                { "label": "1,13", "matrix": [1, 13], "w": 1.5, "x": 13.5, "y": 1 },
-                { "label": "1,14", "matrix": [1, 14], "x": 15.25, "y": 1 },
-                { "label": "2,14", "matrix": [2, 14], "x": 16.25, "y": 1 },
-                { "label": "2,15", "matrix": [2, 15], "x": 17.25, "y": 1 },
-                { "label": "2,0", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
-                { "label": "2,1", "matrix": [2, 1], "x": 1.75, "y": 2 },
-                { "label": "2,2", "matrix": [2, 2], "x": 2.75, "y": 2 },
-                { "label": "2,3", "matrix": [2, 3], "x": 3.75, "y": 2 },
-                { "label": "2,4", "matrix": [2, 4], "x": 4.75, "y": 2 },
-                { "label": "2,5", "matrix": [2, 5], "x": 5.75, "y": 2 },
-                { "label": "2,6", "matrix": [2, 6], "x": 6.75, "y": 2 },
-                { "label": "2,7", "matrix": [2, 7], "x": 7.75, "y": 2 },
-                { "label": "2,8", "matrix": [2, 8], "x": 8.75, "y": 2 },
-                { "label": "2,9", "matrix": [2, 9], "x": 9.75, "y": 2 },
-                { "label": "2,10", "matrix": [2, 10], "x": 10.75, "y": 2 },
-                { "label": "2,11", "matrix": [2, 11], "x": 11.75, "y": 2 },
-                { "label": "2,13", "matrix": [2, 13], "w": 2.25, "x": 12.75, "y": 2 },
-                { "label": "3,0", "matrix": [3, 0], "w": 2.25, "x": 0, "y": 3 },
-                { "label": "3,1", "matrix": [3, 1], "x": 2.25, "y": 3 },
-                { "label": "3,2", "matrix": [3, 2], "x": 3.25, "y": 3 },
-                { "label": "3,3", "matrix": [3, 3], "x": 4.25, "y": 3 },
-                { "label": "3,4", "matrix": [3, 4], "x": 5.25, "y": 3 },
-                { "label": "3,5", "matrix": [3, 5], "x": 6.25, "y": 3 },
-                { "label": "3,6", "matrix": [3, 6], "x": 7.25, "y": 3 },
-                { "label": "3,7", "matrix": [3, 7], "x": 8.25, "y": 3 },
-                { "label": "3,8", "matrix": [3, 8], "x": 9.25, "y": 3 },
-                { "label": "3,9", "matrix": [3, 9], "x": 10.25, "y": 3 },
-                { "label": "3,10", "matrix": [3, 10], "x": 11.25, "y": 3 },
-                { "label": "3,13", "matrix": [3, 13], "w": 2.75, "x": 12.25, "y": 3 },
-                { "label": "3,14", "matrix": [3, 14], "x": 16.25, "y": 3 },
-                { "label": "4,0", "matrix": [4, 0], "w": 1.5, "x": 0, "y": 4 },
-                { "label": "4,2", "matrix": [4, 2], "w": 1.5, "x": 2.5, "y": 4 },
-                { "label": "4,5", "matrix": [4, 5], "w": 7, "x": 4, "y": 4 },
-                { "label": "4,11", "matrix": [4, 11], "w": 1.5, "x": 11, "y": 4 },
-                { "label": "4,13", "matrix": [4, 13], "w": 1.5, "x": 13.5, "y": 4 },
-                { "label": "4,14", "matrix": [4, 14], "x": 15.25, "y": 4 },
-                { "label": "4,15", "matrix": [4, 15], "x": 16.25, "y": 4 },
-                { "label": "3,15", "matrix": [3, 15], "x": 17.25, "y": 4 }
-            ]
-        }
-    }
-}
diff --git a/keyboards/cipulot/ec_alveus/1_0_0/keyboard.json b/keyboards/cipulot/ec_alveus/1_0_0/keyboard.json
new file mode 100644
index 00000000000..cffd3ade586
--- /dev/null
+++ b/keyboards/cipulot/ec_alveus/1_0_0/keyboard.json
@@ -0,0 +1,180 @@
+{
+    "manufacturer": "Cipulot",
+    "keyboard_name": "EC Alveus 1.0.0",
+    "maintainer": "Cipulot",
+    "bootloader": "stm32-dfu",
+    "build": {
+        "lto": true
+    },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": false,
+        "console": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "processor": "STM32F401",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x6BA4",
+        "shared_endpoint": {
+            "keyboard": true
+        },
+        "vid": "0x6369"
+    },
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                { "label": "0,0", "matrix": [0, 0], "x": 0, "y": 0 },
+                { "label": "0,1", "matrix": [0, 1], "x": 1, "y": 0 },
+                { "label": "0,2", "matrix": [0, 2], "x": 2, "y": 0 },
+                { "label": "0,3", "matrix": [0, 3], "x": 3, "y": 0 },
+                { "label": "0,4", "matrix": [0, 4], "x": 4, "y": 0 },
+                { "label": "0,5", "matrix": [0, 5], "x": 5, "y": 0 },
+                { "label": "0,6", "matrix": [0, 6], "x": 6, "y": 0 },
+                { "label": "0,7", "matrix": [0, 7], "x": 7, "y": 0 },
+                { "label": "0,8", "matrix": [0, 8], "x": 8, "y": 0 },
+                { "label": "0,9", "matrix": [0, 9], "x": 9, "y": 0 },
+                { "label": "0,10", "matrix": [0, 10], "x": 10, "y": 0 },
+                { "label": "0,11", "matrix": [0, 11], "x": 11, "y": 0 },
+                { "label": "0,12", "matrix": [0, 12], "x": 12, "y": 0 },
+                { "label": "0,13", "matrix": [0, 13], "w": 2, "x": 13, "y": 0 },
+                { "label": "0,14", "matrix": [0, 14], "x": 15.25, "y": 0 },
+                { "label": "0,15", "matrix": [0, 15], "x": 16.25, "y": 0 },
+                { "label": "1,15", "matrix": [1, 15], "x": 17.25, "y": 0 },
+                { "label": "1,0", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 },
+                { "label": "1,1", "matrix": [1, 1], "x": 1.5, "y": 1 },
+                { "label": "1,2", "matrix": [1, 2], "x": 2.5, "y": 1 },
+                { "label": "1,3", "matrix": [1, 3], "x": 3.5, "y": 1 },
+                { "label": "1,4", "matrix": [1, 4], "x": 4.5, "y": 1 },
+                { "label": "1,5", "matrix": [1, 5], "x": 5.5, "y": 1 },
+                { "label": "1,6", "matrix": [1, 6], "x": 6.5, "y": 1 },
+                { "label": "1,7", "matrix": [1, 7], "x": 7.5, "y": 1 },
+                { "label": "1,8", "matrix": [1, 8], "x": 8.5, "y": 1 },
+                { "label": "1,9", "matrix": [1, 9], "x": 9.5, "y": 1 },
+                { "label": "1,10", "matrix": [1, 10], "x": 10.5, "y": 1 },
+                { "label": "1,11", "matrix": [1, 11], "x": 11.5, "y": 1 },
+                { "label": "1,12", "matrix": [1, 12], "x": 12.5, "y": 1 },
+                { "label": "1,13", "matrix": [1, 13], "w": 1.5, "x": 13.5, "y": 1 },
+                { "label": "1,14", "matrix": [1, 14], "x": 15.25, "y": 1 },
+                { "label": "2,14", "matrix": [2, 14], "x": 16.25, "y": 1 },
+                { "label": "2,15", "matrix": [2, 15], "x": 17.25, "y": 1 },
+                { "label": "2,0", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
+                { "label": "2,1", "matrix": [2, 1], "x": 1.75, "y": 2 },
+                { "label": "2,2", "matrix": [2, 2], "x": 2.75, "y": 2 },
+                { "label": "2,3", "matrix": [2, 3], "x": 3.75, "y": 2 },
+                { "label": "2,4", "matrix": [2, 4], "x": 4.75, "y": 2 },
+                { "label": "2,5", "matrix": [2, 5], "x": 5.75, "y": 2 },
+                { "label": "2,6", "matrix": [2, 6], "x": 6.75, "y": 2 },
+                { "label": "2,7", "matrix": [2, 7], "x": 7.75, "y": 2 },
+                { "label": "2,8", "matrix": [2, 8], "x": 8.75, "y": 2 },
+                { "label": "2,9", "matrix": [2, 9], "x": 9.75, "y": 2 },
+                { "label": "2,10", "matrix": [2, 10], "x": 10.75, "y": 2 },
+                { "label": "2,11", "matrix": [2, 11], "x": 11.75, "y": 2 },
+                { "label": "2,13", "matrix": [2, 13], "w": 2.25, "x": 12.75, "y": 2 },
+                { "label": "3,0", "matrix": [3, 0], "w": 2.25, "x": 0, "y": 3 },
+                { "label": "3,1", "matrix": [3, 1], "x": 2.25, "y": 3 },
+                { "label": "3,2", "matrix": [3, 2], "x": 3.25, "y": 3 },
+                { "label": "3,3", "matrix": [3, 3], "x": 4.25, "y": 3 },
+                { "label": "3,4", "matrix": [3, 4], "x": 5.25, "y": 3 },
+                { "label": "3,5", "matrix": [3, 5], "x": 6.25, "y": 3 },
+                { "label": "3,6", "matrix": [3, 6], "x": 7.25, "y": 3 },
+                { "label": "3,7", "matrix": [3, 7], "x": 8.25, "y": 3 },
+                { "label": "3,8", "matrix": [3, 8], "x": 9.25, "y": 3 },
+                { "label": "3,9", "matrix": [3, 9], "x": 10.25, "y": 3 },
+                { "label": "3,10", "matrix": [3, 10], "x": 11.25, "y": 3 },
+                { "label": "3,13", "matrix": [3, 13], "w": 2.75, "x": 12.25, "y": 3 },
+                { "label": "3,14", "matrix": [3, 14], "x": 16.25, "y": 3 },
+                { "label": "4,0", "matrix": [4, 0], "w": 1.5, "x": 0, "y": 4 },
+                { "label": "4,1", "matrix": [4, 1], "x": 1.5, "y": 4 },
+                { "label": "4,2", "matrix": [4, 2], "w": 1.5, "x": 2.5, "y": 4 },
+                { "label": "4,5", "matrix": [4, 5], "w": 7, "x": 4, "y": 4 },
+                { "label": "4,11", "matrix": [4, 11], "w": 1.5, "x": 11, "y": 4 },
+                { "label": "4,12", "matrix": [4, 12], "x": 12.5, "y": 4 },
+                { "label": "4,13", "matrix": [4, 13], "w": 1.5, "x": 13.5, "y": 4 },
+                { "label": "4,14", "matrix": [4, 14], "x": 15.25, "y": 4 },
+                { "label": "4,15", "matrix": [4, 15], "x": 16.25, "y": 4 },
+                { "label": "3,15", "matrix": [3, 15], "x": 17.25, "y": 4 }
+            ]
+        },
+        "LAYOUT_tkl_nofrow_ansi_tsangan_wkl": {
+            "layout": [
+                { "label": "0,0", "matrix": [0, 0], "x": 0, "y": 0 },
+                { "label": "0,1", "matrix": [0, 1], "x": 1, "y": 0 },
+                { "label": "0,2", "matrix": [0, 2], "x": 2, "y": 0 },
+                { "label": "0,3", "matrix": [0, 3], "x": 3, "y": 0 },
+                { "label": "0,4", "matrix": [0, 4], "x": 4, "y": 0 },
+                { "label": "0,5", "matrix": [0, 5], "x": 5, "y": 0 },
+                { "label": "0,6", "matrix": [0, 6], "x": 6, "y": 0 },
+                { "label": "0,7", "matrix": [0, 7], "x": 7, "y": 0 },
+                { "label": "0,8", "matrix": [0, 8], "x": 8, "y": 0 },
+                { "label": "0,9", "matrix": [0, 9], "x": 9, "y": 0 },
+                { "label": "0,10", "matrix": [0, 10], "x": 10, "y": 0 },
+                { "label": "0,11", "matrix": [0, 11], "x": 11, "y": 0 },
+                { "label": "0,12", "matrix": [0, 12], "x": 12, "y": 0 },
+                { "label": "0,13", "matrix": [0, 13], "w": 2, "x": 13, "y": 0 },
+                { "label": "0,14", "matrix": [0, 14], "x": 15.25, "y": 0 },
+                { "label": "0,15", "matrix": [0, 15], "x": 16.25, "y": 0 },
+                { "label": "1,15", "matrix": [1, 15], "x": 17.25, "y": 0 },
+                { "label": "1,0", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 },
+                { "label": "1,1", "matrix": [1, 1], "x": 1.5, "y": 1 },
+                { "label": "1,2", "matrix": [1, 2], "x": 2.5, "y": 1 },
+                { "label": "1,3", "matrix": [1, 3], "x": 3.5, "y": 1 },
+                { "label": "1,4", "matrix": [1, 4], "x": 4.5, "y": 1 },
+                { "label": "1,5", "matrix": [1, 5], "x": 5.5, "y": 1 },
+                { "label": "1,6", "matrix": [1, 6], "x": 6.5, "y": 1 },
+                { "label": "1,7", "matrix": [1, 7], "x": 7.5, "y": 1 },
+                { "label": "1,8", "matrix": [1, 8], "x": 8.5, "y": 1 },
+                { "label": "1,9", "matrix": [1, 9], "x": 9.5, "y": 1 },
+                { "label": "1,10", "matrix": [1, 10], "x": 10.5, "y": 1 },
+                { "label": "1,11", "matrix": [1, 11], "x": 11.5, "y": 1 },
+                { "label": "1,12", "matrix": [1, 12], "x": 12.5, "y": 1 },
+                { "label": "1,13", "matrix": [1, 13], "w": 1.5, "x": 13.5, "y": 1 },
+                { "label": "1,14", "matrix": [1, 14], "x": 15.25, "y": 1 },
+                { "label": "2,14", "matrix": [2, 14], "x": 16.25, "y": 1 },
+                { "label": "2,15", "matrix": [2, 15], "x": 17.25, "y": 1 },
+                { "label": "2,0", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
+                { "label": "2,1", "matrix": [2, 1], "x": 1.75, "y": 2 },
+                { "label": "2,2", "matrix": [2, 2], "x": 2.75, "y": 2 },
+                { "label": "2,3", "matrix": [2, 3], "x": 3.75, "y": 2 },
+                { "label": "2,4", "matrix": [2, 4], "x": 4.75, "y": 2 },
+                { "label": "2,5", "matrix": [2, 5], "x": 5.75, "y": 2 },
+                { "label": "2,6", "matrix": [2, 6], "x": 6.75, "y": 2 },
+                { "label": "2,7", "matrix": [2, 7], "x": 7.75, "y": 2 },
+                { "label": "2,8", "matrix": [2, 8], "x": 8.75, "y": 2 },
+                { "label": "2,9", "matrix": [2, 9], "x": 9.75, "y": 2 },
+                { "label": "2,10", "matrix": [2, 10], "x": 10.75, "y": 2 },
+                { "label": "2,11", "matrix": [2, 11], "x": 11.75, "y": 2 },
+                { "label": "2,13", "matrix": [2, 13], "w": 2.25, "x": 12.75, "y": 2 },
+                { "label": "3,0", "matrix": [3, 0], "w": 2.25, "x": 0, "y": 3 },
+                { "label": "3,1", "matrix": [3, 1], "x": 2.25, "y": 3 },
+                { "label": "3,2", "matrix": [3, 2], "x": 3.25, "y": 3 },
+                { "label": "3,3", "matrix": [3, 3], "x": 4.25, "y": 3 },
+                { "label": "3,4", "matrix": [3, 4], "x": 5.25, "y": 3 },
+                { "label": "3,5", "matrix": [3, 5], "x": 6.25, "y": 3 },
+                { "label": "3,6", "matrix": [3, 6], "x": 7.25, "y": 3 },
+                { "label": "3,7", "matrix": [3, 7], "x": 8.25, "y": 3 },
+                { "label": "3,8", "matrix": [3, 8], "x": 9.25, "y": 3 },
+                { "label": "3,9", "matrix": [3, 9], "x": 10.25, "y": 3 },
+                { "label": "3,10", "matrix": [3, 10], "x": 11.25, "y": 3 },
+                { "label": "3,13", "matrix": [3, 13], "w": 2.75, "x": 12.25, "y": 3 },
+                { "label": "3,14", "matrix": [3, 14], "x": 16.25, "y": 3 },
+                { "label": "4,0", "matrix": [4, 0], "w": 1.5, "x": 0, "y": 4 },
+                { "label": "4,2", "matrix": [4, 2], "w": 1.5, "x": 2.5, "y": 4 },
+                { "label": "4,5", "matrix": [4, 5], "w": 7, "x": 4, "y": 4 },
+                { "label": "4,11", "matrix": [4, 11], "w": 1.5, "x": 11, "y": 4 },
+                { "label": "4,13", "matrix": [4, 13], "w": 1.5, "x": 13.5, "y": 4 },
+                { "label": "4,14", "matrix": [4, 14], "x": 15.25, "y": 4 },
+                { "label": "4,15", "matrix": [4, 15], "x": 16.25, "y": 4 },
+                { "label": "3,15", "matrix": [3, 15], "x": 17.25, "y": 4 }
+            ]
+        }
+    }
+}
diff --git a/keyboards/cipulot/ec_alveus/1_0_0/rules.mk b/keyboards/cipulot/ec_alveus/1_0_0/rules.mk
index 70494b635f6..ce525670a68 100644
--- a/keyboards/cipulot/ec_alveus/1_0_0/rules.mk
+++ b/keyboards/cipulot/ec_alveus/1_0_0/rules.mk
@@ -1,4 +1,5 @@
 CUSTOM_MATRIX = lite
 ANALOG_DRIVER_REQUIRED = yes
-SRC += keyboards/cipulot/common/matrix.c keyboards/cipulot/common/ec_board.c keyboards/cipulot/common/ec_switch_matrix.c
+VPATH += keyboards/cipulot/common
+SRC += matrix.c ec_board.c ec_switch_matrix.c
 OPT = 3
diff --git a/keyboards/cipulot/ec_alveus/1_2_0/config.h b/keyboards/cipulot/ec_alveus/1_2_0/config.h
index ea43ba348d5..ab51289c023 100644
--- a/keyboards/cipulot/ec_alveus/1_2_0/config.h
+++ b/keyboards/cipulot/ec_alveus/1_2_0/config.h
@@ -63,9 +63,3 @@
 // #define DEBUG_MATRIX_SCAN_RATE
 
 #define EECONFIG_KB_DATA_SIZE 169
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/cipulot/ec_alveus/1_2_0/info.json b/keyboards/cipulot/ec_alveus/1_2_0/info.json
deleted file mode 100644
index 8b63d02f770..00000000000
--- a/keyboards/cipulot/ec_alveus/1_2_0/info.json
+++ /dev/null
@@ -1,248 +0,0 @@
-{
-    "manufacturer": "Cipulot",
-    "keyboard_name": "EC Alveus 1.2.0",
-    "maintainer": "Cipulot",
-    "bootloader": "stm32-dfu",
-    "build": {
-        "lto": true
-    },
-    "diode_direction": "COL2ROW",
-    "features": {
-        "bootmagic": false,
-        "console": true,
-        "extrakey": true,
-        "mousekey": true,
-        "nkro": true
-    },
-    "processor": "STM32F401",
-    "usb": {
-        "device_version": "1.2.0",
-        "pid": "0x6B90",
-        "shared_endpoint": {
-            "keyboard": true
-        },
-        "vid": "0x6369"
-    },
-    "layouts": {
-        "LAYOUT_all": {
-            "layout": [
-                { "label": "0,0", "matrix": [0, 0], "x": 0, "y": 0 },
-                { "label": "0,1", "matrix": [0, 1], "x": 1, "y": 0 },
-                { "label": "0,2", "matrix": [0, 2], "x": 2, "y": 0 },
-                { "label": "0,3", "matrix": [0, 3], "x": 3, "y": 0 },
-                { "label": "0,4", "matrix": [0, 4], "x": 4, "y": 0 },
-                { "label": "0,5", "matrix": [0, 5], "x": 5, "y": 0 },
-                { "label": "0,6", "matrix": [0, 6], "x": 6, "y": 0 },
-                { "label": "0,7", "matrix": [0, 7], "x": 7, "y": 0 },
-                { "label": "0,8", "matrix": [0, 8], "x": 8, "y": 0 },
-                { "label": "0,9", "matrix": [0, 9], "x": 9, "y": 0 },
-                { "label": "0,10", "matrix": [0, 10], "x": 10, "y": 0 },
-                { "label": "0,11", "matrix": [0, 11], "x": 11, "y": 0 },
-                { "label": "0,12", "matrix": [0, 12], "x": 12, "y": 0 },
-                { "label": "0,13", "matrix": [0, 13], "x": 13, "y": 0 },
-                { "label": "1,13", "matrix": [1, 13], "x": 14, "y": 0 },
-                { "label": "0,14", "matrix": [0, 14], "x": 15.25, "y": 0 },
-                { "label": "0,15", "matrix": [0, 15], "x": 16.25, "y": 0 },
-                { "label": "1,15", "matrix": [1, 15], "x": 17.25, "y": 0 },
-                { "label": "1,0", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 },
-                { "label": "1,1", "matrix": [1, 1], "x": 1.5, "y": 1 },
-                { "label": "1,2", "matrix": [1, 2], "x": 2.5, "y": 1 },
-                { "label": "1,3", "matrix": [1, 3], "x": 3.5, "y": 1 },
-                { "label": "1,4", "matrix": [1, 4], "x": 4.5, "y": 1 },
-                { "label": "1,5", "matrix": [1, 5], "x": 5.5, "y": 1 },
-                { "label": "1,6", "matrix": [1, 6], "x": 6.5, "y": 1 },
-                { "label": "1,7", "matrix": [1, 7], "x": 7.5, "y": 1 },
-                { "label": "1,8", "matrix": [1, 8], "x": 8.5, "y": 1 },
-                { "label": "1,9", "matrix": [1, 9], "x": 9.5, "y": 1 },
-                { "label": "1,10", "matrix": [1, 10], "x": 10.5, "y": 1 },
-                { "label": "1,11", "matrix": [1, 11], "x": 11.5, "y": 1 },
-                { "label": "1,12", "matrix": [1, 12], "x": 12.5, "y": 1 },
-                { "label": "2,13", "matrix": [2, 13], "w": 1.5, "x": 13.5, "y": 1 },
-                { "label": "1,14", "matrix": [1, 14], "x": 15.25, "y": 1 },
-                { "label": "2,14", "matrix": [2, 14], "x": 16.25, "y": 1 },
-                { "label": "2,15", "matrix": [2, 15], "x": 17.25, "y": 1 },
-                { "label": "2,0", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
-                { "label": "2,1", "matrix": [2, 1], "x": 1.75, "y": 2 },
-                { "label": "2,2", "matrix": [2, 2], "x": 2.75, "y": 2 },
-                { "label": "2,3", "matrix": [2, 3], "x": 3.75, "y": 2 },
-                { "label": "2,4", "matrix": [2, 4], "x": 4.75, "y": 2 },
-                { "label": "2,5", "matrix": [2, 5], "x": 5.75, "y": 2 },
-                { "label": "2,6", "matrix": [2, 6], "x": 6.75, "y": 2 },
-                { "label": "2,7", "matrix": [2, 7], "x": 7.75, "y": 2 },
-                { "label": "2,8", "matrix": [2, 8], "x": 8.75, "y": 2 },
-                { "label": "2,9", "matrix": [2, 9], "x": 9.75, "y": 2 },
-                { "label": "2,10", "matrix": [2, 10], "x": 10.75, "y": 2 },
-                { "label": "2,11", "matrix": [2, 11], "x": 11.75, "y": 2 },
-                { "label": "2,12", "matrix": [2, 12], "w": 2.25, "x": 12.75, "y": 2 },
-                { "label": "3,0", "matrix": [3, 0], "w": 2.25, "x": 0, "y": 3 },
-                { "label": "3,1", "matrix": [3, 1], "x": 2.25, "y": 3 },
-                { "label": "3,2", "matrix": [3, 2], "x": 3.25, "y": 3 },
-                { "label": "3,3", "matrix": [3, 3], "x": 4.25, "y": 3 },
-                { "label": "3,4", "matrix": [3, 4], "x": 5.25, "y": 3 },
-                { "label": "3,5", "matrix": [3, 5], "x": 6.25, "y": 3 },
-                { "label": "3,6", "matrix": [3, 6], "x": 7.25, "y": 3 },
-                { "label": "3,7", "matrix": [3, 7], "x": 8.25, "y": 3 },
-                { "label": "3,8", "matrix": [3, 8], "x": 9.25, "y": 3 },
-                { "label": "3,9", "matrix": [3, 9], "x": 10.25, "y": 3 },
-                { "label": "3,10", "matrix": [3, 10], "x": 11.25, "y": 3 },
-                { "label": "3,13", "matrix": [3, 13], "w": 2.75, "x": 12.25, "y": 3 },
-                { "label": "3,14", "matrix": [3, 14], "x": 16.25, "y": 3 },
-                { "label": "4,0", "matrix": [4, 0], "w": 1.5, "x": 0, "y": 4 },
-                { "label": "4,1", "matrix": [4, 1], "x": 1.5, "y": 4 },
-                { "label": "4,2", "matrix": [4, 2], "w": 1.5, "x": 2.5, "y": 4 },
-                { "label": "4,5", "matrix": [4, 5], "w": 7, "x": 4, "y": 4 },
-                { "label": "4,11", "matrix": [4, 11], "w": 1.5, "x": 11, "y": 4 },
-                { "label": "4,12", "matrix": [4, 12], "x": 12.5, "y": 4 },
-                { "label": "4,13", "matrix": [4, 13], "w": 1.5, "x": 13.5, "y": 4 },
-                { "label": "4,14", "matrix": [4, 14], "x": 15.25, "y": 4 },
-                { "label": "4,15", "matrix": [4, 15], "x": 16.25, "y": 4 },
-                { "label": "3,15", "matrix": [3, 15], "x": 17.25, "y": 4 }
-            ]
-        },
-        "LAYOUT_tkl_nofrow_ansi_tsangan_wkl": {
-            "layout": [
-                { "label": "0,0", "matrix": [0, 0], "x": 0, "y": 0 },
-                { "label": "0,1", "matrix": [0, 1], "x": 1, "y": 0 },
-                { "label": "0,2", "matrix": [0, 2], "x": 2, "y": 0 },
-                { "label": "0,3", "matrix": [0, 3], "x": 3, "y": 0 },
-                { "label": "0,4", "matrix": [0, 4], "x": 4, "y": 0 },
-                { "label": "0,5", "matrix": [0, 5], "x": 5, "y": 0 },
-                { "label": "0,6", "matrix": [0, 6], "x": 6, "y": 0 },
-                { "label": "0,7", "matrix": [0, 7], "x": 7, "y": 0 },
-                { "label": "0,8", "matrix": [0, 8], "x": 8, "y": 0 },
-                { "label": "0,9", "matrix": [0, 9], "x": 9, "y": 0 },
-                { "label": "0,10", "matrix": [0, 10], "x": 10, "y": 0 },
-                { "label": "0,11", "matrix": [0, 11], "x": 11, "y": 0 },
-                { "label": "0,12", "matrix": [0, 12], "x": 12, "y": 0 },
-                { "label": "1,13", "matrix": [1, 13], "w": 2, "x": 13, "y": 0 },
-                { "label": "0,14", "matrix": [0, 14], "x": 15.25, "y": 0 },
-                { "label": "0,15", "matrix": [0, 15], "x": 16.25, "y": 0 },
-                { "label": "1,15", "matrix": [1, 15], "x": 17.25, "y": 0 },
-                { "label": "1,0", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 },
-                { "label": "1,1", "matrix": [1, 1], "x": 1.5, "y": 1 },
-                { "label": "1,2", "matrix": [1, 2], "x": 2.5, "y": 1 },
-                { "label": "1,3", "matrix": [1, 3], "x": 3.5, "y": 1 },
-                { "label": "1,4", "matrix": [1, 4], "x": 4.5, "y": 1 },
-                { "label": "1,5", "matrix": [1, 5], "x": 5.5, "y": 1 },
-                { "label": "1,6", "matrix": [1, 6], "x": 6.5, "y": 1 },
-                { "label": "1,7", "matrix": [1, 7], "x": 7.5, "y": 1 },
-                { "label": "1,8", "matrix": [1, 8], "x": 8.5, "y": 1 },
-                { "label": "1,9", "matrix": [1, 9], "x": 9.5, "y": 1 },
-                { "label": "1,10", "matrix": [1, 10], "x": 10.5, "y": 1 },
-                { "label": "1,11", "matrix": [1, 11], "x": 11.5, "y": 1 },
-                { "label": "1,12", "matrix": [1, 12], "x": 12.5, "y": 1 },
-                { "label": "2,13", "matrix": [2, 13], "w": 1.5, "x": 13.5, "y": 1 },
-                { "label": "1,14", "matrix": [1, 14], "x": 15.25, "y": 1 },
-                { "label": "2,14", "matrix": [2, 14], "x": 16.25, "y": 1 },
-                { "label": "2,15", "matrix": [2, 15], "x": 17.25, "y": 1 },
-                { "label": "2,0", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
-                { "label": "2,1", "matrix": [2, 1], "x": 1.75, "y": 2 },
-                { "label": "2,2", "matrix": [2, 2], "x": 2.75, "y": 2 },
-                { "label": "2,3", "matrix": [2, 3], "x": 3.75, "y": 2 },
-                { "label": "2,4", "matrix": [2, 4], "x": 4.75, "y": 2 },
-                { "label": "2,5", "matrix": [2, 5], "x": 5.75, "y": 2 },
-                { "label": "2,6", "matrix": [2, 6], "x": 6.75, "y": 2 },
-                { "label": "2,7", "matrix": [2, 7], "x": 7.75, "y": 2 },
-                { "label": "2,8", "matrix": [2, 8], "x": 8.75, "y": 2 },
-                { "label": "2,9", "matrix": [2, 9], "x": 9.75, "y": 2 },
-                { "label": "2,10", "matrix": [2, 10], "x": 10.75, "y": 2 },
-                { "label": "2,11", "matrix": [2, 11], "x": 11.75, "y": 2 },
-                { "label": "2,12", "matrix": [2, 12], "w": 2.25, "x": 12.75, "y": 2 },
-                { "label": "3,0", "matrix": [3, 0], "w": 2.25, "x": 0, "y": 3 },
-                { "label": "3,1", "matrix": [3, 1], "x": 2.25, "y": 3 },
-                { "label": "3,2", "matrix": [3, 2], "x": 3.25, "y": 3 },
-                { "label": "3,3", "matrix": [3, 3], "x": 4.25, "y": 3 },
-                { "label": "3,4", "matrix": [3, 4], "x": 5.25, "y": 3 },
-                { "label": "3,5", "matrix": [3, 5], "x": 6.25, "y": 3 },
-                { "label": "3,6", "matrix": [3, 6], "x": 7.25, "y": 3 },
-                { "label": "3,7", "matrix": [3, 7], "x": 8.25, "y": 3 },
-                { "label": "3,8", "matrix": [3, 8], "x": 9.25, "y": 3 },
-                { "label": "3,9", "matrix": [3, 9], "x": 10.25, "y": 3 },
-                { "label": "3,10", "matrix": [3, 10], "x": 11.25, "y": 3 },
-                { "label": "3,13", "matrix": [3, 13], "w": 2.75, "x": 12.25, "y": 3 },
-                { "label": "3,14", "matrix": [3, 14], "x": 16.25, "y": 3 },
-                { "label": "4,0", "matrix": [4, 0], "w": 1.5, "x": 0, "y": 4 },
-                { "label": "4,2", "matrix": [4, 2], "w": 1.5, "x": 2.5, "y": 4 },
-                { "label": "4,5", "matrix": [4, 5], "w": 7, "x": 4, "y": 4 },
-                { "label": "4,11", "matrix": [4, 11], "w": 1.5, "x": 11, "y": 4 },
-                { "label": "4,13", "matrix": [4, 13], "w": 1.5, "x": 13.5, "y": 4 },
-                { "label": "4,14", "matrix": [4, 14], "x": 15.25, "y": 4 },
-                { "label": "4,15", "matrix": [4, 15], "x": 16.25, "y": 4 },
-                { "label": "3,15", "matrix": [3, 15], "x": 17.25, "y": 4 }
-            ]
-        },
-        "LAYOUT_tkl_nofrow_ansi_tsangan_wkl_split_bs": {
-            "layout": [
-                { "label": "0,0", "matrix": [0, 0], "x": 0, "y": 0 },
-                { "label": "0,1", "matrix": [0, 1], "x": 1, "y": 0 },
-                { "label": "0,2", "matrix": [0, 2], "x": 2, "y": 0 },
-                { "label": "0,3", "matrix": [0, 3], "x": 3, "y": 0 },
-                { "label": "0,4", "matrix": [0, 4], "x": 4, "y": 0 },
-                { "label": "0,5", "matrix": [0, 5], "x": 5, "y": 0 },
-                { "label": "0,6", "matrix": [0, 6], "x": 6, "y": 0 },
-                { "label": "0,7", "matrix": [0, 7], "x": 7, "y": 0 },
-                { "label": "0,8", "matrix": [0, 8], "x": 8, "y": 0 },
-                { "label": "0,9", "matrix": [0, 9], "x": 9, "y": 0 },
-                { "label": "0,10", "matrix": [0, 10], "x": 10, "y": 0 },
-                { "label": "0,11", "matrix": [0, 11], "x": 11, "y": 0 },
-                { "label": "0,12", "matrix": [0, 12], "x": 12, "y": 0 },
-                { "label": "0,13", "matrix": [0, 13], "x": 13, "y": 0 },
-                { "label": "1,13", "matrix": [1, 13], "x": 14, "y": 0 },
-                { "label": "0,14", "matrix": [0, 14], "x": 15.25, "y": 0 },
-                { "label": "0,15", "matrix": [0, 15], "x": 16.25, "y": 0 },
-                { "label": "1,15", "matrix": [1, 15], "x": 17.25, "y": 0 },
-                { "label": "1,0", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 },
-                { "label": "1,1", "matrix": [1, 1], "x": 1.5, "y": 1 },
-                { "label": "1,2", "matrix": [1, 2], "x": 2.5, "y": 1 },
-                { "label": "1,3", "matrix": [1, 3], "x": 3.5, "y": 1 },
-                { "label": "1,4", "matrix": [1, 4], "x": 4.5, "y": 1 },
-                { "label": "1,5", "matrix": [1, 5], "x": 5.5, "y": 1 },
-                { "label": "1,6", "matrix": [1, 6], "x": 6.5, "y": 1 },
-                { "label": "1,7", "matrix": [1, 7], "x": 7.5, "y": 1 },
-                { "label": "1,8", "matrix": [1, 8], "x": 8.5, "y": 1 },
-                { "label": "1,9", "matrix": [1, 9], "x": 9.5, "y": 1 },
-                { "label": "1,10", "matrix": [1, 10], "x": 10.5, "y": 1 },
-                { "label": "1,11", "matrix": [1, 11], "x": 11.5, "y": 1 },
-                { "label": "1,12", "matrix": [1, 12], "x": 12.5, "y": 1 },
-                { "label": "2,13", "matrix": [2, 13], "w": 1.5, "x": 13.5, "y": 1 },
-                { "label": "1,14", "matrix": [1, 14], "x": 15.25, "y": 1 },
-                { "label": "2,14", "matrix": [2, 14], "x": 16.25, "y": 1 },
-                { "label": "2,15", "matrix": [2, 15], "x": 17.25, "y": 1 },
-                { "label": "2,0", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
-                { "label": "2,1", "matrix": [2, 1], "x": 1.75, "y": 2 },
-                { "label": "2,2", "matrix": [2, 2], "x": 2.75, "y": 2 },
-                { "label": "2,3", "matrix": [2, 3], "x": 3.75, "y": 2 },
-                { "label": "2,4", "matrix": [2, 4], "x": 4.75, "y": 2 },
-                { "label": "2,5", "matrix": [2, 5], "x": 5.75, "y": 2 },
-                { "label": "2,6", "matrix": [2, 6], "x": 6.75, "y": 2 },
-                { "label": "2,7", "matrix": [2, 7], "x": 7.75, "y": 2 },
-                { "label": "2,8", "matrix": [2, 8], "x": 8.75, "y": 2 },
-                { "label": "2,9", "matrix": [2, 9], "x": 9.75, "y": 2 },
-                { "label": "2,10", "matrix": [2, 10], "x": 10.75, "y": 2 },
-                { "label": "2,11", "matrix": [2, 11], "x": 11.75, "y": 2 },
-                { "label": "2,12", "matrix": [2, 12], "w": 2.25, "x": 12.75, "y": 2 },
-                { "label": "3,0", "matrix": [3, 0], "w": 2.25, "x": 0, "y": 3 },
-                { "label": "3,1", "matrix": [3, 1], "x": 2.25, "y": 3 },
-                { "label": "3,2", "matrix": [3, 2], "x": 3.25, "y": 3 },
-                { "label": "3,3", "matrix": [3, 3], "x": 4.25, "y": 3 },
-                { "label": "3,4", "matrix": [3, 4], "x": 5.25, "y": 3 },
-                { "label": "3,5", "matrix": [3, 5], "x": 6.25, "y": 3 },
-                { "label": "3,6", "matrix": [3, 6], "x": 7.25, "y": 3 },
-                { "label": "3,7", "matrix": [3, 7], "x": 8.25, "y": 3 },
-                { "label": "3,8", "matrix": [3, 8], "x": 9.25, "y": 3 },
-                { "label": "3,9", "matrix": [3, 9], "x": 10.25, "y": 3 },
-                { "label": "3,10", "matrix": [3, 10], "x": 11.25, "y": 3 },
-                { "label": "3,13", "matrix": [3, 13], "w": 2.75, "x": 12.25, "y": 3 },
-                { "label": "3,14", "matrix": [3, 14], "x": 16.25, "y": 3 },
-                { "label": "4,0", "matrix": [4, 0], "w": 1.5, "x": 0, "y": 4 },
-                { "label": "4,2", "matrix": [4, 2], "w": 1.5, "x": 2.5, "y": 4 },
-                { "label": "4,5", "matrix": [4, 5], "w": 7, "x": 4, "y": 4 },
-                { "label": "4,11", "matrix": [4, 11], "w": 1.5, "x": 11, "y": 4 },
-                { "label": "4,13", "matrix": [4, 13], "w": 1.5, "x": 13.5, "y": 4 },
-                { "label": "4,14", "matrix": [4, 14], "x": 15.25, "y": 4 },
-                { "label": "4,15", "matrix": [4, 15], "x": 16.25, "y": 4 },
-                { "label": "3,15", "matrix": [3, 15], "x": 17.25, "y": 4 }
-            ]
-        }
-    }
-}
diff --git a/keyboards/cipulot/ec_alveus/1_2_0/keyboard.json b/keyboards/cipulot/ec_alveus/1_2_0/keyboard.json
new file mode 100644
index 00000000000..da212f83411
--- /dev/null
+++ b/keyboards/cipulot/ec_alveus/1_2_0/keyboard.json
@@ -0,0 +1,254 @@
+{
+    "manufacturer": "Cipulot",
+    "keyboard_name": "EC Alveus 1.2.0",
+    "maintainer": "Cipulot",
+    "bootloader": "stm32-dfu",
+    "build": {
+        "lto": true
+    },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": false,
+        "console": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "processor": "STM32F401",
+    "usb": {
+        "device_version": "1.2.0",
+        "pid": "0x6B90",
+        "shared_endpoint": {
+            "keyboard": true
+        },
+        "vid": "0x6369"
+    },
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                { "label": "0,0", "matrix": [0, 0], "x": 0, "y": 0 },
+                { "label": "0,1", "matrix": [0, 1], "x": 1, "y": 0 },
+                { "label": "0,2", "matrix": [0, 2], "x": 2, "y": 0 },
+                { "label": "0,3", "matrix": [0, 3], "x": 3, "y": 0 },
+                { "label": "0,4", "matrix": [0, 4], "x": 4, "y": 0 },
+                { "label": "0,5", "matrix": [0, 5], "x": 5, "y": 0 },
+                { "label": "0,6", "matrix": [0, 6], "x": 6, "y": 0 },
+                { "label": "0,7", "matrix": [0, 7], "x": 7, "y": 0 },
+                { "label": "0,8", "matrix": [0, 8], "x": 8, "y": 0 },
+                { "label": "0,9", "matrix": [0, 9], "x": 9, "y": 0 },
+                { "label": "0,10", "matrix": [0, 10], "x": 10, "y": 0 },
+                { "label": "0,11", "matrix": [0, 11], "x": 11, "y": 0 },
+                { "label": "0,12", "matrix": [0, 12], "x": 12, "y": 0 },
+                { "label": "0,13", "matrix": [0, 13], "x": 13, "y": 0 },
+                { "label": "1,13", "matrix": [1, 13], "x": 14, "y": 0 },
+                { "label": "0,14", "matrix": [0, 14], "x": 15.25, "y": 0 },
+                { "label": "0,15", "matrix": [0, 15], "x": 16.25, "y": 0 },
+                { "label": "1,15", "matrix": [1, 15], "x": 17.25, "y": 0 },
+                { "label": "1,0", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 },
+                { "label": "1,1", "matrix": [1, 1], "x": 1.5, "y": 1 },
+                { "label": "1,2", "matrix": [1, 2], "x": 2.5, "y": 1 },
+                { "label": "1,3", "matrix": [1, 3], "x": 3.5, "y": 1 },
+                { "label": "1,4", "matrix": [1, 4], "x": 4.5, "y": 1 },
+                { "label": "1,5", "matrix": [1, 5], "x": 5.5, "y": 1 },
+                { "label": "1,6", "matrix": [1, 6], "x": 6.5, "y": 1 },
+                { "label": "1,7", "matrix": [1, 7], "x": 7.5, "y": 1 },
+                { "label": "1,8", "matrix": [1, 8], "x": 8.5, "y": 1 },
+                { "label": "1,9", "matrix": [1, 9], "x": 9.5, "y": 1 },
+                { "label": "1,10", "matrix": [1, 10], "x": 10.5, "y": 1 },
+                { "label": "1,11", "matrix": [1, 11], "x": 11.5, "y": 1 },
+                { "label": "1,12", "matrix": [1, 12], "x": 12.5, "y": 1 },
+                { "label": "2,13", "matrix": [2, 13], "w": 1.5, "x": 13.5, "y": 1 },
+                { "label": "1,14", "matrix": [1, 14], "x": 15.25, "y": 1 },
+                { "label": "2,14", "matrix": [2, 14], "x": 16.25, "y": 1 },
+                { "label": "2,15", "matrix": [2, 15], "x": 17.25, "y": 1 },
+                { "label": "2,0", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
+                { "label": "2,1", "matrix": [2, 1], "x": 1.75, "y": 2 },
+                { "label": "2,2", "matrix": [2, 2], "x": 2.75, "y": 2 },
+                { "label": "2,3", "matrix": [2, 3], "x": 3.75, "y": 2 },
+                { "label": "2,4", "matrix": [2, 4], "x": 4.75, "y": 2 },
+                { "label": "2,5", "matrix": [2, 5], "x": 5.75, "y": 2 },
+                { "label": "2,6", "matrix": [2, 6], "x": 6.75, "y": 2 },
+                { "label": "2,7", "matrix": [2, 7], "x": 7.75, "y": 2 },
+                { "label": "2,8", "matrix": [2, 8], "x": 8.75, "y": 2 },
+                { "label": "2,9", "matrix": [2, 9], "x": 9.75, "y": 2 },
+                { "label": "2,10", "matrix": [2, 10], "x": 10.75, "y": 2 },
+                { "label": "2,11", "matrix": [2, 11], "x": 11.75, "y": 2 },
+                { "label": "2,12", "matrix": [2, 12], "w": 2.25, "x": 12.75, "y": 2 },
+                { "label": "3,0", "matrix": [3, 0], "w": 2.25, "x": 0, "y": 3 },
+                { "label": "3,1", "matrix": [3, 1], "x": 2.25, "y": 3 },
+                { "label": "3,2", "matrix": [3, 2], "x": 3.25, "y": 3 },
+                { "label": "3,3", "matrix": [3, 3], "x": 4.25, "y": 3 },
+                { "label": "3,4", "matrix": [3, 4], "x": 5.25, "y": 3 },
+                { "label": "3,5", "matrix": [3, 5], "x": 6.25, "y": 3 },
+                { "label": "3,6", "matrix": [3, 6], "x": 7.25, "y": 3 },
+                { "label": "3,7", "matrix": [3, 7], "x": 8.25, "y": 3 },
+                { "label": "3,8", "matrix": [3, 8], "x": 9.25, "y": 3 },
+                { "label": "3,9", "matrix": [3, 9], "x": 10.25, "y": 3 },
+                { "label": "3,10", "matrix": [3, 10], "x": 11.25, "y": 3 },
+                { "label": "3,13", "matrix": [3, 13], "w": 2.75, "x": 12.25, "y": 3 },
+                { "label": "3,14", "matrix": [3, 14], "x": 16.25, "y": 3 },
+                { "label": "4,0", "matrix": [4, 0], "w": 1.5, "x": 0, "y": 4 },
+                { "label": "4,1", "matrix": [4, 1], "x": 1.5, "y": 4 },
+                { "label": "4,2", "matrix": [4, 2], "w": 1.5, "x": 2.5, "y": 4 },
+                { "label": "4,5", "matrix": [4, 5], "w": 7, "x": 4, "y": 4 },
+                { "label": "4,11", "matrix": [4, 11], "w": 1.5, "x": 11, "y": 4 },
+                { "label": "4,12", "matrix": [4, 12], "x": 12.5, "y": 4 },
+                { "label": "4,13", "matrix": [4, 13], "w": 1.5, "x": 13.5, "y": 4 },
+                { "label": "4,14", "matrix": [4, 14], "x": 15.25, "y": 4 },
+                { "label": "4,15", "matrix": [4, 15], "x": 16.25, "y": 4 },
+                { "label": "3,15", "matrix": [3, 15], "x": 17.25, "y": 4 }
+            ]
+        },
+        "LAYOUT_tkl_nofrow_ansi_tsangan_wkl": {
+            "layout": [
+                { "label": "0,0", "matrix": [0, 0], "x": 0, "y": 0 },
+                { "label": "0,1", "matrix": [0, 1], "x": 1, "y": 0 },
+                { "label": "0,2", "matrix": [0, 2], "x": 2, "y": 0 },
+                { "label": "0,3", "matrix": [0, 3], "x": 3, "y": 0 },
+                { "label": "0,4", "matrix": [0, 4], "x": 4, "y": 0 },
+                { "label": "0,5", "matrix": [0, 5], "x": 5, "y": 0 },
+                { "label": "0,6", "matrix": [0, 6], "x": 6, "y": 0 },
+                { "label": "0,7", "matrix": [0, 7], "x": 7, "y": 0 },
+                { "label": "0,8", "matrix": [0, 8], "x": 8, "y": 0 },
+                { "label": "0,9", "matrix": [0, 9], "x": 9, "y": 0 },
+                { "label": "0,10", "matrix": [0, 10], "x": 10, "y": 0 },
+                { "label": "0,11", "matrix": [0, 11], "x": 11, "y": 0 },
+                { "label": "0,12", "matrix": [0, 12], "x": 12, "y": 0 },
+                { "label": "1,13", "matrix": [1, 13], "w": 2, "x": 13, "y": 0 },
+                { "label": "0,14", "matrix": [0, 14], "x": 15.25, "y": 0 },
+                { "label": "0,15", "matrix": [0, 15], "x": 16.25, "y": 0 },
+                { "label": "1,15", "matrix": [1, 15], "x": 17.25, "y": 0 },
+                { "label": "1,0", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 },
+                { "label": "1,1", "matrix": [1, 1], "x": 1.5, "y": 1 },
+                { "label": "1,2", "matrix": [1, 2], "x": 2.5, "y": 1 },
+                { "label": "1,3", "matrix": [1, 3], "x": 3.5, "y": 1 },
+                { "label": "1,4", "matrix": [1, 4], "x": 4.5, "y": 1 },
+                { "label": "1,5", "matrix": [1, 5], "x": 5.5, "y": 1 },
+                { "label": "1,6", "matrix": [1, 6], "x": 6.5, "y": 1 },
+                { "label": "1,7", "matrix": [1, 7], "x": 7.5, "y": 1 },
+                { "label": "1,8", "matrix": [1, 8], "x": 8.5, "y": 1 },
+                { "label": "1,9", "matrix": [1, 9], "x": 9.5, "y": 1 },
+                { "label": "1,10", "matrix": [1, 10], "x": 10.5, "y": 1 },
+                { "label": "1,11", "matrix": [1, 11], "x": 11.5, "y": 1 },
+                { "label": "1,12", "matrix": [1, 12], "x": 12.5, "y": 1 },
+                { "label": "2,13", "matrix": [2, 13], "w": 1.5, "x": 13.5, "y": 1 },
+                { "label": "1,14", "matrix": [1, 14], "x": 15.25, "y": 1 },
+                { "label": "2,14", "matrix": [2, 14], "x": 16.25, "y": 1 },
+                { "label": "2,15", "matrix": [2, 15], "x": 17.25, "y": 1 },
+                { "label": "2,0", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
+                { "label": "2,1", "matrix": [2, 1], "x": 1.75, "y": 2 },
+                { "label": "2,2", "matrix": [2, 2], "x": 2.75, "y": 2 },
+                { "label": "2,3", "matrix": [2, 3], "x": 3.75, "y": 2 },
+                { "label": "2,4", "matrix": [2, 4], "x": 4.75, "y": 2 },
+                { "label": "2,5", "matrix": [2, 5], "x": 5.75, "y": 2 },
+                { "label": "2,6", "matrix": [2, 6], "x": 6.75, "y": 2 },
+                { "label": "2,7", "matrix": [2, 7], "x": 7.75, "y": 2 },
+                { "label": "2,8", "matrix": [2, 8], "x": 8.75, "y": 2 },
+                { "label": "2,9", "matrix": [2, 9], "x": 9.75, "y": 2 },
+                { "label": "2,10", "matrix": [2, 10], "x": 10.75, "y": 2 },
+                { "label": "2,11", "matrix": [2, 11], "x": 11.75, "y": 2 },
+                { "label": "2,12", "matrix": [2, 12], "w": 2.25, "x": 12.75, "y": 2 },
+                { "label": "3,0", "matrix": [3, 0], "w": 2.25, "x": 0, "y": 3 },
+                { "label": "3,1", "matrix": [3, 1], "x": 2.25, "y": 3 },
+                { "label": "3,2", "matrix": [3, 2], "x": 3.25, "y": 3 },
+                { "label": "3,3", "matrix": [3, 3], "x": 4.25, "y": 3 },
+                { "label": "3,4", "matrix": [3, 4], "x": 5.25, "y": 3 },
+                { "label": "3,5", "matrix": [3, 5], "x": 6.25, "y": 3 },
+                { "label": "3,6", "matrix": [3, 6], "x": 7.25, "y": 3 },
+                { "label": "3,7", "matrix": [3, 7], "x": 8.25, "y": 3 },
+                { "label": "3,8", "matrix": [3, 8], "x": 9.25, "y": 3 },
+                { "label": "3,9", "matrix": [3, 9], "x": 10.25, "y": 3 },
+                { "label": "3,10", "matrix": [3, 10], "x": 11.25, "y": 3 },
+                { "label": "3,13", "matrix": [3, 13], "w": 2.75, "x": 12.25, "y": 3 },
+                { "label": "3,14", "matrix": [3, 14], "x": 16.25, "y": 3 },
+                { "label": "4,0", "matrix": [4, 0], "w": 1.5, "x": 0, "y": 4 },
+                { "label": "4,2", "matrix": [4, 2], "w": 1.5, "x": 2.5, "y": 4 },
+                { "label": "4,5", "matrix": [4, 5], "w": 7, "x": 4, "y": 4 },
+                { "label": "4,11", "matrix": [4, 11], "w": 1.5, "x": 11, "y": 4 },
+                { "label": "4,13", "matrix": [4, 13], "w": 1.5, "x": 13.5, "y": 4 },
+                { "label": "4,14", "matrix": [4, 14], "x": 15.25, "y": 4 },
+                { "label": "4,15", "matrix": [4, 15], "x": 16.25, "y": 4 },
+                { "label": "3,15", "matrix": [3, 15], "x": 17.25, "y": 4 }
+            ]
+        },
+        "LAYOUT_tkl_nofrow_ansi_tsangan_wkl_split_bs": {
+            "layout": [
+                { "label": "0,0", "matrix": [0, 0], "x": 0, "y": 0 },
+                { "label": "0,1", "matrix": [0, 1], "x": 1, "y": 0 },
+                { "label": "0,2", "matrix": [0, 2], "x": 2, "y": 0 },
+                { "label": "0,3", "matrix": [0, 3], "x": 3, "y": 0 },
+                { "label": "0,4", "matrix": [0, 4], "x": 4, "y": 0 },
+                { "label": "0,5", "matrix": [0, 5], "x": 5, "y": 0 },
+                { "label": "0,6", "matrix": [0, 6], "x": 6, "y": 0 },
+                { "label": "0,7", "matrix": [0, 7], "x": 7, "y": 0 },
+                { "label": "0,8", "matrix": [0, 8], "x": 8, "y": 0 },
+                { "label": "0,9", "matrix": [0, 9], "x": 9, "y": 0 },
+                { "label": "0,10", "matrix": [0, 10], "x": 10, "y": 0 },
+                { "label": "0,11", "matrix": [0, 11], "x": 11, "y": 0 },
+                { "label": "0,12", "matrix": [0, 12], "x": 12, "y": 0 },
+                { "label": "0,13", "matrix": [0, 13], "x": 13, "y": 0 },
+                { "label": "1,13", "matrix": [1, 13], "x": 14, "y": 0 },
+                { "label": "0,14", "matrix": [0, 14], "x": 15.25, "y": 0 },
+                { "label": "0,15", "matrix": [0, 15], "x": 16.25, "y": 0 },
+                { "label": "1,15", "matrix": [1, 15], "x": 17.25, "y": 0 },
+                { "label": "1,0", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 },
+                { "label": "1,1", "matrix": [1, 1], "x": 1.5, "y": 1 },
+                { "label": "1,2", "matrix": [1, 2], "x": 2.5, "y": 1 },
+                { "label": "1,3", "matrix": [1, 3], "x": 3.5, "y": 1 },
+                { "label": "1,4", "matrix": [1, 4], "x": 4.5, "y": 1 },
+                { "label": "1,5", "matrix": [1, 5], "x": 5.5, "y": 1 },
+                { "label": "1,6", "matrix": [1, 6], "x": 6.5, "y": 1 },
+                { "label": "1,7", "matrix": [1, 7], "x": 7.5, "y": 1 },
+                { "label": "1,8", "matrix": [1, 8], "x": 8.5, "y": 1 },
+                { "label": "1,9", "matrix": [1, 9], "x": 9.5, "y": 1 },
+                { "label": "1,10", "matrix": [1, 10], "x": 10.5, "y": 1 },
+                { "label": "1,11", "matrix": [1, 11], "x": 11.5, "y": 1 },
+                { "label": "1,12", "matrix": [1, 12], "x": 12.5, "y": 1 },
+                { "label": "2,13", "matrix": [2, 13], "w": 1.5, "x": 13.5, "y": 1 },
+                { "label": "1,14", "matrix": [1, 14], "x": 15.25, "y": 1 },
+                { "label": "2,14", "matrix": [2, 14], "x": 16.25, "y": 1 },
+                { "label": "2,15", "matrix": [2, 15], "x": 17.25, "y": 1 },
+                { "label": "2,0", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
+                { "label": "2,1", "matrix": [2, 1], "x": 1.75, "y": 2 },
+                { "label": "2,2", "matrix": [2, 2], "x": 2.75, "y": 2 },
+                { "label": "2,3", "matrix": [2, 3], "x": 3.75, "y": 2 },
+                { "label": "2,4", "matrix": [2, 4], "x": 4.75, "y": 2 },
+                { "label": "2,5", "matrix": [2, 5], "x": 5.75, "y": 2 },
+                { "label": "2,6", "matrix": [2, 6], "x": 6.75, "y": 2 },
+                { "label": "2,7", "matrix": [2, 7], "x": 7.75, "y": 2 },
+                { "label": "2,8", "matrix": [2, 8], "x": 8.75, "y": 2 },
+                { "label": "2,9", "matrix": [2, 9], "x": 9.75, "y": 2 },
+                { "label": "2,10", "matrix": [2, 10], "x": 10.75, "y": 2 },
+                { "label": "2,11", "matrix": [2, 11], "x": 11.75, "y": 2 },
+                { "label": "2,12", "matrix": [2, 12], "w": 2.25, "x": 12.75, "y": 2 },
+                { "label": "3,0", "matrix": [3, 0], "w": 2.25, "x": 0, "y": 3 },
+                { "label": "3,1", "matrix": [3, 1], "x": 2.25, "y": 3 },
+                { "label": "3,2", "matrix": [3, 2], "x": 3.25, "y": 3 },
+                { "label": "3,3", "matrix": [3, 3], "x": 4.25, "y": 3 },
+                { "label": "3,4", "matrix": [3, 4], "x": 5.25, "y": 3 },
+                { "label": "3,5", "matrix": [3, 5], "x": 6.25, "y": 3 },
+                { "label": "3,6", "matrix": [3, 6], "x": 7.25, "y": 3 },
+                { "label": "3,7", "matrix": [3, 7], "x": 8.25, "y": 3 },
+                { "label": "3,8", "matrix": [3, 8], "x": 9.25, "y": 3 },
+                { "label": "3,9", "matrix": [3, 9], "x": 10.25, "y": 3 },
+                { "label": "3,10", "matrix": [3, 10], "x": 11.25, "y": 3 },
+                { "label": "3,13", "matrix": [3, 13], "w": 2.75, "x": 12.25, "y": 3 },
+                { "label": "3,14", "matrix": [3, 14], "x": 16.25, "y": 3 },
+                { "label": "4,0", "matrix": [4, 0], "w": 1.5, "x": 0, "y": 4 },
+                { "label": "4,2", "matrix": [4, 2], "w": 1.5, "x": 2.5, "y": 4 },
+                { "label": "4,5", "matrix": [4, 5], "w": 7, "x": 4, "y": 4 },
+                { "label": "4,11", "matrix": [4, 11], "w": 1.5, "x": 11, "y": 4 },
+                { "label": "4,13", "matrix": [4, 13], "w": 1.5, "x": 13.5, "y": 4 },
+                { "label": "4,14", "matrix": [4, 14], "x": 15.25, "y": 4 },
+                { "label": "4,15", "matrix": [4, 15], "x": 16.25, "y": 4 },
+                { "label": "3,15", "matrix": [3, 15], "x": 17.25, "y": 4 }
+            ]
+        }
+    }
+}
diff --git a/keyboards/cipulot/ec_alveus/1_2_0/rules.mk b/keyboards/cipulot/ec_alveus/1_2_0/rules.mk
index 70494b635f6..ce525670a68 100644
--- a/keyboards/cipulot/ec_alveus/1_2_0/rules.mk
+++ b/keyboards/cipulot/ec_alveus/1_2_0/rules.mk
@@ -1,4 +1,5 @@
 CUSTOM_MATRIX = lite
 ANALOG_DRIVER_REQUIRED = yes
-SRC += keyboards/cipulot/common/matrix.c keyboards/cipulot/common/ec_board.c keyboards/cipulot/common/ec_switch_matrix.c
+VPATH += keyboards/cipulot/common
+SRC += matrix.c ec_board.c ec_switch_matrix.c
 OPT = 3
diff --git a/keyboards/cipulot/ec_dolice/config.h b/keyboards/cipulot/ec_dolice/config.h
new file mode 100644
index 00000000000..a5c56e79491
--- /dev/null
+++ b/keyboards/cipulot/ec_dolice/config.h
@@ -0,0 +1,66 @@
+/* Copyright 2023 Cipulot
+ *
+ * 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 3 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 MATRIX_ROWS 5
+#define MATRIX_COLS 15
+
+#define MATRIX_ROW_PINS \
+    { B13, A8, B12, B14, B15 }
+
+#define AMUX_COUNT 2
+#define AMUX_MAX_COLS_COUNT 8
+
+#define AMUX_EN_PINS \
+    { B9, B8 }
+
+#define AMUX_SEL_PINS \
+    { B7, B6, B5 }
+
+#define AMUX_COL_CHANNELS_SIZES \
+    { 8, 7 }
+
+#define AMUX_0_COL_CHANNELS \
+    { 3, 0, 1, 2, 4, 6, 7, 5 }
+
+#define AMUX_1_COL_CHANNELS \
+    { 3, 0, 1, 2, 4, 6, 7 }
+
+#define AMUX_COL_CHANNELS AMUX_0_COL_CHANNELS, AMUX_1_COL_CHANNELS
+
+#define DISCHARGE_PIN A3
+#define ANALOG_PORT A2
+
+#define DEFAULT_ACTUATION_MODE 0
+#define DEFAULT_MODE_0_ACTUATION_LEVEL 550
+#define DEFAULT_MODE_0_RELEASE_LEVEL 500
+#define DEFAULT_MODE_1_INITIAL_DEADZONE_OFFSET DEFAULT_MODE_0_ACTUATION_LEVEL
+#define DEFAULT_MODE_1_ACTUATION_OFFSET 70
+#define DEFAULT_MODE_1_RELEASE_OFFSET 70
+#define DEFAULT_EXTREMUM 1023
+#define EXPECTED_NOISE_FLOOR 0
+#define NOISE_FLOOR_THRESHOLD 50
+#define BOTTOMING_CALIBRATION_THRESHOLD 100
+#define DEFAULT_NOISE_FLOOR_SAMPLING_COUNT 30
+#define DEFAULT_BOTTOMING_READING 1023
+#define DEFAULT_CALIBRATION_STARTER true
+
+#define DISCHARGE_TIME 10
+
+// #define DEBUG_MATRIX_SCAN_RATE
+
+#define EECONFIG_KB_DATA_SIZE 159
diff --git a/keyboards/cipulot/ec_dolice/halconf.h b/keyboards/cipulot/ec_dolice/halconf.h
new file mode 100644
index 00000000000..835d43b6a0a
--- /dev/null
+++ b/keyboards/cipulot/ec_dolice/halconf.h
@@ -0,0 +1,21 @@
+/* Copyright 2023 Cipulot
+ *
+ * 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 3 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_ADC TRUE
+
+#include_next <halconf.h>
diff --git a/keyboards/cipulot/ec_dolice/info.json b/keyboards/cipulot/ec_dolice/info.json
new file mode 100644
index 00000000000..e81422e2c54
--- /dev/null
+++ b/keyboards/cipulot/ec_dolice/info.json
@@ -0,0 +1,319 @@
+{
+    "manufacturer": "Cipulot",
+    "keyboard_name": "Dolice EC",
+    "maintainer": "Cipulot",
+    "bootloader": "stm32-dfu",
+    "build": {
+        "lto": true
+    },
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": false,
+        "console": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "indicators": {
+        "caps_lock": "B4",
+        "num_lock": "A15",
+        "scroll_lock": "B3",
+        "on_state": 0
+    },
+    "processor": "STM32F411",
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
+    "usb": {
+        "device_version": "0.0.1",
+        "pid": "0x6BB9",
+        "shared_endpoint": {
+            "keyboard": true
+        },
+        "vid": "0x6369"
+    },
+    "layout_aliases": {
+        "LAYOUT_all": "LAYOUT_alice_split_bs"
+    },
+    "layouts": {
+        "LAYOUT_alice": {
+            "layout": [
+                {"matrix": [1, 0], "x": 0, "y": 0},
+                {"matrix": [0, 0], "x": 1.25, "y": 0},
+                {"matrix": [0, 1], "x": 2.25, "y": 0},
+                {"matrix": [0, 2], "x": 3.25, "y": 0},
+                {"matrix": [0, 3], "x": 4.25, "y": 0},
+                {"matrix": [0, 4], "x": 5.25, "y": 0},
+                {"matrix": [0, 5], "x": 6.25, "y": 0},
+                {"matrix": [0, 6], "x": 7.25, "y": 0},
+                {"matrix": [0, 7], "x": 10.25, "y": 0},
+                {"matrix": [0, 8], "x": 11.25, "y": 0},
+                {"matrix": [0, 9], "x": 12.25, "y": 0},
+                {"matrix": [0, 10], "x": 13.25, "y": 0},
+                {"matrix": [0, 11], "x": 14.25, "y": 0},
+                {"matrix": [0, 12], "x": 15.25, "y": 0},
+                {"matrix": [0, 14], "x": 16.25, "y": 0, "w": 2},
+                {"matrix": [2, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 2.75, "y": 1},
+                {"matrix": [1, 3], "x": 3.75, "y": 1},
+                {"matrix": [1, 4], "x": 4.75, "y": 1},
+                {"matrix": [1, 5], "x": 5.75, "y": 1},
+                {"matrix": [1, 6], "x": 6.75, "y": 1},
+                {"matrix": [1, 7], "x": 9.75, "y": 1},
+                {"matrix": [1, 8], "x": 10.75, "y": 1},
+                {"matrix": [1, 9], "x": 11.75, "y": 1},
+                {"matrix": [1, 10], "x": 12.75, "y": 1},
+                {"matrix": [1, 11], "x": 13.75, "y": 1},
+                {"matrix": [1, 12], "x": 14.75, "y": 1},
+                {"matrix": [1, 13], "x": 15.75, "y": 1},
+                {"matrix": [1, 14], "x": 16.75, "y": 1, "w": 1.5},
+                {"matrix": [3, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 3, "y": 2},
+                {"matrix": [2, 3], "x": 4, "y": 2},
+                {"matrix": [2, 4], "x": 5, "y": 2},
+                {"matrix": [2, 5], "x": 6, "y": 2},
+                {"matrix": [2, 6], "x": 7, "y": 2},
+                {"matrix": [2, 7], "x": 10, "y": 2},
+                {"matrix": [2, 8], "x": 11, "y": 2},
+                {"matrix": [2, 9], "x": 12, "y": 2},
+                {"matrix": [2, 10], "x": 13, "y": 2},
+                {"matrix": [2, 11], "x": 14, "y": 2},
+                {"matrix": [2, 12], "x": 15, "y": 2},
+                {"matrix": [2, 13], "x": 16, "y": 2, "w": 2.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 3.5, "y": 3},
+                {"matrix": [3, 3], "x": 4.5, "y": 3},
+                {"matrix": [3, 4], "x": 5.5, "y": 3},
+                {"matrix": [3, 5], "x": 6.5, "y": 3},
+                {"matrix": [3, 6], "x": 7.5, "y": 3},
+                {"matrix": [3, 7], "x": 9.5, "y": 3},
+                {"matrix": [3, 8], "x": 10.5, "y": 3},
+                {"matrix": [3, 9], "x": 11.5, "y": 3},
+                {"matrix": [3, 10], "x": 12.5, "y": 3},
+                {"matrix": [3, 11], "x": 13.5, "y": 3},
+                {"matrix": [3, 12], "x": 14.5, "y": 3},
+                {"matrix": [3, 13], "x": 15.5, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 17.25, "y": 3},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 2], "x": 4.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 5], "x": 5.75, "y": 4, "w": 2},
+                {"matrix": [4, 6], "x": 7.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 8], "x": 9.5, "y": 4, "w": 2.75},
+                {"matrix": [4, 10], "x": 12.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 14], "x": 16.75, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_alice_split_bs": {
+            "layout": [
+                {"matrix": [1, 0], "x": 0, "y": 0},
+                {"matrix": [0, 0], "x": 1.25, "y": 0},
+                {"matrix": [0, 1], "x": 2.25, "y": 0},
+                {"matrix": [0, 2], "x": 3.25, "y": 0},
+                {"matrix": [0, 3], "x": 4.25, "y": 0},
+                {"matrix": [0, 4], "x": 5.25, "y": 0},
+                {"matrix": [0, 5], "x": 6.25, "y": 0},
+                {"matrix": [0, 6], "x": 7.25, "y": 0},
+                {"matrix": [0, 7], "x": 10.25, "y": 0},
+                {"matrix": [0, 8], "x": 11.25, "y": 0},
+                {"matrix": [0, 9], "x": 12.25, "y": 0},
+                {"matrix": [0, 10], "x": 13.25, "y": 0},
+                {"matrix": [0, 11], "x": 14.25, "y": 0},
+                {"matrix": [0, 12], "x": 15.25, "y": 0},
+                {"matrix": [0, 13], "x": 16.25, "y": 0},
+                {"matrix": [0, 14], "x": 17.25, "y": 0},
+                {"matrix": [2, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 2.75, "y": 1},
+                {"matrix": [1, 3], "x": 3.75, "y": 1},
+                {"matrix": [1, 4], "x": 4.75, "y": 1},
+                {"matrix": [1, 5], "x": 5.75, "y": 1},
+                {"matrix": [1, 6], "x": 6.75, "y": 1},
+                {"matrix": [1, 7], "x": 9.75, "y": 1},
+                {"matrix": [1, 8], "x": 10.75, "y": 1},
+                {"matrix": [1, 9], "x": 11.75, "y": 1},
+                {"matrix": [1, 10], "x": 12.75, "y": 1},
+                {"matrix": [1, 11], "x": 13.75, "y": 1},
+                {"matrix": [1, 12], "x": 14.75, "y": 1},
+                {"matrix": [1, 13], "x": 15.75, "y": 1},
+                {"matrix": [1, 14], "x": 16.75, "y": 1, "w": 1.5},
+                {"matrix": [3, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 3, "y": 2},
+                {"matrix": [2, 3], "x": 4, "y": 2},
+                {"matrix": [2, 4], "x": 5, "y": 2},
+                {"matrix": [2, 5], "x": 6, "y": 2},
+                {"matrix": [2, 6], "x": 7, "y": 2},
+                {"matrix": [2, 7], "x": 10, "y": 2},
+                {"matrix": [2, 8], "x": 11, "y": 2},
+                {"matrix": [2, 9], "x": 12, "y": 2},
+                {"matrix": [2, 10], "x": 13, "y": 2},
+                {"matrix": [2, 11], "x": 14, "y": 2},
+                {"matrix": [2, 12], "x": 15, "y": 2},
+                {"matrix": [2, 13], "x": 16, "y": 2, "w": 2.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 3.5, "y": 3},
+                {"matrix": [3, 3], "x": 4.5, "y": 3},
+                {"matrix": [3, 4], "x": 5.5, "y": 3},
+                {"matrix": [3, 5], "x": 6.5, "y": 3},
+                {"matrix": [3, 6], "x": 7.5, "y": 3},
+                {"matrix": [3, 7], "x": 9.5, "y": 3},
+                {"matrix": [3, 8], "x": 10.5, "y": 3},
+                {"matrix": [3, 9], "x": 11.5, "y": 3},
+                {"matrix": [3, 10], "x": 12.5, "y": 3},
+                {"matrix": [3, 11], "x": 13.5, "y": 3},
+                {"matrix": [3, 12], "x": 14.5, "y": 3},
+                {"matrix": [3, 13], "x": 15.5, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 17.25, "y": 3},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 2], "x": 4.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 5], "x": 5.75, "y": 4, "w": 2},
+                {"matrix": [4, 6], "x": 7.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 8], "x": 9.5, "y": 4, "w": 2.75},
+                {"matrix": [4, 10], "x": 12.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 14], "x": 16.75, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_long_rshift": {
+            "layout": [
+                {"matrix": [1, 0], "x": 0, "y": 0},
+                {"matrix": [0, 0], "x": 1.25, "y": 0},
+                {"matrix": [0, 1], "x": 2.25, "y": 0},
+                {"matrix": [0, 2], "x": 3.25, "y": 0},
+                {"matrix": [0, 3], "x": 4.25, "y": 0},
+                {"matrix": [0, 4], "x": 5.25, "y": 0},
+                {"matrix": [0, 5], "x": 6.25, "y": 0},
+                {"matrix": [0, 6], "x": 7.25, "y": 0},
+                {"matrix": [0, 7], "x": 10.25, "y": 0},
+                {"matrix": [0, 8], "x": 11.25, "y": 0},
+                {"matrix": [0, 9], "x": 12.25, "y": 0},
+                {"matrix": [0, 10], "x": 13.25, "y": 0},
+                {"matrix": [0, 11], "x": 14.25, "y": 0},
+                {"matrix": [0, 12], "x": 15.25, "y": 0},
+                {"matrix": [0, 14], "x": 16.25, "y": 0, "w": 2},
+                {"matrix": [2, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 2.75, "y": 1},
+                {"matrix": [1, 3], "x": 3.75, "y": 1},
+                {"matrix": [1, 4], "x": 4.75, "y": 1},
+                {"matrix": [1, 5], "x": 5.75, "y": 1},
+                {"matrix": [1, 6], "x": 6.75, "y": 1},
+                {"matrix": [1, 7], "x": 9.75, "y": 1},
+                {"matrix": [1, 8], "x": 10.75, "y": 1},
+                {"matrix": [1, 9], "x": 11.75, "y": 1},
+                {"matrix": [1, 10], "x": 12.75, "y": 1},
+                {"matrix": [1, 11], "x": 13.75, "y": 1},
+                {"matrix": [1, 12], "x": 14.75, "y": 1},
+                {"matrix": [1, 13], "x": 15.75, "y": 1},
+                {"matrix": [1, 14], "x": 16.75, "y": 1, "w": 1.5},
+                {"matrix": [3, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 3, "y": 2},
+                {"matrix": [2, 3], "x": 4, "y": 2},
+                {"matrix": [2, 4], "x": 5, "y": 2},
+                {"matrix": [2, 5], "x": 6, "y": 2},
+                {"matrix": [2, 6], "x": 7, "y": 2},
+                {"matrix": [2, 7], "x": 10, "y": 2},
+                {"matrix": [2, 8], "x": 11, "y": 2},
+                {"matrix": [2, 9], "x": 12, "y": 2},
+                {"matrix": [2, 10], "x": 13, "y": 2},
+                {"matrix": [2, 11], "x": 14, "y": 2},
+                {"matrix": [2, 12], "x": 15, "y": 2},
+                {"matrix": [2, 13], "x": 16, "y": 2, "w": 2.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 3.5, "y": 3},
+                {"matrix": [3, 3], "x": 4.5, "y": 3},
+                {"matrix": [3, 4], "x": 5.5, "y": 3},
+                {"matrix": [3, 5], "x": 6.5, "y": 3},
+                {"matrix": [3, 6], "x": 7.5, "y": 3},
+                {"matrix": [3, 7], "x": 9.5, "y": 3},
+                {"matrix": [3, 8], "x": 10.5, "y": 3},
+                {"matrix": [3, 9], "x": 11.5, "y": 3},
+                {"matrix": [3, 10], "x": 12.5, "y": 3},
+                {"matrix": [3, 11], "x": 13.5, "y": 3},
+                {"matrix": [3, 12], "x": 14.5, "y": 3},
+                {"matrix": [3, 13], "x": 15.5, "y": 3, "w": 2.75},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 2], "x": 4.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 5], "x": 5.75, "y": 4, "w": 2},
+                {"matrix": [4, 6], "x": 7.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 8], "x": 9.5, "y": 4, "w": 2.75},
+                {"matrix": [4, 10], "x": 12.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 14], "x": 16.75, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_long_rshift_split_bs": {
+            "layout": [
+                {"matrix": [1, 0], "x": 0, "y": 0},
+                {"matrix": [0, 0], "x": 1.25, "y": 0},
+                {"matrix": [0, 1], "x": 2.25, "y": 0},
+                {"matrix": [0, 2], "x": 3.25, "y": 0},
+                {"matrix": [0, 3], "x": 4.25, "y": 0},
+                {"matrix": [0, 4], "x": 5.25, "y": 0},
+                {"matrix": [0, 5], "x": 6.25, "y": 0},
+                {"matrix": [0, 6], "x": 7.25, "y": 0},
+                {"matrix": [0, 7], "x": 10.25, "y": 0},
+                {"matrix": [0, 8], "x": 11.25, "y": 0},
+                {"matrix": [0, 9], "x": 12.25, "y": 0},
+                {"matrix": [0, 10], "x": 13.25, "y": 0},
+                {"matrix": [0, 11], "x": 14.25, "y": 0},
+                {"matrix": [0, 12], "x": 15.25, "y": 0},
+                {"matrix": [0, 13], "x": 16.25, "y": 0},
+                {"matrix": [0, 14], "x": 17.25, "y": 0},
+                {"matrix": [2, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 2.75, "y": 1},
+                {"matrix": [1, 3], "x": 3.75, "y": 1},
+                {"matrix": [1, 4], "x": 4.75, "y": 1},
+                {"matrix": [1, 5], "x": 5.75, "y": 1},
+                {"matrix": [1, 6], "x": 6.75, "y": 1},
+                {"matrix": [1, 7], "x": 9.75, "y": 1},
+                {"matrix": [1, 8], "x": 10.75, "y": 1},
+                {"matrix": [1, 9], "x": 11.75, "y": 1},
+                {"matrix": [1, 10], "x": 12.75, "y": 1},
+                {"matrix": [1, 11], "x": 13.75, "y": 1},
+                {"matrix": [1, 12], "x": 14.75, "y": 1},
+                {"matrix": [1, 13], "x": 15.75, "y": 1},
+                {"matrix": [1, 14], "x": 16.75, "y": 1, "w": 1.5},
+                {"matrix": [3, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 3, "y": 2},
+                {"matrix": [2, 3], "x": 4, "y": 2},
+                {"matrix": [2, 4], "x": 5, "y": 2},
+                {"matrix": [2, 5], "x": 6, "y": 2},
+                {"matrix": [2, 6], "x": 7, "y": 2},
+                {"matrix": [2, 7], "x": 10, "y": 2},
+                {"matrix": [2, 8], "x": 11, "y": 2},
+                {"matrix": [2, 9], "x": 12, "y": 2},
+                {"matrix": [2, 10], "x": 13, "y": 2},
+                {"matrix": [2, 11], "x": 14, "y": 2},
+                {"matrix": [2, 12], "x": 15, "y": 2},
+                {"matrix": [2, 13], "x": 16, "y": 2, "w": 2.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 3.5, "y": 3},
+                {"matrix": [3, 3], "x": 4.5, "y": 3},
+                {"matrix": [3, 4], "x": 5.5, "y": 3},
+                {"matrix": [3, 5], "x": 6.5, "y": 3},
+                {"matrix": [3, 6], "x": 7.5, "y": 3},
+                {"matrix": [3, 7], "x": 9.5, "y": 3},
+                {"matrix": [3, 8], "x": 10.5, "y": 3},
+                {"matrix": [3, 9], "x": 11.5, "y": 3},
+                {"matrix": [3, 10], "x": 12.5, "y": 3},
+                {"matrix": [3, 11], "x": 13.5, "y": 3},
+                {"matrix": [3, 12], "x": 14.5, "y": 3},
+                {"matrix": [3, 13], "x": 15.5, "y": 3, "w": 2.75},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 2], "x": 4.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 5], "x": 5.75, "y": 4, "w": 2},
+                {"matrix": [4, 6], "x": 7.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 8], "x": 9.5, "y": 4, "w": 2.75},
+                {"matrix": [4, 10], "x": 12.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 14], "x": 16.75, "y": 4, "w": 1.5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/cipulot/ec_dolice/keymaps/default/keymap.c b/keyboards/cipulot/ec_dolice/keymaps/default/keymap.c
new file mode 100644
index 00000000000..5a501e29823
--- /dev/null
+++ b/keyboards/cipulot/ec_dolice/keymaps/default/keymap.c
@@ -0,0 +1,41 @@
+/* Copyright 2023 Cipulot
+ *
+ * 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 3 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_PSCR, KC_ESC,  KC_1,  KC_2,  KC_3,     KC_4,    KC_5,     KC_6,    KC_7,    KC_8,  KC_9,     KC_0,     KC_MINS,  KC_EQL,   KC_BSPC,  KC_DEL,
+        KC_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_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_B,    KC_N,    KC_M,  KC_COMM,  KC_DOT,   KC_SLSH,  KC_RSFT,  MO(1),
+                 KC_LCTL,               KC_LALT,  KC_SPC,  KC_LGUI,           KC_SPC,         KC_RALT,                                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_DEL,
+        _______,  _______,  KC_HOME,  KC_UP,    KC_END,   _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+        _______,  KC_CAPS,  KC_LEFT,  KC_DOWN,  KC_RGHT,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,
+                  _______,  _______,  _______,  _______,  _______,  _______,  KC_VOLD,  KC_VOLU,  KC_MUTE,  KC_MPRV,  KC_MNXT,  KC_MPLY,  _______,  _______,
+                  _______,                      _______,  _______,  _______,            _______,            _______,                                MO(2)
+    ),
+    [2] = LAYOUT_all(
+        QK_BOOT,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+        NK_TOGG,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,
+                  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+                  _______,                      _______,  _______,  _______,            _______,            _______,                                _______
+    )
+};
diff --git a/keyboards/cipulot/ec_dolice/keymaps/via/keymap.c b/keyboards/cipulot/ec_dolice/keymaps/via/keymap.c
new file mode 100644
index 00000000000..5a501e29823
--- /dev/null
+++ b/keyboards/cipulot/ec_dolice/keymaps/via/keymap.c
@@ -0,0 +1,41 @@
+/* Copyright 2023 Cipulot
+ *
+ * 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 3 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_PSCR, KC_ESC,  KC_1,  KC_2,  KC_3,     KC_4,    KC_5,     KC_6,    KC_7,    KC_8,  KC_9,     KC_0,     KC_MINS,  KC_EQL,   KC_BSPC,  KC_DEL,
+        KC_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_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_B,    KC_N,    KC_M,  KC_COMM,  KC_DOT,   KC_SLSH,  KC_RSFT,  MO(1),
+                 KC_LCTL,               KC_LALT,  KC_SPC,  KC_LGUI,           KC_SPC,         KC_RALT,                                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_DEL,
+        _______,  _______,  KC_HOME,  KC_UP,    KC_END,   _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+        _______,  KC_CAPS,  KC_LEFT,  KC_DOWN,  KC_RGHT,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,
+                  _______,  _______,  _______,  _______,  _______,  _______,  KC_VOLD,  KC_VOLU,  KC_MUTE,  KC_MPRV,  KC_MNXT,  KC_MPLY,  _______,  _______,
+                  _______,                      _______,  _______,  _______,            _______,            _______,                                MO(2)
+    ),
+    [2] = LAYOUT_all(
+        QK_BOOT,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+        NK_TOGG,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,
+                  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+                  _______,                      _______,  _______,  _______,            _______,            _______,                                _______
+    )
+};
diff --git a/keyboards/cipulot/ec_dolice/keymaps/via/rules.mk b/keyboards/cipulot/ec_dolice/keymaps/via/rules.mk
new file mode 100644
index 00000000000..1e5b99807cb
--- /dev/null
+++ b/keyboards/cipulot/ec_dolice/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/cipulot/ec_dolice/mcuconf.h b/keyboards/cipulot/ec_dolice/mcuconf.h
new file mode 100644
index 00000000000..fa3c955e0d8
--- /dev/null
+++ b/keyboards/cipulot/ec_dolice/mcuconf.h
@@ -0,0 +1,22 @@
+/* Copyright 2023 Cipulot
+ *
+ * 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 3 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_ADC_USE_ADC1
+#define STM32_ADC_USE_ADC1 TRUE
diff --git a/keyboards/cipulot/ec_dolice/post_rules.mk b/keyboards/cipulot/ec_dolice/post_rules.mk
new file mode 100644
index 00000000000..d726a112a8c
--- /dev/null
+++ b/keyboards/cipulot/ec_dolice/post_rules.mk
@@ -0,0 +1,3 @@
+ifeq ($(strip $(VIA_ENABLE)), yes)
+    SRC += keyboards/cipulot/common/via_ec.c
+endif
diff --git a/keyboards/cipulot/ec_dolice/readme.md b/keyboards/cipulot/ec_dolice/readme.md
new file mode 100644
index 00000000000..a947df139c3
--- /dev/null
+++ b/keyboards/cipulot/ec_dolice/readme.md
@@ -0,0 +1,26 @@
+# Dolice EC
+
+![Dolice EC](https://i.imgur.com/uvM0G5v.png)
+
+The Dolice is a alice keyboard designed by Lx3 (Linworks) and yuktsi (TGR) and run by KLC. EC Version designed by Cipulot.
+
+* Keyboard Maintainer: [cipulot](https://github.com/cipulot)
+* Hardware Supported: Dolice EC
+* Hardware availability: Groupbuys. Check the ongoing ones on [the KLC Discord](https://discord.gg/d2A72mGPRB) or [Webshop](https://klc-playground.com/).
+
+Make example for this keyboard (after setting up your build environment):
+
+    make cipulot/ec_dolice:default
+
+Flashing example for this keyboard:
+
+    make cipulot/ec_dolice: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:
+
+* **Physical reset**: Long short the exposed pads on the top of the PCB
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
diff --git a/keyboards/cipulot/ec_dolice/rules.mk b/keyboards/cipulot/ec_dolice/rules.mk
new file mode 100644
index 00000000000..ce525670a68
--- /dev/null
+++ b/keyboards/cipulot/ec_dolice/rules.mk
@@ -0,0 +1,5 @@
+CUSTOM_MATRIX = lite
+ANALOG_DRIVER_REQUIRED = yes
+VPATH += keyboards/cipulot/common
+SRC += matrix.c ec_board.c ec_switch_matrix.c
+OPT = 3
diff --git a/keyboards/cipulot/ec_menhir/config.h b/keyboards/cipulot/ec_menhir/config.h
new file mode 100644
index 00000000000..bd0094c7f15
--- /dev/null
+++ b/keyboards/cipulot/ec_menhir/config.h
@@ -0,0 +1,61 @@
+/* Copyright 2023 Cipulot
+ *
+ * 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 3 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 MATRIX_ROWS 4
+#define MATRIX_COLS 12
+
+#define MATRIX_ROW_PINS \
+    { A0, A3, A2, A1 }
+
+#define AMUX_COUNT 1
+#define AMUX_MAX_COLS_COUNT 12
+
+#define AMUX_EN_PINS \
+    { C10 }
+
+#define AMUX_SEL_PINS \
+    { C11, B3, A15, A14 }
+
+#define AMUX_COL_CHANNELS_SIZES \
+    { 12 }
+
+#define AMUX_0_COL_CHANNELS \
+    { 5, 4, 3, 2, 1, 0, 15, 14, 13, 12, 11, 10 }
+
+#define AMUX_COL_CHANNELS AMUX_0_COL_CHANNELS
+
+#define DISCHARGE_PIN A4
+#define ANALOG_PORT A5
+
+#define DEFAULT_ACTUATION_MODE 0
+#define DEFAULT_MODE_0_ACTUATION_LEVEL 550
+#define DEFAULT_MODE_0_RELEASE_LEVEL 500
+#define DEFAULT_MODE_1_INITIAL_DEADZONE_OFFSET DEFAULT_MODE_0_ACTUATION_LEVEL
+#define DEFAULT_MODE_1_ACTUATION_OFFSET 70
+#define DEFAULT_MODE_1_RELEASE_OFFSET 70
+#define DEFAULT_EXTREMUM 1023
+#define EXPECTED_NOISE_FLOOR 0
+#define NOISE_FLOOR_THRESHOLD 50
+#define BOTTOMING_CALIBRATION_THRESHOLD 50
+#define DEFAULT_NOISE_FLOOR_SAMPLING_COUNT 30
+#define DEFAULT_BOTTOMING_READING 1023
+#define DEFAULT_CALIBRATION_STARTER true
+
+#define DISCHARGE_TIME 10
+
+#define EECONFIG_KB_DATA_SIZE 105
diff --git a/keyboards/cipulot/ec_menhir/halconf.h b/keyboards/cipulot/ec_menhir/halconf.h
new file mode 100644
index 00000000000..835d43b6a0a
--- /dev/null
+++ b/keyboards/cipulot/ec_menhir/halconf.h
@@ -0,0 +1,21 @@
+/* Copyright 2023 Cipulot
+ *
+ * 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 3 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_ADC TRUE
+
+#include_next <halconf.h>
diff --git a/keyboards/cipulot/ec_menhir/info.json b/keyboards/cipulot/ec_menhir/info.json
new file mode 100644
index 00000000000..4cc6a845259
--- /dev/null
+++ b/keyboards/cipulot/ec_menhir/info.json
@@ -0,0 +1,87 @@
+{
+    "manufacturer": "Cipulot",
+    "keyboard_name": "EC Menhir",
+    "maintainer": "Cipulot",
+    "bootloader": "stm32-dfu",
+    "build": {
+        "lto": true
+    },
+    "diode_direction": "COL2ROW",
+    "eeprom": {
+        "driver": "wear_leveling",
+        "wear_leveling": {
+            "driver": "embedded_flash",
+            "backing_size": 4096
+        }
+    },
+    "features": {
+        "bootmagic": false,
+        "console": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "processor": "STM32G431",
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
+    "usb": {
+        "device_version": "0.0.1",
+        "pid": "0x6BB8",
+        "shared_endpoint": {
+            "keyboard": true
+        },
+        "vid": "0x6369"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 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, "w": 1.75},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
+                {"matrix": [1, 1], "x": 1.25, "y": 1},
+                {"matrix": [1, 2], "x": 2.25, "y": 1},
+                {"matrix": [1, 3], "x": 3.25, "y": 1},
+                {"matrix": [1, 4], "x": 4.25, "y": 1},
+                {"matrix": [1, 5], "x": 5.25, "y": 1},
+                {"matrix": [1, 6], "x": 6.25, "y": 1},
+                {"matrix": [1, 7], "x": 7.25, "y": 1},
+                {"matrix": [1, 8], "x": 8.25, "y": 1},
+                {"matrix": [1, 9], "x": 9.25, "y": 1},
+                {"matrix": [1, 10], "x": 10.25, "y": 1},
+                {"matrix": [1, 11], "x": 11.25, "y": 1, "w": 1.5},
+                {"matrix": [2, 0], "x": 0.5, "y": 2, "w": 1.25},
+                {"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, "w": 1.5},
+                {"matrix": [3, 1], "x": 1.75, "y": 3, "w": 1.25},
+                {"matrix": [3, 2], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3, "w": 2},
+                {"matrix": [3, 5], "x": 6, "y": 3},
+                {"matrix": [3, 6], "x": 7, "y": 3, "w": 2},
+                {"matrix": [3, 8], "x": 9, "y": 3},
+                {"matrix": [3, 9], "x": 10, "y": 3}
+            ]
+        }
+    }
+}
diff --git a/keyboards/cipulot/ec_menhir/keymaps/default/keymap.c b/keyboards/cipulot/ec_menhir/keymaps/default/keymap.c
new file mode 100644
index 00000000000..e6780e6439f
--- /dev/null
+++ b/keyboards/cipulot/ec_menhir/keymaps/default/keymap.c
@@ -0,0 +1,27 @@
+/* Copyright 2023 Cipulot
+ *
+ * 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 3 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] = {
+    // clang-format off
+    [0] = LAYOUT(
+        KC_ESC,   KC_Q,     KC_W,     KC_E,     KC_R,   KC_T,    KC_Y,    KC_U,   KC_I,      KC_O,    KC_P,     KC_BSPC,
+		KC_TAB,   KC_A,     KC_S,     KC_D,     KC_F,   KC_G,    KC_H,    KC_J,   KC_K,      KC_L,    KC_SCLN,  KC_ENT,
+		KC_LSFT,  KC_Z,     KC_X,     KC_C,     KC_V,   KC_B,    KC_N,    KC_M,   KC_COMM,   KC_DOT,  KC_RSFT,
+                            KC_LALT,  KC_LGUI,  MO(1),  KC_SPC,  KC_SPC,  MO(2),  KC_LCTL)
+    // clang-format on
+};
diff --git a/keyboards/cipulot/ec_menhir/keymaps/via/keymap.c b/keyboards/cipulot/ec_menhir/keymaps/via/keymap.c
new file mode 100644
index 00000000000..e6780e6439f
--- /dev/null
+++ b/keyboards/cipulot/ec_menhir/keymaps/via/keymap.c
@@ -0,0 +1,27 @@
+/* Copyright 2023 Cipulot
+ *
+ * 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 3 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] = {
+    // clang-format off
+    [0] = LAYOUT(
+        KC_ESC,   KC_Q,     KC_W,     KC_E,     KC_R,   KC_T,    KC_Y,    KC_U,   KC_I,      KC_O,    KC_P,     KC_BSPC,
+		KC_TAB,   KC_A,     KC_S,     KC_D,     KC_F,   KC_G,    KC_H,    KC_J,   KC_K,      KC_L,    KC_SCLN,  KC_ENT,
+		KC_LSFT,  KC_Z,     KC_X,     KC_C,     KC_V,   KC_B,    KC_N,    KC_M,   KC_COMM,   KC_DOT,  KC_RSFT,
+                            KC_LALT,  KC_LGUI,  MO(1),  KC_SPC,  KC_SPC,  MO(2),  KC_LCTL)
+    // clang-format on
+};
diff --git a/keyboards/cipulot/ec_menhir/keymaps/via/rules.mk b/keyboards/cipulot/ec_menhir/keymaps/via/rules.mk
new file mode 100644
index 00000000000..1e5b99807cb
--- /dev/null
+++ b/keyboards/cipulot/ec_menhir/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/cipulot/ec_menhir/mcuconf.h b/keyboards/cipulot/ec_menhir/mcuconf.h
new file mode 100644
index 00000000000..b120f145c5b
--- /dev/null
+++ b/keyboards/cipulot/ec_menhir/mcuconf.h
@@ -0,0 +1,22 @@
+/* Copyright 2023 Cipulot
+ *
+ * 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 3 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_ADC_USE_ADC2
+#define STM32_ADC_USE_ADC2 TRUE
diff --git a/keyboards/cipulot/ec_menhir/post_rules.mk b/keyboards/cipulot/ec_menhir/post_rules.mk
new file mode 100644
index 00000000000..d726a112a8c
--- /dev/null
+++ b/keyboards/cipulot/ec_menhir/post_rules.mk
@@ -0,0 +1,3 @@
+ifeq ($(strip $(VIA_ENABLE)), yes)
+    SRC += keyboards/cipulot/common/via_ec.c
+endif
diff --git a/keyboards/cipulot/ec_menhir/readme.md b/keyboards/cipulot/ec_menhir/readme.md
new file mode 100644
index 00000000000..234b1ab9d0e
--- /dev/null
+++ b/keyboards/cipulot/ec_menhir/readme.md
@@ -0,0 +1,26 @@
+# EC Menhir
+
+![EC Menhir](https://i.imgur.com/m0feb2Zh.png)
+
+EC version of the Menhir.
+
+* Keyboard Maintainer: [cipulot](https://github.com/cipulot)
+* Hardware Supported: EC Menhir
+* Hardware Availability: [fruitykeeb](https://fruitykeeb.xyz/)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make cipulot/ec_menhir:default
+
+Flashing example for this keyboard:
+
+    make cipulot/ec_menhir: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:
+
+* **Physical Boot0 pins**: Short the Boot0 pins on the back of the PCB while plugging in the keyboard
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
diff --git a/keyboards/cipulot/ec_menhir/rules.mk b/keyboards/cipulot/ec_menhir/rules.mk
new file mode 100644
index 00000000000..e7d73cefc98
--- /dev/null
+++ b/keyboards/cipulot/ec_menhir/rules.mk
@@ -0,0 +1,4 @@
+CUSTOM_MATRIX = lite
+ANALOG_DRIVER_REQUIRED = yes
+VPATH += keyboards/cipulot/common
+SRC += matrix.c ec_board.c ec_switch_matrix.c
diff --git a/keyboards/cipulot/ec_pro2/config.h b/keyboards/cipulot/ec_pro2/config.h
index c936b248c45..a05e716823a 100644
--- a/keyboards/cipulot/ec_pro2/config.h
+++ b/keyboards/cipulot/ec_pro2/config.h
@@ -65,8 +65,3 @@
 
 #define EECONFIG_KB_DATA_SIZE 159
 
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/cipulot/ec_pro2/info.json b/keyboards/cipulot/ec_pro2/info.json
deleted file mode 100644
index 2929edfb19c..00000000000
--- a/keyboards/cipulot/ec_pro2/info.json
+++ /dev/null
@@ -1,177 +0,0 @@
-{
-    "manufacturer": "Cipulot",
-    "keyboard_name": "EC Pro 2",
-    "maintainer": "Cipulot",
-    "bootloader": "stm32-dfu",
-    "build": {
-        "lto": true
-    },
-    "diode_direction": "COL2ROW",
-    "features": {
-        "bootmagic": false,
-        "console": true,
-        "extrakey": true,
-        "mousekey": true,
-        "nkro": true,
-        "rgblight": true
-    },
-    "processor": "STM32F401",
-    "rgblight": {
-        "led_count": 22,
-        "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
-        }
-    },
-    "ws2812": {
-        "pin": "B14"
-    },
-    "usb": {
-        "device_version": "0.0.1",
-        "pid": "0x6B8E",
-        "shared_endpoint": {
-            "keyboard": true
-        },
-        "vid": "0x6369"
-    },
-    "layouts": {
-        "LAYOUT_all": {
-            "layout": [
-                {"label": "0,0", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "0,1", "matrix": [0, 1], "x": 1, "y": 0},
-                {"label": "0,2", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "0,3", "matrix": [0, 3], "x": 3, "y": 0},
-                {"label": "0,4", "matrix": [0, 4], "x": 4, "y": 0},
-                {"label": "0,5", "matrix": [0, 5], "x": 5, "y": 0},
-                {"label": "0,6", "matrix": [0, 6], "x": 6, "y": 0},
-                {"label": "0,7", "matrix": [0, 7], "x": 7, "y": 0},
-                {"label": "0,8", "matrix": [0, 8], "x": 8, "y": 0},
-                {"label": "0,9", "matrix": [0, 9], "x": 9, "y": 0},
-                {"label": "0,10", "matrix": [0, 10], "x": 10, "y": 0},
-                {"label": "0,11", "matrix": [0, 11], "x": 11, "y": 0},
-                {"label": "0,12", "matrix": [0, 12], "x": 12, "y": 0},
-                {"label": "0,13", "matrix": [0, 13], "x": 13, "y": 0},
-                {"label": "0,14", "matrix": [0, 14], "x": 14, "y": 0},
-                {"label": "1,0", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1},
-                {"label": "1,1", "matrix": [1, 1], "x": 1.5, "y": 1},
-                {"label": "1,2", "matrix": [1, 2], "x": 2.5, "y": 1},
-                {"label": "1,3", "matrix": [1, 3], "x": 3.5, "y": 1},
-                {"label": "1,4", "matrix": [1, 4], "x": 4.5, "y": 1},
-                {"label": "1,5", "matrix": [1, 5], "x": 5.5, "y": 1},
-                {"label": "1,6", "matrix": [1, 6], "x": 6.5, "y": 1},
-                {"label": "1,7", "matrix": [1, 7], "x": 7.5, "y": 1},
-                {"label": "1,8", "matrix": [1, 8], "x": 8.5, "y": 1},
-                {"label": "1,9", "matrix": [1, 9], "x": 9.5, "y": 1},
-                {"label": "1,10", "matrix": [1, 10], "x": 10.5, "y": 1},
-                {"label": "1,11", "matrix": [1, 11], "x": 11.5, "y": 1},
-                {"label": "1,12", "matrix": [1, 12], "x": 12.5, "y": 1},
-                {"label": "1,13", "matrix": [1, 13], "w": 1.5, "x": 13.5, "y": 1},
-                {"label": "2,0", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2},
-                {"label": "2,1", "matrix": [2, 1], "x": 1.75, "y": 2},
-                {"label": "2,2", "matrix": [2, 2], "x": 2.75, "y": 2},
-                {"label": "2,3", "matrix": [2, 3], "x": 3.75, "y": 2},
-                {"label": "2,4", "matrix": [2, 4], "x": 4.75, "y": 2},
-                {"label": "2,5", "matrix": [2, 5], "x": 5.75, "y": 2},
-                {"label": "2,6", "matrix": [2, 6], "x": 6.75, "y": 2},
-                {"label": "2,7", "matrix": [2, 7], "x": 7.75, "y": 2},
-                {"label": "2,8", "matrix": [2, 8], "x": 8.75, "y": 2},
-                {"label": "2,9", "matrix": [2, 9], "x": 9.75, "y": 2},
-                {"label": "2,10", "matrix": [2, 10], "x": 10.75, "y": 2},
-                {"label": "2,11", "matrix": [2, 11], "x": 11.75, "y": 2},
-                {"label": "2,12", "matrix": [2, 12], "x": 12.75, "y": 2},
-                {"label": "2,13", "matrix": [2, 13], "w": 1.25, "x": 13.75, "y": 2},
-                {"label": "3,0", "matrix": [3, 0], "w": 1.25, "x": 0, "y": 3},
-                {"label": "3,1", "matrix": [3, 1], "x": 1.25, "y": 3},
-                {"label": "3,2", "matrix": [3, 2], "x": 2.25, "y": 3},
-                {"label": "3,3", "matrix": [3, 3], "x": 3.25, "y": 3},
-                {"label": "3,4", "matrix": [3, 4], "x": 4.25, "y": 3},
-                {"label": "3,5", "matrix": [3, 5], "x": 5.25, "y": 3},
-                {"label": "3,6", "matrix": [3, 6], "x": 6.25, "y": 3},
-                {"label": "3,7", "matrix": [3, 7], "x": 7.25, "y": 3},
-                {"label": "3,8", "matrix": [3, 8], "x": 8.25, "y": 3},
-                {"label": "3,9", "matrix": [3, 9], "x": 9.25, "y": 3},
-                {"label": "3,10", "matrix": [3, 10], "x": 10.25, "y": 3},
-                {"label": "3,11", "matrix": [3, 11], "x": 11.25, "y": 3},
-                {"label": "3,13", "matrix": [3, 13], "w": 1.75, "x": 12.25, "y": 3},
-                {"label": "3,14", "matrix": [3, 14], "x": 14, "y": 3},
-                {"label": "4,1", "matrix": [4, 1], "x": 1.5, "y": 4},
-                {"label": "4,2", "matrix": [4, 2], "w": 1.5, "x": 2.5, "y": 4},
-                {"label": "4,6", "matrix": [4, 6], "w": 6, "x": 4, "y": 4},
-                {"label": "4,9", "matrix": [4, 9], "w": 1.5, "x": 10, "y": 4},
-                {"label": "4,10", "matrix": [4, 10], "x": 11.5, "y": 4}
-            ]
-        },
-        "LAYOUT_60_hhkb": {
-            "layout": [
-                {"label": "0,0", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "0,1", "matrix": [0, 1], "x": 1, "y": 0},
-                {"label": "0,2", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "0,3", "matrix": [0, 3], "x": 3, "y": 0},
-                {"label": "0,4", "matrix": [0, 4], "x": 4, "y": 0},
-                {"label": "0,5", "matrix": [0, 5], "x": 5, "y": 0},
-                {"label": "0,6", "matrix": [0, 6], "x": 6, "y": 0},
-                {"label": "0,7", "matrix": [0, 7], "x": 7, "y": 0},
-                {"label": "0,8", "matrix": [0, 8], "x": 8, "y": 0},
-                {"label": "0,9", "matrix": [0, 9], "x": 9, "y": 0},
-                {"label": "0,10", "matrix": [0, 10], "x": 10, "y": 0},
-                {"label": "0,11", "matrix": [0, 11], "x": 11, "y": 0},
-                {"label": "0,12", "matrix": [0, 12], "x": 12, "y": 0},
-                {"label": "0,13", "matrix": [0, 13], "x": 13, "y": 0},
-                {"label": "0,14", "matrix": [0, 14], "x": 14, "y": 0},
-                {"label": "1,0", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1},
-                {"label": "1,1", "matrix": [1, 1], "x": 1.5, "y": 1},
-                {"label": "1,2", "matrix": [1, 2], "x": 2.5, "y": 1},
-                {"label": "1,3", "matrix": [1, 3], "x": 3.5, "y": 1},
-                {"label": "1,4", "matrix": [1, 4], "x": 4.5, "y": 1},
-                {"label": "1,5", "matrix": [1, 5], "x": 5.5, "y": 1},
-                {"label": "1,6", "matrix": [1, 6], "x": 6.5, "y": 1},
-                {"label": "1,7", "matrix": [1, 7], "x": 7.5, "y": 1},
-                {"label": "1,8", "matrix": [1, 8], "x": 8.5, "y": 1},
-                {"label": "1,9", "matrix": [1, 9], "x": 9.5, "y": 1},
-                {"label": "1,10", "matrix": [1, 10], "x": 10.5, "y": 1},
-                {"label": "1,11", "matrix": [1, 11], "x": 11.5, "y": 1},
-                {"label": "1,12", "matrix": [1, 12], "x": 12.5, "y": 1},
-                {"label": "1,13", "matrix": [1, 13], "w": 1.5, "x": 13.5, "y": 1},
-                {"label": "2,0", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2},
-                {"label": "2,1", "matrix": [2, 1], "x": 1.75, "y": 2},
-                {"label": "2,2", "matrix": [2, 2], "x": 2.75, "y": 2},
-                {"label": "2,3", "matrix": [2, 3], "x": 3.75, "y": 2},
-                {"label": "2,4", "matrix": [2, 4], "x": 4.75, "y": 2},
-                {"label": "2,5", "matrix": [2, 5], "x": 5.75, "y": 2},
-                {"label": "2,6", "matrix": [2, 6], "x": 6.75, "y": 2},
-                {"label": "2,7", "matrix": [2, 7], "x": 7.75, "y": 2},
-                {"label": "2,8", "matrix": [2, 8], "x": 8.75, "y": 2},
-                {"label": "2,9", "matrix": [2, 9], "x": 9.75, "y": 2},
-                {"label": "2,10", "matrix": [2, 10], "x": 10.75, "y": 2},
-                {"label": "2,11", "matrix": [2, 11], "x": 11.75, "y": 2},
-                {"label": "2,13", "matrix": [2, 13], "w": 2.25, "x": 12.75, "y": 2},
-                {"label": "3,0", "matrix": [3, 0], "w": 2.25, "x": 0, "y": 3},
-                {"label": "3,2", "matrix": [3, 2], "x": 2.25, "y": 3},
-                {"label": "3,3", "matrix": [3, 3], "x": 3.25, "y": 3},
-                {"label": "3,4", "matrix": [3, 4], "x": 4.25, "y": 3},
-                {"label": "3,5", "matrix": [3, 5], "x": 5.25, "y": 3},
-                {"label": "3,6", "matrix": [3, 6], "x": 6.25, "y": 3},
-                {"label": "3,7", "matrix": [3, 7], "x": 7.25, "y": 3},
-                {"label": "3,8", "matrix": [3, 8], "x": 8.25, "y": 3},
-                {"label": "3,9", "matrix": [3, 9], "x": 9.25, "y": 3},
-                {"label": "3,10", "matrix": [3, 10], "x": 10.25, "y": 3},
-                {"label": "3,11", "matrix": [3, 11], "x": 11.25, "y": 3},
-                {"label": "3,13", "matrix": [3, 13], "w": 1.75, "x": 12.25, "y": 3},
-                {"label": "3,14", "matrix": [3, 14], "x": 14, "y": 3},
-                {"label": "4,1", "matrix": [4, 1], "x": 1.5, "y": 4},
-                {"label": "4,2", "matrix": [4, 2], "w": 1.5, "x": 2.5, "y": 4},
-                {"label": "4,6", "matrix": [4, 6], "w": 6, "x": 4, "y": 4},
-                {"label": "4,9", "matrix": [4, 9], "w": 1.5, "x": 10, "y": 4},
-                {"label": "4,10", "matrix": [4, 10], "x": 11.5, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/cipulot/ec_pro2/keyboard.json b/keyboards/cipulot/ec_pro2/keyboard.json
new file mode 100644
index 00000000000..2e05cff3c16
--- /dev/null
+++ b/keyboards/cipulot/ec_pro2/keyboard.json
@@ -0,0 +1,183 @@
+{
+    "manufacturer": "Cipulot",
+    "keyboard_name": "EC Pro 2",
+    "maintainer": "Cipulot",
+    "bootloader": "stm32-dfu",
+    "build": {
+        "lto": true
+    },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": false,
+        "console": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgblight": true
+    },
+    "processor": "STM32F401",
+    "rgblight": {
+        "led_count": 22,
+        "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
+        }
+    },
+    "ws2812": {
+        "pin": "B14"
+    },
+    "usb": {
+        "device_version": "0.0.1",
+        "pid": "0x6B8E",
+        "shared_endpoint": {
+            "keyboard": true
+        },
+        "vid": "0x6369"
+    },
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                {"label": "0,0", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "0,1", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "0,2", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "0,3", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "0,4", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "0,5", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "0,6", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "0,7", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "0,8", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "0,9", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "0,10", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "0,11", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "0,12", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "0,13", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "0,14", "matrix": [0, 14], "x": 14, "y": 0},
+                {"label": "1,0", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1},
+                {"label": "1,1", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "1,2", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "1,3", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "1,4", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "1,5", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "1,6", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "1,7", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "1,8", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "1,9", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "1,10", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "1,11", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "1,12", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "1,13", "matrix": [1, 13], "w": 1.5, "x": 13.5, "y": 1},
+                {"label": "2,0", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2},
+                {"label": "2,1", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "2,2", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "2,3", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "2,4", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "2,5", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "2,6", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "2,7", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "2,8", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "2,9", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": "2,10", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "2,11", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "2,12", "matrix": [2, 12], "x": 12.75, "y": 2},
+                {"label": "2,13", "matrix": [2, 13], "w": 1.25, "x": 13.75, "y": 2},
+                {"label": "3,0", "matrix": [3, 0], "w": 1.25, "x": 0, "y": 3},
+                {"label": "3,1", "matrix": [3, 1], "x": 1.25, "y": 3},
+                {"label": "3,2", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "3,3", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "3,4", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "3,5", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "3,6", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "3,7", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "3,8", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": "3,9", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": "3,10", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "3,11", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "3,13", "matrix": [3, 13], "w": 1.75, "x": 12.25, "y": 3},
+                {"label": "3,14", "matrix": [3, 14], "x": 14, "y": 3},
+                {"label": "4,1", "matrix": [4, 1], "x": 1.5, "y": 4},
+                {"label": "4,2", "matrix": [4, 2], "w": 1.5, "x": 2.5, "y": 4},
+                {"label": "4,6", "matrix": [4, 6], "w": 6, "x": 4, "y": 4},
+                {"label": "4,9", "matrix": [4, 9], "w": 1.5, "x": 10, "y": 4},
+                {"label": "4,10", "matrix": [4, 10], "x": 11.5, "y": 4}
+            ]
+        },
+        "LAYOUT_60_hhkb": {
+            "layout": [
+                {"label": "0,0", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "0,1", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "0,2", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "0,3", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "0,4", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "0,5", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "0,6", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "0,7", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "0,8", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "0,9", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "0,10", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "0,11", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "0,12", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "0,13", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "0,14", "matrix": [0, 14], "x": 14, "y": 0},
+                {"label": "1,0", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1},
+                {"label": "1,1", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "1,2", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "1,3", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "1,4", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "1,5", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "1,6", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "1,7", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "1,8", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "1,9", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "1,10", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "1,11", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "1,12", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "1,13", "matrix": [1, 13], "w": 1.5, "x": 13.5, "y": 1},
+                {"label": "2,0", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2},
+                {"label": "2,1", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "2,2", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "2,3", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "2,4", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "2,5", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "2,6", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "2,7", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "2,8", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "2,9", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": "2,10", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "2,11", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "2,13", "matrix": [2, 13], "w": 2.25, "x": 12.75, "y": 2},
+                {"label": "3,0", "matrix": [3, 0], "w": 2.25, "x": 0, "y": 3},
+                {"label": "3,2", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "3,3", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "3,4", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "3,5", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "3,6", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "3,7", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "3,8", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": "3,9", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": "3,10", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "3,11", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "3,13", "matrix": [3, 13], "w": 1.75, "x": 12.25, "y": 3},
+                {"label": "3,14", "matrix": [3, 14], "x": 14, "y": 3},
+                {"label": "4,1", "matrix": [4, 1], "x": 1.5, "y": 4},
+                {"label": "4,2", "matrix": [4, 2], "w": 1.5, "x": 2.5, "y": 4},
+                {"label": "4,6", "matrix": [4, 6], "w": 6, "x": 4, "y": 4},
+                {"label": "4,9", "matrix": [4, 9], "w": 1.5, "x": 10, "y": 4},
+                {"label": "4,10", "matrix": [4, 10], "x": 11.5, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/cipulot/ec_pro2/rules.mk b/keyboards/cipulot/ec_pro2/rules.mk
index ab6c37cad43..318e0215ce9 100644
--- a/keyboards/cipulot/ec_pro2/rules.mk
+++ b/keyboards/cipulot/ec_pro2/rules.mk
@@ -1,4 +1,5 @@
 CUSTOM_MATRIX = lite
 ANALOG_DRIVER_REQUIRED = yes
-SRC += keyboards/cipulot/common/matrix.c keyboards/cipulot/common/ec_board.c keyboards/cipulot/common/ec_switch_matrix.c
+VPATH += keyboards/cipulot/common
+SRC += matrix.c ec_board.c ec_switch_matrix.c
 OPT = 2
diff --git a/keyboards/cipulot/ec_prox/ansi_iso/config.h b/keyboards/cipulot/ec_prox/ansi_iso/config.h
index 6a165cf3abd..bf25d0b7128 100644
--- a/keyboards/cipulot/ec_prox/ansi_iso/config.h
+++ b/keyboards/cipulot/ec_prox/ansi_iso/config.h
@@ -64,9 +64,3 @@
 // #define DEBUG_MATRIX_SCAN_RATE
 
 #define EECONFIG_KB_DATA_SIZE 159
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/cipulot/ec_prox/ansi_iso/info.json b/keyboards/cipulot/ec_prox/ansi_iso/info.json
deleted file mode 100644
index 3f390d0bc61..00000000000
--- a/keyboards/cipulot/ec_prox/ansi_iso/info.json
+++ /dev/null
@@ -1,178 +0,0 @@
-{
-    "manufacturer": "Cipulot",
-    "keyboard_name": "EC Pro X ANSI/ISO",
-    "maintainer": "Cipulot",
-    "bootloader": "stm32-dfu",
-    "build": {
-        "lto": true
-    },
-    "diode_direction": "COL2ROW",
-    "features": {
-        "bootmagic": false,
-        "console": true,
-        "extrakey": true,
-        "mousekey": true,
-        "nkro": true,
-        "rgblight": true
-    },
-    "processor": "STM32F401",
-    "rgblight": {
-        "led_count": 22,
-        "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
-        }
-    },
-    "ws2812": {
-        "pin": "B12"
-    },
-    "url": "https://www.github.com/Cipulot/EC-Pro-X",
-    "usb": {
-        "device_version": "0.0.1",
-        "pid": "0x6B98",
-        "shared_endpoint": {
-            "keyboard": true
-        },
-        "vid": "0x6369"
-    },
-    "layouts": {
-        "LAYOUT_all": {
-            "layout": [
-                {"label": "0,0", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "0,1", "matrix": [0, 1], "x": 1, "y": 0},
-                {"label": "0,2", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "0,3", "matrix": [0, 3], "x": 3, "y": 0},
-                {"label": "0,4", "matrix": [0, 4], "x": 4, "y": 0},
-                {"label": "0,5", "matrix": [0, 5], "x": 5, "y": 0},
-                {"label": "0,6", "matrix": [0, 6], "x": 6, "y": 0},
-                {"label": "0,7", "matrix": [0, 7], "x": 7, "y": 0},
-                {"label": "0,8", "matrix": [0, 8], "x": 8, "y": 0},
-                {"label": "0,9", "matrix": [0, 9], "x": 9, "y": 0},
-                {"label": "0,10", "matrix": [0, 10], "x": 10, "y": 0},
-                {"label": "0,11", "matrix": [0, 11], "x": 11, "y": 0},
-                {"label": "0,12", "matrix": [0, 12], "x": 12, "y": 0},
-                {"label": "0,13", "matrix": [0, 13], "x": 13, "y": 0},
-                {"label": "0,14", "matrix": [0, 14], "x": 14, "y": 0},
-                {"label": "1,0", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1},
-                {"label": "1,1", "matrix": [1, 1], "x": 1.5, "y": 1},
-                {"label": "1,2", "matrix": [1, 2], "x": 2.5, "y": 1},
-                {"label": "1,3", "matrix": [1, 3], "x": 3.5, "y": 1},
-                {"label": "1,4", "matrix": [1, 4], "x": 4.5, "y": 1},
-                {"label": "1,5", "matrix": [1, 5], "x": 5.5, "y": 1},
-                {"label": "1,6", "matrix": [1, 6], "x": 6.5, "y": 1},
-                {"label": "1,7", "matrix": [1, 7], "x": 7.5, "y": 1},
-                {"label": "1,8", "matrix": [1, 8], "x": 8.5, "y": 1},
-                {"label": "1,9", "matrix": [1, 9], "x": 9.5, "y": 1},
-                {"label": "1,10", "matrix": [1, 10], "x": 10.5, "y": 1},
-                {"label": "1,11", "matrix": [1, 11], "x": 11.5, "y": 1},
-                {"label": "1,12", "matrix": [1, 12], "x": 12.5, "y": 1},
-                {"label": "1,13", "matrix": [1, 13], "w": 1.5, "x": 13.5, "y": 1},
-                {"label": "2,0", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2},
-                {"label": "2,1", "matrix": [2, 1], "x": 1.75, "y": 2},
-                {"label": "2,2", "matrix": [2, 2], "x": 2.75, "y": 2},
-                {"label": "2,3", "matrix": [2, 3], "x": 3.75, "y": 2},
-                {"label": "2,4", "matrix": [2, 4], "x": 4.75, "y": 2},
-                {"label": "2,5", "matrix": [2, 5], "x": 5.75, "y": 2},
-                {"label": "2,6", "matrix": [2, 6], "x": 6.75, "y": 2},
-                {"label": "2,7", "matrix": [2, 7], "x": 7.75, "y": 2},
-                {"label": "2,8", "matrix": [2, 8], "x": 8.75, "y": 2},
-                {"label": "2,9", "matrix": [2, 9], "x": 9.75, "y": 2},
-                {"label": "2,10", "matrix": [2, 10], "x": 10.75, "y": 2},
-                {"label": "2,11", "matrix": [2, 11], "x": 11.75, "y": 2},
-                {"label": "2,12", "matrix": [2, 12], "x": 12.75, "y": 2},
-                {"label": "2,13", "matrix": [2, 13], "w": 1.25, "x": 13.75, "y": 2},
-                {"label": "3,0", "matrix": [3, 0], "w": 1.25, "x": 0, "y": 3},
-                {"label": "3,1", "matrix": [3, 1], "x": 1.25, "y": 3},
-                {"label": "3,2", "matrix": [3, 2], "x": 2.25, "y": 3},
-                {"label": "3,3", "matrix": [3, 3], "x": 3.25, "y": 3},
-                {"label": "3,4", "matrix": [3, 4], "x": 4.25, "y": 3},
-                {"label": "3,5", "matrix": [3, 5], "x": 5.25, "y": 3},
-                {"label": "3,6", "matrix": [3, 6], "x": 6.25, "y": 3},
-                {"label": "3,7", "matrix": [3, 7], "x": 7.25, "y": 3},
-                {"label": "3,8", "matrix": [3, 8], "x": 8.25, "y": 3},
-                {"label": "3,9", "matrix": [3, 9], "x": 9.25, "y": 3},
-                {"label": "3,10", "matrix": [3, 10], "x": 10.25, "y": 3},
-                {"label": "3,11", "matrix": [3, 11], "x": 11.25, "y": 3},
-                {"label": "3,13", "matrix": [3, 13], "w": 1.75, "x": 12.25, "y": 3},
-                {"label": "3,14", "matrix": [3, 14], "x": 14, "y": 3},
-                {"label": "4,1", "matrix": [4, 1], "x": 1.5, "y": 4},
-                {"label": "4,2", "matrix": [4, 2], "w": 1.5, "x": 2.5, "y": 4},
-                {"label": "4,6", "matrix": [4, 6], "w": 6, "x": 4, "y": 4},
-                {"label": "4,9", "matrix": [4, 9], "w": 1.5, "x": 10, "y": 4},
-                {"label": "4,10", "matrix": [4, 10], "x": 11.5, "y": 4}
-            ]
-        },
-        "LAYOUT_60_hhkb": {
-            "layout": [
-                {"label": "0,0", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "0,1", "matrix": [0, 1], "x": 1, "y": 0},
-                {"label": "0,2", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "0,3", "matrix": [0, 3], "x": 3, "y": 0},
-                {"label": "0,4", "matrix": [0, 4], "x": 4, "y": 0},
-                {"label": "0,5", "matrix": [0, 5], "x": 5, "y": 0},
-                {"label": "0,6", "matrix": [0, 6], "x": 6, "y": 0},
-                {"label": "0,7", "matrix": [0, 7], "x": 7, "y": 0},
-                {"label": "0,8", "matrix": [0, 8], "x": 8, "y": 0},
-                {"label": "0,9", "matrix": [0, 9], "x": 9, "y": 0},
-                {"label": "0,10", "matrix": [0, 10], "x": 10, "y": 0},
-                {"label": "0,11", "matrix": [0, 11], "x": 11, "y": 0},
-                {"label": "0,12", "matrix": [0, 12], "x": 12, "y": 0},
-                {"label": "0,13", "matrix": [0, 13], "x": 13, "y": 0},
-                {"label": "0,14", "matrix": [0, 14], "x": 14, "y": 0},
-                {"label": "1,0", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1},
-                {"label": "1,1", "matrix": [1, 1], "x": 1.5, "y": 1},
-                {"label": "1,2", "matrix": [1, 2], "x": 2.5, "y": 1},
-                {"label": "1,3", "matrix": [1, 3], "x": 3.5, "y": 1},
-                {"label": "1,4", "matrix": [1, 4], "x": 4.5, "y": 1},
-                {"label": "1,5", "matrix": [1, 5], "x": 5.5, "y": 1},
-                {"label": "1,6", "matrix": [1, 6], "x": 6.5, "y": 1},
-                {"label": "1,7", "matrix": [1, 7], "x": 7.5, "y": 1},
-                {"label": "1,8", "matrix": [1, 8], "x": 8.5, "y": 1},
-                {"label": "1,9", "matrix": [1, 9], "x": 9.5, "y": 1},
-                {"label": "1,10", "matrix": [1, 10], "x": 10.5, "y": 1},
-                {"label": "1,11", "matrix": [1, 11], "x": 11.5, "y": 1},
-                {"label": "1,12", "matrix": [1, 12], "x": 12.5, "y": 1},
-                {"label": "1,13", "matrix": [1, 13], "w": 1.5, "x": 13.5, "y": 1},
-                {"label": "2,0", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2},
-                {"label": "2,1", "matrix": [2, 1], "x": 1.75, "y": 2},
-                {"label": "2,2", "matrix": [2, 2], "x": 2.75, "y": 2},
-                {"label": "2,3", "matrix": [2, 3], "x": 3.75, "y": 2},
-                {"label": "2,4", "matrix": [2, 4], "x": 4.75, "y": 2},
-                {"label": "2,5", "matrix": [2, 5], "x": 5.75, "y": 2},
-                {"label": "2,6", "matrix": [2, 6], "x": 6.75, "y": 2},
-                {"label": "2,7", "matrix": [2, 7], "x": 7.75, "y": 2},
-                {"label": "2,8", "matrix": [2, 8], "x": 8.75, "y": 2},
-                {"label": "2,9", "matrix": [2, 9], "x": 9.75, "y": 2},
-                {"label": "2,10", "matrix": [2, 10], "x": 10.75, "y": 2},
-                {"label": "2,11", "matrix": [2, 11], "x": 11.75, "y": 2},
-                {"label": "2,13", "matrix": [2, 13], "w": 2.25, "x": 12.75, "y": 2},
-                {"label": "3,0", "matrix": [3, 0], "w": 2.25, "x": 0, "y": 3},
-                {"label": "3,2", "matrix": [3, 2], "x": 2.25, "y": 3},
-                {"label": "3,3", "matrix": [3, 3], "x": 3.25, "y": 3},
-                {"label": "3,4", "matrix": [3, 4], "x": 4.25, "y": 3},
-                {"label": "3,5", "matrix": [3, 5], "x": 5.25, "y": 3},
-                {"label": "3,6", "matrix": [3, 6], "x": 6.25, "y": 3},
-                {"label": "3,7", "matrix": [3, 7], "x": 7.25, "y": 3},
-                {"label": "3,8", "matrix": [3, 8], "x": 8.25, "y": 3},
-                {"label": "3,9", "matrix": [3, 9], "x": 9.25, "y": 3},
-                {"label": "3,10", "matrix": [3, 10], "x": 10.25, "y": 3},
-                {"label": "3,11", "matrix": [3, 11], "x": 11.25, "y": 3},
-                {"label": "3,13", "matrix": [3, 13], "w": 1.75, "x": 12.25, "y": 3},
-                {"label": "3,14", "matrix": [3, 14], "x": 14, "y": 3},
-                {"label": "4,1", "matrix": [4, 1], "x": 1.5, "y": 4},
-                {"label": "4,2", "matrix": [4, 2], "w": 1.5, "x": 2.5, "y": 4},
-                {"label": "4,6", "matrix": [4, 6], "w": 6, "x": 4, "y": 4},
-                {"label": "4,9", "matrix": [4, 9], "w": 1.5, "x": 10, "y": 4},
-                {"label": "4,10", "matrix": [4, 10], "x": 11.5, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/cipulot/ec_prox/ansi_iso/keyboard.json b/keyboards/cipulot/ec_prox/ansi_iso/keyboard.json
new file mode 100644
index 00000000000..9a68d8b0bf7
--- /dev/null
+++ b/keyboards/cipulot/ec_prox/ansi_iso/keyboard.json
@@ -0,0 +1,184 @@
+{
+    "manufacturer": "Cipulot",
+    "keyboard_name": "EC Pro X ANSI/ISO",
+    "maintainer": "Cipulot",
+    "bootloader": "stm32-dfu",
+    "build": {
+        "lto": true
+    },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": false,
+        "console": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgblight": true
+    },
+    "processor": "STM32F401",
+    "rgblight": {
+        "led_count": 22,
+        "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
+        }
+    },
+    "ws2812": {
+        "pin": "B12"
+    },
+    "url": "https://www.github.com/Cipulot/EC-Pro-X",
+    "usb": {
+        "device_version": "0.0.1",
+        "pid": "0x6B98",
+        "shared_endpoint": {
+            "keyboard": true
+        },
+        "vid": "0x6369"
+    },
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                {"label": "0,0", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "0,1", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "0,2", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "0,3", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "0,4", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "0,5", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "0,6", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "0,7", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "0,8", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "0,9", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "0,10", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "0,11", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "0,12", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "0,13", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "0,14", "matrix": [0, 14], "x": 14, "y": 0},
+                {"label": "1,0", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1},
+                {"label": "1,1", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "1,2", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "1,3", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "1,4", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "1,5", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "1,6", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "1,7", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "1,8", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "1,9", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "1,10", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "1,11", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "1,12", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "1,13", "matrix": [1, 13], "w": 1.5, "x": 13.5, "y": 1},
+                {"label": "2,0", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2},
+                {"label": "2,1", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "2,2", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "2,3", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "2,4", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "2,5", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "2,6", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "2,7", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "2,8", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "2,9", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": "2,10", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "2,11", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "2,12", "matrix": [2, 12], "x": 12.75, "y": 2},
+                {"label": "2,13", "matrix": [2, 13], "w": 1.25, "x": 13.75, "y": 2},
+                {"label": "3,0", "matrix": [3, 0], "w": 1.25, "x": 0, "y": 3},
+                {"label": "3,1", "matrix": [3, 1], "x": 1.25, "y": 3},
+                {"label": "3,2", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "3,3", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "3,4", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "3,5", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "3,6", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "3,7", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "3,8", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": "3,9", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": "3,10", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "3,11", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "3,13", "matrix": [3, 13], "w": 1.75, "x": 12.25, "y": 3},
+                {"label": "3,14", "matrix": [3, 14], "x": 14, "y": 3},
+                {"label": "4,1", "matrix": [4, 1], "x": 1.5, "y": 4},
+                {"label": "4,2", "matrix": [4, 2], "w": 1.5, "x": 2.5, "y": 4},
+                {"label": "4,6", "matrix": [4, 6], "w": 6, "x": 4, "y": 4},
+                {"label": "4,9", "matrix": [4, 9], "w": 1.5, "x": 10, "y": 4},
+                {"label": "4,10", "matrix": [4, 10], "x": 11.5, "y": 4}
+            ]
+        },
+        "LAYOUT_60_hhkb": {
+            "layout": [
+                {"label": "0,0", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "0,1", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "0,2", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "0,3", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "0,4", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "0,5", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "0,6", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "0,7", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "0,8", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "0,9", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "0,10", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "0,11", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "0,12", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "0,13", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "0,14", "matrix": [0, 14], "x": 14, "y": 0},
+                {"label": "1,0", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1},
+                {"label": "1,1", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "1,2", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "1,3", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "1,4", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "1,5", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "1,6", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "1,7", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "1,8", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "1,9", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "1,10", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "1,11", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "1,12", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "1,13", "matrix": [1, 13], "w": 1.5, "x": 13.5, "y": 1},
+                {"label": "2,0", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2},
+                {"label": "2,1", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "2,2", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "2,3", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "2,4", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "2,5", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "2,6", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "2,7", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "2,8", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "2,9", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": "2,10", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "2,11", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "2,13", "matrix": [2, 13], "w": 2.25, "x": 12.75, "y": 2},
+                {"label": "3,0", "matrix": [3, 0], "w": 2.25, "x": 0, "y": 3},
+                {"label": "3,2", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "3,3", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "3,4", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "3,5", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "3,6", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "3,7", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "3,8", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": "3,9", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": "3,10", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "3,11", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "3,13", "matrix": [3, 13], "w": 1.75, "x": 12.25, "y": 3},
+                {"label": "3,14", "matrix": [3, 14], "x": 14, "y": 3},
+                {"label": "4,1", "matrix": [4, 1], "x": 1.5, "y": 4},
+                {"label": "4,2", "matrix": [4, 2], "w": 1.5, "x": 2.5, "y": 4},
+                {"label": "4,6", "matrix": [4, 6], "w": 6, "x": 4, "y": 4},
+                {"label": "4,9", "matrix": [4, 9], "w": 1.5, "x": 10, "y": 4},
+                {"label": "4,10", "matrix": [4, 10], "x": 11.5, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/cipulot/ec_prox/ansi_iso/rules.mk b/keyboards/cipulot/ec_prox/ansi_iso/rules.mk
index ab6c37cad43..318e0215ce9 100644
--- a/keyboards/cipulot/ec_prox/ansi_iso/rules.mk
+++ b/keyboards/cipulot/ec_prox/ansi_iso/rules.mk
@@ -1,4 +1,5 @@
 CUSTOM_MATRIX = lite
 ANALOG_DRIVER_REQUIRED = yes
-SRC += keyboards/cipulot/common/matrix.c keyboards/cipulot/common/ec_board.c keyboards/cipulot/common/ec_switch_matrix.c
+VPATH += keyboards/cipulot/common
+SRC += matrix.c ec_board.c ec_switch_matrix.c
 OPT = 2
diff --git a/keyboards/cipulot/ec_prox/jis/config.h b/keyboards/cipulot/ec_prox/jis/config.h
index 6a686d74044..fd3c048bc38 100644
--- a/keyboards/cipulot/ec_prox/jis/config.h
+++ b/keyboards/cipulot/ec_prox/jis/config.h
@@ -64,9 +64,3 @@
 // #define DEBUG_MATRIX_SCAN_RATE
 
 #define EECONFIG_KB_DATA_SIZE 149
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/cipulot/ec_prox/jis/info.json b/keyboards/cipulot/ec_prox/jis/info.json
deleted file mode 100644
index 88067f9305e..00000000000
--- a/keyboards/cipulot/ec_prox/jis/info.json
+++ /dev/null
@@ -1,121 +0,0 @@
-{
-    "manufacturer": "Cipulot",
-    "keyboard_name": "EC Pro X JIS",
-    "maintainer": "Cipulot",
-    "bootloader": "stm32-dfu",
-    "build": {
-        "lto": true
-    },
-    "diode_direction": "COL2ROW",
-    "features": {
-        "bootmagic": false,
-        "console": true,
-        "extrakey": true,
-        "mousekey": true,
-        "nkro": true,
-        "rgblight": true
-    },
-    "processor": "STM32F401",
-    "rgblight": {
-        "led_count": 22,
-        "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
-        }
-    },
-    "ws2812": {
-        "pin": "B12"
-    },
-    "url": "https://www.github.com/Cipulot/EC-Pro-X",
-    "usb": {
-        "device_version": "0.0.1",
-        "pid": "0x6B99",
-        "shared_endpoint": {
-            "keyboard": true
-        },
-        "vid": "0x6369"
-    },
-    "layouts": {
-        "LAYOUT_jp": {
-            "layout": [
-                {"label": "0,0", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "0,1", "matrix": [0, 1], "x": 1, "y": 0},
-                {"label": "0,2", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "0,3", "matrix": [0, 3], "x": 3, "y": 0},
-                {"label": "0,4", "matrix": [0, 4], "x": 4, "y": 0},
-                {"label": "0,5", "matrix": [0, 5], "x": 5, "y": 0},
-                {"label": "0,6", "matrix": [0, 6], "x": 6, "y": 0},
-                {"label": "0,7", "matrix": [0, 7], "x": 7, "y": 0},
-                {"label": "0,8", "matrix": [0, 8], "x": 8, "y": 0},
-                {"label": "0,9", "matrix": [0, 9], "x": 9, "y": 0},
-                {"label": "0,10", "matrix": [0, 10], "x": 10, "y": 0},
-                {"label": "0,11", "matrix": [0, 11], "x": 11, "y": 0},
-                {"label": "0,12", "matrix": [0, 12], "x": 12, "y": 0},
-                {"label": "0,13", "matrix": [0, 13], "x": 13, "y": 0},
-                {"label": "1,13", "matrix": [1, 13], "x": 14, "y": 0},
-                {"label": "1,0", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1},
-                {"label": "1,1", "matrix": [1, 1], "x": 1.5, "y": 1},
-                {"label": "1,2", "matrix": [1, 2], "x": 2.5, "y": 1},
-                {"label": "1,3", "matrix": [1, 3], "x": 3.5, "y": 1},
-                {"label": "1,4", "matrix": [1, 4], "x": 4.5, "y": 1},
-                {"label": "1,5", "matrix": [1, 5], "x": 5.5, "y": 1},
-                {"label": "1,6", "matrix": [1, 6], "x": 6.5, "y": 1},
-                {"label": "1,7", "matrix": [1, 7], "x": 7.5, "y": 1},
-                {"label": "1,8", "matrix": [1, 8], "x": 8.5, "y": 1},
-                {"label": "1,9", "matrix": [1, 9], "x": 9.5, "y": 1},
-                {"label": "1,10", "matrix": [1, 10], "x": 10.5, "y": 1},
-                {"label": "1,11", "matrix": [1, 11], "x": 11.5, "y": 1},
-                {"label": "1,12", "matrix": [1, 12], "x": 12.5, "y": 1},
-                {"label": "2,13", "matrix": [2, 13], "w": 1.25, "h": 2, "x": 13.75, "y": 1},
-                {"label": "2,0", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2},
-                {"label": "2,1", "matrix": [2, 1], "x": 1.75, "y": 2},
-                {"label": "2,2", "matrix": [2, 2], "x": 2.75, "y": 2},
-                {"label": "2,3", "matrix": [2, 3], "x": 3.75, "y": 2},
-                {"label": "2,4", "matrix": [2, 4], "x": 4.75, "y": 2},
-                {"label": "2,5", "matrix": [2, 5], "x": 5.75, "y": 2},
-                {"label": "2,6", "matrix": [2, 6], "x": 6.75, "y": 2},
-                {"label": "2,7", "matrix": [2, 7], "x": 7.75, "y": 2},
-                {"label": "2,8", "matrix": [2, 8], "x": 8.75, "y": 2},
-                {"label": "2,9", "matrix": [2, 9], "x": 9.75, "y": 2},
-                {"label": "2,10", "matrix": [2, 10], "x": 10.75, "y": 2},
-                {"label": "2,11", "matrix": [2, 11], "x": 11.75, "y": 2},
-                {"label": "2,12", "matrix": [2, 12], "x": 12.75, "y": 2},
-                {"label": "3,0", "matrix": [3, 0], "w": 2, "x": 0, "y": 3},
-                {"label": "3,1", "matrix": [3, 1], "x": 2, "y": 3},
-                {"label": "3,2", "matrix": [3, 2], "x": 3, "y": 3},
-                {"label": "3,3", "matrix": [3, 3], "x": 4, "y": 3},
-                {"label": "3,4", "matrix": [3, 4], "x": 5, "y": 3},
-                {"label": "3,5", "matrix": [3, 5], "x": 6, "y": 3},
-                {"label": "3,6", "matrix": [3, 6], "x": 7, "y": 3},
-                {"label": "3,7", "matrix": [3, 7], "x": 8, "y": 3},
-                {"label": "3,8", "matrix": [3, 8], "x": 9, "y": 3},
-                {"label": "3,9", "matrix": [3, 9], "x": 10, "y": 3},
-                {"label": "3,10", "matrix": [3, 10], "x": 11, "y": 3},
-                {"label": "3,11", "matrix": [3, 11], "x": 12, "y": 3},
-                {"label": "3,12", "matrix": [3, 12], "x": 13, "y": 3},
-                {"label": "3,13", "matrix": [3, 13], "x": 14, "y": 3},
-                {"label": "4,0", "matrix": [4, 0], "x": 0, "y": 4},
-                {"label": "4,1", "matrix": [4, 1], "x": 1.25, "y": 4},
-                {"label": "4,2", "matrix": [4, 2], "x": 2.25, "y": 4},
-                {"label": "4,3", "matrix": [4, 3], "x": 3.25, "y": 4},
-                {"label": "4,4", "matrix": [4, 4], "x": 4.25, "y": 4},
-                {"label": "4,5", "matrix": [4, 5], "w": 2.5, "x": 5.25, "y": 4},
-                {"label": "4,7", "matrix": [4, 7], "x": 7.75, "y": 4},
-                {"label": "4,8", "matrix": [4, 8], "x": 8.75, "y": 4},
-                {"label": "4,9", "matrix": [4, 9], "x": 9.75, "y": 4},
-                {"label": "4,10", "matrix": [4, 10], "x": 10.75, "y": 4},
-                {"label": "4,11", "matrix": [4, 11], "x": 12, "y": 4},
-                {"label": "4,12", "matrix": [4, 12], "x": 13, "y": 4},
-                {"label": "4,13", "matrix": [4, 13], "x": 14, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/cipulot/ec_prox/jis/keyboard.json b/keyboards/cipulot/ec_prox/jis/keyboard.json
new file mode 100644
index 00000000000..4c92f8c6732
--- /dev/null
+++ b/keyboards/cipulot/ec_prox/jis/keyboard.json
@@ -0,0 +1,127 @@
+{
+    "manufacturer": "Cipulot",
+    "keyboard_name": "EC Pro X JIS",
+    "maintainer": "Cipulot",
+    "bootloader": "stm32-dfu",
+    "build": {
+        "lto": true
+    },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": false,
+        "console": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgblight": true
+    },
+    "processor": "STM32F401",
+    "rgblight": {
+        "led_count": 22,
+        "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
+        }
+    },
+    "ws2812": {
+        "pin": "B12"
+    },
+    "url": "https://www.github.com/Cipulot/EC-Pro-X",
+    "usb": {
+        "device_version": "0.0.1",
+        "pid": "0x6B99",
+        "shared_endpoint": {
+            "keyboard": true
+        },
+        "vid": "0x6369"
+    },
+    "layouts": {
+        "LAYOUT_jp": {
+            "layout": [
+                {"label": "0,0", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "0,1", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "0,2", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "0,3", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "0,4", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "0,5", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "0,6", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "0,7", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "0,8", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "0,9", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "0,10", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "0,11", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "0,12", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "0,13", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "1,13", "matrix": [1, 13], "x": 14, "y": 0},
+                {"label": "1,0", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1},
+                {"label": "1,1", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "1,2", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "1,3", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "1,4", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "1,5", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "1,6", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "1,7", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "1,8", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "1,9", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "1,10", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "1,11", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "1,12", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "2,13", "matrix": [2, 13], "w": 1.25, "h": 2, "x": 13.75, "y": 1},
+                {"label": "2,0", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2},
+                {"label": "2,1", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "2,2", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "2,3", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "2,4", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "2,5", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "2,6", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "2,7", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "2,8", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "2,9", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": "2,10", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "2,11", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "2,12", "matrix": [2, 12], "x": 12.75, "y": 2},
+                {"label": "3,0", "matrix": [3, 0], "w": 2, "x": 0, "y": 3},
+                {"label": "3,1", "matrix": [3, 1], "x": 2, "y": 3},
+                {"label": "3,2", "matrix": [3, 2], "x": 3, "y": 3},
+                {"label": "3,3", "matrix": [3, 3], "x": 4, "y": 3},
+                {"label": "3,4", "matrix": [3, 4], "x": 5, "y": 3},
+                {"label": "3,5", "matrix": [3, 5], "x": 6, "y": 3},
+                {"label": "3,6", "matrix": [3, 6], "x": 7, "y": 3},
+                {"label": "3,7", "matrix": [3, 7], "x": 8, "y": 3},
+                {"label": "3,8", "matrix": [3, 8], "x": 9, "y": 3},
+                {"label": "3,9", "matrix": [3, 9], "x": 10, "y": 3},
+                {"label": "3,10", "matrix": [3, 10], "x": 11, "y": 3},
+                {"label": "3,11", "matrix": [3, 11], "x": 12, "y": 3},
+                {"label": "3,12", "matrix": [3, 12], "x": 13, "y": 3},
+                {"label": "3,13", "matrix": [3, 13], "x": 14, "y": 3},
+                {"label": "4,0", "matrix": [4, 0], "x": 0, "y": 4},
+                {"label": "4,1", "matrix": [4, 1], "x": 1.25, "y": 4},
+                {"label": "4,2", "matrix": [4, 2], "x": 2.25, "y": 4},
+                {"label": "4,3", "matrix": [4, 3], "x": 3.25, "y": 4},
+                {"label": "4,4", "matrix": [4, 4], "x": 4.25, "y": 4},
+                {"label": "4,5", "matrix": [4, 5], "w": 2.5, "x": 5.25, "y": 4},
+                {"label": "4,7", "matrix": [4, 7], "x": 7.75, "y": 4},
+                {"label": "4,8", "matrix": [4, 8], "x": 8.75, "y": 4},
+                {"label": "4,9", "matrix": [4, 9], "x": 9.75, "y": 4},
+                {"label": "4,10", "matrix": [4, 10], "x": 10.75, "y": 4},
+                {"label": "4,11", "matrix": [4, 11], "x": 12, "y": 4},
+                {"label": "4,12", "matrix": [4, 12], "x": 13, "y": 4},
+                {"label": "4,13", "matrix": [4, 13], "x": 14, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/cipulot/ec_prox/jis/rules.mk b/keyboards/cipulot/ec_prox/jis/rules.mk
index ab6c37cad43..318e0215ce9 100644
--- a/keyboards/cipulot/ec_prox/jis/rules.mk
+++ b/keyboards/cipulot/ec_prox/jis/rules.mk
@@ -1,4 +1,5 @@
 CUSTOM_MATRIX = lite
 ANALOG_DRIVER_REQUIRED = yes
-SRC += keyboards/cipulot/common/matrix.c keyboards/cipulot/common/ec_board.c keyboards/cipulot/common/ec_switch_matrix.c
+VPATH += keyboards/cipulot/common
+SRC += matrix.c ec_board.c ec_switch_matrix.c
 OPT = 2
diff --git a/keyboards/cipulot/ec_theca/config.h b/keyboards/cipulot/ec_theca/config.h
index 4b834fdff68..d9fea559675 100644
--- a/keyboards/cipulot/ec_theca/config.h
+++ b/keyboards/cipulot/ec_theca/config.h
@@ -63,9 +63,3 @@
 // #define DEBUG_MATRIX_SCAN_RATE
 #define DYNAMIC_KEYMAP_LAYER_COUNT 3
 #define EECONFIG_KB_DATA_SIZE 201
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/cipulot/ec_theca/info.json b/keyboards/cipulot/ec_theca/info.json
deleted file mode 100644
index fbd7d7ec471..00000000000
--- a/keyboards/cipulot/ec_theca/info.json
+++ /dev/null
@@ -1,305 +0,0 @@
-{
-    "manufacturer": "Cipulot",
-    "keyboard_name": "EC Theca",
-    "maintainer": "Cipulot",
-    "bootloader": "stm32-dfu",
-    "build": {
-        "lto": true
-    },
-    "diode_direction": "COL2ROW",
-    "features": {
-        "bootmagic": false,
-        "console": true,
-        "extrakey": true,
-        "mousekey": true,
-        "nkro": true
-    },
-    "processor": "STM32F401",
-    "usb": {
-        "device_version": "0.0.1",
-        "pid": "0x6B7E",
-        "shared_endpoint": {
-            "keyboard": true
-        },
-        "vid": "0x6369"
-    },
-    "layout_aliases": {
-        "LAYOUT_all": "LAYOUT_tkl_ansi",
-        "LAYOUT_tkl_ansi_tsangan_wkl": "LAYOUT_tkl_ansi_wkl"
-    },
-    "community_layouts": [
-        "tkl_ansi",
-        "tkl_ansi_tsangan"
-    ],
-    "layouts": {
-        "LAYOUT_tkl_ansi": {
-            "layout": [
-                { "label": "0,0", "matrix": [0, 0], "x": 0, "y": 0 },
-                { "label": "0,1", "matrix": [0, 1], "x": 2, "y": 0 },
-                { "label": "0,2", "matrix": [0, 2], "x": 3, "y": 0 },
-                { "label": "0,3", "matrix": [0, 3], "x": 4, "y": 0 },
-                { "label": "0,4", "matrix": [0, 4], "x": 5, "y": 0 },
-                { "label": "0,5", "matrix": [0, 5], "x": 6.5, "y": 0 },
-                { "label": "0,6", "matrix": [0, 6], "x": 7.5, "y": 0 },
-                { "label": "0,7", "matrix": [0, 7], "x": 8.5, "y": 0 },
-                { "label": "0,8", "matrix": [0, 8], "x": 9.5, "y": 0 },
-                { "label": "0,9", "matrix": [0, 9], "x": 11, "y": 0 },
-                { "label": "0,10", "matrix": [0, 10], "x": 12, "y": 0 },
-                { "label": "0,11", "matrix": [0, 11], "x": 13, "y": 0 },
-                { "label": "0,12", "matrix": [0, 12], "x": 14, "y": 0 },
-                { "label": "0,13", "matrix": [0, 13], "x": 15.25, "y": 0 },
-                { "label": "0,14", "matrix": [0, 14], "x": 16.25, "y": 0 },
-                { "label": "0,15", "matrix": [0, 15], "x": 17.25, "y": 0 },
-                { "label": "1,0", "matrix": [1, 0], "x": 0, "y": 1.25 },
-                { "label": "1,1", "matrix": [1, 1], "x": 1, "y": 1.25 },
-                { "label": "1,2", "matrix": [1, 2], "x": 2, "y": 1.25 },
-                { "label": "1,3", "matrix": [1, 3], "x": 3, "y": 1.25 },
-                { "label": "1,4", "matrix": [1, 4], "x": 4, "y": 1.25 },
-                { "label": "1,5", "matrix": [1, 5], "x": 5, "y": 1.25 },
-                { "label": "1,6", "matrix": [1, 6], "x": 6, "y": 1.25 },
-                { "label": "1,7", "matrix": [1, 7], "x": 7, "y": 1.25 },
-                { "label": "1,8", "matrix": [1, 8], "x": 8, "y": 1.25 },
-                { "label": "1,9", "matrix": [1, 9], "x": 9, "y": 1.25 },
-                { "label": "1,10", "matrix": [1, 10], "x": 10, "y": 1.25 },
-                { "label": "1,11", "matrix": [1, 11], "x": 11, "y": 1.25 },
-                { "label": "1,12", "matrix": [1, 12], "x": 12, "y": 1.25 },
-                { "label": "1,13", "matrix": [1, 13], "w": 2, "x": 13, "y": 1.25 },
-                { "label": "1,14", "matrix": [1, 14], "x": 15.25, "y": 1.25 },
-                { "label": "1,15", "matrix": [1, 15], "x": 16.25, "y": 1.25 },
-                { "label": "2,15", "matrix": [2, 15], "x": 17.25, "y": 1.25 },
-                { "label": "2,0", "matrix": [2, 0], "w": 1.5, "x": 0, "y": 2.25 },
-                { "label": "2,1", "matrix": [2, 1], "x": 1.5, "y": 2.25 },
-                { "label": "2,2", "matrix": [2, 2], "x": 2.5, "y": 2.25 },
-                { "label": "2,3", "matrix": [2, 3], "x": 3.5, "y": 2.25 },
-                { "label": "2,4", "matrix": [2, 4], "x": 4.5, "y": 2.25 },
-                { "label": "2,5", "matrix": [2, 5], "x": 5.5, "y": 2.25 },
-                { "label": "2,6", "matrix": [2, 6], "x": 6.5, "y": 2.25 },
-                { "label": "2,7", "matrix": [2, 7], "x": 7.5, "y": 2.25 },
-                { "label": "2,8", "matrix": [2, 8], "x": 8.5, "y": 2.25 },
-                { "label": "2,9", "matrix": [2, 9], "x": 9.5, "y": 2.25 },
-                { "label": "2,10", "matrix": [2, 10], "x": 10.5, "y": 2.25 },
-                { "label": "2,11", "matrix": [2, 11], "x": 11.5, "y": 2.25 },
-                { "label": "2,12", "matrix": [2, 12], "x": 12.5, "y": 2.25 },
-                { "label": "2,13", "matrix": [2, 13], "w": 1.5, "x": 13.5, "y": 2.25 },
-                { "label": "2,14", "matrix": [2, 14], "x": 15.25, "y": 2.25 },
-                { "label": "3,14", "matrix": [3, 14], "x": 16.25, "y": 2.25 },
-                { "label": "3,15", "matrix": [3, 15], "x": 17.25, "y": 2.25 },
-                { "label": "3,0", "matrix": [3, 0], "w": 1.75, "x": 0, "y": 3.25 },
-                { "label": "3,1", "matrix": [3, 1], "x": 1.75, "y": 3.25 },
-                { "label": "3,2", "matrix": [3, 2], "x": 2.75, "y": 3.25 },
-                { "label": "3,3", "matrix": [3, 3], "x": 3.75, "y": 3.25 },
-                { "label": "3,4", "matrix": [3, 4], "x": 4.75, "y": 3.25 },
-                { "label": "3,5", "matrix": [3, 5], "x": 5.75, "y": 3.25 },
-                { "label": "3,6", "matrix": [3, 6], "x": 6.75, "y": 3.25 },
-                { "label": "3,7", "matrix": [3, 7], "x": 7.75, "y": 3.25 },
-                { "label": "3,8", "matrix": [3, 8], "x": 8.75, "y": 3.25 },
-                { "label": "3,9", "matrix": [3, 9], "x": 9.75, "y": 3.25 },
-                { "label": "3,10", "matrix": [3, 10], "x": 10.75, "y": 3.25 },
-                { "label": "3,11", "matrix": [3, 11], "x": 11.75, "y": 3.25 },
-                { "label": "3,13", "matrix": [3, 13], "w": 2.25, "x": 12.75, "y": 3.25 },
-                { "label": "4,0", "matrix": [4, 0], "w": 2.25, "x": 0, "y": 4.25 },
-                { "label": "4,1", "matrix": [4, 1], "x": 2.25, "y": 4.25 },
-                { "label": "4,2", "matrix": [4, 2], "x": 3.25, "y": 4.25 },
-                { "label": "4,3", "matrix": [4, 3], "x": 4.25, "y": 4.25 },
-                { "label": "4,4", "matrix": [4, 4], "x": 5.25, "y": 4.25 },
-                { "label": "4,5", "matrix": [4, 5], "x": 6.25, "y": 4.25 },
-                { "label": "4,6", "matrix": [4, 6], "x": 7.25, "y": 4.25 },
-                { "label": "4,7", "matrix": [4, 7], "x": 8.25, "y": 4.25 },
-                { "label": "4,8", "matrix": [4, 8], "x": 9.25, "y": 4.25 },
-                { "label": "4,9", "matrix": [4, 9], "x": 10.25, "y": 4.25 },
-                { "label": "4,10", "matrix": [4, 10], "x": 11.25, "y": 4.25 },
-                { "label": "4,13", "matrix": [4, 13], "w": 2.75, "x": 12.25, "y": 4.25 },
-                { "label": "4,14", "matrix": [4, 14], "x": 16.25, "y": 4.25 },
-                { "label": "5,0", "matrix": [5, 0], "w": 1.25, "x": 0, "y": 5.25 },
-                { "label": "5,1", "matrix": [5, 1], "w": 1.25, "x": 1.25, "y": 5.25 },
-                { "label": "5,2", "matrix": [5, 2], "w": 1.25, "x": 2.5, "y": 5.25 },
-                { "label": "5,5", "matrix": [5, 5], "w": 6.25, "x": 3.75, "y": 5.25 },
-                { "label": "5,10", "matrix": [5, 10], "w": 1.25, "x": 10, "y": 5.25 },
-                { "label": "5,11", "matrix": [5, 11], "w": 1.25, "x": 11.25, "y": 5.25 },
-                { "label": "5,12", "matrix": [5, 12], "w": 1.25, "x": 12.5, "y": 5.25 },
-                { "label": "5,13", "matrix": [5, 13], "w": 1.25, "x": 13.75, "y": 5.25 },
-                { "label": "5,14", "matrix": [5, 14], "x": 15.25, "y": 5.25 },
-                { "label": "5,15", "matrix": [5, 15], "x": 16.25, "y": 5.25 },
-                { "label": "4,15", "matrix": [4, 15], "x": 17.25, "y": 5.25 }
-            ]
-        },
-        "LAYOUT_tkl_ansi_tsangan": {
-            "layout": [
-                { "label": "0,0", "matrix": [0, 0], "x": 0, "y": 0 },
-                { "label": "0,1", "matrix": [0, 1], "x": 2, "y": 0 },
-                { "label": "0,2", "matrix": [0, 2], "x": 3, "y": 0 },
-                { "label": "0,3", "matrix": [0, 3], "x": 4, "y": 0 },
-                { "label": "0,4", "matrix": [0, 4], "x": 5, "y": 0 },
-                { "label": "0,5", "matrix": [0, 5], "x": 6.5, "y": 0 },
-                { "label": "0,6", "matrix": [0, 6], "x": 7.5, "y": 0 },
-                { "label": "0,7", "matrix": [0, 7], "x": 8.5, "y": 0 },
-                { "label": "0,8", "matrix": [0, 8], "x": 9.5, "y": 0 },
-                { "label": "0,9", "matrix": [0, 9], "x": 11, "y": 0 },
-                { "label": "0,10", "matrix": [0, 10], "x": 12, "y": 0 },
-                { "label": "0,11", "matrix": [0, 11], "x": 13, "y": 0 },
-                { "label": "0,12", "matrix": [0, 12], "x": 14, "y": 0 },
-                { "label": "0,13", "matrix": [0, 13], "x": 15.25, "y": 0 },
-                { "label": "0,14", "matrix": [0, 14], "x": 16.25, "y": 0 },
-                { "label": "0,15", "matrix": [0, 15], "x": 17.25, "y": 0 },
-                { "label": "1,0", "matrix": [1, 0], "x": 0, "y": 1.25 },
-                { "label": "1,1", "matrix": [1, 1], "x": 1, "y": 1.25 },
-                { "label": "1,2", "matrix": [1, 2], "x": 2, "y": 1.25 },
-                { "label": "1,3", "matrix": [1, 3], "x": 3, "y": 1.25 },
-                { "label": "1,4", "matrix": [1, 4], "x": 4, "y": 1.25 },
-                { "label": "1,5", "matrix": [1, 5], "x": 5, "y": 1.25 },
-                { "label": "1,6", "matrix": [1, 6], "x": 6, "y": 1.25 },
-                { "label": "1,7", "matrix": [1, 7], "x": 7, "y": 1.25 },
-                { "label": "1,8", "matrix": [1, 8], "x": 8, "y": 1.25 },
-                { "label": "1,9", "matrix": [1, 9], "x": 9, "y": 1.25 },
-                { "label": "1,10", "matrix": [1, 10], "x": 10, "y": 1.25 },
-                { "label": "1,11", "matrix": [1, 11], "x": 11, "y": 1.25 },
-                { "label": "1,12", "matrix": [1, 12], "x": 12, "y": 1.25 },
-                { "label": "1,13", "matrix": [1, 13], "w": 2, "x": 13, "y": 1.25 },
-                { "label": "1,14", "matrix": [1, 14], "x": 15.25, "y": 1.25 },
-                { "label": "1,15", "matrix": [1, 15], "x": 16.25, "y": 1.25 },
-                { "label": "2,15", "matrix": [2, 15], "x": 17.25, "y": 1.25 },
-                { "label": "2,0", "matrix": [2, 0], "w": 1.5, "x": 0, "y": 2.25 },
-                { "label": "2,1", "matrix": [2, 1], "x": 1.5, "y": 2.25 },
-                { "label": "2,2", "matrix": [2, 2], "x": 2.5, "y": 2.25 },
-                { "label": "2,3", "matrix": [2, 3], "x": 3.5, "y": 2.25 },
-                { "label": "2,4", "matrix": [2, 4], "x": 4.5, "y": 2.25 },
-                { "label": "2,5", "matrix": [2, 5], "x": 5.5, "y": 2.25 },
-                { "label": "2,6", "matrix": [2, 6], "x": 6.5, "y": 2.25 },
-                { "label": "2,7", "matrix": [2, 7], "x": 7.5, "y": 2.25 },
-                { "label": "2,8", "matrix": [2, 8], "x": 8.5, "y": 2.25 },
-                { "label": "2,9", "matrix": [2, 9], "x": 9.5, "y": 2.25 },
-                { "label": "2,10", "matrix": [2, 10], "x": 10.5, "y": 2.25 },
-                { "label": "2,11", "matrix": [2, 11], "x": 11.5, "y": 2.25 },
-                { "label": "2,12", "matrix": [2, 12], "x": 12.5, "y": 2.25 },
-                { "label": "2,13", "matrix": [2, 13], "w": 1.5, "x": 13.5, "y": 2.25 },
-                { "label": "2,14", "matrix": [2, 14], "x": 15.25, "y": 2.25 },
-                { "label": "3,14", "matrix": [3, 14], "x": 16.25, "y": 2.25 },
-                { "label": "3,15", "matrix": [3, 15], "x": 17.25, "y": 2.25 },
-                { "label": "3,0", "matrix": [3, 0], "w": 1.75, "x": 0, "y": 3.25 },
-                { "label": "3,1", "matrix": [3, 1], "x": 1.75, "y": 3.25 },
-                { "label": "3,2", "matrix": [3, 2], "x": 2.75, "y": 3.25 },
-                { "label": "3,3", "matrix": [3, 3], "x": 3.75, "y": 3.25 },
-                { "label": "3,4", "matrix": [3, 4], "x": 4.75, "y": 3.25 },
-                { "label": "3,5", "matrix": [3, 5], "x": 5.75, "y": 3.25 },
-                { "label": "3,6", "matrix": [3, 6], "x": 6.75, "y": 3.25 },
-                { "label": "3,7", "matrix": [3, 7], "x": 7.75, "y": 3.25 },
-                { "label": "3,8", "matrix": [3, 8], "x": 8.75, "y": 3.25 },
-                { "label": "3,9", "matrix": [3, 9], "x": 9.75, "y": 3.25 },
-                { "label": "3,10", "matrix": [3, 10], "x": 10.75, "y": 3.25 },
-                { "label": "3,11", "matrix": [3, 11], "x": 11.75, "y": 3.25 },
-                { "label": "3,13", "matrix": [3, 13], "w": 2.25, "x": 12.75, "y": 3.25 },
-                { "label": "4,0", "matrix": [4, 0], "w": 2.25, "x": 0, "y": 4.25 },
-                { "label": "4,1", "matrix": [4, 1], "x": 2.25, "y": 4.25 },
-                { "label": "4,2", "matrix": [4, 2], "x": 3.25, "y": 4.25 },
-                { "label": "4,3", "matrix": [4, 3], "x": 4.25, "y": 4.25 },
-                { "label": "4,4", "matrix": [4, 4], "x": 5.25, "y": 4.25 },
-                { "label": "4,5", "matrix": [4, 5], "x": 6.25, "y": 4.25 },
-                { "label": "4,6", "matrix": [4, 6], "x": 7.25, "y": 4.25 },
-                { "label": "4,7", "matrix": [4, 7], "x": 8.25, "y": 4.25 },
-                { "label": "4,8", "matrix": [4, 8], "x": 9.25, "y": 4.25 },
-                { "label": "4,9", "matrix": [4, 9], "x": 10.25, "y": 4.25 },
-                { "label": "4,10", "matrix": [4, 10], "x": 11.25, "y": 4.25 },
-                { "label": "4,13", "matrix": [4, 13], "w": 2.75, "x": 12.25, "y": 4.25 },
-                { "label": "4,14", "matrix": [4, 14], "x": 16.25, "y": 4.25 },
-                { "label": "5,0", "matrix": [5, 0], "w": 1.5, "x": 0, "y": 5.25 },
-                { "label": "5,1", "matrix": [5, 1], "x": 1.5, "y": 5.25 },
-                { "label": "5,2", "matrix": [5, 2], "w": 1.5, "x": 2.5, "y": 5.25 },
-                { "label": "5,5", "matrix": [5, 5], "w": 7, "x": 4, "y": 5.25 },
-                { "label": "5,11", "matrix": [5, 11], "w": 1.5, "x": 11, "y": 5.25 },
-                { "label": "5,12", "matrix": [5, 12], "x": 12.5, "y": 5.25 },
-                { "label": "5,13", "matrix": [5, 13], "w": 1.5, "x": 13.5, "y": 5.25 },
-                { "label": "5,14", "matrix": [5, 14], "x": 15.25, "y": 5.25 },
-                { "label": "5,15", "matrix": [5, 15], "x": 16.25, "y": 5.25 },
-                { "label": "4,15", "matrix": [4, 15], "x": 17.25, "y": 5.25 }
-            ]
-        },
-        "LAYOUT_tkl_ansi_wkl": {
-            "layout": [
-                { "label": "0,0", "matrix": [0, 0], "x": 0, "y": 0 },
-                { "label": "0,1", "matrix": [0, 1], "x": 2, "y": 0 },
-                { "label": "0,2", "matrix": [0, 2], "x": 3, "y": 0 },
-                { "label": "0,3", "matrix": [0, 3], "x": 4, "y": 0 },
-                { "label": "0,4", "matrix": [0, 4], "x": 5, "y": 0 },
-                { "label": "0,5", "matrix": [0, 5], "x": 6.5, "y": 0 },
-                { "label": "0,6", "matrix": [0, 6], "x": 7.5, "y": 0 },
-                { "label": "0,7", "matrix": [0, 7], "x": 8.5, "y": 0 },
-                { "label": "0,8", "matrix": [0, 8], "x": 9.5, "y": 0 },
-                { "label": "0,9", "matrix": [0, 9], "x": 11, "y": 0 },
-                { "label": "0,10", "matrix": [0, 10], "x": 12, "y": 0 },
-                { "label": "0,11", "matrix": [0, 11], "x": 13, "y": 0 },
-                { "label": "0,12", "matrix": [0, 12], "x": 14, "y": 0 },
-                { "label": "0,13", "matrix": [0, 13], "x": 15.25, "y": 0 },
-                { "label": "0,14", "matrix": [0, 14], "x": 16.25, "y": 0 },
-                { "label": "0,15", "matrix": [0, 15], "x": 17.25, "y": 0 },
-                { "label": "1,0", "matrix": [1, 0], "x": 0, "y": 1.25 },
-                { "label": "1,1", "matrix": [1, 1], "x": 1, "y": 1.25 },
-                { "label": "1,2", "matrix": [1, 2], "x": 2, "y": 1.25 },
-                { "label": "1,3", "matrix": [1, 3], "x": 3, "y": 1.25 },
-                { "label": "1,4", "matrix": [1, 4], "x": 4, "y": 1.25 },
-                { "label": "1,5", "matrix": [1, 5], "x": 5, "y": 1.25 },
-                { "label": "1,6", "matrix": [1, 6], "x": 6, "y": 1.25 },
-                { "label": "1,7", "matrix": [1, 7], "x": 7, "y": 1.25 },
-                { "label": "1,8", "matrix": [1, 8], "x": 8, "y": 1.25 },
-                { "label": "1,9", "matrix": [1, 9], "x": 9, "y": 1.25 },
-                { "label": "1,10", "matrix": [1, 10], "x": 10, "y": 1.25 },
-                { "label": "1,11", "matrix": [1, 11], "x": 11, "y": 1.25 },
-                { "label": "1,12", "matrix": [1, 12], "x": 12, "y": 1.25 },
-                { "label": "1,13", "matrix": [1, 13], "w": 2, "x": 13, "y": 1.25 },
-                { "label": "1,14", "matrix": [1, 14], "x": 15.25, "y": 1.25 },
-                { "label": "1,15", "matrix": [1, 15], "x": 16.25, "y": 1.25 },
-                { "label": "2,15", "matrix": [2, 15], "x": 17.25, "y": 1.25 },
-                { "label": "2,0", "matrix": [2, 0], "w": 1.5, "x": 0, "y": 2.25 },
-                { "label": "2,1", "matrix": [2, 1], "x": 1.5, "y": 2.25 },
-                { "label": "2,2", "matrix": [2, 2], "x": 2.5, "y": 2.25 },
-                { "label": "2,3", "matrix": [2, 3], "x": 3.5, "y": 2.25 },
-                { "label": "2,4", "matrix": [2, 4], "x": 4.5, "y": 2.25 },
-                { "label": "2,5", "matrix": [2, 5], "x": 5.5, "y": 2.25 },
-                { "label": "2,6", "matrix": [2, 6], "x": 6.5, "y": 2.25 },
-                { "label": "2,7", "matrix": [2, 7], "x": 7.5, "y": 2.25 },
-                { "label": "2,8", "matrix": [2, 8], "x": 8.5, "y": 2.25 },
-                { "label": "2,9", "matrix": [2, 9], "x": 9.5, "y": 2.25 },
-                { "label": "2,10", "matrix": [2, 10], "x": 10.5, "y": 2.25 },
-                { "label": "2,11", "matrix": [2, 11], "x": 11.5, "y": 2.25 },
-                { "label": "2,12", "matrix": [2, 12], "x": 12.5, "y": 2.25 },
-                { "label": "2,13", "matrix": [2, 13], "w": 1.5, "x": 13.5, "y": 2.25 },
-                { "label": "2,14", "matrix": [2, 14], "x": 15.25, "y": 2.25 },
-                { "label": "3,14", "matrix": [3, 14], "x": 16.25, "y": 2.25 },
-                { "label": "3,15", "matrix": [3, 15], "x": 17.25, "y": 2.25 },
-                { "label": "3,0", "matrix": [3, 0], "w": 1.75, "x": 0, "y": 3.25 },
-                { "label": "3,1", "matrix": [3, 1], "x": 1.75, "y": 3.25 },
-                { "label": "3,2", "matrix": [3, 2], "x": 2.75, "y": 3.25 },
-                { "label": "3,3", "matrix": [3, 3], "x": 3.75, "y": 3.25 },
-                { "label": "3,4", "matrix": [3, 4], "x": 4.75, "y": 3.25 },
-                { "label": "3,5", "matrix": [3, 5], "x": 5.75, "y": 3.25 },
-                { "label": "3,6", "matrix": [3, 6], "x": 6.75, "y": 3.25 },
-                { "label": "3,7", "matrix": [3, 7], "x": 7.75, "y": 3.25 },
-                { "label": "3,8", "matrix": [3, 8], "x": 8.75, "y": 3.25 },
-                { "label": "3,9", "matrix": [3, 9], "x": 9.75, "y": 3.25 },
-                { "label": "3,10", "matrix": [3, 10], "x": 10.75, "y": 3.25 },
-                { "label": "3,11", "matrix": [3, 11], "x": 11.75, "y": 3.25 },
-                { "label": "3,13", "matrix": [3, 13], "w": 2.25, "x": 12.75, "y": 3.25 },
-                { "label": "4,0", "matrix": [4, 0], "w": 2.25, "x": 0, "y": 4.25 },
-                { "label": "4,1", "matrix": [4, 1], "x": 2.25, "y": 4.25 },
-                { "label": "4,2", "matrix": [4, 2], "x": 3.25, "y": 4.25 },
-                { "label": "4,3", "matrix": [4, 3], "x": 4.25, "y": 4.25 },
-                { "label": "4,4", "matrix": [4, 4], "x": 5.25, "y": 4.25 },
-                { "label": "4,5", "matrix": [4, 5], "x": 6.25, "y": 4.25 },
-                { "label": "4,6", "matrix": [4, 6], "x": 7.25, "y": 4.25 },
-                { "label": "4,7", "matrix": [4, 7], "x": 8.25, "y": 4.25 },
-                { "label": "4,8", "matrix": [4, 8], "x": 9.25, "y": 4.25 },
-                { "label": "4,9", "matrix": [4, 9], "x": 10.25, "y": 4.25 },
-                { "label": "4,10", "matrix": [4, 10], "x": 11.25, "y": 4.25 },
-                { "label": "4,13", "matrix": [4, 13], "w": 2.75, "x": 12.25, "y": 4.25 },
-                { "label": "4,14", "matrix": [4, 14], "x": 16.25, "y": 4.25 },
-                { "label": "5,0", "matrix": [5, 0], "w": 1.5, "x": 0, "y": 5.25 },
-                { "label": "5,2", "matrix": [5, 2], "w": 1.5, "x": 2.5, "y": 5.25 },
-                { "label": "5,5", "matrix": [5, 5], "w": 7, "x": 4, "y": 5.25 },
-                { "label": "5,11", "matrix": [5, 11], "w": 1.5, "x": 11, "y": 5.25 },
-                { "label": "5,13", "matrix": [5, 13], "w": 1.5, "x": 13.5, "y": 5.25 },
-                { "label": "5,14", "matrix": [5, 14], "x": 15.25, "y": 5.25 },
-                { "label": "5,15", "matrix": [5, 15], "x": 16.25, "y": 5.25 },
-                { "label": "4,15", "matrix": [4, 15], "x": 17.25, "y": 5.25 }
-            ]
-        }
-    }
-}
diff --git a/keyboards/cipulot/ec_theca/keyboard.json b/keyboards/cipulot/ec_theca/keyboard.json
new file mode 100644
index 00000000000..a438e401806
--- /dev/null
+++ b/keyboards/cipulot/ec_theca/keyboard.json
@@ -0,0 +1,307 @@
+{
+    "manufacturer": "Cipulot",
+    "keyboard_name": "EC Theca",
+    "maintainer": "Cipulot",
+    "bootloader": "stm32-dfu",
+    "build": {
+        "lto": true
+    },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": false,
+        "console": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "processor": "STM32F401",
+    "usb": {
+        "device_version": "0.0.1",
+        "pid": "0x6B7E",
+        "shared_endpoint": {
+            "keyboard": true
+        },
+        "vid": "0x6369"
+    },
+    "layout_aliases": {
+        "LAYOUT_all": "LAYOUT_tkl_ansi",
+        "LAYOUT_tkl_ansi_tsangan_wkl": "LAYOUT_tkl_ansi_wkl"
+    },
+    "layouts": {
+        "LAYOUT_tkl_ansi": {
+            "layout": [
+                { "label": "0,0", "matrix": [0, 0], "x": 0, "y": 0 },
+                { "label": "0,1", "matrix": [0, 1], "x": 2, "y": 0 },
+                { "label": "0,2", "matrix": [0, 2], "x": 3, "y": 0 },
+                { "label": "0,3", "matrix": [0, 3], "x": 4, "y": 0 },
+                { "label": "0,4", "matrix": [0, 4], "x": 5, "y": 0 },
+                { "label": "0,5", "matrix": [0, 5], "x": 6.5, "y": 0 },
+                { "label": "0,6", "matrix": [0, 6], "x": 7.5, "y": 0 },
+                { "label": "0,7", "matrix": [0, 7], "x": 8.5, "y": 0 },
+                { "label": "0,8", "matrix": [0, 8], "x": 9.5, "y": 0 },
+                { "label": "0,9", "matrix": [0, 9], "x": 11, "y": 0 },
+                { "label": "0,10", "matrix": [0, 10], "x": 12, "y": 0 },
+                { "label": "0,11", "matrix": [0, 11], "x": 13, "y": 0 },
+                { "label": "0,12", "matrix": [0, 12], "x": 14, "y": 0 },
+                { "label": "0,13", "matrix": [0, 13], "x": 15.25, "y": 0 },
+                { "label": "0,14", "matrix": [0, 14], "x": 16.25, "y": 0 },
+                { "label": "0,15", "matrix": [0, 15], "x": 17.25, "y": 0 },
+                { "label": "1,0", "matrix": [1, 0], "x": 0, "y": 1.25 },
+                { "label": "1,1", "matrix": [1, 1], "x": 1, "y": 1.25 },
+                { "label": "1,2", "matrix": [1, 2], "x": 2, "y": 1.25 },
+                { "label": "1,3", "matrix": [1, 3], "x": 3, "y": 1.25 },
+                { "label": "1,4", "matrix": [1, 4], "x": 4, "y": 1.25 },
+                { "label": "1,5", "matrix": [1, 5], "x": 5, "y": 1.25 },
+                { "label": "1,6", "matrix": [1, 6], "x": 6, "y": 1.25 },
+                { "label": "1,7", "matrix": [1, 7], "x": 7, "y": 1.25 },
+                { "label": "1,8", "matrix": [1, 8], "x": 8, "y": 1.25 },
+                { "label": "1,9", "matrix": [1, 9], "x": 9, "y": 1.25 },
+                { "label": "1,10", "matrix": [1, 10], "x": 10, "y": 1.25 },
+                { "label": "1,11", "matrix": [1, 11], "x": 11, "y": 1.25 },
+                { "label": "1,12", "matrix": [1, 12], "x": 12, "y": 1.25 },
+                { "label": "1,13", "matrix": [1, 13], "w": 2, "x": 13, "y": 1.25 },
+                { "label": "1,14", "matrix": [1, 14], "x": 15.25, "y": 1.25 },
+                { "label": "1,15", "matrix": [1, 15], "x": 16.25, "y": 1.25 },
+                { "label": "2,15", "matrix": [2, 15], "x": 17.25, "y": 1.25 },
+                { "label": "2,0", "matrix": [2, 0], "w": 1.5, "x": 0, "y": 2.25 },
+                { "label": "2,1", "matrix": [2, 1], "x": 1.5, "y": 2.25 },
+                { "label": "2,2", "matrix": [2, 2], "x": 2.5, "y": 2.25 },
+                { "label": "2,3", "matrix": [2, 3], "x": 3.5, "y": 2.25 },
+                { "label": "2,4", "matrix": [2, 4], "x": 4.5, "y": 2.25 },
+                { "label": "2,5", "matrix": [2, 5], "x": 5.5, "y": 2.25 },
+                { "label": "2,6", "matrix": [2, 6], "x": 6.5, "y": 2.25 },
+                { "label": "2,7", "matrix": [2, 7], "x": 7.5, "y": 2.25 },
+                { "label": "2,8", "matrix": [2, 8], "x": 8.5, "y": 2.25 },
+                { "label": "2,9", "matrix": [2, 9], "x": 9.5, "y": 2.25 },
+                { "label": "2,10", "matrix": [2, 10], "x": 10.5, "y": 2.25 },
+                { "label": "2,11", "matrix": [2, 11], "x": 11.5, "y": 2.25 },
+                { "label": "2,12", "matrix": [2, 12], "x": 12.5, "y": 2.25 },
+                { "label": "2,13", "matrix": [2, 13], "w": 1.5, "x": 13.5, "y": 2.25 },
+                { "label": "2,14", "matrix": [2, 14], "x": 15.25, "y": 2.25 },
+                { "label": "3,14", "matrix": [3, 14], "x": 16.25, "y": 2.25 },
+                { "label": "3,15", "matrix": [3, 15], "x": 17.25, "y": 2.25 },
+                { "label": "3,0", "matrix": [3, 0], "w": 1.75, "x": 0, "y": 3.25 },
+                { "label": "3,1", "matrix": [3, 1], "x": 1.75, "y": 3.25 },
+                { "label": "3,2", "matrix": [3, 2], "x": 2.75, "y": 3.25 },
+                { "label": "3,3", "matrix": [3, 3], "x": 3.75, "y": 3.25 },
+                { "label": "3,4", "matrix": [3, 4], "x": 4.75, "y": 3.25 },
+                { "label": "3,5", "matrix": [3, 5], "x": 5.75, "y": 3.25 },
+                { "label": "3,6", "matrix": [3, 6], "x": 6.75, "y": 3.25 },
+                { "label": "3,7", "matrix": [3, 7], "x": 7.75, "y": 3.25 },
+                { "label": "3,8", "matrix": [3, 8], "x": 8.75, "y": 3.25 },
+                { "label": "3,9", "matrix": [3, 9], "x": 9.75, "y": 3.25 },
+                { "label": "3,10", "matrix": [3, 10], "x": 10.75, "y": 3.25 },
+                { "label": "3,11", "matrix": [3, 11], "x": 11.75, "y": 3.25 },
+                { "label": "3,13", "matrix": [3, 13], "w": 2.25, "x": 12.75, "y": 3.25 },
+                { "label": "4,0", "matrix": [4, 0], "w": 2.25, "x": 0, "y": 4.25 },
+                { "label": "4,1", "matrix": [4, 1], "x": 2.25, "y": 4.25 },
+                { "label": "4,2", "matrix": [4, 2], "x": 3.25, "y": 4.25 },
+                { "label": "4,3", "matrix": [4, 3], "x": 4.25, "y": 4.25 },
+                { "label": "4,4", "matrix": [4, 4], "x": 5.25, "y": 4.25 },
+                { "label": "4,5", "matrix": [4, 5], "x": 6.25, "y": 4.25 },
+                { "label": "4,6", "matrix": [4, 6], "x": 7.25, "y": 4.25 },
+                { "label": "4,7", "matrix": [4, 7], "x": 8.25, "y": 4.25 },
+                { "label": "4,8", "matrix": [4, 8], "x": 9.25, "y": 4.25 },
+                { "label": "4,9", "matrix": [4, 9], "x": 10.25, "y": 4.25 },
+                { "label": "4,10", "matrix": [4, 10], "x": 11.25, "y": 4.25 },
+                { "label": "4,13", "matrix": [4, 13], "w": 2.75, "x": 12.25, "y": 4.25 },
+                { "label": "4,14", "matrix": [4, 14], "x": 16.25, "y": 4.25 },
+                { "label": "5,0", "matrix": [5, 0], "w": 1.25, "x": 0, "y": 5.25 },
+                { "label": "5,1", "matrix": [5, 1], "w": 1.25, "x": 1.25, "y": 5.25 },
+                { "label": "5,2", "matrix": [5, 2], "w": 1.25, "x": 2.5, "y": 5.25 },
+                { "label": "5,5", "matrix": [5, 5], "w": 6.25, "x": 3.75, "y": 5.25 },
+                { "label": "5,10", "matrix": [5, 10], "w": 1.25, "x": 10, "y": 5.25 },
+                { "label": "5,11", "matrix": [5, 11], "w": 1.25, "x": 11.25, "y": 5.25 },
+                { "label": "5,12", "matrix": [5, 12], "w": 1.25, "x": 12.5, "y": 5.25 },
+                { "label": "5,13", "matrix": [5, 13], "w": 1.25, "x": 13.75, "y": 5.25 },
+                { "label": "5,14", "matrix": [5, 14], "x": 15.25, "y": 5.25 },
+                { "label": "5,15", "matrix": [5, 15], "x": 16.25, "y": 5.25 },
+                { "label": "4,15", "matrix": [4, 15], "x": 17.25, "y": 5.25 }
+            ]
+        },
+        "LAYOUT_tkl_ansi_tsangan": {
+            "layout": [
+                { "label": "0,0", "matrix": [0, 0], "x": 0, "y": 0 },
+                { "label": "0,1", "matrix": [0, 1], "x": 2, "y": 0 },
+                { "label": "0,2", "matrix": [0, 2], "x": 3, "y": 0 },
+                { "label": "0,3", "matrix": [0, 3], "x": 4, "y": 0 },
+                { "label": "0,4", "matrix": [0, 4], "x": 5, "y": 0 },
+                { "label": "0,5", "matrix": [0, 5], "x": 6.5, "y": 0 },
+                { "label": "0,6", "matrix": [0, 6], "x": 7.5, "y": 0 },
+                { "label": "0,7", "matrix": [0, 7], "x": 8.5, "y": 0 },
+                { "label": "0,8", "matrix": [0, 8], "x": 9.5, "y": 0 },
+                { "label": "0,9", "matrix": [0, 9], "x": 11, "y": 0 },
+                { "label": "0,10", "matrix": [0, 10], "x": 12, "y": 0 },
+                { "label": "0,11", "matrix": [0, 11], "x": 13, "y": 0 },
+                { "label": "0,12", "matrix": [0, 12], "x": 14, "y": 0 },
+                { "label": "0,13", "matrix": [0, 13], "x": 15.25, "y": 0 },
+                { "label": "0,14", "matrix": [0, 14], "x": 16.25, "y": 0 },
+                { "label": "0,15", "matrix": [0, 15], "x": 17.25, "y": 0 },
+                { "label": "1,0", "matrix": [1, 0], "x": 0, "y": 1.25 },
+                { "label": "1,1", "matrix": [1, 1], "x": 1, "y": 1.25 },
+                { "label": "1,2", "matrix": [1, 2], "x": 2, "y": 1.25 },
+                { "label": "1,3", "matrix": [1, 3], "x": 3, "y": 1.25 },
+                { "label": "1,4", "matrix": [1, 4], "x": 4, "y": 1.25 },
+                { "label": "1,5", "matrix": [1, 5], "x": 5, "y": 1.25 },
+                { "label": "1,6", "matrix": [1, 6], "x": 6, "y": 1.25 },
+                { "label": "1,7", "matrix": [1, 7], "x": 7, "y": 1.25 },
+                { "label": "1,8", "matrix": [1, 8], "x": 8, "y": 1.25 },
+                { "label": "1,9", "matrix": [1, 9], "x": 9, "y": 1.25 },
+                { "label": "1,10", "matrix": [1, 10], "x": 10, "y": 1.25 },
+                { "label": "1,11", "matrix": [1, 11], "x": 11, "y": 1.25 },
+                { "label": "1,12", "matrix": [1, 12], "x": 12, "y": 1.25 },
+                { "label": "1,13", "matrix": [1, 13], "w": 2, "x": 13, "y": 1.25 },
+                { "label": "1,14", "matrix": [1, 14], "x": 15.25, "y": 1.25 },
+                { "label": "1,15", "matrix": [1, 15], "x": 16.25, "y": 1.25 },
+                { "label": "2,15", "matrix": [2, 15], "x": 17.25, "y": 1.25 },
+                { "label": "2,0", "matrix": [2, 0], "w": 1.5, "x": 0, "y": 2.25 },
+                { "label": "2,1", "matrix": [2, 1], "x": 1.5, "y": 2.25 },
+                { "label": "2,2", "matrix": [2, 2], "x": 2.5, "y": 2.25 },
+                { "label": "2,3", "matrix": [2, 3], "x": 3.5, "y": 2.25 },
+                { "label": "2,4", "matrix": [2, 4], "x": 4.5, "y": 2.25 },
+                { "label": "2,5", "matrix": [2, 5], "x": 5.5, "y": 2.25 },
+                { "label": "2,6", "matrix": [2, 6], "x": 6.5, "y": 2.25 },
+                { "label": "2,7", "matrix": [2, 7], "x": 7.5, "y": 2.25 },
+                { "label": "2,8", "matrix": [2, 8], "x": 8.5, "y": 2.25 },
+                { "label": "2,9", "matrix": [2, 9], "x": 9.5, "y": 2.25 },
+                { "label": "2,10", "matrix": [2, 10], "x": 10.5, "y": 2.25 },
+                { "label": "2,11", "matrix": [2, 11], "x": 11.5, "y": 2.25 },
+                { "label": "2,12", "matrix": [2, 12], "x": 12.5, "y": 2.25 },
+                { "label": "2,13", "matrix": [2, 13], "w": 1.5, "x": 13.5, "y": 2.25 },
+                { "label": "2,14", "matrix": [2, 14], "x": 15.25, "y": 2.25 },
+                { "label": "3,14", "matrix": [3, 14], "x": 16.25, "y": 2.25 },
+                { "label": "3,15", "matrix": [3, 15], "x": 17.25, "y": 2.25 },
+                { "label": "3,0", "matrix": [3, 0], "w": 1.75, "x": 0, "y": 3.25 },
+                { "label": "3,1", "matrix": [3, 1], "x": 1.75, "y": 3.25 },
+                { "label": "3,2", "matrix": [3, 2], "x": 2.75, "y": 3.25 },
+                { "label": "3,3", "matrix": [3, 3], "x": 3.75, "y": 3.25 },
+                { "label": "3,4", "matrix": [3, 4], "x": 4.75, "y": 3.25 },
+                { "label": "3,5", "matrix": [3, 5], "x": 5.75, "y": 3.25 },
+                { "label": "3,6", "matrix": [3, 6], "x": 6.75, "y": 3.25 },
+                { "label": "3,7", "matrix": [3, 7], "x": 7.75, "y": 3.25 },
+                { "label": "3,8", "matrix": [3, 8], "x": 8.75, "y": 3.25 },
+                { "label": "3,9", "matrix": [3, 9], "x": 9.75, "y": 3.25 },
+                { "label": "3,10", "matrix": [3, 10], "x": 10.75, "y": 3.25 },
+                { "label": "3,11", "matrix": [3, 11], "x": 11.75, "y": 3.25 },
+                { "label": "3,13", "matrix": [3, 13], "w": 2.25, "x": 12.75, "y": 3.25 },
+                { "label": "4,0", "matrix": [4, 0], "w": 2.25, "x": 0, "y": 4.25 },
+                { "label": "4,1", "matrix": [4, 1], "x": 2.25, "y": 4.25 },
+                { "label": "4,2", "matrix": [4, 2], "x": 3.25, "y": 4.25 },
+                { "label": "4,3", "matrix": [4, 3], "x": 4.25, "y": 4.25 },
+                { "label": "4,4", "matrix": [4, 4], "x": 5.25, "y": 4.25 },
+                { "label": "4,5", "matrix": [4, 5], "x": 6.25, "y": 4.25 },
+                { "label": "4,6", "matrix": [4, 6], "x": 7.25, "y": 4.25 },
+                { "label": "4,7", "matrix": [4, 7], "x": 8.25, "y": 4.25 },
+                { "label": "4,8", "matrix": [4, 8], "x": 9.25, "y": 4.25 },
+                { "label": "4,9", "matrix": [4, 9], "x": 10.25, "y": 4.25 },
+                { "label": "4,10", "matrix": [4, 10], "x": 11.25, "y": 4.25 },
+                { "label": "4,13", "matrix": [4, 13], "w": 2.75, "x": 12.25, "y": 4.25 },
+                { "label": "4,14", "matrix": [4, 14], "x": 16.25, "y": 4.25 },
+                { "label": "5,0", "matrix": [5, 0], "w": 1.5, "x": 0, "y": 5.25 },
+                { "label": "5,1", "matrix": [5, 1], "x": 1.5, "y": 5.25 },
+                { "label": "5,2", "matrix": [5, 2], "w": 1.5, "x": 2.5, "y": 5.25 },
+                { "label": "5,5", "matrix": [5, 5], "w": 7, "x": 4, "y": 5.25 },
+                { "label": "5,11", "matrix": [5, 11], "w": 1.5, "x": 11, "y": 5.25 },
+                { "label": "5,12", "matrix": [5, 12], "x": 12.5, "y": 5.25 },
+                { "label": "5,13", "matrix": [5, 13], "w": 1.5, "x": 13.5, "y": 5.25 },
+                { "label": "5,14", "matrix": [5, 14], "x": 15.25, "y": 5.25 },
+                { "label": "5,15", "matrix": [5, 15], "x": 16.25, "y": 5.25 },
+                { "label": "4,15", "matrix": [4, 15], "x": 17.25, "y": 5.25 }
+            ]
+        },
+        "LAYOUT_tkl_ansi_wkl": {
+            "layout": [
+                { "label": "0,0", "matrix": [0, 0], "x": 0, "y": 0 },
+                { "label": "0,1", "matrix": [0, 1], "x": 2, "y": 0 },
+                { "label": "0,2", "matrix": [0, 2], "x": 3, "y": 0 },
+                { "label": "0,3", "matrix": [0, 3], "x": 4, "y": 0 },
+                { "label": "0,4", "matrix": [0, 4], "x": 5, "y": 0 },
+                { "label": "0,5", "matrix": [0, 5], "x": 6.5, "y": 0 },
+                { "label": "0,6", "matrix": [0, 6], "x": 7.5, "y": 0 },
+                { "label": "0,7", "matrix": [0, 7], "x": 8.5, "y": 0 },
+                { "label": "0,8", "matrix": [0, 8], "x": 9.5, "y": 0 },
+                { "label": "0,9", "matrix": [0, 9], "x": 11, "y": 0 },
+                { "label": "0,10", "matrix": [0, 10], "x": 12, "y": 0 },
+                { "label": "0,11", "matrix": [0, 11], "x": 13, "y": 0 },
+                { "label": "0,12", "matrix": [0, 12], "x": 14, "y": 0 },
+                { "label": "0,13", "matrix": [0, 13], "x": 15.25, "y": 0 },
+                { "label": "0,14", "matrix": [0, 14], "x": 16.25, "y": 0 },
+                { "label": "0,15", "matrix": [0, 15], "x": 17.25, "y": 0 },
+                { "label": "1,0", "matrix": [1, 0], "x": 0, "y": 1.25 },
+                { "label": "1,1", "matrix": [1, 1], "x": 1, "y": 1.25 },
+                { "label": "1,2", "matrix": [1, 2], "x": 2, "y": 1.25 },
+                { "label": "1,3", "matrix": [1, 3], "x": 3, "y": 1.25 },
+                { "label": "1,4", "matrix": [1, 4], "x": 4, "y": 1.25 },
+                { "label": "1,5", "matrix": [1, 5], "x": 5, "y": 1.25 },
+                { "label": "1,6", "matrix": [1, 6], "x": 6, "y": 1.25 },
+                { "label": "1,7", "matrix": [1, 7], "x": 7, "y": 1.25 },
+                { "label": "1,8", "matrix": [1, 8], "x": 8, "y": 1.25 },
+                { "label": "1,9", "matrix": [1, 9], "x": 9, "y": 1.25 },
+                { "label": "1,10", "matrix": [1, 10], "x": 10, "y": 1.25 },
+                { "label": "1,11", "matrix": [1, 11], "x": 11, "y": 1.25 },
+                { "label": "1,12", "matrix": [1, 12], "x": 12, "y": 1.25 },
+                { "label": "1,13", "matrix": [1, 13], "w": 2, "x": 13, "y": 1.25 },
+                { "label": "1,14", "matrix": [1, 14], "x": 15.25, "y": 1.25 },
+                { "label": "1,15", "matrix": [1, 15], "x": 16.25, "y": 1.25 },
+                { "label": "2,15", "matrix": [2, 15], "x": 17.25, "y": 1.25 },
+                { "label": "2,0", "matrix": [2, 0], "w": 1.5, "x": 0, "y": 2.25 },
+                { "label": "2,1", "matrix": [2, 1], "x": 1.5, "y": 2.25 },
+                { "label": "2,2", "matrix": [2, 2], "x": 2.5, "y": 2.25 },
+                { "label": "2,3", "matrix": [2, 3], "x": 3.5, "y": 2.25 },
+                { "label": "2,4", "matrix": [2, 4], "x": 4.5, "y": 2.25 },
+                { "label": "2,5", "matrix": [2, 5], "x": 5.5, "y": 2.25 },
+                { "label": "2,6", "matrix": [2, 6], "x": 6.5, "y": 2.25 },
+                { "label": "2,7", "matrix": [2, 7], "x": 7.5, "y": 2.25 },
+                { "label": "2,8", "matrix": [2, 8], "x": 8.5, "y": 2.25 },
+                { "label": "2,9", "matrix": [2, 9], "x": 9.5, "y": 2.25 },
+                { "label": "2,10", "matrix": [2, 10], "x": 10.5, "y": 2.25 },
+                { "label": "2,11", "matrix": [2, 11], "x": 11.5, "y": 2.25 },
+                { "label": "2,12", "matrix": [2, 12], "x": 12.5, "y": 2.25 },
+                { "label": "2,13", "matrix": [2, 13], "w": 1.5, "x": 13.5, "y": 2.25 },
+                { "label": "2,14", "matrix": [2, 14], "x": 15.25, "y": 2.25 },
+                { "label": "3,14", "matrix": [3, 14], "x": 16.25, "y": 2.25 },
+                { "label": "3,15", "matrix": [3, 15], "x": 17.25, "y": 2.25 },
+                { "label": "3,0", "matrix": [3, 0], "w": 1.75, "x": 0, "y": 3.25 },
+                { "label": "3,1", "matrix": [3, 1], "x": 1.75, "y": 3.25 },
+                { "label": "3,2", "matrix": [3, 2], "x": 2.75, "y": 3.25 },
+                { "label": "3,3", "matrix": [3, 3], "x": 3.75, "y": 3.25 },
+                { "label": "3,4", "matrix": [3, 4], "x": 4.75, "y": 3.25 },
+                { "label": "3,5", "matrix": [3, 5], "x": 5.75, "y": 3.25 },
+                { "label": "3,6", "matrix": [3, 6], "x": 6.75, "y": 3.25 },
+                { "label": "3,7", "matrix": [3, 7], "x": 7.75, "y": 3.25 },
+                { "label": "3,8", "matrix": [3, 8], "x": 8.75, "y": 3.25 },
+                { "label": "3,9", "matrix": [3, 9], "x": 9.75, "y": 3.25 },
+                { "label": "3,10", "matrix": [3, 10], "x": 10.75, "y": 3.25 },
+                { "label": "3,11", "matrix": [3, 11], "x": 11.75, "y": 3.25 },
+                { "label": "3,13", "matrix": [3, 13], "w": 2.25, "x": 12.75, "y": 3.25 },
+                { "label": "4,0", "matrix": [4, 0], "w": 2.25, "x": 0, "y": 4.25 },
+                { "label": "4,1", "matrix": [4, 1], "x": 2.25, "y": 4.25 },
+                { "label": "4,2", "matrix": [4, 2], "x": 3.25, "y": 4.25 },
+                { "label": "4,3", "matrix": [4, 3], "x": 4.25, "y": 4.25 },
+                { "label": "4,4", "matrix": [4, 4], "x": 5.25, "y": 4.25 },
+                { "label": "4,5", "matrix": [4, 5], "x": 6.25, "y": 4.25 },
+                { "label": "4,6", "matrix": [4, 6], "x": 7.25, "y": 4.25 },
+                { "label": "4,7", "matrix": [4, 7], "x": 8.25, "y": 4.25 },
+                { "label": "4,8", "matrix": [4, 8], "x": 9.25, "y": 4.25 },
+                { "label": "4,9", "matrix": [4, 9], "x": 10.25, "y": 4.25 },
+                { "label": "4,10", "matrix": [4, 10], "x": 11.25, "y": 4.25 },
+                { "label": "4,13", "matrix": [4, 13], "w": 2.75, "x": 12.25, "y": 4.25 },
+                { "label": "4,14", "matrix": [4, 14], "x": 16.25, "y": 4.25 },
+                { "label": "5,0", "matrix": [5, 0], "w": 1.5, "x": 0, "y": 5.25 },
+                { "label": "5,2", "matrix": [5, 2], "w": 1.5, "x": 2.5, "y": 5.25 },
+                { "label": "5,5", "matrix": [5, 5], "w": 7, "x": 4, "y": 5.25 },
+                { "label": "5,11", "matrix": [5, 11], "w": 1.5, "x": 11, "y": 5.25 },
+                { "label": "5,13", "matrix": [5, 13], "w": 1.5, "x": 13.5, "y": 5.25 },
+                { "label": "5,14", "matrix": [5, 14], "x": 15.25, "y": 5.25 },
+                { "label": "5,15", "matrix": [5, 15], "x": 16.25, "y": 5.25 },
+                { "label": "4,15", "matrix": [4, 15], "x": 17.25, "y": 5.25 }
+            ]
+        }
+    }
+}
diff --git a/keyboards/cipulot/ec_theca/rules.mk b/keyboards/cipulot/ec_theca/rules.mk
index 70494b635f6..ce525670a68 100644
--- a/keyboards/cipulot/ec_theca/rules.mk
+++ b/keyboards/cipulot/ec_theca/rules.mk
@@ -1,4 +1,5 @@
 CUSTOM_MATRIX = lite
 ANALOG_DRIVER_REQUIRED = yes
-SRC += keyboards/cipulot/common/matrix.c keyboards/cipulot/common/ec_board.c keyboards/cipulot/common/ec_switch_matrix.c
+VPATH += keyboards/cipulot/common
+SRC += matrix.c ec_board.c ec_switch_matrix.c
 OPT = 3
diff --git a/keyboards/cipulot/ec_tkl/config.h b/keyboards/cipulot/ec_tkl/config.h
new file mode 100644
index 00000000000..95a7f9137a1
--- /dev/null
+++ b/keyboards/cipulot/ec_tkl/config.h
@@ -0,0 +1,69 @@
+/* Copyright 2023 Cipulot
+ *
+ * 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 3 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 MATRIX_ROWS 6
+#define MATRIX_COLS 16
+
+#define MATRIX_ROW_PINS \
+    { B6, B5, B12, B10, B13, B7 }
+
+#define AMUX_COUNT 1
+#define AMUX_MAX_COLS_COUNT 16
+
+#define AMUX_EN_PINS \
+    { A8 }
+
+#define AMUX_SEL_PINS \
+    { B14, B15, A9, A10 }
+
+#define AMUX_COL_CHANNELS_SIZES \
+    { 16 }
+
+#define AMUX_0_COL_CHANNELS \
+    { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15}
+
+#define AMUX_COL_CHANNELS AMUX_0_COL_CHANNELS
+
+#define DISCHARGE_PIN A4
+#define ANALOG_PORT A2
+
+#define DEFAULT_ACTUATION_MODE 0
+#define DEFAULT_MODE_0_ACTUATION_LEVEL 550
+#define DEFAULT_MODE_0_RELEASE_LEVEL 500
+#define DEFAULT_MODE_1_INITIAL_DEADZONE_OFFSET DEFAULT_MODE_0_ACTUATION_LEVEL
+#define DEFAULT_MODE_1_ACTUATION_OFFSET 70
+#define DEFAULT_MODE_1_RELEASE_OFFSET 70
+#define DEFAULT_EXTREMUM 1023
+#define EXPECTED_NOISE_FLOOR 0
+#define NOISE_FLOOR_THRESHOLD 50
+#define BOTTOMING_CALIBRATION_THRESHOLD 50
+#define DEFAULT_NOISE_FLOOR_SAMPLING_COUNT 30
+#define DEFAULT_BOTTOMING_READING 1023
+#define DEFAULT_CALIBRATION_STARTER true
+
+#define DISCHARGE_TIME 10
+
+// #define DEBUG_MATRIX_SCAN_RATE
+#define EECONFIG_KB_DATA_SIZE 201
+
+// PWM driver with direct memory access (DMA) support
+#define WS2812_PWM_DRIVER PWMD3
+#define WS2812_PWM_CHANNEL 1
+#define WS2812_PWM_PAL_MODE 2
+#define WS2812_DMA_STREAM STM32_DMA1_STREAM2
+#define WS2812_DMA_CHANNEL 5
diff --git a/keyboards/cipulot/ec_tkl/halconf.h b/keyboards/cipulot/ec_tkl/halconf.h
new file mode 100644
index 00000000000..f2c22202313
--- /dev/null
+++ b/keyboards/cipulot/ec_tkl/halconf.h
@@ -0,0 +1,23 @@
+/* Copyright 2023 Cipulot
+ *
+ * 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 3 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_ADC TRUE
+#define HAL_USE_PAL TRUE
+#define HAL_USE_PWM TRUE
+
+#include_next <halconf.h>
diff --git a/keyboards/cipulot/ec_tkl/info.json b/keyboards/cipulot/ec_tkl/info.json
new file mode 100644
index 00000000000..0c56fb838d8
--- /dev/null
+++ b/keyboards/cipulot/ec_tkl/info.json
@@ -0,0 +1,433 @@
+{
+    "manufacturer": "Cipulot",
+    "keyboard_name": "EC TKL",
+    "maintainer": "Cipulot",
+    "bootloader": "stm32-dfu",
+    "build": {
+        "lto": true
+    },
+    "diode_direction": "COL2ROW",
+    "eeprom": {
+        "wear_leveling": {
+            "backing_size": 4096
+        }
+    },
+    "features": {
+        "bootmagic": false,
+        "console": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgblight": true
+    },
+    "processor": "STM32F411",
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
+    "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": 22
+    },
+    "usb": {
+        "device_version": "0.0.1",
+        "pid": "0x6BC3",
+        "shared_endpoint": {
+            "keyboard": true
+        },
+        "vid": "0x6369"
+    },
+    "ws2812": {
+        "driver": "pwm",
+        "pin": "B4"
+    },
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                {"label": "0,0", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "0,1", "matrix": [0, 1], "x": 2, "y": 0},
+                {"label": "0,2", "matrix": [0, 2], "x": 3, "y": 0},
+                {"label": "0,3", "matrix": [0, 3], "x": 4, "y": 0},
+                {"label": "0,4", "matrix": [0, 4], "x": 5, "y": 0},
+                {"label": "0,5", "matrix": [0, 5], "x": 6.5, "y": 0},
+                {"label": "0,6", "matrix": [0, 6], "x": 7.5, "y": 0},
+                {"label": "0,7", "matrix": [0, 7], "x": 8.5, "y": 0},
+                {"label": "0,8", "matrix": [0, 8], "x": 9.5, "y": 0},
+                {"label": "0,9", "matrix": [0, 9], "x": 11, "y": 0},
+                {"label": "0,10", "matrix": [0, 10], "x": 12, "y": 0},
+                {"label": "0,11", "matrix": [0, 11], "x": 13, "y": 0},
+                {"label": "0,12", "matrix": [0, 12], "x": 14, "y": 0},
+                {"label": "0,13", "matrix": [0, 13], "x": 15.25, "y": 0},
+                {"label": "0,14", "matrix": [0, 14], "x": 16.25, "y": 0},
+                {"label": "0,15", "matrix": [0, 15], "x": 17.25, "y": 0},
+                {"label": "1,0", "matrix": [1, 0], "x": 0, "y": 1.25},
+                {"label": "1,1", "matrix": [1, 1], "x": 1, "y": 1.25},
+                {"label": "1,2", "matrix": [1, 2], "x": 2, "y": 1.25},
+                {"label": "1,3", "matrix": [1, 3], "x": 3, "y": 1.25},
+                {"label": "1,4", "matrix": [1, 4], "x": 4, "y": 1.25},
+                {"label": "1,5", "matrix": [1, 5], "x": 5, "y": 1.25},
+                {"label": "1,6", "matrix": [1, 6], "x": 6, "y": 1.25},
+                {"label": "1,7", "matrix": [1, 7], "x": 7, "y": 1.25},
+                {"label": "1,8", "matrix": [1, 8], "x": 8, "y": 1.25},
+                {"label": "1,9", "matrix": [1, 9], "x": 9, "y": 1.25},
+                {"label": "1,10", "matrix": [1, 10], "x": 10, "y": 1.25},
+                {"label": "1,11", "matrix": [1, 11], "x": 11, "y": 1.25},
+                {"label": "1,12", "matrix": [1, 12], "x": 12, "y": 1.25},
+                {"label": "1,13", "matrix": [1, 13], "x": 13, "y": 1.25},
+                {"label": "1,14", "matrix": [1, 14], "x": 14, "y": 1.25},
+                {"label": "3,14", "matrix": [3, 14], "x": 15.25, "y": 1.25},
+                {"label": "2,15", "matrix": [2, 15], "x": 16.25, "y": 1.25},
+                {"label": "1,15", "matrix": [1, 15], "x": 17.25, "y": 1.25},
+                {"label": "2,0", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"label": "2,1", "matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"label": "2,2", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"label": "2,3", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"label": "2,4", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"label": "2,5", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"label": "2,6", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"label": "2,7", "matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"label": "2,8", "matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"label": "2,9", "matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"label": "2,10", "matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"label": "2,11", "matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"label": "2,12", "matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"label": "2,13", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 0.75},
+                {"label": "2,14", "matrix": [2, 14], "x": 14.25, "y": 2.25, "w": 0.75},
+                {"label": "4,14", "matrix": [4, 14], "x": 15.25, "y": 2.25},
+                {"label": "4,15", "matrix": [4, 15], "x": 16.25, "y": 2.25},
+                {"label": "3,15", "matrix": [3, 15], "x": 17.25, "y": 2.25},
+                {"label": "3,0", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"label": "3,1", "matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"label": "3,2", "matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"label": "3,3", "matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"label": "3,4", "matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"label": "3,5", "matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"label": "3,6", "matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"label": "3,7", "matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"label": "3,8", "matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"label": "3,9", "matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"label": "3,10", "matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"label": "3,11", "matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"label": "3,12", "matrix": [3, 12], "x": 12.75, "y": 3.25},
+                {"label": "3,13", "matrix": [3, 13], "x": 13.75, "y": 3.25, "w": 1.25},
+                {"label": "4,0", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"label": "4,1", "matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"label": "4,2", "matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"label": "4,3", "matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"label": "4,4", "matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"label": "4,5", "matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"label": "4,6", "matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"label": "4,7", "matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"label": "4,8", "matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"label": "4,9", "matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"label": "4,10", "matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"label": "4,11", "matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"label": "4,12", "matrix": [4, 12], "x": 12.25, "y": 4.25},
+                {"label": "4,13", "matrix": [4, 13], "x": 13.25, "y": 4.25, "w": 1.75},
+                {"label": "5,14", "matrix": [5, 14], "x": 16.25, "y": 4.25},
+                {"label": "5,0", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"label": "5,1", "matrix": [5, 1], "x": 1.5, "y": 5.25},
+                {"label": "5,2", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"label": "5,4", "matrix": [5, 4], "x": 4, "y": 5.25, "w": 1.5},
+                {"label": "5,6", "matrix": [5, 6], "x": 5.5, "y": 5.25, "w": 2.5},
+                {"label": "5,7", "matrix": [5, 7], "x": 8, "y": 5.25, "w": 1.5},
+                {"label": "5,8", "matrix": [5, 8], "x": 9.5, "y": 5.25, "w": 1.5},
+                {"label": "5,9", "matrix": [5, 9], "x": 11, "y": 5.25, "w": 1.5},
+                {"label": "5,10", "matrix": [5, 10], "x": 12.5, "y": 5.25},
+                {"label": "5,11", "matrix": [5, 11], "x": 13.5, "y": 5.25, "w": 1.5},
+                {"label": "5,12", "matrix": [5, 12], "x": 15.25, "y": 5.25},
+                {"label": "5,13", "matrix": [5, 13], "x": 16.25, "y": 5.25},
+                {"label": "5,15", "matrix": [5, 15], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_ansi_tsangan": {
+            "layout": [
+                {"label": "0,0", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "0,1", "matrix": [0, 1], "x": 2, "y": 0},
+                {"label": "0,2", "matrix": [0, 2], "x": 3, "y": 0},
+                {"label": "0,3", "matrix": [0, 3], "x": 4, "y": 0},
+                {"label": "0,4", "matrix": [0, 4], "x": 5, "y": 0},
+                {"label": "0,5", "matrix": [0, 5], "x": 6.5, "y": 0},
+                {"label": "0,6", "matrix": [0, 6], "x": 7.5, "y": 0},
+                {"label": "0,7", "matrix": [0, 7], "x": 8.5, "y": 0},
+                {"label": "0,8", "matrix": [0, 8], "x": 9.5, "y": 0},
+                {"label": "0,9", "matrix": [0, 9], "x": 11, "y": 0},
+                {"label": "0,10", "matrix": [0, 10], "x": 12, "y": 0},
+                {"label": "0,11", "matrix": [0, 11], "x": 13, "y": 0},
+                {"label": "0,12", "matrix": [0, 12], "x": 14, "y": 0},
+                {"label": "0,13", "matrix": [0, 13], "x": 15.25, "y": 0},
+                {"label": "0,14", "matrix": [0, 14], "x": 16.25, "y": 0},
+                {"label": "0,15", "matrix": [0, 15], "x": 17.25, "y": 0},
+                {"label": "1,0", "matrix": [1, 0], "x": 0, "y": 1.25},
+                {"label": "1,1", "matrix": [1, 1], "x": 1, "y": 1.25},
+                {"label": "1,2", "matrix": [1, 2], "x": 2, "y": 1.25},
+                {"label": "1,3", "matrix": [1, 3], "x": 3, "y": 1.25},
+                {"label": "1,4", "matrix": [1, 4], "x": 4, "y": 1.25},
+                {"label": "1,5", "matrix": [1, 5], "x": 5, "y": 1.25},
+                {"label": "1,6", "matrix": [1, 6], "x": 6, "y": 1.25},
+                {"label": "1,7", "matrix": [1, 7], "x": 7, "y": 1.25},
+                {"label": "1,8", "matrix": [1, 8], "x": 8, "y": 1.25},
+                {"label": "1,9", "matrix": [1, 9], "x": 9, "y": 1.25},
+                {"label": "1,10", "matrix": [1, 10], "x": 10, "y": 1.25},
+                {"label": "1,11", "matrix": [1, 11], "x": 11, "y": 1.25},
+                {"label": "1,12", "matrix": [1, 12], "x": 12, "y": 1.25},
+                {"label": "1,14", "matrix": [1, 14], "x": 13, "y": 1.25, "w": 2},
+                {"label": "3,14", "matrix": [3, 14], "x": 15.25, "y": 1.25},
+                {"label": "2,15", "matrix": [2, 15], "x": 16.25, "y": 1.25},
+                {"label": "1,15", "matrix": [1, 15], "x": 17.25, "y": 1.25},
+                {"label": "2,0", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"label": "2,1", "matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"label": "2,2", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"label": "2,3", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"label": "2,4", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"label": "2,5", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"label": "2,6", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"label": "2,7", "matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"label": "2,8", "matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"label": "2,9", "matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"label": "2,10", "matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"label": "2,11", "matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"label": "2,12", "matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"label": "2,13", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+                {"label": "4,14", "matrix": [4, 14], "x": 15.25, "y": 2.25},
+                {"label": "4,15", "matrix": [4, 15], "x": 16.25, "y": 2.25},
+                {"label": "3,15", "matrix": [3, 15], "x": 17.25, "y": 2.25},
+                {"label": "3,0", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"label": "3,1", "matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"label": "3,2", "matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"label": "3,3", "matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"label": "3,4", "matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"label": "3,5", "matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"label": "3,6", "matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"label": "3,7", "matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"label": "3,8", "matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"label": "3,9", "matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"label": "3,10", "matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"label": "3,11", "matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"label": "3,13", "matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+                {"label": "4,0", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"label": "4,2", "matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"label": "4,3", "matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"label": "4,4", "matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"label": "4,5", "matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"label": "4,6", "matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"label": "4,7", "matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"label": "4,8", "matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"label": "4,9", "matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"label": "4,10", "matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"label": "4,11", "matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"label": "4,13", "matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 2.75},
+                {"label": "5,14", "matrix": [5, 14], "x": 16.25, "y": 4.25},
+                {"label": "5,0", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"label": "5,1", "matrix": [5, 1], "x": 1.5, "y": 5.25},
+                {"label": "5,2", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"label": "5,6", "matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
+                {"label": "5,9", "matrix": [5, 9], "x": 11, "y": 5.25, "w": 1.5},
+                {"label": "5,10", "matrix": [5, 10], "x": 12.5, "y": 5.25},
+                {"label": "5,11", "matrix": [5, 11], "x": 13.5, "y": 5.25, "w": 1.5},
+                {"label": "5,12", "matrix": [5, 12], "x": 15.25, "y": 5.25},
+                {"label": "5,13", "matrix": [5, 13], "x": 16.25, "y": 5.25},
+                {"label": "5,15", "matrix": [5, 15], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_iso_tsangan": {
+            "layout": [
+                {"label": "0,0", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "0,1", "matrix": [0, 1], "x": 2, "y": 0},
+                {"label": "0,2", "matrix": [0, 2], "x": 3, "y": 0},
+                {"label": "0,3", "matrix": [0, 3], "x": 4, "y": 0},
+                {"label": "0,4", "matrix": [0, 4], "x": 5, "y": 0},
+                {"label": "0,5", "matrix": [0, 5], "x": 6.5, "y": 0},
+                {"label": "0,6", "matrix": [0, 6], "x": 7.5, "y": 0},
+                {"label": "0,7", "matrix": [0, 7], "x": 8.5, "y": 0},
+                {"label": "0,8", "matrix": [0, 8], "x": 9.5, "y": 0},
+                {"label": "0,9", "matrix": [0, 9], "x": 11, "y": 0},
+                {"label": "0,10", "matrix": [0, 10], "x": 12, "y": 0},
+                {"label": "0,11", "matrix": [0, 11], "x": 13, "y": 0},
+                {"label": "0,12", "matrix": [0, 12], "x": 14, "y": 0},
+                {"label": "0,13", "matrix": [0, 13], "x": 15.25, "y": 0},
+                {"label": "0,14", "matrix": [0, 14], "x": 16.25, "y": 0},
+                {"label": "0,15", "matrix": [0, 15], "x": 17.25, "y": 0},
+                {"label": "1,0", "matrix": [1, 0], "x": 0, "y": 1.25},
+                {"label": "1,1", "matrix": [1, 1], "x": 1, "y": 1.25},
+                {"label": "1,2", "matrix": [1, 2], "x": 2, "y": 1.25},
+                {"label": "1,3", "matrix": [1, 3], "x": 3, "y": 1.25},
+                {"label": "1,4", "matrix": [1, 4], "x": 4, "y": 1.25},
+                {"label": "1,5", "matrix": [1, 5], "x": 5, "y": 1.25},
+                {"label": "1,6", "matrix": [1, 6], "x": 6, "y": 1.25},
+                {"label": "1,7", "matrix": [1, 7], "x": 7, "y": 1.25},
+                {"label": "1,8", "matrix": [1, 8], "x": 8, "y": 1.25},
+                {"label": "1,9", "matrix": [1, 9], "x": 9, "y": 1.25},
+                {"label": "1,10", "matrix": [1, 10], "x": 10, "y": 1.25},
+                {"label": "1,11", "matrix": [1, 11], "x": 11, "y": 1.25},
+                {"label": "1,12", "matrix": [1, 12], "x": 12, "y": 1.25},
+                {"label": "1,14", "matrix": [1, 14], "x": 13, "y": 1.25, "w": 2},
+                {"label": "3,14", "matrix": [3, 14], "x": 15.25, "y": 1.25},
+                {"label": "2,15", "matrix": [2, 15], "x": 16.25, "y": 1.25},
+                {"label": "1,15", "matrix": [1, 15], "x": 17.25, "y": 1.25},
+                {"label": "2,0", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"label": "2,1", "matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"label": "2,2", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"label": "2,3", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"label": "2,4", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"label": "2,5", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"label": "2,6", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"label": "2,7", "matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"label": "2,8", "matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"label": "2,9", "matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"label": "2,10", "matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"label": "2,11", "matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"label": "2,12", "matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"label": "2,14", "matrix": [2, 14], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+                {"label": "4,14", "matrix": [4, 14], "x": 15.25, "y": 2.25},
+                {"label": "4,15", "matrix": [4, 15], "x": 16.25, "y": 2.25},
+                {"label": "3,15", "matrix": [3, 15], "x": 17.25, "y": 2.25},
+                {"label": "3,0", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"label": "3,1", "matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"label": "3,2", "matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"label": "3,3", "matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"label": "3,4", "matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"label": "3,5", "matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"label": "3,6", "matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"label": "3,7", "matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"label": "3,8", "matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"label": "3,9", "matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"label": "3,10", "matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"label": "3,11", "matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"label": "3,12", "matrix": [3, 12], "x": 12.75, "y": 3.25},
+                {"label": "4,0", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"label": "4,1", "matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"label": "4,2", "matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"label": "4,3", "matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"label": "4,4", "matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"label": "4,5", "matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"label": "4,6", "matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"label": "4,7", "matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"label": "4,8", "matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"label": "4,9", "matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"label": "4,10", "matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"label": "4,11", "matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"label": "4,13", "matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 2.75},
+                {"label": "5,14", "matrix": [5, 14], "x": 16.25, "y": 4.25},
+                {"label": "5,0", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"label": "5,1", "matrix": [5, 1], "x": 1.5, "y": 5.25},
+                {"label": "5,2", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"label": "5,6", "matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
+                {"label": "5,9", "matrix": [5, 9], "x": 11, "y": 5.25, "w": 1.5},
+                {"label": "5,10", "matrix": [5, 10], "x": 12.5, "y": 5.25},
+                {"label": "5,11", "matrix": [5, 11], "x": 13.5, "y": 5.25, "w": 1.5},
+                {"label": "5,12", "matrix": [5, 12], "x": 15.25, "y": 5.25},
+                {"label": "5,13", "matrix": [5, 13], "x": 16.25, "y": 5.25},
+                {"label": "5,15", "matrix": [5, 15], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_jis": {
+            "layout": [
+                {"label": "0,0", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "0,1", "matrix": [0, 1], "x": 2, "y": 0},
+                {"label": "0,2", "matrix": [0, 2], "x": 3, "y": 0},
+                {"label": "0,3", "matrix": [0, 3], "x": 4, "y": 0},
+                {"label": "0,4", "matrix": [0, 4], "x": 5, "y": 0},
+                {"label": "0,5", "matrix": [0, 5], "x": 6.5, "y": 0},
+                {"label": "0,6", "matrix": [0, 6], "x": 7.5, "y": 0},
+                {"label": "0,7", "matrix": [0, 7], "x": 8.5, "y": 0},
+                {"label": "0,8", "matrix": [0, 8], "x": 9.5, "y": 0},
+                {"label": "0,9", "matrix": [0, 9], "x": 11, "y": 0},
+                {"label": "0,10", "matrix": [0, 10], "x": 12, "y": 0},
+                {"label": "0,11", "matrix": [0, 11], "x": 13, "y": 0},
+                {"label": "0,12", "matrix": [0, 12], "x": 14, "y": 0},
+                {"label": "0,13", "matrix": [0, 13], "x": 15.25, "y": 0},
+                {"label": "0,14", "matrix": [0, 14], "x": 16.25, "y": 0},
+                {"label": "0,15", "matrix": [0, 15], "x": 17.25, "y": 0},
+                {"label": "1,0", "matrix": [1, 0], "x": 0, "y": 1.25},
+                {"label": "1,1", "matrix": [1, 1], "x": 1, "y": 1.25},
+                {"label": "1,2", "matrix": [1, 2], "x": 2, "y": 1.25},
+                {"label": "1,3", "matrix": [1, 3], "x": 3, "y": 1.25},
+                {"label": "1,4", "matrix": [1, 4], "x": 4, "y": 1.25},
+                {"label": "1,5", "matrix": [1, 5], "x": 5, "y": 1.25},
+                {"label": "1,6", "matrix": [1, 6], "x": 6, "y": 1.25},
+                {"label": "1,7", "matrix": [1, 7], "x": 7, "y": 1.25},
+                {"label": "1,8", "matrix": [1, 8], "x": 8, "y": 1.25},
+                {"label": "1,9", "matrix": [1, 9], "x": 9, "y": 1.25},
+                {"label": "1,10", "matrix": [1, 10], "x": 10, "y": 1.25},
+                {"label": "1,11", "matrix": [1, 11], "x": 11, "y": 1.25},
+                {"label": "1,12", "matrix": [1, 12], "x": 12, "y": 1.25},
+                {"label": "1,13", "matrix": [1, 13], "x": 13, "y": 1.25},
+                {"label": "1,14", "matrix": [1, 14], "x": 14, "y": 1.25},
+                {"label": "3,14", "matrix": [3, 14], "x": 15.25, "y": 1.25},
+                {"label": "2,15", "matrix": [2, 15], "x": 16.25, "y": 1.25},
+                {"label": "1,15", "matrix": [1, 15], "x": 17.25, "y": 1.25},
+                {"label": "2,0", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"label": "2,1", "matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"label": "2,2", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"label": "2,3", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"label": "2,4", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"label": "2,5", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"label": "2,6", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"label": "2,7", "matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"label": "2,8", "matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"label": "2,9", "matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"label": "2,10", "matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"label": "2,11", "matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"label": "2,12", "matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"label": "2,14", "matrix": [2, 14], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+                {"label": "4,14", "matrix": [4, 14], "x": 15.25, "y": 2.25},
+                {"label": "4,15", "matrix": [4, 15], "x": 16.25, "y": 2.25},
+                {"label": "3,15", "matrix": [3, 15], "x": 17.25, "y": 2.25},
+                {"label": "3,0", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"label": "3,1", "matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"label": "3,2", "matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"label": "3,3", "matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"label": "3,4", "matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"label": "3,5", "matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"label": "3,6", "matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"label": "3,7", "matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"label": "3,8", "matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"label": "3,9", "matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"label": "3,10", "matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"label": "3,11", "matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"label": "3,12", "matrix": [3, 12], "x": 12.75, "y": 3.25},
+                {"label": "4,0", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"label": "4,2", "matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"label": "4,3", "matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"label": "4,4", "matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"label": "4,5", "matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"label": "4,6", "matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"label": "4,7", "matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"label": "4,8", "matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"label": "4,9", "matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"label": "4,10", "matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"label": "4,11", "matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"label": "4,12", "matrix": [4, 12], "x": 12.25, "y": 4.25},
+                {"label": "4,13", "matrix": [4, 13], "x": 13.25, "y": 4.25, "w": 1.75},
+                {"label": "5,14", "matrix": [5, 14], "x": 16.25, "y": 4.25},
+                {"label": "5,0", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"label": "5,1", "matrix": [5, 1], "x": 1.5, "y": 5.25},
+                {"label": "5,2", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"label": "5,4", "matrix": [5, 4], "x": 4, "y": 5.25, "w": 1.5},
+                {"label": "5,6", "matrix": [5, 6], "x": 5.5, "y": 5.25, "w": 2.5},
+                {"label": "5,7", "matrix": [5, 7], "x": 8, "y": 5.25, "w": 1.5},
+                {"label": "5,8", "matrix": [5, 8], "x": 9.5, "y": 5.25, "w": 1.5},
+                {"label": "5,9", "matrix": [5, 9], "x": 11, "y": 5.25, "w": 1.5},
+                {"label": "5,10", "matrix": [5, 10], "x": 12.5, "y": 5.25},
+                {"label": "5,11", "matrix": [5, 11], "x": 13.5, "y": 5.25, "w": 1.5},
+                {"label": "5,12", "matrix": [5, 12], "x": 15.25, "y": 5.25},
+                {"label": "5,13", "matrix": [5, 13], "x": 16.25, "y": 5.25},
+                {"label": "5,15", "matrix": [5, 15], "x": 17.25, "y": 5.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/cipulot/ec_tkl/keymaps/default/keymap.c b/keyboards/cipulot/ec_tkl/keymaps/default/keymap.c
new file mode 100644
index 00000000000..983bdefe8a9
--- /dev/null
+++ b/keyboards/cipulot/ec_tkl/keymaps/default/keymap.c
@@ -0,0 +1,39 @@
+/* Copyright 2023 Cipulot
+ *
+ * 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 3 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 "keymap_japanese.h"
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    // clang-format off
+    [0] = LAYOUT_all(
+        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,  KC_F5, KC_F6, KC_F7, KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,                       KC_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,  JP_YEN,  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_ENTER,   KC_DEL,  KC_END,  KC_PGDN,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,   KC_G,  KC_H,  KC_J,  KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS, KC_ENTER,
+        KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,   KC_V,  KC_B,  KC_N,  KC_M,    KC_COMM, KC_DOT,  KC_SLSH, JP_UNDS, KC_RSFT,                      KC_UP,
+        KC_LCTL, KC_LGUI, KC_LALT, JP_MHEN,                KC_SPC,                JP_KANA, KC_RALT, KC_RGUI, MO(1),   KC_RCTL,             KC_LEFT, KC_DOWN, KC_RIGHT),
+
+    [1] = LAYOUT_all(
+        QK_BOOT, NK_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                     _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                     _______,
+        _______, _______, _______, _______,                   _______,                   _______, _______, _______, _______, _______,            _______, _______, _______)
+    // clang-format on
+};
diff --git a/keyboards/cipulot/ec_tkl/keymaps/tkl_ansi_tsangan/keymap.c b/keyboards/cipulot/ec_tkl/keymaps/tkl_ansi_tsangan/keymap.c
new file mode 100644
index 00000000000..ba948b4fc12
--- /dev/null
+++ b/keyboards/cipulot/ec_tkl/keymaps/tkl_ansi_tsangan/keymap.c
@@ -0,0 +1,37 @@
+/* Copyright 2023 Cipulot
+ *
+ * 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 3 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] = {
+    // clang-format off
+    [0] = LAYOUT_tkl_ansi_tsangan(
+        KC_ESC,  KC_F1,   KC_F2,   KC_F3, KC_F4, KC_F5, KC_F6,  KC_F7, KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,              KC_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_ENTER,
+        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, MO(1),   KC_RCTL,    KC_LEFT, KC_DOWN, KC_RIGHT),
+
+    [1] = LAYOUT_tkl_ansi_tsangan(
+        QK_BOOT, NK_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,            _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                              _______,
+        _______, _______, _______,                            _______,                                     _______, _______, _______,   _______, _______, _______)
+    // clang-format on
+};
diff --git a/keyboards/cipulot/ec_tkl/keymaps/tkl_iso_tsangan/keymap.c b/keyboards/cipulot/ec_tkl/keymaps/tkl_iso_tsangan/keymap.c
new file mode 100644
index 00000000000..1689d44d408
--- /dev/null
+++ b/keyboards/cipulot/ec_tkl/keymaps/tkl_iso_tsangan/keymap.c
@@ -0,0 +1,37 @@
+/* Copyright 2023 Cipulot
+ *
+ * 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 3 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] = {
+    // clang-format off
+    [0] = LAYOUT_tkl_iso_tsangan(
+        KC_ESC,  KC_F1,   KC_F2,   KC_F3, KC_F4, KC_F5, KC_F6,  KC_F7, KC_F8, KC_F9,   KC_F10,  KC_F11,  KC_F12,             KC_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_ENT,    KC_DEL,  KC_END,  KC_PGDN,
+        KC_CAPS, KC_A,    KC_S,    KC_D,  KC_F,  KC_G,  KC_H,   KC_J,  KC_K,  KC_L,    KC_SCLN, KC_QUOT, KC_NUHS,
+        KC_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_UP,
+        KC_LCTL, KC_LGUI, KC_LALT,                      KC_SPC,                                 KC_RALT, MO(1),   KC_RCTL,   KC_LEFT, KC_DOWN, KC_RIGHT),
+
+    [1] = LAYOUT_tkl_iso_tsangan(
+        QK_BOOT, NK_TOGG, _______, _______, _______, _______, _______,  _______, _______, _______, _______, _______, _______,            _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______, _______, _______, _______,                     _______,
+        _______, _______, _______,                            _______,                                      _______, _______, _______,   _______, _______, _______)
+    // clang-format on
+};
diff --git a/keyboards/cipulot/ec_tkl/keymaps/tkl_jis/keymap.c b/keyboards/cipulot/ec_tkl/keymaps/tkl_jis/keymap.c
new file mode 100644
index 00000000000..e44575f74f9
--- /dev/null
+++ b/keyboards/cipulot/ec_tkl/keymaps/tkl_jis/keymap.c
@@ -0,0 +1,39 @@
+/* Copyright 2023 Cipulot
+ *
+ * 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 3 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 "keymap_japanese.h"
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    // clang-format off
+    [0] = LAYOUT_tkl_jis(
+        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,
+        JP_ZKHK, JP_1,    JP_2,    JP_3,    JP_4,  JP_5,  JP_6,   JP_7,  JP_8,    JP_9,    JP_0,    JP_MINS, JP_CIRC, JP_YEN,  KC_BSPC,    KC_INS,  KC_HOME, KC_PGUP,
+        KC_TAB,  JP_Q,    JP_W,    JP_E,    JP_R,  JP_T,  JP_Y,   JP_U,  JP_I,    JP_O,    JP_P,    JP_AT,   JP_LBRC, KC_ENTER,            KC_DEL,  KC_END,  KC_PGDN,
+        JP_EISU, JP_A,    JP_S,    JP_D,    JP_F,  JP_G,  JP_H,   JP_J,  JP_K,    JP_L,    JP_SCLN, JP_COLN, JP_RBRC,
+        KC_LSFT, JP_Z,    JP_X,    JP_C,    JP_V,  JP_B,  JP_N,   JP_M,  JP_COMM, JP_DOT,  JP_SLSH, JP_BSLS, KC_RSFT,                               KC_UP,
+        KC_LCTL, KC_LGUI, KC_LALT, JP_MHEN,               KC_SPC,                 JP_HENK, JP_KANA, KC_RALT, MO(1),   KC_RCTL,             KC_LEFT, KC_DOWN, KC_RIGHT),
+
+    [1] = LAYOUT_tkl_jis(
+        QK_BOOT, NK_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                     _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,            _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                              _______,
+        _______, _______, _______, _______,                   _______,                   _______, _______, _______, _______, _______,            _______, _______, _______)
+    // clang-format on
+};
diff --git a/keyboards/cipulot/ec_tkl/keymaps/via/config.h b/keyboards/cipulot/ec_tkl/keymaps/via/config.h
new file mode 100644
index 00000000000..1ab0d3d9aa2
--- /dev/null
+++ b/keyboards/cipulot/ec_tkl/keymaps/via/config.h
@@ -0,0 +1,20 @@
+/* Copyright 2023 Cipulot
+ *
+ * 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 3 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
+
+// This is the firmware version for VIA support to avoid conflicts on menu fetching
+#define VIA_FIRMWARE_VERSION 1
diff --git a/keyboards/cipulot/ec_tkl/keymaps/via/keymap.c b/keyboards/cipulot/ec_tkl/keymaps/via/keymap.c
new file mode 100644
index 00000000000..983bdefe8a9
--- /dev/null
+++ b/keyboards/cipulot/ec_tkl/keymaps/via/keymap.c
@@ -0,0 +1,39 @@
+/* Copyright 2023 Cipulot
+ *
+ * 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 3 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 "keymap_japanese.h"
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    // clang-format off
+    [0] = LAYOUT_all(
+        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,  KC_F5, KC_F6, KC_F7, KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,                       KC_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,  JP_YEN,  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_ENTER,   KC_DEL,  KC_END,  KC_PGDN,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,   KC_G,  KC_H,  KC_J,  KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS, KC_ENTER,
+        KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,   KC_V,  KC_B,  KC_N,  KC_M,    KC_COMM, KC_DOT,  KC_SLSH, JP_UNDS, KC_RSFT,                      KC_UP,
+        KC_LCTL, KC_LGUI, KC_LALT, JP_MHEN,                KC_SPC,                JP_KANA, KC_RALT, KC_RGUI, MO(1),   KC_RCTL,             KC_LEFT, KC_DOWN, KC_RIGHT),
+
+    [1] = LAYOUT_all(
+        QK_BOOT, NK_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                     _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                     _______,
+        _______, _______, _______, _______,                   _______,                   _______, _______, _______, _______, _______,            _______, _______, _______)
+    // clang-format on
+};
diff --git a/keyboards/cipulot/ec_tkl/keymaps/via/rules.mk b/keyboards/cipulot/ec_tkl/keymaps/via/rules.mk
new file mode 100644
index 00000000000..1e5b99807cb
--- /dev/null
+++ b/keyboards/cipulot/ec_tkl/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/cipulot/ec_tkl/mcuconf.h b/keyboards/cipulot/ec_tkl/mcuconf.h
new file mode 100644
index 00000000000..206928272fb
--- /dev/null
+++ b/keyboards/cipulot/ec_tkl/mcuconf.h
@@ -0,0 +1,25 @@
+/* Copyright 2023 Cipulot
+ *
+ * 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 3 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_ADC_USE_ADC1
+#define STM32_ADC_USE_ADC1 TRUE
+
+#undef STM32_PWM_USE_TIM3
+#define STM32_PWM_USE_TIM3 TRUE
diff --git a/keyboards/cipulot/ec_tkl/post_rules.mk b/keyboards/cipulot/ec_tkl/post_rules.mk
new file mode 100644
index 00000000000..d726a112a8c
--- /dev/null
+++ b/keyboards/cipulot/ec_tkl/post_rules.mk
@@ -0,0 +1,3 @@
+ifeq ($(strip $(VIA_ENABLE)), yes)
+    SRC += keyboards/cipulot/common/via_ec.c
+endif
diff --git a/keyboards/cipulot/ec_tkl/readme.md b/keyboards/cipulot/ec_tkl/readme.md
new file mode 100644
index 00000000000..31467b94d74
--- /dev/null
+++ b/keyboards/cipulot/ec_tkl/readme.md
@@ -0,0 +1,26 @@
+# EC TKL
+
+![EC TKL PCB](https://i.imgur.com/jQTHGzBh.png)
+
+Universal TKL Electrostatic Capacitive PCB, with multi-layout support.
+
+* Keyboard Maintainer: [cipulot](https://github.com/cipulot)
+* Hardware Supported: EC TKL PCB Rev 1.1
+* Hardware Availability: TBD
+
+Make example for this keyboard (after setting up your build environment):
+
+    make cipulot/ec_tkl:default
+
+Flashing example for this keyboard:
+
+    make cipulot/ec_tkl: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:
+
+* **Physical reset**: Long short the exposed pins on the PCB
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
diff --git a/keyboards/cipulot/ec_tkl/rules.mk b/keyboards/cipulot/ec_tkl/rules.mk
new file mode 100644
index 00000000000..318e0215ce9
--- /dev/null
+++ b/keyboards/cipulot/ec_tkl/rules.mk
@@ -0,0 +1,5 @@
+CUSTOM_MATRIX = lite
+ANALOG_DRIVER_REQUIRED = yes
+VPATH += keyboards/cipulot/common
+SRC += matrix.c ec_board.c ec_switch_matrix.c
+OPT = 2
diff --git a/keyboards/cipulot/ec_typeb/config.h b/keyboards/cipulot/ec_typeb/config.h
new file mode 100644
index 00000000000..bf25d0b7128
--- /dev/null
+++ b/keyboards/cipulot/ec_typeb/config.h
@@ -0,0 +1,66 @@
+/* Copyright 2023 Cipulot
+ *
+ * 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 3 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 MATRIX_ROWS 5
+#define MATRIX_COLS 15
+
+#define MATRIX_ROW_PINS \
+    { A7, B0, A4, A5, A6 }
+
+#define AMUX_COUNT 2
+#define AMUX_MAX_COLS_COUNT 8
+
+#define AMUX_EN_PINS \
+    { B7, B3 }
+
+#define AMUX_SEL_PINS \
+    { B4, B5, B6 }
+
+#define AMUX_COL_CHANNELS_SIZES \
+    { 8, 7 }
+
+#define AMUX_0_COL_CHANNELS \
+    { 0, 3, 1, 2, 5, 7, 6, 4 }
+
+#define AMUX_1_COL_CHANNELS \
+    { 0, 3, 1, 2, 5, 7, 6 }
+
+#define AMUX_COL_CHANNELS AMUX_0_COL_CHANNELS, AMUX_1_COL_CHANNELS
+
+#define DISCHARGE_PIN A2
+#define ANALOG_PORT A1
+
+#define DEFAULT_ACTUATION_MODE 0
+#define DEFAULT_MODE_0_ACTUATION_LEVEL 550
+#define DEFAULT_MODE_0_RELEASE_LEVEL 500
+#define DEFAULT_MODE_1_INITIAL_DEADZONE_OFFSET DEFAULT_MODE_0_ACTUATION_LEVEL
+#define DEFAULT_MODE_1_ACTUATION_OFFSET 70
+#define DEFAULT_MODE_1_RELEASE_OFFSET 70
+#define DEFAULT_EXTREMUM 1023
+#define EXPECTED_NOISE_FLOOR 0
+#define NOISE_FLOOR_THRESHOLD 50
+#define BOTTOMING_CALIBRATION_THRESHOLD 100
+#define DEFAULT_NOISE_FLOOR_SAMPLING_COUNT 30
+#define DEFAULT_BOTTOMING_READING 1023
+#define DEFAULT_CALIBRATION_STARTER true
+
+#define DISCHARGE_TIME 10
+
+// #define DEBUG_MATRIX_SCAN_RATE
+
+#define EECONFIG_KB_DATA_SIZE 159
diff --git a/keyboards/cipulot/ec_typeb/halconf.h b/keyboards/cipulot/ec_typeb/halconf.h
new file mode 100644
index 00000000000..835d43b6a0a
--- /dev/null
+++ b/keyboards/cipulot/ec_typeb/halconf.h
@@ -0,0 +1,21 @@
+/* Copyright 2023 Cipulot
+ *
+ * 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 3 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_ADC TRUE
+
+#include_next <halconf.h>
diff --git a/keyboards/cipulot/ec_typeb/info.json b/keyboards/cipulot/ec_typeb/info.json
new file mode 100644
index 00000000000..2036632af59
--- /dev/null
+++ b/keyboards/cipulot/ec_typeb/info.json
@@ -0,0 +1,98 @@
+{
+    "manufacturer": "Cipulot",
+    "keyboard_name": "EC Type-B",
+    "maintainer": "Cipulot",
+    "bootloader": "stm32-dfu",
+    "build": {
+        "lto": true
+    },
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": false,
+        "console": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "processor": "STM32F411",
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
+    "usb": {
+        "device_version": "0.0.1",
+        "pid": "0x6BAA",
+        "shared_endpoint": {
+            "keyboard": true
+        },
+        "vid": "0x6369"
+    },
+    "layouts": {
+        "LAYOUT_60_hhkb": {
+            "layout": [
+                {"label": "0,0", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "0,1", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "0,2", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "0,3", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "0,4", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "0,5", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "0,6", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "0,7", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "0,8", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "0,9", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "0,10", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "0,11", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "0,12", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "0,13", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "0,14", "matrix": [0, 14], "x": 14, "y": 0},
+                {"label": "1,0", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "1,1", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "1,2", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "1,3", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "1,4", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "1,5", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "1,6", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "1,7", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "1,8", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "1,9", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "1,10", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "1,11", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "1,12", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "1,13", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"label": "2,0", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "2,1", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "2,2", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "2,3", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "2,4", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "2,5", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "2,6", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "2,7", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "2,8", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "2,9", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": "2,10", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "2,11", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "2,13", "matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"label": "3,0", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"label": "3,2", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "3,3", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "3,4", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "3,5", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "3,6", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "3,7", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "3,8", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": "3,9", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": "3,10", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "3,11", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "3,13", "matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "3,14", "matrix": [3, 14], "x": 14, "y": 3},
+                {"label": "4,1", "matrix": [4, 1], "x": 1.5, "y": 4},
+                {"label": "4,2", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"label": "4,6", "matrix": [4, 6], "x": 4, "y": 4, "w": 6},
+                {"label": "4,9", "matrix": [4, 9], "x": 10, "y": 4, "w": 1.5},
+                {"label": "4,10", "matrix": [4, 10], "x": 11.5, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/cipulot/ec_typeb/keymaps/default/keymap.c b/keyboards/cipulot/ec_typeb/keymaps/default/keymap.c
new file mode 100644
index 00000000000..71f8cd0368d
--- /dev/null
+++ b/keyboards/cipulot/ec_typeb/keymaps/default/keymap.c
@@ -0,0 +1,42 @@
+/* Copyright 2023 Cipulot
+ *
+ * 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 3 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] = {
+    // clang-format off
+    [0] = LAYOUT_60_hhkb(
+        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_DEL,
+        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_ENTER,
+        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_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_PSCR,  KC_SCRL,  KC_PAUSE,  KC_UP,    _______,  KC_BSPC,
+        _______,  KC_VOLD,  KC_VOLU,  KC_MUTE,  _______,  _______,  S(KC_8),  KC_SLSH,    KC_HOME,  KC_PGUP,  KC_LEFT,  KC_RIGHT,  _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  S(KC_EQL),  KC_MINS,  KC_END,   KC_PGDN,  KC_DOWN,  _______,   _______,
+                  _______,  _______,                                _______,                                  _______,  MO(2)),
+
+    [2] = LAYOUT_60_hhkb(
+        QK_BOOT,  NK_TOGG,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+                  _______,  _______,                                _______,                                _______,  _______)
+    // clang-format on
+};
diff --git a/keyboards/cipulot/ec_typeb/keymaps/via/keymap.c b/keyboards/cipulot/ec_typeb/keymaps/via/keymap.c
new file mode 100644
index 00000000000..71f8cd0368d
--- /dev/null
+++ b/keyboards/cipulot/ec_typeb/keymaps/via/keymap.c
@@ -0,0 +1,42 @@
+/* Copyright 2023 Cipulot
+ *
+ * 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 3 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] = {
+    // clang-format off
+    [0] = LAYOUT_60_hhkb(
+        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_DEL,
+        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_ENTER,
+        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_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_PSCR,  KC_SCRL,  KC_PAUSE,  KC_UP,    _______,  KC_BSPC,
+        _______,  KC_VOLD,  KC_VOLU,  KC_MUTE,  _______,  _______,  S(KC_8),  KC_SLSH,    KC_HOME,  KC_PGUP,  KC_LEFT,  KC_RIGHT,  _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  S(KC_EQL),  KC_MINS,  KC_END,   KC_PGDN,  KC_DOWN,  _______,   _______,
+                  _______,  _______,                                _______,                                  _______,  MO(2)),
+
+    [2] = LAYOUT_60_hhkb(
+        QK_BOOT,  NK_TOGG,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+                  _______,  _______,                                _______,                                _______,  _______)
+    // clang-format on
+};
diff --git a/keyboards/cipulot/ec_typeb/keymaps/via/rules.mk b/keyboards/cipulot/ec_typeb/keymaps/via/rules.mk
new file mode 100644
index 00000000000..1e5b99807cb
--- /dev/null
+++ b/keyboards/cipulot/ec_typeb/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/cipulot/ec_typeb/mcuconf.h b/keyboards/cipulot/ec_typeb/mcuconf.h
new file mode 100644
index 00000000000..fa3c955e0d8
--- /dev/null
+++ b/keyboards/cipulot/ec_typeb/mcuconf.h
@@ -0,0 +1,22 @@
+/* Copyright 2023 Cipulot
+ *
+ * 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 3 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_ADC_USE_ADC1
+#define STM32_ADC_USE_ADC1 TRUE
diff --git a/keyboards/cipulot/ec_typeb/post_rules.mk b/keyboards/cipulot/ec_typeb/post_rules.mk
new file mode 100644
index 00000000000..d726a112a8c
--- /dev/null
+++ b/keyboards/cipulot/ec_typeb/post_rules.mk
@@ -0,0 +1,3 @@
+ifeq ($(strip $(VIA_ENABLE)), yes)
+    SRC += keyboards/cipulot/common/via_ec.c
+endif
diff --git a/keyboards/cipulot/ec_typeb/readme.md b/keyboards/cipulot/ec_typeb/readme.md
new file mode 100644
index 00000000000..c3bfe812388
--- /dev/null
+++ b/keyboards/cipulot/ec_typeb/readme.md
@@ -0,0 +1,26 @@
+# EC Type-B
+
+![EC Type-B](https://i.imgur.com/B6yFoUJh.jpg)
+
+EC Type-B Keyboard by bababaul.
+
+* Keyboard Maintainer: [cipulot](https://github.com/cipulot)
+* Hardware Supported: EC Type-B
+* Hardware Availability: [Sand Keys](https://sandkeys.me/)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make cipulot/ec_typeb:default
+
+Flashing example for this keyboard:
+
+    make cipulot/ec_typeb: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:
+
+* **Physical Boot0 pins**: Short the Boot0 pins on the back of the PCB while plugging in the keyboard
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
diff --git a/keyboards/cipulot/ec_typeb/rules.mk b/keyboards/cipulot/ec_typeb/rules.mk
new file mode 100644
index 00000000000..ce525670a68
--- /dev/null
+++ b/keyboards/cipulot/ec_typeb/rules.mk
@@ -0,0 +1,5 @@
+CUSTOM_MATRIX = lite
+ANALOG_DRIVER_REQUIRED = yes
+VPATH += keyboards/cipulot/common
+SRC += matrix.c ec_board.c ec_switch_matrix.c
+OPT = 3
diff --git a/keyboards/cipulot/ec_typek/info.json b/keyboards/cipulot/ec_typek/keyboard.json
similarity index 100%
rename from keyboards/cipulot/ec_typek/info.json
rename to keyboards/cipulot/ec_typek/keyboard.json
diff --git a/keyboards/cipulot/ec_vero/config.h b/keyboards/cipulot/ec_vero/config.h
new file mode 100644
index 00000000000..89f7474b552
--- /dev/null
+++ b/keyboards/cipulot/ec_vero/config.h
@@ -0,0 +1,61 @@
+/* Copyright 2023 Cipulot
+ *
+ * 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 3 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 MATRIX_ROWS 5
+#define MATRIX_COLS 15
+
+#define MATRIX_ROW_PINS \
+    { B7, B6, A9, A10, B3 }
+
+#define AMUX_COUNT 1
+#define AMUX_MAX_COLS_COUNT 15
+
+#define AMUX_EN_PINS \
+    { B14 }
+
+#define AMUX_SEL_PINS \
+    { B13, B12, B15, A8 }
+
+#define AMUX_COL_CHANNELS_SIZES \
+    { 15 }
+
+#define AMUX_0_COL_CHANNELS \
+    { 1, 2, 3, 4, 5, 6, 7, 0, 8, 9, 10, 11, 13, 12, 14}
+
+#define AMUX_COL_CHANNELS AMUX_0_COL_CHANNELS
+
+#define DISCHARGE_PIN A4
+#define ANALOG_PORT A2
+
+#define DEFAULT_ACTUATION_MODE 0
+#define DEFAULT_MODE_0_ACTUATION_LEVEL 550
+#define DEFAULT_MODE_0_RELEASE_LEVEL 500
+#define DEFAULT_MODE_1_INITIAL_DEADZONE_OFFSET DEFAULT_MODE_0_ACTUATION_LEVEL
+#define DEFAULT_MODE_1_ACTUATION_OFFSET 70
+#define DEFAULT_MODE_1_RELEASE_OFFSET 70
+#define DEFAULT_EXTREMUM 1023
+#define EXPECTED_NOISE_FLOOR 0
+#define NOISE_FLOOR_THRESHOLD 50
+#define BOTTOMING_CALIBRATION_THRESHOLD 50
+#define DEFAULT_NOISE_FLOOR_SAMPLING_COUNT 30
+#define DEFAULT_BOTTOMING_READING 1023
+#define DEFAULT_CALIBRATION_STARTER true
+
+#define DISCHARGE_TIME 10
+
+#define EECONFIG_KB_DATA_SIZE 159
diff --git a/keyboards/cipulot/ec_vero/halconf.h b/keyboards/cipulot/ec_vero/halconf.h
new file mode 100644
index 00000000000..835d43b6a0a
--- /dev/null
+++ b/keyboards/cipulot/ec_vero/halconf.h
@@ -0,0 +1,21 @@
+/* Copyright 2023 Cipulot
+ *
+ * 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 3 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_ADC TRUE
+
+#include_next <halconf.h>
diff --git a/keyboards/cipulot/ec_vero/info.json b/keyboards/cipulot/ec_vero/info.json
new file mode 100644
index 00000000000..a2cc1e4a07d
--- /dev/null
+++ b/keyboards/cipulot/ec_vero/info.json
@@ -0,0 +1,165 @@
+{
+    "manufacturer": "Cipulot",
+    "keyboard_name": "Vero EC",
+    "maintainer": "Cipulot",
+    "bootloader": "stm32-dfu",
+    "build": {
+        "lto": true
+    },
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": false,
+        "console": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "processor": "STM32F411",
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
+    "usb": {
+        "device_version": "0.0.1",
+        "pid": "0x6BC1",
+        "shared_endpoint": {
+            "keyboard": true
+        },
+        "vid": "0x6369"
+    },
+    "layouts": {
+        "LAYOUT_60_hhkb": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 6], "x": 4, "y": 4, "w": 6},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.5},
+                {"matrix": [4, 11], "x": 11.5, "y": 4}
+            ]
+        },
+        "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": [0, 14], "x": 14, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 0.75},
+                {"matrix": [1, 14], "x": 14.25, "y": 1, "w": 0.75},
+                {"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": 2, "w": 1.25},
+                {"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, 13], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 6], "x": 4, "y": 4, "w": 6},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.5},
+                {"matrix": [4, 11], "x": 11.5, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/cipulot/ec_vero/keymaps/60_hhkb/keymap.c b/keyboards/cipulot/ec_vero/keymaps/60_hhkb/keymap.c
new file mode 100644
index 00000000000..bd4df694af9
--- /dev/null
+++ b/keyboards/cipulot/ec_vero/keymaps/60_hhkb/keymap.c
@@ -0,0 +1,42 @@
+/* Copyright 2023 Cipulot
+ *
+ * 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 3 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] = {
+    // clang-format off
+    [0] = LAYOUT_60_hhkb(
+        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_DEL,
+        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_ENTER,
+        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_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_PSCR,  KC_SCRL,  KC_PAUSE,  KC_UP,    _______,  KC_BSPC,
+        _______,  KC_VOLD,  KC_VOLU,  KC_MUTE,  _______,  _______,  S(KC_8),  KC_SLSH,    KC_HOME,  KC_PGUP,  KC_LEFT,  KC_RIGHT,  _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  S(KC_EQL),  KC_MINS,  KC_END,   KC_PGDN,  KC_DOWN,  _______,   _______,
+                  _______,  _______,                                _______,                                  _______,  MO(2)),
+
+    [2] = LAYOUT_60_hhkb(
+        QK_BOOT,  NK_TOGG,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+                  _______,  _______,                                _______,                                _______,  _______)
+    // clang-format on
+};
diff --git a/keyboards/cipulot/ec_vero/keymaps/default/keymap.c b/keyboards/cipulot/ec_vero/keymaps/default/keymap.c
new file mode 100644
index 00000000000..06b3651d94a
--- /dev/null
+++ b/keyboards/cipulot/ec_vero/keymaps/default/keymap.c
@@ -0,0 +1,42 @@
+/* Copyright 2023 Cipulot
+ *
+ * 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 3 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] = {
+    // clang-format off
+    [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_DEL,    KC_ENTER,
+        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_NUHS,  KC_ENTER,
+        KC_LSFT,  KC_BSLS,  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_all(
+        _______,  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_PSCR,  KC_SCRL,  KC_PAUSE,  KC_UP,     _______,  KC_BSPC, _______,
+        _______,  KC_VOLD,  KC_VOLU,  KC_MUTE,  _______,  _______,  S(KC_8),  KC_SLSH,    KC_HOME,  KC_PGUP,  KC_LEFT,   KC_RIGHT,  _______,  _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  S(KC_EQL),  KC_MINS,  KC_END,   KC_PGDN,   KC_DOWN,   _______,  _______,
+                  _______,  _______,                                _______,                                  _______,   MO(2)),
+
+    [2] = LAYOUT_all(
+        QK_BOOT,  NK_TOGG,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+                  _______,  _______,                                _______,                                _______,  _______)
+    // clang-format on
+};
diff --git a/keyboards/cipulot/ec_vero/keymaps/via/keymap.c b/keyboards/cipulot/ec_vero/keymaps/via/keymap.c
new file mode 100644
index 00000000000..06b3651d94a
--- /dev/null
+++ b/keyboards/cipulot/ec_vero/keymaps/via/keymap.c
@@ -0,0 +1,42 @@
+/* Copyright 2023 Cipulot
+ *
+ * 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 3 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] = {
+    // clang-format off
+    [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_DEL,    KC_ENTER,
+        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_NUHS,  KC_ENTER,
+        KC_LSFT,  KC_BSLS,  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_all(
+        _______,  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_PSCR,  KC_SCRL,  KC_PAUSE,  KC_UP,     _______,  KC_BSPC, _______,
+        _______,  KC_VOLD,  KC_VOLU,  KC_MUTE,  _______,  _______,  S(KC_8),  KC_SLSH,    KC_HOME,  KC_PGUP,  KC_LEFT,   KC_RIGHT,  _______,  _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  S(KC_EQL),  KC_MINS,  KC_END,   KC_PGDN,   KC_DOWN,   _______,  _______,
+                  _______,  _______,                                _______,                                  _______,   MO(2)),
+
+    [2] = LAYOUT_all(
+        QK_BOOT,  NK_TOGG,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+                  _______,  _______,                                _______,                                _______,  _______)
+    // clang-format on
+};
diff --git a/keyboards/cipulot/ec_vero/keymaps/via/rules.mk b/keyboards/cipulot/ec_vero/keymaps/via/rules.mk
new file mode 100644
index 00000000000..1e5b99807cb
--- /dev/null
+++ b/keyboards/cipulot/ec_vero/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/cipulot/ec_vero/mcuconf.h b/keyboards/cipulot/ec_vero/mcuconf.h
new file mode 100644
index 00000000000..fa3c955e0d8
--- /dev/null
+++ b/keyboards/cipulot/ec_vero/mcuconf.h
@@ -0,0 +1,22 @@
+/* Copyright 2023 Cipulot
+ *
+ * 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 3 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_ADC_USE_ADC1
+#define STM32_ADC_USE_ADC1 TRUE
diff --git a/keyboards/cipulot/ec_vero/post_rules.mk b/keyboards/cipulot/ec_vero/post_rules.mk
new file mode 100644
index 00000000000..d726a112a8c
--- /dev/null
+++ b/keyboards/cipulot/ec_vero/post_rules.mk
@@ -0,0 +1,3 @@
+ifeq ($(strip $(VIA_ENABLE)), yes)
+    SRC += keyboards/cipulot/common/via_ec.c
+endif
diff --git a/keyboards/cipulot/ec_vero/readme.md b/keyboards/cipulot/ec_vero/readme.md
new file mode 100644
index 00000000000..590423fa023
--- /dev/null
+++ b/keyboards/cipulot/ec_vero/readme.md
@@ -0,0 +1,26 @@
+# Vero EC
+
+![Vero EC PCB](https://i.imgur.com/JV8pMaXh.jpg)
+
+EC version of the Vero R2 keyboard.
+
+* Keyboard Maintainer: [cipulot](https://github.com/cipulot)
+* Hardware Supported: Vero EC PCB
+* Hardware Availability: [Antipode](https://www.antipode.no/)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make cipulot/ec_vero:default
+
+Flashing example for this keyboard:
+
+    make cipulot/ec_vero: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:
+
+* **Physical reset**: Long short the exposed pads on the top of the PCB
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
diff --git a/keyboards/cipulot/ec_vero/rules.mk b/keyboards/cipulot/ec_vero/rules.mk
new file mode 100644
index 00000000000..ce525670a68
--- /dev/null
+++ b/keyboards/cipulot/ec_vero/rules.mk
@@ -0,0 +1,5 @@
+CUSTOM_MATRIX = lite
+ANALOG_DRIVER_REQUIRED = yes
+VPATH += keyboards/cipulot/common
+SRC += matrix.c ec_board.c ec_switch_matrix.c
+OPT = 3
diff --git a/keyboards/cipulot/ec_virgo/config.h b/keyboards/cipulot/ec_virgo/config.h
new file mode 100644
index 00000000000..2fce8cd7fa7
--- /dev/null
+++ b/keyboards/cipulot/ec_virgo/config.h
@@ -0,0 +1,66 @@
+/* Copyright 2023 Cipulot
+ *
+ * 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 3 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 MATRIX_ROWS 6
+#define MATRIX_COLS 18
+
+#define MATRIX_ROW_PINS \
+    { B6, B7, B5, B4, B3, A15 }
+
+#define AMUX_COUNT 2
+#define AMUX_MAX_COLS_COUNT 16
+
+#define AMUX_EN_PINS \
+    { A9, A8 }
+
+#define AMUX_SEL_PINS \
+    { B12, B13, B15, B14 }
+
+#define AMUX_COL_CHANNELS_SIZES \
+    { 7, 11 }
+
+#define AMUX_0_COL_CHANNELS \
+    { 2, 1, 0, 3, 5, 4, 7 }
+
+#define AMUX_1_COL_CHANNELS \
+    { 2, 1, 0, 15, 14, 13, 12, 8, 11, 10, 9 }
+
+#define AMUX_COL_CHANNELS AMUX_0_COL_CHANNELS, AMUX_1_COL_CHANNELS
+
+#define DISCHARGE_PIN A4
+#define ANALOG_PORT A3
+
+#define DEFAULT_ACTUATION_MODE 0
+#define DEFAULT_MODE_0_ACTUATION_LEVEL 550
+#define DEFAULT_MODE_0_RELEASE_LEVEL 500
+#define DEFAULT_MODE_1_INITIAL_DEADZONE_OFFSET DEFAULT_MODE_0_ACTUATION_LEVEL
+#define DEFAULT_MODE_1_ACTUATION_OFFSET 70
+#define DEFAULT_MODE_1_RELEASE_OFFSET 70
+#define DEFAULT_EXTREMUM 1023
+#define EXPECTED_NOISE_FLOOR 0
+#define NOISE_FLOOR_THRESHOLD 50
+#define BOTTOMING_CALIBRATION_THRESHOLD 50
+#define DEFAULT_NOISE_FLOOR_SAMPLING_COUNT 30
+#define DEFAULT_BOTTOMING_READING 1023
+#define DEFAULT_CALIBRATION_STARTER true
+
+#define DISCHARGE_TIME 10
+
+// #define DEBUG_MATRIX_SCAN_RATE
+
+#define EECONFIG_KB_DATA_SIZE 225
diff --git a/keyboards/cipulot/ec_virgo/halconf.h b/keyboards/cipulot/ec_virgo/halconf.h
new file mode 100644
index 00000000000..835d43b6a0a
--- /dev/null
+++ b/keyboards/cipulot/ec_virgo/halconf.h
@@ -0,0 +1,21 @@
+/* Copyright 2023 Cipulot
+ *
+ * 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 3 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_ADC TRUE
+
+#include_next <halconf.h>
diff --git a/keyboards/cipulot/ec_virgo/info.json b/keyboards/cipulot/ec_virgo/info.json
new file mode 100644
index 00000000000..6b37880181b
--- /dev/null
+++ b/keyboards/cipulot/ec_virgo/info.json
@@ -0,0 +1,136 @@
+{
+    "manufacturer": "Cipulot",
+    "keyboard_name": "Virgo EC",
+    "maintainer": "Cipulot",
+    "bootloader": "stm32-dfu",
+    "build": {
+        "lto": true
+    },
+    "diode_direction": "COL2ROW",
+    "eeprom": {
+        "wear_leveling": {
+            "backing_size": 4096
+        }
+    },
+    "features": {
+        "bootmagic": false,
+        "console": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "processor": "STM32F411",
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
+    "usb": {
+        "device_version": "0.0.1",
+        "pid": "0x6BC0",
+        "shared_endpoint": {
+            "keyboard": true
+        },
+        "vid": "0x6369"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 7], "x": 9, "y": 0},
+                {"matrix": [0, 8], "x": 10, "y": 0},
+                {"matrix": [0, 9], "x": 11, "y": 0},
+                {"matrix": [0, 10], "x": 12.25, "y": 0},
+                {"matrix": [0, 11], "x": 13.25, "y": 0},
+                {"matrix": [0, 12], "x": 14.25, "y": 0},
+                {"matrix": [0, 13], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 17.25, "y": 0},
+                {"matrix": [0, 16], "x": 18.25, "y": 0},
+                {"matrix": [0, 17], "x": 19.25, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1.5},
+                {"matrix": [1, 4], "x": 4, "y": 1.5},
+                {"matrix": [1, 5], "x": 5, "y": 1.5},
+                {"matrix": [1, 6], "x": 6, "y": 1.5},
+                {"matrix": [1, 7], "x": 9, "y": 1.5},
+                {"matrix": [1, 8], "x": 10, "y": 1.5},
+                {"matrix": [1, 9], "x": 11, "y": 1.5},
+                {"matrix": [1, 10], "x": 12, "y": 1.5},
+                {"matrix": [1, 11], "x": 13, "y": 1.5},
+                {"matrix": [1, 12], "x": 14, "y": 1.5},
+                {"matrix": [1, 13], "x": 15, "y": 1.5},
+                {"matrix": [1, 14], "x": 16, "y": 1.5},
+                {"matrix": [1, 15], "x": 17.25, "y": 1.5},
+                {"matrix": [1, 16], "x": 18.25, "y": 1.5},
+                {"matrix": [1, 17], "x": 19.25, "y": 1.5},
+                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 8.5, "y": 2.5},
+                {"matrix": [2, 7], "x": 9.5, "y": 2.5},
+                {"matrix": [2, 8], "x": 10.5, "y": 2.5},
+                {"matrix": [2, 9], "x": 11.5, "y": 2.5},
+                {"matrix": [2, 10], "x": 12.5, "y": 2.5},
+                {"matrix": [2, 11], "x": 13.5, "y": 2.5},
+                {"matrix": [2, 12], "x": 14.5, "y": 2.5},
+                {"matrix": [2, 13], "x": 15.5, "y": 2.5},
+                {"matrix": [2, 14], "x": 16.5, "y": 2.5, "w": 0.5},
+                {"matrix": [2, 15], "x": 17.25, "y": 2.5},
+                {"matrix": [2, 16], "x": 18.25, "y": 2.5},
+                {"matrix": [2, 17], "x": 19.25, "y": 2.5},
+                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+                {"matrix": [3, 6], "x": 8.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 8], "x": 10.75, "y": 3.5},
+                {"matrix": [3, 9], "x": 11.75, "y": 3.5},
+                {"matrix": [3, 10], "x": 12.75, "y": 3.5},
+                {"matrix": [3, 11], "x": 13.75, "y": 3.5},
+                {"matrix": [3, 12], "x": 14.75, "y": 3.5},
+                {"matrix": [3, 13], "x": 15.75, "y": 3.5, "w": 1.25},
+                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.5},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.5},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.5},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.5},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.5},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.5},
+                {"matrix": [5, 6], "x": 8.25, "y": 4.5},
+                {"matrix": [4, 7], "x": 9.25, "y": 4.5},
+                {"matrix": [4, 8], "x": 10.25, "y": 4.5},
+                {"matrix": [4, 9], "x": 11.25, "y": 4.5},
+                {"matrix": [4, 10], "x": 12.25, "y": 4.5},
+                {"matrix": [4, 11], "x": 13.25, "y": 4.5},
+                {"matrix": [4, 13], "x": 14.25, "y": 4.5, "w": 1.75},
+                {"matrix": [4, 14], "x": 16, "y": 4.5},
+                {"matrix": [4, 16], "x": 18.25, "y": 4.5},
+                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 3], "x": 3.75, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 5], "x": 5, "y": 5.5, "w": 2.25},
+                {"matrix": [5, 7], "x": 8.25, "y": 5.5, "w": 2.75},
+                {"matrix": [5, 9], "x": 11, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 10], "x": 12.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 13], "x": 14.5, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 15], "x": 17.25, "y": 5.5},
+                {"matrix": [5, 16], "x": 18.25, "y": 5.5},
+                {"matrix": [5, 17], "x": 19.25, "y": 5.5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/cipulot/ec_virgo/keymaps/default/keymap.c b/keyboards/cipulot/ec_virgo/keymaps/default/keymap.c
new file mode 100644
index 00000000000..f176ec71dc0
--- /dev/null
+++ b/keyboards/cipulot/ec_virgo/keymaps/default/keymap.c
@@ -0,0 +1,37 @@
+/* Copyright 2023 Cipulot
+ *
+ * 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 3 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] = {
+    // clang-format off
+    [0] = LAYOUT(
+        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4, KC_F5,             KC_F6,  KC_F7, KC_F8,            KC_F9,   KC_F10,  KC_F11,  KC_F12,               KC_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_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_ENTER,   KC_DEL,  KC_END,  KC_PGDN,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,  KC_G,              KC_H,   KC_J,  KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS, KC_ENTER,
+        KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,  KC_V,   KC_B,      KC_B,   KC_N,  KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,  MO(1),                        KC_UP,
+        KC_LCTL,          KC_LGUI, KC_LALT,        KC_SPC,            KC_SPC,        KC_RALT, KC_RGUI,          KC_RCTL,                                KC_LEFT, KC_DOWN, KC_RIGHT),
+    [1] = LAYOUT(
+        QK_BOOT, NK_TOGG, _______, _______, _______, _______,               _______, _______, _______,          _______, _______, _______, _______,            _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______,      _______, _______, _______, _______, _______, _______, _______, _______,            _______, _______, _______,
+        _______, _______, _______, _______, _______, _______,               _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,
+        _______, _______, _______, _______, _______, _______,               _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______,      _______, _______, _______, _______, _______, _______, _______, _______,                     _______,
+        _______,          _______, _______,          _______,               _______,          _______, _______,          _______,                              _______, _______, _______)
+
+    // clang-format on
+};
diff --git a/keyboards/cipulot/ec_virgo/keymaps/via/keymap.c b/keyboards/cipulot/ec_virgo/keymaps/via/keymap.c
new file mode 100644
index 00000000000..f176ec71dc0
--- /dev/null
+++ b/keyboards/cipulot/ec_virgo/keymaps/via/keymap.c
@@ -0,0 +1,37 @@
+/* Copyright 2023 Cipulot
+ *
+ * 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 3 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] = {
+    // clang-format off
+    [0] = LAYOUT(
+        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4, KC_F5,             KC_F6,  KC_F7, KC_F8,            KC_F9,   KC_F10,  KC_F11,  KC_F12,               KC_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_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_ENTER,   KC_DEL,  KC_END,  KC_PGDN,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,  KC_G,              KC_H,   KC_J,  KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS, KC_ENTER,
+        KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,  KC_V,   KC_B,      KC_B,   KC_N,  KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,  MO(1),                        KC_UP,
+        KC_LCTL,          KC_LGUI, KC_LALT,        KC_SPC,            KC_SPC,        KC_RALT, KC_RGUI,          KC_RCTL,                                KC_LEFT, KC_DOWN, KC_RIGHT),
+    [1] = LAYOUT(
+        QK_BOOT, NK_TOGG, _______, _______, _______, _______,               _______, _______, _______,          _______, _______, _______, _______,            _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______,      _______, _______, _______, _______, _______, _______, _______, _______,            _______, _______, _______,
+        _______, _______, _______, _______, _______, _______,               _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,
+        _______, _______, _______, _______, _______, _______,               _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______,      _______, _______, _______, _______, _______, _______, _______, _______,                     _______,
+        _______,          _______, _______,          _______,               _______,          _______, _______,          _______,                              _______, _______, _______)
+
+    // clang-format on
+};
diff --git a/keyboards/cipulot/ec_virgo/keymaps/via/rules.mk b/keyboards/cipulot/ec_virgo/keymaps/via/rules.mk
new file mode 100644
index 00000000000..1e5b99807cb
--- /dev/null
+++ b/keyboards/cipulot/ec_virgo/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/cipulot/ec_virgo/mcuconf.h b/keyboards/cipulot/ec_virgo/mcuconf.h
new file mode 100644
index 00000000000..fa3c955e0d8
--- /dev/null
+++ b/keyboards/cipulot/ec_virgo/mcuconf.h
@@ -0,0 +1,22 @@
+/* Copyright 2023 Cipulot
+ *
+ * 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 3 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_ADC_USE_ADC1
+#define STM32_ADC_USE_ADC1 TRUE
diff --git a/keyboards/cipulot/ec_virgo/post_rules.mk b/keyboards/cipulot/ec_virgo/post_rules.mk
new file mode 100644
index 00000000000..d726a112a8c
--- /dev/null
+++ b/keyboards/cipulot/ec_virgo/post_rules.mk
@@ -0,0 +1,3 @@
+ifeq ($(strip $(VIA_ENABLE)), yes)
+    SRC += keyboards/cipulot/common/via_ec.c
+endif
diff --git a/keyboards/cipulot/ec_virgo/readme.md b/keyboards/cipulot/ec_virgo/readme.md
new file mode 100644
index 00000000000..ddf976ca792
--- /dev/null
+++ b/keyboards/cipulot/ec_virgo/readme.md
@@ -0,0 +1,26 @@
+# Virgo EC
+
+![Virgo EC PCB](https://i.imgur.com/iaKYqySh.jpeg)
+
+EC version of the Virgo keyboard.
+
+* Keyboard Maintainer: [cipulot](https://github.com/cipulot)
+* Hardware Supported: Virgo EC PCB
+* Hardware Availability: [Antipode](https://www.antipode.no/)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make cipulot/ec_virgo:default
+
+Flashing example for this keyboard:
+
+    make cipulot/ec_virgo: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:
+
+* **Physical reset**: Long short the exposed pads on the top of the PCB
+* **Keycode in layout**: Press the key mapped to QK_BOOT if it is available
diff --git a/keyboards/cipulot/ec_virgo/rules.mk b/keyboards/cipulot/ec_virgo/rules.mk
new file mode 100644
index 00000000000..ce525670a68
--- /dev/null
+++ b/keyboards/cipulot/ec_virgo/rules.mk
@@ -0,0 +1,5 @@
+CUSTOM_MATRIX = lite
+ANALOG_DRIVER_REQUIRED = yes
+VPATH += keyboards/cipulot/common
+SRC += matrix.c ec_board.c ec_switch_matrix.c
+OPT = 3
diff --git a/keyboards/cipulot/kallos/config.h b/keyboards/cipulot/kallos/config.h
deleted file mode 100644
index dfe6b13b066..00000000000
--- a/keyboards/cipulot/kallos/config.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
-Copyright 2022 Cipulot
-
-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
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/cipulot/kallos/keyboard.json b/keyboards/cipulot/kallos/keyboard.json
index e92d634489d..731b37fda9b 100644
--- a/keyboards/cipulot/kallos/keyboard.json
+++ b/keyboards/cipulot/kallos/keyboard.json
@@ -42,6 +42,12 @@
         "cols": ["F5", "F6", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "F7", "D2", "D1", "B7"],
         "rows": ["B3", "B2", "F0", "C7", "F4", "F1"]
     },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
     "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
diff --git a/keyboards/cipulot/kawayo/config.h b/keyboards/cipulot/kawayo/config.h
deleted file mode 100644
index a08011b9cf9..00000000000
--- a/keyboards/cipulot/kawayo/config.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/* Copyright 2022 Cipulot
- *
- * 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 3 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
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/cipulot/kawayo/keyboard.json b/keyboards/cipulot/kawayo/keyboard.json
index ac4d24b9b53..4e235e4e4ac 100644
--- a/keyboards/cipulot/kawayo/keyboard.json
+++ b/keyboards/cipulot/kawayo/keyboard.json
@@ -15,6 +15,12 @@
         "cols": ["B10", "A0", "B9", "B8", "B7", "B6", "B5", "B4", "B3", "A15", "A14", "A4", "A3", "A2", "A1"],
         "rows": ["B1", "B12", "C13", "A7", "B0"]
     },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
     "diode_direction": "COL2ROW",
     "processor": "STM32F411",
     "bootloader": "stm32-dfu",
diff --git a/keyboards/cipulot/mnk_60_ec/info.json b/keyboards/cipulot/mnk_60_ec/keyboard.json
similarity index 100%
rename from keyboards/cipulot/mnk_60_ec/info.json
rename to keyboards/cipulot/mnk_60_ec/keyboard.json
diff --git a/keyboards/cipulot/mnk_65_ec/info.json b/keyboards/cipulot/mnk_65_ec/keyboard.json
similarity index 100%
rename from keyboards/cipulot/mnk_65_ec/info.json
rename to keyboards/cipulot/mnk_65_ec/keyboard.json
diff --git a/keyboards/cipulot/rf_r1_8_9xu/config.h b/keyboards/cipulot/rf_r1_8_9xu/config.h
index fbd65f259fd..cd98ff7f3da 100644
--- a/keyboards/cipulot/rf_r1_8_9xu/config.h
+++ b/keyboards/cipulot/rf_r1_8_9xu/config.h
@@ -63,9 +63,3 @@
 // #define DEBUG_MATRIX_SCAN_RATE
 #define DYNAMIC_KEYMAP_LAYER_COUNT 3
 #define EECONFIG_KB_DATA_SIZE 201
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/cipulot/rf_r1_8_9xu/info.json b/keyboards/cipulot/rf_r1_8_9xu/info.json
deleted file mode 100644
index 6d3ab8b7091..00000000000
--- a/keyboards/cipulot/rf_r1_8_9xu/info.json
+++ /dev/null
@@ -1,427 +0,0 @@
-{
-    "manufacturer": "Cipulot",
-    "keyboard_name": "RF R1 8-9Xu",
-    "maintainer": "Cipulot",
-    "bootloader": "stm32-dfu",
-    "build": {
-        "lto": true
-    },
-    "diode_direction": "COL2ROW",
-    "features": {
-        "bootmagic": false,
-        "console": true,
-        "extrakey": true,
-        "mousekey": true,
-        "nkro": true,
-        "rgblight": true
-    },
-    "indicators": {
-        "caps_lock": "B3",
-        "scroll_lock": "A14"
-    },
-    "processor": "STM32F401",
-    "rgblight": {
-        "led_count": 22,
-        "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
-        }
-    },
-    "ws2812": {
-        "pin": "A15"
-    },
-    "url": "https://www.github.com/Cipulot/RF_R1_8-9Xu",
-    "usb": {
-        "device_version": "0.0.1",
-        "pid": "0x6B8B",
-        "shared_endpoint": {
-            "keyboard": true
-        },
-        "vid": "0x6369"
-    },
-    "community_layouts": ["tkl_jis", "tkl_iso_tsangan", "tkl_ansi_tsangan"],
-    "layouts": {
-        "LAYOUT_all": {
-            "layout": [
-                {"label": "0,0", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "0,1", "matrix": [0, 1], "x": 2, "y": 0},
-                {"label": "0,2", "matrix": [0, 2], "x": 3, "y": 0},
-                {"label": "0,3", "matrix": [0, 3], "x": 4, "y": 0},
-                {"label": "0,4", "matrix": [0, 4], "x": 5, "y": 0},
-                {"label": "0,5", "matrix": [0, 5], "x": 6.5, "y": 0},
-                {"label": "0,6", "matrix": [0, 6], "x": 7.5, "y": 0},
-                {"label": "0,7", "matrix": [0, 7], "x": 8.5, "y": 0},
-                {"label": "0,8", "matrix": [0, 8], "x": 9.5, "y": 0},
-                {"label": "0,9", "matrix": [0, 9], "x": 11, "y": 0},
-                {"label": "0,10", "matrix": [0, 10], "x": 12, "y": 0},
-                {"label": "0,11", "matrix": [0, 11], "x": 13, "y": 0},
-                {"label": "0,12", "matrix": [0, 12], "x": 14, "y": 0},
-                {"label": "0,13", "matrix": [0, 13], "x": 15.25, "y": 0},
-                {"label": "0,14", "matrix": [0, 14], "x": 16.25, "y": 0},
-                {"label": "0,15", "matrix": [0, 15], "x": 17.25, "y": 0},
-                {"label": "1,0", "matrix": [1, 0], "x": 0, "y": 1.25},
-                {"label": "1,1", "matrix": [1, 1], "x": 1, "y": 1.25},
-                {"label": "1,2", "matrix": [1, 2], "x": 2, "y": 1.25},
-                {"label": "1,3", "matrix": [1, 3], "x": 3, "y": 1.25},
-                {"label": "1,4", "matrix": [1, 4], "x": 4, "y": 1.25},
-                {"label": "1,5", "matrix": [1, 5], "x": 5, "y": 1.25},
-                {"label": "1,6", "matrix": [1, 6], "x": 6, "y": 1.25},
-                {"label": "1,7", "matrix": [1, 7], "x": 7, "y": 1.25},
-                {"label": "1,8", "matrix": [1, 8], "x": 8, "y": 1.25},
-                {"label": "1,9", "matrix": [1, 9], "x": 9, "y": 1.25},
-                {"label": "1,10", "matrix": [1, 10], "x": 10, "y": 1.25},
-                {"label": "1,11", "matrix": [1, 11], "x": 11, "y": 1.25},
-                {"label": "1,12", "matrix": [1, 12], "x": 12, "y": 1.25},
-                {"label": "1,13", "matrix": [1, 13], "x": 13, "y": 1.25},
-                {"label": "1,14", "matrix": [1, 14], "x": 14, "y": 1.25},
-                {"label": "3,14", "matrix": [3, 14], "x": 15.25, "y": 1.25},
-                {"label": "2,15", "matrix": [2, 15], "x": 16.25, "y": 1.25},
-                {"label": "1,15", "matrix": [1, 15], "x": 17.25, "y": 1.25},
-                {"label": "2,0", "matrix": [2, 0], "w": 1.5, "x": 0, "y": 2.25},
-                {"label": "2,1", "matrix": [2, 1], "x": 1.5, "y": 2.25},
-                {"label": "2,2", "matrix": [2, 2], "x": 2.5, "y": 2.25},
-                {"label": "2,3", "matrix": [2, 3], "x": 3.5, "y": 2.25},
-                {"label": "2,4", "matrix": [2, 4], "x": 4.5, "y": 2.25},
-                {"label": "2,5", "matrix": [2, 5], "x": 5.5, "y": 2.25},
-                {"label": "2,6", "matrix": [2, 6], "x": 6.5, "y": 2.25},
-                {"label": "2,7", "matrix": [2, 7], "x": 7.5, "y": 2.25},
-                {"label": "2,8", "matrix": [2, 8], "x": 8.5, "y": 2.25},
-                {"label": "2,9", "matrix": [2, 9], "x": 9.5, "y": 2.25},
-                {"label": "2,10", "matrix": [2, 10], "x": 10.5, "y": 2.25},
-                {"label": "2,11", "matrix": [2, 11], "x": 11.5, "y": 2.25},
-                {"label": "2,12", "matrix": [2, 12], "x": 12.5, "y": 2.25},
-                {"label": "2,13", "matrix": [2, 13], "w": 0.75, "x": 13.5, "y": 2.25},
-                {"label": "2,14", "matrix": [2, 14], "w": 0.75, "x": 14.25, "y": 2.25},
-                {"label": "4,14", "matrix": [4, 14], "x": 15.25, "y": 2.25},
-                {"label": "4,15", "matrix": [4, 15], "x": 16.25, "y": 2.25},
-                {"label": "3,15", "matrix": [3, 15], "x": 17.25, "y": 2.25},
-                {"label": "3,0", "matrix": [3, 0], "w": 1.75, "x": 0, "y": 3.25},
-                {"label": "3,1", "matrix": [3, 1], "x": 1.75, "y": 3.25},
-                {"label": "3,2", "matrix": [3, 2], "x": 2.75, "y": 3.25},
-                {"label": "3,3", "matrix": [3, 3], "x": 3.75, "y": 3.25},
-                {"label": "3,4", "matrix": [3, 4], "x": 4.75, "y": 3.25},
-                {"label": "3,5", "matrix": [3, 5], "x": 5.75, "y": 3.25},
-                {"label": "3,6", "matrix": [3, 6], "x": 6.75, "y": 3.25},
-                {"label": "3,7", "matrix": [3, 7], "x": 7.75, "y": 3.25},
-                {"label": "3,8", "matrix": [3, 8], "x": 8.75, "y": 3.25},
-                {"label": "3,9", "matrix": [3, 9], "x": 9.75, "y": 3.25},
-                {"label": "3,10", "matrix": [3, 10], "x": 10.75, "y": 3.25},
-                {"label": "3,11", "matrix": [3, 11], "x": 11.75, "y": 3.25},
-                {"label": "3,12", "matrix": [3, 12], "x": 12.75, "y": 3.25},
-                {"label": "3,13", "matrix": [3, 13], "w": 1.25, "x": 13.75, "y": 3.25},
-                {"label": "4,0", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4.25},
-                {"label": "4,1", "matrix": [4, 1], "x": 1.25, "y": 4.25},
-                {"label": "4,2", "matrix": [4, 2], "x": 2.25, "y": 4.25},
-                {"label": "4,3", "matrix": [4, 3], "x": 3.25, "y": 4.25},
-                {"label": "4,4", "matrix": [4, 4], "x": 4.25, "y": 4.25},
-                {"label": "4,5", "matrix": [4, 5], "x": 5.25, "y": 4.25},
-                {"label": "4,6", "matrix": [4, 6], "x": 6.25, "y": 4.25},
-                {"label": "4,7", "matrix": [4, 7], "x": 7.25, "y": 4.25},
-                {"label": "4,8", "matrix": [4, 8], "x": 8.25, "y": 4.25},
-                {"label": "4,9", "matrix": [4, 9], "x": 9.25, "y": 4.25},
-                {"label": "4,10", "matrix": [4, 10], "x": 10.25, "y": 4.25},
-                {"label": "4,11", "matrix": [4, 11], "x": 11.25, "y": 4.25},
-                {"label": "4,12", "matrix": [4, 12], "x": 12.25, "y": 4.25},
-                {"label": "4,13", "matrix": [4, 13], "w": 1.75, "x": 13.25, "y": 4.25},
-                {"label": "5,14", "matrix": [5, 14], "x": 16.25, "y": 4.25},
-                {"label": "5,0", "matrix": [5, 0], "w": 1.5, "x": 0, "y": 5.25},
-                {"label": "5,1", "matrix": [5, 1], "x": 1.5, "y": 5.25},
-                {"label": "5,2", "matrix": [5, 2], "w": 1.5, "x": 2.5, "y": 5.25},
-                {"label": "5,4", "matrix": [5, 4], "w": 1.5, "x": 4, "y": 5.25},
-                {"label": "5,6", "matrix": [5, 6], "w": 2.5, "x": 5.5, "y": 5.25},
-                {"label": "5,7", "matrix": [5, 7], "w": 1.5, "x": 8, "y": 5.25},
-                {"label": "5,8", "matrix": [5, 8], "w": 1.5, "x": 9.5, "y": 5.25},
-                {"label": "5,9", "matrix": [5, 9], "w": 1.5, "x": 11, "y": 5.25},
-                {"label": "5,10", "matrix": [5, 10], "x": 12.5, "y": 5.25},
-                {"label": "5,11", "matrix": [5, 11], "w": 1.5, "x": 13.5, "y": 5.25},
-                {"label": "5,12", "matrix": [5, 12], "x": 15.25, "y": 5.25},
-                {"label": "5,13", "matrix": [5, 13], "x": 16.25, "y": 5.25},
-                {"label": "5,15", "matrix": [5, 15], "x": 17.25, "y": 5.25}
-            ]
-        },
-        "LAYOUT_tkl_ansi_tsangan": {
-            "layout": [
-                {"label": "0,0", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "0,1", "matrix": [0, 1], "x": 2, "y": 0},
-                {"label": "0,2", "matrix": [0, 2], "x": 3, "y": 0},
-                {"label": "0,3", "matrix": [0, 3], "x": 4, "y": 0},
-                {"label": "0,4", "matrix": [0, 4], "x": 5, "y": 0},
-                {"label": "0,5", "matrix": [0, 5], "x": 6.5, "y": 0},
-                {"label": "0,6", "matrix": [0, 6], "x": 7.5, "y": 0},
-                {"label": "0,7", "matrix": [0, 7], "x": 8.5, "y": 0},
-                {"label": "0,8", "matrix": [0, 8], "x": 9.5, "y": 0},
-                {"label": "0,9", "matrix": [0, 9], "x": 11, "y": 0},
-                {"label": "0,10", "matrix": [0, 10], "x": 12, "y": 0},
-                {"label": "0,11", "matrix": [0, 11], "x": 13, "y": 0},
-                {"label": "0,12", "matrix": [0, 12], "x": 14, "y": 0},
-                {"label": "0,13", "matrix": [0, 13], "x": 15.25, "y": 0},
-                {"label": "0,14", "matrix": [0, 14], "x": 16.25, "y": 0},
-                {"label": "0,15", "matrix": [0, 15], "x": 17.25, "y": 0},
-                {"label": "1,0", "matrix": [1, 0], "x": 0, "y": 1.25},
-                {"label": "1,1", "matrix": [1, 1], "x": 1, "y": 1.25},
-                {"label": "1,2", "matrix": [1, 2], "x": 2, "y": 1.25},
-                {"label": "1,3", "matrix": [1, 3], "x": 3, "y": 1.25},
-                {"label": "1,4", "matrix": [1, 4], "x": 4, "y": 1.25},
-                {"label": "1,5", "matrix": [1, 5], "x": 5, "y": 1.25},
-                {"label": "1,6", "matrix": [1, 6], "x": 6, "y": 1.25},
-                {"label": "1,7", "matrix": [1, 7], "x": 7, "y": 1.25},
-                {"label": "1,8", "matrix": [1, 8], "x": 8, "y": 1.25},
-                {"label": "1,9", "matrix": [1, 9], "x": 9, "y": 1.25},
-                {"label": "1,10", "matrix": [1, 10], "x": 10, "y": 1.25},
-                {"label": "1,11", "matrix": [1, 11], "x": 11, "y": 1.25},
-                {"label": "1,12", "matrix": [1, 12], "x": 12, "y": 1.25},
-                {"label": "1,14", "matrix": [1, 14], "w": 2, "x": 13, "y": 1.25},
-                {"label": "3,14", "matrix": [3, 14], "x": 15.25, "y": 1.25},
-                {"label": "2,15", "matrix": [2, 15], "x": 16.25, "y": 1.25},
-                {"label": "1,15", "matrix": [1, 15], "x": 17.25, "y": 1.25},
-                {"label": "2,0", "matrix": [2, 0], "w": 1.5, "x": 0, "y": 2.25},
-                {"label": "2,1", "matrix": [2, 1], "x": 1.5, "y": 2.25},
-                {"label": "2,2", "matrix": [2, 2], "x": 2.5, "y": 2.25},
-                {"label": "2,3", "matrix": [2, 3], "x": 3.5, "y": 2.25},
-                {"label": "2,4", "matrix": [2, 4], "x": 4.5, "y": 2.25},
-                {"label": "2,5", "matrix": [2, 5], "x": 5.5, "y": 2.25},
-                {"label": "2,6", "matrix": [2, 6], "x": 6.5, "y": 2.25},
-                {"label": "2,7", "matrix": [2, 7], "x": 7.5, "y": 2.25},
-                {"label": "2,8", "matrix": [2, 8], "x": 8.5, "y": 2.25},
-                {"label": "2,9", "matrix": [2, 9], "x": 9.5, "y": 2.25},
-                {"label": "2,10", "matrix": [2, 10], "x": 10.5, "y": 2.25},
-                {"label": "2,11", "matrix": [2, 11], "x": 11.5, "y": 2.25},
-                {"label": "2,12", "matrix": [2, 12], "x": 12.5, "y": 2.25},
-                {"label": "2,13", "matrix": [2, 13], "w": 1.5, "x": 13.5, "y": 2.25},
-                {"label": "4,14", "matrix": [4, 14], "x": 15.25, "y": 2.25},
-                {"label": "4,15", "matrix": [4, 15], "x": 16.25, "y": 2.25},
-                {"label": "3,15", "matrix": [3, 15], "x": 17.25, "y": 2.25},
-                {"label": "3,0", "matrix": [3, 0], "w": 1.75, "x": 0, "y": 3.25},
-                {"label": "3,1", "matrix": [3, 1], "x": 1.75, "y": 3.25},
-                {"label": "3,2", "matrix": [3, 2], "x": 2.75, "y": 3.25},
-                {"label": "3,3", "matrix": [3, 3], "x": 3.75, "y": 3.25},
-                {"label": "3,4", "matrix": [3, 4], "x": 4.75, "y": 3.25},
-                {"label": "3,5", "matrix": [3, 5], "x": 5.75, "y": 3.25},
-                {"label": "3,6", "matrix": [3, 6], "x": 6.75, "y": 3.25},
-                {"label": "3,7", "matrix": [3, 7], "x": 7.75, "y": 3.25},
-                {"label": "3,8", "matrix": [3, 8], "x": 8.75, "y": 3.25},
-                {"label": "3,9", "matrix": [3, 9], "x": 9.75, "y": 3.25},
-                {"label": "3,10", "matrix": [3, 10], "x": 10.75, "y": 3.25},
-                {"label": "3,11", "matrix": [3, 11], "x": 11.75, "y": 3.25},
-                {"label": "3,13", "matrix": [3, 13], "w": 2.25, "x": 12.75, "y": 3.25},
-                {"label": "4,0", "matrix": [4, 0], "w": 2.25, "x": 0, "y": 4.25},
-                {"label": "4,2", "matrix": [4, 2], "x": 2.25, "y": 4.25},
-                {"label": "4,3", "matrix": [4, 3], "x": 3.25, "y": 4.25},
-                {"label": "4,4", "matrix": [4, 4], "x": 4.25, "y": 4.25},
-                {"label": "4,5", "matrix": [4, 5], "x": 5.25, "y": 4.25},
-                {"label": "4,6", "matrix": [4, 6], "x": 6.25, "y": 4.25},
-                {"label": "4,7", "matrix": [4, 7], "x": 7.25, "y": 4.25},
-                {"label": "4,8", "matrix": [4, 8], "x": 8.25, "y": 4.25},
-                {"label": "4,9", "matrix": [4, 9], "x": 9.25, "y": 4.25},
-                {"label": "4,10", "matrix": [4, 10], "x": 10.25, "y": 4.25},
-                {"label": "4,11", "matrix": [4, 11], "x": 11.25, "y": 4.25},
-                {"label": "4,13", "matrix": [4, 13], "w": 2.75, "x": 12.25, "y": 4.25},
-                {"label": "5,14", "matrix": [5, 14], "x": 16.25, "y": 4.25},
-                {"label": "5,0", "matrix": [5, 0], "w": 1.5, "x": 0, "y": 5.25},
-                {"label": "5,1", "matrix": [5, 1], "x": 1.5, "y": 5.25},
-                {"label": "5,2", "matrix": [5, 2], "w": 1.5, "x": 2.5, "y": 5.25},
-                {"label": "5,6", "matrix": [5, 6], "w": 7, "x": 4, "y": 5.25},
-                {"label": "5,9", "matrix": [5, 9], "w": 1.5, "x": 11, "y": 5.25},
-                {"label": "5,10", "matrix": [5, 10], "x": 12.5, "y": 5.25},
-                {"label": "5,11", "matrix": [5, 11], "w": 1.5, "x": 13.5, "y": 5.25},
-                {"label": "5,12", "matrix": [5, 12], "x": 15.25, "y": 5.25},
-                {"label": "5,13", "matrix": [5, 13], "x": 16.25, "y": 5.25},
-                {"label": "5,15", "matrix": [5, 15], "x": 17.25, "y": 5.25}
-            ]
-        },
-        "LAYOUT_tkl_iso_tsangan": {
-            "layout": [
-                {"label": "0,0", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "0,1", "matrix": [0, 1], "x": 2, "y": 0},
-                {"label": "0,2", "matrix": [0, 2], "x": 3, "y": 0},
-                {"label": "0,3", "matrix": [0, 3], "x": 4, "y": 0},
-                {"label": "0,4", "matrix": [0, 4], "x": 5, "y": 0},
-                {"label": "0,5", "matrix": [0, 5], "x": 6.5, "y": 0},
-                {"label": "0,6", "matrix": [0, 6], "x": 7.5, "y": 0},
-                {"label": "0,7", "matrix": [0, 7], "x": 8.5, "y": 0},
-                {"label": "0,8", "matrix": [0, 8], "x": 9.5, "y": 0},
-                {"label": "0,9", "matrix": [0, 9], "x": 11, "y": 0},
-                {"label": "0,10", "matrix": [0, 10], "x": 12, "y": 0},
-                {"label": "0,11", "matrix": [0, 11], "x": 13, "y": 0},
-                {"label": "0,12", "matrix": [0, 12], "x": 14, "y": 0},
-                {"label": "0,13", "matrix": [0, 13], "x": 15.25, "y": 0},
-                {"label": "0,14", "matrix": [0, 14], "x": 16.25, "y": 0},
-                {"label": "0,15", "matrix": [0, 15], "x": 17.25, "y": 0},
-                {"label": "1,0", "matrix": [1, 0], "x": 0, "y": 1.25},
-                {"label": "1,1", "matrix": [1, 1], "x": 1, "y": 1.25},
-                {"label": "1,2", "matrix": [1, 2], "x": 2, "y": 1.25},
-                {"label": "1,3", "matrix": [1, 3], "x": 3, "y": 1.25},
-                {"label": "1,4", "matrix": [1, 4], "x": 4, "y": 1.25},
-                {"label": "1,5", "matrix": [1, 5], "x": 5, "y": 1.25},
-                {"label": "1,6", "matrix": [1, 6], "x": 6, "y": 1.25},
-                {"label": "1,7", "matrix": [1, 7], "x": 7, "y": 1.25},
-                {"label": "1,8", "matrix": [1, 8], "x": 8, "y": 1.25},
-                {"label": "1,9", "matrix": [1, 9], "x": 9, "y": 1.25},
-                {"label": "1,10", "matrix": [1, 10], "x": 10, "y": 1.25},
-                {"label": "1,11", "matrix": [1, 11], "x": 11, "y": 1.25},
-                {"label": "1,12", "matrix": [1, 12], "x": 12, "y": 1.25},
-                {"label": "1,14", "matrix": [1, 14], "w": 2, "x": 13, "y": 1.25},
-                {"label": "3,14", "matrix": [3, 14], "x": 15.25, "y": 1.25},
-                {"label": "2,15", "matrix": [2, 15], "x": 16.25, "y": 1.25},
-                {"label": "1,15", "matrix": [1, 15], "x": 17.25, "y": 1.25},
-                {"label": "2,0", "matrix": [2, 0], "w": 1.5, "x": 0, "y": 2.25},
-                {"label": "2,1", "matrix": [2, 1], "x": 1.5, "y": 2.25},
-                {"label": "2,2", "matrix": [2, 2], "x": 2.5, "y": 2.25},
-                {"label": "2,3", "matrix": [2, 3], "x": 3.5, "y": 2.25},
-                {"label": "2,4", "matrix": [2, 4], "x": 4.5, "y": 2.25},
-                {"label": "2,5", "matrix": [2, 5], "x": 5.5, "y": 2.25},
-                {"label": "2,6", "matrix": [2, 6], "x": 6.5, "y": 2.25},
-                {"label": "2,7", "matrix": [2, 7], "x": 7.5, "y": 2.25},
-                {"label": "2,8", "matrix": [2, 8], "x": 8.5, "y": 2.25},
-                {"label": "2,9", "matrix": [2, 9], "x": 9.5, "y": 2.25},
-                {"label": "2,10", "matrix": [2, 10], "x": 10.5, "y": 2.25},
-                {"label": "2,11", "matrix": [2, 11], "x": 11.5, "y": 2.25},
-                {"label": "2,12", "matrix": [2, 12], "x": 12.5, "y": 2.25},
-                {"h": 2, "label": "2,14", "matrix": [2, 14], "w": 1.25, "x": 13.75, "y": 2.25},
-                {"label": "4,14", "matrix": [4, 14], "x": 15.25, "y": 2.25},
-                {"label": "4,15", "matrix": [4, 15], "x": 16.25, "y": 2.25},
-                {"label": "3,15", "matrix": [3, 15], "x": 17.25, "y": 2.25},
-                {"label": "3,0", "matrix": [3, 0], "w": 1.75, "x": 0, "y": 3.25},
-                {"label": "3,1", "matrix": [3, 1], "x": 1.75, "y": 3.25},
-                {"label": "3,2", "matrix": [3, 2], "x": 2.75, "y": 3.25},
-                {"label": "3,3", "matrix": [3, 3], "x": 3.75, "y": 3.25},
-                {"label": "3,4", "matrix": [3, 4], "x": 4.75, "y": 3.25},
-                {"label": "3,5", "matrix": [3, 5], "x": 5.75, "y": 3.25},
-                {"label": "3,6", "matrix": [3, 6], "x": 6.75, "y": 3.25},
-                {"label": "3,7", "matrix": [3, 7], "x": 7.75, "y": 3.25},
-                {"label": "3,8", "matrix": [3, 8], "x": 8.75, "y": 3.25},
-                {"label": "3,9", "matrix": [3, 9], "x": 9.75, "y": 3.25},
-                {"label": "3,10", "matrix": [3, 10], "x": 10.75, "y": 3.25},
-                {"label": "3,11", "matrix": [3, 11], "x": 11.75, "y": 3.25},
-                {"label": "3,12", "matrix": [3, 12], "x": 12.75, "y": 3.25},
-                {"label": "4,0", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4.25},
-                {"label": "4,1", "matrix": [4, 1], "x": 1.25, "y": 4.25},
-                {"label": "4,2", "matrix": [4, 2], "x": 2.25, "y": 4.25},
-                {"label": "4,3", "matrix": [4, 3], "x": 3.25, "y": 4.25},
-                {"label": "4,4", "matrix": [4, 4], "x": 4.25, "y": 4.25},
-                {"label": "4,5", "matrix": [4, 5], "x": 5.25, "y": 4.25},
-                {"label": "4,6", "matrix": [4, 6], "x": 6.25, "y": 4.25},
-                {"label": "4,7", "matrix": [4, 7], "x": 7.25, "y": 4.25},
-                {"label": "4,8", "matrix": [4, 8], "x": 8.25, "y": 4.25},
-                {"label": "4,9", "matrix": [4, 9], "x": 9.25, "y": 4.25},
-                {"label": "4,10", "matrix": [4, 10], "x": 10.25, "y": 4.25},
-                {"label": "4,11", "matrix": [4, 11], "x": 11.25, "y": 4.25},
-                {"label": "4,13", "matrix": [4, 13], "w": 2.75, "x": 12.25, "y": 4.25},
-                {"label": "5,14", "matrix": [5, 14], "x": 16.25, "y": 4.25},
-                {"label": "5,0", "matrix": [5, 0], "w": 1.5, "x": 0, "y": 5.25},
-                {"label": "5,1", "matrix": [5, 1], "x": 1.5, "y": 5.25},
-                {"label": "5,2", "matrix": [5, 2], "w": 1.5, "x": 2.5, "y": 5.25},
-                {"label": "5,6", "matrix": [5, 6], "w": 7, "x": 4, "y": 5.25},
-                {"label": "5,9", "matrix": [5, 9], "w": 1.5, "x": 11, "y": 5.25},
-                {"label": "5,10", "matrix": [5, 10], "x": 12.5, "y": 5.25},
-                {"label": "5,11", "matrix": [5, 11], "w": 1.5, "x": 13.5, "y": 5.25},
-                {"label": "5,12", "matrix": [5, 12], "x": 15.25, "y": 5.25},
-                {"label": "5,13", "matrix": [5, 13], "x": 16.25, "y": 5.25},
-                {"label": "5,15", "matrix": [5, 15], "x": 17.25, "y": 5.25}
-            ]
-        },
-        "LAYOUT_tkl_jis": {
-            "layout": [
-                {"label": "0,0", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "0,1", "matrix": [0, 1], "x": 2, "y": 0},
-                {"label": "0,2", "matrix": [0, 2], "x": 3, "y": 0},
-                {"label": "0,3", "matrix": [0, 3], "x": 4, "y": 0},
-                {"label": "0,4", "matrix": [0, 4], "x": 5, "y": 0},
-                {"label": "0,5", "matrix": [0, 5], "x": 6.5, "y": 0},
-                {"label": "0,6", "matrix": [0, 6], "x": 7.5, "y": 0},
-                {"label": "0,7", "matrix": [0, 7], "x": 8.5, "y": 0},
-                {"label": "0,8", "matrix": [0, 8], "x": 9.5, "y": 0},
-                {"label": "0,9", "matrix": [0, 9], "x": 11, "y": 0},
-                {"label": "0,10", "matrix": [0, 10], "x": 12, "y": 0},
-                {"label": "0,11", "matrix": [0, 11], "x": 13, "y": 0},
-                {"label": "0,12", "matrix": [0, 12], "x": 14, "y": 0},
-                {"label": "0,13", "matrix": [0, 13], "x": 15.25, "y": 0},
-                {"label": "0,14", "matrix": [0, 14], "x": 16.25, "y": 0},
-                {"label": "0,15", "matrix": [0, 15], "x": 17.25, "y": 0},
-                {"label": "1,0", "matrix": [1, 0], "x": 0, "y": 1.25},
-                {"label": "1,1", "matrix": [1, 1], "x": 1, "y": 1.25},
-                {"label": "1,2", "matrix": [1, 2], "x": 2, "y": 1.25},
-                {"label": "1,3", "matrix": [1, 3], "x": 3, "y": 1.25},
-                {"label": "1,4", "matrix": [1, 4], "x": 4, "y": 1.25},
-                {"label": "1,5", "matrix": [1, 5], "x": 5, "y": 1.25},
-                {"label": "1,6", "matrix": [1, 6], "x": 6, "y": 1.25},
-                {"label": "1,7", "matrix": [1, 7], "x": 7, "y": 1.25},
-                {"label": "1,8", "matrix": [1, 8], "x": 8, "y": 1.25},
-                {"label": "1,9", "matrix": [1, 9], "x": 9, "y": 1.25},
-                {"label": "1,10", "matrix": [1, 10], "x": 10, "y": 1.25},
-                {"label": "1,11", "matrix": [1, 11], "x": 11, "y": 1.25},
-                {"label": "1,12", "matrix": [1, 12], "x": 12, "y": 1.25},
-                {"label": "1,13", "matrix": [1, 13], "x": 13, "y": 1.25},
-                {"label": "1,14", "matrix": [1, 14], "x": 14, "y": 1.25},
-                {"label": "3,14", "matrix": [3, 14], "x": 15.25, "y": 1.25},
-                {"label": "2,15", "matrix": [2, 15], "x": 16.25, "y": 1.25},
-                {"label": "1,15", "matrix": [1, 15], "x": 17.25, "y": 1.25},
-                {"label": "2,0", "matrix": [2, 0], "w": 1.5, "x": 0, "y": 2.25},
-                {"label": "2,1", "matrix": [2, 1], "x": 1.5, "y": 2.25},
-                {"label": "2,2", "matrix": [2, 2], "x": 2.5, "y": 2.25},
-                {"label": "2,3", "matrix": [2, 3], "x": 3.5, "y": 2.25},
-                {"label": "2,4", "matrix": [2, 4], "x": 4.5, "y": 2.25},
-                {"label": "2,5", "matrix": [2, 5], "x": 5.5, "y": 2.25},
-                {"label": "2,6", "matrix": [2, 6], "x": 6.5, "y": 2.25},
-                {"label": "2,7", "matrix": [2, 7], "x": 7.5, "y": 2.25},
-                {"label": "2,8", "matrix": [2, 8], "x": 8.5, "y": 2.25},
-                {"label": "2,9", "matrix": [2, 9], "x": 9.5, "y": 2.25},
-                {"label": "2,10", "matrix": [2, 10], "x": 10.5, "y": 2.25},
-                {"label": "2,11", "matrix": [2, 11], "x": 11.5, "y": 2.25},
-                {"label": "2,12", "matrix": [2, 12], "x": 12.5, "y": 2.25},
-                {"h": 2, "label": "2,14", "matrix": [2, 14], "w": 1.25, "x": 13.75, "y": 2.25},
-                {"label": "4,14", "matrix": [4, 14], "x": 15.25, "y": 2.25},
-                {"label": "4,15", "matrix": [4, 15], "x": 16.25, "y": 2.25},
-                {"label": "3,15", "matrix": [3, 15], "x": 17.25, "y": 2.25},
-                {"label": "3,0", "matrix": [3, 0], "w": 1.75, "x": 0, "y": 3.25},
-                {"label": "3,1", "matrix": [3, 1], "x": 1.75, "y": 3.25},
-                {"label": "3,2", "matrix": [3, 2], "x": 2.75, "y": 3.25},
-                {"label": "3,3", "matrix": [3, 3], "x": 3.75, "y": 3.25},
-                {"label": "3,4", "matrix": [3, 4], "x": 4.75, "y": 3.25},
-                {"label": "3,5", "matrix": [3, 5], "x": 5.75, "y": 3.25},
-                {"label": "3,6", "matrix": [3, 6], "x": 6.75, "y": 3.25},
-                {"label": "3,7", "matrix": [3, 7], "x": 7.75, "y": 3.25},
-                {"label": "3,8", "matrix": [3, 8], "x": 8.75, "y": 3.25},
-                {"label": "3,9", "matrix": [3, 9], "x": 9.75, "y": 3.25},
-                {"label": "3,10", "matrix": [3, 10], "x": 10.75, "y": 3.25},
-                {"label": "3,11", "matrix": [3, 11], "x": 11.75, "y": 3.25},
-                {"label": "3,12", "matrix": [3, 12], "x": 12.75, "y": 3.25},
-                {"label": "4,0", "matrix": [4, 0], "w": 2.25, "x": 0, "y": 4.25},
-                {"label": "4,2", "matrix": [4, 2], "x": 2.25, "y": 4.25},
-                {"label": "4,3", "matrix": [4, 3], "x": 3.25, "y": 4.25},
-                {"label": "4,4", "matrix": [4, 4], "x": 4.25, "y": 4.25},
-                {"label": "4,5", "matrix": [4, 5], "x": 5.25, "y": 4.25},
-                {"label": "4,6", "matrix": [4, 6], "x": 6.25, "y": 4.25},
-                {"label": "4,7", "matrix": [4, 7], "x": 7.25, "y": 4.25},
-                {"label": "4,8", "matrix": [4, 8], "x": 8.25, "y": 4.25},
-                {"label": "4,9", "matrix": [4, 9], "x": 9.25, "y": 4.25},
-                {"label": "4,10", "matrix": [4, 10], "x": 10.25, "y": 4.25},
-                {"label": "4,11", "matrix": [4, 11], "x": 11.25, "y": 4.25},
-                {"label": "4,12", "matrix": [4, 12], "x": 12.25, "y": 4.25},
-                {"label": "4,13", "matrix": [4, 13], "w": 1.75, "x": 13.25, "y": 4.25},
-                {"label": "5,14", "matrix": [5, 14], "x": 16.25, "y": 4.25},
-                {"label": "5,0", "matrix": [5, 0], "w": 1.5, "x": 0, "y": 5.25},
-                {"label": "5,1", "matrix": [5, 1], "x": 1.5, "y": 5.25},
-                {"label": "5,2", "matrix": [5, 2], "w": 1.5, "x": 2.5, "y": 5.25},
-                {"label": "5,4", "matrix": [5, 4], "w": 1.5, "x": 4, "y": 5.25},
-                {"label": "5,6", "matrix": [5, 6], "w": 2.5, "x": 5.5, "y": 5.25},
-                {"label": "5,7", "matrix": [5, 7], "w": 1.5, "x": 8, "y": 5.25},
-                {"label": "5,8", "matrix": [5, 8], "w": 1.5, "x": 9.5, "y": 5.25},
-                {"label": "5,9", "matrix": [5, 9], "w": 1.5, "x": 11, "y": 5.25},
-                {"label": "5,10", "matrix": [5, 10], "x": 12.5, "y": 5.25},
-                {"label": "5,11", "matrix": [5, 11], "w": 1.5, "x": 13.5, "y": 5.25},
-                {"label": "5,12", "matrix": [5, 12], "x": 15.25, "y": 5.25},
-                {"label": "5,13", "matrix": [5, 13], "x": 16.25, "y": 5.25},
-                {"label": "5,15", "matrix": [5, 15], "x": 17.25, "y": 5.25}
-            ]
-        }
-    }
-}
diff --git a/keyboards/cipulot/rf_r1_8_9xu/keyboard.json b/keyboards/cipulot/rf_r1_8_9xu/keyboard.json
new file mode 100644
index 00000000000..4c1a0e4384c
--- /dev/null
+++ b/keyboards/cipulot/rf_r1_8_9xu/keyboard.json
@@ -0,0 +1,432 @@
+{
+    "manufacturer": "Cipulot",
+    "keyboard_name": "RF R1 8-9Xu",
+    "maintainer": "Cipulot",
+    "bootloader": "stm32-dfu",
+    "build": {
+        "lto": true
+    },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": false,
+        "console": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgblight": true
+    },
+    "indicators": {
+        "caps_lock": "B3",
+        "scroll_lock": "A14"
+    },
+    "processor": "STM32F401",
+    "rgblight": {
+        "led_count": 22,
+        "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
+        }
+    },
+    "ws2812": {
+        "pin": "A15"
+    },
+    "url": "https://www.github.com/Cipulot/RF_R1_8-9Xu",
+    "usb": {
+        "device_version": "0.0.1",
+        "pid": "0x6B8B",
+        "shared_endpoint": {
+            "keyboard": true
+        },
+        "vid": "0x6369"
+    },
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                {"label": "0,0", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "0,1", "matrix": [0, 1], "x": 2, "y": 0},
+                {"label": "0,2", "matrix": [0, 2], "x": 3, "y": 0},
+                {"label": "0,3", "matrix": [0, 3], "x": 4, "y": 0},
+                {"label": "0,4", "matrix": [0, 4], "x": 5, "y": 0},
+                {"label": "0,5", "matrix": [0, 5], "x": 6.5, "y": 0},
+                {"label": "0,6", "matrix": [0, 6], "x": 7.5, "y": 0},
+                {"label": "0,7", "matrix": [0, 7], "x": 8.5, "y": 0},
+                {"label": "0,8", "matrix": [0, 8], "x": 9.5, "y": 0},
+                {"label": "0,9", "matrix": [0, 9], "x": 11, "y": 0},
+                {"label": "0,10", "matrix": [0, 10], "x": 12, "y": 0},
+                {"label": "0,11", "matrix": [0, 11], "x": 13, "y": 0},
+                {"label": "0,12", "matrix": [0, 12], "x": 14, "y": 0},
+                {"label": "0,13", "matrix": [0, 13], "x": 15.25, "y": 0},
+                {"label": "0,14", "matrix": [0, 14], "x": 16.25, "y": 0},
+                {"label": "0,15", "matrix": [0, 15], "x": 17.25, "y": 0},
+                {"label": "1,0", "matrix": [1, 0], "x": 0, "y": 1.25},
+                {"label": "1,1", "matrix": [1, 1], "x": 1, "y": 1.25},
+                {"label": "1,2", "matrix": [1, 2], "x": 2, "y": 1.25},
+                {"label": "1,3", "matrix": [1, 3], "x": 3, "y": 1.25},
+                {"label": "1,4", "matrix": [1, 4], "x": 4, "y": 1.25},
+                {"label": "1,5", "matrix": [1, 5], "x": 5, "y": 1.25},
+                {"label": "1,6", "matrix": [1, 6], "x": 6, "y": 1.25},
+                {"label": "1,7", "matrix": [1, 7], "x": 7, "y": 1.25},
+                {"label": "1,8", "matrix": [1, 8], "x": 8, "y": 1.25},
+                {"label": "1,9", "matrix": [1, 9], "x": 9, "y": 1.25},
+                {"label": "1,10", "matrix": [1, 10], "x": 10, "y": 1.25},
+                {"label": "1,11", "matrix": [1, 11], "x": 11, "y": 1.25},
+                {"label": "1,12", "matrix": [1, 12], "x": 12, "y": 1.25},
+                {"label": "1,13", "matrix": [1, 13], "x": 13, "y": 1.25},
+                {"label": "1,14", "matrix": [1, 14], "x": 14, "y": 1.25},
+                {"label": "3,14", "matrix": [3, 14], "x": 15.25, "y": 1.25},
+                {"label": "2,15", "matrix": [2, 15], "x": 16.25, "y": 1.25},
+                {"label": "1,15", "matrix": [1, 15], "x": 17.25, "y": 1.25},
+                {"label": "2,0", "matrix": [2, 0], "w": 1.5, "x": 0, "y": 2.25},
+                {"label": "2,1", "matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"label": "2,2", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"label": "2,3", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"label": "2,4", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"label": "2,5", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"label": "2,6", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"label": "2,7", "matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"label": "2,8", "matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"label": "2,9", "matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"label": "2,10", "matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"label": "2,11", "matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"label": "2,12", "matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"label": "2,13", "matrix": [2, 13], "w": 0.75, "x": 13.5, "y": 2.25},
+                {"label": "2,14", "matrix": [2, 14], "w": 0.75, "x": 14.25, "y": 2.25},
+                {"label": "4,14", "matrix": [4, 14], "x": 15.25, "y": 2.25},
+                {"label": "4,15", "matrix": [4, 15], "x": 16.25, "y": 2.25},
+                {"label": "3,15", "matrix": [3, 15], "x": 17.25, "y": 2.25},
+                {"label": "3,0", "matrix": [3, 0], "w": 1.75, "x": 0, "y": 3.25},
+                {"label": "3,1", "matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"label": "3,2", "matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"label": "3,3", "matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"label": "3,4", "matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"label": "3,5", "matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"label": "3,6", "matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"label": "3,7", "matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"label": "3,8", "matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"label": "3,9", "matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"label": "3,10", "matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"label": "3,11", "matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"label": "3,12", "matrix": [3, 12], "x": 12.75, "y": 3.25},
+                {"label": "3,13", "matrix": [3, 13], "w": 1.25, "x": 13.75, "y": 3.25},
+                {"label": "4,0", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4.25},
+                {"label": "4,1", "matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"label": "4,2", "matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"label": "4,3", "matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"label": "4,4", "matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"label": "4,5", "matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"label": "4,6", "matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"label": "4,7", "matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"label": "4,8", "matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"label": "4,9", "matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"label": "4,10", "matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"label": "4,11", "matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"label": "4,12", "matrix": [4, 12], "x": 12.25, "y": 4.25},
+                {"label": "4,13", "matrix": [4, 13], "w": 1.75, "x": 13.25, "y": 4.25},
+                {"label": "5,14", "matrix": [5, 14], "x": 16.25, "y": 4.25},
+                {"label": "5,0", "matrix": [5, 0], "w": 1.5, "x": 0, "y": 5.25},
+                {"label": "5,1", "matrix": [5, 1], "x": 1.5, "y": 5.25},
+                {"label": "5,2", "matrix": [5, 2], "w": 1.5, "x": 2.5, "y": 5.25},
+                {"label": "5,4", "matrix": [5, 4], "w": 1.5, "x": 4, "y": 5.25},
+                {"label": "5,6", "matrix": [5, 6], "w": 2.5, "x": 5.5, "y": 5.25},
+                {"label": "5,7", "matrix": [5, 7], "w": 1.5, "x": 8, "y": 5.25},
+                {"label": "5,8", "matrix": [5, 8], "w": 1.5, "x": 9.5, "y": 5.25},
+                {"label": "5,9", "matrix": [5, 9], "w": 1.5, "x": 11, "y": 5.25},
+                {"label": "5,10", "matrix": [5, 10], "x": 12.5, "y": 5.25},
+                {"label": "5,11", "matrix": [5, 11], "w": 1.5, "x": 13.5, "y": 5.25},
+                {"label": "5,12", "matrix": [5, 12], "x": 15.25, "y": 5.25},
+                {"label": "5,13", "matrix": [5, 13], "x": 16.25, "y": 5.25},
+                {"label": "5,15", "matrix": [5, 15], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_ansi_tsangan": {
+            "layout": [
+                {"label": "0,0", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "0,1", "matrix": [0, 1], "x": 2, "y": 0},
+                {"label": "0,2", "matrix": [0, 2], "x": 3, "y": 0},
+                {"label": "0,3", "matrix": [0, 3], "x": 4, "y": 0},
+                {"label": "0,4", "matrix": [0, 4], "x": 5, "y": 0},
+                {"label": "0,5", "matrix": [0, 5], "x": 6.5, "y": 0},
+                {"label": "0,6", "matrix": [0, 6], "x": 7.5, "y": 0},
+                {"label": "0,7", "matrix": [0, 7], "x": 8.5, "y": 0},
+                {"label": "0,8", "matrix": [0, 8], "x": 9.5, "y": 0},
+                {"label": "0,9", "matrix": [0, 9], "x": 11, "y": 0},
+                {"label": "0,10", "matrix": [0, 10], "x": 12, "y": 0},
+                {"label": "0,11", "matrix": [0, 11], "x": 13, "y": 0},
+                {"label": "0,12", "matrix": [0, 12], "x": 14, "y": 0},
+                {"label": "0,13", "matrix": [0, 13], "x": 15.25, "y": 0},
+                {"label": "0,14", "matrix": [0, 14], "x": 16.25, "y": 0},
+                {"label": "0,15", "matrix": [0, 15], "x": 17.25, "y": 0},
+                {"label": "1,0", "matrix": [1, 0], "x": 0, "y": 1.25},
+                {"label": "1,1", "matrix": [1, 1], "x": 1, "y": 1.25},
+                {"label": "1,2", "matrix": [1, 2], "x": 2, "y": 1.25},
+                {"label": "1,3", "matrix": [1, 3], "x": 3, "y": 1.25},
+                {"label": "1,4", "matrix": [1, 4], "x": 4, "y": 1.25},
+                {"label": "1,5", "matrix": [1, 5], "x": 5, "y": 1.25},
+                {"label": "1,6", "matrix": [1, 6], "x": 6, "y": 1.25},
+                {"label": "1,7", "matrix": [1, 7], "x": 7, "y": 1.25},
+                {"label": "1,8", "matrix": [1, 8], "x": 8, "y": 1.25},
+                {"label": "1,9", "matrix": [1, 9], "x": 9, "y": 1.25},
+                {"label": "1,10", "matrix": [1, 10], "x": 10, "y": 1.25},
+                {"label": "1,11", "matrix": [1, 11], "x": 11, "y": 1.25},
+                {"label": "1,12", "matrix": [1, 12], "x": 12, "y": 1.25},
+                {"label": "1,14", "matrix": [1, 14], "w": 2, "x": 13, "y": 1.25},
+                {"label": "3,14", "matrix": [3, 14], "x": 15.25, "y": 1.25},
+                {"label": "2,15", "matrix": [2, 15], "x": 16.25, "y": 1.25},
+                {"label": "1,15", "matrix": [1, 15], "x": 17.25, "y": 1.25},
+                {"label": "2,0", "matrix": [2, 0], "w": 1.5, "x": 0, "y": 2.25},
+                {"label": "2,1", "matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"label": "2,2", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"label": "2,3", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"label": "2,4", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"label": "2,5", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"label": "2,6", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"label": "2,7", "matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"label": "2,8", "matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"label": "2,9", "matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"label": "2,10", "matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"label": "2,11", "matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"label": "2,12", "matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"label": "2,13", "matrix": [2, 13], "w": 1.5, "x": 13.5, "y": 2.25},
+                {"label": "4,14", "matrix": [4, 14], "x": 15.25, "y": 2.25},
+                {"label": "4,15", "matrix": [4, 15], "x": 16.25, "y": 2.25},
+                {"label": "3,15", "matrix": [3, 15], "x": 17.25, "y": 2.25},
+                {"label": "3,0", "matrix": [3, 0], "w": 1.75, "x": 0, "y": 3.25},
+                {"label": "3,1", "matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"label": "3,2", "matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"label": "3,3", "matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"label": "3,4", "matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"label": "3,5", "matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"label": "3,6", "matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"label": "3,7", "matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"label": "3,8", "matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"label": "3,9", "matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"label": "3,10", "matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"label": "3,11", "matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"label": "3,13", "matrix": [3, 13], "w": 2.25, "x": 12.75, "y": 3.25},
+                {"label": "4,0", "matrix": [4, 0], "w": 2.25, "x": 0, "y": 4.25},
+                {"label": "4,2", "matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"label": "4,3", "matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"label": "4,4", "matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"label": "4,5", "matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"label": "4,6", "matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"label": "4,7", "matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"label": "4,8", "matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"label": "4,9", "matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"label": "4,10", "matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"label": "4,11", "matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"label": "4,13", "matrix": [4, 13], "w": 2.75, "x": 12.25, "y": 4.25},
+                {"label": "5,14", "matrix": [5, 14], "x": 16.25, "y": 4.25},
+                {"label": "5,0", "matrix": [5, 0], "w": 1.5, "x": 0, "y": 5.25},
+                {"label": "5,1", "matrix": [5, 1], "x": 1.5, "y": 5.25},
+                {"label": "5,2", "matrix": [5, 2], "w": 1.5, "x": 2.5, "y": 5.25},
+                {"label": "5,6", "matrix": [5, 6], "w": 7, "x": 4, "y": 5.25},
+                {"label": "5,9", "matrix": [5, 9], "w": 1.5, "x": 11, "y": 5.25},
+                {"label": "5,10", "matrix": [5, 10], "x": 12.5, "y": 5.25},
+                {"label": "5,11", "matrix": [5, 11], "w": 1.5, "x": 13.5, "y": 5.25},
+                {"label": "5,12", "matrix": [5, 12], "x": 15.25, "y": 5.25},
+                {"label": "5,13", "matrix": [5, 13], "x": 16.25, "y": 5.25},
+                {"label": "5,15", "matrix": [5, 15], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_iso_tsangan": {
+            "layout": [
+                {"label": "0,0", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "0,1", "matrix": [0, 1], "x": 2, "y": 0},
+                {"label": "0,2", "matrix": [0, 2], "x": 3, "y": 0},
+                {"label": "0,3", "matrix": [0, 3], "x": 4, "y": 0},
+                {"label": "0,4", "matrix": [0, 4], "x": 5, "y": 0},
+                {"label": "0,5", "matrix": [0, 5], "x": 6.5, "y": 0},
+                {"label": "0,6", "matrix": [0, 6], "x": 7.5, "y": 0},
+                {"label": "0,7", "matrix": [0, 7], "x": 8.5, "y": 0},
+                {"label": "0,8", "matrix": [0, 8], "x": 9.5, "y": 0},
+                {"label": "0,9", "matrix": [0, 9], "x": 11, "y": 0},
+                {"label": "0,10", "matrix": [0, 10], "x": 12, "y": 0},
+                {"label": "0,11", "matrix": [0, 11], "x": 13, "y": 0},
+                {"label": "0,12", "matrix": [0, 12], "x": 14, "y": 0},
+                {"label": "0,13", "matrix": [0, 13], "x": 15.25, "y": 0},
+                {"label": "0,14", "matrix": [0, 14], "x": 16.25, "y": 0},
+                {"label": "0,15", "matrix": [0, 15], "x": 17.25, "y": 0},
+                {"label": "1,0", "matrix": [1, 0], "x": 0, "y": 1.25},
+                {"label": "1,1", "matrix": [1, 1], "x": 1, "y": 1.25},
+                {"label": "1,2", "matrix": [1, 2], "x": 2, "y": 1.25},
+                {"label": "1,3", "matrix": [1, 3], "x": 3, "y": 1.25},
+                {"label": "1,4", "matrix": [1, 4], "x": 4, "y": 1.25},
+                {"label": "1,5", "matrix": [1, 5], "x": 5, "y": 1.25},
+                {"label": "1,6", "matrix": [1, 6], "x": 6, "y": 1.25},
+                {"label": "1,7", "matrix": [1, 7], "x": 7, "y": 1.25},
+                {"label": "1,8", "matrix": [1, 8], "x": 8, "y": 1.25},
+                {"label": "1,9", "matrix": [1, 9], "x": 9, "y": 1.25},
+                {"label": "1,10", "matrix": [1, 10], "x": 10, "y": 1.25},
+                {"label": "1,11", "matrix": [1, 11], "x": 11, "y": 1.25},
+                {"label": "1,12", "matrix": [1, 12], "x": 12, "y": 1.25},
+                {"label": "1,14", "matrix": [1, 14], "w": 2, "x": 13, "y": 1.25},
+                {"label": "3,14", "matrix": [3, 14], "x": 15.25, "y": 1.25},
+                {"label": "2,15", "matrix": [2, 15], "x": 16.25, "y": 1.25},
+                {"label": "1,15", "matrix": [1, 15], "x": 17.25, "y": 1.25},
+                {"label": "2,0", "matrix": [2, 0], "w": 1.5, "x": 0, "y": 2.25},
+                {"label": "2,1", "matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"label": "2,2", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"label": "2,3", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"label": "2,4", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"label": "2,5", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"label": "2,6", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"label": "2,7", "matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"label": "2,8", "matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"label": "2,9", "matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"label": "2,10", "matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"label": "2,11", "matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"label": "2,12", "matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"h": 2, "label": "2,14", "matrix": [2, 14], "w": 1.25, "x": 13.75, "y": 2.25},
+                {"label": "4,14", "matrix": [4, 14], "x": 15.25, "y": 2.25},
+                {"label": "4,15", "matrix": [4, 15], "x": 16.25, "y": 2.25},
+                {"label": "3,15", "matrix": [3, 15], "x": 17.25, "y": 2.25},
+                {"label": "3,0", "matrix": [3, 0], "w": 1.75, "x": 0, "y": 3.25},
+                {"label": "3,1", "matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"label": "3,2", "matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"label": "3,3", "matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"label": "3,4", "matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"label": "3,5", "matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"label": "3,6", "matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"label": "3,7", "matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"label": "3,8", "matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"label": "3,9", "matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"label": "3,10", "matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"label": "3,11", "matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"label": "3,12", "matrix": [3, 12], "x": 12.75, "y": 3.25},
+                {"label": "4,0", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4.25},
+                {"label": "4,1", "matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"label": "4,2", "matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"label": "4,3", "matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"label": "4,4", "matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"label": "4,5", "matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"label": "4,6", "matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"label": "4,7", "matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"label": "4,8", "matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"label": "4,9", "matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"label": "4,10", "matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"label": "4,11", "matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"label": "4,13", "matrix": [4, 13], "w": 2.75, "x": 12.25, "y": 4.25},
+                {"label": "5,14", "matrix": [5, 14], "x": 16.25, "y": 4.25},
+                {"label": "5,0", "matrix": [5, 0], "w": 1.5, "x": 0, "y": 5.25},
+                {"label": "5,1", "matrix": [5, 1], "x": 1.5, "y": 5.25},
+                {"label": "5,2", "matrix": [5, 2], "w": 1.5, "x": 2.5, "y": 5.25},
+                {"label": "5,6", "matrix": [5, 6], "w": 7, "x": 4, "y": 5.25},
+                {"label": "5,9", "matrix": [5, 9], "w": 1.5, "x": 11, "y": 5.25},
+                {"label": "5,10", "matrix": [5, 10], "x": 12.5, "y": 5.25},
+                {"label": "5,11", "matrix": [5, 11], "w": 1.5, "x": 13.5, "y": 5.25},
+                {"label": "5,12", "matrix": [5, 12], "x": 15.25, "y": 5.25},
+                {"label": "5,13", "matrix": [5, 13], "x": 16.25, "y": 5.25},
+                {"label": "5,15", "matrix": [5, 15], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_jis": {
+            "layout": [
+                {"label": "0,0", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "0,1", "matrix": [0, 1], "x": 2, "y": 0},
+                {"label": "0,2", "matrix": [0, 2], "x": 3, "y": 0},
+                {"label": "0,3", "matrix": [0, 3], "x": 4, "y": 0},
+                {"label": "0,4", "matrix": [0, 4], "x": 5, "y": 0},
+                {"label": "0,5", "matrix": [0, 5], "x": 6.5, "y": 0},
+                {"label": "0,6", "matrix": [0, 6], "x": 7.5, "y": 0},
+                {"label": "0,7", "matrix": [0, 7], "x": 8.5, "y": 0},
+                {"label": "0,8", "matrix": [0, 8], "x": 9.5, "y": 0},
+                {"label": "0,9", "matrix": [0, 9], "x": 11, "y": 0},
+                {"label": "0,10", "matrix": [0, 10], "x": 12, "y": 0},
+                {"label": "0,11", "matrix": [0, 11], "x": 13, "y": 0},
+                {"label": "0,12", "matrix": [0, 12], "x": 14, "y": 0},
+                {"label": "0,13", "matrix": [0, 13], "x": 15.25, "y": 0},
+                {"label": "0,14", "matrix": [0, 14], "x": 16.25, "y": 0},
+                {"label": "0,15", "matrix": [0, 15], "x": 17.25, "y": 0},
+                {"label": "1,0", "matrix": [1, 0], "x": 0, "y": 1.25},
+                {"label": "1,1", "matrix": [1, 1], "x": 1, "y": 1.25},
+                {"label": "1,2", "matrix": [1, 2], "x": 2, "y": 1.25},
+                {"label": "1,3", "matrix": [1, 3], "x": 3, "y": 1.25},
+                {"label": "1,4", "matrix": [1, 4], "x": 4, "y": 1.25},
+                {"label": "1,5", "matrix": [1, 5], "x": 5, "y": 1.25},
+                {"label": "1,6", "matrix": [1, 6], "x": 6, "y": 1.25},
+                {"label": "1,7", "matrix": [1, 7], "x": 7, "y": 1.25},
+                {"label": "1,8", "matrix": [1, 8], "x": 8, "y": 1.25},
+                {"label": "1,9", "matrix": [1, 9], "x": 9, "y": 1.25},
+                {"label": "1,10", "matrix": [1, 10], "x": 10, "y": 1.25},
+                {"label": "1,11", "matrix": [1, 11], "x": 11, "y": 1.25},
+                {"label": "1,12", "matrix": [1, 12], "x": 12, "y": 1.25},
+                {"label": "1,13", "matrix": [1, 13], "x": 13, "y": 1.25},
+                {"label": "1,14", "matrix": [1, 14], "x": 14, "y": 1.25},
+                {"label": "3,14", "matrix": [3, 14], "x": 15.25, "y": 1.25},
+                {"label": "2,15", "matrix": [2, 15], "x": 16.25, "y": 1.25},
+                {"label": "1,15", "matrix": [1, 15], "x": 17.25, "y": 1.25},
+                {"label": "2,0", "matrix": [2, 0], "w": 1.5, "x": 0, "y": 2.25},
+                {"label": "2,1", "matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"label": "2,2", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"label": "2,3", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"label": "2,4", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"label": "2,5", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"label": "2,6", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"label": "2,7", "matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"label": "2,8", "matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"label": "2,9", "matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"label": "2,10", "matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"label": "2,11", "matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"label": "2,12", "matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"h": 2, "label": "2,14", "matrix": [2, 14], "w": 1.25, "x": 13.75, "y": 2.25},
+                {"label": "4,14", "matrix": [4, 14], "x": 15.25, "y": 2.25},
+                {"label": "4,15", "matrix": [4, 15], "x": 16.25, "y": 2.25},
+                {"label": "3,15", "matrix": [3, 15], "x": 17.25, "y": 2.25},
+                {"label": "3,0", "matrix": [3, 0], "w": 1.75, "x": 0, "y": 3.25},
+                {"label": "3,1", "matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"label": "3,2", "matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"label": "3,3", "matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"label": "3,4", "matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"label": "3,5", "matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"label": "3,6", "matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"label": "3,7", "matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"label": "3,8", "matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"label": "3,9", "matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"label": "3,10", "matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"label": "3,11", "matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"label": "3,12", "matrix": [3, 12], "x": 12.75, "y": 3.25},
+                {"label": "4,0", "matrix": [4, 0], "w": 2.25, "x": 0, "y": 4.25},
+                {"label": "4,2", "matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"label": "4,3", "matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"label": "4,4", "matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"label": "4,5", "matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"label": "4,6", "matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"label": "4,7", "matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"label": "4,8", "matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"label": "4,9", "matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"label": "4,10", "matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"label": "4,11", "matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"label": "4,12", "matrix": [4, 12], "x": 12.25, "y": 4.25},
+                {"label": "4,13", "matrix": [4, 13], "w": 1.75, "x": 13.25, "y": 4.25},
+                {"label": "5,14", "matrix": [5, 14], "x": 16.25, "y": 4.25},
+                {"label": "5,0", "matrix": [5, 0], "w": 1.5, "x": 0, "y": 5.25},
+                {"label": "5,1", "matrix": [5, 1], "x": 1.5, "y": 5.25},
+                {"label": "5,2", "matrix": [5, 2], "w": 1.5, "x": 2.5, "y": 5.25},
+                {"label": "5,4", "matrix": [5, 4], "w": 1.5, "x": 4, "y": 5.25},
+                {"label": "5,6", "matrix": [5, 6], "w": 2.5, "x": 5.5, "y": 5.25},
+                {"label": "5,7", "matrix": [5, 7], "w": 1.5, "x": 8, "y": 5.25},
+                {"label": "5,8", "matrix": [5, 8], "w": 1.5, "x": 9.5, "y": 5.25},
+                {"label": "5,9", "matrix": [5, 9], "w": 1.5, "x": 11, "y": 5.25},
+                {"label": "5,10", "matrix": [5, 10], "x": 12.5, "y": 5.25},
+                {"label": "5,11", "matrix": [5, 11], "w": 1.5, "x": 13.5, "y": 5.25},
+                {"label": "5,12", "matrix": [5, 12], "x": 15.25, "y": 5.25},
+                {"label": "5,13", "matrix": [5, 13], "x": 16.25, "y": 5.25},
+                {"label": "5,15", "matrix": [5, 15], "x": 17.25, "y": 5.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/cipulot/rf_r1_8_9xu/rules.mk b/keyboards/cipulot/rf_r1_8_9xu/rules.mk
index ab6c37cad43..318e0215ce9 100644
--- a/keyboards/cipulot/rf_r1_8_9xu/rules.mk
+++ b/keyboards/cipulot/rf_r1_8_9xu/rules.mk
@@ -1,4 +1,5 @@
 CUSTOM_MATRIX = lite
 ANALOG_DRIVER_REQUIRED = yes
-SRC += keyboards/cipulot/common/matrix.c keyboards/cipulot/common/ec_board.c keyboards/cipulot/common/ec_switch_matrix.c
+VPATH += keyboards/cipulot/common
+SRC += matrix.c ec_board.c ec_switch_matrix.c
 OPT = 2
diff --git a/keyboards/ckeys/thedora/keyboard.json b/keyboards/ckeys/thedora/keyboard.json
index 0e52b24dfa6..08448e761c4 100644
--- a/keyboards/ckeys/thedora/keyboard.json
+++ b/keyboards/ckeys/thedora/keyboard.json
@@ -29,9 +29,7 @@
       {"pin_a": "B13", "pin_b": "B15"}
     ]
   },
-  "processor": "STM32F303",
-  "bootloader": "stm32-dfu",
-  "board": "QMK_PROTON_C",
+  "development_board": "proton_c",
   "layouts": {
     "LAYOUT": {
       "layout": [
diff --git a/keyboards/clueboard/2x1800/2021/info.json b/keyboards/clueboard/2x1800/2021/keyboard.json
similarity index 100%
rename from keyboards/clueboard/2x1800/2021/info.json
rename to keyboards/clueboard/2x1800/2021/keyboard.json
diff --git a/keyboards/clueboard/60/info.json b/keyboards/clueboard/60/keyboard.json
similarity index 100%
rename from keyboards/clueboard/60/info.json
rename to keyboards/clueboard/60/keyboard.json
diff --git a/keyboards/controllerworks/city42/info.json b/keyboards/controllerworks/city42/keyboard.json
similarity index 100%
rename from keyboards/controllerworks/city42/info.json
rename to keyboards/controllerworks/city42/keyboard.json
diff --git a/keyboards/controllerworks/mini36/info.json b/keyboards/controllerworks/mini36/keyboard.json
similarity index 100%
rename from keyboards/controllerworks/mini36/info.json
rename to keyboards/controllerworks/mini36/keyboard.json
diff --git a/keyboards/controllerworks/mini42/info.json b/keyboards/controllerworks/mini42/keyboard.json
similarity index 100%
rename from keyboards/controllerworks/mini42/info.json
rename to keyboards/controllerworks/mini42/keyboard.json
diff --git a/keyboards/converter/hp_46010a/info.json b/keyboards/converter/hp_46010a/info.json
deleted file mode 100644
index 0296bda5e98..00000000000
--- a/keyboards/converter/hp_46010a/info.json
+++ /dev/null
@@ -1,151 +0,0 @@
-{
-  "keyboard_name": "HP 46010A to USB Keyboard Converter",
-  "manufacturer": "QMK",
-  "url": "https://deskthority.net/wiki/HP_46010A",
-  "maintainer": "listofoptions",
-  "usb": {
-    "vid": "0xFEED",
-    "pid": "0x6060",
-    "device_version": "0.0.1"
-  },
-  "processor": "atmega32u4",
-  "bootloader": "halfkay",
-  "features": {
-    "bootmagic": false,
-    "mousekey": true,
-    "extrakey": true,
-    "console": true,
-    "nkro": true
-  },
-  "layouts": {
-    "LAYOUT": {
-      "layout": [
-        {"matrix": [9, 0], "x": 0, "y": 0},
-        {"matrix": [6, 5], "x": 1, "y": 0},
-
-        {"matrix": [6, 2], "x": 2.5, "y": 0, "w": 1.25},
-        {"matrix": [6, 1], "x": 3.75, "y": 0, "w": 1.25},
-        {"matrix": [6, 0], "x": 5, "y": 0, "w": 1.25},
-        {"matrix": [6, 7], "x": 6.25, "y": 0, "w": 1.25},
-        {"matrix": [0, 7], "x": 7.5, "y": 0},
-        {"matrix": [0, 0], "x": 8.5, "y": 0},
-        {"matrix": [0, 1], "x": 9.5, "y": 0, "w": 1.25},
-        {"matrix": [0, 2], "x": 10.75, "y": 0, "w": 1.25},
-        {"matrix": [0, 3], "x": 12, "y": 0, "w": 1.25},
-        {"matrix": [0, 4], "x": 13.25, "y": 0, "w": 1.25},
-
-        {"matrix": [0, 5], "x": 15, "y": 0},
-        {"matrix": [0, 6], "x": 16, "y": 0},
-
-        {"matrix": [12, 0], "x": 18, "y": 0},
-        {"matrix": [12, 2], "x": 19, "y": 0},
-        {"matrix": [12, 4], "x": 20, "y": 0},
-        {"matrix": [12, 6], "x": 21, "y": 0},
-
-        {"matrix": [6, 3], "x": 0, "y": 2, "w": 1.25},
-        {"matrix": [4, 3], "x": 1.25, "y": 2},
-        {"matrix": [9, 6], "x": 2.25, "y": 2},
-        {"matrix": [7, 3], "x": 3.25, "y": 2},
-        {"matrix": [7, 2], "x": 4.25, "y": 2},
-        {"matrix": [7, 1], "x": 5.25, "y": 2},
-        {"matrix": [7, 0], "x": 6.25, "y": 2},
-        {"matrix": [7, 7], "x": 7.25, "y": 2},
-        {"matrix": [1, 7], "x": 8.25, "y": 2},
-        {"matrix": [1, 0], "x": 9.25, "y": 2},
-        {"matrix": [1, 1], "x": 10.25, "y": 2},
-        {"matrix": [1, 2], "x": 11.25, "y": 2},
-        {"matrix": [1, 3], "x": 12.25, "y": 2},
-        {"matrix": [1, 4], "x": 13.25, "y": 2, "w": 1.5},
-
-        {"matrix": [1, 5], "x": 15, "y": 2},
-        {"matrix": [1, 6], "x": 16, "y": 2},
-
-        {"matrix": [11, 0], "x": 18, "y": 2},
-        {"matrix": [11, 2], "x": 19, "y": 2},
-        {"matrix": [11, 4], "x": 20, "y": 2},
-        {"matrix": [11, 6], "x": 21, "y": 2},
-
-        {"matrix": [8, 6], "x": 0, "y": 3, "w": 1.75},
-        {"matrix": [8, 5], "x": 1.75, "y": 3},
-        {"matrix": [8, 4], "x": 2.75, "y": 3},
-        {"matrix": [8, 3], "x": 3.75, "y": 3},
-        {"matrix": [8, 2], "x": 4.75, "y": 3},
-        {"matrix": [8, 1], "x": 5.75, "y": 3},
-        {"matrix": [8, 0], "x": 6.75, "y": 3},
-        {"matrix": [8, 7], "x": 7.75, "y": 3},
-        {"matrix": [2, 7], "x": 8.75, "y": 3},
-        {"matrix": [2, 0], "x": 9.75, "y": 3},
-        {"matrix": [2, 1], "x": 10.75, "y": 3},
-        {"matrix": [2, 2], "x": 11.75, "y": 3},
-        {"matrix": [2, 3], "x": 12.75, "y": 3},
-        {"matrix": [2, 4], "x": 13.75, "y": 3},
-
-        {"matrix": [2, 5], "x": 15, "y": 3},
-        {"matrix": [2, 6], "x": 16, "y": 3},
-
-        {"matrix": [10, 0], "x": 18, "y": 3},
-        {"matrix": [10, 2], "x": 19, "y": 3},
-        {"matrix": [10, 4], "x": 20, "y": 3},
-        {"matrix": [10, 6], "x": 21, "y": 3},
-
-        {"matrix": [7, 4], "x": 0, "y": 4},
-        {"matrix": [6, 4], "x": 1, "y": 4},
-        {"matrix": [9, 4], "x": 2, "y": 4},
-        {"matrix": [9, 3], "x": 3, "y": 4},
-        {"matrix": [9, 2], "x": 4, "y": 4},
-        {"matrix": [9, 1], "x": 5, "y": 4},
-        {"matrix": [6, 6], "x": 6, "y": 4},
-        {"matrix": [9, 7], "x": 7, "y": 4},
-        {"matrix": [3, 7], "x": 8, "y": 4},
-        {"matrix": [3, 0], "x": 9, "y": 4},
-        {"matrix": [3, 1], "x": 10, "y": 4},
-        {"matrix": [3, 2], "x": 11, "y": 4},
-        {"matrix": [3, 3], "x": 12, "y": 4},
-        {"matrix": [3, 4], "x": 13, "y": 4, "w": 1.75},
-
-        {"matrix": [3, 5], "x": 15, "y": 4},
-        {"matrix": [3, 6], "x": 16, "y": 4},
-
-        {"matrix": [10, 1], "x": 18, "y": 4},
-        {"matrix": [10, 3], "x": 19, "y": 4},
-        {"matrix": [10, 5], "x": 20, "y": 4},
-        {"matrix": [10, 7], "x": 21, "y": 4},
-
-        {"matrix": [13, 6], "x": 0, "y": 5},
-        {"matrix": [7, 6], "x": 1.25, "y": 5, "w": 1.25},
-        {"matrix": [13, 4], "x": 2.5, "y": 5},
-        {"matrix": [13, 3], "x": 3.5, "y": 5},
-        {"matrix": [13, 2], "x": 4.5, "y": 5},
-        {"matrix": [13, 1], "x": 5.5, "y": 5},
-        {"matrix": [13, 0], "x": 6.5, "y": 5},
-        {"matrix": [13, 7], "x": 7.5, "y": 5},
-        {"matrix": [4, 7], "x": 8.5, "y": 5},
-        {"matrix": [4, 0], "x": 9.5, "y": 5},
-        {"matrix": [4, 1], "x": 10.5, "y": 5},
-        {"matrix": [4, 2], "x": 11.5, "y": 5},
-        {"matrix": [7, 5], "x": 12.5, "y": 5, "w": 1.25},
-
-        {"matrix": [4, 4], "x": 14, "y": 5},
-        {"matrix": [4, 5], "x": 15, "y": 5},
-        {"matrix": [4, 6], "x": 16, "y": 5},
-
-        {"matrix": [11, 1], "x": 18, "y": 5},
-        {"matrix": [11, 3], "x": 19, "y": 5},
-        {"matrix": [11, 5], "x": 20, "y": 5},
-        {"matrix": [11, 7], "x": 21, "y": 5, "h": 2},
-
-        {"matrix": [13, 5], "x": 0, "y": 6},
-        {"matrix": [5, 1], "x": 2.5, "y": 6},
-        {"matrix": [5, 0], "x": 3.5, "y": 6, "w": 8},
-        {"matrix": [5, 2], "x": 11.5, "y": 6},
-
-        {"matrix": [5, 4], "x": 14, "y": 6},
-        {"matrix": [5, 5], "x": 15, "y": 6},
-        {"matrix": [5, 6], "x": 16, "y": 6},
-
-        {"matrix": [12, 1], "x": 18, "y": 6, "w": 2},
-        {"matrix": [12, 5], "x": 20, "y": 6}
-      ]
-    }
-  }
-}
diff --git a/keyboards/converter/hp_46010a/keyboard.json b/keyboards/converter/hp_46010a/keyboard.json
new file mode 100644
index 00000000000..45193069813
--- /dev/null
+++ b/keyboards/converter/hp_46010a/keyboard.json
@@ -0,0 +1,152 @@
+{
+  "keyboard_name": "HP 46010A to USB Keyboard Converter",
+  "manufacturer": "QMK",
+  "url": "https://deskthority.net/wiki/HP_46010A",
+  "maintainer": "listofoptions",
+  "usb": {
+    "vid": "0xFEED",
+    "pid": "0x6060",
+    "device_version": "0.0.1",
+    "wait_for_enumeration": true
+  },
+  "processor": "atmega32u4",
+  "bootloader": "halfkay",
+  "features": {
+    "bootmagic": false,
+    "mousekey": true,
+    "extrakey": true,
+    "console": true,
+    "nkro": true
+  },
+  "layouts": {
+    "LAYOUT": {
+      "layout": [
+        {"matrix": [9, 0], "x": 0, "y": 0},
+        {"matrix": [6, 5], "x": 1, "y": 0},
+
+        {"matrix": [6, 2], "x": 2.5, "y": 0, "w": 1.25},
+        {"matrix": [6, 1], "x": 3.75, "y": 0, "w": 1.25},
+        {"matrix": [6, 0], "x": 5, "y": 0, "w": 1.25},
+        {"matrix": [6, 7], "x": 6.25, "y": 0, "w": 1.25},
+        {"matrix": [0, 7], "x": 7.5, "y": 0},
+        {"matrix": [0, 0], "x": 8.5, "y": 0},
+        {"matrix": [0, 1], "x": 9.5, "y": 0, "w": 1.25},
+        {"matrix": [0, 2], "x": 10.75, "y": 0, "w": 1.25},
+        {"matrix": [0, 3], "x": 12, "y": 0, "w": 1.25},
+        {"matrix": [0, 4], "x": 13.25, "y": 0, "w": 1.25},
+
+        {"matrix": [0, 5], "x": 15, "y": 0},
+        {"matrix": [0, 6], "x": 16, "y": 0},
+
+        {"matrix": [12, 0], "x": 18, "y": 0},
+        {"matrix": [12, 2], "x": 19, "y": 0},
+        {"matrix": [12, 4], "x": 20, "y": 0},
+        {"matrix": [12, 6], "x": 21, "y": 0},
+
+        {"matrix": [6, 3], "x": 0, "y": 2, "w": 1.25},
+        {"matrix": [4, 3], "x": 1.25, "y": 2},
+        {"matrix": [9, 6], "x": 2.25, "y": 2},
+        {"matrix": [7, 3], "x": 3.25, "y": 2},
+        {"matrix": [7, 2], "x": 4.25, "y": 2},
+        {"matrix": [7, 1], "x": 5.25, "y": 2},
+        {"matrix": [7, 0], "x": 6.25, "y": 2},
+        {"matrix": [7, 7], "x": 7.25, "y": 2},
+        {"matrix": [1, 7], "x": 8.25, "y": 2},
+        {"matrix": [1, 0], "x": 9.25, "y": 2},
+        {"matrix": [1, 1], "x": 10.25, "y": 2},
+        {"matrix": [1, 2], "x": 11.25, "y": 2},
+        {"matrix": [1, 3], "x": 12.25, "y": 2},
+        {"matrix": [1, 4], "x": 13.25, "y": 2, "w": 1.5},
+
+        {"matrix": [1, 5], "x": 15, "y": 2},
+        {"matrix": [1, 6], "x": 16, "y": 2},
+
+        {"matrix": [11, 0], "x": 18, "y": 2},
+        {"matrix": [11, 2], "x": 19, "y": 2},
+        {"matrix": [11, 4], "x": 20, "y": 2},
+        {"matrix": [11, 6], "x": 21, "y": 2},
+
+        {"matrix": [8, 6], "x": 0, "y": 3, "w": 1.75},
+        {"matrix": [8, 5], "x": 1.75, "y": 3},
+        {"matrix": [8, 4], "x": 2.75, "y": 3},
+        {"matrix": [8, 3], "x": 3.75, "y": 3},
+        {"matrix": [8, 2], "x": 4.75, "y": 3},
+        {"matrix": [8, 1], "x": 5.75, "y": 3},
+        {"matrix": [8, 0], "x": 6.75, "y": 3},
+        {"matrix": [8, 7], "x": 7.75, "y": 3},
+        {"matrix": [2, 7], "x": 8.75, "y": 3},
+        {"matrix": [2, 0], "x": 9.75, "y": 3},
+        {"matrix": [2, 1], "x": 10.75, "y": 3},
+        {"matrix": [2, 2], "x": 11.75, "y": 3},
+        {"matrix": [2, 3], "x": 12.75, "y": 3},
+        {"matrix": [2, 4], "x": 13.75, "y": 3},
+
+        {"matrix": [2, 5], "x": 15, "y": 3},
+        {"matrix": [2, 6], "x": 16, "y": 3},
+
+        {"matrix": [10, 0], "x": 18, "y": 3},
+        {"matrix": [10, 2], "x": 19, "y": 3},
+        {"matrix": [10, 4], "x": 20, "y": 3},
+        {"matrix": [10, 6], "x": 21, "y": 3},
+
+        {"matrix": [7, 4], "x": 0, "y": 4},
+        {"matrix": [6, 4], "x": 1, "y": 4},
+        {"matrix": [9, 4], "x": 2, "y": 4},
+        {"matrix": [9, 3], "x": 3, "y": 4},
+        {"matrix": [9, 2], "x": 4, "y": 4},
+        {"matrix": [9, 1], "x": 5, "y": 4},
+        {"matrix": [6, 6], "x": 6, "y": 4},
+        {"matrix": [9, 7], "x": 7, "y": 4},
+        {"matrix": [3, 7], "x": 8, "y": 4},
+        {"matrix": [3, 0], "x": 9, "y": 4},
+        {"matrix": [3, 1], "x": 10, "y": 4},
+        {"matrix": [3, 2], "x": 11, "y": 4},
+        {"matrix": [3, 3], "x": 12, "y": 4},
+        {"matrix": [3, 4], "x": 13, "y": 4, "w": 1.75},
+
+        {"matrix": [3, 5], "x": 15, "y": 4},
+        {"matrix": [3, 6], "x": 16, "y": 4},
+
+        {"matrix": [10, 1], "x": 18, "y": 4},
+        {"matrix": [10, 3], "x": 19, "y": 4},
+        {"matrix": [10, 5], "x": 20, "y": 4},
+        {"matrix": [10, 7], "x": 21, "y": 4},
+
+        {"matrix": [13, 6], "x": 0, "y": 5},
+        {"matrix": [7, 6], "x": 1.25, "y": 5, "w": 1.25},
+        {"matrix": [13, 4], "x": 2.5, "y": 5},
+        {"matrix": [13, 3], "x": 3.5, "y": 5},
+        {"matrix": [13, 2], "x": 4.5, "y": 5},
+        {"matrix": [13, 1], "x": 5.5, "y": 5},
+        {"matrix": [13, 0], "x": 6.5, "y": 5},
+        {"matrix": [13, 7], "x": 7.5, "y": 5},
+        {"matrix": [4, 7], "x": 8.5, "y": 5},
+        {"matrix": [4, 0], "x": 9.5, "y": 5},
+        {"matrix": [4, 1], "x": 10.5, "y": 5},
+        {"matrix": [4, 2], "x": 11.5, "y": 5},
+        {"matrix": [7, 5], "x": 12.5, "y": 5, "w": 1.25},
+
+        {"matrix": [4, 4], "x": 14, "y": 5},
+        {"matrix": [4, 5], "x": 15, "y": 5},
+        {"matrix": [4, 6], "x": 16, "y": 5},
+
+        {"matrix": [11, 1], "x": 18, "y": 5},
+        {"matrix": [11, 3], "x": 19, "y": 5},
+        {"matrix": [11, 5], "x": 20, "y": 5},
+        {"matrix": [11, 7], "x": 21, "y": 5, "h": 2},
+
+        {"matrix": [13, 5], "x": 0, "y": 6},
+        {"matrix": [5, 1], "x": 2.5, "y": 6},
+        {"matrix": [5, 0], "x": 3.5, "y": 6, "w": 8},
+        {"matrix": [5, 2], "x": 11.5, "y": 6},
+
+        {"matrix": [5, 4], "x": 14, "y": 6},
+        {"matrix": [5, 5], "x": 15, "y": 6},
+        {"matrix": [5, 6], "x": 16, "y": 6},
+
+        {"matrix": [12, 1], "x": 18, "y": 6, "w": 2},
+        {"matrix": [12, 5], "x": 20, "y": 6}
+      ]
+    }
+  }
+}
diff --git a/keyboards/converter/hp_46010a/rules.mk b/keyboards/converter/hp_46010a/rules.mk
index 3c6124d20ab..857395fb404 100644
--- a/keyboards/converter/hp_46010a/rules.mk
+++ b/keyboards/converter/hp_46010a/rules.mk
@@ -1,4 +1,3 @@
-WAIT_FOR_USB = yes
 CUSTOM_MATRIX = yes
 
 SRC = matrix.c
diff --git a/keyboards/converter/ibm_terminal/info.json b/keyboards/converter/ibm_terminal/keyboard.json
similarity index 100%
rename from keyboards/converter/ibm_terminal/info.json
rename to keyboards/converter/ibm_terminal/keyboard.json
diff --git a/keyboards/converter/m0110_usb/info.json b/keyboards/converter/m0110_usb/keyboard.json
similarity index 100%
rename from keyboards/converter/m0110_usb/info.json
rename to keyboards/converter/m0110_usb/keyboard.json
diff --git a/keyboards/converter/siemens_tastatur/info.json b/keyboards/converter/siemens_tastatur/info.json
deleted file mode 100644
index 571d06a5c31..00000000000
--- a/keyboards/converter/siemens_tastatur/info.json
+++ /dev/null
@@ -1,109 +0,0 @@
-{
-    "keyboard_name": "Siemens Tastatur",
-    "manufacturer": "Yiancar-Designs",
-    "url": "",
-    "maintainer": "qmk",
-    "usb": {
-        "vid": "0x8968",
-        "pid": "0x4353",
-        "device_version": "0.0.1"
-    },
-    "processor": "STM32F103",
-    "bootloader": "stm32duino",
-    "features": {
-        "bootmagic": false,
-        "mousekey": true,
-        "extrakey": true,
-        "console": true,
-        "command": true,
-        "nkro": true,
-        "sleep_led": true
-    },
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0, "w": 1.5},
-                {"matrix": [0, 1], "x": 1.5, "y": 0},
-                {"matrix": [0, 2], "x": 2.5, "y": 0},
-                {"matrix": [0, 3], "x": 3.5, "y": 0},
-                {"matrix": [0, 4], "x": 4.5, "y": 0},
-                {"matrix": [0, 5], "x": 5.5, "y": 0},
-                {"matrix": [0, 6], "x": 6.5, "y": 0},
-                {"matrix": [0, 7], "x": 7.5, "y": 0},
-                {"matrix": [0, 8], "x": 8.5, "y": 0},
-                {"matrix": [0, 9], "x": 9.5, "y": 0},
-                {"matrix": [0, 10], "x": 10.5, "y": 0},
-                {"matrix": [0, 11], "x": 11.5, "y": 0},
-                {"matrix": [0, 12], "x": 12.5, "y": 0},
-                {"matrix": [0, 13], "x": 13.5, "y": 0, "h": 2},
-
-                {"matrix": [0, 14], "x": 15, "y": 0},
-                {"matrix": [0, 15], "x": 16, "y": 0},
-                {"matrix": [0, 16], "x": 17, "y": 0},
-                {"matrix": [0, 17], "x": 18, "y": 0},
-                {"matrix": [0, 18], "x": 19, "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": [1, 4], "x": 4, "y": 1},
-                {"matrix": [1, 5], "x": 5, "y": 1},
-                {"matrix": [1, 6], "x": 6, "y": 1},
-                {"matrix": [1, 7], "x": 7, "y": 1},
-                {"matrix": [1, 8], "x": 8, "y": 1},
-                {"matrix": [1, 9], "x": 9, "y": 1},
-                {"matrix": [1, 10], "x": 10, "y": 1},
-                {"matrix": [1, 11], "x": 11, "y": 1},
-                {"matrix": [1, 12], "x": 12, "y": 1, "w": 1.5},
-
-                {"matrix": [1, 14], "x": 15, "y": 1},
-                {"matrix": [1, 15], "x": 16, "y": 1},
-                {"matrix": [1, 16], "x": 17, "y": 1},
-                {"matrix": [1, 17], "x": 18, "y": 1},
-                {"matrix": [1, 18], "x": 19, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.25},
-                {"matrix": [2, 1], "x": 1.25, "y": 2},
-                {"matrix": [2, 2], "x": 2.25, "y": 2},
-                {"matrix": [2, 3], "x": 3.25, "y": 2},
-                {"matrix": [2, 4], "x": 4.25, "y": 2},
-                {"matrix": [2, 5], "x": 5.25, "y": 2},
-                {"matrix": [2, 6], "x": 6.25, "y": 2},
-                {"matrix": [2, 7], "x": 7.25, "y": 2},
-                {"matrix": [2, 8], "x": 8.25, "y": 2},
-                {"matrix": [2, 9], "x": 9.25, "y": 2},
-                {"matrix": [2, 10], "x": 10.25, "y": 2},
-                {"matrix": [2, 11], "x": 11.25, "y": 2},
-                {"matrix": [2, 12], "x": 12.25, "y": 2, "w": 1.25},
-                {"matrix": [2, 13], "x": 13.5, "y": 2, "h": 2},
-
-                {"matrix": [2, 14], "x": 15, "y": 2},
-                {"matrix": [2, 15], "x": 16, "y": 2},
-                {"matrix": [2, 16], "x": 17, "y": 2},
-                {"matrix": [2, 17], "x": 18, "y": 2},
-                {"matrix": [2, 18], "x": 19, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
-                {"matrix": [3, 1], "x": 1.75, "y": 3},
-                {"matrix": [3, 2], "x": 2.75, "y": 3},
-                {"matrix": [3, 3], "x": 3.75, "y": 3},
-                {"matrix": [3, 4], "x": 4.75, "y": 3},
-                {"matrix": [3, 5], "x": 5.75, "y": 3},
-                {"matrix": [3, 6], "x": 6.75, "y": 3},
-                {"matrix": [3, 7], "x": 7.75, "y": 3},
-                {"matrix": [3, 8], "x": 8.75, "y": 3},
-                {"matrix": [3, 9], "x": 9.75, "y": 3},
-                {"matrix": [3, 10], "x": 10.75, "y": 3},
-
-                {"matrix": [3, 14], "x": 15, "y": 3},
-                {"matrix": [3, 15], "x": 16, "y": 3},
-                {"matrix": [3, 16], "x": 17, "y": 3},
-                {"matrix": [3, 17], "x": 18, "y": 3},
-                {"matrix": [3, 18], "x": 19, "y": 3},
-
-                {"matrix": [3, 11], "x": 3.5, "y": 4, "w": 6.5}
-            ]
-        }
-    }
-}
diff --git a/keyboards/converter/siemens_tastatur/keyboard.json b/keyboards/converter/siemens_tastatur/keyboard.json
new file mode 100644
index 00000000000..639859f2081
--- /dev/null
+++ b/keyboards/converter/siemens_tastatur/keyboard.json
@@ -0,0 +1,108 @@
+{
+    "keyboard_name": "Siemens Tastatur",
+    "manufacturer": "Yiancar-Designs",
+    "url": "",
+    "maintainer": "qmk",
+    "usb": {
+        "vid": "0x8968",
+        "pid": "0x4353",
+        "device_version": "0.0.1"
+    },
+    "development_board": "bluepill",
+    "features": {
+        "bootmagic": false,
+        "mousekey": true,
+        "extrakey": true,
+        "console": true,
+        "command": true,
+        "nkro": true,
+        "sleep_led": true
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0, "w": 1.5},
+                {"matrix": [0, 1], "x": 1.5, "y": 0},
+                {"matrix": [0, 2], "x": 2.5, "y": 0},
+                {"matrix": [0, 3], "x": 3.5, "y": 0},
+                {"matrix": [0, 4], "x": 4.5, "y": 0},
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.5, "y": 0},
+                {"matrix": [0, 10], "x": 10.5, "y": 0},
+                {"matrix": [0, 11], "x": 11.5, "y": 0},
+                {"matrix": [0, 12], "x": 12.5, "y": 0},
+                {"matrix": [0, 13], "x": 13.5, "y": 0, "h": 2},
+
+                {"matrix": [0, 14], "x": 15, "y": 0},
+                {"matrix": [0, 15], "x": 16, "y": 0},
+                {"matrix": [0, 16], "x": 17, "y": 0},
+                {"matrix": [0, 17], "x": 18, "y": 0},
+                {"matrix": [0, 18], "x": 19, "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": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+                {"matrix": [1, 12], "x": 12, "y": 1, "w": 1.5},
+
+                {"matrix": [1, 14], "x": 15, "y": 1},
+                {"matrix": [1, 15], "x": 16, "y": 1},
+                {"matrix": [1, 16], "x": 17, "y": 1},
+                {"matrix": [1, 17], "x": 18, "y": 1},
+                {"matrix": [1, 18], "x": 19, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.25},
+                {"matrix": [2, 1], "x": 1.25, "y": 2},
+                {"matrix": [2, 2], "x": 2.25, "y": 2},
+                {"matrix": [2, 3], "x": 3.25, "y": 2},
+                {"matrix": [2, 4], "x": 4.25, "y": 2},
+                {"matrix": [2, 5], "x": 5.25, "y": 2},
+                {"matrix": [2, 6], "x": 6.25, "y": 2},
+                {"matrix": [2, 7], "x": 7.25, "y": 2},
+                {"matrix": [2, 8], "x": 8.25, "y": 2},
+                {"matrix": [2, 9], "x": 9.25, "y": 2},
+                {"matrix": [2, 10], "x": 10.25, "y": 2},
+                {"matrix": [2, 11], "x": 11.25, "y": 2},
+                {"matrix": [2, 12], "x": 12.25, "y": 2, "w": 1.25},
+                {"matrix": [2, 13], "x": 13.5, "y": 2, "h": 2},
+
+                {"matrix": [2, 14], "x": 15, "y": 2},
+                {"matrix": [2, 15], "x": 16, "y": 2},
+                {"matrix": [2, 16], "x": 17, "y": 2},
+                {"matrix": [2, 17], "x": 18, "y": 2},
+                {"matrix": [2, 18], "x": 19, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3},
+                {"matrix": [3, 2], "x": 2.75, "y": 3},
+                {"matrix": [3, 3], "x": 3.75, "y": 3},
+                {"matrix": [3, 4], "x": 4.75, "y": 3},
+                {"matrix": [3, 5], "x": 5.75, "y": 3},
+                {"matrix": [3, 6], "x": 6.75, "y": 3},
+                {"matrix": [3, 7], "x": 7.75, "y": 3},
+                {"matrix": [3, 8], "x": 8.75, "y": 3},
+                {"matrix": [3, 9], "x": 9.75, "y": 3},
+                {"matrix": [3, 10], "x": 10.75, "y": 3},
+
+                {"matrix": [3, 14], "x": 15, "y": 3},
+                {"matrix": [3, 15], "x": 16, "y": 3},
+                {"matrix": [3, 16], "x": 17, "y": 3},
+                {"matrix": [3, 17], "x": 18, "y": 3},
+                {"matrix": [3, 18], "x": 19, "y": 3},
+
+                {"matrix": [3, 11], "x": 3.5, "y": 4, "w": 6.5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/converter/usb_usb/ble/info.json b/keyboards/converter/usb_usb/ble/info.json
deleted file mode 100644
index 18edf5f577c..00000000000
--- a/keyboards/converter/usb_usb/ble/info.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "bootloader": "caterina",
-    "bluetooth": {
-        "driver": "bluefruit_le"
-    }
-}
diff --git a/keyboards/converter/usb_usb/ble/keyboard.json b/keyboards/converter/usb_usb/ble/keyboard.json
new file mode 100644
index 00000000000..b92bfe7f3e0
--- /dev/null
+++ b/keyboards/converter/usb_usb/ble/keyboard.json
@@ -0,0 +1,12 @@
+{
+    "bootloader": "caterina",
+    "bluetooth": {
+        "driver": "bluefruit_le"
+    },
+    "build": {
+        "lto": true
+    },
+    "features":{
+        "bluetooth": true
+    }
+}
diff --git a/keyboards/converter/usb_usb/ble/rules.mk b/keyboards/converter/usb_usb/ble/rules.mk
index 5b0435372b7..3437a35bdf1 100644
--- a/keyboards/converter/usb_usb/ble/rules.mk
+++ b/keyboards/converter/usb_usb/ble/rules.mk
@@ -1,6 +1,2 @@
 # Processor frequency
 F_CPU = 8000000
-
-EXTRAKEY_ENABLE = no
-BLUETOOTH_ENABLE = yes
-LTO_ENABLE = yes
diff --git a/keyboards/converter/usb_usb/info.json b/keyboards/converter/usb_usb/info.json
index 63c02322a2e..747fd497828 100644
--- a/keyboards/converter/usb_usb/info.json
+++ b/keyboards/converter/usb_usb/info.json
@@ -8,6 +8,13 @@
         "pid": "0x005B",
         "device_version": "0.0.1"
     },
+    "features": {
+        "bootmagic": false,
+        "extrakey": true,
+        "mousekey": false,
+        "nkro": false,
+        "usb_hid": true
+    },
     "processor": "atmega32u4",
     "community_layouts": ["fullsize_ansi", "fullsize_iso", "fullsize_jis"],
     "layouts": {
diff --git a/keyboards/converter/usb_usb/matrix.c b/keyboards/converter/usb_usb/matrix.c
deleted file mode 100644
index b077febd74d..00000000000
--- a/keyboards/converter/usb_usb/matrix.c
+++ /dev/null
@@ -1 +0,0 @@
-// Intentionally left empty. This file must exist for this board to build.
diff --git a/keyboards/converter/usb_usb/pro_micro/info.json b/keyboards/converter/usb_usb/pro_micro/keyboard.json
similarity index 100%
rename from keyboards/converter/usb_usb/pro_micro/info.json
rename to keyboards/converter/usb_usb/pro_micro/keyboard.json
diff --git a/keyboards/converter/usb_usb/rules.mk b/keyboards/converter/usb_usb/rules.mk
index 97aebc9349b..1e278514f68 100644
--- a/keyboards/converter/usb_usb/rules.mk
+++ b/keyboards/converter/usb_usb/rules.mk
@@ -1,16 +1,3 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-USB_HID_ENABLE = yes
 CUSTOM_MATRIX = yes
 
 SRC += custom_matrix.cpp
diff --git a/keyboards/converter/xmk/info.json b/keyboards/converter/xmk/keyboard.json
similarity index 100%
rename from keyboards/converter/xmk/info.json
rename to keyboards/converter/xmk/keyboard.json
diff --git a/keyboards/converter/xt_usb/info.json b/keyboards/converter/xt_usb/keyboard.json
similarity index 100%
rename from keyboards/converter/xt_usb/info.json
rename to keyboards/converter/xt_usb/keyboard.json
diff --git a/keyboards/coseyfannitutti/discipline/info.json b/keyboards/coseyfannitutti/discipline/keyboard.json
similarity index 100%
rename from keyboards/coseyfannitutti/discipline/info.json
rename to keyboards/coseyfannitutti/discipline/keyboard.json
diff --git a/keyboards/coseyfannitutti/mysterium/info.json b/keyboards/coseyfannitutti/mysterium/keyboard.json
similarity index 100%
rename from keyboards/coseyfannitutti/mysterium/info.json
rename to keyboards/coseyfannitutti/mysterium/keyboard.json
diff --git a/keyboards/cozykeys/speedo/v3/info.json b/keyboards/cozykeys/speedo/v3/info.json
deleted file mode 100644
index 7636d9b702f..00000000000
--- a/keyboards/cozykeys/speedo/v3/info.json
+++ /dev/null
@@ -1,129 +0,0 @@
-{
-  "keyboard_name": "Speedo",
-  "manufacturer": "CozyKeys",
-  "url": "https://github.com/cozykeys/speedo",
-  "maintainer": "pcewing",
-  "usb": {
-    "vid": "0xFEED",
-    "pid": "0x1192",
-    "device_version": "0.0.3"
-  },
-  "rgblight": {
-    "saturation_steps": 8,
-    "brightness_steps": 8,
-    "led_count": 12,
-    "sleep": true,
-    "animations": {
-      "breathing": true,
-      "rainbow_mood": true,
-      "rainbow_swirl": true,
-      "snake": true,
-      "knight": true,
-      "christmas": true,
-      "static_gradient": true,
-      "rgb_test": true,
-      "alternating": true,
-      "twinkle": true
-    }
-  },
-  "ws2812": {
-    "pin": "B5"
-  },
-  "matrix_pins": {
-    "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B6", "B2", "E6", "D7", "C6", "D4", "D0", "D1"],
-    "rows": ["F0", "F1", "C7", "D5", "B7"]
-  },
-  "diode_direction": "COL2ROW",
-  "processor": "atmega32u4",
-  "bootloader": "atmel-dfu",
-  "features": {
-    "bootmagic": false,
-    "mousekey": true,
-    "extrakey": true,
-    "rgblight": true
-  },
-  "layouts": {
-    "LAYOUT": {
-      "layout": [
-        {"matrix": [0, 0], "x": 0.695, "y": 0, "r": 10},
-        {"matrix": [0, 1], "x": 1.679, "y": 0.174, "r": 10},
-        {"matrix": [0, 2], "x": 2.692, "y": 0.192, "r": 10},
-        {"matrix": [0, 3], "x": 3.722, "y": 0.107, "r": 10},
-        {"matrix": [0, 4], "x": 4.652, "y": 0.591, "r": 10},
-        {"matrix": [0, 5], "x": 5.591, "y": 1.023, "r": 10},
-
-        {"matrix": [0, 8], "x": 9.457, "y": 1.023, "r": -10},
-        {"matrix": [0, 9], "x": 10.396, "y": 0.591, "r": -10},
-        {"matrix": [0, 10], "x": 11.326, "y": 0.107, "r": -10},
-        {"matrix": [0, 11], "x": 12.356, "y": 0.192, "r": -10},
-        {"matrix": [0, 12], "x": 13.369, "y": 0.174, "r": -10},
-        {"matrix": [0, 13], "x": 14.353, "y": 0, "r": -10},
-
-        {"matrix": [1, 0], "x": 0.521, "y": 0.985, "r": 10},
-        {"matrix": [1, 1], "x": 1.506, "y": 1.158, "r": 10},
-        {"matrix": [1, 2], "x": 2.518, "y": 1.177, "r": 10},
-        {"matrix": [1, 3], "x": 3.548, "y": 1.092, "r": 10},
-        {"matrix": [1, 4], "x": 4.478, "y": 1.576, "r": 10},
-        {"matrix": [1, 5], "x": 5.418, "y": 2.008, "r": 10},
-
-        {"matrix": [2, 7], "x": 7.524, "y": 3.305, "r": 0},
-
-        {"matrix": [1, 8], "x": 9.63, "y": 2.008, "r": -10},
-        {"matrix": [1, 9], "x": 10.57, "y": 1.576, "r": -10},
-        {"matrix": [1, 10], "x": 11.5, "y": 1.092, "r": -10},
-        {"matrix": [1, 11], "x": 12.53, "y": 1.177, "r": -10},
-        {"matrix": [1, 12], "x": 13.542, "y": 1.158, "r": -10},
-        {"matrix": [1, 13], "x": 14.527, "y": 0.985, "r": -10},
-
-        {"matrix": [2, 0], "x": 0.347, "y": 1.97, "r": 10},
-        {"matrix": [2, 1], "x": 1.332, "y": 2.143, "r": 10},
-        {"matrix": [2, 2], "x": 2.344, "y": 2.162, "r": 10},
-        {"matrix": [2, 3], "x": 3.375, "y": 2.077, "r": 10},
-        {"matrix": [2, 4], "x": 4.305, "y": 2.561, "r": 10},
-        {"matrix": [2, 5], "x": 5.244, "y": 2.993, "r": 10},
-
-        {"matrix": [2, 6], "x": 6.524, "y": 3.805, "r": 0},
-        {"matrix": [3, 7], "x": 8.524, "y": 3.805, "r": 0},
-
-        {"matrix": [2, 8], "x": 9.804, "y": 2.993, "r": -10},
-        {"matrix": [2, 9], "x": 10.743, "y": 2.561, "r": -10},
-        {"matrix": [2, 10], "x": 11.673, "y": 2.077, "r": -10},
-        {"matrix": [2, 11], "x": 12.704, "y": 2.162, "r": -10},
-        {"matrix": [2, 12], "x": 13.716, "y": 2.143, "r": -10},
-        {"matrix": [2, 13], "x": 14.701, "y": 1.97, "r": -10},
-
-        {"matrix": [3, 0], "x": 0.174, "y": 2.954, "r": 10},
-        {"matrix": [3, 1], "x": 1.158, "y": 3.128, "r": 10},
-        {"matrix": [3, 2], "x": 2.171, "y": 3.147, "r": 10},
-        {"matrix": [3, 3], "x": 3.201, "y": 3.062, "r": 10},
-        {"matrix": [3, 4], "x": 4.131, "y": 3.546, "r": 10},
-        {"matrix": [3, 5], "x": 5.07, "y": 3.978, "r": 10},
-
-        {"matrix": [3, 6], "x": 7.524, "y": 4.305, "r": 0},
-
-        {"matrix": [3, 8], "x": 9.978, "y": 3.978, "r": -10},
-        {"matrix": [3, 9], "x": 10.917, "y": 3.546, "r": -10},
-        {"matrix": [3, 10], "x": 11.847, "y": 3.062, "r": -10},
-        {"matrix": [3, 11], "x": 12.877, "y": 3.147, "r": -10},
-        {"matrix": [3, 12], "x": 13.89, "y": 3.128, "r": -10},
-        {"matrix": [3, 13], "x": 14.874, "y": 2.954, "r": -10},
-
-        {"matrix": [4, 0], "x": 0, "y": 3.939, "r": 10},
-        {"matrix": [4, 1], "x": 0.985, "y": 4.113, "r": 10},
-        {"matrix": [4, 2], "x": 1.997, "y": 4.131, "r": 10},
-        {"matrix": [4, 3], "x": 3.027, "y": 4.047, "r": 10},
-        {"matrix": [4, 4], "x": 3.957, "y": 4.53, "r": 10},
-        {"matrix": [4, 5], "x": 4.897, "y": 4.963, "r": 10},
-        {"matrix": [4, 6], "x": 5.881, "y": 5.136, "r": 10},
-
-        {"matrix": [4, 7], "x": 9.166, "y": 5.136, "r": -10},
-        {"matrix": [4, 8], "x": 10.151, "y": 4.963, "r": -10},
-        {"matrix": [4, 9], "x": 11.09, "y": 4.53, "r": -10},
-        {"matrix": [4, 10], "x": 12.021, "y": 4.047, "r": -10},
-        {"matrix": [4, 11], "x": 13.051, "y": 4.131, "r": -10},
-        {"matrix": [4, 12], "x": 14.063, "y": 4.113, "r": -10},
-        {"matrix": [4, 13], "x": 15.048, "y": 3.939, "r": -10}
-      ]
-    }
-  }
-}
diff --git a/keyboards/cozykeys/speedo/v3/keyboard.json b/keyboards/cozykeys/speedo/v3/keyboard.json
new file mode 100644
index 00000000000..c4aaaecb6d1
--- /dev/null
+++ b/keyboards/cozykeys/speedo/v3/keyboard.json
@@ -0,0 +1,130 @@
+{
+  "keyboard_name": "Speedo",
+  "manufacturer": "CozyKeys",
+  "url": "https://github.com/cozykeys/speedo",
+  "maintainer": "pcewing",
+  "usb": {
+    "vid": "0xFEED",
+    "pid": "0x1192",
+    "device_version": "0.0.3"
+  },
+  "rgblight": {
+    "saturation_steps": 8,
+    "brightness_steps": 8,
+    "led_count": 12,
+    "sleep": true,
+    "animations": {
+      "breathing": true,
+      "rainbow_mood": true,
+      "rainbow_swirl": true,
+      "snake": true,
+      "knight": true,
+      "christmas": true,
+      "static_gradient": true,
+      "rgb_test": true,
+      "alternating": true,
+      "twinkle": true
+    }
+  },
+  "ws2812": {
+    "pin": "B5"
+  },
+  "matrix_pins": {
+    "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B6", "B2", "E6", "D7", "C6", "D4", "D0", "D1"],
+    "rows": ["F0", "F1", "C7", "D5", "B7"]
+  },
+  "diode_direction": "COL2ROW",
+  "processor": "atmega32u4",
+  "bootloader": "atmel-dfu",
+  "pin_compatible": "elite_c",
+  "features": {
+    "bootmagic": false,
+    "mousekey": true,
+    "extrakey": true,
+    "rgblight": true
+  },
+  "layouts": {
+    "LAYOUT": {
+      "layout": [
+        {"matrix": [0, 0], "x": 0.695, "y": 0, "r": 10},
+        {"matrix": [0, 1], "x": 1.679, "y": 0.174, "r": 10},
+        {"matrix": [0, 2], "x": 2.692, "y": 0.192, "r": 10},
+        {"matrix": [0, 3], "x": 3.722, "y": 0.107, "r": 10},
+        {"matrix": [0, 4], "x": 4.652, "y": 0.591, "r": 10},
+        {"matrix": [0, 5], "x": 5.591, "y": 1.023, "r": 10},
+
+        {"matrix": [0, 8], "x": 9.457, "y": 1.023, "r": -10},
+        {"matrix": [0, 9], "x": 10.396, "y": 0.591, "r": -10},
+        {"matrix": [0, 10], "x": 11.326, "y": 0.107, "r": -10},
+        {"matrix": [0, 11], "x": 12.356, "y": 0.192, "r": -10},
+        {"matrix": [0, 12], "x": 13.369, "y": 0.174, "r": -10},
+        {"matrix": [0, 13], "x": 14.353, "y": 0, "r": -10},
+
+        {"matrix": [1, 0], "x": 0.521, "y": 0.985, "r": 10},
+        {"matrix": [1, 1], "x": 1.506, "y": 1.158, "r": 10},
+        {"matrix": [1, 2], "x": 2.518, "y": 1.177, "r": 10},
+        {"matrix": [1, 3], "x": 3.548, "y": 1.092, "r": 10},
+        {"matrix": [1, 4], "x": 4.478, "y": 1.576, "r": 10},
+        {"matrix": [1, 5], "x": 5.418, "y": 2.008, "r": 10},
+
+        {"matrix": [2, 7], "x": 7.524, "y": 3.305, "r": 0},
+
+        {"matrix": [1, 8], "x": 9.63, "y": 2.008, "r": -10},
+        {"matrix": [1, 9], "x": 10.57, "y": 1.576, "r": -10},
+        {"matrix": [1, 10], "x": 11.5, "y": 1.092, "r": -10},
+        {"matrix": [1, 11], "x": 12.53, "y": 1.177, "r": -10},
+        {"matrix": [1, 12], "x": 13.542, "y": 1.158, "r": -10},
+        {"matrix": [1, 13], "x": 14.527, "y": 0.985, "r": -10},
+
+        {"matrix": [2, 0], "x": 0.347, "y": 1.97, "r": 10},
+        {"matrix": [2, 1], "x": 1.332, "y": 2.143, "r": 10},
+        {"matrix": [2, 2], "x": 2.344, "y": 2.162, "r": 10},
+        {"matrix": [2, 3], "x": 3.375, "y": 2.077, "r": 10},
+        {"matrix": [2, 4], "x": 4.305, "y": 2.561, "r": 10},
+        {"matrix": [2, 5], "x": 5.244, "y": 2.993, "r": 10},
+
+        {"matrix": [2, 6], "x": 6.524, "y": 3.805, "r": 0},
+        {"matrix": [3, 7], "x": 8.524, "y": 3.805, "r": 0},
+
+        {"matrix": [2, 8], "x": 9.804, "y": 2.993, "r": -10},
+        {"matrix": [2, 9], "x": 10.743, "y": 2.561, "r": -10},
+        {"matrix": [2, 10], "x": 11.673, "y": 2.077, "r": -10},
+        {"matrix": [2, 11], "x": 12.704, "y": 2.162, "r": -10},
+        {"matrix": [2, 12], "x": 13.716, "y": 2.143, "r": -10},
+        {"matrix": [2, 13], "x": 14.701, "y": 1.97, "r": -10},
+
+        {"matrix": [3, 0], "x": 0.174, "y": 2.954, "r": 10},
+        {"matrix": [3, 1], "x": 1.158, "y": 3.128, "r": 10},
+        {"matrix": [3, 2], "x": 2.171, "y": 3.147, "r": 10},
+        {"matrix": [3, 3], "x": 3.201, "y": 3.062, "r": 10},
+        {"matrix": [3, 4], "x": 4.131, "y": 3.546, "r": 10},
+        {"matrix": [3, 5], "x": 5.07, "y": 3.978, "r": 10},
+
+        {"matrix": [3, 6], "x": 7.524, "y": 4.305, "r": 0},
+
+        {"matrix": [3, 8], "x": 9.978, "y": 3.978, "r": -10},
+        {"matrix": [3, 9], "x": 10.917, "y": 3.546, "r": -10},
+        {"matrix": [3, 10], "x": 11.847, "y": 3.062, "r": -10},
+        {"matrix": [3, 11], "x": 12.877, "y": 3.147, "r": -10},
+        {"matrix": [3, 12], "x": 13.89, "y": 3.128, "r": -10},
+        {"matrix": [3, 13], "x": 14.874, "y": 2.954, "r": -10},
+
+        {"matrix": [4, 0], "x": 0, "y": 3.939, "r": 10},
+        {"matrix": [4, 1], "x": 0.985, "y": 4.113, "r": 10},
+        {"matrix": [4, 2], "x": 1.997, "y": 4.131, "r": 10},
+        {"matrix": [4, 3], "x": 3.027, "y": 4.047, "r": 10},
+        {"matrix": [4, 4], "x": 3.957, "y": 4.53, "r": 10},
+        {"matrix": [4, 5], "x": 4.897, "y": 4.963, "r": 10},
+        {"matrix": [4, 6], "x": 5.881, "y": 5.136, "r": 10},
+
+        {"matrix": [4, 7], "x": 9.166, "y": 5.136, "r": -10},
+        {"matrix": [4, 8], "x": 10.151, "y": 4.963, "r": -10},
+        {"matrix": [4, 9], "x": 11.09, "y": 4.53, "r": -10},
+        {"matrix": [4, 10], "x": 12.021, "y": 4.047, "r": -10},
+        {"matrix": [4, 11], "x": 13.051, "y": 4.131, "r": -10},
+        {"matrix": [4, 12], "x": 14.063, "y": 4.113, "r": -10},
+        {"matrix": [4, 13], "x": 15.048, "y": 3.939, "r": -10}
+      ]
+    }
+  }
+}
diff --git a/keyboards/cozykeys/speedo/v3/rules.mk b/keyboards/cozykeys/speedo/v3/rules.mk
deleted file mode 100644
index baf23318ccd..00000000000
--- a/keyboards/cozykeys/speedo/v3/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-PIN_COMPATIBLE = elite_c
diff --git a/keyboards/crimsonkeyboards/resume1800/info.json b/keyboards/crimsonkeyboards/resume1800/keyboard.json
similarity index 100%
rename from keyboards/crimsonkeyboards/resume1800/info.json
rename to keyboards/crimsonkeyboards/resume1800/keyboard.json
diff --git a/keyboards/crkbd/rules.mk b/keyboards/crkbd/rules.mk
index a63f102097f..836587e45e6 100644
--- a/keyboards/crkbd/rules.mk
+++ b/keyboards/crkbd/rules.mk
@@ -1,8 +1 @@
-# Build Options
-#   change yes to no to disable
-#
-
 DEFAULT_FOLDER = crkbd/rev1
-
-RGBLIGHT_SUPPORTED = yes
-RGB_MATRIX_SUPPORTED = yes
diff --git a/keyboards/crypt_macro/info.json b/keyboards/crypt_macro/keyboard.json
similarity index 100%
rename from keyboards/crypt_macro/info.json
rename to keyboards/crypt_macro/keyboard.json
diff --git a/keyboards/custommk/cmk11/info.json b/keyboards/custommk/cmk11/info.json
deleted file mode 100644
index d831351aa78..00000000000
--- a/keyboards/custommk/cmk11/info.json
+++ /dev/null
@@ -1,121 +0,0 @@
-{
-    "manufacturer": "customMK",
-    "keyboard_name": "CMK11",
-    "maintainer": "customMK",
-    "bootloader": "stm32-dfu",
-    "diode_direction": "ROW2COL",
-    "dynamic_keymap": {
-        "layer_count": 32
-    },
-    "eeprom": {
-        "driver": "spi"
-    },
-    "features": {
-        "audio": true,
-        "bootmagic": true,
-        "extrakey": true,
-        "mousekey": true,
-        "nkro": true,
-        "rgb_matrix": true
-    },
-    "matrix_pins": {
-        "cols": ["B0", "A1", "A2", "A3", "A6", "B10"],
-        "rows": ["A5", "A4"]
-    },
-    "processor": "STM32F411",
-    "qmk": {
-        "tap_keycode_delay": 10
-    },
-    "rgb_matrix": {
-        "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_fractal": 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": [
-            {"matrix": [0, 0], "x": 0, "y": 0, "flags": 4},
-            {"matrix": [0, 1], "x": 45, "y": 0, "flags": 4},
-            {"matrix": [0, 2], "x": 90, "y": 0, "flags": 4},
-            {"matrix": [0, 3], "x": 134, "y": 0, "flags": 4},
-            {"matrix": [0, 4], "x": 179, "y": 0, "flags": 4},
-            {"matrix": [0, 5], "x": 224, "y": 0, "flags": 4},
-            {"matrix": [1, 0], "x": 23, "y": 64, "flags": 4},
-            {"matrix": [1, 1], "x": 68, "y": 64, "flags": 4},
-            {"matrix": [1, 2], "x": 112, "y": 64, "flags": 4},
-            {"matrix": [1, 3], "x": 157, "y": 64, "flags": 4},
-            {"matrix": [1, 4], "x": 202, "y": 64, "flags": 4}
-        ],
-        "max_brightness": 120,
-        "sat_steps": 8,
-        "speed_steps": 10,
-        "val_steps": 8
-    },
-    "url": "https://shop.custommk.com/collections/cmk11/products/ckm11",
-    "usb": {
-        "device_version": "1.0.0",
-        "pid": "0xFABA",
-        "vid": "0xF35B"
-    },
-    "ws2812": {
-        "driver": "pwm",
-        "pin": "A10"
-    },
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [1, 0], "x": 0.5, "y": 1},
-                {"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}
-            ]
-        }
-    }
-}
\ No newline at end of file
diff --git a/keyboards/custommk/cmk11/keyboard.json b/keyboards/custommk/cmk11/keyboard.json
new file mode 100644
index 00000000000..9a853063ba3
--- /dev/null
+++ b/keyboards/custommk/cmk11/keyboard.json
@@ -0,0 +1,124 @@
+{
+    "manufacturer": "customMK",
+    "keyboard_name": "CMK11",
+    "maintainer": "customMK",
+    "bootloader": "stm32-dfu",
+    "diode_direction": "ROW2COL",
+    "dynamic_keymap": {
+        "layer_count": 32
+    },
+    "eeprom": {
+        "driver": "spi"
+    },
+    "features": {
+        "audio": true,
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgb_matrix": true
+    },
+    "audio": {
+        "driver": "pwm_hardware"
+    },
+    "matrix_pins": {
+        "cols": ["B0", "A1", "A2", "A3", "A6", "B10"],
+        "rows": ["A5", "A4"]
+    },
+    "processor": "STM32F411",
+    "qmk": {
+        "tap_keycode_delay": 10
+    },
+    "rgb_matrix": {
+        "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_fractal": 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": [
+            {"matrix": [0, 0], "x": 0, "y": 0, "flags": 4},
+            {"matrix": [0, 1], "x": 45, "y": 0, "flags": 4},
+            {"matrix": [0, 2], "x": 90, "y": 0, "flags": 4},
+            {"matrix": [0, 3], "x": 134, "y": 0, "flags": 4},
+            {"matrix": [0, 4], "x": 179, "y": 0, "flags": 4},
+            {"matrix": [0, 5], "x": 224, "y": 0, "flags": 4},
+            {"matrix": [1, 0], "x": 23, "y": 64, "flags": 4},
+            {"matrix": [1, 1], "x": 68, "y": 64, "flags": 4},
+            {"matrix": [1, 2], "x": 112, "y": 64, "flags": 4},
+            {"matrix": [1, 3], "x": 157, "y": 64, "flags": 4},
+            {"matrix": [1, 4], "x": 202, "y": 64, "flags": 4}
+        ],
+        "max_brightness": 120,
+        "sat_steps": 8,
+        "speed_steps": 10,
+        "val_steps": 8
+    },
+    "url": "https://shop.custommk.com/collections/cmk11/products/ckm11",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0xFABA",
+        "vid": "0xF35B"
+    },
+    "ws2812": {
+        "driver": "pwm",
+        "pin": "A10"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [1, 0], "x": 0.5, "y": 1},
+                {"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}
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/keyboards/custommk/cmk11/rules.mk b/keyboards/custommk/cmk11/rules.mk
deleted file mode 100644
index 72f75f4367e..00000000000
--- a/keyboards/custommk/cmk11/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-AUDIO_DRIVER = pwm_hardware
diff --git a/keyboards/custommk/ergostrafer/info.json b/keyboards/custommk/ergostrafer/info.json
deleted file mode 100644
index a1283114c8e..00000000000
--- a/keyboards/custommk/ergostrafer/info.json
+++ /dev/null
@@ -1,89 +0,0 @@
-{
-    "manufacturer": "customMK",
-    "keyboard_name": "ErgoStrafer",
-    "maintainer": "customMK",
-    "bootloader": "stm32-dfu",
-    "diode_direction": "ROW2COL",
-    "eeprom": {
-        "driver": "spi"
-    },
-    "features": {
-        "bootmagic": true,
-        "command": false,
-        "console": false,
-        "extrakey": true,
-        "mousekey": true,
-        "nkro": true,
-        "encoder": true,
-        "audio": true
-    },
-    "matrix_pins": {
-        "cols": ["B0", "A1", "A2", "A3", "A6", "B6", "B10"],
-        "rows": ["C13", "C14", "C15", "B1", "A7", "A5"]
-    },
-    "processor": "STM32F411",
-    "url": "https://shop.custommk.com/collections/ergostrafer/products/ergostrafer",
-    "usb": {
-        "device_version": "1.0.0",
-        "pid": "0xFAB8",
-        "vid": "0xF35B"
-    },
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                { "matrix": [0, 0], "label":"F9", "x":7.5, "y":0 },
-                { "matrix": [0, 1], "label":"7", "x":1.5, "y":1.25 },
-                { "matrix": [0, 2], "label":"8", "x":2.5, "y":1.25 },
-                { "matrix": [0, 3], "label":"9", "x":3.5, "y":1.25 },
-                { "matrix": [0, 4], "label":"0", "x":4.5, "y":1.25 },
-                { "matrix": [0, 5], "label":"-", "x":5.5, "y":1.25 },
-                { "matrix": [0, 6], "label":"T", "x":7.25, "y":3.25, "w":1.5 },
-
-                { "matrix": [1, 0], "label":"PrtScr", "x":7.5, "y":1 },
-                { "matrix": [1, 1], "label":"1", "x":1, "y":2.25 },
-                { "matrix": [1, 2], "label":"2", "x":2, "y":2.25 },
-                { "matrix": [1, 3], "label":"3", "x":3, "y":2.25 },
-                { "matrix": [1, 4], "label":"5", "x":5, "y":2.25 },
-                { "matrix": [1, 5], "label":"6", "x":6, "y":2.25 },
-                { "matrix": [1, 6], "label":"G", "x":7.25, "y":4.25, "w":1.5 },
-
-                { "matrix": [2, 0], "label":"F5", "x":7.5, "y":2 },
-                { "matrix": [2, 1], "label":"Tab", "x":1, "y":3.5 },
-                { "matrix": [2, 2], "label":"Q", "x":2.5, "y":3.4 },
-                { "matrix": [2, 3], "label":"4", "x":4, "y":2.25 },
-                { "matrix": [2, 4], "label":"E", "x":4.5, "y":3.4 },
-                { "matrix": [2, 5], "label":"R", "x":6, "y":3.3 },
-                { "matrix": [2, 6], "label":"B", "x":6.5, "y":5.75, "w":1.5 },
-
-                { "matrix": [3, 0], "label":"Caps Lock", "x":0, "y":3.5 },
-                { "matrix": [3, 1], "label":"L Alt", "x":0.25, "y":4.75, "w":1.5 },
-                { "matrix": [3, 2], "label":"A", "x":2.5, "y":4.5 },
-                { "matrix": [3, 3], "label":"W", "x":3.5, "y":3.4 },
-                { "matrix": [3, 4], "label":"D", "x":4.5, "y":4.5 },
-                { "matrix": [3, 5], "label":"F", "x":6, "y":4.3 },
-                { "matrix": [3, 6], "label":"P", "x":8, "y":5.75 },
-
-                { "matrix": [4, 1], "label":"L Shift", "x":0.25, "y":5.75, "w":1.5 },                    
-                { "matrix": [4, 2], "label":"Z", "x":2.5, "y":5.6 },
-                { "matrix": [4, 3], "label":"S", "x":3.5, "y":4.5 },
-                { "matrix": [4, 5], "label":"V", "x":5, "y":5.75, "w":1.5 },
-                { "matrix": [4, 6], "label":"Space", "x":6.5, "y":6.85, "w":1.75 },
-
-                { "matrix": [5, 1], "label":"L Ctrl Duck", "x":0.25, "y":6.75, "w":1.5 },
-                { "matrix": [5, 3], "label":"X", "x":3.5, "y":5.6 },
-                { "matrix": [5, 5], "label":"C", "x":4.75, "y":6.85, "w":1.75 },                   
-                { "matrix": [5, 6], "label":"L Ctrl", "x":9.5, "y":5.75 }
-            ]
-        }
-    },
-    "encoder": {
-        "rotary": [
-            { "pin_a": "A8",  "pin_b": "A4"},
-            { "pin_a": "B12", "pin_b": "B14"},
-            { "pin_a": "B15", "pin_b": "A15"}
-        ]
-    },
-    "qmk": {
-        "tap_keycode_delay": 10
-    }
-}
\ No newline at end of file
diff --git a/keyboards/custommk/ergostrafer/keyboard.json b/keyboards/custommk/ergostrafer/keyboard.json
new file mode 100644
index 00000000000..4f23417415d
--- /dev/null
+++ b/keyboards/custommk/ergostrafer/keyboard.json
@@ -0,0 +1,92 @@
+{
+    "manufacturer": "customMK",
+    "keyboard_name": "ErgoStrafer",
+    "maintainer": "customMK",
+    "bootloader": "stm32-dfu",
+    "diode_direction": "ROW2COL",
+    "eeprom": {
+        "driver": "spi"
+    },
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "encoder": true,
+        "audio": true
+    },
+    "audio": {
+        "driver": "pwm_hardware"
+    },
+    "matrix_pins": {
+        "cols": ["B0", "A1", "A2", "A3", "A6", "B6", "B10"],
+        "rows": ["C13", "C14", "C15", "B1", "A7", "A5"]
+    },
+    "processor": "STM32F411",
+    "url": "https://shop.custommk.com/collections/ergostrafer/products/ergostrafer",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0xFAB8",
+        "vid": "0xF35B"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                { "matrix": [0, 0], "label":"F9", "x":7.5, "y":0 },
+                { "matrix": [0, 1], "label":"7", "x":1.5, "y":1.25 },
+                { "matrix": [0, 2], "label":"8", "x":2.5, "y":1.25 },
+                { "matrix": [0, 3], "label":"9", "x":3.5, "y":1.25 },
+                { "matrix": [0, 4], "label":"0", "x":4.5, "y":1.25 },
+                { "matrix": [0, 5], "label":"-", "x":5.5, "y":1.25 },
+                { "matrix": [0, 6], "label":"T", "x":7.25, "y":3.25, "w":1.5 },
+
+                { "matrix": [1, 0], "label":"PrtScr", "x":7.5, "y":1 },
+                { "matrix": [1, 1], "label":"1", "x":1, "y":2.25 },
+                { "matrix": [1, 2], "label":"2", "x":2, "y":2.25 },
+                { "matrix": [1, 3], "label":"3", "x":3, "y":2.25 },
+                { "matrix": [1, 4], "label":"5", "x":5, "y":2.25 },
+                { "matrix": [1, 5], "label":"6", "x":6, "y":2.25 },
+                { "matrix": [1, 6], "label":"G", "x":7.25, "y":4.25, "w":1.5 },
+
+                { "matrix": [2, 0], "label":"F5", "x":7.5, "y":2 },
+                { "matrix": [2, 1], "label":"Tab", "x":1, "y":3.5 },
+                { "matrix": [2, 2], "label":"Q", "x":2.5, "y":3.4 },
+                { "matrix": [2, 3], "label":"4", "x":4, "y":2.25 },
+                { "matrix": [2, 4], "label":"E", "x":4.5, "y":3.4 },
+                { "matrix": [2, 5], "label":"R", "x":6, "y":3.3 },
+                { "matrix": [2, 6], "label":"B", "x":6.5, "y":5.75, "w":1.5 },
+
+                { "matrix": [3, 0], "label":"Caps Lock", "x":0, "y":3.5 },
+                { "matrix": [3, 1], "label":"L Alt", "x":0.25, "y":4.75, "w":1.5 },
+                { "matrix": [3, 2], "label":"A", "x":2.5, "y":4.5 },
+                { "matrix": [3, 3], "label":"W", "x":3.5, "y":3.4 },
+                { "matrix": [3, 4], "label":"D", "x":4.5, "y":4.5 },
+                { "matrix": [3, 5], "label":"F", "x":6, "y":4.3 },
+                { "matrix": [3, 6], "label":"P", "x":8, "y":5.75 },
+
+                { "matrix": [4, 1], "label":"L Shift", "x":0.25, "y":5.75, "w":1.5 },                    
+                { "matrix": [4, 2], "label":"Z", "x":2.5, "y":5.6 },
+                { "matrix": [4, 3], "label":"S", "x":3.5, "y":4.5 },
+                { "matrix": [4, 5], "label":"V", "x":5, "y":5.75, "w":1.5 },
+                { "matrix": [4, 6], "label":"Space", "x":6.5, "y":6.85, "w":1.75 },
+
+                { "matrix": [5, 1], "label":"L Ctrl Duck", "x":0.25, "y":6.75, "w":1.5 },
+                { "matrix": [5, 3], "label":"X", "x":3.5, "y":5.6 },
+                { "matrix": [5, 5], "label":"C", "x":4.75, "y":6.85, "w":1.75 },                   
+                { "matrix": [5, 6], "label":"L Ctrl", "x":9.5, "y":5.75 }
+            ]
+        }
+    },
+    "encoder": {
+        "rotary": [
+            { "pin_a": "A8",  "pin_b": "A4"},
+            { "pin_a": "B12", "pin_b": "B14"},
+            { "pin_a": "B15", "pin_b": "A15"}
+        ]
+    },
+    "qmk": {
+        "tap_keycode_delay": 10
+    }
+}
\ No newline at end of file
diff --git a/keyboards/custommk/ergostrafer/rules.mk b/keyboards/custommk/ergostrafer/rules.mk
deleted file mode 100644
index 72f75f4367e..00000000000
--- a/keyboards/custommk/ergostrafer/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-AUDIO_DRIVER = pwm_hardware
diff --git a/keyboards/custommk/evo70_r2/info.json b/keyboards/custommk/evo70_r2/info.json
deleted file mode 100644
index dea56ed2570..00000000000
--- a/keyboards/custommk/evo70_r2/info.json
+++ /dev/null
@@ -1,323 +0,0 @@
-{
-    "keyboard_name": "EVO70 R2", 
-    "url": "https://shop.custommk.com/collections/evo70/products/evo70", 
-    "maintainer": "customMK", 
-    "manufacturer": "customMK",
-    "tags": ["70%", "encoder", "underglow", "backlight"],
-    "features": {
-        "bootmagic": true,
-        "command": false,
-        "console": false,
-        "extrakey": true,
-        "mousekey": true,
-        "nkro": true,
-        "encoder": true,
-        "quantum_painter": true,
-        "oled": true,
-        "rgblight": true,
-        "backlight": true,
-        "audio": true
-    },
-    "usb": {
-        "vid": "0xF35B",
-        "pid": "0xFAB6",
-        "device_version": "1.0.0"
-    },
-    "diode_direction": "ROW2COL",
-    "eeprom": {
-        "driver": "spi"
-    },
-    "processor": "STM32F411",
-    "bootloader": "stm32-dfu",
-    "rgblight": {
-        "led_count": 48,
-        "hue_steps": 4,
-        "saturation_steps": 8,
-        "brightness_steps": 4,
-        "max_brightness": 128,
-        "layers": {
-            "enabled": true
-        },
-        "animations": {
-            "alternating": true,
-            "breathing": true,
-            "christmas": true,
-            "knight": true,
-            "rainbo_mood": true,
-            "rainbow_swirl": true,
-            "rgb_test": true,
-            "snake": true,
-            "static_gradient": true,
-            "twinkle": true
-        }
-    },
-    "ws2812": {
-        "driver": "pwm",
-        "pin": "A10"
-    },
-    "backlight": {
-        "driver": "pwm",
-        "breathing": true,
-        "breathing_period": 6,
-        "levels": 17,
-        "pin": "A6"
-    },
-    "layout_aliases": {
-        "LAYOUT": "LAYOUT_all"
-    },
-    "layouts": {
-        "LAYOUT_all": {
-            "layout": [
-                {"label": "Encoder", "matrix": [1, 0], "x": 0.5, "y": 0},
-                {"label": "Esc", "matrix": [0, 0], "x": 2.25, "y": 0},
-                {"label": "1", "matrix": [0, 2], "x": 3.25, "y": 0},
-                {"label": "2", "matrix": [0, 3], "x": 4.25, "y": 0},
-                {"label": "3", "matrix": [0, 4], "x": 5.25, "y": 0},
-                {"label": "4", "matrix": [0, 5], "x": 6.25, "y": 0},
-                {"label": "5", "matrix": [0, 6], "x": 7.25, "y": 0},
-                {"label": "6", "matrix": [0, 7], "x": 8.25, "y": 0},
-                {"label": "7", "matrix": [0, 8], "x": 9.25, "y": 0},
-                {"label": "8", "matrix": [0, 9], "x": 10.25, "y": 0},
-                {"label": "9", "matrix": [0, 10], "x": 11.25, "y": 0},
-                {"label": "0", "matrix": [0, 11], "x": 12.25, "y": 0},
-                {"label": "-", "matrix": [0, 12], "x": 13.25, "y": 0},
-                {"label": "=", "matrix": [0, 13], "x": 14.25, "y": 0},
-                {"label": "Backspace", "matrix": [0, 14], "x": 15.25, "y": 0, "w": 2},
-                {"label": "Delete", "matrix": [0, 15], "x": 17.25, "y": 0},
-
-                {"label": "Tab", "matrix": [1, 1], "x": 2.25, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 2], "x": 3.75, "y": 1},
-                {"label": "W", "matrix": [1, 3], "x": 4.75, "y": 1},
-                {"label": "E", "matrix": [1, 4], "x": 5.75, "y": 1},
-                {"label": "R", "matrix": [1, 5], "x": 6.75, "y": 1},
-                {"label": "T", "matrix": [1, 6], "x": 7.75, "y": 1},
-                {"label": "Y", "matrix": [1, 7], "x": 8.75, "y": 1},
-                {"label": "U", "matrix": [1, 8], "x": 9.75, "y": 1},
-                {"label": "I", "matrix": [1, 9], "x": 10.75, "y": 1},
-                {"label": "O", "matrix": [1, 10], "x": 11.75, "y": 1},
-                {"label": "P", "matrix": [1, 11], "x": 12.75, "y": 1},
-                {"label": "[", "matrix": [1, 12], "x": 13.75, "y": 1},
-                {"label": "]", "matrix": [1, 13], "x": 14.75, "y": 1},
-                {"label": "\\", "matrix": [1, 14], "x": 15.75, "y": 1, "w": 1.5},
-                {"label": "PgUp", "matrix": [1, 15], "x": 17.25, "y": 1},
-
-                {"label": "F1", "matrix": [2, 2], "x": 0, "y": 2},
-                {"label": "F2", "matrix": [2, 0], "x": 1, "y": 2},
-                {"label": "Caps Lock", "matrix": [2, 1], "x": 2.25, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 3], "x": 4, "y": 2},
-                {"label": "S", "matrix": [2, 4], "x": 5, "y": 2},
-                {"label": "D", "matrix": [2, 5], "x": 6, "y": 2},
-                {"label": "F", "matrix": [2, 6], "x": 7, "y": 2},
-                {"label": "G", "matrix": [2, 7], "x": 8, "y": 2},
-                {"label": "H", "matrix": [2, 8], "x": 9, "y": 2},
-                {"label": "J", "matrix": [2, 9], "x": 10, "y": 2},
-                {"label": "K", "matrix": [2, 10], "x": 11, "y": 2},
-                {"label": "L", "matrix": [2, 11], "x": 12, "y": 2},
-                {"label": ";", "matrix": [2, 12], "x": 13, "y": 2},
-                {"label": "'", "matrix": [2, 13], "x": 14, "y": 2},
-                {"label": "Enter", "matrix": [2, 14], "x": 15, "y": 2, "w": 2.25},
-                {"label": "PgDn", "matrix": [2, 15], "x": 17.25, "y": 2},
-
-                {"label": "F3", "matrix": [3, 1], "x": 0, "y": 3},
-                {"label": "F4", "matrix": [3, 0], "x": 1, "y": 3},
-                {"label": "Shift", "matrix": [3, 2], "x": 2.25, "y": 3, "w": 1.25},
-                {"label": "\u2298", "matrix": [0, 1], "x": 3.5, "y": 3},
-                {"label": "Z", "matrix": [3, 3], "x": 4.5, "y": 3},
-                {"label": "X", "matrix": [3, 4], "x": 5.5, "y": 3},
-                {"label": "C", "matrix": [3, 5], "x": 6.5, "y": 3},
-                {"label": "V", "matrix": [3, 6], "x": 7.5, "y": 3},
-                {"label": "B", "matrix": [3, 7], "x": 8.5, "y": 3},
-                {"label": "N", "matrix": [3, 8], "x": 9.5, "y": 3},
-                {"label": "M", "matrix": [3, 9], "x": 10.5, "y": 3},
-                {"label": ",", "matrix": [3, 10], "x": 11.5, "y": 3},
-                {"label": ".", "matrix": [3, 11], "x": 12.5, "y": 3},
-                {"label": "/", "matrix": [3, 12], "x": 13.5, "y": 3},
-                {"label": "Shift", "matrix": [3, 13], "x": 14.5, "y": 3, "w": 1.75},
-                {"label": "Up", "matrix": [3, 14], "x": 16.25, "y": 3},
-                {"label": "End", "matrix": [3, 15], "x": 17.25, "y": 3},
-
-                {"label": "F5", "matrix": [4, 3], "x": 0, "y": 4},
-                {"label": "F6", "matrix": [4, 0], "x": 1, "y": 4},
-                {"label": "Ctrl", "matrix": [4, 1], "x": 2.25, "y": 4, "w": 1.25},
-                {"label": "GUI", "matrix": [4, 2], "x": 3.5, "y": 4, "w": 1.25},
-                {"label": "Alt", "matrix": [4, 4], "x": 4.75, "y": 4, "w": 1.25},
-                {"label": "Space", "matrix": [4, 7], "x": 6, "y": 4, "w": 6.25},
-                {"label": "Alt", "matrix": [4, 10], "x": 12.25, "y": 4, "w": 1.25},
-                {"label": "Ctrl", "matrix": [4, 11], "x": 13.5, "y": 4, "w": 1.25},
-                {"label": "Left", "matrix": [4, 13], "x": 15.25, "y": 4},
-                {"label": "Down", "matrix": [4, 14], "x": 16.25, "y": 4},
-                {"label": "Right", "matrix": [4, 15], "x": 17.25, "y": 4}
-            ]
-        },
-        "LAYOUT_ansi_blocker": {
-            "layout": [
-                {"label": "Encoder", "matrix": [1, 0], "x": 0.5, "y": 0},
-                {"label": "Esc", "matrix": [0, 0], "x": 2.25, "y": 0},
-                {"label": "1", "matrix": [0, 2], "x": 3.25, "y": 0},
-                {"label": "2", "matrix": [0, 3], "x": 4.25, "y": 0},
-                {"label": "3", "matrix": [0, 4], "x": 5.25, "y": 0},
-                {"label": "4", "matrix": [0, 5], "x": 6.25, "y": 0},
-                {"label": "5", "matrix": [0, 6], "x": 7.25, "y": 0},
-                {"label": "6", "matrix": [0, 7], "x": 8.25, "y": 0},
-                {"label": "7", "matrix": [0, 8], "x": 9.25, "y": 0},
-                {"label": "8", "matrix": [0, 9], "x": 10.25, "y": 0},
-                {"label": "9", "matrix": [0, 10], "x": 11.25, "y": 0},
-                {"label": "0", "matrix": [0, 11], "x": 12.25, "y": 0},
-                {"label": "-", "matrix": [0, 12], "x": 13.25, "y": 0},
-                {"label": "=", "matrix": [0, 13], "x": 14.25, "y": 0},
-                {"label": "Backspace", "matrix": [0, 14], "x": 15.25, "y": 0, "w": 2},
-                {"label": "Delete", "matrix": [0, 15], "x": 17.25, "y": 0},
-
-                {"label": "Tab", "matrix": [1, 1], "x": 2.25, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 2], "x": 3.75, "y": 1},
-                {"label": "W", "matrix": [1, 3], "x": 4.75, "y": 1},
-                {"label": "E", "matrix": [1, 4], "x": 5.75, "y": 1},
-                {"label": "R", "matrix": [1, 5], "x": 6.75, "y": 1},
-                {"label": "T", "matrix": [1, 6], "x": 7.75, "y": 1},
-                {"label": "Y", "matrix": [1, 7], "x": 8.75, "y": 1},
-                {"label": "U", "matrix": [1, 8], "x": 9.75, "y": 1},
-                {"label": "I", "matrix": [1, 9], "x": 10.75, "y": 1},
-                {"label": "O", "matrix": [1, 10], "x": 11.75, "y": 1},
-                {"label": "P", "matrix": [1, 11], "x": 12.75, "y": 1},
-                {"label": "[", "matrix": [1, 12], "x": 13.75, "y": 1},
-                {"label": "]", "matrix": [1, 13], "x": 14.75, "y": 1},
-                {"label": "\\", "matrix": [1, 14], "x": 15.75, "y": 1, "w": 1.5},
-                {"label": "PgUp", "matrix": [1, 15], "x": 17.25, "y": 1},
-
-                {"label": "F1", "matrix": [2, 2], "x": 0, "y": 2},
-                {"label": "F2", "matrix": [2, 0], "x": 1, "y": 2},
-                {"label": "Caps Lock", "matrix": [2, 1], "x": 2.25, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 3], "x": 4, "y": 2},
-                {"label": "S", "matrix": [2, 4], "x": 5, "y": 2},
-                {"label": "D", "matrix": [2, 5], "x": 6, "y": 2},
-                {"label": "F", "matrix": [2, 6], "x": 7, "y": 2},
-                {"label": "G", "matrix": [2, 7], "x": 8, "y": 2},
-                {"label": "H", "matrix": [2, 8], "x": 9, "y": 2},
-                {"label": "J", "matrix": [2, 9], "x": 10, "y": 2},
-                {"label": "K", "matrix": [2, 10], "x": 11, "y": 2},
-                {"label": "L", "matrix": [2, 11], "x": 12, "y": 2},
-                {"label": ";", "matrix": [2, 12], "x": 13, "y": 2},
-                {"label": "'", "matrix": [2, 13], "x": 14, "y": 2},
-                {"label": "Enter", "matrix": [2, 14], "x": 15, "y": 2, "w": 2.25},
-                {"label": "PgDn", "matrix": [2, 15], "x": 17.25, "y": 2},
-
-                {"label": "F3", "matrix": [3, 1], "x": 0, "y": 3},
-                {"label": "F4", "matrix": [3, 0], "x": 1, "y": 3},
-                {"label": "Shift", "matrix": [3, 2], "x": 2.25, "y": 3, "w": 2.25},
-                {"label": "Z", "matrix": [3, 3], "x": 4.5, "y": 3},
-                {"label": "X", "matrix": [3, 4], "x": 5.5, "y": 3},
-                {"label": "C", "matrix": [3, 5], "x": 6.5, "y": 3},
-                {"label": "V", "matrix": [3, 6], "x": 7.5, "y": 3},
-                {"label": "B", "matrix": [3, 7], "x": 8.5, "y": 3},
-                {"label": "N", "matrix": [3, 8], "x": 9.5, "y": 3},
-                {"label": "M", "matrix": [3, 9], "x": 10.5, "y": 3},
-                {"label": ",", "matrix": [3, 10], "x": 11.5, "y": 3},
-                {"label": ".", "matrix": [3, 11], "x": 12.5, "y": 3},
-                {"label": "/", "matrix": [3, 12], "x": 13.5, "y": 3},
-                {"label": "Shift", "matrix": [3, 13], "x": 14.5, "y": 3, "w": 1.75},
-                {"label": "Up", "matrix": [3, 14], "x": 16.25, "y": 3},
-                {"label": "End", "matrix": [3, 15], "x": 17.25, "y": 3},
-
-                {"label": "F5", "matrix": [4, 3], "x": 0, "y": 4},
-                {"label": "F6", "matrix": [4, 0], "x": 1, "y": 4},
-                {"label": "Ctrl", "matrix": [4, 1], "x": 2.25, "y": 4, "w": 1.25},
-                {"label": "GUI", "matrix": [4, 2], "x": 3.5, "y": 4, "w": 1.25},
-                {"label": "Alt", "matrix": [4, 4], "x": 4.75, "y": 4, "w": 1.25},
-                {"label": "Space", "matrix": [4, 7], "x": 6, "y": 4, "w": 6.25},
-                {"label": "Alt", "matrix": [4, 10], "x": 12.25, "y": 4, "w": 1.25},
-                {"label": "Ctrl", "matrix": [4, 11], "x": 13.5, "y": 4, "w": 1.25},
-                {"label": "Left", "matrix": [4, 13], "x": 15.25, "y": 4},
-                {"label": "Down", "matrix": [4, 14], "x": 16.25, "y": 4},
-                {"label": "Right", "matrix": [4, 15], "x": 17.25, "y": 4}
-            ]
-        },
-        "LAYOUT_iso_blocker": {
-            "layout": [
-                {"label": "Encoder", "matrix": [1, 0], "x": 0.5, "y": 0},
-                {"label": "Esc", "matrix": [0, 0], "x": 2.25, "y": 0},
-                {"label": "1", "matrix": [0, 2], "x": 3.25, "y": 0},
-                {"label": "2", "matrix": [0, 3], "x": 4.25, "y": 0},
-                {"label": "3", "matrix": [0, 4], "x": 5.25, "y": 0},
-                {"label": "4", "matrix": [0, 5], "x": 6.25, "y": 0},
-                {"label": "5", "matrix": [0, 6], "x": 7.25, "y": 0},
-                {"label": "6", "matrix": [0, 7], "x": 8.25, "y": 0},
-                {"label": "7", "matrix": [0, 8], "x": 9.25, "y": 0},
-                {"label": "8", "matrix": [0, 9], "x": 10.25, "y": 0},
-                {"label": "9", "matrix": [0, 10], "x": 11.25, "y": 0},
-                {"label": "0", "matrix": [0, 11], "x": 12.25, "y": 0},
-                {"label": "-", "matrix": [0, 12], "x": 13.25, "y": 0},
-                {"label": "=", "matrix": [0, 13], "x": 14.25, "y": 0},
-                {"label": "Backspace", "matrix": [0, 14], "x": 15.25, "y": 0, "w": 2},
-                {"label": "Delete", "matrix": [0, 15], "x": 17.25, "y": 0},
-
-                {"label": "Tab", "matrix": [1, 1], "x": 2.25, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 2], "x": 3.75, "y": 1},
-                {"label": "W", "matrix": [1, 3], "x": 4.75, "y": 1},
-                {"label": "E", "matrix": [1, 4], "x": 5.75, "y": 1},
-                {"label": "R", "matrix": [1, 5], "x": 6.75, "y": 1},
-                {"label": "T", "matrix": [1, 6], "x": 7.75, "y": 1},
-                {"label": "Y", "matrix": [1, 7], "x": 8.75, "y": 1},
-                {"label": "U", "matrix": [1, 8], "x": 9.75, "y": 1},
-                {"label": "I", "matrix": [1, 9], "x": 10.75, "y": 1},
-                {"label": "O", "matrix": [1, 10], "x": 11.75, "y": 1},
-                {"label": "P", "matrix": [1, 11], "x": 12.75, "y": 1},
-                {"label": "[", "matrix": [1, 12], "x": 13.75, "y": 1},
-                {"label": "]", "matrix": [1, 13], "x": 14.75, "y": 1},
-                {"label": "PgUp", "matrix": [1, 15], "x": 17.25, "y": 1},
-
-                {"label": "F1", "matrix": [2, 2], "x": 0, "y": 2},
-                {"label": "F2", "matrix": [2, 0], "x": 1, "y": 2},
-                {"label": "Caps Lock", "matrix": [2, 1], "x": 2.25, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 3], "x": 4, "y": 2},
-                {"label": "S", "matrix": [2, 4], "x": 5, "y": 2},
-                {"label": "D", "matrix": [2, 5], "x": 6, "y": 2},
-                {"label": "F", "matrix": [2, 6], "x": 7, "y": 2},
-                {"label": "G", "matrix": [2, 7], "x": 8, "y": 2},
-                {"label": "H", "matrix": [2, 8], "x": 9, "y": 2},
-                {"label": "J", "matrix": [2, 9], "x": 10, "y": 2},
-                {"label": "K", "matrix": [2, 10], "x": 11, "y": 2},
-                {"label": "L", "matrix": [2, 11], "x": 12, "y": 2},
-                {"label": ";", "matrix": [2, 12], "x": 13, "y": 2},
-                {"label": "'", "matrix": [2, 13], "x": 14, "y": 2},
-                {"label": "#", "matrix": [1, 14], "x": 15, "y": 2},
-                {"label": "Enter", "matrix": [2, 14], "x": 16, "y": 1, "w": 1.25, "h": 2},
-                {"label": "PgDn", "matrix": [2, 15], "x": 17.25, "y": 2},
-
-                {"label": "F3", "matrix": [3, 1], "x": 0, "y": 3},
-                {"label": "F4", "matrix": [3, 0], "x": 1, "y": 3},
-                {"label": "Shift", "matrix": [3, 2], "x": 2.25, "y": 3, "w": 1.25},
-                {"label": "\u2298", "matrix": [0, 1], "x": 3.5, "y": 3},
-                {"label": "Z", "matrix": [3, 3], "x": 4.5, "y": 3},
-                {"label": "X", "matrix": [3, 4], "x": 5.5, "y": 3},
-                {"label": "C", "matrix": [3, 5], "x": 6.5, "y": 3},
-                {"label": "V", "matrix": [3, 6], "x": 7.5, "y": 3},
-                {"label": "B", "matrix": [3, 7], "x": 8.5, "y": 3},
-                {"label": "N", "matrix": [3, 8], "x": 9.5, "y": 3},
-                {"label": "M", "matrix": [3, 9], "x": 10.5, "y": 3},
-                {"label": ",", "matrix": [3, 10], "x": 11.5, "y": 3},
-                {"label": ".", "matrix": [3, 11], "x": 12.5, "y": 3},
-                {"label": "/", "matrix": [3, 12], "x": 13.5, "y": 3},
-                {"label": "Shift", "matrix": [3, 13], "x": 14.5, "y": 3, "w": 1.75},
-                {"label": "Up", "matrix": [3, 14], "x": 16.25, "y": 3},
-                {"label": "End", "matrix": [3, 15], "x": 17.25, "y": 3},
-
-                {"label": "F5", "matrix": [4, 3], "x": 0, "y": 4},
-                {"label": "F6", "matrix": [4, 0], "x": 1, "y": 4},
-                {"label": "Ctrl", "matrix": [4, 1], "x": 2.25, "y": 4, "w": 1.25},
-                {"label": "GUI", "matrix": [4, 2], "x": 3.5, "y": 4, "w": 1.25},
-                {"label": "Alt", "matrix": [4, 4], "x": 4.75, "y": 4, "w": 1.25},
-                {"label": "Space", "matrix": [4, 7], "x": 6, "y": 4, "w": 6.25},
-                {"label": "Alt", "matrix": [4, 10], "x": 12.25, "y": 4, "w": 1.25},
-                {"label": "Ctrl", "matrix": [4, 11], "x": 13.5, "y": 4, "w": 1.25},
-                {"label": "Left", "matrix": [4, 13], "x": 15.25, "y": 4},
-                {"label": "Down", "matrix": [4, 14], "x": 16.25, "y": 4},
-                {"label": "Right", "matrix": [4, 15], "x": 17.25, "y": 4}
-            ]
-        }
-    },
-    "encoder": {
-        "rotary": [
-            { "pin_a": "B7",  "pin_b": "A4", "resolution": 2}
-        ]
-    }
-}
diff --git a/keyboards/custommk/evo70_r2/keyboard.json b/keyboards/custommk/evo70_r2/keyboard.json
new file mode 100644
index 00000000000..5f10d6705d9
--- /dev/null
+++ b/keyboards/custommk/evo70_r2/keyboard.json
@@ -0,0 +1,326 @@
+{
+    "keyboard_name": "EVO70 R2", 
+    "url": "https://shop.custommk.com/collections/evo70/products/evo70", 
+    "maintainer": "customMK", 
+    "manufacturer": "customMK",
+    "tags": ["70%", "encoder", "underglow", "backlight"],
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "encoder": true,
+        "quantum_painter": true,
+        "oled": true,
+        "rgblight": true,
+        "backlight": true,
+        "audio": true
+    },
+    "usb": {
+        "vid": "0xF35B",
+        "pid": "0xFAB6",
+        "device_version": "1.0.0"
+    },
+    "diode_direction": "ROW2COL",
+    "eeprom": {
+        "driver": "spi"
+    },
+    "processor": "STM32F411",
+    "bootloader": "stm32-dfu",
+    "rgblight": {
+        "led_count": 48,
+        "hue_steps": 4,
+        "saturation_steps": 8,
+        "brightness_steps": 4,
+        "max_brightness": 128,
+        "layers": {
+            "enabled": true
+        },
+        "animations": {
+            "alternating": true,
+            "breathing": true,
+            "christmas": true,
+            "knight": true,
+            "rainbo_mood": true,
+            "rainbow_swirl": true,
+            "rgb_test": true,
+            "snake": true,
+            "static_gradient": true,
+            "twinkle": true
+        }
+    },
+    "audio": {
+        "driver": "pwm_hardware"
+    },
+    "ws2812": {
+        "driver": "pwm",
+        "pin": "A10"
+    },
+    "backlight": {
+        "driver": "pwm",
+        "breathing": true,
+        "breathing_period": 6,
+        "levels": 17,
+        "pin": "A6"
+    },
+    "layout_aliases": {
+        "LAYOUT": "LAYOUT_all"
+    },
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                {"label": "Encoder", "matrix": [1, 0], "x": 0.5, "y": 0},
+                {"label": "Esc", "matrix": [0, 0], "x": 2.25, "y": 0},
+                {"label": "1", "matrix": [0, 2], "x": 3.25, "y": 0},
+                {"label": "2", "matrix": [0, 3], "x": 4.25, "y": 0},
+                {"label": "3", "matrix": [0, 4], "x": 5.25, "y": 0},
+                {"label": "4", "matrix": [0, 5], "x": 6.25, "y": 0},
+                {"label": "5", "matrix": [0, 6], "x": 7.25, "y": 0},
+                {"label": "6", "matrix": [0, 7], "x": 8.25, "y": 0},
+                {"label": "7", "matrix": [0, 8], "x": 9.25, "y": 0},
+                {"label": "8", "matrix": [0, 9], "x": 10.25, "y": 0},
+                {"label": "9", "matrix": [0, 10], "x": 11.25, "y": 0},
+                {"label": "0", "matrix": [0, 11], "x": 12.25, "y": 0},
+                {"label": "-", "matrix": [0, 12], "x": 13.25, "y": 0},
+                {"label": "=", "matrix": [0, 13], "x": 14.25, "y": 0},
+                {"label": "Backspace", "matrix": [0, 14], "x": 15.25, "y": 0, "w": 2},
+                {"label": "Delete", "matrix": [0, 15], "x": 17.25, "y": 0},
+
+                {"label": "Tab", "matrix": [1, 1], "x": 2.25, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 2], "x": 3.75, "y": 1},
+                {"label": "W", "matrix": [1, 3], "x": 4.75, "y": 1},
+                {"label": "E", "matrix": [1, 4], "x": 5.75, "y": 1},
+                {"label": "R", "matrix": [1, 5], "x": 6.75, "y": 1},
+                {"label": "T", "matrix": [1, 6], "x": 7.75, "y": 1},
+                {"label": "Y", "matrix": [1, 7], "x": 8.75, "y": 1},
+                {"label": "U", "matrix": [1, 8], "x": 9.75, "y": 1},
+                {"label": "I", "matrix": [1, 9], "x": 10.75, "y": 1},
+                {"label": "O", "matrix": [1, 10], "x": 11.75, "y": 1},
+                {"label": "P", "matrix": [1, 11], "x": 12.75, "y": 1},
+                {"label": "[", "matrix": [1, 12], "x": 13.75, "y": 1},
+                {"label": "]", "matrix": [1, 13], "x": 14.75, "y": 1},
+                {"label": "\\", "matrix": [1, 14], "x": 15.75, "y": 1, "w": 1.5},
+                {"label": "PgUp", "matrix": [1, 15], "x": 17.25, "y": 1},
+
+                {"label": "F1", "matrix": [2, 2], "x": 0, "y": 2},
+                {"label": "F2", "matrix": [2, 0], "x": 1, "y": 2},
+                {"label": "Caps Lock", "matrix": [2, 1], "x": 2.25, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 3], "x": 4, "y": 2},
+                {"label": "S", "matrix": [2, 4], "x": 5, "y": 2},
+                {"label": "D", "matrix": [2, 5], "x": 6, "y": 2},
+                {"label": "F", "matrix": [2, 6], "x": 7, "y": 2},
+                {"label": "G", "matrix": [2, 7], "x": 8, "y": 2},
+                {"label": "H", "matrix": [2, 8], "x": 9, "y": 2},
+                {"label": "J", "matrix": [2, 9], "x": 10, "y": 2},
+                {"label": "K", "matrix": [2, 10], "x": 11, "y": 2},
+                {"label": "L", "matrix": [2, 11], "x": 12, "y": 2},
+                {"label": ";", "matrix": [2, 12], "x": 13, "y": 2},
+                {"label": "'", "matrix": [2, 13], "x": 14, "y": 2},
+                {"label": "Enter", "matrix": [2, 14], "x": 15, "y": 2, "w": 2.25},
+                {"label": "PgDn", "matrix": [2, 15], "x": 17.25, "y": 2},
+
+                {"label": "F3", "matrix": [3, 1], "x": 0, "y": 3},
+                {"label": "F4", "matrix": [3, 0], "x": 1, "y": 3},
+                {"label": "Shift", "matrix": [3, 2], "x": 2.25, "y": 3, "w": 1.25},
+                {"label": "\u2298", "matrix": [0, 1], "x": 3.5, "y": 3},
+                {"label": "Z", "matrix": [3, 3], "x": 4.5, "y": 3},
+                {"label": "X", "matrix": [3, 4], "x": 5.5, "y": 3},
+                {"label": "C", "matrix": [3, 5], "x": 6.5, "y": 3},
+                {"label": "V", "matrix": [3, 6], "x": 7.5, "y": 3},
+                {"label": "B", "matrix": [3, 7], "x": 8.5, "y": 3},
+                {"label": "N", "matrix": [3, 8], "x": 9.5, "y": 3},
+                {"label": "M", "matrix": [3, 9], "x": 10.5, "y": 3},
+                {"label": ",", "matrix": [3, 10], "x": 11.5, "y": 3},
+                {"label": ".", "matrix": [3, 11], "x": 12.5, "y": 3},
+                {"label": "/", "matrix": [3, 12], "x": 13.5, "y": 3},
+                {"label": "Shift", "matrix": [3, 13], "x": 14.5, "y": 3, "w": 1.75},
+                {"label": "Up", "matrix": [3, 14], "x": 16.25, "y": 3},
+                {"label": "End", "matrix": [3, 15], "x": 17.25, "y": 3},
+
+                {"label": "F5", "matrix": [4, 3], "x": 0, "y": 4},
+                {"label": "F6", "matrix": [4, 0], "x": 1, "y": 4},
+                {"label": "Ctrl", "matrix": [4, 1], "x": 2.25, "y": 4, "w": 1.25},
+                {"label": "GUI", "matrix": [4, 2], "x": 3.5, "y": 4, "w": 1.25},
+                {"label": "Alt", "matrix": [4, 4], "x": 4.75, "y": 4, "w": 1.25},
+                {"label": "Space", "matrix": [4, 7], "x": 6, "y": 4, "w": 6.25},
+                {"label": "Alt", "matrix": [4, 10], "x": 12.25, "y": 4, "w": 1.25},
+                {"label": "Ctrl", "matrix": [4, 11], "x": 13.5, "y": 4, "w": 1.25},
+                {"label": "Left", "matrix": [4, 13], "x": 15.25, "y": 4},
+                {"label": "Down", "matrix": [4, 14], "x": 16.25, "y": 4},
+                {"label": "Right", "matrix": [4, 15], "x": 17.25, "y": 4}
+            ]
+        },
+        "LAYOUT_ansi_blocker": {
+            "layout": [
+                {"label": "Encoder", "matrix": [1, 0], "x": 0.5, "y": 0},
+                {"label": "Esc", "matrix": [0, 0], "x": 2.25, "y": 0},
+                {"label": "1", "matrix": [0, 2], "x": 3.25, "y": 0},
+                {"label": "2", "matrix": [0, 3], "x": 4.25, "y": 0},
+                {"label": "3", "matrix": [0, 4], "x": 5.25, "y": 0},
+                {"label": "4", "matrix": [0, 5], "x": 6.25, "y": 0},
+                {"label": "5", "matrix": [0, 6], "x": 7.25, "y": 0},
+                {"label": "6", "matrix": [0, 7], "x": 8.25, "y": 0},
+                {"label": "7", "matrix": [0, 8], "x": 9.25, "y": 0},
+                {"label": "8", "matrix": [0, 9], "x": 10.25, "y": 0},
+                {"label": "9", "matrix": [0, 10], "x": 11.25, "y": 0},
+                {"label": "0", "matrix": [0, 11], "x": 12.25, "y": 0},
+                {"label": "-", "matrix": [0, 12], "x": 13.25, "y": 0},
+                {"label": "=", "matrix": [0, 13], "x": 14.25, "y": 0},
+                {"label": "Backspace", "matrix": [0, 14], "x": 15.25, "y": 0, "w": 2},
+                {"label": "Delete", "matrix": [0, 15], "x": 17.25, "y": 0},
+
+                {"label": "Tab", "matrix": [1, 1], "x": 2.25, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 2], "x": 3.75, "y": 1},
+                {"label": "W", "matrix": [1, 3], "x": 4.75, "y": 1},
+                {"label": "E", "matrix": [1, 4], "x": 5.75, "y": 1},
+                {"label": "R", "matrix": [1, 5], "x": 6.75, "y": 1},
+                {"label": "T", "matrix": [1, 6], "x": 7.75, "y": 1},
+                {"label": "Y", "matrix": [1, 7], "x": 8.75, "y": 1},
+                {"label": "U", "matrix": [1, 8], "x": 9.75, "y": 1},
+                {"label": "I", "matrix": [1, 9], "x": 10.75, "y": 1},
+                {"label": "O", "matrix": [1, 10], "x": 11.75, "y": 1},
+                {"label": "P", "matrix": [1, 11], "x": 12.75, "y": 1},
+                {"label": "[", "matrix": [1, 12], "x": 13.75, "y": 1},
+                {"label": "]", "matrix": [1, 13], "x": 14.75, "y": 1},
+                {"label": "\\", "matrix": [1, 14], "x": 15.75, "y": 1, "w": 1.5},
+                {"label": "PgUp", "matrix": [1, 15], "x": 17.25, "y": 1},
+
+                {"label": "F1", "matrix": [2, 2], "x": 0, "y": 2},
+                {"label": "F2", "matrix": [2, 0], "x": 1, "y": 2},
+                {"label": "Caps Lock", "matrix": [2, 1], "x": 2.25, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 3], "x": 4, "y": 2},
+                {"label": "S", "matrix": [2, 4], "x": 5, "y": 2},
+                {"label": "D", "matrix": [2, 5], "x": 6, "y": 2},
+                {"label": "F", "matrix": [2, 6], "x": 7, "y": 2},
+                {"label": "G", "matrix": [2, 7], "x": 8, "y": 2},
+                {"label": "H", "matrix": [2, 8], "x": 9, "y": 2},
+                {"label": "J", "matrix": [2, 9], "x": 10, "y": 2},
+                {"label": "K", "matrix": [2, 10], "x": 11, "y": 2},
+                {"label": "L", "matrix": [2, 11], "x": 12, "y": 2},
+                {"label": ";", "matrix": [2, 12], "x": 13, "y": 2},
+                {"label": "'", "matrix": [2, 13], "x": 14, "y": 2},
+                {"label": "Enter", "matrix": [2, 14], "x": 15, "y": 2, "w": 2.25},
+                {"label": "PgDn", "matrix": [2, 15], "x": 17.25, "y": 2},
+
+                {"label": "F3", "matrix": [3, 1], "x": 0, "y": 3},
+                {"label": "F4", "matrix": [3, 0], "x": 1, "y": 3},
+                {"label": "Shift", "matrix": [3, 2], "x": 2.25, "y": 3, "w": 2.25},
+                {"label": "Z", "matrix": [3, 3], "x": 4.5, "y": 3},
+                {"label": "X", "matrix": [3, 4], "x": 5.5, "y": 3},
+                {"label": "C", "matrix": [3, 5], "x": 6.5, "y": 3},
+                {"label": "V", "matrix": [3, 6], "x": 7.5, "y": 3},
+                {"label": "B", "matrix": [3, 7], "x": 8.5, "y": 3},
+                {"label": "N", "matrix": [3, 8], "x": 9.5, "y": 3},
+                {"label": "M", "matrix": [3, 9], "x": 10.5, "y": 3},
+                {"label": ",", "matrix": [3, 10], "x": 11.5, "y": 3},
+                {"label": ".", "matrix": [3, 11], "x": 12.5, "y": 3},
+                {"label": "/", "matrix": [3, 12], "x": 13.5, "y": 3},
+                {"label": "Shift", "matrix": [3, 13], "x": 14.5, "y": 3, "w": 1.75},
+                {"label": "Up", "matrix": [3, 14], "x": 16.25, "y": 3},
+                {"label": "End", "matrix": [3, 15], "x": 17.25, "y": 3},
+
+                {"label": "F5", "matrix": [4, 3], "x": 0, "y": 4},
+                {"label": "F6", "matrix": [4, 0], "x": 1, "y": 4},
+                {"label": "Ctrl", "matrix": [4, 1], "x": 2.25, "y": 4, "w": 1.25},
+                {"label": "GUI", "matrix": [4, 2], "x": 3.5, "y": 4, "w": 1.25},
+                {"label": "Alt", "matrix": [4, 4], "x": 4.75, "y": 4, "w": 1.25},
+                {"label": "Space", "matrix": [4, 7], "x": 6, "y": 4, "w": 6.25},
+                {"label": "Alt", "matrix": [4, 10], "x": 12.25, "y": 4, "w": 1.25},
+                {"label": "Ctrl", "matrix": [4, 11], "x": 13.5, "y": 4, "w": 1.25},
+                {"label": "Left", "matrix": [4, 13], "x": 15.25, "y": 4},
+                {"label": "Down", "matrix": [4, 14], "x": 16.25, "y": 4},
+                {"label": "Right", "matrix": [4, 15], "x": 17.25, "y": 4}
+            ]
+        },
+        "LAYOUT_iso_blocker": {
+            "layout": [
+                {"label": "Encoder", "matrix": [1, 0], "x": 0.5, "y": 0},
+                {"label": "Esc", "matrix": [0, 0], "x": 2.25, "y": 0},
+                {"label": "1", "matrix": [0, 2], "x": 3.25, "y": 0},
+                {"label": "2", "matrix": [0, 3], "x": 4.25, "y": 0},
+                {"label": "3", "matrix": [0, 4], "x": 5.25, "y": 0},
+                {"label": "4", "matrix": [0, 5], "x": 6.25, "y": 0},
+                {"label": "5", "matrix": [0, 6], "x": 7.25, "y": 0},
+                {"label": "6", "matrix": [0, 7], "x": 8.25, "y": 0},
+                {"label": "7", "matrix": [0, 8], "x": 9.25, "y": 0},
+                {"label": "8", "matrix": [0, 9], "x": 10.25, "y": 0},
+                {"label": "9", "matrix": [0, 10], "x": 11.25, "y": 0},
+                {"label": "0", "matrix": [0, 11], "x": 12.25, "y": 0},
+                {"label": "-", "matrix": [0, 12], "x": 13.25, "y": 0},
+                {"label": "=", "matrix": [0, 13], "x": 14.25, "y": 0},
+                {"label": "Backspace", "matrix": [0, 14], "x": 15.25, "y": 0, "w": 2},
+                {"label": "Delete", "matrix": [0, 15], "x": 17.25, "y": 0},
+
+                {"label": "Tab", "matrix": [1, 1], "x": 2.25, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 2], "x": 3.75, "y": 1},
+                {"label": "W", "matrix": [1, 3], "x": 4.75, "y": 1},
+                {"label": "E", "matrix": [1, 4], "x": 5.75, "y": 1},
+                {"label": "R", "matrix": [1, 5], "x": 6.75, "y": 1},
+                {"label": "T", "matrix": [1, 6], "x": 7.75, "y": 1},
+                {"label": "Y", "matrix": [1, 7], "x": 8.75, "y": 1},
+                {"label": "U", "matrix": [1, 8], "x": 9.75, "y": 1},
+                {"label": "I", "matrix": [1, 9], "x": 10.75, "y": 1},
+                {"label": "O", "matrix": [1, 10], "x": 11.75, "y": 1},
+                {"label": "P", "matrix": [1, 11], "x": 12.75, "y": 1},
+                {"label": "[", "matrix": [1, 12], "x": 13.75, "y": 1},
+                {"label": "]", "matrix": [1, 13], "x": 14.75, "y": 1},
+                {"label": "PgUp", "matrix": [1, 15], "x": 17.25, "y": 1},
+
+                {"label": "F1", "matrix": [2, 2], "x": 0, "y": 2},
+                {"label": "F2", "matrix": [2, 0], "x": 1, "y": 2},
+                {"label": "Caps Lock", "matrix": [2, 1], "x": 2.25, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 3], "x": 4, "y": 2},
+                {"label": "S", "matrix": [2, 4], "x": 5, "y": 2},
+                {"label": "D", "matrix": [2, 5], "x": 6, "y": 2},
+                {"label": "F", "matrix": [2, 6], "x": 7, "y": 2},
+                {"label": "G", "matrix": [2, 7], "x": 8, "y": 2},
+                {"label": "H", "matrix": [2, 8], "x": 9, "y": 2},
+                {"label": "J", "matrix": [2, 9], "x": 10, "y": 2},
+                {"label": "K", "matrix": [2, 10], "x": 11, "y": 2},
+                {"label": "L", "matrix": [2, 11], "x": 12, "y": 2},
+                {"label": ";", "matrix": [2, 12], "x": 13, "y": 2},
+                {"label": "'", "matrix": [2, 13], "x": 14, "y": 2},
+                {"label": "#", "matrix": [1, 14], "x": 15, "y": 2},
+                {"label": "Enter", "matrix": [2, 14], "x": 16, "y": 1, "w": 1.25, "h": 2},
+                {"label": "PgDn", "matrix": [2, 15], "x": 17.25, "y": 2},
+
+                {"label": "F3", "matrix": [3, 1], "x": 0, "y": 3},
+                {"label": "F4", "matrix": [3, 0], "x": 1, "y": 3},
+                {"label": "Shift", "matrix": [3, 2], "x": 2.25, "y": 3, "w": 1.25},
+                {"label": "\u2298", "matrix": [0, 1], "x": 3.5, "y": 3},
+                {"label": "Z", "matrix": [3, 3], "x": 4.5, "y": 3},
+                {"label": "X", "matrix": [3, 4], "x": 5.5, "y": 3},
+                {"label": "C", "matrix": [3, 5], "x": 6.5, "y": 3},
+                {"label": "V", "matrix": [3, 6], "x": 7.5, "y": 3},
+                {"label": "B", "matrix": [3, 7], "x": 8.5, "y": 3},
+                {"label": "N", "matrix": [3, 8], "x": 9.5, "y": 3},
+                {"label": "M", "matrix": [3, 9], "x": 10.5, "y": 3},
+                {"label": ",", "matrix": [3, 10], "x": 11.5, "y": 3},
+                {"label": ".", "matrix": [3, 11], "x": 12.5, "y": 3},
+                {"label": "/", "matrix": [3, 12], "x": 13.5, "y": 3},
+                {"label": "Shift", "matrix": [3, 13], "x": 14.5, "y": 3, "w": 1.75},
+                {"label": "Up", "matrix": [3, 14], "x": 16.25, "y": 3},
+                {"label": "End", "matrix": [3, 15], "x": 17.25, "y": 3},
+
+                {"label": "F5", "matrix": [4, 3], "x": 0, "y": 4},
+                {"label": "F6", "matrix": [4, 0], "x": 1, "y": 4},
+                {"label": "Ctrl", "matrix": [4, 1], "x": 2.25, "y": 4, "w": 1.25},
+                {"label": "GUI", "matrix": [4, 2], "x": 3.5, "y": 4, "w": 1.25},
+                {"label": "Alt", "matrix": [4, 4], "x": 4.75, "y": 4, "w": 1.25},
+                {"label": "Space", "matrix": [4, 7], "x": 6, "y": 4, "w": 6.25},
+                {"label": "Alt", "matrix": [4, 10], "x": 12.25, "y": 4, "w": 1.25},
+                {"label": "Ctrl", "matrix": [4, 11], "x": 13.5, "y": 4, "w": 1.25},
+                {"label": "Left", "matrix": [4, 13], "x": 15.25, "y": 4},
+                {"label": "Down", "matrix": [4, 14], "x": 16.25, "y": 4},
+                {"label": "Right", "matrix": [4, 15], "x": 17.25, "y": 4}
+            ]
+        }
+    },
+    "encoder": {
+        "rotary": [
+            { "pin_a": "B7",  "pin_b": "A4", "resolution": 2}
+        ]
+    }
+}
diff --git a/keyboards/custommk/evo70_r2/rules.mk b/keyboards/custommk/evo70_r2/rules.mk
index 193fe4f1a43..3961343ce4b 100644
--- a/keyboards/custommk/evo70_r2/rules.mk
+++ b/keyboards/custommk/evo70_r2/rules.mk
@@ -1,5 +1,3 @@
-AUDIO_DRIVER = pwm_hardware
-
 # project specific files
 SRC += matrix.c 
 
diff --git a/keyboards/dcpedit/masonry/info.json b/keyboards/dcpedit/masonry/info.json
new file mode 100644
index 00000000000..2d25f726219
--- /dev/null
+++ b/keyboards/dcpedit/masonry/info.json
@@ -0,0 +1,79 @@
+{
+    "manufacturer": "dcpedit",
+    "keyboard_name": "Masonry",
+    "maintainer": "dcpedit",
+    "bootloader": "stm32-dfu",
+    "diode_direction": "COL2ROW",
+    "dynamic_keymap": {
+        "layer_count": 2
+    },
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": true
+    },
+    "matrix_pins": {
+        "cols": ["A8", "B15", "B14", "B13", "B12", "A2"],
+        "rows": ["A9", "A0", "F0", "C15", "A10", "F1", "A1", "C14"]
+    },
+    "processor": "STM32F072",
+    "url": "https://github.com/dcpedit/masonry",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x177A",
+        "vid": "0xDC9E"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"label": "0,0", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "4,0", "matrix": [4, 0], "x": 1, "y": 0},
+                {"label": "0,1", "matrix": [0, 1], "x": 2, "y": 0},
+                {"label": "4,1", "matrix": [4, 1], "x": 3, "y": 0},
+                {"label": "0,2", "matrix": [0, 2], "x": 4, "y": 0},
+                {"label": "4,2", "matrix": [4, 2], "x": 5, "y": 0},
+                {"label": "0,3", "matrix": [0, 3], "x": 6, "y": 0},
+                {"label": "4,3", "matrix": [4, 3], "x": 7, "y": 0},
+                {"label": "0,4", "matrix": [0, 4], "x": 8, "y": 0},
+                {"label": "4,4", "matrix": [4, 4], "x": 9, "y": 0},
+                {"label": "0,5", "matrix": [0, 5], "x": 10, "y": 0},
+                {"label": "4,5", "matrix": [4, 5], "x": 11, "y": 0},
+
+                {"label": "1,0", "matrix": [1, 0], "x": 0, "y": 1.75},
+                {"label": "5,0", "matrix": [5, 0], "x": 1, "y": 1.5},
+                {"label": "1,1", "matrix": [1, 1], "x": 2, "y": 1.25},
+                {"label": "5,1", "matrix": [5, 1], "x": 3, "y": 1},
+                {"label": "1,2", "matrix": [1, 2], "x": 4, "y": 1.25},
+                {"label": "5,2", "matrix": [5, 2], "x": 5, "y": 1.25},
+                {"label": "1,3", "matrix": [1, 3], "x": 6, "y": 1.25},
+                {"label": "5,3", "matrix": [5, 3], "x": 7, "y": 1.25},
+                {"label": "1,4", "matrix": [1, 4], "x": 8, "y": 1},
+                {"label": "5,4", "matrix": [5, 4], "x": 9, "y": 1.25},
+                {"label": "1,5", "matrix": [1, 5], "x": 10, "y": 1.5},
+                {"label": "5,5", "matrix": [5, 5], "x": 11, "y": 1.75},
+
+                {"label": "2,0", "matrix": [2, 0], "x": 0, "y": 2.75},
+                {"label": "6,0", "matrix": [6, 0], "x": 1, "y": 2.5},
+                {"label": "2,1", "matrix": [2, 1], "x": 2, "y": 2.25},
+                {"label": "6,1", "matrix": [6, 1], "x": 3, "y": 2},
+                {"label": "2,2", "matrix": [2, 2], "x": 4, "y": 2.25},
+                {"label": "6,2", "matrix": [6, 2], "x": 5, "y": 2.25},
+                {"label": "2,3", "matrix": [2, 3], "x": 6, "y": 2.25},
+                {"label": "6,3", "matrix": [6, 3], "x": 7, "y": 2.25},
+                {"label": "2,4", "matrix": [2, 4], "x": 8, "y": 2},
+                {"label": "6,4", "matrix": [6, 4], "x": 9, "y": 2.25},
+                {"label": "2,5", "matrix": [2, 5], "x": 10, "y": 2.5},
+                {"label": "6,5", "matrix": [6, 5], "x": 11, "y": 2.75},
+
+                {"label": "3,1", "matrix": [3, 1], "x": 2, "y": 3.25},
+                {"label": "7,1", "matrix": [7, 1], "x": 3, "y": 3.25},
+                {"label": "3,2", "matrix": [3, 2], "x": 4, "y": 3.25},
+                {"label": "7,2", "matrix": [7, 2], "x": 5, "y": 3.25},
+                {"label": "3,3", "matrix": [3, 3], "x": 6, "y": 3.25},
+                {"label": "7,3", "matrix": [7, 3], "x": 7, "y": 3.25},
+                {"label": "3,4", "matrix": [3, 4], "x": 8, "y": 3.25},
+                {"label": "7,4", "matrix": [7, 4], "x": 9, "y": 3.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/dcpedit/masonry/keymaps/default/keymap.json b/keyboards/dcpedit/masonry/keymaps/default/keymap.json
new file mode 100644
index 00000000000..6da346bb917
--- /dev/null
+++ b/keyboards/dcpedit/masonry/keymaps/default/keymap.json
@@ -0,0 +1,21 @@
+{
+  "keyboard": "dcpedit/masonry",
+  "keymap": "default",
+  "author": "dcpedit",
+  "version": 1,
+  "layout": "LAYOUT",
+  "layers": [
+    [
+      "KC_ESC",  "KC_Q",    "KC_W",    "KC_E",    "KC_R",    "KC_T",    "KC_Y",    "KC_U",    "KC_I",    "KC_O",    "KC_P",    "KC_QUOT",
+      "KC_TAB",  "KC_A",    "KC_S",    "KC_D",    "KC_F",    "KC_G",    "KC_H",    "KC_J",    "KC_K",    "KC_L",    "KC_SCLN", "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", "LT(1,KC_BSPC)", "KC_BSPC", "KC_SPC", "LT(1,KC_SPC)", "KC_RALT", "KC_RGUI"
+    ],
+    [
+      "KC_GRV" , "KC_1",    "KC_2",    "KC_3",    "KC_4",    "KC_5",    "KC_6",    "KC_7",    "KC_8",    "KC_9",    "KC_0",    "KC_RGUI",
+      "KC_LCTL", "KC_LEFT", "KC_DOWN", "KC_UP",   "KC_RGHT", "KC_HOME", "KC_END",  "KC_MINS", "KC_EQL",  "KC_LBRC", "KC_RBRC", "KC_RALT",
+      "_______", "_______", "_______", "_______", "_______", "_______", "KC_PGDN", "KC_PGUP", "_______", "_______", "KC_BSLS", "_______",
+                            "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______"
+    ]
+  ]
+}
\ No newline at end of file
diff --git a/keyboards/dcpedit/masonry/keymaps/via/keymap.json b/keyboards/dcpedit/masonry/keymaps/via/keymap.json
new file mode 100644
index 00000000000..76dfde65659
--- /dev/null
+++ b/keyboards/dcpedit/masonry/keymaps/via/keymap.json
@@ -0,0 +1,26 @@
+{
+  "keyboard": "dcpedit/masonry",
+  "keymap": "default",
+  "author": "dcpedit",
+  "version": 1,
+  "config": {
+    "features": {
+      "via": true
+    }
+  },
+  "layout": "LAYOUT",
+  "layers": [
+    [
+      "KC_ESC",  "KC_Q",    "KC_W",    "KC_E",    "KC_R",    "KC_T",    "KC_Y",    "KC_U",    "KC_I",    "KC_O",    "KC_P",    "KC_QUOT",
+      "KC_TAB",  "KC_A",    "KC_S",    "KC_D",    "KC_F",    "KC_G",    "KC_H",    "KC_J",    "KC_K",    "KC_L",    "KC_SCLN", "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", "LT(1,KC_BSPC)", "KC_BSPC", "KC_SPC", "LT(1,KC_SPC)", "KC_RALT", "KC_RGUI"
+    ],
+    [
+      "KC_GRV" , "KC_1",    "KC_2",    "KC_3",    "KC_4",    "KC_5",    "KC_6",    "KC_7",    "KC_8",    "KC_9",    "KC_0",    "KC_RGUI",
+      "KC_LCTL", "KC_LEFT", "KC_DOWN", "KC_UP",   "KC_RGHT", "KC_HOME", "KC_END",  "KC_MINS", "KC_EQL",  "KC_LBRC", "KC_RBRC", "KC_RALT",
+      "_______", "_______", "_______", "_______", "_______", "_______", "KC_PGDN", "KC_PGUP", "_______", "_______", "KC_BSLS", "_______",
+                            "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______"
+    ]
+  ]
+}
\ No newline at end of file
diff --git a/keyboards/dcpedit/masonry/readme.md b/keyboards/dcpedit/masonry/readme.md
new file mode 100644
index 00000000000..9ba7a1597e5
--- /dev/null
+++ b/keyboards/dcpedit/masonry/readme.md
@@ -0,0 +1,27 @@
+# Masonry
+
+![Masonry](https://i.imgur.com/gqx2FZW.jpg)
+
+Masonry is a 40% ergoish columnar keyboard projected on a rectangular keyboard shape.
+
+* Keyboard Maintainer: [dcpedit](https://github.com/dcpedit)
+* Hardware Supported: STM32F072
+* Hardware Availability: https://github.com/dcpedit/masonry
+
+Make example for this keyboard (after setting up your build environment):
+
+    make dcpedit/masonry:default
+
+Flashing example for this keyboard:
+
+    make dcpedit/masonry: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 ESC key (top-left key) and plug in the keyboard
+* **Physical reset button**: On the PCB, while holding down the BOOT button, press and release the RESET button
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
\ No newline at end of file
diff --git a/keyboards/dcpedit/masonry/rules.mk b/keyboards/dcpedit/masonry/rules.mk
new file mode 100644
index 00000000000..cfa2d9632f9
--- /dev/null
+++ b/keyboards/dcpedit/masonry/rules.mk
@@ -0,0 +1 @@
+# Intentionally left blank
\ No newline at end of file
diff --git a/keyboards/dcpedit/redherring/keyboard.json b/keyboards/dcpedit/redherring/keyboard.json
index 845c52e3e04..a2f87c90b9a 100644
--- a/keyboards/dcpedit/redherring/keyboard.json
+++ b/keyboards/dcpedit/redherring/keyboard.json
@@ -31,6 +31,9 @@
     "qmk": {
         "tap_keycode_delay": 10
     },
+    "haptic": {
+        "driver": "solenoid"
+    },
     "url": "https://github.com/dcpedit/redherring",
     "usb": {
         "device_version": "1.0.0",
diff --git a/keyboards/dcpedit/redherring/rules.mk b/keyboards/dcpedit/redherring/rules.mk
index 35c76d4cf1c..27d8af7683e 100644
--- a/keyboards/dcpedit/redherring/rules.mk
+++ b/keyboards/dcpedit/redherring/rules.mk
@@ -1,2 +1 @@
 F_CPU = 16000000
-HAPTIC_DRIVER = solenoid
\ No newline at end of file
diff --git a/keyboards/dp60/dp60.c b/keyboards/dp60/dp60.c
index 5f23b355424..349e5cea9b3 100644
--- a/keyboards/dp60/dp60.c
+++ b/keyboards/dp60/dp60.c
@@ -172,27 +172,3 @@ webusb_pos_t webusb_keymap[] = {
     {4, 0}, {4, 1}, {4, 2}, {4, 6}, {4, 10}, {4, 11}, {4, 12}, {4, 13},
 };
 #endif
-
-#ifndef RAW_ENABLE
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-#else
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-#endif
-  if (record->event.pressed) {
-    switch(keycode) {
-    #ifdef RGBLIGHT_ENABLE
-        #ifdef RGB_MATRIX_ENABLE
-        case KC_F13: // toggle rgb matrix
-            rgb_matrix_toggle();
-            return false;
-        case KC_F14:
-            rgb_matrix_step();
-            return false;
-        #endif
-    #endif
-        default:
-        break;
-    }
-  }
-  return true;
-}
diff --git a/keyboards/dp60/keymaps/via/keymap.c b/keyboards/dp60/keymaps/via/keymap.c
index 538a27886f0..fab799e08a4 100644
--- a/keyboards/dp60/keymaps/via/keymap.c
+++ b/keyboards/dp60/keymaps/via/keymap.c
@@ -44,3 +44,23 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       _______, _______,       _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,
       _______,_______,_______,                        _______,                        _______,_______,_______,_______)
 };
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+  if (record->event.pressed) {
+    switch(keycode) {
+    #ifdef RGBLIGHT_ENABLE
+        #ifdef RGB_MATRIX_ENABLE
+        case KC_F13: // toggle rgb matrix
+            rgb_matrix_toggle();
+            return false;
+        case KC_F14:
+            rgb_matrix_step();
+            return false;
+        #endif
+    #endif
+        default:
+        break;
+    }
+  }
+  return true;
+}
diff --git a/keyboards/druah/dk_saver_redux/info.json b/keyboards/druah/dk_saver_redux/info.json
new file mode 100644
index 00000000000..6c76e107565
--- /dev/null
+++ b/keyboards/druah/dk_saver_redux/info.json
@@ -0,0 +1,323 @@
+{
+    "manufacturer": "KBDMania",
+    "keyboard_name": "DK Saver",
+    "maintainer": "Druah",
+    "backlight": {
+        "breathing": true,
+        "levels": 10,
+        "pin": "B7"
+    },
+    "bootloader": "atmel-dfu",
+    "build": {
+        "lto": true
+    },
+    "diode_direction": "COL2ROW",
+    "features": {
+        "backlight": true,
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "indicators": {
+        "caps_lock": "C2",
+        "scroll_lock": "C1"
+    },
+    "matrix_pins": {
+        "cols": ["F5", "F6", "F7", "A1", "A2", "B5", "B4", "B3", "B2", "F2", "F1", "F0", "F4", "B1", "C5", "C6", "C0"],
+        "rows": ["C3", "F3", "B6", "A0", "C7", "C4"]
+    },
+    "processor": "at90usb646",
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
+    "url": "https://druah.moe",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x0002",
+        "vid": "0x444E"
+    },
+    "community_layouts": ["tkl_f13_ansi", "tkl_f13_ansi_tsangan"],
+    "layout_aliases": {
+        "LAYOUT_all": "LAYOUT_tkl_f13_ansi"
+    },
+    "layouts": {
+        "LAYOUT_tkl_f13_ansi": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.75, "y": 0},
+                {"matrix": [0, 10], "x": 10.75, "y": 0},
+                {"matrix": [0, 11], "x": 11.75, "y": 0},
+                {"matrix": [0, 12], "x": 12.75, "y": 0},
+                {"matrix": [0, 13], "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": [2, 13], "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, 13], "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.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 7], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+                {"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_f13_ansi_tsangan": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.75, "y": 0},
+                {"matrix": [0, 10], "x": 10.75, "y": 0},
+                {"matrix": [0, 11], "x": 11.75, "y": 0},
+                {"matrix": [0, 12], "x": 12.75, "y": 0},
+                {"matrix": [0, 13], "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": [2, 13], "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, 13], "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, 7], "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_f13_ansi_wkl": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.75, "y": 0},
+                {"matrix": [0, 10], "x": 10.75, "y": 0},
+                {"matrix": [0, 11], "x": 11.75, "y": 0},
+                {"matrix": [0, 12], "x": 12.75, "y": 0},
+                {"matrix": [0, 13], "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": [2, 13], "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, 13], "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, 7], "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}
+            ]
+        }
+    }
+}
diff --git a/keyboards/druah/dk_saver_redux/keymaps/default/keymap.c b/keyboards/druah/dk_saver_redux/keymaps/default/keymap.c
new file mode 100644
index 00000000000..cf959d606a8
--- /dev/null
+++ b/keyboards/druah/dk_saver_redux/keymaps/default/keymap.c
@@ -0,0 +1,32 @@
+// Copyright 2024 Druah (@Druah)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /*
+     * ┌───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┐┌───┬───┬───┐
+     * │Esc││F1 │F2 │F3 │F4 ││F5 │F6 │F7 │F8 ││F9 │F10│F11│F12││F13││PSc│Scr│Pse│
+     * └───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┘└───┴───┴───┘
+     * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐┌───┬───┬───┐
+     * │ ` │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │ Backsp││Ins│Hom│PgU│
+     * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤├───┼───┼───┤
+     * │ Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ [ │ ] │  \  ││Del│End│PgD│
+     * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤└───┴───┴───┘
+     * │ Caps │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │  Enter │
+     * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤    ┌───┐
+     * │ Shift  │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │    Shift │    │ ↑ │
+     * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤┌───┼───┼───┐
+     * │Ctrl│GUI │Alt │                        │ Alt│ GUI│Menu│Ctrl││ ← │ ↓ │ → │
+     * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘└───┴───┴───┘
+     */
+    [0] = LAYOUT_all(
+        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,     KC_PSCR, KC_SCRL, KC_PAUS,
+
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,    KC_INS,  KC_HOME, KC_PGUP,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,    KC_DEL,  KC_END,  KC_PGDN,
+        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_RGUI, KC_APP,  KC_RCTL,    KC_LEFT, KC_DOWN, KC_RGHT
+    )
+};
diff --git a/keyboards/druah/dk_saver_redux/keymaps/via/keymap.c b/keyboards/druah/dk_saver_redux/keymaps/via/keymap.c
new file mode 100644
index 00000000000..cf959d606a8
--- /dev/null
+++ b/keyboards/druah/dk_saver_redux/keymaps/via/keymap.c
@@ -0,0 +1,32 @@
+// Copyright 2024 Druah (@Druah)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /*
+     * ┌───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┐┌───┬───┬───┐
+     * │Esc││F1 │F2 │F3 │F4 ││F5 │F6 │F7 │F8 ││F9 │F10│F11│F12││F13││PSc│Scr│Pse│
+     * └───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┘└───┴───┴───┘
+     * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐┌───┬───┬───┐
+     * │ ` │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │ Backsp││Ins│Hom│PgU│
+     * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤├───┼───┼───┤
+     * │ Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ [ │ ] │  \  ││Del│End│PgD│
+     * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤└───┴───┴───┘
+     * │ Caps │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │  Enter │
+     * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤    ┌───┐
+     * │ Shift  │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │    Shift │    │ ↑ │
+     * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤┌───┼───┼───┐
+     * │Ctrl│GUI │Alt │                        │ Alt│ GUI│Menu│Ctrl││ ← │ ↓ │ → │
+     * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘└───┴───┴───┘
+     */
+    [0] = LAYOUT_all(
+        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,     KC_PSCR, KC_SCRL, KC_PAUS,
+
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,    KC_INS,  KC_HOME, KC_PGUP,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,    KC_DEL,  KC_END,  KC_PGDN,
+        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_RGUI, KC_APP,  KC_RCTL,    KC_LEFT, KC_DOWN, KC_RGHT
+    )
+};
diff --git a/keyboards/druah/dk_saver_redux/keymaps/via/rules.mk b/keyboards/druah/dk_saver_redux/keymaps/via/rules.mk
new file mode 100644
index 00000000000..1e5b99807cb
--- /dev/null
+++ b/keyboards/druah/dk_saver_redux/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/druah/dk_saver_redux/readme.md b/keyboards/druah/dk_saver_redux/readme.md
new file mode 100644
index 00000000000..0929182b880
--- /dev/null
+++ b/keyboards/druah/dk_saver_redux/readme.md
@@ -0,0 +1,27 @@
+# DK Saver Redux
+
+![PCB](https://i.imgur.com/eEw8Yog.png)
+
+A replacement TKL PCB for the DK Saver keyboard
+
+* Keyboard Maintainer: [Druah](https://github.com/Druah)
+* Hardware Supported: DK Saver Redux
+* Hardware Availability: Private buy
+
+Make example for this keyboard (after setting up your build environment):
+
+    make druah/dk_saver_redux:default
+
+Flashing example for this keyboard:
+
+    make druah/dk_saver_redux: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 (the Escape/top left key) and plug in the keyboard
+* **Physical reset button**: Briefly press the button on the back of the PCB labelled with "RESET"
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
diff --git a/keyboards/ibm/model_m/mschwingen/led_ffc/rules.mk b/keyboards/druah/dk_saver_redux/rules.mk
similarity index 100%
rename from keyboards/ibm/model_m/mschwingen/led_ffc/rules.mk
rename to keyboards/druah/dk_saver_redux/rules.mk
diff --git a/keyboards/dz60/keyboard.json b/keyboards/dz60/keyboard.json
index eb831143b79..a6beff0d63a 100644
--- a/keyboards/dz60/keyboard.json
+++ b/keyboards/dz60/keyboard.json
@@ -54,7 +54,7 @@
     },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
-    "community_layouts": ["60_ansi", "60_ansi_arrow_split_bs_7u_spc", "60_ansi_arrow", "60_ansi_split_bs_rshift", "60_hhkb", "60_iso", "60_abnt2", "60_tsangan_hhkb"],
+    "community_layouts": ["60_ansi", "60_ansi_arrow", "60_ansi_split_bs_rshift", "60_hhkb", "60_iso", "60_abnt2", "60_tsangan_hhkb"],
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/dztech/dz60v2/keyboard.json b/keyboards/dztech/dz60v2/keyboard.json
index 8984787b32d..3ee3cc5c38e 100644
--- a/keyboards/dztech/dz60v2/keyboard.json
+++ b/keyboards/dztech/dz60v2/keyboard.json
@@ -53,7 +53,24 @@
         "LAYOUT_60_ansi_arrow_split_bs_7u_spc": "LAYOUT_60_ansi_arrow_tsangan_split_bs",
         "LAYOUT_60_iso_4th_row_all_1u": "LAYOUT_64_iso"
     },
-    "community_layouts": ["60_ansi", "60_ansi_arrow", "60_ansi_split_bs_rshift", "60_ansi_tsangan", "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", "60_tsangan_hhkb", "64_ansi", "64_iso"],
+    "community_layouts": [
+        "60_ansi",
+        "60_ansi_arrow",
+        "60_ansi_split_bs_rshift",
+        "60_ansi_tsangan",
+        "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",
+        "60_tsangan_hhkb",
+        "64_ansi",
+        "64_iso"
+    ],
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/epomaker/tide65/keyboard.json b/keyboards/epomaker/tide65/keyboard.json
new file mode 100644
index 00000000000..60f1b46f708
--- /dev/null
+++ b/keyboards/epomaker/tide65/keyboard.json
@@ -0,0 +1,231 @@
+{
+    "manufacturer": "HS",
+    "keyboard_name": "EPOMAKER TIDE 65",
+    "maintainer": "sdk66",
+    "bootloader": "wb32-dfu",
+    "diode_direction": "ROW2COL",
+    "encoder": {
+        "rotary": [
+            {"pin_a": "B7", "pin_b": "B6"}
+        ]
+    },
+    "features": {
+        "bootmagic": true,
+        "encoder": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgb_matrix": true
+    },
+    "matrix_pins": {
+        "cols": ["C0", "C1", "C2", "C3", "A6", "B10", "B11", "B12", "B13", "B14", "A10", "C6", "C7", "C8", "C9"],
+        "rows": ["A1", "A2", "A3", "A4", "C13"]
+    },
+    "processor": "WB32FQ95",
+    "rgb_matrix": {
+        "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_fractal": 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": [
+            {"matrix": [0, 0], "x": 0, "y": 0, "flags": 4},
+            {"matrix": [0, 1], "x": 16, "y": 0, "flags": 4},
+            {"matrix": [0, 2], "x": 32, "y": 0, "flags": 4},
+            {"matrix": [0, 3], "x": 48, "y": 0, "flags": 4},
+            {"matrix": [0, 4], "x": 64, "y": 0, "flags": 4},
+            {"matrix": [0, 5], "x": 80, "y": 0, "flags": 4},
+            {"matrix": [0, 6], "x": 96, "y": 0, "flags": 4},
+            {"matrix": [0, 7], "x": 112, "y": 0, "flags": 4},
+            {"matrix": [0, 8], "x": 128, "y": 0, "flags": 4},
+            {"matrix": [0, 9], "x": 144, "y": 0, "flags": 4},
+            {"matrix": [0, 10], "x": 160, "y": 0, "flags": 4},
+            {"matrix": [0, 11], "x": 176, "y": 0, "flags": 4},
+            {"matrix": [0, 12], "x": 192, "y": 0, "flags": 4},
+            {"matrix": [0, 13], "x": 208, "y": 0, "flags": 4},
+            {"matrix": [1, 0], "x": 0, "y": 16, "flags": 4},
+            {"matrix": [1, 1], "x": 16, "y": 16, "flags": 4},
+            {"matrix": [1, 2], "x": 32, "y": 16, "flags": 4},
+            {"matrix": [1, 3], "x": 48, "y": 16, "flags": 4},
+            {"matrix": [1, 4], "x": 64, "y": 16, "flags": 4},
+            {"matrix": [1, 5], "x": 80, "y": 16, "flags": 4},
+            {"matrix": [1, 6], "x": 96, "y": 16, "flags": 4},
+            {"matrix": [1, 7], "x": 112, "y": 16, "flags": 4},
+            {"matrix": [1, 8], "x": 128, "y": 16, "flags": 4},
+            {"matrix": [1, 9], "x": 144, "y": 16, "flags": 4},
+            {"matrix": [1, 10], "x": 160, "y": 16, "flags": 4},
+            {"matrix": [1, 11], "x": 176, "y": 16, "flags": 4},
+            {"matrix": [1, 12], "x": 192, "y": 16, "flags": 4},
+            {"matrix": [1, 13], "x": 208, "y": 16, "flags": 4},
+            {"matrix": [1, 14], "x": 224, "y": 16, "flags": 4},
+            {"matrix": [2, 0], "x": 0, "y": 32, "flags": 4},
+            {"matrix": [2, 1], "x": 16, "y": 32, "flags": 4},
+            {"matrix": [2, 2], "x": 32, "y": 32, "flags": 4},
+            {"matrix": [2, 3], "x": 48, "y": 32, "flags": 4},
+            {"matrix": [2, 4], "x": 64, "y": 32, "flags": 4},
+            {"matrix": [2, 5], "x": 80, "y": 32, "flags": 4},
+            {"matrix": [2, 6], "x": 96, "y": 32, "flags": 4},
+            {"matrix": [2, 7], "x": 112, "y": 32, "flags": 4},
+            {"matrix": [2, 8], "x": 128, "y": 32, "flags": 4},
+            {"matrix": [2, 9], "x": 144, "y": 32, "flags": 4},
+            {"matrix": [2, 10], "x": 160, "y": 32, "flags": 4},
+            {"matrix": [2, 11], "x": 176, "y": 32, "flags": 4},
+            {"matrix": [2, 13], "x": 208, "y": 32, "flags": 4},
+            {"matrix": [2, 14], "x": 224, "y": 32, "flags": 4},
+            {"matrix": [3, 0], "x": 0, "y": 48, "flags": 4},
+            {"matrix": [3, 1], "x": 16, "y": 48, "flags": 4},
+            {"matrix": [3, 2], "x": 32, "y": 48, "flags": 4},
+            {"matrix": [3, 3], "x": 48, "y": 48, "flags": 4},
+            {"matrix": [3, 4], "x": 64, "y": 48, "flags": 4},
+            {"matrix": [3, 5], "x": 80, "y": 48, "flags": 4},
+            {"matrix": [3, 6], "x": 96, "y": 48, "flags": 4},
+            {"matrix": [3, 7], "x": 112, "y": 48, "flags": 4},
+            {"matrix": [3, 8], "x": 128, "y": 48, "flags": 4},
+            {"matrix": [3, 9], "x": 144, "y": 48, "flags": 4},
+            {"matrix": [3, 11], "x": 176, "y": 48, "flags": 4},
+            {"matrix": [3, 12], "x": 192, "y": 48, "flags": 4},
+            {"matrix": [3, 13], "x": 208, "y": 48, "flags": 4},
+            {"matrix": [3, 14], "x": 224, "y": 48, "flags": 4},
+            {"matrix": [4, 0], "x": 0, "y": 64, "flags": 4},
+            {"matrix": [4, 1], "x": 16, "y": 64, "flags": 4},
+            {"matrix": [4, 2], "x": 32, "y": 64, "flags": 4},
+            {"matrix": [4, 3], "x": 48, "y": 64, "flags": 4},
+            {"matrix": [4, 4], "x": 64, "y": 64, "flags": 4},
+            {"matrix": [4, 5], "x": 80, "y": 64, "flags": 4},
+            {"matrix": [4, 6], "x": 96, "y": 64, "flags": 4},
+            {"matrix": [4, 9], "x": 144, "y": 64, "flags": 4},
+            {"matrix": [4, 11], "x": 176, "y": 64, "flags": 4},
+            {"matrix": [4, 12], "x": 192, "y": 64, "flags": 4},
+            {"matrix": [4, 13], "x": 208, "y": 64, "flags": 4},
+            {"matrix": [4, 14], "x": 224, "y": 64, "flags": 4}
+        ]
+    },
+    "url": "",
+    "usb": {
+        "device_version": "0.0.1",
+        "force_nkro": true,
+        "pid": "0xE463",
+        "suspend_wakeup_delay": 1000,
+        "vid": "0x342D"
+    },
+    "ws2812": {
+        "pin": "B15"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 2.25},
+                {"matrix": [4, 5], "x": 6, "y": 4, "w": 1.25, "h": 0.5},
+                {"matrix": [4, 4], "x": 6, "y": 4.5, "w": 1.25, "h": 0.5},
+                {"matrix": [4, 6], "x": 7.25, "y": 4, "w": 2.75},
+                {"matrix": [4, 9], "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}
+            ]
+        }
+    }
+}
diff --git a/keyboards/epomaker/tide65/keymaps/default/keymap.c b/keyboards/epomaker/tide65/keymaps/default/keymap.c
new file mode 100644
index 00000000000..830e2e03c36
--- /dev/null
+++ b/keyboards/epomaker/tide65/keymaps/default/keymap.c
@@ -0,0 +1,26 @@
+// Copyright 2024 SDK (@sdk66)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+// clang-format off
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    [0] = LAYOUT( /* Base */
+        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_MUTE,
+        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_CAPS,  KC_A,       KC_S,       KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,    KC_QUOT,            KC_ENT,    KC_PGUP,  
+        KC_LSFT,  KC_Z,       KC_X,       KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,               KC_SLSH,  KC_RSFT,  KC_UP,     KC_PGDN,
+        KC_LCTL,  KC_LGUI,    KC_LALT,    KC_SPC,   KC_SPC,   KC_SPC,   KC_SPC,                       KC_RALT,              MO(1),    KC_LEFT,  KC_DOWN,   KC_RGHT
+        ),  
+
+    [1] = LAYOUT( /* Base */
+        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_HOME,  KC_SCRL,  _______,   _______,
+        _______,  _______,    _______,    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    KC_PSCR,            _______,   _______,
+        _______,  _______,    _______,    _______,  _______,  _______,  _______,  _______,  _______,  _______,              _______,  _______,  _______,   _______,
+        _______,  GU_TOGG,    _______,    EE_CLR,   EE_CLR,   EE_CLR,   EE_CLR,                       _______,              _______,  _______,  _______,   _______
+        )
+};
+
+// clang-format on
diff --git a/keyboards/epomaker/tide65/keymaps/via/keymap.c b/keyboards/epomaker/tide65/keymaps/via/keymap.c
new file mode 100644
index 00000000000..6dfde729136
--- /dev/null
+++ b/keyboards/epomaker/tide65/keymaps/via/keymap.c
@@ -0,0 +1,33 @@
+// Copyright 2024 SDK (@sdk66)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+// clang-format off
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    [0] = LAYOUT( /* Base */
+        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_MUTE,
+        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_CAPS,  KC_A,       KC_S,       KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,    KC_QUOT,            KC_ENT,    KC_PGUP,  
+        KC_LSFT,  KC_Z,       KC_X,       KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,               KC_SLSH,  KC_RSFT,  KC_UP,     KC_PGDN,
+        KC_LCTL,  KC_LGUI,    KC_LALT,    KC_SPC,   KC_SPC,   KC_SPC,   KC_SPC,                       KC_RALT,              MO(1),    KC_LEFT,  KC_DOWN,   KC_RGHT
+        ),  
+
+    [1] = LAYOUT( /* Base */
+        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_HOME,  KC_SCRL,  _______,   _______,
+        _______,  _______,    _______,    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    KC_PSCR,            _______,   _______,
+        _______,  _______,    _______,    _______,  _______,  _______,  _______,  _______,  _______,  _______,              _______,  _______,  _______,   _______,
+        _______,  GU_TOGG,    _______,    EE_CLR,   EE_CLR,   EE_CLR,   EE_CLR,                       _______,              _______,  _______,  _______,   _______
+        )
+};
+
+#ifdef 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(_______, _______)},
+};
+#endif
+
+// clang-format on
diff --git a/keyboards/epomaker/tide65/keymaps/via/rules.mk b/keyboards/epomaker/tide65/keymaps/via/rules.mk
new file mode 100644
index 00000000000..715838ecc5d
--- /dev/null
+++ b/keyboards/epomaker/tide65/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+ENCODER_MAP_ENABLE = yes
+VIA_ENABLE = yes
diff --git a/keyboards/epomaker/tide65/readme.md b/keyboards/epomaker/tide65/readme.md
new file mode 100644
index 00000000000..8274f2dddbb
--- /dev/null
+++ b/keyboards/epomaker/tide65/readme.md
@@ -0,0 +1,21 @@
+# EPOMAKER TIDE 65
+
+* Keyboard Maintainer: [sdk66](https://github.com/sdk66)
+* Hardware Supported: EPOMAKER TIDE 65
+* Hardware Availability: [epomaker](https://www.epomaker.com)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make epomaker/tide_65:default
+        
+Flashing example for this keyboard:
+
+    make epomaker/tide65:default:flash
+
+To reset the board into bootloader mode, do one of the following:
+
+* Hold the Reset switch mounted on the bottom side of the PCB while connecting the USB cable
+* Hold the Escape key while connecting the USB cable (also erases persistent settings)
+* Fn+R_Shift+Esc will reset the board to bootloader mode if you have flashed the default QMK keymap
+
+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).
diff --git a/keyboards/epomaker/tide65/tide65.c b/keyboards/epomaker/tide65/tide65.c
new file mode 100644
index 00000000000..fc9e7c0db57
--- /dev/null
+++ b/keyboards/epomaker/tide65/tide65.c
@@ -0,0 +1,10 @@
+// Copyright 2024 SDK (@sdk66)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "quantum.h"
+
+void keyboard_pre_init_kb(void) {
+    gpio_set_pin_output(A5);
+    gpio_write_pin_high(A5);
+    keyboard_pre_init_user();
+}
diff --git a/keyboards/era/linx3/n87/config.h b/keyboards/era/linx3/n87/config.h
new file mode 100644
index 00000000000..8b294dd91b1
--- /dev/null
+++ b/keyboards/era/linx3/n87/config.h
@@ -0,0 +1,8 @@
+// Copyright 2024 Hyojin Bak (@eerraa)
+// SPDX-License-Identifier: GPL-2.0-or-later
+ 
+#pragma once
+
+/* Reset */
+#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET
+#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 2000U
\ No newline at end of file
diff --git a/keyboards/era/linx3/n87/info.json b/keyboards/era/linx3/n87/info.json
new file mode 100644
index 00000000000..548a37faddb
--- /dev/null
+++ b/keyboards/era/linx3/n87/info.json
@@ -0,0 +1,455 @@
+{
+    "manufacturer": "eerraa",
+    "keyboard_name": "N87",
+    "maintainer": "eerraa",
+    "bootloader": "rp2040",
+    "build": {
+        "debounce_type": "sym_defer_pk"
+    },
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgb_matrix": true
+    },
+    "matrix_pins": {
+        "cols": ["GP29", "GP28", "GP27", "GP26", "GP25", "GP24", "GP23", "GP22", "GP20", "GP19", "GP18", "GP17", "GP16", "GP21", "GP11", "GP9", "GP5"],
+        "rows": ["GP3", "GP2", "GP1", "GP0", "GP10", "GP8"]
+    },
+    "processor": "RP2040",
+    "rgb_matrix": {
+        "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_fractal": 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": [
+            {"matrix": [0, 16], "x": 224, "y": 0, "flags": 4},
+            {"matrix": [0, 15], "x": 211, "y": 0, "flags": 4},
+            {"matrix": [0, 14], "x": 198, "y": 0, "flags": 4},
+            {"matrix": [0, 13], "x": 182, "y": 0, "flags": 4},
+            {"matrix": [0, 12], "x": 169, "y": 0, "flags": 4},
+            {"matrix": [0, 11], "x": 156, "y": 0, "flags": 4},
+            {"matrix": [0, 10], "x": 143, "y": 0, "flags": 4},
+            {"matrix": [0, 9], "x": 123, "y": 0, "flags": 4},
+            {"matrix": [0, 8], "x": 110, "y": 0, "flags": 4},
+            {"matrix": [0, 7], "x": 97, "y": 0, "flags": 4},
+            {"matrix": [0, 6], "x": 84, "y": 0, "flags": 4},
+            {"matrix": [0, 5], "x": 65, "y": 0, "flags": 4},
+            {"matrix": [0, 4], "x": 52, "y": 0, "flags": 4},
+            {"matrix": [0, 3], "x": 39, "y": 0, "flags": 4},
+            {"matrix": [0, 2], "x": 26, "y": 0, "flags": 4},
+            {"matrix": [0, 0], "x": 0, "y": 0, "flags": 1},
+            {"matrix": [1, 0], "x": 0, "y": 15, "flags": 4},
+            {"matrix": [1, 1], "x": 13, "y": 15, "flags": 4},
+            {"matrix": [1, 2], "x": 26, "y": 15, "flags": 4},
+            {"matrix": [1, 3], "x": 39, "y": 15, "flags": 4},
+            {"matrix": [1, 4], "x": 52, "y": 15, "flags": 4},
+            {"matrix": [1, 5], "x": 65, "y": 15, "flags": 4},
+            {"matrix": [1, 6], "x": 78, "y": 15, "flags": 4},
+            {"matrix": [1, 7], "x": 91, "y": 15, "flags": 4},
+            {"matrix": [1, 8], "x": 104, "y": 15, "flags": 4},
+            {"matrix": [1, 9], "x": 117, "y": 15, "flags": 4},
+            {"matrix": [1, 10], "x": 130, "y": 15, "flags": 4},
+            {"matrix": [1, 11], "x": 143, "y": 15, "flags": 4},
+            {"matrix": [1, 12], "x": 156, "y": 15, "flags": 4},
+            {"matrix": [1, 13], "x": 175, "y": 15, "flags": 1},
+            {"matrix": [2, 14], "x": 198, "y": 15, "flags": 4},
+            {"matrix": [1, 15], "x": 211, "y": 15, "flags": 4},
+            {"matrix": [1, 16], "x": 224, "y": 15, "flags": 4},
+            {"matrix": [2, 16], "x": 224, "y": 27, "flags": 4},
+            {"matrix": [2, 15], "x": 211, "y": 27, "flags": 4},
+            {"matrix": [3, 14], "x": 198, "y": 27, "flags": 4},
+            {"matrix": [2, 13], "x": 179, "y": 27, "flags": 4},
+            {"matrix": [2, 12], "x": 162, "y": 27, "flags": 4},
+            {"matrix": [2, 11], "x": 149, "y": 27, "flags": 4},
+            {"matrix": [2, 10], "x": 136, "y": 27, "flags": 4},
+            {"matrix": [2, 9], "x": 123, "y": 27, "flags": 4},
+            {"matrix": [2, 8], "x": 110, "y": 27, "flags": 4},
+            {"matrix": [2, 7], "x": 97, "y": 27, "flags": 4},
+            {"matrix": [2, 6], "x": 84, "y": 27, "flags": 4},
+            {"matrix": [2, 5], "x": 71, "y": 27, "flags": 4},
+            {"matrix": [2, 4], "x": 58, "y": 27, "flags": 4},
+            {"matrix": [2, 3], "x": 45, "y": 27, "flags": 4},
+            {"matrix": [2, 2], "x": 32, "y": 27, "flags": 4},
+            {"matrix": [2, 1], "x": 19, "y": 27, "flags": 4},
+            {"matrix": [2, 0], "x": 3, "y": 27, "flags": 1},
+            {"matrix": [3, 0], "x": 2, "y": 40, "flags": 1},
+            {"matrix": [3, 1], "x": 23, "y": 40, "flags": 4},
+            {"matrix": [3, 2], "x": 36, "y": 40, "flags": 4},
+            {"matrix": [3, 3], "x": 49, "y": 40, "flags": 4},
+            {"matrix": [3, 4], "x": 62, "y": 40, "flags": 4},
+            {"matrix": [3, 5], "x": 75, "y": 40, "flags": 4},
+            {"matrix": [3, 6], "x": 88, "y": 40, "flags": 4},
+            {"matrix": [3, 7], "x": 101, "y": 40, "flags": 4},
+            {"matrix": [3, 8], "x": 114, "y": 40, "flags": 4},
+            {"matrix": [3, 9], "x": 127, "y": 40, "flags": 4},
+            {"matrix": [3, 10], "x": 140, "y": 40, "flags": 4},
+            {"matrix": [3, 11], "x": 153, "y": 40, "flags": 4},
+            {"matrix": [3, 13], "x": 174, "y": 40, "flags": 1},
+            {"matrix": [4, 15], "x": 211, "y": 52, "flags": 1},
+            {"matrix": [4, 13], "x": 182, "y": 52, "flags": 4},
+            {"matrix": [4, 12], "x": 170, "y": 52, "flags": 1},
+            {"matrix": [4, 11], "x": 146, "y": 52, "flags": 4},
+            {"matrix": [4, 10], "x": 133, "y": 52, "flags": 4},
+            {"matrix": [4, 9], "x": 120, "y": 52, "flags": 4},
+            {"matrix": [4, 8], "x": 107, "y": 52, "flags": 4},
+            {"matrix": [4, 7], "x": 94, "y": 52, "flags": 4},
+            {"matrix": [4, 6], "x": 81, "y": 52, "flags": 4},
+            {"matrix": [4, 5], "x": 68, "y": 52, "flags": 4},
+            {"matrix": [4, 4], "x": 55, "y": 52, "flags": 4},
+            {"matrix": [4, 3], "x": 42, "y": 52, "flags": 4},
+            {"matrix": [4, 2], "x": 29, "y": 52, "flags": 4},
+            {"matrix": [4, 0], "x": 8, "y": 52, "flags": 1},
+            {"matrix": [5, 0], "x": 2, "y": 64, "flags": 1},
+            {"matrix": [5, 1], "x": 18, "y": 64, "flags": 1},
+            {"matrix": [5, 2], "x": 34, "y": 64, "flags": 1},
+            {"x": 57, "y": 64, "flags": 4},
+            {"x": 70, "y": 64, "flags": 4},
+            {"matrix": [5, 6], "x": 83, "y": 64, "flags": 4},
+            {"x": 96, "y": 64, "flags": 4},
+            {"x": 109, "y": 64, "flags": 4},
+            {"matrix": [5, 10], "x": 131, "y": 64, "flags": 1},
+            {"matrix": [5, 11], "x": 148, "y": 64, "flags": 1},
+            {"matrix": [5, 12], "x": 164, "y": 64, "flags": 1},
+            {"matrix": [5, 13], "x": 180, "y": 64, "flags": 1},
+            {"matrix": [5, 14], "x": 198, "y": 64, "flags": 1},
+            {"matrix": [5, 15], "x": 211, "y": 64, "flags": 1},
+            {"matrix": [5, 16], "x": 224, "y": 64, "flags": 1}
+        ],
+        "sleep": true
+    },
+    "url": "",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x0009",
+        "vid": "0x4552"
+    },
+    "ws2812": {
+        "driver": "vendor",
+        "pin": "GP4"
+    },
+    "community_layouts": ["tkl_ansi", "tkl_ansi_split_bs_rshift"],
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.75, "y": 0},
+                {"matrix": [0, 10], "x": 10.75, "y": 0},
+                {"matrix": [0, 11], "x": 11.75, "y": 0},
+                {"matrix": [0, 12], "x": 12.75, "y": 0},
+                {"matrix": [0, 13], "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},
+                {"matrix": [1, 14], "x": 14, "y": 1.25},
+                {"matrix": [2, 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": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+                {"matrix": [3, 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": 1.75},
+                {"matrix": [4, 13], "x": 14, "y": 4.25},
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+                {"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": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "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.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.5, "y": 0},
+                {"matrix": [0, 10], "x": 11, "y": 0},
+                {"matrix": [0, 11], "x": 12, "y": 0},
+                {"matrix": [0, 12], "x": 13, "y": 0},
+                {"matrix": [0, 13], "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": [2, 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": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+                {"matrix": [3, 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.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 9], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 10], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+                {"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_split_bs_rshift": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "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.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.5, "y": 0},
+                {"matrix": [0, 10], "x": 11, "y": 0},
+                {"matrix": [0, 11], "x": 12, "y": 0},
+                {"matrix": [0, 12], "x": 13, "y": 0},
+                {"matrix": [0, 13], "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},
+                {"matrix": [1, 14], "x": 14, "y": 1.25},
+                {"matrix": [2, 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": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+                {"matrix": [3, 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": 1.75},
+                {"matrix": [4, 13], "x": 14, "y": 4.25},
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 9], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 10], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+                {"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}
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/keyboards/era/linx3/n87/keymaps/default/keymap.c b/keyboards/era/linx3/n87/keymaps/default/keymap.c
new file mode 100644
index 00000000000..a16e6a21105
--- /dev/null
+++ b/keyboards/era/linx3/n87/keymaps/default/keymap.c
@@ -0,0 +1,24 @@
+// Copyright 2024 QMK (@qmk)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+	
+    [0] = LAYOUT_all(
+        KC_ESC ,          KC_F1  , KC_F2  , KC_F3 , KC_F4   , KC_F5  , KC_F6  , KC_F7  , KC_F8  , KC_F9  , KC_F10 , KC_F11 , KC_F12 ,          KC_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_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, MO(1)  ,          KC_UP  ,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC ,                            KC_RALT, KC_RGUI, MO(1)  , KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    [1] = LAYOUT_all(
+        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, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+    )
+};
\ No newline at end of file
diff --git a/keyboards/era/linx3/n87/keymaps/via/keymap.c b/keyboards/era/linx3/n87/keymaps/via/keymap.c
new file mode 100644
index 00000000000..a16e6a21105
--- /dev/null
+++ b/keyboards/era/linx3/n87/keymaps/via/keymap.c
@@ -0,0 +1,24 @@
+// Copyright 2024 QMK (@qmk)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+	
+    [0] = LAYOUT_all(
+        KC_ESC ,          KC_F1  , KC_F2  , KC_F3 , KC_F4   , KC_F5  , KC_F6  , KC_F7  , KC_F8  , KC_F9  , KC_F10 , KC_F11 , KC_F12 ,          KC_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_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, MO(1)  ,          KC_UP  ,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC ,                            KC_RALT, KC_RGUI, MO(1)  , KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    [1] = LAYOUT_all(
+        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, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+    )
+};
\ No newline at end of file
diff --git a/keyboards/era/linx3/n87/keymaps/via/rules.mk b/keyboards/era/linx3/n87/keymaps/via/rules.mk
new file mode 100644
index 00000000000..036bd6d1c3e
--- /dev/null
+++ b/keyboards/era/linx3/n87/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/era/linx3/n87/readme.md b/keyboards/era/linx3/n87/readme.md
new file mode 100644
index 00000000000..ff5b29d3bd1
--- /dev/null
+++ b/keyboards/era/linx3/n87/readme.md
@@ -0,0 +1,23 @@
+# N87
+
+* Keyboard Maintainer: [ERA](https://github.com/eerraa)
+* Hardware supported: Syryan & Linx3
+* Hardware availability: [Syryan](https://srind.mysoho.com/) & [Linx3](https://allthatkeyboard.com)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make era/linx3/n87:default
+
+Flashing example for this keyboard:
+
+    make era/linx3/n87: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 ESC(0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
+* **Physical reset button**: Briefly short the `RESET` and `GND` pads on the SWD header twice, or short the `BOOT` header and plug in keyboard
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
\ No newline at end of file
diff --git a/keyboards/keychron/q4/ansi/v1/rules.mk b/keyboards/era/linx3/n87/rules.mk
similarity index 100%
rename from keyboards/keychron/q4/ansi/v1/rules.mk
rename to keyboards/era/linx3/n87/rules.mk
diff --git a/keyboards/era/sirind/tomak/config.h b/keyboards/era/sirind/tomak/config.h
new file mode 100644
index 00000000000..7bb56107054
--- /dev/null
+++ b/keyboards/era/sirind/tomak/config.h
@@ -0,0 +1,16 @@
+// Copyright 2023 Hyojin Bak (@eerraa)
+// SPDX-License-Identifier: GPL-2.0-or-later
+ 
+#pragma once
+
+/* Split configuration */
+#define SPLIT_HAND_PIN GP21
+#define USB_VBUS_PIN GP29
+#define SERIAL_USART_FULL_DUPLEX
+#define SERIAL_USART_TX_PIN GP0
+#define SERIAL_USART_RX_PIN GP1
+#define SERIAL_USART_PIN_SWAP
+
+/* Reset */
+#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET
+#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 2000U
\ No newline at end of file
diff --git a/keyboards/era/sirind/tomak/info.json b/keyboards/era/sirind/tomak/info.json
new file mode 100644
index 00000000000..da7d12e94d1
--- /dev/null
+++ b/keyboards/era/sirind/tomak/info.json
@@ -0,0 +1,710 @@
+{
+    "manufacturer": "SIRIND",
+    "keyboard_name": "Tomak",
+    "maintainer": "eerraa",
+    "bootloader": "rp2040",
+    "build": {
+        "debounce_type": "sym_defer_pk"
+    },
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgb_matrix": true
+    },
+    "matrix_pins": {
+        "cols": ["GP16", "GP9", "GP8", "GP6", "GP5", "GP4", "GP3", "GP2", null, null, null],
+        "rows": ["GP27", "GP10", "GP11", "GP12", "GP13", "GP14"]
+    },
+    "processor": "RP2040",
+    "rgb_matrix": {
+        "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_fractal": 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": [
+            {"matrix": [0, 0], "x": 2, "y": 0, "flags": 1},
+            {"matrix": [0, 2], "x": 19, "y": 0, "flags": 4},
+            {"matrix": [0, 3], "x": 31, "y": 0, "flags": 4},
+            {"matrix": [0, 4], "x": 43, "y": 0, "flags": 4},
+            {"matrix": [0, 5], "x": 55, "y": 0, "flags": 4},
+            {"matrix": [0, 6], "x": 73, "y": 0, "flags": 4},
+            {"matrix": [0, 7], "x": 85, "y": 0, "flags": 4},
+            {"matrix": [1, 7], "x": 87, "y": 13, "flags": 4},
+            {"matrix": [1, 6], "x": 74, "y": 13, "flags": 4},
+            {"matrix": [1, 5], "x": 62, "y": 13, "flags": 4},
+            {"matrix": [1, 4], "x": 50, "y": 13, "flags": 4},
+            {"matrix": [1, 3], "x": 38, "y": 13, "flags": 4},
+            {"matrix": [1, 2], "x": 26, "y": 13, "flags": 4},
+            {"matrix": [1, 1], "x": 14, "y": 13, "flags": 4},
+            {"matrix": [1, 0], "x": 2, "y": 13, "flags": 4},
+            {"matrix": [2, 0], "x": 5, "y": 26, "flags": 1},
+            {"matrix": [2, 1], "x": 20, "y": 26, "flags": 4},
+            {"matrix": [2, 2], "x": 32, "y": 26, "flags": 4},
+            {"matrix": [2, 3], "x": 44, "y": 26, "flags": 4},
+            {"matrix": [2, 4], "x": 56, "y": 26, "flags": 4},
+            {"matrix": [2, 5], "x": 68, "y": 26, "flags": 4},
+            {"matrix": [2, 6], "x": 71, "y": 26, "flags": 4},
+            {"matrix": [3, 6], "x": 84, "y": 38, "flags": 4},
+            {"matrix": [3, 5], "x": 71, "y": 38, "flags": 4},
+            {"matrix": [3, 4], "x": 59, "y": 38, "flags": 4},
+            {"matrix": [3, 3], "x": 47, "y": 38, "flags": 4},
+            {"matrix": [3, 2], "x": 35, "y": 38, "flags": 4},
+            {"matrix": [3, 1], "x": 23, "y": 38, "flags": 4},
+            {"matrix": [3, 0], "x": 0, "y": 38, "flags": 1},
+            {"matrix": [4, 0], "x": 9, "y": 51, "flags": 1},
+            {"matrix": [4, 1], "x": 29, "y": 51, "flags": 4},
+            {"matrix": [4, 2], "x": 41, "y": 51, "flags": 4},
+            {"matrix": [4, 3], "x": 53, "y": 51, "flags": 4},
+            {"matrix": [4, 4], "x": 65, "y": 51, "flags": 4},
+            {"matrix": [4, 5], "x": 77, "y": 51, "flags": 4},
+            {"matrix": [5, 5], "x": 84, "y": 64, "flags": 1},
+            {"matrix": [5, 4], "x": 61, "y": 64, "flags": 4},
+            {"matrix": [5, 2], "x": 35, "y": 64, "flags": 1},
+            {"matrix": [5, 1], "x": 20, "y": 64, "flags": 1},
+            {"matrix": [5, 0], "x": 5, "y": 64, "flags": 1},
+            {"matrix": [6, 10], "x": 224, "y": 0, "flags": 4},
+            {"matrix": [6, 9], "x": 212, "y": 0, "flags": 4},
+            {"matrix": [6, 8], "x": 200, "y": 0, "flags": 4},
+            {"matrix": [6, 7], "x": 184, "y": 0, "flags": 4},
+            {"matrix": [6, 5], "x": 167, "y": 0, "flags": 4},
+            {"matrix": [6, 4], "x": 155, "y": 0, "flags": 4},
+            {"matrix": [6, 3], "x": 143, "y": 0, "flags": 4},
+            {"matrix": [6, 2], "x": 131, "y": 0, "flags": 4},
+            {"matrix": [6, 1], "x": 113, "y": 0, "flags": 4},
+            {"matrix": [6, 0], "x": 101, "y": 0, "flags": 4},
+            {"matrix": [7, 0], "x": 99, "y": 13, "flags": 4},
+            {"matrix": [7, 1], "x": 112, "y": 13, "flags": 4},
+            {"matrix": [7, 2], "x": 124, "y": 13, "flags": 4},
+            {"matrix": [7, 3], "x": 136, "y": 13, "flags": 4},
+            {"matrix": [7, 4], "x": 148, "y": 13, "flags": 4},
+            {"matrix": [7, 5], "x": 160, "y": 13, "flags": 4},
+            {"matrix": [7, 7], "x": 178, "y": 13, "flags": 1},
+            {"matrix": [7, 8], "x": 200, "y": 13, "flags": 4},
+            {"matrix": [7, 9], "x": 212, "y": 13, "flags": 4},
+            {"matrix": [7, 10], "x": 224, "y": 13, "flags": 4},
+            {"matrix": [8, 10], "x": 224, "y": 26, "flags": 4},
+            {"matrix": [8, 9], "x": 212, "y": 26, "flags": 4},
+            {"matrix": [8, 8], "x": 200, "y": 26, "flags": 4},
+            {"matrix": [8, 7], "x": 181, "y": 26, "flags": 4},
+            {"matrix": [8, 6], "x": 166, "y": 26, "flags": 4},
+            {"matrix": [8, 5], "x": 154, "y": 26, "flags": 4},
+            {"matrix": [8, 4], "x": 142, "y": 26, "flags": 4},
+            {"matrix": [8, 3], "x": 130, "y": 26, "flags": 4},
+            {"matrix": [8, 2], "x": 118, "y": 26, "flags": 4},
+            {"matrix": [8, 1], "x": 105, "y": 26, "flags": 4},
+            {"matrix": [8, 0], "x": 93, "y": 26, "flags": 4},
+            {"matrix": [9, 0], "x": 96, "y": 38, "flags": 4},
+            {"matrix": [9, 1], "x": 109, "y": 38, "flags": 4},
+            {"matrix": [9, 2], "x": 121, "y": 38, "flags": 4},
+            {"matrix": [9, 3], "x": 133, "y": 38, "flags": 4},
+            {"matrix": [9, 4], "x": 145, "y": 38, "flags": 4},
+            {"matrix": [9, 5], "x": 157, "y": 38, "flags": 4},
+            {"matrix": [9, 7], "x": 177, "y": 38, "flags": 1},
+            {"matrix": [10, 9], "x": 212, "y": 51, "flags": 4},
+            {"matrix": [10, 7], "x": 184, "y": 45, "flags": 1},
+            {"matrix": [10, 6], "x": 174, "y": 51, "flags": 1},
+            {"matrix": [10, 5], "x": 151, "y": 51, "flags": 4},
+            {"matrix": [10, 4], "x": 139, "y": 51, "flags": 4},
+            {"matrix": [10, 3], "x": 127, "y": 51, "flags": 4},
+            {"matrix": [10, 2], "x": 115, "y": 51, "flags": 4},
+            {"matrix": [10, 1], "x": 102, "y": 51, "flags": 4},
+            {"matrix": [10, 0], "x": 90, "y": 51, "flags": 4},
+            {"matrix": [11, 1], "x": 96, "y": 64, "flags": 1},
+            {"matrix": [11, 2], "x": 110, "y": 64, "flags": 4},
+            {"matrix": [11, 4], "x": 137, "y": 64, "flags": 1},
+            {"matrix": [11, 5], "x": 153, "y": 64, "flags": 1},
+            {"matrix": [11, 6], "x": 168, "y": 64, "flags": 1},
+            {"matrix": [11, 7], "x": 183, "y": 64, "flags": 1},
+            {"matrix": [11, 8], "x": 200, "y": 64, "flags": 1},
+            {"matrix": [11, 9], "x": 212, "y": 64, "flags": 1},
+            {"matrix": [11, 10], "x": 224, "y": 64, "flags": 1},
+            {"x": 224, "y": 40, "flags": 8},
+            {"x": 224, "y": 45, "flags": 8},
+            {"x": 224, "y": 50, "flags": 8}
+        ],
+        "max_brightness": 120,
+        "sleep": true,
+        "split_count": [40, 59]
+    },
+    "split": {
+        "bootmagic": {
+            "matrix": [6, 0]
+        },
+        "enabled": true,
+        "matrix_pins": {
+            "right": {
+                "cols": ["GP2", "GP3", "GP4", "GP5", "GP6", "GP7", "GP8", "GP9", "GP27", "GP17", "GP13"],
+                "rows": ["GP10", "GP11", "GP12", "GP28", "GP19", "GP16"]
+            }
+        },
+        "transport": {
+            "protocol": "serial_usart",
+            "sync": {
+                "indicators": true,
+                "layer_state": true,
+                "matrix_state": true
+            }
+        }
+    },
+    "url": "",
+    "usb": {
+        "device_version": "1.0.2",
+        "pid": "0x0006",
+        "vid": "0x4552"
+    },
+    "ws2812": {
+        "driver": "vendor",
+        "pin": "GP20"
+    },
+    "layout_aliases": {
+        "LAYOUT_all": "LAYOUT_split_tkl_ansi_split_rshift_bs_rspace",
+        "LAYOUT_ansi": "LAYOUT_split_tkl_ansi",
+        "LAYOUT_ansi_split_bs": "LAYOUT_split_tkl_ansi_split_bs",
+        "LAYOUT_ansi_split_rshift": "LAYOUT_split_tkl_ansi_split_rshift",
+        "LAYOUT_ansi_split_rshift_bs": "LAYOUT_split_tkl_ansi_split_rshift_bs"
+    },
+    "layouts": {
+        "LAYOUT_split_tkl_ansi": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 2], "x": 1.5, "y": 0},
+                {"matrix": [0, 3], "x": 2.5, "y": 0},
+                {"matrix": [0, 4], "x": 3.5, "y": 0},
+                {"matrix": [0, 5], "x": 4.5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [6, 0], "x": 9.5, "y": 0},
+                {"matrix": [6, 1], "x": 10.5, "y": 0},
+                {"matrix": [6, 2], "x": 12, "y": 0},
+                {"matrix": [6, 3], "x": 13, "y": 0},
+                {"matrix": [6, 4], "x": 14, "y": 0},
+                {"matrix": [6, 5], "x": 15, "y": 0},
+                {"matrix": [6, 7], "x": 16.5, "y": 0},
+                {"matrix": [6, 8], "x": 17.75, "y": 0},
+                {"matrix": [6, 9], "x": 18.75, "y": 0},
+                {"matrix": [6, 10], "x": 19.75, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1.5},
+                {"matrix": [1, 4], "x": 4, "y": 1.5},
+                {"matrix": [1, 5], "x": 5, "y": 1.5},
+                {"matrix": [1, 6], "x": 6, "y": 1.5},
+                {"matrix": [1, 7], "x": 7, "y": 1.5},
+                {"matrix": [7, 0], "x": 9.5, "y": 1.5},
+                {"matrix": [7, 1], "x": 10.5, "y": 1.5},
+                {"matrix": [7, 2], "x": 11.5, "y": 1.5},
+                {"matrix": [7, 3], "x": 12.5, "y": 1.5},
+                {"matrix": [7, 4], "x": 13.5, "y": 1.5},
+                {"matrix": [7, 5], "x": 14.5, "y": 1.5},
+                {"matrix": [7, 7], "x": 15.5, "y": 1.5, "w": 2},
+                {"matrix": [7, 8], "x": 17.75, "y": 1.5},
+                {"matrix": [7, 9], "x": 18.75, "y": 1.5},
+                {"matrix": [7, 10], "x": 19.75, "y": 1.5},
+                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+                {"matrix": [8, 0], "x": 9, "y": 2.5},
+                {"matrix": [8, 1], "x": 10, "y": 2.5},
+                {"matrix": [8, 2], "x": 11, "y": 2.5},
+                {"matrix": [8, 3], "x": 12, "y": 2.5},
+                {"matrix": [8, 4], "x": 13, "y": 2.5},
+                {"matrix": [8, 5], "x": 14, "y": 2.5},
+                {"matrix": [8, 6], "x": 15, "y": 2.5},
+                {"matrix": [8, 7], "x": 16.25, "y": 2.5, "w": 1.25},
+                {"matrix": [8, 8], "x": 17.75, "y": 2.5},
+                {"matrix": [8, 9], "x": 18.75, "y": 2.5},
+                {"matrix": [8, 10], "x": 19.75, "y": 2.5},
+                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+                {"matrix": [9, 0], "x": 9.25, "y": 3.5},
+                {"matrix": [9, 1], "x": 10.25, "y": 3.5},
+                {"matrix": [9, 2], "x": 11.25, "y": 3.5},
+                {"matrix": [9, 3], "x": 12.25, "y": 3.5},
+                {"matrix": [9, 4], "x": 13.25, "y": 3.5},
+                {"matrix": [9, 5], "x": 14.25, "y": 3.5},
+                {"matrix": [9, 7], "x": 15.25, "y": 3.5, "w": 2.25},
+                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
+                {"matrix": [4, 1], "x": 2.25, "y": 4.5},
+                {"matrix": [4, 2], "x": 3.25, "y": 4.5},
+                {"matrix": [4, 3], "x": 4.25, "y": 4.5},
+                {"matrix": [4, 4], "x": 5.25, "y": 4.5},
+                {"matrix": [4, 5], "x": 6.25, "y": 4.5},
+                {"matrix": [10, 0], "x": 8.75, "y": 4.5},
+                {"matrix": [10, 1], "x": 9.75, "y": 4.5},
+                {"matrix": [10, 2], "x": 10.75, "y": 4.5},
+                {"matrix": [10, 3], "x": 11.75, "y": 4.5},
+                {"matrix": [10, 4], "x": 12.75, "y": 4.5},
+                {"matrix": [10, 5], "x": 13.75, "y": 4.5},
+                {"matrix": [10, 6], "x": 14.75, "y": 4.5, "w": 2.75},
+                {"matrix": [10, 9], "x": 18.75, "y": 4.5},
+                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 1], "x": 1.5, "y": 5.5},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 4], "x": 4, "y": 5.5, "w": 2.75},
+                {"matrix": [5, 5], "x": 6.75, "y": 5.5},
+                {"matrix": [11, 2], "x": 9.25, "y": 5.5, "w": 3.25},
+                {"matrix": [11, 4], "x": 12.5, "y": 5.5, "w": 1.25},
+                {"matrix": [11, 5], "x": 13.75, "y": 5.5, "w": 1.25},
+                {"matrix": [11, 6], "x": 15, "y": 5.5, "w": 1.25},
+                {"matrix": [11, 7], "x": 16.25, "y": 5.5, "w": 1.25},
+                {"matrix": [11, 8], "x": 17.75, "y": 5.5},
+                {"matrix": [11, 9], "x": 18.75, "y": 5.5},
+                {"matrix": [11, 10], "x": 19.75, "y": 5.5}
+            ]
+        },
+        "LAYOUT_split_tkl_ansi_split_bs": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 2], "x": 1.5, "y": 0},
+                {"matrix": [0, 3], "x": 2.5, "y": 0},
+                {"matrix": [0, 4], "x": 3.5, "y": 0},
+                {"matrix": [0, 5], "x": 4.5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [6, 0], "x": 9.5, "y": 0},
+                {"matrix": [6, 1], "x": 10.5, "y": 0},
+                {"matrix": [6, 2], "x": 12, "y": 0},
+                {"matrix": [6, 3], "x": 13, "y": 0},
+                {"matrix": [6, 4], "x": 14, "y": 0},
+                {"matrix": [6, 5], "x": 15, "y": 0},
+                {"matrix": [6, 7], "x": 16.5, "y": 0},
+                {"matrix": [6, 8], "x": 17.75, "y": 0},
+                {"matrix": [6, 9], "x": 18.75, "y": 0},
+                {"matrix": [6, 10], "x": 19.75, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1.5},
+                {"matrix": [1, 4], "x": 4, "y": 1.5},
+                {"matrix": [1, 5], "x": 5, "y": 1.5},
+                {"matrix": [1, 6], "x": 6, "y": 1.5},
+                {"matrix": [1, 7], "x": 7, "y": 1.5},
+                {"matrix": [7, 0], "x": 9.5, "y": 1.5},
+                {"matrix": [7, 1], "x": 10.5, "y": 1.5},
+                {"matrix": [7, 2], "x": 11.5, "y": 1.5},
+                {"matrix": [7, 3], "x": 12.5, "y": 1.5},
+                {"matrix": [7, 4], "x": 13.5, "y": 1.5},
+                {"matrix": [7, 5], "x": 14.5, "y": 1.5},
+                {"matrix": [7, 6], "x": 15.5, "y": 1.5},
+                {"matrix": [7, 7], "x": 16.5, "y": 1.5},
+                {"matrix": [7, 8], "x": 17.75, "y": 1.5},
+                {"matrix": [7, 9], "x": 18.75, "y": 1.5},
+                {"matrix": [7, 10], "x": 19.75, "y": 1.5},
+                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+                {"matrix": [8, 0], "x": 9, "y": 2.5},
+                {"matrix": [8, 1], "x": 10, "y": 2.5},
+                {"matrix": [8, 2], "x": 11, "y": 2.5},
+                {"matrix": [8, 3], "x": 12, "y": 2.5},
+                {"matrix": [8, 4], "x": 13, "y": 2.5},
+                {"matrix": [8, 5], "x": 14, "y": 2.5},
+                {"matrix": [8, 6], "x": 15, "y": 2.5},
+                {"matrix": [8, 7], "x": 16.25, "y": 2.5, "w": 1.25},
+                {"matrix": [8, 8], "x": 17.75, "y": 2.5},
+                {"matrix": [8, 9], "x": 18.75, "y": 2.5},
+                {"matrix": [8, 10], "x": 19.75, "y": 2.5},
+                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+                {"matrix": [9, 0], "x": 9.25, "y": 3.5},
+                {"matrix": [9, 1], "x": 10.25, "y": 3.5},
+                {"matrix": [9, 2], "x": 11.25, "y": 3.5},
+                {"matrix": [9, 3], "x": 12.25, "y": 3.5},
+                {"matrix": [9, 4], "x": 13.25, "y": 3.5},
+                {"matrix": [9, 5], "x": 14.25, "y": 3.5},
+                {"matrix": [9, 7], "x": 15.25, "y": 3.5, "w": 2.25},
+                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
+                {"matrix": [4, 1], "x": 2.25, "y": 4.5},
+                {"matrix": [4, 2], "x": 3.25, "y": 4.5},
+                {"matrix": [4, 3], "x": 4.25, "y": 4.5},
+                {"matrix": [4, 4], "x": 5.25, "y": 4.5},
+                {"matrix": [4, 5], "x": 6.25, "y": 4.5},
+                {"matrix": [10, 0], "x": 8.75, "y": 4.5},
+                {"matrix": [10, 1], "x": 9.75, "y": 4.5},
+                {"matrix": [10, 2], "x": 10.75, "y": 4.5},
+                {"matrix": [10, 3], "x": 11.75, "y": 4.5},
+                {"matrix": [10, 4], "x": 12.75, "y": 4.5},
+                {"matrix": [10, 5], "x": 13.75, "y": 4.5},
+                {"matrix": [10, 6], "x": 14.75, "y": 4.5, "w": 2.75},
+                {"matrix": [10, 9], "x": 18.75, "y": 4.5},
+                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 1], "x": 1.5, "y": 5.5},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 4], "x": 4, "y": 5.5, "w": 2.75},
+                {"matrix": [5, 5], "x": 6.75, "y": 5.5},
+                {"matrix": [11, 2], "x": 9.25, "y": 5.5, "w": 3.25},
+                {"matrix": [11, 4], "x": 12.5, "y": 5.5, "w": 1.25},
+                {"matrix": [11, 5], "x": 13.75, "y": 5.5, "w": 1.25},
+                {"matrix": [11, 6], "x": 15, "y": 5.5, "w": 1.25},
+                {"matrix": [11, 7], "x": 16.25, "y": 5.5, "w": 1.25},
+                {"matrix": [11, 8], "x": 17.75, "y": 5.5},
+                {"matrix": [11, 9], "x": 18.75, "y": 5.5},
+                {"matrix": [11, 10], "x": 19.75, "y": 5.5}
+            ]
+        },
+        "LAYOUT_split_tkl_ansi_split_rshift": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 2], "x": 1.5, "y": 0},
+                {"matrix": [0, 3], "x": 2.5, "y": 0},
+                {"matrix": [0, 4], "x": 3.5, "y": 0},
+                {"matrix": [0, 5], "x": 4.5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [6, 0], "x": 9.5, "y": 0},
+                {"matrix": [6, 1], "x": 10.5, "y": 0},
+                {"matrix": [6, 2], "x": 12, "y": 0},
+                {"matrix": [6, 3], "x": 13, "y": 0},
+                {"matrix": [6, 4], "x": 14, "y": 0},
+                {"matrix": [6, 5], "x": 15, "y": 0},
+                {"matrix": [6, 7], "x": 16.5, "y": 0},
+                {"matrix": [6, 8], "x": 17.75, "y": 0},
+                {"matrix": [6, 9], "x": 18.75, "y": 0},
+                {"matrix": [6, 10], "x": 19.75, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1.5},
+                {"matrix": [1, 4], "x": 4, "y": 1.5},
+                {"matrix": [1, 5], "x": 5, "y": 1.5},
+                {"matrix": [1, 6], "x": 6, "y": 1.5},
+                {"matrix": [1, 7], "x": 7, "y": 1.5},
+                {"matrix": [7, 0], "x": 9.5, "y": 1.5},
+                {"matrix": [7, 1], "x": 10.5, "y": 1.5},
+                {"matrix": [7, 2], "x": 11.5, "y": 1.5},
+                {"matrix": [7, 3], "x": 12.5, "y": 1.5},
+                {"matrix": [7, 4], "x": 13.5, "y": 1.5},
+                {"matrix": [7, 5], "x": 14.5, "y": 1.5},
+                {"matrix": [7, 6], "x": 15.5, "y": 1.5, "w": 2},
+                {"matrix": [7, 8], "x": 17.75, "y": 1.5},
+                {"matrix": [7, 9], "x": 18.75, "y": 1.5},
+                {"matrix": [7, 10], "x": 19.75, "y": 1.5},
+                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+                {"matrix": [8, 0], "x": 9, "y": 2.5},
+                {"matrix": [8, 1], "x": 10, "y": 2.5},
+                {"matrix": [8, 2], "x": 11, "y": 2.5},
+                {"matrix": [8, 3], "x": 12, "y": 2.5},
+                {"matrix": [8, 4], "x": 13, "y": 2.5},
+                {"matrix": [8, 5], "x": 14, "y": 2.5},
+                {"matrix": [8, 6], "x": 15, "y": 2.5},
+                {"matrix": [8, 7], "x": 16.25, "y": 2.5, "w": 1.25},
+                {"matrix": [8, 8], "x": 17.75, "y": 2.5},
+                {"matrix": [8, 9], "x": 18.75, "y": 2.5},
+                {"matrix": [8, 10], "x": 19.75, "y": 2.5},
+                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+                {"matrix": [9, 0], "x": 9.25, "y": 3.5},
+                {"matrix": [9, 1], "x": 10.25, "y": 3.5},
+                {"matrix": [9, 2], "x": 11.25, "y": 3.5},
+                {"matrix": [9, 3], "x": 12.25, "y": 3.5},
+                {"matrix": [9, 4], "x": 13.25, "y": 3.5},
+                {"matrix": [9, 5], "x": 14.25, "y": 3.5},
+                {"matrix": [9, 7], "x": 15.25, "y": 3.5, "w": 2.25},
+                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
+                {"matrix": [4, 1], "x": 2.25, "y": 4.5},
+                {"matrix": [4, 2], "x": 3.25, "y": 4.5},
+                {"matrix": [4, 3], "x": 4.25, "y": 4.5},
+                {"matrix": [4, 4], "x": 5.25, "y": 4.5},
+                {"matrix": [4, 5], "x": 6.25, "y": 4.5},
+                {"matrix": [10, 0], "x": 8.75, "y": 4.5},
+                {"matrix": [10, 1], "x": 9.75, "y": 4.5},
+                {"matrix": [10, 2], "x": 10.75, "y": 4.5},
+                {"matrix": [10, 3], "x": 11.75, "y": 4.5},
+                {"matrix": [10, 4], "x": 12.75, "y": 4.5},
+                {"matrix": [10, 5], "x": 13.75, "y": 4.5},
+                {"matrix": [10, 6], "x": 14.75, "y": 4.5, "w": 1.75},
+                {"matrix": [10, 7], "x": 16.5, "y": 4.5},
+                {"matrix": [10, 9], "x": 18.75, "y": 4.5},
+                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 1], "x": 1.5, "y": 5.5},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 4], "x": 4, "y": 5.5, "w": 2.75},
+                {"matrix": [5, 5], "x": 6.75, "y": 5.5},
+                {"matrix": [11, 2], "x": 9.25, "y": 5.5, "w": 3.25},
+                {"matrix": [11, 4], "x": 12.5, "y": 5.5, "w": 1.25},
+                {"matrix": [11, 5], "x": 13.75, "y": 5.5, "w": 1.25},
+                {"matrix": [11, 6], "x": 15, "y": 5.5, "w": 1.25},
+                {"matrix": [11, 7], "x": 16.25, "y": 5.5, "w": 1.25},
+                {"matrix": [11, 8], "x": 17.75, "y": 5.5},
+                {"matrix": [11, 9], "x": 18.75, "y": 5.5},
+                {"matrix": [11, 10], "x": 19.75, "y": 5.5}
+            ]
+        },
+        "LAYOUT_split_tkl_ansi_split_rshift_bs": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 2], "x": 1.5, "y": 0},
+                {"matrix": [0, 3], "x": 2.5, "y": 0},
+                {"matrix": [0, 4], "x": 3.5, "y": 0},
+                {"matrix": [0, 5], "x": 4.5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [6, 0], "x": 9.5, "y": 0},
+                {"matrix": [6, 1], "x": 10.5, "y": 0},
+                {"matrix": [6, 2], "x": 12, "y": 0},
+                {"matrix": [6, 3], "x": 13, "y": 0},
+                {"matrix": [6, 4], "x": 14, "y": 0},
+                {"matrix": [6, 5], "x": 15, "y": 0},
+                {"matrix": [6, 7], "x": 16.5, "y": 0},
+                {"matrix": [6, 8], "x": 17.75, "y": 0},
+                {"matrix": [6, 9], "x": 18.75, "y": 0},
+                {"matrix": [6, 10], "x": 19.75, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1.5},
+                {"matrix": [1, 4], "x": 4, "y": 1.5},
+                {"matrix": [1, 5], "x": 5, "y": 1.5},
+                {"matrix": [1, 6], "x": 6, "y": 1.5},
+                {"matrix": [1, 7], "x": 7, "y": 1.5},
+                {"matrix": [7, 0], "x": 9.5, "y": 1.5},
+                {"matrix": [7, 1], "x": 10.5, "y": 1.5},
+                {"matrix": [7, 2], "x": 11.5, "y": 1.5},
+                {"matrix": [7, 3], "x": 12.5, "y": 1.5},
+                {"matrix": [7, 4], "x": 13.5, "y": 1.5},
+                {"matrix": [7, 5], "x": 14.5, "y": 1.5},
+                {"matrix": [7, 6], "x": 15.5, "y": 1.5},
+                {"matrix": [7, 7], "x": 16.5, "y": 1.5},
+                {"matrix": [7, 8], "x": 17.75, "y": 1.5},
+                {"matrix": [7, 9], "x": 18.75, "y": 1.5},
+                {"matrix": [7, 10], "x": 19.75, "y": 1.5},
+                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+                {"matrix": [8, 0], "x": 9, "y": 2.5},
+                {"matrix": [8, 1], "x": 10, "y": 2.5},
+                {"matrix": [8, 2], "x": 11, "y": 2.5},
+                {"matrix": [8, 3], "x": 12, "y": 2.5},
+                {"matrix": [8, 4], "x": 13, "y": 2.5},
+                {"matrix": [8, 5], "x": 14, "y": 2.5},
+                {"matrix": [8, 6], "x": 15, "y": 2.5},
+                {"matrix": [8, 7], "x": 16.25, "y": 2.5, "w": 1.25},
+                {"matrix": [8, 8], "x": 17.75, "y": 2.5},
+                {"matrix": [8, 9], "x": 18.75, "y": 2.5},
+                {"matrix": [8, 10], "x": 19.75, "y": 2.5},
+                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+                {"matrix": [9, 0], "x": 9.25, "y": 3.5},
+                {"matrix": [9, 1], "x": 10.25, "y": 3.5},
+                {"matrix": [9, 2], "x": 11.25, "y": 3.5},
+                {"matrix": [9, 3], "x": 12.25, "y": 3.5},
+                {"matrix": [9, 4], "x": 13.25, "y": 3.5},
+                {"matrix": [9, 5], "x": 14.25, "y": 3.5},
+                {"matrix": [9, 7], "x": 15.25, "y": 3.5, "w": 2.25},
+                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
+                {"matrix": [4, 1], "x": 2.25, "y": 4.5},
+                {"matrix": [4, 2], "x": 3.25, "y": 4.5},
+                {"matrix": [4, 3], "x": 4.25, "y": 4.5},
+                {"matrix": [4, 4], "x": 5.25, "y": 4.5},
+                {"matrix": [4, 5], "x": 6.25, "y": 4.5},
+                {"matrix": [10, 0], "x": 8.75, "y": 4.5},
+                {"matrix": [10, 1], "x": 9.75, "y": 4.5},
+                {"matrix": [10, 2], "x": 10.75, "y": 4.5},
+                {"matrix": [10, 3], "x": 11.75, "y": 4.5},
+                {"matrix": [10, 4], "x": 12.75, "y": 4.5},
+                {"matrix": [10, 5], "x": 13.75, "y": 4.5},
+                {"matrix": [10, 6], "x": 14.75, "y": 4.5, "w": 1.75},
+                {"matrix": [10, 7], "x": 16.5, "y": 4.5},
+                {"matrix": [10, 9], "x": 18.75, "y": 4.5},
+                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 1], "x": 1.5, "y": 5.5},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 4], "x": 4, "y": 5.5, "w": 2.75},
+                {"matrix": [5, 5], "x": 6.75, "y": 5.5},
+                {"matrix": [11, 2], "x": 9.25, "y": 5.5, "w": 3.25},
+                {"matrix": [11, 4], "x": 12.5, "y": 5.5, "w": 1.25},
+                {"matrix": [11, 5], "x": 13.75, "y": 5.5, "w": 1.25},
+                {"matrix": [11, 6], "x": 15, "y": 5.5, "w": 1.25},
+                {"matrix": [11, 7], "x": 16.25, "y": 5.5, "w": 1.25},
+                {"matrix": [11, 8], "x": 17.75, "y": 5.5},
+                {"matrix": [11, 9], "x": 18.75, "y": 5.5},
+                {"matrix": [11, 10], "x": 19.75, "y": 5.5}
+            ]
+        },
+        "LAYOUT_split_tkl_ansi_split_rshift_bs_rspace": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 2], "x": 1.5, "y": 0},
+                {"matrix": [0, 3], "x": 2.5, "y": 0},
+                {"matrix": [0, 4], "x": 3.5, "y": 0},
+                {"matrix": [0, 5], "x": 4.5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [6, 0], "x": 9.5, "y": 0},
+                {"matrix": [6, 1], "x": 10.5, "y": 0},
+                {"matrix": [6, 2], "x": 12, "y": 0},
+                {"matrix": [6, 3], "x": 13, "y": 0},
+                {"matrix": [6, 4], "x": 14, "y": 0},
+                {"matrix": [6, 5], "x": 15, "y": 0},
+                {"matrix": [6, 7], "x": 16.5, "y": 0},
+                {"matrix": [6, 8], "x": 17.75, "y": 0},
+                {"matrix": [6, 9], "x": 18.75, "y": 0},
+                {"matrix": [6, 10], "x": 19.75, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1.5},
+                {"matrix": [1, 4], "x": 4, "y": 1.5},
+                {"matrix": [1, 5], "x": 5, "y": 1.5},
+                {"matrix": [1, 6], "x": 6, "y": 1.5},
+                {"matrix": [1, 7], "x": 7, "y": 1.5},
+                {"matrix": [7, 0], "x": 9.5, "y": 1.5},
+                {"matrix": [7, 1], "x": 10.5, "y": 1.5},
+                {"matrix": [7, 2], "x": 11.5, "y": 1.5},
+                {"matrix": [7, 3], "x": 12.5, "y": 1.5},
+                {"matrix": [7, 4], "x": 13.5, "y": 1.5},
+                {"matrix": [7, 5], "x": 14.5, "y": 1.5},
+                {"matrix": [7, 6], "x": 15.5, "y": 1.5},
+                {"matrix": [7, 7], "x": 16.5, "y": 1.5},
+                {"matrix": [7, 8], "x": 17.75, "y": 1.5},
+                {"matrix": [7, 9], "x": 18.75, "y": 1.5},
+                {"matrix": [7, 10], "x": 19.75, "y": 1.5},
+                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+                {"matrix": [8, 0], "x": 9, "y": 2.5},
+                {"matrix": [8, 1], "x": 10, "y": 2.5},
+                {"matrix": [8, 2], "x": 11, "y": 2.5},
+                {"matrix": [8, 3], "x": 12, "y": 2.5},
+                {"matrix": [8, 4], "x": 13, "y": 2.5},
+                {"matrix": [8, 5], "x": 14, "y": 2.5},
+                {"matrix": [8, 6], "x": 15, "y": 2.5},
+                {"matrix": [8, 7], "x": 16.25, "y": 2.5, "w": 1.25},
+                {"matrix": [8, 8], "x": 17.75, "y": 2.5},
+                {"matrix": [8, 9], "x": 18.75, "y": 2.5},
+                {"matrix": [8, 10], "x": 19.75, "y": 2.5},
+                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+                {"matrix": [9, 0], "x": 9.25, "y": 3.5},
+                {"matrix": [9, 1], "x": 10.25, "y": 3.5},
+                {"matrix": [9, 2], "x": 11.25, "y": 3.5},
+                {"matrix": [9, 3], "x": 12.25, "y": 3.5},
+                {"matrix": [9, 4], "x": 13.25, "y": 3.5},
+                {"matrix": [9, 5], "x": 14.25, "y": 3.5},
+                {"matrix": [9, 7], "x": 15.25, "y": 3.5, "w": 2.25},
+                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
+                {"matrix": [4, 1], "x": 2.25, "y": 4.5},
+                {"matrix": [4, 2], "x": 3.25, "y": 4.5},
+                {"matrix": [4, 3], "x": 4.25, "y": 4.5},
+                {"matrix": [4, 4], "x": 5.25, "y": 4.5},
+                {"matrix": [4, 5], "x": 6.25, "y": 4.5},
+                {"matrix": [10, 0], "x": 8.75, "y": 4.5},
+                {"matrix": [10, 1], "x": 9.75, "y": 4.5},
+                {"matrix": [10, 2], "x": 10.75, "y": 4.5},
+                {"matrix": [10, 3], "x": 11.75, "y": 4.5},
+                {"matrix": [10, 4], "x": 12.75, "y": 4.5},
+                {"matrix": [10, 5], "x": 13.75, "y": 4.5},
+                {"matrix": [10, 6], "x": 14.75, "y": 4.5, "w": 1.75},
+                {"matrix": [10, 7], "x": 16.5, "y": 4.5},
+                {"matrix": [10, 9], "x": 18.75, "y": 4.5},
+                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 1], "x": 1.5, "y": 5.5},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 4], "x": 4, "y": 5.5, "w": 2.75},
+                {"matrix": [5, 5], "x": 6.75, "y": 5.5},
+                {"matrix": [11, 1], "x": 9.25, "y": 5.5},
+                {"matrix": [11, 2], "x": 10.25, "y": 5.5, "w": 2.25},
+                {"matrix": [11, 4], "x": 12.5, "y": 5.5, "w": 1.25},
+                {"matrix": [11, 5], "x": 13.75, "y": 5.5, "w": 1.25},
+                {"matrix": [11, 6], "x": 15, "y": 5.5, "w": 1.25},
+                {"matrix": [11, 7], "x": 16.25, "y": 5.5, "w": 1.25},
+                {"matrix": [11, 8], "x": 17.75, "y": 5.5},
+                {"matrix": [11, 9], "x": 18.75, "y": 5.5},
+                {"matrix": [11, 10], "x": 19.75, "y": 5.5}
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/keyboards/era/sirind/tomak/keymaps/default/keymap.c b/keyboards/era/sirind/tomak/keymaps/default/keymap.c
new file mode 100644
index 00000000000..62941ff8b7a
--- /dev/null
+++ b/keyboards/era/sirind/tomak/keymaps/default/keymap.c
@@ -0,0 +1,25 @@
+// Copyright 2023 Hyojin Bak (@eerraa)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    [0] = LAYOUT_all(
+        KC_ESC,             KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,             KC_F13,   KC_PSCR,  KC_SCRL,  KC_PAUS,
+        KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,   KC_BSPC,  KC_BSPC,  KC_INS,   KC_HOME,  KC_PGUP,
+        KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,               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_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_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,  KC_RSFT,  MO(1),              KC_UP,
+        KC_LCTL,  KC_LGUI,  KC_LALT,            KC_SPC,   MO(1),                                  MO(1),    KC_SPC,             KC_RALT,  KC_RGUI,  KC_MENU,  KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT
+    ),
+
+    [1] = LAYOUT_all(
+        QK_BOOT,            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,
+        KC_TRNS,  RGB_TOG,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  KC_TRNS,            KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,
+        KC_TRNS,  RGB_MOD,  RGB_VAD,  RGB_HUD,  RGB_SAD,  RGB_SPD,                      KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,
+        KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,  KC_TRNS,                                KC_TRNS,  KC_TRNS,            KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS
+    )
+};
\ No newline at end of file
diff --git a/keyboards/era/sirind/tomak/keymaps/default_ansi/keymap.c b/keyboards/era/sirind/tomak/keymaps/default_ansi/keymap.c
new file mode 100644
index 00000000000..3823cc69c36
--- /dev/null
+++ b/keyboards/era/sirind/tomak/keymaps/default_ansi/keymap.c
@@ -0,0 +1,25 @@
+// Copyright 2023 Hyojin Bak (@eerraa)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    [0] = LAYOUT_ansi(
+        KC_ESC,             KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,             KC_F13,   KC_PSCR,  KC_SCRL,  KC_PAUS,
+        KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_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_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_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_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,  KC_RSFT,                      KC_UP,
+        KC_LCTL,  KC_LGUI,  KC_LALT,            KC_SPC,   MO(1),                                            KC_SPC,             KC_RALT,  KC_RGUI,  KC_MENU,  KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT
+    ),
+
+    [1] = LAYOUT_ansi(
+        QK_BOOT,            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,  RGB_TOG,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  KC_TRNS,            KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,
+        KC_TRNS,  RGB_MOD,  RGB_VAD,  RGB_HUD,  RGB_SAD,  RGB_SPD,                      KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,                      KC_TRNS,
+        KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,  KC_TRNS,                                          KC_TRNS,            KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS
+    )
+};
\ No newline at end of file
diff --git a/keyboards/era/sirind/tomak/keymaps/default_ansi_split_bs/keymap.c b/keyboards/era/sirind/tomak/keymaps/default_ansi_split_bs/keymap.c
new file mode 100644
index 00000000000..87f3072a9e1
--- /dev/null
+++ b/keyboards/era/sirind/tomak/keymaps/default_ansi_split_bs/keymap.c
@@ -0,0 +1,25 @@
+// Copyright 2023 Hyojin Bak (@eerraa)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    [0] = LAYOUT_ansi_split_bs(
+        KC_ESC,             KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,             KC_F13,   KC_PSCR,  KC_SCRL,  KC_PAUS,
+        KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,   KC_BSPC,  KC_BSPC,  KC_INS,   KC_HOME,  KC_PGUP,
+        KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,               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_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_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,  KC_RSFT,                      KC_UP,
+        KC_LCTL,  KC_LGUI,  KC_LALT,            KC_SPC,   MO(1),                                            KC_SPC,             KC_RALT,  KC_RGUI,  KC_MENU,  KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT
+    ),
+
+    [1] = LAYOUT_ansi_split_bs(
+        QK_BOOT,            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,
+        KC_TRNS,  RGB_TOG,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  KC_TRNS,            KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,
+        KC_TRNS,  RGB_MOD,  RGB_VAD,  RGB_HUD,  RGB_SAD,  RGB_SPD,                      KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,                      KC_TRNS,
+        KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,  KC_TRNS,                                          KC_TRNS,            KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS
+    )
+};
\ No newline at end of file
diff --git a/keyboards/era/sirind/tomak/keymaps/default_ansi_split_rshift/keymap.c b/keyboards/era/sirind/tomak/keymaps/default_ansi_split_rshift/keymap.c
new file mode 100644
index 00000000000..6b8fb56e339
--- /dev/null
+++ b/keyboards/era/sirind/tomak/keymaps/default_ansi_split_rshift/keymap.c
@@ -0,0 +1,25 @@
+// Copyright 2023 Hyojin Bak (@eerraa)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    [0] = LAYOUT_ansi_split_rshift(
+        KC_ESC,             KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,             KC_F13,   KC_PSCR,  KC_SCRL,  KC_PAUS,
+        KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_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_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_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_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,  KC_RSFT,  MO(1),              KC_UP,
+        KC_LCTL,  KC_LGUI,  KC_LALT,            KC_SPC,   MO(1),                                            KC_SPC,             KC_RALT,  KC_RGUI,  KC_MENU,  KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT
+    ),
+
+    [1] = LAYOUT_ansi_split_rshift(
+        QK_BOOT,            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,  RGB_TOG,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  KC_TRNS,            KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,
+        KC_TRNS,  RGB_MOD,  RGB_VAD,  RGB_HUD,  RGB_SAD,  RGB_SPD,                      KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,
+        KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,  KC_TRNS,                                          KC_TRNS,            KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS
+    )
+};
\ No newline at end of file
diff --git a/keyboards/era/sirind/tomak/keymaps/default_ansi_split_rshift_bs/keymap.c b/keyboards/era/sirind/tomak/keymaps/default_ansi_split_rshift_bs/keymap.c
new file mode 100644
index 00000000000..380689dd46b
--- /dev/null
+++ b/keyboards/era/sirind/tomak/keymaps/default_ansi_split_rshift_bs/keymap.c
@@ -0,0 +1,25 @@
+// Copyright 2023 Hyojin Bak (@eerraa)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    [0] = LAYOUT_ansi_split_rshift_bs(
+        KC_ESC,             KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,             KC_F13,   KC_PSCR,  KC_SCRL,  KC_PAUS,
+        KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,   KC_BSPC,  KC_BSPC,  KC_INS,   KC_HOME,  KC_PGUP,
+        KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,               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_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_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,  KC_RSFT,  MO(1),              KC_UP,
+        KC_LCTL,  KC_LGUI,  KC_LALT,            KC_SPC,   MO(1),                                            KC_SPC,             KC_RALT,  KC_RGUI,  KC_MENU,  KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT
+    ),
+
+    [1] = LAYOUT_ansi_split_rshift_bs(
+        QK_BOOT,            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,
+        KC_TRNS,  RGB_TOG,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  KC_TRNS,            KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,
+        KC_TRNS,  RGB_MOD,  RGB_VAD,  RGB_HUD,  RGB_SAD,  RGB_SPD,                      KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,
+        KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,  KC_TRNS,                                          KC_TRNS,            KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS
+    )
+};
\ No newline at end of file
diff --git a/keyboards/era/sirind/tomak/keymaps/via/keymap.c b/keyboards/era/sirind/tomak/keymaps/via/keymap.c
new file mode 100644
index 00000000000..62941ff8b7a
--- /dev/null
+++ b/keyboards/era/sirind/tomak/keymaps/via/keymap.c
@@ -0,0 +1,25 @@
+// Copyright 2023 Hyojin Bak (@eerraa)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    [0] = LAYOUT_all(
+        KC_ESC,             KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,             KC_F13,   KC_PSCR,  KC_SCRL,  KC_PAUS,
+        KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,   KC_BSPC,  KC_BSPC,  KC_INS,   KC_HOME,  KC_PGUP,
+        KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,               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_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_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,  KC_RSFT,  MO(1),              KC_UP,
+        KC_LCTL,  KC_LGUI,  KC_LALT,            KC_SPC,   MO(1),                                  MO(1),    KC_SPC,             KC_RALT,  KC_RGUI,  KC_MENU,  KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT
+    ),
+
+    [1] = LAYOUT_all(
+        QK_BOOT,            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,
+        KC_TRNS,  RGB_TOG,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  KC_TRNS,            KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,
+        KC_TRNS,  RGB_MOD,  RGB_VAD,  RGB_HUD,  RGB_SAD,  RGB_SPD,                      KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,
+        KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,  KC_TRNS,                                KC_TRNS,  KC_TRNS,            KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS
+    )
+};
\ No newline at end of file
diff --git a/keyboards/era/sirind/tomak/keymaps/via/rules.mk b/keyboards/era/sirind/tomak/keymaps/via/rules.mk
new file mode 100644
index 00000000000..036bd6d1c3e
--- /dev/null
+++ b/keyboards/era/sirind/tomak/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/era/sirind/tomak/readme.md b/keyboards/era/sirind/tomak/readme.md
new file mode 100644
index 00000000000..0834dfd6a87
--- /dev/null
+++ b/keyboards/era/sirind/tomak/readme.md
@@ -0,0 +1,27 @@
+# Tomak
+
+![Tomak](https://i.imgur.com/CmVR0G1.jpeg)
+
+Ergonomics Split Keyboard powered by RP2040.
+
+* Keyboard Maintainer: [ERA](https://github.com/eerraa)
+* Hardware supported: SIRIND Tomak
+* Hardware availability: [Syryan](https://srind.mysoho.com/)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make era/sirind/tomak:default
+
+Flashing example for this keyboard:
+
+    make era/sirind/tomak: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(ESC, F7)' key and plug in the keyboard.
+* **Physical reset**: Short the 'RESET' and 'GND' holes twice within one second, or plug in the keyboard with the 'BOOT' and 'GND' holes shorted.
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available.
\ No newline at end of file
diff --git a/keyboards/era/sirind/tomak/rules.mk b/keyboards/era/sirind/tomak/rules.mk
new file mode 100644
index 00000000000..743228e94b6
--- /dev/null
+++ b/keyboards/era/sirind/tomak/rules.mk
@@ -0,0 +1 @@
+SERIAL_DRIVER = vendor
\ No newline at end of file
diff --git a/keyboards/era/sirind/tomak/tomak.c b/keyboards/era/sirind/tomak/tomak.c
new file mode 100644
index 00000000000..8533cd4a737
--- /dev/null
+++ b/keyboards/era/sirind/tomak/tomak.c
@@ -0,0 +1,16 @@
+// Copyright 2023 Hyojin Bak (@eerraa)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "quantum.h"
+
+bool rgb_matrix_indicators_kb(void) {
+    if (!rgb_matrix_indicators_user()) {
+         return false;
+    }
+    if (host_keyboard_led_state().caps_lock) {
+        rgb_matrix_set_color(96, 0, 128, 128);
+        rgb_matrix_set_color(97, 0, 128, 128);
+        rgb_matrix_set_color(98, 0, 128, 128);
+    }
+    return true;
+}
\ No newline at end of file
diff --git a/keyboards/ergodox_ez/config.h b/keyboards/ergodox_ez/config.h
index 8209c21dba5..3688e007854 100644
--- a/keyboards/ergodox_ez/config.h
+++ b/keyboards/ergodox_ez/config.h
@@ -73,8 +73,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* fix space cadet rollover issue */
 #define DISABLE_SPACE_CADET_ROLLOVER
 
-#define RGBW
-
 /*
  * The debounce filtering reports a key/switch change directly,
  * without any extra delay. After that the debounce logic will filter
diff --git a/keyboards/ergodox_ez/info.json b/keyboards/ergodox_ez/info.json
index f2495a409c3..a560e97a0b5 100644
--- a/keyboards/ergodox_ez/info.json
+++ b/keyboards/ergodox_ez/info.json
@@ -27,7 +27,8 @@
         "debounce_type": "sym_eager_pr"
     },
     "ws2812": {
-        "pin": "D7"
+        "pin": "D7",
+        "rgbw": true
     },
     "rgb_matrix": {
         "animations": {
diff --git a/keyboards/ergodox_ez/shine/rgblight_custom.c b/keyboards/ergodox_ez/shine/rgblight_custom.c
index feac50cba08..29060e76fce 100644
--- a/keyboards/ergodox_ez/shine/rgblight_custom.c
+++ b/keyboards/ergodox_ez/shine/rgblight_custom.c
@@ -25,7 +25,7 @@ void setleds_custom(rgb_led_t *led, uint16_t led_num) {
     uint16_t length = 0;
     int i = 0;
     int j = 0;
-#    ifdef RGBW
+#    ifdef WS2812_RGBW
     int bytes_per_led = 4;
 #    else
     int bytes_per_led = 3;
@@ -52,7 +52,7 @@ void setleds_custom(rgb_led_t *led, uint16_t led_num) {
         data[j++] = data_byte[0];
         data[j++] = data_byte[1];
         data[j++] = data_byte[2];
-#ifdef RGBW
+#ifdef WS2812_RGBW
         data[j++] = data_byte[3];
 #endif
     }
diff --git a/keyboards/evyd13/plain60/keymaps/rgb/rules.mk b/keyboards/evyd13/plain60/keymaps/rgb/rules.mk
index b6cd87b7d4e..1e3cebb1451 100644
--- a/keyboards/evyd13/plain60/keymaps/rgb/rules.mk
+++ b/keyboards/evyd13/plain60/keymaps/rgb/rules.mk
@@ -1,3 +1 @@
 RGBLIGHT_ENABLE = yes
-RAW_ENABLE = no
-DYNAMIC_KEYMAP_ENABLE = no
diff --git a/keyboards/ez_maker/directpins/proton_c/keyboard.json b/keyboards/ez_maker/directpins/proton_c/keyboard.json
index a835ef7df19..4a46d4e1791 100644
--- a/keyboards/ez_maker/directpins/proton_c/keyboard.json
+++ b/keyboards/ez_maker/directpins/proton_c/keyboard.json
@@ -2,9 +2,7 @@
     "manufacturer": "Zach White",
     "keyboard_name": "DirectPins Proton C",
     "maintainer": "skullydazed",
-    "processor": "STM32F303",
-    "board": "QMK_PROTON_C",
-    "bootloader": "stm32-dfu",
+    "development_board": "proton_c",
     "features": {
         "bootmagic": true,
         "extrakey": true,
diff --git a/keyboards/fallacy/info.json b/keyboards/fallacy/keyboard.json
similarity index 100%
rename from keyboards/fallacy/info.json
rename to keyboards/fallacy/keyboard.json
diff --git a/keyboards/fatotesa/info.json b/keyboards/fatotesa/info.json
new file mode 100644
index 00000000000..bdd5e40478d
--- /dev/null
+++ b/keyboards/fatotesa/info.json
@@ -0,0 +1,144 @@
+{
+    "development_board": "promicro",
+    "manufacturer": "fatotesa",
+    "keyboard_name": "fatotesa",
+    "maintainer": "stefangluszek",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "encoder": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "caps_word": true
+    },
+    "encoder": {
+        "rotary": [
+            { "pin_a": "D1", "pin_b": "D0" , "resolution": 2}
+        ]
+    },
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "D2",
+        "usb_detect": {
+            "enabled": true,
+            "timeout": 2500
+        },
+        "matrix_pins": {
+            "right": {
+                "cols": ["F4", "F5", "F6", "C6", "F7", "B1", "B3", "B2"],
+                "rows": ["B6", "E6", "D4", "D7", "B4", "B5"]
+            }
+        },
+        "bootmagic": {
+            "matrix": [4, 1]
+        }
+    },
+    "matrix_pins": {
+        "cols": ["F5", "F6", "F7", "B1", "B3", "B2", "B6", null],
+        "rows": ["D4", "C6", "D7", "E6", "B4", "B5"]
+    },
+    "url": "",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x0000",
+        "vid": "0xFEED"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "label":"esc", "x":0, "y":0},
+                {"matrix": [0, 2], "label":"f1", "x":2, "y":0},
+                {"matrix": [0, 3], "label":"f2", "x":3, "y":0},
+                {"matrix": [0, 4], "label":"f3", "x":4, "y":0},
+                {"matrix": [0, 5], "label":"f4", "x":5, "y":0},
+
+                {"matrix": [6, 4], "label":"end", "x":13.25, "y":0},
+                {"matrix": [6, 5], "label":"ins", "x":14.25, "y":0},
+                {"matrix": [6, 6], "label":"del", "x":15.25, "y":0},
+                {"matrix": [6, 7], "label":"enc", "x":16.5, "y":0, "encoder": 0},
+
+
+                {"matrix": [1, 0], "label":"`", "x":0, "y":1},
+                {"matrix": [1, 1], "label":"1", "x":1, "y":1},
+                {"matrix": [1, 2], "label":"2", "x":2, "y":1},
+                {"matrix": [1, 3], "label":"3", "x":3, "y":1},
+                {"matrix": [1, 4], "label":"4", "x":4, "y":1},
+                {"matrix": [1, 5], "label":"5", "x":5, "y":1},
+                {"matrix": [1, 6], "label":"6", "x":6, "y":1},
+
+                {"matrix": [7, 1], "label":"7", "x":9.5, "y":1},
+                {"matrix": [7, 2], "label":"8", "x":10.5, "y":1},
+                {"matrix": [7, 3], "label":"9", "x":11.5, "y":1},
+                {"matrix": [7, 4], "label":"0", "x":12.5, "y":1},
+                {"matrix": [7, 5], "label":"-", "x":13.5, "y":1},
+                {"matrix": [7, 6], "label":"=", "x":14.5, "y":1},
+                {"matrix": [7, 7], "label":"<", "x":15.5, "y":1, "w":2},
+
+
+                {"matrix": [2, 0], "label":"tab", "x":0, "y":2, "w":1.5},
+                {"matrix": [2, 1], "label":"q", "x":1.5, "y":2},
+                {"matrix": [2, 2], "label":"w", "x":2.5, "y":2},
+                {"matrix": [2, 3], "label":"e", "x":3.5, "y":2},
+                {"matrix": [2, 4], "label":"r", "x":4.5, "y":2},
+                {"matrix": [2, 5], "label":"t", "x":5.5, "y":2},
+
+                {"matrix": [8, 0], "label":"y", "x":9, "y":2},
+                {"matrix": [8, 1], "label":"u", "x":10, "y":2},
+                {"matrix": [8, 2], "label":"i", "x":11, "y":2},
+                {"matrix": [8, 3], "label":"o", "x":12, "y":2},
+                {"matrix": [8, 4], "label":"p", "x":13, "y":2},
+                {"matrix": [8, 5], "label":"[", "x":14, "y":2},
+                {"matrix": [8, 6], "label":"]", "x":15, "y":2},
+                {"matrix": [8, 7], "x":16.25, "y":2, "w":1.25, "h":2},
+
+
+                {"matrix": [3, 0], "label":"caps", "x":0, "y":3, "w":1.75},
+                {"matrix": [3, 1], "label":"a", "x":1.75, "y":3},
+                {"matrix": [3, 2], "label":"s", "x":2.75, "y":3},
+                {"matrix": [3, 3], "label":"d", "x":3.75, "y":3},
+                {"matrix": [3, 4], "label":"f", "x":4.75, "y":3},
+                {"matrix": [3, 5], "label":"g", "x":5.75, "y":3},
+
+                {"matrix": [9, 0], "label":"h", "x":9.25, "y":3},
+                {"matrix": [9, 1], "label":"j", "x":10.25, "y":3},
+                {"matrix": [9, 2], "label":"k", "x":11.25, "y":3},
+                {"matrix": [9, 3], "label":"l", "x":12.25, "y":3},
+                {"matrix": [9, 4], "label":";", "x":13.25, "y":3},
+                {"matrix": [9, 5], "label":"'", "x":14.25, "y":3},
+                {"matrix": [9, 6], "label":"\\", "x":15.25, "y":3},
+
+
+                {"matrix": [4, 0], "label":"shift", "x":0, "y":4, "w":1.25},
+                {"matrix": [4, 1], "label":"<", "x":1.25, "y":4},
+                {"matrix": [4, 2], "label":"z", "x":2.25, "y":4},
+                {"matrix": [4, 3], "label":"x", "x":3.25, "y":4},
+                {"matrix": [4, 4], "label":"c", "x":4.25, "y":4},
+                {"matrix": [4, 5], "label":"v", "x":5.25, "y":4},
+                {"matrix": [4, 6], "label":"b", "x":6.25, "y":4},
+
+                {"matrix": [10, 2], "label":"n", "x":9.75, "y":4},
+                {"matrix": [10, 3], "label":"m", "x":10.75, "y":4},
+                {"matrix": [10, 4], "label":",", "x":11.75, "y":4},
+                {"matrix": [10, 5], "label":".", "x":12.75, "y":4},
+                {"matrix": [10, 6], "label":"/", "x":13.75, "y":4},
+                {"matrix": [10, 7], "x":14.75, "y":4},
+
+
+                {"matrix": [5, 0], "label":"ctrl", "x":0, "y":5, "w":1.25},
+                {"matrix": [5, 1], "label":"win", "x":1.25, "y":5, "w":1.25},
+                {"matrix": [5, 2], "label":"alt", "x":2.5, "y":5, "w":1.25},
+                {"matrix": [5, 3], "label":"space", "x":3.75, "y":5, "w":1.75},
+                {"matrix": [5, 4], "label":"na", "x":5.5, "y":5},
+
+                {"matrix": [11, 3], "label":"space", "x":10.5, "y":5, "w":2},
+                {"matrix": [11, 4], "label":"alt gr", "x":12.5, "y":5, "w":1.25},
+                {"matrix": [11, 5], "label":"ctrl", "x":13.75, "y":5, "w":1.25},
+                {"matrix": [11, 6], "label":"?", "x":15, "y":5, "w":1.25},
+                {"matrix": [11, 7], "label":"?", "x":16.25, "y":5, "w":1.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/fatotesa/keymaps/default/keymap.c b/keyboards/fatotesa/keymaps/default/keymap.c
new file mode 100644
index 00000000000..1f6aa804889
--- /dev/null
+++ b/keyboards/fatotesa/keymaps/default/keymap.c
@@ -0,0 +1,30 @@
+// Copyright 2023 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+#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_VOLD, KC_VOLU)  },
+};
+#endif
+
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT(
+        KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4,                                                                 KC_END, KC_INSERT, KC_DELETE, KC_KB_MUTE,
+        KC_GRAVE, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6,                                        KC_7, KC_8, KC_9, KC_0, KC_MINUS, KC_EQUAL, KC_BACKSPACE,
+        LT(1, KC_TAB), KC_Q, KC_W, KC_E, KC_R, KC_T,                        KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LEFT_BRACKET, KC_RIGHT_BRACKET, KC_ENTER,
+        KC_LEFT_CTRL, KC_A, KC_S, KC_D, KC_F, KC_G,                                      KC_H, KC_J, KC_K, KC_L, KC_SEMICOLON, KC_QUOTE, KC_BACKSLASH,
+        KC_LEFT_SHIFT, KC_LEFT_ANGLE_BRACKET, KC_Z, KC_X, KC_C, KC_V, KC_B,                    KC_N, KC_M, KC_COMMA, KC_DOT, KC_SLASH, KC_RIGHT_SHIFT,
+        CW_TOGG, KC_LWIN, KC_LEFT_ALT, KC_BACKSPACE, KC_LEFT_ALT,                                 KC_SPACE, KC_RIGHT_ALT, KC_RIGHT_CTRL, KC_NO, KC_NO
+        ),
+    [1] = LAYOUT(
+        _______, _______, _______, _______, _______,                                                                 _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______,                    _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______,                    _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______,                              _______, KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______,                             _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, KC_DEL, _______,                                                        _______, _______, _______, _______, _______
+        )};
diff --git a/keyboards/fatotesa/keymaps/default/rules.mk b/keyboards/fatotesa/keymaps/default/rules.mk
new file mode 100644
index 00000000000..ee325681483
--- /dev/null
+++ b/keyboards/fatotesa/keymaps/default/rules.mk
@@ -0,0 +1 @@
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/fatotesa/readme.md b/keyboards/fatotesa/readme.md
new file mode 100644
index 00000000000..a3794cfd667
--- /dev/null
+++ b/keyboards/fatotesa/readme.md
@@ -0,0 +1,25 @@
+# fatotesa
+
+![fatotesa](https://i.imgur.com/LbxQcU2.png)
+
+This is the QMK firmware for the [fat-o-tesa](https://github.com/stefangluszek/fat-o-tesa) keyboard.
+
+* Keyboard Maintainer: [Stefan Gluszek](https://github.com/stefangluszek)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make fatotesa:default
+
+Flashing example for this keyboard:
+
+    make fatotesa: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 (4,1) in the matrix and plug in the keyboard - this is somewhat unusual choice but our split halves are not symmetrical and we can't use (0,0) but instead a key that maps to the same matrix position regardless of which part is being connected to the computer and flashed.
+* **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
diff --git a/keyboards/ibm/model_m/mschwingen/led_wired/rules.mk b/keyboards/fatotesa/rules.mk
similarity index 100%
rename from keyboards/ibm/model_m/mschwingen/led_wired/rules.mk
rename to keyboards/fatotesa/rules.mk
diff --git a/keyboards/fc660c/info.json b/keyboards/fc660c/keyboard.json
similarity index 100%
rename from keyboards/fc660c/info.json
rename to keyboards/fc660c/keyboard.json
diff --git a/keyboards/fc980c/info.json b/keyboards/fc980c/keyboard.json
similarity index 100%
rename from keyboards/fc980c/info.json
rename to keyboards/fc980c/keyboard.json
diff --git a/keyboards/ferris/0_1/info.json b/keyboards/ferris/0_1/keyboard.json
similarity index 100%
rename from keyboards/ferris/0_1/info.json
rename to keyboards/ferris/0_1/keyboard.json
diff --git a/keyboards/ferris/0_2/bling/info.json b/keyboards/ferris/0_2/bling/keyboard.json
similarity index 100%
rename from keyboards/ferris/0_2/bling/info.json
rename to keyboards/ferris/0_2/bling/keyboard.json
diff --git a/keyboards/fjlabs/7vhotswap/info.json b/keyboards/fjlabs/7vhotswap/keyboard.json
similarity index 100%
rename from keyboards/fjlabs/7vhotswap/info.json
rename to keyboards/fjlabs/7vhotswap/keyboard.json
diff --git a/keyboards/fjlabs/ad65/info.json b/keyboards/fjlabs/ad65/keyboard.json
similarity index 100%
rename from keyboards/fjlabs/ad65/info.json
rename to keyboards/fjlabs/ad65/keyboard.json
diff --git a/keyboards/fjlabs/avalon/info.json b/keyboards/fjlabs/avalon/keyboard.json
similarity index 100%
rename from keyboards/fjlabs/avalon/info.json
rename to keyboards/fjlabs/avalon/keyboard.json
diff --git a/keyboards/fjlabs/bks65/info.json b/keyboards/fjlabs/bks65/keyboard.json
similarity index 100%
rename from keyboards/fjlabs/bks65/info.json
rename to keyboards/fjlabs/bks65/keyboard.json
diff --git a/keyboards/fjlabs/bks65solder/info.json b/keyboards/fjlabs/bks65solder/keyboard.json
similarity index 100%
rename from keyboards/fjlabs/bks65solder/info.json
rename to keyboards/fjlabs/bks65solder/keyboard.json
diff --git a/keyboards/fjlabs/bolsa65/info.json b/keyboards/fjlabs/bolsa65/keyboard.json
similarity index 100%
rename from keyboards/fjlabs/bolsa65/info.json
rename to keyboards/fjlabs/bolsa65/keyboard.json
diff --git a/keyboards/fjlabs/kf87/info.json b/keyboards/fjlabs/kf87/keyboard.json
similarity index 100%
rename from keyboards/fjlabs/kf87/info.json
rename to keyboards/fjlabs/kf87/keyboard.json
diff --git a/keyboards/fjlabs/kyuu/info.json b/keyboards/fjlabs/kyuu/keyboard.json
similarity index 100%
rename from keyboards/fjlabs/kyuu/info.json
rename to keyboards/fjlabs/kyuu/keyboard.json
diff --git a/keyboards/fjlabs/ldk65/info.json b/keyboards/fjlabs/ldk65/keyboard.json
similarity index 100%
rename from keyboards/fjlabs/ldk65/info.json
rename to keyboards/fjlabs/ldk65/keyboard.json
diff --git a/keyboards/fjlabs/midway60/info.json b/keyboards/fjlabs/midway60/keyboard.json
similarity index 100%
rename from keyboards/fjlabs/midway60/info.json
rename to keyboards/fjlabs/midway60/keyboard.json
diff --git a/keyboards/fjlabs/mk61rgbansi/info.json b/keyboards/fjlabs/mk61rgbansi/keyboard.json
similarity index 100%
rename from keyboards/fjlabs/mk61rgbansi/info.json
rename to keyboards/fjlabs/mk61rgbansi/keyboard.json
diff --git a/keyboards/fjlabs/peaker/info.json b/keyboards/fjlabs/peaker/keyboard.json
similarity index 100%
rename from keyboards/fjlabs/peaker/info.json
rename to keyboards/fjlabs/peaker/keyboard.json
diff --git a/keyboards/fjlabs/polaris/info.json b/keyboards/fjlabs/polaris/keyboard.json
similarity index 100%
rename from keyboards/fjlabs/polaris/info.json
rename to keyboards/fjlabs/polaris/keyboard.json
diff --git a/keyboards/fjlabs/ready100/info.json b/keyboards/fjlabs/ready100/keyboard.json
similarity index 100%
rename from keyboards/fjlabs/ready100/info.json
rename to keyboards/fjlabs/ready100/keyboard.json
diff --git a/keyboards/fjlabs/sinanju/info.json b/keyboards/fjlabs/sinanju/keyboard.json
similarity index 100%
rename from keyboards/fjlabs/sinanju/info.json
rename to keyboards/fjlabs/sinanju/keyboard.json
diff --git a/keyboards/fjlabs/sinanjuwk/info.json b/keyboards/fjlabs/sinanjuwk/keyboard.json
similarity index 100%
rename from keyboards/fjlabs/sinanjuwk/info.json
rename to keyboards/fjlabs/sinanjuwk/keyboard.json
diff --git a/keyboards/fjlabs/solanis/info.json b/keyboards/fjlabs/solanis/keyboard.json
similarity index 100%
rename from keyboards/fjlabs/solanis/info.json
rename to keyboards/fjlabs/solanis/keyboard.json
diff --git a/keyboards/fjlabs/swordfish/info.json b/keyboards/fjlabs/swordfish/keyboard.json
similarity index 100%
rename from keyboards/fjlabs/swordfish/info.json
rename to keyboards/fjlabs/swordfish/keyboard.json
diff --git a/keyboards/fjlabs/tf60ansi/info.json b/keyboards/fjlabs/tf60ansi/keyboard.json
similarity index 100%
rename from keyboards/fjlabs/tf60ansi/info.json
rename to keyboards/fjlabs/tf60ansi/keyboard.json
diff --git a/keyboards/fjlabs/tf60v2/info.json b/keyboards/fjlabs/tf60v2/keyboard.json
similarity index 100%
rename from keyboards/fjlabs/tf60v2/info.json
rename to keyboards/fjlabs/tf60v2/keyboard.json
diff --git a/keyboards/fjlabs/tf65rgbv2/info.json b/keyboards/fjlabs/tf65rgbv2/keyboard.json
similarity index 100%
rename from keyboards/fjlabs/tf65rgbv2/info.json
rename to keyboards/fjlabs/tf65rgbv2/keyboard.json
diff --git a/keyboards/fractal/info.json b/keyboards/fractal/keyboard.json
similarity index 100%
rename from keyboards/fractal/info.json
rename to keyboards/fractal/keyboard.json
diff --git a/keyboards/frobiac/blackbowl/info.json b/keyboards/frobiac/blackbowl/keyboard.json
similarity index 100%
rename from keyboards/frobiac/blackbowl/info.json
rename to keyboards/frobiac/blackbowl/keyboard.json
diff --git a/keyboards/gboards/ergotaco/info.json b/keyboards/gboards/ergotaco/info.json
deleted file mode 100644
index 80558ad6929..00000000000
--- a/keyboards/gboards/ergotaco/info.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "keyboard_name": "ErgoTaco",
-    "manufacturer": "g Heavy Industries",
-    "url": "http://gboards.ca",
-    "maintainer": "germ",
-    "usb": {
-        "vid": "0xFEED",
-        "pid": "0x1337",
-        "device_version": "0.0.1"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "tapping": {
-        "toggle": 1
-    },
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [11, 0], "x": 0, "y": 1},
-                {"matrix": [10, 0], "x": 1, "y": 0.5},
-                {"matrix": [9, 0], "x": 2, "y": 0.25},
-                {"matrix": [8, 0], "x": 3, "y": 0},
-                {"matrix": [7, 0], "x": 4, "y": 0.75},
-                {"matrix": [6, 0], "x": 5, "y": 1.5},
-
-                {"matrix": [0, 0], "x": 7, "y": 1.5},
-                {"matrix": [1, 0], "x": 8, "y": 0.75},
-                {"matrix": [2, 0], "x": 9, "y": 0},
-                {"matrix": [3, 0], "x": 10, "y": 0.25},
-                {"matrix": [4, 0], "x": 11, "y": 0.5},
-                {"matrix": [5, 0], "x": 12, "y": 1}
-            ]
-        }
-    }
-}
diff --git a/keyboards/gboards/ergotaco/keyboard.json b/keyboards/gboards/ergotaco/keyboard.json
new file mode 100644
index 00000000000..1d13c2458a7
--- /dev/null
+++ b/keyboards/gboards/ergotaco/keyboard.json
@@ -0,0 +1,42 @@
+{
+    "keyboard_name": "ErgoTaco",
+    "manufacturer": "g Heavy Industries",
+    "url": "http://gboards.ca",
+    "maintainer": "germ",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0x1337",
+        "device_version": "0.0.1"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": false,
+        "mousekey": false,
+        "extrakey": true,
+        "console": true,
+        "command": true
+    },
+    "tapping": {
+        "toggle": 1
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [11, 0], "x": 0, "y": 1},
+                {"matrix": [10, 0], "x": 1, "y": 0.5},
+                {"matrix": [9, 0], "x": 2, "y": 0.25},
+                {"matrix": [8, 0], "x": 3, "y": 0},
+                {"matrix": [7, 0], "x": 4, "y": 0.75},
+                {"matrix": [6, 0], "x": 5, "y": 1.5},
+
+                {"matrix": [0, 0], "x": 7, "y": 1.5},
+                {"matrix": [1, 0], "x": 8, "y": 0.75},
+                {"matrix": [2, 0], "x": 9, "y": 0},
+                {"matrix": [3, 0], "x": 10, "y": 0.25},
+                {"matrix": [4, 0], "x": 11, "y": 0.5},
+                {"matrix": [5, 0], "x": 12, "y": 1}
+            ]
+        }
+    }
+}
diff --git a/keyboards/gboards/ergotaco/rules.mk b/keyboards/gboards/ergotaco/rules.mk
index 6fbefbd22d7..5d025b31ef2 100644
--- a/keyboards/gboards/ergotaco/rules.mk
+++ b/keyboards/gboards/ergotaco/rules.mk
@@ -1,7 +1,4 @@
 CUSTOM_MATRIX 		= yes
-EXTRAKEY_ENABLE		= yes
-CONSOLE_ENABLE  	= yes
-COMMAND_ENABLE		= yes
 
 # A bunch of stuff that you shouldn't touch unless you
 # know what you're doing.
diff --git a/keyboards/gboards/georgi/info.json b/keyboards/gboards/georgi/info.json
deleted file mode 100644
index 51737f75af8..00000000000
--- a/keyboards/gboards/georgi/info.json
+++ /dev/null
@@ -1,61 +0,0 @@
-{
-    "keyboard_name": "Georgi",
-    "manufacturer": "g Heavy Industries",
-    "url": "http://gboards.ca",
-    "maintainer": "germ",
-    "usb": {
-        "vid": "0xFEED",
-        "pid": "0x1337",
-        "device_version": "0.0.1",
-        "force_nkro": true
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "tapping": {
-        "toggle": 2
-    },
-    "layout_aliases": {
-        "LAYOUT_georgi": "LAYOUT"
-    },
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [12, 1], "x": 0, "y": 0.5},
-                {"matrix": [11, 1], "x": 1, "y": 0.5},
-                {"matrix": [10, 1], "x": 2, "y": 0.3},
-                {"matrix": [9, 1], "x": 3, "y": 0},
-                {"matrix": [8, 1], "x": 4, "y": 0.4},
-                {"matrix": [7, 1], "x": 5, "y": 0.5},
-
-                {"matrix": [0, 1], "x": 7, "y": 0.5},
-                {"matrix": [1, 1], "x": 8, "y": 0.4},
-                {"matrix": [2, 1], "x": 9, "y": 0},
-                {"matrix": [3, 1], "x": 10, "y": 0.3},
-                {"matrix": [4, 1], "x": 11, "y": 0.5},
-                {"matrix": [5, 1], "x": 12, "y": 0.5},
-
-                {"matrix": [12, 2], "x": 0, "y": 1.5},
-                {"matrix": [11, 2], "x": 1, "y": 1.5},
-                {"matrix": [10, 2], "x": 2, "y": 1.3},
-                {"matrix": [9, 2], "x": 3, "y": 1},
-                {"matrix": [8, 2], "x": 4, "y": 1.4},
-                {"matrix": [7, 2], "x": 5, "y": 1.5},
-
-                {"matrix": [0, 2], "x": 7, "y": 1.5},
-                {"matrix": [1, 2], "x": 8, "y": 1.4},
-                {"matrix": [2, 2], "x": 9, "y": 1},
-                {"matrix": [3, 2], "x": 10, "y": 1.3},
-                {"matrix": [4, 2], "x": 11, "y": 1.5},
-                {"matrix": [5, 2], "x": 12, "y": 1.5},
-
-                {"matrix": [9, 3], "x": 3, "y": 2.75},
-                {"matrix": [8, 3], "x": 4, "y": 2.75},
-                {"matrix": [7, 3], "x": 5, "y": 2.75},
-
-                {"matrix": [1, 3], "x": 7, "y": 2.75},
-                {"matrix": [0, 3], "x": 8, "y": 2.75},
-                {"matrix": [2, 3], "x": 9, "y": 2.75}
-            ]
-        }
-    }
-}
diff --git a/keyboards/gboards/georgi/keyboard.json b/keyboards/gboards/georgi/keyboard.json
new file mode 100644
index 00000000000..066797a2415
--- /dev/null
+++ b/keyboards/gboards/georgi/keyboard.json
@@ -0,0 +1,72 @@
+{
+    "keyboard_name": "Georgi",
+    "manufacturer": "g Heavy Industries",
+    "url": "http://gboards.ca",
+    "maintainer": "germ",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0x1337",
+        "device_version": "0.0.1",
+        "force_nkro": true
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": false,
+        "mousekey": false,
+        "extrakey": true,
+        "console": true,
+        "nkro": true,
+        "steno": true
+    },
+    "build": {
+        "lto": true
+    },
+    "tapping": {
+        "toggle": 2
+    },
+    "layout_aliases": {
+        "LAYOUT_georgi": "LAYOUT"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [12, 1], "x": 0, "y": 0.5},
+                {"matrix": [11, 1], "x": 1, "y": 0.5},
+                {"matrix": [10, 1], "x": 2, "y": 0.3},
+                {"matrix": [9, 1], "x": 3, "y": 0},
+                {"matrix": [8, 1], "x": 4, "y": 0.4},
+                {"matrix": [7, 1], "x": 5, "y": 0.5},
+
+                {"matrix": [0, 1], "x": 7, "y": 0.5},
+                {"matrix": [1, 1], "x": 8, "y": 0.4},
+                {"matrix": [2, 1], "x": 9, "y": 0},
+                {"matrix": [3, 1], "x": 10, "y": 0.3},
+                {"matrix": [4, 1], "x": 11, "y": 0.5},
+                {"matrix": [5, 1], "x": 12, "y": 0.5},
+
+                {"matrix": [12, 2], "x": 0, "y": 1.5},
+                {"matrix": [11, 2], "x": 1, "y": 1.5},
+                {"matrix": [10, 2], "x": 2, "y": 1.3},
+                {"matrix": [9, 2], "x": 3, "y": 1},
+                {"matrix": [8, 2], "x": 4, "y": 1.4},
+                {"matrix": [7, 2], "x": 5, "y": 1.5},
+
+                {"matrix": [0, 2], "x": 7, "y": 1.5},
+                {"matrix": [1, 2], "x": 8, "y": 1.4},
+                {"matrix": [2, 2], "x": 9, "y": 1},
+                {"matrix": [3, 2], "x": 10, "y": 1.3},
+                {"matrix": [4, 2], "x": 11, "y": 1.5},
+                {"matrix": [5, 2], "x": 12, "y": 1.5},
+
+                {"matrix": [9, 3], "x": 3, "y": 2.75},
+                {"matrix": [8, 3], "x": 4, "y": 2.75},
+                {"matrix": [7, 3], "x": 5, "y": 2.75},
+
+                {"matrix": [1, 3], "x": 7, "y": 2.75},
+                {"matrix": [0, 3], "x": 8, "y": 2.75},
+                {"matrix": [2, 3], "x": 9, "y": 2.75}
+            ]
+        }
+    }
+}
diff --git a/keyboards/gboards/georgi/rules.mk b/keyboards/gboards/georgi/rules.mk
index 5b63e269fa5..42be966784a 100644
--- a/keyboards/gboards/georgi/rules.mk
+++ b/keyboards/gboards/georgi/rules.mk
@@ -1,18 +1,4 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = yes        # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
 CUSTOM_MATRIX = yes
-STENO_ENABLE = yes
-LTO_ENABLE = yes
 
 SRC += matrix.c
-I2C_DRIVER_REQUIRED = yes
\ No newline at end of file
+I2C_DRIVER_REQUIRED = yes
diff --git a/keyboards/gboards/gergo/info.json b/keyboards/gboards/gergo/info.json
deleted file mode 100644
index bc53f2db5f0..00000000000
--- a/keyboards/gboards/gergo/info.json
+++ /dev/null
@@ -1,88 +0,0 @@
-{
-    "keyboard_name": "Gergo",
-    "manufacturer": "g Heavy Industries",
-    "url": "http://gboards.ca",
-    "maintainer": "germ",
-    "usb": {
-        "vid": "0xFEED",
-        "pid": "0x1307",
-        "device_version": "0.0.1"
-    },
-    "build": {
-        "debounce_type": "sym_eager_pr"
-    },
-    "bootmagic": {
-        "matrix": [13, 2]
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "tapping": {
-        "toggle": 1
-    },
-    "layout_aliases": {
-        "LAYOUT_gergo": "LAYOUT"
-    },
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [6, 0], "x": 0, "y": 0.38, "w": 1.5},
-                {"matrix": [5, 0], "x": 1.5, "y": 0.38},
-                {"matrix": [4, 0], "x": 2.5, "y": 0.13},
-                {"matrix": [3, 0], "x": 3.5, "y": 0},
-                {"matrix": [2, 0], "x": 4.5, "y": 0.13},
-                {"matrix": [1, 0], "x": 5.5, "y": 0.25},
-
-                {"matrix": [8, 0], "x": 13, "y": 0.25},
-                {"matrix": [9, 0], "x": 14, "y": 0.13},
-                {"matrix": [10, 0], "x": 15, "y": 0},
-                {"matrix": [11, 0], "x": 16, "y": 0.13},
-                {"matrix": [12, 0], "x": 17, "y": 0.38},
-                {"matrix": [13, 0], "x": 18, "y": 0.38, "w": 1.5},
-
-                {"matrix": [6, 1], "x": 0, "y": 1.38, "w": 1.5},
-                {"matrix": [5, 1], "x": 1.5, "y": 1.38},
-                {"matrix": [4, 1], "x": 2.5, "y": 1.13},
-                {"matrix": [3, 1], "x": 3.5, "y": 1},
-                {"matrix": [2, 1], "x": 4.5, "y": 1.13},
-                {"matrix": [1, 1], "x": 5.5, "y": 1.25},
-                {"matrix": [0, 1], "x": 6.5, "y": 0.25, "h": 1.5},
-
-                {"matrix": [7, 1], "x": 12, "y": 0.25, "h": 1.5},
-                {"matrix": [8, 1], "x": 13, "y": 1.25},
-                {"matrix": [9, 1], "x": 14, "y": 1.13},
-                {"matrix": [10, 1], "x": 15, "y": 1},
-                {"matrix": [11, 1], "x": 16, "y": 1.13},
-                {"matrix": [12, 1], "x": 17, "y": 1.38},
-                {"matrix": [13, 1], "x": 18, "y": 1.38, "w": 1.5},
-
-                {"matrix": [6, 2], "x": 0, "y": 2.38, "w": 1.5},
-                {"matrix": [5, 2], "x": 1.5, "y": 2.38},
-                {"matrix": [4, 2], "x": 2.5, "y": 2.13},
-                {"matrix": [3, 2], "x": 3.5, "y": 2},
-                {"matrix": [2, 2], "x": 4.5, "y": 2.13},
-                {"matrix": [1, 2], "x": 5.5, "y": 2.25},
-                {"matrix": [0, 2], "x": 6.5, "y": 1.75, "h": 1.5},
-                {"matrix": [0, 3], "x": 8.25, "y": 2.75},
-
-                {"matrix": [7, 3], "x": 10.25, "y": 2.75},
-                {"matrix": [7, 2], "x": 12, "y": 1.75, "h": 1.5},
-                {"matrix": [8, 2], "x": 13, "y": 2.25},
-                {"matrix": [9, 2], "x": 14, "y": 2.13},
-                {"matrix": [10, 2], "x": 15, "y": 2},
-                {"matrix": [11, 2], "x": 16, "y": 2.13},
-                {"matrix": [12, 2], "x": 17, "y": 2.38},
-                {"matrix": [13, 2], "x": 18, "y": 2.38, "w": 1.5},
-
-                {"matrix": [4, 3], "x": 4.75, "y": 3.25},
-                {"matrix": [3, 3], "x": 6, "y": 3.63},
-                {"matrix": [2, 3], "x": 7.25, "y": 3.75, "h": 2},
-                {"matrix": [1, 3], "x": 8.25, "y": 3.75, "h": 2},
-
-                {"matrix": [8, 3], "x": 10.25, "y": 3.75, "h": 2},
-                {"matrix": [9, 3], "x": 11.25, "y": 3.75, "h": 2},
-                {"matrix": [10, 3], "x": 12.5, "y": 3.63},
-                {"matrix": [11, 3], "x": 13.75, "y": 3.25}
-            ]
-        }
-    }
-}
diff --git a/keyboards/gboards/gergo/keyboard.json b/keyboards/gboards/gergo/keyboard.json
new file mode 100644
index 00000000000..e576ac8012e
--- /dev/null
+++ b/keyboards/gboards/gergo/keyboard.json
@@ -0,0 +1,95 @@
+{
+    "keyboard_name": "Gergo",
+    "manufacturer": "g Heavy Industries",
+    "url": "http://gboards.ca",
+    "maintainer": "germ",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0x1307",
+        "device_version": "0.0.1"
+    },
+    "build": {
+        "debounce_type": "sym_eager_pr"
+    },
+    "bootmagic": {
+        "matrix": [13, 2]
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": false,
+        "extrakey": true,
+        "console": true,
+        "command": true
+    },
+    "tapping": {
+        "toggle": 1
+    },
+    "layout_aliases": {
+        "LAYOUT_gergo": "LAYOUT"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [6, 0], "x": 0, "y": 0.38, "w": 1.5},
+                {"matrix": [5, 0], "x": 1.5, "y": 0.38},
+                {"matrix": [4, 0], "x": 2.5, "y": 0.13},
+                {"matrix": [3, 0], "x": 3.5, "y": 0},
+                {"matrix": [2, 0], "x": 4.5, "y": 0.13},
+                {"matrix": [1, 0], "x": 5.5, "y": 0.25},
+
+                {"matrix": [8, 0], "x": 13, "y": 0.25},
+                {"matrix": [9, 0], "x": 14, "y": 0.13},
+                {"matrix": [10, 0], "x": 15, "y": 0},
+                {"matrix": [11, 0], "x": 16, "y": 0.13},
+                {"matrix": [12, 0], "x": 17, "y": 0.38},
+                {"matrix": [13, 0], "x": 18, "y": 0.38, "w": 1.5},
+
+                {"matrix": [6, 1], "x": 0, "y": 1.38, "w": 1.5},
+                {"matrix": [5, 1], "x": 1.5, "y": 1.38},
+                {"matrix": [4, 1], "x": 2.5, "y": 1.13},
+                {"matrix": [3, 1], "x": 3.5, "y": 1},
+                {"matrix": [2, 1], "x": 4.5, "y": 1.13},
+                {"matrix": [1, 1], "x": 5.5, "y": 1.25},
+                {"matrix": [0, 1], "x": 6.5, "y": 0.25, "h": 1.5},
+
+                {"matrix": [7, 1], "x": 12, "y": 0.25, "h": 1.5},
+                {"matrix": [8, 1], "x": 13, "y": 1.25},
+                {"matrix": [9, 1], "x": 14, "y": 1.13},
+                {"matrix": [10, 1], "x": 15, "y": 1},
+                {"matrix": [11, 1], "x": 16, "y": 1.13},
+                {"matrix": [12, 1], "x": 17, "y": 1.38},
+                {"matrix": [13, 1], "x": 18, "y": 1.38, "w": 1.5},
+
+                {"matrix": [6, 2], "x": 0, "y": 2.38, "w": 1.5},
+                {"matrix": [5, 2], "x": 1.5, "y": 2.38},
+                {"matrix": [4, 2], "x": 2.5, "y": 2.13},
+                {"matrix": [3, 2], "x": 3.5, "y": 2},
+                {"matrix": [2, 2], "x": 4.5, "y": 2.13},
+                {"matrix": [1, 2], "x": 5.5, "y": 2.25},
+                {"matrix": [0, 2], "x": 6.5, "y": 1.75, "h": 1.5},
+                {"matrix": [0, 3], "x": 8.25, "y": 2.75},
+
+                {"matrix": [7, 3], "x": 10.25, "y": 2.75},
+                {"matrix": [7, 2], "x": 12, "y": 1.75, "h": 1.5},
+                {"matrix": [8, 2], "x": 13, "y": 2.25},
+                {"matrix": [9, 2], "x": 14, "y": 2.13},
+                {"matrix": [10, 2], "x": 15, "y": 2},
+                {"matrix": [11, 2], "x": 16, "y": 2.13},
+                {"matrix": [12, 2], "x": 17, "y": 2.38},
+                {"matrix": [13, 2], "x": 18, "y": 2.38, "w": 1.5},
+
+                {"matrix": [4, 3], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 6, "y": 3.63},
+                {"matrix": [2, 3], "x": 7.25, "y": 3.75, "h": 2},
+                {"matrix": [1, 3], "x": 8.25, "y": 3.75, "h": 2},
+
+                {"matrix": [8, 3], "x": 10.25, "y": 3.75, "h": 2},
+                {"matrix": [9, 3], "x": 11.25, "y": 3.75, "h": 2},
+                {"matrix": [10, 3], "x": 12.5, "y": 3.63},
+                {"matrix": [11, 3], "x": 13.75, "y": 3.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/gboards/gergo/rules.mk b/keyboards/gboards/gergo/rules.mk
index d789b349da8..77c632bc1ca 100644
--- a/keyboards/gboards/gergo/rules.mk
+++ b/keyboards/gboards/gergo/rules.mk
@@ -2,10 +2,6 @@
 #   change yes to no to disable
 #
 CUSTOM_MATRIX 		= yes
-EXTRAKEY_ENABLE		= yes
-CONSOLE_ENABLE  	= yes
-COMMAND_ENABLE		= yes
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
 
 SRC += matrix.c
 I2C_DRIVER_REQUIRED = yes
diff --git a/keyboards/gboards/gergoplex/info.json b/keyboards/gboards/gergoplex/info.json
deleted file mode 100644
index c5f6be47509..00000000000
--- a/keyboards/gboards/gergoplex/info.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "keyboard_name": "GergoPlex",
-    "manufacturer": "g Heavy Industries",
-    "url": "",
-    "maintainer": "germ",
-    "usb": {
-        "vid": "0x6B0A",
-        "pid": "0x0002",
-        "device_version": "0.0.1"
-    },
-    "build": {
-        "debounce_type": "sym_eager_pr"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "community_layouts": ["split_3x5_3"],
-    "layouts": {
-        "LAYOUT_split_3x5_3": {
-            "layout": [
-                {"matrix": [4, 0], "x": 0, "y": 0.25},
-                {"matrix": [3, 0], "x": 1, "y": 0.125},
-                {"matrix": [2, 0], "x": 2, "y": 0},
-                {"matrix": [1, 0], "x": 3, "y": 0.125},
-                {"matrix": [0, 0], "x": 4, "y": 0.375},
-
-                {"matrix": [5, 0], "x": 8, "y": 0.375},
-                {"matrix": [6, 0], "x": 9, "y": 0.125},
-                {"matrix": [7, 0], "x": 10, "y": 0},
-                {"matrix": [8, 0], "x": 11, "y": 0.125},
-                {"matrix": [9, 0], "x": 12, "y": 0.25},
-
-                {"matrix": [4, 1], "x": 0, "y": 1.25},
-                {"matrix": [3, 1], "x": 1, "y": 1.125},
-                {"matrix": [2, 1], "x": 2, "y": 1},
-                {"matrix": [1, 1], "x": 3, "y": 1.125},
-                {"matrix": [0, 1], "x": 4, "y": 1.375},
-
-                {"matrix": [5, 1], "x": 8, "y": 1.375},
-                {"matrix": [6, 1], "x": 9, "y": 1.125},
-                {"matrix": [7, 1], "x": 10, "y": 1},
-                {"matrix": [8, 1], "x": 11, "y": 1.125},
-                {"matrix": [9, 1], "x": 12, "y": 1.25},
-
-                {"matrix": [4, 2], "x": 0, "y": 2.25},
-                {"matrix": [3, 2], "x": 1, "y": 2.125},
-                {"matrix": [2, 2], "x": 2, "y": 2},
-                {"matrix": [1, 2], "x": 3, "y": 2.125},
-                {"matrix": [0, 2], "x": 4, "y": 2.375},
-
-                {"matrix": [5, 2], "x": 8, "y": 2.375},
-                {"matrix": [6, 2], "x": 9, "y": 2.125},
-                {"matrix": [7, 2], "x": 10, "y": 2},
-                {"matrix": [8, 2], "x": 11, "y": 2.125},
-                {"matrix": [9, 2], "x": 12, "y": 2.25},
-
-                {"matrix": [3, 3], "x": 2, "y": 3.5},
-                {"matrix": [2, 3], "x": 3.25, "y": 3.625, "w": 1.5},
-                {"matrix": [1, 3], "x": 5, "y": 3.125, "h": 2},
-
-                {"matrix": [6, 3], "x": 7, "y": 3.125, "h": 2},
-                {"matrix": [7, 3], "x": 8.25, "y": 3.625, "w": 1.5},
-                {"matrix": [8, 3], "x": 10, "y": 3.5}
-            ]
-        }
-    }
-}
diff --git a/keyboards/gboards/gergoplex/keyboard.json b/keyboards/gboards/gergoplex/keyboard.json
new file mode 100644
index 00000000000..cf1e4513923
--- /dev/null
+++ b/keyboards/gboards/gergoplex/keyboard.json
@@ -0,0 +1,73 @@
+{
+    "keyboard_name": "GergoPlex",
+    "manufacturer": "g Heavy Industries",
+    "url": "",
+    "maintainer": "germ",
+    "usb": {
+        "vid": "0x6B0A",
+        "pid": "0x0002",
+        "device_version": "0.0.1"
+    },
+    "build": {
+        "debounce_type": "sym_eager_pr"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "command": true,
+        "nkro": true
+    },
+    "community_layouts": ["split_3x5_3"],
+    "layouts": {
+        "LAYOUT_split_3x5_3": {
+            "layout": [
+                {"matrix": [4, 0], "x": 0, "y": 0.25},
+                {"matrix": [3, 0], "x": 1, "y": 0.125},
+                {"matrix": [2, 0], "x": 2, "y": 0},
+                {"matrix": [1, 0], "x": 3, "y": 0.125},
+                {"matrix": [0, 0], "x": 4, "y": 0.375},
+
+                {"matrix": [5, 0], "x": 8, "y": 0.375},
+                {"matrix": [6, 0], "x": 9, "y": 0.125},
+                {"matrix": [7, 0], "x": 10, "y": 0},
+                {"matrix": [8, 0], "x": 11, "y": 0.125},
+                {"matrix": [9, 0], "x": 12, "y": 0.25},
+
+                {"matrix": [4, 1], "x": 0, "y": 1.25},
+                {"matrix": [3, 1], "x": 1, "y": 1.125},
+                {"matrix": [2, 1], "x": 2, "y": 1},
+                {"matrix": [1, 1], "x": 3, "y": 1.125},
+                {"matrix": [0, 1], "x": 4, "y": 1.375},
+
+                {"matrix": [5, 1], "x": 8, "y": 1.375},
+                {"matrix": [6, 1], "x": 9, "y": 1.125},
+                {"matrix": [7, 1], "x": 10, "y": 1},
+                {"matrix": [8, 1], "x": 11, "y": 1.125},
+                {"matrix": [9, 1], "x": 12, "y": 1.25},
+
+                {"matrix": [4, 2], "x": 0, "y": 2.25},
+                {"matrix": [3, 2], "x": 1, "y": 2.125},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [1, 2], "x": 3, "y": 2.125},
+                {"matrix": [0, 2], "x": 4, "y": 2.375},
+
+                {"matrix": [5, 2], "x": 8, "y": 2.375},
+                {"matrix": [6, 2], "x": 9, "y": 2.125},
+                {"matrix": [7, 2], "x": 10, "y": 2},
+                {"matrix": [8, 2], "x": 11, "y": 2.125},
+                {"matrix": [9, 2], "x": 12, "y": 2.25},
+
+                {"matrix": [3, 3], "x": 2, "y": 3.5},
+                {"matrix": [2, 3], "x": 3.25, "y": 3.625, "w": 1.5},
+                {"matrix": [1, 3], "x": 5, "y": 3.125, "h": 2},
+
+                {"matrix": [6, 3], "x": 7, "y": 3.125, "h": 2},
+                {"matrix": [7, 3], "x": 8.25, "y": 3.625, "w": 1.5},
+                {"matrix": [8, 3], "x": 10, "y": 3.5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/gboards/gergoplex/rules.mk b/keyboards/gboards/gergoplex/rules.mk
index 9846c64771e..6ae3f1122b1 100644
--- a/keyboards/gboards/gergoplex/rules.mk
+++ b/keyboards/gboards/gergoplex/rules.mk
@@ -1,15 +1,6 @@
 # Build Options
 #   change yes to no to disable
 #
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
 CUSTOM_MATRIX = yes
 
 SRC += matrix.c
diff --git a/keyboards/geekboards/macropad_v2/config.h b/keyboards/geekboards/macropad_v2/config.h
index dca98f0c954..e452c886f69 100644
--- a/keyboards/geekboards/macropad_v2/config.h
+++ b/keyboards/geekboards/macropad_v2/config.h
@@ -21,5 +21,3 @@
 #define WS2812_PWM_PAL_MODE 1
 #define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM3
 #define WS2812_PWM_DMA_CHANNEL 3
-
-#define WAIT_FOR_USB
diff --git a/keyboards/geekboards/macropad_v2/keyboard.json b/keyboards/geekboards/macropad_v2/keyboard.json
index 035a83c157d..54d779570a6 100644
--- a/keyboards/geekboards/macropad_v2/keyboard.json
+++ b/keyboards/geekboards/macropad_v2/keyboard.json
@@ -6,7 +6,8 @@
   "usb": {
     "vid": "0x0483",
     "pid": "0xA372",
-    "device_version": "0.0.2"
+    "device_version": "0.0.2",
+    "wait_for_enumeration": true
   },
   "qmk": {
     "tap_keycode_delay": 10
diff --git a/keyboards/geistmaschine/macropod/info.json b/keyboards/geistmaschine/macropod/keyboard.json
similarity index 100%
rename from keyboards/geistmaschine/macropod/info.json
rename to keyboards/geistmaschine/macropod/keyboard.json
diff --git a/keyboards/geonworks/ee_at/info.json b/keyboards/geonworks/ee_at/keyboard.json
similarity index 100%
rename from keyboards/geonworks/ee_at/info.json
rename to keyboards/geonworks/ee_at/keyboard.json
diff --git a/keyboards/geonworks/w1_at/info.json b/keyboards/geonworks/w1_at/keyboard.json
similarity index 100%
rename from keyboards/geonworks/w1_at/info.json
rename to keyboards/geonworks/w1_at/keyboard.json
diff --git a/keyboards/gh80_3000/config.h b/keyboards/gh80_3000/config.h
deleted file mode 100644
index 5f360813239..00000000000
--- a/keyboards/gh80_3000/config.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/gh80_3000/keyboard.json b/keyboards/gh80_3000/keyboard.json
index f5f4ba75332..c88f5c8232c 100644
--- a/keyboards/gh80_3000/keyboard.json
+++ b/keyboards/gh80_3000/keyboard.json
@@ -16,6 +16,18 @@
         "mousekey": false,
         "nkro": true
     },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
+    "indicators": {
+        "num_lock": "B5",
+        "caps_lock": "B6",
+        "scroll_lock": "B7",
+        "on_state": 0
+    },
     "matrix_pins": {
         "cols": ["C7", "C6", "B4", "D7", "B3", "B2", "B0", "E6", "B1", "D1", "D6"],
         "rows": ["F4", "F1", "F0", "F5", "F6", "F7", "D4", "D5", "D3", "D2", "D0"]
diff --git a/keyboards/gh80_3000/keymaps/ansi_std/keymap.c b/keyboards/gh80_3000/keymaps/ansi_std/keymap.c
index f99d522ead4..2f1e410656f 100644
--- a/keyboards/gh80_3000/keymaps/ansi_std/keymap.c
+++ b/keyboards/gh80_3000/keymaps/ansi_std/keymap.c
@@ -11,30 +11,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, KC_RGUI, KC_APP,  KC_RCTL,     KC_LEFT, KC_DOWN, KC_RGHT,     KC_P0,            KC_PDOT
   )
 };
-
-bool led_update_user(led_t led_state) {
-    if (led_state.num_lock) {
-        DDRB |= (1 << 5);
-        PORTB &= ~(1 << 5);
-    } else {
-        DDRB &= ~(1 << 5);
-        PORTB &= ~(1 << 5);
-    }
-
-    if (led_state.caps_lock) {
-        DDRB |= (1 << 6);
-        PORTB &= ~(1 << 6);
-    } else {
-        DDRB &= ~(1 << 6);
-        PORTB &= ~(1 << 6);
-    }
-
-    if (led_state.scroll_lock) {
-        DDRB |= (1 << 7);
-        PORTB &= ~(1 << 7);
-    } else {
-        DDRB &= ~(1 << 7);
-        PORTB &= ~(1 << 7);
-    }
-    return false;
-}
diff --git a/keyboards/gh80_3000/keymaps/ansi_wkl/keymap.c b/keyboards/gh80_3000/keymaps/ansi_wkl/keymap.c
index b3f2426e88a..a949b11941e 100644
--- a/keyboards/gh80_3000/keymaps/ansi_wkl/keymap.c
+++ b/keyboards/gh80_3000/keymaps/ansi_wkl/keymap.c
@@ -12,29 +12,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   )
 };
 
-bool led_update_user(led_t led_state) {
-    if (led_state.num_lock) {
-        DDRB |= (1 << 5);
-        PORTB &= ~(1 << 5);
-    } else {
-        DDRB &= ~(1 << 5);
-        PORTB &= ~(1 << 5);
-    }
-
-    if (led_state.caps_lock) {
-        DDRB |= (1 << 6);
-        PORTB &= ~(1 << 6);
-    } else {
-        DDRB &= ~(1 << 6);
-        PORTB &= ~(1 << 6);
-    }
-
-    if (led_state.scroll_lock) {
-        DDRB |= (1 << 7);
-        PORTB &= ~(1 << 7);
-    } else {
-        DDRB &= ~(1 << 7);
-        PORTB &= ~(1 << 7);
-    }
-    return false;
-}
diff --git a/keyboards/gh80_3000/keymaps/default/keymap.c b/keyboards/gh80_3000/keymaps/default/keymap.c
index b74127fc5e1..08f43c1d685 100644
--- a/keyboards/gh80_3000/keymaps/default/keymap.c
+++ b/keyboards/gh80_3000/keymaps/default/keymap.c
@@ -12,29 +12,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   )
 };
 
-bool led_update_user(led_t led_state) {
-    if (led_state.num_lock) {
-        DDRB |= (1 << 5);
-        PORTB &= ~(1 << 5);
-    } else {
-        DDRB &= ~(1 << 5);
-        PORTB &= ~(1 << 5);
-    }
-
-    if (led_state.caps_lock) {
-        DDRB |= (1 << 6);
-        PORTB &= ~(1 << 6);
-    } else {
-        DDRB &= ~(1 << 6);
-        PORTB &= ~(1 << 6);
-    }
-
-    if (led_state.scroll_lock) {
-        DDRB |= (1 << 7);
-        PORTB &= ~(1 << 7);
-    } else {
-        DDRB &= ~(1 << 7);
-        PORTB &= ~(1 << 7);
-    }
-    return false;
-}
diff --git a/keyboards/gh80_3000/keymaps/iso_default/keymap.c b/keyboards/gh80_3000/keymaps/iso_default/keymap.c
index 4c4b10f458a..ff2b373a544 100644
--- a/keyboards/gh80_3000/keymaps/iso_default/keymap.c
+++ b/keyboards/gh80_3000/keymaps/iso_default/keymap.c
@@ -12,29 +12,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   )
 };
 
-bool led_update_user(led_t led_state) {
-    if (led_state.num_lock) {
-        DDRB |= (1 << 5);
-        PORTB &= ~(1 << 5);
-    } else {
-        DDRB &= ~(1 << 5);
-        PORTB &= ~(1 << 5);
-    }
-
-    if (led_state.caps_lock) {
-        DDRB |= (1 << 6);
-        PORTB &= ~(1 << 6);
-    } else {
-        DDRB &= ~(1 << 6);
-        PORTB &= ~(1 << 6);
-    }
-
-    if (led_state.scroll_lock) {
-        DDRB |= (1 << 7);
-        PORTB &= ~(1 << 7);
-    } else {
-        DDRB &= ~(1 << 7);
-        PORTB &= ~(1 << 7);
-    }
-    return false;
-}
diff --git a/keyboards/gh80_3000/keymaps/iso_std/keymap.c b/keyboards/gh80_3000/keymaps/iso_std/keymap.c
index 9559bde1194..7783aae0a9f 100644
--- a/keyboards/gh80_3000/keymaps/iso_std/keymap.c
+++ b/keyboards/gh80_3000/keymaps/iso_std/keymap.c
@@ -12,29 +12,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   )
 };
 
-bool led_update_user(led_t led_state) {
-    if (led_state.num_lock) {
-        DDRB |= (1 << 5);
-        PORTB &= ~(1 << 5);
-    } else {
-        DDRB &= ~(1 << 5);
-        PORTB &= ~(1 << 5);
-    }
-
-    if (led_state.caps_lock) {
-        DDRB |= (1 << 6);
-        PORTB &= ~(1 << 6);
-    } else {
-        DDRB &= ~(1 << 6);
-        PORTB &= ~(1 << 6);
-    }
-
-    if (led_state.scroll_lock) {
-        DDRB |= (1 << 7);
-        PORTB &= ~(1 << 7);
-    } else {
-        DDRB &= ~(1 << 7);
-        PORTB &= ~(1 << 7);
-    }
-    return false;
-}
diff --git a/keyboards/gh80_3000/keymaps/iso_wkl/keymap.c b/keyboards/gh80_3000/keymaps/iso_wkl/keymap.c
index 86054ba1fd5..9108f6aba41 100644
--- a/keyboards/gh80_3000/keymaps/iso_wkl/keymap.c
+++ b/keyboards/gh80_3000/keymaps/iso_wkl/keymap.c
@@ -12,29 +12,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	)
 };
 
-bool led_update_user(led_t led_state) {
-    if (led_state.num_lock) {
-        DDRB |= (1 << 5);
-        PORTB &= ~(1 << 5);
-    } else {
-        DDRB &= ~(1 << 5);
-        PORTB &= ~(1 << 5);
-    }
-
-    if (led_state.caps_lock) {
-        DDRB |= (1 << 6);
-        PORTB &= ~(1 << 6);
-    } else {
-        DDRB &= ~(1 << 6);
-        PORTB &= ~(1 << 6);
-    }
-
-    if (led_state.scroll_lock) {
-        DDRB |= (1 << 7);
-        PORTB &= ~(1 << 7);
-    } else {
-        DDRB &= ~(1 << 7);
-        PORTB &= ~(1 << 7);
-    }
-    return false;
-}
diff --git a/keyboards/giabalanai/info.json b/keyboards/giabalanai/info.json
deleted file mode 100644
index 953e0bebc37..00000000000
--- a/keyboards/giabalanai/info.json
+++ /dev/null
@@ -1,316 +0,0 @@
-{
-    "keyboard_name": "giabalanai",
-    "manufacturer": "3araht",
-    "url": "https://github.com/3araht",
-    "maintainer": "3araht",
-    "usb": {
-        "vid": "0xFEED",
-        "pid": "0xF4B0",
-        "device_version": "0.0.1"
-    },
-    "rgb_matrix": {
-        "animations" :{
-            "gradient_up_down": true,
-            "rainbow_moving_chevron": true,
-            "hue_breathing": true,
-            "solid_reactive": true,
-            "multisplash": true
-        },
-        "driver": "ws2812",
-        "max_brightness": 50
-    },
-    "rgblight": {
-        "led_count": 123,
-        "max_brightness": 80,
-        "led_map": [60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 97, 84, 83, 82, 81, 80, 79, 78, 77, 76, 75, 74, 73, 72, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 110, 109, 108, 107, 106, 105, 104, 103, 102, 101, 100, 99, 98, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 35, 34, 33, 32, 31, 30, 29, 28, 27, 26, 25, 24, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 59, 58, 57, 56, 55, 54, 53, 52, 51, 50, 49, 48]
-    },
-    "matrix_pins": {
-        "cols": ["B1", "F7", "F6", "F5", "F4", "B3", "B2", "B6", "D0", "D1"],
-        "rows": ["B5", "B4", "E6", "D7", "C6", "D4"]
-    },
-    "diode_direction": "COL2ROW",
-    "features": {
-        "midi": true,
-        "extrakey": true,
-        "encoder": true,
-        "bootmagic": false,
-        "console": false,
-        "mousekey": false,
-        "nkro": false
-    },
-    "encoder": {
-        "rotary": []
-    },
-    "ws2812": {
-        "pin": "D3"
-    },
-    "split": {
-        "enabled": true,
-        "soft_serial_pin": "D2",
-        "encoder": {
-            "right": {
-                "rotary": [
-                    {"pin_a": "B4", "pin_b": "B6"}
-                ]
-            }
-        },
-        "matrix_pins": {
-            "right": {
-                "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "C7", "B7", "F1"],
-                "rows": ["D1", "D0", "D4", "C6", "D7", "E6"]
-            }
-        }
-    },
-    "qmk": {
-        "tap_keycode_delay": 10
-    },
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [1, 0], "x": 1, "y": 0},
-                {"matrix": [2, 0], "x": 2, "y": 0},
-                {"matrix": [3, 0], "x": 3, "y": 0},
-                {"matrix": [4, 0], "x": 4, "y": 0},
-                {"matrix": [5, 0], "x": 5, "y": 0},
-                {"matrix": [5, 5], "x": 6, "y": 0},
-                {"matrix": [4, 5], "x": 7, "y": 0},
-                {"matrix": [3, 5], "x": 8, "y": 0},
-                {"matrix": [2, 5], "x": 9, "y": 0},
-                {"matrix": [1, 5], "x": 10, "y": 0},
-                {"matrix": [0, 5], "x": 11, "y": 0},
-
-                {"matrix": [0, 1], "x": 0.5, "y": 1},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [2, 1], "x": 2.5, "y": 1},
-                {"matrix": [3, 1], "x": 3.5, "y": 1},
-                {"matrix": [4, 1], "x": 4.5, "y": 1},
-                {"matrix": [5, 1], "x": 5.5, "y": 1},
-                {"matrix": [5, 6], "x": 6.5, "y": 1},
-                {"matrix": [4, 6], "x": 7.5, "y": 1},
-                {"matrix": [3, 6], "x": 8.5, "y": 1},
-                {"matrix": [2, 6], "x": 9.5, "y": 1},
-                {"matrix": [1, 6], "x": 10.5, "y": 1},
-                {"matrix": [0, 6], "x": 11.5, "y": 1},
-
-                {"matrix": [0, 2], "x": 14.5, "y": 1},
-
-                {"matrix": [1, 2], "x": 1, "y": 2},
-                {"matrix": [2, 2], "x": 2, "y": 2},
-                {"matrix": [3, 2], "x": 3, "y": 2},
-                {"matrix": [4, 2], "x": 4, "y": 2},
-                {"matrix": [5, 2], "x": 5, "y": 2},
-                {"matrix": [5, 7], "x": 6, "y": 2},
-                {"matrix": [4, 7], "x": 7, "y": 2},
-                {"matrix": [3, 7], "x": 8, "y": 2},
-                {"matrix": [2, 7], "x": 9, "y": 2},
-                {"matrix": [1, 7], "x": 10, "y": 2},
-                {"matrix": [0, 7], "x": 11, "y": 2},
-                {"matrix": [0, 3], "x": 12, "y": 2},
-
-                {"matrix": [1, 3], "x": 15, "y": 2},
-                {"matrix": [2, 3], "x": 16, "y": 2},
-                {"matrix": [3, 3], "x": 17, "y": 2},
-                {"matrix": [4, 3], "x": 18, "y": 2},
-                {"matrix": [5, 3], "x": 19, "y": 2},
-                {"matrix": [5, 8], "x": 20, "y": 2},
-                {"matrix": [4, 8], "x": 21, "y": 2},
-                {"matrix": [3, 8], "x": 22, "y": 2},
-                {"matrix": [2, 8], "x": 23, "y": 2},
-                {"matrix": [1, 8], "x": 24, "y": 2},
-                {"matrix": [0, 8], "x": 25, "y": 2},
-                {"matrix": [0, 4], "x": 26, "y": 2},
-
-                {"matrix": [1, 4], "x": 27.5, "y": 2},
-
-                {"matrix": [2, 4], "x": 1.5, "y": 3},
-                {"matrix": [3, 4], "x": 2.5, "y": 3},
-                {"matrix": [4, 4], "x": 3.5, "y": 3},
-                {"matrix": [5, 4], "x": 4.5, "y": 3},
-                {"matrix": [5, 9], "x": 5.5, "y": 3},
-                {"matrix": [4, 9], "x": 6.5, "y": 3},
-                {"matrix": [3, 9], "x": 7.5, "y": 3},
-                {"matrix": [2, 9], "x": 8.5, "y": 3},
-                {"matrix": [1, 9], "x": 9.5, "y": 3},
-                {"matrix": [0, 9], "x": 10.5, "y": 3},
-                {"matrix": [8, 0], "x": 11.5, "y": 3},
-                {"matrix": [6, 0], "x": 12.5, "y": 3},
-
-                {"matrix": [6, 1], "x": 14.5, "y": 3},
-                {"matrix": [6, 2], "x": 15.5, "y": 3},
-                {"matrix": [6, 3], "x": 16.5, "y": 3},
-                {"matrix": [6, 4], "x": 17.5, "y": 3},
-                {"matrix": [6, 5], "x": 18.5, "y": 3},
-                {"matrix": [6, 6], "x": 19.5, "y": 3},
-                {"matrix": [9, 6], "x": 20.5, "y": 3},
-                {"matrix": [9, 5], "x": 21.5, "y": 3},
-                {"matrix": [9, 4], "x": 22.5, "y": 3},
-                {"matrix": [9, 3], "x": 23.5, "y": 3},
-                {"matrix": [9, 2], "x": 24.5, "y": 3},
-                {"matrix": [9, 1], "x": 25.5, "y": 3},
-                {"matrix": [7, 0], "x": 26.5, "y": 3},
-
-                {"matrix": [7, 1], "x": 2, "y": 4},
-                {"matrix": [7, 2], "x": 3, "y": 4},
-                {"matrix": [7, 3], "x": 4, "y": 4},
-                {"matrix": [7, 4], "x": 5, "y": 4},
-                {"matrix": [7, 5], "x": 6, "y": 4},
-                {"matrix": [7, 6], "x": 7, "y": 4},
-                {"matrix": [10, 6], "x": 8, "y": 4},
-                {"matrix": [10, 5], "x": 9, "y": 4},
-                {"matrix": [10, 4], "x": 10, "y": 4},
-                {"matrix": [10, 3], "x": 11, "y": 4},
-                {"matrix": [10, 2], "x": 12, "y": 4},
-                {"matrix": [10, 1], "x": 13, "y": 4},
-
-                {"matrix": [8, 1], "x": 15, "y": 4},
-                {"matrix": [8, 2], "x": 16, "y": 4},
-                {"matrix": [8, 3], "x": 17, "y": 4},
-                {"matrix": [8, 4], "x": 18, "y": 4},
-                {"matrix": [8, 5], "x": 19, "y": 4},
-                {"matrix": [8, 6], "x": 20, "y": 4},
-                {"matrix": [11, 6], "x": 21, "y": 4},
-                {"matrix": [11, 5], "x": 22, "y": 4},
-                {"matrix": [11, 4], "x": 23, "y": 4},
-                {"matrix": [11, 3], "x": 24, "y": 4},
-                {"matrix": [11, 2], "x": 25, "y": 4},
-                {"matrix": [11, 1], "x": 26, "y": 4}
-            ]
-        },
-        "LAYOUT_giabarinaix2": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [1, 0], "x": 1, "y": 0},
-                {"matrix": [2, 0], "x": 2, "y": 0},
-                {"matrix": [3, 0], "x": 3, "y": 0},
-                {"matrix": [4, 0], "x": 4, "y": 0},
-                {"matrix": [5, 0], "x": 5, "y": 0},
-                {"matrix": [5, 5], "x": 6, "y": 0},
-                {"matrix": [4, 5], "x": 7, "y": 0},
-                {"matrix": [3, 5], "x": 8, "y": 0},
-                {"matrix": [2, 5], "x": 9, "y": 0},
-                {"matrix": [1, 5], "x": 10, "y": 0},
-                {"matrix": [0, 5], "x": 11, "y": 0},
-
-                {"matrix": [0, 1], "x": 0.5, "y": 1},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [2, 1], "x": 2.5, "y": 1},
-                {"matrix": [3, 1], "x": 3.5, "y": 1},
-                {"matrix": [4, 1], "x": 4.5, "y": 1},
-                {"matrix": [5, 1], "x": 5.5, "y": 1},
-                {"matrix": [5, 6], "x": 6.5, "y": 1},
-                {"matrix": [4, 6], "x": 7.5, "y": 1},
-                {"matrix": [3, 6], "x": 8.5, "y": 1},
-                {"matrix": [2, 6], "x": 9.5, "y": 1},
-                {"matrix": [1, 6], "x": 10.5, "y": 1},
-                {"matrix": [0, 6], "x": 11.5, "y": 1},
-
-                {"matrix": [0, 2], "x": 1, "y": 2},
-                {"matrix": [1, 2], "x": 2, "y": 2},
-                {"matrix": [2, 2], "x": 3, "y": 2},
-                {"matrix": [3, 2], "x": 4, "y": 2},
-                {"matrix": [4, 2], "x": 5, "y": 2},
-                {"matrix": [5, 2], "x": 6, "y": 2},
-                {"matrix": [5, 7], "x": 7, "y": 2},
-                {"matrix": [4, 7], "x": 8, "y": 2},
-                {"matrix": [3, 7], "x": 9, "y": 2},
-                {"matrix": [2, 7], "x": 10, "y": 2},
-                {"matrix": [1, 7], "x": 11, "y": 2},
-                {"matrix": [0, 7], "x": 12, "y": 2},
-
-                {"matrix": [0, 3], "x": 1.5, "y": 3},
-                {"matrix": [1, 3], "x": 2.5, "y": 3},
-                {"matrix": [2, 3], "x": 3.5, "y": 3},
-                {"matrix": [3, 3], "x": 4.5, "y": 3},
-                {"matrix": [4, 3], "x": 5.5, "y": 3},
-                {"matrix": [5, 3], "x": 6.5, "y": 3},
-                {"matrix": [5, 8], "x": 7.5, "y": 3},
-                {"matrix": [4, 8], "x": 8.5, "y": 3},
-                {"matrix": [3, 8], "x": 9.5, "y": 3},
-                {"matrix": [2, 8], "x": 10.5, "y": 3},
-                {"matrix": [1, 8], "x": 11.5, "y": 3},
-                {"matrix": [0, 8], "x": 12.5, "y": 3},
-
-                {"matrix": [0, 4], "x": 2, "y": 4},
-                {"matrix": [1, 4], "x": 3, "y": 4},
-                {"matrix": [2, 4], "x": 4, "y": 4},
-                {"matrix": [3, 4], "x": 5, "y": 4},
-                {"matrix": [4, 4], "x": 6, "y": 4},
-                {"matrix": [5, 4], "x": 7, "y": 4},
-                {"matrix": [5, 9], "x": 8, "y": 4},
-                {"matrix": [4, 9], "x": 9, "y": 4},
-                {"matrix": [3, 9], "x": 10, "y": 4},
-                {"matrix": [2, 9], "x": 11, "y": 4},
-                {"matrix": [1, 9], "x": 12, "y": 4},
-                {"matrix": [0, 9], "x": 13, "y": 4},
-
-                {"matrix": [6, 9], "x": 0, "y": 6},
-                {"matrix": [7, 9], "x": 1, "y": 6},
-                {"matrix": [8, 9], "x": 2, "y": 6},
-                {"matrix": [9, 9], "x": 3, "y": 6},
-                {"matrix": [10, 9], "x": 4, "y": 6},
-                {"matrix": [11, 9], "x": 5, "y": 6},
-                {"matrix": [11, 4], "x": 6, "y": 6},
-                {"matrix": [10, 4], "x": 7, "y": 6},
-                {"matrix": [9, 4], "x": 8, "y": 6},
-                {"matrix": [8, 4], "x": 9, "y": 6},
-                {"matrix": [7, 4], "x": 10, "y": 6},
-                {"matrix": [6, 4], "x": 11, "y": 6},
-
-                {"matrix": [6, 8], "x": 0.5, "y": 7},
-                {"matrix": [7, 8], "x": 1.5, "y": 7},
-                {"matrix": [8, 8], "x": 2.5, "y": 7},
-                {"matrix": [9, 8], "x": 3.5, "y": 7},
-                {"matrix": [10, 8], "x": 4.5, "y": 7},
-                {"matrix": [11, 8], "x": 5.5, "y": 7},
-                {"matrix": [11, 3], "x": 6.5, "y": 7},
-                {"matrix": [10, 3], "x": 7.5, "y": 7},
-                {"matrix": [9, 3], "x": 8.5, "y": 7},
-                {"matrix": [8, 3], "x": 9.5, "y": 7},
-                {"matrix": [7, 3], "x": 10.5, "y": 7},
-                {"matrix": [6, 3], "x": 11.5, "y": 7},
-
-                {"matrix": [6, 7], "x": 1, "y": 8},
-                {"matrix": [7, 7], "x": 2, "y": 8},
-                {"matrix": [8, 7], "x": 3, "y": 8},
-                {"matrix": [9, 7], "x": 4, "y": 8},
-                {"matrix": [10, 7], "x": 5, "y": 8},
-                {"matrix": [11, 7], "x": 6, "y": 8},
-                {"matrix": [11, 2], "x": 7, "y": 8},
-                {"matrix": [10, 2], "x": 8, "y": 8},
-                {"matrix": [9, 2], "x": 9, "y": 8},
-                {"matrix": [8, 2], "x": 10, "y": 8},
-                {"matrix": [7, 2], "x": 11, "y": 8},
-                {"matrix": [6, 2], "x": 12, "y": 8},
-
-                {"matrix": [6, 6], "x": 1.5, "y": 9},
-                {"matrix": [7, 6], "x": 2.5, "y": 9},
-                {"matrix": [8, 6], "x": 3.5, "y": 9},
-                {"matrix": [9, 6], "x": 4.5, "y": 9},
-                {"matrix": [10, 6], "x": 5.5, "y": 9},
-                {"matrix": [11, 6], "x": 6.5, "y": 9},
-                {"matrix": [11, 1], "x": 7.5, "y": 9},
-                {"matrix": [10, 1], "x": 8.5, "y": 9},
-                {"matrix": [9, 1], "x": 9.5, "y": 9},
-                {"matrix": [8, 1], "x": 10.5, "y": 9},
-                {"matrix": [7, 1], "x": 11.5, "y": 9},
-                {"matrix": [6, 1], "x": 12.5, "y": 9},
-
-                {"matrix": [6, 5], "x": 2, "y": 10},
-                {"matrix": [7, 5], "x": 3, "y": 10},
-                {"matrix": [8, 5], "x": 4, "y": 10},
-                {"matrix": [9, 5], "x": 5, "y": 10},
-                {"matrix": [10, 5], "x": 6, "y": 10},
-                {"matrix": [11, 5], "x": 7, "y": 10},
-                {"matrix": [11, 0], "x": 8, "y": 10},
-                {"matrix": [10, 0], "x": 9, "y": 10},
-                {"matrix": [9, 0], "x": 10, "y": 10},
-                {"matrix": [8, 0], "x": 11, "y": 10},
-                {"matrix": [7, 0], "x": 12, "y": 10},
-                {"matrix": [6, 0], "x": 13, "y": 10}
-            ]
-        }
-    }
-}
diff --git a/keyboards/giabalanai/keyboard.json b/keyboards/giabalanai/keyboard.json
new file mode 100644
index 00000000000..ae5787cec6e
--- /dev/null
+++ b/keyboards/giabalanai/keyboard.json
@@ -0,0 +1,322 @@
+{
+    "keyboard_name": "giabalanai",
+    "manufacturer": "3araht",
+    "url": "https://github.com/3araht",
+    "maintainer": "3araht",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0xF4B0",
+        "device_version": "0.0.1"
+    },
+    "rgb_matrix": {
+        "animations" :{
+            "gradient_up_down": true,
+            "rainbow_moving_chevron": true,
+            "hue_breathing": true,
+            "solid_reactive": true,
+            "multisplash": true
+        },
+        "driver": "ws2812",
+        "max_brightness": 50
+    },
+    "rgblight": {
+        "led_count": 123,
+        "max_brightness": 80,
+        "led_map": [60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 97, 84, 83, 82, 81, 80, 79, 78, 77, 76, 75, 74, 73, 72, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 110, 109, 108, 107, 106, 105, 104, 103, 102, 101, 100, 99, 98, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 35, 34, 33, 32, 31, 30, 29, 28, 27, 26, 25, 24, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 59, 58, 57, 56, 55, 54, 53, 52, 51, 50, 49, 48]
+    },
+    "matrix_pins": {
+        "cols": ["B1", "F7", "F6", "F5", "F4", "B3", "B2", "B6", "D0", "D1"],
+        "rows": ["B5", "B4", "E6", "D7", "C6", "D4"]
+    },
+    "diode_direction": "COL2ROW",
+    "features": {
+        "midi": true,
+        "extrakey": true,
+        "encoder": true,
+        "bootmagic": false,
+        "console": false,
+        "mousekey": false,
+        "nkro": false,
+        "command": false,
+        "backlight": false,
+        "rgb_matrix": false
+    },
+    "build": {
+        "lto": true
+    },
+    "encoder": {
+        "rotary": []
+    },
+    "ws2812": {
+        "pin": "D3"
+    },
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "D2",
+        "encoder": {
+            "right": {
+                "rotary": [
+                    {"pin_a": "B4", "pin_b": "B6"}
+                ]
+            }
+        },
+        "matrix_pins": {
+            "right": {
+                "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "C7", "B7", "F1"],
+                "rows": ["D1", "D0", "D4", "C6", "D7", "E6"]
+            }
+        }
+    },
+    "qmk": {
+        "tap_keycode_delay": 10
+    },
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [1, 0], "x": 1, "y": 0},
+                {"matrix": [2, 0], "x": 2, "y": 0},
+                {"matrix": [3, 0], "x": 3, "y": 0},
+                {"matrix": [4, 0], "x": 4, "y": 0},
+                {"matrix": [5, 0], "x": 5, "y": 0},
+                {"matrix": [5, 5], "x": 6, "y": 0},
+                {"matrix": [4, 5], "x": 7, "y": 0},
+                {"matrix": [3, 5], "x": 8, "y": 0},
+                {"matrix": [2, 5], "x": 9, "y": 0},
+                {"matrix": [1, 5], "x": 10, "y": 0},
+                {"matrix": [0, 5], "x": 11, "y": 0},
+
+                {"matrix": [0, 1], "x": 0.5, "y": 1},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [2, 1], "x": 2.5, "y": 1},
+                {"matrix": [3, 1], "x": 3.5, "y": 1},
+                {"matrix": [4, 1], "x": 4.5, "y": 1},
+                {"matrix": [5, 1], "x": 5.5, "y": 1},
+                {"matrix": [5, 6], "x": 6.5, "y": 1},
+                {"matrix": [4, 6], "x": 7.5, "y": 1},
+                {"matrix": [3, 6], "x": 8.5, "y": 1},
+                {"matrix": [2, 6], "x": 9.5, "y": 1},
+                {"matrix": [1, 6], "x": 10.5, "y": 1},
+                {"matrix": [0, 6], "x": 11.5, "y": 1},
+
+                {"matrix": [0, 2], "x": 14.5, "y": 1},
+
+                {"matrix": [1, 2], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [3, 2], "x": 3, "y": 2},
+                {"matrix": [4, 2], "x": 4, "y": 2},
+                {"matrix": [5, 2], "x": 5, "y": 2},
+                {"matrix": [5, 7], "x": 6, "y": 2},
+                {"matrix": [4, 7], "x": 7, "y": 2},
+                {"matrix": [3, 7], "x": 8, "y": 2},
+                {"matrix": [2, 7], "x": 9, "y": 2},
+                {"matrix": [1, 7], "x": 10, "y": 2},
+                {"matrix": [0, 7], "x": 11, "y": 2},
+                {"matrix": [0, 3], "x": 12, "y": 2},
+
+                {"matrix": [1, 3], "x": 15, "y": 2},
+                {"matrix": [2, 3], "x": 16, "y": 2},
+                {"matrix": [3, 3], "x": 17, "y": 2},
+                {"matrix": [4, 3], "x": 18, "y": 2},
+                {"matrix": [5, 3], "x": 19, "y": 2},
+                {"matrix": [5, 8], "x": 20, "y": 2},
+                {"matrix": [4, 8], "x": 21, "y": 2},
+                {"matrix": [3, 8], "x": 22, "y": 2},
+                {"matrix": [2, 8], "x": 23, "y": 2},
+                {"matrix": [1, 8], "x": 24, "y": 2},
+                {"matrix": [0, 8], "x": 25, "y": 2},
+                {"matrix": [0, 4], "x": 26, "y": 2},
+
+                {"matrix": [1, 4], "x": 27.5, "y": 2},
+
+                {"matrix": [2, 4], "x": 1.5, "y": 3},
+                {"matrix": [3, 4], "x": 2.5, "y": 3},
+                {"matrix": [4, 4], "x": 3.5, "y": 3},
+                {"matrix": [5, 4], "x": 4.5, "y": 3},
+                {"matrix": [5, 9], "x": 5.5, "y": 3},
+                {"matrix": [4, 9], "x": 6.5, "y": 3},
+                {"matrix": [3, 9], "x": 7.5, "y": 3},
+                {"matrix": [2, 9], "x": 8.5, "y": 3},
+                {"matrix": [1, 9], "x": 9.5, "y": 3},
+                {"matrix": [0, 9], "x": 10.5, "y": 3},
+                {"matrix": [8, 0], "x": 11.5, "y": 3},
+                {"matrix": [6, 0], "x": 12.5, "y": 3},
+
+                {"matrix": [6, 1], "x": 14.5, "y": 3},
+                {"matrix": [6, 2], "x": 15.5, "y": 3},
+                {"matrix": [6, 3], "x": 16.5, "y": 3},
+                {"matrix": [6, 4], "x": 17.5, "y": 3},
+                {"matrix": [6, 5], "x": 18.5, "y": 3},
+                {"matrix": [6, 6], "x": 19.5, "y": 3},
+                {"matrix": [9, 6], "x": 20.5, "y": 3},
+                {"matrix": [9, 5], "x": 21.5, "y": 3},
+                {"matrix": [9, 4], "x": 22.5, "y": 3},
+                {"matrix": [9, 3], "x": 23.5, "y": 3},
+                {"matrix": [9, 2], "x": 24.5, "y": 3},
+                {"matrix": [9, 1], "x": 25.5, "y": 3},
+                {"matrix": [7, 0], "x": 26.5, "y": 3},
+
+                {"matrix": [7, 1], "x": 2, "y": 4},
+                {"matrix": [7, 2], "x": 3, "y": 4},
+                {"matrix": [7, 3], "x": 4, "y": 4},
+                {"matrix": [7, 4], "x": 5, "y": 4},
+                {"matrix": [7, 5], "x": 6, "y": 4},
+                {"matrix": [7, 6], "x": 7, "y": 4},
+                {"matrix": [10, 6], "x": 8, "y": 4},
+                {"matrix": [10, 5], "x": 9, "y": 4},
+                {"matrix": [10, 4], "x": 10, "y": 4},
+                {"matrix": [10, 3], "x": 11, "y": 4},
+                {"matrix": [10, 2], "x": 12, "y": 4},
+                {"matrix": [10, 1], "x": 13, "y": 4},
+
+                {"matrix": [8, 1], "x": 15, "y": 4},
+                {"matrix": [8, 2], "x": 16, "y": 4},
+                {"matrix": [8, 3], "x": 17, "y": 4},
+                {"matrix": [8, 4], "x": 18, "y": 4},
+                {"matrix": [8, 5], "x": 19, "y": 4},
+                {"matrix": [8, 6], "x": 20, "y": 4},
+                {"matrix": [11, 6], "x": 21, "y": 4},
+                {"matrix": [11, 5], "x": 22, "y": 4},
+                {"matrix": [11, 4], "x": 23, "y": 4},
+                {"matrix": [11, 3], "x": 24, "y": 4},
+                {"matrix": [11, 2], "x": 25, "y": 4},
+                {"matrix": [11, 1], "x": 26, "y": 4}
+            ]
+        },
+        "LAYOUT_giabarinaix2": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [1, 0], "x": 1, "y": 0},
+                {"matrix": [2, 0], "x": 2, "y": 0},
+                {"matrix": [3, 0], "x": 3, "y": 0},
+                {"matrix": [4, 0], "x": 4, "y": 0},
+                {"matrix": [5, 0], "x": 5, "y": 0},
+                {"matrix": [5, 5], "x": 6, "y": 0},
+                {"matrix": [4, 5], "x": 7, "y": 0},
+                {"matrix": [3, 5], "x": 8, "y": 0},
+                {"matrix": [2, 5], "x": 9, "y": 0},
+                {"matrix": [1, 5], "x": 10, "y": 0},
+                {"matrix": [0, 5], "x": 11, "y": 0},
+
+                {"matrix": [0, 1], "x": 0.5, "y": 1},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [2, 1], "x": 2.5, "y": 1},
+                {"matrix": [3, 1], "x": 3.5, "y": 1},
+                {"matrix": [4, 1], "x": 4.5, "y": 1},
+                {"matrix": [5, 1], "x": 5.5, "y": 1},
+                {"matrix": [5, 6], "x": 6.5, "y": 1},
+                {"matrix": [4, 6], "x": 7.5, "y": 1},
+                {"matrix": [3, 6], "x": 8.5, "y": 1},
+                {"matrix": [2, 6], "x": 9.5, "y": 1},
+                {"matrix": [1, 6], "x": 10.5, "y": 1},
+                {"matrix": [0, 6], "x": 11.5, "y": 1},
+
+                {"matrix": [0, 2], "x": 1, "y": 2},
+                {"matrix": [1, 2], "x": 2, "y": 2},
+                {"matrix": [2, 2], "x": 3, "y": 2},
+                {"matrix": [3, 2], "x": 4, "y": 2},
+                {"matrix": [4, 2], "x": 5, "y": 2},
+                {"matrix": [5, 2], "x": 6, "y": 2},
+                {"matrix": [5, 7], "x": 7, "y": 2},
+                {"matrix": [4, 7], "x": 8, "y": 2},
+                {"matrix": [3, 7], "x": 9, "y": 2},
+                {"matrix": [2, 7], "x": 10, "y": 2},
+                {"matrix": [1, 7], "x": 11, "y": 2},
+                {"matrix": [0, 7], "x": 12, "y": 2},
+
+                {"matrix": [0, 3], "x": 1.5, "y": 3},
+                {"matrix": [1, 3], "x": 2.5, "y": 3},
+                {"matrix": [2, 3], "x": 3.5, "y": 3},
+                {"matrix": [3, 3], "x": 4.5, "y": 3},
+                {"matrix": [4, 3], "x": 5.5, "y": 3},
+                {"matrix": [5, 3], "x": 6.5, "y": 3},
+                {"matrix": [5, 8], "x": 7.5, "y": 3},
+                {"matrix": [4, 8], "x": 8.5, "y": 3},
+                {"matrix": [3, 8], "x": 9.5, "y": 3},
+                {"matrix": [2, 8], "x": 10.5, "y": 3},
+                {"matrix": [1, 8], "x": 11.5, "y": 3},
+                {"matrix": [0, 8], "x": 12.5, "y": 3},
+
+                {"matrix": [0, 4], "x": 2, "y": 4},
+                {"matrix": [1, 4], "x": 3, "y": 4},
+                {"matrix": [2, 4], "x": 4, "y": 4},
+                {"matrix": [3, 4], "x": 5, "y": 4},
+                {"matrix": [4, 4], "x": 6, "y": 4},
+                {"matrix": [5, 4], "x": 7, "y": 4},
+                {"matrix": [5, 9], "x": 8, "y": 4},
+                {"matrix": [4, 9], "x": 9, "y": 4},
+                {"matrix": [3, 9], "x": 10, "y": 4},
+                {"matrix": [2, 9], "x": 11, "y": 4},
+                {"matrix": [1, 9], "x": 12, "y": 4},
+                {"matrix": [0, 9], "x": 13, "y": 4},
+
+                {"matrix": [6, 9], "x": 0, "y": 6},
+                {"matrix": [7, 9], "x": 1, "y": 6},
+                {"matrix": [8, 9], "x": 2, "y": 6},
+                {"matrix": [9, 9], "x": 3, "y": 6},
+                {"matrix": [10, 9], "x": 4, "y": 6},
+                {"matrix": [11, 9], "x": 5, "y": 6},
+                {"matrix": [11, 4], "x": 6, "y": 6},
+                {"matrix": [10, 4], "x": 7, "y": 6},
+                {"matrix": [9, 4], "x": 8, "y": 6},
+                {"matrix": [8, 4], "x": 9, "y": 6},
+                {"matrix": [7, 4], "x": 10, "y": 6},
+                {"matrix": [6, 4], "x": 11, "y": 6},
+
+                {"matrix": [6, 8], "x": 0.5, "y": 7},
+                {"matrix": [7, 8], "x": 1.5, "y": 7},
+                {"matrix": [8, 8], "x": 2.5, "y": 7},
+                {"matrix": [9, 8], "x": 3.5, "y": 7},
+                {"matrix": [10, 8], "x": 4.5, "y": 7},
+                {"matrix": [11, 8], "x": 5.5, "y": 7},
+                {"matrix": [11, 3], "x": 6.5, "y": 7},
+                {"matrix": [10, 3], "x": 7.5, "y": 7},
+                {"matrix": [9, 3], "x": 8.5, "y": 7},
+                {"matrix": [8, 3], "x": 9.5, "y": 7},
+                {"matrix": [7, 3], "x": 10.5, "y": 7},
+                {"matrix": [6, 3], "x": 11.5, "y": 7},
+
+                {"matrix": [6, 7], "x": 1, "y": 8},
+                {"matrix": [7, 7], "x": 2, "y": 8},
+                {"matrix": [8, 7], "x": 3, "y": 8},
+                {"matrix": [9, 7], "x": 4, "y": 8},
+                {"matrix": [10, 7], "x": 5, "y": 8},
+                {"matrix": [11, 7], "x": 6, "y": 8},
+                {"matrix": [11, 2], "x": 7, "y": 8},
+                {"matrix": [10, 2], "x": 8, "y": 8},
+                {"matrix": [9, 2], "x": 9, "y": 8},
+                {"matrix": [8, 2], "x": 10, "y": 8},
+                {"matrix": [7, 2], "x": 11, "y": 8},
+                {"matrix": [6, 2], "x": 12, "y": 8},
+
+                {"matrix": [6, 6], "x": 1.5, "y": 9},
+                {"matrix": [7, 6], "x": 2.5, "y": 9},
+                {"matrix": [8, 6], "x": 3.5, "y": 9},
+                {"matrix": [9, 6], "x": 4.5, "y": 9},
+                {"matrix": [10, 6], "x": 5.5, "y": 9},
+                {"matrix": [11, 6], "x": 6.5, "y": 9},
+                {"matrix": [11, 1], "x": 7.5, "y": 9},
+                {"matrix": [10, 1], "x": 8.5, "y": 9},
+                {"matrix": [9, 1], "x": 9.5, "y": 9},
+                {"matrix": [8, 1], "x": 10.5, "y": 9},
+                {"matrix": [7, 1], "x": 11.5, "y": 9},
+                {"matrix": [6, 1], "x": 12.5, "y": 9},
+
+                {"matrix": [6, 5], "x": 2, "y": 10},
+                {"matrix": [7, 5], "x": 3, "y": 10},
+                {"matrix": [8, 5], "x": 4, "y": 10},
+                {"matrix": [9, 5], "x": 5, "y": 10},
+                {"matrix": [10, 5], "x": 6, "y": 10},
+                {"matrix": [11, 5], "x": 7, "y": 10},
+                {"matrix": [11, 0], "x": 8, "y": 10},
+                {"matrix": [10, 0], "x": 9, "y": 10},
+                {"matrix": [9, 0], "x": 10, "y": 10},
+                {"matrix": [8, 0], "x": 11, "y": 10},
+                {"matrix": [7, 0], "x": 12, "y": 10},
+                {"matrix": [6, 0], "x": 13, "y": 10}
+            ]
+        }
+    }
+}
diff --git a/keyboards/giabalanai/rules.mk b/keyboards/giabalanai/rules.mk
deleted file mode 100644
index 90ba252d264..00000000000
--- a/keyboards/giabalanai/rules.mk
+++ /dev/null
@@ -1,9 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-COMMAND_ENABLE = no         # Commands for debug and configuration
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-# RGB_MATRIX_ENABLE is not suitable for giabalanai keyboard on the right side (there are dulpicate keys).
-RGB_MATRIX_ENABLE = no      # Use RGB matrix (Don't enable this when RGBLIGHT_ENABLE is used.)
-
-LTO_ENABLE = yes
diff --git a/keyboards/gl516/a52gl/info.json b/keyboards/gl516/a52gl/info.json
deleted file mode 100644
index bc9b1cacfad..00000000000
--- a/keyboards/gl516/a52gl/info.json
+++ /dev/null
@@ -1,81 +0,0 @@
-{
-    "keyboard_name": "a52gl",
-    "manufacturer": "Salicylic_Acid",
-    "url": "https://salicylic-acid3.hatenablog.com/",
-    "maintainer": "Salicylic_acid3",
-    "usb": {
-        "vid": "0x04D8",
-        "pid": "0xE8D1",
-        "device_version": "0.0.1"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2.25, "y": 0},
-                {"matrix": [0, 3], "x": 3.25, "y": 0},
-                {"matrix": [0, 4], "x": 4.25, "y": 0},
-                {"matrix": [0, 5], "x": 5.25, "y": 0},
-
-                {"matrix": [0, 6], "x": 7.75, "y": 0},
-                {"matrix": [4, 0], "x": 8.75, "y": 0},
-                {"matrix": [4, 1], "x": 9.75, "y": 0},
-                {"matrix": [4, 2], "x": 10.75, "y": 0},
-                {"matrix": [4, 3], "x": 12, "y": 0},
-                {"matrix": [4, 4], "x": 13, "y": 0},
-                {"matrix": [4, 5], "x": 14, "y": 0},
-                {"matrix": [4, 6], "x": 15, "y": 0, "w": 1.5},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
-                {"matrix": [1, 1], "x": 1.25, "y": 1},
-                {"matrix": [1, 2], "x": 2.52, "y": 1},
-                {"matrix": [1, 3], "x": 3.52, "y": 1},
-                {"matrix": [1, 4], "x": 4.52, "y": 1},
-                {"matrix": [1, 5], "x": 5.52, "y": 1},
-
-                {"matrix": [1, 6], "x": 8, "y": 1},
-                {"matrix": [5, 0], "x": 9, "y": 1},
-                {"matrix": [5, 1], "x": 10, "y": 1},
-                {"matrix": [5, 2], "x": 11, "y": 1},
-                {"matrix": [5, 3], "x": 12.25, "y": 1},
-                {"matrix": [5, 4], "x": 13.25, "y": 1},
-                {"matrix": [5, 5], "x": 14.25, "y": 1, "w": 2.25},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 3.05, "y": 2},
-                {"matrix": [2, 3], "x": 4.05, "y": 2},
-                {"matrix": [2, 4], "x": 5.05, "y": 2},
-                {"matrix": [2, 5], "x": 6.05, "y": 2},
-
-                {"matrix": [2, 6], "x": 7.5, "y": 2},
-                {"matrix": [6, 0], "x": 8.5, "y": 2},
-                {"matrix": [6, 1], "x": 9.5, "y": 2},
-                {"matrix": [6, 2], "x": 10.5, "y": 2},
-                {"matrix": [6, 3], "x": 12, "y": 2},
-                {"matrix": [6, 4], "x": 13, "y": 2},
-
-                {"matrix": [6, 5], "x": 14.25, "y": 2.25},
-
-                {"matrix": [6, 6], "x": 15.5, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
-                {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 1.25},
-                {"matrix": [3, 2], "x": 3.05, "y": 3},
-                {"matrix": [3, 4], "x": 4.05, "y": 3, "w": 2},
-                {"matrix": [3, 5], "x": 6.05, "y": 3},
-
-                {"matrix": [3, 6], "x": 7.5, "y": 3, "w": 2.25},
-                {"matrix": [7, 1], "x": 9.75, "y": 3, "w": 1.25},
-                {"matrix": [7, 3], "x": 12, "y": 3},
-
-                {"matrix": [7, 4], "x": 13.25, "y": 3.25},
-                {"matrix": [7, 5], "x": 14.25, "y": 3.25},
-                {"matrix": [7, 6], "x": 15.25, "y": 3.25}
-            ]
-        }
-    }
-}
diff --git a/keyboards/gl516/a52gl/keyboard.json b/keyboards/gl516/a52gl/keyboard.json
new file mode 100644
index 00000000000..54fbce6bdad
--- /dev/null
+++ b/keyboards/gl516/a52gl/keyboard.json
@@ -0,0 +1,86 @@
+{
+    "keyboard_name": "a52gl",
+    "manufacturer": "Salicylic_Acid",
+    "url": "https://salicylic-acid3.hatenablog.com/",
+    "maintainer": "Salicylic_acid3",
+    "usb": {
+        "vid": "0x04D8",
+        "pid": "0xE8D1",
+        "device_version": "0.0.1"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+                {"matrix": [0, 5], "x": 5.25, "y": 0},
+
+                {"matrix": [0, 6], "x": 7.75, "y": 0},
+                {"matrix": [4, 0], "x": 8.75, "y": 0},
+                {"matrix": [4, 1], "x": 9.75, "y": 0},
+                {"matrix": [4, 2], "x": 10.75, "y": 0},
+                {"matrix": [4, 3], "x": 12, "y": 0},
+                {"matrix": [4, 4], "x": 13, "y": 0},
+                {"matrix": [4, 5], "x": 14, "y": 0},
+                {"matrix": [4, 6], "x": 15, "y": 0, "w": 1.5},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
+                {"matrix": [1, 1], "x": 1.25, "y": 1},
+                {"matrix": [1, 2], "x": 2.52, "y": 1},
+                {"matrix": [1, 3], "x": 3.52, "y": 1},
+                {"matrix": [1, 4], "x": 4.52, "y": 1},
+                {"matrix": [1, 5], "x": 5.52, "y": 1},
+
+                {"matrix": [1, 6], "x": 8, "y": 1},
+                {"matrix": [5, 0], "x": 9, "y": 1},
+                {"matrix": [5, 1], "x": 10, "y": 1},
+                {"matrix": [5, 2], "x": 11, "y": 1},
+                {"matrix": [5, 3], "x": 12.25, "y": 1},
+                {"matrix": [5, 4], "x": 13.25, "y": 1},
+                {"matrix": [5, 5], "x": 14.25, "y": 1, "w": 2.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 3.05, "y": 2},
+                {"matrix": [2, 3], "x": 4.05, "y": 2},
+                {"matrix": [2, 4], "x": 5.05, "y": 2},
+                {"matrix": [2, 5], "x": 6.05, "y": 2},
+
+                {"matrix": [2, 6], "x": 7.5, "y": 2},
+                {"matrix": [6, 0], "x": 8.5, "y": 2},
+                {"matrix": [6, 1], "x": 9.5, "y": 2},
+                {"matrix": [6, 2], "x": 10.5, "y": 2},
+                {"matrix": [6, 3], "x": 12, "y": 2},
+                {"matrix": [6, 4], "x": 13, "y": 2},
+
+                {"matrix": [6, 5], "x": 14.25, "y": 2.25},
+
+                {"matrix": [6, 6], "x": 15.5, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 1.25},
+                {"matrix": [3, 2], "x": 3.05, "y": 3},
+                {"matrix": [3, 4], "x": 4.05, "y": 3, "w": 2},
+                {"matrix": [3, 5], "x": 6.05, "y": 3},
+
+                {"matrix": [3, 6], "x": 7.5, "y": 3, "w": 2.25},
+                {"matrix": [7, 1], "x": 9.75, "y": 3, "w": 1.25},
+                {"matrix": [7, 3], "x": 12, "y": 3},
+
+                {"matrix": [7, 4], "x": 13.25, "y": 3.25},
+                {"matrix": [7, 5], "x": 14.25, "y": 3.25},
+                {"matrix": [7, 6], "x": 15.25, "y": 3.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/gl516/a52gl/rules.mk b/keyboards/gl516/a52gl/rules.mk
index 109f8bc976d..179d02c3c68 100644
--- a/keyboards/gl516/a52gl/rules.mk
+++ b/keyboards/gl516/a52gl/rules.mk
@@ -1,16 +1,3 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
 CUSTOM_MATRIX = lite
 
-SRC += matrix.c
\ No newline at end of file
+SRC += matrix.c
diff --git a/keyboards/gl516/j73gl/info.json b/keyboards/gl516/j73gl/info.json
deleted file mode 100644
index fa78788e666..00000000000
--- a/keyboards/gl516/j73gl/info.json
+++ /dev/null
@@ -1,115 +0,0 @@
-{
-    "keyboard_name": "j73gl",
-    "manufacturer": "Salicylic_Acid",
-    "url": "https://salicylic-acid3.hatenablog.com/",
-    "maintainer": "Salicylic_acid3",
-    "usb": {
-        "vid": "0x04D8",
-        "pid": "0xE8D0",
-        "device_version": "0.0.1"
-    },
-    "rgblight": {
-        "led_count": 73,
-        "animations": {
-            "breathing": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "snake": true,
-            "knight": true,
-            "christmas": true,
-            "static_gradient": true,
-            "rgb_test": true,
-            "alternating": true,
-            "twinkle": true
-        }
-    },
-    "ws2812": {
-        "pin": "D3"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [5, 0], "x": 7, "y": 0},
-                {"matrix": [5, 1], "x": 8, "y": 0},
-                {"matrix": [5, 2], "x": 9, "y": 0},
-                {"matrix": [5, 3], "x": 10, "y": 0},
-                {"matrix": [5, 4], "x": 11, "y": 0},
-                {"matrix": [5, 5], "x": 12, "y": 0},
-                {"matrix": [5, 6], "x": 13, "y": 0},
-                {"matrix": [6, 6], "x": 14, "y": 0},
-                {"matrix": [5, 7], "x": 15, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [6, 0], "x": 7.5, "y": 1},
-                {"matrix": [6, 1], "x": 8.5, "y": 1},
-                {"matrix": [6, 2], "x": 9.5, "y": 1},
-                {"matrix": [6, 3], "x": 10.5, "y": 1},
-                {"matrix": [6, 4], "x": 11.5, "y": 1},
-                {"matrix": [6, 5], "x": 12.5, "y": 1},
-                {"matrix": [6, 7], "x": 15, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [7, 0], "x": 7.75, "y": 2},
-                {"matrix": [7, 1], "x": 8.75, "y": 2},
-                {"matrix": [7, 2], "x": 9.75, "y": 2},
-                {"matrix": [7, 3], "x": 10.75, "y": 2},
-                {"matrix": [7, 4], "x": 11.75, "y": 2},
-                {"matrix": [7, 5], "x": 12.75, "y": 2},
-                {"matrix": [7, 6], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
-                {"matrix": [7, 7], "x": 15, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 1], "x": 2.25, "y": 3},
-                {"matrix": [3, 2], "x": 3.25, "y": 3},
-                {"matrix": [3, 3], "x": 4.25, "y": 3},
-                {"matrix": [3, 4], "x": 5.25, "y": 3},
-                {"matrix": [3, 5], "x": 6.25, "y": 3},
-                {"matrix": [3, 6], "x": 7.25, "y": 3},
-                {"matrix": [8, 0], "x": 8.25, "y": 3},
-                {"matrix": [8, 1], "x": 9.25, "y": 3},
-                {"matrix": [8, 2], "x": 10.25, "y": 3},
-                {"matrix": [8, 3], "x": 11.25, "y": 3},
-                {"matrix": [8, 5], "x": 12.25, "y": 3, "w": 1.75},
-                {"matrix": [8, 6], "x": 14, "y": 3},
-                {"matrix": [8, 7], "x": 15, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4},
-                {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 3], "x": 3.5, "y": 4},
-                {"matrix": [4, 4], "x": 4.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 5], "x": 5.75, "y": 4},
-                {"matrix": [4, 6], "x": 6.75, "y": 4},
-                {"matrix": [9, 0], "x": 7.75, "y": 4, "w": 1.25},
-                {"matrix": [9, 1], "x": 9, "y": 4},
-                {"matrix": [9, 2], "x": 10, "y": 4, "w": 1.25},
-                {"matrix": [9, 3], "x": 11.25, "y": 4, "w": 1.25},
-
-                {"matrix": [9, 5], "x": 13, "y": 4},
-                {"matrix": [9, 6], "x": 14, "y": 4},
-                {"matrix": [9, 7], "x": 15, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/gl516/j73gl/keyboard.json b/keyboards/gl516/j73gl/keyboard.json
new file mode 100644
index 00000000000..b252363f700
--- /dev/null
+++ b/keyboards/gl516/j73gl/keyboard.json
@@ -0,0 +1,121 @@
+{
+    "keyboard_name": "j73gl",
+    "manufacturer": "Salicylic_Acid",
+    "url": "https://salicylic-acid3.hatenablog.com/",
+    "maintainer": "Salicylic_acid3",
+    "usb": {
+        "vid": "0x04D8",
+        "pid": "0xE8D0",
+        "device_version": "0.0.1"
+    },
+    "rgblight": {
+        "led_count": 73,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": true,
+            "twinkle": true
+        }
+    },
+    "ws2812": {
+        "pin": "D3"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "rgblight": true
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [5, 0], "x": 7, "y": 0},
+                {"matrix": [5, 1], "x": 8, "y": 0},
+                {"matrix": [5, 2], "x": 9, "y": 0},
+                {"matrix": [5, 3], "x": 10, "y": 0},
+                {"matrix": [5, 4], "x": 11, "y": 0},
+                {"matrix": [5, 5], "x": 12, "y": 0},
+                {"matrix": [5, 6], "x": 13, "y": 0},
+                {"matrix": [6, 6], "x": 14, "y": 0},
+                {"matrix": [5, 7], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [6, 0], "x": 7.5, "y": 1},
+                {"matrix": [6, 1], "x": 8.5, "y": 1},
+                {"matrix": [6, 2], "x": 9.5, "y": 1},
+                {"matrix": [6, 3], "x": 10.5, "y": 1},
+                {"matrix": [6, 4], "x": 11.5, "y": 1},
+                {"matrix": [6, 5], "x": 12.5, "y": 1},
+                {"matrix": [6, 7], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [7, 0], "x": 7.75, "y": 2},
+                {"matrix": [7, 1], "x": 8.75, "y": 2},
+                {"matrix": [7, 2], "x": 9.75, "y": 2},
+                {"matrix": [7, 3], "x": 10.75, "y": 2},
+                {"matrix": [7, 4], "x": 11.75, "y": 2},
+                {"matrix": [7, 5], "x": 12.75, "y": 2},
+                {"matrix": [7, 6], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [7, 7], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [8, 0], "x": 8.25, "y": 3},
+                {"matrix": [8, 1], "x": 9.25, "y": 3},
+                {"matrix": [8, 2], "x": 10.25, "y": 3},
+                {"matrix": [8, 3], "x": 11.25, "y": 3},
+                {"matrix": [8, 5], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [8, 6], "x": 14, "y": 3},
+                {"matrix": [8, 7], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4},
+                {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 3.5, "y": 4},
+                {"matrix": [4, 4], "x": 4.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 5.75, "y": 4},
+                {"matrix": [4, 6], "x": 6.75, "y": 4},
+                {"matrix": [9, 0], "x": 7.75, "y": 4, "w": 1.25},
+                {"matrix": [9, 1], "x": 9, "y": 4},
+                {"matrix": [9, 2], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [9, 3], "x": 11.25, "y": 4, "w": 1.25},
+
+                {"matrix": [9, 5], "x": 13, "y": 4},
+                {"matrix": [9, 6], "x": 14, "y": 4},
+                {"matrix": [9, 7], "x": 15, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/gl516/j73gl/rules.mk b/keyboards/gl516/j73gl/rules.mk
index 3ea771b6701..179d02c3c68 100644
--- a/keyboards/gl516/j73gl/rules.mk
+++ b/keyboards/gl516/j73gl/rules.mk
@@ -1,16 +1,3 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
 CUSTOM_MATRIX = lite
 
-SRC += matrix.c
\ No newline at end of file
+SRC += matrix.c
diff --git a/keyboards/gl516/n51gl/info.json b/keyboards/gl516/n51gl/info.json
deleted file mode 100644
index c5abdd45428..00000000000
--- a/keyboards/gl516/n51gl/info.json
+++ /dev/null
@@ -1,103 +0,0 @@
-{
-    "keyboard_name": "n51gl",
-    "manufacturer": "Salicylic_Acid",
-    "url": "https://salicylic-acid3.hatenablog.com/",
-    "maintainer": "Salicylic_acid3",
-    "usb": {
-        "vid": "0x04D8",
-        "pid": "0xE8CF",
-        "device_version": "0.0.1"
-    },
-    "rgblight": {
-        "led_count": 15,
-        "animations": {
-            "breathing": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "snake": true,
-            "knight": true,
-            "christmas": true,
-            "static_gradient": true,
-            "rgb_test": true,
-            "alternating": true,
-            "twinkle": true
-        }
-    },
-    "ws2812": {
-        "pin": "D3"
-    },
-    "encoder": {
-        "rotary": [
-            {"pin_a": "D7", "pin_b": "E6", "resolution": 3}
-        ]
-    },
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0.25, "y": 0},
-                {"matrix": [0, 1], "x": 1.25, "y": 0},
-                {"matrix": [0, 2], "x": 2.25, "y": 0},
-                {"matrix": [0, 3], "x": 3.25, "y": 0},
-                {"matrix": [0, 4], "x": 4.25, "y": 0},
-                {"matrix": [0, 5], "x": 5.25, "y": 0},
-                {"matrix": [0, 6], "x": 6.25, "y": 0},
-
-                {"matrix": [4, 0], "x": 9.25, "y": 0},
-                {"matrix": [4, 1], "x": 10.25, "y": 0},
-                {"matrix": [4, 2], "x": 11.25, "y": 0},
-                {"matrix": [4, 3], "x": 12.25, "y": 0},
-                {"matrix": [4, 4], "x": 13.25, "y": 0},
-                {"matrix": [4, 5], "x": 14.25, "y": 0},
-                {"matrix": [4, 6], "x": 15.25, "y": 0},
-
-                {"matrix": [1, 1], "x": 0.25, "y": 1, "w": 1.75},
-                {"matrix": [1, 2], "x": 2, "y": 1},
-                {"matrix": [1, 3], "x": 3.25, "y": 1},
-                {"matrix": [1, 4], "x": 4.25, "y": 1},
-                {"matrix": [1, 5], "x": 5.25, "y": 1},
-                {"matrix": [1, 6], "x": 6.25, "y": 1},
-
-                {"matrix": [5, 0], "x": 9.25, "y": 1},
-                {"matrix": [5, 1], "x": 10.25, "y": 1},
-                {"matrix": [5, 2], "x": 11.25, "y": 1},
-                {"matrix": [5, 3], "x": 12.25, "y": 1},
-                {"matrix": [5, 4], "x": 13.5, "y": 1},
-                {"matrix": [5, 5], "x": 14.5, "y": 1},
-                {"matrix": [5, 6], "x": 15.5, "y": 1},
-
-                {"matrix": [2, 1], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 2], "x": 1.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.25, "y": 2},
-                {"matrix": [2, 4], "x": 4.25, "y": 2},
-                {"matrix": [2, 5], "x": 5.25, "y": 2},
-                {"matrix": [2, 6], "x": 6.25, "y": 2},
-
-                {"matrix": [2, 0], "x": 7.75, "y": 2},
-
-                {"matrix": [6, 0], "x": 9.25, "y": 2},
-                {"matrix": [6, 1], "x": 10.25, "y": 2},
-                {"matrix": [6, 2], "x": 11.25, "y": 2},
-                {"matrix": [6, 3], "x": 12.25, "y": 2},
-                {"matrix": [6, 4], "x": 13.75, "y": 2},
-                {"matrix": [6, 5], "x": 14.75, "y": 2},
-                {"matrix": [6, 6], "x": 15.75, "y": 2},
-
-                {"matrix": [3, 1], "x": 0.25, "y": 3, "w": 1.25},
-                {"matrix": [3, 2], "x": 1.5, "y": 3, "w": 1.25},
-                {"matrix": [3, 4], "x": 4.125, "y": 3, "w": 1.25},
-                {"matrix": [3, 5], "x": 5.375, "y": 3, "w": 1.25},
-                {"matrix": [3, 6], "x": 6.625, "y": 3},
-
-                {"matrix": [7, 0], "x": 8.875, "y": 3},
-                {"matrix": [7, 1], "x": 9.875, "y": 3, "w": 1.25},
-                {"matrix": [7, 2], "x": 11.125, "y": 3, "w": 1.25},
-
-                {"matrix": [7, 4], "x": 13.75, "y": 3},
-                {"matrix": [7, 5], "x": 14.75, "y": 3},
-                {"matrix": [7, 6], "x": 15.75, "y": 3}
-            ]
-        }
-    }
-}
diff --git a/keyboards/gl516/n51gl/keyboard.json b/keyboards/gl516/n51gl/keyboard.json
new file mode 100644
index 00000000000..0e54ee52a45
--- /dev/null
+++ b/keyboards/gl516/n51gl/keyboard.json
@@ -0,0 +1,110 @@
+{
+    "keyboard_name": "n51gl",
+    "manufacturer": "Salicylic_Acid",
+    "url": "https://salicylic-acid3.hatenablog.com/",
+    "maintainer": "Salicylic_acid3",
+    "usb": {
+        "vid": "0x04D8",
+        "pid": "0xE8CF",
+        "device_version": "0.0.1"
+    },
+    "rgblight": {
+        "led_count": 15,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": true,
+            "twinkle": true
+        }
+    },
+    "ws2812": {
+        "pin": "D3"
+    },
+    "encoder": {
+        "rotary": [
+            {"pin_a": "D7", "pin_b": "E6", "resolution": 3}
+        ]
+    },
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "rgblight": true,
+        "encoder": true
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0.25, "y": 0},
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+                {"matrix": [0, 5], "x": 5.25, "y": 0},
+                {"matrix": [0, 6], "x": 6.25, "y": 0},
+
+                {"matrix": [4, 0], "x": 9.25, "y": 0},
+                {"matrix": [4, 1], "x": 10.25, "y": 0},
+                {"matrix": [4, 2], "x": 11.25, "y": 0},
+                {"matrix": [4, 3], "x": 12.25, "y": 0},
+                {"matrix": [4, 4], "x": 13.25, "y": 0},
+                {"matrix": [4, 5], "x": 14.25, "y": 0},
+                {"matrix": [4, 6], "x": 15.25, "y": 0},
+
+                {"matrix": [1, 1], "x": 0.25, "y": 1, "w": 1.75},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3.25, "y": 1},
+                {"matrix": [1, 4], "x": 4.25, "y": 1},
+                {"matrix": [1, 5], "x": 5.25, "y": 1},
+                {"matrix": [1, 6], "x": 6.25, "y": 1},
+
+                {"matrix": [5, 0], "x": 9.25, "y": 1},
+                {"matrix": [5, 1], "x": 10.25, "y": 1},
+                {"matrix": [5, 2], "x": 11.25, "y": 1},
+                {"matrix": [5, 3], "x": 12.25, "y": 1},
+                {"matrix": [5, 4], "x": 13.5, "y": 1},
+                {"matrix": [5, 5], "x": 14.5, "y": 1},
+                {"matrix": [5, 6], "x": 15.5, "y": 1},
+
+                {"matrix": [2, 1], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 1.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.25, "y": 2},
+                {"matrix": [2, 4], "x": 4.25, "y": 2},
+                {"matrix": [2, 5], "x": 5.25, "y": 2},
+                {"matrix": [2, 6], "x": 6.25, "y": 2},
+
+                {"matrix": [2, 0], "x": 7.75, "y": 2},
+
+                {"matrix": [6, 0], "x": 9.25, "y": 2},
+                {"matrix": [6, 1], "x": 10.25, "y": 2},
+                {"matrix": [6, 2], "x": 11.25, "y": 2},
+                {"matrix": [6, 3], "x": 12.25, "y": 2},
+                {"matrix": [6, 4], "x": 13.75, "y": 2},
+                {"matrix": [6, 5], "x": 14.75, "y": 2},
+                {"matrix": [6, 6], "x": 15.75, "y": 2},
+
+                {"matrix": [3, 1], "x": 0.25, "y": 3, "w": 1.25},
+                {"matrix": [3, 2], "x": 1.5, "y": 3, "w": 1.25},
+                {"matrix": [3, 4], "x": 4.125, "y": 3, "w": 1.25},
+                {"matrix": [3, 5], "x": 5.375, "y": 3, "w": 1.25},
+                {"matrix": [3, 6], "x": 6.625, "y": 3},
+
+                {"matrix": [7, 0], "x": 8.875, "y": 3},
+                {"matrix": [7, 1], "x": 9.875, "y": 3, "w": 1.25},
+                {"matrix": [7, 2], "x": 11.125, "y": 3, "w": 1.25},
+
+                {"matrix": [7, 4], "x": 13.75, "y": 3},
+                {"matrix": [7, 5], "x": 14.75, "y": 3},
+                {"matrix": [7, 6], "x": 15.75, "y": 3}
+            ]
+        }
+    }
+}
diff --git a/keyboards/gl516/n51gl/rules.mk b/keyboards/gl516/n51gl/rules.mk
index c5b4f3e3764..179d02c3c68 100644
--- a/keyboards/gl516/n51gl/rules.mk
+++ b/keyboards/gl516/n51gl/rules.mk
@@ -1,16 +1,3 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-ENCODER_ENABLE = yes
 CUSTOM_MATRIX = lite
 
-SRC += matrix.c
\ No newline at end of file
+SRC += matrix.c
diff --git a/keyboards/glenpickle/chimera_ergo/info.json b/keyboards/glenpickle/chimera_ergo/info.json
deleted file mode 100644
index ea49dabbca4..00000000000
--- a/keyboards/glenpickle/chimera_ergo/info.json
+++ /dev/null
@@ -1,80 +0,0 @@
-{
-  "keyboard_name": "Chimera Ergo",
-  "manufacturer": "Unknown",
-  "url": "",
-  "maintainer": "qmk",
-  "usb": {
-    "vid": "0xFEED",
-    "pid": "0x6060",
-    "device_version": "0.0.1"
-  },
-  "processor": "atmega32u4",
-  "bootloader": "caterina",
-  "layouts": {
-    "LAYOUT": {
-      "layout": [
-        {"matrix": [1, 0], "x": 0, "y": 1},
-        {"matrix": [0, 5], "x": 1, "y": 0.75},
-        {"matrix": [2, 2], "x": 2, "y": 0.25},
-        {"matrix": [4, 2], "x": 3, "y": 0},
-        {"matrix": [3, 3], "x": 4, "y": 0.25},
-        {"matrix": [3, 4], "x": 5, "y": 0.5},
-
-        {"matrix": [3, 7], "x": 7, "y": 0.5},
-        {"matrix": [3, 8], "x": 8, "y": 0.25},
-        {"matrix": [4, 8], "x": 9, "y": 0},
-        {"matrix": [2, 9], "x": 10, "y": 0.25},
-        {"matrix": [4, 9], "x": 11, "y": 0.75},
-        {"matrix": [1, 11], "x": 12, "y": 1},
-
-        {"matrix": [2, 0], "x": 0, "y": 2},
-        {"matrix": [3, 1], "x": 1, "y": 1.75},
-        {"matrix": [1, 2], "x": 2, "y": 1.25},
-        {"matrix": [0, 3], "x": 3, "y": 1},
-        {"matrix": [1, 4], "x": 4, "y": 1.25},
-        {"matrix": [2, 4], "x": 5, "y": 1.5},
-
-        {"matrix": [2, 7], "x": 7, "y": 1.5},
-        {"matrix": [1, 7], "x": 8, "y": 1.25},
-        {"matrix": [0, 8], "x": 9, "y": 1},
-        {"matrix": [1, 9], "x": 10, "y": 1.25},
-        {"matrix": [3, 10], "x": 11, "y": 1.75},
-        {"matrix": [2, 11], "x": 12, "y": 2},
-
-        {"matrix": [3, 0], "x": 0, "y": 3},
-        {"matrix": [2, 1], "x": 1, "y": 2.75},
-        {"matrix": [0, 2], "x": 2, "y": 2.25},
-        {"matrix": [1, 3], "x": 3, "y": 2},
-        {"matrix": [0, 4], "x": 4, "y": 2.25},
-        {"matrix": [4, 0], "x": 5, "y": 2.5},
-
-        {"matrix": [4, 6], "x": 7, "y": 2.5},
-        {"matrix": [0, 7], "x": 8, "y": 2.25},
-        {"matrix": [1, 8], "x": 9, "y": 2},
-        {"matrix": [0, 9], "x": 10, "y": 2.25},
-        {"matrix": [2, 10], "x": 11, "y": 2.75},
-        {"matrix": [3, 11], "x": 12, "y": 3},
-
-        {"matrix": [1, 5], "x": 0, "y": 4},
-        {"matrix": [4, 4], "x": 1, "y": 3.75},
-        {"matrix": [3, 2], "x": 2, "y": 3.25},
-        {"matrix": [2, 3], "x": 3, "y": 3},
-        {"matrix": [4, 3], "x": 4, "y": 3.25},
-        {"matrix": [4, 1], "x": 5, "y": 3.5},
-
-        {"matrix": [0, 6], "x": 7, "y": 3.5},
-        {"matrix": [4, 7], "x": 8, "y": 3.25},
-        {"matrix": [2, 8], "x": 9, "y": 3},
-        {"matrix": [3, 9], "x": 10, "y": 3.25},
-        {"matrix": [4, 10], "x": 11, "y": 3.75},
-        {"matrix": [1, 6], "x": 12, "y": 4},
-
-        {"matrix": [3, 5], "x": 4, "y": 4.75},
-        {"matrix": [2, 5], "x": 5, "y": 5},
-
-        {"matrix": [2, 6], "x": 7, "y": 5},
-        {"matrix": [3, 6], "x": 8, "y": 4.75}
-      ]
-    }
-  }
-}
diff --git a/keyboards/glenpickle/chimera_ergo/keyboard.json b/keyboards/glenpickle/chimera_ergo/keyboard.json
new file mode 100644
index 00000000000..038498fd10a
--- /dev/null
+++ b/keyboards/glenpickle/chimera_ergo/keyboard.json
@@ -0,0 +1,88 @@
+{
+  "keyboard_name": "Chimera Ergo",
+  "manufacturer": "Unknown",
+  "url": "",
+  "maintainer": "qmk",
+  "usb": {
+    "vid": "0xFEED",
+    "pid": "0x6060",
+    "device_version": "0.0.1"
+  },
+  "processor": "atmega32u4",
+  "bootloader": "caterina",
+  "features": {
+    "bootmagic": false,
+    "mousekey": true,
+    "extrakey": true,
+    "console": true,
+    "command": true,
+    "nkro": true
+  },
+  "layouts": {
+    "LAYOUT": {
+      "layout": [
+        {"matrix": [1, 0], "x": 0, "y": 1},
+        {"matrix": [0, 5], "x": 1, "y": 0.75},
+        {"matrix": [2, 2], "x": 2, "y": 0.25},
+        {"matrix": [4, 2], "x": 3, "y": 0},
+        {"matrix": [3, 3], "x": 4, "y": 0.25},
+        {"matrix": [3, 4], "x": 5, "y": 0.5},
+
+        {"matrix": [3, 7], "x": 7, "y": 0.5},
+        {"matrix": [3, 8], "x": 8, "y": 0.25},
+        {"matrix": [4, 8], "x": 9, "y": 0},
+        {"matrix": [2, 9], "x": 10, "y": 0.25},
+        {"matrix": [4, 9], "x": 11, "y": 0.75},
+        {"matrix": [1, 11], "x": 12, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2},
+        {"matrix": [3, 1], "x": 1, "y": 1.75},
+        {"matrix": [1, 2], "x": 2, "y": 1.25},
+        {"matrix": [0, 3], "x": 3, "y": 1},
+        {"matrix": [1, 4], "x": 4, "y": 1.25},
+        {"matrix": [2, 4], "x": 5, "y": 1.5},
+
+        {"matrix": [2, 7], "x": 7, "y": 1.5},
+        {"matrix": [1, 7], "x": 8, "y": 1.25},
+        {"matrix": [0, 8], "x": 9, "y": 1},
+        {"matrix": [1, 9], "x": 10, "y": 1.25},
+        {"matrix": [3, 10], "x": 11, "y": 1.75},
+        {"matrix": [2, 11], "x": 12, "y": 2},
+
+        {"matrix": [3, 0], "x": 0, "y": 3},
+        {"matrix": [2, 1], "x": 1, "y": 2.75},
+        {"matrix": [0, 2], "x": 2, "y": 2.25},
+        {"matrix": [1, 3], "x": 3, "y": 2},
+        {"matrix": [0, 4], "x": 4, "y": 2.25},
+        {"matrix": [4, 0], "x": 5, "y": 2.5},
+
+        {"matrix": [4, 6], "x": 7, "y": 2.5},
+        {"matrix": [0, 7], "x": 8, "y": 2.25},
+        {"matrix": [1, 8], "x": 9, "y": 2},
+        {"matrix": [0, 9], "x": 10, "y": 2.25},
+        {"matrix": [2, 10], "x": 11, "y": 2.75},
+        {"matrix": [3, 11], "x": 12, "y": 3},
+
+        {"matrix": [1, 5], "x": 0, "y": 4},
+        {"matrix": [4, 4], "x": 1, "y": 3.75},
+        {"matrix": [3, 2], "x": 2, "y": 3.25},
+        {"matrix": [2, 3], "x": 3, "y": 3},
+        {"matrix": [4, 3], "x": 4, "y": 3.25},
+        {"matrix": [4, 1], "x": 5, "y": 3.5},
+
+        {"matrix": [0, 6], "x": 7, "y": 3.5},
+        {"matrix": [4, 7], "x": 8, "y": 3.25},
+        {"matrix": [2, 8], "x": 9, "y": 3},
+        {"matrix": [3, 9], "x": 10, "y": 3.25},
+        {"matrix": [4, 10], "x": 11, "y": 3.75},
+        {"matrix": [1, 6], "x": 12, "y": 4},
+
+        {"matrix": [3, 5], "x": 4, "y": 4.75},
+        {"matrix": [2, 5], "x": 5, "y": 5},
+
+        {"matrix": [2, 6], "x": 7, "y": 5},
+        {"matrix": [3, 6], "x": 8, "y": 4.75}
+      ]
+    }
+  }
+}
diff --git a/keyboards/glenpickle/chimera_ergo/rules.mk b/keyboards/glenpickle/chimera_ergo/rules.mk
index f543b5fd9a2..18d234d62a0 100644
--- a/keyboards/glenpickle/chimera_ergo/rules.mk
+++ b/keyboards/glenpickle/chimera_ergo/rules.mk
@@ -1,15 +1,3 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = yes        # Console for debug
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
 CUSTOM_MATRIX = lite
 
 # project specific files
diff --git a/keyboards/glenpickle/chimera_ls/info.json b/keyboards/glenpickle/chimera_ls/info.json
deleted file mode 100644
index 300b6be928e..00000000000
--- a/keyboards/glenpickle/chimera_ls/info.json
+++ /dev/null
@@ -1,71 +0,0 @@
-{
-  "keyboard_name": "Chimera Lets Split",
-  "manufacturer": "Unknown",
-  "url": "",
-  "maintainer": "qmk",
-  "usb": {
-    "vid": "0xFEED",
-    "pid": "0x6060",
-    "device_version": "0.0.1"
-  },
-  "processor": "atmega32u4",
-  "bootloader": "caterina",
-  "community_layouts": ["ortho_4x12"],
-  "layouts": {
-    "LAYOUT_ortho_4x12": {
-      "layout": [
-        {"matrix": [0, 8], "x": 0, "y": 0},
-        {"matrix": [4, 8], "x": 1, "y": 0},
-        {"matrix": [2, 9], "x": 2, "y": 0},
-        {"matrix": [4, 7], "x": 3, "y": 0},
-        {"matrix": [4, 6], "x": 4, "y": 0},
-        {"matrix": [4, 5], "x": 5, "y": 0},
-        {"matrix": [4, 0], "x": 7, "y": 0},
-        {"matrix": [4, 1], "x": 8, "y": 0},
-        {"matrix": [4, 2], "x": 9, "y": 0},
-        {"matrix": [2, 4], "x": 10, "y": 0},
-        {"matrix": [4, 3], "x": 11, "y": 0},
-        {"matrix": [0, 3], "x": 12, "y": 0},
-
-        {"matrix": [0, 9], "x": 0, "y": 1},
-        {"matrix": [1, 9], "x": 1, "y": 1},
-        {"matrix": [3, 7], "x": 2, "y": 1},
-        {"matrix": [3, 6], "x": 3, "y": 1},
-        {"matrix": [3, 5], "x": 4, "y": 1},
-        {"matrix": [3, 9], "x": 5, "y": 1},
-        {"matrix": [3, 4], "x": 7, "y": 1},
-        {"matrix": [3, 0], "x": 8, "y": 1},
-        {"matrix": [3, 1], "x": 9, "y": 1},
-        {"matrix": [3, 2], "x": 10, "y": 1},
-        {"matrix": [1, 4], "x": 11, "y": 1},
-        {"matrix": [0, 4], "x": 12, "y": 1},
-
-        {"matrix": [1, 8], "x": 0, "y": 2},
-        {"matrix": [0, 7], "x": 1, "y": 2},
-        {"matrix": [2, 7], "x": 2, "y": 2},
-        {"matrix": [2, 6], "x": 3, "y": 2},
-        {"matrix": [1, 5], "x": 4, "y": 2},
-        {"matrix": [2, 5], "x": 5, "y": 2},
-        {"matrix": [2, 0], "x": 7, "y": 2},
-        {"matrix": [1, 0], "x": 8, "y": 2},
-        {"matrix": [2, 1], "x": 9, "y": 2},
-        {"matrix": [2, 2], "x": 10, "y": 2},
-        {"matrix": [0, 2], "x": 11, "y": 2},
-        {"matrix": [1, 3], "x": 12, "y": 2},
-
-        {"matrix": [2, 8], "x": 0, "y": 3},
-        {"matrix": [1, 7], "x": 1, "y": 3},
-        {"matrix": [0, 6], "x": 2, "y": 3},
-        {"matrix": [1, 6], "x": 3, "y": 3},
-        {"matrix": [0, 5], "x": 4, "y": 3},
-        {"matrix": [3, 8], "x": 5, "y": 3},
-        {"matrix": [3, 3], "x": 7, "y": 3},
-        {"matrix": [0, 0], "x": 8, "y": 3},
-        {"matrix": [1, 1], "x": 9, "y": 3},
-        {"matrix": [0, 1], "x": 10, "y": 3},
-        {"matrix": [1, 2], "x": 11, "y": 3},
-        {"matrix": [2, 3], "x": 12, "y": 3}
-      ]
-    }
-  }
-}
diff --git a/keyboards/glenpickle/chimera_ls/keyboard.json b/keyboards/glenpickle/chimera_ls/keyboard.json
new file mode 100644
index 00000000000..b0d6a529124
--- /dev/null
+++ b/keyboards/glenpickle/chimera_ls/keyboard.json
@@ -0,0 +1,79 @@
+{
+  "keyboard_name": "Chimera Lets Split",
+  "manufacturer": "Unknown",
+  "url": "",
+  "maintainer": "qmk",
+  "usb": {
+    "vid": "0xFEED",
+    "pid": "0x6060",
+    "device_version": "0.0.1"
+  },
+  "processor": "atmega32u4",
+  "bootloader": "caterina",
+  "features": {
+    "bootmagic": false,
+    "mousekey": true,
+    "extrakey": true,
+    "console": true,
+    "command": true,
+    "nkro": true
+  },
+  "community_layouts": ["ortho_4x12"],
+  "layouts": {
+    "LAYOUT_ortho_4x12": {
+      "layout": [
+        {"matrix": [0, 8], "x": 0, "y": 0},
+        {"matrix": [4, 8], "x": 1, "y": 0},
+        {"matrix": [2, 9], "x": 2, "y": 0},
+        {"matrix": [4, 7], "x": 3, "y": 0},
+        {"matrix": [4, 6], "x": 4, "y": 0},
+        {"matrix": [4, 5], "x": 5, "y": 0},
+        {"matrix": [4, 0], "x": 7, "y": 0},
+        {"matrix": [4, 1], "x": 8, "y": 0},
+        {"matrix": [4, 2], "x": 9, "y": 0},
+        {"matrix": [2, 4], "x": 10, "y": 0},
+        {"matrix": [4, 3], "x": 11, "y": 0},
+        {"matrix": [0, 3], "x": 12, "y": 0},
+
+        {"matrix": [0, 9], "x": 0, "y": 1},
+        {"matrix": [1, 9], "x": 1, "y": 1},
+        {"matrix": [3, 7], "x": 2, "y": 1},
+        {"matrix": [3, 6], "x": 3, "y": 1},
+        {"matrix": [3, 5], "x": 4, "y": 1},
+        {"matrix": [3, 9], "x": 5, "y": 1},
+        {"matrix": [3, 4], "x": 7, "y": 1},
+        {"matrix": [3, 0], "x": 8, "y": 1},
+        {"matrix": [3, 1], "x": 9, "y": 1},
+        {"matrix": [3, 2], "x": 10, "y": 1},
+        {"matrix": [1, 4], "x": 11, "y": 1},
+        {"matrix": [0, 4], "x": 12, "y": 1},
+
+        {"matrix": [1, 8], "x": 0, "y": 2},
+        {"matrix": [0, 7], "x": 1, "y": 2},
+        {"matrix": [2, 7], "x": 2, "y": 2},
+        {"matrix": [2, 6], "x": 3, "y": 2},
+        {"matrix": [1, 5], "x": 4, "y": 2},
+        {"matrix": [2, 5], "x": 5, "y": 2},
+        {"matrix": [2, 0], "x": 7, "y": 2},
+        {"matrix": [1, 0], "x": 8, "y": 2},
+        {"matrix": [2, 1], "x": 9, "y": 2},
+        {"matrix": [2, 2], "x": 10, "y": 2},
+        {"matrix": [0, 2], "x": 11, "y": 2},
+        {"matrix": [1, 3], "x": 12, "y": 2},
+
+        {"matrix": [2, 8], "x": 0, "y": 3},
+        {"matrix": [1, 7], "x": 1, "y": 3},
+        {"matrix": [0, 6], "x": 2, "y": 3},
+        {"matrix": [1, 6], "x": 3, "y": 3},
+        {"matrix": [0, 5], "x": 4, "y": 3},
+        {"matrix": [3, 8], "x": 5, "y": 3},
+        {"matrix": [3, 3], "x": 7, "y": 3},
+        {"matrix": [0, 0], "x": 8, "y": 3},
+        {"matrix": [1, 1], "x": 9, "y": 3},
+        {"matrix": [0, 1], "x": 10, "y": 3},
+        {"matrix": [1, 2], "x": 11, "y": 3},
+        {"matrix": [2, 3], "x": 12, "y": 3}
+      ]
+    }
+  }
+}
diff --git a/keyboards/glenpickle/chimera_ls/rules.mk b/keyboards/glenpickle/chimera_ls/rules.mk
index 706d6106538..812e3cef929 100644
--- a/keyboards/glenpickle/chimera_ls/rules.mk
+++ b/keyboards/glenpickle/chimera_ls/rules.mk
@@ -1,15 +1,3 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = yes        # Console for debug
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
 CUSTOM_MATRIX = lite
 
 # project specific files
diff --git a/keyboards/glenpickle/chimera_ortho/info.json b/keyboards/glenpickle/chimera_ortho/info.json
deleted file mode 100644
index 4932d2f5a5a..00000000000
--- a/keyboards/glenpickle/chimera_ortho/info.json
+++ /dev/null
@@ -1,71 +0,0 @@
-{
-  "keyboard_name": "Chimera Ortho",
-  "manufacturer": "Unknown",
-  "maintainer": "qmk",
-  "usb": {
-    "vid": "0xFEED",
-    "pid": "0x6060",
-    "device_version": "0.0.1"
-  },
-  "processor": "atmega32u4",
-  "bootloader": "caterina",
-  "layouts": {
-    "LAYOUT": {
-      "layout": [
-        {"matrix": [4, 3], "x": 0, "y": 0},
-        {"matrix": [0, 0], "x": 1, "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": [3, 1], "x": 6, "y": 0},
-
-        {"matrix": [3, 8], "x": 8.5, "y": 0},
-        {"matrix": [0, 5], "x": 9.5, "y": 0},
-        {"matrix": [0, 6], "x": 10.5, "y": 0},
-        {"matrix": [0, 7], "x": 11.5, "y": 0},
-        {"matrix": [0, 8], "x": 12.5, "y": 0},
-        {"matrix": [0, 9], "x": 13.5, "y": 0},
-        {"matrix": [4, 6], "x": 14.5, "y": 0},
-
-        {"matrix": [4, 2], "x": 0, "y": 1},
-        {"matrix": [1, 0], "x": 1, "y": 1},
-        {"matrix": [1, 1], "x": 2, "y": 1},
-        {"matrix": [1, 2], "x": 3, "y": 1},
-        {"matrix": [1, 3], "x": 4, "y": 1},
-        {"matrix": [1, 4], "x": 5, "y": 1},
-        {"matrix": [3, 2], "x": 6, "y": 1},
-
-        {"matrix": [3, 7], "x": 8.5, "y": 1},
-        {"matrix": [1, 5], "x": 9.5, "y": 1},
-        {"matrix": [1, 6], "x": 10.5, "y": 1},
-        {"matrix": [1, 7], "x": 11.5, "y": 1},
-        {"matrix": [1, 8], "x": 12.5, "y": 1},
-        {"matrix": [1, 9], "x": 13.5, "y": 1},
-        {"matrix": [4, 7], "x": 14.5, "y": 1},
-
-        {"matrix": [4, 1], "x": 0, "y": 2},
-        {"matrix": [2, 0], "x": 1, "y": 2},
-        {"matrix": [2, 1], "x": 2, "y": 2},
-        {"matrix": [2, 2], "x": 3, "y": 2},
-        {"matrix": [2, 3], "x": 4, "y": 2},
-        {"matrix": [2, 4], "x": 5, "y": 2},
-        {"matrix": [3, 3], "x": 6, "y": 2},
-
-        {"matrix": [3, 6], "x": 8.5, "y": 2},
-        {"matrix": [2, 5], "x": 9.5, "y": 2},
-        {"matrix": [2, 6], "x": 10.5, "y": 2},
-        {"matrix": [2, 7], "x": 11.5, "y": 2},
-        {"matrix": [2, 8], "x": 12.5, "y": 2},
-        {"matrix": [2, 9], "x": 13.5, "y": 2},
-        {"matrix": [4, 8], "x": 14.5, "y": 2},
-
-        {"matrix": [4, 4], "x": 4, "y": 3.25},
-        {"matrix": [3, 4], "x": 5, "y": 3.25},
-
-        {"matrix": [3, 5], "x": 9.5, "y": 3.25},
-        {"matrix": [4, 5], "x": 10.5, "y": 3.25}
-      ]
-    }
-  }
-}
diff --git a/keyboards/glenpickle/chimera_ortho/keyboard.json b/keyboards/glenpickle/chimera_ortho/keyboard.json
new file mode 100644
index 00000000000..b62616ce689
--- /dev/null
+++ b/keyboards/glenpickle/chimera_ortho/keyboard.json
@@ -0,0 +1,79 @@
+{
+  "keyboard_name": "Chimera Ortho",
+  "manufacturer": "Unknown",
+  "maintainer": "qmk",
+  "usb": {
+    "vid": "0xFEED",
+    "pid": "0x6060",
+    "device_version": "0.0.1"
+  },
+  "processor": "atmega32u4",
+  "bootloader": "caterina",
+  "features": {
+    "bootmagic": false,
+    "mousekey": true,
+    "extrakey": true,
+    "console": true,
+    "command": true,
+    "nkro": true
+  },
+  "layouts": {
+    "LAYOUT": {
+      "layout": [
+        {"matrix": [4, 3], "x": 0, "y": 0},
+        {"matrix": [0, 0], "x": 1, "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": [3, 1], "x": 6, "y": 0},
+
+        {"matrix": [3, 8], "x": 8.5, "y": 0},
+        {"matrix": [0, 5], "x": 9.5, "y": 0},
+        {"matrix": [0, 6], "x": 10.5, "y": 0},
+        {"matrix": [0, 7], "x": 11.5, "y": 0},
+        {"matrix": [0, 8], "x": 12.5, "y": 0},
+        {"matrix": [0, 9], "x": 13.5, "y": 0},
+        {"matrix": [4, 6], "x": 14.5, "y": 0},
+
+        {"matrix": [4, 2], "x": 0, "y": 1},
+        {"matrix": [1, 0], "x": 1, "y": 1},
+        {"matrix": [1, 1], "x": 2, "y": 1},
+        {"matrix": [1, 2], "x": 3, "y": 1},
+        {"matrix": [1, 3], "x": 4, "y": 1},
+        {"matrix": [1, 4], "x": 5, "y": 1},
+        {"matrix": [3, 2], "x": 6, "y": 1},
+
+        {"matrix": [3, 7], "x": 8.5, "y": 1},
+        {"matrix": [1, 5], "x": 9.5, "y": 1},
+        {"matrix": [1, 6], "x": 10.5, "y": 1},
+        {"matrix": [1, 7], "x": 11.5, "y": 1},
+        {"matrix": [1, 8], "x": 12.5, "y": 1},
+        {"matrix": [1, 9], "x": 13.5, "y": 1},
+        {"matrix": [4, 7], "x": 14.5, "y": 1},
+
+        {"matrix": [4, 1], "x": 0, "y": 2},
+        {"matrix": [2, 0], "x": 1, "y": 2},
+        {"matrix": [2, 1], "x": 2, "y": 2},
+        {"matrix": [2, 2], "x": 3, "y": 2},
+        {"matrix": [2, 3], "x": 4, "y": 2},
+        {"matrix": [2, 4], "x": 5, "y": 2},
+        {"matrix": [3, 3], "x": 6, "y": 2},
+
+        {"matrix": [3, 6], "x": 8.5, "y": 2},
+        {"matrix": [2, 5], "x": 9.5, "y": 2},
+        {"matrix": [2, 6], "x": 10.5, "y": 2},
+        {"matrix": [2, 7], "x": 11.5, "y": 2},
+        {"matrix": [2, 8], "x": 12.5, "y": 2},
+        {"matrix": [2, 9], "x": 13.5, "y": 2},
+        {"matrix": [4, 8], "x": 14.5, "y": 2},
+
+        {"matrix": [4, 4], "x": 4, "y": 3.25},
+        {"matrix": [3, 4], "x": 5, "y": 3.25},
+
+        {"matrix": [3, 5], "x": 9.5, "y": 3.25},
+        {"matrix": [4, 5], "x": 10.5, "y": 3.25}
+      ]
+    }
+  }
+}
diff --git a/keyboards/glenpickle/chimera_ortho/rules.mk b/keyboards/glenpickle/chimera_ortho/rules.mk
index f543b5fd9a2..18d234d62a0 100644
--- a/keyboards/glenpickle/chimera_ortho/rules.mk
+++ b/keyboards/glenpickle/chimera_ortho/rules.mk
@@ -1,15 +1,3 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = yes        # Console for debug
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
 CUSTOM_MATRIX = lite
 
 # project specific files
diff --git a/keyboards/glenpickle/chimera_ortho_plus/info.json b/keyboards/glenpickle/chimera_ortho_plus/info.json
deleted file mode 100644
index 39d6c11eb22..00000000000
--- a/keyboards/glenpickle/chimera_ortho_plus/info.json
+++ /dev/null
@@ -1,79 +0,0 @@
-{
-  "keyboard_name": "Chimera Ortho Plus",
-  "manufacturer": "Unknown",
-  "maintainer": "qmk",
-  "usb": {
-    "vid": "0xFEED",
-    "pid": "0xDE1D",
-    "device_version": "0.0.1"
-  },
-  "processor": "atmega32u4",
-  "bootloader": "caterina",
-  "layouts": {
-    "LAYOUT": {
-      "layout": [
-        {"matrix": [1, 0], "x": 0, "y": 0},
-        {"matrix": [0, 5], "x": 1, "y": 0},
-        {"matrix": [2, 2], "x": 2, "y": 0},
-        {"matrix": [0, 0], "x": 3, "y": 0},
-        {"matrix": [3, 3], "x": 4, "y": 0},
-        {"matrix": [3, 4], "x": 5, "y": 0},
-
-        {"matrix": [3, 7], "x": 7.5, "y": 0},
-        {"matrix": [3, 8], "x": 8.5, "y": 0},
-        {"matrix": [0, 10], "x": 9.5, "y": 0},
-        {"matrix": [2, 9], "x": 10.5, "y": 0},
-        {"matrix": [0, 11], "x": 11.5, "y": 0},
-        {"matrix": [1, 11], "x": 12.5, "y": 0},
-
-        {"matrix": [2, 0], "x": 0, "y": 1},
-        {"matrix": [3, 1], "x": 1, "y": 1},
-        {"matrix": [1, 2], "x": 2, "y": 1},
-        {"matrix": [0, 3], "x": 3, "y": 1},
-        {"matrix": [1, 4], "x": 4, "y": 1},
-        {"matrix": [2, 4], "x": 5, "y": 1},
-
-        {"matrix": [2, 7], "x": 7.5, "y": 1},
-        {"matrix": [1, 7], "x": 8.5, "y": 1},
-        {"matrix": [0, 8], "x": 9.5, "y": 1},
-        {"matrix": [1, 9], "x": 10.5, "y": 1},
-        {"matrix": [3, 10], "x": 11.5, "y": 1},
-        {"matrix": [2, 11], "x": 12.5, "y": 1},
-
-        {"matrix": [3, 0], "x": 0, "y": 2},
-        {"matrix": [2, 1], "x": 1, "y": 2},
-        {"matrix": [0, 2], "x": 2, "y": 2},
-        {"matrix": [1, 3], "x": 3, "y": 2},
-        {"matrix": [0, 4], "x": 4, "y": 2},
-        {"matrix": [4, 0], "x": 5, "y": 2},
-
-        {"matrix": [4, 6], "x": 7.5, "y": 2},
-        {"matrix": [0, 7], "x": 8.5, "y": 2},
-        {"matrix": [1, 8], "x": 9.5, "y": 2},
-        {"matrix": [0, 9], "x": 10.5, "y": 2},
-        {"matrix": [2, 10], "x": 11.5, "y": 2},
-        {"matrix": [3, 11], "x": 12.5, "y": 2},
-
-        {"matrix": [1, 5], "x": 0, "y": 3},
-        {"matrix": [1, 1], "x": 1, "y": 3},
-        {"matrix": [3, 2], "x": 2, "y": 3},
-        {"matrix": [2, 3], "x": 3, "y": 3},
-        {"matrix": [0, 1], "x": 4, "y": 3},
-        {"matrix": [4, 1], "x": 5, "y": 3},
-
-        {"matrix": [0, 6], "x": 7.5, "y": 3},
-        {"matrix": [4, 7], "x": 8.5, "y": 3},
-        {"matrix": [2, 8], "x": 9.5, "y": 3},
-        {"matrix": [3, 9], "x": 10.5, "y": 3},
-        {"matrix": [1, 10], "x": 11.5, "y": 3},
-        {"matrix": [1, 6], "x": 12.5, "y": 3},
-
-        {"matrix": [3, 5], "x": 4, "y": 4},
-        {"matrix": [2, 5], "x": 5, "y": 4},
-
-        {"matrix": [2, 6], "x": 7.5, "y": 4},
-        {"matrix": [3, 6], "x": 8.5, "y": 4}
-      ]
-    }
-  }
-}
diff --git a/keyboards/glenpickle/chimera_ortho_plus/keyboard.json b/keyboards/glenpickle/chimera_ortho_plus/keyboard.json
new file mode 100644
index 00000000000..bf0ae445483
--- /dev/null
+++ b/keyboards/glenpickle/chimera_ortho_plus/keyboard.json
@@ -0,0 +1,88 @@
+{
+  "keyboard_name": "Chimera Ortho Plus",
+  "manufacturer": "Unknown",
+  "maintainer": "qmk",
+  "usb": {
+    "vid": "0xFEED",
+    "pid": "0xDE1D",
+    "device_version": "0.0.1"
+  },
+  "processor": "atmega32u4",
+  "bootloader": "caterina",
+  "features": {
+    "bootmagic": false,
+    "mousekey": true,
+    "extrakey": true,
+    "console": true,
+    "command": true,
+    "nkro": true,
+    "unicode": true
+  },
+  "layouts": {
+    "LAYOUT": {
+      "layout": [
+        {"matrix": [1, 0], "x": 0, "y": 0},
+        {"matrix": [0, 5], "x": 1, "y": 0},
+        {"matrix": [2, 2], "x": 2, "y": 0},
+        {"matrix": [0, 0], "x": 3, "y": 0},
+        {"matrix": [3, 3], "x": 4, "y": 0},
+        {"matrix": [3, 4], "x": 5, "y": 0},
+
+        {"matrix": [3, 7], "x": 7.5, "y": 0},
+        {"matrix": [3, 8], "x": 8.5, "y": 0},
+        {"matrix": [0, 10], "x": 9.5, "y": 0},
+        {"matrix": [2, 9], "x": 10.5, "y": 0},
+        {"matrix": [0, 11], "x": 11.5, "y": 0},
+        {"matrix": [1, 11], "x": 12.5, "y": 0},
+
+        {"matrix": [2, 0], "x": 0, "y": 1},
+        {"matrix": [3, 1], "x": 1, "y": 1},
+        {"matrix": [1, 2], "x": 2, "y": 1},
+        {"matrix": [0, 3], "x": 3, "y": 1},
+        {"matrix": [1, 4], "x": 4, "y": 1},
+        {"matrix": [2, 4], "x": 5, "y": 1},
+
+        {"matrix": [2, 7], "x": 7.5, "y": 1},
+        {"matrix": [1, 7], "x": 8.5, "y": 1},
+        {"matrix": [0, 8], "x": 9.5, "y": 1},
+        {"matrix": [1, 9], "x": 10.5, "y": 1},
+        {"matrix": [3, 10], "x": 11.5, "y": 1},
+        {"matrix": [2, 11], "x": 12.5, "y": 1},
+
+        {"matrix": [3, 0], "x": 0, "y": 2},
+        {"matrix": [2, 1], "x": 1, "y": 2},
+        {"matrix": [0, 2], "x": 2, "y": 2},
+        {"matrix": [1, 3], "x": 3, "y": 2},
+        {"matrix": [0, 4], "x": 4, "y": 2},
+        {"matrix": [4, 0], "x": 5, "y": 2},
+
+        {"matrix": [4, 6], "x": 7.5, "y": 2},
+        {"matrix": [0, 7], "x": 8.5, "y": 2},
+        {"matrix": [1, 8], "x": 9.5, "y": 2},
+        {"matrix": [0, 9], "x": 10.5, "y": 2},
+        {"matrix": [2, 10], "x": 11.5, "y": 2},
+        {"matrix": [3, 11], "x": 12.5, "y": 2},
+
+        {"matrix": [1, 5], "x": 0, "y": 3},
+        {"matrix": [1, 1], "x": 1, "y": 3},
+        {"matrix": [3, 2], "x": 2, "y": 3},
+        {"matrix": [2, 3], "x": 3, "y": 3},
+        {"matrix": [0, 1], "x": 4, "y": 3},
+        {"matrix": [4, 1], "x": 5, "y": 3},
+
+        {"matrix": [0, 6], "x": 7.5, "y": 3},
+        {"matrix": [4, 7], "x": 8.5, "y": 3},
+        {"matrix": [2, 8], "x": 9.5, "y": 3},
+        {"matrix": [3, 9], "x": 10.5, "y": 3},
+        {"matrix": [1, 10], "x": 11.5, "y": 3},
+        {"matrix": [1, 6], "x": 12.5, "y": 3},
+
+        {"matrix": [3, 5], "x": 4, "y": 4},
+        {"matrix": [2, 5], "x": 5, "y": 4},
+
+        {"matrix": [2, 6], "x": 7.5, "y": 4},
+        {"matrix": [3, 6], "x": 8.5, "y": 4}
+      ]
+    }
+  }
+}
diff --git a/keyboards/glenpickle/chimera_ortho_plus/rules.mk b/keyboards/glenpickle/chimera_ortho_plus/rules.mk
index 539a2d1004b..18d234d62a0 100644
--- a/keyboards/glenpickle/chimera_ortho_plus/rules.mk
+++ b/keyboards/glenpickle/chimera_ortho_plus/rules.mk
@@ -1,16 +1,3 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = yes        # Console for debug
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-UNICODE_ENABLE = yes
 CUSTOM_MATRIX = lite
 
 # project specific files
diff --git a/keyboards/gmmk/numpad/info.json b/keyboards/gmmk/numpad/info.json
deleted file mode 100644
index 63ae544ad32..00000000000
--- a/keyboards/gmmk/numpad/info.json
+++ /dev/null
@@ -1,106 +0,0 @@
-{
-    "keyboard_name": "GMMK Numpad",
-    "manufacturer": "Glorious",
-    "url": "https://www.gloriousgaming.com/products/gmmk-numpad",
-    "maintainer": "GloriousThrall",
-    "usb": {
-        "vid": "0x320F",
-        "pid": "0x5088",
-        "device_version": "0.0.1"
-    },
-    "eeprom": {
-        "driver": "wear_leveling",
-        "wear_leveling": {
-            "driver": "spi_flash",
-            "backing_size": 2048
-        }
-    },
-    "encoder": {
-        "rotary": [
-            {"pin_a": "A2", "pin_b": "A1"}
-        ]
-    },
-    "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,
-            "rainbow_moving_chevron": true,
-            "cycle_out_in": true,
-            "cycle_out_in_dual": 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_rain": true,
-            "pixel_flow": true,
-            "pixel_fractal": 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": "aw20216s"
-    },
-    "processor": "WB32F3G71",
-    "bootloader": "wb32-dfu",
-    "diode_direction": "ROW2COL",
-    "matrix_pins": {
-        "rows": ["A3", "A4", "A5", "A6", "A7"],
-        "cols": ["B7", "B1", "B10", "B11"]
-    },
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"label": "NUM", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "/", "matrix": [0, 1], "x": 1, "y": 0},
-                {"label": "*", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "-", "matrix": [0, 3], "x": 3, "y": 0},
-
-                {"label": "7", "matrix": [1, 0], "x": 0, "y": 1},
-                {"label": "8", "matrix": [1, 1], "x": 1, "y": 1},
-                {"label": "9", "matrix": [1, 2], "x": 2, "y": 1},
-                {"label": "+", "matrix": [1, 3], "x": 3, "y": 1, "h": 2},
-
-                {"label": "4", "matrix": [2, 0], "x": 0, "y": 2},
-                {"label": "5", "matrix": [2, 1], "x": 1, "y": 2},
-                {"label": "6", "matrix": [2, 2], "x": 2, "y": 2},
-                {"label": "CALC", "matrix": [2, 3], "x": 4.25, "y": 0},
-
-                {"label": "1", "matrix": [3, 0], "x": 0, "y": 3},
-                {"label": "2", "matrix": [3, 1], "x": 1, "y": 3},
-                {"label": "3", "matrix": [3, 2], "x": 2, "y": 3},
-                {"label": "RET", "matrix": [3, 3], "x": 3, "y": 3, "h": 2},
-
-                {"label": "0", "matrix": [4, 0], "x": 0, "y": 4, "w": 2},
-                {"label": ".", "matrix": [4, 3], "x": 2, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/gmmk/numpad/keyboard.json b/keyboards/gmmk/numpad/keyboard.json
new file mode 100644
index 00000000000..70e2d3e6791
--- /dev/null
+++ b/keyboards/gmmk/numpad/keyboard.json
@@ -0,0 +1,121 @@
+{
+    "keyboard_name": "GMMK Numpad",
+    "manufacturer": "Glorious",
+    "url": "https://www.gloriousgaming.com/products/gmmk-numpad",
+    "maintainer": "GloriousThrall",
+    "usb": {
+        "vid": "0x320F",
+        "pid": "0x5088",
+        "device_version": "0.0.1",
+        "shared_endpoint": {
+            "keyboard": true
+        }
+    },
+    "eeprom": {
+        "driver": "wear_leveling",
+        "wear_leveling": {
+            "driver": "spi_flash",
+            "backing_size": 2048
+        }
+    },
+    "encoder": {
+        "rotary": [
+            {"pin_a": "A2", "pin_b": "A1"}
+        ]
+    },
+    "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,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": 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_rain": true,
+            "pixel_flow": true,
+            "pixel_fractal": 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": "aw20216s"
+    },
+    "processor": "WB32F3G71",
+    "bootloader": "wb32-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "nkro": true,
+        "rgb_matrix": true,
+        "encoder": true,
+        "midi": true
+    },
+    "build": {
+        "lto": true
+    },
+    "diode_direction": "ROW2COL",
+    "matrix_pins": {
+        "rows": ["A3", "A4", "A5", "A6", "A7"],
+        "cols": ["B7", "B1", "B10", "B11"]
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"label": "NUM", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "/", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "*", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "-", "matrix": [0, 3], "x": 3, "y": 0},
+
+                {"label": "7", "matrix": [1, 0], "x": 0, "y": 1},
+                {"label": "8", "matrix": [1, 1], "x": 1, "y": 1},
+                {"label": "9", "matrix": [1, 2], "x": 2, "y": 1},
+                {"label": "+", "matrix": [1, 3], "x": 3, "y": 1, "h": 2},
+
+                {"label": "4", "matrix": [2, 0], "x": 0, "y": 2},
+                {"label": "5", "matrix": [2, 1], "x": 1, "y": 2},
+                {"label": "6", "matrix": [2, 2], "x": 2, "y": 2},
+                {"label": "CALC", "matrix": [2, 3], "x": 4.25, "y": 0},
+
+                {"label": "1", "matrix": [3, 0], "x": 0, "y": 3},
+                {"label": "2", "matrix": [3, 1], "x": 1, "y": 3},
+                {"label": "3", "matrix": [3, 2], "x": 2, "y": 3},
+                {"label": "RET", "matrix": [3, 3], "x": 3, "y": 3, "h": 2},
+
+                {"label": "0", "matrix": [4, 0], "x": 0, "y": 4, "w": 2},
+                {"label": ".", "matrix": [4, 3], "x": 2, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/gmmk/numpad/rules.mk b/keyboards/gmmk/numpad/rules.mk
index d289eb81a4d..752b0ce9d0b 100644
--- a/keyboards/gmmk/numpad/rules.mk
+++ b/keyboards/gmmk/numpad/rules.mk
@@ -1,23 +1,3 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-ENCODER_ENABLE = yes
-KEYBOARD_SHARED_EP = yes
-MIDI_ENABLE = yes
-
-RGB_MATRIX_ENABLE = yes
-
-LTO_ENABLE = yes
-
 ANALOG_DRIVER_REQUIRED = yes
 
 SRC += matrix.c
diff --git a/keyboards/gon/nerd60/info.json b/keyboards/gon/nerd60/info.json
deleted file mode 100644
index 38152a32e6c..00000000000
--- a/keyboards/gon/nerd60/info.json
+++ /dev/null
@@ -1,381 +0,0 @@
-{
-    "keyboard_name": "NerD 60",
-    "manufacturer": "GON",
-    "url": "",
-    "maintainer": "qmk",
-    "usb": {
-        "vid": "0x4E45",
-        "pid": "0x3630",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["E6", "B0", "B1", "B2", "B3", "F0", "D0", "D5"],
-        "rows": ["B4", "E2", "F4", "F7", "F1", "F6", "C6", "F5", "D7", "C7"]
-    },
-    "diode_direction": "COL2ROW",
-    "backlight": {
-        "pin": "B7"
-    },
-    "bootmagic": {
-        "matrix": [8, 0]
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "community_layouts": ["60_ansi", "60_ansi_split_bs_rshift", "60_iso", "60_iso_split_bs_rshift"],
-    "layouts": {
-        "LAYOUT_all": {
-            "layout": [
-                {"matrix": [8, 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, 7], "x": 13, "y": 0},
-                {"matrix": [1, 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": [4, 1], "x": 1.75, "y": 2},
-                {"matrix": [5, 1], "x": 2.75, "y": 2},
-                {"matrix": [4, 2], "x": 3.75, "y": 2},
-                {"matrix": [5, 2], "x": 4.75, "y": 2},
-                {"matrix": [4, 3], "x": 5.75, "y": 2},
-                {"matrix": [5, 3], "x": 6.75, "y": 2},
-                {"matrix": [4, 4], "x": 7.75, "y": 2},
-                {"matrix": [5, 4], "x": 8.75, "y": 2},
-                {"matrix": [4, 5], "x": 9.75, "y": 2},
-                {"matrix": [5, 5], "x": 10.75, "y": 2},
-                {"matrix": [4, 6], "x": 11.75, "y": 2},
-                {"matrix": [5, 6], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"matrix": [7, 0], "x": 0, "y": 3, "w": 1.25},
-                {"matrix": [9, 7], "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": [6, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [5, 0], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [8, 7], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [0, 7], "x": 3.75, "y": 4, "w": 6.25},
-                {"matrix": [2, 7], "x": 10, "y": 4, "w": 1.25},
-                {"matrix": [3, 7], "x": 11.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 7], "x": 12.5, "y": 4, "w": 1.25},
-                {"matrix": [5, 7], "x": 13.75, "y": 4, "w": 1.25}
-            ]
-        },
-        "LAYOUT_60_ansi": {
-            "layout": [
-                {"matrix": [8, 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": [4, 1], "x": 1.75, "y": 2},
-                {"matrix": [5, 1], "x": 2.75, "y": 2},
-                {"matrix": [4, 2], "x": 3.75, "y": 2},
-                {"matrix": [5, 2], "x": 4.75, "y": 2},
-                {"matrix": [4, 3], "x": 5.75, "y": 2},
-                {"matrix": [5, 3], "x": 6.75, "y": 2},
-                {"matrix": [4, 4], "x": 7.75, "y": 2},
-                {"matrix": [5, 4], "x": 8.75, "y": 2},
-                {"matrix": [4, 5], "x": 9.75, "y": 2},
-                {"matrix": [5, 5], "x": 10.75, "y": 2},
-                {"matrix": [4, 6], "x": 11.75, "y": 2},
-                {"matrix": [5, 6], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"matrix": [7, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [6, 1], "x": 2.25, "y": 3},
-                {"matrix": [7, 1], "x": 3.25, "y": 3},
-                {"matrix": [6, 2], "x": 4.25, "y": 3},
-                {"matrix": [7, 2], "x": 5.25, "y": 3},
-                {"matrix": [6, 3], "x": 6.25, "y": 3},
-                {"matrix": [7, 3], "x": 7.25, "y": 3},
-                {"matrix": [6, 4], "x": 8.25, "y": 3},
-                {"matrix": [7, 4], "x": 9.25, "y": 3},
-                {"matrix": [6, 5], "x": 10.25, "y": 3},
-                {"matrix": [7, 5], "x": 11.25, "y": 3},
-                {"matrix": [6, 6], "x": 12.25, "y": 3, "w": 2.75},
-
-                {"matrix": [6, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [5, 0], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [8, 7], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [0, 7], "x": 3.75, "y": 4, "w": 6.25},
-                {"matrix": [2, 7], "x": 10, "y": 4, "w": 1.25},
-                {"matrix": [3, 7], "x": 11.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 7], "x": 12.5, "y": 4, "w": 1.25},
-                {"matrix": [5, 7], "x": 13.75, "y": 4, "w": 1.25}
-            ]
-        },
-        "LAYOUT_60_ansi_split_bs_rshift": {
-            "layout": [
-                {"matrix": [8, 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, 7], "x": 13, "y": 0},
-                {"matrix": [1, 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": [4, 1], "x": 1.75, "y": 2},
-                {"matrix": [5, 1], "x": 2.75, "y": 2},
-                {"matrix": [4, 2], "x": 3.75, "y": 2},
-                {"matrix": [5, 2], "x": 4.75, "y": 2},
-                {"matrix": [4, 3], "x": 5.75, "y": 2},
-                {"matrix": [5, 3], "x": 6.75, "y": 2},
-                {"matrix": [4, 4], "x": 7.75, "y": 2},
-                {"matrix": [5, 4], "x": 8.75, "y": 2},
-                {"matrix": [4, 5], "x": 9.75, "y": 2},
-                {"matrix": [5, 5], "x": 10.75, "y": 2},
-                {"matrix": [4, 6], "x": 11.75, "y": 2},
-                {"matrix": [5, 6], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"matrix": [7, 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": [6, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [5, 0], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [8, 7], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [0, 7], "x": 3.75, "y": 4, "w": 6.25},
-                {"matrix": [2, 7], "x": 10, "y": 4, "w": 1.25},
-                {"matrix": [3, 7], "x": 11.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 7], "x": 12.5, "y": 4, "w": 1.25},
-                {"matrix": [5, 7], "x": 13.75, "y": 4, "w": 1.25}
-            ]
-        },
-        "LAYOUT_60_iso": {
-            "layout": [
-                {"matrix": [8, 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": [4, 1], "x": 1.75, "y": 2},
-                {"matrix": [5, 1], "x": 2.75, "y": 2},
-                {"matrix": [4, 2], "x": 3.75, "y": 2},
-                {"matrix": [5, 2], "x": 4.75, "y": 2},
-                {"matrix": [4, 3], "x": 5.75, "y": 2},
-                {"matrix": [5, 3], "x": 6.75, "y": 2},
-                {"matrix": [4, 4], "x": 7.75, "y": 2},
-                {"matrix": [5, 4], "x": 8.75, "y": 2},
-                {"matrix": [4, 5], "x": 9.75, "y": 2},
-                {"matrix": [5, 5], "x": 10.75, "y": 2},
-                {"matrix": [4, 6], "x": 11.75, "y": 2},
-                {"matrix": [3, 6], "x": 12.75, "y": 2},
-                {"matrix": [5, 6], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
-
-                {"matrix": [7, 0], "x": 0, "y": 3, "w": 1.25},
-                {"matrix": [9, 7], "x": 1.25, "y": 3},
-                {"matrix": [6, 1], "x": 2.25, "y": 3},
-                {"matrix": [7, 1], "x": 3.25, "y": 3},
-                {"matrix": [6, 2], "x": 4.25, "y": 3},
-                {"matrix": [7, 2], "x": 5.25, "y": 3},
-                {"matrix": [6, 3], "x": 6.25, "y": 3},
-                {"matrix": [7, 3], "x": 7.25, "y": 3},
-                {"matrix": [6, 4], "x": 8.25, "y": 3},
-                {"matrix": [7, 4], "x": 9.25, "y": 3},
-                {"matrix": [6, 5], "x": 10.25, "y": 3},
-                {"matrix": [7, 5], "x": 11.25, "y": 3},
-                {"matrix": [6, 6], "x": 12.25, "y": 3, "w": 2.75},
-
-                {"matrix": [6, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [5, 0], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [8, 7], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [0, 7], "x": 3.75, "y": 4, "w": 6.25},
-                {"matrix": [2, 7], "x": 10, "y": 4, "w": 1.25},
-                {"matrix": [3, 7], "x": 11.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 7], "x": 12.5, "y": 4, "w": 1.25},
-                {"matrix": [5, 7], "x": 13.75, "y": 4, "w": 1.25}
-            ]
-        },
-        "LAYOUT_60_iso_split_bs_rshift": {
-            "layout": [
-                {"matrix": [8, 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, 7], "x": 13, "y": 0},
-                {"matrix": [1, 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": [4, 1], "x": 1.75, "y": 2},
-                {"matrix": [5, 1], "x": 2.75, "y": 2},
-                {"matrix": [4, 2], "x": 3.75, "y": 2},
-                {"matrix": [5, 2], "x": 4.75, "y": 2},
-                {"matrix": [4, 3], "x": 5.75, "y": 2},
-                {"matrix": [5, 3], "x": 6.75, "y": 2},
-                {"matrix": [4, 4], "x": 7.75, "y": 2},
-                {"matrix": [5, 4], "x": 8.75, "y": 2},
-                {"matrix": [4, 5], "x": 9.75, "y": 2},
-                {"matrix": [5, 5], "x": 10.75, "y": 2},
-                {"matrix": [4, 6], "x": 11.75, "y": 2},
-                {"matrix": [3, 6], "x": 12.75, "y": 2},
-                {"matrix": [5, 6], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
-
-                {"matrix": [7, 0], "x": 0, "y": 3, "w": 1.25},
-                {"matrix": [9, 7], "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": [6, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [5, 0], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [8, 7], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [0, 7], "x": 3.75, "y": 4, "w": 6.25},
-                {"matrix": [2, 7], "x": 10, "y": 4, "w": 1.25},
-                {"matrix": [3, 7], "x": 11.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 7], "x": 12.5, "y": 4, "w": 1.25},
-                {"matrix": [5, 7], "x": 13.75, "y": 4, "w": 1.25}
-            ]
-        }
-    }
-}
diff --git a/keyboards/gon/nerd60/keyboard.json b/keyboards/gon/nerd60/keyboard.json
new file mode 100644
index 00000000000..33ad716b4fd
--- /dev/null
+++ b/keyboards/gon/nerd60/keyboard.json
@@ -0,0 +1,388 @@
+{
+    "keyboard_name": "NerD 60",
+    "manufacturer": "GON",
+    "url": "",
+    "maintainer": "qmk",
+    "usb": {
+        "vid": "0x4E45",
+        "pid": "0x3630",
+        "device_version": "0.0.1"
+    },
+    "matrix_pins": {
+        "cols": ["E6", "B0", "B1", "B2", "B3", "F0", "D0", "D5"],
+        "rows": ["B4", "E2", "F4", "F7", "F1", "F6", "C6", "F5", "D7", "C7"]
+    },
+    "diode_direction": "COL2ROW",
+    "backlight": {
+        "pin": "B7"
+    },
+    "bootmagic": {
+        "matrix": [8, 0]
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": false,
+        "mousekey": true,
+        "extrakey": true,
+        "command": true,
+        "nkro": true
+    },
+    "community_layouts": ["60_ansi", "60_ansi_split_bs_rshift", "60_iso", "60_iso_split_bs_rshift"],
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                {"matrix": [8, 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, 7], "x": 13, "y": 0},
+                {"matrix": [1, 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": [4, 1], "x": 1.75, "y": 2},
+                {"matrix": [5, 1], "x": 2.75, "y": 2},
+                {"matrix": [4, 2], "x": 3.75, "y": 2},
+                {"matrix": [5, 2], "x": 4.75, "y": 2},
+                {"matrix": [4, 3], "x": 5.75, "y": 2},
+                {"matrix": [5, 3], "x": 6.75, "y": 2},
+                {"matrix": [4, 4], "x": 7.75, "y": 2},
+                {"matrix": [5, 4], "x": 8.75, "y": 2},
+                {"matrix": [4, 5], "x": 9.75, "y": 2},
+                {"matrix": [5, 5], "x": 10.75, "y": 2},
+                {"matrix": [4, 6], "x": 11.75, "y": 2},
+                {"matrix": [5, 6], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [7, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [9, 7], "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": [6, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [5, 0], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [8, 7], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [0, 7], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [2, 7], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [3, 7], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 7], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [5, 7], "x": 13.75, "y": 4, "w": 1.25}
+            ]
+        },
+        "LAYOUT_60_ansi": {
+            "layout": [
+                {"matrix": [8, 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": [4, 1], "x": 1.75, "y": 2},
+                {"matrix": [5, 1], "x": 2.75, "y": 2},
+                {"matrix": [4, 2], "x": 3.75, "y": 2},
+                {"matrix": [5, 2], "x": 4.75, "y": 2},
+                {"matrix": [4, 3], "x": 5.75, "y": 2},
+                {"matrix": [5, 3], "x": 6.75, "y": 2},
+                {"matrix": [4, 4], "x": 7.75, "y": 2},
+                {"matrix": [5, 4], "x": 8.75, "y": 2},
+                {"matrix": [4, 5], "x": 9.75, "y": 2},
+                {"matrix": [5, 5], "x": 10.75, "y": 2},
+                {"matrix": [4, 6], "x": 11.75, "y": 2},
+                {"matrix": [5, 6], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [7, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [6, 1], "x": 2.25, "y": 3},
+                {"matrix": [7, 1], "x": 3.25, "y": 3},
+                {"matrix": [6, 2], "x": 4.25, "y": 3},
+                {"matrix": [7, 2], "x": 5.25, "y": 3},
+                {"matrix": [6, 3], "x": 6.25, "y": 3},
+                {"matrix": [7, 3], "x": 7.25, "y": 3},
+                {"matrix": [6, 4], "x": 8.25, "y": 3},
+                {"matrix": [7, 4], "x": 9.25, "y": 3},
+                {"matrix": [6, 5], "x": 10.25, "y": 3},
+                {"matrix": [7, 5], "x": 11.25, "y": 3},
+                {"matrix": [6, 6], "x": 12.25, "y": 3, "w": 2.75},
+
+                {"matrix": [6, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [5, 0], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [8, 7], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [0, 7], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [2, 7], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [3, 7], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 7], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [5, 7], "x": 13.75, "y": 4, "w": 1.25}
+            ]
+        },
+        "LAYOUT_60_ansi_split_bs_rshift": {
+            "layout": [
+                {"matrix": [8, 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, 7], "x": 13, "y": 0},
+                {"matrix": [1, 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": [4, 1], "x": 1.75, "y": 2},
+                {"matrix": [5, 1], "x": 2.75, "y": 2},
+                {"matrix": [4, 2], "x": 3.75, "y": 2},
+                {"matrix": [5, 2], "x": 4.75, "y": 2},
+                {"matrix": [4, 3], "x": 5.75, "y": 2},
+                {"matrix": [5, 3], "x": 6.75, "y": 2},
+                {"matrix": [4, 4], "x": 7.75, "y": 2},
+                {"matrix": [5, 4], "x": 8.75, "y": 2},
+                {"matrix": [4, 5], "x": 9.75, "y": 2},
+                {"matrix": [5, 5], "x": 10.75, "y": 2},
+                {"matrix": [4, 6], "x": 11.75, "y": 2},
+                {"matrix": [5, 6], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [7, 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": [6, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [5, 0], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [8, 7], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [0, 7], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [2, 7], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [3, 7], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 7], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [5, 7], "x": 13.75, "y": 4, "w": 1.25}
+            ]
+        },
+        "LAYOUT_60_iso": {
+            "layout": [
+                {"matrix": [8, 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": [4, 1], "x": 1.75, "y": 2},
+                {"matrix": [5, 1], "x": 2.75, "y": 2},
+                {"matrix": [4, 2], "x": 3.75, "y": 2},
+                {"matrix": [5, 2], "x": 4.75, "y": 2},
+                {"matrix": [4, 3], "x": 5.75, "y": 2},
+                {"matrix": [5, 3], "x": 6.75, "y": 2},
+                {"matrix": [4, 4], "x": 7.75, "y": 2},
+                {"matrix": [5, 4], "x": 8.75, "y": 2},
+                {"matrix": [4, 5], "x": 9.75, "y": 2},
+                {"matrix": [5, 5], "x": 10.75, "y": 2},
+                {"matrix": [4, 6], "x": 11.75, "y": 2},
+                {"matrix": [3, 6], "x": 12.75, "y": 2},
+                {"matrix": [5, 6], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+                {"matrix": [7, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [9, 7], "x": 1.25, "y": 3},
+                {"matrix": [6, 1], "x": 2.25, "y": 3},
+                {"matrix": [7, 1], "x": 3.25, "y": 3},
+                {"matrix": [6, 2], "x": 4.25, "y": 3},
+                {"matrix": [7, 2], "x": 5.25, "y": 3},
+                {"matrix": [6, 3], "x": 6.25, "y": 3},
+                {"matrix": [7, 3], "x": 7.25, "y": 3},
+                {"matrix": [6, 4], "x": 8.25, "y": 3},
+                {"matrix": [7, 4], "x": 9.25, "y": 3},
+                {"matrix": [6, 5], "x": 10.25, "y": 3},
+                {"matrix": [7, 5], "x": 11.25, "y": 3},
+                {"matrix": [6, 6], "x": 12.25, "y": 3, "w": 2.75},
+
+                {"matrix": [6, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [5, 0], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [8, 7], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [0, 7], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [2, 7], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [3, 7], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 7], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [5, 7], "x": 13.75, "y": 4, "w": 1.25}
+            ]
+        },
+        "LAYOUT_60_iso_split_bs_rshift": {
+            "layout": [
+                {"matrix": [8, 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, 7], "x": 13, "y": 0},
+                {"matrix": [1, 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": [4, 1], "x": 1.75, "y": 2},
+                {"matrix": [5, 1], "x": 2.75, "y": 2},
+                {"matrix": [4, 2], "x": 3.75, "y": 2},
+                {"matrix": [5, 2], "x": 4.75, "y": 2},
+                {"matrix": [4, 3], "x": 5.75, "y": 2},
+                {"matrix": [5, 3], "x": 6.75, "y": 2},
+                {"matrix": [4, 4], "x": 7.75, "y": 2},
+                {"matrix": [5, 4], "x": 8.75, "y": 2},
+                {"matrix": [4, 5], "x": 9.75, "y": 2},
+                {"matrix": [5, 5], "x": 10.75, "y": 2},
+                {"matrix": [4, 6], "x": 11.75, "y": 2},
+                {"matrix": [3, 6], "x": 12.75, "y": 2},
+                {"matrix": [5, 6], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+                {"matrix": [7, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [9, 7], "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": [6, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [5, 0], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [8, 7], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [0, 7], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [2, 7], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [3, 7], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 7], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [5, 7], "x": 13.75, "y": 4, "w": 1.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/gon/nerd60/rules.mk b/keyboards/gon/nerd60/rules.mk
index e0782ddcb51..3437a35bdf1 100644
--- a/keyboards/gon/nerd60/rules.mk
+++ b/keyboards/gon/nerd60/rules.mk
@@ -1,15 +1,2 @@
 # Processor frequency
 F_CPU = 8000000
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
diff --git a/keyboards/gon/nerdtkl/info.json b/keyboards/gon/nerdtkl/info.json
deleted file mode 100644
index 103c856bf0b..00000000000
--- a/keyboards/gon/nerdtkl/info.json
+++ /dev/null
@@ -1,133 +0,0 @@
-{
-    "keyboard_name": "NerD TKL",
-    "manufacturer": "GON",
-    "url": "",
-    "maintainer": "qmk",
-    "usb": {
-        "vid": "0x4E45",
-        "pid": "0x5244",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["E6", "B0", "B1", "B2", "B3", "F0", "D0", "D5", "D1"],
-        "rows": ["B4", "E2", "F4", "F7", "F1", "F6", "C6", "F5", "D7", "C7"]
-    },
-    "diode_direction": "COL2ROW",
-    "backlight": {
-        "pin": "B7"
-    },
-    "bootmagic": {
-        "matrix": [8, 0]
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "layouts": {
-        "LAYOUT_tkl": {
-            "layout": [
-                {"matrix": [8, 0], "x": 0, "y": 0},
-
-                {"matrix": [9, 0], "x": 2, "y": 0},
-                {"matrix": [8, 1], "x": 3, "y": 0},
-                {"matrix": [9, 1], "x": 4, "y": 0},
-                {"matrix": [8, 2], "x": 5, "y": 0},
-
-                {"matrix": [9, 2], "x": 6.5, "y": 0},
-                {"matrix": [8, 3], "x": 7.5, "y": 0},
-                {"matrix": [9, 3], "x": 8.5, "y": 0},
-                {"matrix": [8, 4], "x": 9.5, "y": 0},
-
-                {"matrix": [9, 4], "x": 11, "y": 0},
-                {"matrix": [8, 5], "x": 12, "y": 0},
-                {"matrix": [9, 5], "x": 13, "y": 0},
-                {"matrix": [8, 6], "x": 14, "y": 0},
-
-                {"matrix": [9, 6], "x": 15.25, "y": 0},
-                {"matrix": [8, 8], "x": 16.25, "y": 0},
-                {"matrix": [9, 8], "x": 17.25, "y": 0},
-
-                {"matrix": [0, 0], "x": 0, "y": 1.25},
-                {"matrix": [1, 0], "x": 1, "y": 1.25},
-                {"matrix": [0, 1], "x": 2, "y": 1.25},
-                {"matrix": [1, 1], "x": 3, "y": 1.25},
-                {"matrix": [0, 2], "x": 4, "y": 1.25},
-                {"matrix": [1, 2], "x": 5, "y": 1.25},
-                {"matrix": [0, 3], "x": 6, "y": 1.25},
-                {"matrix": [1, 3], "x": 7, "y": 1.25},
-                {"matrix": [0, 4], "x": 8, "y": 1.25},
-                {"matrix": [1, 4], "x": 9, "y": 1.25},
-                {"matrix": [0, 5], "x": 10, "y": 1.25},
-                {"matrix": [1, 5], "x": 11, "y": 1.25},
-                {"matrix": [0, 6], "x": 12, "y": 1.25},
-                {"matrix": [1, 6], "x": 13, "y": 1.25, "w": 2},
-
-                {"matrix": [0, 8], "x": 15.25, "y": 1.25},
-                {"matrix": [1, 8], "x": 16.25, "y": 1.25},
-                {"matrix": [4, 8], "x": 17.25, "y": 1.25},
-
-                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
-                {"matrix": [3, 0], "x": 1.5, "y": 2.25},
-                {"matrix": [2, 1], "x": 2.5, "y": 2.25},
-                {"matrix": [3, 1], "x": 3.5, "y": 2.25},
-                {"matrix": [2, 2], "x": 4.5, "y": 2.25},
-                {"matrix": [3, 2], "x": 5.5, "y": 2.25},
-                {"matrix": [2, 3], "x": 6.5, "y": 2.25},
-                {"matrix": [3, 3], "x": 7.5, "y": 2.25},
-                {"matrix": [2, 4], "x": 8.5, "y": 2.25},
-                {"matrix": [3, 4], "x": 9.5, "y": 2.25},
-                {"matrix": [2, 5], "x": 10.5, "y": 2.25},
-                {"matrix": [3, 5], "x": 11.5, "y": 2.25},
-                {"matrix": [2, 6], "x": 12.5, "y": 2.25},
-                {"matrix": [3, 6], "x": 13.5, "y": 2.25, "w": 1.5},
-
-                {"matrix": [2, 8], "x": 15.25, "y": 2.25},
-                {"matrix": [3, 8], "x": 16.25, "y": 2.25},
-                {"matrix": [5, 8], "x": 17.25, "y": 2.25},
-
-                {"matrix": [4, 0], "x": 0, "y": 3.25, "w": 1.75},
-                {"matrix": [4, 1], "x": 1.75, "y": 3.25},
-                {"matrix": [5, 1], "x": 2.75, "y": 3.25},
-                {"matrix": [4, 2], "x": 3.75, "y": 3.25},
-                {"matrix": [5, 2], "x": 4.75, "y": 3.25},
-                {"matrix": [4, 3], "x": 5.75, "y": 3.25},
-                {"matrix": [5, 3], "x": 6.75, "y": 3.25},
-                {"matrix": [4, 4], "x": 7.75, "y": 3.25},
-                {"matrix": [5, 4], "x": 8.75, "y": 3.25},
-                {"matrix": [4, 5], "x": 9.75, "y": 3.25},
-                {"matrix": [5, 5], "x": 10.75, "y": 3.25},
-                {"matrix": [4, 6], "x": 11.75, "y": 3.25},
-                {"matrix": [1, 7], "x": 12.75, "y": 3.25},
-                {"matrix": [5, 6], "x": 13.75, "y": 3.25, "w": 1.25},
-
-                {"matrix": [7, 0], "x": 0, "y": 4.25, "w": 1.25},
-                {"matrix": [9, 7], "x": 1.25, "y": 4.25},
-                {"matrix": [6, 1], "x": 2.25, "y": 4.25},
-                {"matrix": [7, 1], "x": 3.25, "y": 4.25},
-                {"matrix": [6, 2], "x": 4.25, "y": 4.25},
-                {"matrix": [7, 2], "x": 5.25, "y": 4.25},
-                {"matrix": [6, 3], "x": 6.25, "y": 4.25},
-                {"matrix": [7, 3], "x": 7.25, "y": 4.25},
-                {"matrix": [6, 4], "x": 8.25, "y": 4.25},
-                {"matrix": [7, 4], "x": 9.25, "y": 4.25},
-                {"matrix": [6, 5], "x": 10.25, "y": 4.25},
-                {"matrix": [7, 5], "x": 11.25, "y": 4.25},
-                {"matrix": [6, 6], "x": 12.25, "y": 4.25, "w": 1.75},
-                {"matrix": [7, 6], "x": 14, "y": 4.25},
-
-                {"matrix": [6, 8], "x": 16.25, "y": 4.25},
-
-                {"matrix": [6, 0], "x": 0, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 0], "x": 1.25, "y": 5.25, "w": 1.25},
-                {"matrix": [8, 7], "x": 2.5, "y": 5.25, "w": 1.25},
-                {"matrix": [0, 7], "x": 3.75, "y": 5.25, "w": 6.25},
-                {"matrix": [2, 7], "x": 10, "y": 5.25, "w": 1.25},
-                {"matrix": [3, 7], "x": 11.25, "y": 5.25, "w": 1.25},
-                {"matrix": [4, 7], "x": 12.5, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 7], "x": 13.75, "y": 5.25, "w": 1.25},
-
-                {"matrix": [6, 7], "x": 15.25, "y": 5.25},
-                {"matrix": [7, 7], "x": 16.25, "y": 5.25},
-                {"matrix": [7, 8], "x": 17.25, "y": 5.25}
-            ]
-        }
-    }
-}
diff --git a/keyboards/gon/nerdtkl/keyboard.json b/keyboards/gon/nerdtkl/keyboard.json
new file mode 100644
index 00000000000..301cbaf19f1
--- /dev/null
+++ b/keyboards/gon/nerdtkl/keyboard.json
@@ -0,0 +1,140 @@
+{
+    "keyboard_name": "NerD TKL",
+    "manufacturer": "GON",
+    "url": "",
+    "maintainer": "qmk",
+    "usb": {
+        "vid": "0x4E45",
+        "pid": "0x5244",
+        "device_version": "0.0.1"
+    },
+    "matrix_pins": {
+        "cols": ["E6", "B0", "B1", "B2", "B3", "F0", "D0", "D5", "D1"],
+        "rows": ["B4", "E2", "F4", "F7", "F1", "F6", "C6", "F5", "D7", "C7"]
+    },
+    "diode_direction": "COL2ROW",
+    "backlight": {
+        "pin": "B7"
+    },
+    "bootmagic": {
+        "matrix": [8, 0]
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": false,
+        "mousekey": true,
+        "extrakey": true,
+        "command": true,
+        "nkro": true
+    },
+    "layouts": {
+        "LAYOUT_tkl": {
+            "layout": [
+                {"matrix": [8, 0], "x": 0, "y": 0},
+
+                {"matrix": [9, 0], "x": 2, "y": 0},
+                {"matrix": [8, 1], "x": 3, "y": 0},
+                {"matrix": [9, 1], "x": 4, "y": 0},
+                {"matrix": [8, 2], "x": 5, "y": 0},
+
+                {"matrix": [9, 2], "x": 6.5, "y": 0},
+                {"matrix": [8, 3], "x": 7.5, "y": 0},
+                {"matrix": [9, 3], "x": 8.5, "y": 0},
+                {"matrix": [8, 4], "x": 9.5, "y": 0},
+
+                {"matrix": [9, 4], "x": 11, "y": 0},
+                {"matrix": [8, 5], "x": 12, "y": 0},
+                {"matrix": [9, 5], "x": 13, "y": 0},
+                {"matrix": [8, 6], "x": 14, "y": 0},
+
+                {"matrix": [9, 6], "x": 15.25, "y": 0},
+                {"matrix": [8, 8], "x": 16.25, "y": 0},
+                {"matrix": [9, 8], "x": 17.25, "y": 0},
+
+                {"matrix": [0, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 0], "x": 1, "y": 1.25},
+                {"matrix": [0, 1], "x": 2, "y": 1.25},
+                {"matrix": [1, 1], "x": 3, "y": 1.25},
+                {"matrix": [0, 2], "x": 4, "y": 1.25},
+                {"matrix": [1, 2], "x": 5, "y": 1.25},
+                {"matrix": [0, 3], "x": 6, "y": 1.25},
+                {"matrix": [1, 3], "x": 7, "y": 1.25},
+                {"matrix": [0, 4], "x": 8, "y": 1.25},
+                {"matrix": [1, 4], "x": 9, "y": 1.25},
+                {"matrix": [0, 5], "x": 10, "y": 1.25},
+                {"matrix": [1, 5], "x": 11, "y": 1.25},
+                {"matrix": [0, 6], "x": 12, "y": 1.25},
+                {"matrix": [1, 6], "x": 13, "y": 1.25, "w": 2},
+
+                {"matrix": [0, 8], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 8], "x": 16.25, "y": 1.25},
+                {"matrix": [4, 8], "x": 17.25, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [3, 0], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 1], "x": 2.5, "y": 2.25},
+                {"matrix": [3, 1], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 4.5, "y": 2.25},
+                {"matrix": [3, 2], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 6.5, "y": 2.25},
+                {"matrix": [3, 3], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 8.5, "y": 2.25},
+                {"matrix": [3, 4], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 10.5, "y": 2.25},
+                {"matrix": [3, 5], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 12.5, "y": 2.25},
+                {"matrix": [3, 6], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [2, 8], "x": 15.25, "y": 2.25},
+                {"matrix": [3, 8], "x": 16.25, "y": 2.25},
+                {"matrix": [5, 8], "x": 17.25, "y": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [4, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [5, 1], "x": 2.75, "y": 3.25},
+                {"matrix": [4, 2], "x": 3.75, "y": 3.25},
+                {"matrix": [5, 2], "x": 4.75, "y": 3.25},
+                {"matrix": [4, 3], "x": 5.75, "y": 3.25},
+                {"matrix": [5, 3], "x": 6.75, "y": 3.25},
+                {"matrix": [4, 4], "x": 7.75, "y": 3.25},
+                {"matrix": [5, 4], "x": 8.75, "y": 3.25},
+                {"matrix": [4, 5], "x": 9.75, "y": 3.25},
+                {"matrix": [5, 5], "x": 10.75, "y": 3.25},
+                {"matrix": [4, 6], "x": 11.75, "y": 3.25},
+                {"matrix": [1, 7], "x": 12.75, "y": 3.25},
+                {"matrix": [5, 6], "x": 13.75, "y": 3.25, "w": 1.25},
+
+                {"matrix": [7, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [9, 7], "x": 1.25, "y": 4.25},
+                {"matrix": [6, 1], "x": 2.25, "y": 4.25},
+                {"matrix": [7, 1], "x": 3.25, "y": 4.25},
+                {"matrix": [6, 2], "x": 4.25, "y": 4.25},
+                {"matrix": [7, 2], "x": 5.25, "y": 4.25},
+                {"matrix": [6, 3], "x": 6.25, "y": 4.25},
+                {"matrix": [7, 3], "x": 7.25, "y": 4.25},
+                {"matrix": [6, 4], "x": 8.25, "y": 4.25},
+                {"matrix": [7, 4], "x": 9.25, "y": 4.25},
+                {"matrix": [6, 5], "x": 10.25, "y": 4.25},
+                {"matrix": [7, 5], "x": 11.25, "y": 4.25},
+                {"matrix": [6, 6], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"matrix": [7, 6], "x": 14, "y": 4.25},
+
+                {"matrix": [6, 8], "x": 16.25, "y": 4.25},
+
+                {"matrix": [6, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 0], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [8, 7], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [0, 7], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [2, 7], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [3, 7], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [4, 7], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 7], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"matrix": [6, 7], "x": 15.25, "y": 5.25},
+                {"matrix": [7, 7], "x": 16.25, "y": 5.25},
+                {"matrix": [7, 8], "x": 17.25, "y": 5.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/gon/nerdtkl/rules.mk b/keyboards/gon/nerdtkl/rules.mk
index e0782ddcb51..3437a35bdf1 100644
--- a/keyboards/gon/nerdtkl/rules.mk
+++ b/keyboards/gon/nerdtkl/rules.mk
@@ -1,15 +1,2 @@
 # Processor frequency
 F_CPU = 8000000
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
diff --git a/keyboards/gopolar/gg86/info.json b/keyboards/gopolar/gg86/info.json
deleted file mode 100644
index 13669a85420..00000000000
--- a/keyboards/gopolar/gg86/info.json
+++ /dev/null
@@ -1,381 +0,0 @@
-{
-    "keyboard_name": "GG86 Tai-Chi",
-    "manufacturer": "Gopolar",
-    "url": "",
-    "maintainer": "Gopolar",
-    "usb": {
-        "vid": "0x0007",
-        "pid": "0x0007",
-        "device_version": "0.0.1",
-        "force_nkro": true
-    },
-    "ws2812": {
-        "pin": "E2"
-    },
-    "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,
-            "rainbow_moving_chevron": true,
-            "cycle_out_in": true,
-            "cycle_out_in_dual": 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_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",
-        "max_brightness": 150
-    },
-    "matrix_pins": {
-        "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "C7", "E6", "D2", "D3"],
-        "rows": ["B0", "B1", "B2", "B3", "B7", "D5"]
-    },
-    "diode_direction": "COL2ROW",
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "layouts": {
-        "LAYOUT_all": {
-            "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.5},
-                {"matrix": [1, 1], "x": 1, "y": 1.5},
-                {"matrix": [1, 2], "x": 2, "y": 1.5},
-                {"matrix": [1, 3], "x": 3, "y": 1.5},
-                {"matrix": [1, 4], "x": 4, "y": 1.5},
-                {"matrix": [1, 5], "x": 5, "y": 1.5},
-                {"matrix": [1, 6], "x": 6, "y": 1.5},
-                {"matrix": [1, 7], "x": 7, "y": 1.5},
-                {"matrix": [1, 8], "x": 8, "y": 1.5},
-                {"matrix": [1, 9], "x": 9, "y": 1.5},
-                {"matrix": [1, 10], "x": 10, "y": 1.5},
-                {"matrix": [1, 11], "x": 11, "y": 1.5},
-                {"matrix": [1, 12], "x": 12, "y": 1.5},
-                {"matrix": [1, 13], "x": 13, "y": 1.5, "w": 2},
-
-                {"matrix": [1, 14], "x": 15.25, "y": 1.5},
-                {"matrix": [1, 15], "x": 16.25, "y": 1.5},
-                {"matrix": [1, 16], "x": 17.25, "y": 1.5},
-
-                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
-                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
-                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
-                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
-                {"matrix": [2, 4], "x": 4.5, "y": 2.5},
-                {"matrix": [2, 5], "x": 5.5, "y": 2.5},
-                {"matrix": [2, 6], "x": 6.5, "y": 2.5},
-                {"matrix": [2, 7], "x": 7.5, "y": 2.5},
-                {"matrix": [2, 8], "x": 8.5, "y": 2.5},
-                {"matrix": [2, 9], "x": 9.5, "y": 2.5},
-                {"matrix": [2, 10], "x": 10.5, "y": 2.5},
-                {"matrix": [2, 11], "x": 11.5, "y": 2.5},
-                {"matrix": [2, 12], "x": 12.5, "y": 2.5},
-                {"matrix": [2, 13], "x": 13.5, "y": 2.5, "w": 1.5},
-
-                {"matrix": [2, 14], "x": 15.25, "y": 2.5},
-                {"matrix": [2, 15], "x": 16.25, "y": 2.5},
-                {"matrix": [2, 16], "x": 17.25, "y": 2.5},
-
-                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
-                {"matrix": [3, 1], "x": 1.75, "y": 3.5},
-                {"matrix": [3, 2], "x": 2.75, "y": 3.5},
-                {"matrix": [3, 3], "x": 3.75, "y": 3.5},
-                {"matrix": [3, 4], "x": 4.75, "y": 3.5},
-                {"matrix": [3, 5], "x": 5.75, "y": 3.5},
-                {"matrix": [3, 6], "x": 6.75, "y": 3.5},
-                {"matrix": [3, 7], "x": 7.75, "y": 3.5},
-                {"matrix": [3, 8], "x": 8.75, "y": 3.5},
-                {"matrix": [3, 9], "x": 9.75, "y": 3.5},
-                {"matrix": [3, 10], "x": 10.75, "y": 3.5},
-                {"matrix": [3, 11], "x": 11.75, "y": 3.5},
-                {"matrix": [3, 13], "x": 12.75, "y": 3.5, "w": 2.25},
-
-                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4.5},
-                {"matrix": [4, 2], "x": 2.25, "y": 4.5},
-                {"matrix": [4, 3], "x": 3.25, "y": 4.5},
-                {"matrix": [4, 4], "x": 4.25, "y": 4.5},
-                {"matrix": [4, 5], "x": 5.25, "y": 4.5},
-                {"matrix": [4, 6], "x": 6.25, "y": 4.5},
-                {"matrix": [4, 7], "x": 7.25, "y": 4.5},
-                {"matrix": [4, 8], "x": 8.25, "y": 4.5},
-                {"matrix": [4, 9], "x": 9.25, "y": 4.5},
-                {"matrix": [4, 10], "x": 10.25, "y": 4.5},
-                {"matrix": [4, 11], "x": 11.25, "y": 4.5},
-                {"matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 1.75},
-                {"matrix": [4, 13], "x": 14, "y": 4.5},
-
-                {"matrix": [4, 15], "x": 16.25, "y": 4.5},
-
-                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.5},
-                {"matrix": [5, 1], "x": 1.5, "y": 5.5},
-                {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.5},
-                {"matrix": [5, 5], "x": 4, "y": 5.5, "w": 7},
-                {"matrix": [5, 10], "x": 11, "y": 5.5, "w": 1.5},
-                {"matrix": [5, 11], "x": 12.5, "y": 5.5},
-                {"matrix": [5, 12], "x": 13.5, "y": 5.5, "w": 1.5},
-
-                {"matrix": [5, 14], "x": 15.25, "y": 5.5},
-                {"matrix": [5, 15], "x": 16.25, "y": 5.5},
-                {"matrix": [5, 16], "x": 17.25, "y": 5.5}
-            ]
-        },
-        "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.5},
-                {"matrix": [1, 1], "x": 1, "y": 1.5},
-                {"matrix": [1, 2], "x": 2, "y": 1.5},
-                {"matrix": [1, 3], "x": 3, "y": 1.5},
-                {"matrix": [1, 4], "x": 4, "y": 1.5},
-                {"matrix": [1, 5], "x": 5, "y": 1.5},
-                {"matrix": [1, 6], "x": 6, "y": 1.5},
-                {"matrix": [1, 7], "x": 7, "y": 1.5},
-                {"matrix": [1, 8], "x": 8, "y": 1.5},
-                {"matrix": [1, 9], "x": 9, "y": 1.5},
-                {"matrix": [1, 10], "x": 10, "y": 1.5},
-                {"matrix": [1, 11], "x": 11, "y": 1.5},
-                {"matrix": [1, 12], "x": 12, "y": 1.5},
-                {"matrix": [1, 13], "x": 13, "y": 1.5, "w": 2},
-
-                {"matrix": [1, 14], "x": 15.25, "y": 1.5},
-                {"matrix": [1, 15], "x": 16.25, "y": 1.5},
-                {"matrix": [1, 16], "x": 17.25, "y": 1.5},
-
-                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
-                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
-                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
-                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
-                {"matrix": [2, 4], "x": 4.5, "y": 2.5},
-                {"matrix": [2, 5], "x": 5.5, "y": 2.5},
-                {"matrix": [2, 6], "x": 6.5, "y": 2.5},
-                {"matrix": [2, 7], "x": 7.5, "y": 2.5},
-                {"matrix": [2, 8], "x": 8.5, "y": 2.5},
-                {"matrix": [2, 9], "x": 9.5, "y": 2.5},
-                {"matrix": [2, 10], "x": 10.5, "y": 2.5},
-                {"matrix": [2, 11], "x": 11.5, "y": 2.5},
-                {"matrix": [2, 12], "x": 12.5, "y": 2.5},
-                {"matrix": [2, 13], "x": 13.5, "y": 2.5, "w": 1.5},
-
-                {"matrix": [2, 14], "x": 15.25, "y": 2.5},
-                {"matrix": [2, 15], "x": 16.25, "y": 2.5},
-                {"matrix": [2, 16], "x": 17.25, "y": 2.5},
-
-                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
-                {"matrix": [3, 1], "x": 1.75, "y": 3.5},
-                {"matrix": [3, 2], "x": 2.75, "y": 3.5},
-                {"matrix": [3, 3], "x": 3.75, "y": 3.5},
-                {"matrix": [3, 4], "x": 4.75, "y": 3.5},
-                {"matrix": [3, 5], "x": 5.75, "y": 3.5},
-                {"matrix": [3, 6], "x": 6.75, "y": 3.5},
-                {"matrix": [3, 7], "x": 7.75, "y": 3.5},
-                {"matrix": [3, 8], "x": 8.75, "y": 3.5},
-                {"matrix": [3, 9], "x": 9.75, "y": 3.5},
-                {"matrix": [3, 10], "x": 10.75, "y": 3.5},
-                {"matrix": [3, 11], "x": 11.75, "y": 3.5},
-                {"matrix": [3, 13], "x": 12.75, "y": 3.5, "w": 2.25},
-
-                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
-                {"matrix": [4, 2], "x": 2.25, "y": 4.5},
-                {"matrix": [4, 3], "x": 3.25, "y": 4.5},
-                {"matrix": [4, 4], "x": 4.25, "y": 4.5},
-                {"matrix": [4, 5], "x": 5.25, "y": 4.5},
-                {"matrix": [4, 6], "x": 6.25, "y": 4.5},
-                {"matrix": [4, 7], "x": 7.25, "y": 4.5},
-                {"matrix": [4, 8], "x": 8.25, "y": 4.5},
-                {"matrix": [4, 9], "x": 9.25, "y": 4.5},
-                {"matrix": [4, 10], "x": 10.25, "y": 4.5},
-                {"matrix": [4, 11], "x": 11.25, "y": 4.5},
-                {"matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 2.75},
-
-                {"matrix": [4, 15], "x": 16.25, "y": 4.5},
-
-                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.5},
-                {"matrix": [5, 1], "x": 1.5, "y": 5.5},
-                {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.5},
-                {"matrix": [5, 5], "x": 4, "y": 5.5, "w": 7},
-                {"matrix": [5, 10], "x": 11, "y": 5.5, "w": 1.5},
-                {"matrix": [5, 11], "x": 12.5, "y": 5.5},
-                {"matrix": [5, 12], "x": 13.5, "y": 5.5, "w": 1.5},
-
-                {"matrix": [5, 14], "x": 15.25, "y": 5.5},
-                {"matrix": [5, 15], "x": 16.25, "y": 5.5},
-                {"matrix": [5, 16], "x": 17.25, "y": 5.5}
-            ]
-        },
-        "LAYOUT_tkl_iso_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.5},
-                {"matrix": [1, 1], "x": 1, "y": 1.5},
-                {"matrix": [1, 2], "x": 2, "y": 1.5},
-                {"matrix": [1, 3], "x": 3, "y": 1.5},
-                {"matrix": [1, 4], "x": 4, "y": 1.5},
-                {"matrix": [1, 5], "x": 5, "y": 1.5},
-                {"matrix": [1, 6], "x": 6, "y": 1.5},
-                {"matrix": [1, 7], "x": 7, "y": 1.5},
-                {"matrix": [1, 8], "x": 8, "y": 1.5},
-                {"matrix": [1, 9], "x": 9, "y": 1.5},
-                {"matrix": [1, 10], "x": 10, "y": 1.5},
-                {"matrix": [1, 11], "x": 11, "y": 1.5},
-                {"matrix": [1, 12], "x": 12, "y": 1.5},
-                {"matrix": [1, 13], "x": 13, "y": 1.5, "w": 2},
-
-                {"matrix": [1, 14], "x": 15.25, "y": 1.5},
-                {"matrix": [1, 15], "x": 16.25, "y": 1.5},
-                {"matrix": [1, 16], "x": 17.25, "y": 1.5},
-
-                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
-                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
-                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
-                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
-                {"matrix": [2, 4], "x": 4.5, "y": 2.5},
-                {"matrix": [2, 5], "x": 5.5, "y": 2.5},
-                {"matrix": [2, 6], "x": 6.5, "y": 2.5},
-                {"matrix": [2, 7], "x": 7.5, "y": 2.5},
-                {"matrix": [2, 8], "x": 8.5, "y": 2.5},
-                {"matrix": [2, 9], "x": 9.5, "y": 2.5},
-                {"matrix": [2, 10], "x": 10.5, "y": 2.5},
-                {"matrix": [2, 11], "x": 11.5, "y": 2.5},
-                {"matrix": [2, 12], "x": 12.5, "y": 2.5},
-
-                {"matrix": [2, 14], "x": 15.25, "y": 2.5},
-                {"matrix": [2, 15], "x": 16.25, "y": 2.5},
-                {"matrix": [2, 16], "x": 17.25, "y": 2.5},
-
-                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
-                {"matrix": [3, 1], "x": 1.75, "y": 3.5},
-                {"matrix": [3, 2], "x": 2.75, "y": 3.5},
-                {"matrix": [3, 3], "x": 3.75, "y": 3.5},
-                {"matrix": [3, 4], "x": 4.75, "y": 3.5},
-                {"matrix": [3, 5], "x": 5.75, "y": 3.5},
-                {"matrix": [3, 6], "x": 6.75, "y": 3.5},
-                {"matrix": [3, 7], "x": 7.75, "y": 3.5},
-                {"matrix": [3, 8], "x": 8.75, "y": 3.5},
-                {"matrix": [3, 9], "x": 9.75, "y": 3.5},
-                {"matrix": [3, 10], "x": 10.75, "y": 3.5},
-                {"matrix": [3, 11], "x": 11.75, "y": 3.5},
-                {"matrix": [2, 13], "x": 12.75, "y": 3.5},
-                {"matrix": [3, 13], "x": 13.75, "y": 2.5, "w": 1.25, "h": 2},
-
-                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4.5},
-                {"matrix": [4, 2], "x": 2.25, "y": 4.5},
-                {"matrix": [4, 3], "x": 3.25, "y": 4.5},
-                {"matrix": [4, 4], "x": 4.25, "y": 4.5},
-                {"matrix": [4, 5], "x": 5.25, "y": 4.5},
-                {"matrix": [4, 6], "x": 6.25, "y": 4.5},
-                {"matrix": [4, 7], "x": 7.25, "y": 4.5},
-                {"matrix": [4, 8], "x": 8.25, "y": 4.5},
-                {"matrix": [4, 9], "x": 9.25, "y": 4.5},
-                {"matrix": [4, 10], "x": 10.25, "y": 4.5},
-                {"matrix": [4, 11], "x": 11.25, "y": 4.5},
-                {"matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 2.75},
-
-                {"matrix": [4, 15], "x": 16.25, "y": 4.5},
-
-                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.5},
-                {"matrix": [5, 1], "x": 1.5, "y": 5.5},
-                {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.5},
-                {"matrix": [5, 5], "x": 4, "y": 5.5, "w": 7},
-                {"matrix": [5, 10], "x": 11, "y": 5.5, "w": 1.5},
-                {"matrix": [5, 11], "x": 12.5, "y": 5.5},
-                {"matrix": [5, 12], "x": 13.5, "y": 5.5, "w": 1.5},
-
-                {"matrix": [5, 14], "x": 15.25, "y": 5.5},
-                {"matrix": [5, 15], "x": 16.25, "y": 5.5},
-                {"matrix": [5, 16], "x": 17.25, "y": 5.5}
-            ]
-        }
-    }
-}
diff --git a/keyboards/gopolar/gg86/keyboard.json b/keyboards/gopolar/gg86/keyboard.json
new file mode 100644
index 00000000000..b704582aa6c
--- /dev/null
+++ b/keyboards/gopolar/gg86/keyboard.json
@@ -0,0 +1,393 @@
+{
+    "keyboard_name": "GG86 Tai-Chi",
+    "manufacturer": "Gopolar",
+    "url": "",
+    "maintainer": "Gopolar",
+    "usb": {
+        "vid": "0x0007",
+        "pid": "0x0007",
+        "device_version": "0.0.1",
+        "force_nkro": true,
+        "no_startup_check": true
+    },
+    "ws2812": {
+        "pin": "E2"
+    },
+    "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,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": 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_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",
+        "max_brightness": 150
+    },
+    "matrix_pins": {
+        "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "C7", "E6", "D2", "D3"],
+        "rows": ["B0", "B1", "B2", "B3", "B7", "D5"]
+    },
+    "diode_direction": "COL2ROW",
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": false,
+        "extrakey": true,
+        "nkro": true,
+        "rgb_matrix": true,
+        "oled": true
+    },
+    "build": {
+        "lto": true
+    },
+    "layouts": {
+        "LAYOUT_all": {
+            "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.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1.5},
+                {"matrix": [1, 4], "x": 4, "y": 1.5},
+                {"matrix": [1, 5], "x": 5, "y": 1.5},
+                {"matrix": [1, 6], "x": 6, "y": 1.5},
+                {"matrix": [1, 7], "x": 7, "y": 1.5},
+                {"matrix": [1, 8], "x": 8, "y": 1.5},
+                {"matrix": [1, 9], "x": 9, "y": 1.5},
+                {"matrix": [1, 10], "x": 10, "y": 1.5},
+                {"matrix": [1, 11], "x": 11, "y": 1.5},
+                {"matrix": [1, 12], "x": 12, "y": 1.5},
+                {"matrix": [1, 13], "x": 13, "y": 1.5, "w": 2},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1.5},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.5},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.5},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.5},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.5},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.5, "w": 1.5},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 2.5},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.5},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.5},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.5, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.5},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.5},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.5},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.5},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.5},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.5},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.5},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.5},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.5},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.5},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.5},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 1.75},
+                {"matrix": [4, 13], "x": 14, "y": 4.5},
+
+                {"matrix": [4, 15], "x": 16.25, "y": 4.5},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 1], "x": 1.5, "y": 5.5},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 5], "x": 4, "y": 5.5, "w": 7},
+                {"matrix": [5, 10], "x": 11, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 11], "x": 12.5, "y": 5.5},
+                {"matrix": [5, 12], "x": 13.5, "y": 5.5, "w": 1.5},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.5},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.5},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.5}
+            ]
+        },
+        "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.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1.5},
+                {"matrix": [1, 4], "x": 4, "y": 1.5},
+                {"matrix": [1, 5], "x": 5, "y": 1.5},
+                {"matrix": [1, 6], "x": 6, "y": 1.5},
+                {"matrix": [1, 7], "x": 7, "y": 1.5},
+                {"matrix": [1, 8], "x": 8, "y": 1.5},
+                {"matrix": [1, 9], "x": 9, "y": 1.5},
+                {"matrix": [1, 10], "x": 10, "y": 1.5},
+                {"matrix": [1, 11], "x": 11, "y": 1.5},
+                {"matrix": [1, 12], "x": 12, "y": 1.5},
+                {"matrix": [1, 13], "x": 13, "y": 1.5, "w": 2},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1.5},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.5},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.5},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.5},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.5},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.5, "w": 1.5},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 2.5},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.5},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.5},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.5, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.5},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.5},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.5},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.5},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.5},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.5},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.5},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.5},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.5},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.5},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 2.75},
+
+                {"matrix": [4, 15], "x": 16.25, "y": 4.5},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 1], "x": 1.5, "y": 5.5},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 5], "x": 4, "y": 5.5, "w": 7},
+                {"matrix": [5, 10], "x": 11, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 11], "x": 12.5, "y": 5.5},
+                {"matrix": [5, 12], "x": 13.5, "y": 5.5, "w": 1.5},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.5},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.5},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.5}
+            ]
+        },
+        "LAYOUT_tkl_iso_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.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1.5},
+                {"matrix": [1, 4], "x": 4, "y": 1.5},
+                {"matrix": [1, 5], "x": 5, "y": 1.5},
+                {"matrix": [1, 6], "x": 6, "y": 1.5},
+                {"matrix": [1, 7], "x": 7, "y": 1.5},
+                {"matrix": [1, 8], "x": 8, "y": 1.5},
+                {"matrix": [1, 9], "x": 9, "y": 1.5},
+                {"matrix": [1, 10], "x": 10, "y": 1.5},
+                {"matrix": [1, 11], "x": 11, "y": 1.5},
+                {"matrix": [1, 12], "x": 12, "y": 1.5},
+                {"matrix": [1, 13], "x": 13, "y": 1.5, "w": 2},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1.5},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.5},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.5},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.5},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.5},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 2.5},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.5},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.5},
+                {"matrix": [2, 13], "x": 12.75, "y": 3.5},
+                {"matrix": [3, 13], "x": 13.75, "y": 2.5, "w": 1.25, "h": 2},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.5},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.5},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.5},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.5},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.5},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.5},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.5},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.5},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.5},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.5},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.5},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 2.75},
+
+                {"matrix": [4, 15], "x": 16.25, "y": 4.5},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 1], "x": 1.5, "y": 5.5},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 5], "x": 4, "y": 5.5, "w": 7},
+                {"matrix": [5, 10], "x": 11, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 11], "x": 12.5, "y": 5.5},
+                {"matrix": [5, 12], "x": 13.5, "y": 5.5, "w": 1.5},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.5},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.5},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/gopolar/gg86/rules.mk b/keyboards/gopolar/gg86/rules.mk
index acdf49b47da..7b380ccdfbe 100644
--- a/keyboards/gopolar/gg86/rules.mk
+++ b/keyboards/gopolar/gg86/rules.mk
@@ -1,24 +1 @@
 SRC += lib/logo.c
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
-# Additional thing to reduce compiled size
-LTO_ENABLE = yes
-NO_USB_STARTUP_CHECK = yes
-
-# RGB Matrix enabled
-RGB_MATRIX_ENABLE = yes
-
-# OLED enabled
-OLED_ENABLE = yes
diff --git a/keyboards/gray_studio/cod67/info.json b/keyboards/gray_studio/cod67/info.json
deleted file mode 100644
index 653885f963e..00000000000
--- a/keyboards/gray_studio/cod67/info.json
+++ /dev/null
@@ -1,124 +0,0 @@
-{
-  "keyboard_name": "COD67",
-  "manufacturer": "Graystudio",
-  "url": "",
-  "maintainer": "qmk",
-  "usb": {
-    "vid": "0x4753",
-    "pid": "0x1000",
-    "device_version": "0.0.1"
-  },
-  "rgblight": {
-    "saturation_steps": 8,
-    "brightness_steps": 8,
-    "led_count": 20,
-    "sleep": true,
-    "animations": {
-      "breathing": true,
-      "rainbow_mood": true,
-      "rainbow_swirl": true,
-      "snake": true,
-      "knight": true,
-      "christmas": true,
-      "static_gradient": true,
-      "rgb_test": true,
-      "alternating": true,
-      "twinkle": true
-    }
-  },
-  "ws2812": {
-    "pin": "B2"
-  },
-  "matrix_pins": {
-    "cols": ["D7", "F7", "F6", "F5", "F4", "F1", "F0", "E6", "B0", "B7", "D0", "D1", "D2", "D3"],
-    "rows": ["C7", "C6", "B6", "B5", "B4"]
-  },
-  "diode_direction": "COL2ROW",
-  "backlight": {
-    "driver": "timer",
-    "pin": "D4",
-    "on_state": 0
-  },
-  "processor": "atmega32u4",
-  "bootloader": "lufa-ms",
-  "layouts": {
-    "LAYOUT": {
-      "layout": [
-        {"matrix": [0, 0], "x": 0, "y": 0},
-        {"matrix": [0, 1], "x": 1, "y": 0},
-        {"matrix": [0, 2], "x": 2, "y": 0},
-        {"matrix": [0, 3], "x": 3, "y": 0},
-        {"matrix": [0, 4], "x": 4, "y": 0},
-        {"matrix": [0, 5], "x": 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": [4, 8], "x": 13, "y": 0, "w": 2},
-
-        {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-        {"matrix": [1, 1], "x": 1.5, "y": 1},
-        {"matrix": [1, 2], "x": 2.5, "y": 1},
-        {"matrix": [1, 3], "x": 3.5, "y": 1},
-        {"matrix": [1, 4], "x": 4.5, "y": 1},
-        {"matrix": [1, 5], "x": 5.5, "y": 1},
-        {"matrix": [1, 6], "x": 6.5, "y": 1},
-        {"matrix": [1, 7], "x": 7.5, "y": 1},
-        {"matrix": [1, 8], "x": 8.5, "y": 1},
-        {"matrix": [1, 9], "x": 9.5, "y": 1},
-        {"matrix": [1, 10], "x": 10.5, "y": 1},
-        {"matrix": [1, 11], "x": 11.5, "y": 1},
-        {"matrix": [1, 12], "x": 12.5, "y": 1},
-        {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
-        {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-        {"matrix": [2, 1], "x": 1.75, "y": 2},
-        {"matrix": [2, 2], "x": 2.75, "y": 2},
-        {"matrix": [2, 3], "x": 3.75, "y": 2},
-        {"matrix": [2, 4], "x": 4.75, "y": 2},
-        {"matrix": [2, 5], "x": 5.75, "y": 2},
-        {"matrix": [2, 6], "x": 6.75, "y": 2},
-        {"matrix": [2, 7], "x": 7.75, "y": 2},
-        {"matrix": [2, 8], "x": 8.75, "y": 2},
-        {"matrix": [2, 9], "x": 9.75, "y": 2},
-        {"matrix": [2, 10], "x": 10.75, "y": 2},
-        {"matrix": [2, 11], "x": 11.75, "y": 2},
-        {"matrix": [2, 12], "x": 12.75, "y": 2},
-        {"matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.25},
-
-        {"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, "w": 1.75},
-        {"matrix": [3, 12], "x": 13, "y": 3},
-        {"matrix": [3, 13], "x": 14, "y": 3},
-
-        {"matrix": [4, 0], "x": 0, "y": 4},
-        {"matrix": [4, 1], "x": 1, "y": 4},
-        {"matrix": [4, 2], "x": 2, "y": 4},
-        {"matrix": [4, 3], "x": 3, "y": 4},
-        {"matrix": [4, 4], "x": 4, "y": 4},
-        {"matrix": [4, 5], "x": 5, "y": 4},
-        {"matrix": [4, 6], "x": 6, "y": 4, "w": 2},
-        {"matrix": [4, 7], "x": 8, "y": 4},
-        {"matrix": [0, 13], "x": 9, "y": 4},
-        {"matrix": [4, 9], "x": 10, "y": 4},
-        {"matrix": [4, 10], "x": 11, "y": 4},
-        {"matrix": [4, 11], "x": 12, "y": 4},
-        {"matrix": [4, 12], "x": 13, "y": 4},
-        {"matrix": [4, 13], "x": 14, "y": 4}
-      ]
-    }
-  }
-}
diff --git a/keyboards/gray_studio/cod67/keyboard.json b/keyboards/gray_studio/cod67/keyboard.json
new file mode 100644
index 00000000000..e3687ce9591
--- /dev/null
+++ b/keyboards/gray_studio/cod67/keyboard.json
@@ -0,0 +1,132 @@
+{
+  "keyboard_name": "COD67",
+  "manufacturer": "Graystudio",
+  "url": "",
+  "maintainer": "qmk",
+  "usb": {
+    "vid": "0x4753",
+    "pid": "0x1000",
+    "device_version": "0.0.1"
+  },
+  "rgblight": {
+    "saturation_steps": 8,
+    "brightness_steps": 8,
+    "led_count": 20,
+    "sleep": true,
+    "animations": {
+      "breathing": true,
+      "rainbow_mood": true,
+      "rainbow_swirl": true,
+      "snake": true,
+      "knight": true,
+      "christmas": true,
+      "static_gradient": true,
+      "rgb_test": true,
+      "alternating": true,
+      "twinkle": true
+    }
+  },
+  "ws2812": {
+    "pin": "B2"
+  },
+  "matrix_pins": {
+    "cols": ["D7", "F7", "F6", "F5", "F4", "F1", "F0", "E6", "B0", "B7", "D0", "D1", "D2", "D3"],
+    "rows": ["C7", "C6", "B6", "B5", "B4"]
+  },
+  "diode_direction": "COL2ROW",
+  "backlight": {
+    "driver": "timer",
+    "pin": "D4",
+    "on_state": 0
+  },
+  "processor": "atmega32u4",
+  "bootloader": "lufa-ms",
+  "features": {
+    "bootmagic": false,
+    "mousekey": true,
+    "extrakey": true,
+    "command": true,
+    "backlight": true,
+    "rgblight": true
+  },
+  "layouts": {
+    "LAYOUT": {
+      "layout": [
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0},
+        {"matrix": [0, 5], "x": 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": [4, 8], "x": 13, "y": 0, "w": 2},
+
+        {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+        {"matrix": [1, 1], "x": 1.5, "y": 1},
+        {"matrix": [1, 2], "x": 2.5, "y": 1},
+        {"matrix": [1, 3], "x": 3.5, "y": 1},
+        {"matrix": [1, 4], "x": 4.5, "y": 1},
+        {"matrix": [1, 5], "x": 5.5, "y": 1},
+        {"matrix": [1, 6], "x": 6.5, "y": 1},
+        {"matrix": [1, 7], "x": 7.5, "y": 1},
+        {"matrix": [1, 8], "x": 8.5, "y": 1},
+        {"matrix": [1, 9], "x": 9.5, "y": 1},
+        {"matrix": [1, 10], "x": 10.5, "y": 1},
+        {"matrix": [1, 11], "x": 11.5, "y": 1},
+        {"matrix": [1, 12], "x": 12.5, "y": 1},
+        {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+        {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+        {"matrix": [2, 1], "x": 1.75, "y": 2},
+        {"matrix": [2, 2], "x": 2.75, "y": 2},
+        {"matrix": [2, 3], "x": 3.75, "y": 2},
+        {"matrix": [2, 4], "x": 4.75, "y": 2},
+        {"matrix": [2, 5], "x": 5.75, "y": 2},
+        {"matrix": [2, 6], "x": 6.75, "y": 2},
+        {"matrix": [2, 7], "x": 7.75, "y": 2},
+        {"matrix": [2, 8], "x": 8.75, "y": 2},
+        {"matrix": [2, 9], "x": 9.75, "y": 2},
+        {"matrix": [2, 10], "x": 10.75, "y": 2},
+        {"matrix": [2, 11], "x": 11.75, "y": 2},
+        {"matrix": [2, 12], "x": 12.75, "y": 2},
+        {"matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.25},
+
+        {"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, "w": 1.75},
+        {"matrix": [3, 12], "x": 13, "y": 3},
+        {"matrix": [3, 13], "x": 14, "y": 3},
+
+        {"matrix": [4, 0], "x": 0, "y": 4},
+        {"matrix": [4, 1], "x": 1, "y": 4},
+        {"matrix": [4, 2], "x": 2, "y": 4},
+        {"matrix": [4, 3], "x": 3, "y": 4},
+        {"matrix": [4, 4], "x": 4, "y": 4},
+        {"matrix": [4, 5], "x": 5, "y": 4},
+        {"matrix": [4, 6], "x": 6, "y": 4, "w": 2},
+        {"matrix": [4, 7], "x": 8, "y": 4},
+        {"matrix": [0, 13], "x": 9, "y": 4},
+        {"matrix": [4, 9], "x": 10, "y": 4},
+        {"matrix": [4, 10], "x": 11, "y": 4},
+        {"matrix": [4, 11], "x": 12, "y": 4},
+        {"matrix": [4, 12], "x": 13, "y": 4},
+        {"matrix": [4, 13], "x": 14, "y": 4}
+      ]
+    }
+  }
+}
diff --git a/keyboards/gray_studio/cod67/rules.mk b/keyboards/gray_studio/cod67/rules.mk
index c8d3337cb38..e22d5248895 100644
--- a/keyboards/gray_studio/cod67/rules.mk
+++ b/keyboards/gray_studio/cod67/rules.mk
@@ -1,15 +1,2 @@
 # This board uses the older unsafe 6k version of lufa-ms
 BOOTLOADER_SIZE = 6144
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes       # Enable RGB underglow
-AUDIO_ENABLE = no           # Audio output
diff --git a/keyboards/gregandcin/teaqueen/info.json b/keyboards/gregandcin/teaqueen/keyboard.json
similarity index 100%
rename from keyboards/gregandcin/teaqueen/info.json
rename to keyboards/gregandcin/teaqueen/keyboard.json
diff --git a/keyboards/hadron/ver2/info.json b/keyboards/hadron/ver2/info.json
deleted file mode 100644
index fb1dc102b7e..00000000000
--- a/keyboards/hadron/ver2/info.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-    "usb": {
-        "device_version": "0.0.2"
-    },
-    "matrix_pins": {
-        "cols": ["F6", "F7", "D6", "C7", "F5", "F4", "F1", "F0", "D2", "D3", "D5", "B3", "B2", "B1", "B0"],
-        "rows": ["D7", "E6", "B4", "B5", "B6"]
-    },
-    "diode_direction": "COL2ROW",
-    "rgblight": {
-        "hue_steps": 10,
-        "led_count": 14,
-        "animations": {
-            "breathing": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "snake": true,
-            "knight": true,
-            "christmas": true,
-            "static_gradient": true,
-            "rgb_test": true,
-            "alternating": true,
-            "twinkle": true
-        }
-    },
-    "ws2812": {
-        "pin": "D4"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "halfkay"
-}
diff --git a/keyboards/hadron/ver2/keyboard.json b/keyboards/hadron/ver2/keyboard.json
new file mode 100644
index 00000000000..fbb97f1c186
--- /dev/null
+++ b/keyboards/hadron/ver2/keyboard.json
@@ -0,0 +1,39 @@
+{
+    "usb": {
+        "device_version": "0.0.2"
+    },
+    "matrix_pins": {
+        "cols": ["F6", "F7", "D6", "C7", "F5", "F4", "F1", "F0", "D2", "D3", "D5", "B3", "B2", "B1", "B0"],
+        "rows": ["D7", "E6", "B4", "B5", "B6"]
+    },
+    "diode_direction": "COL2ROW",
+    "rgblight": {
+        "hue_steps": 10,
+        "led_count": 14,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": true,
+            "twinkle": true
+        }
+    },
+    "ws2812": {
+        "pin": "D4"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "halfkay",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "nkro": true,
+        "rgblight": true,
+        "oled": true
+    }
+}
diff --git a/keyboards/hadron/ver2/rules.mk b/keyboards/hadron/ver2/rules.mk
deleted file mode 100644
index 188b4696f18..00000000000
--- a/keyboards/hadron/ver2/rules.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-AUDIO_ENABLE = no           # Audio output
-RGBLIGHT_ENABLE = yes       # Enable WS2812 RGB underlight
-OLED_ENABLE = yes
diff --git a/keyboards/hadron/ver3/info.json b/keyboards/hadron/ver3/info.json
deleted file mode 100644
index 381a5dc5501..00000000000
--- a/keyboards/hadron/ver3/info.json
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-    "usb": {
-        "device_version": "0.0.3"
-    },
-    "rgb_matrix": {
-        "driver": "ws2812"
-    },
-    "matrix_pins": {
-        "cols": ["B8", "B2", "B10", "A0", "A1", "A2", "B0", "A3", "B1", "A6", "A7", "B12", "C13", "B11", "B9"],
-        "rows": ["C15", "C14", "A10", "A9", "A8"]
-    },
-    "diode_direction": "COL2ROW",
-    "encoder": {
-        "rotary": [
-            {"pin_a": "B13", "pin_b": "B14"}
-        ]
-    },
-    "rgblight": {
-        "led_count": 10,
-        "animations": {
-            "breathing": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "snake": true,
-            "knight": true,
-            "christmas": true,
-            "static_gradient": true,
-            "rgb_test": true,
-            "alternating": true,
-            "twinkle": true
-        }
-    },
-    "ws2812": {
-        "pin": "B5"
-    },
-    "processor": "STM32F303",
-    "bootloader": "stm32-dfu",
-    "board": "QMK_PROTON_C"
-}
diff --git a/keyboards/hadron/ver3/keyboard.json b/keyboards/hadron/ver3/keyboard.json
new file mode 100644
index 00000000000..f3e4bba06f1
--- /dev/null
+++ b/keyboards/hadron/ver3/keyboard.json
@@ -0,0 +1,54 @@
+{
+    "usb": {
+        "device_version": "0.0.3"
+    },
+    "rgb_matrix": {
+        "driver": "ws2812"
+    },
+    "matrix_pins": {
+        "cols": ["B8", "B2", "B10", "A0", "A1", "A2", "B0", "A3", "B1", "A6", "A7", "B12", "C13", "B11", "B9"],
+        "rows": ["C15", "C14", "A10", "A9", "A8"]
+    },
+    "diode_direction": "COL2ROW",
+    "encoder": {
+        "rotary": [
+            {"pin_a": "B13", "pin_b": "B14"}
+        ]
+    },
+    "haptic": {
+        "driver": "drv2605l"
+    },
+    "rgblight": {
+        "led_count": 10,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": true,
+            "twinkle": true
+        }
+    },
+    "ws2812": {
+        "pin": "B5"
+    },
+    "processor": "STM32F303",
+    "bootloader": "stm32-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "command": true,
+        "nkro": true,
+        "audio": true,
+        "rgblight": true,
+        "haptic": true,
+        "oled": true,
+        "encoder": true
+    },
+    "board": "QMK_PROTON_C"
+}
diff --git a/keyboards/hadron/ver3/rules.mk b/keyboards/hadron/ver3/rules.mk
deleted file mode 100644
index edc5fa7d5bf..00000000000
--- a/keyboards/hadron/ver3/rules.mk
+++ /dev/null
@@ -1,17 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-BACKLIGHT_ENABLE = no
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes	# Mouse keys
-EXTRAKEY_ENABLE = yes	# Audio control and System control
-CONSOLE_ENABLE = no	# Console for debug
-COMMAND_ENABLE = yes    # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-AUDIO_ENABLE = yes
-RGBLIGHT_ENABLE = yes
-RGB_MATRIX_ENABLE = no # once arm_rgb is implemented
-HAPTIC_ENABLE = yes
-HAPTIC_DRIVER = drv2605l
-OLED_ENABLE = yes
-ENCODER_ENABLER = yes
diff --git a/keyboards/halfcliff/info.json b/keyboards/halfcliff/info.json
deleted file mode 100644
index 225c5dcb37a..00000000000
--- a/keyboards/halfcliff/info.json
+++ /dev/null
@@ -1,122 +0,0 @@
-{
-    "keyboard_name": "halfcliff",
-    "manufacturer": "n2",
-    "url": "https://github.com/N2-Sumikko",
-    "maintainer": "n2",
-    "usb": {
-        "vid": "0x0335",
-        "pid": "0x0021",
-        "device_version": "0.0.1"
-    },
-    "encoder": {
-        "rotary": [
-            {"pin_a": "D4", "pin_b": "F4", "resolution": 2}
-        ]
-    },
-    "split": {
-        "enabled": true,
-        "soft_serial_pin": "D2"
-    },
-    "rgblight": {
-        "saturation_steps": 8,
-        "brightness_steps": 8,
-        "led_count": 10,
-        "sleep": true,
-        "split_count": [5, 5]
-    },
-    "ws2812": {
-        "pin": "D3"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [5, 1], "x": 0.75, "y": 0},
-                {"matrix": [5, 0], "x": 1.75, "y": 0},
-                {"matrix": [0, 0], "x": 2.75, "y": 0},
-                {"matrix": [0, 1], "x": 3.75, "y": 0},
-                {"matrix": [0, 2], "x": 4.75, "y": 0},
-                {"matrix": [0, 3], "x": 5.75, "y": 0},
-                {"matrix": [0, 4], "x": 6.75, "y": 0},
-
-                {"matrix": [10, 4], "x": 8.25, "y": 0},
-                {"matrix": [10, 3], "x": 9.25, "y": 0},
-                {"matrix": [10, 2], "x": 10.25, "y": 0},
-                {"matrix": [10, 1], "x": 11.25, "y": 0},
-                {"matrix": [10, 0], "x": 12.25, "y": 0},
-                {"matrix": [15, 0], "x": 13.25, "y": 0},
-                {"matrix": [15, 1], "x": 14.25, "y": 0},
-                {"matrix": [15, 2], "x": 15.25, "y": 0},
-
-                {"matrix": [6, 1], "x": 0.25, "y": 1, "w": 1.5},
-                {"matrix": [6, 0], "x": 1.75, "y": 1},
-                {"matrix": [1, 0], "x": 2.75, "y": 1},
-                {"matrix": [1, 1], "x": 3.75, "y": 1},
-                {"matrix": [1, 2], "x": 4.75, "y": 1},
-                {"matrix": [1, 3], "x": 5.75, "y": 1},
-                {"matrix": [1, 4], "x": 6.75, "y": 1},
-
-                {"matrix": [11, 4], "x": 8.25, "y": 1},
-                {"matrix": [11, 3], "x": 9.25, "y": 1},
-                {"matrix": [11, 2], "x": 10.25, "y": 1},
-                {"matrix": [11, 1], "x": 11.25, "y": 1},
-                {"matrix": [11, 0], "x": 12.25, "y": 1},
-                {"matrix": [16, 0], "x": 13.25, "y": 1},
-                {"matrix": [16, 1], "x": 14.25, "y": 1},
-                {"matrix": [16, 2], "x": 16.25, "y": 0},
-
-                {"matrix": [7, 1], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [7, 0], "x": 1.75, "y": 2},
-                {"matrix": [2, 0], "x": 2.75, "y": 2},
-                {"matrix": [2, 1], "x": 3.75, "y": 2},
-                {"matrix": [2, 2], "x": 4.75, "y": 2},
-                {"matrix": [2, 3], "x": 5.75, "y": 2},
-                {"matrix": [2, 4], "x": 6.75, "y": 2},
-
-                {"matrix": [12, 4], "x": 8.25, "y": 2},
-                {"matrix": [12, 3], "x": 9.25, "y": 2},
-                {"matrix": [12, 2], "x": 10.25, "y": 2},
-                {"matrix": [12, 1], "x": 11.25, "y": 2},
-                {"matrix": [12, 0], "x": 12.25, "y": 2},
-                {"matrix": [17, 0], "x": 13.25, "y": 2},
-                {"matrix": [17, 1], "x": 14.25, "y": 2},
-                {"matrix": [17, 2], "x": 15.5, "y": 1, "w": 1.25, "h": 2},
-
-                {"matrix": [8, 1], "x": 0, "y": 3, "w": 1.75},
-                {"matrix": [8, 0], "x": 1.75, "y": 3},
-                {"matrix": [3, 0], "x": 2.75, "y": 3},
-                {"matrix": [3, 1], "x": 3.75, "y": 3},
-                {"matrix": [3, 2], "x": 4.75, "y": 3},
-                {"matrix": [3, 3], "x": 5.75, "y": 3},
-                {"matrix": [3, 4], "x": 6.75, "y": 3},
-
-                {"matrix": [13, 4], "x": 8.25, "y": 3},
-                {"matrix": [13, 3], "x": 9.25, "y": 3},
-                {"matrix": [13, 2], "x": 10.25, "y": 3},
-                {"matrix": [13, 1], "x": 11.25, "y": 3},
-                {"matrix": [13, 0], "x": 12.25, "y": 3},
-                {"matrix": [18, 0], "x": 13.25, "y": 3},
-                {"matrix": [18, 1], "x": 14.25, "y": 3},
-                {"matrix": [18, 2], "x": 15.25, "y": 3, "w": 2},
-
-                {"matrix": [9, 1], "x": 0.5, "y": 4, "w": 1.25},
-                {"matrix": [9, 0], "x": 1.75, "y": 4},
-                {"matrix": [4, 0], "x": 2.75, "y": 4},
-                {"matrix": [4, 1], "x": 3.75, "y": 4},
-                {"matrix": [4, 2], "x": 4.75, "y": 4},
-                {"matrix": [4, 3], "x": 5.75, "y": 4},
-                {"matrix": [4, 4], "x": 6.75, "y": 4},
-
-                {"matrix": [14, 4], "x": 8.25, "y": 4},
-                {"matrix": [14, 3], "x": 9.25, "y": 4},
-                {"matrix": [14, 2], "x": 10.25, "y": 4},
-                {"matrix": [14, 1], "x": 11.25, "y": 4},
-                {"matrix": [14, 0], "x": 12.25, "y": 4},
-                {"matrix": [19, 0], "x": 13.25, "y": 4},
-                {"matrix": [19, 1], "x": 14.25, "y": 4},
-                {"matrix": [19, 2], "x": 15.25, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/halfcliff/keyboard.json b/keyboards/halfcliff/keyboard.json
new file mode 100644
index 00000000000..1f60537b249
--- /dev/null
+++ b/keyboards/halfcliff/keyboard.json
@@ -0,0 +1,127 @@
+{
+    "keyboard_name": "halfcliff",
+    "manufacturer": "n2",
+    "url": "https://github.com/N2-Sumikko",
+    "maintainer": "n2",
+    "usb": {
+        "vid": "0x0335",
+        "pid": "0x0021",
+        "device_version": "0.0.1"
+    },
+    "encoder": {
+        "rotary": [
+            {"pin_a": "D4", "pin_b": "F4", "resolution": 2}
+        ]
+    },
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "D2"
+    },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 10,
+        "sleep": true,
+        "split_count": [5, 5]
+    },
+    "ws2812": {
+        "pin": "D3"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
+    "features": {
+        "bootmagic": false,
+        "mousekey": false,
+        "extrakey": false
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [5, 1], "x": 0.75, "y": 0},
+                {"matrix": [5, 0], "x": 1.75, "y": 0},
+                {"matrix": [0, 0], "x": 2.75, "y": 0},
+                {"matrix": [0, 1], "x": 3.75, "y": 0},
+                {"matrix": [0, 2], "x": 4.75, "y": 0},
+                {"matrix": [0, 3], "x": 5.75, "y": 0},
+                {"matrix": [0, 4], "x": 6.75, "y": 0},
+
+                {"matrix": [10, 4], "x": 8.25, "y": 0},
+                {"matrix": [10, 3], "x": 9.25, "y": 0},
+                {"matrix": [10, 2], "x": 10.25, "y": 0},
+                {"matrix": [10, 1], "x": 11.25, "y": 0},
+                {"matrix": [10, 0], "x": 12.25, "y": 0},
+                {"matrix": [15, 0], "x": 13.25, "y": 0},
+                {"matrix": [15, 1], "x": 14.25, "y": 0},
+                {"matrix": [15, 2], "x": 15.25, "y": 0},
+
+                {"matrix": [6, 1], "x": 0.25, "y": 1, "w": 1.5},
+                {"matrix": [6, 0], "x": 1.75, "y": 1},
+                {"matrix": [1, 0], "x": 2.75, "y": 1},
+                {"matrix": [1, 1], "x": 3.75, "y": 1},
+                {"matrix": [1, 2], "x": 4.75, "y": 1},
+                {"matrix": [1, 3], "x": 5.75, "y": 1},
+                {"matrix": [1, 4], "x": 6.75, "y": 1},
+
+                {"matrix": [11, 4], "x": 8.25, "y": 1},
+                {"matrix": [11, 3], "x": 9.25, "y": 1},
+                {"matrix": [11, 2], "x": 10.25, "y": 1},
+                {"matrix": [11, 1], "x": 11.25, "y": 1},
+                {"matrix": [11, 0], "x": 12.25, "y": 1},
+                {"matrix": [16, 0], "x": 13.25, "y": 1},
+                {"matrix": [16, 1], "x": 14.25, "y": 1},
+                {"matrix": [16, 2], "x": 16.25, "y": 0},
+
+                {"matrix": [7, 1], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [7, 0], "x": 1.75, "y": 2},
+                {"matrix": [2, 0], "x": 2.75, "y": 2},
+                {"matrix": [2, 1], "x": 3.75, "y": 2},
+                {"matrix": [2, 2], "x": 4.75, "y": 2},
+                {"matrix": [2, 3], "x": 5.75, "y": 2},
+                {"matrix": [2, 4], "x": 6.75, "y": 2},
+
+                {"matrix": [12, 4], "x": 8.25, "y": 2},
+                {"matrix": [12, 3], "x": 9.25, "y": 2},
+                {"matrix": [12, 2], "x": 10.25, "y": 2},
+                {"matrix": [12, 1], "x": 11.25, "y": 2},
+                {"matrix": [12, 0], "x": 12.25, "y": 2},
+                {"matrix": [17, 0], "x": 13.25, "y": 2},
+                {"matrix": [17, 1], "x": 14.25, "y": 2},
+                {"matrix": [17, 2], "x": 15.5, "y": 1, "w": 1.25, "h": 2},
+
+                {"matrix": [8, 1], "x": 0, "y": 3, "w": 1.75},
+                {"matrix": [8, 0], "x": 1.75, "y": 3},
+                {"matrix": [3, 0], "x": 2.75, "y": 3},
+                {"matrix": [3, 1], "x": 3.75, "y": 3},
+                {"matrix": [3, 2], "x": 4.75, "y": 3},
+                {"matrix": [3, 3], "x": 5.75, "y": 3},
+                {"matrix": [3, 4], "x": 6.75, "y": 3},
+
+                {"matrix": [13, 4], "x": 8.25, "y": 3},
+                {"matrix": [13, 3], "x": 9.25, "y": 3},
+                {"matrix": [13, 2], "x": 10.25, "y": 3},
+                {"matrix": [13, 1], "x": 11.25, "y": 3},
+                {"matrix": [13, 0], "x": 12.25, "y": 3},
+                {"matrix": [18, 0], "x": 13.25, "y": 3},
+                {"matrix": [18, 1], "x": 14.25, "y": 3},
+                {"matrix": [18, 2], "x": 15.25, "y": 3, "w": 2},
+
+                {"matrix": [9, 1], "x": 0.5, "y": 4, "w": 1.25},
+                {"matrix": [9, 0], "x": 1.75, "y": 4},
+                {"matrix": [4, 0], "x": 2.75, "y": 4},
+                {"matrix": [4, 1], "x": 3.75, "y": 4},
+                {"matrix": [4, 2], "x": 4.75, "y": 4},
+                {"matrix": [4, 3], "x": 5.75, "y": 4},
+                {"matrix": [4, 4], "x": 6.75, "y": 4},
+
+                {"matrix": [14, 4], "x": 8.25, "y": 4},
+                {"matrix": [14, 3], "x": 9.25, "y": 4},
+                {"matrix": [14, 2], "x": 10.25, "y": 4},
+                {"matrix": [14, 1], "x": 11.25, "y": 4},
+                {"matrix": [14, 0], "x": 12.25, "y": 4},
+                {"matrix": [19, 0], "x": 13.25, "y": 4},
+                {"matrix": [19, 1], "x": 14.25, "y": 4},
+                {"matrix": [19, 2], "x": 15.25, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/halfcliff/rules.mk b/keyboards/halfcliff/rules.mk
index 425015c04d8..8784813b335 100644
--- a/keyboards/halfcliff/rules.mk
+++ b/keyboards/halfcliff/rules.mk
@@ -1,18 +1,2 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no       # Mouse keys
-EXTRAKEY_ENABLE = no       # Audio control and System control
-CONSOLE_ENABLE = no        # Console for debug
-COMMAND_ENABLE = no        # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-ENCODER_ENABLE = no
-POINTING_DEVICE_ENABLE = no
 CUSTOM_MATRIX = yes
-OLED_ENABLE = no
-
 SRC += matrix.c
diff --git a/keyboards/handwired/108key_trackpoint/info.json b/keyboards/handwired/108key_trackpoint/info.json
deleted file mode 100644
index 605c77875d2..00000000000
--- a/keyboards/handwired/108key_trackpoint/info.json
+++ /dev/null
@@ -1,155 +0,0 @@
-{
-  "keyboard_name": "108Key-TrackPoint",
-  "manufacturer": "QMK",
-  "url": "",
-  "maintainer": "mkem114",
-  "usb": {
-    "vid": "0x1234",
-    "pid": "0x5678",
-    "device_version": "0.0.1"
-  },
-  "matrix_pins": {
-    "cols": ["C0", "C1", "C2", "C3", "C4", "C5", "C6", "C7", "D0", "D1", "F0", "D3", "D4", "F1", "D6", "D7", "E0", "E1", "E2", "E3", "E4", "E5", "E6"],
-    "rows": ["B0", "B1", "B2", "B3", "B4", "B5", "B6", "B7"]
-  },
-  "diode_direction": "COL2ROW",
-  "processor": "at90usb1286",
-  "bootloader": "halfkay",
-  "layouts": {
-    "LAYOUT": {
-      "layout": [
-        {"matrix": [0, 0], "x": 0, "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, 7], "x": 6.5, "y": 0},
-        {"matrix": [0, 8], "x": 7.5, "y": 0},
-        {"matrix": [0, 9], "x": 8.5, "y": 0},
-        {"matrix": [0, 10], "x": 9.5, "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, 14], "x": 14, "y": 0},
-
-        {"matrix": [0, 15], "x": 15.25, "y": 0},
-        {"matrix": [0, 16], "x": 16.25, "y": 0},
-        {"matrix": [0, 17], "x": 17.25, "y": 0},
-
-        {"matrix": [0, 19], "x": 18.5, "y": 0},
-        {"matrix": [0, 20], "x": 19.5, "y": 0},
-        {"matrix": [0, 21], "x": 20.5, "y": 0},
-        {"matrix": [0, 22], "x": 21.5, "y": 0},
-
-        {"matrix": [2, 0], "x": 0, "y": 1.5},
-        {"matrix": [2, 1], "x": 1, "y": 1.5},
-        {"matrix": [2, 2], "x": 2, "y": 1.5},
-        {"matrix": [2, 3], "x": 3, "y": 1.5},
-        {"matrix": [2, 4], "x": 4, "y": 1.5},
-        {"matrix": [2, 5], "x": 5, "y": 1.5},
-        {"matrix": [2, 6], "x": 6, "y": 1.5},
-        {"matrix": [2, 7], "x": 7, "y": 1.5},
-        {"matrix": [2, 8], "x": 8, "y": 1.5},
-        {"matrix": [2, 9], "x": 9, "y": 1.5},
-        {"matrix": [2, 10], "x": 10, "y": 1.5},
-        {"matrix": [2, 11], "x": 11, "y": 1.5},
-        {"matrix": [2, 12], "x": 12, "y": 1.5},
-        {"matrix": [2, 14], "x": 13, "y": 1.5, "w": 2},
-
-        {"matrix": [2, 15], "x": 15.25, "y": 1.5},
-        {"matrix": [2, 16], "x": 16.25, "y": 1.5},
-        {"matrix": [2, 17], "x": 17.25, "y": 1.5},
-
-        {"matrix": [2, 19], "x": 18.5, "y": 1.5},
-        {"matrix": [2, 20], "x": 19.5, "y": 1.5},
-        {"matrix": [2, 21], "x": 20.5, "y": 1.5},
-        {"matrix": [2, 22], "x": 21.5, "y": 1.5},
-
-        {"matrix": [3, 0], "x": 0, "y": 2.5, "w": 1.5},
-        {"matrix": [3, 2], "x": 1.5, "y": 2.5},
-        {"matrix": [3, 3], "x": 2.5, "y": 2.5},
-        {"matrix": [3, 4], "x": 3.5, "y": 2.5},
-        {"matrix": [3, 5], "x": 4.5, "y": 2.5},
-        {"matrix": [3, 6], "x": 5.5, "y": 2.5},
-        {"matrix": [3, 7], "x": 6.5, "y": 2.5},
-        {"matrix": [3, 8], "x": 7.5, "y": 2.5},
-        {"matrix": [3, 9], "x": 8.5, "y": 2.5},
-        {"matrix": [3, 10], "x": 9.5, "y": 2.5},
-        {"matrix": [3, 11], "x": 10.5, "y": 2.5},
-        {"matrix": [3, 12], "x": 11.5, "y": 2.5},
-        {"matrix": [3, 13], "x": 12.5, "y": 2.5},
-        {"matrix": [3, 14], "x": 13.5, "y": 2.5, "w": 1.5},
-
-        {"matrix": [3, 15], "x": 15.25, "y": 2.5},
-        {"matrix": [3, 16], "x": 16.25, "y": 2.5},
-        {"matrix": [3, 17], "x": 17.25, "y": 2.5},
-
-        {"matrix": [3, 19], "x": 18.5, "y": 2.5},
-        {"matrix": [3, 20], "x": 19.5, "y": 2.5},
-        {"matrix": [3, 21], "x": 20.5, "y": 2.5},
-
-        {"matrix": [4, 0], "x": 0, "y": 3.5, "w": 1.75},
-        {"matrix": [4, 2], "x": 1.75, "y": 3.5},
-        {"matrix": [4, 3], "x": 2.75, "y": 3.5},
-        {"matrix": [4, 4], "x": 3.75, "y": 3.5},
-        {"matrix": [4, 5], "x": 4.75, "y": 3.5},
-        {"matrix": [4, 6], "x": 5.75, "y": 3.5},
-        {"matrix": [4, 7], "x": 6.75, "y": 3.5},
-        {"matrix": [4, 8], "x": 7.75, "y": 3.5},
-        {"matrix": [4, 9], "x": 8.75, "y": 3.5},
-        {"matrix": [4, 10], "x": 9.75, "y": 3.5},
-        {"matrix": [4, 11], "x": 10.75, "y": 3.5},
-        {"matrix": [4, 12], "x": 11.75, "y": 3.5},
-        {"matrix": [4, 13], "x": 12.75, "y": 3.5, "w": 2.25},
-
-        {"matrix": [4, 19], "x": 18.5, "y": 3.5},
-        {"matrix": [4, 20], "x": 19.5, "y": 3.5},
-        {"matrix": [4, 21], "x": 20.5, "y": 3.5},
-        {"matrix": [4, 22], "x": 21.5, "y": 2.5, "h": 2},
-
-        {"matrix": [5, 1], "x": 0, "y": 4.5, "w": 2.25},
-        {"matrix": [5, 2], "x": 2.25, "y": 4.5},
-        {"matrix": [5, 3], "x": 3.25, "y": 4.5},
-        {"matrix": [5, 4], "x": 4.25, "y": 4.5},
-        {"matrix": [5, 5], "x": 5.25, "y": 4.5},
-        {"matrix": [5, 6], "x": 6.25, "y": 4.5},
-        {"matrix": [5, 7], "x": 7.25, "y": 4.5},
-        {"matrix": [5, 8], "x": 8.25, "y": 4.5},
-        {"matrix": [5, 9], "x": 9.25, "y": 4.5},
-        {"matrix": [5, 10], "x": 10.25, "y": 4.5},
-        {"matrix": [5, 11], "x": 11.25, "y": 4.5},
-        {"matrix": [5, 13], "x": 12.25, "y": 4.5, "w": 2.75},
-
-        {"matrix": [5, 16], "x": 16.25, "y": 4.5},
-
-        {"matrix": [5, 19], "x": 18.5, "y": 4.5},
-        {"matrix": [5, 20], "x": 19.5, "y": 4.5},
-        {"matrix": [5, 21], "x": 20.5, "y": 4.5},
-
-        {"matrix": [6, 0], "x": 0, "y": 5.5, "w": 1.25},
-        {"matrix": [6, 1], "x": 1.25, "y": 5.5, "w": 1.25},
-        {"matrix": [6, 3], "x": 2.5, "y": 5.5, "w": 1.25},
-        {"matrix": [6, 6], "x": 3.75, "y": 5.5, "w": 6.25},
-        {"matrix": [6, 10], "x": 10, "y": 5.5, "w": 1.25},
-        {"matrix": [6, 11], "x": 11.25, "y": 5.5, "w": 1.25},
-        {"matrix": [6, 13], "x": 12.5, "y": 5.5, "w": 1.25},
-        {"matrix": [6, 14], "x": 13.75, "y": 5.5, "w": 1.25},
-
-        {"matrix": [6, 15], "x": 15.25, "y": 5.5},
-        {"matrix": [6, 16], "x": 16.25, "y": 5.5},
-        {"matrix": [6, 17], "x": 17.25, "y": 5.5},
-
-        {"matrix": [6, 19], "x": 18.5, "y": 5.5, "w": 2},
-        {"matrix": [6, 21], "x": 20.5, "y": 5.5},
-        {"matrix": [6, 22], "x": 21.5, "y": 4.5, "h": 2},
-
-        {"matrix": [7, 5], "x": 5.25, "y": 6.5},
-        {"matrix": [7, 6], "x": 6.25, "y": 6.5},
-        {"matrix": [7, 7], "x": 7.25, "y": 6.5}
-      ]
-    }
-  }
-}
diff --git a/keyboards/handwired/108key_trackpoint/keyboard.json b/keyboards/handwired/108key_trackpoint/keyboard.json
new file mode 100644
index 00000000000..396b4c33cb5
--- /dev/null
+++ b/keyboards/handwired/108key_trackpoint/keyboard.json
@@ -0,0 +1,165 @@
+{
+  "keyboard_name": "108Key-TrackPoint",
+  "manufacturer": "QMK",
+  "url": "",
+  "maintainer": "mkem114",
+  "usb": {
+    "vid": "0x1234",
+    "pid": "0x5678",
+    "device_version": "0.0.1"
+  },
+  "matrix_pins": {
+    "cols": ["C0", "C1", "C2", "C3", "C4", "C5", "C6", "C7", "D0", "D1", "F0", "D3", "D4", "F1", "D6", "D7", "E0", "E1", "E2", "E3", "E4", "E5", "E6"],
+    "rows": ["B0", "B1", "B2", "B3", "B4", "B5", "B6", "B7"]
+  },
+  "diode_direction": "COL2ROW",
+  "processor": "at90usb1286",
+  "bootloader": "halfkay",
+  "features": {
+    "bootmagic": false,
+    "mousekey": true,
+    "extrakey": true,
+    "console": true,
+    "command": true,
+    "nkro": true,
+    "ps2_mouse": true,
+    "ps2": true
+  },
+  "layouts": {
+    "LAYOUT": {
+      "layout": [
+        {"matrix": [0, 0], "x": 0, "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, 7], "x": 6.5, "y": 0},
+        {"matrix": [0, 8], "x": 7.5, "y": 0},
+        {"matrix": [0, 9], "x": 8.5, "y": 0},
+        {"matrix": [0, 10], "x": 9.5, "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, 14], "x": 14, "y": 0},
+
+        {"matrix": [0, 15], "x": 15.25, "y": 0},
+        {"matrix": [0, 16], "x": 16.25, "y": 0},
+        {"matrix": [0, 17], "x": 17.25, "y": 0},
+
+        {"matrix": [0, 19], "x": 18.5, "y": 0},
+        {"matrix": [0, 20], "x": 19.5, "y": 0},
+        {"matrix": [0, 21], "x": 20.5, "y": 0},
+        {"matrix": [0, 22], "x": 21.5, "y": 0},
+
+        {"matrix": [2, 0], "x": 0, "y": 1.5},
+        {"matrix": [2, 1], "x": 1, "y": 1.5},
+        {"matrix": [2, 2], "x": 2, "y": 1.5},
+        {"matrix": [2, 3], "x": 3, "y": 1.5},
+        {"matrix": [2, 4], "x": 4, "y": 1.5},
+        {"matrix": [2, 5], "x": 5, "y": 1.5},
+        {"matrix": [2, 6], "x": 6, "y": 1.5},
+        {"matrix": [2, 7], "x": 7, "y": 1.5},
+        {"matrix": [2, 8], "x": 8, "y": 1.5},
+        {"matrix": [2, 9], "x": 9, "y": 1.5},
+        {"matrix": [2, 10], "x": 10, "y": 1.5},
+        {"matrix": [2, 11], "x": 11, "y": 1.5},
+        {"matrix": [2, 12], "x": 12, "y": 1.5},
+        {"matrix": [2, 14], "x": 13, "y": 1.5, "w": 2},
+
+        {"matrix": [2, 15], "x": 15.25, "y": 1.5},
+        {"matrix": [2, 16], "x": 16.25, "y": 1.5},
+        {"matrix": [2, 17], "x": 17.25, "y": 1.5},
+
+        {"matrix": [2, 19], "x": 18.5, "y": 1.5},
+        {"matrix": [2, 20], "x": 19.5, "y": 1.5},
+        {"matrix": [2, 21], "x": 20.5, "y": 1.5},
+        {"matrix": [2, 22], "x": 21.5, "y": 1.5},
+
+        {"matrix": [3, 0], "x": 0, "y": 2.5, "w": 1.5},
+        {"matrix": [3, 2], "x": 1.5, "y": 2.5},
+        {"matrix": [3, 3], "x": 2.5, "y": 2.5},
+        {"matrix": [3, 4], "x": 3.5, "y": 2.5},
+        {"matrix": [3, 5], "x": 4.5, "y": 2.5},
+        {"matrix": [3, 6], "x": 5.5, "y": 2.5},
+        {"matrix": [3, 7], "x": 6.5, "y": 2.5},
+        {"matrix": [3, 8], "x": 7.5, "y": 2.5},
+        {"matrix": [3, 9], "x": 8.5, "y": 2.5},
+        {"matrix": [3, 10], "x": 9.5, "y": 2.5},
+        {"matrix": [3, 11], "x": 10.5, "y": 2.5},
+        {"matrix": [3, 12], "x": 11.5, "y": 2.5},
+        {"matrix": [3, 13], "x": 12.5, "y": 2.5},
+        {"matrix": [3, 14], "x": 13.5, "y": 2.5, "w": 1.5},
+
+        {"matrix": [3, 15], "x": 15.25, "y": 2.5},
+        {"matrix": [3, 16], "x": 16.25, "y": 2.5},
+        {"matrix": [3, 17], "x": 17.25, "y": 2.5},
+
+        {"matrix": [3, 19], "x": 18.5, "y": 2.5},
+        {"matrix": [3, 20], "x": 19.5, "y": 2.5},
+        {"matrix": [3, 21], "x": 20.5, "y": 2.5},
+
+        {"matrix": [4, 0], "x": 0, "y": 3.5, "w": 1.75},
+        {"matrix": [4, 2], "x": 1.75, "y": 3.5},
+        {"matrix": [4, 3], "x": 2.75, "y": 3.5},
+        {"matrix": [4, 4], "x": 3.75, "y": 3.5},
+        {"matrix": [4, 5], "x": 4.75, "y": 3.5},
+        {"matrix": [4, 6], "x": 5.75, "y": 3.5},
+        {"matrix": [4, 7], "x": 6.75, "y": 3.5},
+        {"matrix": [4, 8], "x": 7.75, "y": 3.5},
+        {"matrix": [4, 9], "x": 8.75, "y": 3.5},
+        {"matrix": [4, 10], "x": 9.75, "y": 3.5},
+        {"matrix": [4, 11], "x": 10.75, "y": 3.5},
+        {"matrix": [4, 12], "x": 11.75, "y": 3.5},
+        {"matrix": [4, 13], "x": 12.75, "y": 3.5, "w": 2.25},
+
+        {"matrix": [4, 19], "x": 18.5, "y": 3.5},
+        {"matrix": [4, 20], "x": 19.5, "y": 3.5},
+        {"matrix": [4, 21], "x": 20.5, "y": 3.5},
+        {"matrix": [4, 22], "x": 21.5, "y": 2.5, "h": 2},
+
+        {"matrix": [5, 1], "x": 0, "y": 4.5, "w": 2.25},
+        {"matrix": [5, 2], "x": 2.25, "y": 4.5},
+        {"matrix": [5, 3], "x": 3.25, "y": 4.5},
+        {"matrix": [5, 4], "x": 4.25, "y": 4.5},
+        {"matrix": [5, 5], "x": 5.25, "y": 4.5},
+        {"matrix": [5, 6], "x": 6.25, "y": 4.5},
+        {"matrix": [5, 7], "x": 7.25, "y": 4.5},
+        {"matrix": [5, 8], "x": 8.25, "y": 4.5},
+        {"matrix": [5, 9], "x": 9.25, "y": 4.5},
+        {"matrix": [5, 10], "x": 10.25, "y": 4.5},
+        {"matrix": [5, 11], "x": 11.25, "y": 4.5},
+        {"matrix": [5, 13], "x": 12.25, "y": 4.5, "w": 2.75},
+
+        {"matrix": [5, 16], "x": 16.25, "y": 4.5},
+
+        {"matrix": [5, 19], "x": 18.5, "y": 4.5},
+        {"matrix": [5, 20], "x": 19.5, "y": 4.5},
+        {"matrix": [5, 21], "x": 20.5, "y": 4.5},
+
+        {"matrix": [6, 0], "x": 0, "y": 5.5, "w": 1.25},
+        {"matrix": [6, 1], "x": 1.25, "y": 5.5, "w": 1.25},
+        {"matrix": [6, 3], "x": 2.5, "y": 5.5, "w": 1.25},
+        {"matrix": [6, 6], "x": 3.75, "y": 5.5, "w": 6.25},
+        {"matrix": [6, 10], "x": 10, "y": 5.5, "w": 1.25},
+        {"matrix": [6, 11], "x": 11.25, "y": 5.5, "w": 1.25},
+        {"matrix": [6, 13], "x": 12.5, "y": 5.5, "w": 1.25},
+        {"matrix": [6, 14], "x": 13.75, "y": 5.5, "w": 1.25},
+
+        {"matrix": [6, 15], "x": 15.25, "y": 5.5},
+        {"matrix": [6, 16], "x": 16.25, "y": 5.5},
+        {"matrix": [6, 17], "x": 17.25, "y": 5.5},
+
+        {"matrix": [6, 19], "x": 18.5, "y": 5.5, "w": 2},
+        {"matrix": [6, 21], "x": 20.5, "y": 5.5},
+        {"matrix": [6, 22], "x": 21.5, "y": 4.5, "h": 2},
+
+        {"matrix": [7, 5], "x": 5.25, "y": 6.5},
+        {"matrix": [7, 6], "x": 6.25, "y": 6.5},
+        {"matrix": [7, 7], "x": 7.25, "y": 6.5}
+      ]
+    }
+  }
+}
diff --git a/keyboards/handwired/108key_trackpoint/rules.mk b/keyboards/handwired/108key_trackpoint/rules.mk
index acdf7bf3932..74035c9903b 100644
--- a/keyboards/handwired/108key_trackpoint/rules.mk
+++ b/keyboards/handwired/108key_trackpoint/rules.mk
@@ -1,15 +1 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = yes        # Console for debug
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-PS2_MOUSE_ENABLE = yes
-PS2_ENABLE = yes
 PS2_DRIVER = usart
diff --git a/keyboards/handwired/10k/info.json b/keyboards/handwired/10k/info.json
deleted file mode 100644
index 9b0164ed85e..00000000000
--- a/keyboards/handwired/10k/info.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "keyboard_name": "10k",
-  "maintainer": "Nabos",
-  "manufacturer": "Nabos",
-  "diode_direction": "COL2ROW",
-  "matrix_pins": {
-    "cols": ["C6", "D7", "E6", "B4", "B5"],
-    "rows": ["B6"]
-  },
-  "features": {
-    "bootmagic": false,
-    "command": false,
-    "console": false,
-    "extrakey": false,
-    "mousekey": false,
-    "nkro": false
-  },
-  "split": {
-    "enabled": true
-  },
-  "usb": {
-    "vid": "0x6869",
-    "pid": "0x0001",
-    "device_version": "0.0.1"
-  },
-  "processor": "atmega32u4",
-  "bootloader": "caterina",
-  "layout_aliases": {
-    "LAYOUT": "LAYOUT_split_1x5"
-  },
-  "layouts": {
-    "LAYOUT_split_1x5": {
-      "layout": [
-        {"matrix": [0, 0], "x": 0, "y": 0.25},
-        {"matrix": [0, 1], "x": 1, "y": 0.125},
-        {"matrix": [0, 2], "x": 2, "y": 0},
-        {"matrix": [0, 3], "x": 3, "y": 0.5},
-        {"matrix": [0, 4], "x": 3.75, "y": 2.75},
-
-        {"matrix": [1, 0], "x": 5.75, "y": 2.75},
-        {"matrix": [1, 1], "x": 6.5, "y": 0.5},
-        {"matrix": [1, 2], "x": 7.5, "y": 0},
-        {"matrix": [1, 3], "x": 8.5, "y": 0.125},
-        {"matrix": [1, 4], "x": 9.5, "y": 0.25}
-      ]
-    }
-  }
-}
diff --git a/keyboards/handwired/10k/keyboard.json b/keyboards/handwired/10k/keyboard.json
new file mode 100644
index 00000000000..a3293601e3a
--- /dev/null
+++ b/keyboards/handwired/10k/keyboard.json
@@ -0,0 +1,51 @@
+{
+  "keyboard_name": "10k",
+  "maintainer": "Nabos",
+  "manufacturer": "Nabos",
+  "diode_direction": "COL2ROW",
+  "matrix_pins": {
+    "cols": ["C6", "D7", "E6", "B4", "B5"],
+    "rows": ["B6"]
+  },
+  "build": {
+    "lto": true
+  },
+  "features": {
+    "bootmagic": false,
+    "command": false,
+    "console": false,
+    "extrakey": false,
+    "mousekey": false,
+    "nkro": false
+  },
+  "split": {
+    "enabled": true
+  },
+  "usb": {
+    "vid": "0x6869",
+    "pid": "0x0001",
+    "device_version": "0.0.1"
+  },
+  "processor": "atmega32u4",
+  "bootloader": "caterina",
+  "layout_aliases": {
+    "LAYOUT": "LAYOUT_split_1x5"
+  },
+  "layouts": {
+    "LAYOUT_split_1x5": {
+      "layout": [
+        {"matrix": [0, 0], "x": 0, "y": 0.25},
+        {"matrix": [0, 1], "x": 1, "y": 0.125},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0.5},
+        {"matrix": [0, 4], "x": 3.75, "y": 2.75},
+
+        {"matrix": [1, 0], "x": 5.75, "y": 2.75},
+        {"matrix": [1, 1], "x": 6.5, "y": 0.5},
+        {"matrix": [1, 2], "x": 7.5, "y": 0},
+        {"matrix": [1, 3], "x": 8.5, "y": 0.125},
+        {"matrix": [1, 4], "x": 9.5, "y": 0.25}
+      ]
+    }
+  }
+}
diff --git a/keyboards/handwired/10k/rules.mk b/keyboards/handwired/10k/rules.mk
deleted file mode 100644
index 4da205a168c..00000000000
--- a/keyboards/handwired/10k/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-LTO_ENABLE = yes
diff --git a/keyboards/handwired/42/info.json b/keyboards/handwired/42/info.json
deleted file mode 100644
index e2cc8dbf716..00000000000
--- a/keyboards/handwired/42/info.json
+++ /dev/null
@@ -1,79 +0,0 @@
-{
-    "keyboard_name": "42",
-    "manufacturer": "nglgzz",
-    "url": "",
-    "maintainer": "nglgzz",
-    "usb": {
-        "vid": "0xFEED",
-        "pid": "0x0000",
-        "device_version": "0.0.3"
-    },
-    "bluetooth": {
-        "driver": "bluefruit_le"
-    },
-    "tapping": {
-        "term": 100
-    },
-    "matrix_pins": {
-        "cols": ["F5", "F6", "F7", "F0", "F1", "F4", "B6", "B5", "D7", "C7", "D6", "B7"],
-        "rows": ["D2", "D3", "D0", "D1"]
-    },
-    "diode_direction": "COL2ROW",
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0.625},
-                {"matrix": [0, 1], "x": 1, "y": 0.417},
-                {"matrix": [0, 2], "x": 2, "y": 0.208},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0.208},
-                {"matrix": [0, 5], "x": 5, "y": 0.417},
-
-                {"matrix": [0, 6], "x": 8.5, "y": 0.417},
-                {"matrix": [0, 7], "x": 9.5, "y": 0.208},
-                {"matrix": [0, 8], "x": 10.5, "y": 0},
-                {"matrix": [0, 9], "x": 11.5, "y": 0.208},
-                {"matrix": [0, 10], "x": 12.5, "y": 0.417},
-                {"matrix": [0, 11], "x": 13.5, "y": 0.625},
-
-                {"matrix": [1, 0], "x": 0, "y": 1.625},
-                {"matrix": [1, 1], "x": 1, "y": 1.417},
-                {"matrix": [1, 2], "x": 2, "y": 1.208},
-                {"matrix": [1, 3], "x": 3, "y": 1},
-                {"matrix": [1, 4], "x": 4, "y": 1.208},
-                {"matrix": [1, 5], "x": 5, "y": 1.417},
-
-                {"matrix": [1, 6], "x": 8.5, "y": 1.417},
-                {"matrix": [1, 7], "x": 9.5, "y": 1.208},
-                {"matrix": [1, 8], "x": 10.5, "y": 1},
-                {"matrix": [1, 9], "x": 11.5, "y": 1.208},
-                {"matrix": [1, 10], "x": 12.5, "y": 1.417},
-                {"matrix": [1, 11], "x": 13.5, "y": 1.625},
-
-                {"matrix": [2, 0], "x": 0, "y": 2.625},
-                {"matrix": [2, 1], "x": 1, "y": 2.417},
-                {"matrix": [2, 2], "x": 2, "y": 2.208},
-                {"matrix": [2, 3], "x": 3, "y": 2},
-                {"matrix": [2, 4], "x": 4, "y": 2.208},
-                {"matrix": [2, 5], "x": 5, "y": 2.417},
-
-                {"matrix": [2, 6], "x": 8.5, "y": 2.417},
-                {"matrix": [2, 7], "x": 9.5, "y": 2.208},
-                {"matrix": [2, 8], "x": 10.5, "y": 2},
-                {"matrix": [2, 9], "x": 11.5, "y": 2.208},
-                {"matrix": [2, 10], "x": 12.5, "y": 2.417},
-                {"matrix": [2, 11], "x": 13.5, "y": 2.625},
-
-                {"matrix": [3, 3], "x": 4, "y": 3.208},
-                {"matrix": [3, 4], "x": 5, "y": 3.417},
-                {"matrix": [3, 5], "x": 5.75, "y": 4.417},
-
-                {"matrix": [3, 6], "x": 7.75, "y": 4.417},
-                {"matrix": [3, 7], "x": 8.5, "y": 3.417},
-                {"matrix": [3, 8], "x": 9.5, "y": 3.208}
-            ]
-        }
-    }
-}
diff --git a/keyboards/handwired/42/keyboard.json b/keyboards/handwired/42/keyboard.json
new file mode 100644
index 00000000000..d68dcd1ec2f
--- /dev/null
+++ b/keyboards/handwired/42/keyboard.json
@@ -0,0 +1,86 @@
+{
+    "keyboard_name": "42",
+    "manufacturer": "nglgzz",
+    "url": "",
+    "maintainer": "nglgzz",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0x0000",
+        "device_version": "0.0.3"
+    },
+    "bluetooth": {
+        "driver": "bluefruit_le"
+    },
+    "tapping": {
+        "term": 100
+    },
+    "matrix_pins": {
+        "cols": ["F5", "F6", "F7", "F0", "F1", "F4", "B6", "B5", "D7", "C7", "D6", "B7"],
+        "rows": ["D2", "D3", "D0", "D1"]
+    },
+    "diode_direction": "COL2ROW",
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
+    "features": {
+        "bootmagic": false,
+        "mousekey": true,
+        "extrakey": true,
+        "nkro": true,
+        "bluetooth": true
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0.625},
+                {"matrix": [0, 1], "x": 1, "y": 0.417},
+                {"matrix": [0, 2], "x": 2, "y": 0.208},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0.208},
+                {"matrix": [0, 5], "x": 5, "y": 0.417},
+
+                {"matrix": [0, 6], "x": 8.5, "y": 0.417},
+                {"matrix": [0, 7], "x": 9.5, "y": 0.208},
+                {"matrix": [0, 8], "x": 10.5, "y": 0},
+                {"matrix": [0, 9], "x": 11.5, "y": 0.208},
+                {"matrix": [0, 10], "x": 12.5, "y": 0.417},
+                {"matrix": [0, 11], "x": 13.5, "y": 0.625},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.625},
+                {"matrix": [1, 1], "x": 1, "y": 1.417},
+                {"matrix": [1, 2], "x": 2, "y": 1.208},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1.208},
+                {"matrix": [1, 5], "x": 5, "y": 1.417},
+
+                {"matrix": [1, 6], "x": 8.5, "y": 1.417},
+                {"matrix": [1, 7], "x": 9.5, "y": 1.208},
+                {"matrix": [1, 8], "x": 10.5, "y": 1},
+                {"matrix": [1, 9], "x": 11.5, "y": 1.208},
+                {"matrix": [1, 10], "x": 12.5, "y": 1.417},
+                {"matrix": [1, 11], "x": 13.5, "y": 1.625},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.625},
+                {"matrix": [2, 1], "x": 1, "y": 2.417},
+                {"matrix": [2, 2], "x": 2, "y": 2.208},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2.208},
+                {"matrix": [2, 5], "x": 5, "y": 2.417},
+
+                {"matrix": [2, 6], "x": 8.5, "y": 2.417},
+                {"matrix": [2, 7], "x": 9.5, "y": 2.208},
+                {"matrix": [2, 8], "x": 10.5, "y": 2},
+                {"matrix": [2, 9], "x": 11.5, "y": 2.208},
+                {"matrix": [2, 10], "x": 12.5, "y": 2.417},
+                {"matrix": [2, 11], "x": 13.5, "y": 2.625},
+
+                {"matrix": [3, 3], "x": 4, "y": 3.208},
+                {"matrix": [3, 4], "x": 5, "y": 3.417},
+                {"matrix": [3, 5], "x": 5.75, "y": 4.417},
+
+                {"matrix": [3, 6], "x": 7.75, "y": 4.417},
+                {"matrix": [3, 7], "x": 8.5, "y": 3.417},
+                {"matrix": [3, 8], "x": 9.5, "y": 3.208}
+            ]
+        }
+    }
+}
diff --git a/keyboards/handwired/42/rules.mk b/keyboards/handwired/42/rules.mk
index 0c5b506f63f..3437a35bdf1 100644
--- a/keyboards/handwired/42/rules.mk
+++ b/keyboards/handwired/42/rules.mk
@@ -1,17 +1,2 @@
 # Processor frequency
 F_CPU = 8000000
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
-BLUETOOTH_ENABLE = yes
diff --git a/keyboards/handwired/aball/info.json b/keyboards/handwired/aball/info.json
deleted file mode 100644
index 173abdfb60a..00000000000
--- a/keyboards/handwired/aball/info.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-    "keyboard_name": "ABall",
-    "manufacturer": "Richard Sutherland",
-    "url": "https://github.com/brickbots/aball/",
-    "maintainer": "@brickbots",
-    "usb": {
-        "vid": "0xFEED",
-        "pid": "0xC2F0",
-        "device_version": "0.0.1"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "matrix_pins": {
-        "direct": [
-            [null]
-        ]
-    },
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"x": 0, "y": 0, "matrix": [0, 0]}
-            ]
-        }
-    }
-}
diff --git a/keyboards/handwired/aball/keyboard.json b/keyboards/handwired/aball/keyboard.json
new file mode 100644
index 00000000000..6ab686c5186
--- /dev/null
+++ b/keyboards/handwired/aball/keyboard.json
@@ -0,0 +1,31 @@
+{
+    "keyboard_name": "ABall",
+    "manufacturer": "Richard Sutherland",
+    "url": "https://github.com/brickbots/aball/",
+    "maintainer": "@brickbots",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0xC2F0",
+        "device_version": "0.0.1"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": false,
+        "mousekey": true,
+        "extrakey": false,
+        "pointing_device": true
+    },
+    "matrix_pins": {
+        "direct": [
+            [null]
+        ]
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"x": 0, "y": 0, "matrix": [0, 0]}
+            ]
+        }
+    }
+}
diff --git a/keyboards/handwired/aball/rules.mk b/keyboards/handwired/aball/rules.mk
index d5e8e6ab985..84de35aeb14 100644
--- a/keyboards/handwired/aball/rules.mk
+++ b/keyboards/handwired/aball/rules.mk
@@ -1,16 +1 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = no        # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
-# Add trackball support
-POINTING_DEVICE_ENABLE = yes
 POINTING_DEVICE_DRIVER = adns9800
diff --git a/keyboards/handwired/alcor_dactyl/info.json b/keyboards/handwired/alcor_dactyl/keyboard.json
similarity index 100%
rename from keyboards/handwired/alcor_dactyl/info.json
rename to keyboards/handwired/alcor_dactyl/keyboard.json
diff --git a/keyboards/handwired/battleship_gamepad/info.json b/keyboards/handwired/battleship_gamepad/info.json
deleted file mode 100644
index 06ef96ba21e..00000000000
--- a/keyboards/handwired/battleship_gamepad/info.json
+++ /dev/null
@@ -1,68 +0,0 @@
-{
-    "keyboard_name": "Battleship Gamepad",
-    "manufacturer": "arbraini",
-    "url": "https://github.com/abraini-Nascent/battleship_gamepad",
-    "maintainer": "arbraini",
-    "usb": {
-        "vid": "0x4142",
-        "pid": "0x0000",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5"],
-        "rows": ["B6", "B2", "B3", "B1", "F7"]
-    },
-    "diode_direction": "COL2ROW",
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"x": 0, "y": 0, "matrix": [0, 0]},
-                {"x": 1, "y": 0, "matrix": [0, 1]},
-                {"x": 2.25, "y": 0, "w": 1.25, "matrix": [0, 2]},
-                {"x": 3.5, "y": 0, "matrix": [0, 3]},
-                {"x": 4.5, "y": 0, "matrix": [0, 4]},
-                {"x": 5.5, "y": 0, "matrix": [0, 5]},
-                {"x": 6.5, "y": 0, "matrix": [0, 6]},
-                {"x": 7.5, "y": 0, "matrix": [0, 7]},
-
-                {"x": 0, "y": 1, "matrix": [1, 0]},
-                {"x": 1, "y": 1, "matrix": [1, 1]},
-                {"x": 2.25, "y": 1, "w": 1.25, "matrix": [1, 2]},
-                {"x": 3.5, "y": 1, "matrix": [1, 3]},
-                {"x": 4.5, "y": 1, "matrix": [1, 4]},
-                {"x": 5.5, "y": 1, "matrix": [1, 5]},
-                {"x": 6.5, "y": 1, "matrix": [1, 6]},
-                {"x": 7.5, "y": 1, "matrix": [1, 7]},
-
-                {"x": 0, "y": 2, "matrix": [2, 0]},
-                {"x": 1, "y": 2, "matrix": [2, 1]},
-                {"x": 2.25, "y": 2, "w": 1.25, "matrix": [2, 2]},
-                {"x": 3.5, "y": 2, "matrix": [2, 3]},
-                {"x": 4.5, "y": 2, "matrix": [2, 4]},
-                {"x": 5.5, "y": 2, "matrix": [2, 5]},
-                {"x": 6.5, "y": 2, "matrix": [2, 6]},
-                {"x": 7.5, "y": 2, "matrix": [2, 7]},
-
-                {"x": 0, "y": 3, "matrix": [3, 0]},
-                {"x": 1, "y": 3, "matrix": [3, 1]},
-                {"x": 2.25, "y": 3, "w": 1.25, "matrix": [3, 2]},
-                {"x": 3.5, "y": 3, "matrix": [3, 3]},
-                {"x": 4.5, "y": 3, "matrix": [3, 4]},
-                {"x": 5.5, "y": 3, "matrix": [3, 5]},
-                {"x": 6.5, "y": 3, "matrix": [3, 6]},
-                {"x": 7.5, "y": 3, "matrix": [3, 7]},
-
-                {"x": 0, "y": 4, "matrix": [4, 0]},
-                {"x": 1, "y": 4, "matrix": [4, 1]},
-                {"x": 2.25, "y": 4, "w": 1.25, "matrix": [4, 2]},
-                {"x": 3.5, "y": 4, "matrix": [4, 3]},
-                {"x": 4.5, "y": 4, "matrix": [4, 4]},
-                {"x": 5.5, "y": 4, "matrix": [4, 5]},
-                {"x": 6.5, "y": 4, "matrix": [4, 6]},
-                {"x": 7.5, "y": 4, "matrix": [4, 7]}
-            ]
-        }
-    }
-}
diff --git a/keyboards/handwired/battleship_gamepad/keyboard.json b/keyboards/handwired/battleship_gamepad/keyboard.json
new file mode 100644
index 00000000000..3b4010ce40c
--- /dev/null
+++ b/keyboards/handwired/battleship_gamepad/keyboard.json
@@ -0,0 +1,75 @@
+{
+    "keyboard_name": "Battleship Gamepad",
+    "manufacturer": "arbraini",
+    "url": "https://github.com/abraini-Nascent/battleship_gamepad",
+    "maintainer": "arbraini",
+    "usb": {
+        "vid": "0x4142",
+        "pid": "0x0000",
+        "device_version": "0.0.1"
+    },
+    "matrix_pins": {
+        "cols": ["D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5"],
+        "rows": ["B6", "B2", "B3", "B1", "F7"]
+    },
+    "diode_direction": "COL2ROW",
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
+    "features": {
+        "bootmagic": false,
+        "mousekey": true,
+        "extrakey": true,
+        "nkro": true,
+        "joystick": true
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"x": 0, "y": 0, "matrix": [0, 0]},
+                {"x": 1, "y": 0, "matrix": [0, 1]},
+                {"x": 2.25, "y": 0, "w": 1.25, "matrix": [0, 2]},
+                {"x": 3.5, "y": 0, "matrix": [0, 3]},
+                {"x": 4.5, "y": 0, "matrix": [0, 4]},
+                {"x": 5.5, "y": 0, "matrix": [0, 5]},
+                {"x": 6.5, "y": 0, "matrix": [0, 6]},
+                {"x": 7.5, "y": 0, "matrix": [0, 7]},
+
+                {"x": 0, "y": 1, "matrix": [1, 0]},
+                {"x": 1, "y": 1, "matrix": [1, 1]},
+                {"x": 2.25, "y": 1, "w": 1.25, "matrix": [1, 2]},
+                {"x": 3.5, "y": 1, "matrix": [1, 3]},
+                {"x": 4.5, "y": 1, "matrix": [1, 4]},
+                {"x": 5.5, "y": 1, "matrix": [1, 5]},
+                {"x": 6.5, "y": 1, "matrix": [1, 6]},
+                {"x": 7.5, "y": 1, "matrix": [1, 7]},
+
+                {"x": 0, "y": 2, "matrix": [2, 0]},
+                {"x": 1, "y": 2, "matrix": [2, 1]},
+                {"x": 2.25, "y": 2, "w": 1.25, "matrix": [2, 2]},
+                {"x": 3.5, "y": 2, "matrix": [2, 3]},
+                {"x": 4.5, "y": 2, "matrix": [2, 4]},
+                {"x": 5.5, "y": 2, "matrix": [2, 5]},
+                {"x": 6.5, "y": 2, "matrix": [2, 6]},
+                {"x": 7.5, "y": 2, "matrix": [2, 7]},
+
+                {"x": 0, "y": 3, "matrix": [3, 0]},
+                {"x": 1, "y": 3, "matrix": [3, 1]},
+                {"x": 2.25, "y": 3, "w": 1.25, "matrix": [3, 2]},
+                {"x": 3.5, "y": 3, "matrix": [3, 3]},
+                {"x": 4.5, "y": 3, "matrix": [3, 4]},
+                {"x": 5.5, "y": 3, "matrix": [3, 5]},
+                {"x": 6.5, "y": 3, "matrix": [3, 6]},
+                {"x": 7.5, "y": 3, "matrix": [3, 7]},
+
+                {"x": 0, "y": 4, "matrix": [4, 0]},
+                {"x": 1, "y": 4, "matrix": [4, 1]},
+                {"x": 2.25, "y": 4, "w": 1.25, "matrix": [4, 2]},
+                {"x": 3.5, "y": 4, "matrix": [4, 3]},
+                {"x": 4.5, "y": 4, "matrix": [4, 4]},
+                {"x": 5.5, "y": 4, "matrix": [4, 5]},
+                {"x": 6.5, "y": 4, "matrix": [4, 6]},
+                {"x": 7.5, "y": 4, "matrix": [4, 7]}
+            ]
+        }
+    }
+}
diff --git a/keyboards/handwired/battleship_gamepad/rules.mk b/keyboards/handwired/battleship_gamepad/rules.mk
index a41273f8900..c5ab560bca9 100644
--- a/keyboards/handwired/battleship_gamepad/rules.mk
+++ b/keyboards/handwired/battleship_gamepad/rules.mk
@@ -1,14 +1 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-JOYSTICK_ENABLE = yes
 JOYSTICK_DRIVER = analog
diff --git a/keyboards/handwired/bdn9_ble/info.json b/keyboards/handwired/bdn9_ble/info.json
deleted file mode 100644
index e5c94794537..00000000000
--- a/keyboards/handwired/bdn9_ble/info.json
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-  "keyboard_name": "BDN9-BLE",
-  "manufacturer": "KeyPCB/Keebio",
-  "url": "",
-  "maintainer": "merlin04",
-  "usb": {
-    "vid": "0xCB10",
-    "pid": "0x1134",
-    "device_version": "1.0.0"
-  },
-  "bluetooth": {
-    "driver": "bluefruit_le"
-  },
-  "backlight": {
-    "driver": "timer",
-    "pin": "F6",
-    "levels": 5
-  },
-  "processor": "atmega32u4",
-  "bootloader": "caterina",
-  "matrix_pins": {
-    "direct": [
-      ["D1", "D0", "C6"],
-      ["D7", "B5", "B6"],
-      ["B7", "D6", "F7"]
-    ]
-  },
-  "layouts": {
-    "LAYOUT": {
-      "layout": [
-        {"x": 0, "y": 0, "matrix": [0, 0]},
-        {"x": 1, "y": 0, "matrix": [0, 1]},
-        {"x": 2, "y": 0, "matrix": [0, 2]},
-        {"x": 0, "y": 1, "matrix": [1, 0]},
-        {"x": 1, "y": 1, "matrix": [1, 1]},
-        {"x": 2, "y": 1, "matrix": [1, 2]},
-        {"x": 0, "y": 2, "matrix": [2, 0]},
-        {"x": 1, "y": 2, "matrix": [2, 1]},
-        {"x": 2, "y": 2, "matrix": [2, 2]}
-      ]
-    }
-  }
-}
diff --git a/keyboards/handwired/bdn9_ble/keyboard.json b/keyboards/handwired/bdn9_ble/keyboard.json
new file mode 100644
index 00000000000..76d9e42f83c
--- /dev/null
+++ b/keyboards/handwired/bdn9_ble/keyboard.json
@@ -0,0 +1,52 @@
+{
+  "keyboard_name": "BDN9-BLE",
+  "manufacturer": "KeyPCB/Keebio",
+  "url": "",
+  "maintainer": "merlin04",
+  "usb": {
+    "vid": "0xCB10",
+    "pid": "0x1134",
+    "device_version": "1.0.0"
+  },
+  "bluetooth": {
+    "driver": "bluefruit_le"
+  },
+  "backlight": {
+    "driver": "timer",
+    "pin": "F6",
+    "levels": 5
+  },
+  "processor": "atmega32u4",
+  "bootloader": "caterina",
+  "features": {
+    "bootmagic": false,
+    "mousekey": false,
+    "extrakey": true,
+    "console": true,
+    "command": true,
+    "backlight": true,
+    "bluetooth": true
+  },
+  "matrix_pins": {
+    "direct": [
+      ["D1", "D0", "C6"],
+      ["D7", "B5", "B6"],
+      ["B7", "D6", "F7"]
+    ]
+  },
+  "layouts": {
+    "LAYOUT": {
+      "layout": [
+        {"x": 0, "y": 0, "matrix": [0, 0]},
+        {"x": 1, "y": 0, "matrix": [0, 1]},
+        {"x": 2, "y": 0, "matrix": [0, 2]},
+        {"x": 0, "y": 1, "matrix": [1, 0]},
+        {"x": 1, "y": 1, "matrix": [1, 1]},
+        {"x": 2, "y": 1, "matrix": [1, 2]},
+        {"x": 0, "y": 2, "matrix": [2, 0]},
+        {"x": 1, "y": 2, "matrix": [2, 1]},
+        {"x": 2, "y": 2, "matrix": [2, 2]}
+      ]
+    }
+  }
+}
diff --git a/keyboards/handwired/bdn9_ble/rules.mk b/keyboards/handwired/bdn9_ble/rules.mk
index 0dafe2f289e..3437a35bdf1 100644
--- a/keyboards/handwired/bdn9_ble/rules.mk
+++ b/keyboards/handwired/bdn9_ble/rules.mk
@@ -1,17 +1,2 @@
 # Processor frequency
 F_CPU = 8000000
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = yes        # Console for debug
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = yes       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no       # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-ENCODER_ENABLE = no
-BLUETOOTH_ENABLE = yes
diff --git a/keyboards/handwired/bento/rev1/info.json b/keyboards/handwired/bento/rev1/info.json
deleted file mode 100644
index 6730c14a361..00000000000
--- a/keyboards/handwired/bento/rev1/info.json
+++ /dev/null
@@ -1,57 +0,0 @@
-{
-  "keyboard_name": "Bento Macropad Rev. 1",
-  "manufacturer": "GhostSeven",
-  "url": "https://www.thingiverse.com/thing:4416966",
-  "maintainer": "Ghostseven",
-  "usb": {
-    "vid": "0xFEED",
-    "pid": "0xDAD3",
-    "device_version": "1.0.0"
-  },
-  "rgblight": {
-    "saturation_steps": 8,
-    "brightness_steps": 8,
-    "led_count": 4,
-    "sleep": true,
-    "animations": {
-      "breathing": true,
-      "rainbow_mood": true,
-      "rainbow_swirl": true,
-      "snake": true,
-      "knight": true,
-      "christmas": true,
-      "static_gradient": true,
-      "rgb_test": true,
-      "alternating": true,
-      "twinkle": true
-    }
-  },
-  "ws2812": {
-    "pin": "D3"
-  },
-  "encoder": {
-    "rotary": [
-      {"pin_a": "D1", "pin_b": "D0"}
-    ]
-  },
-  "processor": "atmega32u4",
-  "bootloader": "caterina",
-  "matrix_pins": {
-    "direct": [
-      ["D7", "B1", "D2"],
-      ["E6", "B4", "B2"]
-    ]
-  },
-  "layouts": {
-    "LAYOUT": {
-      "layout": [
-        {"x": 0, "y": 0, "matrix": [0, 0]},
-        {"x": 1, "y": 0, "matrix": [0, 1]},
-        {"x": 2, "y": 0, "matrix": [0, 2]},
-        {"x": 0, "y": 1, "matrix": [1, 0]},
-        {"x": 1, "y": 1, "matrix": [1, 1]},
-        {"x": 2, "y": 1, "matrix": [1, 2]}
-      ]
-    }
-  }
-}
diff --git a/keyboards/handwired/bento/rev1/keyboard.json b/keyboards/handwired/bento/rev1/keyboard.json
new file mode 100644
index 00000000000..3baa7d77ce4
--- /dev/null
+++ b/keyboards/handwired/bento/rev1/keyboard.json
@@ -0,0 +1,66 @@
+{
+  "keyboard_name": "Bento Macropad Rev. 1",
+  "manufacturer": "GhostSeven",
+  "url": "https://www.thingiverse.com/thing:4416966",
+  "maintainer": "Ghostseven",
+  "usb": {
+    "vid": "0xFEED",
+    "pid": "0xDAD3",
+    "device_version": "1.0.0"
+  },
+  "rgblight": {
+    "saturation_steps": 8,
+    "brightness_steps": 8,
+    "led_count": 4,
+    "sleep": true,
+    "animations": {
+      "breathing": true,
+      "rainbow_mood": true,
+      "rainbow_swirl": true,
+      "snake": true,
+      "knight": true,
+      "christmas": true,
+      "static_gradient": true,
+      "rgb_test": true,
+      "alternating": true,
+      "twinkle": true
+    }
+  },
+  "ws2812": {
+    "pin": "D3"
+  },
+  "encoder": {
+    "rotary": [
+      {"pin_a": "D1", "pin_b": "D0"}
+    ]
+  },
+  "processor": "atmega32u4",
+  "bootloader": "caterina",
+  "features": {
+    "bootmagic": false,
+    "mousekey": false,
+    "extrakey": true,
+    "console": true,
+    "command": true,
+    "rgblight": true,
+    "encoder": true
+  },
+  "matrix_pins": {
+    "direct": [
+      ["D7", "B1", "D2"],
+      ["E6", "B4", "B2"]
+    ]
+  },
+  "layouts": {
+    "LAYOUT": {
+      "layout": [
+        {"x": 0, "y": 0, "matrix": [0, 0]},
+        {"x": 1, "y": 0, "matrix": [0, 1]},
+        {"x": 2, "y": 0, "matrix": [0, 2]},
+        {"x": 0, "y": 1, "matrix": [1, 0]},
+        {"x": 1, "y": 1, "matrix": [1, 1]},
+        {"x": 2, "y": 1, "matrix": [1, 2]}
+      ]
+    }
+  }
+}
diff --git a/keyboards/handwired/bento/rev1/rules.mk b/keyboards/handwired/bento/rev1/rules.mk
deleted file mode 100644
index 6a4a0677378..00000000000
--- a/keyboards/handwired/bento/rev1/rules.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = yes        # Console for debug
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-ENCODER_ENABLE = yes
diff --git a/keyboards/handwired/cyberstar/info.json b/keyboards/handwired/cyberstar/info.json
deleted file mode 100644
index 6b2db46b1f0..00000000000
--- a/keyboards/handwired/cyberstar/info.json
+++ /dev/null
@@ -1,402 +0,0 @@
-{
-    "keyboard_name": "Cyberstar",
-    "manufacturer": "Yiancar-Designs",
-    "url": "https://yiancar-designs.com",
-    "maintainer": "Yiancar-Designs",
-    "usb": {
-        "vid": "0x8968",
-        "pid": "0x432A",
-        "device_version": "0.0.1"
-    },
-    "rgblight": {
-        "saturation_steps": 8,
-        "brightness_steps": 8,
-        "led_count": 12,
-        "animations": {
-            "breathing": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "snake": true,
-            "knight": true,
-            "christmas": true,
-            "static_gradient": true,
-            "rgb_test": true,
-            "alternating": true,
-            "twinkle": true
-        }
-    },
-    "ws2812": {
-        "pin": "B4",
-        "driver": "pwm"
-    },
-    "matrix_pins": {
-        "cols": ["A4", "A5", "A6", "A7", "B0", "B1", "B2", "B10", "B11", "B12", "B13", "B14", "B15", "A8", "A10", "A14", "B8", "B9"],
-        "rows": ["A15", "B3", "A9", "B5", "A3"]
-    },
-    "diode_direction": "COL2ROW",
-    "processor": "STM32F072",
-    "bootloader": "stm32-dfu",
-    "layout_aliases": {
-        "LAYOUT_all": "LAYOUT_split_space_split_bs"
-    },
-    "layouts": {
-        "LAYOUT_split_space": {
-            "layout": [
-                {"label": "F1", "matrix": [0, 0], "x": 0, "y": 0},
-
-                {"label": "Esc", "matrix": [0, 1], "x": 1.25, "y": 0},
-                {"label": "1", "matrix": [0, 2], "x": 2.25, "y": 0},
-                {"label": "2", "matrix": [0, 3], "x": 3.25, "y": 0},
-                {"label": "3", "matrix": [0, 4], "x": 4.25, "y": 0},
-                {"label": "4", "matrix": [0, 5], "x": 5.25, "y": 0},
-                {"label": "5", "matrix": [0, 6], "x": 6.25, "y": 0},
-                {"label": "6", "matrix": [0, 7], "x": 7.25, "y": 0},
-                {"label": "7", "matrix": [0, 8], "x": 8.25, "y": 0},
-                {"label": "8", "matrix": [0, 9], "x": 9.25, "y": 0},
-                {"label": "9", "matrix": [0, 10], "x": 10.25, "y": 0},
-                {"label": "0", "matrix": [0, 11], "x": 11.25, "y": 0},
-                {"label": "-", "matrix": [0, 12], "x": 12.25, "y": 0},
-                {"label": "=", "matrix": [0, 13], "x": 13.25, "y": 0},
-                {"label": "Backspace", "matrix": [0, 14], "x": 14.25, "y": 0, "w": 2},
-
-                {"label": "Insert", "matrix": [0, 15], "x": 16.5, "y": 0},
-                {"label": "Home", "matrix": [0, 16], "x": 17.5, "y": 0},
-                {"label": "Page Up", "matrix": [0, 17], "x": 18.5, "y": 0},
-
-                {"label": "F2", "matrix": [1, 0], "x": 0, "y": 1},
-
-                {"label": "Tab", "matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 2], "x": 2.75, "y": 1},
-                {"label": "W", "matrix": [1, 3], "x": 3.75, "y": 1},
-                {"label": "E", "matrix": [1, 4], "x": 4.75, "y": 1},
-                {"label": "R", "matrix": [1, 5], "x": 5.75, "y": 1},
-                {"label": "T", "matrix": [1, 6], "x": 6.75, "y": 1},
-                {"label": "Y", "matrix": [1, 7], "x": 7.75, "y": 1},
-                {"label": "U", "matrix": [1, 8], "x": 8.75, "y": 1},
-                {"label": "I", "matrix": [1, 9], "x": 9.75, "y": 1},
-                {"label": "O", "matrix": [1, 10], "x": 10.75, "y": 1},
-                {"label": "P", "matrix": [1, 11], "x": 11.75, "y": 1},
-                {"label": "[", "matrix": [1, 12], "x": 12.75, "y": 1},
-                {"label": "]", "matrix": [1, 13], "x": 13.75, "y": 1},
-                {"label": "\\", "matrix": [2, 13], "x": 14.75, "y": 1, "w": 1.5},
-
-                {"label": "Delete", "matrix": [1, 15], "x": 16.5, "y": 1},
-                {"label": "End", "matrix": [1, 16], "x": 17.5, "y": 1},
-                {"label": "Page Down", "matrix": [1, 17], "x": 18.5, "y": 1},
-
-                {"label": "F3", "matrix": [2, 0], "x": 0, "y": 2},
-
-                {"label": "Caps Lock", "matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 2], "x": 3, "y": 2},
-                {"label": "S", "matrix": [2, 3], "x": 4, "y": 2},
-                {"label": "D", "matrix": [2, 4], "x": 5, "y": 2},
-                {"label": "F", "matrix": [2, 5], "x": 6, "y": 2},
-                {"label": "G", "matrix": [2, 6], "x": 7, "y": 2},
-                {"label": "H", "matrix": [2, 7], "x": 8, "y": 2},
-                {"label": "J", "matrix": [2, 8], "x": 9, "y": 2},
-                {"label": "K", "matrix": [2, 9], "x": 10, "y": 2},
-                {"label": "L", "matrix": [2, 10], "x": 11, "y": 2},
-                {"label": ";", "matrix": [2, 11], "x": 12, "y": 2},
-                {"label": "'", "matrix": [2, 12], "x": 13, "y": 2},
-                {"label": "Enter", "matrix": [2, 14], "x": 14, "y": 2, "w": 2.25},
-
-                {"label": "F4", "matrix": [3, 0], "x": 0, "y": 3},
-
-                {"label": "Shift", "matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
-                {"label": "Z", "matrix": [3, 3], "x": 3.5, "y": 3},
-                {"label": "X", "matrix": [3, 4], "x": 4.5, "y": 3},
-                {"label": "C", "matrix": [3, 5], "x": 5.5, "y": 3},
-                {"label": "V", "matrix": [3, 6], "x": 6.5, "y": 3},
-                {"label": "B", "matrix": [3, 7], "x": 7.5, "y": 3},
-                {"label": "N", "matrix": [3, 8], "x": 8.5, "y": 3},
-                {"label": "M", "matrix": [3, 9], "x": 9.5, "y": 3},
-                {"label": ",", "matrix": [3, 10], "x": 10.5, "y": 3},
-                {"label": ".", "matrix": [3, 11], "x": 11.5, "y": 3},
-                {"label": "/", "matrix": [3, 12], "x": 12.5, "y": 3},
-                {"label": "Shift", "matrix": [3, 13], "x": 13.5, "y": 3, "w": 1.75},
-                {"label": "Fn", "matrix": [3, 14], "x": 15.25, "y": 3},
-
-                {"label": "\u2191", "matrix": [3, 16], "x": 17.5, "y": 3},
-
-                {"label": "Ctrl", "matrix": [4, 3], "x": 3.25, "y": 4},
-                {"label": "Alt", "matrix": [4, 4], "x": 4.25, "y": 4, "w": 1.5},
-                {"label": "Space", "matrix": [4, 6], "x": 5.75, "y": 4, "w": 2.25},
-                {"label": "Space", "matrix": [4, 8], "x": 8, "y": 4, "w": 2.75},
-                {"label": "Alt", "matrix": [4, 11], "x": 10.75, "y": 4, "w": 1.5},
-                {"label": "Ctrl", "matrix": [4, 12], "x": 12.25, "y": 4},
-
-                {"label": "\u2190", "matrix": [4, 15], "x": 16.5, "y": 4},
-                {"label": "\u2193", "matrix": [4, 16], "x": 17.5, "y": 4},
-                {"label": "\u2192", "matrix": [4, 17], "x": 18.5, "y": 4}
-            ]
-        },
-        "LAYOUT_split_space_split_bs": {
-            "layout": [
-                {"label": "F1", "matrix": [0, 0], "x": 0, "y": 0},
-
-                {"label": "Esc", "matrix": [0, 1], "x": 1.25, "y": 0},
-                {"label": "1", "matrix": [0, 2], "x": 2.25, "y": 0},
-                {"label": "2", "matrix": [0, 3], "x": 3.25, "y": 0},
-                {"label": "3", "matrix": [0, 4], "x": 4.25, "y": 0},
-                {"label": "4", "matrix": [0, 5], "x": 5.25, "y": 0},
-                {"label": "5", "matrix": [0, 6], "x": 6.25, "y": 0},
-                {"label": "6", "matrix": [0, 7], "x": 7.25, "y": 0},
-                {"label": "7", "matrix": [0, 8], "x": 8.25, "y": 0},
-                {"label": "8", "matrix": [0, 9], "x": 9.25, "y": 0},
-                {"label": "9", "matrix": [0, 10], "x": 10.25, "y": 0},
-                {"label": "0", "matrix": [0, 11], "x": 11.25, "y": 0},
-                {"label": "-", "matrix": [0, 12], "x": 12.25, "y": 0},
-                {"label": "=", "matrix": [0, 13], "x": 13.25, "y": 0},
-                {"label": "Backspace", "matrix": [0, 14], "x": 14.25, "y": 0},
-                {"label": "Delete", "matrix": [1, 14], "x": 15.25, "y": 0},
-
-                {"label": "Insert", "matrix": [0, 15], "x": 16.5, "y": 0},
-                {"label": "Home", "matrix": [0, 16], "x": 17.5, "y": 0},
-                {"label": "Page Up", "matrix": [0, 17], "x": 18.5, "y": 0},
-
-                {"label": "F2", "matrix": [1, 0], "x": 0, "y": 1},
-
-                {"label": "Tab", "matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 2], "x": 2.75, "y": 1},
-                {"label": "W", "matrix": [1, 3], "x": 3.75, "y": 1},
-                {"label": "E", "matrix": [1, 4], "x": 4.75, "y": 1},
-                {"label": "R", "matrix": [1, 5], "x": 5.75, "y": 1},
-                {"label": "T", "matrix": [1, 6], "x": 6.75, "y": 1},
-                {"label": "Y", "matrix": [1, 7], "x": 7.75, "y": 1},
-                {"label": "U", "matrix": [1, 8], "x": 8.75, "y": 1},
-                {"label": "I", "matrix": [1, 9], "x": 9.75, "y": 1},
-                {"label": "O", "matrix": [1, 10], "x": 10.75, "y": 1},
-                {"label": "P", "matrix": [1, 11], "x": 11.75, "y": 1},
-                {"label": "[", "matrix": [1, 12], "x": 12.75, "y": 1},
-                {"label": "]", "matrix": [1, 13], "x": 13.75, "y": 1},
-                {"label": "\\", "matrix": [2, 13], "x": 14.75, "y": 1, "w": 1.5},
-
-                {"label": "Delete", "matrix": [1, 15], "x": 16.5, "y": 1},
-                {"label": "End", "matrix": [1, 16], "x": 17.5, "y": 1},
-                {"label": "Page Down", "matrix": [1, 17], "x": 18.5, "y": 1},
-
-                {"label": "F3", "matrix": [2, 0], "x": 0, "y": 2},
-
-                {"label": "Caps Lock", "matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 2], "x": 3, "y": 2},
-                {"label": "S", "matrix": [2, 3], "x": 4, "y": 2},
-                {"label": "D", "matrix": [2, 4], "x": 5, "y": 2},
-                {"label": "F", "matrix": [2, 5], "x": 6, "y": 2},
-                {"label": "G", "matrix": [2, 6], "x": 7, "y": 2},
-                {"label": "H", "matrix": [2, 7], "x": 8, "y": 2},
-                {"label": "J", "matrix": [2, 8], "x": 9, "y": 2},
-                {"label": "K", "matrix": [2, 9], "x": 10, "y": 2},
-                {"label": "L", "matrix": [2, 10], "x": 11, "y": 2},
-                {"label": ";", "matrix": [2, 11], "x": 12, "y": 2},
-                {"label": "'", "matrix": [2, 12], "x": 13, "y": 2},
-                {"label": "Enter", "matrix": [2, 14], "x": 14, "y": 2, "w": 2.25},
-
-                {"label": "F4", "matrix": [3, 0], "x": 0, "y": 3},
-
-                {"label": "Shift", "matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
-                {"label": "Z", "matrix": [3, 3], "x": 3.5, "y": 3},
-                {"label": "X", "matrix": [3, 4], "x": 4.5, "y": 3},
-                {"label": "C", "matrix": [3, 5], "x": 5.5, "y": 3},
-                {"label": "V", "matrix": [3, 6], "x": 6.5, "y": 3},
-                {"label": "B", "matrix": [3, 7], "x": 7.5, "y": 3},
-                {"label": "N", "matrix": [3, 8], "x": 8.5, "y": 3},
-                {"label": "M", "matrix": [3, 9], "x": 9.5, "y": 3},
-                {"label": ",", "matrix": [3, 10], "x": 10.5, "y": 3},
-                {"label": ".", "matrix": [3, 11], "x": 11.5, "y": 3},
-                {"label": "/", "matrix": [3, 12], "x": 12.5, "y": 3},
-                {"label": "Shift", "matrix": [3, 13], "x": 13.5, "y": 3, "w": 1.75},
-                {"label": "Fn", "matrix": [3, 14], "x": 15.25, "y": 3},
-
-                {"label": "\u2191", "matrix": [3, 16], "x": 17.5, "y": 3},
-
-                {"label": "Ctrl", "matrix": [4, 3], "x": 3.25, "y": 4},
-                {"label": "Alt", "matrix": [4, 4], "x": 4.25, "y": 4, "w": 1.5},
-                {"label": "Space", "matrix": [4, 6], "x": 5.75, "y": 4, "w": 2.25},
-                {"label": "Space", "matrix": [4, 8], "x": 8, "y": 4, "w": 2.75},
-                {"label": "Alt", "matrix": [4, 11], "x": 10.75, "y": 4, "w": 1.5},
-                {"label": "Ctrl", "matrix": [4, 12], "x": 12.25, "y": 4},
-
-                {"label": "\u2190", "matrix": [4, 15], "x": 16.5, "y": 4},
-                {"label": "\u2193", "matrix": [4, 16], "x": 17.5, "y": 4},
-                {"label": "\u2192", "matrix": [4, 17], "x": 18.5, "y": 4}
-            ]
-        },
-        "LAYOUT_625u_space": {
-            "layout": [
-                {"label": "F1", "matrix": [0, 0], "x": 0, "y": 0},
-
-                {"label": "Esc", "matrix": [0, 1], "x": 1.25, "y": 0},
-                {"label": "1", "matrix": [0, 2], "x": 2.25, "y": 0},
-                {"label": "2", "matrix": [0, 3], "x": 3.25, "y": 0},
-                {"label": "3", "matrix": [0, 4], "x": 4.25, "y": 0},
-                {"label": "4", "matrix": [0, 5], "x": 5.25, "y": 0},
-                {"label": "5", "matrix": [0, 6], "x": 6.25, "y": 0},
-                {"label": "6", "matrix": [0, 7], "x": 7.25, "y": 0},
-                {"label": "7", "matrix": [0, 8], "x": 8.25, "y": 0},
-                {"label": "8", "matrix": [0, 9], "x": 9.25, "y": 0},
-                {"label": "9", "matrix": [0, 10], "x": 10.25, "y": 0},
-                {"label": "0", "matrix": [0, 11], "x": 11.25, "y": 0},
-                {"label": "-", "matrix": [0, 12], "x": 12.25, "y": 0},
-                {"label": "=", "matrix": [0, 13], "x": 13.25, "y": 0},
-                {"label": "Backspace", "matrix": [0, 14], "x": 14.25, "y": 0, "w": 2},
-
-                {"label": "Insert", "matrix": [0, 15], "x": 16.5, "y": 0},
-                {"label": "Home", "matrix": [0, 16], "x": 17.5, "y": 0},
-                {"label": "Page Up", "matrix": [0, 17], "x": 18.5, "y": 0},
-
-                {"label": "F2", "matrix": [1, 0], "x": 0, "y": 1},
-
-                {"label": "Tab", "matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 2], "x": 2.75, "y": 1},
-                {"label": "W", "matrix": [1, 3], "x": 3.75, "y": 1},
-                {"label": "E", "matrix": [1, 4], "x": 4.75, "y": 1},
-                {"label": "R", "matrix": [1, 5], "x": 5.75, "y": 1},
-                {"label": "T", "matrix": [1, 6], "x": 6.75, "y": 1},
-                {"label": "Y", "matrix": [1, 7], "x": 7.75, "y": 1},
-                {"label": "U", "matrix": [1, 8], "x": 8.75, "y": 1},
-                {"label": "I", "matrix": [1, 9], "x": 9.75, "y": 1},
-                {"label": "O", "matrix": [1, 10], "x": 10.75, "y": 1},
-                {"label": "P", "matrix": [1, 11], "x": 11.75, "y": 1},
-                {"label": "[", "matrix": [1, 12], "x": 12.75, "y": 1},
-                {"label": "]", "matrix": [1, 13], "x": 13.75, "y": 1},
-                {"label": "\\", "matrix": [2, 13], "x": 14.75, "y": 1, "w": 1.5},
-
-                {"label": "Delete", "matrix": [1, 15], "x": 16.5, "y": 1},
-                {"label": "End", "matrix": [1, 16], "x": 17.5, "y": 1},
-                {"label": "Page Down", "matrix": [1, 17], "x": 18.5, "y": 1},
-
-                {"label": "F3", "matrix": [2, 0], "x": 0, "y": 2},
-
-                {"label": "Caps Lock", "matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 2], "x": 3, "y": 2},
-                {"label": "S", "matrix": [2, 3], "x": 4, "y": 2},
-                {"label": "D", "matrix": [2, 4], "x": 5, "y": 2},
-                {"label": "F", "matrix": [2, 5], "x": 6, "y": 2},
-                {"label": "G", "matrix": [2, 6], "x": 7, "y": 2},
-                {"label": "H", "matrix": [2, 7], "x": 8, "y": 2},
-                {"label": "J", "matrix": [2, 8], "x": 9, "y": 2},
-                {"label": "K", "matrix": [2, 9], "x": 10, "y": 2},
-                {"label": "L", "matrix": [2, 10], "x": 11, "y": 2},
-                {"label": ";", "matrix": [2, 11], "x": 12, "y": 2},
-                {"label": "'", "matrix": [2, 12], "x": 13, "y": 2},
-                {"label": "Enter", "matrix": [2, 14], "x": 14, "y": 2, "w": 2.25},
-
-                {"label": "F4", "matrix": [3, 0], "x": 0, "y": 3},
-
-                {"label": "Shift", "matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
-                {"label": "Z", "matrix": [3, 3], "x": 3.5, "y": 3},
-                {"label": "X", "matrix": [3, 4], "x": 4.5, "y": 3},
-                {"label": "C", "matrix": [3, 5], "x": 5.5, "y": 3},
-                {"label": "V", "matrix": [3, 6], "x": 6.5, "y": 3},
-                {"label": "B", "matrix": [3, 7], "x": 7.5, "y": 3},
-                {"label": "N", "matrix": [3, 8], "x": 8.5, "y": 3},
-                {"label": "M", "matrix": [3, 9], "x": 9.5, "y": 3},
-                {"label": ",", "matrix": [3, 10], "x": 10.5, "y": 3},
-                {"label": ".", "matrix": [3, 11], "x": 11.5, "y": 3},
-                {"label": "/", "matrix": [3, 12], "x": 12.5, "y": 3},
-                {"label": "Shift", "matrix": [3, 13], "x": 13.5, "y": 3, "w": 1.75},
-                {"label": "Fn", "matrix": [3, 14], "x": 15.25, "y": 3},
-
-                {"label": "\u2191", "matrix": [3, 16], "x": 17.5, "y": 3},
-
-                {"label": "Ctrl", "matrix": [4, 3], "x": 3.25, "y": 4},
-                {"label": "Alt", "matrix": [4, 4], "x": 4.25, "y": 4, "w": 1.5},
-                {"label": "Space", "matrix": [4, 8], "x": 5.75, "y": 4, "w": 6.25},
-                {"label": "Ctrl", "matrix": [4, 12], "x": 12, "y": 4, "w": 1.25},
-
-                {"label": "\u2190", "matrix": [4, 15], "x": 16.5, "y": 4},
-                {"label": "\u2193", "matrix": [4, 16], "x": 17.5, "y": 4},
-                {"label": "\u2192", "matrix": [4, 17], "x": 18.5, "y": 4}
-            ]
-        },
-        "LAYOUT_625u_space_split_bs": {
-            "layout": [
-                {"label": "F1", "matrix": [0, 0], "x": 0, "y": 0},
-
-                {"label": "Esc", "matrix": [0, 1], "x": 1.25, "y": 0},
-                {"label": "1", "matrix": [0, 2], "x": 2.25, "y": 0},
-                {"label": "2", "matrix": [0, 3], "x": 3.25, "y": 0},
-                {"label": "3", "matrix": [0, 4], "x": 4.25, "y": 0},
-                {"label": "4", "matrix": [0, 5], "x": 5.25, "y": 0},
-                {"label": "5", "matrix": [0, 6], "x": 6.25, "y": 0},
-                {"label": "6", "matrix": [0, 7], "x": 7.25, "y": 0},
-                {"label": "7", "matrix": [0, 8], "x": 8.25, "y": 0},
-                {"label": "8", "matrix": [0, 9], "x": 9.25, "y": 0},
-                {"label": "9", "matrix": [0, 10], "x": 10.25, "y": 0},
-                {"label": "0", "matrix": [0, 11], "x": 11.25, "y": 0},
-                {"label": "-", "matrix": [0, 12], "x": 12.25, "y": 0},
-                {"label": "=", "matrix": [0, 13], "x": 13.25, "y": 0},
-                {"label": "Backspace", "matrix": [0, 14], "x": 14.25, "y": 0},
-                {"label": "Delete", "matrix": [1, 14], "x": 15.25, "y": 0},
-
-                {"label": "Insert", "matrix": [0, 15], "x": 16.5, "y": 0},
-                {"label": "Home", "matrix": [0, 16], "x": 17.5, "y": 0},
-                {"label": "Page Up", "matrix": [0, 17], "x": 18.5, "y": 0},
-
-                {"label": "F2", "matrix": [1, 0], "x": 0, "y": 1},
-
-                {"label": "Tab", "matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 2], "x": 2.75, "y": 1},
-                {"label": "W", "matrix": [1, 3], "x": 3.75, "y": 1},
-                {"label": "E", "matrix": [1, 4], "x": 4.75, "y": 1},
-                {"label": "R", "matrix": [1, 5], "x": 5.75, "y": 1},
-                {"label": "T", "matrix": [1, 6], "x": 6.75, "y": 1},
-                {"label": "Y", "matrix": [1, 7], "x": 7.75, "y": 1},
-                {"label": "U", "matrix": [1, 8], "x": 8.75, "y": 1},
-                {"label": "I", "matrix": [1, 9], "x": 9.75, "y": 1},
-                {"label": "O", "matrix": [1, 10], "x": 10.75, "y": 1},
-                {"label": "P", "matrix": [1, 11], "x": 11.75, "y": 1},
-                {"label": "[", "matrix": [1, 12], "x": 12.75, "y": 1},
-                {"label": "]", "matrix": [1, 13], "x": 13.75, "y": 1},
-                {"label": "\\", "matrix": [2, 13], "x": 14.75, "y": 1, "w": 1.5},
-
-                {"label": "Delete", "matrix": [1, 15], "x": 16.5, "y": 1},
-                {"label": "End", "matrix": [1, 16], "x": 17.5, "y": 1},
-                {"label": "Page Down", "matrix": [1, 17], "x": 18.5, "y": 1},
-
-                {"label": "F3", "matrix": [2, 0], "x": 0, "y": 2},
-
-                {"label": "Caps Lock", "matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 2], "x": 3, "y": 2},
-                {"label": "S", "matrix": [2, 3], "x": 4, "y": 2},
-                {"label": "D", "matrix": [2, 4], "x": 5, "y": 2},
-                {"label": "F", "matrix": [2, 5], "x": 6, "y": 2},
-                {"label": "G", "matrix": [2, 6], "x": 7, "y": 2},
-                {"label": "H", "matrix": [2, 7], "x": 8, "y": 2},
-                {"label": "J", "matrix": [2, 8], "x": 9, "y": 2},
-                {"label": "K", "matrix": [2, 9], "x": 10, "y": 2},
-                {"label": "L", "matrix": [2, 10], "x": 11, "y": 2},
-                {"label": ";", "matrix": [2, 11], "x": 12, "y": 2},
-                {"label": "'", "matrix": [2, 12], "x": 13, "y": 2},
-                {"label": "Enter", "matrix": [2, 14], "x": 14, "y": 2, "w": 2.25},
-
-                {"label": "F4", "matrix": [3, 0], "x": 0, "y": 3},
-
-                {"label": "Shift", "matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
-                {"label": "Z", "matrix": [3, 3], "x": 3.5, "y": 3},
-                {"label": "X", "matrix": [3, 4], "x": 4.5, "y": 3},
-                {"label": "C", "matrix": [3, 5], "x": 5.5, "y": 3},
-                {"label": "V", "matrix": [3, 6], "x": 6.5, "y": 3},
-                {"label": "B", "matrix": [3, 7], "x": 7.5, "y": 3},
-                {"label": "N", "matrix": [3, 8], "x": 8.5, "y": 3},
-                {"label": "M", "matrix": [3, 9], "x": 9.5, "y": 3},
-                {"label": ",", "matrix": [3, 10], "x": 10.5, "y": 3},
-                {"label": ".", "matrix": [3, 11], "x": 11.5, "y": 3},
-                {"label": "/", "matrix": [3, 12], "x": 12.5, "y": 3},
-                {"label": "Shift", "matrix": [3, 13], "x": 13.5, "y": 3, "w": 1.75},
-                {"label": "Fn", "matrix": [3, 14], "x": 15.25, "y": 3},
-
-                {"label": "\u2191", "matrix": [3, 16], "x": 17.5, "y": 3},
-
-                {"label": "Ctrl", "matrix": [4, 3], "x": 3.25, "y": 4},
-                {"label": "Alt", "matrix": [4, 4], "x": 4.25, "y": 4, "w": 1.5},
-                {"label": "Space", "matrix": [4, 8], "x": 5.75, "y": 4, "w": 6.25},
-                {"label": "Ctrl", "matrix": [4, 12], "x": 12, "y": 4, "w": 1.25},
-
-                {"label": "\u2190", "matrix": [4, 15], "x": 16.5, "y": 4},
-                {"label": "\u2193", "matrix": [4, 16], "x": 17.5, "y": 4},
-                {"label": "\u2192", "matrix": [4, 17], "x": 18.5, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/handwired/cyberstar/keyboard.json b/keyboards/handwired/cyberstar/keyboard.json
new file mode 100644
index 00000000000..344c576462d
--- /dev/null
+++ b/keyboards/handwired/cyberstar/keyboard.json
@@ -0,0 +1,409 @@
+{
+    "keyboard_name": "Cyberstar",
+    "manufacturer": "Yiancar-Designs",
+    "url": "https://yiancar-designs.com",
+    "maintainer": "Yiancar-Designs",
+    "usb": {
+        "vid": "0x8968",
+        "pid": "0x432A",
+        "device_version": "0.0.1"
+    },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 12,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": true,
+            "twinkle": true
+        }
+    },
+    "ws2812": {
+        "pin": "B4",
+        "driver": "pwm"
+    },
+    "matrix_pins": {
+        "cols": ["A4", "A5", "A6", "A7", "B0", "B1", "B2", "B10", "B11", "B12", "B13", "B14", "B15", "A8", "A10", "A14", "B8", "B9"],
+        "rows": ["A15", "B3", "A9", "B5", "A3"]
+    },
+    "diode_direction": "COL2ROW",
+    "processor": "STM32F072",
+    "bootloader": "stm32-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "nkro": true,
+        "rgblight": true
+    },
+    "layout_aliases": {
+        "LAYOUT_all": "LAYOUT_split_space_split_bs"
+    },
+    "layouts": {
+        "LAYOUT_split_space": {
+            "layout": [
+                {"label": "F1", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "Esc", "matrix": [0, 1], "x": 1.25, "y": 0},
+                {"label": "1", "matrix": [0, 2], "x": 2.25, "y": 0},
+                {"label": "2", "matrix": [0, 3], "x": 3.25, "y": 0},
+                {"label": "3", "matrix": [0, 4], "x": 4.25, "y": 0},
+                {"label": "4", "matrix": [0, 5], "x": 5.25, "y": 0},
+                {"label": "5", "matrix": [0, 6], "x": 6.25, "y": 0},
+                {"label": "6", "matrix": [0, 7], "x": 7.25, "y": 0},
+                {"label": "7", "matrix": [0, 8], "x": 8.25, "y": 0},
+                {"label": "8", "matrix": [0, 9], "x": 9.25, "y": 0},
+                {"label": "9", "matrix": [0, 10], "x": 10.25, "y": 0},
+                {"label": "0", "matrix": [0, 11], "x": 11.25, "y": 0},
+                {"label": "-", "matrix": [0, 12], "x": 12.25, "y": 0},
+                {"label": "=", "matrix": [0, 13], "x": 13.25, "y": 0},
+                {"label": "Backspace", "matrix": [0, 14], "x": 14.25, "y": 0, "w": 2},
+
+                {"label": "Insert", "matrix": [0, 15], "x": 16.5, "y": 0},
+                {"label": "Home", "matrix": [0, 16], "x": 17.5, "y": 0},
+                {"label": "Page Up", "matrix": [0, 17], "x": 18.5, "y": 0},
+
+                {"label": "F2", "matrix": [1, 0], "x": 0, "y": 1},
+
+                {"label": "Tab", "matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 2], "x": 2.75, "y": 1},
+                {"label": "W", "matrix": [1, 3], "x": 3.75, "y": 1},
+                {"label": "E", "matrix": [1, 4], "x": 4.75, "y": 1},
+                {"label": "R", "matrix": [1, 5], "x": 5.75, "y": 1},
+                {"label": "T", "matrix": [1, 6], "x": 6.75, "y": 1},
+                {"label": "Y", "matrix": [1, 7], "x": 7.75, "y": 1},
+                {"label": "U", "matrix": [1, 8], "x": 8.75, "y": 1},
+                {"label": "I", "matrix": [1, 9], "x": 9.75, "y": 1},
+                {"label": "O", "matrix": [1, 10], "x": 10.75, "y": 1},
+                {"label": "P", "matrix": [1, 11], "x": 11.75, "y": 1},
+                {"label": "[", "matrix": [1, 12], "x": 12.75, "y": 1},
+                {"label": "]", "matrix": [1, 13], "x": 13.75, "y": 1},
+                {"label": "\\", "matrix": [2, 13], "x": 14.75, "y": 1, "w": 1.5},
+
+                {"label": "Delete", "matrix": [1, 15], "x": 16.5, "y": 1},
+                {"label": "End", "matrix": [1, 16], "x": 17.5, "y": 1},
+                {"label": "Page Down", "matrix": [1, 17], "x": 18.5, "y": 1},
+
+                {"label": "F3", "matrix": [2, 0], "x": 0, "y": 2},
+
+                {"label": "Caps Lock", "matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 2], "x": 3, "y": 2},
+                {"label": "S", "matrix": [2, 3], "x": 4, "y": 2},
+                {"label": "D", "matrix": [2, 4], "x": 5, "y": 2},
+                {"label": "F", "matrix": [2, 5], "x": 6, "y": 2},
+                {"label": "G", "matrix": [2, 6], "x": 7, "y": 2},
+                {"label": "H", "matrix": [2, 7], "x": 8, "y": 2},
+                {"label": "J", "matrix": [2, 8], "x": 9, "y": 2},
+                {"label": "K", "matrix": [2, 9], "x": 10, "y": 2},
+                {"label": "L", "matrix": [2, 10], "x": 11, "y": 2},
+                {"label": ";", "matrix": [2, 11], "x": 12, "y": 2},
+                {"label": "'", "matrix": [2, 12], "x": 13, "y": 2},
+                {"label": "Enter", "matrix": [2, 14], "x": 14, "y": 2, "w": 2.25},
+
+                {"label": "F4", "matrix": [3, 0], "x": 0, "y": 3},
+
+                {"label": "Shift", "matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
+                {"label": "Z", "matrix": [3, 3], "x": 3.5, "y": 3},
+                {"label": "X", "matrix": [3, 4], "x": 4.5, "y": 3},
+                {"label": "C", "matrix": [3, 5], "x": 5.5, "y": 3},
+                {"label": "V", "matrix": [3, 6], "x": 6.5, "y": 3},
+                {"label": "B", "matrix": [3, 7], "x": 7.5, "y": 3},
+                {"label": "N", "matrix": [3, 8], "x": 8.5, "y": 3},
+                {"label": "M", "matrix": [3, 9], "x": 9.5, "y": 3},
+                {"label": ",", "matrix": [3, 10], "x": 10.5, "y": 3},
+                {"label": ".", "matrix": [3, 11], "x": 11.5, "y": 3},
+                {"label": "/", "matrix": [3, 12], "x": 12.5, "y": 3},
+                {"label": "Shift", "matrix": [3, 13], "x": 13.5, "y": 3, "w": 1.75},
+                {"label": "Fn", "matrix": [3, 14], "x": 15.25, "y": 3},
+
+                {"label": "\u2191", "matrix": [3, 16], "x": 17.5, "y": 3},
+
+                {"label": "Ctrl", "matrix": [4, 3], "x": 3.25, "y": 4},
+                {"label": "Alt", "matrix": [4, 4], "x": 4.25, "y": 4, "w": 1.5},
+                {"label": "Space", "matrix": [4, 6], "x": 5.75, "y": 4, "w": 2.25},
+                {"label": "Space", "matrix": [4, 8], "x": 8, "y": 4, "w": 2.75},
+                {"label": "Alt", "matrix": [4, 11], "x": 10.75, "y": 4, "w": 1.5},
+                {"label": "Ctrl", "matrix": [4, 12], "x": 12.25, "y": 4},
+
+                {"label": "\u2190", "matrix": [4, 15], "x": 16.5, "y": 4},
+                {"label": "\u2193", "matrix": [4, 16], "x": 17.5, "y": 4},
+                {"label": "\u2192", "matrix": [4, 17], "x": 18.5, "y": 4}
+            ]
+        },
+        "LAYOUT_split_space_split_bs": {
+            "layout": [
+                {"label": "F1", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "Esc", "matrix": [0, 1], "x": 1.25, "y": 0},
+                {"label": "1", "matrix": [0, 2], "x": 2.25, "y": 0},
+                {"label": "2", "matrix": [0, 3], "x": 3.25, "y": 0},
+                {"label": "3", "matrix": [0, 4], "x": 4.25, "y": 0},
+                {"label": "4", "matrix": [0, 5], "x": 5.25, "y": 0},
+                {"label": "5", "matrix": [0, 6], "x": 6.25, "y": 0},
+                {"label": "6", "matrix": [0, 7], "x": 7.25, "y": 0},
+                {"label": "7", "matrix": [0, 8], "x": 8.25, "y": 0},
+                {"label": "8", "matrix": [0, 9], "x": 9.25, "y": 0},
+                {"label": "9", "matrix": [0, 10], "x": 10.25, "y": 0},
+                {"label": "0", "matrix": [0, 11], "x": 11.25, "y": 0},
+                {"label": "-", "matrix": [0, 12], "x": 12.25, "y": 0},
+                {"label": "=", "matrix": [0, 13], "x": 13.25, "y": 0},
+                {"label": "Backspace", "matrix": [0, 14], "x": 14.25, "y": 0},
+                {"label": "Delete", "matrix": [1, 14], "x": 15.25, "y": 0},
+
+                {"label": "Insert", "matrix": [0, 15], "x": 16.5, "y": 0},
+                {"label": "Home", "matrix": [0, 16], "x": 17.5, "y": 0},
+                {"label": "Page Up", "matrix": [0, 17], "x": 18.5, "y": 0},
+
+                {"label": "F2", "matrix": [1, 0], "x": 0, "y": 1},
+
+                {"label": "Tab", "matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 2], "x": 2.75, "y": 1},
+                {"label": "W", "matrix": [1, 3], "x": 3.75, "y": 1},
+                {"label": "E", "matrix": [1, 4], "x": 4.75, "y": 1},
+                {"label": "R", "matrix": [1, 5], "x": 5.75, "y": 1},
+                {"label": "T", "matrix": [1, 6], "x": 6.75, "y": 1},
+                {"label": "Y", "matrix": [1, 7], "x": 7.75, "y": 1},
+                {"label": "U", "matrix": [1, 8], "x": 8.75, "y": 1},
+                {"label": "I", "matrix": [1, 9], "x": 9.75, "y": 1},
+                {"label": "O", "matrix": [1, 10], "x": 10.75, "y": 1},
+                {"label": "P", "matrix": [1, 11], "x": 11.75, "y": 1},
+                {"label": "[", "matrix": [1, 12], "x": 12.75, "y": 1},
+                {"label": "]", "matrix": [1, 13], "x": 13.75, "y": 1},
+                {"label": "\\", "matrix": [2, 13], "x": 14.75, "y": 1, "w": 1.5},
+
+                {"label": "Delete", "matrix": [1, 15], "x": 16.5, "y": 1},
+                {"label": "End", "matrix": [1, 16], "x": 17.5, "y": 1},
+                {"label": "Page Down", "matrix": [1, 17], "x": 18.5, "y": 1},
+
+                {"label": "F3", "matrix": [2, 0], "x": 0, "y": 2},
+
+                {"label": "Caps Lock", "matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 2], "x": 3, "y": 2},
+                {"label": "S", "matrix": [2, 3], "x": 4, "y": 2},
+                {"label": "D", "matrix": [2, 4], "x": 5, "y": 2},
+                {"label": "F", "matrix": [2, 5], "x": 6, "y": 2},
+                {"label": "G", "matrix": [2, 6], "x": 7, "y": 2},
+                {"label": "H", "matrix": [2, 7], "x": 8, "y": 2},
+                {"label": "J", "matrix": [2, 8], "x": 9, "y": 2},
+                {"label": "K", "matrix": [2, 9], "x": 10, "y": 2},
+                {"label": "L", "matrix": [2, 10], "x": 11, "y": 2},
+                {"label": ";", "matrix": [2, 11], "x": 12, "y": 2},
+                {"label": "'", "matrix": [2, 12], "x": 13, "y": 2},
+                {"label": "Enter", "matrix": [2, 14], "x": 14, "y": 2, "w": 2.25},
+
+                {"label": "F4", "matrix": [3, 0], "x": 0, "y": 3},
+
+                {"label": "Shift", "matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
+                {"label": "Z", "matrix": [3, 3], "x": 3.5, "y": 3},
+                {"label": "X", "matrix": [3, 4], "x": 4.5, "y": 3},
+                {"label": "C", "matrix": [3, 5], "x": 5.5, "y": 3},
+                {"label": "V", "matrix": [3, 6], "x": 6.5, "y": 3},
+                {"label": "B", "matrix": [3, 7], "x": 7.5, "y": 3},
+                {"label": "N", "matrix": [3, 8], "x": 8.5, "y": 3},
+                {"label": "M", "matrix": [3, 9], "x": 9.5, "y": 3},
+                {"label": ",", "matrix": [3, 10], "x": 10.5, "y": 3},
+                {"label": ".", "matrix": [3, 11], "x": 11.5, "y": 3},
+                {"label": "/", "matrix": [3, 12], "x": 12.5, "y": 3},
+                {"label": "Shift", "matrix": [3, 13], "x": 13.5, "y": 3, "w": 1.75},
+                {"label": "Fn", "matrix": [3, 14], "x": 15.25, "y": 3},
+
+                {"label": "\u2191", "matrix": [3, 16], "x": 17.5, "y": 3},
+
+                {"label": "Ctrl", "matrix": [4, 3], "x": 3.25, "y": 4},
+                {"label": "Alt", "matrix": [4, 4], "x": 4.25, "y": 4, "w": 1.5},
+                {"label": "Space", "matrix": [4, 6], "x": 5.75, "y": 4, "w": 2.25},
+                {"label": "Space", "matrix": [4, 8], "x": 8, "y": 4, "w": 2.75},
+                {"label": "Alt", "matrix": [4, 11], "x": 10.75, "y": 4, "w": 1.5},
+                {"label": "Ctrl", "matrix": [4, 12], "x": 12.25, "y": 4},
+
+                {"label": "\u2190", "matrix": [4, 15], "x": 16.5, "y": 4},
+                {"label": "\u2193", "matrix": [4, 16], "x": 17.5, "y": 4},
+                {"label": "\u2192", "matrix": [4, 17], "x": 18.5, "y": 4}
+            ]
+        },
+        "LAYOUT_625u_space": {
+            "layout": [
+                {"label": "F1", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "Esc", "matrix": [0, 1], "x": 1.25, "y": 0},
+                {"label": "1", "matrix": [0, 2], "x": 2.25, "y": 0},
+                {"label": "2", "matrix": [0, 3], "x": 3.25, "y": 0},
+                {"label": "3", "matrix": [0, 4], "x": 4.25, "y": 0},
+                {"label": "4", "matrix": [0, 5], "x": 5.25, "y": 0},
+                {"label": "5", "matrix": [0, 6], "x": 6.25, "y": 0},
+                {"label": "6", "matrix": [0, 7], "x": 7.25, "y": 0},
+                {"label": "7", "matrix": [0, 8], "x": 8.25, "y": 0},
+                {"label": "8", "matrix": [0, 9], "x": 9.25, "y": 0},
+                {"label": "9", "matrix": [0, 10], "x": 10.25, "y": 0},
+                {"label": "0", "matrix": [0, 11], "x": 11.25, "y": 0},
+                {"label": "-", "matrix": [0, 12], "x": 12.25, "y": 0},
+                {"label": "=", "matrix": [0, 13], "x": 13.25, "y": 0},
+                {"label": "Backspace", "matrix": [0, 14], "x": 14.25, "y": 0, "w": 2},
+
+                {"label": "Insert", "matrix": [0, 15], "x": 16.5, "y": 0},
+                {"label": "Home", "matrix": [0, 16], "x": 17.5, "y": 0},
+                {"label": "Page Up", "matrix": [0, 17], "x": 18.5, "y": 0},
+
+                {"label": "F2", "matrix": [1, 0], "x": 0, "y": 1},
+
+                {"label": "Tab", "matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 2], "x": 2.75, "y": 1},
+                {"label": "W", "matrix": [1, 3], "x": 3.75, "y": 1},
+                {"label": "E", "matrix": [1, 4], "x": 4.75, "y": 1},
+                {"label": "R", "matrix": [1, 5], "x": 5.75, "y": 1},
+                {"label": "T", "matrix": [1, 6], "x": 6.75, "y": 1},
+                {"label": "Y", "matrix": [1, 7], "x": 7.75, "y": 1},
+                {"label": "U", "matrix": [1, 8], "x": 8.75, "y": 1},
+                {"label": "I", "matrix": [1, 9], "x": 9.75, "y": 1},
+                {"label": "O", "matrix": [1, 10], "x": 10.75, "y": 1},
+                {"label": "P", "matrix": [1, 11], "x": 11.75, "y": 1},
+                {"label": "[", "matrix": [1, 12], "x": 12.75, "y": 1},
+                {"label": "]", "matrix": [1, 13], "x": 13.75, "y": 1},
+                {"label": "\\", "matrix": [2, 13], "x": 14.75, "y": 1, "w": 1.5},
+
+                {"label": "Delete", "matrix": [1, 15], "x": 16.5, "y": 1},
+                {"label": "End", "matrix": [1, 16], "x": 17.5, "y": 1},
+                {"label": "Page Down", "matrix": [1, 17], "x": 18.5, "y": 1},
+
+                {"label": "F3", "matrix": [2, 0], "x": 0, "y": 2},
+
+                {"label": "Caps Lock", "matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 2], "x": 3, "y": 2},
+                {"label": "S", "matrix": [2, 3], "x": 4, "y": 2},
+                {"label": "D", "matrix": [2, 4], "x": 5, "y": 2},
+                {"label": "F", "matrix": [2, 5], "x": 6, "y": 2},
+                {"label": "G", "matrix": [2, 6], "x": 7, "y": 2},
+                {"label": "H", "matrix": [2, 7], "x": 8, "y": 2},
+                {"label": "J", "matrix": [2, 8], "x": 9, "y": 2},
+                {"label": "K", "matrix": [2, 9], "x": 10, "y": 2},
+                {"label": "L", "matrix": [2, 10], "x": 11, "y": 2},
+                {"label": ";", "matrix": [2, 11], "x": 12, "y": 2},
+                {"label": "'", "matrix": [2, 12], "x": 13, "y": 2},
+                {"label": "Enter", "matrix": [2, 14], "x": 14, "y": 2, "w": 2.25},
+
+                {"label": "F4", "matrix": [3, 0], "x": 0, "y": 3},
+
+                {"label": "Shift", "matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
+                {"label": "Z", "matrix": [3, 3], "x": 3.5, "y": 3},
+                {"label": "X", "matrix": [3, 4], "x": 4.5, "y": 3},
+                {"label": "C", "matrix": [3, 5], "x": 5.5, "y": 3},
+                {"label": "V", "matrix": [3, 6], "x": 6.5, "y": 3},
+                {"label": "B", "matrix": [3, 7], "x": 7.5, "y": 3},
+                {"label": "N", "matrix": [3, 8], "x": 8.5, "y": 3},
+                {"label": "M", "matrix": [3, 9], "x": 9.5, "y": 3},
+                {"label": ",", "matrix": [3, 10], "x": 10.5, "y": 3},
+                {"label": ".", "matrix": [3, 11], "x": 11.5, "y": 3},
+                {"label": "/", "matrix": [3, 12], "x": 12.5, "y": 3},
+                {"label": "Shift", "matrix": [3, 13], "x": 13.5, "y": 3, "w": 1.75},
+                {"label": "Fn", "matrix": [3, 14], "x": 15.25, "y": 3},
+
+                {"label": "\u2191", "matrix": [3, 16], "x": 17.5, "y": 3},
+
+                {"label": "Ctrl", "matrix": [4, 3], "x": 3.25, "y": 4},
+                {"label": "Alt", "matrix": [4, 4], "x": 4.25, "y": 4, "w": 1.5},
+                {"label": "Space", "matrix": [4, 8], "x": 5.75, "y": 4, "w": 6.25},
+                {"label": "Ctrl", "matrix": [4, 12], "x": 12, "y": 4, "w": 1.25},
+
+                {"label": "\u2190", "matrix": [4, 15], "x": 16.5, "y": 4},
+                {"label": "\u2193", "matrix": [4, 16], "x": 17.5, "y": 4},
+                {"label": "\u2192", "matrix": [4, 17], "x": 18.5, "y": 4}
+            ]
+        },
+        "LAYOUT_625u_space_split_bs": {
+            "layout": [
+                {"label": "F1", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "Esc", "matrix": [0, 1], "x": 1.25, "y": 0},
+                {"label": "1", "matrix": [0, 2], "x": 2.25, "y": 0},
+                {"label": "2", "matrix": [0, 3], "x": 3.25, "y": 0},
+                {"label": "3", "matrix": [0, 4], "x": 4.25, "y": 0},
+                {"label": "4", "matrix": [0, 5], "x": 5.25, "y": 0},
+                {"label": "5", "matrix": [0, 6], "x": 6.25, "y": 0},
+                {"label": "6", "matrix": [0, 7], "x": 7.25, "y": 0},
+                {"label": "7", "matrix": [0, 8], "x": 8.25, "y": 0},
+                {"label": "8", "matrix": [0, 9], "x": 9.25, "y": 0},
+                {"label": "9", "matrix": [0, 10], "x": 10.25, "y": 0},
+                {"label": "0", "matrix": [0, 11], "x": 11.25, "y": 0},
+                {"label": "-", "matrix": [0, 12], "x": 12.25, "y": 0},
+                {"label": "=", "matrix": [0, 13], "x": 13.25, "y": 0},
+                {"label": "Backspace", "matrix": [0, 14], "x": 14.25, "y": 0},
+                {"label": "Delete", "matrix": [1, 14], "x": 15.25, "y": 0},
+
+                {"label": "Insert", "matrix": [0, 15], "x": 16.5, "y": 0},
+                {"label": "Home", "matrix": [0, 16], "x": 17.5, "y": 0},
+                {"label": "Page Up", "matrix": [0, 17], "x": 18.5, "y": 0},
+
+                {"label": "F2", "matrix": [1, 0], "x": 0, "y": 1},
+
+                {"label": "Tab", "matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 2], "x": 2.75, "y": 1},
+                {"label": "W", "matrix": [1, 3], "x": 3.75, "y": 1},
+                {"label": "E", "matrix": [1, 4], "x": 4.75, "y": 1},
+                {"label": "R", "matrix": [1, 5], "x": 5.75, "y": 1},
+                {"label": "T", "matrix": [1, 6], "x": 6.75, "y": 1},
+                {"label": "Y", "matrix": [1, 7], "x": 7.75, "y": 1},
+                {"label": "U", "matrix": [1, 8], "x": 8.75, "y": 1},
+                {"label": "I", "matrix": [1, 9], "x": 9.75, "y": 1},
+                {"label": "O", "matrix": [1, 10], "x": 10.75, "y": 1},
+                {"label": "P", "matrix": [1, 11], "x": 11.75, "y": 1},
+                {"label": "[", "matrix": [1, 12], "x": 12.75, "y": 1},
+                {"label": "]", "matrix": [1, 13], "x": 13.75, "y": 1},
+                {"label": "\\", "matrix": [2, 13], "x": 14.75, "y": 1, "w": 1.5},
+
+                {"label": "Delete", "matrix": [1, 15], "x": 16.5, "y": 1},
+                {"label": "End", "matrix": [1, 16], "x": 17.5, "y": 1},
+                {"label": "Page Down", "matrix": [1, 17], "x": 18.5, "y": 1},
+
+                {"label": "F3", "matrix": [2, 0], "x": 0, "y": 2},
+
+                {"label": "Caps Lock", "matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 2], "x": 3, "y": 2},
+                {"label": "S", "matrix": [2, 3], "x": 4, "y": 2},
+                {"label": "D", "matrix": [2, 4], "x": 5, "y": 2},
+                {"label": "F", "matrix": [2, 5], "x": 6, "y": 2},
+                {"label": "G", "matrix": [2, 6], "x": 7, "y": 2},
+                {"label": "H", "matrix": [2, 7], "x": 8, "y": 2},
+                {"label": "J", "matrix": [2, 8], "x": 9, "y": 2},
+                {"label": "K", "matrix": [2, 9], "x": 10, "y": 2},
+                {"label": "L", "matrix": [2, 10], "x": 11, "y": 2},
+                {"label": ";", "matrix": [2, 11], "x": 12, "y": 2},
+                {"label": "'", "matrix": [2, 12], "x": 13, "y": 2},
+                {"label": "Enter", "matrix": [2, 14], "x": 14, "y": 2, "w": 2.25},
+
+                {"label": "F4", "matrix": [3, 0], "x": 0, "y": 3},
+
+                {"label": "Shift", "matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
+                {"label": "Z", "matrix": [3, 3], "x": 3.5, "y": 3},
+                {"label": "X", "matrix": [3, 4], "x": 4.5, "y": 3},
+                {"label": "C", "matrix": [3, 5], "x": 5.5, "y": 3},
+                {"label": "V", "matrix": [3, 6], "x": 6.5, "y": 3},
+                {"label": "B", "matrix": [3, 7], "x": 7.5, "y": 3},
+                {"label": "N", "matrix": [3, 8], "x": 8.5, "y": 3},
+                {"label": "M", "matrix": [3, 9], "x": 9.5, "y": 3},
+                {"label": ",", "matrix": [3, 10], "x": 10.5, "y": 3},
+                {"label": ".", "matrix": [3, 11], "x": 11.5, "y": 3},
+                {"label": "/", "matrix": [3, 12], "x": 12.5, "y": 3},
+                {"label": "Shift", "matrix": [3, 13], "x": 13.5, "y": 3, "w": 1.75},
+                {"label": "Fn", "matrix": [3, 14], "x": 15.25, "y": 3},
+
+                {"label": "\u2191", "matrix": [3, 16], "x": 17.5, "y": 3},
+
+                {"label": "Ctrl", "matrix": [4, 3], "x": 3.25, "y": 4},
+                {"label": "Alt", "matrix": [4, 4], "x": 4.25, "y": 4, "w": 1.5},
+                {"label": "Space", "matrix": [4, 8], "x": 5.75, "y": 4, "w": 6.25},
+                {"label": "Ctrl", "matrix": [4, 12], "x": 12, "y": 4, "w": 1.25},
+
+                {"label": "\u2190", "matrix": [4, 15], "x": 16.5, "y": 4},
+                {"label": "\u2193", "matrix": [4, 16], "x": 17.5, "y": 4},
+                {"label": "\u2192", "matrix": [4, 17], "x": 18.5, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/handwired/cyberstar/rules.mk b/keyboards/handwired/cyberstar/rules.mk
index cc9d7bb3f53..0ab54aaaf71 100644
--- a/keyboards/handwired/cyberstar/rules.mk
+++ b/keyboards/handwired/cyberstar/rules.mk
@@ -1,15 +1,2 @@
 # Wildcard to allow APM32 MCU
 DFU_SUFFIX_ARGS = -v FFFF -p FFFF
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
diff --git a/keyboards/handwired/d48/info.json b/keyboards/handwired/d48/info.json
deleted file mode 100644
index 295fead5879..00000000000
--- a/keyboards/handwired/d48/info.json
+++ /dev/null
@@ -1,109 +0,0 @@
-{
-    "keyboard_name": "D48",
-    "manufacturer": "Andrew Dunai",
-    "url": "",
-    "maintainer": "and3rson",
-    "usb": {
-        "vid": "0xFEED",
-        "pid": "0x6060",
-        "device_version": "0.0.1"
-    },
-    "rgblight": {
-        "saturation_steps": 8,
-        "brightness_steps": 8,
-        "led_count": 14,
-        "animations": {
-            "breathing": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "snake": true,
-            "knight": true,
-            "christmas": true,
-            "static_gradient": true,
-            "rgb_test": true,
-            "alternating": true,
-            "twinkle": true
-        }
-    },
-    "ws2812": {
-        "pin": "A15"
-    },
-    "matrix_pins": {
-        "cols": ["A2", "B0", "A7", "A8", "A13", "A14", "B12", "B11", "B10", "B15", "B14", "B13"],
-        "rows": ["B8", "B9", "B1", "B2", "B4"]
-    },
-    "diode_direction": "COL2ROW",
-    "encoder": {
-        "rotary": [
-            {"pin_a": "B3", "pin_b": "A6"},
-            {"pin_a": "A0", "pin_b": "A1"}
-        ]
-    },
-    "qmk": {
-        "tap_keycode_delay": 10
-    },
-    "processor": "STM32F303",
-    "bootloader": "stm32-dfu",
-    "board": "QMK_PROTON_C",
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 8], "x": 8, "y": 0},
-
-                {"matrix": [0, 11], "x": 11, "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": [1, 4], "x": 4, "y": 1},
-                {"matrix": [1, 5], "x": 5, "y": 1},
-                {"matrix": [1, 6], "x": 6, "y": 1},
-                {"matrix": [1, 7], "x": 7, "y": 1},
-                {"matrix": [1, 8], "x": 8, "y": 1},
-                {"matrix": [1, 9], "x": 9, "y": 1},
-                {"matrix": [1, 10], "x": 10, "y": 1},
-                {"matrix": [1, 11], "x": 11, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2},
-                {"matrix": [2, 1], "x": 1, "y": 2},
-                {"matrix": [2, 2], "x": 2, "y": 2},
-                {"matrix": [2, 3], "x": 3, "y": 2},
-                {"matrix": [2, 4], "x": 4, "y": 2},
-                {"matrix": [2, 5], "x": 5, "y": 2},
-                {"matrix": [2, 6], "x": 6, "y": 2},
-                {"matrix": [2, 7], "x": 7, "y": 2},
-                {"matrix": [2, 8], "x": 8, "y": 2},
-                {"matrix": [2, 9], "x": 9, "y": 2},
-                {"matrix": [2, 10], "x": 10, "y": 2},
-                {"matrix": [2, 11], "x": 11, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3},
-                {"matrix": [3, 1], "x": 1, "y": 3},
-                {"matrix": [3, 2], "x": 2, "y": 3},
-                {"matrix": [3, 3], "x": 3, "y": 3},
-                {"matrix": [3, 4], "x": 4, "y": 3},
-                {"matrix": [3, 5], "x": 5, "y": 3},
-                {"matrix": [3, 6], "x": 6, "y": 3},
-                {"matrix": [3, 7], "x": 7, "y": 3},
-                {"matrix": [3, 8], "x": 8, "y": 3},
-                {"matrix": [3, 9], "x": 9, "y": 3},
-                {"matrix": [3, 10], "x": 10, "y": 3},
-                {"matrix": [3, 11], "x": 11, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4},
-                {"matrix": [4, 1], "x": 1, "y": 4},
-                {"matrix": [4, 2], "x": 2, "y": 4},
-                {"matrix": [4, 3], "x": 3, "y": 4},
-                {"matrix": [4, 4], "x": 4, "y": 4},
-                {"matrix": [4, 5], "x": 5, "y": 4},
-                {"matrix": [4, 6], "x": 6, "y": 4},
-                {"matrix": [4, 7], "x": 7, "y": 4},
-                {"matrix": [4, 8], "x": 8, "y": 4},
-                {"matrix": [4, 9], "x": 9, "y": 4},
-                {"matrix": [4, 10], "x": 10, "y": 4},
-                {"matrix": [4, 11], "x": 11, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/handwired/d48/keyboard.json b/keyboards/handwired/d48/keyboard.json
new file mode 100644
index 00000000000..99c8a673263
--- /dev/null
+++ b/keyboards/handwired/d48/keyboard.json
@@ -0,0 +1,119 @@
+{
+    "keyboard_name": "D48",
+    "manufacturer": "Andrew Dunai",
+    "url": "",
+    "maintainer": "and3rson",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0x6060",
+        "device_version": "0.0.1"
+    },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 14,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": true,
+            "twinkle": true
+        }
+    },
+    "ws2812": {
+        "pin": "A15"
+    },
+    "matrix_pins": {
+        "cols": ["A2", "B0", "A7", "A8", "A13", "A14", "B12", "B11", "B10", "B15", "B14", "B13"],
+        "rows": ["B8", "B9", "B1", "B2", "B4"]
+    },
+    "diode_direction": "COL2ROW",
+    "encoder": {
+        "rotary": [
+            {"pin_a": "B3", "pin_b": "A6"},
+            {"pin_a": "A0", "pin_b": "A1"}
+        ]
+    },
+    "qmk": {
+        "tap_keycode_delay": 10
+    },
+    "development_board": "proton_c",
+    "features": {
+        "bootmagic": false,
+        "mousekey": false,
+        "extrakey": true,
+        "console": true,
+        "nkro": true,
+        "audio": true,
+        "rgblight": true,
+        "encoder": true,
+        "oled": true,
+        "unicode": true
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 8], "x": 8, "y": 0},
+
+                {"matrix": [0, 11], "x": 11, "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": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [2, 6], "x": 6, "y": 2},
+                {"matrix": [2, 7], "x": 7, "y": 2},
+                {"matrix": [2, 8], "x": 8, "y": 2},
+                {"matrix": [2, 9], "x": 9, "y": 2},
+                {"matrix": [2, 10], "x": 10, "y": 2},
+                {"matrix": [2, 11], "x": 11, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
+                {"matrix": [3, 6], "x": 6, "y": 3},
+                {"matrix": [3, 7], "x": 7, "y": 3},
+                {"matrix": [3, 8], "x": 8, "y": 3},
+                {"matrix": [3, 9], "x": 9, "y": 3},
+                {"matrix": [3, 10], "x": 10, "y": 3},
+                {"matrix": [3, 11], "x": 11, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+                {"matrix": [4, 2], "x": 2, "y": 4},
+                {"matrix": [4, 3], "x": 3, "y": 4},
+                {"matrix": [4, 4], "x": 4, "y": 4},
+                {"matrix": [4, 5], "x": 5, "y": 4},
+                {"matrix": [4, 6], "x": 6, "y": 4},
+                {"matrix": [4, 7], "x": 7, "y": 4},
+                {"matrix": [4, 8], "x": 8, "y": 4},
+                {"matrix": [4, 9], "x": 9, "y": 4},
+                {"matrix": [4, 10], "x": 10, "y": 4},
+                {"matrix": [4, 11], "x": 11, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/handwired/d48/rules.mk b/keyboards/handwired/d48/rules.mk
index 7fa8dfdd340..62866f887a6 100644
--- a/keyboards/handwired/d48/rules.mk
+++ b/keyboards/handwired/d48/rules.mk
@@ -1,18 +1 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no    # Mouse keys
-EXTRAKEY_ENABLE = yes   # Audio control and System control
-CONSOLE_ENABLE = yes    # Console for debug
-COMMAND_ENABLE = no     # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no   # Enable keyboard backlight functionality
-AUDIO_ENABLE = yes
-USE_I2C = no
-RGBLIGHT_ENABLE = yes
-ENCODER_ENABLE = yes
-OLED_ENABLE = yes
-UNICODE_ENABLE = yes
-
 SRC += ds1307.c taphold.c
diff --git a/keyboards/handwired/dactyl/info.json b/keyboards/handwired/dactyl/info.json
deleted file mode 100644
index e95c380d9c0..00000000000
--- a/keyboards/handwired/dactyl/info.json
+++ /dev/null
@@ -1,109 +0,0 @@
-{
-  "keyboard_name": "Dactyl",
-  "manufacturer": "Adereth",
-  "url": "",
-  "maintainer": "qmk",
-  "usb": {
-    "vid": "0xFEED",
-    "pid": "0x1308",
-    "device_version": "0.0.1"
-  },
-  "processor": "atmega32u4",
-  "bootloader": "halfkay",
-  "debounce": 15,
-  "tapping": {
-    "toggle": 1
-  },
-  "layouts": {
-    "LAYOUT_dactyl": {
-      "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": [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": [1, 4], "x": 4, "y": 1},
-        {"matrix": [1, 5], "x": 5, "y": 1},
-
-        {"matrix": [2, 0], "x": 0, "y": 2},
-        {"matrix": [2, 1], "x": 1, "y": 2},
-        {"matrix": [2, 2], "x": 2, "y": 2},
-        {"matrix": [2, 3], "x": 3, "y": 2},
-        {"matrix": [2, 4], "x": 4, "y": 2},
-        {"matrix": [2, 5], "x": 5, "y": 2},
-
-        {"matrix": [3, 0], "x": 0, "y": 3},
-        {"matrix": [3, 1], "x": 1, "y": 3},
-        {"matrix": [3, 2], "x": 2, "y": 3},
-        {"matrix": [3, 3], "x": 3, "y": 3},
-        {"matrix": [3, 4], "x": 4, "y": 3},
-        {"matrix": [3, 5], "x": 5, "y": 3},
-
-        {"matrix": [4, 0], "x": 0, "y": 4},
-        {"matrix": [4, 1], "x": 1, "y": 4},
-        {"matrix": [4, 2], "x": 2, "y": 4},
-        {"matrix": [4, 3], "x": 3, "y": 4},
-        {"matrix": [4, 4], "x": 4, "y": 4},
-
-        {"matrix": [5, 5], "x": 6, "y": 5},
-        {"matrix": [5, 0], "x": 7, "y": 5},
-
-        {"matrix": [5, 4], "x": 7, "y": 6},
-        {"matrix": [5, 3], "x": 5, "y": 6, "h": 2},
-        {"matrix": [5, 2], "x": 6, "y": 6, "h": 2},
-
-        {"matrix": [5, 1], "x": 7, "y": 7},
-
-        {"matrix": [0, 6], "x": 11, "y": 0},
-        {"matrix": [0, 7], "x": 12, "y": 0},
-        {"matrix": [0, 8], "x": 13, "y": 0},
-        {"matrix": [0, 9], "x": 14, "y": 0},
-        {"matrix": [0, 10], "x": 15, "y": 0},
-        {"matrix": [0, 11], "x": 16, "y": 0},
-
-        {"matrix": [1, 6], "x": 11, "y": 1},
-        {"matrix": [1, 7], "x": 12, "y": 1},
-        {"matrix": [1, 8], "x": 13, "y": 1},
-        {"matrix": [1, 9], "x": 14, "y": 1},
-        {"matrix": [1, 10], "x": 15, "y": 1},
-        {"matrix": [1, 11], "x": 16, "y": 1},
-
-        {"matrix": [2, 6], "x": 11, "y": 2},
-        {"matrix": [2, 7], "x": 12, "y": 2},
-        {"matrix": [2, 8], "x": 13, "y": 2},
-        {"matrix": [2, 9], "x": 14, "y": 2},
-        {"matrix": [2, 10], "x": 15, "y": 2},
-        {"matrix": [2, 11], "x": 16, "y": 2},
-
-        {"matrix": [3, 6], "x": 11, "y": 3},
-        {"matrix": [3, 7], "x": 12, "y": 3},
-        {"matrix": [3, 8], "x": 13, "y": 3},
-        {"matrix": [3, 9], "x": 14, "y": 3},
-        {"matrix": [3, 10], "x": 15, "y": 3},
-        {"matrix": [3, 11], "x": 16, "y": 3},
-
-        {"matrix": [4, 7], "x": 12, "y": 4},
-        {"matrix": [4, 8], "x": 13, "y": 4},
-        {"matrix": [4, 9], "x": 14, "y": 4},
-        {"matrix": [4, 10], "x": 15, "y": 4},
-        {"matrix": [4, 11], "x": 16, "y": 4},
-
-        {"matrix": [5, 11], "x": 9, "y": 5},
-        {"matrix": [5, 6], "x": 10, "y": 5},
-
-        {"matrix": [5, 7], "x": 9, "y": 6},
-
-        {"matrix": [5, 10], "x": 9, "y": 7},
-
-        {"matrix": [5, 9], "x": 10, "y": 6, "h": 2},
-        {"matrix": [5, 8], "x": 11, "y": 6, "h": 2}
-      ]
-    }
-  }
-}
diff --git a/keyboards/handwired/dactyl/keyboard.json b/keyboards/handwired/dactyl/keyboard.json
new file mode 100644
index 00000000000..339119e6fd4
--- /dev/null
+++ b/keyboards/handwired/dactyl/keyboard.json
@@ -0,0 +1,117 @@
+{
+  "keyboard_name": "Dactyl",
+  "manufacturer": "Adereth",
+  "url": "",
+  "maintainer": "qmk",
+  "usb": {
+    "vid": "0xFEED",
+    "pid": "0x1308",
+    "device_version": "0.0.1"
+  },
+  "processor": "atmega32u4",
+  "bootloader": "halfkay",
+  "features": {
+    "bootmagic": false,
+    "mousekey": false,
+    "extrakey": true,
+    "nkro": true,
+    "unicode": true,
+    "swap_hands": true
+  },
+  "debounce": 15,
+  "tapping": {
+    "toggle": 1
+  },
+  "layouts": {
+    "LAYOUT_dactyl": {
+      "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": [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": [1, 4], "x": 4, "y": 1},
+        {"matrix": [1, 5], "x": 5, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2},
+        {"matrix": [2, 1], "x": 1, "y": 2},
+        {"matrix": [2, 2], "x": 2, "y": 2},
+        {"matrix": [2, 3], "x": 3, "y": 2},
+        {"matrix": [2, 4], "x": 4, "y": 2},
+        {"matrix": [2, 5], "x": 5, "y": 2},
+
+        {"matrix": [3, 0], "x": 0, "y": 3},
+        {"matrix": [3, 1], "x": 1, "y": 3},
+        {"matrix": [3, 2], "x": 2, "y": 3},
+        {"matrix": [3, 3], "x": 3, "y": 3},
+        {"matrix": [3, 4], "x": 4, "y": 3},
+        {"matrix": [3, 5], "x": 5, "y": 3},
+
+        {"matrix": [4, 0], "x": 0, "y": 4},
+        {"matrix": [4, 1], "x": 1, "y": 4},
+        {"matrix": [4, 2], "x": 2, "y": 4},
+        {"matrix": [4, 3], "x": 3, "y": 4},
+        {"matrix": [4, 4], "x": 4, "y": 4},
+
+        {"matrix": [5, 5], "x": 6, "y": 5},
+        {"matrix": [5, 0], "x": 7, "y": 5},
+
+        {"matrix": [5, 4], "x": 7, "y": 6},
+        {"matrix": [5, 3], "x": 5, "y": 6, "h": 2},
+        {"matrix": [5, 2], "x": 6, "y": 6, "h": 2},
+
+        {"matrix": [5, 1], "x": 7, "y": 7},
+
+        {"matrix": [0, 6], "x": 11, "y": 0},
+        {"matrix": [0, 7], "x": 12, "y": 0},
+        {"matrix": [0, 8], "x": 13, "y": 0},
+        {"matrix": [0, 9], "x": 14, "y": 0},
+        {"matrix": [0, 10], "x": 15, "y": 0},
+        {"matrix": [0, 11], "x": 16, "y": 0},
+
+        {"matrix": [1, 6], "x": 11, "y": 1},
+        {"matrix": [1, 7], "x": 12, "y": 1},
+        {"matrix": [1, 8], "x": 13, "y": 1},
+        {"matrix": [1, 9], "x": 14, "y": 1},
+        {"matrix": [1, 10], "x": 15, "y": 1},
+        {"matrix": [1, 11], "x": 16, "y": 1},
+
+        {"matrix": [2, 6], "x": 11, "y": 2},
+        {"matrix": [2, 7], "x": 12, "y": 2},
+        {"matrix": [2, 8], "x": 13, "y": 2},
+        {"matrix": [2, 9], "x": 14, "y": 2},
+        {"matrix": [2, 10], "x": 15, "y": 2},
+        {"matrix": [2, 11], "x": 16, "y": 2},
+
+        {"matrix": [3, 6], "x": 11, "y": 3},
+        {"matrix": [3, 7], "x": 12, "y": 3},
+        {"matrix": [3, 8], "x": 13, "y": 3},
+        {"matrix": [3, 9], "x": 14, "y": 3},
+        {"matrix": [3, 10], "x": 15, "y": 3},
+        {"matrix": [3, 11], "x": 16, "y": 3},
+
+        {"matrix": [4, 7], "x": 12, "y": 4},
+        {"matrix": [4, 8], "x": 13, "y": 4},
+        {"matrix": [4, 9], "x": 14, "y": 4},
+        {"matrix": [4, 10], "x": 15, "y": 4},
+        {"matrix": [4, 11], "x": 16, "y": 4},
+
+        {"matrix": [5, 11], "x": 9, "y": 5},
+        {"matrix": [5, 6], "x": 10, "y": 5},
+
+        {"matrix": [5, 7], "x": 9, "y": 6},
+
+        {"matrix": [5, 10], "x": 9, "y": 7},
+
+        {"matrix": [5, 9], "x": 10, "y": 6, "h": 2},
+        {"matrix": [5, 8], "x": 11, "y": 6, "h": 2}
+      ]
+    }
+  }
+}
diff --git a/keyboards/handwired/dactyl/rules.mk b/keyboards/handwired/dactyl/rules.mk
index bffd901b04d..35b5df19738 100644
--- a/keyboards/handwired/dactyl/rules.mk
+++ b/keyboards/handwired/dactyl/rules.mk
@@ -1,17 +1,4 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-POINTING_DEVICE_ENABLE  = no
-MOUSEKEY_ENABLE         = no  # Mouse keys
-EXTRAKEY_ENABLE         = yes # Audio control and System control
-CONSOLE_ENABLE          = no  # Console for debug
-COMMAND_ENABLE          = no  # Commands for debug and configuration
-CUSTOM_MATRIX           = yes # Custom matrix file for the Dactyl
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-UNICODE_ENABLE          = yes # Unicode
-SWAP_HANDS_ENABLE       = yes # Allow swapping hands of keyboard
-RGBLIGHT_ENABLE         = no
+CUSTOM_MATRIX           = yes
 
 # project specific files
 I2C_DRIVER_REQUIRED = yes
diff --git a/keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/info.json b/keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/info.json
deleted file mode 100644
index 905ed5cc3fe..00000000000
--- a/keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/info.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-    "matrix_pins": {
-        "cols": ["B1", "B0", "A7", "A6", "A5", "A4"],
-        "rows": ["B12", "B13", "B14", "B15", "A8", "A9", "A10"]
-    },
-    "diode_direction": "COL2ROW",
-    "split": {
-        "enabled": true,
-        "bootmagic": {
-            "matrix": [7, 0]
-        }
-    },
-    "processor": "STM32F411",
-    "bootloader": "stm32-dfu",
-    "board": "BLACKPILL_STM32_F411"
-}
diff --git a/keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/keyboard.json b/keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/keyboard.json
new file mode 100644
index 00000000000..9391d3a46d4
--- /dev/null
+++ b/keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/keyboard.json
@@ -0,0 +1,21 @@
+{
+    "matrix_pins": {
+        "cols": ["B1", "B0", "A7", "A6", "A5", "A4"],
+        "rows": ["B12", "B13", "B14", "B15", "A8", "A9", "A10"]
+    },
+    "diode_direction": "COL2ROW",
+    "split": {
+        "enabled": true,
+        "bootmagic": {
+            "matrix": [7, 0]
+        }
+    },
+    "development_board": "blackpill_f411",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "console": true,
+        "command": true
+    }
+}
diff --git a/keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/rules.mk b/keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/rules.mk
index c6228f59ed7..c018471cadc 100644
--- a/keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/rules.mk
+++ b/keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/rules.mk
@@ -1,16 +1,3 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = yes        # Console for debug
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
 # split settings
 # https://beta.docs.qmk.fm/developing-qmk/c-development/hardware_drivers/serial_driver
 SERIAL_DRIVER = usart
diff --git a/keyboards/handwired/dactyl_manuform/6x6/promicro/keyboard.json b/keyboards/handwired/dactyl_manuform/6x6/promicro/keyboard.json
index e9b1152d664..0ec00196ba5 100644
--- a/keyboards/handwired/dactyl_manuform/6x6/promicro/keyboard.json
+++ b/keyboards/handwired/dactyl_manuform/6x6/promicro/keyboard.json
@@ -15,5 +15,11 @@
         "pin": "D3"
     },
     "processor": "atmega32u4",
-    "bootloader": "caterina"
+    "bootloader": "caterina",
+    "features": {
+        "bootmagic": false,
+        "mousekey": true,
+        "extrakey": true,
+        "command": true
+    }
 }
diff --git a/keyboards/handwired/dactyl_manuform/6x6/rules.mk b/keyboards/handwired/dactyl_manuform/6x6/rules.mk
index 389d7509f00..29194b429ef 100644
--- a/keyboards/handwired/dactyl_manuform/6x6/rules.mk
+++ b/keyboards/handwired/dactyl_manuform/6x6/rules.mk
@@ -1,14 +1 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
 DEFAULT_FOLDER = handwired/dactyl_manuform/6x6/promicro
diff --git a/keyboards/handwired/datahand/info.json b/keyboards/handwired/datahand/info.json
deleted file mode 100644
index 372619565da..00000000000
--- a/keyboards/handwired/datahand/info.json
+++ /dev/null
@@ -1,92 +0,0 @@
-{
-    "keyboard_name": "DataHand",
-    "manufacturer": "DataHand",
-    "url": "",
-    "maintainer": "qmk",
-    "usb": {
-        "vid": "0x13BA",
-        "pid": "0x0017",
-        "device_version": "0.0.1",
-        "force_nkro": true
-    },
-    "processor": "at90usb1286",
-    "bootloader": "halfkay",
-    "debounce": 0,
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 3], "x": 1, "y": 2.75},
-                {"matrix": [3, 3], "x": 3.25, "y": 1.25},
-
-                {"matrix": [5, 3], "x": 5.75, "y": 0},
-                {"matrix": [8, 3], "x": 9, "y": 0.75},
-
-                {"matrix": [0, 1], "x": 13, "y": 0.75},
-                {"matrix": [3, 1], "x": 16.25, "y": 0},
-
-                {"matrix": [5, 1], "x": 18.75, "y": 1.25},
-                {"matrix": [8, 1], "x": 21, "y": 2.75},
-
-                {"matrix": [0, 2], "x": 0, "y": 3.75},
-                {"matrix": [1, 2], "x": 1, "y": 3.75},
-                {"matrix": [1, 3], "x": 2, "y": 3.75},
-
-                {"matrix": [3, 2], "x": 2.25, "y": 2.25},
-                {"matrix": [4, 2], "x": 3.25, "y": 2.25},
-                {"matrix": [4, 3], "x": 4.25, "y": 2.25},
-
-                {"matrix": [5, 2], "x": 4.75, "y": 1},
-                {"matrix": [6, 2], "x": 5.75, "y": 1},
-                {"matrix": [6, 3], "x": 6.75, "y": 1},
-
-                {"matrix": [8, 2], "x": 8, "y": 1.75},
-                {"matrix": [9, 2], "x": 9, "y": 1.75},
-                {"matrix": [9, 3], "x": 10, "y": 1.75},
-
-                {"matrix": [0, 0], "x": 12, "y": 1.75},
-                {"matrix": [1, 0], "x": 13, "y": 1.75},
-                {"matrix": [1, 1], "x": 14, "y": 1.75},
-
-                {"matrix": [3, 0], "x": 15.25, "y": 1},
-                {"matrix": [4, 0], "x": 16.25, "y": 1},
-                {"matrix": [4, 1], "x": 17.25, "y": 1},
-
-                {"matrix": [5, 0], "x": 17.75, "y": 2.25},
-                {"matrix": [6, 0], "x": 18.75, "y": 2.25},
-                {"matrix": [6, 1], "x": 19.75, "y": 2.25},
-
-                {"matrix": [8, 0], "x": 20, "y": 3.75},
-                {"matrix": [9, 0], "x": 21, "y": 3.75},
-                {"matrix": [9, 1], "x": 22, "y": 3.75},
-
-                {"matrix": [2, 2], "x": 1, "y": 4.75},
-                {"matrix": [2, 3], "x": 3.25, "y": 3.25},
-
-                {"matrix": [7, 2], "x": 5.75, "y": 2},
-                {"matrix": [7, 3], "x": 9, "y": 2.75},
-
-                {"matrix": [2, 0], "x": 13, "y": 2.75},
-                {"matrix": [2, 1], "x": 16.25, "y": 2},
-
-                {"matrix": [7, 0], "x": 18.75, "y": 3.25},
-                {"matrix": [7, 1], "x": 21, "y": 4.75},
-
-                {"matrix": [12, 2], "x": 8, "y": 4.75},
-                {"matrix": [10, 3], "x": 10, "y": 4.75},
-                {"matrix": [10, 1], "x": 12, "y": 4.75},
-                {"matrix": [12, 0], "x": 14, "y": 4.75},
-
-                {"matrix": [11, 2], "x": 9, "y": 5.25},
-                {"matrix": [11, 0], "x": 13, "y": 5.25},
-
-                {"matrix": [11, 3], "x": 9, "y": 6.25},
-                {"matrix": [11, 1], "x": 13, "y": 6.25},
-
-                {"matrix": [12, 3], "x": 8, "y": 6.75},
-                {"matrix": [10, 2], "x": 10, "y": 6.75},
-                {"matrix": [10, 0], "x": 12, "y": 6.75},
-                {"matrix": [12, 1], "x": 14, "y": 6.75}
-            ]
-        }
-    }
-}
diff --git a/keyboards/handwired/datahand/keyboard.json b/keyboards/handwired/datahand/keyboard.json
new file mode 100644
index 00000000000..96e49388dc8
--- /dev/null
+++ b/keyboards/handwired/datahand/keyboard.json
@@ -0,0 +1,100 @@
+{
+    "keyboard_name": "DataHand",
+    "manufacturer": "DataHand",
+    "url": "",
+    "maintainer": "qmk",
+    "usb": {
+        "vid": "0x13BA",
+        "pid": "0x0017",
+        "device_version": "0.0.1",
+        "force_nkro": true
+    },
+    "processor": "at90usb1286",
+    "bootloader": "halfkay",
+    "features": {
+        "bootmagic": false,
+        "mousekey": true,
+        "extrakey": true,
+        "console": true,
+        "command": true,
+        "nkro": true
+    },
+    "debounce": 0,
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 3], "x": 1, "y": 2.75},
+                {"matrix": [3, 3], "x": 3.25, "y": 1.25},
+
+                {"matrix": [5, 3], "x": 5.75, "y": 0},
+                {"matrix": [8, 3], "x": 9, "y": 0.75},
+
+                {"matrix": [0, 1], "x": 13, "y": 0.75},
+                {"matrix": [3, 1], "x": 16.25, "y": 0},
+
+                {"matrix": [5, 1], "x": 18.75, "y": 1.25},
+                {"matrix": [8, 1], "x": 21, "y": 2.75},
+
+                {"matrix": [0, 2], "x": 0, "y": 3.75},
+                {"matrix": [1, 2], "x": 1, "y": 3.75},
+                {"matrix": [1, 3], "x": 2, "y": 3.75},
+
+                {"matrix": [3, 2], "x": 2.25, "y": 2.25},
+                {"matrix": [4, 2], "x": 3.25, "y": 2.25},
+                {"matrix": [4, 3], "x": 4.25, "y": 2.25},
+
+                {"matrix": [5, 2], "x": 4.75, "y": 1},
+                {"matrix": [6, 2], "x": 5.75, "y": 1},
+                {"matrix": [6, 3], "x": 6.75, "y": 1},
+
+                {"matrix": [8, 2], "x": 8, "y": 1.75},
+                {"matrix": [9, 2], "x": 9, "y": 1.75},
+                {"matrix": [9, 3], "x": 10, "y": 1.75},
+
+                {"matrix": [0, 0], "x": 12, "y": 1.75},
+                {"matrix": [1, 0], "x": 13, "y": 1.75},
+                {"matrix": [1, 1], "x": 14, "y": 1.75},
+
+                {"matrix": [3, 0], "x": 15.25, "y": 1},
+                {"matrix": [4, 0], "x": 16.25, "y": 1},
+                {"matrix": [4, 1], "x": 17.25, "y": 1},
+
+                {"matrix": [5, 0], "x": 17.75, "y": 2.25},
+                {"matrix": [6, 0], "x": 18.75, "y": 2.25},
+                {"matrix": [6, 1], "x": 19.75, "y": 2.25},
+
+                {"matrix": [8, 0], "x": 20, "y": 3.75},
+                {"matrix": [9, 0], "x": 21, "y": 3.75},
+                {"matrix": [9, 1], "x": 22, "y": 3.75},
+
+                {"matrix": [2, 2], "x": 1, "y": 4.75},
+                {"matrix": [2, 3], "x": 3.25, "y": 3.25},
+
+                {"matrix": [7, 2], "x": 5.75, "y": 2},
+                {"matrix": [7, 3], "x": 9, "y": 2.75},
+
+                {"matrix": [2, 0], "x": 13, "y": 2.75},
+                {"matrix": [2, 1], "x": 16.25, "y": 2},
+
+                {"matrix": [7, 0], "x": 18.75, "y": 3.25},
+                {"matrix": [7, 1], "x": 21, "y": 4.75},
+
+                {"matrix": [12, 2], "x": 8, "y": 4.75},
+                {"matrix": [10, 3], "x": 10, "y": 4.75},
+                {"matrix": [10, 1], "x": 12, "y": 4.75},
+                {"matrix": [12, 0], "x": 14, "y": 4.75},
+
+                {"matrix": [11, 2], "x": 9, "y": 5.25},
+                {"matrix": [11, 0], "x": 13, "y": 5.25},
+
+                {"matrix": [11, 3], "x": 9, "y": 6.25},
+                {"matrix": [11, 1], "x": 13, "y": 6.25},
+
+                {"matrix": [12, 3], "x": 8, "y": 6.75},
+                {"matrix": [10, 2], "x": 10, "y": 6.75},
+                {"matrix": [10, 0], "x": 12, "y": 6.75},
+                {"matrix": [12, 1], "x": 14, "y": 6.75}
+            ]
+        }
+    }
+}
diff --git a/keyboards/handwired/datahand/rules.mk b/keyboards/handwired/datahand/rules.mk
index 447e7fdc02c..a0a4f497e13 100644
--- a/keyboards/handwired/datahand/rules.mk
+++ b/keyboards/handwired/datahand/rules.mk
@@ -1,15 +1,4 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE   = yes  # Mouse keys
-EXTRAKEY_ENABLE   = yes  # Audio control and System control
-CONSOLE_ENABLE    = yes  # Console for debug
-COMMAND_ENABLE    = yes  # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE  = no   # Enable keyboard backlight functionality
-AUDIO_ENABLE      = no   # Audio output
-CUSTOM_MATRIX     = yes  # We definitely have a nonstandard matrix
+CUSTOM_MATRIX     = yes
 
 # Project specific files
 SRC = matrix.c
diff --git a/keyboards/handwired/dqz11n1g/info.json b/keyboards/handwired/dqz11n1g/info.json
deleted file mode 100644
index 4df41850109..00000000000
--- a/keyboards/handwired/dqz11n1g/info.json
+++ /dev/null
@@ -1,155 +0,0 @@
-{
-    "keyboard_name": "DQz11N1G",
-    "manufacturer": "Unknown",
-    "url": "https://github.com/dvdkhlng/qmk_firmware_dqz11n1g",
-    "maintainer": "dvdkhlng",
-    "usb": {
-        "vid": "0xFEED",
-        "pid": "0x4451",
-        "device_version": "0.0.1"
-    },
-    "indicators": {
-        "caps_lock": "F7",
-        "num_lock": "F5",
-        "scroll_lock": "F4"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-
-                {"matrix": [0, 6], "x": 7, "y": 0},
-                {"matrix": [0, 7], "x": 8, "y": 0},
-                {"matrix": [0, 8], "x": 9, "y": 0},
-                {"matrix": [0, 9], "x": 10, "y": 0},
-                {"matrix": [0, 10], "x": 11, "y": 0},
-                {"matrix": [0, 11], "x": 12, "y": 0},
-                {"matrix": [0, 12], "x": 13, "y": 0},
-
-                {"matrix": [0, 13], "x": 15, "y": 0},
-                {"matrix": [0, 14], "x": 16, "y": 0},
-                {"matrix": [0, 15], "x": 17, "y": 0},
-                {"matrix": [0, 16], "x": 18, "y": 0},
-                {"matrix": [0, 17], "x": 19, "y": 0},
-                {"matrix": [0, 18], "x": 20, "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": [1, 4], "x": 4, "y": 1},
-                {"matrix": [1, 5], "x": 5, "y": 1},
-
-                {"matrix": [1, 6], "x": 7, "y": 1},
-                {"matrix": [1, 7], "x": 8, "y": 1},
-                {"matrix": [1, 8], "x": 9, "y": 1},
-                {"matrix": [1, 9], "x": 10, "y": 1},
-                {"matrix": [1, 10], "x": 11, "y": 1},
-                {"matrix": [1, 11], "x": 12, "y": 1},
-                {"matrix": [1, 12], "x": 13, "y": 1},
-
-                {"matrix": [1, 13], "x": 15, "y": 1},
-                {"matrix": [1, 14], "x": 16, "y": 1},
-                {"matrix": [1, 15], "x": 17, "y": 1},
-                {"matrix": [1, 16], "x": 18, "y": 1},
-                {"matrix": [1, 17], "x": 19, "y": 1},
-                {"matrix": [1, 18], "x": 20, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2},
-                {"matrix": [2, 1], "x": 1, "y": 2},
-                {"matrix": [2, 2], "x": 2, "y": 2},
-                {"matrix": [2, 3], "x": 3, "y": 2},
-                {"matrix": [2, 4], "x": 4, "y": 2},
-                {"matrix": [2, 5], "x": 5, "y": 2},
-
-                {"matrix": [2, 6], "x": 7, "y": 2},
-                {"matrix": [2, 7], "x": 8, "y": 2},
-                {"matrix": [2, 8], "x": 9, "y": 2},
-                {"matrix": [2, 9], "x": 10, "y": 2},
-                {"matrix": [2, 10], "x": 11, "y": 2},
-                {"matrix": [2, 11], "x": 12, "y": 2},
-                {"matrix": [2, 12], "x": 13, "y": 2},
-
-                {"matrix": [2, 13], "x": 15, "y": 2},
-                {"matrix": [2, 14], "x": 16, "y": 2},
-                {"matrix": [2, 15], "x": 17, "y": 2},
-                {"matrix": [2, 16], "x": 18, "y": 2},
-                {"matrix": [2, 17], "x": 19, "y": 2},
-                {"matrix": [2, 18], "x": 20, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3},
-                {"matrix": [3, 1], "x": 1, "y": 3},
-                {"matrix": [3, 2], "x": 2, "y": 3},
-                {"matrix": [3, 3], "x": 3, "y": 3},
-                {"matrix": [3, 4], "x": 4, "y": 3},
-                {"matrix": [3, 5], "x": 5, "y": 3},
-
-                {"matrix": [3, 6], "x": 7, "y": 3},
-                {"matrix": [3, 7], "x": 8, "y": 3},
-                {"matrix": [3, 8], "x": 9, "y": 3},
-                {"matrix": [3, 9], "x": 10, "y": 3},
-                {"matrix": [3, 10], "x": 11, "y": 3},
-                {"matrix": [3, 11], "x": 12, "y": 3},
-                {"matrix": [3, 12], "x": 13, "y": 3},
-
-                {"matrix": [3, 13], "x": 15, "y": 3},
-                {"matrix": [3, 14], "x": 16, "y": 3},
-                {"matrix": [3, 15], "x": 17, "y": 3},
-                {"matrix": [3, 16], "x": 18, "y": 3},
-                {"matrix": [3, 17], "x": 19, "y": 3},
-                {"matrix": [3, 18], "x": 20, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "h": 2},
-                {"matrix": [4, 1], "x": 1, "y": 4},
-                {"matrix": [4, 2], "x": 2, "y": 4},
-                {"matrix": [4, 3], "x": 3, "y": 4},
-                {"matrix": [4, 4], "x": 4, "y": 4},
-                {"matrix": [4, 5], "x": 5, "y": 4},
-
-                {"matrix": [4, 13], "x": 15, "y": 4},
-                {"matrix": [4, 14], "x": 16, "y": 4},
-                {"matrix": [4, 15], "x": 17, "y": 4},
-                {"matrix": [4, 16], "x": 18, "y": 4},
-                {"matrix": [4, 17], "x": 19, "y": 4},
-                {"matrix": [4, 18], "x": 20, "y": 4, "h": 2},
-
-                {"matrix": [5, 1], "x": 1, "y": 5},
-                {"matrix": [5, 2], "x": 2, "y": 5},
-                {"matrix": [5, 3], "x": 3, "y": 5},
-                {"matrix": [5, 4], "x": 4, "y": 5},
-
-                {"matrix": [5, 14], "x": 16, "y": 5},
-                {"matrix": [5, 15], "x": 17, "y": 5},
-                {"matrix": [5, 16], "x": 18, "y": 5},
-                {"matrix": [5, 17], "x": 19, "y": 5},
-
-                {"matrix": [4, 6], "x": 5, "y": 7},
-                {"matrix": [4, 7], "x": 6, "y": 7},
-                {"matrix": [4, 8], "x": 7, "y": 7},
-
-                {"matrix": [4, 10], "x": 13, "y": 7},
-                {"matrix": [4, 11], "x": 14, "y": 7},
-                {"matrix": [4, 12], "x": 15, "y": 7},
-
-                {"matrix": [5, 6], "x": 5, "y": 8, "h": 2},
-                {"matrix": [5, 7], "x": 6, "y": 8, "h": 2},
-                {"matrix": [5, 8], "x": 7, "y": 8},
-
-                {"matrix": [5, 10], "x": 13, "y": 8},
-                {"matrix": [5, 11], "x": 14, "y": 8, "h": 2},
-                {"matrix": [5, 12], "x": 15, "y": 8, "h": 2},
-
-                {"matrix": [6, 8], "x": 7, "y": 9},
-
-                {"matrix": [6, 10], "x": 13, "y": 9}
-            ]
-        }
-    }
-}
diff --git a/keyboards/handwired/dqz11n1g/keyboard.json b/keyboards/handwired/dqz11n1g/keyboard.json
new file mode 100644
index 00000000000..4e45a5a920c
--- /dev/null
+++ b/keyboards/handwired/dqz11n1g/keyboard.json
@@ -0,0 +1,162 @@
+{
+    "keyboard_name": "DQz11N1G",
+    "manufacturer": "Unknown",
+    "url": "https://github.com/dvdkhlng/qmk_firmware_dqz11n1g",
+    "maintainer": "dvdkhlng",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0x4451",
+        "device_version": "0.0.1"
+    },
+    "indicators": {
+        "caps_lock": "F7",
+        "num_lock": "F5",
+        "scroll_lock": "F4"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
+    "features": {
+        "bootmagic": false,
+        "mousekey": true,
+        "extrakey": true,
+        "command": true,
+        "audio": true
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+
+                {"matrix": [0, 6], "x": 7, "y": 0},
+                {"matrix": [0, 7], "x": 8, "y": 0},
+                {"matrix": [0, 8], "x": 9, "y": 0},
+                {"matrix": [0, 9], "x": 10, "y": 0},
+                {"matrix": [0, 10], "x": 11, "y": 0},
+                {"matrix": [0, 11], "x": 12, "y": 0},
+                {"matrix": [0, 12], "x": 13, "y": 0},
+
+                {"matrix": [0, 13], "x": 15, "y": 0},
+                {"matrix": [0, 14], "x": 16, "y": 0},
+                {"matrix": [0, 15], "x": 17, "y": 0},
+                {"matrix": [0, 16], "x": 18, "y": 0},
+                {"matrix": [0, 17], "x": 19, "y": 0},
+                {"matrix": [0, 18], "x": 20, "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": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+
+                {"matrix": [1, 6], "x": 7, "y": 1},
+                {"matrix": [1, 7], "x": 8, "y": 1},
+                {"matrix": [1, 8], "x": 9, "y": 1},
+                {"matrix": [1, 9], "x": 10, "y": 1},
+                {"matrix": [1, 10], "x": 11, "y": 1},
+                {"matrix": [1, 11], "x": 12, "y": 1},
+                {"matrix": [1, 12], "x": 13, "y": 1},
+
+                {"matrix": [1, 13], "x": 15, "y": 1},
+                {"matrix": [1, 14], "x": 16, "y": 1},
+                {"matrix": [1, 15], "x": 17, "y": 1},
+                {"matrix": [1, 16], "x": 18, "y": 1},
+                {"matrix": [1, 17], "x": 19, "y": 1},
+                {"matrix": [1, 18], "x": 20, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+
+                {"matrix": [2, 6], "x": 7, "y": 2},
+                {"matrix": [2, 7], "x": 8, "y": 2},
+                {"matrix": [2, 8], "x": 9, "y": 2},
+                {"matrix": [2, 9], "x": 10, "y": 2},
+                {"matrix": [2, 10], "x": 11, "y": 2},
+                {"matrix": [2, 11], "x": 12, "y": 2},
+                {"matrix": [2, 12], "x": 13, "y": 2},
+
+                {"matrix": [2, 13], "x": 15, "y": 2},
+                {"matrix": [2, 14], "x": 16, "y": 2},
+                {"matrix": [2, 15], "x": 17, "y": 2},
+                {"matrix": [2, 16], "x": 18, "y": 2},
+                {"matrix": [2, 17], "x": 19, "y": 2},
+                {"matrix": [2, 18], "x": 20, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
+
+                {"matrix": [3, 6], "x": 7, "y": 3},
+                {"matrix": [3, 7], "x": 8, "y": 3},
+                {"matrix": [3, 8], "x": 9, "y": 3},
+                {"matrix": [3, 9], "x": 10, "y": 3},
+                {"matrix": [3, 10], "x": 11, "y": 3},
+                {"matrix": [3, 11], "x": 12, "y": 3},
+                {"matrix": [3, 12], "x": 13, "y": 3},
+
+                {"matrix": [3, 13], "x": 15, "y": 3},
+                {"matrix": [3, 14], "x": 16, "y": 3},
+                {"matrix": [3, 15], "x": 17, "y": 3},
+                {"matrix": [3, 16], "x": 18, "y": 3},
+                {"matrix": [3, 17], "x": 19, "y": 3},
+                {"matrix": [3, 18], "x": 20, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "h": 2},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+                {"matrix": [4, 2], "x": 2, "y": 4},
+                {"matrix": [4, 3], "x": 3, "y": 4},
+                {"matrix": [4, 4], "x": 4, "y": 4},
+                {"matrix": [4, 5], "x": 5, "y": 4},
+
+                {"matrix": [4, 13], "x": 15, "y": 4},
+                {"matrix": [4, 14], "x": 16, "y": 4},
+                {"matrix": [4, 15], "x": 17, "y": 4},
+                {"matrix": [4, 16], "x": 18, "y": 4},
+                {"matrix": [4, 17], "x": 19, "y": 4},
+                {"matrix": [4, 18], "x": 20, "y": 4, "h": 2},
+
+                {"matrix": [5, 1], "x": 1, "y": 5},
+                {"matrix": [5, 2], "x": 2, "y": 5},
+                {"matrix": [5, 3], "x": 3, "y": 5},
+                {"matrix": [5, 4], "x": 4, "y": 5},
+
+                {"matrix": [5, 14], "x": 16, "y": 5},
+                {"matrix": [5, 15], "x": 17, "y": 5},
+                {"matrix": [5, 16], "x": 18, "y": 5},
+                {"matrix": [5, 17], "x": 19, "y": 5},
+
+                {"matrix": [4, 6], "x": 5, "y": 7},
+                {"matrix": [4, 7], "x": 6, "y": 7},
+                {"matrix": [4, 8], "x": 7, "y": 7},
+
+                {"matrix": [4, 10], "x": 13, "y": 7},
+                {"matrix": [4, 11], "x": 14, "y": 7},
+                {"matrix": [4, 12], "x": 15, "y": 7},
+
+                {"matrix": [5, 6], "x": 5, "y": 8, "h": 2},
+                {"matrix": [5, 7], "x": 6, "y": 8, "h": 2},
+                {"matrix": [5, 8], "x": 7, "y": 8},
+
+                {"matrix": [5, 10], "x": 13, "y": 8},
+                {"matrix": [5, 11], "x": 14, "y": 8, "h": 2},
+                {"matrix": [5, 12], "x": 15, "y": 8, "h": 2},
+
+                {"matrix": [6, 8], "x": 7, "y": 9},
+
+                {"matrix": [6, 10], "x": 13, "y": 9}
+            ]
+        }
+    }
+}
diff --git a/keyboards/handwired/dqz11n1g/rules.mk b/keyboards/handwired/dqz11n1g/rules.mk
index 220e353ab77..d998c6a8843 100644
--- a/keyboards/handwired/dqz11n1g/rules.mk
+++ b/keyboards/handwired/dqz11n1g/rules.mk
@@ -2,17 +2,3 @@
 CUSTOM_MATRIX = lite
 SRC += matrix.c 
 SPI_DRIVER_REQUIRED = yes
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = yes          # Audio output
-
diff --git a/keyboards/handwired/dygma/raise/info.json b/keyboards/handwired/dygma/raise/info.json
index b9bcd2e639c..2d0c354f3b2 100644
--- a/keyboards/handwired/dygma/raise/info.json
+++ b/keyboards/handwired/dygma/raise/info.json
@@ -24,8 +24,12 @@
         "led_flush_limit": 100,
         "sleep": true
     },
-    "processor": "STM32F411",
-    "bootloader": "stm32-dfu",
-    "board": "BLACKPILL_STM32_F411",
+    "development_board": "blackpill_f411",
+    "features": {
+        "bootmagic": false,
+        "mousekey": true,
+        "extrakey": true,
+        "rgb_matrix": true
+    },
     "debounce": 0
 }
diff --git a/keyboards/handwired/dygma/raise/rules.mk b/keyboards/handwired/dygma/raise/rules.mk
index ecf156629aa..7a078c9757b 100644
--- a/keyboards/handwired/dygma/raise/rules.mk
+++ b/keyboards/handwired/dygma/raise/rules.mk
@@ -1,16 +1,3 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-RGB_MATRIX_ENABLE = yes
 CUSTOM_MATRIX = lite
 
 # TODO(ibash) we don't actually need to enable raw, but there's some side effect
diff --git a/keyboards/handwired/ergocheap/keyboard.json b/keyboards/handwired/ergocheap/keyboard.json
index 72be536d64b..8728b486a8f 100644
--- a/keyboards/handwired/ergocheap/keyboard.json
+++ b/keyboards/handwired/ergocheap/keyboard.json
@@ -25,8 +25,7 @@
         "rows": ["B5", "B6", "B7", "B9", "B8"]
     },
     "diode_direction": "COL2ROW",
-    "processor": "STM32F103",
-    "bootloader": "stm32duino",
+    "development_board": "bluepill",
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/handwired/floorboard/keyboard.json b/keyboards/handwired/floorboard/keyboard.json
index 97e6395957f..0bcec56b8fe 100644
--- a/keyboards/handwired/floorboard/keyboard.json
+++ b/keyboards/handwired/floorboard/keyboard.json
@@ -21,9 +21,7 @@
         "rows": ["A2", "A1", "A0", "B8"]
     },
     "diode_direction": "COL2ROW",
-    "processor": "STM32F303",
-    "bootloader": "stm32-dfu",
-    "board": "QMK_PROTON_C",
+    "development_board": "proton_c",
     "community_layouts": ["ortho_4x12"],
     "layouts": {
         "LAYOUT_ortho_4x12": {
diff --git a/keyboards/handwired/frenchdev/info.json b/keyboards/handwired/frenchdev/info.json
deleted file mode 100644
index 8d031b3c42f..00000000000
--- a/keyboards/handwired/frenchdev/info.json
+++ /dev/null
@@ -1,134 +0,0 @@
-{
-  "keyboard_name": "Frenchdev V1",
-  "manufacturer": "Nicolas Poirey",
-  "maintainer": "qmk",
-  "usb": {
-    "vid": "0xFEED",
-    "pid": "0x1307",
-    "device_version": "0.0.1"
-  },
-  "processor": "atmega32u4",
-  "bootloader": "halfkay",
-  "tapping": {
-    "toggle": 1
-  },
-  "layouts": {
-    "LAYOUT": {
-      "layout": [
-        {"matrix": [14, 5], "x": 1, "y": 0.9},
-        {"matrix": [13, 5], "x": 2, "y": 0.3},
-        {"matrix": [12, 5], "x": 3, "y": 0},
-        {"matrix": [11, 5], "x": 4, "y": 0.4},
-        {"matrix": [10, 5], "x": 5, "y": 0.5},
-        {"matrix": [9, 5], "x": 6, "y": 0.5},
-
-        {"matrix": [6, 5], "x": 13, "y": 0.5},
-        {"matrix": [5, 5], "x": 14, "y": 0.5},
-        {"matrix": [4, 5], "x": 15, "y": 0.4},
-        {"matrix": [3, 5], "x": 16, "y": 0},
-        {"matrix": [2, 5], "x": 17, "y": 0.3},
-        {"matrix": [1, 5], "x": 18, "y": 0.9},
-
-        {"matrix": [15, 4], "x": 0, "y": 1.9},
-        {"matrix": [14, 4], "x": 1, "y": 1.9},
-        {"matrix": [13, 4], "x": 2, "y": 1.3},
-        {"matrix": [12, 4], "x": 3, "y": 1},
-        {"matrix": [11, 4], "x": 4, "y": 1.4},
-        {"matrix": [10, 4], "x": 5, "y": 1.5},
-        {"matrix": [9, 4], "x": 6, "y": 1.5},
-
-        {"matrix": [6, 4], "x": 13, "y": 1.5},
-        {"matrix": [5, 4], "x": 14, "y": 1.5},
-        {"matrix": [4, 4], "x": 15, "y": 1.4},
-        {"matrix": [3, 4], "x": 16, "y": 1},
-        {"matrix": [2, 4], "x": 17, "y": 1.3},
-        {"matrix": [1, 4], "x": 18, "y": 1.9},
-        {"matrix": [0, 4], "x": 19, "y": 1.9},
-
-        {"matrix": [15, 3], "x": 0, "y": 2.9},
-        {"matrix": [14, 3], "x": 1, "y": 2.9},
-        {"matrix": [13, 3], "x": 2, "y": 2.3},
-        {"matrix": [12, 3], "x": 3, "y": 2},
-        {"matrix": [11, 3], "x": 4, "y": 2.4},
-        {"matrix": [10, 3], "x": 5, "y": 2.5},
-        {"matrix": [9, 3], "x": 6, "y": 2.5},
-
-        {"matrix": [6, 3], "x": 13, "y": 2.5},
-        {"matrix": [5, 3], "x": 14, "y": 2.5},
-        {"matrix": [4, 3], "x": 15, "y": 2.4},
-        {"matrix": [3, 3], "x": 16, "y": 2},
-        {"matrix": [2, 3], "x": 17, "y": 2.3},
-        {"matrix": [1, 3], "x": 18, "y": 2.9},
-        {"matrix": [0, 3], "x": 19, "y": 2.9},
-
-        {"matrix": [15, 2], "x": 0, "y": 3.9},
-        {"matrix": [14, 2], "x": 1, "y": 3.9},
-        {"matrix": [13, 2], "x": 2, "y": 3.3},
-        {"matrix": [12, 2], "x": 3, "y": 3},
-        {"matrix": [11, 2], "x": 4, "y": 3.4},
-        {"matrix": [10, 2], "x": 5, "y": 3.5},
-        {"matrix": [9, 2], "x": 6, "y": 3.5},
-
-        {"matrix": [6, 2], "x": 13, "y": 3.5},
-        {"matrix": [5, 2], "x": 14, "y": 3.5},
-        {"matrix": [4, 2], "x": 15, "y": 3.4},
-        {"matrix": [3, 2], "x": 16, "y": 3},
-        {"matrix": [2, 2], "x": 17, "y": 3.3},
-        {"matrix": [1, 2], "x": 18, "y": 3.9},
-        {"matrix": [0, 2], "x": 19, "y": 3.9},
-
-        {"matrix": [15, 1], "x": 0, "y": 4.9},
-        {"matrix": [14, 1], "x": 1, "y": 4.9},
-        {"matrix": [13, 1], "x": 2, "y": 4.3},
-        {"matrix": [12, 1], "x": 3, "y": 4},
-        {"matrix": [11, 1], "x": 4, "y": 4.4},
-        {"matrix": [10, 1], "x": 5, "y": 4.5},
-
-        {"matrix": [9, 1], "x": 6.5, "y": 5},
-        {"matrix": [8, 1], "x": 7.5, "y": 5},
-        {"matrix": [8, 2], "x": 8.5, "y": 5},
-
-        {"matrix": [7, 2], "x": 10.5, "y": 5},
-        {"matrix": [7, 1], "x": 11.5, "y": 5},
-        {"matrix": [6, 1], "x": 12.5, "y": 5},
-
-        {"matrix": [5, 1], "x": 14, "y": 4.5},
-        {"matrix": [4, 1], "x": 15, "y": 4.4},
-        {"matrix": [3, 1], "x": 16, "y": 4},
-        {"matrix": [2, 1], "x": 17, "y": 4.3},
-        {"matrix": [1, 1], "x": 18, "y": 4.9},
-        {"matrix": [0, 1], "x": 19, "y": 4.9},
-
-        {"matrix": [15, 0], "x": 0, "y": 5.9},
-        {"matrix": [14, 0], "x": 1, "y": 5.9},
-        {"matrix": [13, 0], "x": 2, "y": 5.3},
-        {"matrix": [12, 0], "x": 3, "y": 5},
-        {"matrix": [11, 0], "x": 4, "y": 5.4},
-        {"matrix": [10, 0], "x": 5, "y": 5.5},
-
-        {"matrix": [9, 0], "x": 6.5, "y": 6},
-        {"matrix": [8, 0], "x": 7.5, "y": 6},
-
-        {"matrix": [7, 0], "x": 11.5, "y": 6},
-        {"matrix": [6, 0], "x": 12.5, "y": 6},
-
-        {"matrix": [5, 0], "x": 14, "y": 5.5},
-        {"matrix": [4, 0], "x": 15, "y": 5.4},
-        {"matrix": [3, 0], "x": 16, "y": 5},
-        {"matrix": [2, 0], "x": 17, "y": 5.3},
-        {"matrix": [1, 0], "x": 18, "y": 5.9},
-        {"matrix": [0, 0], "x": 19, "y": 5.9},
-
-        {"matrix": [8, 3], "x": 2.25, "y": 7.5, "w": 1.75, "h": 2},
-        {"matrix": [8, 4], "x": 4, "y": 7.5, "w": 1.75, "h": 2},
-
-        {"matrix": [8, 5], "x": 5.75, "y": 7.5, "w": 1.75, "h": 2},
-
-        {"matrix": [7, 3], "x": 12.5, "y": 7.5, "w": 1.75, "h": 2},
-        {"matrix": [7, 4], "x": 14.25, "y": 7.5, "w": 1.75, "h": 2},
-
-        {"matrix": [7, 5], "x": 16, "y": 7.5, "w": 1.75, "h": 2}
-      ]
-    }
-  }
-}
diff --git a/keyboards/handwired/frenchdev/keyboard.json b/keyboards/handwired/frenchdev/keyboard.json
new file mode 100644
index 00000000000..ab811888a9a
--- /dev/null
+++ b/keyboards/handwired/frenchdev/keyboard.json
@@ -0,0 +1,142 @@
+{
+  "keyboard_name": "Frenchdev V1",
+  "manufacturer": "Nicolas Poirey",
+  "maintainer": "qmk",
+  "usb": {
+    "vid": "0xFEED",
+    "pid": "0x1307",
+    "device_version": "0.0.1"
+  },
+  "processor": "atmega32u4",
+  "bootloader": "halfkay",
+  "features": {
+    "bootmagic": false,
+    "mousekey": true,
+    "extrakey": true,
+    "console": true,
+    "command": true,
+    "nkro": true
+  },
+  "tapping": {
+    "toggle": 1
+  },
+  "layouts": {
+    "LAYOUT": {
+      "layout": [
+        {"matrix": [14, 5], "x": 1, "y": 0.9},
+        {"matrix": [13, 5], "x": 2, "y": 0.3},
+        {"matrix": [12, 5], "x": 3, "y": 0},
+        {"matrix": [11, 5], "x": 4, "y": 0.4},
+        {"matrix": [10, 5], "x": 5, "y": 0.5},
+        {"matrix": [9, 5], "x": 6, "y": 0.5},
+
+        {"matrix": [6, 5], "x": 13, "y": 0.5},
+        {"matrix": [5, 5], "x": 14, "y": 0.5},
+        {"matrix": [4, 5], "x": 15, "y": 0.4},
+        {"matrix": [3, 5], "x": 16, "y": 0},
+        {"matrix": [2, 5], "x": 17, "y": 0.3},
+        {"matrix": [1, 5], "x": 18, "y": 0.9},
+
+        {"matrix": [15, 4], "x": 0, "y": 1.9},
+        {"matrix": [14, 4], "x": 1, "y": 1.9},
+        {"matrix": [13, 4], "x": 2, "y": 1.3},
+        {"matrix": [12, 4], "x": 3, "y": 1},
+        {"matrix": [11, 4], "x": 4, "y": 1.4},
+        {"matrix": [10, 4], "x": 5, "y": 1.5},
+        {"matrix": [9, 4], "x": 6, "y": 1.5},
+
+        {"matrix": [6, 4], "x": 13, "y": 1.5},
+        {"matrix": [5, 4], "x": 14, "y": 1.5},
+        {"matrix": [4, 4], "x": 15, "y": 1.4},
+        {"matrix": [3, 4], "x": 16, "y": 1},
+        {"matrix": [2, 4], "x": 17, "y": 1.3},
+        {"matrix": [1, 4], "x": 18, "y": 1.9},
+        {"matrix": [0, 4], "x": 19, "y": 1.9},
+
+        {"matrix": [15, 3], "x": 0, "y": 2.9},
+        {"matrix": [14, 3], "x": 1, "y": 2.9},
+        {"matrix": [13, 3], "x": 2, "y": 2.3},
+        {"matrix": [12, 3], "x": 3, "y": 2},
+        {"matrix": [11, 3], "x": 4, "y": 2.4},
+        {"matrix": [10, 3], "x": 5, "y": 2.5},
+        {"matrix": [9, 3], "x": 6, "y": 2.5},
+
+        {"matrix": [6, 3], "x": 13, "y": 2.5},
+        {"matrix": [5, 3], "x": 14, "y": 2.5},
+        {"matrix": [4, 3], "x": 15, "y": 2.4},
+        {"matrix": [3, 3], "x": 16, "y": 2},
+        {"matrix": [2, 3], "x": 17, "y": 2.3},
+        {"matrix": [1, 3], "x": 18, "y": 2.9},
+        {"matrix": [0, 3], "x": 19, "y": 2.9},
+
+        {"matrix": [15, 2], "x": 0, "y": 3.9},
+        {"matrix": [14, 2], "x": 1, "y": 3.9},
+        {"matrix": [13, 2], "x": 2, "y": 3.3},
+        {"matrix": [12, 2], "x": 3, "y": 3},
+        {"matrix": [11, 2], "x": 4, "y": 3.4},
+        {"matrix": [10, 2], "x": 5, "y": 3.5},
+        {"matrix": [9, 2], "x": 6, "y": 3.5},
+
+        {"matrix": [6, 2], "x": 13, "y": 3.5},
+        {"matrix": [5, 2], "x": 14, "y": 3.5},
+        {"matrix": [4, 2], "x": 15, "y": 3.4},
+        {"matrix": [3, 2], "x": 16, "y": 3},
+        {"matrix": [2, 2], "x": 17, "y": 3.3},
+        {"matrix": [1, 2], "x": 18, "y": 3.9},
+        {"matrix": [0, 2], "x": 19, "y": 3.9},
+
+        {"matrix": [15, 1], "x": 0, "y": 4.9},
+        {"matrix": [14, 1], "x": 1, "y": 4.9},
+        {"matrix": [13, 1], "x": 2, "y": 4.3},
+        {"matrix": [12, 1], "x": 3, "y": 4},
+        {"matrix": [11, 1], "x": 4, "y": 4.4},
+        {"matrix": [10, 1], "x": 5, "y": 4.5},
+
+        {"matrix": [9, 1], "x": 6.5, "y": 5},
+        {"matrix": [8, 1], "x": 7.5, "y": 5},
+        {"matrix": [8, 2], "x": 8.5, "y": 5},
+
+        {"matrix": [7, 2], "x": 10.5, "y": 5},
+        {"matrix": [7, 1], "x": 11.5, "y": 5},
+        {"matrix": [6, 1], "x": 12.5, "y": 5},
+
+        {"matrix": [5, 1], "x": 14, "y": 4.5},
+        {"matrix": [4, 1], "x": 15, "y": 4.4},
+        {"matrix": [3, 1], "x": 16, "y": 4},
+        {"matrix": [2, 1], "x": 17, "y": 4.3},
+        {"matrix": [1, 1], "x": 18, "y": 4.9},
+        {"matrix": [0, 1], "x": 19, "y": 4.9},
+
+        {"matrix": [15, 0], "x": 0, "y": 5.9},
+        {"matrix": [14, 0], "x": 1, "y": 5.9},
+        {"matrix": [13, 0], "x": 2, "y": 5.3},
+        {"matrix": [12, 0], "x": 3, "y": 5},
+        {"matrix": [11, 0], "x": 4, "y": 5.4},
+        {"matrix": [10, 0], "x": 5, "y": 5.5},
+
+        {"matrix": [9, 0], "x": 6.5, "y": 6},
+        {"matrix": [8, 0], "x": 7.5, "y": 6},
+
+        {"matrix": [7, 0], "x": 11.5, "y": 6},
+        {"matrix": [6, 0], "x": 12.5, "y": 6},
+
+        {"matrix": [5, 0], "x": 14, "y": 5.5},
+        {"matrix": [4, 0], "x": 15, "y": 5.4},
+        {"matrix": [3, 0], "x": 16, "y": 5},
+        {"matrix": [2, 0], "x": 17, "y": 5.3},
+        {"matrix": [1, 0], "x": 18, "y": 5.9},
+        {"matrix": [0, 0], "x": 19, "y": 5.9},
+
+        {"matrix": [8, 3], "x": 2.25, "y": 7.5, "w": 1.75, "h": 2},
+        {"matrix": [8, 4], "x": 4, "y": 7.5, "w": 1.75, "h": 2},
+
+        {"matrix": [8, 5], "x": 5.75, "y": 7.5, "w": 1.75, "h": 2},
+
+        {"matrix": [7, 3], "x": 12.5, "y": 7.5, "w": 1.75, "h": 2},
+        {"matrix": [7, 4], "x": 14.25, "y": 7.5, "w": 1.75, "h": 2},
+
+        {"matrix": [7, 5], "x": 16, "y": 7.5, "w": 1.75, "h": 2}
+      ]
+    }
+  }
+}
diff --git a/keyboards/handwired/frenchdev/rules.mk b/keyboards/handwired/frenchdev/rules.mk
index e226d0b5172..9b396b76686 100644
--- a/keyboards/handwired/frenchdev/rules.mk
+++ b/keyboards/handwired/frenchdev/rules.mk
@@ -1,16 +1,4 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE  = yes # Mouse keys
-EXTRAKEY_ENABLE  = yes # Audio control and System control
-CONSOLE_ENABLE   = yes  # Console for debug
-COMMAND_ENABLE   = yes # Commands for debug and configuration
-CUSTOM_MATRIX    = yes # Custom matrix file (taken and adapted from the ErgoDox EZ to handle custom number of columns)
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-AUDIO_ENABLE = no           # Audio output
-RGBLIGHT_ENABLE = no
+CUSTOM_MATRIX    = yes
 
 # project specific files
 SRC = matrix.c
diff --git a/keyboards/handwired/fruity60/info.json b/keyboards/handwired/fruity60/info.json
deleted file mode 100644
index 34b1edc8207..00000000000
--- a/keyboards/handwired/fruity60/info.json
+++ /dev/null
@@ -1,94 +0,0 @@
-{
-    "keyboard_name": "fruity60",
-    "manufacturer": "yanfali",
-    "url": "https://github.com/yanfali/fruity60",
-    "maintainer": "qmk",
-    "usb": {
-        "vid": "0xFEED",
-        "pid": "0xB170",
-        "device_version": "0.0.1"
-    },
-    "bluetooth": {
-        "driver": "bluefruit_le"
-    },
-    "matrix_pins": {
-        "cols": ["F7", "F6", "F5", "F4", "F1", "F0", "D2", "D3", "B7", "D6", "C7"],
-        "rows": ["B6", "B5", "D7", "C6", "D0", "D1"]
-    },
-    "diode_direction": "COL2ROW",
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
-    "community_layouts": ["60_tsangan_hhkb"],
-    "layouts": {
-        "LAYOUT_60_tsangan_hhkb": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [5, 0], "x": 11, "y": 0},
-                {"matrix": [5, 1], "x": 12, "y": 0},
-                {"matrix": [5, 2], "x": 13, "y": 0},
-                {"matrix": [5, 3], "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": [5, 4], "x": 11.5, "y": 1},
-                {"matrix": [5, 5], "x": 12.5, "y": 1},
-                {"matrix": [5, 6], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [5, 7], "x": 11.75, "y": 2},
-                {"matrix": [5, 8], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 1], "x": 2.25, "y": 3},
-                {"matrix": [3, 2], "x": 3.25, "y": 3},
-                {"matrix": [3, 3], "x": 4.25, "y": 3},
-                {"matrix": [3, 4], "x": 5.25, "y": 3},
-                {"matrix": [3, 5], "x": 6.25, "y": 3},
-                {"matrix": [3, 6], "x": 7.25, "y": 3},
-                {"matrix": [3, 7], "x": 8.25, "y": 3},
-                {"matrix": [3, 8], "x": 9.25, "y": 3},
-                {"matrix": [3, 9], "x": 10.25, "y": 3},
-                {"matrix": [3, 10], "x": 11.25, "y": 3},
-                {"matrix": [5, 9], "x": 12.25, "y": 3, "w": 1.75},
-                {"matrix": [5, 10], "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, 5], "x": 4, "y": 4, "w": 7},
-                {"matrix": [4, 8], "x": 11, "y": 4, "w": 1.5},
-                {"matrix": [4, 9], "x": 12.5, "y": 4},
-                {"matrix": [4, 10], "x": 13.5, "y": 4, "w": 1.5}
-            ]
-        }
-    }
-}
diff --git a/keyboards/handwired/fruity60/keyboard.json b/keyboards/handwired/fruity60/keyboard.json
new file mode 100644
index 00000000000..4984f3fc03c
--- /dev/null
+++ b/keyboards/handwired/fruity60/keyboard.json
@@ -0,0 +1,101 @@
+{
+    "keyboard_name": "fruity60",
+    "manufacturer": "yanfali",
+    "url": "https://github.com/yanfali/fruity60",
+    "maintainer": "qmk",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0xB170",
+        "device_version": "0.0.1"
+    },
+    "bluetooth": {
+        "driver": "bluefruit_le"
+    },
+    "matrix_pins": {
+        "cols": ["F7", "F6", "F5", "F4", "F1", "F0", "D2", "D3", "B7", "D6", "C7"],
+        "rows": ["B6", "B5", "D7", "C6", "D0", "D1"]
+    },
+    "diode_direction": "COL2ROW",
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "console": true,
+        "bluetooth": true
+    },
+    "community_layouts": ["60_tsangan_hhkb"],
+    "layouts": {
+        "LAYOUT_60_tsangan_hhkb": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [5, 0], "x": 11, "y": 0},
+                {"matrix": [5, 1], "x": 12, "y": 0},
+                {"matrix": [5, 2], "x": 13, "y": 0},
+                {"matrix": [5, 3], "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": [5, 4], "x": 11.5, "y": 1},
+                {"matrix": [5, 5], "x": 12.5, "y": 1},
+                {"matrix": [5, 6], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [5, 7], "x": 11.75, "y": 2},
+                {"matrix": [5, 8], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 10], "x": 11.25, "y": 3},
+                {"matrix": [5, 9], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [5, 10], "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, 5], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 8], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 9], "x": 12.5, "y": 4},
+                {"matrix": [4, 10], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/handwired/fruity60/rules.mk b/keyboards/handwired/fruity60/rules.mk
index 79e2ef4eff9..3437a35bdf1 100644
--- a/keyboards/handwired/fruity60/rules.mk
+++ b/keyboards/handwired/fruity60/rules.mk
@@ -1,16 +1,2 @@
 # Processor frequency
 F_CPU = 8000000
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = yes        # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-BLUETOOTH_ENABLE = yes
diff --git a/keyboards/handwired/hacked_motospeed/info.json b/keyboards/handwired/hacked_motospeed/info.json
deleted file mode 100644
index 899bd58bcbf..00000000000
--- a/keyboards/handwired/hacked_motospeed/info.json
+++ /dev/null
@@ -1,81 +0,0 @@
-{
-  "keyboard_name": "Hacked Motospeed",
-  "manufacturer": "MMO_Corp",
-  "url": "",
-  "maintainer": "Deckweiss",
-  "usb": {
-    "vid": "0xFEED",
-    "pid": "0x0690",
-    "device_version": "0.0.1"
-  },
-  "bluetooth": {
-    "driver": "rn42"
-  },
-  "matrix_pins": {
-    "cols": ["F7", "F6", "F5", "F4", "F3", "F2", "E0", "E1", "C0", "C1", "C2", "C3"],
-    "rows": ["B3", "B4", "F1", "B5", "B6", "D5", "D4", "D6", "D7", "C4"]
-  },
-  "diode_direction": "COL2ROW",
-  "backlight": {
-    "pin": "B7"
-  },
-  "processor": "at90usb1286",
-  "bootloader": "halfkay",
-  "layouts": {
-    "LAYOUT": {
-      "layout": [
-        {"matrix": [0, 0], "x": 0, "y": 0, "h": 2},
-        {"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": [1, 5], "x": 5, "y": 0},
-
-        {"matrix": [6, 6], "x": 7, "y": 0},
-        {"matrix": [5, 8], "x": 8, "y": 0},
-        {"matrix": [5, 7], "x": 9, "y": 0},
-        {"matrix": [5, 9], "x": 10, "y": 0},
-        {"matrix": [5, 10], "x": 11, "y": 0, "w": 2},
-
-        {"matrix": [1, 1], "x": 1, "y": 1},
-        {"matrix": [1, 2], "x": 2, "y": 1},
-        {"matrix": [1, 3], "x": 3, "y": 1},
-        {"matrix": [1, 4], "x": 4, "y": 1},
-        {"matrix": [3, 5], "x": 5, "y": 1},
-
-        {"matrix": [9, 10], "x": 7, "y": 1},
-        {"matrix": [6, 7], "x": 8, "y": 1},
-        {"matrix": [6, 8], "x": 9, "y": 1},
-        {"matrix": [6, 9], "x": 10, "y": 1},
-        {"matrix": [6, 10], "x": 11, "y": 1},
-        {"matrix": [5, 11], "x": 12, "y": 1},
-
-        {"matrix": [3, 0], "x": 0, "y": 2},
-        {"matrix": [2, 1], "x": 1, "y": 2},
-        {"matrix": [2, 2], "x": 2, "y": 2},
-        {"matrix": [2, 3], "x": 3, "y": 2},
-        {"matrix": [2, 4], "x": 4, "y": 2},
-        {"matrix": [4, 1], "x": 5, "y": 2},
-
-        {"matrix": [5, 6], "x": 7, "y": 2},
-        {"matrix": [7, 7], "x": 8, "y": 2},
-        {"matrix": [7, 8], "x": 9, "y": 2},
-        {"matrix": [7, 9], "x": 10, "y": 2},
-        {"matrix": [7, 10], "x": 11, "y": 2},
-
-        {"matrix": [3, 1], "x": 0, "y": 3, "w": 2},
-        {"matrix": [3, 2], "x": 2, "y": 3},
-        {"matrix": [3, 4], "x": 3, "y": 3},
-        {"matrix": [3, 3], "x": 4, "y": 3},
-        {"matrix": [2, 5], "x": 5, "y": 3},
-
-        {"matrix": [7, 6], "x": 7, "y": 3},
-        {"matrix": [8, 7], "x": 8, "y": 3},
-        {"matrix": [8, 8], "x": 9, "y": 3},
-        {"matrix": [8, 9], "x": 10, "y": 3},
-        {"matrix": [8, 10], "x": 11, "y": 3},
-        {"matrix": [8, 11], "x": 12, "y": 2, "h": 2}
-      ]
-    }
-  }
-}
diff --git a/keyboards/handwired/hacked_motospeed/keyboard.json b/keyboards/handwired/hacked_motospeed/keyboard.json
new file mode 100644
index 00000000000..af76a4dd769
--- /dev/null
+++ b/keyboards/handwired/hacked_motospeed/keyboard.json
@@ -0,0 +1,91 @@
+{
+  "keyboard_name": "Hacked Motospeed",
+  "manufacturer": "MMO_Corp",
+  "url": "",
+  "maintainer": "Deckweiss",
+  "usb": {
+    "vid": "0xFEED",
+    "pid": "0x0690",
+    "device_version": "0.0.1",
+    "no_startup_check": true
+  },
+  "bluetooth": {
+    "driver": "rn42"
+  },
+  "matrix_pins": {
+    "cols": ["F7", "F6", "F5", "F4", "F3", "F2", "E0", "E1", "C0", "C1", "C2", "C3"],
+    "rows": ["B3", "B4", "F1", "B5", "B6", "D5", "D4", "D6", "D7", "C4"]
+  },
+  "diode_direction": "COL2ROW",
+  "backlight": {
+    "pin": "B7"
+  },
+  "processor": "at90usb1286",
+  "bootloader": "halfkay",
+  "features": {
+    "bootmagic": false,
+    "mousekey": false,
+    "extrakey": true,
+    "console": true,
+    "command": true,
+    "backlight": true,
+    "bluetooth": true
+  },
+  "layouts": {
+    "LAYOUT": {
+      "layout": [
+        {"matrix": [0, 0], "x": 0, "y": 0, "h": 2},
+        {"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": [1, 5], "x": 5, "y": 0},
+
+        {"matrix": [6, 6], "x": 7, "y": 0},
+        {"matrix": [5, 8], "x": 8, "y": 0},
+        {"matrix": [5, 7], "x": 9, "y": 0},
+        {"matrix": [5, 9], "x": 10, "y": 0},
+        {"matrix": [5, 10], "x": 11, "y": 0, "w": 2},
+
+        {"matrix": [1, 1], "x": 1, "y": 1},
+        {"matrix": [1, 2], "x": 2, "y": 1},
+        {"matrix": [1, 3], "x": 3, "y": 1},
+        {"matrix": [1, 4], "x": 4, "y": 1},
+        {"matrix": [3, 5], "x": 5, "y": 1},
+
+        {"matrix": [9, 10], "x": 7, "y": 1},
+        {"matrix": [6, 7], "x": 8, "y": 1},
+        {"matrix": [6, 8], "x": 9, "y": 1},
+        {"matrix": [6, 9], "x": 10, "y": 1},
+        {"matrix": [6, 10], "x": 11, "y": 1},
+        {"matrix": [5, 11], "x": 12, "y": 1},
+
+        {"matrix": [3, 0], "x": 0, "y": 2},
+        {"matrix": [2, 1], "x": 1, "y": 2},
+        {"matrix": [2, 2], "x": 2, "y": 2},
+        {"matrix": [2, 3], "x": 3, "y": 2},
+        {"matrix": [2, 4], "x": 4, "y": 2},
+        {"matrix": [4, 1], "x": 5, "y": 2},
+
+        {"matrix": [5, 6], "x": 7, "y": 2},
+        {"matrix": [7, 7], "x": 8, "y": 2},
+        {"matrix": [7, 8], "x": 9, "y": 2},
+        {"matrix": [7, 9], "x": 10, "y": 2},
+        {"matrix": [7, 10], "x": 11, "y": 2},
+
+        {"matrix": [3, 1], "x": 0, "y": 3, "w": 2},
+        {"matrix": [3, 2], "x": 2, "y": 3},
+        {"matrix": [3, 4], "x": 3, "y": 3},
+        {"matrix": [3, 3], "x": 4, "y": 3},
+        {"matrix": [2, 5], "x": 5, "y": 3},
+
+        {"matrix": [7, 6], "x": 7, "y": 3},
+        {"matrix": [8, 7], "x": 8, "y": 3},
+        {"matrix": [8, 8], "x": 9, "y": 3},
+        {"matrix": [8, 9], "x": 10, "y": 3},
+        {"matrix": [8, 10], "x": 11, "y": 3},
+        {"matrix": [8, 11], "x": 12, "y": 2, "h": 2}
+      ]
+    }
+  }
+}
diff --git a/keyboards/handwired/hacked_motospeed/rules.mk b/keyboards/handwired/hacked_motospeed/rules.mk
deleted file mode 100644
index 362a7fadbed..00000000000
--- a/keyboards/handwired/hacked_motospeed/rules.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = yes        # Console for debug
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = yes       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-NO_USB_STARTUP_CHECK = yes  # Disable initialization only when usb is plugged in
-BLUETOOTH_ENABLE = yes
diff --git a/keyboards/handwired/jankrp2040dactyl/info.json b/keyboards/handwired/jankrp2040dactyl/keyboard.json
similarity index 100%
rename from keyboards/handwired/jankrp2040dactyl/info.json
rename to keyboards/handwired/jankrp2040dactyl/keyboard.json
diff --git a/keyboards/handwired/lagrange/info.json b/keyboards/handwired/lagrange/info.json
deleted file mode 100644
index 0c968c419d8..00000000000
--- a/keyboards/handwired/lagrange/info.json
+++ /dev/null
@@ -1,120 +0,0 @@
-{
-    "keyboard_name": "Lagrange",
-    "manufacturer": "Dimitris Papavasiliou",
-    "url": "https://github.com/dpapavas/lagrange-keyboard",
-    "maintainer": "dpapavas",
-    "usb": {
-        "vid": "0xFEED",
-        "pid": "0x2718",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["B4", "B5", "D7", "B6", "C6", "D6"],
-        "rows": ["E6", "F1", "F0", "F4", "F5", "F6", "F7"]
-    },
-    "diode_direction": "ROW2COL",
-    "split": {
-        "enabled": true,
-        "matrix_pins": {
-            "right": {
-                "cols": ["C7", "F7", "F6", "F5", "F4", "F1"],
-                "rows": ["B5", "B4", "D7", "B6", "C6", "D6", "D4"]
-            }
-        }
-    },
-    "indicators": {
-        "caps_lock": "D1",
-        "scroll_lock": "D2"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0.75, "w": 1.5},
-                {"matrix": [0, 1], "x": 1.5, "y": 0.75},
-                {"matrix": [0, 2], "x": 2.5, "y": 0.375},
-                {"matrix": [0, 3], "x": 3.5, "y": 0},
-                {"matrix": [0, 4], "x": 4.5, "y": 0.5},
-                {"matrix": [0, 5], "x": 5.5, "y": 0.5},
-
-                {"matrix": [7, 5], "x": 12.5, "y": 0.5},
-                {"matrix": [7, 4], "x": 13.5, "y": 0.5},
-                {"matrix": [7, 3], "x": 14.5, "y": 0},
-                {"matrix": [7, 2], "x": 15.5, "y": 0.375},
-                {"matrix": [7, 1], "x": 16.5, "y": 0.75},
-                {"matrix": [7, 0], "x": 17.5, "y": 0.75, "w": 1.5},
-
-                {"matrix": [1, 0], "x": 0, "y": 1.75, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1.75},
-                {"matrix": [1, 2], "x": 2.5, "y": 1.375},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1.5},
-                {"matrix": [1, 5], "x": 5.5, "y": 1.5},
-
-                {"matrix": [8, 5], "x": 12.5, "y": 1.5},
-                {"matrix": [8, 4], "x": 13.5, "y": 1.5},
-                {"matrix": [8, 3], "x": 14.5, "y": 1},
-                {"matrix": [8, 2], "x": 15.5, "y": 1.375},
-                {"matrix": [8, 1], "x": 16.5, "y": 1.75},
-                {"matrix": [8, 0], "x": 17.5, "y": 1.75, "w": 1.5},
-
-                {"matrix": [2, 0], "x": 0, "y": 2.75, "w": 1.5},
-                {"matrix": [2, 1], "x": 1.5, "y": 2.75},
-                {"matrix": [2, 2], "x": 2.5, "y": 2.375},
-                {"matrix": [2, 3], "x": 3.5, "y": 2},
-                {"matrix": [2, 4], "x": 4.5, "y": 2.5},
-                {"matrix": [2, 5], "x": 5.5, "y": 2.5},
-
-                {"matrix": [9, 5], "x": 12.5, "y": 2.5},
-                {"matrix": [9, 4], "x": 13.5, "y": 2.5},
-                {"matrix": [9, 3], "x": 14.5, "y": 2},
-                {"matrix": [9, 2], "x": 15.5, "y": 2.375},
-                {"matrix": [9, 1], "x": 16.5, "y": 2.75},
-                {"matrix": [9, 0], "x": 17.5, "y": 2.75, "w": 1.5},
-
-                {"matrix": [3, 0], "x": 0, "y": 3.75, "w": 1.5},
-                {"matrix": [3, 1], "x": 1.5, "y": 3.75},
-                {"matrix": [3, 2], "x": 2.5, "y": 3.375},
-                {"matrix": [3, 3], "x": 3.5, "y": 3},
-                {"matrix": [3, 4], "x": 4.5, "y": 3.5},
-                {"matrix": [3, 5], "x": 5.5, "y": 3.5},
-
-                {"matrix": [10, 5], "x": 12.5, "y": 3.5},
-                {"matrix": [10, 4], "x": 13.5, "y": 3.5},
-                {"matrix": [10, 3], "x": 14.5, "y": 3},
-                {"matrix": [10, 2], "x": 15.5, "y": 3.375},
-                {"matrix": [10, 1], "x": 16.5, "y": 3.75},
-                {"matrix": [10, 0], "x": 17.5, "y": 3.75, "w": 1.5},
-
-                {"matrix": [4, 0], "x": 0, "y": 4.75, "w": 1.5},
-                {"matrix": [4, 2], "x": 2.5, "y": 4.375},
-                {"matrix": [4, 3], "x": 3.5, "y": 4},
-                {"matrix": [4, 4], "x": 5, "y": 5, "h": 1.25},
-                {"matrix": [4, 5], "x": 6, "y": 5, "h": 1.5},
-                {"matrix": [5, 5], "x": 7, "y": 5, "h": 1.5},
-                {"matrix": [6, 5], "x": 8, "y": 5.5},
-
-                {"matrix": [13, 5], "x": 10, "y": 5.5},
-                {"matrix": [12, 5], "x": 11, "y": 5, "h": 1.5},
-                {"matrix": [11, 5], "x": 12, "y": 5, "h": 1.5},
-                {"matrix": [11, 4], "x": 13, "y": 5, "h": 1.25},
-                {"matrix": [11, 3], "x": 14.5, "y": 4},
-                {"matrix": [11, 2], "x": 15.5, "y": 4.5},
-                {"matrix": [11, 0], "x": 17.5, "y": 4.75, "w": 1.5},
-
-                {"matrix": [5, 3], "x": 5, "y": 7},
-                {"matrix": [5, 4], "x": 6, "y": 6.5},
-                {"matrix": [6, 4], "x": 7, "y": 7},
-
-                {"matrix": [13, 4], "x": 11, "y": 7},
-                {"matrix": [12, 4], "x": 12, "y": 6.5},
-                {"matrix": [12, 3], "x": 13, "y": 7},
-
-                {"matrix": [6, 3], "x": 6, "y": 7.5},
-
-                {"matrix": [13, 3], "x": 12, "y": 7.5}
-            ]
-        }
-    }
-}
diff --git a/keyboards/handwired/lagrange/keyboard.json b/keyboards/handwired/lagrange/keyboard.json
new file mode 100644
index 00000000000..d7ad47355ab
--- /dev/null
+++ b/keyboards/handwired/lagrange/keyboard.json
@@ -0,0 +1,130 @@
+{
+    "keyboard_name": "Lagrange",
+    "manufacturer": "Dimitris Papavasiliou",
+    "url": "https://github.com/dpapavas/lagrange-keyboard",
+    "maintainer": "dpapavas",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0x2718",
+        "device_version": "0.0.1"
+    },
+    "matrix_pins": {
+        "cols": ["B4", "B5", "D7", "B6", "C6", "D6"],
+        "rows": ["E6", "F1", "F0", "F4", "F5", "F6", "F7"]
+    },
+    "diode_direction": "ROW2COL",
+    "split": {
+        "enabled": true,
+        "matrix_pins": {
+            "right": {
+                "cols": ["C7", "F7", "F6", "F5", "F4", "F1"],
+                "rows": ["B5", "B4", "D7", "B6", "C6", "D6", "D4"]
+            }
+        },
+        "transport": {
+            "protocol": "custom"
+        }
+    },
+    "indicators": {
+        "caps_lock": "D1",
+        "scroll_lock": "D2"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": false,
+        "mousekey": false,
+        "extrakey": true,
+        "console": true,
+        "unicode": true
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0.75, "w": 1.5},
+                {"matrix": [0, 1], "x": 1.5, "y": 0.75},
+                {"matrix": [0, 2], "x": 2.5, "y": 0.375},
+                {"matrix": [0, 3], "x": 3.5, "y": 0},
+                {"matrix": [0, 4], "x": 4.5, "y": 0.5},
+                {"matrix": [0, 5], "x": 5.5, "y": 0.5},
+
+                {"matrix": [7, 5], "x": 12.5, "y": 0.5},
+                {"matrix": [7, 4], "x": 13.5, "y": 0.5},
+                {"matrix": [7, 3], "x": 14.5, "y": 0},
+                {"matrix": [7, 2], "x": 15.5, "y": 0.375},
+                {"matrix": [7, 1], "x": 16.5, "y": 0.75},
+                {"matrix": [7, 0], "x": 17.5, "y": 0.75, "w": 1.5},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.75, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1.75},
+                {"matrix": [1, 2], "x": 2.5, "y": 1.375},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1.5},
+                {"matrix": [1, 5], "x": 5.5, "y": 1.5},
+
+                {"matrix": [8, 5], "x": 12.5, "y": 1.5},
+                {"matrix": [8, 4], "x": 13.5, "y": 1.5},
+                {"matrix": [8, 3], "x": 14.5, "y": 1},
+                {"matrix": [8, 2], "x": 15.5, "y": 1.375},
+                {"matrix": [8, 1], "x": 16.5, "y": 1.75},
+                {"matrix": [8, 0], "x": 17.5, "y": 1.75, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.75, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.75},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.375},
+                {"matrix": [2, 3], "x": 3.5, "y": 2},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+
+                {"matrix": [9, 5], "x": 12.5, "y": 2.5},
+                {"matrix": [9, 4], "x": 13.5, "y": 2.5},
+                {"matrix": [9, 3], "x": 14.5, "y": 2},
+                {"matrix": [9, 2], "x": 15.5, "y": 2.375},
+                {"matrix": [9, 1], "x": 16.5, "y": 2.75},
+                {"matrix": [9, 0], "x": 17.5, "y": 2.75, "w": 1.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.75, "w": 1.5},
+                {"matrix": [3, 1], "x": 1.5, "y": 3.75},
+                {"matrix": [3, 2], "x": 2.5, "y": 3.375},
+                {"matrix": [3, 3], "x": 3.5, "y": 3},
+                {"matrix": [3, 4], "x": 4.5, "y": 3.5},
+                {"matrix": [3, 5], "x": 5.5, "y": 3.5},
+
+                {"matrix": [10, 5], "x": 12.5, "y": 3.5},
+                {"matrix": [10, 4], "x": 13.5, "y": 3.5},
+                {"matrix": [10, 3], "x": 14.5, "y": 3},
+                {"matrix": [10, 2], "x": 15.5, "y": 3.375},
+                {"matrix": [10, 1], "x": 16.5, "y": 3.75},
+                {"matrix": [10, 0], "x": 17.5, "y": 3.75, "w": 1.5},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.75, "w": 1.5},
+                {"matrix": [4, 2], "x": 2.5, "y": 4.375},
+                {"matrix": [4, 3], "x": 3.5, "y": 4},
+                {"matrix": [4, 4], "x": 5, "y": 5, "h": 1.25},
+                {"matrix": [4, 5], "x": 6, "y": 5, "h": 1.5},
+                {"matrix": [5, 5], "x": 7, "y": 5, "h": 1.5},
+                {"matrix": [6, 5], "x": 8, "y": 5.5},
+
+                {"matrix": [13, 5], "x": 10, "y": 5.5},
+                {"matrix": [12, 5], "x": 11, "y": 5, "h": 1.5},
+                {"matrix": [11, 5], "x": 12, "y": 5, "h": 1.5},
+                {"matrix": [11, 4], "x": 13, "y": 5, "h": 1.25},
+                {"matrix": [11, 3], "x": 14.5, "y": 4},
+                {"matrix": [11, 2], "x": 15.5, "y": 4.5},
+                {"matrix": [11, 0], "x": 17.5, "y": 4.75, "w": 1.5},
+
+                {"matrix": [5, 3], "x": 5, "y": 7},
+                {"matrix": [5, 4], "x": 6, "y": 6.5},
+                {"matrix": [6, 4], "x": 7, "y": 7},
+
+                {"matrix": [13, 4], "x": 11, "y": 7},
+                {"matrix": [12, 4], "x": 12, "y": 6.5},
+                {"matrix": [12, 3], "x": 13, "y": 7},
+
+                {"matrix": [6, 3], "x": 6, "y": 7.5},
+
+                {"matrix": [13, 3], "x": 12, "y": 7.5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/handwired/lagrange/rules.mk b/keyboards/handwired/lagrange/rules.mk
index 256826f7fcc..1f2175e9cbf 100644
--- a/keyboards/handwired/lagrange/rules.mk
+++ b/keyboards/handwired/lagrange/rules.mk
@@ -1,17 +1,2 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = yes        # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-UNICODE_ENABLE = yes
-SPLIT_TRANSPORT = custom
-
 SRC += transport.c
 SPI_DRIVER_REQUIRED = yes
diff --git a/keyboards/handwired/m40/5x5_macropad/info.json b/keyboards/handwired/m40/5x5_macropad/info.json
deleted file mode 100644
index 41342fc2ec6..00000000000
--- a/keyboards/handwired/m40/5x5_macropad/info.json
+++ /dev/null
@@ -1,53 +0,0 @@
-{
-    "keyboard_name": "5x5_macropad",
-    "manufacturer": "m40",
-    "url": "https://www.thingiverse.com/thing:5239739",
-    "maintainer": "m40-dev",
-    "usb": {
-        "vid": "0xFEED",
-        "pid": "0x0000",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["B6", "B2", "B3", "B1", "F7"],
-        "rows": ["B5", "B4", "E6", "D7", "C6"]
-    },
-    "diode_direction": "COL2ROW",
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
-    "layouts": {
-        "LAYOUT_ortho_5x5": {
-            "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": [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": [1, 4], "x": 4, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2},
-                {"matrix": [2, 1], "x": 1, "y": 2},
-                {"matrix": [2, 2], "x": 2, "y": 2},
-                {"matrix": [2, 3], "x": 3, "y": 2},
-                {"matrix": [2, 4], "x": 4, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3},
-                {"matrix": [3, 1], "x": 1, "y": 3},
-                {"matrix": [3, 2], "x": 2, "y": 3},
-                {"matrix": [3, 3], "x": 3, "y": 3},
-                {"matrix": [3, 4], "x": 4, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4},
-                {"matrix": [4, 1], "x": 1, "y": 4},
-                {"matrix": [4, 2], "x": 2, "y": 4},
-                {"matrix": [4, 3], "x": 3, "y": 4},
-                {"matrix": [4, 4], "x": 4, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/handwired/m40/5x5_macropad/keyboard.json b/keyboards/handwired/m40/5x5_macropad/keyboard.json
new file mode 100644
index 00000000000..b4bc53afc54
--- /dev/null
+++ b/keyboards/handwired/m40/5x5_macropad/keyboard.json
@@ -0,0 +1,59 @@
+{
+    "keyboard_name": "5x5_macropad",
+    "manufacturer": "m40",
+    "url": "https://www.thingiverse.com/thing:5239739",
+    "maintainer": "m40-dev",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0x0000",
+        "device_version": "0.0.1"
+    },
+    "matrix_pins": {
+        "cols": ["B6", "B2", "B3", "B1", "F7"],
+        "rows": ["B5", "B4", "E6", "D7", "C6"]
+    },
+    "diode_direction": "COL2ROW",
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
+    "features": {
+        "bootmagic": false,
+        "mousekey": true,
+        "extrakey": true,
+        "command": true
+    },
+    "layouts": {
+        "LAYOUT_ortho_5x5": {
+            "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": [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": [1, 4], "x": 4, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+                {"matrix": [4, 2], "x": 2, "y": 4},
+                {"matrix": [4, 3], "x": 3, "y": 4},
+                {"matrix": [4, 4], "x": 4, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/handwired/m40/5x5_macropad/rules.mk b/keyboards/handwired/m40/5x5_macropad/rules.mk
index fe66abc8493..4df55cd2206 100644
--- a/keyboards/handwired/m40/5x5_macropad/rules.mk
+++ b/keyboards/handwired/m40/5x5_macropad/rules.mk
@@ -1,16 +1,3 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
 # Disable unsupported hardware
 AUDIO_SUPPORTED = no
-BACKLIGHT_SUPPORTED = no
\ No newline at end of file
+BACKLIGHT_SUPPORTED = no
diff --git a/keyboards/handwired/macroboard/f401/info.json b/keyboards/handwired/macroboard/f401/info.json
deleted file mode 100644
index 5108d8ce50b..00000000000
--- a/keyboards/handwired/macroboard/f401/info.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-    "matrix_pins": {
-        "cols": ["A5", "A6", "A7", "B0", "B1", "B10"],
-        "rows": ["A4", "A3", "A2", "A1", "A0"]
-    },
-    "diode_direction": "COL2ROW",
-    "ws2812": {
-        "driver": "pwm"
-    },
-    "processor": "STM32F401",
-    "bootloader": "stm32-dfu",
-    "board": "BLACKPILL_STM32_F401"
-}
diff --git a/keyboards/handwired/macroboard/f401/keyboard.json b/keyboards/handwired/macroboard/f401/keyboard.json
new file mode 100644
index 00000000000..d5e217b2f3d
--- /dev/null
+++ b/keyboards/handwired/macroboard/f401/keyboard.json
@@ -0,0 +1,23 @@
+{
+    "usb": {
+        "shared_endpoint": {
+            "keyboard": true
+        }
+    },
+    "matrix_pins": {
+        "cols": ["A5", "A6", "A7", "B0", "B1", "B10"],
+        "rows": ["A4", "A3", "A2", "A1", "A0"]
+    },
+    "diode_direction": "COL2ROW",
+    "ws2812": {
+        "driver": "pwm"
+    },
+    "development_board": "blackpill_f401",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "nkro": true,
+        "rgblight": true
+    }
+}
diff --git a/keyboards/handwired/macroboard/f401/rules.mk b/keyboards/handwired/macroboard/f401/rules.mk
deleted file mode 100644
index bc0cd6b97f6..00000000000
--- a/keyboards/handwired/macroboard/f401/rules.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-KEYBOARD_SHARED_EP = yes
diff --git a/keyboards/handwired/macroboard/f411/info.json b/keyboards/handwired/macroboard/f411/info.json
deleted file mode 100644
index d7ff61f52b6..00000000000
--- a/keyboards/handwired/macroboard/f411/info.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-    "matrix_pins": {
-        "cols": ["B12", "B13", "B14", "B15", "A8", "A10"],
-        "rows": ["A15", "B3", "B4", "B5", "B7"]
-    },
-    "diode_direction": "COL2ROW",
-    "ws2812": {
-        "driver": "pwm"
-    },
-    "processor": "STM32F411",
-    "bootloader": "stm32-dfu",
-    "board": "BLACKPILL_STM32_F411"
-}
diff --git a/keyboards/handwired/macroboard/f411/keyboard.json b/keyboards/handwired/macroboard/f411/keyboard.json
new file mode 100644
index 00000000000..8b1155d7740
--- /dev/null
+++ b/keyboards/handwired/macroboard/f411/keyboard.json
@@ -0,0 +1,27 @@
+{
+    "usb": {
+        "shared_endpoint": {
+            "keyboard": true
+        }
+    },
+    "matrix_pins": {
+        "cols": ["B12", "B13", "B14", "B15", "A8", "A10"],
+        "rows": ["A15", "B3", "B4", "B5", "B7"]
+    },
+    "diode_direction": "COL2ROW",
+    "audio": {
+        "driver": "pwm_hardware"
+    },
+    "ws2812": {
+        "driver": "pwm"
+    },
+    "development_board": "blackpill_f411",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "nkro": true,
+        "rgblight": true,
+        "audio": true
+    }
+}
diff --git a/keyboards/handwired/macroboard/f411/rules.mk b/keyboards/handwired/macroboard/f411/rules.mk
deleted file mode 100644
index cdf33bfea5b..00000000000
--- a/keyboards/handwired/macroboard/f411/rules.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-AUDIO_ENABLE = yes           # Audio output
-AUDIO_DRIVER = pwm_hardware
-KEYBOARD_SHARED_EP = yes
diff --git a/keyboards/handwired/meck_tkl/blackpill_f401/info.json b/keyboards/handwired/meck_tkl/blackpill_f401/info.json
deleted file mode 100644
index eeaa9c392be..00000000000
--- a/keyboards/handwired/meck_tkl/blackpill_f401/info.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-    "matrix_pins": {
-        "cols": ["B4", "B5", "B6", "B7", "B8", "B9", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A0", "B10"],
-        "rows": ["B15", "A8", "A9", "B14", "A15", "B3"]
-    },
-    "diode_direction": "COL2ROW",
-    "indicators": {
-        "caps_lock": "C13",
-        "on_state": 0
-    },
-    "processor": "STM32F401",
-    "bootloader": "stm32-dfu",
-    "board": "BLACKPILL_STM32_F401"
-}
diff --git a/keyboards/handwired/meck_tkl/blackpill_f401/keyboard.json b/keyboards/handwired/meck_tkl/blackpill_f401/keyboard.json
new file mode 100644
index 00000000000..4a9e2a5380a
--- /dev/null
+++ b/keyboards/handwired/meck_tkl/blackpill_f401/keyboard.json
@@ -0,0 +1,145 @@
+{
+    "keyboard_name": "Meck TKL",
+    "manufacturer": "gabrielkim13",
+    "url": "github.com/gabrielkim13",
+    "maintainer": "gabrielkim13",
+    "usb": {
+        "vid": "0x474B",
+        "pid": "0x0001",
+        "device_version": "0.0.1",
+        "shared_endpoint": {
+            "keyboard": true
+        }
+    },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "console": true,
+        "nkro": true
+    },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
+    "matrix_pins": {
+        "cols": ["B4", "B5", "B6", "B7", "B8", "B9", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A0", "B10"],
+        "rows": ["B15", "A8", "A9", "B14", "A15", "B3"]
+    },
+    "diode_direction": "COL2ROW",
+    "indicators": {
+        "caps_lock": "C13",
+        "on_state": 0
+    },
+    "processor": "STM32F401",
+    "bootloader": "stm32-dfu",
+    "board": "BLACKPILL_STM32_F401",
+    "layouts": {
+        "LAYOUT_tkl_ansi": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "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.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 10], "x": 11, "y": 0},
+                {"matrix": [0, 11], "x": 12, "y": 0},
+                {"matrix": [0, 12], "x": 13, "y": 0},
+                {"matrix": [0, 13], "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.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1.5},
+                {"matrix": [1, 4], "x": 4, "y": 1.5},
+                {"matrix": [1, 5], "x": 5, "y": 1.5},
+                {"matrix": [1, 6], "x": 6, "y": 1.5},
+                {"matrix": [1, 7], "x": 7, "y": 1.5},
+                {"matrix": [1, 8], "x": 8, "y": 1.5},
+                {"matrix": [1, 9], "x": 9, "y": 1.5},
+                {"matrix": [1, 10], "x": 10, "y": 1.5},
+                {"matrix": [1, 11], "x": 11, "y": 1.5},
+                {"matrix": [1, 12], "x": 12, "y": 1.5},
+                {"matrix": [1, 13], "x": 13, "y": 1.5, "w": 2},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1.5},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.5},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.5},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.5},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.5},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.5, "w": 1.5},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 2.5},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.5},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.5},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.5, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.5},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.5},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.5},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.5},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.5},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.5},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.5},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.5},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.5},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.5},
+                {"matrix": [4, 13], "x": 12.25, "y": 4.5, "w": 2.75},
+
+                {"matrix": [4, 15], "x": 16.25, "y": 4.5},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.5, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 11], "x": 11.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.5, "w": 1.25},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.5},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.5},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/handwired/meck_tkl/blackpill_f401/rules.mk b/keyboards/handwired/meck_tkl/blackpill_f401/rules.mk
deleted file mode 100644
index b5f27c93eab..00000000000
--- a/keyboards/handwired/meck_tkl/blackpill_f401/rules.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-KEYBOARD_SHARED_EP = yes
diff --git a/keyboards/handwired/meck_tkl/config.h b/keyboards/handwired/meck_tkl/config.h
deleted file mode 100644
index 30221cc2168..00000000000
--- a/keyboards/handwired/meck_tkl/config.h
+++ /dev/null
@@ -1,9 +0,0 @@
-// Copyright 2021 Gabriel Kim (@gabrielkim13)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/handwired/meck_tkl/info.json b/keyboards/handwired/meck_tkl/info.json
deleted file mode 100644
index 8266e704bc6..00000000000
--- a/keyboards/handwired/meck_tkl/info.json
+++ /dev/null
@@ -1,117 +0,0 @@
-{
-    "keyboard_name": "Meck TKL",
-    "manufacturer": "gabrielkim13",
-    "url": "github.com/gabrielkim13",
-    "maintainer": "gabrielkim13",
-    "usb": {
-        "vid": "0x474B",
-        "pid": "0x0001",
-        "device_version": "0.0.1"
-    },
-    "layouts": {
-        "LAYOUT_tkl_ansi": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "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.5, "y": 0},
-                {"matrix": [0, 7], "x": 7.5, "y": 0},
-                {"matrix": [0, 8], "x": 8.5, "y": 0},
-                {"matrix": [0, 9], "x": 9.5, "y": 0},
-
-                {"matrix": [0, 10], "x": 11, "y": 0},
-                {"matrix": [0, 11], "x": 12, "y": 0},
-                {"matrix": [0, 12], "x": 13, "y": 0},
-                {"matrix": [0, 13], "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.5},
-                {"matrix": [1, 1], "x": 1, "y": 1.5},
-                {"matrix": [1, 2], "x": 2, "y": 1.5},
-                {"matrix": [1, 3], "x": 3, "y": 1.5},
-                {"matrix": [1, 4], "x": 4, "y": 1.5},
-                {"matrix": [1, 5], "x": 5, "y": 1.5},
-                {"matrix": [1, 6], "x": 6, "y": 1.5},
-                {"matrix": [1, 7], "x": 7, "y": 1.5},
-                {"matrix": [1, 8], "x": 8, "y": 1.5},
-                {"matrix": [1, 9], "x": 9, "y": 1.5},
-                {"matrix": [1, 10], "x": 10, "y": 1.5},
-                {"matrix": [1, 11], "x": 11, "y": 1.5},
-                {"matrix": [1, 12], "x": 12, "y": 1.5},
-                {"matrix": [1, 13], "x": 13, "y": 1.5, "w": 2},
-
-                {"matrix": [1, 14], "x": 15.25, "y": 1.5},
-                {"matrix": [1, 15], "x": 16.25, "y": 1.5},
-                {"matrix": [1, 16], "x": 17.25, "y": 1.5},
-
-                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
-                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
-                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
-                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
-                {"matrix": [2, 4], "x": 4.5, "y": 2.5},
-                {"matrix": [2, 5], "x": 5.5, "y": 2.5},
-                {"matrix": [2, 6], "x": 6.5, "y": 2.5},
-                {"matrix": [2, 7], "x": 7.5, "y": 2.5},
-                {"matrix": [2, 8], "x": 8.5, "y": 2.5},
-                {"matrix": [2, 9], "x": 9.5, "y": 2.5},
-                {"matrix": [2, 10], "x": 10.5, "y": 2.5},
-                {"matrix": [2, 11], "x": 11.5, "y": 2.5},
-                {"matrix": [2, 12], "x": 12.5, "y": 2.5},
-                {"matrix": [2, 13], "x": 13.5, "y": 2.5, "w": 1.5},
-
-                {"matrix": [2, 14], "x": 15.25, "y": 2.5},
-                {"matrix": [2, 15], "x": 16.25, "y": 2.5},
-                {"matrix": [2, 16], "x": 17.25, "y": 2.5},
-
-                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
-                {"matrix": [3, 1], "x": 1.75, "y": 3.5},
-                {"matrix": [3, 2], "x": 2.75, "y": 3.5},
-                {"matrix": [3, 3], "x": 3.75, "y": 3.5},
-                {"matrix": [3, 4], "x": 4.75, "y": 3.5},
-                {"matrix": [3, 5], "x": 5.75, "y": 3.5},
-                {"matrix": [3, 6], "x": 6.75, "y": 3.5},
-                {"matrix": [3, 7], "x": 7.75, "y": 3.5},
-                {"matrix": [3, 8], "x": 8.75, "y": 3.5},
-                {"matrix": [3, 9], "x": 9.75, "y": 3.5},
-                {"matrix": [3, 10], "x": 10.75, "y": 3.5},
-                {"matrix": [3, 11], "x": 11.75, "y": 3.5},
-                {"matrix": [3, 13], "x": 12.75, "y": 3.5, "w": 2.25},
-
-                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
-                {"matrix": [4, 2], "x": 2.25, "y": 4.5},
-                {"matrix": [4, 3], "x": 3.25, "y": 4.5},
-                {"matrix": [4, 4], "x": 4.25, "y": 4.5},
-                {"matrix": [4, 5], "x": 5.25, "y": 4.5},
-                {"matrix": [4, 6], "x": 6.25, "y": 4.5},
-                {"matrix": [4, 7], "x": 7.25, "y": 4.5},
-                {"matrix": [4, 8], "x": 8.25, "y": 4.5},
-                {"matrix": [4, 9], "x": 9.25, "y": 4.5},
-                {"matrix": [4, 10], "x": 10.25, "y": 4.5},
-                {"matrix": [4, 11], "x": 11.25, "y": 4.5},
-                {"matrix": [4, 13], "x": 12.25, "y": 4.5, "w": 2.75},
-
-                {"matrix": [4, 15], "x": 16.25, "y": 4.5},
-
-                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25},
-                {"matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25},
-                {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25},
-                {"matrix": [5, 6], "x": 3.75, "y": 5.5, "w": 6.25},
-                {"matrix": [5, 10], "x": 10, "y": 5.5, "w": 1.25},
-                {"matrix": [5, 11], "x": 11.25, "y": 5.5, "w": 1.25},
-                {"matrix": [5, 12], "x": 12.5, "y": 5.5, "w": 1.25},
-                {"matrix": [5, 13], "x": 13.75, "y": 5.5, "w": 1.25},
-
-                {"matrix": [5, 14], "x": 15.25, "y": 5.5},
-                {"matrix": [5, 15], "x": 16.25, "y": 5.5},
-                {"matrix": [5, 16], "x": 17.25, "y": 5.5}
-            ]
-        }
-    }
-}
diff --git a/keyboards/handwired/meck_tkl/rules.mk b/keyboards/handwired/meck_tkl/rules.mk
index 6213285117b..cdf3900ff0d 100644
--- a/keyboards/handwired/meck_tkl/rules.mk
+++ b/keyboards/handwired/meck_tkl/rules.mk
@@ -1,15 +1,3 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = yes        # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
 AUDIO_SUPPORTED = no
 BACKLIGHT_SUPPORTED = no
 
diff --git a/keyboards/handwired/myskeeb/info.json b/keyboards/handwired/myskeeb/info.json
deleted file mode 100644
index cd5de808f4d..00000000000
--- a/keyboards/handwired/myskeeb/info.json
+++ /dev/null
@@ -1,113 +0,0 @@
-{
-    "keyboard_name": "MySKeeb",
-    "manufacturer": "DAG3",
-    "url": "",
-    "maintainer": "su8044",
-    "usb": {
-        "vid": "0xFEED",
-        "pid": "0x6060",
-        "device_version": "1.0.0"
-    },
-    "matrix_pins": {
-        "cols": ["B6", "B2", "B3", "B1", "F6", "F7", "F5"],
-        "rows": ["C6", "D7", "E6", "B4", "B5"]
-    },
-    "diode_direction": "COL2ROW",
-    "split": {
-        "enabled": true,
-        "soft_serial_pin": "D3",
-        "matrix_pins": {
-            "right": {
-                "cols": ["F5", "B3", "F7", "B1", "F6", "B2", "B6"]
-            }
-        }
-    },
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
-    "debounce": 0,
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"x": 0, "y": 1, "w": 1.5, "matrix": [0, 0]},
-                {"x": 1.5, "y": 0.75, "matrix": [0, 1]},
-                {"x": 2.5, "y": 0.25, "matrix": [0, 2]},
-                {"x": 3.5, "y": 0, "matrix": [0, 3]},
-                {"x": 4.5, "y": 0.25, "matrix": [0, 4]},
-                {"x": 5.5, "y": 0.75, "matrix": [0, 5]},
-                {"x": 6.5, "y": 1, "matrix": [0, 6]},
-
-                {"x": 9.5, "y": 1, "matrix": [5, 0]},
-                {"x": 10.5, "y": 0.75, "matrix": [5, 1]},
-                {"x": 11.5, "y": 0.25, "matrix": [5, 2]},
-                {"x": 12.5, "y": 0, "matrix": [5, 3]},
-                {"x": 13.5, "y": 0.25, "matrix": [5, 4]},
-                {"x": 14.5, "y": 0.75, "matrix": [5, 5]},
-                {"x": 15.5, "y": 1, "w": 1.5, "matrix": [5, 6]},
-
-                {"x": 0, "y": 2, "w": 1.5, "matrix": [1, 0]},
-                {"x": 1.5, "y": 1.75, "matrix": [1, 1]},
-                {"x": 2.5, "y": 1.25, "matrix": [1, 2]},
-                {"x": 3.5, "y": 1, "matrix": [1, 3]},
-                {"x": 4.5, "y": 1.25, "matrix": [1, 4]},
-                {"x": 5.5, "y": 1.75, "matrix": [1, 5]},
-                {"x": 6.5, "y": 2, "h": 1.5, "matrix": [1, 6]},
-
-                {"x": 9.5, "y": 2, "h": 1.5, "matrix": [6, 0]},
-                {"x": 10.5, "y": 1.75, "matrix": [6, 1]},
-                {"x": 11.5, "y": 1.25, "matrix": [6, 2]},
-                {"x": 12.5, "y": 1, "matrix": [6, 3]},
-                {"x": 13.5, "y": 1.25, "matrix": [6, 4]},
-                {"x": 14.5, "y": 1.75, "matrix": [6, 5]},
-                {"x": 15.5, "y": 2, "w": 1.5, "matrix": [6, 6]},
-
-                {"x": 0, "y": 3, "w": 1.5, "matrix": [2, 0]},
-                {"x": 1.5, "y": 2.75, "matrix": [2, 1]},
-                {"x": 2.5, "y": 2.25, "matrix": [2, 2]},
-                {"x": 3.5, "y": 2, "matrix": [2, 3]},
-                {"x": 4.5, "y": 2.25, "matrix": [2, 4]},
-                {"x": 5.5, "y": 2.75, "matrix": [2, 5]},
-
-                {"x": 10.5, "y": 2.75, "matrix": [7, 1]},
-                {"x": 11.5, "y": 2.25, "matrix": [7, 2]},
-                {"x": 12.5, "y": 2, "matrix": [7, 3]},
-                {"x": 13.5, "y": 2.25, "matrix": [7, 4]},
-                {"x": 14.5, "y": 2.75, "matrix": [7, 5]},
-                {"x": 15.5, "y": 3, "w": 1.5, "matrix": [7, 6]},
-
-                {"x": 0, "y": 4, "w": 1.5, "matrix": [3, 0]},
-                {"x": 1.5, "y": 3.75, "matrix": [3, 1]},
-                {"x": 2.5, "y": 3.25, "matrix": [3, 2]},
-                {"x": 3.5, "y": 3, "matrix": [3, 3]},
-                {"x": 4.5, "y": 3.25, "matrix": [3, 4]},
-                {"x": 5.5, "y": 3.75, "matrix": [3, 5]},
-                {"x": 6.5, "y": 3.5, "h": 1.5, "matrix": [3, 6]},
-
-                {"x": 9.5, "y": 3.5, "h": 1.5, "matrix": [8, 0]},
-                {"x": 10.5, "y": 3.75, "matrix": [8, 1]},
-                {"x": 11.5, "y": 3.25, "matrix": [8, 2]},
-                {"x": 12.5, "y": 3, "matrix": [8, 3]},
-                {"x": 13.5, "y": 3.25, "matrix": [8, 4]},
-                {"x": 14.5, "y": 3.75, "matrix": [8, 5]},
-                {"x": 15.5, "y": 4, "w": 1.5, "matrix": [8, 6]},
-
-                {"x": 0.25, "y": 5, "matrix": [4, 0]},
-                {"x": 1.5, "y": 4.75, "matrix": [4, 1]},
-                {"x": 2.5, "y": 4.25, "matrix": [4, 2]},
-                {"x": 3.5, "y": 4, "matrix": [4, 3]},
-
-                {"x": 5, "y": 6, "matrix": [4, 4]},
-                {"x": 6, "y": 5.5, "h": 2, "matrix": [4, 5]},
-                {"x": 7, "y": 5.5, "h": 2, "matrix": [4, 6]},
-
-                {"x": 9, "y": 5.5, "h": 2, "matrix": [9, 0]},
-                {"x": 10, "y": 5.5, "h": 2, "matrix": [9, 1]},
-                {"x": 11, "y": 6, "matrix": [9, 2]},
-
-                {"x": 12.5, "y": 4, "matrix": [9, 3]},
-                {"x": 13.5, "y": 4.25, "matrix": [9, 4]},
-                {"x": 14.5, "y": 4.75, "matrix": [9, 5]},
-                {"x": 15.75, "y": 5, "matrix": [9, 6]}
-            ]
-        }
-    }
-}
diff --git a/keyboards/handwired/myskeeb/keyboard.json b/keyboards/handwired/myskeeb/keyboard.json
new file mode 100644
index 00000000000..f2da286f194
--- /dev/null
+++ b/keyboards/handwired/myskeeb/keyboard.json
@@ -0,0 +1,121 @@
+{
+    "keyboard_name": "MySKeeb",
+    "manufacturer": "DAG3",
+    "url": "",
+    "maintainer": "su8044",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0x6060",
+        "device_version": "1.0.0",
+        "no_startup_check": true
+    },
+    "matrix_pins": {
+        "cols": ["B6", "B2", "B3", "B1", "F6", "F7", "F5"],
+        "rows": ["C6", "D7", "E6", "B4", "B5"]
+    },
+    "diode_direction": "COL2ROW",
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "D3",
+        "matrix_pins": {
+            "right": {
+                "cols": ["F5", "B3", "F7", "B1", "F6", "B2", "B6"]
+            }
+        }
+    },
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
+    "features": {
+        "bootmagic": false,
+        "mousekey": false,
+        "extrakey": true,
+        "nkro": true,
+        "oled": true
+    },
+    "debounce": 0,
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"x": 0, "y": 1, "w": 1.5, "matrix": [0, 0]},
+                {"x": 1.5, "y": 0.75, "matrix": [0, 1]},
+                {"x": 2.5, "y": 0.25, "matrix": [0, 2]},
+                {"x": 3.5, "y": 0, "matrix": [0, 3]},
+                {"x": 4.5, "y": 0.25, "matrix": [0, 4]},
+                {"x": 5.5, "y": 0.75, "matrix": [0, 5]},
+                {"x": 6.5, "y": 1, "matrix": [0, 6]},
+
+                {"x": 9.5, "y": 1, "matrix": [5, 0]},
+                {"x": 10.5, "y": 0.75, "matrix": [5, 1]},
+                {"x": 11.5, "y": 0.25, "matrix": [5, 2]},
+                {"x": 12.5, "y": 0, "matrix": [5, 3]},
+                {"x": 13.5, "y": 0.25, "matrix": [5, 4]},
+                {"x": 14.5, "y": 0.75, "matrix": [5, 5]},
+                {"x": 15.5, "y": 1, "w": 1.5, "matrix": [5, 6]},
+
+                {"x": 0, "y": 2, "w": 1.5, "matrix": [1, 0]},
+                {"x": 1.5, "y": 1.75, "matrix": [1, 1]},
+                {"x": 2.5, "y": 1.25, "matrix": [1, 2]},
+                {"x": 3.5, "y": 1, "matrix": [1, 3]},
+                {"x": 4.5, "y": 1.25, "matrix": [1, 4]},
+                {"x": 5.5, "y": 1.75, "matrix": [1, 5]},
+                {"x": 6.5, "y": 2, "h": 1.5, "matrix": [1, 6]},
+
+                {"x": 9.5, "y": 2, "h": 1.5, "matrix": [6, 0]},
+                {"x": 10.5, "y": 1.75, "matrix": [6, 1]},
+                {"x": 11.5, "y": 1.25, "matrix": [6, 2]},
+                {"x": 12.5, "y": 1, "matrix": [6, 3]},
+                {"x": 13.5, "y": 1.25, "matrix": [6, 4]},
+                {"x": 14.5, "y": 1.75, "matrix": [6, 5]},
+                {"x": 15.5, "y": 2, "w": 1.5, "matrix": [6, 6]},
+
+                {"x": 0, "y": 3, "w": 1.5, "matrix": [2, 0]},
+                {"x": 1.5, "y": 2.75, "matrix": [2, 1]},
+                {"x": 2.5, "y": 2.25, "matrix": [2, 2]},
+                {"x": 3.5, "y": 2, "matrix": [2, 3]},
+                {"x": 4.5, "y": 2.25, "matrix": [2, 4]},
+                {"x": 5.5, "y": 2.75, "matrix": [2, 5]},
+
+                {"x": 10.5, "y": 2.75, "matrix": [7, 1]},
+                {"x": 11.5, "y": 2.25, "matrix": [7, 2]},
+                {"x": 12.5, "y": 2, "matrix": [7, 3]},
+                {"x": 13.5, "y": 2.25, "matrix": [7, 4]},
+                {"x": 14.5, "y": 2.75, "matrix": [7, 5]},
+                {"x": 15.5, "y": 3, "w": 1.5, "matrix": [7, 6]},
+
+                {"x": 0, "y": 4, "w": 1.5, "matrix": [3, 0]},
+                {"x": 1.5, "y": 3.75, "matrix": [3, 1]},
+                {"x": 2.5, "y": 3.25, "matrix": [3, 2]},
+                {"x": 3.5, "y": 3, "matrix": [3, 3]},
+                {"x": 4.5, "y": 3.25, "matrix": [3, 4]},
+                {"x": 5.5, "y": 3.75, "matrix": [3, 5]},
+                {"x": 6.5, "y": 3.5, "h": 1.5, "matrix": [3, 6]},
+
+                {"x": 9.5, "y": 3.5, "h": 1.5, "matrix": [8, 0]},
+                {"x": 10.5, "y": 3.75, "matrix": [8, 1]},
+                {"x": 11.5, "y": 3.25, "matrix": [8, 2]},
+                {"x": 12.5, "y": 3, "matrix": [8, 3]},
+                {"x": 13.5, "y": 3.25, "matrix": [8, 4]},
+                {"x": 14.5, "y": 3.75, "matrix": [8, 5]},
+                {"x": 15.5, "y": 4, "w": 1.5, "matrix": [8, 6]},
+
+                {"x": 0.25, "y": 5, "matrix": [4, 0]},
+                {"x": 1.5, "y": 4.75, "matrix": [4, 1]},
+                {"x": 2.5, "y": 4.25, "matrix": [4, 2]},
+                {"x": 3.5, "y": 4, "matrix": [4, 3]},
+
+                {"x": 5, "y": 6, "matrix": [4, 4]},
+                {"x": 6, "y": 5.5, "h": 2, "matrix": [4, 5]},
+                {"x": 7, "y": 5.5, "h": 2, "matrix": [4, 6]},
+
+                {"x": 9, "y": 5.5, "h": 2, "matrix": [9, 0]},
+                {"x": 10, "y": 5.5, "h": 2, "matrix": [9, 1]},
+                {"x": 11, "y": 6, "matrix": [9, 2]},
+
+                {"x": 12.5, "y": 4, "matrix": [9, 3]},
+                {"x": 13.5, "y": 4.25, "matrix": [9, 4]},
+                {"x": 14.5, "y": 4.75, "matrix": [9, 5]},
+                {"x": 15.75, "y": 5, "matrix": [9, 6]}
+            ]
+        }
+    }
+}
diff --git a/keyboards/handwired/myskeeb/rules.mk b/keyboards/handwired/myskeeb/rules.mk
deleted file mode 100644
index 21c4a23eb3b..00000000000
--- a/keyboards/handwired/myskeeb/rules.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight.
-AUDIO_ENABLE = no           # Audio output
-OLED_ENABLE = yes
-NO_USB_STARTUP_CHECK = yes
diff --git a/keyboards/handwired/novem/info.json b/keyboards/handwired/novem/info.json
deleted file mode 100644
index bc70d64ed44..00000000000
--- a/keyboards/handwired/novem/info.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "keyboard_name": "novem",
-    "manufacturer": "Jose I. Martinez",
-    "url": "",
-    "maintainer": "Jose I. Martinez",
-    "usb": {
-        "vid": "0xFEED",
-        "pid": "0x0000",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["B3", "B2", "B6"],
-        "rows": ["E6", "B4", "B5"]
-    },
-    "diode_direction": "COL2ROW",
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1},
-                {"matrix": [1, 1], "x": 1, "y": 1},
-                {"matrix": [1, 2], "x": 2, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2},
-                {"matrix": [2, 1], "x": 1, "y": 2},
-                {"matrix": [2, 2], "x": 2, "y": 2}
-            ]
-        }
-    }
-}
diff --git a/keyboards/handwired/novem/keyboard.json b/keyboards/handwired/novem/keyboard.json
new file mode 100644
index 00000000000..bc4fe2c1c95
--- /dev/null
+++ b/keyboards/handwired/novem/keyboard.json
@@ -0,0 +1,40 @@
+{
+    "keyboard_name": "novem",
+    "manufacturer": "Jose I. Martinez",
+    "url": "",
+    "maintainer": "Jose I. Martinez",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0x0000",
+        "device_version": "0.0.1"
+    },
+    "matrix_pins": {
+        "cols": ["B3", "B2", "B6"],
+        "rows": ["E6", "B4", "B5"]
+    },
+    "diode_direction": "COL2ROW",
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
+    "features": {
+        "bootmagic": false,
+        "mousekey": false,
+        "extrakey": false
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2}
+            ]
+        }
+    }
+}
diff --git a/keyboards/handwired/novem/rules.mk b/keyboards/handwired/novem/rules.mk
deleted file mode 100644
index ca9d24172d0..00000000000
--- a/keyboards/handwired/novem/rules.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no       	# Mouse keys
-EXTRAKEY_ENABLE = no       	# Audio control and System control
-CONSOLE_ENABLE = no        	# Console for debug
-COMMAND_ENABLE = no        	# Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       	# Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        	# Enable keyboard RGB underglow
-AUDIO_ENABLE = no           	# Audio output
diff --git a/keyboards/handwired/onekey/blackpill_f401/info.json b/keyboards/handwired/onekey/blackpill_f401/info.json
deleted file mode 100644
index 69a7ea87a75..00000000000
--- a/keyboards/handwired/onekey/blackpill_f401/info.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "keyboard_name": "Onekey Blackpill STM32F401",
-    "development_board": "blackpill_f401",
-    "matrix_pins": {
-        "cols": ["B0"],
-        "rows": ["A7"]
-    },
-    "backlight": {
-        "pin": "A0"
-    },
-    "ws2812": {
-        "pin": "A1"
-    },
-    "apa102": {
-        "data_pin": "A1",
-        "clock_pin": "A2"
-    }
-}
diff --git a/keyboards/handwired/onekey/blackpill_f401/keyboard.json b/keyboards/handwired/onekey/blackpill_f401/keyboard.json
new file mode 100644
index 00000000000..29e2f3f17d6
--- /dev/null
+++ b/keyboards/handwired/onekey/blackpill_f401/keyboard.json
@@ -0,0 +1,23 @@
+{
+    "keyboard_name": "Onekey Blackpill STM32F401",
+    "development_board": "blackpill_f401",
+    "usb": {
+        "shared_endpoint": {
+            "keyboard": true
+        }
+    },
+    "matrix_pins": {
+        "cols": ["B0"],
+        "rows": ["A7"]
+    },
+    "backlight": {
+        "pin": "A0"
+    },
+    "ws2812": {
+        "pin": "A1"
+    },
+    "apa102": {
+        "data_pin": "A1",
+        "clock_pin": "A2"
+    }
+}
diff --git a/keyboards/handwired/onekey/blackpill_f401/rules.mk b/keyboards/handwired/onekey/blackpill_f401/rules.mk
deleted file mode 100644
index 1071cf62ee3..00000000000
--- a/keyboards/handwired/onekey/blackpill_f401/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-KEYBOARD_SHARED_EP = yes
diff --git a/keyboards/handwired/onekey/blackpill_f401_tinyuf2/info.json b/keyboards/handwired/onekey/blackpill_f401_tinyuf2/info.json
deleted file mode 100644
index ed9435c740b..00000000000
--- a/keyboards/handwired/onekey/blackpill_f401_tinyuf2/info.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-    "keyboard_name": "Onekey Blackpill STM32F401 TinyUF2",
-    "development_board": "blackpill_f401",
-    "bootloader": "tinyuf2",
-    "matrix_pins": {
-        "cols": ["B0"],
-        "rows": ["A7"]
-    },
-    "backlight": {
-        "pin": "A0"
-    },
-    "ws2812": {
-        "pin": "A1"
-    },
-    "apa102": {
-        "data_pin": "A1",
-        "clock_pin": "A2"
-    }
-}
diff --git a/keyboards/handwired/onekey/blackpill_f401_tinyuf2/keyboard.json b/keyboards/handwired/onekey/blackpill_f401_tinyuf2/keyboard.json
new file mode 100644
index 00000000000..413bf7a7f34
--- /dev/null
+++ b/keyboards/handwired/onekey/blackpill_f401_tinyuf2/keyboard.json
@@ -0,0 +1,24 @@
+{
+    "keyboard_name": "Onekey Blackpill STM32F401 TinyUF2",
+    "development_board": "blackpill_f401",
+    "bootloader": "tinyuf2",
+    "usb": {
+        "shared_endpoint": {
+            "keyboard": true
+        }
+    },
+    "matrix_pins": {
+        "cols": ["B0"],
+        "rows": ["A7"]
+    },
+    "backlight": {
+        "pin": "A0"
+    },
+    "ws2812": {
+        "pin": "A1"
+    },
+    "apa102": {
+        "data_pin": "A1",
+        "clock_pin": "A2"
+    }
+}
diff --git a/keyboards/handwired/onekey/blackpill_f401_tinyuf2/rules.mk b/keyboards/handwired/onekey/blackpill_f401_tinyuf2/rules.mk
deleted file mode 100755
index 1071cf62ee3..00000000000
--- a/keyboards/handwired/onekey/blackpill_f401_tinyuf2/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-KEYBOARD_SHARED_EP = yes
diff --git a/keyboards/handwired/onekey/blackpill_f411/info.json b/keyboards/handwired/onekey/blackpill_f411/info.json
deleted file mode 100644
index 5ee8ec3d5ed..00000000000
--- a/keyboards/handwired/onekey/blackpill_f411/info.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "keyboard_name": "Onekey Blackpill STM32F411",
-    "development_board": "blackpill_f411",
-    "matrix_pins": {
-        "cols": ["B0"],
-        "rows": ["A7"]
-    },
-    "backlight": {
-        "pin": "A0"
-    },
-    "ws2812": {
-        "pin": "A1"
-    },
-    "apa102": {
-        "data_pin": "A1",
-        "clock_pin": "A2"
-    }
-}
diff --git a/keyboards/handwired/onekey/blackpill_f411/keyboard.json b/keyboards/handwired/onekey/blackpill_f411/keyboard.json
new file mode 100644
index 00000000000..077fee4b3bd
--- /dev/null
+++ b/keyboards/handwired/onekey/blackpill_f411/keyboard.json
@@ -0,0 +1,23 @@
+{
+    "keyboard_name": "Onekey Blackpill STM32F411",
+    "development_board": "blackpill_f411",
+    "usb": {
+        "shared_endpoint": {
+            "keyboard": true
+        }
+    },
+    "matrix_pins": {
+        "cols": ["B0"],
+        "rows": ["A7"]
+    },
+    "backlight": {
+        "pin": "A0"
+    },
+    "ws2812": {
+        "pin": "A1"
+    },
+    "apa102": {
+        "data_pin": "A1",
+        "clock_pin": "A2"
+    }
+}
diff --git a/keyboards/handwired/onekey/blackpill_f411/rules.mk b/keyboards/handwired/onekey/blackpill_f411/rules.mk
deleted file mode 100644
index 1071cf62ee3..00000000000
--- a/keyboards/handwired/onekey/blackpill_f411/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-KEYBOARD_SHARED_EP = yes
diff --git a/keyboards/handwired/onekey/blackpill_f411_tinyuf2/info.json b/keyboards/handwired/onekey/blackpill_f411_tinyuf2/info.json
deleted file mode 100644
index 8e8b52080ad..00000000000
--- a/keyboards/handwired/onekey/blackpill_f411_tinyuf2/info.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-    "keyboard_name": "Onekey Blackpill STM32F411 TinyUF2",
-    "development_board": "blackpill_f411",
-    "bootloader": "tinyuf2",
-    "matrix_pins": {
-        "cols": ["B0"],
-        "rows": ["A7"]
-    },
-    "backlight": {
-        "pin": "A0"
-    },
-    "ws2812": {
-        "pin": "A1"
-    },
-    "apa102": {
-        "data_pin": "A1",
-        "clock_pin": "A2"
-    }
-}
diff --git a/keyboards/handwired/onekey/blackpill_f411_tinyuf2/keyboard.json b/keyboards/handwired/onekey/blackpill_f411_tinyuf2/keyboard.json
new file mode 100644
index 00000000000..e37bf6f54dc
--- /dev/null
+++ b/keyboards/handwired/onekey/blackpill_f411_tinyuf2/keyboard.json
@@ -0,0 +1,24 @@
+{
+    "keyboard_name": "Onekey Blackpill STM32F411 TinyUF2",
+    "development_board": "blackpill_f411",
+    "bootloader": "tinyuf2",
+    "usb": {
+        "shared_endpoint": {
+            "keyboard": true
+        }
+    },
+    "matrix_pins": {
+        "cols": ["B0"],
+        "rows": ["A7"]
+    },
+    "backlight": {
+        "pin": "A0"
+    },
+    "ws2812": {
+        "pin": "A1"
+    },
+    "apa102": {
+        "data_pin": "A1",
+        "clock_pin": "A2"
+    }
+}
diff --git a/keyboards/handwired/onekey/blackpill_f411_tinyuf2/rules.mk b/keyboards/handwired/onekey/blackpill_f411_tinyuf2/rules.mk
deleted file mode 100755
index 1071cf62ee3..00000000000
--- a/keyboards/handwired/onekey/blackpill_f411_tinyuf2/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-KEYBOARD_SHARED_EP = yes
diff --git a/keyboards/handwired/onekey/bluepill_f103c6/info.json b/keyboards/handwired/onekey/bluepill_f103c6/info.json
deleted file mode 100644
index 9460b43f5f4..00000000000
--- a/keyboards/handwired/onekey/bluepill_f103c6/info.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-    "keyboard_name": "Onekey Bluepill STM32F103C6",
-    "processor": "STM32F103",
-    "board": "STM32_F103_STM32DUINO",
-    "matrix_pins": {
-        "cols": ["B0"],
-        "rows": ["A7"]
-    },
-    "backlight": {
-        "pin": "A0"
-    },
-    "ws2812": {
-        "pin": "A1"
-    },
-    "apa102": {
-        "data_pin": "A1",
-        "clock_pin": "A2"
-    }
-}
diff --git a/keyboards/handwired/onekey/bluepill_f103c6/keyboard.json b/keyboards/handwired/onekey/bluepill_f103c6/keyboard.json
new file mode 100644
index 00000000000..4267222cfc9
--- /dev/null
+++ b/keyboards/handwired/onekey/bluepill_f103c6/keyboard.json
@@ -0,0 +1,22 @@
+{
+    "keyboard_name": "Onekey Bluepill STM32F103C6",
+    "processor": "STM32F103",
+    "board": "STM32_F103_STM32DUINO",
+    "matrix_pins": {
+        "cols": ["B0"],
+        "rows": ["A7"]
+    },
+    "backlight": {
+        "pin": "A0"
+    },
+    "ws2812": {
+        "pin": "A1"
+    },
+    "apa102": {
+        "data_pin": "A1",
+        "clock_pin": "A2"
+    },
+    "build": {
+        "lto": true
+    }
+}
diff --git a/keyboards/handwired/onekey/bluepill_f103c6/rules.mk b/keyboards/handwired/onekey/bluepill_f103c6/rules.mk
index 71bc488563a..c37cc1dc1fa 100644
--- a/keyboards/handwired/onekey/bluepill_f103c6/rules.mk
+++ b/keyboards/handwired/onekey/bluepill_f103c6/rules.mk
@@ -7,9 +7,6 @@ BOOTLOADER_TYPE = stm32duino
 DFU_ARGS = -d 1EAF:0003 -a 2 -R
 DFU_SUFFIX_ARGS = -v 1EAF -p 0003
 
-# LTO is required to fit the firmware into the available 24K of flash
-LTO_ENABLE = yes
-
 # EEPROM emulation not supported yet (need to implement a proper firmware size
 # check first, otherwise the chance of the EEPROM backing store overwriting
 # some part of the firmware code is really high).
diff --git a/keyboards/handwired/onekey/evb_wb32f3g71/info.json b/keyboards/handwired/onekey/evb_wb32f3g71/keyboard.json
similarity index 100%
rename from keyboards/handwired/onekey/evb_wb32f3g71/info.json
rename to keyboards/handwired/onekey/evb_wb32f3g71/keyboard.json
diff --git a/keyboards/handwired/onekey/evb_wb32fq95/info.json b/keyboards/handwired/onekey/evb_wb32fq95/keyboard.json
similarity index 100%
rename from keyboards/handwired/onekey/evb_wb32fq95/info.json
rename to keyboards/handwired/onekey/evb_wb32fq95/keyboard.json
diff --git a/keyboards/handwired/onekey/kb2040/info.json b/keyboards/handwired/onekey/kb2040/info.json
deleted file mode 100644
index 5c0c92ef5de..00000000000
--- a/keyboards/handwired/onekey/kb2040/info.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-    "keyboard_name": "Onekey KB2040",
-    "development_board": "kb2040",
-    "matrix_pins": {
-        "cols": ["GP4"],
-        "rows": ["GP5"]
-    },
-    "ws2812": {
-        "pin": "GP17",
-        "driver": "vendor"
-    }
-}
diff --git a/keyboards/handwired/onekey/kb2040/keyboard.json b/keyboards/handwired/onekey/kb2040/keyboard.json
new file mode 100644
index 00000000000..3c099342271
--- /dev/null
+++ b/keyboards/handwired/onekey/kb2040/keyboard.json
@@ -0,0 +1,15 @@
+{
+    "keyboard_name": "Onekey KB2040",
+    "development_board": "kb2040",
+    "matrix_pins": {
+        "cols": ["GP4"],
+        "rows": ["GP5"]
+    },
+    "ws2812": {
+        "pin": "GP17",
+        "driver": "vendor"
+    },
+    "features": {
+        "oled": true
+    }
+}
diff --git a/keyboards/handwired/onekey/kb2040/rules.mk b/keyboards/handwired/onekey/kb2040/rules.mk
deleted file mode 100644
index dd68e9d3b09..00000000000
--- a/keyboards/handwired/onekey/kb2040/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-OLED_ENABLE = yes
diff --git a/keyboards/handwired/onekey/sipeed_longan_nano/info.json b/keyboards/handwired/onekey/sipeed_longan_nano/keyboard.json
similarity index 100%
rename from keyboards/handwired/onekey/sipeed_longan_nano/info.json
rename to keyboards/handwired/onekey/sipeed_longan_nano/keyboard.json
diff --git a/keyboards/handwired/onekey/teensy_lc/info.json b/keyboards/handwired/onekey/teensy_lc/keyboard.json
similarity index 100%
rename from keyboards/handwired/onekey/teensy_lc/info.json
rename to keyboards/handwired/onekey/teensy_lc/keyboard.json
diff --git a/keyboards/handwired/orbweaver/info.json b/keyboards/handwired/orbweaver/info.json
deleted file mode 100644
index 14c87182563..00000000000
--- a/keyboards/handwired/orbweaver/info.json
+++ /dev/null
@@ -1,63 +0,0 @@
-{
-    "manufacturer": "a_marmot",
-    "keyboard_name": "orbweaver",
-    "maintainer": "a_marmot",
-    "bootloader": "rp2040",
-    "diode_direction": "ROW2COL",
-    "features": {
-        "bootmagic": true,
-        "command": false,
-        "console": false,
-        "extrakey": true,
-        "mousekey": true,
-        "nkro": true
-    },
-    "rgb_matrix": {
-        "center_point": [40, 30],
-        "driver": "is31fl3731"
-    },
-    "matrix_pins": {
-        "rows": ["GP4", "GP5", "GP6", "GP7", "GP8", "GP9"],
-        "cols": ["GP12", "GP13", "GP14", "GP15", "GP16"]
-    },
-    "processor": "RP2040",
-    "url": "https://geekhack.org/index.php?topic=119396.0",
-    "usb": {
-        "device_version": "1.0.0",
-        "pid": "0x0000",
-        "vid": "0xFEED"
-    },
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [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": [1, 4], "x": 4, "y": 1},
-                {"matrix": [2, 0], "x": 0, "y": 2},
-                {"matrix": [2, 1], "x": 1, "y": 2},
-                {"matrix": [2, 2], "x": 2, "y": 2},
-                {"matrix": [2, 3], "x": 3, "y": 2},
-                {"matrix": [2, 4], "x": 4, "y": 2},
-                {"matrix": [3, 0], "x": 0, "y": 3},
-                {"matrix": [3, 1], "x": 1, "y": 3},
-                {"matrix": [3, 2], "x": 2, "y": 3},
-                {"matrix": [3, 3], "x": 3, "y": 3},
-                {"matrix": [3, 4], "x": 4, "y": 3},
-                {"matrix": [4, 0], "x": 0, "y": 4},
-                {"matrix": [4, 1], "x": 1, "y": 4},
-                {"matrix": [4, 2], "x": 2, "y": 4},
-                {"matrix": [4, 3], "x": 3, "y": 4},
-                {"matrix": [4, 4], "x": 4, "y": 4},
-                {"matrix": [5, 0], "x": 0, "y": 5},
-                {"matrix": [5, 1], "w": 4, "x": 1, "y": 5}
-            ]
-        }
-    }
-}
diff --git a/keyboards/handwired/orbweaver/keyboard.json b/keyboards/handwired/orbweaver/keyboard.json
new file mode 100644
index 00000000000..5ba08dfc2d5
--- /dev/null
+++ b/keyboards/handwired/orbweaver/keyboard.json
@@ -0,0 +1,64 @@
+{
+    "manufacturer": "a_marmot",
+    "keyboard_name": "orbweaver",
+    "maintainer": "a_marmot",
+    "bootloader": "rp2040",
+    "diode_direction": "ROW2COL",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgb_matrix": true
+    },
+    "rgb_matrix": {
+        "center_point": [40, 30],
+        "driver": "is31fl3731"
+    },
+    "matrix_pins": {
+        "rows": ["GP4", "GP5", "GP6", "GP7", "GP8", "GP9"],
+        "cols": ["GP12", "GP13", "GP14", "GP15", "GP16"]
+    },
+    "processor": "RP2040",
+    "url": "https://geekhack.org/index.php?topic=119396.0",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x0000",
+        "vid": "0xFEED"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [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": [1, 4], "x": 4, "y": 1},
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+                {"matrix": [4, 2], "x": 2, "y": 4},
+                {"matrix": [4, 3], "x": 3, "y": 4},
+                {"matrix": [4, 4], "x": 4, "y": 4},
+                {"matrix": [5, 0], "x": 0, "y": 5},
+                {"matrix": [5, 1], "w": 4, "x": 1, "y": 5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/handwired/orbweaver/rules.mk b/keyboards/handwired/orbweaver/rules.mk
deleted file mode 100644
index 01f9d9397ae..00000000000
--- a/keyboards/handwired/orbweaver/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-# Add support for 3731 RGB matrix controller
-RGB_MATRIX_ENABLE = yes
diff --git a/keyboards/handwired/ortho_brass/info.json b/keyboards/handwired/ortho_brass/info.json
deleted file mode 100644
index b2280b62040..00000000000
--- a/keyboards/handwired/ortho_brass/info.json
+++ /dev/null
@@ -1,133 +0,0 @@
-{
-    "keyboard_name": "Ortho Brass",
-    "manufacturer": "BifbofII",
-    "url": "",
-    "maintainer": "BifbofII",
-    "usb": {
-        "vid": "0xFEED",
-        "pid": "0x6060",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["F4", "F7", "F5", "F1", "C7", "F0", "B1", "B0", "F6", "B6", "B2", "B3"],
-        "rows": ["D3", "D2", "D1", "D0"]
-    },
-    "diode_direction": "COL2ROW",
-    "processor": "atmega32u4",
-    "bootloader": "qmk-dfu",
-    "community_layouts": ["ortho_4x12"],
-    "layout_aliases": {
-        "LAYOUT": "LAYOUT_ortho_4x12"
-    },
-    "layouts": {
-        "LAYOUT_ortho_4x12": {
-            "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": [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": [1, 4], "x": 4, "y": 1},
-                {"matrix": [1, 5], "x": 5, "y": 1},
-                {"matrix": [1, 6], "x": 6, "y": 1},
-                {"matrix": [1, 7], "x": 7, "y": 1},
-                {"matrix": [1, 8], "x": 8, "y": 1},
-                {"matrix": [1, 9], "x": 9, "y": 1},
-                {"matrix": [1, 10], "x": 10, "y": 1},
-                {"matrix": [1, 11], "x": 11, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2},
-                {"matrix": [2, 1], "x": 1, "y": 2},
-                {"matrix": [2, 2], "x": 2, "y": 2},
-                {"matrix": [2, 3], "x": 3, "y": 2},
-                {"matrix": [2, 4], "x": 4, "y": 2},
-                {"matrix": [2, 5], "x": 5, "y": 2},
-                {"matrix": [2, 6], "x": 6, "y": 2},
-                {"matrix": [2, 7], "x": 7, "y": 2},
-                {"matrix": [2, 8], "x": 8, "y": 2},
-                {"matrix": [2, 9], "x": 9, "y": 2},
-                {"matrix": [2, 10], "x": 10, "y": 2},
-                {"matrix": [2, 11], "x": 11, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3},
-                {"matrix": [3, 1], "x": 1, "y": 3},
-                {"matrix": [3, 2], "x": 2, "y": 3},
-                {"matrix": [3, 3], "x": 3, "y": 3},
-                {"matrix": [3, 4], "x": 4, "y": 3},
-                {"matrix": [3, 5], "x": 5, "y": 3},
-                {"matrix": [3, 6], "x": 6, "y": 3},
-                {"matrix": [3, 7], "x": 7, "y": 3},
-                {"matrix": [3, 8], "x": 8, "y": 3},
-                {"matrix": [3, 9], "x": 9, "y": 3},
-                {"matrix": [3, 10], "x": 10, "y": 3},
-                {"matrix": [3, 11], "x": 11, "y": 3}
-            ]
-        },
-        "LAYOUT_ortho_4x12_1x2uC": {
-            "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": [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": [1, 4], "x": 4, "y": 1},
-                {"matrix": [1, 5], "x": 5, "y": 1},
-                {"matrix": [1, 6], "x": 6, "y": 1},
-                {"matrix": [1, 7], "x": 7, "y": 1},
-                {"matrix": [1, 8], "x": 8, "y": 1},
-                {"matrix": [1, 9], "x": 9, "y": 1},
-                {"matrix": [1, 10], "x": 10, "y": 1},
-                {"matrix": [1, 11], "x": 11, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2},
-                {"matrix": [2, 1], "x": 1, "y": 2},
-                {"matrix": [2, 2], "x": 2, "y": 2},
-                {"matrix": [2, 3], "x": 3, "y": 2},
-                {"matrix": [2, 4], "x": 4, "y": 2},
-                {"matrix": [2, 5], "x": 5, "y": 2},
-                {"matrix": [2, 6], "x": 6, "y": 2},
-                {"matrix": [2, 7], "x": 7, "y": 2},
-                {"matrix": [2, 8], "x": 8, "y": 2},
-                {"matrix": [2, 9], "x": 9, "y": 2},
-                {"matrix": [2, 10], "x": 10, "y": 2},
-                {"matrix": [2, 11], "x": 11, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3},
-                {"matrix": [3, 1], "x": 1, "y": 3},
-                {"matrix": [3, 2], "x": 2, "y": 3},
-                {"matrix": [3, 3], "x": 3, "y": 3},
-                {"matrix": [3, 4], "x": 4, "y": 3},
-                {"matrix": [3, 5], "x": 5, "y": 3, "w": 2},
-                {"matrix": [3, 7], "x": 7, "y": 3},
-                {"matrix": [3, 8], "x": 8, "y": 3},
-                {"matrix": [3, 9], "x": 9, "y": 3},
-                {"matrix": [3, 10], "x": 10, "y": 3},
-                {"matrix": [3, 11], "x": 11, "y": 3}
-            ]
-        }
-    }
-}
diff --git a/keyboards/handwired/ortho_brass/keyboard.json b/keyboards/handwired/ortho_brass/keyboard.json
new file mode 100644
index 00000000000..5cd01b1f6d6
--- /dev/null
+++ b/keyboards/handwired/ortho_brass/keyboard.json
@@ -0,0 +1,139 @@
+{
+    "keyboard_name": "Ortho Brass",
+    "manufacturer": "BifbofII",
+    "url": "",
+    "maintainer": "BifbofII",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0x6060",
+        "device_version": "0.0.1"
+    },
+    "matrix_pins": {
+        "cols": ["F4", "F7", "F5", "F1", "C7", "F0", "B1", "B0", "F6", "B6", "B2", "B3"],
+        "rows": ["D3", "D2", "D1", "D0"]
+    },
+    "diode_direction": "COL2ROW",
+    "processor": "atmega32u4",
+    "bootloader": "qmk-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": false,
+        "extrakey": true,
+        "nkro": true
+    },
+    "community_layouts": ["ortho_4x12"],
+    "layout_aliases": {
+        "LAYOUT": "LAYOUT_ortho_4x12"
+    },
+    "layouts": {
+        "LAYOUT_ortho_4x12": {
+            "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": [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": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [2, 6], "x": 6, "y": 2},
+                {"matrix": [2, 7], "x": 7, "y": 2},
+                {"matrix": [2, 8], "x": 8, "y": 2},
+                {"matrix": [2, 9], "x": 9, "y": 2},
+                {"matrix": [2, 10], "x": 10, "y": 2},
+                {"matrix": [2, 11], "x": 11, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
+                {"matrix": [3, 6], "x": 6, "y": 3},
+                {"matrix": [3, 7], "x": 7, "y": 3},
+                {"matrix": [3, 8], "x": 8, "y": 3},
+                {"matrix": [3, 9], "x": 9, "y": 3},
+                {"matrix": [3, 10], "x": 10, "y": 3},
+                {"matrix": [3, 11], "x": 11, "y": 3}
+            ]
+        },
+        "LAYOUT_ortho_4x12_1x2uC": {
+            "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": [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": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [2, 6], "x": 6, "y": 2},
+                {"matrix": [2, 7], "x": 7, "y": 2},
+                {"matrix": [2, 8], "x": 8, "y": 2},
+                {"matrix": [2, 9], "x": 9, "y": 2},
+                {"matrix": [2, 10], "x": 10, "y": 2},
+                {"matrix": [2, 11], "x": 11, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3, "w": 2},
+                {"matrix": [3, 7], "x": 7, "y": 3},
+                {"matrix": [3, 8], "x": 8, "y": 3},
+                {"matrix": [3, 9], "x": 9, "y": 3},
+                {"matrix": [3, 10], "x": 10, "y": 3},
+                {"matrix": [3, 11], "x": 11, "y": 3}
+            ]
+        }
+    }
+}
diff --git a/keyboards/handwired/ortho_brass/rules.mk b/keyboards/handwired/ortho_brass/rules.mk
index 36acc6fd924..6642cf3a9c4 100644
--- a/keyboards/handwired/ortho_brass/rules.mk
+++ b/keyboards/handwired/ortho_brass/rules.mk
@@ -1,11 +1 @@
-# Build Options
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable RGB underlight.
-
 RGBLIGHT_SUPPORTED = no
diff --git a/keyboards/handwired/osborne1/info.json b/keyboards/handwired/osborne1/info.json
deleted file mode 100644
index 2f613b5876d..00000000000
--- a/keyboards/handwired/osborne1/info.json
+++ /dev/null
@@ -1,91 +0,0 @@
-{
-    "manufacturer": "crackmonkey",
-    "keyboard_name": "osborne1",
-    "maintainer": "crackmonkey",
-    "bootloader": "atmel-dfu",
-    "diode_direction": "COL2ROW",
-    "features": {
-        "bootmagic": true,
-        "command": false,
-        "console": true,
-        "extrakey": false,
-        "mousekey": false,
-        "nkro": false
-    },
-    "bluetooth": {
-        "driver": "bluefruit_le"
-    },
-    "matrix_pins": {
-        "cols": ["D3", "D2", "F0", "F1", "F4", "F5", "F6", "F7"],
-        "rows": ["D0", "B7", "B5", "C6", "D1", "B6", "D7", "D6"]
-    },
-    "processor": "atmega32u4",
-    "url": "",
-    "usb": {
-        "device_version": "1.0.0",
-        "pid": "0x239A",
-        "vid": "0x800C"
-    },
-    "layouts": {
-        "LAYOUT_64_ansi": {
-            "layout": [
-                {"matrix": [0, 0], "label": "ESC", "x": 0, "y": 0},
-                {"matrix": [1, 0], "label": "1", "x": 1, "y": 0},
-                {"matrix": [1, 1], "label": "2", "x": 2, "y": 0},
-                {"matrix": [1, 2], "label": "3", "x": 3, "y": 0},
-                {"matrix": [1, 3], "label": "4", "x": 4, "y": 0},
-                {"matrix": [1, 4], "label": "5", "x": 5, "y": 0},
-                {"matrix": [1, 5], "label": "6", "x": 6, "y": 0},
-                {"matrix": [1, 6], "label": "7", "x": 7, "y": 0},
-                {"matrix": [1, 7], "label": "8", "x": 8, "y": 0},
-                {"matrix": [5, 7], "label": "9", "x": 9, "y": 0},
-                {"matrix": [5, 2], "label": "0", "x": 10, "y": 0},
-                {"matrix": [6, 2], "label": "-", "x": 11, "y": 0},
-                {"matrix": [6, 7], "label": "=", "x": 12, "y": 0},
-                {"matrix": [0, 7], "label": "[", "x": 13, "y": 0},
-                {"matrix": [5, 0], "label": "Up", "x": 14, "y": 0},
-                {"matrix": [0, 1], "label": "TAB", "x": 0, "y": 1},
-                {"matrix": [2, 0], "label": "Q", "x": 1, "y": 1},
-                {"matrix": [2, 1], "label": "W", "x": 2, "y": 1},
-                {"matrix": [2, 2], "label": "E", "x": 3, "y": 1},
-                {"matrix": [2, 3], "label": "R", "x": 4, "y": 1},
-                {"matrix": [2, 4], "label": "T", "x": 5, "y": 1},
-                {"matrix": [2, 5], "label": "Y", "x": 6, "y": 1},
-                {"matrix": [2, 6], "label": "U", "x": 7, "y": 1},
-                {"matrix": [2, 7], "label": "I", "x": 8, "y": 1},
-                {"matrix": [5, 6], "label": "O", "x": 9, "y": 1},
-                {"matrix": [5, 5], "label": "P", "x": 10, "y": 1},
-                {"matrix": [6, 5], "label": "Backslash", "x": 11, "y": 1},
-                {"matrix": [0, 6], "label": "Quote", "x": 12, "y": 1},
-                {"matrix": [5, 1], "label": "Left", "x": 13, "y": 1},
-                {"matrix": [6, 0], "label": "Right", "x": 14, "y": 1},
-                {"matrix": [0, 2], "label": "Control", "x": 0, "y": 2},
-                {"matrix": [7, 3], "label": "Capslock", "x": 1, "y": 2},
-                {"matrix": [3, 0], "label": "A", "x": 2, "y": 2},
-                {"matrix": [3, 1], "label": "S", "x": 3, "y": 2},
-                {"matrix": [3, 2], "label": "D", "x": 4, "y": 2},
-                {"matrix": [3, 3], "label": "F", "x": 5, "y": 2},
-                {"matrix": [3, 4], "label": "G", "x": 6, "y": 2},
-                {"matrix": [3, 5], "label": "H", "x": 7, "y": 2},
-                {"matrix": [3, 6], "label": "J", "x": 8, "y": 2},
-                {"matrix": [3, 7], "label": "K", "x": 9, "y": 2},
-                {"matrix": [6, 6], "label": "L", "x": 10, "y": 2},
-                {"matrix": [6, 4], "label": "Semicolon", "x": 11, "y": 2},
-                {"matrix": [0, 5], "label": "Return", "x": 12, "y": 2},
-                {"matrix": [6, 1], "label": "Down", "x": 13, "y": 2},
-                {"matrix": [0, 4], "label": "LShift", "x": 0, "y": 3},
-                {"matrix": [4, 0], "label": "Z", "x": 1, "y": 3},
-                {"matrix": [4, 1], "label": "X", "x": 2, "y": 3},
-                {"matrix": [4, 2], "label": "C", "x": 3, "y": 3},
-                {"matrix": [4, 3], "label": "V", "x": 4, "y": 3},
-                {"matrix": [4, 4], "label": "B", "x": 5, "y": 3},
-                {"matrix": [4, 5], "label": "N", "x": 6, "y": 3},
-                {"matrix": [4, 6], "label": "M", "x": 7, "y": 3},
-                {"matrix": [4, 7], "label": "Comma", "x": 8, "y": 3},
-                {"matrix": [5, 4], "label": "Period", "x": 9, "y": 3},
-                {"matrix": [6, 3], "label": "Slash", "x": 10, "y": 3},
-                {"matrix": [5, 3], "label": "Space", "x": 0, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/handwired/osborne1/keyboard.json b/keyboards/handwired/osborne1/keyboard.json
new file mode 100644
index 00000000000..8cbcb3cc8bb
--- /dev/null
+++ b/keyboards/handwired/osborne1/keyboard.json
@@ -0,0 +1,92 @@
+{
+    "manufacturer": "crackmonkey",
+    "keyboard_name": "osborne1",
+    "maintainer": "crackmonkey",
+    "bootloader": "atmel-dfu",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": true,
+        "extrakey": false,
+        "mousekey": false,
+        "nkro": false,
+        "bluetooth": true
+    },
+    "bluetooth": {
+        "driver": "bluefruit_le"
+    },
+    "matrix_pins": {
+        "cols": ["D3", "D2", "F0", "F1", "F4", "F5", "F6", "F7"],
+        "rows": ["D0", "B7", "B5", "C6", "D1", "B6", "D7", "D6"]
+    },
+    "processor": "atmega32u4",
+    "url": "",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x239A",
+        "vid": "0x800C"
+    },
+    "layouts": {
+        "LAYOUT_64_ansi": {
+            "layout": [
+                {"matrix": [0, 0], "label": "ESC", "x": 0, "y": 0},
+                {"matrix": [1, 0], "label": "1", "x": 1, "y": 0},
+                {"matrix": [1, 1], "label": "2", "x": 2, "y": 0},
+                {"matrix": [1, 2], "label": "3", "x": 3, "y": 0},
+                {"matrix": [1, 3], "label": "4", "x": 4, "y": 0},
+                {"matrix": [1, 4], "label": "5", "x": 5, "y": 0},
+                {"matrix": [1, 5], "label": "6", "x": 6, "y": 0},
+                {"matrix": [1, 6], "label": "7", "x": 7, "y": 0},
+                {"matrix": [1, 7], "label": "8", "x": 8, "y": 0},
+                {"matrix": [5, 7], "label": "9", "x": 9, "y": 0},
+                {"matrix": [5, 2], "label": "0", "x": 10, "y": 0},
+                {"matrix": [6, 2], "label": "-", "x": 11, "y": 0},
+                {"matrix": [6, 7], "label": "=", "x": 12, "y": 0},
+                {"matrix": [0, 7], "label": "[", "x": 13, "y": 0},
+                {"matrix": [5, 0], "label": "Up", "x": 14, "y": 0},
+                {"matrix": [0, 1], "label": "TAB", "x": 0, "y": 1},
+                {"matrix": [2, 0], "label": "Q", "x": 1, "y": 1},
+                {"matrix": [2, 1], "label": "W", "x": 2, "y": 1},
+                {"matrix": [2, 2], "label": "E", "x": 3, "y": 1},
+                {"matrix": [2, 3], "label": "R", "x": 4, "y": 1},
+                {"matrix": [2, 4], "label": "T", "x": 5, "y": 1},
+                {"matrix": [2, 5], "label": "Y", "x": 6, "y": 1},
+                {"matrix": [2, 6], "label": "U", "x": 7, "y": 1},
+                {"matrix": [2, 7], "label": "I", "x": 8, "y": 1},
+                {"matrix": [5, 6], "label": "O", "x": 9, "y": 1},
+                {"matrix": [5, 5], "label": "P", "x": 10, "y": 1},
+                {"matrix": [6, 5], "label": "Backslash", "x": 11, "y": 1},
+                {"matrix": [0, 6], "label": "Quote", "x": 12, "y": 1},
+                {"matrix": [5, 1], "label": "Left", "x": 13, "y": 1},
+                {"matrix": [6, 0], "label": "Right", "x": 14, "y": 1},
+                {"matrix": [0, 2], "label": "Control", "x": 0, "y": 2},
+                {"matrix": [7, 3], "label": "Capslock", "x": 1, "y": 2},
+                {"matrix": [3, 0], "label": "A", "x": 2, "y": 2},
+                {"matrix": [3, 1], "label": "S", "x": 3, "y": 2},
+                {"matrix": [3, 2], "label": "D", "x": 4, "y": 2},
+                {"matrix": [3, 3], "label": "F", "x": 5, "y": 2},
+                {"matrix": [3, 4], "label": "G", "x": 6, "y": 2},
+                {"matrix": [3, 5], "label": "H", "x": 7, "y": 2},
+                {"matrix": [3, 6], "label": "J", "x": 8, "y": 2},
+                {"matrix": [3, 7], "label": "K", "x": 9, "y": 2},
+                {"matrix": [6, 6], "label": "L", "x": 10, "y": 2},
+                {"matrix": [6, 4], "label": "Semicolon", "x": 11, "y": 2},
+                {"matrix": [0, 5], "label": "Return", "x": 12, "y": 2},
+                {"matrix": [6, 1], "label": "Down", "x": 13, "y": 2},
+                {"matrix": [0, 4], "label": "LShift", "x": 0, "y": 3},
+                {"matrix": [4, 0], "label": "Z", "x": 1, "y": 3},
+                {"matrix": [4, 1], "label": "X", "x": 2, "y": 3},
+                {"matrix": [4, 2], "label": "C", "x": 3, "y": 3},
+                {"matrix": [4, 3], "label": "V", "x": 4, "y": 3},
+                {"matrix": [4, 4], "label": "B", "x": 5, "y": 3},
+                {"matrix": [4, 5], "label": "N", "x": 6, "y": 3},
+                {"matrix": [4, 6], "label": "M", "x": 7, "y": 3},
+                {"matrix": [4, 7], "label": "Comma", "x": 8, "y": 3},
+                {"matrix": [5, 4], "label": "Period", "x": 9, "y": 3},
+                {"matrix": [6, 3], "label": "Slash", "x": 10, "y": 3},
+                {"matrix": [5, 3], "label": "Space", "x": 0, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/handwired/osborne1/rules.mk b/keyboards/handwired/osborne1/rules.mk
deleted file mode 100644
index 9ccac102c70..00000000000
--- a/keyboards/handwired/osborne1/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-BLUETOOTH_ENABLE = yes
diff --git a/keyboards/handwired/owlet60/info.json b/keyboards/handwired/owlet60/info.json
deleted file mode 100644
index f6bd2d2f239..00000000000
--- a/keyboards/handwired/owlet60/info.json
+++ /dev/null
@@ -1,377 +0,0 @@
-{
-    "keyboard_name": "Owlet60",
-    "manufacturer": "worthlessowl",
-    "url": "https://github.com/qmk/qmk_firmware/tree/master/keyboards/handwired/owlet60/",
-    "maintainer": "worthlessowl",
-    "usb": {
-        "vid": "0xFEED",
-        "pid": "0xDA19",
-        "device_version": "0.0.1"
-    },
-    "ws2812": {
-        "pin": "D0"
-    },
-    "rgblight": {
-        "saturation_steps": 8,
-        "brightness_steps": 8,
-        "led_count": 8,
-        "max_brightness": 128,
-        "sleep": true,
-        "animations": {
-            "breathing": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "snake": true,
-            "knight": true,
-            "christmas": true,
-            "static_gradient": true,
-            "rgb_test": true,
-            "alternating": true,
-            "twinkle": true
-        }
-    },
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
-    "debounce": 9,
-    "community_layouts": ["alice", "alice_split_bs"],
-    "layout_aliases": {
-        "LAYOUT_owlet60_60_percent_full_bsp": "LAYOUT_alice",
-        "LAYOUT_owlet60_60_percent_split_bsp": "LAYOUT_alice_split_bs"
-    },
-    "layouts": {
-        "LAYOUT_owlet60_full_bsp": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0.5, "y": 0},
-
-                {"matrix": [7, 0], "x": 1.75, "y": 0},
-                {"matrix": [8, 0], "x": 2.75, "y": 0},
-                {"matrix": [7, 1], "x": 3.75, "y": 0},
-                {"matrix": [8, 1], "x": 4.75, "y": 0},
-                {"matrix": [7, 2], "x": 5.75, "y": 0},
-                {"matrix": [8, 2], "x": 6.75, "y": 0},
-                {"matrix": [8, 3], "x": 7.75, "y": 0},
-
-                {"matrix": [0, 4], "x": 9.25, "y": 0},
-                {"matrix": [7, 4], "x": 10.25, "y": 0},
-                {"matrix": [8, 4], "x": 11.25, "y": 0},
-                {"matrix": [7, 5], "x": 12.25, "y": 0},
-                {"matrix": [8, 5], "x": 13.25, "y": 0},
-                {"matrix": [7, 6], "x": 14.25, "y": 0},
-                {"matrix": [8, 6], "x": 15.25, "y": 0, "w": 2},
-                {"matrix": [7, 7], "x": 17.25, "y": 0},
-
-                {"matrix": [1, 0], "x": 0.25, "y": 1},
-
-                {"matrix": [6, 0], "x": 1.5, "y": 1, "w": 1.5},
-                {"matrix": [0, 1], "x": 3, "y": 1},
-                {"matrix": [6, 1], "x": 4, "y": 1},
-                {"matrix": [0, 2], "x": 5, "y": 1},
-                {"matrix": [6, 2], "x": 6, "y": 1},
-                {"matrix": [0, 3], "x": 7, "y": 1},
-
-                {"matrix": [7, 3], "x": 9, "y": 1},
-                {"matrix": [1, 4], "x": 10, "y": 1},
-                {"matrix": [6, 4], "x": 11, "y": 1},
-                {"matrix": [0, 5], "x": 12, "y": 1},
-                {"matrix": [6, 5], "x": 13, "y": 1},
-                {"matrix": [0, 6], "x": 14, "y": 1},
-                {"matrix": [6, 6], "x": 15, "y": 1},
-                {"matrix": [0, 7], "x": 16, "y": 1, "w": 1.5},
-                {"matrix": [6, 7], "x": 17.5, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2},
-
-                {"matrix": [5, 0], "x": 1.25, "y": 2, "w": 1.75},
-                {"matrix": [1, 1], "x": 3, "y": 2},
-                {"matrix": [5, 1], "x": 4, "y": 2},
-                {"matrix": [1, 2], "x": 5, "y": 2},
-                {"matrix": [5, 2], "x": 6, "y": 2},
-                {"matrix": [1, 3], "x": 7, "y": 2},
-
-                {"matrix": [6, 3], "x": 9.5, "y": 2},
-                {"matrix": [2, 4], "x": 10.5, "y": 2},
-                {"matrix": [5, 4], "x": 11.5, "y": 2},
-                {"matrix": [1, 5], "x": 12.5, "y": 2},
-                {"matrix": [5, 5], "x": 13.5, "y": 2},
-                {"matrix": [1, 6], "x": 14.5, "y": 2},
-                {"matrix": [5, 6], "x": 15.5, "y": 2, "w": 2.25},
-                {"matrix": [5, 7], "x": 17.75, "y": 2},
-
-                {"matrix": [4, 0], "x": 1, "y": 3, "w": 2.25},
-                {"matrix": [2, 1], "x": 3.25, "y": 3},
-                {"matrix": [4, 1], "x": 4.25, "y": 3},
-                {"matrix": [2, 2], "x": 5.25, "y": 3},
-                {"matrix": [4, 2], "x": 6.25, "y": 3},
-                {"matrix": [2, 3], "x": 7.25, "y": 3},
-
-                {"matrix": [5, 3], "x": 9.25, "y": 3},
-                {"matrix": [3, 4], "x": 10.25, "y": 3},
-                {"matrix": [4, 4], "x": 11.25, "y": 3},
-                {"matrix": [2, 5], "x": 12.25, "y": 3},
-                {"matrix": [4, 5], "x": 13.25, "y": 3},
-                {"matrix": [2, 6], "x": 14.25, "y": 3},
-                {"matrix": [4, 6], "x": 15.25, "y": 3, "w": 1.75},
-                {"matrix": [1, 7], "x": 17, "y": 3},
-                {"matrix": [4, 7], "x": 18, "y": 3},
-
-                {"matrix": [3, 0], "x": 1, "y": 4, "w": 1.5},
-                {"matrix": [3, 1], "x": 3.5, "y": 4, "w": 1.5},
-                {"matrix": [3, 2], "x": 5, "y": 4, "w": 2.25},
-                {"matrix": [3, 3], "x": 7.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 3], "x": 9.25, "y": 4, "w": 2},
-                {"matrix": [3, 5], "x": 11.25, "y": 4, "w": 1.5},
-                {"matrix": [3, 6], "x": 16, "y": 4},
-                {"matrix": [2, 7], "x": 17, "y": 4},
-                {"matrix": [3, 7], "x": 18, "y": 4}
-            ]
-        },
-        "LAYOUT_owlet60_split_bsp": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0.5, "y": 0},
-
-                {"matrix": [7, 0], "x": 1.75, "y": 0},
-                {"matrix": [8, 0], "x": 2.75, "y": 0},
-                {"matrix": [7, 1], "x": 3.75, "y": 0},
-                {"matrix": [8, 1], "x": 4.75, "y": 0},
-                {"matrix": [7, 2], "x": 5.75, "y": 0},
-                {"matrix": [8, 2], "x": 6.75, "y": 0},
-                {"matrix": [8, 3], "x": 7.75, "y": 0},
-
-                {"matrix": [0, 4], "x": 9.25, "y": 0},
-                {"matrix": [7, 4], "x": 10.25, "y": 0},
-                {"matrix": [8, 4], "x": 11.25, "y": 0},
-                {"matrix": [7, 5], "x": 12.25, "y": 0},
-                {"matrix": [8, 5], "x": 13.25, "y": 0},
-                {"matrix": [7, 6], "x": 14.25, "y": 0},
-                {"matrix": [8, 6], "x": 15.25, "y": 0},
-                {"matrix": [8, 7], "x": 16.25, "y": 0},
-                {"matrix": [7, 7], "x": 17.25, "y": 0},
-
-                {"matrix": [1, 0], "x": 0.25, "y": 1},
-
-                {"matrix": [6, 0], "x": 1.5, "y": 1, "w": 1.5},
-                {"matrix": [0, 1], "x": 3, "y": 1},
-                {"matrix": [6, 1], "x": 4, "y": 1},
-                {"matrix": [0, 2], "x": 5, "y": 1},
-                {"matrix": [6, 2], "x": 6, "y": 1},
-                {"matrix": [0, 3], "x": 7, "y": 1},
-
-                {"matrix": [7, 3], "x": 9, "y": 1},
-                {"matrix": [1, 4], "x": 10, "y": 1},
-                {"matrix": [6, 4], "x": 11, "y": 1},
-                {"matrix": [0, 5], "x": 12, "y": 1},
-                {"matrix": [6, 5], "x": 13, "y": 1},
-                {"matrix": [0, 6], "x": 14, "y": 1},
-                {"matrix": [6, 6], "x": 15, "y": 1},
-                {"matrix": [0, 7], "x": 16, "y": 1, "w": 1.5},
-                {"matrix": [6, 7], "x": 17.5, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2},
-
-                {"matrix": [5, 0], "x": 1.25, "y": 2, "w": 1.75},
-                {"matrix": [1, 1], "x": 3, "y": 2},
-                {"matrix": [5, 1], "x": 4, "y": 2},
-                {"matrix": [1, 2], "x": 5, "y": 2},
-                {"matrix": [5, 2], "x": 6, "y": 2},
-                {"matrix": [1, 3], "x": 7, "y": 2},
-
-                {"matrix": [6, 3], "x": 9.5, "y": 2},
-                {"matrix": [2, 4], "x": 10.5, "y": 2},
-                {"matrix": [5, 4], "x": 11.5, "y": 2},
-                {"matrix": [1, 5], "x": 12.5, "y": 2},
-                {"matrix": [5, 5], "x": 13.5, "y": 2},
-                {"matrix": [1, 6], "x": 14.5, "y": 2},
-                {"matrix": [5, 6], "x": 15.5, "y": 2, "w": 2.25},
-                {"matrix": [5, 7], "x": 17.75, "y": 2},
-
-                {"matrix": [4, 0], "x": 1, "y": 3, "w": 2.25},
-                {"matrix": [2, 1], "x": 3.25, "y": 3},
-                {"matrix": [4, 1], "x": 4.25, "y": 3},
-                {"matrix": [2, 2], "x": 5.25, "y": 3},
-                {"matrix": [4, 2], "x": 6.25, "y": 3},
-                {"matrix": [2, 3], "x": 7.25, "y": 3},
-
-                {"matrix": [5, 3], "x": 9.25, "y": 3},
-                {"matrix": [3, 4], "x": 10.25, "y": 3},
-                {"matrix": [4, 4], "x": 11.25, "y": 3},
-                {"matrix": [2, 5], "x": 12.25, "y": 3},
-                {"matrix": [4, 5], "x": 13.25, "y": 3},
-                {"matrix": [2, 6], "x": 14.25, "y": 3},
-                {"matrix": [4, 6], "x": 15.25, "y": 3, "w": 1.75},
-                {"matrix": [1, 7], "x": 17, "y": 3},
-                {"matrix": [4, 7], "x": 18, "y": 3},
-
-                {"matrix": [3, 0], "x": 1, "y": 4, "w": 1.5},
-                {"matrix": [3, 1], "x": 3.5, "y": 4, "w": 1.5},
-                {"matrix": [3, 2], "x": 5, "y": 4, "w": 2.25},
-                {"matrix": [3, 3], "x": 7.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 3], "x": 9.25, "y": 4, "w": 2},
-                {"matrix": [3, 5], "x": 11.25, "y": 4, "w": 1.5},
-                {"matrix": [3, 6], "x": 16, "y": 4},
-                {"matrix": [2, 7], "x": 17, "y": 4},
-                {"matrix": [3, 7], "x": 18, "y": 4}
-            ]
-        },
-        "LAYOUT_alice_split_bs": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0.5, "y": 0},
-
-                {"matrix": [7, 0], "x": 1.75, "y": 0},
-                {"matrix": [8, 0], "x": 2.75, "y": 0},
-                {"matrix": [7, 1], "x": 3.75, "y": 0},
-                {"matrix": [8, 1], "x": 4.75, "y": 0},
-                {"matrix": [7, 2], "x": 5.75, "y": 0},
-                {"matrix": [8, 2], "x": 6.75, "y": 0},
-                {"matrix": [8, 3], "x": 7.75, "y": 0},
-
-                {"matrix": [0, 4], "x": 9.25, "y": 0},
-                {"matrix": [7, 4], "x": 10.25, "y": 0},
-                {"matrix": [8, 4], "x": 11.25, "y": 0},
-                {"matrix": [7, 5], "x": 12.25, "y": 0},
-                {"matrix": [8, 5], "x": 13.25, "y": 0},
-                {"matrix": [7, 6], "x": 14.25, "y": 0},
-                {"matrix": [8, 6], "x": 15.25, "y": 0},
-                {"matrix": [8, 7], "x": 16.25, "y": 0},
-
-                {"matrix": [1, 0], "x": 0.25, "y": 1},
-
-                {"matrix": [6, 0], "x": 1.5, "y": 1, "w": 1.5},
-                {"matrix": [0, 1], "x": 3, "y": 1},
-                {"matrix": [6, 1], "x": 4, "y": 1},
-                {"matrix": [0, 2], "x": 5, "y": 1},
-                {"matrix": [6, 2], "x": 6, "y": 1},
-                {"matrix": [0, 3], "x": 7, "y": 1},
-
-                {"matrix": [7, 3], "x": 9, "y": 1},
-                {"matrix": [1, 4], "x": 10, "y": 1},
-                {"matrix": [6, 4], "x": 11, "y": 1},
-                {"matrix": [0, 5], "x": 12, "y": 1},
-                {"matrix": [6, 5], "x": 13, "y": 1},
-                {"matrix": [0, 6], "x": 14, "y": 1},
-                {"matrix": [6, 6], "x": 15, "y": 1},
-                {"matrix": [0, 7], "x": 16, "y": 1, "w": 1.5},
-
-                {"matrix": [2, 0], "x": 0, "y": 2},
-
-                {"matrix": [5, 0], "x": 1.25, "y": 2, "w": 1.75},
-                {"matrix": [1, 1], "x": 3, "y": 2},
-                {"matrix": [5, 1], "x": 4, "y": 2},
-                {"matrix": [1, 2], "x": 5, "y": 2},
-                {"matrix": [5, 2], "x": 6, "y": 2},
-                {"matrix": [1, 3], "x": 7, "y": 2},
-
-                {"matrix": [6, 3], "x": 9.5, "y": 2},
-                {"matrix": [2, 4], "x": 10.5, "y": 2},
-                {"matrix": [5, 4], "x": 11.5, "y": 2},
-                {"matrix": [1, 5], "x": 12.5, "y": 2},
-                {"matrix": [5, 5], "x": 13.5, "y": 2},
-                {"matrix": [1, 6], "x": 14.5, "y": 2},
-                {"matrix": [5, 6], "x": 15.5, "y": 2, "w": 2.25},
-
-                {"matrix": [4, 0], "x": 1, "y": 3, "w": 2.25},
-                {"matrix": [2, 1], "x": 3.25, "y": 3},
-                {"matrix": [4, 1], "x": 4.25, "y": 3},
-                {"matrix": [2, 2], "x": 5.25, "y": 3},
-                {"matrix": [4, 2], "x": 6.25, "y": 3},
-                {"matrix": [2, 3], "x": 7.25, "y": 3},
-
-                {"matrix": [5, 3], "x": 9.25, "y": 3},
-                {"matrix": [3, 4], "x": 10.25, "y": 3},
-                {"matrix": [4, 4], "x": 11.25, "y": 3},
-                {"matrix": [2, 5], "x": 12.25, "y": 3},
-                {"matrix": [4, 5], "x": 13.25, "y": 3},
-                {"matrix": [2, 6], "x": 14.25, "y": 3},
-                {"matrix": [4, 6], "x": 15.25, "y": 3, "w": 1.75},
-                {"matrix": [1, 7], "x": 17, "y": 3},
-
-                {"matrix": [3, 0], "x": 1, "y": 4, "w": 1.5},
-                {"matrix": [3, 1], "x": 3.5, "y": 4, "w": 1.5},
-                {"matrix": [3, 2], "x": 5, "y": 4, "w": 2.25},
-                {"matrix": [3, 3], "x": 7.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 3], "x": 9.25, "y": 4, "w": 2},
-                {"matrix": [3, 5], "x": 11.25, "y": 4, "w": 1.5},
-                {"matrix": [2, 7], "x": 16.25, "y": 4, "w": 1.5}
-            ]
-        },
-        "LAYOUT_alice": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0.5, "y": 0},
-
-                {"matrix": [7, 0], "x": 1.75, "y": 0},
-                {"matrix": [8, 0], "x": 2.75, "y": 0},
-                {"matrix": [7, 1], "x": 3.75, "y": 0},
-                {"matrix": [8, 1], "x": 4.75, "y": 0},
-                {"matrix": [7, 2], "x": 5.75, "y": 0},
-                {"matrix": [8, 2], "x": 6.75, "y": 0},
-                {"matrix": [8, 3], "x": 7.75, "y": 0},
-
-                {"matrix": [0, 4], "x": 9.25, "y": 0},
-                {"matrix": [7, 4], "x": 10.25, "y": 0},
-                {"matrix": [8, 4], "x": 11.25, "y": 0},
-                {"matrix": [7, 5], "x": 12.25, "y": 0},
-                {"matrix": [8, 5], "x": 13.25, "y": 0},
-                {"matrix": [7, 6], "x": 14.25, "y": 0},
-                {"matrix": [8, 6], "x": 15.25, "y": 0, "w": 2},
-
-                {"matrix": [1, 0], "x": 0.25, "y": 1},
-
-                {"matrix": [6, 0], "x": 1.5, "y": 1, "w": 1.5},
-                {"matrix": [0, 1], "x": 3, "y": 1},
-                {"matrix": [6, 1], "x": 4, "y": 1},
-                {"matrix": [0, 2], "x": 5, "y": 1},
-                {"matrix": [6, 2], "x": 6, "y": 1},
-                {"matrix": [0, 3], "x": 7, "y": 1},
-
-                {"matrix": [7, 3], "x": 9, "y": 1},
-                {"matrix": [1, 4], "x": 10, "y": 1},
-                {"matrix": [6, 4], "x": 11, "y": 1},
-                {"matrix": [0, 5], "x": 12, "y": 1},
-                {"matrix": [6, 5], "x": 13, "y": 1},
-                {"matrix": [0, 6], "x": 14, "y": 1},
-                {"matrix": [6, 6], "x": 15, "y": 1},
-                {"matrix": [0, 7], "x": 16, "y": 1, "w": 1.5},
-
-                {"matrix": [2, 0], "x": 0, "y": 2},
-
-                {"matrix": [5, 0], "x": 1.25, "y": 2, "w": 1.75},
-                {"matrix": [1, 1], "x": 3, "y": 2},
-                {"matrix": [5, 1], "x": 4, "y": 2},
-                {"matrix": [1, 2], "x": 5, "y": 2},
-                {"matrix": [5, 2], "x": 6, "y": 2},
-                {"matrix": [1, 3], "x": 7, "y": 2},
-
-                {"matrix": [6, 3], "x": 9.5, "y": 2},
-                {"matrix": [2, 4], "x": 10.5, "y": 2},
-                {"matrix": [5, 4], "x": 11.5, "y": 2},
-                {"matrix": [1, 5], "x": 12.5, "y": 2},
-                {"matrix": [5, 5], "x": 13.5, "y": 2},
-                {"matrix": [1, 6], "x": 14.5, "y": 2},
-                {"matrix": [5, 6], "x": 15.5, "y": 2, "w": 2.25},
-
-                {"matrix": [4, 0], "x": 1, "y": 3, "w": 2.25},
-                {"matrix": [2, 1], "x": 3.25, "y": 3},
-                {"matrix": [4, 1], "x": 4.25, "y": 3},
-                {"matrix": [2, 2], "x": 5.25, "y": 3},
-                {"matrix": [4, 2], "x": 6.25, "y": 3},
-                {"matrix": [2, 3], "x": 7.25, "y": 3},
-
-                {"matrix": [5, 3], "x": 9.25, "y": 3},
-                {"matrix": [3, 4], "x": 10.25, "y": 3},
-                {"matrix": [4, 4], "x": 11.25, "y": 3},
-                {"matrix": [2, 5], "x": 12.25, "y": 3},
-                {"matrix": [4, 5], "x": 13.25, "y": 3},
-                {"matrix": [2, 6], "x": 14.25, "y": 3},
-                {"matrix": [4, 6], "x": 15.25, "y": 3, "w": 1.75},
-                {"matrix": [1, 7], "x": 17, "y": 3},
-
-                {"matrix": [3, 0], "x": 1, "y": 4, "w": 1.5},
-                {"matrix": [3, 1], "x": 3.5, "y": 4, "w": 1.5},
-                {"matrix": [3, 2], "x": 5, "y": 4, "w": 2.25},
-                {"matrix": [3, 3], "x": 7.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 3], "x": 9.25, "y": 4, "w": 2},
-                {"matrix": [3, 5], "x": 11.25, "y": 4, "w": 1.5},
-                {"matrix": [2, 7], "x": 16.25, "y": 4, "w": 1.5}
-            ]
-        }
-    }
-}
diff --git a/keyboards/handwired/owlet60/keyboard.json b/keyboards/handwired/owlet60/keyboard.json
new file mode 100644
index 00000000000..8108f51985d
--- /dev/null
+++ b/keyboards/handwired/owlet60/keyboard.json
@@ -0,0 +1,384 @@
+{
+    "keyboard_name": "Owlet60",
+    "manufacturer": "worthlessowl",
+    "url": "https://github.com/qmk/qmk_firmware/tree/master/keyboards/handwired/owlet60/",
+    "maintainer": "worthlessowl",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0xDA19",
+        "device_version": "0.0.1"
+    },
+    "ws2812": {
+        "pin": "D0"
+    },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 8,
+        "max_brightness": 128,
+        "sleep": true,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": true,
+            "twinkle": true
+        }
+    },
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
+    "features": {
+        "bootmagic": false,
+        "mousekey": false,
+        "extrakey": true,
+        "nkro": true,
+        "rgblight": true
+    },
+    "debounce": 9,
+    "community_layouts": ["alice", "alice_split_bs"],
+    "layout_aliases": {
+        "LAYOUT_owlet60_60_percent_full_bsp": "LAYOUT_alice",
+        "LAYOUT_owlet60_60_percent_split_bsp": "LAYOUT_alice_split_bs"
+    },
+    "layouts": {
+        "LAYOUT_owlet60_full_bsp": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0.5, "y": 0},
+
+                {"matrix": [7, 0], "x": 1.75, "y": 0},
+                {"matrix": [8, 0], "x": 2.75, "y": 0},
+                {"matrix": [7, 1], "x": 3.75, "y": 0},
+                {"matrix": [8, 1], "x": 4.75, "y": 0},
+                {"matrix": [7, 2], "x": 5.75, "y": 0},
+                {"matrix": [8, 2], "x": 6.75, "y": 0},
+                {"matrix": [8, 3], "x": 7.75, "y": 0},
+
+                {"matrix": [0, 4], "x": 9.25, "y": 0},
+                {"matrix": [7, 4], "x": 10.25, "y": 0},
+                {"matrix": [8, 4], "x": 11.25, "y": 0},
+                {"matrix": [7, 5], "x": 12.25, "y": 0},
+                {"matrix": [8, 5], "x": 13.25, "y": 0},
+                {"matrix": [7, 6], "x": 14.25, "y": 0},
+                {"matrix": [8, 6], "x": 15.25, "y": 0, "w": 2},
+                {"matrix": [7, 7], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0.25, "y": 1},
+
+                {"matrix": [6, 0], "x": 1.5, "y": 1, "w": 1.5},
+                {"matrix": [0, 1], "x": 3, "y": 1},
+                {"matrix": [6, 1], "x": 4, "y": 1},
+                {"matrix": [0, 2], "x": 5, "y": 1},
+                {"matrix": [6, 2], "x": 6, "y": 1},
+                {"matrix": [0, 3], "x": 7, "y": 1},
+
+                {"matrix": [7, 3], "x": 9, "y": 1},
+                {"matrix": [1, 4], "x": 10, "y": 1},
+                {"matrix": [6, 4], "x": 11, "y": 1},
+                {"matrix": [0, 5], "x": 12, "y": 1},
+                {"matrix": [6, 5], "x": 13, "y": 1},
+                {"matrix": [0, 6], "x": 14, "y": 1},
+                {"matrix": [6, 6], "x": 15, "y": 1},
+                {"matrix": [0, 7], "x": 16, "y": 1, "w": 1.5},
+                {"matrix": [6, 7], "x": 17.5, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+
+                {"matrix": [5, 0], "x": 1.25, "y": 2, "w": 1.75},
+                {"matrix": [1, 1], "x": 3, "y": 2},
+                {"matrix": [5, 1], "x": 4, "y": 2},
+                {"matrix": [1, 2], "x": 5, "y": 2},
+                {"matrix": [5, 2], "x": 6, "y": 2},
+                {"matrix": [1, 3], "x": 7, "y": 2},
+
+                {"matrix": [6, 3], "x": 9.5, "y": 2},
+                {"matrix": [2, 4], "x": 10.5, "y": 2},
+                {"matrix": [5, 4], "x": 11.5, "y": 2},
+                {"matrix": [1, 5], "x": 12.5, "y": 2},
+                {"matrix": [5, 5], "x": 13.5, "y": 2},
+                {"matrix": [1, 6], "x": 14.5, "y": 2},
+                {"matrix": [5, 6], "x": 15.5, "y": 2, "w": 2.25},
+                {"matrix": [5, 7], "x": 17.75, "y": 2},
+
+                {"matrix": [4, 0], "x": 1, "y": 3, "w": 2.25},
+                {"matrix": [2, 1], "x": 3.25, "y": 3},
+                {"matrix": [4, 1], "x": 4.25, "y": 3},
+                {"matrix": [2, 2], "x": 5.25, "y": 3},
+                {"matrix": [4, 2], "x": 6.25, "y": 3},
+                {"matrix": [2, 3], "x": 7.25, "y": 3},
+
+                {"matrix": [5, 3], "x": 9.25, "y": 3},
+                {"matrix": [3, 4], "x": 10.25, "y": 3},
+                {"matrix": [4, 4], "x": 11.25, "y": 3},
+                {"matrix": [2, 5], "x": 12.25, "y": 3},
+                {"matrix": [4, 5], "x": 13.25, "y": 3},
+                {"matrix": [2, 6], "x": 14.25, "y": 3},
+                {"matrix": [4, 6], "x": 15.25, "y": 3, "w": 1.75},
+                {"matrix": [1, 7], "x": 17, "y": 3},
+                {"matrix": [4, 7], "x": 18, "y": 3},
+
+                {"matrix": [3, 0], "x": 1, "y": 4, "w": 1.5},
+                {"matrix": [3, 1], "x": 3.5, "y": 4, "w": 1.5},
+                {"matrix": [3, 2], "x": 5, "y": 4, "w": 2.25},
+                {"matrix": [3, 3], "x": 7.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 9.25, "y": 4, "w": 2},
+                {"matrix": [3, 5], "x": 11.25, "y": 4, "w": 1.5},
+                {"matrix": [3, 6], "x": 16, "y": 4},
+                {"matrix": [2, 7], "x": 17, "y": 4},
+                {"matrix": [3, 7], "x": 18, "y": 4}
+            ]
+        },
+        "LAYOUT_owlet60_split_bsp": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0.5, "y": 0},
+
+                {"matrix": [7, 0], "x": 1.75, "y": 0},
+                {"matrix": [8, 0], "x": 2.75, "y": 0},
+                {"matrix": [7, 1], "x": 3.75, "y": 0},
+                {"matrix": [8, 1], "x": 4.75, "y": 0},
+                {"matrix": [7, 2], "x": 5.75, "y": 0},
+                {"matrix": [8, 2], "x": 6.75, "y": 0},
+                {"matrix": [8, 3], "x": 7.75, "y": 0},
+
+                {"matrix": [0, 4], "x": 9.25, "y": 0},
+                {"matrix": [7, 4], "x": 10.25, "y": 0},
+                {"matrix": [8, 4], "x": 11.25, "y": 0},
+                {"matrix": [7, 5], "x": 12.25, "y": 0},
+                {"matrix": [8, 5], "x": 13.25, "y": 0},
+                {"matrix": [7, 6], "x": 14.25, "y": 0},
+                {"matrix": [8, 6], "x": 15.25, "y": 0},
+                {"matrix": [8, 7], "x": 16.25, "y": 0},
+                {"matrix": [7, 7], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0.25, "y": 1},
+
+                {"matrix": [6, 0], "x": 1.5, "y": 1, "w": 1.5},
+                {"matrix": [0, 1], "x": 3, "y": 1},
+                {"matrix": [6, 1], "x": 4, "y": 1},
+                {"matrix": [0, 2], "x": 5, "y": 1},
+                {"matrix": [6, 2], "x": 6, "y": 1},
+                {"matrix": [0, 3], "x": 7, "y": 1},
+
+                {"matrix": [7, 3], "x": 9, "y": 1},
+                {"matrix": [1, 4], "x": 10, "y": 1},
+                {"matrix": [6, 4], "x": 11, "y": 1},
+                {"matrix": [0, 5], "x": 12, "y": 1},
+                {"matrix": [6, 5], "x": 13, "y": 1},
+                {"matrix": [0, 6], "x": 14, "y": 1},
+                {"matrix": [6, 6], "x": 15, "y": 1},
+                {"matrix": [0, 7], "x": 16, "y": 1, "w": 1.5},
+                {"matrix": [6, 7], "x": 17.5, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+
+                {"matrix": [5, 0], "x": 1.25, "y": 2, "w": 1.75},
+                {"matrix": [1, 1], "x": 3, "y": 2},
+                {"matrix": [5, 1], "x": 4, "y": 2},
+                {"matrix": [1, 2], "x": 5, "y": 2},
+                {"matrix": [5, 2], "x": 6, "y": 2},
+                {"matrix": [1, 3], "x": 7, "y": 2},
+
+                {"matrix": [6, 3], "x": 9.5, "y": 2},
+                {"matrix": [2, 4], "x": 10.5, "y": 2},
+                {"matrix": [5, 4], "x": 11.5, "y": 2},
+                {"matrix": [1, 5], "x": 12.5, "y": 2},
+                {"matrix": [5, 5], "x": 13.5, "y": 2},
+                {"matrix": [1, 6], "x": 14.5, "y": 2},
+                {"matrix": [5, 6], "x": 15.5, "y": 2, "w": 2.25},
+                {"matrix": [5, 7], "x": 17.75, "y": 2},
+
+                {"matrix": [4, 0], "x": 1, "y": 3, "w": 2.25},
+                {"matrix": [2, 1], "x": 3.25, "y": 3},
+                {"matrix": [4, 1], "x": 4.25, "y": 3},
+                {"matrix": [2, 2], "x": 5.25, "y": 3},
+                {"matrix": [4, 2], "x": 6.25, "y": 3},
+                {"matrix": [2, 3], "x": 7.25, "y": 3},
+
+                {"matrix": [5, 3], "x": 9.25, "y": 3},
+                {"matrix": [3, 4], "x": 10.25, "y": 3},
+                {"matrix": [4, 4], "x": 11.25, "y": 3},
+                {"matrix": [2, 5], "x": 12.25, "y": 3},
+                {"matrix": [4, 5], "x": 13.25, "y": 3},
+                {"matrix": [2, 6], "x": 14.25, "y": 3},
+                {"matrix": [4, 6], "x": 15.25, "y": 3, "w": 1.75},
+                {"matrix": [1, 7], "x": 17, "y": 3},
+                {"matrix": [4, 7], "x": 18, "y": 3},
+
+                {"matrix": [3, 0], "x": 1, "y": 4, "w": 1.5},
+                {"matrix": [3, 1], "x": 3.5, "y": 4, "w": 1.5},
+                {"matrix": [3, 2], "x": 5, "y": 4, "w": 2.25},
+                {"matrix": [3, 3], "x": 7.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 9.25, "y": 4, "w": 2},
+                {"matrix": [3, 5], "x": 11.25, "y": 4, "w": 1.5},
+                {"matrix": [3, 6], "x": 16, "y": 4},
+                {"matrix": [2, 7], "x": 17, "y": 4},
+                {"matrix": [3, 7], "x": 18, "y": 4}
+            ]
+        },
+        "LAYOUT_alice_split_bs": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0.5, "y": 0},
+
+                {"matrix": [7, 0], "x": 1.75, "y": 0},
+                {"matrix": [8, 0], "x": 2.75, "y": 0},
+                {"matrix": [7, 1], "x": 3.75, "y": 0},
+                {"matrix": [8, 1], "x": 4.75, "y": 0},
+                {"matrix": [7, 2], "x": 5.75, "y": 0},
+                {"matrix": [8, 2], "x": 6.75, "y": 0},
+                {"matrix": [8, 3], "x": 7.75, "y": 0},
+
+                {"matrix": [0, 4], "x": 9.25, "y": 0},
+                {"matrix": [7, 4], "x": 10.25, "y": 0},
+                {"matrix": [8, 4], "x": 11.25, "y": 0},
+                {"matrix": [7, 5], "x": 12.25, "y": 0},
+                {"matrix": [8, 5], "x": 13.25, "y": 0},
+                {"matrix": [7, 6], "x": 14.25, "y": 0},
+                {"matrix": [8, 6], "x": 15.25, "y": 0},
+                {"matrix": [8, 7], "x": 16.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0.25, "y": 1},
+
+                {"matrix": [6, 0], "x": 1.5, "y": 1, "w": 1.5},
+                {"matrix": [0, 1], "x": 3, "y": 1},
+                {"matrix": [6, 1], "x": 4, "y": 1},
+                {"matrix": [0, 2], "x": 5, "y": 1},
+                {"matrix": [6, 2], "x": 6, "y": 1},
+                {"matrix": [0, 3], "x": 7, "y": 1},
+
+                {"matrix": [7, 3], "x": 9, "y": 1},
+                {"matrix": [1, 4], "x": 10, "y": 1},
+                {"matrix": [6, 4], "x": 11, "y": 1},
+                {"matrix": [0, 5], "x": 12, "y": 1},
+                {"matrix": [6, 5], "x": 13, "y": 1},
+                {"matrix": [0, 6], "x": 14, "y": 1},
+                {"matrix": [6, 6], "x": 15, "y": 1},
+                {"matrix": [0, 7], "x": 16, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+
+                {"matrix": [5, 0], "x": 1.25, "y": 2, "w": 1.75},
+                {"matrix": [1, 1], "x": 3, "y": 2},
+                {"matrix": [5, 1], "x": 4, "y": 2},
+                {"matrix": [1, 2], "x": 5, "y": 2},
+                {"matrix": [5, 2], "x": 6, "y": 2},
+                {"matrix": [1, 3], "x": 7, "y": 2},
+
+                {"matrix": [6, 3], "x": 9.5, "y": 2},
+                {"matrix": [2, 4], "x": 10.5, "y": 2},
+                {"matrix": [5, 4], "x": 11.5, "y": 2},
+                {"matrix": [1, 5], "x": 12.5, "y": 2},
+                {"matrix": [5, 5], "x": 13.5, "y": 2},
+                {"matrix": [1, 6], "x": 14.5, "y": 2},
+                {"matrix": [5, 6], "x": 15.5, "y": 2, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 1, "y": 3, "w": 2.25},
+                {"matrix": [2, 1], "x": 3.25, "y": 3},
+                {"matrix": [4, 1], "x": 4.25, "y": 3},
+                {"matrix": [2, 2], "x": 5.25, "y": 3},
+                {"matrix": [4, 2], "x": 6.25, "y": 3},
+                {"matrix": [2, 3], "x": 7.25, "y": 3},
+
+                {"matrix": [5, 3], "x": 9.25, "y": 3},
+                {"matrix": [3, 4], "x": 10.25, "y": 3},
+                {"matrix": [4, 4], "x": 11.25, "y": 3},
+                {"matrix": [2, 5], "x": 12.25, "y": 3},
+                {"matrix": [4, 5], "x": 13.25, "y": 3},
+                {"matrix": [2, 6], "x": 14.25, "y": 3},
+                {"matrix": [4, 6], "x": 15.25, "y": 3, "w": 1.75},
+                {"matrix": [1, 7], "x": 17, "y": 3},
+
+                {"matrix": [3, 0], "x": 1, "y": 4, "w": 1.5},
+                {"matrix": [3, 1], "x": 3.5, "y": 4, "w": 1.5},
+                {"matrix": [3, 2], "x": 5, "y": 4, "w": 2.25},
+                {"matrix": [3, 3], "x": 7.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 9.25, "y": 4, "w": 2},
+                {"matrix": [3, 5], "x": 11.25, "y": 4, "w": 1.5},
+                {"matrix": [2, 7], "x": 16.25, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_alice": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0.5, "y": 0},
+
+                {"matrix": [7, 0], "x": 1.75, "y": 0},
+                {"matrix": [8, 0], "x": 2.75, "y": 0},
+                {"matrix": [7, 1], "x": 3.75, "y": 0},
+                {"matrix": [8, 1], "x": 4.75, "y": 0},
+                {"matrix": [7, 2], "x": 5.75, "y": 0},
+                {"matrix": [8, 2], "x": 6.75, "y": 0},
+                {"matrix": [8, 3], "x": 7.75, "y": 0},
+
+                {"matrix": [0, 4], "x": 9.25, "y": 0},
+                {"matrix": [7, 4], "x": 10.25, "y": 0},
+                {"matrix": [8, 4], "x": 11.25, "y": 0},
+                {"matrix": [7, 5], "x": 12.25, "y": 0},
+                {"matrix": [8, 5], "x": 13.25, "y": 0},
+                {"matrix": [7, 6], "x": 14.25, "y": 0},
+                {"matrix": [8, 6], "x": 15.25, "y": 0, "w": 2},
+
+                {"matrix": [1, 0], "x": 0.25, "y": 1},
+
+                {"matrix": [6, 0], "x": 1.5, "y": 1, "w": 1.5},
+                {"matrix": [0, 1], "x": 3, "y": 1},
+                {"matrix": [6, 1], "x": 4, "y": 1},
+                {"matrix": [0, 2], "x": 5, "y": 1},
+                {"matrix": [6, 2], "x": 6, "y": 1},
+                {"matrix": [0, 3], "x": 7, "y": 1},
+
+                {"matrix": [7, 3], "x": 9, "y": 1},
+                {"matrix": [1, 4], "x": 10, "y": 1},
+                {"matrix": [6, 4], "x": 11, "y": 1},
+                {"matrix": [0, 5], "x": 12, "y": 1},
+                {"matrix": [6, 5], "x": 13, "y": 1},
+                {"matrix": [0, 6], "x": 14, "y": 1},
+                {"matrix": [6, 6], "x": 15, "y": 1},
+                {"matrix": [0, 7], "x": 16, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+
+                {"matrix": [5, 0], "x": 1.25, "y": 2, "w": 1.75},
+                {"matrix": [1, 1], "x": 3, "y": 2},
+                {"matrix": [5, 1], "x": 4, "y": 2},
+                {"matrix": [1, 2], "x": 5, "y": 2},
+                {"matrix": [5, 2], "x": 6, "y": 2},
+                {"matrix": [1, 3], "x": 7, "y": 2},
+
+                {"matrix": [6, 3], "x": 9.5, "y": 2},
+                {"matrix": [2, 4], "x": 10.5, "y": 2},
+                {"matrix": [5, 4], "x": 11.5, "y": 2},
+                {"matrix": [1, 5], "x": 12.5, "y": 2},
+                {"matrix": [5, 5], "x": 13.5, "y": 2},
+                {"matrix": [1, 6], "x": 14.5, "y": 2},
+                {"matrix": [5, 6], "x": 15.5, "y": 2, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 1, "y": 3, "w": 2.25},
+                {"matrix": [2, 1], "x": 3.25, "y": 3},
+                {"matrix": [4, 1], "x": 4.25, "y": 3},
+                {"matrix": [2, 2], "x": 5.25, "y": 3},
+                {"matrix": [4, 2], "x": 6.25, "y": 3},
+                {"matrix": [2, 3], "x": 7.25, "y": 3},
+
+                {"matrix": [5, 3], "x": 9.25, "y": 3},
+                {"matrix": [3, 4], "x": 10.25, "y": 3},
+                {"matrix": [4, 4], "x": 11.25, "y": 3},
+                {"matrix": [2, 5], "x": 12.25, "y": 3},
+                {"matrix": [4, 5], "x": 13.25, "y": 3},
+                {"matrix": [2, 6], "x": 14.25, "y": 3},
+                {"matrix": [4, 6], "x": 15.25, "y": 3, "w": 1.75},
+                {"matrix": [1, 7], "x": 17, "y": 3},
+
+                {"matrix": [3, 0], "x": 1, "y": 4, "w": 1.5},
+                {"matrix": [3, 1], "x": 3.5, "y": 4, "w": 1.5},
+                {"matrix": [3, 2], "x": 5, "y": 4, "w": 2.25},
+                {"matrix": [3, 3], "x": 7.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 9.25, "y": 4, "w": 2},
+                {"matrix": [3, 5], "x": 11.25, "y": 4, "w": 1.5},
+                {"matrix": [2, 7], "x": 16.25, "y": 4, "w": 1.5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/handwired/owlet60/rules.mk b/keyboards/handwired/owlet60/rules.mk
index dd125034f29..09c02c88b0d 100644
--- a/keyboards/handwired/owlet60/rules.mk
+++ b/keyboards/handwired/owlet60/rules.mk
@@ -1,16 +1,3 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no	        # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
 CUSTOM_MATRIX = yes
-OLED_ENABLE = no
 
 SRC += matrix.c
diff --git a/keyboards/handwired/pill60/blackpill_f401/info.json b/keyboards/handwired/pill60/blackpill_f401/info.json
deleted file mode 100644
index 8d85a2e9300..00000000000
--- a/keyboards/handwired/pill60/blackpill_f401/info.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-    "matrix_pins": {
-        "cols": ["A8", "B2", "B1", "B15", "A10", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0"],
-        "rows": ["B4", "B3", "A15", "B13", "B5"]
-    },
-    "diode_direction": "COL2ROW",
-    "processor": "STM32F401",
-    "bootloader": "stm32-dfu",
-    "board": "BLACKPILL_STM32_F401"
-}
diff --git a/keyboards/handwired/pill60/blackpill_f401/keyboard.json b/keyboards/handwired/pill60/blackpill_f401/keyboard.json
new file mode 100644
index 00000000000..f43fd45a855
--- /dev/null
+++ b/keyboards/handwired/pill60/blackpill_f401/keyboard.json
@@ -0,0 +1,13 @@
+{
+    "usb": {
+        "shared_endpoint": {
+            "keyboard": true
+        }
+    },
+    "matrix_pins": {
+        "cols": ["A8", "B2", "B1", "B15", "A10", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0"],
+        "rows": ["B4", "B3", "A15", "B13", "B5"]
+    },
+    "diode_direction": "COL2ROW",
+    "development_board": "blackpill_f401"
+}
diff --git a/keyboards/handwired/pill60/blackpill_f401/rules.mk b/keyboards/handwired/pill60/blackpill_f401/rules.mk
deleted file mode 100644
index 3d2bfceea99..00000000000
--- a/keyboards/handwired/pill60/blackpill_f401/rules.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-KEYBOARD_SHARED_EP       = yes
diff --git a/keyboards/handwired/pill60/blackpill_f411/info.json b/keyboards/handwired/pill60/blackpill_f411/info.json
deleted file mode 100644
index 4e0935f79ce..00000000000
--- a/keyboards/handwired/pill60/blackpill_f411/info.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-    "matrix_pins": {
-        "cols": ["A8", "B2", "B1", "B15", "A10", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0"],
-        "rows": ["B4", "B3", "A15", "B13", "B5"]
-    },
-    "diode_direction": "COL2ROW",
-    "processor": "STM32F411",
-    "bootloader": "stm32-dfu",
-    "board": "BLACKPILL_STM32_F411"
-}
diff --git a/keyboards/handwired/pill60/blackpill_f411/keyboard.json b/keyboards/handwired/pill60/blackpill_f411/keyboard.json
new file mode 100644
index 00000000000..4d47a6b4349
--- /dev/null
+++ b/keyboards/handwired/pill60/blackpill_f411/keyboard.json
@@ -0,0 +1,13 @@
+{
+    "usb": {
+        "shared_endpoint": {
+            "keyboard": true
+        }
+    },
+    "matrix_pins": {
+        "cols": ["A8", "B2", "B1", "B15", "A10", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0"],
+        "rows": ["B4", "B3", "A15", "B13", "B5"]
+    },
+    "diode_direction": "COL2ROW",
+    "development_board": "blackpill_f411"
+}
diff --git a/keyboards/handwired/pill60/blackpill_f411/rules.mk b/keyboards/handwired/pill60/blackpill_f411/rules.mk
deleted file mode 100644
index b5f27c93eab..00000000000
--- a/keyboards/handwired/pill60/blackpill_f411/rules.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-KEYBOARD_SHARED_EP = yes
diff --git a/keyboards/handwired/pill60/bluepill/keyboard.json b/keyboards/handwired/pill60/bluepill/keyboard.json
index 028b1d89d87..3c52f8ad2ba 100644
--- a/keyboards/handwired/pill60/bluepill/keyboard.json
+++ b/keyboards/handwired/pill60/bluepill/keyboard.json
@@ -4,6 +4,5 @@
         "rows": ["B4", "B3", "A15", "B13", "B5"]
     },
     "diode_direction": "COL2ROW",
-    "processor": "STM32F103",
-    "bootloader": "stm32duino"
+    "development_board": "bluepill"
 }
diff --git a/keyboards/handwired/postageboard/mini/info.json b/keyboards/handwired/postageboard/mini/info.json
deleted file mode 100644
index b6944f2916d..00000000000
--- a/keyboards/handwired/postageboard/mini/info.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-    "usb": {
-        "device_version": "0.0.2"
-    },
-    "matrix_pins": {
-        "cols": ["E6", "B3", "B7"],
-        "rows": ["D5"]
-    },
-    "diode_direction": "COL2ROW",
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu"
-}
diff --git a/keyboards/handwired/postageboard/mini/keyboard.json b/keyboards/handwired/postageboard/mini/keyboard.json
new file mode 100644
index 00000000000..13e83147bbd
--- /dev/null
+++ b/keyboards/handwired/postageboard/mini/keyboard.json
@@ -0,0 +1,19 @@
+{
+    "usb": {
+        "device_version": "0.0.2"
+    },
+    "matrix_pins": {
+        "cols": ["E6", "B3", "B7"],
+        "rows": ["D5"]
+    },
+    "diode_direction": "COL2ROW",
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "console": true,
+        "command": true
+    }
+}
diff --git a/keyboards/handwired/postageboard/mini/rules.mk b/keyboards/handwired/postageboard/mini/rules.mk
deleted file mode 100644
index 309e55c9f4c..00000000000
--- a/keyboards/handwired/postageboard/mini/rules.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = yes        # Console for debug
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
diff --git a/keyboards/handwired/postageboard/r1/info.json b/keyboards/handwired/postageboard/r1/info.json
deleted file mode 100644
index a1ea87df869..00000000000
--- a/keyboards/handwired/postageboard/r1/info.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-    "usb": {
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["B7", "C6", "C7"],
-        "rows": ["B6"]
-    },
-    "diode_direction": "COL2ROW",
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu"
-}
diff --git a/keyboards/handwired/postageboard/r1/keyboard.json b/keyboards/handwired/postageboard/r1/keyboard.json
new file mode 100644
index 00000000000..78ab5d028e0
--- /dev/null
+++ b/keyboards/handwired/postageboard/r1/keyboard.json
@@ -0,0 +1,19 @@
+{
+    "usb": {
+        "device_version": "0.0.1"
+    },
+    "matrix_pins": {
+        "cols": ["B7", "C6", "C7"],
+        "rows": ["B6"]
+    },
+    "diode_direction": "COL2ROW",
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "console": true,
+        "command": true
+    }
+}
diff --git a/keyboards/handwired/postageboard/r1/rules.mk b/keyboards/handwired/postageboard/r1/rules.mk
deleted file mode 100644
index 309e55c9f4c..00000000000
--- a/keyboards/handwired/postageboard/r1/rules.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = yes        # Console for debug
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
diff --git a/keyboards/handwired/prkl30/feather/info.json b/keyboards/handwired/prkl30/feather/info.json
deleted file mode 100644
index a89fe9ec57f..00000000000
--- a/keyboards/handwired/prkl30/feather/info.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "rgblight": {
-        "saturation_steps": 8,
-        "brightness_steps": 8,
-        "led_count": 13,
-        "animations": {
-            "breathing": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "snake": true,
-            "knight": true,
-            "christmas": true,
-            "static_gradient": true,
-            "rgb_test": true,
-            "alternating": true,
-            "twinkle": true
-        }
-    },
-    "ws2812": {
-        "pin": "D1"
-    },
-    "bluetooth": {
-        "driver": "bluefruit_le"
-    },
-    "matrix_pins": {
-        "cols": ["D3", "D1", "B7", "D6", "C7", "B6", "B5", "D7", "C6", "D0"],
-        "rows": ["F4", "F1", "F0", "D2"]
-    },
-    "diode_direction": "COL2ROW",
-    "encoder": {
-        "rotary": [
-            {"pin_a": "F7", "pin_b": "F6"}
-        ]
-    }
-}
diff --git a/keyboards/handwired/prkl30/feather/keyboard.json b/keyboards/handwired/prkl30/feather/keyboard.json
new file mode 100644
index 00000000000..721107e0646
--- /dev/null
+++ b/keyboards/handwired/prkl30/feather/keyboard.json
@@ -0,0 +1,45 @@
+{
+    "features": {
+        "bluetooth": true,
+        "bootmagic": true,
+        "command": true,
+        "console": true,
+        "encoder": true,
+        "extrakey": false,
+        "mousekey": false,
+        "nkro": true
+    },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 13,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": true,
+            "twinkle": true
+        }
+    },
+    "ws2812": {
+        "pin": "D1"
+    },
+    "bluetooth": {
+        "driver": "bluefruit_le"
+    },
+    "matrix_pins": {
+        "cols": ["D3", "D1", "B7", "D6", "C7", "B6", "B5", "D7", "C6", "D0"],
+        "rows": ["F4", "F1", "F0", "D2"]
+    },
+    "diode_direction": "COL2ROW",
+    "encoder": {
+        "rotary": [
+            {"pin_a": "F7", "pin_b": "F6"}
+        ]
+    }
+}
diff --git a/keyboards/handwired/prkl30/feather/rules.mk b/keyboards/handwired/prkl30/feather/rules.mk
index aaab95b9e04..3437a35bdf1 100644
--- a/keyboards/handwired/prkl30/feather/rules.mk
+++ b/keyboards/handwired/prkl30/feather/rules.mk
@@ -1,18 +1,2 @@
 # Processor frequency
 F_CPU = 8000000
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-ENCODER_ENABLE = yes
-MOUSEKEY_ENABLE  = no       # Mouse keys
-EXTRAKEY_ENABLE  = no       # Audio control and System control
-CONSOLE_ENABLE  = yes       # Console for debug
-COMMAND_ENABLE  = yes       # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE  = no
-AUDIO_ENABLE  = no          # This can be enabled if a speaker is connected to the expansion port. Not compatible with RGBLIGHT below
-RGBLIGHT_ENABLE  = no       # This can be enabled if a ws2812 strip is connected to the expansion port.
-
-BLUETOOTH_ENABLE = yes
diff --git a/keyboards/handwired/promethium/info.json b/keyboards/handwired/promethium/info.json
deleted file mode 100644
index c26325069b4..00000000000
--- a/keyboards/handwired/promethium/info.json
+++ /dev/null
@@ -1,84 +0,0 @@
-{
-  "keyboard_name": "Promethium",
-  "manufacturer": "Priyadi",
-  "url": "",
-  "maintainer": "qmk",
-  "usb": {
-    "vid": "0x17EF",
-    "pid": "0x6048",
-    "device_version": "0.0.1"
-  },
-  "ws2812": {
-    "pin": "B5"
-  },
-  "bluetooth": {
-    "driver": "bluefruit_le"
-  },
-  "processor": "atmega32u4",
-  "bootloader": "caterina",
-  "layouts": {
-    "LAYOUT": {
-      "layout": [
-        {"matrix": [0, 0], "x": 0, "y": 0.5},
-        {"matrix": [0, 1], "x": 1, "y": 0.3},
-        {"matrix": [0, 2], "x": 2, "y": 0.15},
-        {"matrix": [0, 3], "x": 3, "y": 0},
-        {"matrix": [0, 4], "x": 4, "y": 0.15},
-        {"matrix": [0, 5], "x": 5, "y": 0.15},
-
-        {"matrix": [4, 0], "x": 10, "y": 0.15},
-        {"matrix": [4, 1], "x": 11, "y": 0.15},
-        {"matrix": [4, 2], "x": 12, "y": 0},
-        {"matrix": [4, 3], "x": 13, "y": 0.15},
-        {"matrix": [4, 4], "x": 14, "y": 0.3},
-        {"matrix": [4, 5], "x": 15, "y": 0.5},
-
-        {"matrix": [1, 0], "x": 0, "y": 1.5},
-        {"matrix": [1, 1], "x": 1, "y": 1.3},
-        {"matrix": [1, 2], "x": 2, "y": 1.15},
-        {"matrix": [1, 3], "x": 3, "y": 1},
-        {"matrix": [1, 4], "x": 4, "y": 1.15},
-        {"matrix": [1, 5], "x": 5, "y": 1.15},
-
-        {"matrix": [5, 0], "x": 10, "y": 1.15},
-        {"matrix": [5, 1], "x": 11, "y": 1.15},
-        {"matrix": [5, 2], "x": 12, "y": 1},
-        {"matrix": [5, 3], "x": 13, "y": 1.15},
-        {"matrix": [5, 4], "x": 14, "y": 1.3},
-        {"matrix": [5, 5], "x": 15, "y": 1.5},
-
-        {"matrix": [2, 0], "x": 0, "y": 2.5},
-        {"matrix": [2, 1], "x": 1, "y": 2.3},
-        {"matrix": [2, 2], "x": 2, "y": 2.15},
-        {"matrix": [2, 3], "x": 3, "y": 2},
-        {"matrix": [2, 4], "x": 4, "y": 2.15},
-        {"matrix": [2, 5], "x": 5, "y": 2.15},
-
-        {"matrix": [6, 0], "x": 10, "y": 2.15},
-        {"matrix": [6, 1], "x": 11, "y": 2.15},
-        {"matrix": [6, 2], "x": 12, "y": 2},
-        {"matrix": [6, 3], "x": 13, "y": 2.15},
-        {"matrix": [6, 4], "x": 14, "y": 2.3},
-        {"matrix": [6, 5], "x": 15, "y": 2.5},
-
-        {"matrix": [3, 0], "x": 0, "y": 3.5},
-        {"matrix": [3, 1], "x": 1, "y": 3.3},
-        {"matrix": [3, 2], "x": 2, "y": 3.15},
-        {"matrix": [3, 3], "x": 3, "y": 3},
-        {"matrix": [3, 4], "x": 4, "y": 3.15},
-        {"matrix": [3, 5], "x": 5, "y": 3.15},
-
-        {"matrix": [7, 0], "x": 10, "y": 3.15},
-        {"matrix": [7, 1], "x": 11, "y": 3.15},
-        {"matrix": [7, 2], "x": 12, "y": 3},
-        {"matrix": [7, 3], "x": 13, "y": 3.15},
-        {"matrix": [7, 4], "x": 14, "y": 3.3},
-        {"matrix": [7, 5], "x": 15, "y": 3.5},
-
-        {"matrix": [8, 0], "x": 6.5, "y": 3.15},
-        {"matrix": [8, 1], "x": 7.5, "y": 3.15},
-        {"matrix": [8, 2], "x": 8.5, "y": 3.15}
-      ]
-    }
-  }
-}
diff --git a/keyboards/handwired/promethium/keyboard.json b/keyboards/handwired/promethium/keyboard.json
new file mode 100644
index 00000000000..6ee1ed8ca19
--- /dev/null
+++ b/keyboards/handwired/promethium/keyboard.json
@@ -0,0 +1,96 @@
+{
+  "keyboard_name": "Promethium",
+  "manufacturer": "Priyadi",
+  "url": "",
+  "maintainer": "qmk",
+  "usb": {
+    "vid": "0x17EF",
+    "pid": "0x6048",
+    "device_version": "0.0.1"
+  },
+  "ws2812": {
+    "pin": "B5"
+  },
+  "bluetooth": {
+    "driver": "bluefruit_le"
+  },
+  "processor": "atmega32u4",
+  "bootloader": "caterina",
+  "features": {
+    "bootmagic": false,
+    "mousekey": false,
+    "extrakey": true,
+    "nkro": true,
+    "ps2_mouse": true,
+    "ps2": true,
+    "bluetooth": true
+  },
+  "build": {
+    "lto": true
+  },
+  "layouts": {
+    "LAYOUT": {
+      "layout": [
+        {"matrix": [0, 0], "x": 0, "y": 0.5},
+        {"matrix": [0, 1], "x": 1, "y": 0.3},
+        {"matrix": [0, 2], "x": 2, "y": 0.15},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0.15},
+        {"matrix": [0, 5], "x": 5, "y": 0.15},
+
+        {"matrix": [4, 0], "x": 10, "y": 0.15},
+        {"matrix": [4, 1], "x": 11, "y": 0.15},
+        {"matrix": [4, 2], "x": 12, "y": 0},
+        {"matrix": [4, 3], "x": 13, "y": 0.15},
+        {"matrix": [4, 4], "x": 14, "y": 0.3},
+        {"matrix": [4, 5], "x": 15, "y": 0.5},
+
+        {"matrix": [1, 0], "x": 0, "y": 1.5},
+        {"matrix": [1, 1], "x": 1, "y": 1.3},
+        {"matrix": [1, 2], "x": 2, "y": 1.15},
+        {"matrix": [1, 3], "x": 3, "y": 1},
+        {"matrix": [1, 4], "x": 4, "y": 1.15},
+        {"matrix": [1, 5], "x": 5, "y": 1.15},
+
+        {"matrix": [5, 0], "x": 10, "y": 1.15},
+        {"matrix": [5, 1], "x": 11, "y": 1.15},
+        {"matrix": [5, 2], "x": 12, "y": 1},
+        {"matrix": [5, 3], "x": 13, "y": 1.15},
+        {"matrix": [5, 4], "x": 14, "y": 1.3},
+        {"matrix": [5, 5], "x": 15, "y": 1.5},
+
+        {"matrix": [2, 0], "x": 0, "y": 2.5},
+        {"matrix": [2, 1], "x": 1, "y": 2.3},
+        {"matrix": [2, 2], "x": 2, "y": 2.15},
+        {"matrix": [2, 3], "x": 3, "y": 2},
+        {"matrix": [2, 4], "x": 4, "y": 2.15},
+        {"matrix": [2, 5], "x": 5, "y": 2.15},
+
+        {"matrix": [6, 0], "x": 10, "y": 2.15},
+        {"matrix": [6, 1], "x": 11, "y": 2.15},
+        {"matrix": [6, 2], "x": 12, "y": 2},
+        {"matrix": [6, 3], "x": 13, "y": 2.15},
+        {"matrix": [6, 4], "x": 14, "y": 2.3},
+        {"matrix": [6, 5], "x": 15, "y": 2.5},
+
+        {"matrix": [3, 0], "x": 0, "y": 3.5},
+        {"matrix": [3, 1], "x": 1, "y": 3.3},
+        {"matrix": [3, 2], "x": 2, "y": 3.15},
+        {"matrix": [3, 3], "x": 3, "y": 3},
+        {"matrix": [3, 4], "x": 4, "y": 3.15},
+        {"matrix": [3, 5], "x": 5, "y": 3.15},
+
+        {"matrix": [7, 0], "x": 10, "y": 3.15},
+        {"matrix": [7, 1], "x": 11, "y": 3.15},
+        {"matrix": [7, 2], "x": 12, "y": 3},
+        {"matrix": [7, 3], "x": 13, "y": 3.15},
+        {"matrix": [7, 4], "x": 14, "y": 3.3},
+        {"matrix": [7, 5], "x": 15, "y": 3.5},
+
+        {"matrix": [8, 0], "x": 6.5, "y": 3.15},
+        {"matrix": [8, 1], "x": 7.5, "y": 3.15},
+        {"matrix": [8, 2], "x": 8.5, "y": 3.15}
+      ]
+    }
+  }
+}
diff --git a/keyboards/handwired/promethium/rules.mk b/keyboards/handwired/promethium/rules.mk
index d6b97ed8100..7f208800663 100644
--- a/keyboards/handwired/promethium/rules.mk
+++ b/keyboards/handwired/promethium/rules.mk
@@ -1,28 +1,11 @@
 # Processor frequency
 F_CPU = 8000000
 
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-AUDIO_ENABLE = no           # Audio output
-RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight.
-PS2_MOUSE_ENABLE = yes
-PS2_ENABLE = yes
 PS2_DRIVER = interrupt
 CUSTOM_MATRIX = yes
-BLUETOOTH_ENABLE = yes
 
 WS2812_DRIVER_REQUIRED = yes
 ANALOG_DRIVER_REQUIRED = yes
 
 SRC += rgbsps.c
 SRC += matrix.c
-
-LTO_ENABLE = yes
diff --git a/keyboards/handwired/pterodactyl/info.json b/keyboards/handwired/pterodactyl/info.json
deleted file mode 100644
index ad83f34999d..00000000000
--- a/keyboards/handwired/pterodactyl/info.json
+++ /dev/null
@@ -1,111 +0,0 @@
-{
-  "keyboard_name": "Pterodactyl",
-  "manufacturer": "myoung34",
-  "url": "https://marcyoung.us/post/pterodactyl/",
-  "maintainer": "Marcus Young",
-  "usb": {
-    "vid": "0xFEED",
-    "pid": "0x1308",
-    "device_version": "0.0.2"
-  },
-  "processor": "atmega32u4",
-  "bootloader": "caterina",
-  "debounce": 0,
-  "tapping": {
-    "toggle": 1
-  },
-  "bluetooth": {
-    "driver": "bluefruit_le"
-  },
-  "layouts": {
-    "LAYOUT_pterodactyl": {
-      "layout": [
-        {"matrix": [0, 11], "x": 0, "y": 0},
-        {"matrix": [0, 10], "x": 1, "y": 0},
-        {"matrix": [0, 9], "x": 2, "y": 0},
-        {"matrix": [0, 8], "x": 3, "y": 0},
-        {"matrix": [0, 7], "x": 4, "y": 0},
-        {"matrix": [0, 6], "x": 5, "y": 0},
-
-        {"matrix": [0, 5], "x": 11, "y": 0},
-        {"matrix": [0, 4], "x": 12, "y": 0},
-        {"matrix": [0, 3], "x": 13, "y": 0},
-        {"matrix": [0, 2], "x": 14, "y": 0},
-        {"matrix": [0, 1], "x": 15, "y": 0},
-        {"matrix": [0, 0], "x": 16, "y": 0},
-
-        {"matrix": [1, 11], "x": 0, "y": 1},
-        {"matrix": [1, 10], "x": 1, "y": 1},
-        {"matrix": [1, 9], "x": 2, "y": 1},
-        {"matrix": [1, 8], "x": 3, "y": 1},
-        {"matrix": [1, 7], "x": 4, "y": 1},
-        {"matrix": [1, 6], "x": 5, "y": 1},
-
-        {"matrix": [1, 5], "x": 11, "y": 1},
-        {"matrix": [1, 4], "x": 12, "y": 1},
-        {"matrix": [1, 3], "x": 13, "y": 1},
-        {"matrix": [1, 2], "x": 14, "y": 1},
-        {"matrix": [1, 1], "x": 15, "y": 1},
-        {"matrix": [1, 0], "x": 16, "y": 1},
-
-        {"matrix": [2, 11], "x": 0, "y": 2},
-        {"matrix": [2, 10], "x": 1, "y": 2},
-        {"matrix": [2, 9], "x": 2, "y": 2},
-        {"matrix": [2, 8], "x": 3, "y": 2},
-        {"matrix": [2, 7], "x": 4, "y": 2},
-        {"matrix": [2, 6], "x": 5, "y": 2},
-
-        {"matrix": [2, 5], "x": 11, "y": 2},
-        {"matrix": [2, 4], "x": 12, "y": 2},
-        {"matrix": [2, 3], "x": 13, "y": 2},
-        {"matrix": [2, 2], "x": 14, "y": 2},
-        {"matrix": [2, 1], "x": 15, "y": 2},
-        {"matrix": [2, 0], "x": 16, "y": 2},
-
-        {"matrix": [3, 11], "x": 0, "y": 3},
-        {"matrix": [3, 10], "x": 1, "y": 3},
-        {"matrix": [3, 9], "x": 2, "y": 3},
-        {"matrix": [3, 8], "x": 3, "y": 3},
-        {"matrix": [3, 7], "x": 4, "y": 3},
-        {"matrix": [3, 6], "x": 5, "y": 3},
-
-        {"matrix": [3, 5], "x": 11, "y": 3},
-        {"matrix": [3, 4], "x": 12, "y": 3},
-        {"matrix": [3, 3], "x": 13, "y": 3},
-        {"matrix": [3, 2], "x": 14, "y": 3},
-        {"matrix": [3, 1], "x": 15, "y": 3},
-        {"matrix": [3, 0], "x": 16, "y": 3},
-
-        {"matrix": [4, 11], "x": 0, "y": 4},
-        {"matrix": [4, 10], "x": 1, "y": 4},
-        {"matrix": [4, 9], "x": 2, "y": 4},
-        {"matrix": [4, 8], "x": 3, "y": 4},
-        {"matrix": [4, 7], "x": 4, "y": 4},
-
-        {"matrix": [4, 4], "x": 12, "y": 4},
-        {"matrix": [4, 3], "x": 13, "y": 4},
-        {"matrix": [4, 2], "x": 14, "y": 4},
-        {"matrix": [4, 1], "x": 15, "y": 4},
-        {"matrix": [4, 0], "x": 16, "y": 4},
-
-        {"matrix": [5, 11], "x": 6, "y": 5},
-        {"matrix": [5, 10], "x": 7, "y": 5},
-
-        {"matrix": [5, 1], "x": 9, "y": 5},
-        {"matrix": [5, 0], "x": 10, "y": 5},
-
-        {"matrix": [5, 9], "x": 7, "y": 6},
-
-        {"matrix": [5, 2], "x": 9, "y": 6},
-
-        {"matrix": [4, 6], "x": 5, "y": 6, "h": 2},
-        {"matrix": [5, 7], "x": 6, "y": 6, "h": 2},
-        {"matrix": [5, 8], "x": 7, "y": 7},
-
-        {"matrix": [5, 3], "x": 9, "y": 7},
-        {"matrix": [5, 4], "x": 10, "y": 6, "h": 2},
-        {"matrix": [4, 5], "x": 11, "y": 6, "h": 2}
-      ]
-    }
-  }
-}
diff --git a/keyboards/handwired/pterodactyl/keyboard.json b/keyboards/handwired/pterodactyl/keyboard.json
new file mode 100644
index 00000000000..fac20aeebe1
--- /dev/null
+++ b/keyboards/handwired/pterodactyl/keyboard.json
@@ -0,0 +1,120 @@
+{
+  "keyboard_name": "Pterodactyl",
+  "manufacturer": "myoung34",
+  "url": "https://marcyoung.us/post/pterodactyl/",
+  "maintainer": "Marcus Young",
+  "usb": {
+    "vid": "0xFEED",
+    "pid": "0x1308",
+    "device_version": "0.0.2"
+  },
+  "processor": "atmega32u4",
+  "bootloader": "caterina",
+  "features": {
+    "bootmagic": false,
+    "mousekey": false,
+    "extrakey": true,
+    "console": true,
+    "nkro": true,
+    "unicode": true,
+    "bluetooth": true
+  },
+  "debounce": 0,
+  "tapping": {
+    "toggle": 1
+  },
+  "bluetooth": {
+    "driver": "bluefruit_le"
+  },
+  "layouts": {
+    "LAYOUT_pterodactyl": {
+      "layout": [
+        {"matrix": [0, 11], "x": 0, "y": 0},
+        {"matrix": [0, 10], "x": 1, "y": 0},
+        {"matrix": [0, 9], "x": 2, "y": 0},
+        {"matrix": [0, 8], "x": 3, "y": 0},
+        {"matrix": [0, 7], "x": 4, "y": 0},
+        {"matrix": [0, 6], "x": 5, "y": 0},
+
+        {"matrix": [0, 5], "x": 11, "y": 0},
+        {"matrix": [0, 4], "x": 12, "y": 0},
+        {"matrix": [0, 3], "x": 13, "y": 0},
+        {"matrix": [0, 2], "x": 14, "y": 0},
+        {"matrix": [0, 1], "x": 15, "y": 0},
+        {"matrix": [0, 0], "x": 16, "y": 0},
+
+        {"matrix": [1, 11], "x": 0, "y": 1},
+        {"matrix": [1, 10], "x": 1, "y": 1},
+        {"matrix": [1, 9], "x": 2, "y": 1},
+        {"matrix": [1, 8], "x": 3, "y": 1},
+        {"matrix": [1, 7], "x": 4, "y": 1},
+        {"matrix": [1, 6], "x": 5, "y": 1},
+
+        {"matrix": [1, 5], "x": 11, "y": 1},
+        {"matrix": [1, 4], "x": 12, "y": 1},
+        {"matrix": [1, 3], "x": 13, "y": 1},
+        {"matrix": [1, 2], "x": 14, "y": 1},
+        {"matrix": [1, 1], "x": 15, "y": 1},
+        {"matrix": [1, 0], "x": 16, "y": 1},
+
+        {"matrix": [2, 11], "x": 0, "y": 2},
+        {"matrix": [2, 10], "x": 1, "y": 2},
+        {"matrix": [2, 9], "x": 2, "y": 2},
+        {"matrix": [2, 8], "x": 3, "y": 2},
+        {"matrix": [2, 7], "x": 4, "y": 2},
+        {"matrix": [2, 6], "x": 5, "y": 2},
+
+        {"matrix": [2, 5], "x": 11, "y": 2},
+        {"matrix": [2, 4], "x": 12, "y": 2},
+        {"matrix": [2, 3], "x": 13, "y": 2},
+        {"matrix": [2, 2], "x": 14, "y": 2},
+        {"matrix": [2, 1], "x": 15, "y": 2},
+        {"matrix": [2, 0], "x": 16, "y": 2},
+
+        {"matrix": [3, 11], "x": 0, "y": 3},
+        {"matrix": [3, 10], "x": 1, "y": 3},
+        {"matrix": [3, 9], "x": 2, "y": 3},
+        {"matrix": [3, 8], "x": 3, "y": 3},
+        {"matrix": [3, 7], "x": 4, "y": 3},
+        {"matrix": [3, 6], "x": 5, "y": 3},
+
+        {"matrix": [3, 5], "x": 11, "y": 3},
+        {"matrix": [3, 4], "x": 12, "y": 3},
+        {"matrix": [3, 3], "x": 13, "y": 3},
+        {"matrix": [3, 2], "x": 14, "y": 3},
+        {"matrix": [3, 1], "x": 15, "y": 3},
+        {"matrix": [3, 0], "x": 16, "y": 3},
+
+        {"matrix": [4, 11], "x": 0, "y": 4},
+        {"matrix": [4, 10], "x": 1, "y": 4},
+        {"matrix": [4, 9], "x": 2, "y": 4},
+        {"matrix": [4, 8], "x": 3, "y": 4},
+        {"matrix": [4, 7], "x": 4, "y": 4},
+
+        {"matrix": [4, 4], "x": 12, "y": 4},
+        {"matrix": [4, 3], "x": 13, "y": 4},
+        {"matrix": [4, 2], "x": 14, "y": 4},
+        {"matrix": [4, 1], "x": 15, "y": 4},
+        {"matrix": [4, 0], "x": 16, "y": 4},
+
+        {"matrix": [5, 11], "x": 6, "y": 5},
+        {"matrix": [5, 10], "x": 7, "y": 5},
+
+        {"matrix": [5, 1], "x": 9, "y": 5},
+        {"matrix": [5, 0], "x": 10, "y": 5},
+
+        {"matrix": [5, 9], "x": 7, "y": 6},
+
+        {"matrix": [5, 2], "x": 9, "y": 6},
+
+        {"matrix": [4, 6], "x": 5, "y": 6, "h": 2},
+        {"matrix": [5, 7], "x": 6, "y": 6, "h": 2},
+        {"matrix": [5, 8], "x": 7, "y": 7},
+
+        {"matrix": [5, 3], "x": 9, "y": 7},
+        {"matrix": [5, 4], "x": 10, "y": 6, "h": 2},
+        {"matrix": [4, 5], "x": 11, "y": 6, "h": 2}
+      ]
+    }
+  }
+}
diff --git a/keyboards/handwired/pterodactyl/rules.mk b/keyboards/handwired/pterodactyl/rules.mk
index 108e1498a83..e332a03eaac 100644
--- a/keyboards/handwired/pterodactyl/rules.mk
+++ b/keyboards/handwired/pterodactyl/rules.mk
@@ -1,21 +1,7 @@
 # Processor frequency
 F_CPU = 8000000
 
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = yes        # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-UNICODE_ENABLE = yes
 CUSTOM_MATRIX = yes
-BLUETOOTH_ENABLE = yes
 
 SRC += matrix.c
 I2C_DRIVER_REQUIRED = yes
diff --git a/keyboards/handwired/riblee_f401/info.json b/keyboards/handwired/riblee_f401/info.json
deleted file mode 100644
index 933973d5f39..00000000000
--- a/keyboards/handwired/riblee_f401/info.json
+++ /dev/null
@@ -1,97 +0,0 @@
-{
-    "keyboard_name": "Handwired F401",
-    "manufacturer": "Riblee",
-    "url": "",
-    "maintainer": "riblee",
-    "usb": {
-        "vid": "0xFEED",
-        "pid": "0x002A",
-        "device_version": "0.0.1"
-    },
-    "tapping": {
-        "term": 175
-    },
-    "matrix_pins": {
-        "cols": ["B10", "B1", "B0", "B15", "A8", "B3", "B4", "B5", "B6", "B7", "B8", "B9"],
-        "rows": ["A6", "A5", "A4", "A3", "A2"]
-    },
-    "diode_direction": "COL2ROW",
-    "backlight": {
-        "pin": "A0",
-        "levels": 5
-    },
-    "processor": "STM32F401",
-    "bootloader": "stm32-dfu",
-    "board": "BLACKPILL_STM32_F401",
-    "community_layouts": ["ortho_5x12"],
-    "layouts": {
-        "LAYOUT_ortho_5x12": {
-            "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": [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": [1, 4], "x": 4, "y": 1},
-                {"matrix": [1, 5], "x": 5, "y": 1},
-                {"matrix": [1, 6], "x": 6, "y": 1},
-                {"matrix": [1, 7], "x": 7, "y": 1},
-                {"matrix": [1, 8], "x": 8, "y": 1},
-                {"matrix": [1, 9], "x": 9, "y": 1},
-                {"matrix": [1, 10], "x": 10, "y": 1},
-                {"matrix": [1, 11], "x": 11, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2},
-                {"matrix": [2, 1], "x": 1, "y": 2},
-                {"matrix": [2, 2], "x": 2, "y": 2},
-                {"matrix": [2, 3], "x": 3, "y": 2},
-                {"matrix": [2, 4], "x": 4, "y": 2},
-                {"matrix": [2, 5], "x": 5, "y": 2},
-                {"matrix": [2, 6], "x": 6, "y": 2},
-                {"matrix": [2, 7], "x": 7, "y": 2},
-                {"matrix": [2, 8], "x": 8, "y": 2},
-                {"matrix": [2, 9], "x": 9, "y": 2},
-                {"matrix": [2, 10], "x": 10, "y": 2},
-                {"matrix": [2, 11], "x": 11, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3},
-                {"matrix": [3, 1], "x": 1, "y": 3},
-                {"matrix": [3, 2], "x": 2, "y": 3},
-                {"matrix": [3, 3], "x": 3, "y": 3},
-                {"matrix": [3, 4], "x": 4, "y": 3},
-                {"matrix": [3, 5], "x": 5, "y": 3},
-                {"matrix": [3, 6], "x": 6, "y": 3},
-                {"matrix": [3, 7], "x": 7, "y": 3},
-                {"matrix": [3, 8], "x": 8, "y": 3},
-                {"matrix": [3, 9], "x": 9, "y": 3},
-                {"matrix": [3, 10], "x": 10, "y": 3},
-                {"matrix": [3, 11], "x": 11, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4},
-                {"matrix": [4, 1], "x": 1, "y": 4},
-                {"matrix": [4, 2], "x": 2, "y": 4},
-                {"matrix": [4, 3], "x": 3, "y": 4},
-                {"matrix": [4, 4], "x": 4, "y": 4},
-                {"matrix": [4, 5], "x": 5, "y": 4},
-                {"matrix": [4, 6], "x": 6, "y": 4},
-                {"matrix": [4, 7], "x": 7, "y": 4},
-                {"matrix": [4, 8], "x": 8, "y": 4},
-                {"matrix": [4, 9], "x": 9, "y": 4},
-                {"matrix": [4, 10], "x": 10, "y": 4},
-                {"matrix": [4, 11], "x": 11, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/handwired/riblee_f401/keyboard.json b/keyboards/handwired/riblee_f401/keyboard.json
new file mode 100644
index 00000000000..53fc6137603
--- /dev/null
+++ b/keyboards/handwired/riblee_f401/keyboard.json
@@ -0,0 +1,105 @@
+{
+    "keyboard_name": "Handwired F401",
+    "manufacturer": "Riblee",
+    "url": "",
+    "maintainer": "riblee",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0x002A",
+        "device_version": "0.0.1",
+        "shared_endpoint": {
+             "keyboard": true
+        }
+    },
+    "tapping": {
+        "term": 175
+    },
+    "matrix_pins": {
+        "cols": ["B10", "B1", "B0", "B15", "A8", "B3", "B4", "B5", "B6", "B7", "B8", "B9"],
+        "rows": ["A6", "A5", "A4", "A3", "A2"]
+    },
+    "diode_direction": "COL2ROW",
+    "backlight": {
+        "pin": "A0",
+        "levels": 5
+    },
+    "development_board": "blackpill_f401",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "nkro": true,
+        "backlight": true
+    },
+    "community_layouts": ["ortho_5x12"],
+    "layouts": {
+        "LAYOUT_ortho_5x12": {
+            "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": [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": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [2, 6], "x": 6, "y": 2},
+                {"matrix": [2, 7], "x": 7, "y": 2},
+                {"matrix": [2, 8], "x": 8, "y": 2},
+                {"matrix": [2, 9], "x": 9, "y": 2},
+                {"matrix": [2, 10], "x": 10, "y": 2},
+                {"matrix": [2, 11], "x": 11, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
+                {"matrix": [3, 6], "x": 6, "y": 3},
+                {"matrix": [3, 7], "x": 7, "y": 3},
+                {"matrix": [3, 8], "x": 8, "y": 3},
+                {"matrix": [3, 9], "x": 9, "y": 3},
+                {"matrix": [3, 10], "x": 10, "y": 3},
+                {"matrix": [3, 11], "x": 11, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+                {"matrix": [4, 2], "x": 2, "y": 4},
+                {"matrix": [4, 3], "x": 3, "y": 4},
+                {"matrix": [4, 4], "x": 4, "y": 4},
+                {"matrix": [4, 5], "x": 5, "y": 4},
+                {"matrix": [4, 6], "x": 6, "y": 4},
+                {"matrix": [4, 7], "x": 7, "y": 4},
+                {"matrix": [4, 8], "x": 8, "y": 4},
+                {"matrix": [4, 9], "x": 9, "y": 4},
+                {"matrix": [4, 10], "x": 10, "y": 4},
+                {"matrix": [4, 11], "x": 11, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/handwired/riblee_f401/rules.mk b/keyboards/handwired/riblee_f401/rules.mk
deleted file mode 100644
index 4c2d255a184..00000000000
--- a/keyboards/handwired/riblee_f401/rules.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-KEYBOARD_SHARED_EP = yes
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
diff --git a/keyboards/handwired/riblee_f411/info.json b/keyboards/handwired/riblee_f411/info.json
deleted file mode 100644
index 1c957e99404..00000000000
--- a/keyboards/handwired/riblee_f411/info.json
+++ /dev/null
@@ -1,93 +0,0 @@
-{
-    "keyboard_name": "Handwired F411",
-    "manufacturer": "Riblee",
-    "url": "",
-    "maintainer": "riblee",
-    "usb": {
-        "vid": "0xFEED",
-        "pid": "0x002B",
-        "device_version": "0.0.1"
-    },
-    "tapping": {
-        "term": 175
-    },
-    "matrix_pins": {
-        "cols": ["B10", "B1", "B0", "B15", "A8", "B3", "B4", "B5", "B14", "A0", "B8", "B9"],
-        "rows": ["A6", "A5", "A4", "A3", "A2"]
-    },
-    "diode_direction": "COL2ROW",
-    "processor": "STM32F411",
-    "bootloader": "stm32-dfu",
-    "board": "BLACKPILL_STM32_F411",
-    "community_layouts": ["ortho_5x12"],
-    "layouts": {
-        "LAYOUT_ortho_5x12": {
-            "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": [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": [1, 4], "x": 4, "y": 1},
-                {"matrix": [1, 5], "x": 5, "y": 1},
-                {"matrix": [1, 6], "x": 6, "y": 1},
-                {"matrix": [1, 7], "x": 7, "y": 1},
-                {"matrix": [1, 8], "x": 8, "y": 1},
-                {"matrix": [1, 9], "x": 9, "y": 1},
-                {"matrix": [1, 10], "x": 10, "y": 1},
-                {"matrix": [1, 11], "x": 11, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2},
-                {"matrix": [2, 1], "x": 1, "y": 2},
-                {"matrix": [2, 2], "x": 2, "y": 2},
-                {"matrix": [2, 3], "x": 3, "y": 2},
-                {"matrix": [2, 4], "x": 4, "y": 2},
-                {"matrix": [2, 5], "x": 5, "y": 2},
-                {"matrix": [2, 6], "x": 6, "y": 2},
-                {"matrix": [2, 7], "x": 7, "y": 2},
-                {"matrix": [2, 8], "x": 8, "y": 2},
-                {"matrix": [2, 9], "x": 9, "y": 2},
-                {"matrix": [2, 10], "x": 10, "y": 2},
-                {"matrix": [2, 11], "x": 11, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3},
-                {"matrix": [3, 1], "x": 1, "y": 3},
-                {"matrix": [3, 2], "x": 2, "y": 3},
-                {"matrix": [3, 3], "x": 3, "y": 3},
-                {"matrix": [3, 4], "x": 4, "y": 3},
-                {"matrix": [3, 5], "x": 5, "y": 3},
-                {"matrix": [3, 6], "x": 6, "y": 3},
-                {"matrix": [3, 7], "x": 7, "y": 3},
-                {"matrix": [3, 8], "x": 8, "y": 3},
-                {"matrix": [3, 9], "x": 9, "y": 3},
-                {"matrix": [3, 10], "x": 10, "y": 3},
-                {"matrix": [3, 11], "x": 11, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4},
-                {"matrix": [4, 1], "x": 1, "y": 4},
-                {"matrix": [4, 2], "x": 2, "y": 4},
-                {"matrix": [4, 3], "x": 3, "y": 4},
-                {"matrix": [4, 4], "x": 4, "y": 4},
-                {"matrix": [4, 5], "x": 5, "y": 4},
-                {"matrix": [4, 6], "x": 6, "y": 4},
-                {"matrix": [4, 7], "x": 7, "y": 4},
-                {"matrix": [4, 8], "x": 8, "y": 4},
-                {"matrix": [4, 9], "x": 9, "y": 4},
-                {"matrix": [4, 10], "x": 10, "y": 4},
-                {"matrix": [4, 11], "x": 11, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/handwired/riblee_f411/keyboard.json b/keyboards/handwired/riblee_f411/keyboard.json
new file mode 100644
index 00000000000..47d6349ba77
--- /dev/null
+++ b/keyboards/handwired/riblee_f411/keyboard.json
@@ -0,0 +1,100 @@
+{
+    "keyboard_name": "Handwired F411",
+    "manufacturer": "Riblee",
+    "url": "",
+    "maintainer": "riblee",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0x002B",
+        "device_version": "0.0.1",
+        "shared_endpoint": {
+             "keyboard": true
+        }
+    },
+    "tapping": {
+        "term": 175
+    },
+    "matrix_pins": {
+        "cols": ["B10", "B1", "B0", "B15", "A8", "B3", "B4", "B5", "B14", "A0", "B8", "B9"],
+        "rows": ["A6", "A5", "A4", "A3", "A2"]
+    },
+    "diode_direction": "COL2ROW",
+    "development_board": "blackpill_f411",
+    "features": {
+        "bootmagic": false,
+        "mousekey": true,
+        "extrakey": true,
+        "nkro": true
+    },
+    "community_layouts": ["ortho_5x12"],
+    "layouts": {
+        "LAYOUT_ortho_5x12": {
+            "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": [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": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [2, 6], "x": 6, "y": 2},
+                {"matrix": [2, 7], "x": 7, "y": 2},
+                {"matrix": [2, 8], "x": 8, "y": 2},
+                {"matrix": [2, 9], "x": 9, "y": 2},
+                {"matrix": [2, 10], "x": 10, "y": 2},
+                {"matrix": [2, 11], "x": 11, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
+                {"matrix": [3, 6], "x": 6, "y": 3},
+                {"matrix": [3, 7], "x": 7, "y": 3},
+                {"matrix": [3, 8], "x": 8, "y": 3},
+                {"matrix": [3, 9], "x": 9, "y": 3},
+                {"matrix": [3, 10], "x": 10, "y": 3},
+                {"matrix": [3, 11], "x": 11, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+                {"matrix": [4, 2], "x": 2, "y": 4},
+                {"matrix": [4, 3], "x": 3, "y": 4},
+                {"matrix": [4, 4], "x": 4, "y": 4},
+                {"matrix": [4, 5], "x": 5, "y": 4},
+                {"matrix": [4, 6], "x": 6, "y": 4},
+                {"matrix": [4, 7], "x": 7, "y": 4},
+                {"matrix": [4, 8], "x": 8, "y": 4},
+                {"matrix": [4, 9], "x": 9, "y": 4},
+                {"matrix": [4, 10], "x": 10, "y": 4},
+                {"matrix": [4, 11], "x": 11, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/handwired/riblee_f411/rules.mk b/keyboards/handwired/riblee_f411/rules.mk
deleted file mode 100644
index 4741169e4db..00000000000
--- a/keyboards/handwired/riblee_f411/rules.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-KEYBOARD_SHARED_EP = yes    # Free up some extra endpoints - needed if console+mouse+extra
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
diff --git a/keyboards/handwired/riblee_split/info.json b/keyboards/handwired/riblee_split/keyboard.json
similarity index 100%
rename from keyboards/handwired/riblee_split/info.json
rename to keyboards/handwired/riblee_split/keyboard.json
diff --git a/keyboards/handwired/scottokeebs/scottoslant/info.json b/keyboards/handwired/scottokeebs/scottoslant/info.json
deleted file mode 100644
index ebaa1b530c2..00000000000
--- a/keyboards/handwired/scottokeebs/scottoslant/info.json
+++ /dev/null
@@ -1,75 +0,0 @@
-{
-    "manufacturer": "ScottoKeebs",
-    "keyboard_name": "ScottoSlant",
-    "maintainer": "joe-scotto",
-    "development_board": "promicro",
-    "diode_direction": "COL2ROW",
-    "features": {
-        "bootmagic": true,
-        "command": false,
-        "console": false,
-        "extrakey": true,
-        "mousekey": true,
-        "nkro": true
-    },
-    "matrix_pins": {
-        "cols": ["D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5", "F4", "F5"],
-        "rows": ["B1", "B3", "B2", "B6"]
-    },
-    "url": "https://scottokeebs.com",
-    "usb": {
-        "device_version": "1.0.0",
-        "pid": "0x0004",
-        "vid": "0x534B"
-    },
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                // Row 1
-                { "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 },
-
-                // Row 2
-                { "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": [1, 4], "x": 4, "y": 1 },
-                { "matrix": [1, 5], "x": 5, "y": 1 },
-                { "matrix": [1, 6], "x": 6, "y": 1 },
-                { "matrix": [1, 7], "x": 7, "y": 1 },
-                { "matrix": [1, 8], "x": 8, "y": 1 },
-                { "matrix": [1, 9], "x": 9, "y": 1 },
-
-                // Row 3
-                { "matrix": [2, 0], "x": 0, "y": 2 },
-                { "matrix": [2, 1], "x": 1, "y": 2 },
-                { "matrix": [2, 2], "x": 2, "y": 2 },
-                { "matrix": [2, 3], "x": 3, "y": 2 },
-                { "matrix": [2, 4], "x": 4, "y": 2 },
-                { "matrix": [2, 5], "x": 5, "y": 2 },
-                { "matrix": [2, 6], "x": 6, "y": 2 },
-                { "matrix": [2, 7], "x": 7, "y": 2 },
-                { "matrix": [2, 8], "x": 8, "y": 2 },
-                { "matrix": [2, 9], "x": 9, "y": 2 },
-
-                // Row 4
-                { "matrix": [3, 1], "x": 1, "y": 3 },
-                { "matrix": [3, 2], "x": 2, "y": 3 },
-                { "matrix": [3, 3], "x": 3, "y": 3 },
-                { "matrix": [3, 4], "x": 4, "y": 3 },
-                { "matrix": [3, 6], "x": 6, "y": 3 },
-                { "matrix": [3, 7], "x": 7, "y": 3 },
-                { "matrix": [3, 8], "x": 8, "y": 3 }
-            ]
-        }
-    }
-}
diff --git a/keyboards/handwired/scottokeebs/scottoslant/keyboard.json b/keyboards/handwired/scottokeebs/scottoslant/keyboard.json
new file mode 100644
index 00000000000..8c9de39cd6d
--- /dev/null
+++ b/keyboards/handwired/scottokeebs/scottoslant/keyboard.json
@@ -0,0 +1,78 @@
+{
+    "manufacturer": "ScottoKeebs",
+    "keyboard_name": "ScottoSlant",
+    "maintainer": "joe-scotto",
+    "development_board": "promicro",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "build": {
+        "lto": true
+    },
+    "matrix_pins": {
+        "cols": ["D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5", "F4", "F5"],
+        "rows": ["B1", "B3", "B2", "B6"]
+    },
+    "url": "https://scottokeebs.com",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x0004",
+        "vid": "0x534B"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                // Row 1
+                { "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 },
+
+                // Row 2
+                { "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": [1, 4], "x": 4, "y": 1 },
+                { "matrix": [1, 5], "x": 5, "y": 1 },
+                { "matrix": [1, 6], "x": 6, "y": 1 },
+                { "matrix": [1, 7], "x": 7, "y": 1 },
+                { "matrix": [1, 8], "x": 8, "y": 1 },
+                { "matrix": [1, 9], "x": 9, "y": 1 },
+
+                // Row 3
+                { "matrix": [2, 0], "x": 0, "y": 2 },
+                { "matrix": [2, 1], "x": 1, "y": 2 },
+                { "matrix": [2, 2], "x": 2, "y": 2 },
+                { "matrix": [2, 3], "x": 3, "y": 2 },
+                { "matrix": [2, 4], "x": 4, "y": 2 },
+                { "matrix": [2, 5], "x": 5, "y": 2 },
+                { "matrix": [2, 6], "x": 6, "y": 2 },
+                { "matrix": [2, 7], "x": 7, "y": 2 },
+                { "matrix": [2, 8], "x": 8, "y": 2 },
+                { "matrix": [2, 9], "x": 9, "y": 2 },
+
+                // Row 4
+                { "matrix": [3, 1], "x": 1, "y": 3 },
+                { "matrix": [3, 2], "x": 2, "y": 3 },
+                { "matrix": [3, 3], "x": 3, "y": 3 },
+                { "matrix": [3, 4], "x": 4, "y": 3 },
+                { "matrix": [3, 6], "x": 6, "y": 3 },
+                { "matrix": [3, 7], "x": 7, "y": 3 },
+                { "matrix": [3, 8], "x": 8, "y": 3 }
+            ]
+        }
+    }
+}
diff --git a/keyboards/handwired/scottokeebs/scottoslant/rules.mk b/keyboards/handwired/scottokeebs/scottoslant/rules.mk
deleted file mode 100644
index 4da205a168c..00000000000
--- a/keyboards/handwired/scottokeebs/scottoslant/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-LTO_ENABLE = yes
diff --git a/keyboards/handwired/selene/keyboard.json b/keyboards/handwired/selene/keyboard.json
index ed3231981df..5e46cc4f324 100644
--- a/keyboards/handwired/selene/keyboard.json
+++ b/keyboards/handwired/selene/keyboard.json
@@ -28,9 +28,7 @@
     "rows": ["B10", "B9", "B15", "B14", "B13", "B8"]
   },
   "diode_direction": "COL2ROW",
-  "processor": "STM32F303",
-  "bootloader": "stm32-dfu",
-  "board": "QMK_PROTON_C",
+  "development_board": "proton_c",
   "layouts": {
     "LAYOUT": {
       "layout": [
diff --git a/keyboards/handwired/sick_pad/keyboard.json b/keyboards/handwired/sick_pad/keyboard.json
index 8298a497ed3..86457a704e2 100644
--- a/keyboards/handwired/sick_pad/keyboard.json
+++ b/keyboards/handwired/sick_pad/keyboard.json
@@ -21,9 +21,7 @@
         "rows": ["B0", "B1", "B2", "B3", "B4"]
     },
     "diode_direction": "COL2ROW",
-    "processor": "STM32F303",
-    "bootloader": "stm32-dfu",
-    "board": "QMK_PROTON_C",
+    "development_board": "proton_c",
     "community_layouts": ["numpad_5x4"],
     "layouts": {
         "LAYOUT_numpad_5x4": {
diff --git a/keyboards/handwired/slash/info.json b/keyboards/handwired/slash/info.json
deleted file mode 100644
index 95abaeb9c71..00000000000
--- a/keyboards/handwired/slash/info.json
+++ /dev/null
@@ -1,92 +0,0 @@
-{
-    "keyboard_name": "Slash",
-    "manufacturer": "asdftemp",
-    "url": "",
-    "maintainer": "qmk",
-    "usb": {
-        "vid": "0xFEED",
-        "pid": "0x0000",
-        "device_version": "0.0.1"
-    },
-    "bluetooth": {
-        "driver": "bluefruit_le"
-    },
-    "matrix_pins": {
-        "cols": ["D2", "F0", "F1", "F4", "F5", "F6", "F7", "D3"],
-        "rows": ["C7", "D6", "B7", "B6", "B5", "D7", "C6", "D0"]
-    },
-    "diode_direction": "COL2ROW",
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 0], "x": 1.75, "y": 0},
-                {"matrix": [1, 0], "x": 2.75, "y": 0},
-                {"matrix": [0, 1], "x": 3.75, "y": 0},
-                {"matrix": [1, 1], "x": 4.75, "y": 0},
-                {"matrix": [0, 2], "x": 5.75, "y": 0},
-                {"matrix": [1, 2], "x": 6.75, "y": 0},
-                {"matrix": [0, 3], "x": 7.75, "y": 0},
-                {"matrix": [1, 3], "x": 8.75, "y": 0},
-                {"matrix": [0, 4], "x": 9.75, "y": 0},
-                {"matrix": [1, 4], "x": 10.75, "y": 0},
-                {"matrix": [0, 5], "x": 11.75, "y": 0},
-                {"matrix": [1, 5], "x": 12.75, "y": 0},
-                {"matrix": [0, 6], "x": 13.75, "y": 0},
-                {"matrix": [1, 6], "x": 14.75, "y": 0, "w": 2},
-
-                {"matrix": [2, 0], "x": 1.25, "y": 1, "w": 1.5},
-                {"matrix": [3, 0], "x": 2.75, "y": 1},
-                {"matrix": [2, 1], "x": 3.75, "y": 1},
-                {"matrix": [3, 1], "x": 4.75, "y": 1},
-                {"matrix": [2, 2], "x": 5.75, "y": 1},
-                {"matrix": [3, 2], "x": 6.75, "y": 1},
-                {"matrix": [2, 3], "x": 7.75, "y": 1},
-                {"matrix": [3, 3], "x": 8.75, "y": 1},
-                {"matrix": [2, 4], "x": 9.75, "y": 1},
-                {"matrix": [3, 4], "x": 10.75, "y": 1},
-                {"matrix": [2, 5], "x": 11.75, "y": 1},
-                {"matrix": [3, 5], "x": 12.75, "y": 1},
-                {"matrix": [2, 6], "x": 13.75, "y": 1},
-                {"matrix": [3, 6], "x": 14.75, "y": 1, "w": 1.5},
-
-                {"matrix": [5, 0], "x": 1, "y": 2, "w": 1.75},
-                {"matrix": [4, 0], "x": 2.75, "y": 2},
-                {"matrix": [5, 1], "x": 3.75, "y": 2},
-                {"matrix": [4, 1], "x": 4.75, "y": 2},
-                {"matrix": [5, 2], "x": 5.75, "y": 2},
-                {"matrix": [4, 2], "x": 6.75, "y": 2},
-                {"matrix": [5, 3], "x": 7.75, "y": 2},
-                {"matrix": [4, 3], "x": 8.75, "y": 2},
-                {"matrix": [5, 4], "x": 9.75, "y": 2},
-                {"matrix": [4, 4], "x": 10.75, "y": 2},
-                {"matrix": [5, 5], "x": 11.75, "y": 2},
-                {"matrix": [4, 5], "x": 12.75, "y": 2},
-                {"matrix": [5, 6], "x": 13.75, "y": 2, "w": 2.25},
-
-                {"matrix": [7, 0], "x": 0.5, "y": 3, "w": 2.25},
-                {"matrix": [6, 0], "x": 2.75, "y": 3},
-                {"matrix": [7, 1], "x": 3.75, "y": 3},
-                {"matrix": [6, 1], "x": 4.75, "y": 3},
-                {"matrix": [7, 2], "x": 5.75, "y": 3},
-                {"matrix": [6, 2], "x": 6.75, "y": 3},
-                {"matrix": [7, 3], "x": 7.75, "y": 3},
-                {"matrix": [6, 3], "x": 8.75, "y": 3},
-                {"matrix": [7, 4], "x": 9.75, "y": 3},
-                {"matrix": [6, 4], "x": 10.75, "y": 3},
-                {"matrix": [7, 5], "x": 11.75, "y": 3},
-                {"matrix": [6, 5], "x": 12.75, "y": 3, "w": 2.75},
-
-                {"matrix": [6, 7], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [7, 7], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 7], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [5, 7], "x": 3.75, "y": 4, "w": 6.25},
-                {"matrix": [3, 7], "x": 10, "y": 4, "w": 1.25},
-                {"matrix": [2, 7], "x": 11.25, "y": 4, "w": 1.25},
-                {"matrix": [7, 6], "x": 12.5, "y": 4, "w": 1.25},
-                {"matrix": [6, 6], "x": 13.75, "y": 4, "w": 1.25}
-            ]
-        }
-    }
-}
diff --git a/keyboards/handwired/slash/keyboard.json b/keyboards/handwired/slash/keyboard.json
new file mode 100644
index 00000000000..4fd99ebeee3
--- /dev/null
+++ b/keyboards/handwired/slash/keyboard.json
@@ -0,0 +1,98 @@
+{
+    "keyboard_name": "Slash",
+    "manufacturer": "asdftemp",
+    "url": "",
+    "maintainer": "qmk",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0x0000",
+        "device_version": "0.0.1"
+    },
+    "bluetooth": {
+        "driver": "bluefruit_le"
+    },
+    "matrix_pins": {
+        "cols": ["D2", "F0", "F1", "F4", "F5", "F6", "F7", "D3"],
+        "rows": ["C7", "D6", "B7", "B6", "B5", "D7", "C6", "D0"]
+    },
+    "diode_direction": "COL2ROW",
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
+    "features": {
+        "bootmagic": false,
+        "mousekey": true,
+        "extrakey": true,
+        "bluetooth": true
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 1.75, "y": 0},
+                {"matrix": [1, 0], "x": 2.75, "y": 0},
+                {"matrix": [0, 1], "x": 3.75, "y": 0},
+                {"matrix": [1, 1], "x": 4.75, "y": 0},
+                {"matrix": [0, 2], "x": 5.75, "y": 0},
+                {"matrix": [1, 2], "x": 6.75, "y": 0},
+                {"matrix": [0, 3], "x": 7.75, "y": 0},
+                {"matrix": [1, 3], "x": 8.75, "y": 0},
+                {"matrix": [0, 4], "x": 9.75, "y": 0},
+                {"matrix": [1, 4], "x": 10.75, "y": 0},
+                {"matrix": [0, 5], "x": 11.75, "y": 0},
+                {"matrix": [1, 5], "x": 12.75, "y": 0},
+                {"matrix": [0, 6], "x": 13.75, "y": 0},
+                {"matrix": [1, 6], "x": 14.75, "y": 0, "w": 2},
+
+                {"matrix": [2, 0], "x": 1.25, "y": 1, "w": 1.5},
+                {"matrix": [3, 0], "x": 2.75, "y": 1},
+                {"matrix": [2, 1], "x": 3.75, "y": 1},
+                {"matrix": [3, 1], "x": 4.75, "y": 1},
+                {"matrix": [2, 2], "x": 5.75, "y": 1},
+                {"matrix": [3, 2], "x": 6.75, "y": 1},
+                {"matrix": [2, 3], "x": 7.75, "y": 1},
+                {"matrix": [3, 3], "x": 8.75, "y": 1},
+                {"matrix": [2, 4], "x": 9.75, "y": 1},
+                {"matrix": [3, 4], "x": 10.75, "y": 1},
+                {"matrix": [2, 5], "x": 11.75, "y": 1},
+                {"matrix": [3, 5], "x": 12.75, "y": 1},
+                {"matrix": [2, 6], "x": 13.75, "y": 1},
+                {"matrix": [3, 6], "x": 14.75, "y": 1, "w": 1.5},
+
+                {"matrix": [5, 0], "x": 1, "y": 2, "w": 1.75},
+                {"matrix": [4, 0], "x": 2.75, "y": 2},
+                {"matrix": [5, 1], "x": 3.75, "y": 2},
+                {"matrix": [4, 1], "x": 4.75, "y": 2},
+                {"matrix": [5, 2], "x": 5.75, "y": 2},
+                {"matrix": [4, 2], "x": 6.75, "y": 2},
+                {"matrix": [5, 3], "x": 7.75, "y": 2},
+                {"matrix": [4, 3], "x": 8.75, "y": 2},
+                {"matrix": [5, 4], "x": 9.75, "y": 2},
+                {"matrix": [4, 4], "x": 10.75, "y": 2},
+                {"matrix": [5, 5], "x": 11.75, "y": 2},
+                {"matrix": [4, 5], "x": 12.75, "y": 2},
+                {"matrix": [5, 6], "x": 13.75, "y": 2, "w": 2.25},
+
+                {"matrix": [7, 0], "x": 0.5, "y": 3, "w": 2.25},
+                {"matrix": [6, 0], "x": 2.75, "y": 3},
+                {"matrix": [7, 1], "x": 3.75, "y": 3},
+                {"matrix": [6, 1], "x": 4.75, "y": 3},
+                {"matrix": [7, 2], "x": 5.75, "y": 3},
+                {"matrix": [6, 2], "x": 6.75, "y": 3},
+                {"matrix": [7, 3], "x": 7.75, "y": 3},
+                {"matrix": [6, 3], "x": 8.75, "y": 3},
+                {"matrix": [7, 4], "x": 9.75, "y": 3},
+                {"matrix": [6, 4], "x": 10.75, "y": 3},
+                {"matrix": [7, 5], "x": 11.75, "y": 3},
+                {"matrix": [6, 5], "x": 12.75, "y": 3, "w": 2.75},
+
+                {"matrix": [6, 7], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [7, 7], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 7], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [5, 7], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [3, 7], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [2, 7], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [7, 6], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [6, 6], "x": 13.75, "y": 4, "w": 1.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/handwired/slash/rules.mk b/keyboards/handwired/slash/rules.mk
index ca7f6f843fb..3437a35bdf1 100644
--- a/keyboards/handwired/slash/rules.mk
+++ b/keyboards/handwired/slash/rules.mk
@@ -1,16 +1,2 @@
 # Processor frequency
 F_CPU = 8000000
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no        # Console for debug
-COMMAND_ENABLE = no        # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-BLUETOOTH_ENABLE = yes
diff --git a/keyboards/handwired/sono1/stm32f103/keyboard.json b/keyboards/handwired/sono1/stm32f103/keyboard.json
index f6e874a77f0..7a4b7420be4 100644
--- a/keyboards/handwired/sono1/stm32f103/keyboard.json
+++ b/keyboards/handwired/sono1/stm32f103/keyboard.json
@@ -13,6 +13,5 @@
         "kana": "A2",
         "on_state": 0
     },
-    "processor": "STM32F103",
-    "bootloader": "stm32duino"
+    "development_board": "bluepill"
 }
diff --git a/keyboards/handwired/split65/stm32/info.json b/keyboards/handwired/split65/stm32/info.json
deleted file mode 100644
index a9693b3a5b9..00000000000
--- a/keyboards/handwired/split65/stm32/info.json
+++ /dev/null
@@ -1,101 +0,0 @@
-{
-    "matrix_pins": {
-        "cols": ["A2", "A1", "A0", "B8", "B13", "B14", "B15", "B9"],
-        "rows": ["B5", "B4", "B3", "B2", "B1"],
-        "io_delay": 5
-    },
-    "diode_direction": "COL2ROW",
-    "split": {
-        "enabled": true,
-        "soft_serial_pin": "A9"
-    },
-    "processor": "STM32F303",
-    "bootloader": "stm32-dfu",
-    "board": "QMK_PROTON_C",
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-
-                {"matrix": [5, 7], "x": 8, "y": 0},
-                {"matrix": [5, 6], "x": 9, "y": 0},
-                {"matrix": [5, 5], "x": 10, "y": 0},
-                {"matrix": [5, 4], "x": 11, "y": 0},
-                {"matrix": [5, 3], "x": 12, "y": 0},
-                {"matrix": [5, 2], "x": 13, "y": 0},
-                {"matrix": [5, 1], "x": 14, "y": 0, "w": 2},
-                {"matrix": [5, 0], "x": 16, "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": [6, 7], "x": 7.5, "y": 1},
-                {"matrix": [6, 6], "x": 8.5, "y": 1},
-                {"matrix": [6, 5], "x": 9.5, "y": 1},
-                {"matrix": [6, 4], "x": 10.5, "y": 1},
-                {"matrix": [6, 3], "x": 11.5, "y": 1},
-                {"matrix": [6, 2], "x": 12.5, "y": 1},
-                {"matrix": [6, 1], "x": 13.5, "y": 1},
-                {"matrix": [6, 0], "x": 16, "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": [9, 7], "x": 7.75, "y": 2},
-                {"matrix": [7, 7], "x": 8.75, "y": 2},
-                {"matrix": [7, 6], "x": 9.75, "y": 2},
-                {"matrix": [7, 5], "x": 10.75, "y": 2},
-                {"matrix": [7, 4], "x": 11.75, "y": 2},
-                {"matrix": [7, 3], "x": 12.75, "y": 2},
-                {"matrix": [7, 2], "x": 13.75, "y": 2},
-                {"matrix": [7, 1], "x": 14.75, "y": 1, "w": 1.25, "h": 2},
-                {"matrix": [7, 0], "x": 16, "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": [8, 7], "x": 8.25, "y": 3},
-                {"matrix": [8, 6], "x": 9.25, "y": 3},
-                {"matrix": [8, 5], "x": 10.25, "y": 3},
-                {"matrix": [8, 4], "x": 11.25, "y": 3},
-                {"matrix": [8, 3], "x": 12.25, "y": 3},
-                {"matrix": [8, 2], "x": 13.25, "y": 3, "w": 1.75},
-                {"matrix": [8, 1], "x": 15, "y": 3},
-                {"matrix": [8, 0], "x": 16, "y": 3},
-
-                {"matrix": [4, 0], "x": 0.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.75, "y": 4, "w": 1.25},
-                {"matrix": [4, 4], "x": 4, "y": 4, "w": 2.75},
-
-                {"matrix": [9, 6], "x": 8, "y": 4, "w": 2.25},
-                {"matrix": [9, 5], "x": 10.25, "y": 4},
-                {"matrix": [9, 4], "x": 11.25, "y": 4},
-                {"matrix": [9, 3], "x": 12.25, "y": 4},
-
-                {"matrix": [9, 2], "x": 14, "y": 4},
-                {"matrix": [9, 1], "x": 15, "y": 4},
-                {"matrix": [9, 0], "x": 16, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/handwired/split65/stm32/keyboard.json b/keyboards/handwired/split65/stm32/keyboard.json
new file mode 100644
index 00000000000..6763c5eb886
--- /dev/null
+++ b/keyboards/handwired/split65/stm32/keyboard.json
@@ -0,0 +1,106 @@
+{
+    "matrix_pins": {
+        "cols": ["A2", "A1", "A0", "B8", "B13", "B14", "B15", "B9"],
+        "rows": ["B5", "B4", "B3", "B2", "B1"],
+        "io_delay": 5
+    },
+    "diode_direction": "COL2ROW",
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "A9"
+    },
+    "development_board": "proton_c",
+    "features": {
+        "bootmagic": false,
+        "mousekey": false,
+        "extrakey": false,
+        "audio": true,
+        "oled": true
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+
+                {"matrix": [5, 7], "x": 8, "y": 0},
+                {"matrix": [5, 6], "x": 9, "y": 0},
+                {"matrix": [5, 5], "x": 10, "y": 0},
+                {"matrix": [5, 4], "x": 11, "y": 0},
+                {"matrix": [5, 3], "x": 12, "y": 0},
+                {"matrix": [5, 2], "x": 13, "y": 0},
+                {"matrix": [5, 1], "x": 14, "y": 0, "w": 2},
+                {"matrix": [5, 0], "x": 16, "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": [6, 7], "x": 7.5, "y": 1},
+                {"matrix": [6, 6], "x": 8.5, "y": 1},
+                {"matrix": [6, 5], "x": 9.5, "y": 1},
+                {"matrix": [6, 4], "x": 10.5, "y": 1},
+                {"matrix": [6, 3], "x": 11.5, "y": 1},
+                {"matrix": [6, 2], "x": 12.5, "y": 1},
+                {"matrix": [6, 1], "x": 13.5, "y": 1},
+                {"matrix": [6, 0], "x": 16, "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": [9, 7], "x": 7.75, "y": 2},
+                {"matrix": [7, 7], "x": 8.75, "y": 2},
+                {"matrix": [7, 6], "x": 9.75, "y": 2},
+                {"matrix": [7, 5], "x": 10.75, "y": 2},
+                {"matrix": [7, 4], "x": 11.75, "y": 2},
+                {"matrix": [7, 3], "x": 12.75, "y": 2},
+                {"matrix": [7, 2], "x": 13.75, "y": 2},
+                {"matrix": [7, 1], "x": 14.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [7, 0], "x": 16, "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": [8, 7], "x": 8.25, "y": 3},
+                {"matrix": [8, 6], "x": 9.25, "y": 3},
+                {"matrix": [8, 5], "x": 10.25, "y": 3},
+                {"matrix": [8, 4], "x": 11.25, "y": 3},
+                {"matrix": [8, 3], "x": 12.25, "y": 3},
+                {"matrix": [8, 2], "x": 13.25, "y": 3, "w": 1.75},
+                {"matrix": [8, 1], "x": 15, "y": 3},
+                {"matrix": [8, 0], "x": 16, "y": 3},
+
+                {"matrix": [4, 0], "x": 0.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 4, "y": 4, "w": 2.75},
+
+                {"matrix": [9, 6], "x": 8, "y": 4, "w": 2.25},
+                {"matrix": [9, 5], "x": 10.25, "y": 4},
+                {"matrix": [9, 4], "x": 11.25, "y": 4},
+                {"matrix": [9, 3], "x": 12.25, "y": 4},
+
+                {"matrix": [9, 2], "x": 14, "y": 4},
+                {"matrix": [9, 1], "x": 15, "y": 4},
+                {"matrix": [9, 0], "x": 16, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/handwired/split65/stm32/rules.mk b/keyboards/handwired/split65/stm32/rules.mk
index 94186bf8c72..c6e29883213 100644
--- a/keyboards/handwired/split65/stm32/rules.mk
+++ b/keyboards/handwired/split65/stm32/rules.mk
@@ -1,14 +1 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = no        # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = yes          # Audio output
-OLED_ENABLE = yes
 SERIAL_DRIVER = usart
diff --git a/keyboards/handwired/splittest/bluepill/keyboard.json b/keyboards/handwired/splittest/bluepill/keyboard.json
index 17b7f86a6f8..5c061a71192 100644
--- a/keyboards/handwired/splittest/bluepill/keyboard.json
+++ b/keyboards/handwired/splittest/bluepill/keyboard.json
@@ -4,6 +4,11 @@
         "rows": ["B10"]
     },
     "diode_direction": "COL2ROW",
-    "processor": "STM32F103",
-    "bootloader": "stm32duino"
+    "development_board": "bluepill",
+    "features": {
+        "bootmagic": false,
+        "mousekey": false,
+        "extrakey": false,
+        "console": true
+    }
 }
diff --git a/keyboards/handwired/splittest/promicro/keyboard.json b/keyboards/handwired/splittest/promicro/keyboard.json
index f3765207656..2f5929cc008 100644
--- a/keyboards/handwired/splittest/promicro/keyboard.json
+++ b/keyboards/handwired/splittest/promicro/keyboard.json
@@ -11,5 +11,11 @@
         "pin": "D3"
     },
     "processor": "atmega32u4",
-    "bootloader": "caterina"
+    "bootloader": "caterina",
+    "features": {
+        "bootmagic": false,
+        "mousekey": false,
+        "extrakey": false,
+        "console": true
+    }
 }
diff --git a/keyboards/handwired/splittest/rules.mk b/keyboards/handwired/splittest/rules.mk
index 8d00fcc579f..ae4d823b53e 100644
--- a/keyboards/handwired/splittest/rules.mk
+++ b/keyboards/handwired/splittest/rules.mk
@@ -1,13 +1 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = no        # Audio control and System control
-CONSOLE_ENABLE = yes        # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-AUDIO_ENABLE = no           # Audio output
-
 DEFAULT_FOLDER = handwired/splittest/promicro
diff --git a/keyboards/handwired/splittest/teensy_2/keyboard.json b/keyboards/handwired/splittest/teensy_2/keyboard.json
index 72e9d022b94..68ab3f92c4e 100644
--- a/keyboards/handwired/splittest/teensy_2/keyboard.json
+++ b/keyboards/handwired/splittest/teensy_2/keyboard.json
@@ -11,5 +11,11 @@
         "pin": "D3"
     },
     "processor": "atmega32u4",
-    "bootloader": "halfkay"
+    "bootloader": "halfkay",
+    "features": {
+        "bootmagic": false,
+        "mousekey": false,
+        "extrakey": false,
+        "console": true
+    }
 }
diff --git a/keyboards/handwired/symmetric70_proto/proton_c/info.json b/keyboards/handwired/symmetric70_proto/proton_c/info.json
index a6f017ae75d..1fd231bbc47 100644
--- a/keyboards/handwired/symmetric70_proto/proton_c/info.json
+++ b/keyboards/handwired/symmetric70_proto/proton_c/info.json
@@ -1,6 +1,4 @@
 {
     "keyboard_name": "Symmetric70 prototype proton-c",
-    "processor": "STM32F303",
-    "bootloader": "stm32-dfu",
-    "board": "QMK_PROTON_C"
+    "development_board": "proton_c"
 }
diff --git a/keyboards/handwired/t111/keyboard.json b/keyboards/handwired/t111/keyboard.json
index 4c2b7ac4690..f65a3f087e8 100644
--- a/keyboards/handwired/t111/keyboard.json
+++ b/keyboards/handwired/t111/keyboard.json
@@ -21,8 +21,7 @@
         "rows": ["A15", "B6", "B5", "B4", "B3", "B9", "B8", "B7"]
     },
     "diode_direction": "ROW2COL",
-    "processor": "STM32F103",
-    "bootloader": "stm32duino",
+    "development_board": "bluepill",
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/handwired/tennie/config.h b/keyboards/handwired/tennie/config.h
index 7c77f53a82d..dcbcfeaaa8c 100644
--- a/keyboards/handwired/tennie/config.h
+++ b/keyboards/handwired/tennie/config.h
@@ -17,8 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define RGBW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/handwired/tennie/keyboard.json b/keyboards/handwired/tennie/keyboard.json
index 34e6676c953..36c1266d50b 100644
--- a/keyboards/handwired/tennie/keyboard.json
+++ b/keyboards/handwired/tennie/keyboard.json
@@ -26,7 +26,8 @@
         }
     },
     "ws2812": {
-        "pin": "D1"
+        "pin": "D1",
+        "rgbw": true
     },
     "features": {
         "bootmagic": true,
diff --git a/keyboards/handwired/trackpoint/info.json b/keyboards/handwired/trackpoint/info.json
deleted file mode 100644
index 92098b09c64..00000000000
--- a/keyboards/handwired/trackpoint/info.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-    "keyboard_name": "Trackpoint Demo",
-    "manufacturer": "QMK",
-    "url": "",
-    "maintainer": "qmk",
-    "usb": {
-        "vid": "0x1234",
-        "pid": "0x5678",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["F1", "F4", "F5"],
-        "rows": ["F0"]
-    },
-    "diode_direction": "COL2ROW",
-    "processor": "atmega32u4",
-    "bootloader": "halfkay",
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0}
-            ]
-        }
-    }
-}
diff --git a/keyboards/handwired/trackpoint/keyboard.json b/keyboards/handwired/trackpoint/keyboard.json
new file mode 100644
index 00000000000..94ed022878f
--- /dev/null
+++ b/keyboards/handwired/trackpoint/keyboard.json
@@ -0,0 +1,36 @@
+{
+    "keyboard_name": "Trackpoint Demo",
+    "manufacturer": "QMK",
+    "url": "",
+    "maintainer": "qmk",
+    "usb": {
+        "vid": "0x1234",
+        "pid": "0x5678",
+        "device_version": "0.0.1"
+    },
+    "matrix_pins": {
+        "cols": ["F1", "F4", "F5"],
+        "rows": ["F0"]
+    },
+    "diode_direction": "COL2ROW",
+    "processor": "atmega32u4",
+    "bootloader": "halfkay",
+    "features": {
+        "bootmagic": false,
+        "mousekey": true,
+        "extrakey": true,
+        "console": true,
+        "command": true,
+        "ps2": true,
+        "ps2_mouse": true
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0}
+            ]
+        }
+    }
+}
diff --git a/keyboards/handwired/trackpoint/rules.mk b/keyboards/handwired/trackpoint/rules.mk
index ca3836ef06b..74035c9903b 100644
--- a/keyboards/handwired/trackpoint/rules.mk
+++ b/keyboards/handwired/trackpoint/rules.mk
@@ -1,15 +1 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = yes        # Console for debug
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-AUDIO_ENABLE = no           # Audio output
-
-PS2_MOUSE_ENABLE = yes
-PS2_ENABLE = yes
 PS2_DRIVER = usart
diff --git a/keyboards/handwired/tractyl_manuform/4x6_right/info.json b/keyboards/handwired/tractyl_manuform/4x6_right/info.json
deleted file mode 100644
index aa01e763eb4..00000000000
--- a/keyboards/handwired/tractyl_manuform/4x6_right/info.json
+++ /dev/null
@@ -1,101 +0,0 @@
-{
-    "keyboard_name": "Tractyl Manuform (4x6)",
-    "url": "",
-    "maintainer": "drashna",
-    "usb": {
-        "pid": "0x3537",
-        "device_version": "0.0.1"
-    },
-    "rgb_matrix": {
-        "driver": "ws2812",
-        "max_brightness": 80,
-        "sleep": true,
-        "split_count": [32, 30]
-    },
-    "matrix_pins": {
-        "cols": ["C0", "C1", "C2", "C3", "C4", "C5"],
-        "rows": ["A0", "A1", "A2", "A3", "A4"]
-    },
-    "diode_direction": "COL2ROW",
-    "split": {
-        "enabled": true,
-        "soft_serial_pin": "D3",
-        "bootmagic": {
-            "matrix": [4, 5]
-        }
-    },
-    "ws2812": {
-        "pin": "E7"
-    },
-    "processor": "at90usb1286",
-    "bootloader": "atmel-dfu",
-    "layouts": {
-        "LAYOUT_4x6_right": {
-            "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": [5, 0], "x": 11, "y": 0},
-                {"matrix": [5, 1], "x": 12, "y": 0},
-                {"matrix": [5, 2], "x": 13, "y": 0},
-                {"matrix": [5, 3], "x": 14, "y": 0},
-                {"matrix": [5, 4], "x": 15, "y": 0},
-                {"matrix": [5, 5], "x": 16, "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": [1, 4], "x": 4, "y": 1},
-                {"matrix": [1, 5], "x": 5, "y": 1},
-
-                {"matrix": [6, 0], "x": 11, "y": 1},
-                {"matrix": [6, 1], "x": 12, "y": 1},
-                {"matrix": [6, 2], "x": 13, "y": 1},
-                {"matrix": [6, 3], "x": 14, "y": 1},
-                {"matrix": [6, 4], "x": 15, "y": 1},
-                {"matrix": [6, 5], "x": 16, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2},
-                {"matrix": [2, 1], "x": 1, "y": 2},
-                {"matrix": [2, 2], "x": 2, "y": 2},
-                {"matrix": [2, 3], "x": 3, "y": 2},
-                {"matrix": [2, 4], "x": 4, "y": 2},
-                {"matrix": [2, 5], "x": 5, "y": 2},
-
-                {"matrix": [7, 0], "x": 11, "y": 2},
-                {"matrix": [7, 1], "x": 12, "y": 2},
-                {"matrix": [7, 2], "x": 13, "y": 2},
-                {"matrix": [7, 3], "x": 14, "y": 2},
-                {"matrix": [7, 4], "x": 15, "y": 2},
-                {"matrix": [7, 5], "x": 16, "y": 2},
-
-                {"matrix": [3, 2], "x": 2, "y": 3},
-                {"matrix": [3, 3], "x": 3, "y": 3},
-
-                {"matrix": [8, 2], "x": 13, "y": 3},
-                {"matrix": [8, 3], "x": 14, "y": 3},
-
-                {"matrix": [3, 4], "x": 4, "y": 4},
-                {"matrix": [3, 5], "x": 5, "y": 4},
-
-                {"matrix": [8, 1], "x": 12, "y": 4},
-
-                {"matrix": [4, 4], "x": 6, "y": 5},
-                {"matrix": [4, 5], "x": 7, "y": 5},
-
-                {"matrix": [9, 1], "x": 10, "y": 5},
-
-                {"matrix": [4, 2], "x": 6, "y": 6},
-                {"matrix": [4, 3], "x": 7, "y": 6},
-
-                {"matrix": [9, 2], "x": 9, "y": 6},
-                {"matrix": [9, 3], "x": 10, "y": 6}
-            ]
-        }
-    }
-}
diff --git a/keyboards/handwired/tractyl_manuform/4x6_right/keyboard.json b/keyboards/handwired/tractyl_manuform/4x6_right/keyboard.json
new file mode 100644
index 00000000000..825c59ac725
--- /dev/null
+++ b/keyboards/handwired/tractyl_manuform/4x6_right/keyboard.json
@@ -0,0 +1,108 @@
+{
+    "keyboard_name": "Tractyl Manuform (4x6)",
+    "url": "",
+    "maintainer": "drashna",
+    "usb": {
+        "pid": "0x3537",
+        "device_version": "0.0.1"
+    },
+    "rgb_matrix": {
+        "driver": "ws2812",
+        "max_brightness": 80,
+        "sleep": true,
+        "split_count": [32, 30]
+    },
+    "matrix_pins": {
+        "cols": ["C0", "C1", "C2", "C3", "C4", "C5"],
+        "rows": ["A0", "A1", "A2", "A3", "A4"]
+    },
+    "diode_direction": "COL2ROW",
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "D3",
+        "bootmagic": {
+            "matrix": [4, 5]
+        }
+    },
+    "ws2812": {
+        "pin": "E7"
+    },
+    "processor": "at90usb1286",
+    "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "nkro": true,
+        "pointing_device": true
+    },
+    "layouts": {
+        "LAYOUT_4x6_right": {
+            "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": [5, 0], "x": 11, "y": 0},
+                {"matrix": [5, 1], "x": 12, "y": 0},
+                {"matrix": [5, 2], "x": 13, "y": 0},
+                {"matrix": [5, 3], "x": 14, "y": 0},
+                {"matrix": [5, 4], "x": 15, "y": 0},
+                {"matrix": [5, 5], "x": 16, "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": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+
+                {"matrix": [6, 0], "x": 11, "y": 1},
+                {"matrix": [6, 1], "x": 12, "y": 1},
+                {"matrix": [6, 2], "x": 13, "y": 1},
+                {"matrix": [6, 3], "x": 14, "y": 1},
+                {"matrix": [6, 4], "x": 15, "y": 1},
+                {"matrix": [6, 5], "x": 16, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+
+                {"matrix": [7, 0], "x": 11, "y": 2},
+                {"matrix": [7, 1], "x": 12, "y": 2},
+                {"matrix": [7, 2], "x": 13, "y": 2},
+                {"matrix": [7, 3], "x": 14, "y": 2},
+                {"matrix": [7, 4], "x": 15, "y": 2},
+                {"matrix": [7, 5], "x": 16, "y": 2},
+
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+
+                {"matrix": [8, 2], "x": 13, "y": 3},
+                {"matrix": [8, 3], "x": 14, "y": 3},
+
+                {"matrix": [3, 4], "x": 4, "y": 4},
+                {"matrix": [3, 5], "x": 5, "y": 4},
+
+                {"matrix": [8, 1], "x": 12, "y": 4},
+
+                {"matrix": [4, 4], "x": 6, "y": 5},
+                {"matrix": [4, 5], "x": 7, "y": 5},
+
+                {"matrix": [9, 1], "x": 10, "y": 5},
+
+                {"matrix": [4, 2], "x": 6, "y": 6},
+                {"matrix": [4, 3], "x": 7, "y": 6},
+
+                {"matrix": [9, 2], "x": 9, "y": 6},
+                {"matrix": [9, 3], "x": 10, "y": 6}
+            ]
+        }
+    }
+}
diff --git a/keyboards/handwired/tractyl_manuform/4x6_right/rules.mk b/keyboards/handwired/tractyl_manuform/4x6_right/rules.mk
index 0b23bdc61ff..0f3d0657aa4 100644
--- a/keyboards/handwired/tractyl_manuform/4x6_right/rules.mk
+++ b/keyboards/handwired/tractyl_manuform/4x6_right/rules.mk
@@ -1,17 +1,2 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-RGB_MATRIX_ENABLE = no
-
-POINTING_DEVICE_ENABLE = yes
 POINTING_DEVICE_DRIVER = pmw3360
 MOUSE_SHARED_EP = yes
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/elite_c/info.json b/keyboards/handwired/tractyl_manuform/5x6_right/elite_c/info.json
deleted file mode 100644
index 92e0baace1f..00000000000
--- a/keyboards/handwired/tractyl_manuform/5x6_right/elite_c/info.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-    "keyboard_name": "Tractyl Manuform (5x6) Elite-C",
-    "matrix_pins": {
-        "cols": ["D4", "D7", "E6", "B4", "B5", "B7"],
-        "rows": ["F7", "F6", "F5", "F4", "F1", "F0"]
-    },
-    "diode_direction": "COL2ROW",
-    "encoder": {
-        "rotary": [
-            {"pin_a": "D5", "pin_b": "C7"}
-        ]
-    },
-    "split": {
-        "soft_serial_pin": "D2"
-    },
-    "ws2812": {
-        "pin": "D3"
-    },
-    "rgblight": {
-        "led_count": 20,
-        "max_brightness": 80,
-        "split_count": [10, 10]
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu"
-}
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/elite_c/keyboard.json b/keyboards/handwired/tractyl_manuform/5x6_right/elite_c/keyboard.json
new file mode 100644
index 00000000000..e6c0e42bde9
--- /dev/null
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/elite_c/keyboard.json
@@ -0,0 +1,29 @@
+{
+    "keyboard_name": "Tractyl Manuform (5x6) Elite-C",
+    "matrix_pins": {
+        "cols": ["D4", "D7", "E6", "B4", "B5", "B7"],
+        "rows": ["F7", "F6", "F5", "F4", "F1", "F0"]
+    },
+    "diode_direction": "COL2ROW",
+    "encoder": {
+        "rotary": [
+            {"pin_a": "D5", "pin_b": "C7"}
+        ]
+    },
+    "split": {
+        "soft_serial_pin": "D2"
+    },
+    "ws2812": {
+        "pin": "D3"
+    },
+    "rgblight": {
+        "led_count": 20,
+        "max_brightness": 80,
+        "split_count": [10, 10]
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "build": {
+        "lto": true
+    }
+}
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/elite_c/rules.mk b/keyboards/handwired/tractyl_manuform/5x6_right/elite_c/rules.mk
deleted file mode 100644
index 16c76d7f49b..00000000000
--- a/keyboards/handwired/tractyl_manuform/5x6_right/elite_c/rules.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-LTO_ENABLE := yes
-RGBLIGHT_ENABLE = no
-OLED_ENABLE = no
-AUDIO_ENABLE = no
-ENCODER_ENABLE = no
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/f303/info.json b/keyboards/handwired/tractyl_manuform/5x6_right/f303/info.json
deleted file mode 100644
index eafb77fce2b..00000000000
--- a/keyboards/handwired/tractyl_manuform/5x6_right/f303/info.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-    "keyboard_name": "Tractyl Manuform (5x6) Proton-C",
-    "matrix_pins": {
-        "cols": ["B0", "B1", "B2", "B3", "B4", "B5"],
-        "rows": ["B10", "B11", "B12", "A14", "A13", "A15"]
-    },
-    "diode_direction": "COL2ROW",
-    "eeprom": {
-        "driver": "spi"
-    },
-    "rgblight": {
-        "led_count": 20,
-        "split_count": [10, 10]
-    },
-    "ws2812": {
-        "pin": "A6",
-        "driver": "pwm"
-    },
-    "encoder": {
-        "rotary": [
-            {"pin_a": "A7", "pin_b": "A8"}
-        ]
-    },
-    "processor": "STM32F303",
-    "bootloader": "stm32-dfu"
-}
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/f303/keyboard.json b/keyboards/handwired/tractyl_manuform/5x6_right/f303/keyboard.json
new file mode 100644
index 00000000000..499390c6107
--- /dev/null
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/f303/keyboard.json
@@ -0,0 +1,31 @@
+{
+    "keyboard_name": "Tractyl Manuform (5x6) Proton-C",
+    "matrix_pins": {
+        "cols": ["B0", "B1", "B2", "B3", "B4", "B5"],
+        "rows": ["B10", "B11", "B12", "A14", "A13", "A15"]
+    },
+    "diode_direction": "COL2ROW",
+    "eeprom": {
+        "driver": "spi"
+    },
+    "rgblight": {
+        "led_count": 20,
+        "split_count": [10, 10]
+    },
+    "audio": {
+        "driver": "dac_additive"
+    },
+    "ws2812": {
+        "pin": "A6",
+        "driver": "pwm"
+    },
+    "encoder": {
+        "rotary": [
+            {"pin_a": "A7", "pin_b": "A8"}
+        ]
+    },
+    "development_board": "proton_c",
+    "features": {
+        "console": true
+    }
+}
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/f303/rules.mk b/keyboards/handwired/tractyl_manuform/5x6_right/f303/rules.mk
index ab601e31f9a..22915ec0001 100644
--- a/keyboards/handwired/tractyl_manuform/5x6_right/f303/rules.mk
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/f303/rules.mk
@@ -1,5 +1,3 @@
 # KEYBOARD_SHARED_EP = yes
-CONSOLE_ENABLE     = yes
 
 SERIAL_DRIVER = usart
-AUDIO_DRIVER  = dac_additive
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/f411/info.json b/keyboards/handwired/tractyl_manuform/5x6_right/f411/info.json
deleted file mode 100644
index e5a6dc6c7a2..00000000000
--- a/keyboards/handwired/tractyl_manuform/5x6_right/f411/info.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-    "keyboard_name": "Tractyl Manuform (5x6) BlackPill",
-    "matrix_pins": {
-        "cols": ["A15", "B3", "B4", "B5", "B6", "B7"],
-        "rows": ["B12", "B13", "B14", "B15", "A8", "A10"]
-    },
-    "diode_direction": "COL2ROW",
-    "eeprom": {
-        "driver": "spi"
-    },
-    "rgblight": {
-        "led_count": 57,
-        "split_count": [26, 31]
-    },
-    "build": {
-        "debounce_type": "asym_eager_defer_pk"
-    },
-    "ws2812": {
-        "pin": "A1",
-        "driver": "pwm"
-    },
-    "encoder": {
-        "rotary": [
-            {"pin_a": "A13", "pin_b": "A14"}
-        ]
-    },
-    "processor": "STM32F411",
-    "bootloader": "stm32-dfu",
-    "board": "BLACKPILL_STM32_F411"
-}
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/f411/keyboard.json b/keyboards/handwired/tractyl_manuform/5x6_right/f411/keyboard.json
new file mode 100644
index 00000000000..7182ee17012
--- /dev/null
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/f411/keyboard.json
@@ -0,0 +1,36 @@
+{
+    "keyboard_name": "Tractyl Manuform (5x6) BlackPill",
+    "matrix_pins": {
+        "cols": ["A15", "B3", "B4", "B5", "B6", "B7"],
+        "rows": ["B12", "B13", "B14", "B15", "A8", "A10"]
+    },
+    "diode_direction": "COL2ROW",
+    "eeprom": {
+        "driver": "spi"
+    },
+    "rgblight": {
+        "led_count": 57,
+        "split_count": [26, 31]
+    },
+    "build": {
+        "debounce_type": "asym_eager_defer_pk"
+    },
+    "audio": {
+        "driver": "pwm_hardware"
+    },
+    "ws2812": {
+        "pin": "A1",
+        "driver": "pwm"
+    },
+    "encoder": {
+        "rotary": [
+            {"pin_a": "A13", "pin_b": "A14"}
+        ]
+    },
+    "development_board": "blackpill_f411",
+    "processor": "STM32F411",
+    "bootloader": "stm32-dfu",
+    "features": {
+        "console": true
+    }
+}
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/f411/rules.mk b/keyboards/handwired/tractyl_manuform/5x6_right/f411/rules.mk
index 0c4b05ee7e2..f26cbbced12 100644
--- a/keyboards/handwired/tractyl_manuform/5x6_right/f411/rules.mk
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/f411/rules.mk
@@ -1,6 +1,4 @@
 KEYBOARD_SHARED_EP = yes
-CONSOLE_ENABLE     = yes
 MOUSE_SHARED_EP    = yes
 
 SERIAL_DRIVER = usart
-AUDIO_DRIVER  = pwm_hardware
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/info.json b/keyboards/handwired/tractyl_manuform/5x6_right/info.json
index c9fe6e89cff..b28f309fdbb 100644
--- a/keyboards/handwired/tractyl_manuform/5x6_right/info.json
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/info.json
@@ -10,6 +10,14 @@
             "matrix": [6, 5]
         }
     },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "nkro": true,
+        "swap_hands": true,
+        "pointing_device": true
+    },
     "layouts": {
         "LAYOUT_5x6_right": {
             "layout": [
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/rules.mk b/keyboards/handwired/tractyl_manuform/5x6_right/rules.mk
index 220a361a4cc..b7f7c949ec4 100644
--- a/keyboards/handwired/tractyl_manuform/5x6_right/rules.mk
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/rules.mk
@@ -1,18 +1,3 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-SWAP_HANDS_ENABLE = yes
-
-POINTING_DEVICE_ENABLE = yes
 POINTING_DEVICE_DRIVER = pmw3360
 MOUSE_SHARED_EP = yes
 
diff --git a/keyboards/handwired/twadlee/tp69/info.json b/keyboards/handwired/twadlee/tp69/info.json
deleted file mode 100644
index afd79a9bcc6..00000000000
--- a/keyboards/handwired/twadlee/tp69/info.json
+++ /dev/null
@@ -1,97 +0,0 @@
-{
-    "keyboard_name": "TP69",
-    "manufacturer": "Tracy Wadleigh",
-    "url": "https://github.com/twadleigh/qmk_firmware",
-    "maintainer": "qmk",
-    "usb": {
-        "vid": "0xBEEF",
-        "pid": "0xCACA",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["D5", "D6", "A4", "B16", "B17", "A1", "A2", "D7"],
-        "rows": ["B2", "B1", "B0", "C0", "D1", "D0", "D3", "D4", "D2", "C3"]
-    },
-    "diode_direction": "COL2ROW",
-    "processor": "MKL26Z64",
-    "bootloader": "halfkay",
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [5, 0], "x": 8, "y": 0},
-                {"matrix": [5, 1], "x": 9, "y": 0},
-                {"matrix": [5, 2], "x": 10, "y": 0},
-                {"matrix": [5, 3], "x": 11, "y": 0},
-                {"matrix": [5, 4], "x": 12, "y": 0},
-                {"matrix": [5, 5], "x": 13, "y": 0},
-                {"matrix": [5, 6], "x": 14, "y": 0},
-                {"matrix": [5, 7], "x": 15, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 3], "x": 2.5, "y": 1},
-                {"matrix": [1, 4], "x": 3.5, "y": 1},
-                {"matrix": [1, 5], "x": 4.5, "y": 1},
-                {"matrix": [1, 6], "x": 5.5, "y": 1},
-                {"matrix": [1, 7], "x": 6.5, "y": 1},
-                {"matrix": [6, 0], "x": 7.5, "y": 1},
-                {"matrix": [6, 1], "x": 8.5, "y": 1},
-                {"matrix": [6, 2], "x": 9.5, "y": 1},
-                {"matrix": [6, 3], "x": 10.5, "y": 1},
-                {"matrix": [6, 4], "x": 11.5, "y": 1},
-                {"matrix": [6, 5], "x": 12.5, "y": 1},
-                {"matrix": [6, 6], "x": 13.5, "y": 1},
-                {"matrix": [6, 7], "x": 14.5, "y": 1, "w": 1.5},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 3], "x": 2.75, "y": 2},
-                {"matrix": [2, 4], "x": 3.75, "y": 2},
-                {"matrix": [2, 5], "x": 4.75, "y": 2},
-                {"matrix": [2, 7], "x": 5.75, "y": 2},
-                {"matrix": [7, 0], "x": 7.75, "y": 2},
-                {"matrix": [7, 1], "x": 8.75, "y": 2},
-                {"matrix": [7, 2], "x": 9.75, "y": 2},
-                {"matrix": [7, 3], "x": 10.75, "y": 2},
-                {"matrix": [7, 4], "x": 11.75, "y": 2},
-                {"matrix": [7, 5], "x": 12.75, "y": 2},
-                {"matrix": [7, 7], "x": 13.75, "y": 2, "w": 2.25},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 2], "x": 2.25, "y": 3},
-                {"matrix": [3, 3], "x": 3.25, "y": 3},
-                {"matrix": [3, 4], "x": 4.25, "y": 3},
-                {"matrix": [3, 5], "x": 5.25, "y": 3},
-                {"matrix": [3, 6], "x": 6.25, "y": 3},
-                {"matrix": [3, 7], "x": 7.25, "y": 3},
-                {"matrix": [8, 1], "x": 8.25, "y": 3},
-                {"matrix": [8, 2], "x": 9.25, "y": 3},
-                {"matrix": [8, 3], "x": 10.25, "y": 3},
-                {"matrix": [8, 4], "x": 11.25, "y": 3},
-                {"matrix": [8, 5], "x": 12.25, "y": 3},
-                {"matrix": [8, 6], "x": 13.25, "y": 3, "w": 2.75},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 4], "x": 3.75, "y": 4, "w": 2},
-                {"matrix": [4, 6], "x": 5.75, "y": 4},
-                {"matrix": [4, 7], "x": 6.75, "y": 4},
-                {"matrix": [9, 1], "x": 7.75, "y": 4},
-                {"matrix": [9, 2], "x": 8.75, "y": 4, "w": 2.25},
-                {"matrix": [9, 4], "x": 11, "y": 4, "w": 1.25},
-                {"matrix": [9, 5], "x": 12.25, "y": 4, "w": 1.25},
-                {"matrix": [9, 6], "x": 13.5, "y": 4, "w": 1.25},
-                {"matrix": [9, 7], "x": 14.75, "y": 4, "w": 1.25}
-            ]
-        }
-    }
-}
diff --git a/keyboards/handwired/twadlee/tp69/keyboard.json b/keyboards/handwired/twadlee/tp69/keyboard.json
new file mode 100644
index 00000000000..27e0325f92d
--- /dev/null
+++ b/keyboards/handwired/twadlee/tp69/keyboard.json
@@ -0,0 +1,104 @@
+{
+    "keyboard_name": "TP69",
+    "manufacturer": "Tracy Wadleigh",
+    "url": "https://github.com/twadleigh/qmk_firmware",
+    "maintainer": "qmk",
+    "usb": {
+        "vid": "0xBEEF",
+        "pid": "0xCACA",
+        "device_version": "0.0.1"
+    },
+    "matrix_pins": {
+        "cols": ["D5", "D6", "A4", "B16", "B17", "A1", "A2", "D7"],
+        "rows": ["B2", "B1", "B0", "C0", "D1", "D0", "D3", "D4", "D2", "C3"]
+    },
+    "diode_direction": "COL2ROW",
+    "processor": "MKL26Z64",
+    "bootloader": "halfkay",
+    "features": {
+        "bootmagic": false,
+        "mousekey": true,
+        "extrakey": true,
+        "console": true,
+        "command": true
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [5, 0], "x": 8, "y": 0},
+                {"matrix": [5, 1], "x": 9, "y": 0},
+                {"matrix": [5, 2], "x": 10, "y": 0},
+                {"matrix": [5, 3], "x": 11, "y": 0},
+                {"matrix": [5, 4], "x": 12, "y": 0},
+                {"matrix": [5, 5], "x": 13, "y": 0},
+                {"matrix": [5, 6], "x": 14, "y": 0},
+                {"matrix": [5, 7], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 3], "x": 2.5, "y": 1},
+                {"matrix": [1, 4], "x": 3.5, "y": 1},
+                {"matrix": [1, 5], "x": 4.5, "y": 1},
+                {"matrix": [1, 6], "x": 5.5, "y": 1},
+                {"matrix": [1, 7], "x": 6.5, "y": 1},
+                {"matrix": [6, 0], "x": 7.5, "y": 1},
+                {"matrix": [6, 1], "x": 8.5, "y": 1},
+                {"matrix": [6, 2], "x": 9.5, "y": 1},
+                {"matrix": [6, 3], "x": 10.5, "y": 1},
+                {"matrix": [6, 4], "x": 11.5, "y": 1},
+                {"matrix": [6, 5], "x": 12.5, "y": 1},
+                {"matrix": [6, 6], "x": 13.5, "y": 1},
+                {"matrix": [6, 7], "x": 14.5, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 3], "x": 2.75, "y": 2},
+                {"matrix": [2, 4], "x": 3.75, "y": 2},
+                {"matrix": [2, 5], "x": 4.75, "y": 2},
+                {"matrix": [2, 7], "x": 5.75, "y": 2},
+                {"matrix": [7, 0], "x": 7.75, "y": 2},
+                {"matrix": [7, 1], "x": 8.75, "y": 2},
+                {"matrix": [7, 2], "x": 9.75, "y": 2},
+                {"matrix": [7, 3], "x": 10.75, "y": 2},
+                {"matrix": [7, 4], "x": 11.75, "y": 2},
+                {"matrix": [7, 5], "x": 12.75, "y": 2},
+                {"matrix": [7, 7], "x": 13.75, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [8, 1], "x": 8.25, "y": 3},
+                {"matrix": [8, 2], "x": 9.25, "y": 3},
+                {"matrix": [8, 3], "x": 10.25, "y": 3},
+                {"matrix": [8, 4], "x": 11.25, "y": 3},
+                {"matrix": [8, 5], "x": 12.25, "y": 3},
+                {"matrix": [8, 6], "x": 13.25, "y": 3, "w": 2.75},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 3.75, "y": 4, "w": 2},
+                {"matrix": [4, 6], "x": 5.75, "y": 4},
+                {"matrix": [4, 7], "x": 6.75, "y": 4},
+                {"matrix": [9, 1], "x": 7.75, "y": 4},
+                {"matrix": [9, 2], "x": 8.75, "y": 4, "w": 2.25},
+                {"matrix": [9, 4], "x": 11, "y": 4, "w": 1.25},
+                {"matrix": [9, 5], "x": 12.25, "y": 4, "w": 1.25},
+                {"matrix": [9, 6], "x": 13.5, "y": 4, "w": 1.25},
+                {"matrix": [9, 7], "x": 14.75, "y": 4, "w": 1.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/handwired/twadlee/tp69/rules.mk b/keyboards/handwired/twadlee/tp69/rules.mk
index b73afc0e44a..43b04f34f77 100644
--- a/keyboards/handwired/twadlee/tp69/rules.mk
+++ b/keyboards/handwired/twadlee/tp69/rules.mk
@@ -1,16 +1 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = yes        # Console for debug
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-PS2_MOUSE_ENABLE = no
-
 USE_CHIBIOS_CONTRIB = yes
-
diff --git a/keyboards/handwired/twig/twig50/keyboard.json b/keyboards/handwired/twig/twig50/keyboard.json
index aa78691838c..f1cc2f5a969 100644
--- a/keyboards/handwired/twig/twig50/keyboard.json
+++ b/keyboards/handwired/twig/twig50/keyboard.json
@@ -26,9 +26,7 @@
       "rows": ["B7", "B6", "B5", "B4"]
     },
     "diode_direction": "COL2ROW",
-    "processor": "STM32F303",
-    "bootloader": "stm32-dfu",
-    "board": "QMK_PROTON_C",
+    "development_board": "proton_c",
     "debounce": 8,
     "layouts": {
         "LAYOUT_diag_4x14": {
diff --git a/keyboards/handwired/unk/rev1/keyboard.json b/keyboards/handwired/unk/rev1/keyboard.json
index fc1cfc90b72..acaca15f3b3 100644
--- a/keyboards/handwired/unk/rev1/keyboard.json
+++ b/keyboards/handwired/unk/rev1/keyboard.json
@@ -31,6 +31,12 @@
     },
     "processor": "atmega32u4",
     "bootloader": "caterina",
+    "features": {
+        "bootmagic": false,
+        "mousekey": true,
+        "extrakey": true,
+        "command": true
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/handwired/unk/rules.mk b/keyboards/handwired/unk/rules.mk
index a03f28dbf5f..d4536e0cbb6 100644
--- a/keyboards/handwired/unk/rules.mk
+++ b/keyboards/handwired/unk/rules.mk
@@ -1,14 +1 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
 DEFAULT_FOLDER = handwired/unk/rev1
diff --git a/keyboards/handwired/uthol/rev3/info.json b/keyboards/handwired/uthol/rev3/info.json
deleted file mode 100644
index dbbce9139dc..00000000000
--- a/keyboards/handwired/uthol/rev3/info.json
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-    "keyboard_name": "UtholThree",
-    "usb": {
-        "device_version": "0.0.3"
-    },
-    "rgblight": {
-        "led_count": 39,
-        "animations": {
-            "breathing": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "snake": true,
-            "knight": true,
-            "christmas": true,
-            "static_gradient": true,
-            "rgb_test": true,
-            "alternating": true,
-            "twinkle": true
-        },
-        "default": {
-            "hue": 201
-        }
-    },
-    "tapping": {
-        "term": 500
-    },
-    "ws2812": {
-        "pin": "B0"
-    },
-    "matrix_pins": {
-        "cols": ["B1", "B10", "B9", "B8", "B5", "B4", "B3", "A15", "B15", "B14", "B13", "B12"],
-        "rows": ["A4", "A3", "A2", "A1", "A0"]
-    },
-    "diode_direction": "COL2ROW",
-    "encoder": {
-        "rotary": [
-            {"pin_a": "C15", "pin_b": "C14", "resolution": 2}
-        ]
-    },
-    "processor": "STM32F401",
-    "bootloader": "stm32-dfu",
-    "board": "BLACKPILL_STM32_F401"
-}
diff --git a/keyboards/handwired/uthol/rev3/keyboard.json b/keyboards/handwired/uthol/rev3/keyboard.json
new file mode 100644
index 00000000000..8d826772b06
--- /dev/null
+++ b/keyboards/handwired/uthol/rev3/keyboard.json
@@ -0,0 +1,53 @@
+{
+    "keyboard_name": "UtholThree",
+    "usb": {
+        "device_version": "0.0.3",
+        "shared_endpoint": {
+            "keyboard": true
+        }
+    },
+    "rgblight": {
+        "led_count": 39,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": true,
+            "twinkle": true
+        },
+        "default": {
+            "hue": 201
+        }
+    },
+    "tapping": {
+        "term": 500
+    },
+    "ws2812": {
+        "pin": "B0"
+    },
+    "matrix_pins": {
+        "cols": ["B1", "B10", "B9", "B8", "B5", "B4", "B3", "A15", "B15", "B14", "B13", "B12"],
+        "rows": ["A4", "A3", "A2", "A1", "A0"]
+    },
+    "diode_direction": "COL2ROW",
+    "encoder": {
+        "rotary": [
+            {"pin_a": "C15", "pin_b": "C14", "resolution": 2}
+        ]
+    },
+    "development_board": "blackpill_f401",
+    "features": {
+        "bootmagic": true,
+        "nkro": true,
+        "oled": true,
+        "wpm": true,
+        "extrakey": true,
+        "encoder": true,
+        "rgblight": true
+    }
+}
diff --git a/keyboards/handwired/uthol/rev3/rules.mk b/keyboards/handwired/uthol/rev3/rules.mk
deleted file mode 100644
index 1577cf8a775..00000000000
--- a/keyboards/handwired/uthol/rev3/rules.mk
+++ /dev/null
@@ -1,11 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes
-NKRO_ENABLE = yes
-KEYBOARD_SHARED_EP = yes
-OLED_ENABLE = yes
-WPM_ENABLE = yes
-EXTRAKEY_ENABLE = yes
-ENCODER_ENABLE = yes
-RGBLIGHT_ENABLE = yes
diff --git a/keyboards/handwired/wulkan/info.json b/keyboards/handwired/wulkan/info.json
deleted file mode 100644
index 9bb1d9cd940..00000000000
--- a/keyboards/handwired/wulkan/info.json
+++ /dev/null
@@ -1,81 +0,0 @@
-{
-    "keyboard_name": "Handwired48Keys",
-    "manufacturer": "Wulkan",
-    "url": "",
-    "maintainer": "Napoleon Wulkan",
-    "usb": {
-      "vid": "0xFEED",
-      "pid": "0x6060",
-      "device_version": "0.0.1",
-      "force_nkro": true
-    },
-    "matrix_pins": {
-      "cols": ["B13", "B14", "B15", "B9", "B7", "B6", "B5", "B4", "B3", "B2", "B1", "B0"],
-      "rows": ["B8", "A0", "A1", "A2"]
-    },
-    "diode_direction": "COL2ROW",
-    "processor": "STM32F303",
-    "bootloader": "stm32-dfu",
-    "board": "QMK_PROTON_C",
-    "community_layouts": ["ortho_4x12"],
-    "layout_aliases": {
-      "LAYOUT": "LAYOUT_ortho_4x12"
-    },
-    "layouts": {
-      "LAYOUT_ortho_4x12": {
-        "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": [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": [1, 4], "x": 4, "y": 1},
-          {"matrix": [1, 5], "x": 5, "y": 1},
-          {"matrix": [1, 6], "x": 6, "y": 1},
-          {"matrix": [1, 7], "x": 7, "y": 1},
-          {"matrix": [1, 8], "x": 8, "y": 1},
-          {"matrix": [1, 9], "x": 9, "y": 1},
-          {"matrix": [1, 10], "x": 10, "y": 1},
-          {"matrix": [1, 11], "x": 11, "y": 1},
-
-          {"matrix": [2, 0], "x": 0, "y": 2},
-          {"matrix": [2, 1], "x": 1, "y": 2},
-          {"matrix": [2, 2], "x": 2, "y": 2},
-          {"matrix": [2, 3], "x": 3, "y": 2},
-          {"matrix": [2, 4], "x": 4, "y": 2},
-          {"matrix": [2, 5], "x": 5, "y": 2},
-          {"matrix": [2, 6], "x": 6, "y": 2},
-          {"matrix": [2, 7], "x": 7, "y": 2},
-          {"matrix": [2, 8], "x": 8, "y": 2},
-          {"matrix": [2, 9], "x": 9, "y": 2},
-          {"matrix": [2, 10], "x": 10, "y": 2},
-          {"matrix": [2, 11], "x": 11, "y": 2},
-
-          {"matrix": [3, 0], "x": 0, "y": 3},
-          {"matrix": [3, 1], "x": 1, "y": 3},
-          {"matrix": [3, 2], "x": 2, "y": 3},
-          {"matrix": [3, 3], "x": 3, "y": 3},
-          {"matrix": [3, 4], "x": 4, "y": 3},
-          {"matrix": [3, 5], "x": 5, "y": 3},
-          {"matrix": [3, 6], "x": 6, "y": 3},
-          {"matrix": [3, 7], "x": 7, "y": 3},
-          {"matrix": [3, 8], "x": 8, "y": 3},
-          {"matrix": [3, 9], "x": 9, "y": 3},
-          {"matrix": [3, 10], "x": 10, "y": 3},
-          {"matrix": [3, 11], "x": 11, "y": 3}
-        ]
-      }
-    }
-  }
diff --git a/keyboards/handwired/wulkan/keyboard.json b/keyboards/handwired/wulkan/keyboard.json
new file mode 100644
index 00000000000..eceeb5c145e
--- /dev/null
+++ b/keyboards/handwired/wulkan/keyboard.json
@@ -0,0 +1,85 @@
+{
+    "keyboard_name": "Handwired48Keys",
+    "manufacturer": "Wulkan",
+    "url": "",
+    "maintainer": "Napoleon Wulkan",
+    "usb": {
+      "vid": "0xFEED",
+      "pid": "0x6060",
+      "device_version": "0.0.1",
+      "force_nkro": true
+    },
+    "matrix_pins": {
+      "cols": ["B13", "B14", "B15", "B9", "B7", "B6", "B5", "B4", "B3", "B2", "B1", "B0"],
+      "rows": ["B8", "A0", "A1", "A2"]
+    },
+    "diode_direction": "COL2ROW",
+    "development_board": "proton_c",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "nkro": true
+    },
+    "community_layouts": ["ortho_4x12"],
+    "layout_aliases": {
+      "LAYOUT": "LAYOUT_ortho_4x12"
+    },
+    "layouts": {
+      "LAYOUT_ortho_4x12": {
+        "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": [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": [1, 4], "x": 4, "y": 1},
+          {"matrix": [1, 5], "x": 5, "y": 1},
+          {"matrix": [1, 6], "x": 6, "y": 1},
+          {"matrix": [1, 7], "x": 7, "y": 1},
+          {"matrix": [1, 8], "x": 8, "y": 1},
+          {"matrix": [1, 9], "x": 9, "y": 1},
+          {"matrix": [1, 10], "x": 10, "y": 1},
+          {"matrix": [1, 11], "x": 11, "y": 1},
+
+          {"matrix": [2, 0], "x": 0, "y": 2},
+          {"matrix": [2, 1], "x": 1, "y": 2},
+          {"matrix": [2, 2], "x": 2, "y": 2},
+          {"matrix": [2, 3], "x": 3, "y": 2},
+          {"matrix": [2, 4], "x": 4, "y": 2},
+          {"matrix": [2, 5], "x": 5, "y": 2},
+          {"matrix": [2, 6], "x": 6, "y": 2},
+          {"matrix": [2, 7], "x": 7, "y": 2},
+          {"matrix": [2, 8], "x": 8, "y": 2},
+          {"matrix": [2, 9], "x": 9, "y": 2},
+          {"matrix": [2, 10], "x": 10, "y": 2},
+          {"matrix": [2, 11], "x": 11, "y": 2},
+
+          {"matrix": [3, 0], "x": 0, "y": 3},
+          {"matrix": [3, 1], "x": 1, "y": 3},
+          {"matrix": [3, 2], "x": 2, "y": 3},
+          {"matrix": [3, 3], "x": 3, "y": 3},
+          {"matrix": [3, 4], "x": 4, "y": 3},
+          {"matrix": [3, 5], "x": 5, "y": 3},
+          {"matrix": [3, 6], "x": 6, "y": 3},
+          {"matrix": [3, 7], "x": 7, "y": 3},
+          {"matrix": [3, 8], "x": 8, "y": 3},
+          {"matrix": [3, 9], "x": 9, "y": 3},
+          {"matrix": [3, 10], "x": 10, "y": 3},
+          {"matrix": [3, 11], "x": 11, "y": 3}
+        ]
+      }
+    }
+  }
diff --git a/keyboards/handwired/wulkan/rules.mk b/keyboards/handwired/wulkan/rules.mk
index e664c345408..934dd273a65 100644
--- a/keyboards/handwired/wulkan/rules.mk
+++ b/keyboards/handwired/wulkan/rules.mk
@@ -1,13 +1 @@
-# Build Options
-#   change yes to no to disable
-#
-BACKLIGHT_ENABLE = no
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-AUDIO_ENABLE = no
-RGBLIGHT_ENABLE = no
 NO_SUSPEND_POWER_DOWN = yes
diff --git a/keyboards/handwired/xealous/rev1/keyboard.json b/keyboards/handwired/xealous/rev1/keyboard.json
index 001cd82074c..9f926a36021 100644
--- a/keyboards/handwired/xealous/rev1/keyboard.json
+++ b/keyboards/handwired/xealous/rev1/keyboard.json
@@ -22,6 +22,15 @@
   },
   "processor": "atmega32u4",
   "bootloader": "caterina",
+  "features": {
+    "bootmagic": false,
+    "mousekey": false,
+    "extrakey": true,
+    "console": true,
+    "command": true,
+    "nkro": true,
+    "audio": true
+  },
   "layouts": {
     "LAYOUT": {
       "layout": [
diff --git a/keyboards/handwired/xealous/rules.mk b/keyboards/handwired/xealous/rules.mk
index aa77674920d..4a97d066df7 100644
--- a/keyboards/handwired/xealous/rules.mk
+++ b/keyboards/handwired/xealous/rules.mk
@@ -1,16 +1,3 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = yes        # Console for debug
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-AUDIO_ENABLE = yes          # Audio output
-RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight.
-
 SRC += matrix.c
 
 DEFAULT_FOLDER = handwired/xealous/rev1
diff --git a/keyboards/hardwareabstraction/handwire/info.json b/keyboards/hardwareabstraction/handwire/info.json
deleted file mode 100644
index 6fa33228df8..00000000000
--- a/keyboards/hardwareabstraction/handwire/info.json
+++ /dev/null
@@ -1,99 +0,0 @@
-{
-    "manufacturer": "Hardware Abstraction",
-    "keyboard_name": "handwire",
-    "maintainer": "cgmandy",
-    "bootloader": "atmel-dfu",
-    "diode_direction": "COL2ROW",
-    "features": {
-        "bootmagic": true,
-        "command": false,
-        "console": false,
-        "extrakey": true,
-        "mousekey": true,
-        "nkro": true
-    },
-    "matrix_pins": {
-        "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"],
-        "rows": ["B0", "B7", "D5", "D3", "D2"]
-    },
-    "processor": "atmega32u4",
-    "url": "https://github.com/cgmandy",
-    "usb": {
-        "device_version": "1.0.0",
-        "vid": "0xAF01",
-        "pid": "0x0001"
-    },
-    "layouts": {
-        "LAYOUT_60_arrows": {
-            "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], "w": 2, "x": 13, "y": 0},
-
-                {"matrix": [1, 0], "w": 1.5, "x": 0, "y": 1},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 13], "w": 1.5, "x": 13.5, "y": 1},
-
-                {"matrix": [2, 0], "w": 1.75, "x": 0, "y": 2},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 13], "w": 2.25, "x": 12.75, "y": 2},
-
-                {"matrix": [3, 0], "w": 2.25, "x": 0, "y": 3},
-                {"matrix": [3, 1], "x": 2.25, "y": 3},
-                {"matrix": [3, 2], "x": 3.25, "y": 3},
-                {"matrix": [3, 3], "x": 4.25, "y": 3},
-                {"matrix": [3, 4], "x": 5.25, "y": 3},
-                {"matrix": [3, 5], "x": 6.25, "y": 3},
-                {"matrix": [3, 6], "x": 7.25, "y": 3},
-                {"matrix": [3, 7], "x": 8.25, "y": 3},
-                {"matrix": [3, 8], "x": 9.25, "y": 3},
-                {"matrix": [3, 9], "x": 10.25, "y": 3},
-                {"matrix": [3, 10], "w": 1.75, "x": 11.25, "y": 3},
-                {"matrix": [3, 12], "x": 13, "y": 3},
-                {"matrix": [3, 13], "x": 14, "y": 3},
-
-                {"matrix": [4, 0], "w": 1.25, "x": 0, "y": 4},
-                {"matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4},
-                {"matrix": [4, 2], "w": 1.25, "x": 2.5, "y": 4},
-                {"matrix": [4, 5], "w": 6.25, "x": 3.75, "y": 4},
-                {"matrix": [4, 8], "x": 10, "y": 4},
-                {"matrix": [4, 9], "x": 11, "y": 4},
-                {"matrix": [4, 10], "x": 12, "y": 4},
-                {"matrix": [4, 12], "x": 13, "y": 4},
-                {"matrix": [4, 13], "x": 14, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/hardwareabstraction/handwire/keyboard.json b/keyboards/hardwareabstraction/handwire/keyboard.json
new file mode 100644
index 00000000000..225712dcc4f
--- /dev/null
+++ b/keyboards/hardwareabstraction/handwire/keyboard.json
@@ -0,0 +1,108 @@
+{
+    "manufacturer": "Hardware Abstraction",
+    "keyboard_name": "handwire",
+    "maintainer": "cgmandy",
+    "bootloader": "atmel-dfu",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "haptic": true,
+        "oled": true,
+        "wpm": true
+    },
+    "haptic": {
+        "driver": "solenoid"
+    },
+    "build": {
+        "lto": true
+    },
+    "matrix_pins": {
+        "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"],
+        "rows": ["B0", "B7", "D5", "D3", "D2"]
+    },
+    "processor": "atmega32u4",
+    "url": "https://github.com/cgmandy",
+    "usb": {
+        "device_version": "1.0.0",
+        "vid": "0xAF01",
+        "pid": "0x0001"
+    },
+    "layouts": {
+        "LAYOUT_60_arrows": {
+            "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], "w": 2, "x": 13, "y": 0},
+
+                {"matrix": [1, 0], "w": 1.5, "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "w": 1.5, "x": 13.5, "y": 1},
+
+                {"matrix": [2, 0], "w": 1.75, "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "w": 2.25, "x": 12.75, "y": 2},
+
+                {"matrix": [3, 0], "w": 2.25, "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 10], "w": 1.75, "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 13, "y": 3},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+
+                {"matrix": [4, 0], "w": 1.25, "x": 0, "y": 4},
+                {"matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4},
+                {"matrix": [4, 2], "w": 1.25, "x": 2.5, "y": 4},
+                {"matrix": [4, 5], "w": 6.25, "x": 3.75, "y": 4},
+                {"matrix": [4, 8], "x": 10, "y": 4},
+                {"matrix": [4, 9], "x": 11, "y": 4},
+                {"matrix": [4, 10], "x": 12, "y": 4},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/hardwareabstraction/handwire/rules.mk b/keyboards/hardwareabstraction/handwire/rules.mk
deleted file mode 100644
index 8a33a553313..00000000000
--- a/keyboards/hardwareabstraction/handwire/rules.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-LTO_ENABLE = yes
-HAPTIC_ENABLE = yes
-HAPTIC_DRIVER = solenoid
-
-OLED_ENABLE = yes
-
-WPM_ENABLE = yes
diff --git a/keyboards/hazel/bad_wings/info.json b/keyboards/hazel/bad_wings/info.json
deleted file mode 100644
index 070a69f6917..00000000000
--- a/keyboards/hazel/bad_wings/info.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-  "keyboard_name": "Bad Wings",
-  "manufacturer": "Hazel",
-  "maintainer": "jasonhazel",
-  "url": "https://shop.hazel.cc/products/bad-wings",
-  "usb": {
-    "vid": "0x4A48",
-    "pid": "0x4257",
-    "device_version": "1.0.0"
-  },
-  "processor": "RP2040",
-  "bootloader": "rp2040",
-  "matrix_size": {
-    "cols": 8,
-    "rows": 5
-  },
-  "diode_direction": "COL2ROW",
-  "features": {
-    "bootmagic": true,
-    "deferred_exec": true,
-    "nkro": false
-  },
-  "community_layouts": ["split_3x5_3"],
-  "layouts": {
-    "LAYOUT_split_3x5_3": {
-      "layout": [
-        {"label": "K00", "matrix": [0, 0], "x": 0, "y": 0.75},
-        {"label": "K10", "matrix": [1, 0], "x": 1, "y": 0.5},
-        {"label": "K20", "matrix": [2, 0], "x": 2, "y": 0},
-        {"label": "K30", "matrix": [3, 0], "x": 3, "y": 0.25},
-        {"label": "K40", "matrix": [4, 0], "x": 4, "y": 0.36},
-        {"label": "K44", "matrix": [4, 4], "x": 8, "y": 0.36},
-        {"label": "K34", "matrix": [3, 4], "x": 9, "y": 0.25},
-        {"label": "K24", "matrix": [2, 4], "x": 10, "y": 0},
-        {"label": "K14", "matrix": [1, 4], "x": 11, "y": 0.5},
-        {"label": "K04", "matrix": [0, 4], "x": 12, "y": 0.75},
-        {"label": "K01", "matrix": [0, 1], "x": 0, "y": 1.75},
-        {"label": "K11", "matrix": [1, 1], "x": 1, "y": 1.5},
-        {"label": "K21", "matrix": [2, 1], "x": 2, "y": 1},
-        {"label": "K31", "matrix": [3, 1], "x": 3, "y": 1.25},
-        {"label": "K41", "matrix": [4, 1], "x": 4, "y": 1.36},
-        {"label": "K45", "matrix": [4, 5], "x": 8, "y": 1.36},
-        {"label": "K35", "matrix": [3, 5], "x": 9, "y": 1.25},
-        {"label": "K25", "matrix": [2, 5], "x": 10, "y": 1},
-        {"label": "K15", "matrix": [1, 5], "x": 11, "y": 1.5},
-        {"label": "K05", "matrix": [0, 5], "x": 12, "y": 1.75},
-        {"label": "K02", "matrix": [0, 2], "x": 0, "y": 2.75},
-        {"label": "K12", "matrix": [1, 2], "x": 1, "y": 2.5},
-        {"label": "K22", "matrix": [2, 2], "x": 2, "y": 2},
-        {"label": "K32", "matrix": [3, 2], "x": 3, "y": 2.25},
-        {"label": "K42", "matrix": [4, 2], "x": 4, "y": 2.36},
-        {"label": "K46", "matrix": [4, 6], "x": 8, "y": 2.36},
-        {"label": "K36", "matrix": [3, 6], "x": 9, "y": 2.25},
-        {"label": "K26", "matrix": [2, 6], "x": 10, "y": 2},
-        {"label": "K16", "matrix": [1, 6], "x": 11, "y": 2.5},
-        {"label": "K06", "matrix": [0, 6], "x": 12, "y": 2.75},
-        {"label": "K23", "matrix": [2, 3], "x": 3, "y": 3.25},
-        {"label": "K33", "matrix": [3, 3], "x": 4, "y": 3.36},
-        {"label": "K43", "matrix": [4, 3], "x": 5, "y": 3.47},
-        {"label": "K47", "matrix": [4, 7], "x": 7, "y": 3.47},
-        {"label": "K37", "matrix": [3, 7], "x": 8, "y": 3.36},
-        {"label": "K27", "matrix": [2, 7], "x": 9, "y": 3.25}
-      ]
-    }
-  }
-}
diff --git a/keyboards/hazel/bad_wings/keyboard.json b/keyboards/hazel/bad_wings/keyboard.json
new file mode 100644
index 00000000000..fef514c539f
--- /dev/null
+++ b/keyboards/hazel/bad_wings/keyboard.json
@@ -0,0 +1,69 @@
+{
+  "keyboard_name": "Bad Wings",
+  "manufacturer": "Hazel",
+  "maintainer": "jasonhazel",
+  "url": "https://shop.hazel.cc/products/bad-wings",
+  "usb": {
+    "vid": "0x4A48",
+    "pid": "0x4257",
+    "device_version": "1.0.0"
+  },
+  "processor": "RP2040",
+  "bootloader": "rp2040",
+  "matrix_size": {
+    "cols": 8,
+    "rows": 5
+  },
+  "diode_direction": "COL2ROW",
+  "features": {
+    "bootmagic": true,
+    "deferred_exec": true,
+    "nkro": false,
+    "pointing_device": true,
+    "tri_layer": true,
+    "caps_word": true
+  },
+  "community_layouts": ["split_3x5_3"],
+  "layouts": {
+    "LAYOUT_split_3x5_3": {
+      "layout": [
+        {"label": "K00", "matrix": [0, 0], "x": 0, "y": 0.75},
+        {"label": "K10", "matrix": [1, 0], "x": 1, "y": 0.5},
+        {"label": "K20", "matrix": [2, 0], "x": 2, "y": 0},
+        {"label": "K30", "matrix": [3, 0], "x": 3, "y": 0.25},
+        {"label": "K40", "matrix": [4, 0], "x": 4, "y": 0.36},
+        {"label": "K44", "matrix": [4, 4], "x": 8, "y": 0.36},
+        {"label": "K34", "matrix": [3, 4], "x": 9, "y": 0.25},
+        {"label": "K24", "matrix": [2, 4], "x": 10, "y": 0},
+        {"label": "K14", "matrix": [1, 4], "x": 11, "y": 0.5},
+        {"label": "K04", "matrix": [0, 4], "x": 12, "y": 0.75},
+        {"label": "K01", "matrix": [0, 1], "x": 0, "y": 1.75},
+        {"label": "K11", "matrix": [1, 1], "x": 1, "y": 1.5},
+        {"label": "K21", "matrix": [2, 1], "x": 2, "y": 1},
+        {"label": "K31", "matrix": [3, 1], "x": 3, "y": 1.25},
+        {"label": "K41", "matrix": [4, 1], "x": 4, "y": 1.36},
+        {"label": "K45", "matrix": [4, 5], "x": 8, "y": 1.36},
+        {"label": "K35", "matrix": [3, 5], "x": 9, "y": 1.25},
+        {"label": "K25", "matrix": [2, 5], "x": 10, "y": 1},
+        {"label": "K15", "matrix": [1, 5], "x": 11, "y": 1.5},
+        {"label": "K05", "matrix": [0, 5], "x": 12, "y": 1.75},
+        {"label": "K02", "matrix": [0, 2], "x": 0, "y": 2.75},
+        {"label": "K12", "matrix": [1, 2], "x": 1, "y": 2.5},
+        {"label": "K22", "matrix": [2, 2], "x": 2, "y": 2},
+        {"label": "K32", "matrix": [3, 2], "x": 3, "y": 2.25},
+        {"label": "K42", "matrix": [4, 2], "x": 4, "y": 2.36},
+        {"label": "K46", "matrix": [4, 6], "x": 8, "y": 2.36},
+        {"label": "K36", "matrix": [3, 6], "x": 9, "y": 2.25},
+        {"label": "K26", "matrix": [2, 6], "x": 10, "y": 2},
+        {"label": "K16", "matrix": [1, 6], "x": 11, "y": 2.5},
+        {"label": "K06", "matrix": [0, 6], "x": 12, "y": 2.75},
+        {"label": "K23", "matrix": [2, 3], "x": 3, "y": 3.25},
+        {"label": "K33", "matrix": [3, 3], "x": 4, "y": 3.36},
+        {"label": "K43", "matrix": [4, 3], "x": 5, "y": 3.47},
+        {"label": "K47", "matrix": [4, 7], "x": 7, "y": 3.47},
+        {"label": "K37", "matrix": [3, 7], "x": 8, "y": 3.36},
+        {"label": "K27", "matrix": [2, 7], "x": 9, "y": 3.25}
+      ]
+    }
+  }
+}
diff --git a/keyboards/hazel/bad_wings/rules.mk b/keyboards/hazel/bad_wings/rules.mk
index 47a188155fe..a49017527d7 100644
--- a/keyboards/hazel/bad_wings/rules.mk
+++ b/keyboards/hazel/bad_wings/rules.mk
@@ -1,10 +1,6 @@
-TRI_LAYER_ENABLE = yes
-CAPS_WORD_ENABLE = yes
-
 SRC += matrix.c
 
 SPI_DRIVER_REQUIRED = yes
 CUSTOM_MATRIX = lite
 
 POINTING_DEVICE_DRIVER = cirque_pinnacle_spi
-POINTING_DEVICE_ENABLE  = yes
diff --git a/keyboards/hhkb/ansi/32u2/info.json b/keyboards/hhkb/ansi/32u2/info.json
deleted file mode 100644
index dd190d18ee0..00000000000
--- a/keyboards/hhkb/ansi/32u2/info.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "processor": "atmega32u2",
-    "bootloader": "atmel-dfu"
-}
diff --git a/keyboards/hhkb/ansi/32u2/keyboard.json b/keyboards/hhkb/ansi/32u2/keyboard.json
new file mode 100644
index 00000000000..d210808d984
--- /dev/null
+++ b/keyboards/hhkb/ansi/32u2/keyboard.json
@@ -0,0 +1,10 @@
+{
+    "processor": "atmega32u2",
+    "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": false
+    }
+}
diff --git a/keyboards/hhkb/ansi/32u2/rules.mk b/keyboards/hhkb/ansi/32u2/rules.mk
deleted file mode 100644
index 95a1d66061d..00000000000
--- a/keyboards/hhkb/ansi/32u2/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-CONSOLE_ENABLE = no   # Console for debug
-COMMAND_ENABLE = no   # Commands for debug and configuration
diff --git a/keyboards/hhkb/ansi/32u4/keyboard.json b/keyboards/hhkb/ansi/32u4/keyboard.json
index 042c41f34d6..1e47ddd20fe 100644
--- a/keyboards/hhkb/ansi/32u4/keyboard.json
+++ b/keyboards/hhkb/ansi/32u4/keyboard.json
@@ -1,4 +1,12 @@
 {
     "processor": "atmega32u4",
-    "bootloader": "atmel-dfu"
+    "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": true,
+        "command": true,
+        "console": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": false
+    }
 }
diff --git a/keyboards/hhkb/ansi/rules.mk b/keyboards/hhkb/ansi/rules.mk
index f5a147ccb9a..841565b8465 100644
--- a/keyboards/hhkb/ansi/rules.mk
+++ b/keyboards/hhkb/ansi/rules.mk
@@ -1,23 +1,6 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes  # Mouse keys
-EXTRAKEY_ENABLE = yes  # Audio control and System control
-CONSOLE_ENABLE = yes   # Console for debug
-COMMAND_ENABLE = yes   # Commands for debug and configuration
-CUSTOM_MATRIX = yes    # Custom matrix file for the HHKB
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no  # Enable keyboard backlight functionality
+CUSTOM_MATRIX = yes
 
 # project specific files
 SRC = matrix.c
 
-# debug-on: EXTRAFLAGS += -DDEBUG -DDEBUG_ACTION
-# debug-on: all
-
-# debug-off: EXTRAFLAGS += -DNO_DEBUG -DNO_PRINT
-# debug-off: OPT_DEFS := $(filter-out -DCONSOLE_ENABLE,$(OPT_DEFS))
-# debug-off: all
-
 DEFAULT_FOLDER = hhkb/ansi/32u4
diff --git a/keyboards/hhkb/jp/info.json b/keyboards/hhkb/jp/info.json
deleted file mode 100644
index 589cf98dde4..00000000000
--- a/keyboards/hhkb/jp/info.json
+++ /dev/null
@@ -1,94 +0,0 @@
-{
-  "keyboard_name": "JP",
-  "manufacturer": "HHKB",
-  "url": "",
-  "maintainer": "qmk",
-  "usb": {
-    "vid": "0x4848",
-    "pid": "0x0002",
-    "device_version": "1.0.4"
-  },
-  "processor": "atmega32u4",
-  "bootloader": "atmel-dfu",
-  "layouts": {
-    "LAYOUT_jp": {
-      "layout": [
-        {"matrix": [0, 2], "x": 0, "y": 0},
-        {"matrix": [3, 2], "x": 1, "y": 0},
-        {"matrix": [6, 2], "x": 2, "y": 0},
-        {"matrix": [2, 2], "x": 3, "y": 0},
-        {"matrix": [1, 2], "x": 4, "y": 0},
-        {"matrix": [5, 2], "x": 5, "y": 0},
-        {"matrix": [7, 2], "x": 6, "y": 0},
-        {"matrix": [10, 2], "x": 7, "y": 0},
-        {"matrix": [9, 2], "x": 8, "y": 0},
-        {"matrix": [8, 2], "x": 9, "y": 0},
-        {"matrix": [11, 2], "x": 10, "y": 0},
-        {"matrix": [14, 2], "x": 11, "y": 0},
-        {"matrix": [15, 2], "x": 12, "y": 0},
-        {"matrix": [13, 2], "x": 13, "y": 0},
-        {"matrix": [12, 2], "x": 14, "y": 0},
-
-        {"matrix": [0, 3], "x": 0, "y": 1, "w": 1.5},
-        {"matrix": [6, 3], "x": 1.5, "y": 1},
-        {"matrix": [2, 3], "x": 2.5, "y": 1},
-        {"matrix": [1, 3], "x": 3.5, "y": 1},
-        {"matrix": [5, 3], "x": 4.5, "y": 1},
-        {"matrix": [7, 3], "x": 5.5, "y": 1},
-        {"matrix": [10, 3], "x": 6.5, "y": 1},
-        {"matrix": [9, 3], "x": 7.5, "y": 1},
-        {"matrix": [8, 3], "x": 8.5, "y": 1},
-        {"matrix": [11, 3], "x": 9.5, "y": 1},
-        {"matrix": [14, 3], "x": 10.5, "y": 1},
-        {"matrix": [15, 3], "x": 11.5, "y": 1},
-        {"matrix": [13, 3], "x": 12.5, "y": 1},
-        {"matrix": [0, 6], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
-
-        {"matrix": [6, 6], "x": 0, "y": 2, "w": 1.75},
-        {"matrix": [2, 6], "x": 1.75, "y": 2},
-        {"matrix": [1, 6], "x": 2.75, "y": 2},
-        {"matrix": [5, 6], "x": 3.75, "y": 2},
-        {"matrix": [7, 6], "x": 4.75, "y": 2},
-        {"matrix": [10, 6], "x": 5.75, "y": 2},
-        {"matrix": [9, 6], "x": 6.75, "y": 2},
-        {"matrix": [8, 6], "x": 7.75, "y": 2},
-        {"matrix": [11, 6], "x": 8.75, "y": 2},
-        {"matrix": [14, 6], "x": 9.75, "y": 2},
-        {"matrix": [15, 6], "x": 10.75, "y": 2},
-        {"matrix": [13, 6], "x": 11.75, "y": 2},
-        {"matrix": [12, 6], "x": 12.75, "y": 2},
-
-        {"matrix": [0, 5], "x": 0, "y": 3, "w": 2},
-        {"matrix": [6, 5], "x": 2, "y": 3},
-        {"matrix": [2, 5], "x": 3, "y": 3},
-        {"matrix": [1, 5], "x": 4, "y": 3},
-        {"matrix": [5, 5], "x": 5, "y": 3},
-        {"matrix": [7, 5], "x": 6, "y": 3},
-        {"matrix": [10, 5], "x": 7, "y": 3},
-        {"matrix": [9, 5], "x": 8, "y": 3},
-        {"matrix": [8, 5], "x": 9, "y": 3},
-        {"matrix": [11, 5], "x": 10, "y": 3},
-        {"matrix": [14, 5], "x": 11, "y": 3},
-        {"matrix": [15, 5], "x": 12, "y": 3},
-        {"matrix": [13, 5], "x": 13, "y": 3},
-        {"matrix": [12, 5], "x": 14, "y": 3},
-
-        {"matrix": [0, 4], "x": 0, "y": 4},
-
-        {"matrix": [3, 4], "x": 1.25, "y": 4},
-        {"matrix": [6, 4], "x": 2.25, "y": 4},
-        {"matrix": [2, 4], "x": 3.25, "y": 4},
-        {"matrix": [1, 4], "x": 4.25, "y": 4},
-        {"matrix": [7, 4], "x": 5.25, "y": 4, "w": 2.5},
-        {"matrix": [9, 4], "x": 7.75, "y": 4},
-        {"matrix": [8, 4], "x": 8.75, "y": 4},
-        {"matrix": [11, 4], "x": 9.75, "y": 4},
-        {"matrix": [14, 4], "x": 10.75, "y": 4},
-
-        {"matrix": [15, 4], "x": 12, "y": 4},
-        {"matrix": [13, 4], "x": 13, "y": 4},
-        {"matrix": [12, 4], "x": 14, "y": 4}
-      ]
-    }
-  }
-}
diff --git a/keyboards/hhkb/jp/keyboard.json b/keyboards/hhkb/jp/keyboard.json
new file mode 100644
index 00000000000..d745f21d20b
--- /dev/null
+++ b/keyboards/hhkb/jp/keyboard.json
@@ -0,0 +1,101 @@
+{
+  "keyboard_name": "JP",
+  "manufacturer": "HHKB",
+  "url": "",
+  "maintainer": "qmk",
+  "usb": {
+    "vid": "0x4848",
+    "pid": "0x0002",
+    "device_version": "1.0.4"
+  },
+  "processor": "atmega32u4",
+  "bootloader": "atmel-dfu",
+  "features": {
+    "bootmagic": true,
+    "mousekey": true,
+    "extrakey": true,
+    "console": true,
+    "command": true
+  },
+  "layouts": {
+    "LAYOUT_jp": {
+      "layout": [
+        {"matrix": [0, 2], "x": 0, "y": 0},
+        {"matrix": [3, 2], "x": 1, "y": 0},
+        {"matrix": [6, 2], "x": 2, "y": 0},
+        {"matrix": [2, 2], "x": 3, "y": 0},
+        {"matrix": [1, 2], "x": 4, "y": 0},
+        {"matrix": [5, 2], "x": 5, "y": 0},
+        {"matrix": [7, 2], "x": 6, "y": 0},
+        {"matrix": [10, 2], "x": 7, "y": 0},
+        {"matrix": [9, 2], "x": 8, "y": 0},
+        {"matrix": [8, 2], "x": 9, "y": 0},
+        {"matrix": [11, 2], "x": 10, "y": 0},
+        {"matrix": [14, 2], "x": 11, "y": 0},
+        {"matrix": [15, 2], "x": 12, "y": 0},
+        {"matrix": [13, 2], "x": 13, "y": 0},
+        {"matrix": [12, 2], "x": 14, "y": 0},
+
+        {"matrix": [0, 3], "x": 0, "y": 1, "w": 1.5},
+        {"matrix": [6, 3], "x": 1.5, "y": 1},
+        {"matrix": [2, 3], "x": 2.5, "y": 1},
+        {"matrix": [1, 3], "x": 3.5, "y": 1},
+        {"matrix": [5, 3], "x": 4.5, "y": 1},
+        {"matrix": [7, 3], "x": 5.5, "y": 1},
+        {"matrix": [10, 3], "x": 6.5, "y": 1},
+        {"matrix": [9, 3], "x": 7.5, "y": 1},
+        {"matrix": [8, 3], "x": 8.5, "y": 1},
+        {"matrix": [11, 3], "x": 9.5, "y": 1},
+        {"matrix": [14, 3], "x": 10.5, "y": 1},
+        {"matrix": [15, 3], "x": 11.5, "y": 1},
+        {"matrix": [13, 3], "x": 12.5, "y": 1},
+        {"matrix": [0, 6], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+        {"matrix": [6, 6], "x": 0, "y": 2, "w": 1.75},
+        {"matrix": [2, 6], "x": 1.75, "y": 2},
+        {"matrix": [1, 6], "x": 2.75, "y": 2},
+        {"matrix": [5, 6], "x": 3.75, "y": 2},
+        {"matrix": [7, 6], "x": 4.75, "y": 2},
+        {"matrix": [10, 6], "x": 5.75, "y": 2},
+        {"matrix": [9, 6], "x": 6.75, "y": 2},
+        {"matrix": [8, 6], "x": 7.75, "y": 2},
+        {"matrix": [11, 6], "x": 8.75, "y": 2},
+        {"matrix": [14, 6], "x": 9.75, "y": 2},
+        {"matrix": [15, 6], "x": 10.75, "y": 2},
+        {"matrix": [13, 6], "x": 11.75, "y": 2},
+        {"matrix": [12, 6], "x": 12.75, "y": 2},
+
+        {"matrix": [0, 5], "x": 0, "y": 3, "w": 2},
+        {"matrix": [6, 5], "x": 2, "y": 3},
+        {"matrix": [2, 5], "x": 3, "y": 3},
+        {"matrix": [1, 5], "x": 4, "y": 3},
+        {"matrix": [5, 5], "x": 5, "y": 3},
+        {"matrix": [7, 5], "x": 6, "y": 3},
+        {"matrix": [10, 5], "x": 7, "y": 3},
+        {"matrix": [9, 5], "x": 8, "y": 3},
+        {"matrix": [8, 5], "x": 9, "y": 3},
+        {"matrix": [11, 5], "x": 10, "y": 3},
+        {"matrix": [14, 5], "x": 11, "y": 3},
+        {"matrix": [15, 5], "x": 12, "y": 3},
+        {"matrix": [13, 5], "x": 13, "y": 3},
+        {"matrix": [12, 5], "x": 14, "y": 3},
+
+        {"matrix": [0, 4], "x": 0, "y": 4},
+
+        {"matrix": [3, 4], "x": 1.25, "y": 4},
+        {"matrix": [6, 4], "x": 2.25, "y": 4},
+        {"matrix": [2, 4], "x": 3.25, "y": 4},
+        {"matrix": [1, 4], "x": 4.25, "y": 4},
+        {"matrix": [7, 4], "x": 5.25, "y": 4, "w": 2.5},
+        {"matrix": [9, 4], "x": 7.75, "y": 4},
+        {"matrix": [8, 4], "x": 8.75, "y": 4},
+        {"matrix": [11, 4], "x": 9.75, "y": 4},
+        {"matrix": [14, 4], "x": 10.75, "y": 4},
+
+        {"matrix": [15, 4], "x": 12, "y": 4},
+        {"matrix": [13, 4], "x": 13, "y": 4},
+        {"matrix": [12, 4], "x": 14, "y": 4}
+      ]
+    }
+  }
+}
diff --git a/keyboards/hhkb/jp/rules.mk b/keyboards/hhkb/jp/rules.mk
index 5c659643418..9e74e1cfb9a 100644
--- a/keyboards/hhkb/jp/rules.mk
+++ b/keyboards/hhkb/jp/rules.mk
@@ -1,14 +1,7 @@
 # Build Options
 #   change yes to no to disable
 #
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes  # Mouse keys
-EXTRAKEY_ENABLE = yes  # Audio control and System control
-CONSOLE_ENABLE = yes   # Console for debug
-COMMAND_ENABLE = yes   # Commands for debug and configuration
 CUSTOM_MATRIX = yes    # Custom matrix file for the HHKB
-NKRO_ENABLE = no            # Enable N-Key Rollover
-# BACKLIGHT_ENABLE = yes  # Enable keyboard backlight functionality
 
 # project specific files
 SRC = matrix.c
diff --git a/keyboards/hhkb/yang/info.json b/keyboards/hhkb/yang/info.json
deleted file mode 100644
index 24cd750e09c..00000000000
--- a/keyboards/hhkb/yang/info.json
+++ /dev/null
@@ -1,91 +0,0 @@
-{
-  "keyboard_name": "HHKB BLE",
-  "manufacturer": "YANG",
-  "url": "",
-  "maintainer": "qmk",
-  "usb": {
-    "vid": "0x4848",
-    "pid": "0x0001",
-    "device_version": "1.0.4"
-  },
-  "indicators": {
-    "caps_lock": "F4"
-  },
-  "bluetooth": {
-    "driver": "bluefruit_le"
-  },
-  "processor": "atmega32u4",
-  "bootloader": "lufa-ms",
-  "debounce": 0,
-  "community_layouts": ["60_hhkb"],
-  "layouts": {
-    "LAYOUT_60_hhkb": {
-      "layout": [
-        {"matrix": [3, 1], "x": 0, "y": 0},
-        {"matrix": [3, 0], "x": 1, "y": 0},
-        {"matrix": [0, 0], "x": 2, "y": 0},
-        {"matrix": [1, 0], "x": 3, "y": 0},
-        {"matrix": [1, 1], "x": 4, "y": 0},
-        {"matrix": [2, 0], "x": 5, "y": 0},
-        {"matrix": [2, 1], "x": 6, "y": 0},
-        {"matrix": [4, 0], "x": 7, "y": 0},
-        {"matrix": [4, 1], "x": 8, "y": 0},
-        {"matrix": [6, 0], "x": 9, "y": 0},
-        {"matrix": [6, 1], "x": 10, "y": 0},
-        {"matrix": [7, 0], "x": 11, "y": 0},
-        {"matrix": [7, 1], "x": 12, "y": 0},
-        {"matrix": [5, 0], "x": 13, "y": 0},
-        {"matrix": [5, 1], "x": 14, "y": 0},
-
-        {"matrix": [3, 2], "x": 0, "y": 1, "w": 1.5},
-        {"matrix": [0, 1], "x": 1.5, "y": 1},
-        {"matrix": [0, 2], "x": 2.5, "y": 1},
-        {"matrix": [1, 3], "x": 3.5, "y": 1},
-        {"matrix": [1, 2], "x": 4.5, "y": 1},
-        {"matrix": [2, 3], "x": 5.5, "y": 1},
-        {"matrix": [2, 2], "x": 6.5, "y": 1},
-        {"matrix": [4, 2], "x": 7.5, "y": 1},
-        {"matrix": [4, 3], "x": 8.5, "y": 1},
-        {"matrix": [6, 2], "x": 9.5, "y": 1},
-        {"matrix": [6, 3], "x": 10.5, "y": 1},
-        {"matrix": [7, 3], "x": 11.5, "y": 1},
-        {"matrix": [7, 2], "x": 12.5, "y": 1},
-        {"matrix": [5, 2], "x": 13.5, "y": 1, "w": 1.5},
-
-        {"matrix": [3, 3], "x": 0, "y": 2, "w": 1.75},
-        {"matrix": [0, 4], "x": 1.75, "y": 2},
-        {"matrix": [0, 3], "x": 2.75, "y": 2},
-        {"matrix": [1, 4], "x": 3.75, "y": 2},
-        {"matrix": [1, 5], "x": 4.75, "y": 2},
-        {"matrix": [2, 4], "x": 5.75, "y": 2},
-        {"matrix": [2, 5], "x": 6.75, "y": 2},
-        {"matrix": [4, 5], "x": 7.75, "y": 2},
-        {"matrix": [4, 4], "x": 8.75, "y": 2},
-        {"matrix": [6, 5], "x": 9.75, "y": 2},
-        {"matrix": [6, 4], "x": 10.75, "y": 2},
-        {"matrix": [7, 4], "x": 11.75, "y": 2},
-        {"matrix": [5, 3], "x": 12.75, "y": 2, "w": 2.25},
-
-        {"matrix": [3, 4], "x": 0, "y": 3, "w": 2.25},
-        {"matrix": [0, 5], "x": 2.25, "y": 3},
-        {"matrix": [0, 6], "x": 3.25, "y": 3},
-        {"matrix": [0, 7], "x": 4.25, "y": 3},
-        {"matrix": [1, 6], "x": 5.25, "y": 3},
-        {"matrix": [1, 7], "x": 6.25, "y": 3},
-        {"matrix": [2, 6], "x": 7.25, "y": 3},
-        {"matrix": [4, 6], "x": 8.25, "y": 3},
-        {"matrix": [6, 6], "x": 9.25, "y": 3},
-        {"matrix": [7, 6], "x": 10.25, "y": 3},
-        {"matrix": [7, 5], "x": 11.25, "y": 3},
-        {"matrix": [5, 5], "x": 12.25, "y": 3, "w": 1.75},
-        {"matrix": [5, 4], "x": 14, "y": 3},
-
-        {"matrix": [3, 5], "x": 1.5, "y": 4},
-        {"matrix": [3, 6], "x": 2.5, "y": 4, "w": 1.5},
-        {"matrix": [3, 7], "x": 4, "y": 4, "w": 6},
-        {"matrix": [5, 7], "x": 10, "y": 4, "w": 1.5},
-        {"matrix": [5, 6], "x": 11.5, "y": 4}
-      ]
-    }
-  }
-}
diff --git a/keyboards/hhkb/yang/keyboard.json b/keyboards/hhkb/yang/keyboard.json
new file mode 100644
index 00000000000..a5725d6afaa
--- /dev/null
+++ b/keyboards/hhkb/yang/keyboard.json
@@ -0,0 +1,97 @@
+{
+  "keyboard_name": "HHKB BLE",
+  "manufacturer": "YANG",
+  "url": "",
+  "maintainer": "qmk",
+  "usb": {
+    "vid": "0x4848",
+    "pid": "0x0001",
+    "device_version": "1.0.4"
+  },
+  "indicators": {
+    "caps_lock": "F4"
+  },
+  "bluetooth": {
+    "driver": "bluefruit_le"
+  },
+  "processor": "atmega32u4",
+  "bootloader": "lufa-ms",
+  "features": {
+    "bootmagic": true,
+    "mousekey": true,
+    "extrakey": true,
+    "command": true
+  },
+  "debounce": 0,
+  "community_layouts": ["60_hhkb"],
+  "layouts": {
+    "LAYOUT_60_hhkb": {
+      "layout": [
+        {"matrix": [3, 1], "x": 0, "y": 0},
+        {"matrix": [3, 0], "x": 1, "y": 0},
+        {"matrix": [0, 0], "x": 2, "y": 0},
+        {"matrix": [1, 0], "x": 3, "y": 0},
+        {"matrix": [1, 1], "x": 4, "y": 0},
+        {"matrix": [2, 0], "x": 5, "y": 0},
+        {"matrix": [2, 1], "x": 6, "y": 0},
+        {"matrix": [4, 0], "x": 7, "y": 0},
+        {"matrix": [4, 1], "x": 8, "y": 0},
+        {"matrix": [6, 0], "x": 9, "y": 0},
+        {"matrix": [6, 1], "x": 10, "y": 0},
+        {"matrix": [7, 0], "x": 11, "y": 0},
+        {"matrix": [7, 1], "x": 12, "y": 0},
+        {"matrix": [5, 0], "x": 13, "y": 0},
+        {"matrix": [5, 1], "x": 14, "y": 0},
+
+        {"matrix": [3, 2], "x": 0, "y": 1, "w": 1.5},
+        {"matrix": [0, 1], "x": 1.5, "y": 1},
+        {"matrix": [0, 2], "x": 2.5, "y": 1},
+        {"matrix": [1, 3], "x": 3.5, "y": 1},
+        {"matrix": [1, 2], "x": 4.5, "y": 1},
+        {"matrix": [2, 3], "x": 5.5, "y": 1},
+        {"matrix": [2, 2], "x": 6.5, "y": 1},
+        {"matrix": [4, 2], "x": 7.5, "y": 1},
+        {"matrix": [4, 3], "x": 8.5, "y": 1},
+        {"matrix": [6, 2], "x": 9.5, "y": 1},
+        {"matrix": [6, 3], "x": 10.5, "y": 1},
+        {"matrix": [7, 3], "x": 11.5, "y": 1},
+        {"matrix": [7, 2], "x": 12.5, "y": 1},
+        {"matrix": [5, 2], "x": 13.5, "y": 1, "w": 1.5},
+
+        {"matrix": [3, 3], "x": 0, "y": 2, "w": 1.75},
+        {"matrix": [0, 4], "x": 1.75, "y": 2},
+        {"matrix": [0, 3], "x": 2.75, "y": 2},
+        {"matrix": [1, 4], "x": 3.75, "y": 2},
+        {"matrix": [1, 5], "x": 4.75, "y": 2},
+        {"matrix": [2, 4], "x": 5.75, "y": 2},
+        {"matrix": [2, 5], "x": 6.75, "y": 2},
+        {"matrix": [4, 5], "x": 7.75, "y": 2},
+        {"matrix": [4, 4], "x": 8.75, "y": 2},
+        {"matrix": [6, 5], "x": 9.75, "y": 2},
+        {"matrix": [6, 4], "x": 10.75, "y": 2},
+        {"matrix": [7, 4], "x": 11.75, "y": 2},
+        {"matrix": [5, 3], "x": 12.75, "y": 2, "w": 2.25},
+
+        {"matrix": [3, 4], "x": 0, "y": 3, "w": 2.25},
+        {"matrix": [0, 5], "x": 2.25, "y": 3},
+        {"matrix": [0, 6], "x": 3.25, "y": 3},
+        {"matrix": [0, 7], "x": 4.25, "y": 3},
+        {"matrix": [1, 6], "x": 5.25, "y": 3},
+        {"matrix": [1, 7], "x": 6.25, "y": 3},
+        {"matrix": [2, 6], "x": 7.25, "y": 3},
+        {"matrix": [4, 6], "x": 8.25, "y": 3},
+        {"matrix": [6, 6], "x": 9.25, "y": 3},
+        {"matrix": [7, 6], "x": 10.25, "y": 3},
+        {"matrix": [7, 5], "x": 11.25, "y": 3},
+        {"matrix": [5, 5], "x": 12.25, "y": 3, "w": 1.75},
+        {"matrix": [5, 4], "x": 14, "y": 3},
+
+        {"matrix": [3, 5], "x": 1.5, "y": 4},
+        {"matrix": [3, 6], "x": 2.5, "y": 4, "w": 1.5},
+        {"matrix": [3, 7], "x": 4, "y": 4, "w": 6},
+        {"matrix": [5, 7], "x": 10, "y": 4, "w": 1.5},
+        {"matrix": [5, 6], "x": 11.5, "y": 4}
+      ]
+    }
+  }
+}
diff --git a/keyboards/hhkb/yang/rules.mk b/keyboards/hhkb/yang/rules.mk
index 99f77d0c162..d8acce0a36b 100644
--- a/keyboards/hhkb/yang/rules.mk
+++ b/keyboards/hhkb/yang/rules.mk
@@ -1,16 +1,6 @@
 # MCU frequency
 F_CPU = 8000000
 
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = no            # USB Nkey Rollover
-
 # Custom matrix file for the HHKB
 CUSTOM_MATRIX = lite
 SRC += matrix.c
diff --git a/keyboards/hillside/46/0_1/info.json b/keyboards/hillside/46/0_1/info.json
deleted file mode 100644
index 6dd45b06f08..00000000000
--- a/keyboards/hillside/46/0_1/info.json
+++ /dev/null
@@ -1,105 +0,0 @@
-{
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "matrix_pins": {
-        "rows": ["C6", "D7", "E6", "B5"],
-        "cols": ["F6", "F7", "B1", "B3", "B2", "B6"]
-     },
-    "diode_direction": "COL2ROW",
-    "usb": {
-      "vid": "0x4D4D",
-      "pid": "0x4846",
-      "device_version": "0.0.1"
-    },
-    "encoder": {
-        "rotary": [
-            {"pin_a": "F5", "pin_b": "F4"}
-        ]
-    },
-    "features": {
-        "encoder": true,
-        "extrakey": true,
-        "rgblight": true
-    },
-    "split": {
-        "enabled": true,
-        "soft_serial_pin": "D2",
-        "encoder": {
-            "right": {
-                "rotary": [
-                    {"pin_a": "F4", "pin_b": "F5"}
-                ]
-            }
-        }
-    },
-    "rgblight": {
-        "led_count": 4,
-        "split": true,
-        "hue_steps": 8,
-        "saturation_steps": 8,
-        "brightness_steps": 8,
-        "sleep": true
-    },
-    "ws2812": {
-        "pin": "D3"
-    },
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 1.13},
-                {"matrix": [0, 1], "x": 1, "y": 0.93},
-                {"matrix": [0, 2], "x": 2.1, "y": 0.31},
-                {"matrix": [0, 3], "x": 3.2, "y": 0},
-                {"matrix": [0, 4], "x": 4.2, "y": 0.28},
-                {"matrix": [0, 5], "x": 5.2, "y": 0.42},
-
-                {"matrix": [4, 5], "x": 9.7, "y": 0.42},
-                {"matrix": [4, 4], "x": 10.7, "y": 0.28},
-                {"matrix": [4, 3], "x": 11.7, "y": 0},
-                {"matrix": [4, 2], "x": 12.8, "y": 0.31},
-                {"matrix": [4, 1], "x": 13.9, "y": 0.93},
-                {"matrix": [4, 0], "x": 14.9, "y": 1.13},
-
-                {"matrix": [1, 0], "x": 0.1, "y": 2.13},
-                {"matrix": [1, 1], "x": 1.1, "y": 1.93},
-                {"matrix": [1, 2], "x": 2.15, "y": 1.31},
-                {"matrix": [1, 3], "x": 3.2, "y": 1},
-                {"matrix": [1, 4], "x": 4.2, "y": 1.28},
-                {"matrix": [1, 5], "x": 5.2, "y": 1.42},
-
-                {"matrix": [5, 5], "x": 9.7, "y": 1.42},
-                {"matrix": [5, 4], "x": 10.7, "y": 1.28},
-                {"matrix": [5, 3], "x": 11.7, "y": 1},
-                {"matrix": [5, 2], "x": 12.75, "y": 1.31},
-                {"matrix": [5, 1], "x": 13.8, "y": 1.93},
-                {"matrix": [5, 0], "x": 14.8, "y": 2.13},
-
-                {"matrix": [2, 0], "x": 0.2, "y": 3.13},
-                {"matrix": [2, 1], "x": 1.2, "y": 2.93},
-                {"matrix": [2, 2], "x": 2.2, "y": 2.31},
-                {"matrix": [2, 3], "x": 3.2, "y": 2},
-                {"matrix": [2, 4], "x": 4.2, "y": 2.28},
-                {"matrix": [2, 5], "x": 5.2, "y": 2.42},
-                {"matrix": [3, 5], "x": 6.2, "y": 2.88},
-
-                {"matrix": [7, 5], "x": 8.7, "y": 2.88},
-                {"matrix": [6, 5], "x": 9.7, "y": 2.42},
-                {"matrix": [6, 4], "x": 10.7, "y": 2.28},
-                {"matrix": [6, 3], "x": 11.7, "y": 2},
-                {"matrix": [6, 2], "x": 12.7, "y": 2.31},
-                {"matrix": [6, 1], "x": 13.7, "y": 2.93},
-                {"matrix": [6, 0], "x": 14.7, "y": 3.13},
-
-                {"matrix": [3, 1], "x": 3.7, "y": 3.28},
-                {"matrix": [3, 2], "x": 4.7, "y": 3.42},
-                {"matrix": [3, 3], "x": 5.7, "y": 3.88},
-                {"matrix": [3, 4], "x": 6.7, "y": 4.44},
-
-                {"matrix": [7, 4], "x": 8.2, "y": 4.44},
-                {"matrix": [7, 3], "x": 9.2, "y": 3.88},
-                {"matrix": [7, 2], "x": 10.2, "y": 3.42},
-                {"matrix": [7, 1], "x": 11.2, "y": 3.28}
-            ]
-        }
-    }
-}
diff --git a/keyboards/hillside/46/0_1/keyboard.json b/keyboards/hillside/46/0_1/keyboard.json
new file mode 100644
index 00000000000..7cb7150f3f2
--- /dev/null
+++ b/keyboards/hillside/46/0_1/keyboard.json
@@ -0,0 +1,108 @@
+{
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "matrix_pins": {
+        "rows": ["C6", "D7", "E6", "B5"],
+        "cols": ["F6", "F7", "B1", "B3", "B2", "B6"]
+     },
+    "diode_direction": "COL2ROW",
+    "usb": {
+      "vid": "0x4D4D",
+      "pid": "0x4846",
+      "device_version": "0.0.1"
+    },
+    "encoder": {
+        "rotary": [
+            {"pin_a": "F5", "pin_b": "F4"}
+        ]
+    },
+    "build": {
+        "lto": true
+    },
+    "features": {
+        "encoder": true,
+        "extrakey": true,
+        "rgblight": true
+    },
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "D2",
+        "encoder": {
+            "right": {
+                "rotary": [
+                    {"pin_a": "F4", "pin_b": "F5"}
+                ]
+            }
+        }
+    },
+    "rgblight": {
+        "led_count": 4,
+        "split": true,
+        "hue_steps": 8,
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "sleep": true
+    },
+    "ws2812": {
+        "pin": "D3"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 1.13},
+                {"matrix": [0, 1], "x": 1, "y": 0.93},
+                {"matrix": [0, 2], "x": 2.1, "y": 0.31},
+                {"matrix": [0, 3], "x": 3.2, "y": 0},
+                {"matrix": [0, 4], "x": 4.2, "y": 0.28},
+                {"matrix": [0, 5], "x": 5.2, "y": 0.42},
+
+                {"matrix": [4, 5], "x": 9.7, "y": 0.42},
+                {"matrix": [4, 4], "x": 10.7, "y": 0.28},
+                {"matrix": [4, 3], "x": 11.7, "y": 0},
+                {"matrix": [4, 2], "x": 12.8, "y": 0.31},
+                {"matrix": [4, 1], "x": 13.9, "y": 0.93},
+                {"matrix": [4, 0], "x": 14.9, "y": 1.13},
+
+                {"matrix": [1, 0], "x": 0.1, "y": 2.13},
+                {"matrix": [1, 1], "x": 1.1, "y": 1.93},
+                {"matrix": [1, 2], "x": 2.15, "y": 1.31},
+                {"matrix": [1, 3], "x": 3.2, "y": 1},
+                {"matrix": [1, 4], "x": 4.2, "y": 1.28},
+                {"matrix": [1, 5], "x": 5.2, "y": 1.42},
+
+                {"matrix": [5, 5], "x": 9.7, "y": 1.42},
+                {"matrix": [5, 4], "x": 10.7, "y": 1.28},
+                {"matrix": [5, 3], "x": 11.7, "y": 1},
+                {"matrix": [5, 2], "x": 12.75, "y": 1.31},
+                {"matrix": [5, 1], "x": 13.8, "y": 1.93},
+                {"matrix": [5, 0], "x": 14.8, "y": 2.13},
+
+                {"matrix": [2, 0], "x": 0.2, "y": 3.13},
+                {"matrix": [2, 1], "x": 1.2, "y": 2.93},
+                {"matrix": [2, 2], "x": 2.2, "y": 2.31},
+                {"matrix": [2, 3], "x": 3.2, "y": 2},
+                {"matrix": [2, 4], "x": 4.2, "y": 2.28},
+                {"matrix": [2, 5], "x": 5.2, "y": 2.42},
+                {"matrix": [3, 5], "x": 6.2, "y": 2.88},
+
+                {"matrix": [7, 5], "x": 8.7, "y": 2.88},
+                {"matrix": [6, 5], "x": 9.7, "y": 2.42},
+                {"matrix": [6, 4], "x": 10.7, "y": 2.28},
+                {"matrix": [6, 3], "x": 11.7, "y": 2},
+                {"matrix": [6, 2], "x": 12.7, "y": 2.31},
+                {"matrix": [6, 1], "x": 13.7, "y": 2.93},
+                {"matrix": [6, 0], "x": 14.7, "y": 3.13},
+
+                {"matrix": [3, 1], "x": 3.7, "y": 3.28},
+                {"matrix": [3, 2], "x": 4.7, "y": 3.42},
+                {"matrix": [3, 3], "x": 5.7, "y": 3.88},
+                {"matrix": [3, 4], "x": 6.7, "y": 4.44},
+
+                {"matrix": [7, 4], "x": 8.2, "y": 4.44},
+                {"matrix": [7, 3], "x": 9.2, "y": 3.88},
+                {"matrix": [7, 2], "x": 10.2, "y": 3.42},
+                {"matrix": [7, 1], "x": 11.2, "y": 3.28}
+            ]
+        }
+    }
+}
diff --git a/keyboards/hillside/46/0_1/rules.mk b/keyboards/hillside/46/0_1/rules.mk
deleted file mode 100644
index 093b81abfe0..00000000000
--- a/keyboards/hillside/46/0_1/rules.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-LTO_ENABLE = yes            # Use link time optimization for smaller firmware
-
-# If you add a haptic board,
-# enable it and set its driver here or in your keymap folder
-# The Pimoroni board's driver is DRV2605L 
-# HAPTIC_ENABLE = yes        # Enable haptic driver
-# HAPTIC_DRIVER = drv2605l
diff --git a/keyboards/hillside/48/0_1/info.json b/keyboards/hillside/48/0_1/info.json
deleted file mode 100644
index 4f565f5cdc6..00000000000
--- a/keyboards/hillside/48/0_1/info.json
+++ /dev/null
@@ -1,107 +0,0 @@
-{
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "matrix_pins": {
-        "rows": ["D7", "E6", "B4", "B5"],
-        "cols": ["F6", "F7", "B1", "B3", "B2", "B6"]
-     },
-    "diode_direction": "COL2ROW",
-    "usb": {
-      "vid": "0xFEED",
-      "pid": "0x67C0",
-      "device_version": "0.0.1"
-    },
-    "encoder": {
-        "rotary": [
-            {"pin_a": "F5", "pin_b": "F4"}
-        ]
-    },
-    "features": {
-        "encoder": true,
-        "extrakey": true,
-        "rgblight": true
-    },
-    "split": {
-        "enabled": true,
-        "soft_serial_pin": "D2",
-        "encoder": {
-            "right": {
-                "rotary": [
-                    {"pin_a": "F4", "pin_b": "F5"}
-                ]
-            }
-        }
-    },
-    "rgblight": {
-        "led_count": 5,
-        "split": true,
-        "hue_steps": 8,
-        "saturation_steps": 8,
-        "brightness_steps": 8,
-        "sleep": true
-    },
-    "ws2812": {
-        "pin": "D3"
-    },
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0.93},
-                {"matrix": [0, 1], "x": 1, "y": 0.93},
-                {"matrix": [0, 2], "x": 2, "y": 0.31},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0.28},
-                {"matrix": [0, 5], "x": 5, "y": 0.42},
-
-                {"matrix": [4, 5], "x": 9.5, "y": 0.42},
-                {"matrix": [4, 4], "x": 10.5, "y": 0.28},
-                {"matrix": [4, 3], "x": 11.5, "y": 0},
-                {"matrix": [4, 2], "x": 12.5, "y": 0.31},
-                {"matrix": [4, 1], "x": 13.5, "y": 0.93},
-                {"matrix": [4, 0], "x": 14.5, "y": 0.93},
-
-                {"matrix": [1, 0], "x": 0, "y": 1.93},
-                {"matrix": [1, 1], "x": 1, "y": 1.93},
-                {"matrix": [1, 2], "x": 2, "y": 1.31},
-                {"matrix": [1, 3], "x": 3, "y": 1},
-                {"matrix": [1, 4], "x": 4, "y": 1.28},
-                {"matrix": [1, 5], "x": 5, "y": 1.42},
-
-                {"matrix": [5, 5], "x": 9.5, "y": 1.42},
-                {"matrix": [5, 4], "x": 10.5, "y": 1.28},
-                {"matrix": [5, 3], "x": 11.5, "y": 1},
-                {"matrix": [5, 2], "x": 12.5, "y": 1.31},
-                {"matrix": [5, 1], "x": 13.5, "y": 1.93},
-                {"matrix": [5, 0], "x": 14.5, "y": 1.93},
-
-                {"matrix": [2, 0], "x": 0, "y": 2.93},
-                {"matrix": [2, 1], "x": 1, "y": 2.93},
-                {"matrix": [2, 2], "x": 2, "y": 2.31},
-                {"matrix": [2, 3], "x": 3, "y": 2},
-                {"matrix": [2, 4], "x": 4, "y": 2.28},
-                {"matrix": [2, 5], "x": 5, "y": 2.42},
-                {"matrix": [3, 5], "x": 6, "y": 2.78},
-
-                {"matrix": [7, 5], "x": 8.5, "y": 2.78},
-                {"matrix": [6, 5], "x": 9.5, "y": 2.42},
-                {"matrix": [6, 4], "x": 10.5, "y": 2.28},
-                {"matrix": [6, 3], "x": 11.5, "y": 2},
-                {"matrix": [6, 2], "x": 12.5, "y": 2.31},
-                {"matrix": [6, 1], "x": 13.5, "y": 2.93},
-                {"matrix": [6, 0], "x": 14.5, "y": 2.93},
-
-                {"matrix": [3, 0], "x": 2, "y": 3.31},
-                {"matrix": [3, 1], "x": 3.5, "y": 3.28},
-                {"matrix": [3, 2], "x": 4.5, "y": 3.42},
-                {"matrix": [3, 3], "x": 5.5, "y": 3.78},
-                {"matrix": [3, 4], "x": 6.5, "y": 4.14},
-
-                {"matrix": [7, 4], "x": 8, "y": 4.14},
-                {"matrix": [7, 3], "x": 9, "y": 3.78},
-                {"matrix": [7, 2], "x": 10, "y": 3.42},
-                {"matrix": [7, 1], "x": 11, "y": 3.28},
-                {"matrix": [7, 0], "x": 12.5, "y": 3.31}
-            ]
-        }
-    }
-}
diff --git a/keyboards/hillside/48/0_1/keyboard.json b/keyboards/hillside/48/0_1/keyboard.json
new file mode 100644
index 00000000000..b640bc0cbf2
--- /dev/null
+++ b/keyboards/hillside/48/0_1/keyboard.json
@@ -0,0 +1,110 @@
+{
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "matrix_pins": {
+        "rows": ["D7", "E6", "B4", "B5"],
+        "cols": ["F6", "F7", "B1", "B3", "B2", "B6"]
+     },
+    "diode_direction": "COL2ROW",
+    "usb": {
+      "vid": "0xFEED",
+      "pid": "0x67C0",
+      "device_version": "0.0.1"
+    },
+    "encoder": {
+        "rotary": [
+            {"pin_a": "F5", "pin_b": "F4"}
+        ]
+    },
+    "build": {
+        "lto": true
+    },
+    "features": {
+        "encoder": true,
+        "extrakey": true,
+        "rgblight": true
+    },
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "D2",
+        "encoder": {
+            "right": {
+                "rotary": [
+                    {"pin_a": "F4", "pin_b": "F5"}
+                ]
+            }
+        }
+    },
+    "rgblight": {
+        "led_count": 5,
+        "split": true,
+        "hue_steps": 8,
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "sleep": true
+    },
+    "ws2812": {
+        "pin": "D3"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0.93},
+                {"matrix": [0, 1], "x": 1, "y": 0.93},
+                {"matrix": [0, 2], "x": 2, "y": 0.31},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0.28},
+                {"matrix": [0, 5], "x": 5, "y": 0.42},
+
+                {"matrix": [4, 5], "x": 9.5, "y": 0.42},
+                {"matrix": [4, 4], "x": 10.5, "y": 0.28},
+                {"matrix": [4, 3], "x": 11.5, "y": 0},
+                {"matrix": [4, 2], "x": 12.5, "y": 0.31},
+                {"matrix": [4, 1], "x": 13.5, "y": 0.93},
+                {"matrix": [4, 0], "x": 14.5, "y": 0.93},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.93},
+                {"matrix": [1, 1], "x": 1, "y": 1.93},
+                {"matrix": [1, 2], "x": 2, "y": 1.31},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1.28},
+                {"matrix": [1, 5], "x": 5, "y": 1.42},
+
+                {"matrix": [5, 5], "x": 9.5, "y": 1.42},
+                {"matrix": [5, 4], "x": 10.5, "y": 1.28},
+                {"matrix": [5, 3], "x": 11.5, "y": 1},
+                {"matrix": [5, 2], "x": 12.5, "y": 1.31},
+                {"matrix": [5, 1], "x": 13.5, "y": 1.93},
+                {"matrix": [5, 0], "x": 14.5, "y": 1.93},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.93},
+                {"matrix": [2, 1], "x": 1, "y": 2.93},
+                {"matrix": [2, 2], "x": 2, "y": 2.31},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2.28},
+                {"matrix": [2, 5], "x": 5, "y": 2.42},
+                {"matrix": [3, 5], "x": 6, "y": 2.78},
+
+                {"matrix": [7, 5], "x": 8.5, "y": 2.78},
+                {"matrix": [6, 5], "x": 9.5, "y": 2.42},
+                {"matrix": [6, 4], "x": 10.5, "y": 2.28},
+                {"matrix": [6, 3], "x": 11.5, "y": 2},
+                {"matrix": [6, 2], "x": 12.5, "y": 2.31},
+                {"matrix": [6, 1], "x": 13.5, "y": 2.93},
+                {"matrix": [6, 0], "x": 14.5, "y": 2.93},
+
+                {"matrix": [3, 0], "x": 2, "y": 3.31},
+                {"matrix": [3, 1], "x": 3.5, "y": 3.28},
+                {"matrix": [3, 2], "x": 4.5, "y": 3.42},
+                {"matrix": [3, 3], "x": 5.5, "y": 3.78},
+                {"matrix": [3, 4], "x": 6.5, "y": 4.14},
+
+                {"matrix": [7, 4], "x": 8, "y": 4.14},
+                {"matrix": [7, 3], "x": 9, "y": 3.78},
+                {"matrix": [7, 2], "x": 10, "y": 3.42},
+                {"matrix": [7, 1], "x": 11, "y": 3.28},
+                {"matrix": [7, 0], "x": 12.5, "y": 3.31}
+            ]
+        }
+    }
+}
diff --git a/keyboards/hillside/48/0_1/rules.mk b/keyboards/hillside/48/0_1/rules.mk
deleted file mode 100644
index 093b81abfe0..00000000000
--- a/keyboards/hillside/48/0_1/rules.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-LTO_ENABLE = yes            # Use link time optimization for smaller firmware
-
-# If you add a haptic board,
-# enable it and set its driver here or in your keymap folder
-# The Pimoroni board's driver is DRV2605L 
-# HAPTIC_ENABLE = yes        # Enable haptic driver
-# HAPTIC_DRIVER = drv2605l
diff --git a/keyboards/hillside/52/0_1/info.json b/keyboards/hillside/52/0_1/info.json
deleted file mode 100644
index 2064ba617cc..00000000000
--- a/keyboards/hillside/52/0_1/info.json
+++ /dev/null
@@ -1,111 +0,0 @@
-{
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "matrix_pins": {
-        "rows": ["C6", "D7", "E6", "B4", "B5"],
-        "cols": ["F6", "F7", "B1", "B3", "B2", "B6"]
-     },
-    "diode_direction": "COL2ROW",
-    "usb": {
-      "vid": "0x4D4D",
-      "pid": "0x4852",
-      "device_version": "0.0.1"
-    },
-    "encoder": {
-        "rotary": [
-            {"pin_a": "F5", "pin_b": "F4"}
-        ]
-    },
-    "features": {
-        "encoder": true,
-        "extrakey": true,
-        "rgblight": true
-    },
-    "split": {
-        "enabled": true,
-        "soft_serial_pin": "D2",
-        "encoder": {
-            "right": {
-                "rotary": [
-                    {"pin_a": "F4", "pin_b": "F5"}
-                ]
-            }
-        }
-    },
-    "rgblight": {
-        "led_count": 5,
-        "split": true,
-        "hue_steps": 8,
-        "saturation_steps": 8,
-        "brightness_steps": 8,
-        "sleep": true
-    },
-    "ws2812": {
-        "pin": "D3"
-    },
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 1.13},
-                {"matrix": [0, 1], "x": 1, "y": 0.93},
-                {"matrix": [0, 2], "x": 2.1, "y": 0.31},
-                {"matrix": [0, 3], "x": 3.2, "y": 0},
-                {"matrix": [0, 4], "x": 4.2, "y": 0.28},
-                {"matrix": [0, 5], "x": 5.2, "y": 0.42},
-
-                {"matrix": [5, 5], "x": 9.7, "y": 0.42},
-                {"matrix": [5, 4], "x": 10.7, "y": 0.28},
-                {"matrix": [5, 3], "x": 11.7, "y": 0},
-                {"matrix": [5, 2], "x": 12.8, "y": 0.31},
-                {"matrix": [5, 1], "x": 13.9, "y": 0.93},
-                {"matrix": [5, 0], "x": 14.9, "y": 1.13},
-
-                {"matrix": [1, 0], "x": 0.1, "y": 2.13},
-                {"matrix": [1, 1], "x": 1.1, "y": 1.93},
-                {"matrix": [1, 2], "x": 2.15, "y": 1.31},
-                {"matrix": [1, 3], "x": 3.2, "y": 1},
-                {"matrix": [1, 4], "x": 4.2, "y": 1.28},
-                {"matrix": [1, 5], "x": 5.2, "y": 1.42},
-
-                {"matrix": [6, 5], "x": 9.7, "y": 1.42},
-                {"matrix": [6, 4], "x": 10.7, "y": 1.28},
-                {"matrix": [6, 3], "x": 11.7, "y": 1},
-                {"matrix": [6, 2], "x": 12.75, "y": 1.31},
-                {"matrix": [6, 1], "x": 13.8, "y": 1.93},
-                {"matrix": [6, 0], "x": 14.8, "y": 2.13},
-
-                {"matrix": [2, 0], "x": 0.2, "y": 3.13},
-                {"matrix": [2, 1], "x": 1.2, "y": 2.93},
-                {"matrix": [2, 2], "x": 2.2, "y": 2.31},
-                {"matrix": [2, 3], "x": 3.2, "y": 2},
-                {"matrix": [2, 4], "x": 4.2, "y": 2.28},
-                {"matrix": [2, 5], "x": 5.2, "y": 2.42},
-                {"matrix": [4, 5], "x": 6.2, "y": 2.88},
-
-                {"matrix": [9, 5], "x": 8.7, "y": 2.88},
-                {"matrix": [7, 5], "x": 9.7, "y": 2.42},
-                {"matrix": [7, 4], "x": 10.7, "y": 2.28},
-                {"matrix": [7, 3], "x": 11.7, "y": 2},
-                {"matrix": [7, 2], "x": 12.7, "y": 2.31},
-                {"matrix": [7, 1], "x": 13.7, "y": 2.93},
-                {"matrix": [7, 0], "x": 14.7, "y": 3.13},
-
-                {"matrix": [3, 0], "x": 0.3, "y": 4.13},
-                {"matrix": [3, 1], "x": 1.3, "y": 3.93},
-                {"matrix": [3, 2], "x": 2.3, "y": 3.73},
-                {"matrix": [4, 1], "x": 3.7, "y": 3.28},
-                {"matrix": [4, 2], "x": 4.7, "y": 3.42},
-                {"matrix": [4, 3], "x": 5.7, "y": 3.88},
-                {"matrix": [4, 4], "x": 6.7, "y": 4.44},
-
-                {"matrix": [9, 4], "x": 8.2, "y": 4.44},
-                {"matrix": [9, 3], "x": 9.2, "y": 3.88},
-                {"matrix": [9, 2], "x": 10.2, "y": 3.42},
-                {"matrix": [9, 1], "x": 11.2, "y": 3.28},
-                {"matrix": [8, 2], "x": 12.6, "y": 3.73},
-                {"matrix": [8, 1], "x": 13.6, "y": 3.93},
-                {"matrix": [8, 0], "x": 14.6, "y": 4.13}
-            ]
-        }
-    }
-}
diff --git a/keyboards/hillside/52/0_1/keyboard.json b/keyboards/hillside/52/0_1/keyboard.json
new file mode 100644
index 00000000000..0949fa9bb8e
--- /dev/null
+++ b/keyboards/hillside/52/0_1/keyboard.json
@@ -0,0 +1,114 @@
+{
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "matrix_pins": {
+        "rows": ["C6", "D7", "E6", "B4", "B5"],
+        "cols": ["F6", "F7", "B1", "B3", "B2", "B6"]
+     },
+    "diode_direction": "COL2ROW",
+    "usb": {
+      "vid": "0x4D4D",
+      "pid": "0x4852",
+      "device_version": "0.0.1"
+    },
+    "encoder": {
+        "rotary": [
+            {"pin_a": "F5", "pin_b": "F4"}
+        ]
+    },
+    "build": {
+        "lto": true
+    },
+    "features": {
+        "encoder": true,
+        "extrakey": true,
+        "rgblight": true
+    },
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "D2",
+        "encoder": {
+            "right": {
+                "rotary": [
+                    {"pin_a": "F4", "pin_b": "F5"}
+                ]
+            }
+        }
+    },
+    "rgblight": {
+        "led_count": 5,
+        "split": true,
+        "hue_steps": 8,
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "sleep": true
+    },
+    "ws2812": {
+        "pin": "D3"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 1.13},
+                {"matrix": [0, 1], "x": 1, "y": 0.93},
+                {"matrix": [0, 2], "x": 2.1, "y": 0.31},
+                {"matrix": [0, 3], "x": 3.2, "y": 0},
+                {"matrix": [0, 4], "x": 4.2, "y": 0.28},
+                {"matrix": [0, 5], "x": 5.2, "y": 0.42},
+
+                {"matrix": [5, 5], "x": 9.7, "y": 0.42},
+                {"matrix": [5, 4], "x": 10.7, "y": 0.28},
+                {"matrix": [5, 3], "x": 11.7, "y": 0},
+                {"matrix": [5, 2], "x": 12.8, "y": 0.31},
+                {"matrix": [5, 1], "x": 13.9, "y": 0.93},
+                {"matrix": [5, 0], "x": 14.9, "y": 1.13},
+
+                {"matrix": [1, 0], "x": 0.1, "y": 2.13},
+                {"matrix": [1, 1], "x": 1.1, "y": 1.93},
+                {"matrix": [1, 2], "x": 2.15, "y": 1.31},
+                {"matrix": [1, 3], "x": 3.2, "y": 1},
+                {"matrix": [1, 4], "x": 4.2, "y": 1.28},
+                {"matrix": [1, 5], "x": 5.2, "y": 1.42},
+
+                {"matrix": [6, 5], "x": 9.7, "y": 1.42},
+                {"matrix": [6, 4], "x": 10.7, "y": 1.28},
+                {"matrix": [6, 3], "x": 11.7, "y": 1},
+                {"matrix": [6, 2], "x": 12.75, "y": 1.31},
+                {"matrix": [6, 1], "x": 13.8, "y": 1.93},
+                {"matrix": [6, 0], "x": 14.8, "y": 2.13},
+
+                {"matrix": [2, 0], "x": 0.2, "y": 3.13},
+                {"matrix": [2, 1], "x": 1.2, "y": 2.93},
+                {"matrix": [2, 2], "x": 2.2, "y": 2.31},
+                {"matrix": [2, 3], "x": 3.2, "y": 2},
+                {"matrix": [2, 4], "x": 4.2, "y": 2.28},
+                {"matrix": [2, 5], "x": 5.2, "y": 2.42},
+                {"matrix": [4, 5], "x": 6.2, "y": 2.88},
+
+                {"matrix": [9, 5], "x": 8.7, "y": 2.88},
+                {"matrix": [7, 5], "x": 9.7, "y": 2.42},
+                {"matrix": [7, 4], "x": 10.7, "y": 2.28},
+                {"matrix": [7, 3], "x": 11.7, "y": 2},
+                {"matrix": [7, 2], "x": 12.7, "y": 2.31},
+                {"matrix": [7, 1], "x": 13.7, "y": 2.93},
+                {"matrix": [7, 0], "x": 14.7, "y": 3.13},
+
+                {"matrix": [3, 0], "x": 0.3, "y": 4.13},
+                {"matrix": [3, 1], "x": 1.3, "y": 3.93},
+                {"matrix": [3, 2], "x": 2.3, "y": 3.73},
+                {"matrix": [4, 1], "x": 3.7, "y": 3.28},
+                {"matrix": [4, 2], "x": 4.7, "y": 3.42},
+                {"matrix": [4, 3], "x": 5.7, "y": 3.88},
+                {"matrix": [4, 4], "x": 6.7, "y": 4.44},
+
+                {"matrix": [9, 4], "x": 8.2, "y": 4.44},
+                {"matrix": [9, 3], "x": 9.2, "y": 3.88},
+                {"matrix": [9, 2], "x": 10.2, "y": 3.42},
+                {"matrix": [9, 1], "x": 11.2, "y": 3.28},
+                {"matrix": [8, 2], "x": 12.6, "y": 3.73},
+                {"matrix": [8, 1], "x": 13.6, "y": 3.93},
+                {"matrix": [8, 0], "x": 14.6, "y": 4.13}
+            ]
+        }
+    }
+}
diff --git a/keyboards/hillside/52/0_1/rules.mk b/keyboards/hillside/52/0_1/rules.mk
deleted file mode 100644
index 093b81abfe0..00000000000
--- a/keyboards/hillside/52/0_1/rules.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-LTO_ENABLE = yes            # Use link time optimization for smaller firmware
-
-# If you add a haptic board,
-# enable it and set its driver here or in your keymap folder
-# The Pimoroni board's driver is DRV2605L 
-# HAPTIC_ENABLE = yes        # Enable haptic driver
-# HAPTIC_DRIVER = drv2605l
diff --git a/keyboards/hineybush/hbcp/info.json b/keyboards/hineybush/hbcp/info.json
deleted file mode 100644
index ca92b3f4a52..00000000000
--- a/keyboards/hineybush/hbcp/info.json
+++ /dev/null
@@ -1,281 +0,0 @@
-{
-    "keyboard_name": "hbcp",
-    "manufacturer": "hineybush",
-    "url": "",
-    "maintainer": "hineybush",
-    "usb": {
-        "vid": "0x04D8",
-        "pid": "0xECE8",
-        "device_version": "0.0.1"
-    },
-    "backlight": {
-        "pin": "B7",
-        "breathing": true
-    },
-    "ws2812": {
-        "pin": "B0"
-    },
-    "rgblight": {
-        "saturation_steps": 8,
-        "brightness_steps": 8,
-        "led_count": 27,
-        "max_brightness": 200,
-        "sleep": true,
-        "animations": {
-            "breathing": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "snake": true,
-            "knight": true,
-            "christmas": true,
-            "static_gradient": true,
-            "rgb_test": true,
-            "alternating": true,
-            "twinkle": true
-        }
-    },
-    "processor": "at90usb1286",
-    "bootloader": "atmel-dfu",
-    "layouts": {
-        "LAYOUT_all": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-
-                {"matrix": [0, 1], "x": 1.25, "y": 0},
-                {"matrix": [0, 2], "x": 2.25, "y": 0},
-                {"matrix": [0, 3], "x": 3.25, "y": 0},
-                {"matrix": [0, 4], "x": 4.25, "y": 0},
-
-                {"matrix": [0, 5], "x": 5.5, "y": 0},
-                {"matrix": [0, 6], "x": 6.5, "y": 0},
-                {"matrix": [0, 7], "x": 7.5, "y": 0},
-                {"matrix": [0, 8], "x": 8.5, "y": 0},
-
-                {"matrix": [0, 9], "x": 9.75, "y": 0},
-                {"matrix": [0, 10], "x": 10.75, "y": 0},
-                {"matrix": [0, 11], "x": 11.75, "y": 0},
-                {"matrix": [0, 12], "x": 12.75, "y": 0},
-
-                {"matrix": [0, 14], "x": 15.5, "y": 0},
-                {"matrix": [0, 15], "x": 16.5, "y": 0},
-                {"matrix": [0, 16], "x": 17.5, "y": 0},
-                {"matrix": [0, 17], "x": 18.5, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1.25},
-                {"matrix": [1, 1], "x": 1, "y": 1.25},
-                {"matrix": [1, 2], "x": 2, "y": 1.25},
-                {"matrix": [1, 3], "x": 3, "y": 1.25},
-                {"matrix": [1, 4], "x": 4, "y": 1.25},
-                {"matrix": [1, 5], "x": 5, "y": 1.25},
-                {"matrix": [1, 6], "x": 6, "y": 1.25},
-                {"matrix": [1, 7], "x": 7, "y": 1.25},
-                {"matrix": [1, 8], "x": 8, "y": 1.25},
-                {"matrix": [1, 9], "x": 9, "y": 1.25},
-                {"matrix": [1, 10], "x": 10, "y": 1.25},
-                {"matrix": [1, 11], "x": 11, "y": 1.25},
-                {"matrix": [1, 12], "x": 12, "y": 1.25},
-                {"matrix": [1, 13], "x": 13, "y": 1.25},
-                {"matrix": [0, 13], "x": 14, "y": 1.25},
-
-                {"matrix": [1, 14], "x": 15.5, "y": 1.25},
-                {"matrix": [1, 15], "x": 16.5, "y": 1.25},
-                {"matrix": [1, 16], "x": 17.5, "y": 1.25},
-                {"matrix": [1, 17], "x": 18.5, "y": 1.25},
-
-                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
-                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
-                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
-                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
-                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
-                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
-                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
-                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
-                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
-                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
-                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
-                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
-                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
-                {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
-
-                {"matrix": [2, 14], "x": 15.5, "y": 2.25},
-                {"matrix": [2, 15], "x": 16.5, "y": 2.25},
-                {"matrix": [2, 16], "x": 17.5, "y": 2.25},
-                {"matrix": [2, 17], "x": 18.5, "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, 12], "x": 12.75, "y": 3.25},
-                {"matrix": [3, 13], "x": 13.75, "y": 3.25, "w": 1.25},
-
-                {"matrix": [3, 14], "x": 15.5, "y": 3.25},
-                {"matrix": [3, 15], "x": 16.5, "y": 3.25},
-                {"matrix": [3, 16], "x": 17.5, "y": 3.25},
-                {"matrix": [3, 17], "x": 18.5, "y": 3.25},
-
-                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4.25},
-                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
-                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
-                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
-                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
-                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
-                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
-                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
-                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
-                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
-                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
-                {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
-
-                {"matrix": [4, 13], "x": 14.25, "y": 4.5},
-
-                {"matrix": [4, 14], "x": 15.5, "y": 4.25},
-                {"matrix": [4, 15], "x": 16.5, "y": 4.25},
-                {"matrix": [4, 16], "x": 17.5, "y": 4.25},
-                {"matrix": [4, 17], "x": 18.5, "y": 4.25},
-
-                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 5], "x": 3.75, "y": 5.25, "w": 6.25},
-                {"matrix": [5, 9], "x": 10, "y": 5.25},
-                {"matrix": [5, 10], "x": 11, "y": 5.25},
-                {"matrix": [5, 11], "x": 12, "y": 5.25},
-
-                {"matrix": [5, 12], "x": 13.25, "y": 5.5},
-                {"matrix": [5, 13], "x": 14.25, "y": 5.5},
-                {"matrix": [5, 14], "x": 15.25, "y": 5.5},
-
-                {"matrix": [5, 15], "x": 16.5, "y": 5.25},
-                {"matrix": [5, 16], "x": 17.5, "y": 5.25},
-                {"matrix": [5, 17], "x": 18.5, "y": 5.25}
-            ]
-        },
-        "LAYOUT_wkl": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-
-                {"matrix": [0, 1], "x": 1.25, "y": 0},
-                {"matrix": [0, 2], "x": 2.25, "y": 0},
-                {"matrix": [0, 3], "x": 3.25, "y": 0},
-                {"matrix": [0, 4], "x": 4.25, "y": 0},
-
-                {"matrix": [0, 5], "x": 5.5, "y": 0},
-                {"matrix": [0, 6], "x": 6.5, "y": 0},
-                {"matrix": [0, 7], "x": 7.5, "y": 0},
-                {"matrix": [0, 8], "x": 8.5, "y": 0},
-
-                {"matrix": [0, 9], "x": 9.75, "y": 0},
-                {"matrix": [0, 10], "x": 10.75, "y": 0},
-                {"matrix": [0, 11], "x": 11.75, "y": 0},
-                {"matrix": [0, 12], "x": 12.75, "y": 0},
-
-                {"matrix": [0, 14], "x": 15.5, "y": 0},
-                {"matrix": [0, 15], "x": 16.5, "y": 0},
-                {"matrix": [0, 16], "x": 17.5, "y": 0},
-                {"matrix": [0, 17], "x": 18.5, "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": [0, 13], "x": 13, "y": 1.25, "w": 2},
-
-                {"matrix": [1, 14], "x": 15.5, "y": 1.25},
-                {"matrix": [1, 15], "x": 16.5, "y": 1.25},
-                {"matrix": [1, 16], "x": 17.5, "y": 1.25},
-                {"matrix": [1, 17], "x": 18.5, "y": 1.25},
-
-                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
-                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
-                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
-                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
-                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
-                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
-                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
-                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
-                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
-                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
-                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
-                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
-                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
-                {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
-
-                {"matrix": [2, 14], "x": 15.5, "y": 2.25},
-                {"matrix": [2, 15], "x": 16.5, "y": 2.25},
-                {"matrix": [2, 16], "x": 17.5, "y": 2.25},
-                {"matrix": [2, 17], "x": 18.5, "y": 2.25},
-
-                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
-                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
-                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
-                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
-                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
-                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
-                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
-                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
-                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
-                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
-                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
-                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
-                {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
-
-                {"matrix": [3, 14], "x": 15.5, "y": 3.25},
-                {"matrix": [3, 15], "x": 16.5, "y": 3.25},
-                {"matrix": [3, 16], "x": 17.5, "y": 3.25},
-                {"matrix": [3, 17], "x": 18.5, "y": 3.25},
-
-                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
-                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
-                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
-                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
-                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
-                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
-                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
-                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
-                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
-                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
-                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
-                {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
-
-                {"matrix": [4, 13], "x": 14.25, "y": 4.5},
-
-                {"matrix": [4, 14], "x": 15.5, "y": 4.25},
-                {"matrix": [4, 15], "x": 16.5, "y": 4.25},
-                {"matrix": [4, 16], "x": 17.5, "y": 4.25},
-
-                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
-                {"matrix": [5, 1], "x": 1.5, "y": 5.25, "w": 1.5},
-                {"matrix": [5, 5], "x": 3, "y": 5.25, "w": 7},
-                {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.5},
-                {"matrix": [5, 11], "x": 11.5, "y": 5.25, "w": 1.5},
-
-                {"matrix": [5, 12], "x": 13.25, "y": 5.5},
-                {"matrix": [5, 13], "x": 14.25, "y": 5.5},
-                {"matrix": [5, 14], "x": 15.25, "y": 5.5},
-
-                {"matrix": [5, 15], "x": 16.5, "y": 5.25},
-                {"matrix": [5, 16], "x": 17.5, "y": 5.25},
-                {"matrix": [5, 17], "x": 18.5, "y": 4.25, "h": 2}
-            ]
-        }
-    }
-}
diff --git a/keyboards/hineybush/hbcp/keyboard.json b/keyboards/hineybush/hbcp/keyboard.json
new file mode 100644
index 00000000000..ab36bfaea09
--- /dev/null
+++ b/keyboards/hineybush/hbcp/keyboard.json
@@ -0,0 +1,291 @@
+{
+    "keyboard_name": "hbcp",
+    "manufacturer": "hineybush",
+    "url": "",
+    "maintainer": "hineybush",
+    "usb": {
+        "vid": "0x04D8",
+        "pid": "0xECE8",
+        "device_version": "0.0.1"
+    },
+    "backlight": {
+        "pin": "B7",
+        "breathing": true
+    },
+    "ws2812": {
+        "pin": "B0"
+    },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 27,
+        "max_brightness": 200,
+        "sleep": true,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": true,
+            "twinkle": true
+        }
+    },
+    "processor": "at90usb1286",
+    "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": false,
+        "extrakey": true,
+        "console": true,
+        "command": true,
+        "nkro": true,
+        "backlight": true,
+        "rgblight": true
+    },
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 9.75, "y": 0},
+                {"matrix": [0, 10], "x": 10.75, "y": 0},
+                {"matrix": [0, 11], "x": 11.75, "y": 0},
+                {"matrix": [0, 12], "x": 12.75, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.5, "y": 0},
+                {"matrix": [0, 15], "x": 16.5, "y": 0},
+                {"matrix": [0, 16], "x": 17.5, "y": 0},
+                {"matrix": [0, 17], "x": 18.5, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25},
+                {"matrix": [0, 13], "x": 14, "y": 1.25},
+
+                {"matrix": [1, 14], "x": 15.5, "y": 1.25},
+                {"matrix": [1, 15], "x": 16.5, "y": 1.25},
+                {"matrix": [1, 16], "x": 17.5, "y": 1.25},
+                {"matrix": [1, 17], "x": 18.5, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [2, 14], "x": 15.5, "y": 2.25},
+                {"matrix": [2, 15], "x": 16.5, "y": 2.25},
+                {"matrix": [2, 16], "x": 17.5, "y": 2.25},
+                {"matrix": [2, 17], "x": 18.5, "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, 12], "x": 12.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 13.75, "y": 3.25, "w": 1.25},
+
+                {"matrix": [3, 14], "x": 15.5, "y": 3.25},
+                {"matrix": [3, 15], "x": 16.5, "y": 3.25},
+                {"matrix": [3, 16], "x": 17.5, "y": 3.25},
+                {"matrix": [3, 17], "x": 18.5, "y": 3.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+
+                {"matrix": [4, 13], "x": 14.25, "y": 4.5},
+
+                {"matrix": [4, 14], "x": 15.5, "y": 4.25},
+                {"matrix": [4, 15], "x": 16.5, "y": 4.25},
+                {"matrix": [4, 16], "x": 17.5, "y": 4.25},
+                {"matrix": [4, 17], "x": 18.5, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 5], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 9], "x": 10, "y": 5.25},
+                {"matrix": [5, 10], "x": 11, "y": 5.25},
+                {"matrix": [5, 11], "x": 12, "y": 5.25},
+
+                {"matrix": [5, 12], "x": 13.25, "y": 5.5},
+                {"matrix": [5, 13], "x": 14.25, "y": 5.5},
+                {"matrix": [5, 14], "x": 15.25, "y": 5.5},
+
+                {"matrix": [5, 15], "x": 16.5, "y": 5.25},
+                {"matrix": [5, 16], "x": 17.5, "y": 5.25},
+                {"matrix": [5, 17], "x": 18.5, "y": 5.25}
+            ]
+        },
+        "LAYOUT_wkl": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 9.75, "y": 0},
+                {"matrix": [0, 10], "x": 10.75, "y": 0},
+                {"matrix": [0, 11], "x": 11.75, "y": 0},
+                {"matrix": [0, 12], "x": 12.75, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.5, "y": 0},
+                {"matrix": [0, 15], "x": 16.5, "y": 0},
+                {"matrix": [0, 16], "x": 17.5, "y": 0},
+                {"matrix": [0, 17], "x": 18.5, "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": [0, 13], "x": 13, "y": 1.25, "w": 2},
+
+                {"matrix": [1, 14], "x": 15.5, "y": 1.25},
+                {"matrix": [1, 15], "x": 16.5, "y": 1.25},
+                {"matrix": [1, 16], "x": 17.5, "y": 1.25},
+                {"matrix": [1, 17], "x": 18.5, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [2, 14], "x": 15.5, "y": 2.25},
+                {"matrix": [2, 15], "x": 16.5, "y": 2.25},
+                {"matrix": [2, 16], "x": 17.5, "y": 2.25},
+                {"matrix": [2, 17], "x": 18.5, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"matrix": [3, 14], "x": 15.5, "y": 3.25},
+                {"matrix": [3, 15], "x": 16.5, "y": 3.25},
+                {"matrix": [3, 16], "x": 17.5, "y": 3.25},
+                {"matrix": [3, 17], "x": 18.5, "y": 3.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+
+                {"matrix": [4, 13], "x": 14.25, "y": 4.5},
+
+                {"matrix": [4, 14], "x": 15.5, "y": 4.25},
+                {"matrix": [4, 15], "x": 16.5, "y": 4.25},
+                {"matrix": [4, 16], "x": 17.5, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 1], "x": 1.5, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 5], "x": 3, "y": 5.25, "w": 7},
+                {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 11], "x": 11.5, "y": 5.25, "w": 1.5},
+
+                {"matrix": [5, 12], "x": 13.25, "y": 5.5},
+                {"matrix": [5, 13], "x": 14.25, "y": 5.5},
+                {"matrix": [5, 14], "x": 15.25, "y": 5.5},
+
+                {"matrix": [5, 15], "x": 16.5, "y": 5.25},
+                {"matrix": [5, 16], "x": 17.5, "y": 5.25},
+                {"matrix": [5, 17], "x": 18.5, "y": 4.25, "h": 2}
+            ]
+        }
+    }
+}
diff --git a/keyboards/hineybush/hbcp/rules.mk b/keyboards/hineybush/hbcp/rules.mk
index f60d6afa1e2..30ce5d293b7 100644
--- a/keyboards/hineybush/hbcp/rules.mk
+++ b/keyboards/hineybush/hbcp/rules.mk
@@ -1,14 +1,2 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no      # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = yes        # Console for debug
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = yes       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
 CUSTOM_MATRIX = lite
 SRC += matrix.c
diff --git a/keyboards/horrortroll/handwired_k552/info.json b/keyboards/horrortroll/handwired_k552/info.json
deleted file mode 100644
index 6eb5cbd80ec..00000000000
--- a/keyboards/horrortroll/handwired_k552/info.json
+++ /dev/null
@@ -1,158 +0,0 @@
-{
-    "keyboard_name": "K552 Kumara",
-    "manufacturer": "HorrorTroll",
-    "url": "",
-    "maintainer": "HorrorTroll",
-    "usb": {
-        "vid": "0x7516",
-        "pid": "0x5104",
-        "device_version": "0.0.1",
-        "force_nkro": true
-    },
-    "ws2812": {
-        "pin": "C14"
-    },
-    "rgb_matrix": {
-        "animations": {
-            "gradient_up_down": true,
-            "gradient_left_right": true,
-            "breathing": true,
-            "band_val": true,
-            "band_pinwheel_val": true,
-            "cycle_all": true,
-            "cycle_left_right": true,
-            "cycle_up_down": true,
-            "cycle_out_in": true,
-            "cycle_pinwheel": true,
-            "dual_beacon": true,
-            "rainbow_beacon": true,
-            "raindrops": true,
-            "jellybean_raindrops": true,
-            "hue_breathing": true,
-            "hue_pendulum": true,
-            "hue_wave": true,
-            "pixel_rain": true
-        },
-        "driver": "ws2812",
-        "max_brightness": 200
-    },
-    "matrix_pins": {
-        "cols": ["B15", "C6", "C7", "A3", "A1", "C3", "C1", "B14", "B13", "A9", "B3", "B4", "A0", "C11", "C4", "C0", "C2"],
-        "rows": ["C12", "C10", "A10", "A8", "C8", "C9"]
-    },
-    "diode_direction": "ROW2COL",
-    "eeprom": {
-        "driver": "wear_leveling",
-        "wear_leveling": {
-            "driver": "spi_flash",
-            "backing_size": 2048
-        }
-    },
-    "community_layouts": ["tkl_ansi"],
-    "layouts": {
-        "LAYOUT_tkl_ansi": {
-            "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": [2, 13], "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, 13], "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.25},
-                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 3], "x": 3.75, "y": 5.25, "w": 6.25},
-                {"matrix": [5, 4], "x": 10, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 5], "x": 11.25, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 6], "x": 12.5, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 8], "x": 13.75, "y": 5.25, "w": 1.25},
-
-                {"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}
-            ]
-        }
-    }
-}
diff --git a/keyboards/horrortroll/handwired_k552/keyboard.json b/keyboards/horrortroll/handwired_k552/keyboard.json
new file mode 100644
index 00000000000..6bbfa86e124
--- /dev/null
+++ b/keyboards/horrortroll/handwired_k552/keyboard.json
@@ -0,0 +1,167 @@
+{
+    "keyboard_name": "K552 Kumara",
+    "manufacturer": "HorrorTroll",
+    "url": "",
+    "maintainer": "HorrorTroll",
+    "usb": {
+        "vid": "0x7516",
+        "pid": "0x5104",
+        "device_version": "0.0.1",
+        "force_nkro": true
+    },
+    "ws2812": {
+        "pin": "C14"
+    },
+    "rgb_matrix": {
+        "animations": {
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_val": true,
+            "band_pinwheel_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "cycle_out_in": true,
+            "cycle_pinwheel": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_rain": true
+        },
+        "driver": "ws2812",
+        "max_brightness": 200
+    },
+    "matrix_pins": {
+        "cols": ["B15", "C6", "C7", "A3", "A1", "C3", "C1", "B14", "B13", "A9", "B3", "B4", "A0", "C11", "C4", "C0", "C2"],
+        "rows": ["C12", "C10", "A10", "A8", "C8", "C9"]
+    },
+    "diode_direction": "ROW2COL",
+    "eeprom": {
+        "driver": "wear_leveling",
+        "wear_leveling": {
+            "driver": "spi_flash",
+            "backing_size": 2048
+        }
+    },
+    "features": {
+        "bootmagic": true,
+        "mousekey": false,
+        "extrakey": true,
+        "nkro": true,
+        "rgb_matrix": true,
+        "oled": true,
+        "wpm": true
+    },
+    "community_layouts": ["tkl_ansi"],
+    "layouts": {
+        "LAYOUT_tkl_ansi": {
+            "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": [2, 13], "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, 13], "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.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 3], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 4], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 5], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 8], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"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}
+            ]
+        }
+    }
+}
diff --git a/keyboards/horrortroll/handwired_k552/rules.mk b/keyboards/horrortroll/handwired_k552/rules.mk
index 6d6ec253db3..b2ab6eed6df 100644
--- a/keyboards/horrortroll/handwired_k552/rules.mk
+++ b/keyboards/horrortroll/handwired_k552/rules.mk
@@ -12,23 +12,3 @@ BOARD = STM32_F103_STM32DUINO
 BOOTLOADER_TYPE = stm32duino
 DFU_ARGS = -d 1EAF:0003 -a 2 -R
 DFU_SUFFIX_ARGS = -v 1EAF -p 0003
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
-# RGB Matrix enabled
-RGB_MATRIX_ENABLE = yes
-
-# OLED enabled
-OLED_ENABLE = yes
-WPM_ENABLE = yes
diff --git a/keyboards/horrortroll/lemon40/info.json b/keyboards/horrortroll/lemon40/info.json
deleted file mode 100644
index 7b0b1c394b3..00000000000
--- a/keyboards/horrortroll/lemon40/info.json
+++ /dev/null
@@ -1,96 +0,0 @@
-{
-    "keyboard_name": "Lemon40",
-    "manufacturer": "HorrorTroll",
-    "url": "",
-    "maintainer": "HorrorTroll",
-    "usb": {
-        "vid": "0x7516",
-        "pid": "0x2434",
-        "device_version": "0.0.1",
-        "force_nkro": true
-    },
-    "rgblight": {
-        "led_count": 15,
-        "animations": {
-            "breathing": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "snake": true,
-            "knight": true,
-            "christmas": true,
-            "static_gradient": true,
-            "alternating": true
-        }
-    },
-    "ws2812": {
-        "pin": "F4"
-    },
-    "matrix_pins": {
-        "cols": ["F5", "F6", "B1", "B3", "B2", "B6", "F7"],
-        "rows": ["D7", "E6", "B4", "B5", "D4", "C6", "D2", "D3"]
-    },
-    "diode_direction": "COL2ROW",
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0, "w": 1.5},
-                {"matrix": [0, 1], "x": 1.5, "y": 0},
-                {"matrix": [0, 2], "x": 2.5, "y": 0},
-                {"matrix": [0, 3], "x": 3.5, "y": 0},
-                {"matrix": [0, 4], "x": 4.5, "y": 0},
-                {"matrix": [0, 5], "x": 5.5, "y": 0},
-
-                {"matrix": [0, 6], "x": 8.25, "y": 0},
-                {"matrix": [4, 0], "x": 9.25, "y": 0},
-                {"matrix": [4, 1], "x": 10.25, "y": 0},
-                {"matrix": [4, 2], "x": 11.25, "y": 0},
-                {"matrix": [4, 3], "x": 12.25, "y": 0},
-                {"matrix": [4, 4], "x": 13.25, "y": 0},
-                {"matrix": [4, 5], "x": 14.25, "y": 0, "w": 1.25},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.75},
-                {"matrix": [1, 1], "x": 1.75, "y": 1},
-                {"matrix": [1, 2], "x": 2.75, "y": 1},
-                {"matrix": [1, 3], "x": 3.75, "y": 1},
-                {"matrix": [1, 4], "x": 4.75, "y": 1},
-                {"matrix": [1, 5], "x": 5.75, "y": 1},
-
-                {"matrix": [1, 6], "x": 8.5, "y": 1},
-                {"matrix": [5, 0], "x": 9.5, "y": 1},
-                {"matrix": [5, 1], "x": 10.5, "y": 1},
-                {"matrix": [5, 2], "x": 11.5, "y": 1},
-                {"matrix": [5, 3], "x": 12.5, "y": 1},
-                {"matrix": [5, 5], "x": 13.5, "y": 1, "w": 2},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 2.25},
-                {"matrix": [2, 1], "x": 2.25, "y": 2},
-                {"matrix": [2, 2], "x": 3.25, "y": 2},
-                {"matrix": [2, 3], "x": 4.25, "y": 2},
-                {"matrix": [2, 4], "x": 5.25, "y": 2},
-                {"matrix": [2, 5], "x": 6.25, "y": 2},
-
-                {"matrix": [2, 6], "x": 8, "y": 2},
-                {"matrix": [6, 0], "x": 9, "y": 2},
-                {"matrix": [6, 1], "x": 10, "y": 2},
-                {"matrix": [6, 2], "x": 11, "y": 2},
-                {"matrix": [6, 3], "x": 12.25, "y": 2},
-                {"matrix": [6, 4], "x": 13.25, "y": 2},
-                {"matrix": [6, 5], "x": 14.25, "y": 2, "w": 1.25},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
-                {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 1.25},
-                {"matrix": [3, 2], "x": 3.25, "y": 3, "w": 1.25},
-                {"matrix": [3, 4], "x": 4.5, "y": 3, "w": 2.75},
-
-                {"matrix": [7, 0], "x": 8, "y": 3, "w": 2.25},
-                {"matrix": [7, 2], "x": 10.25, "y": 3, "w": 1.25},
-
-                {"matrix": [7, 3], "x": 12.25, "y": 3},
-                {"matrix": [7, 4], "x": 13.25, "y": 3},
-                {"matrix": [7, 5], "x": 14.25, "y": 3}
-            ]
-        }
-    }
-}
diff --git a/keyboards/horrortroll/lemon40/keyboard.json b/keyboards/horrortroll/lemon40/keyboard.json
new file mode 100644
index 00000000000..6303fb70bba
--- /dev/null
+++ b/keyboards/horrortroll/lemon40/keyboard.json
@@ -0,0 +1,108 @@
+{
+    "keyboard_name": "Lemon40",
+    "manufacturer": "HorrorTroll",
+    "url": "",
+    "maintainer": "HorrorTroll",
+    "usb": {
+        "vid": "0x7516",
+        "pid": "0x2434",
+        "device_version": "0.0.1",
+        "force_nkro": true
+    },
+    "rgblight": {
+        "led_count": 15,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "alternating": true
+        }
+    },
+    "ws2812": {
+        "pin": "F4"
+    },
+    "matrix_pins": {
+        "cols": ["F5", "F6", "B1", "B3", "B2", "B6", "F7"],
+        "rows": ["D7", "E6", "B4", "B5", "D4", "C6", "D2", "D3"]
+    },
+    "diode_direction": "COL2ROW",
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": false,
+        "extrakey": true,
+        "nkro": true,
+        "rgblight": true,
+        "oled": true,
+        "wpm": true
+    },
+    "build": {
+        "lto": true
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0, "w": 1.5},
+                {"matrix": [0, 1], "x": 1.5, "y": 0},
+                {"matrix": [0, 2], "x": 2.5, "y": 0},
+                {"matrix": [0, 3], "x": 3.5, "y": 0},
+                {"matrix": [0, 4], "x": 4.5, "y": 0},
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+
+                {"matrix": [0, 6], "x": 8.25, "y": 0},
+                {"matrix": [4, 0], "x": 9.25, "y": 0},
+                {"matrix": [4, 1], "x": 10.25, "y": 0},
+                {"matrix": [4, 2], "x": 11.25, "y": 0},
+                {"matrix": [4, 3], "x": 12.25, "y": 0},
+                {"matrix": [4, 4], "x": 13.25, "y": 0},
+                {"matrix": [4, 5], "x": 14.25, "y": 0, "w": 1.25},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.75},
+                {"matrix": [1, 1], "x": 1.75, "y": 1},
+                {"matrix": [1, 2], "x": 2.75, "y": 1},
+                {"matrix": [1, 3], "x": 3.75, "y": 1},
+                {"matrix": [1, 4], "x": 4.75, "y": 1},
+                {"matrix": [1, 5], "x": 5.75, "y": 1},
+
+                {"matrix": [1, 6], "x": 8.5, "y": 1},
+                {"matrix": [5, 0], "x": 9.5, "y": 1},
+                {"matrix": [5, 1], "x": 10.5, "y": 1},
+                {"matrix": [5, 2], "x": 11.5, "y": 1},
+                {"matrix": [5, 3], "x": 12.5, "y": 1},
+                {"matrix": [5, 5], "x": 13.5, "y": 1, "w": 2},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 2.25},
+                {"matrix": [2, 1], "x": 2.25, "y": 2},
+                {"matrix": [2, 2], "x": 3.25, "y": 2},
+                {"matrix": [2, 3], "x": 4.25, "y": 2},
+                {"matrix": [2, 4], "x": 5.25, "y": 2},
+                {"matrix": [2, 5], "x": 6.25, "y": 2},
+
+                {"matrix": [2, 6], "x": 8, "y": 2},
+                {"matrix": [6, 0], "x": 9, "y": 2},
+                {"matrix": [6, 1], "x": 10, "y": 2},
+                {"matrix": [6, 2], "x": 11, "y": 2},
+                {"matrix": [6, 3], "x": 12.25, "y": 2},
+                {"matrix": [6, 4], "x": 13.25, "y": 2},
+                {"matrix": [6, 5], "x": 14.25, "y": 2, "w": 1.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 1.25},
+                {"matrix": [3, 2], "x": 3.25, "y": 3, "w": 1.25},
+                {"matrix": [3, 4], "x": 4.5, "y": 3, "w": 2.75},
+
+                {"matrix": [7, 0], "x": 8, "y": 3, "w": 2.25},
+                {"matrix": [7, 2], "x": 10.25, "y": 3, "w": 1.25},
+
+                {"matrix": [7, 3], "x": 12.25, "y": 3},
+                {"matrix": [7, 4], "x": 13.25, "y": 3},
+                {"matrix": [7, 5], "x": 14.25, "y": 3}
+            ]
+        }
+    }
+}
diff --git a/keyboards/horrortroll/lemon40/rules.mk b/keyboards/horrortroll/lemon40/rules.mk
index 9ac59719d8e..89d3a12a0b6 100644
--- a/keyboards/horrortroll/lemon40/rules.mk
+++ b/keyboards/horrortroll/lemon40/rules.mk
@@ -1,21 +1 @@
 SRC += lib/bongocat.c
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
-# OLED enabled
-OLED_ENABLE = yes
-WPM_ENABLE = yes
-
-# Additional thing to reduce compiled size
-LTO_ENABLE = yes
diff --git a/keyboards/horrortroll/nyx/rev1/info.json b/keyboards/horrortroll/nyx/rev1/keyboard.json
similarity index 100%
rename from keyboards/horrortroll/nyx/rev1/info.json
rename to keyboards/horrortroll/nyx/rev1/keyboard.json
diff --git a/keyboards/hotdox/info.json b/keyboards/hotdox/info.json
deleted file mode 100644
index 8184588e5d7..00000000000
--- a/keyboards/hotdox/info.json
+++ /dev/null
@@ -1,402 +0,0 @@
-{
-    "keyboard_name": "Ergodox 76 \"HotDox\"",
-    "manufacturer": "Alpaca Keyboards",
-    "maintainer": "layne001365",
-    "usb": {
-      "vid": "0x414B",
-      "pid": "0x0001",
-      "device_version": "0.0.1"
-    },
-    "backlight": {
-      "pin": "B7"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "tapping": {
-      "toggle": 1
-    },
-    "community_layouts": ["ergodox"],
-    "layouts": {
-    "LAYOUT_ergodox": {
-      "layout": [
-        {"matrix": [0, 0], "x": 0, "y": 0.375, "w": 1.5},
-        {"matrix": [0, 1], "x": 1.5, "y": 0.375},
-        {"matrix": [0, 2], "x": 2.5, "y": 0.125},
-        {"matrix": [0, 3], "x": 3.5, "y": 0},
-        {"matrix": [0, 4], "x": 4.5, "y": 0.125},
-        {"matrix": [0, 5], "x": 5.5, "y": 0.25},
-        {"matrix": [0, 6], "x": 6.5, "y": 0.25},
-
-        {"matrix": [1, 0], "x": 0, "y": 1.375, "w": 1.5},
-        {"matrix": [1, 1], "x": 1.5, "y": 1.375},
-        {"matrix": [1, 2], "x": 2.5, "y": 1.125},
-        {"matrix": [1, 3], "x": 3.5, "y": 1},
-        {"matrix": [1, 4], "x": 4.5, "y": 1.125},
-        {"matrix": [1, 5], "x": 5.5, "y": 1.25},
-        {"matrix": [1, 6], "x": 6.5, "y": 1.25, "h": 1.5},
-
-        {"matrix": [2, 0], "x": 0, "y": 2.375, "w": 1.5},
-        {"matrix": [2, 1], "x": 1.5, "y": 2.375},
-        {"matrix": [2, 2], "x": 2.5, "y": 2.125},
-        {"matrix": [2, 3], "x": 3.5, "y": 2},
-        {"matrix": [2, 4], "x": 4.5, "y": 2.125},
-        {"matrix": [2, 5], "x": 5.5, "y": 2.25},
-
-        {"matrix": [3, 0], "x": 0, "y": 3.375, "w": 1.5},
-        {"matrix": [3, 1], "x": 1.5, "y": 3.375},
-        {"matrix": [3, 2], "x": 2.5, "y": 3.125},
-        {"matrix": [3, 3], "x": 3.5, "y": 3},
-        {"matrix": [3, 4], "x": 4.5, "y": 3.125},
-        {"matrix": [3, 5], "x": 5.5, "y": 3.25},
-        {"matrix": [3, 6], "x": 6.5, "y": 2.75, "h": 1.5},
-
-        {"matrix": [4, 0], "x": 0.5, "y": 4.375},
-        {"matrix": [4, 1], "x": 1.5, "y": 4.375},
-        {"matrix": [4, 2], "x": 2.5, "y": 4.125},
-        {"matrix": [4, 3], "x": 3.5, "y": 4},
-        {"matrix": [4, 4], "x": 4.5, "y": 4.125},
-
-        {"matrix": [5, 5], "x": 6, "y": 5},
-        {"matrix": [5, 6], "x": 7, "y": 5},
-
-        {"matrix": [5, 4], "x": 7, "y": 6},
-        {"matrix": [5, 1], "x": 5, "y": 6, "h": 2},
-        {"matrix": [5, 2], "x": 6, "y": 6, "h": 2},
-
-        {"matrix": [5, 3], "x": 7, "y": 7},
-
-        {"matrix": [0, 7], "x": 9.5, "y": 0.25},
-        {"matrix": [0, 8], "x": 10.5, "y": 0.25},
-        {"matrix": [0, 9], "x": 11.5, "y": 0.125},
-        {"matrix": [0, 10], "x": 12.5, "y": 0},
-        {"matrix": [0, 11], "x": 13.5, "y": 0.125},
-        {"matrix": [0, 12], "x": 14.5, "y": 0.375},
-        {"matrix": [0, 13], "x": 15.5, "y": 0.375, "w": 1.5},
-
-        {"matrix": [1, 7], "x": 9.5, "y": 1.25, "h": 1.5},
-        {"matrix": [1, 8], "x": 10.5, "y": 1.25},
-        {"matrix": [1, 9], "x": 11.5, "y": 1.125},
-        {"matrix": [1, 10], "x": 12.5, "y": 1},
-        {"matrix": [1, 11], "x": 13.5, "y": 1.125},
-        {"matrix": [1, 12], "x": 14.5, "y": 1.375},
-        {"matrix": [1, 13], "x": 15.5, "y": 1.375, "w": 1.5},
-
-        {"matrix": [2, 8], "x": 10.5, "y": 2.25},
-        {"matrix": [2, 9], "x": 11.5, "y": 2.125},
-        {"matrix": [2, 10], "x": 12.5, "y": 2},
-        {"matrix": [2, 11], "x": 13.5, "y": 2.125},
-        {"matrix": [2, 12], "x": 14.5, "y": 2.375},
-        {"matrix": [2, 13], "x": 15.5, "y": 2.375, "w": 1.5},
-        {"matrix": [3, 7], "x": 9.5, "y": 2.75, "h": 1.5},
-
-        {"matrix": [3, 8], "x": 10.5, "y": 3.25},
-        {"matrix": [3, 9], "x": 11.5, "y": 3.125},
-        {"matrix": [3, 10], "x": 12.5, "y": 3},
-        {"matrix": [3, 11], "x": 13.5, "y": 3.125},
-        {"matrix": [3, 12], "x": 14.5, "y": 3.375},
-        {"matrix": [3, 13], "x": 15.5, "y": 3.375, "w": 1.5},
-
-        {"matrix": [4, 9], "x": 11.5, "y": 4.125},
-        {"matrix": [4, 10], "x": 12.5, "y": 4},
-        {"matrix": [4, 11], "x": 13.5, "y": 4.125},
-        {"matrix": [4, 12], "x": 14.5, "y": 4.375},
-        {"matrix": [4, 13], "x": 15.5, "y": 4.375},
-
-        {"matrix": [5, 7], "x": 9, "y": 5},
-        {"matrix": [5, 8], "x": 10, "y": 5},
-
-        {"matrix": [5, 9], "x": 9, "y": 6},
-
-        {"matrix": [5, 10], "x": 9, "y": 7},
-
-        {"matrix": [5, 11], "x": 10, "y": 6, "h": 2},
-        {"matrix": [5, 12], "x": 11, "y": 6, "h": 2}
-      ]
-    },
-    "LAYOUT_ergodox_pretty": {
-      "layout": [
-        {"matrix": [0, 0], "x": 0, "y": 0.375, "w": 1.5},
-        {"matrix": [0, 1], "x": 1.5, "y": 0.375},
-        {"matrix": [0, 2], "x": 2.5, "y": 0.125},
-        {"matrix": [0, 3], "x": 3.5, "y": 0},
-        {"matrix": [0, 4], "x": 4.5, "y": 0.125},
-        {"matrix": [0, 5], "x": 5.5, "y": 0.25},
-        {"matrix": [0, 6], "x": 6.5, "y": 0.25},
-
-        {"matrix": [0, 7], "x": 9.5, "y": 0.25},
-        {"matrix": [0, 8], "x": 10.5, "y": 0.25},
-        {"matrix": [0, 9], "x": 11.5, "y": 0.125},
-        {"matrix": [0, 10], "x": 12.5, "y": 0},
-        {"matrix": [0, 11], "x": 13.5, "y": 0.125},
-        {"matrix": [0, 12], "x": 14.5, "y": 0.375},
-        {"matrix": [0, 13], "x": 15.5, "y": 0.375, "w": 1.5},
-
-        {"matrix": [1, 0], "x": 0, "y": 1.375, "w": 1.5},
-        {"matrix": [1, 1], "x": 1.5, "y": 1.375},
-        {"matrix": [1, 2], "x": 2.5, "y": 1.125},
-        {"matrix": [1, 3], "x": 3.5, "y": 1},
-        {"matrix": [1, 4], "x": 4.5, "y": 1.125},
-        {"matrix": [1, 5], "x": 5.5, "y": 1.25},
-        {"matrix": [1, 6], "x": 6.5, "y": 1.25, "h": 1.5},
-
-        {"matrix": [1, 7], "x": 9.5, "y": 1.25, "h": 1.5},
-        {"matrix": [1, 8], "x": 10.5, "y": 1.25},
-        {"matrix": [1, 9], "x": 11.5, "y": 1.125},
-        {"matrix": [1, 10], "x": 12.5, "y": 1},
-        {"matrix": [1, 11], "x": 13.5, "y": 1.125},
-        {"matrix": [1, 12], "x": 14.5, "y": 1.375},
-        {"matrix": [1, 13], "x": 15.5, "y": 1.375, "w": 1.5},
-
-        {"matrix": [2, 0], "x": 0, "y": 2.375, "w": 1.5},
-        {"matrix": [2, 1], "x": 1.5, "y": 2.375},
-        {"matrix": [2, 2], "x": 2.5, "y": 2.125},
-        {"matrix": [2, 3], "x": 3.5, "y": 2},
-        {"matrix": [2, 4], "x": 4.5, "y": 2.125},
-        {"matrix": [2, 5], "x": 5.5, "y": 2.25},
-
-        {"matrix": [2, 8], "x": 10.5, "y": 2.25},
-        {"matrix": [2, 9], "x": 11.5, "y": 2.125},
-        {"matrix": [2, 10], "x": 12.5, "y": 2},
-        {"matrix": [2, 11], "x": 13.5, "y": 2.125},
-        {"matrix": [2, 12], "x": 14.5, "y": 2.375},
-        {"matrix": [2, 13], "x": 15.5, "y": 2.375, "w": 1.5},
-
-        {"matrix": [3, 0], "x": 0, "y": 3.375, "w": 1.5},
-        {"matrix": [3, 1], "x": 1.5, "y": 3.375},
-        {"matrix": [3, 2], "x": 2.5, "y": 3.125},
-        {"matrix": [3, 3], "x": 3.5, "y": 3},
-        {"matrix": [3, 4], "x": 4.5, "y": 3.125},
-        {"matrix": [3, 5], "x": 5.5, "y": 3.25},
-        {"matrix": [3, 6], "x": 6.5, "y": 2.75, "h": 1.5},
-
-        {"matrix": [3, 7], "x": 9.5, "y": 2.75, "h": 1.5},
-        {"matrix": [3, 8], "x": 10.5, "y": 3.25},
-        {"matrix": [3, 9], "x": 11.5, "y": 3.125},
-        {"matrix": [3, 10], "x": 12.5, "y": 3},
-        {"matrix": [3, 11], "x": 13.5, "y": 3.125},
-        {"matrix": [3, 12], "x": 14.5, "y": 3.375},
-        {"matrix": [3, 13], "x": 15.5, "y": 3.375, "w": 1.5},
-
-        {"matrix": [4, 0], "x": 0.5, "y": 4.375},
-        {"matrix": [4, 1], "x": 1.5, "y": 4.375},
-        {"matrix": [4, 2], "x": 2.5, "y": 4.125},
-        {"matrix": [4, 3], "x": 3.5, "y": 4},
-        {"matrix": [4, 4], "x": 4.5, "y": 4.125},
-        {"matrix": [4, 9], "x": 11.5, "y": 4.125},
-        {"matrix": [4, 10], "x": 12.5, "y": 4},
-        {"matrix": [4, 11], "x": 13.5, "y": 4.125},
-        {"matrix": [4, 12], "x": 14.5, "y": 4.375},
-        {"matrix": [4, 13], "x": 15.5, "y": 4.375},
-
-        {"matrix": [5, 5], "x": 6, "y": 5},
-        {"matrix": [5, 6], "x": 7, "y": 5},
-        {"matrix": [5, 7], "x": 9, "y": 5},
-        {"matrix": [5, 8], "x": 10, "y": 5},
-
-        {"matrix": [5, 4], "x": 7, "y": 6},
-        {"matrix": [5, 9], "x": 9, "y": 6},
-        {"matrix": [5, 1], "x": 5, "y": 6, "h": 2},
-        {"matrix": [5, 2], "x": 6, "y": 6, "h": 2},
-
-        {"matrix": [5, 3], "x": 7, "y": 7},
-        {"matrix": [5, 10], "x": 9, "y": 7},
-
-        {"matrix": [5, 11], "x": 10, "y": 6, "h": 2},
-        {"matrix": [5, 12], "x": 11, "y": 6, "h": 2}
-      ]
-    },
-    "LAYOUT_ergodox_80": {
-      "layout": [
-        {"matrix": [0, 0], "x": 0, "y": 0.375, "w": 1.5},
-        {"matrix": [0, 1], "x": 1.5, "y": 0.375},
-        {"matrix": [0, 2], "x": 2.5, "y": 0.125},
-        {"matrix": [0, 3], "x": 3.5, "y": 0},
-        {"matrix": [0, 4], "x": 4.5, "y": 0.125},
-        {"matrix": [0, 5], "x": 5.5, "y": 0.25},
-        {"matrix": [0, 6], "x": 6.5, "y": 0.25},
-
-        {"matrix": [1, 0], "x": 0, "y": 1.375, "w": 1.5},
-        {"matrix": [1, 1], "x": 1.5, "y": 1.375},
-        {"matrix": [1, 2], "x": 2.5, "y": 1.125},
-        {"matrix": [1, 3], "x": 3.5, "y": 1},
-        {"matrix": [1, 4], "x": 4.5, "y": 1.125},
-        {"matrix": [1, 5], "x": 5.5, "y": 1.25},
-        {"matrix": [1, 6], "x": 6.5, "y": 1.25, "h": 1.5},
-
-        {"matrix": [2, 0], "x": 0, "y": 2.375, "w": 1.5},
-        {"matrix": [2, 1], "x": 1.5, "y": 2.375},
-        {"matrix": [2, 2], "x": 2.5, "y": 2.125},
-        {"matrix": [2, 3], "x": 3.5, "y": 2},
-        {"matrix": [2, 4], "x": 4.5, "y": 2.125},
-        {"matrix": [2, 5], "x": 5.5, "y": 2.25},
-
-        {"matrix": [3, 0], "x": 0, "y": 3.375, "w": 1.5},
-        {"matrix": [3, 1], "x": 1.5, "y": 3.375},
-        {"matrix": [3, 2], "x": 2.5, "y": 3.125},
-        {"matrix": [3, 3], "x": 3.5, "y": 3},
-        {"matrix": [3, 4], "x": 4.5, "y": 3.125},
-        {"matrix": [3, 5], "x": 5.5, "y": 3.25},
-        {"matrix": [3, 6], "x": 6.5, "y": 2.75, "h": 1.5},
-
-        {"matrix": [4, 0], "x": 0.5, "y": 4.375},
-        {"matrix": [4, 1], "x": 1.5, "y": 4.375},
-        {"matrix": [4, 2], "x": 2.5, "y": 4.125},
-        {"matrix": [4, 3], "x": 3.5, "y": 4},
-        {"matrix": [4, 4], "x": 4.5, "y": 4.125},
-
-        {"matrix": [5, 5], "x": 6, "y": 5},
-        {"matrix": [5, 6], "x": 7, "y": 5},
-        {"matrix": [4, 5], "x": 5, "y": 6},
-        {"matrix": [4, 6], "x": 6, "y": 6},
-        {"matrix": [5, 4], "x": 7, "y": 6},
-        {"matrix": [5, 3], "x": 5, "y": 7},
-        {"matrix": [5, 2], "x": 6, "y": 7},
-        {"matrix": [5, 1], "x": 7, "y": 7},
-
-        {"matrix": [0, 7], "x": 9.5, "y": 0.25},
-        {"matrix": [0, 8], "x": 10.5, "y": 0.25},
-        {"matrix": [0, 9], "x": 11.5, "y": 0.125},
-        {"matrix": [0, 10], "x": 12.5, "y": 0},
-        {"matrix": [0, 11], "x": 13.5, "y": 0.125},
-        {"matrix": [0, 12], "x": 14.5, "y": 0.375},
-        {"matrix": [0, 13], "x": 15.5, "y": 0.375, "w": 1.5},
-
-        {"matrix": [1, 7], "x": 9.5, "y": 1.25, "h": 1.5},
-        {"matrix": [1, 8], "x": 10.5, "y": 1.25},
-        {"matrix": [1, 9], "x": 11.5, "y": 1.125},
-        {"matrix": [1, 10], "x": 12.5, "y": 1},
-        {"matrix": [1, 11], "x": 13.5, "y": 1.125},
-        {"matrix": [1, 12], "x": 14.5, "y": 1.375},
-        {"matrix": [1, 13], "x": 15.5, "y": 1.375, "w": 1.5},
-
-        {"matrix": [2, 8], "x": 10.5, "y": 2.25},
-        {"matrix": [2, 9], "x": 11.5, "y": 2.125},
-        {"matrix": [2, 10], "x": 12.5, "y": 2},
-        {"matrix": [2, 11], "x": 13.5, "y": 2.125},
-        {"matrix": [2, 12], "x": 14.5, "y": 2.375},
-        {"matrix": [2, 13], "x": 15.5, "y": 2.375, "w": 1.5},
-        {"matrix": [3, 7], "x": 9.5, "y": 2.75, "h": 1.5},
-
-        {"matrix": [3, 8], "x": 10.5, "y": 3.25},
-        {"matrix": [3, 9], "x": 11.5, "y": 3.125},
-        {"matrix": [3, 10], "x": 12.5, "y": 3},
-        {"matrix": [3, 11], "x": 13.5, "y": 3.125},
-        {"matrix": [3, 12], "x": 14.5, "y": 3.375},
-        {"matrix": [3, 13], "x": 15.5, "y": 3.375, "w": 1.5},
-
-        {"matrix": [4, 9], "x": 11.5, "y": 4.125},
-        {"matrix": [4, 10], "x": 12.5, "y": 4},
-        {"matrix": [4, 11], "x": 13.5, "y": 4.125},
-        {"matrix": [4, 12], "x": 14.5, "y": 4.375},
-        {"matrix": [4, 13], "x": 15.5, "y": 4.375},
-
-        {"matrix": [5, 7], "x": 9, "y": 5},
-        {"matrix": [5, 8], "x": 10, "y": 5},
-
-        {"matrix": [5, 9], "x": 9, "y": 6},
-        {"matrix": [4, 7], "x": 10, "y": 6},
-        {"matrix": [4, 8], "x": 11, "y": 6},
-
-        {"matrix": [5, 10], "x": 9, "y": 7},
-        {"matrix": [5, 11], "x": 10, "y": 7},
-        {"matrix": [5, 12], "x": 11, "y": 7}
-      ]
-    },
-    "LAYOUT_ergodox_pretty_80": {
-      "layout": [
-        {"matrix": [0, 0], "x": 0, "y": 0.375, "w": 1.5},
-        {"matrix": [0, 1], "x": 1.5, "y": 0.375},
-        {"matrix": [0, 2], "x": 2.5, "y": 0.125},
-        {"matrix": [0, 3], "x": 3.5, "y": 0},
-        {"matrix": [0, 4], "x": 4.5, "y": 0.125},
-        {"matrix": [0, 5], "x": 5.5, "y": 0.25},
-        {"matrix": [0, 6], "x": 6.5, "y": 0.25},
-
-        {"matrix": [0, 7], "x": 9.5, "y": 0.25},
-        {"matrix": [0, 8], "x": 10.5, "y": 0.25},
-        {"matrix": [0, 9], "x": 11.5, "y": 0.125},
-        {"matrix": [0, 10], "x": 12.5, "y": 0},
-        {"matrix": [0, 11], "x": 13.5, "y": 0.125},
-        {"matrix": [0, 12], "x": 14.5, "y": 0.375},
-        {"matrix": [0, 13], "x": 15.5, "y": 0.375, "w": 1.5},
-
-        {"matrix": [1, 0], "x": 0, "y": 1.375, "w": 1.5},
-        {"matrix": [1, 1], "x": 1.5, "y": 1.375},
-        {"matrix": [1, 2], "x": 2.5, "y": 1.125},
-        {"matrix": [1, 3], "x": 3.5, "y": 1},
-        {"matrix": [1, 4], "x": 4.5, "y": 1.125},
-        {"matrix": [1, 5], "x": 5.5, "y": 1.25},
-        {"matrix": [1, 6], "x": 6.5, "y": 1.25, "h": 1.5},
-
-        {"matrix": [1, 7], "x": 9.5, "y": 1.25, "h": 1.5},
-        {"matrix": [1, 8], "x": 10.5, "y": 1.25},
-        {"matrix": [1, 9], "x": 11.5, "y": 1.125},
-        {"matrix": [1, 10], "x": 12.5, "y": 1},
-        {"matrix": [1, 11], "x": 13.5, "y": 1.125},
-        {"matrix": [1, 12], "x": 14.5, "y": 1.375},
-        {"matrix": [1, 13], "x": 15.5, "y": 1.375, "w": 1.5},
-
-        {"matrix": [2, 0], "x": 0, "y": 2.375, "w": 1.5},
-        {"matrix": [2, 1], "x": 1.5, "y": 2.375},
-        {"matrix": [2, 2], "x": 2.5, "y": 2.125},
-        {"matrix": [2, 3], "x": 3.5, "y": 2},
-        {"matrix": [2, 4], "x": 4.5, "y": 2.125},
-        {"matrix": [2, 5], "x": 5.5, "y": 2.25},
-
-        {"matrix": [2, 8], "x": 10.5, "y": 2.25},
-        {"matrix": [2, 9], "x": 11.5, "y": 2.125},
-        {"matrix": [2, 10], "x": 12.5, "y": 2},
-        {"matrix": [2, 11], "x": 13.5, "y": 2.125},
-        {"matrix": [2, 12], "x": 14.5, "y": 2.375},
-        {"matrix": [2, 13], "x": 15.5, "y": 2.375, "w": 1.5},
-
-        {"matrix": [3, 0], "x": 0, "y": 3.375, "w": 1.5},
-        {"matrix": [3, 1], "x": 1.5, "y": 3.375},
-        {"matrix": [3, 2], "x": 2.5, "y": 3.125},
-        {"matrix": [3, 3], "x": 3.5, "y": 3},
-        {"matrix": [3, 4], "x": 4.5, "y": 3.125},
-        {"matrix": [3, 5], "x": 5.5, "y": 3.25},
-        {"matrix": [3, 6], "x": 6.5, "y": 2.75, "h": 1.5},
-
-        {"matrix": [3, 7], "x": 9.5, "y": 2.75, "h": 1.5},
-        {"matrix": [3, 8], "x": 10.5, "y": 3.25},
-        {"matrix": [3, 9], "x": 11.5, "y": 3.125},
-        {"matrix": [3, 10], "x": 12.5, "y": 3},
-        {"matrix": [3, 11], "x": 13.5, "y": 3.125},
-        {"matrix": [3, 12], "x": 14.5, "y": 3.375},
-        {"matrix": [3, 13], "x": 15.5, "y": 3.375, "w": 1.5},
-
-        {"matrix": [4, 0], "x": 0.5, "y": 4.375},
-        {"matrix": [4, 1], "x": 1.5, "y": 4.375},
-        {"matrix": [4, 2], "x": 2.5, "y": 4.125},
-        {"matrix": [4, 3], "x": 3.5, "y": 4},
-        {"matrix": [4, 4], "x": 4.5, "y": 4.125},
-
-        {"matrix": [4, 9], "x": 11.5, "y": 4.125},
-        {"matrix": [4, 10], "x": 12.5, "y": 4},
-        {"matrix": [4, 11], "x": 13.5, "y": 4.125},
-        {"matrix": [4, 12], "x": 14.5, "y": 4.375},
-        {"matrix": [4, 13], "x": 15.5, "y": 4.375},
-
-        {"matrix": [5, 5], "x": 6, "y": 5},
-        {"matrix": [5, 6], "x": 7, "y": 5},
-        {"matrix": [5, 7], "x": 9, "y": 5},
-        {"matrix": [5, 8], "x": 10, "y": 5},
-
-        {"matrix": [4, 5], "x": 5, "y": 6},
-        {"matrix": [4, 6], "x": 6, "y": 6},
-        {"matrix": [5, 4], "x": 7, "y": 6},
-        {"matrix": [5, 9], "x": 9, "y": 6},
-        {"matrix": [4, 7], "x": 10, "y": 6},
-        {"matrix": [4, 8], "x": 11, "y": 6},
-
-        {"matrix": [5, 1], "x": 5, "y": 7},
-        {"matrix": [5, 2], "x": 6, "y": 7},
-        {"matrix": [5, 3], "x": 7, "y": 7},
-        {"matrix": [5, 10], "x": 9, "y": 7},
-        {"matrix": [5, 11], "x": 10, "y": 7},
-        {"matrix": [5, 12], "x": 11, "y": 7}
-      ]
-    }
-  }
-}
diff --git a/keyboards/hotdox/keyboard.json b/keyboards/hotdox/keyboard.json
new file mode 100644
index 00000000000..5d2c3ec5acd
--- /dev/null
+++ b/keyboards/hotdox/keyboard.json
@@ -0,0 +1,411 @@
+{
+    "keyboard_name": "Ergodox 76 \"HotDox\"",
+    "manufacturer": "Alpaca Keyboards",
+    "maintainer": "layne001365",
+    "usb": {
+      "vid": "0x414B",
+      "pid": "0x0001",
+      "device_version": "0.0.1"
+    },
+    "backlight": {
+      "pin": "B7"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "console": true,
+        "nkro": true,
+        "backlight": true,
+        "unicode": true
+    },
+    "tapping": {
+      "toggle": 1
+    },
+    "community_layouts": ["ergodox"],
+    "layouts": {
+    "LAYOUT_ergodox": {
+      "layout": [
+        {"matrix": [0, 0], "x": 0, "y": 0.375, "w": 1.5},
+        {"matrix": [0, 1], "x": 1.5, "y": 0.375},
+        {"matrix": [0, 2], "x": 2.5, "y": 0.125},
+        {"matrix": [0, 3], "x": 3.5, "y": 0},
+        {"matrix": [0, 4], "x": 4.5, "y": 0.125},
+        {"matrix": [0, 5], "x": 5.5, "y": 0.25},
+        {"matrix": [0, 6], "x": 6.5, "y": 0.25},
+
+        {"matrix": [1, 0], "x": 0, "y": 1.375, "w": 1.5},
+        {"matrix": [1, 1], "x": 1.5, "y": 1.375},
+        {"matrix": [1, 2], "x": 2.5, "y": 1.125},
+        {"matrix": [1, 3], "x": 3.5, "y": 1},
+        {"matrix": [1, 4], "x": 4.5, "y": 1.125},
+        {"matrix": [1, 5], "x": 5.5, "y": 1.25},
+        {"matrix": [1, 6], "x": 6.5, "y": 1.25, "h": 1.5},
+
+        {"matrix": [2, 0], "x": 0, "y": 2.375, "w": 1.5},
+        {"matrix": [2, 1], "x": 1.5, "y": 2.375},
+        {"matrix": [2, 2], "x": 2.5, "y": 2.125},
+        {"matrix": [2, 3], "x": 3.5, "y": 2},
+        {"matrix": [2, 4], "x": 4.5, "y": 2.125},
+        {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+
+        {"matrix": [3, 0], "x": 0, "y": 3.375, "w": 1.5},
+        {"matrix": [3, 1], "x": 1.5, "y": 3.375},
+        {"matrix": [3, 2], "x": 2.5, "y": 3.125},
+        {"matrix": [3, 3], "x": 3.5, "y": 3},
+        {"matrix": [3, 4], "x": 4.5, "y": 3.125},
+        {"matrix": [3, 5], "x": 5.5, "y": 3.25},
+        {"matrix": [3, 6], "x": 6.5, "y": 2.75, "h": 1.5},
+
+        {"matrix": [4, 0], "x": 0.5, "y": 4.375},
+        {"matrix": [4, 1], "x": 1.5, "y": 4.375},
+        {"matrix": [4, 2], "x": 2.5, "y": 4.125},
+        {"matrix": [4, 3], "x": 3.5, "y": 4},
+        {"matrix": [4, 4], "x": 4.5, "y": 4.125},
+
+        {"matrix": [5, 5], "x": 6, "y": 5},
+        {"matrix": [5, 6], "x": 7, "y": 5},
+
+        {"matrix": [5, 4], "x": 7, "y": 6},
+        {"matrix": [5, 1], "x": 5, "y": 6, "h": 2},
+        {"matrix": [5, 2], "x": 6, "y": 6, "h": 2},
+
+        {"matrix": [5, 3], "x": 7, "y": 7},
+
+        {"matrix": [0, 7], "x": 9.5, "y": 0.25},
+        {"matrix": [0, 8], "x": 10.5, "y": 0.25},
+        {"matrix": [0, 9], "x": 11.5, "y": 0.125},
+        {"matrix": [0, 10], "x": 12.5, "y": 0},
+        {"matrix": [0, 11], "x": 13.5, "y": 0.125},
+        {"matrix": [0, 12], "x": 14.5, "y": 0.375},
+        {"matrix": [0, 13], "x": 15.5, "y": 0.375, "w": 1.5},
+
+        {"matrix": [1, 7], "x": 9.5, "y": 1.25, "h": 1.5},
+        {"matrix": [1, 8], "x": 10.5, "y": 1.25},
+        {"matrix": [1, 9], "x": 11.5, "y": 1.125},
+        {"matrix": [1, 10], "x": 12.5, "y": 1},
+        {"matrix": [1, 11], "x": 13.5, "y": 1.125},
+        {"matrix": [1, 12], "x": 14.5, "y": 1.375},
+        {"matrix": [1, 13], "x": 15.5, "y": 1.375, "w": 1.5},
+
+        {"matrix": [2, 8], "x": 10.5, "y": 2.25},
+        {"matrix": [2, 9], "x": 11.5, "y": 2.125},
+        {"matrix": [2, 10], "x": 12.5, "y": 2},
+        {"matrix": [2, 11], "x": 13.5, "y": 2.125},
+        {"matrix": [2, 12], "x": 14.5, "y": 2.375},
+        {"matrix": [2, 13], "x": 15.5, "y": 2.375, "w": 1.5},
+        {"matrix": [3, 7], "x": 9.5, "y": 2.75, "h": 1.5},
+
+        {"matrix": [3, 8], "x": 10.5, "y": 3.25},
+        {"matrix": [3, 9], "x": 11.5, "y": 3.125},
+        {"matrix": [3, 10], "x": 12.5, "y": 3},
+        {"matrix": [3, 11], "x": 13.5, "y": 3.125},
+        {"matrix": [3, 12], "x": 14.5, "y": 3.375},
+        {"matrix": [3, 13], "x": 15.5, "y": 3.375, "w": 1.5},
+
+        {"matrix": [4, 9], "x": 11.5, "y": 4.125},
+        {"matrix": [4, 10], "x": 12.5, "y": 4},
+        {"matrix": [4, 11], "x": 13.5, "y": 4.125},
+        {"matrix": [4, 12], "x": 14.5, "y": 4.375},
+        {"matrix": [4, 13], "x": 15.5, "y": 4.375},
+
+        {"matrix": [5, 7], "x": 9, "y": 5},
+        {"matrix": [5, 8], "x": 10, "y": 5},
+
+        {"matrix": [5, 9], "x": 9, "y": 6},
+
+        {"matrix": [5, 10], "x": 9, "y": 7},
+
+        {"matrix": [5, 11], "x": 10, "y": 6, "h": 2},
+        {"matrix": [5, 12], "x": 11, "y": 6, "h": 2}
+      ]
+    },
+    "LAYOUT_ergodox_pretty": {
+      "layout": [
+        {"matrix": [0, 0], "x": 0, "y": 0.375, "w": 1.5},
+        {"matrix": [0, 1], "x": 1.5, "y": 0.375},
+        {"matrix": [0, 2], "x": 2.5, "y": 0.125},
+        {"matrix": [0, 3], "x": 3.5, "y": 0},
+        {"matrix": [0, 4], "x": 4.5, "y": 0.125},
+        {"matrix": [0, 5], "x": 5.5, "y": 0.25},
+        {"matrix": [0, 6], "x": 6.5, "y": 0.25},
+
+        {"matrix": [0, 7], "x": 9.5, "y": 0.25},
+        {"matrix": [0, 8], "x": 10.5, "y": 0.25},
+        {"matrix": [0, 9], "x": 11.5, "y": 0.125},
+        {"matrix": [0, 10], "x": 12.5, "y": 0},
+        {"matrix": [0, 11], "x": 13.5, "y": 0.125},
+        {"matrix": [0, 12], "x": 14.5, "y": 0.375},
+        {"matrix": [0, 13], "x": 15.5, "y": 0.375, "w": 1.5},
+
+        {"matrix": [1, 0], "x": 0, "y": 1.375, "w": 1.5},
+        {"matrix": [1, 1], "x": 1.5, "y": 1.375},
+        {"matrix": [1, 2], "x": 2.5, "y": 1.125},
+        {"matrix": [1, 3], "x": 3.5, "y": 1},
+        {"matrix": [1, 4], "x": 4.5, "y": 1.125},
+        {"matrix": [1, 5], "x": 5.5, "y": 1.25},
+        {"matrix": [1, 6], "x": 6.5, "y": 1.25, "h": 1.5},
+
+        {"matrix": [1, 7], "x": 9.5, "y": 1.25, "h": 1.5},
+        {"matrix": [1, 8], "x": 10.5, "y": 1.25},
+        {"matrix": [1, 9], "x": 11.5, "y": 1.125},
+        {"matrix": [1, 10], "x": 12.5, "y": 1},
+        {"matrix": [1, 11], "x": 13.5, "y": 1.125},
+        {"matrix": [1, 12], "x": 14.5, "y": 1.375},
+        {"matrix": [1, 13], "x": 15.5, "y": 1.375, "w": 1.5},
+
+        {"matrix": [2, 0], "x": 0, "y": 2.375, "w": 1.5},
+        {"matrix": [2, 1], "x": 1.5, "y": 2.375},
+        {"matrix": [2, 2], "x": 2.5, "y": 2.125},
+        {"matrix": [2, 3], "x": 3.5, "y": 2},
+        {"matrix": [2, 4], "x": 4.5, "y": 2.125},
+        {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+
+        {"matrix": [2, 8], "x": 10.5, "y": 2.25},
+        {"matrix": [2, 9], "x": 11.5, "y": 2.125},
+        {"matrix": [2, 10], "x": 12.5, "y": 2},
+        {"matrix": [2, 11], "x": 13.5, "y": 2.125},
+        {"matrix": [2, 12], "x": 14.5, "y": 2.375},
+        {"matrix": [2, 13], "x": 15.5, "y": 2.375, "w": 1.5},
+
+        {"matrix": [3, 0], "x": 0, "y": 3.375, "w": 1.5},
+        {"matrix": [3, 1], "x": 1.5, "y": 3.375},
+        {"matrix": [3, 2], "x": 2.5, "y": 3.125},
+        {"matrix": [3, 3], "x": 3.5, "y": 3},
+        {"matrix": [3, 4], "x": 4.5, "y": 3.125},
+        {"matrix": [3, 5], "x": 5.5, "y": 3.25},
+        {"matrix": [3, 6], "x": 6.5, "y": 2.75, "h": 1.5},
+
+        {"matrix": [3, 7], "x": 9.5, "y": 2.75, "h": 1.5},
+        {"matrix": [3, 8], "x": 10.5, "y": 3.25},
+        {"matrix": [3, 9], "x": 11.5, "y": 3.125},
+        {"matrix": [3, 10], "x": 12.5, "y": 3},
+        {"matrix": [3, 11], "x": 13.5, "y": 3.125},
+        {"matrix": [3, 12], "x": 14.5, "y": 3.375},
+        {"matrix": [3, 13], "x": 15.5, "y": 3.375, "w": 1.5},
+
+        {"matrix": [4, 0], "x": 0.5, "y": 4.375},
+        {"matrix": [4, 1], "x": 1.5, "y": 4.375},
+        {"matrix": [4, 2], "x": 2.5, "y": 4.125},
+        {"matrix": [4, 3], "x": 3.5, "y": 4},
+        {"matrix": [4, 4], "x": 4.5, "y": 4.125},
+        {"matrix": [4, 9], "x": 11.5, "y": 4.125},
+        {"matrix": [4, 10], "x": 12.5, "y": 4},
+        {"matrix": [4, 11], "x": 13.5, "y": 4.125},
+        {"matrix": [4, 12], "x": 14.5, "y": 4.375},
+        {"matrix": [4, 13], "x": 15.5, "y": 4.375},
+
+        {"matrix": [5, 5], "x": 6, "y": 5},
+        {"matrix": [5, 6], "x": 7, "y": 5},
+        {"matrix": [5, 7], "x": 9, "y": 5},
+        {"matrix": [5, 8], "x": 10, "y": 5},
+
+        {"matrix": [5, 4], "x": 7, "y": 6},
+        {"matrix": [5, 9], "x": 9, "y": 6},
+        {"matrix": [5, 1], "x": 5, "y": 6, "h": 2},
+        {"matrix": [5, 2], "x": 6, "y": 6, "h": 2},
+
+        {"matrix": [5, 3], "x": 7, "y": 7},
+        {"matrix": [5, 10], "x": 9, "y": 7},
+
+        {"matrix": [5, 11], "x": 10, "y": 6, "h": 2},
+        {"matrix": [5, 12], "x": 11, "y": 6, "h": 2}
+      ]
+    },
+    "LAYOUT_ergodox_80": {
+      "layout": [
+        {"matrix": [0, 0], "x": 0, "y": 0.375, "w": 1.5},
+        {"matrix": [0, 1], "x": 1.5, "y": 0.375},
+        {"matrix": [0, 2], "x": 2.5, "y": 0.125},
+        {"matrix": [0, 3], "x": 3.5, "y": 0},
+        {"matrix": [0, 4], "x": 4.5, "y": 0.125},
+        {"matrix": [0, 5], "x": 5.5, "y": 0.25},
+        {"matrix": [0, 6], "x": 6.5, "y": 0.25},
+
+        {"matrix": [1, 0], "x": 0, "y": 1.375, "w": 1.5},
+        {"matrix": [1, 1], "x": 1.5, "y": 1.375},
+        {"matrix": [1, 2], "x": 2.5, "y": 1.125},
+        {"matrix": [1, 3], "x": 3.5, "y": 1},
+        {"matrix": [1, 4], "x": 4.5, "y": 1.125},
+        {"matrix": [1, 5], "x": 5.5, "y": 1.25},
+        {"matrix": [1, 6], "x": 6.5, "y": 1.25, "h": 1.5},
+
+        {"matrix": [2, 0], "x": 0, "y": 2.375, "w": 1.5},
+        {"matrix": [2, 1], "x": 1.5, "y": 2.375},
+        {"matrix": [2, 2], "x": 2.5, "y": 2.125},
+        {"matrix": [2, 3], "x": 3.5, "y": 2},
+        {"matrix": [2, 4], "x": 4.5, "y": 2.125},
+        {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+
+        {"matrix": [3, 0], "x": 0, "y": 3.375, "w": 1.5},
+        {"matrix": [3, 1], "x": 1.5, "y": 3.375},
+        {"matrix": [3, 2], "x": 2.5, "y": 3.125},
+        {"matrix": [3, 3], "x": 3.5, "y": 3},
+        {"matrix": [3, 4], "x": 4.5, "y": 3.125},
+        {"matrix": [3, 5], "x": 5.5, "y": 3.25},
+        {"matrix": [3, 6], "x": 6.5, "y": 2.75, "h": 1.5},
+
+        {"matrix": [4, 0], "x": 0.5, "y": 4.375},
+        {"matrix": [4, 1], "x": 1.5, "y": 4.375},
+        {"matrix": [4, 2], "x": 2.5, "y": 4.125},
+        {"matrix": [4, 3], "x": 3.5, "y": 4},
+        {"matrix": [4, 4], "x": 4.5, "y": 4.125},
+
+        {"matrix": [5, 5], "x": 6, "y": 5},
+        {"matrix": [5, 6], "x": 7, "y": 5},
+        {"matrix": [4, 5], "x": 5, "y": 6},
+        {"matrix": [4, 6], "x": 6, "y": 6},
+        {"matrix": [5, 4], "x": 7, "y": 6},
+        {"matrix": [5, 3], "x": 5, "y": 7},
+        {"matrix": [5, 2], "x": 6, "y": 7},
+        {"matrix": [5, 1], "x": 7, "y": 7},
+
+        {"matrix": [0, 7], "x": 9.5, "y": 0.25},
+        {"matrix": [0, 8], "x": 10.5, "y": 0.25},
+        {"matrix": [0, 9], "x": 11.5, "y": 0.125},
+        {"matrix": [0, 10], "x": 12.5, "y": 0},
+        {"matrix": [0, 11], "x": 13.5, "y": 0.125},
+        {"matrix": [0, 12], "x": 14.5, "y": 0.375},
+        {"matrix": [0, 13], "x": 15.5, "y": 0.375, "w": 1.5},
+
+        {"matrix": [1, 7], "x": 9.5, "y": 1.25, "h": 1.5},
+        {"matrix": [1, 8], "x": 10.5, "y": 1.25},
+        {"matrix": [1, 9], "x": 11.5, "y": 1.125},
+        {"matrix": [1, 10], "x": 12.5, "y": 1},
+        {"matrix": [1, 11], "x": 13.5, "y": 1.125},
+        {"matrix": [1, 12], "x": 14.5, "y": 1.375},
+        {"matrix": [1, 13], "x": 15.5, "y": 1.375, "w": 1.5},
+
+        {"matrix": [2, 8], "x": 10.5, "y": 2.25},
+        {"matrix": [2, 9], "x": 11.5, "y": 2.125},
+        {"matrix": [2, 10], "x": 12.5, "y": 2},
+        {"matrix": [2, 11], "x": 13.5, "y": 2.125},
+        {"matrix": [2, 12], "x": 14.5, "y": 2.375},
+        {"matrix": [2, 13], "x": 15.5, "y": 2.375, "w": 1.5},
+        {"matrix": [3, 7], "x": 9.5, "y": 2.75, "h": 1.5},
+
+        {"matrix": [3, 8], "x": 10.5, "y": 3.25},
+        {"matrix": [3, 9], "x": 11.5, "y": 3.125},
+        {"matrix": [3, 10], "x": 12.5, "y": 3},
+        {"matrix": [3, 11], "x": 13.5, "y": 3.125},
+        {"matrix": [3, 12], "x": 14.5, "y": 3.375},
+        {"matrix": [3, 13], "x": 15.5, "y": 3.375, "w": 1.5},
+
+        {"matrix": [4, 9], "x": 11.5, "y": 4.125},
+        {"matrix": [4, 10], "x": 12.5, "y": 4},
+        {"matrix": [4, 11], "x": 13.5, "y": 4.125},
+        {"matrix": [4, 12], "x": 14.5, "y": 4.375},
+        {"matrix": [4, 13], "x": 15.5, "y": 4.375},
+
+        {"matrix": [5, 7], "x": 9, "y": 5},
+        {"matrix": [5, 8], "x": 10, "y": 5},
+
+        {"matrix": [5, 9], "x": 9, "y": 6},
+        {"matrix": [4, 7], "x": 10, "y": 6},
+        {"matrix": [4, 8], "x": 11, "y": 6},
+
+        {"matrix": [5, 10], "x": 9, "y": 7},
+        {"matrix": [5, 11], "x": 10, "y": 7},
+        {"matrix": [5, 12], "x": 11, "y": 7}
+      ]
+    },
+    "LAYOUT_ergodox_pretty_80": {
+      "layout": [
+        {"matrix": [0, 0], "x": 0, "y": 0.375, "w": 1.5},
+        {"matrix": [0, 1], "x": 1.5, "y": 0.375},
+        {"matrix": [0, 2], "x": 2.5, "y": 0.125},
+        {"matrix": [0, 3], "x": 3.5, "y": 0},
+        {"matrix": [0, 4], "x": 4.5, "y": 0.125},
+        {"matrix": [0, 5], "x": 5.5, "y": 0.25},
+        {"matrix": [0, 6], "x": 6.5, "y": 0.25},
+
+        {"matrix": [0, 7], "x": 9.5, "y": 0.25},
+        {"matrix": [0, 8], "x": 10.5, "y": 0.25},
+        {"matrix": [0, 9], "x": 11.5, "y": 0.125},
+        {"matrix": [0, 10], "x": 12.5, "y": 0},
+        {"matrix": [0, 11], "x": 13.5, "y": 0.125},
+        {"matrix": [0, 12], "x": 14.5, "y": 0.375},
+        {"matrix": [0, 13], "x": 15.5, "y": 0.375, "w": 1.5},
+
+        {"matrix": [1, 0], "x": 0, "y": 1.375, "w": 1.5},
+        {"matrix": [1, 1], "x": 1.5, "y": 1.375},
+        {"matrix": [1, 2], "x": 2.5, "y": 1.125},
+        {"matrix": [1, 3], "x": 3.5, "y": 1},
+        {"matrix": [1, 4], "x": 4.5, "y": 1.125},
+        {"matrix": [1, 5], "x": 5.5, "y": 1.25},
+        {"matrix": [1, 6], "x": 6.5, "y": 1.25, "h": 1.5},
+
+        {"matrix": [1, 7], "x": 9.5, "y": 1.25, "h": 1.5},
+        {"matrix": [1, 8], "x": 10.5, "y": 1.25},
+        {"matrix": [1, 9], "x": 11.5, "y": 1.125},
+        {"matrix": [1, 10], "x": 12.5, "y": 1},
+        {"matrix": [1, 11], "x": 13.5, "y": 1.125},
+        {"matrix": [1, 12], "x": 14.5, "y": 1.375},
+        {"matrix": [1, 13], "x": 15.5, "y": 1.375, "w": 1.5},
+
+        {"matrix": [2, 0], "x": 0, "y": 2.375, "w": 1.5},
+        {"matrix": [2, 1], "x": 1.5, "y": 2.375},
+        {"matrix": [2, 2], "x": 2.5, "y": 2.125},
+        {"matrix": [2, 3], "x": 3.5, "y": 2},
+        {"matrix": [2, 4], "x": 4.5, "y": 2.125},
+        {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+
+        {"matrix": [2, 8], "x": 10.5, "y": 2.25},
+        {"matrix": [2, 9], "x": 11.5, "y": 2.125},
+        {"matrix": [2, 10], "x": 12.5, "y": 2},
+        {"matrix": [2, 11], "x": 13.5, "y": 2.125},
+        {"matrix": [2, 12], "x": 14.5, "y": 2.375},
+        {"matrix": [2, 13], "x": 15.5, "y": 2.375, "w": 1.5},
+
+        {"matrix": [3, 0], "x": 0, "y": 3.375, "w": 1.5},
+        {"matrix": [3, 1], "x": 1.5, "y": 3.375},
+        {"matrix": [3, 2], "x": 2.5, "y": 3.125},
+        {"matrix": [3, 3], "x": 3.5, "y": 3},
+        {"matrix": [3, 4], "x": 4.5, "y": 3.125},
+        {"matrix": [3, 5], "x": 5.5, "y": 3.25},
+        {"matrix": [3, 6], "x": 6.5, "y": 2.75, "h": 1.5},
+
+        {"matrix": [3, 7], "x": 9.5, "y": 2.75, "h": 1.5},
+        {"matrix": [3, 8], "x": 10.5, "y": 3.25},
+        {"matrix": [3, 9], "x": 11.5, "y": 3.125},
+        {"matrix": [3, 10], "x": 12.5, "y": 3},
+        {"matrix": [3, 11], "x": 13.5, "y": 3.125},
+        {"matrix": [3, 12], "x": 14.5, "y": 3.375},
+        {"matrix": [3, 13], "x": 15.5, "y": 3.375, "w": 1.5},
+
+        {"matrix": [4, 0], "x": 0.5, "y": 4.375},
+        {"matrix": [4, 1], "x": 1.5, "y": 4.375},
+        {"matrix": [4, 2], "x": 2.5, "y": 4.125},
+        {"matrix": [4, 3], "x": 3.5, "y": 4},
+        {"matrix": [4, 4], "x": 4.5, "y": 4.125},
+
+        {"matrix": [4, 9], "x": 11.5, "y": 4.125},
+        {"matrix": [4, 10], "x": 12.5, "y": 4},
+        {"matrix": [4, 11], "x": 13.5, "y": 4.125},
+        {"matrix": [4, 12], "x": 14.5, "y": 4.375},
+        {"matrix": [4, 13], "x": 15.5, "y": 4.375},
+
+        {"matrix": [5, 5], "x": 6, "y": 5},
+        {"matrix": [5, 6], "x": 7, "y": 5},
+        {"matrix": [5, 7], "x": 9, "y": 5},
+        {"matrix": [5, 8], "x": 10, "y": 5},
+
+        {"matrix": [4, 5], "x": 5, "y": 6},
+        {"matrix": [4, 6], "x": 6, "y": 6},
+        {"matrix": [5, 4], "x": 7, "y": 6},
+        {"matrix": [5, 9], "x": 9, "y": 6},
+        {"matrix": [4, 7], "x": 10, "y": 6},
+        {"matrix": [4, 8], "x": 11, "y": 6},
+
+        {"matrix": [5, 1], "x": 5, "y": 7},
+        {"matrix": [5, 2], "x": 6, "y": 7},
+        {"matrix": [5, 3], "x": 7, "y": 7},
+        {"matrix": [5, 10], "x": 9, "y": 7},
+        {"matrix": [5, 11], "x": 10, "y": 7},
+        {"matrix": [5, 12], "x": 11, "y": 7}
+      ]
+    }
+  }
+}
diff --git a/keyboards/hotdox/rules.mk b/keyboards/hotdox/rules.mk
index 8e11eeabe08..f5dfc77dd19 100644
--- a/keyboards/hotdox/rules.mk
+++ b/keyboards/hotdox/rules.mk
@@ -1,17 +1,4 @@
-# Build Options
-#   change yes to no to disable
-#
 CUSTOM_MATRIX           = yes # Custom matrix file for the ErgoDone
-UNICODE_ENABLE          = yes # Unicode
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE         = yes  # Mouse keys
-EXTRAKEY_ENABLE         = yes # Audio control and System control
-CONSOLE_ENABLE          = yes # Console for debug
-COMMAND_ENABLE          = no  # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE        = yes # Enable keyboard backlight functionality
-SWAP_HANDS_ENABLE       = no  # Disable Onehand
-RGBLIGHT_ENABLE         = no
 
 # project specific files
 SRC =  matrix.c     \
diff --git a/keyboards/hs60/v1/info.json b/keyboards/hs60/v1/info.json
deleted file mode 100644
index f9d77c3513a..00000000000
--- a/keyboards/hs60/v1/info.json
+++ /dev/null
@@ -1,213 +0,0 @@
-{
-  "keyboard_name": "HS60",
-  "manufacturer": "Yiancar-Designs",
-  "url": "",
-  "maintainer": "qmk",
-  "usb": {
-    "vid": "0xFEED",
-    "pid": "0x0257",
-    "device_version": "0.0.1"
-  },
-  "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,
-      "rainbow_moving_chevron": true,
-      "cycle_out_in": true,
-      "cycle_out_in_dual": 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_rain": true,
-      "pixel_flow": true,
-      "pixel_fractal": 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": "is31fl3731",
-    "max_brightness": 215
-  },
-  "matrix_pins": {
-    "cols": ["F1", "F4", "F5", "E6", "F0", "B7", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5"],
-    "rows": ["B0", "B1", "B2", "B3", "F7"]
-  },
-  "diode_direction": "COL2ROW",
-  "qmk_lufa_bootloader": {
-    "esc_input": "B2",
-    "esc_output": "B5"
-  },
-  "processor": "atmega32u4",
-  "bootloader": "qmk-dfu",
-  "community_layouts": ["60_ansi", "60_iso"],
-  "layouts": {
-    "LAYOUT_60_iso": {
-      "layout": [
-        {"matrix": [0, 0], "x": 0, "y": 0},
-        {"matrix": [0, 1], "x": 1, "y": 0},
-        {"matrix": [0, 2], "x": 2, "y": 0},
-        {"matrix": [0, 3], "x": 3, "y": 0},
-        {"matrix": [0, 4], "x": 4, "y": 0},
-        {"matrix": [0, 5], "x": 5, "y": 0},
-        {"matrix": [0, 6], "x": 6, "y": 0},
-        {"matrix": [0, 7], "x": 7, "y": 0},
-        {"matrix": [0, 8], "x": 8, "y": 0},
-        {"matrix": [0, 9], "x": 9, "y": 0},
-        {"matrix": [0, 10], "x": 10, "y": 0},
-        {"matrix": [0, 11], "x": 11, "y": 0},
-        {"matrix": [0, 12], "x": 12, "y": 0},
-        {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-
-        {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-        {"matrix": [1, 1], "x": 1.5, "y": 1},
-        {"matrix": [1, 2], "x": 2.5, "y": 1},
-        {"matrix": [1, 3], "x": 3.5, "y": 1},
-        {"matrix": [1, 4], "x": 4.5, "y": 1},
-        {"matrix": [1, 5], "x": 5.5, "y": 1},
-        {"matrix": [1, 6], "x": 6.5, "y": 1},
-        {"matrix": [1, 7], "x": 7.5, "y": 1},
-        {"matrix": [1, 8], "x": 8.5, "y": 1},
-        {"matrix": [1, 9], "x": 9.5, "y": 1},
-        {"matrix": [1, 10], "x": 10.5, "y": 1},
-        {"matrix": [1, 11], "x": 11.5, "y": 1},
-        {"matrix": [1, 12], "x": 12.5, "y": 1},
-
-        {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-        {"matrix": [2, 1], "x": 1.75, "y": 2},
-        {"matrix": [2, 2], "x": 2.75, "y": 2},
-        {"matrix": [2, 3], "x": 3.75, "y": 2},
-        {"matrix": [2, 4], "x": 4.75, "y": 2},
-        {"matrix": [2, 5], "x": 5.75, "y": 2},
-        {"matrix": [2, 6], "x": 6.75, "y": 2},
-        {"matrix": [2, 7], "x": 7.75, "y": 2},
-        {"matrix": [2, 8], "x": 8.75, "y": 2},
-        {"matrix": [2, 9], "x": 9.75, "y": 2},
-        {"matrix": [2, 10], "x": 10.75, "y": 2},
-        {"matrix": [2, 11], "x": 11.75, "y": 2},
-        {"matrix": [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, 13], "x": 12.25, "y": 3, "w": 2.75},
-
-        {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-        {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-        {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-        {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
-        {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
-        {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
-        {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
-        {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
-      ]
-    },
-    "LAYOUT_60_ansi": {
-      "layout": [
-        {"matrix": [0, 0], "x": 0, "y": 0},
-        {"matrix": [0, 1], "x": 1, "y": 0},
-        {"matrix": [0, 2], "x": 2, "y": 0},
-        {"matrix": [0, 3], "x": 3, "y": 0},
-        {"matrix": [0, 4], "x": 4, "y": 0},
-        {"matrix": [0, 5], "x": 5, "y": 0},
-        {"matrix": [0, 6], "x": 6, "y": 0},
-        {"matrix": [0, 7], "x": 7, "y": 0},
-        {"matrix": [0, 8], "x": 8, "y": 0},
-        {"matrix": [0, 9], "x": 9, "y": 0},
-        {"matrix": [0, 10], "x": 10, "y": 0},
-        {"matrix": [0, 11], "x": 11, "y": 0},
-        {"matrix": [0, 12], "x": 12, "y": 0},
-        {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-
-        {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-        {"matrix": [1, 1], "x": 1.5, "y": 1},
-        {"matrix": [1, 2], "x": 2.5, "y": 1},
-        {"matrix": [1, 3], "x": 3.5, "y": 1},
-        {"matrix": [1, 4], "x": 4.5, "y": 1},
-        {"matrix": [1, 5], "x": 5.5, "y": 1},
-        {"matrix": [1, 6], "x": 6.5, "y": 1},
-        {"matrix": [1, 7], "x": 7.5, "y": 1},
-        {"matrix": [1, 8], "x": 8.5, "y": 1},
-        {"matrix": [1, 9], "x": 9.5, "y": 1},
-        {"matrix": [1, 10], "x": 10.5, "y": 1},
-        {"matrix": [1, 11], "x": 11.5, "y": 1},
-        {"matrix": [1, 12], "x": 12.5, "y": 1},
-        {"matrix": [2, 12], "x": 13.5, "y": 1, "w": 1.5},
-
-        {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-        {"matrix": [2, 1], "x": 1.75, "y": 2},
-        {"matrix": [2, 2], "x": 2.75, "y": 2},
-        {"matrix": [2, 3], "x": 3.75, "y": 2},
-        {"matrix": [2, 4], "x": 4.75, "y": 2},
-        {"matrix": [2, 5], "x": 5.75, "y": 2},
-        {"matrix": [2, 6], "x": 6.75, "y": 2},
-        {"matrix": [2, 7], "x": 7.75, "y": 2},
-        {"matrix": [2, 8], "x": 8.75, "y": 2},
-        {"matrix": [2, 9], "x": 9.75, "y": 2},
-        {"matrix": [2, 10], "x": 10.75, "y": 2},
-        {"matrix": [2, 11], "x": 11.75, "y": 2},
-        {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
-
-        {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-        {"matrix": [3, 2], "x": 2.25, "y": 3},
-        {"matrix": [3, 3], "x": 3.25, "y": 3},
-        {"matrix": [3, 4], "x": 4.25, "y": 3},
-        {"matrix": [3, 5], "x": 5.25, "y": 3},
-        {"matrix": [3, 6], "x": 6.25, "y": 3},
-        {"matrix": [3, 7], "x": 7.25, "y": 3},
-        {"matrix": [3, 8], "x": 8.25, "y": 3},
-        {"matrix": [3, 9], "x": 9.25, "y": 3},
-        {"matrix": [3, 10], "x": 10.25, "y": 3},
-        {"matrix": [3, 11], "x": 11.25, "y": 3},
-        {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 2.75},
-
-        {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-        {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-        {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-        {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
-        {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
-        {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
-        {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
-        {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
-      ]
-    }
-  }
-}
diff --git a/keyboards/hs60/v1/keyboard.json b/keyboards/hs60/v1/keyboard.json
new file mode 100644
index 00000000000..3c07491a3db
--- /dev/null
+++ b/keyboards/hs60/v1/keyboard.json
@@ -0,0 +1,220 @@
+{
+  "keyboard_name": "HS60",
+  "manufacturer": "Yiancar-Designs",
+  "url": "",
+  "maintainer": "qmk",
+  "usb": {
+    "vid": "0xFEED",
+    "pid": "0x0257",
+    "device_version": "0.0.1"
+  },
+  "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,
+      "rainbow_moving_chevron": true,
+      "cycle_out_in": true,
+      "cycle_out_in_dual": 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_rain": true,
+      "pixel_flow": true,
+      "pixel_fractal": 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": "is31fl3731",
+    "max_brightness": 215
+  },
+  "matrix_pins": {
+    "cols": ["F1", "F4", "F5", "E6", "F0", "B7", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5"],
+    "rows": ["B0", "B1", "B2", "B3", "F7"]
+  },
+  "diode_direction": "COL2ROW",
+  "qmk_lufa_bootloader": {
+    "esc_input": "B2",
+    "esc_output": "B5"
+  },
+  "processor": "atmega32u4",
+  "bootloader": "qmk-dfu",
+  "features": {
+    "bootmagic": false,
+    "mousekey": false,
+    "extrakey": true,
+    "nkro": true,
+    "rgb_matrix": true
+  },
+  "community_layouts": ["60_ansi", "60_iso"],
+  "layouts": {
+    "LAYOUT_60_iso": {
+      "layout": [
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0},
+        {"matrix": [0, 5], "x": 5, "y": 0},
+        {"matrix": [0, 6], "x": 6, "y": 0},
+        {"matrix": [0, 7], "x": 7, "y": 0},
+        {"matrix": [0, 8], "x": 8, "y": 0},
+        {"matrix": [0, 9], "x": 9, "y": 0},
+        {"matrix": [0, 10], "x": 10, "y": 0},
+        {"matrix": [0, 11], "x": 11, "y": 0},
+        {"matrix": [0, 12], "x": 12, "y": 0},
+        {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+        {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+        {"matrix": [1, 1], "x": 1.5, "y": 1},
+        {"matrix": [1, 2], "x": 2.5, "y": 1},
+        {"matrix": [1, 3], "x": 3.5, "y": 1},
+        {"matrix": [1, 4], "x": 4.5, "y": 1},
+        {"matrix": [1, 5], "x": 5.5, "y": 1},
+        {"matrix": [1, 6], "x": 6.5, "y": 1},
+        {"matrix": [1, 7], "x": 7.5, "y": 1},
+        {"matrix": [1, 8], "x": 8.5, "y": 1},
+        {"matrix": [1, 9], "x": 9.5, "y": 1},
+        {"matrix": [1, 10], "x": 10.5, "y": 1},
+        {"matrix": [1, 11], "x": 11.5, "y": 1},
+        {"matrix": [1, 12], "x": 12.5, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+        {"matrix": [2, 1], "x": 1.75, "y": 2},
+        {"matrix": [2, 2], "x": 2.75, "y": 2},
+        {"matrix": [2, 3], "x": 3.75, "y": 2},
+        {"matrix": [2, 4], "x": 4.75, "y": 2},
+        {"matrix": [2, 5], "x": 5.75, "y": 2},
+        {"matrix": [2, 6], "x": 6.75, "y": 2},
+        {"matrix": [2, 7], "x": 7.75, "y": 2},
+        {"matrix": [2, 8], "x": 8.75, "y": 2},
+        {"matrix": [2, 9], "x": 9.75, "y": 2},
+        {"matrix": [2, 10], "x": 10.75, "y": 2},
+        {"matrix": [2, 11], "x": 11.75, "y": 2},
+        {"matrix": [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, 13], "x": 12.25, "y": 3, "w": 2.75},
+
+        {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+        {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+        {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+        {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+        {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+        {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+        {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+        {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
+      ]
+    },
+    "LAYOUT_60_ansi": {
+      "layout": [
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0},
+        {"matrix": [0, 5], "x": 5, "y": 0},
+        {"matrix": [0, 6], "x": 6, "y": 0},
+        {"matrix": [0, 7], "x": 7, "y": 0},
+        {"matrix": [0, 8], "x": 8, "y": 0},
+        {"matrix": [0, 9], "x": 9, "y": 0},
+        {"matrix": [0, 10], "x": 10, "y": 0},
+        {"matrix": [0, 11], "x": 11, "y": 0},
+        {"matrix": [0, 12], "x": 12, "y": 0},
+        {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+        {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+        {"matrix": [1, 1], "x": 1.5, "y": 1},
+        {"matrix": [1, 2], "x": 2.5, "y": 1},
+        {"matrix": [1, 3], "x": 3.5, "y": 1},
+        {"matrix": [1, 4], "x": 4.5, "y": 1},
+        {"matrix": [1, 5], "x": 5.5, "y": 1},
+        {"matrix": [1, 6], "x": 6.5, "y": 1},
+        {"matrix": [1, 7], "x": 7.5, "y": 1},
+        {"matrix": [1, 8], "x": 8.5, "y": 1},
+        {"matrix": [1, 9], "x": 9.5, "y": 1},
+        {"matrix": [1, 10], "x": 10.5, "y": 1},
+        {"matrix": [1, 11], "x": 11.5, "y": 1},
+        {"matrix": [1, 12], "x": 12.5, "y": 1},
+        {"matrix": [2, 12], "x": 13.5, "y": 1, "w": 1.5},
+
+        {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+        {"matrix": [2, 1], "x": 1.75, "y": 2},
+        {"matrix": [2, 2], "x": 2.75, "y": 2},
+        {"matrix": [2, 3], "x": 3.75, "y": 2},
+        {"matrix": [2, 4], "x": 4.75, "y": 2},
+        {"matrix": [2, 5], "x": 5.75, "y": 2},
+        {"matrix": [2, 6], "x": 6.75, "y": 2},
+        {"matrix": [2, 7], "x": 7.75, "y": 2},
+        {"matrix": [2, 8], "x": 8.75, "y": 2},
+        {"matrix": [2, 9], "x": 9.75, "y": 2},
+        {"matrix": [2, 10], "x": 10.75, "y": 2},
+        {"matrix": [2, 11], "x": 11.75, "y": 2},
+        {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+        {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+        {"matrix": [3, 2], "x": 2.25, "y": 3},
+        {"matrix": [3, 3], "x": 3.25, "y": 3},
+        {"matrix": [3, 4], "x": 4.25, "y": 3},
+        {"matrix": [3, 5], "x": 5.25, "y": 3},
+        {"matrix": [3, 6], "x": 6.25, "y": 3},
+        {"matrix": [3, 7], "x": 7.25, "y": 3},
+        {"matrix": [3, 8], "x": 8.25, "y": 3},
+        {"matrix": [3, 9], "x": 9.25, "y": 3},
+        {"matrix": [3, 10], "x": 10.25, "y": 3},
+        {"matrix": [3, 11], "x": 11.25, "y": 3},
+        {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 2.75},
+
+        {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+        {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+        {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+        {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+        {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+        {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+        {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+        {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
+      ]
+    }
+  }
+}
diff --git a/keyboards/hs60/v1/rules.mk b/keyboards/hs60/v1/rules.mk
index 7aa0a5ae51d..5cde06a483e 100644
--- a/keyboards/hs60/v1/rules.mk
+++ b/keyboards/hs60/v1/rules.mk
@@ -1,22 +1,4 @@
 # Do not put the microcontroller into power saving mode
 # when we get USB suspend event. We want it to keep updating
 # backlight effects.
-OPT_DEFS += -DNO_SUSPEND_POWER_DOWN
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-AUDIO_ENABLE = no           # Audio output
-RGB_MATRIX_ENABLE = yes     # Use RGB matrix
-RAW_ENABLE = yes
-
-# Experimental features for zealcmd please do no enable
-#RAW_ENABLE = yes
-#USE_KEYMAPS_IN_EEPROM = yes
+NO_SUSPEND_POWER_DOWN = yes
diff --git a/keyboards/hs60/v1/v1.c b/keyboards/hs60/v1/v1.c
index f68bcbdf9e7..7a43784ad96 100644
--- a/keyboards/hs60/v1/v1.c
+++ b/keyboards/hs60/v1/v1.c
@@ -15,80 +15,6 @@
  */
 #include "quantum.h"
 
-// Please ignore this is for upcoming features
-/*#ifdef RAW_ENABLE
-
-void raw_hid_receive( uint8_t *data, uint8_t length )
-{
-	uint8_t command = data[0];
-	switch ( command )
-	{
-		case id_protocol_version:
-		{
-			msg_protocol_version *msg = (msg_protocol_version*)&data[1];
-			msg->version = PROTOCOL_VERSION;
-			break;
-		}
-#if USE_KEYMAPS_IN_EEPROM
-		case id_keymap_keycode_load:
-		{
-			msg_keymap_keycode_load *msg = (msg_keymap_keycode_load*)&data[1];
-			msg->keycode = keymap_keycode_load( msg->layer, msg->row, msg->column );
-			break;
-		}
-		case id_keymap_keycode_save:
-		{
-			msg_keymap_keycode_save *msg = (msg_keymap_keycode_save*)&data[1];
-			keymap_keycode_save( msg->layer, msg->row, msg->column, msg->keycode);
-			break;
-		}
-		case id_keymap_default_save:
-		{
-			keymap_default_save();
-			break;
-		}
-#endif // USE_KEYMAPS_IN_EEPROM
-		case id_backlight_config_set_values:
-		{
-			msg_backlight_config_set_values *msg = (msg_backlight_config_set_values*)&data[1];
-			backlight_config_set_values(msg);
-			backlight_config_save();
-			break;
-		}
-		case id_backlight_config_set_alphas_mods:
-		{
-			msg_backlight_config_set_alphas_mods *msg = (msg_backlight_config_set_alphas_mods*)&data[1];
-			backlight_config_set_alphas_mods( msg->alphas_mods );
-			backlight_config_save();
-			break;
-		}
-		case id_backlight_set_key_color:
-		{
-			msg_backlight_set_key_color *msg = (msg_backlight_set_key_color*)&data[1];
-			backlight_set_key_color(msg->row, msg->column, msg->hsv);
-			break;
-		}
-		case id_system_get_state:
-		{
-			msg_system_state *msg = (msg_system_state*)&data[1];
-			msg->value = backlight_get_tick();
-			break;
-		}
-		default:
-		{
-			// Unhandled message.
-			data[0] = id_unhandled;
-			break;
-		}
-	}
-
-	// Return same buffer with values changed
-	raw_hid_send( data, length );
-
-}
-
-#endif*/
-
 #ifdef HS60_ANSI
 
 const is31fl3731_led_t PROGMEM g_is31fl3731_leds[IS31FL3731_LED_COUNT] = {
diff --git a/keyboards/hs60/v2/ansi/info.json b/keyboards/hs60/v2/ansi/info.json
deleted file mode 100644
index 0debcea8d1f..00000000000
--- a/keyboards/hs60/v2/ansi/info.json
+++ /dev/null
@@ -1,91 +0,0 @@
-{
-  "keyboard_name": "HS60 V2",
-  "manufacturer": "Yiancar-Designs",
-  "url": "",
-  "maintainer": "yiancar",
-  "usb": {
-    "vid": "0x8968",
-    "pid": "0x4854",
-    "device_version": "0.0.2"
-  },
-  "matrix_pins": {
-    "cols": ["A13", "A10", "A9", "A14", "A15", "B8", "B9", "C13", "C14", "C15", "A0", "A1", "A2", "A3"],
-    "rows": ["B3", "B4", "B5", "A8", "A4"]
-  },
-  "diode_direction": "COL2ROW",
-  "processor": "STM32F303",
-  "bootloader": "stm32-dfu",
-  "board": "QMK_PROTON_C",
-  "community_layouts": ["60_ansi"],
-  "layouts": {
-    "LAYOUT_60_ansi": {
-      "layout": [
-        {"matrix": [0, 0], "x": 0, "y": 0},
-        {"matrix": [0, 1], "x": 1, "y": 0},
-        {"matrix": [0, 2], "x": 2, "y": 0},
-        {"matrix": [0, 3], "x": 3, "y": 0},
-        {"matrix": [0, 4], "x": 4, "y": 0},
-        {"matrix": [0, 5], "x": 5, "y": 0},
-        {"matrix": [0, 6], "x": 6, "y": 0},
-        {"matrix": [0, 7], "x": 7, "y": 0},
-        {"matrix": [0, 8], "x": 8, "y": 0},
-        {"matrix": [0, 9], "x": 9, "y": 0},
-        {"matrix": [0, 10], "x": 10, "y": 0},
-        {"matrix": [0, 11], "x": 11, "y": 0},
-        {"matrix": [0, 12], "x": 12, "y": 0},
-        {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-
-        {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-        {"matrix": [1, 1], "x": 1.5, "y": 1},
-        {"matrix": [1, 2], "x": 2.5, "y": 1},
-        {"matrix": [1, 3], "x": 3.5, "y": 1},
-        {"matrix": [1, 4], "x": 4.5, "y": 1},
-        {"matrix": [1, 5], "x": 5.5, "y": 1},
-        {"matrix": [1, 6], "x": 6.5, "y": 1},
-        {"matrix": [1, 7], "x": 7.5, "y": 1},
-        {"matrix": [1, 8], "x": 8.5, "y": 1},
-        {"matrix": [1, 9], "x": 9.5, "y": 1},
-        {"matrix": [1, 10], "x": 10.5, "y": 1},
-        {"matrix": [1, 11], "x": 11.5, "y": 1},
-        {"matrix": [1, 12], "x": 12.5, "y": 1},
-        {"matrix": [2, 12], "x": 13.5, "y": 1, "w": 1.5},
-
-        {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-        {"matrix": [2, 1], "x": 1.75, "y": 2},
-        {"matrix": [2, 2], "x": 2.75, "y": 2},
-        {"matrix": [2, 3], "x": 3.75, "y": 2},
-        {"matrix": [2, 4], "x": 4.75, "y": 2},
-        {"matrix": [2, 5], "x": 5.75, "y": 2},
-        {"matrix": [2, 6], "x": 6.75, "y": 2},
-        {"matrix": [2, 7], "x": 7.75, "y": 2},
-        {"matrix": [2, 8], "x": 8.75, "y": 2},
-        {"matrix": [2, 9], "x": 9.75, "y": 2},
-        {"matrix": [2, 10], "x": 10.75, "y": 2},
-        {"matrix": [2, 11], "x": 11.75, "y": 2},
-        {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
-
-        {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-        {"matrix": [3, 2], "x": 2.25, "y": 3},
-        {"matrix": [3, 3], "x": 3.25, "y": 3},
-        {"matrix": [3, 4], "x": 4.25, "y": 3},
-        {"matrix": [3, 5], "x": 5.25, "y": 3},
-        {"matrix": [3, 6], "x": 6.25, "y": 3},
-        {"matrix": [3, 7], "x": 7.25, "y": 3},
-        {"matrix": [3, 8], "x": 8.25, "y": 3},
-        {"matrix": [3, 9], "x": 9.25, "y": 3},
-        {"matrix": [3, 10], "x": 10.25, "y": 3},
-        {"matrix": [3, 11], "x": 11.25, "y": 3},
-        {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 2.75},
-
-        {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-        {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-        {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-        {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
-        {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
-        {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
-        {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
-        {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
-      ]
-    }
-  }
-}
diff --git a/keyboards/hs60/v2/ansi/keyboard.json b/keyboards/hs60/v2/ansi/keyboard.json
new file mode 100644
index 00000000000..e0781ef54b5
--- /dev/null
+++ b/keyboards/hs60/v2/ansi/keyboard.json
@@ -0,0 +1,97 @@
+{
+  "keyboard_name": "HS60 V2",
+  "manufacturer": "Yiancar-Designs",
+  "url": "",
+  "maintainer": "yiancar",
+  "usb": {
+    "vid": "0x8968",
+    "pid": "0x4854",
+    "device_version": "0.0.2"
+  },
+  "matrix_pins": {
+    "cols": ["A13", "A10", "A9", "A14", "A15", "B8", "B9", "C13", "C14", "C15", "A0", "A1", "A2", "A3"],
+    "rows": ["B3", "B4", "B5", "A8", "A4"]
+  },
+  "diode_direction": "COL2ROW",
+  "processor": "STM32F303",
+  "bootloader": "stm32-dfu",
+  "features": {
+    "bootmagic": true,
+    "mousekey": true,
+    "extrakey": true,
+    "nkro": true
+  },
+  "board": "QMK_PROTON_C",
+  "community_layouts": ["60_ansi"],
+  "layouts": {
+    "LAYOUT_60_ansi": {
+      "layout": [
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0},
+        {"matrix": [0, 5], "x": 5, "y": 0},
+        {"matrix": [0, 6], "x": 6, "y": 0},
+        {"matrix": [0, 7], "x": 7, "y": 0},
+        {"matrix": [0, 8], "x": 8, "y": 0},
+        {"matrix": [0, 9], "x": 9, "y": 0},
+        {"matrix": [0, 10], "x": 10, "y": 0},
+        {"matrix": [0, 11], "x": 11, "y": 0},
+        {"matrix": [0, 12], "x": 12, "y": 0},
+        {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+        {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+        {"matrix": [1, 1], "x": 1.5, "y": 1},
+        {"matrix": [1, 2], "x": 2.5, "y": 1},
+        {"matrix": [1, 3], "x": 3.5, "y": 1},
+        {"matrix": [1, 4], "x": 4.5, "y": 1},
+        {"matrix": [1, 5], "x": 5.5, "y": 1},
+        {"matrix": [1, 6], "x": 6.5, "y": 1},
+        {"matrix": [1, 7], "x": 7.5, "y": 1},
+        {"matrix": [1, 8], "x": 8.5, "y": 1},
+        {"matrix": [1, 9], "x": 9.5, "y": 1},
+        {"matrix": [1, 10], "x": 10.5, "y": 1},
+        {"matrix": [1, 11], "x": 11.5, "y": 1},
+        {"matrix": [1, 12], "x": 12.5, "y": 1},
+        {"matrix": [2, 12], "x": 13.5, "y": 1, "w": 1.5},
+
+        {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+        {"matrix": [2, 1], "x": 1.75, "y": 2},
+        {"matrix": [2, 2], "x": 2.75, "y": 2},
+        {"matrix": [2, 3], "x": 3.75, "y": 2},
+        {"matrix": [2, 4], "x": 4.75, "y": 2},
+        {"matrix": [2, 5], "x": 5.75, "y": 2},
+        {"matrix": [2, 6], "x": 6.75, "y": 2},
+        {"matrix": [2, 7], "x": 7.75, "y": 2},
+        {"matrix": [2, 8], "x": 8.75, "y": 2},
+        {"matrix": [2, 9], "x": 9.75, "y": 2},
+        {"matrix": [2, 10], "x": 10.75, "y": 2},
+        {"matrix": [2, 11], "x": 11.75, "y": 2},
+        {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+        {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+        {"matrix": [3, 2], "x": 2.25, "y": 3},
+        {"matrix": [3, 3], "x": 3.25, "y": 3},
+        {"matrix": [3, 4], "x": 4.25, "y": 3},
+        {"matrix": [3, 5], "x": 5.25, "y": 3},
+        {"matrix": [3, 6], "x": 6.25, "y": 3},
+        {"matrix": [3, 7], "x": 7.25, "y": 3},
+        {"matrix": [3, 8], "x": 8.25, "y": 3},
+        {"matrix": [3, 9], "x": 9.25, "y": 3},
+        {"matrix": [3, 10], "x": 10.25, "y": 3},
+        {"matrix": [3, 11], "x": 11.25, "y": 3},
+        {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 2.75},
+
+        {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+        {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+        {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+        {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+        {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+        {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+        {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+        {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
+      ]
+    }
+  }
+}
diff --git a/keyboards/hs60/v2/ansi/rules.mk b/keyboards/hs60/v2/ansi/rules.mk
index 96e559f742e..3b7a32713c3 100644
--- a/keyboards/hs60/v2/ansi/rules.mk
+++ b/keyboards/hs60/v2/ansi/rules.mk
@@ -1,25 +1,13 @@
 # Do not put the microcontroller into power saving mode
 # when we get USB suspend event. We want it to keep updating
 # backlight effects.
-OPT_DEFS += -DNO_SUSPEND_POWER_DOWN
-
-# Build Options
-#   change yes to no to disable
-#
-BACKLIGHT_ENABLE = no              # Enable keyboard backlight functionality
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes              # Mouse keys
-EXTRAKEY_ENABLE = yes              # Audio control and System control
-CONSOLE_ENABLE = no                # Console for debug
-COMMAND_ENABLE = no                # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-AUDIO_ENABLE = no                  # Audio output
+NO_SUSPEND_POWER_DOWN = yes
 
 CIE1931_CURVE = yes
+I2C_DRIVER_REQUIRED = yes
 
 # project specific files
 SRC =	keyboards/wilba_tech/wt_main.c \
 		keyboards/wilba_tech/wt_rgb_backlight.c \
 		drivers/led/issi/is31fl3733.c \
 		quantum/color.c
-I2C_DRIVER_REQUIRED = yes
diff --git a/keyboards/hs60/v2/hhkb/info.json b/keyboards/hs60/v2/hhkb/info.json
deleted file mode 100644
index 5323fe20f01..00000000000
--- a/keyboards/hs60/v2/hhkb/info.json
+++ /dev/null
@@ -1,91 +0,0 @@
-{
-  "keyboard_name": "HS60 V2",
-  "manufacturer": "Yiancar-Designs",
-  "url": "",
-  "maintainer": "yiancar",
-  "usb": {
-    "vid": "0x8968",
-    "pid": "0x4855",
-    "device_version": "0.0.2"
-  },
-  "matrix_pins": {
-    "cols": ["A13", "A10", "A9", "A14", "A15", "B8", "B9", "C13", "C14", "C15", "A0", "A1", "A2", "A3"],
-    "rows": ["B3", "B4", "B5", "A8", "A4"]
-  },
-  "diode_direction": "COL2ROW",
-  "processor": "STM32F303",
-  "bootloader": "stm32-dfu",
-  "board": "QMK_PROTON_C",
-  "layouts": {
-    "LAYOUT_60_hhkb": {
-      "layout": [
-        {"matrix": [0, 0], "x": 0, "y": 0},
-        {"matrix": [0, 1], "x": 1, "y": 0},
-        {"matrix": [0, 2], "x": 2, "y": 0},
-        {"matrix": [0, 3], "x": 3, "y": 0},
-        {"matrix": [0, 4], "x": 4, "y": 0},
-        {"matrix": [0, 5], "x": 5, "y": 0},
-        {"matrix": [0, 6], "x": 6, "y": 0},
-        {"matrix": [0, 7], "x": 7, "y": 0},
-        {"matrix": [0, 8], "x": 8, "y": 0},
-        {"matrix": [0, 9], "x": 9, "y": 0},
-        {"matrix": [0, 10], "x": 10, "y": 0},
-        {"matrix": [0, 11], "x": 11, "y": 0},
-        {"matrix": [0, 12], "x": 12, "y": 0},
-        {"matrix": [0, 13], "x": 13, "y": 0},
-        {"matrix": [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, 12], "x": 13.5, "y": 1, "w": 1.5},
-
-        {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-        {"matrix": [2, 1], "x": 1.75, "y": 2},
-        {"matrix": [2, 2], "x": 2.75, "y": 2},
-        {"matrix": [2, 3], "x": 3.75, "y": 2},
-        {"matrix": [2, 4], "x": 4.75, "y": 2},
-        {"matrix": [2, 5], "x": 5.75, "y": 2},
-        {"matrix": [2, 6], "x": 6.75, "y": 2},
-        {"matrix": [2, 7], "x": 7.75, "y": 2},
-        {"matrix": [2, 8], "x": 8.75, "y": 2},
-        {"matrix": [2, 9], "x": 9.75, "y": 2},
-        {"matrix": [2, 10], "x": 10.75, "y": 2},
-        {"matrix": [2, 11], "x": 11.75, "y": 2},
-        {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
-
-        {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-        {"matrix": [3, 2], "x": 2.25, "y": 3},
-        {"matrix": [3, 3], "x": 3.25, "y": 3},
-        {"matrix": [3, 4], "x": 4.25, "y": 3},
-        {"matrix": [3, 5], "x": 5.25, "y": 3},
-        {"matrix": [3, 6], "x": 6.25, "y": 3},
-        {"matrix": [3, 7], "x": 7.25, "y": 3},
-        {"matrix": [3, 8], "x": 8.25, "y": 3},
-        {"matrix": [3, 9], "x": 9.25, "y": 3},
-        {"matrix": [3, 10], "x": 10.25, "y": 3},
-        {"matrix": [3, 11], "x": 11.25, "y": 3},
-        {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-        {"matrix": [3, 13], "x": 14, "y": 3},
-
-        {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
-        {"matrix": [4, 1], "x": 1.5, "y": 4},
-        {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
-        {"matrix": [4, 6], "x": 4, "y": 4, "w": 7},
-        {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
-        {"matrix": [4, 12], "x": 12.5, "y": 4},
-        {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
-      ]
-    }
-  }
-}
diff --git a/keyboards/hs60/v2/hhkb/keyboard.json b/keyboards/hs60/v2/hhkb/keyboard.json
new file mode 100644
index 00000000000..d9bc040e23c
--- /dev/null
+++ b/keyboards/hs60/v2/hhkb/keyboard.json
@@ -0,0 +1,97 @@
+{
+  "keyboard_name": "HS60 V2",
+  "manufacturer": "Yiancar-Designs",
+  "url": "",
+  "maintainer": "yiancar",
+  "usb": {
+    "vid": "0x8968",
+    "pid": "0x4855",
+    "device_version": "0.0.2"
+  },
+  "matrix_pins": {
+    "cols": ["A13", "A10", "A9", "A14", "A15", "B8", "B9", "C13", "C14", "C15", "A0", "A1", "A2", "A3"],
+    "rows": ["B3", "B4", "B5", "A8", "A4"]
+  },
+  "diode_direction": "COL2ROW",
+  "processor": "STM32F303",
+  "bootloader": "stm32-dfu",
+  "features": {
+    "bootmagic": true,
+    "mousekey": true,
+    "extrakey": true,
+    "nkro": true
+  },
+  "board": "QMK_PROTON_C",
+  "layouts": {
+    "LAYOUT_60_hhkb": {
+      "layout": [
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0},
+        {"matrix": [0, 5], "x": 5, "y": 0},
+        {"matrix": [0, 6], "x": 6, "y": 0},
+        {"matrix": [0, 7], "x": 7, "y": 0},
+        {"matrix": [0, 8], "x": 8, "y": 0},
+        {"matrix": [0, 9], "x": 9, "y": 0},
+        {"matrix": [0, 10], "x": 10, "y": 0},
+        {"matrix": [0, 11], "x": 11, "y": 0},
+        {"matrix": [0, 12], "x": 12, "y": 0},
+        {"matrix": [0, 13], "x": 13, "y": 0},
+        {"matrix": [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, 12], "x": 13.5, "y": 1, "w": 1.5},
+
+        {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+        {"matrix": [2, 1], "x": 1.75, "y": 2},
+        {"matrix": [2, 2], "x": 2.75, "y": 2},
+        {"matrix": [2, 3], "x": 3.75, "y": 2},
+        {"matrix": [2, 4], "x": 4.75, "y": 2},
+        {"matrix": [2, 5], "x": 5.75, "y": 2},
+        {"matrix": [2, 6], "x": 6.75, "y": 2},
+        {"matrix": [2, 7], "x": 7.75, "y": 2},
+        {"matrix": [2, 8], "x": 8.75, "y": 2},
+        {"matrix": [2, 9], "x": 9.75, "y": 2},
+        {"matrix": [2, 10], "x": 10.75, "y": 2},
+        {"matrix": [2, 11], "x": 11.75, "y": 2},
+        {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+        {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+        {"matrix": [3, 2], "x": 2.25, "y": 3},
+        {"matrix": [3, 3], "x": 3.25, "y": 3},
+        {"matrix": [3, 4], "x": 4.25, "y": 3},
+        {"matrix": [3, 5], "x": 5.25, "y": 3},
+        {"matrix": [3, 6], "x": 6.25, "y": 3},
+        {"matrix": [3, 7], "x": 7.25, "y": 3},
+        {"matrix": [3, 8], "x": 8.25, "y": 3},
+        {"matrix": [3, 9], "x": 9.25, "y": 3},
+        {"matrix": [3, 10], "x": 10.25, "y": 3},
+        {"matrix": [3, 11], "x": 11.25, "y": 3},
+        {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+        {"matrix": [3, 13], "x": 14, "y": 3},
+
+        {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+        {"matrix": [4, 1], "x": 1.5, "y": 4},
+        {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+        {"matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+        {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+        {"matrix": [4, 12], "x": 12.5, "y": 4},
+        {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+      ]
+    }
+  }
+}
diff --git a/keyboards/hs60/v2/hhkb/rules.mk b/keyboards/hs60/v2/hhkb/rules.mk
index 96e559f742e..3b7a32713c3 100644
--- a/keyboards/hs60/v2/hhkb/rules.mk
+++ b/keyboards/hs60/v2/hhkb/rules.mk
@@ -1,25 +1,13 @@
 # Do not put the microcontroller into power saving mode
 # when we get USB suspend event. We want it to keep updating
 # backlight effects.
-OPT_DEFS += -DNO_SUSPEND_POWER_DOWN
-
-# Build Options
-#   change yes to no to disable
-#
-BACKLIGHT_ENABLE = no              # Enable keyboard backlight functionality
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes              # Mouse keys
-EXTRAKEY_ENABLE = yes              # Audio control and System control
-CONSOLE_ENABLE = no                # Console for debug
-COMMAND_ENABLE = no                # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-AUDIO_ENABLE = no                  # Audio output
+NO_SUSPEND_POWER_DOWN = yes
 
 CIE1931_CURVE = yes
+I2C_DRIVER_REQUIRED = yes
 
 # project specific files
 SRC =	keyboards/wilba_tech/wt_main.c \
 		keyboards/wilba_tech/wt_rgb_backlight.c \
 		drivers/led/issi/is31fl3733.c \
 		quantum/color.c
-I2C_DRIVER_REQUIRED = yes
diff --git a/keyboards/hs60/v2/iso/info.json b/keyboards/hs60/v2/iso/info.json
deleted file mode 100644
index c422ae2d727..00000000000
--- a/keyboards/hs60/v2/iso/info.json
+++ /dev/null
@@ -1,92 +0,0 @@
-{
-  "keyboard_name": "HS60 V2",
-  "manufacturer": "Yiancar-Designs",
-  "url": "",
-  "maintainer": "yiancar",
-  "usb": {
-    "vid": "0x8968",
-    "pid": "0x4853",
-    "device_version": "0.0.2"
-  },
-  "matrix_pins": {
-    "cols": ["A13", "A10", "A9", "A14", "A15", "B8", "B9", "C13", "C14", "C15", "A0", "A1", "A2", "A3"],
-    "rows": ["B3", "B4", "B5", "A8", "A4"]
-  },
-  "diode_direction": "COL2ROW",
-  "processor": "STM32F303",
-  "bootloader": "stm32-dfu",
-  "board": "QMK_PROTON_C",
-  "community_layouts": ["60_iso"],
-  "layouts": {
-    "LAYOUT_60_iso": {
-      "layout": [
-        {"matrix": [0, 0], "x": 0, "y": 0},
-        {"matrix": [0, 1], "x": 1, "y": 0},
-        {"matrix": [0, 2], "x": 2, "y": 0},
-        {"matrix": [0, 3], "x": 3, "y": 0},
-        {"matrix": [0, 4], "x": 4, "y": 0},
-        {"matrix": [0, 5], "x": 5, "y": 0},
-        {"matrix": [0, 6], "x": 6, "y": 0},
-        {"matrix": [0, 7], "x": 7, "y": 0},
-        {"matrix": [0, 8], "x": 8, "y": 0},
-        {"matrix": [0, 9], "x": 9, "y": 0},
-        {"matrix": [0, 10], "x": 10, "y": 0},
-        {"matrix": [0, 11], "x": 11, "y": 0},
-        {"matrix": [0, 12], "x": 12, "y": 0},
-        {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-
-        {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-        {"matrix": [1, 1], "x": 1.5, "y": 1},
-        {"matrix": [1, 2], "x": 2.5, "y": 1},
-        {"matrix": [1, 3], "x": 3.5, "y": 1},
-        {"matrix": [1, 4], "x": 4.5, "y": 1},
-        {"matrix": [1, 5], "x": 5.5, "y": 1},
-        {"matrix": [1, 6], "x": 6.5, "y": 1},
-        {"matrix": [1, 7], "x": 7.5, "y": 1},
-        {"matrix": [1, 8], "x": 8.5, "y": 1},
-        {"matrix": [1, 9], "x": 9.5, "y": 1},
-        {"matrix": [1, 10], "x": 10.5, "y": 1},
-        {"matrix": [1, 11], "x": 11.5, "y": 1},
-        {"matrix": [1, 12], "x": 12.5, "y": 1},
-
-        {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-        {"matrix": [2, 1], "x": 1.75, "y": 2},
-        {"matrix": [2, 2], "x": 2.75, "y": 2},
-        {"matrix": [2, 3], "x": 3.75, "y": 2},
-        {"matrix": [2, 4], "x": 4.75, "y": 2},
-        {"matrix": [2, 5], "x": 5.75, "y": 2},
-        {"matrix": [2, 6], "x": 6.75, "y": 2},
-        {"matrix": [2, 7], "x": 7.75, "y": 2},
-        {"matrix": [2, 8], "x": 8.75, "y": 2},
-        {"matrix": [2, 9], "x": 9.75, "y": 2},
-        {"matrix": [2, 10], "x": 10.75, "y": 2},
-        {"matrix": [2, 11], "x": 11.75, "y": 2},
-        {"matrix": [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, 13], "x": 12.25, "y": 3, "w": 2.75},
-
-        {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-        {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-        {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-        {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
-        {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
-        {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
-        {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
-        {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
-      ]
-    }
-  }
-}
diff --git a/keyboards/hs60/v2/iso/keyboard.json b/keyboards/hs60/v2/iso/keyboard.json
new file mode 100644
index 00000000000..a51dac05fa2
--- /dev/null
+++ b/keyboards/hs60/v2/iso/keyboard.json
@@ -0,0 +1,98 @@
+{
+  "keyboard_name": "HS60 V2",
+  "manufacturer": "Yiancar-Designs",
+  "url": "",
+  "maintainer": "yiancar",
+  "usb": {
+    "vid": "0x8968",
+    "pid": "0x4853",
+    "device_version": "0.0.2"
+  },
+  "matrix_pins": {
+    "cols": ["A13", "A10", "A9", "A14", "A15", "B8", "B9", "C13", "C14", "C15", "A0", "A1", "A2", "A3"],
+    "rows": ["B3", "B4", "B5", "A8", "A4"]
+  },
+  "diode_direction": "COL2ROW",
+  "processor": "STM32F303",
+  "bootloader": "stm32-dfu",
+  "features": {
+    "bootmagic": true,
+    "mousekey": true,
+    "extrakey": true,
+    "nkro": true
+  },
+  "board": "QMK_PROTON_C",
+  "community_layouts": ["60_iso"],
+  "layouts": {
+    "LAYOUT_60_iso": {
+      "layout": [
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0},
+        {"matrix": [0, 5], "x": 5, "y": 0},
+        {"matrix": [0, 6], "x": 6, "y": 0},
+        {"matrix": [0, 7], "x": 7, "y": 0},
+        {"matrix": [0, 8], "x": 8, "y": 0},
+        {"matrix": [0, 9], "x": 9, "y": 0},
+        {"matrix": [0, 10], "x": 10, "y": 0},
+        {"matrix": [0, 11], "x": 11, "y": 0},
+        {"matrix": [0, 12], "x": 12, "y": 0},
+        {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+        {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+        {"matrix": [1, 1], "x": 1.5, "y": 1},
+        {"matrix": [1, 2], "x": 2.5, "y": 1},
+        {"matrix": [1, 3], "x": 3.5, "y": 1},
+        {"matrix": [1, 4], "x": 4.5, "y": 1},
+        {"matrix": [1, 5], "x": 5.5, "y": 1},
+        {"matrix": [1, 6], "x": 6.5, "y": 1},
+        {"matrix": [1, 7], "x": 7.5, "y": 1},
+        {"matrix": [1, 8], "x": 8.5, "y": 1},
+        {"matrix": [1, 9], "x": 9.5, "y": 1},
+        {"matrix": [1, 10], "x": 10.5, "y": 1},
+        {"matrix": [1, 11], "x": 11.5, "y": 1},
+        {"matrix": [1, 12], "x": 12.5, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+        {"matrix": [2, 1], "x": 1.75, "y": 2},
+        {"matrix": [2, 2], "x": 2.75, "y": 2},
+        {"matrix": [2, 3], "x": 3.75, "y": 2},
+        {"matrix": [2, 4], "x": 4.75, "y": 2},
+        {"matrix": [2, 5], "x": 5.75, "y": 2},
+        {"matrix": [2, 6], "x": 6.75, "y": 2},
+        {"matrix": [2, 7], "x": 7.75, "y": 2},
+        {"matrix": [2, 8], "x": 8.75, "y": 2},
+        {"matrix": [2, 9], "x": 9.75, "y": 2},
+        {"matrix": [2, 10], "x": 10.75, "y": 2},
+        {"matrix": [2, 11], "x": 11.75, "y": 2},
+        {"matrix": [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, 13], "x": 12.25, "y": 3, "w": 2.75},
+
+        {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+        {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+        {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+        {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+        {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+        {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+        {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+        {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
+      ]
+    }
+  }
+}
diff --git a/keyboards/hs60/v2/iso/rules.mk b/keyboards/hs60/v2/iso/rules.mk
index 96e559f742e..3b7a32713c3 100644
--- a/keyboards/hs60/v2/iso/rules.mk
+++ b/keyboards/hs60/v2/iso/rules.mk
@@ -1,25 +1,13 @@
 # Do not put the microcontroller into power saving mode
 # when we get USB suspend event. We want it to keep updating
 # backlight effects.
-OPT_DEFS += -DNO_SUSPEND_POWER_DOWN
-
-# Build Options
-#   change yes to no to disable
-#
-BACKLIGHT_ENABLE = no              # Enable keyboard backlight functionality
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes              # Mouse keys
-EXTRAKEY_ENABLE = yes              # Audio control and System control
-CONSOLE_ENABLE = no                # Console for debug
-COMMAND_ENABLE = no                # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-AUDIO_ENABLE = no                  # Audio output
+NO_SUSPEND_POWER_DOWN = yes
 
 CIE1931_CURVE = yes
+I2C_DRIVER_REQUIRED = yes
 
 # project specific files
 SRC =	keyboards/wilba_tech/wt_main.c \
 		keyboards/wilba_tech/wt_rgb_backlight.c \
 		drivers/led/issi/is31fl3733.c \
 		quantum/color.c
-I2C_DRIVER_REQUIRED = yes
diff --git a/keyboards/ibm/model_m/mschwingen/info.json b/keyboards/ibm/model_m/mschwingen/info.json
index ce740e4a548..0deb57ed038 100644
--- a/keyboards/ibm/model_m/mschwingen/info.json
+++ b/keyboards/ibm/model_m/mschwingen/info.json
@@ -16,6 +16,18 @@
     },
     "processor": "atmega32u4",
     "bootloader": "lufa-dfu",
+    "features": {
+        "bootmagic": false,
+        "mousekey": true,
+        "extrakey": true,
+        "console": true,
+        "command": true,
+        "key_lock": true,
+        "dynamic_macro": true
+    },
+    "build": {
+        "lto": true
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/ibm/model_m/mschwingen/led_ffc/keyboard.json b/keyboards/ibm/model_m/mschwingen/led_ffc/keyboard.json
new file mode 100644
index 00000000000..2c63c085104
--- /dev/null
+++ b/keyboards/ibm/model_m/mschwingen/led_ffc/keyboard.json
@@ -0,0 +1,2 @@
+{
+}
diff --git a/keyboards/ibm/model_m/mschwingen/led_wired/keyboard.json b/keyboards/ibm/model_m/mschwingen/led_wired/keyboard.json
new file mode 100644
index 00000000000..2c63c085104
--- /dev/null
+++ b/keyboards/ibm/model_m/mschwingen/led_wired/keyboard.json
@@ -0,0 +1,2 @@
+{
+}
diff --git a/keyboards/ibm/model_m/mschwingen/led_ws2812/keyboard.json b/keyboards/ibm/model_m/mschwingen/led_ws2812/keyboard.json
new file mode 100644
index 00000000000..2c63c085104
--- /dev/null
+++ b/keyboards/ibm/model_m/mschwingen/led_ws2812/keyboard.json
@@ -0,0 +1,2 @@
+{
+}
diff --git a/keyboards/ibm/model_m/mschwingen/post_rules.mk b/keyboards/ibm/model_m/mschwingen/post_rules.mk
index a1c2040f4c5..025068e057d 100644
--- a/keyboards/ibm/model_m/mschwingen/post_rules.mk
+++ b/keyboards/ibm/model_m/mschwingen/post_rules.mk
@@ -1,3 +1,5 @@
+UART_DEBUG ?= no
+
 ifeq ($(strip $(UART_DEBUG)), yes)
     OPT_DEFS += -DUART_DEBUG
 endif
diff --git a/keyboards/ibm/model_m/mschwingen/rules.mk b/keyboards/ibm/model_m/mschwingen/rules.mk
index 7d81ffe326b..65761bcf9a2 100644
--- a/keyboards/ibm/model_m/mschwingen/rules.mk
+++ b/keyboards/ibm/model_m/mschwingen/rules.mk
@@ -1,29 +1,9 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = yes        # Console for debug
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
 CUSTOM_MATRIX = lite
-KEY_LOCK_ENABLE = yes
-
-DYNAMIC_MACRO_ENABLE = yes
-
-UART_DEBUG = no
 
 SRC += matrix.c
 UART_DRIVER_REQUIRED = yes
 SPI_DRIVER_REQUIRED = yes
 
-OPT_DEFS += -DSLEEP_LED_ENABLE # we need our own sleep callbacks to turn of WS2812 LEDs
-
-LTO_ENABLE = yes
+OPT_DEFS += -DSLEEP_LED_ENABLE
 
 DEFAULT_FOLDER = ibm/model_m/mschwingen/led_wired
diff --git a/keyboards/ibm/model_m/teensypp/info.json b/keyboards/ibm/model_m/teensypp/info.json
deleted file mode 100644
index dcbed72aebf..00000000000
--- a/keyboards/ibm/model_m/teensypp/info.json
+++ /dev/null
@@ -1,145 +0,0 @@
-{
-    "keyboard_name": "IBM Model M 101/102",
-    "manufacturer": "iw0rm3r",
-    "url": "https://github.com/qmk/qmk_firmware/tree/master/keyboards/ibm/model_m/teensypp",
-    "maintainer": "iw0rm3r",
-    "usb": {
-        "vid": "0xFEED",
-        "pid": "0x0000",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["C7", "C6", "C5", "C4", "C3", "C2", "C1", "C0", "E1", "E0", "D7", "D6", "D5", "D4", "D3", "D2"],
-        "rows": ["F7", "F6", "F5", "F4", "F3", "F2", "F1", "F0"]
-    },
-    "diode_direction": "ROW2COL",
-    "processor": "at90usb1286",
-    "bootloader": "halfkay",
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 2], "x": 0, "y": 0},
-
-                {"matrix": [2, 3], "x": 2, "y": 0},
-                {"matrix": [2, 4], "x": 3, "y": 0},
-                {"matrix": [1, 4], "x": 4, "y": 0},
-                {"matrix": [0, 4], "x": 5, "y": 0},
-
-                {"matrix": [0, 6], "x": 6.5, "y": 0},
-                {"matrix": [0, 8], "x": 7.5, "y": 0},
-                {"matrix": [1, 9], "x": 8.5, "y": 0},
-                {"matrix": [2, 9], "x": 9.5, "y": 0},
-
-                {"matrix": [2, 6], "x": 11, "y": 0},
-                {"matrix": [3, 6], "x": 12, "y": 0},
-                {"matrix": [3, 11], "x": 13, "y": 0},
-                {"matrix": [3, 12], "x": 14, "y": 0},
-
-                {"matrix": [3, 15], "x": 15.25, "y": 0},
-                {"matrix": [4, 15], "x": 16.25, "y": 0},
-                {"matrix": [6, 14], "x": 17.25, "y": 0},
-
-                {"matrix": [2, 2], "x": 0, "y": 1.5},
-                {"matrix": [3, 2], "x": 1, "y": 1.5},
-                {"matrix": [3, 3], "x": 2, "y": 1.5},
-                {"matrix": [3, 4], "x": 3, "y": 1.5},
-                {"matrix": [3, 5], "x": 4, "y": 1.5},
-                {"matrix": [2, 5], "x": 5, "y": 1.5},
-                {"matrix": [2, 7], "x": 6, "y": 1.5},
-                {"matrix": [3, 7], "x": 7, "y": 1.5},
-                {"matrix": [3, 8], "x": 8, "y": 1.5},
-                {"matrix": [3, 9], "x": 9, "y": 1.5},
-                {"matrix": [3, 10], "x": 10, "y": 1.5},
-                {"matrix": [2, 10], "x": 11, "y": 1.5},
-                {"matrix": [2, 8], "x": 12, "y": 1.5},
-                {"matrix": [1, 6], "x": 13, "y": 1.5, "w": 2},
-
-                {"matrix": [2, 12], "x": 15.25, "y": 1.5},
-                {"matrix": [2, 14], "x": 16.25, "y": 1.5},
-                {"matrix": [2, 13], "x": 17.25, "y": 1.5},
-
-                {"matrix": [6, 11], "x": 18.5, "y": 1.5},
-                {"matrix": [6, 12], "x": 19.5, "y": 1.5},
-                {"matrix": [6, 13], "x": 20.5, "y": 1.5},
-                {"matrix": [7, 13], "x": 21.5, "y": 1.5},
-
-                {"matrix": [1, 2], "x": 0, "y": 2.5, "w": 1.5},
-                {"matrix": [4, 2], "x": 1.5, "y": 2.5},
-                {"matrix": [4, 3], "x": 2.5, "y": 2.5},
-                {"matrix": [4, 4], "x": 3.5, "y": 2.5},
-                {"matrix": [4, 5], "x": 4.5, "y": 2.5},
-                {"matrix": [1, 5], "x": 5.5, "y": 2.5},
-                {"matrix": [1, 7], "x": 6.5, "y": 2.5},
-                {"matrix": [4, 7], "x": 7.5, "y": 2.5},
-                {"matrix": [4, 8], "x": 8.5, "y": 2.5},
-                {"matrix": [4, 9], "x": 9.5, "y": 2.5},
-                {"matrix": [4, 10], "x": 10.5, "y": 2.5},
-                {"matrix": [1, 10], "x": 11.5, "y": 2.5},
-                {"matrix": [1, 8], "x": 12.5, "y": 2.5},
-                {"matrix": [5, 6], "x": 13.5, "y": 2.5, "w": 1.5},
-
-                {"matrix": [2, 11], "x": 15.25, "y": 2.5},
-                {"matrix": [3, 14], "x": 16.25, "y": 2.5},
-                {"matrix": [3, 13], "x": 17.25, "y": 2.5},
-
-                {"matrix": [4, 11], "x": 18.5, "y": 2.5},
-                {"matrix": [4, 12], "x": 19.5, "y": 2.5},
-                {"matrix": [4, 13], "x": 20.5, "y": 2.5},
-                {"matrix": [4, 14], "x": 21.5, "y": 2.5, "h": 2},
-
-                {"matrix": [1, 3], "x": 0, "y": 3.5, "w": 1.5},
-                {"matrix": [5, 2], "x": 1.75, "y": 3.5},
-                {"matrix": [5, 3], "x": 2.75, "y": 3.5},
-                {"matrix": [5, 4], "x": 3.75, "y": 3.5},
-                {"matrix": [5, 5], "x": 4.75, "y": 3.5},
-                {"matrix": [0, 5], "x": 5.75, "y": 3.5},
-                {"matrix": [0, 7], "x": 6.75, "y": 3.5},
-                {"matrix": [5, 7], "x": 7.75, "y": 3.5},
-                {"matrix": [5, 8], "x": 8.75, "y": 3.5},
-                {"matrix": [5, 9], "x": 9.75, "y": 3.5},
-                {"matrix": [5, 10], "x": 10.75, "y": 3.5},
-                {"matrix": [0, 10], "x": 11.75, "y": 3.5},
-                {"matrix": [6, 10], "x": 12.75, "y": 3.5},
-                {"matrix": [6, 6], "x": 13.75, "y": 3.5, "w": 1.25},
-
-                {"matrix": [1, 11], "x": 18.5, "y": 3.5},
-                {"matrix": [1, 12], "x": 19.5, "y": 3.5},
-                {"matrix": [1, 13], "x": 20.5, "y": 3.5},
-
-                {"matrix": [1, 1], "x": 0, "y": 4.5, "w": 1.25},
-                {"matrix": [0, 3], "x": 1.25, "y": 4.5},
-                {"matrix": [6, 2], "x": 2.25, "y": 4.5},
-                {"matrix": [6, 3], "x": 3.25, "y": 4.5},
-                {"matrix": [6, 4], "x": 4.25, "y": 4.5},
-                {"matrix": [6, 5], "x": 5.25, "y": 4.5},
-                {"matrix": [7, 5], "x": 6.25, "y": 4.5},
-                {"matrix": [7, 7], "x": 7.25, "y": 4.5},
-                {"matrix": [6, 7], "x": 8.25, "y": 4.5},
-                {"matrix": [6, 8], "x": 9.25, "y": 4.5},
-                {"matrix": [6, 9], "x": 10.25, "y": 4.5},
-                {"matrix": [7, 10], "x": 11.25, "y": 4.5},
-                {"matrix": [6, 1], "x": 12.25, "y": 4.5, "w": 2.75},
-
-                {"matrix": [0, 14], "x": 16.25, "y": 4.5},
-
-                {"matrix": [5, 11], "x": 18.5, "y": 4.5},
-                {"matrix": [5, 12], "x": 19.5, "y": 4.5},
-                {"matrix": [5, 13], "x": 20.5, "y": 4.5},
-                {"matrix": [5, 14], "x": 21.5, "y": 4.5, "h": 2},
-
-                {"matrix": [2, 0], "x": 0, "y": 5.5, "w": 1.5},
-                {"matrix": [0, 15], "x": 2.5, "y": 5.5, "w": 1.5},
-                {"matrix": [7, 6], "x": 4, "y": 5.5, "w": 7},
-                {"matrix": [7, 15], "x": 11, "y": 5.5, "w": 1.5},
-                {"matrix": [6, 0], "x": 13.5, "y": 5.5, "w": 1.5},
-
-                {"matrix": [7, 14], "x": 15.25, "y": 5.5},
-                {"matrix": [7, 11], "x": 16.25, "y": 5.5},
-                {"matrix": [7, 12], "x": 17.25, "y": 5.5},
-
-                {"matrix": [0, 12], "x": 18.5, "y": 5.5, "w": 2},
-                {"matrix": [0, 13], "x": 20.5, "y": 5.5}
-            ]
-        }
-    }
-}
diff --git a/keyboards/ibm/model_m/teensypp/keyboard.json b/keyboards/ibm/model_m/teensypp/keyboard.json
new file mode 100644
index 00000000000..4464a299f6d
--- /dev/null
+++ b/keyboards/ibm/model_m/teensypp/keyboard.json
@@ -0,0 +1,150 @@
+{
+    "keyboard_name": "IBM Model M 101/102",
+    "manufacturer": "iw0rm3r",
+    "url": "https://github.com/qmk/qmk_firmware/tree/master/keyboards/ibm/model_m/teensypp",
+    "maintainer": "iw0rm3r",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0x0000",
+        "device_version": "0.0.1"
+    },
+    "matrix_pins": {
+        "cols": ["C7", "C6", "C5", "C4", "C3", "C2", "C1", "C0", "E1", "E0", "D7", "D6", "D5", "D4", "D3", "D2"],
+        "rows": ["F7", "F6", "F5", "F4", "F3", "F2", "F1", "F0"]
+    },
+    "diode_direction": "ROW2COL",
+    "processor": "at90usb1286",
+    "bootloader": "halfkay",
+    "features": {
+        "bootmagic": false,
+        "mousekey": false,
+        "extrakey": false
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 2], "x": 0, "y": 0},
+
+                {"matrix": [2, 3], "x": 2, "y": 0},
+                {"matrix": [2, 4], "x": 3, "y": 0},
+                {"matrix": [1, 4], "x": 4, "y": 0},
+                {"matrix": [0, 4], "x": 5, "y": 0},
+
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 8], "x": 7.5, "y": 0},
+                {"matrix": [1, 9], "x": 8.5, "y": 0},
+                {"matrix": [2, 9], "x": 9.5, "y": 0},
+
+                {"matrix": [2, 6], "x": 11, "y": 0},
+                {"matrix": [3, 6], "x": 12, "y": 0},
+                {"matrix": [3, 11], "x": 13, "y": 0},
+                {"matrix": [3, 12], "x": 14, "y": 0},
+
+                {"matrix": [3, 15], "x": 15.25, "y": 0},
+                {"matrix": [4, 15], "x": 16.25, "y": 0},
+                {"matrix": [6, 14], "x": 17.25, "y": 0},
+
+                {"matrix": [2, 2], "x": 0, "y": 1.5},
+                {"matrix": [3, 2], "x": 1, "y": 1.5},
+                {"matrix": [3, 3], "x": 2, "y": 1.5},
+                {"matrix": [3, 4], "x": 3, "y": 1.5},
+                {"matrix": [3, 5], "x": 4, "y": 1.5},
+                {"matrix": [2, 5], "x": 5, "y": 1.5},
+                {"matrix": [2, 7], "x": 6, "y": 1.5},
+                {"matrix": [3, 7], "x": 7, "y": 1.5},
+                {"matrix": [3, 8], "x": 8, "y": 1.5},
+                {"matrix": [3, 9], "x": 9, "y": 1.5},
+                {"matrix": [3, 10], "x": 10, "y": 1.5},
+                {"matrix": [2, 10], "x": 11, "y": 1.5},
+                {"matrix": [2, 8], "x": 12, "y": 1.5},
+                {"matrix": [1, 6], "x": 13, "y": 1.5, "w": 2},
+
+                {"matrix": [2, 12], "x": 15.25, "y": 1.5},
+                {"matrix": [2, 14], "x": 16.25, "y": 1.5},
+                {"matrix": [2, 13], "x": 17.25, "y": 1.5},
+
+                {"matrix": [6, 11], "x": 18.5, "y": 1.5},
+                {"matrix": [6, 12], "x": 19.5, "y": 1.5},
+                {"matrix": [6, 13], "x": 20.5, "y": 1.5},
+                {"matrix": [7, 13], "x": 21.5, "y": 1.5},
+
+                {"matrix": [1, 2], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [4, 2], "x": 1.5, "y": 2.5},
+                {"matrix": [4, 3], "x": 2.5, "y": 2.5},
+                {"matrix": [4, 4], "x": 3.5, "y": 2.5},
+                {"matrix": [4, 5], "x": 4.5, "y": 2.5},
+                {"matrix": [1, 5], "x": 5.5, "y": 2.5},
+                {"matrix": [1, 7], "x": 6.5, "y": 2.5},
+                {"matrix": [4, 7], "x": 7.5, "y": 2.5},
+                {"matrix": [4, 8], "x": 8.5, "y": 2.5},
+                {"matrix": [4, 9], "x": 9.5, "y": 2.5},
+                {"matrix": [4, 10], "x": 10.5, "y": 2.5},
+                {"matrix": [1, 10], "x": 11.5, "y": 2.5},
+                {"matrix": [1, 8], "x": 12.5, "y": 2.5},
+                {"matrix": [5, 6], "x": 13.5, "y": 2.5, "w": 1.5},
+
+                {"matrix": [2, 11], "x": 15.25, "y": 2.5},
+                {"matrix": [3, 14], "x": 16.25, "y": 2.5},
+                {"matrix": [3, 13], "x": 17.25, "y": 2.5},
+
+                {"matrix": [4, 11], "x": 18.5, "y": 2.5},
+                {"matrix": [4, 12], "x": 19.5, "y": 2.5},
+                {"matrix": [4, 13], "x": 20.5, "y": 2.5},
+                {"matrix": [4, 14], "x": 21.5, "y": 2.5, "h": 2},
+
+                {"matrix": [1, 3], "x": 0, "y": 3.5, "w": 1.5},
+                {"matrix": [5, 2], "x": 1.75, "y": 3.5},
+                {"matrix": [5, 3], "x": 2.75, "y": 3.5},
+                {"matrix": [5, 4], "x": 3.75, "y": 3.5},
+                {"matrix": [5, 5], "x": 4.75, "y": 3.5},
+                {"matrix": [0, 5], "x": 5.75, "y": 3.5},
+                {"matrix": [0, 7], "x": 6.75, "y": 3.5},
+                {"matrix": [5, 7], "x": 7.75, "y": 3.5},
+                {"matrix": [5, 8], "x": 8.75, "y": 3.5},
+                {"matrix": [5, 9], "x": 9.75, "y": 3.5},
+                {"matrix": [5, 10], "x": 10.75, "y": 3.5},
+                {"matrix": [0, 10], "x": 11.75, "y": 3.5},
+                {"matrix": [6, 10], "x": 12.75, "y": 3.5},
+                {"matrix": [6, 6], "x": 13.75, "y": 3.5, "w": 1.25},
+
+                {"matrix": [1, 11], "x": 18.5, "y": 3.5},
+                {"matrix": [1, 12], "x": 19.5, "y": 3.5},
+                {"matrix": [1, 13], "x": 20.5, "y": 3.5},
+
+                {"matrix": [1, 1], "x": 0, "y": 4.5, "w": 1.25},
+                {"matrix": [0, 3], "x": 1.25, "y": 4.5},
+                {"matrix": [6, 2], "x": 2.25, "y": 4.5},
+                {"matrix": [6, 3], "x": 3.25, "y": 4.5},
+                {"matrix": [6, 4], "x": 4.25, "y": 4.5},
+                {"matrix": [6, 5], "x": 5.25, "y": 4.5},
+                {"matrix": [7, 5], "x": 6.25, "y": 4.5},
+                {"matrix": [7, 7], "x": 7.25, "y": 4.5},
+                {"matrix": [6, 7], "x": 8.25, "y": 4.5},
+                {"matrix": [6, 8], "x": 9.25, "y": 4.5},
+                {"matrix": [6, 9], "x": 10.25, "y": 4.5},
+                {"matrix": [7, 10], "x": 11.25, "y": 4.5},
+                {"matrix": [6, 1], "x": 12.25, "y": 4.5, "w": 2.75},
+
+                {"matrix": [0, 14], "x": 16.25, "y": 4.5},
+
+                {"matrix": [5, 11], "x": 18.5, "y": 4.5},
+                {"matrix": [5, 12], "x": 19.5, "y": 4.5},
+                {"matrix": [5, 13], "x": 20.5, "y": 4.5},
+                {"matrix": [5, 14], "x": 21.5, "y": 4.5, "h": 2},
+
+                {"matrix": [2, 0], "x": 0, "y": 5.5, "w": 1.5},
+                {"matrix": [0, 15], "x": 2.5, "y": 5.5, "w": 1.5},
+                {"matrix": [7, 6], "x": 4, "y": 5.5, "w": 7},
+                {"matrix": [7, 15], "x": 11, "y": 5.5, "w": 1.5},
+                {"matrix": [6, 0], "x": 13.5, "y": 5.5, "w": 1.5},
+
+                {"matrix": [7, 14], "x": 15.25, "y": 5.5},
+                {"matrix": [7, 11], "x": 16.25, "y": 5.5},
+                {"matrix": [7, 12], "x": 17.25, "y": 5.5},
+
+                {"matrix": [0, 12], "x": 18.5, "y": 5.5, "w": 2},
+                {"matrix": [0, 13], "x": 20.5, "y": 5.5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/ibm/model_m/teensypp/rules.mk b/keyboards/ibm/model_m/teensypp/rules.mk
deleted file mode 100644
index 1eeda920b40..00000000000
--- a/keyboards/ibm/model_m/teensypp/rules.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = no        # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
diff --git a/keyboards/ibm/model_m_122/m122_3270/blackpill/keyboard.json b/keyboards/ibm/model_m_122/m122_3270/blackpill/keyboard.json
index 46abafb2c42..5abadff2f74 100644
--- a/keyboards/ibm/model_m_122/m122_3270/blackpill/keyboard.json
+++ b/keyboards/ibm/model_m_122/m122_3270/blackpill/keyboard.json
@@ -15,7 +15,5 @@
         "rows": ["C13", "C14", "C15", "A0", "A1", "A2", "A3", "A4"]
     },
     "diode_direction": "ROW2COL",
-    "processor": "STM32F411",
-    "bootloader": "stm32-dfu",
-    "board": "BLACKPILL_STM32_F411"
+    "development_board": "blackpill_f411"
 }
diff --git a/keyboards/ibm/model_m_122/m122_3270/bluepill/keyboard.json b/keyboards/ibm/model_m_122/m122_3270/bluepill/keyboard.json
index e2f18d06e44..9a852141067 100644
--- a/keyboards/ibm/model_m_122/m122_3270/bluepill/keyboard.json
+++ b/keyboards/ibm/model_m_122/m122_3270/bluepill/keyboard.json
@@ -7,6 +7,5 @@
         "rows": ["C13", "C14", "C15", "A1", "A2", "A3", "A4", "A5"]
     },
     "diode_direction": "ROW2COL",
-    "processor": "STM32F103",
-    "bootloader": "stm32duino"
+    "development_board": "bluepill"
 }
diff --git a/keyboards/ibm/model_m_4th_gen/overnumpad_1xb/info.json b/keyboards/ibm/model_m_4th_gen/overnumpad_1xb/info.json
deleted file mode 100644
index 37fddaaf8f1..00000000000
--- a/keyboards/ibm/model_m_4th_gen/overnumpad_1xb/info.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-    "keyboard_name": "IBM Model M (4th generation)",
-    "manufacturer": "IBM/Purdea Andrei",
-    "url": "https://github.com/purdeaandrei/overnumpad_controller_1xb",
-    "maintainer": "purdeaandrei",
-    "usb": {
-        "vid": "0x16C0",
-        "pid": "0x27DB",
-        "device_version": "0.0.1"
-    },
-    "indicators": {
-        "caps_lock": "C11",
-        "num_lock": "C12",
-        "scroll_lock": "C10"
-    },
-    "processor": "STM32F446", // RET6
-    "bootloader": "stm32-dfu",
-    "diode_direction": "ROW2COL",
-    "matrix_pins": {
-        // All pins in order from left-to-right, as seen on the keyboard:
-        // C3, C2, C1, C0, A3, A4, A5, A6, A7, C4, C5, B0, B1, B10, B12, B13, B14, B15, C6, C7, C8, C9, A8, A9, A10,
-        // On this keyboard columns and rows are staggered:
-        "cols": ["C3", "C2", "C1", "C0", "A3", "A4", "A5", "A6", "C4", "B0", "B10", "B13", "C6", "C7", "C8", "C9"],
-        "rows": ["A7", "C5", "B1", "B12", "B14", "B15", "A8", "A9"]
-    }
-}
diff --git a/keyboards/ibm/model_m_4th_gen/overnumpad_1xb/keyboard.json b/keyboards/ibm/model_m_4th_gen/overnumpad_1xb/keyboard.json
new file mode 100644
index 00000000000..be103896718
--- /dev/null
+++ b/keyboards/ibm/model_m_4th_gen/overnumpad_1xb/keyboard.json
@@ -0,0 +1,38 @@
+{
+    "keyboard_name": "IBM Model M (4th generation)",
+    "manufacturer": "IBM/Purdea Andrei",
+    "url": "https://github.com/purdeaandrei/overnumpad_controller_1xb",
+    "maintainer": "purdeaandrei",
+    "usb": {
+        "vid": "0x16C0",
+        "pid": "0x27DB",
+        "device_version": "0.0.1",
+        "shared_endpoint": {
+             "keyboard": true
+        }
+    },
+    "haptic": {
+        "driver": "solenoid"
+    },
+    "indicators": {
+        "caps_lock": "C11",
+        "num_lock": "C12",
+        "scroll_lock": "C10"
+    },
+    "processor": "STM32F446", // RET6
+    "bootloader": "stm32-dfu",
+    "diode_direction": "ROW2COL",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "haptic": true
+    },
+    "matrix_pins": {
+        // All pins in order from left-to-right, as seen on the keyboard:
+        // C3, C2, C1, C0, A3, A4, A5, A6, A7, C4, C5, B0, B1, B10, B12, B13, B14, B15, C6, C7, C8, C9, A8, A9, A10,
+        // On this keyboard columns and rows are staggered:
+        "cols": ["C3", "C2", "C1", "C0", "A3", "A4", "A5", "A6", "C4", "B0", "B10", "B13", "C6", "C7", "C8", "C9"],
+        "rows": ["A7", "C5", "B1", "B12", "B14", "B15", "A8", "A9"]
+    }
+}
diff --git a/keyboards/ibm/model_m_4th_gen/overnumpad_1xb/rules.mk b/keyboards/ibm/model_m_4th_gen/overnumpad_1xb/rules.mk
deleted file mode 100644
index 9131708828a..00000000000
--- a/keyboards/ibm/model_m_4th_gen/overnumpad_1xb/rules.mk
+++ /dev/null
@@ -1,17 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-ENCODER_ENABLE = no         # Enable rotary encoder support
-AUDIO_ENABLE = no           # Audio output
-KEYBOARD_SHARED_EP = yes    # Free up some extra endpoints - needed if console+mouse+extra
-
-HAPTIC_ENABLE = yes
-HAPTIC_DRIVER = solenoid
diff --git a/keyboards/ibnuda/squiggle/rev1/info.json b/keyboards/ibnuda/squiggle/rev1/info.json
deleted file mode 100644
index 862b6323b02..00000000000
--- a/keyboards/ibnuda/squiggle/rev1/info.json
+++ /dev/null
@@ -1,313 +0,0 @@
-{
-    "keyboard_name": "squiggle",
-    "manufacturer": "ibnuda",
-    "url": "https://github.com/ibnuda/squiggle",
-    "maintainer": "Ibnu D. Aji",
-    "usb": {
-        "vid": "0x1209",
-        "pid": "0x6969",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["C6", "D7", "E6", "B4", "B5"],
-        "rows": ["B1", "B3", "B2", "B6"]
-    },
-    "diode_direction": "COL2ROW",
-    "split": {
-        "enabled": true,
-        "soft_serial_pin": "D0"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
-    "community_layouts": ["split_3x5_3"],
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0.9},
-                {"matrix": [0, 1], "x": 1, "y": 0.2},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0.1},
-                {"matrix": [0, 4], "x": 4, "y": 0.15},
-
-                {"matrix": [4, 4], "x": 5, "y": 0.15},
-                {"matrix": [4, 3], "x": 6, "y": 0.1},
-                {"matrix": [4, 2], "x": 7, "y": 0},
-                {"matrix": [4, 1], "x": 8, "y": 0.2},
-                {"matrix": [4, 0], "x": 9, "y": 0.9},
-
-                {"matrix": [1, 0], "x": 0, "y": 1.9},
-                {"matrix": [1, 1], "x": 1, "y": 1.2},
-                {"matrix": [1, 2], "x": 2, "y": 1},
-                {"matrix": [1, 3], "x": 3, "y": 1.1},
-                {"matrix": [1, 4], "x": 4, "y": 1.15},
-
-                {"matrix": [5, 4], "x": 5, "y": 1.15},
-                {"matrix": [5, 3], "x": 6, "y": 1.1},
-                {"matrix": [5, 2], "x": 7, "y": 1},
-                {"matrix": [5, 1], "x": 8, "y": 1.2},
-                {"matrix": [5, 0], "x": 9, "y": 1.9},
-
-                {"matrix": [2, 0], "x": 0, "y": 2.9},
-                {"matrix": [2, 1], "x": 1, "y": 2.2},
-                {"matrix": [2, 2], "x": 2, "y": 2},
-                {"matrix": [2, 3], "x": 3, "y": 2.1},
-                {"matrix": [2, 4], "x": 4, "y": 2.15},
-
-                {"matrix": [6, 4], "x": 5, "y": 2.15},
-                {"matrix": [6, 3], "x": 6, "y": 2.1},
-                {"matrix": [6, 2], "x": 7, "y": 2},
-                {"matrix": [6, 1], "x": 8, "y": 2.2},
-                {"matrix": [6, 0], "x": 9, "y": 2.9},
-
-                {"matrix": [3, 3], "x": 3, "y": 3.6, "h": 2},
-                {"matrix": [3, 4], "x": 4, "y": 3.65, "h": 2},
-
-                {"matrix": [7, 4], "x": 5, "y": 3.65, "h": 2},
-                {"matrix": [7, 3], "x": 6, "y": 3.6, "h": 2}
-            ]
-        },
-        "LAYOUT_complicated": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0.9},
-                {"matrix": [0, 1], "x": 1, "y": 0.2},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0.1},
-                {"matrix": [0, 4], "x": 4, "y": 0.15},
-
-                {"matrix": [4, 4], "x": 5, "y": 0.15},
-                {"matrix": [4, 3], "x": 6, "y": 0.1},
-                {"matrix": [4, 2], "x": 7, "y": 0},
-                {"matrix": [4, 1], "x": 8, "y": 0.2},
-                {"matrix": [4, 0], "x": 9, "y": 0.9},
-
-                {"matrix": [1, 0], "x": 0, "y": 1.9},
-                {"matrix": [1, 1], "x": 1, "y": 1.2},
-                {"matrix": [1, 2], "x": 2, "y": 1},
-                {"matrix": [1, 3], "x": 3, "y": 1.1},
-                {"matrix": [1, 4], "x": 4, "y": 1.15},
-
-                {"matrix": [5, 4], "x": 5, "y": 1.15},
-                {"matrix": [5, 3], "x": 6, "y": 1.1},
-                {"matrix": [5, 2], "x": 7, "y": 1},
-                {"matrix": [5, 1], "x": 8, "y": 1.2},
-                {"matrix": [5, 0], "x": 9, "y": 1.9},
-
-                {"matrix": [2, 0], "x": 0, "y": 2.9},
-                {"matrix": [2, 1], "x": 1, "y": 2.2},
-                {"matrix": [2, 2], "x": 2, "y": 2},
-                {"matrix": [2, 3], "x": 3, "y": 2.1},
-                {"matrix": [2, 4], "x": 4, "y": 2.15},
-
-                {"matrix": [6, 4], "x": 5, "y": 2.15},
-                {"matrix": [6, 3], "x": 6, "y": 2.1},
-                {"matrix": [6, 2], "x": 7, "y": 2},
-                {"matrix": [6, 1], "x": 8, "y": 2.2},
-                {"matrix": [6, 0], "x": 9, "y": 2.9},
-
-                {"matrix": [3, 3], "x": 3, "y": 3.6},
-                {"matrix": [3, 4], "x": 4, "y": 3.65},
-
-                {"matrix": [7, 4], "x": 5, "y": 3.65},
-                {"matrix": [7, 3], "x": 6, "y": 3.6},
-
-                {"matrix": [3, 1], "x": 3, "y": 4.6},
-                {"matrix": [3, 2], "x": 4, "y": 4.65},
-
-                {"matrix": [7, 2], "x": 5, "y": 4.65},
-                {"matrix": [7, 1], "x": 6, "y": 4.6}
-            ]
-        },
-        "LAYOUT_full": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0.9},
-                {"matrix": [0, 1], "x": 1, "y": 0.2},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0.1},
-                {"matrix": [0, 4], "x": 4, "y": 0.15},
-
-                {"matrix": [4, 4], "x": 5, "y": 0.15},
-                {"matrix": [4, 3], "x": 6, "y": 0.1},
-                {"matrix": [4, 2], "x": 7, "y": 0},
-                {"matrix": [4, 1], "x": 8, "y": 0.2},
-                {"matrix": [4, 0], "x": 9, "y": 0.9},
-
-                {"matrix": [1, 0], "x": 0, "y": 1.9},
-                {"matrix": [1, 1], "x": 1, "y": 1.2},
-                {"matrix": [1, 2], "x": 2, "y": 1},
-                {"matrix": [1, 3], "x": 3, "y": 1.1},
-                {"matrix": [1, 4], "x": 4, "y": 1.15},
-
-                {"matrix": [5, 4], "x": 5, "y": 1.15},
-                {"matrix": [5, 3], "x": 6, "y": 1.1},
-                {"matrix": [5, 2], "x": 7, "y": 1},
-                {"matrix": [5, 1], "x": 8, "y": 1.2},
-                {"matrix": [5, 0], "x": 9, "y": 1.9},
-
-                {"matrix": [2, 0], "x": 0, "y": 2.9},
-                {"matrix": [2, 1], "x": 1, "y": 2.2},
-                {"matrix": [2, 2], "x": 2, "y": 2},
-                {"matrix": [2, 3], "x": 3, "y": 2.1},
-                {"matrix": [2, 4], "x": 4, "y": 2.15},
-
-                {"matrix": [6, 4], "x": 5, "y": 2.15},
-                {"matrix": [6, 3], "x": 6, "y": 2.1},
-                {"matrix": [6, 2], "x": 7, "y": 2},
-                {"matrix": [6, 1], "x": 8, "y": 2.2},
-                {"matrix": [6, 0], "x": 9, "y": 2.9},
-
-                {"matrix": [3, 0], "x": 0, "y": 3.9},
-                {"matrix": [3, 1], "x": 1, "y": 3.2},
-                {"matrix": [3, 2], "x": 2, "y": 3},
-                {"matrix": [3, 3], "x": 3, "y": 3.1},
-                {"matrix": [3, 4], "x": 4, "y": 3.15},
-
-                {"matrix": [7, 4], "x": 5, "y": 3.15},
-                {"matrix": [7, 3], "x": 6, "y": 3.1},
-                {"matrix": [7, 2], "x": 7, "y": 3},
-                {"matrix": [7, 1], "x": 8, "y": 3.2},
-                {"matrix": [7, 0], "x": 9, "y": 3.9}
-            ]
-        },
-        "LAYOUT_reversed": {
-            "layout": [
-                {"matrix": [4, 0], "x": 0, "y": 0.9},
-                {"matrix": [4, 1], "x": 1, "y": 0.2},
-                {"matrix": [4, 2], "x": 2, "y": 0},
-                {"matrix": [4, 3], "x": 3, "y": 0.1},
-                {"matrix": [4, 4], "x": 4, "y": 0.15},
-
-                {"matrix": [0, 4], "x": 5, "y": 0.15},
-                {"matrix": [0, 3], "x": 6, "y": 0.1},
-                {"matrix": [0, 2], "x": 7, "y": 0},
-                {"matrix": [0, 1], "x": 8, "y": 0.2},
-                {"matrix": [0, 0], "x": 9, "y": 0.9},
-
-                {"matrix": [5, 0], "x": 0, "y": 1.9},
-                {"matrix": [5, 1], "x": 1, "y": 1.2},
-                {"matrix": [5, 2], "x": 2, "y": 1},
-                {"matrix": [5, 3], "x": 3, "y": 1.1},
-                {"matrix": [5, 4], "x": 4, "y": 1.15},
-
-                {"matrix": [1, 4], "x": 5, "y": 1.15},
-                {"matrix": [1, 3], "x": 6, "y": 1.1},
-                {"matrix": [1, 2], "x": 7, "y": 1},
-                {"matrix": [1, 1], "x": 8, "y": 1.2},
-                {"matrix": [1, 0], "x": 9, "y": 1.9},
-
-                {"matrix": [6, 0], "x": 0, "y": 2.9},
-                {"matrix": [6, 1], "x": 1, "y": 2.2},
-                {"matrix": [6, 2], "x": 2, "y": 2},
-                {"matrix": [6, 3], "x": 3, "y": 2.1},
-                {"matrix": [6, 4], "x": 4, "y": 2.15},
-
-                {"matrix": [2, 4], "x": 5, "y": 2.15},
-                {"matrix": [2, 3], "x": 6, "y": 2.1},
-                {"matrix": [2, 2], "x": 7, "y": 2},
-                {"matrix": [2, 1], "x": 8, "y": 2.2},
-                {"matrix": [2, 0], "x": 9, "y": 2.9},
-
-                {"matrix": [7, 3], "x": 3, "y": 3.6, "h": 2},
-                {"matrix": [7, 4], "x": 4, "y": 3.65, "h": 2},
-
-                {"matrix": [3, 4], "x": 5, "y": 3.65, "h": 2},
-                {"matrix": [3, 3], "x": 6, "y": 3.6, "h": 2}
-            ]
-        },
-        "LAYOUT_split_3x5_3": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0.9},
-                {"matrix": [0, 1], "x": 1, "y": 0.2},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0.1},
-                {"matrix": [0, 4], "x": 4, "y": 0.15},
-
-                {"matrix": [4, 4], "x": 5, "y": 0.15},
-                {"matrix": [4, 3], "x": 6, "y": 0.1},
-                {"matrix": [4, 2], "x": 7, "y": 0},
-                {"matrix": [4, 1], "x": 8, "y": 0.2},
-                {"matrix": [4, 0], "x": 9, "y": 0.9},
-
-                {"matrix": [1, 0], "x": 0, "y": 1.9},
-                {"matrix": [1, 1], "x": 1, "y": 1.2},
-                {"matrix": [1, 2], "x": 2, "y": 1},
-                {"matrix": [1, 3], "x": 3, "y": 1.1},
-                {"matrix": [1, 4], "x": 4, "y": 1.15},
-
-                {"matrix": [5, 4], "x": 5, "y": 1.15},
-                {"matrix": [5, 3], "x": 6, "y": 1.1},
-                {"matrix": [5, 2], "x": 7, "y": 1},
-                {"matrix": [5, 1], "x": 8, "y": 1.2},
-                {"matrix": [5, 0], "x": 9, "y": 1.9},
-
-                {"matrix": [2, 0], "x": 0, "y": 2.9},
-                {"matrix": [2, 1], "x": 1, "y": 2.2},
-                {"matrix": [2, 2], "x": 2, "y": 2},
-                {"matrix": [2, 3], "x": 3, "y": 2.1},
-                {"matrix": [2, 4], "x": 4, "y": 2.15},
-
-                {"matrix": [6, 4], "x": 5, "y": 2.15},
-                {"matrix": [6, 3], "x": 6, "y": 2.1},
-                {"matrix": [6, 2], "x": 7, "y": 2},
-                {"matrix": [6, 1], "x": 8, "y": 2.2},
-                {"matrix": [6, 0], "x": 9, "y": 2.9},
-
-                {"matrix": [3, 2], "x": 2, "y": 3.6, "h": 1.25},
-                {"matrix": [3, 3], "x": 3, "y": 3.6, "h": 2},
-                {"matrix": [3, 4], "x": 4, "y": 3.65, "h": 2},
-
-                {"matrix": [7, 4], "x": 5, "y": 3.65, "h": 2},
-                {"matrix": [7, 3], "x": 6, "y": 3.6, "h": 2},
-                {"matrix": [7, 2], "x": 7, "y": 3.6, "h": 1.25}
-            ]
-        },
-        "LAYOUT_thumbrow": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0.9},
-                {"matrix": [0, 1], "x": 1, "y": 0.2},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0.1},
-                {"matrix": [0, 4], "x": 4, "y": 0.15},
-
-                {"matrix": [4, 4], "x": 5, "y": 0.15},
-                {"matrix": [4, 3], "x": 6, "y": 0.1},
-                {"matrix": [4, 2], "x": 7, "y": 0},
-                {"matrix": [4, 1], "x": 8, "y": 0.2},
-                {"matrix": [4, 0], "x": 9, "y": 0.9},
-
-                {"matrix": [1, 0], "x": 0, "y": 1.9},
-                {"matrix": [1, 1], "x": 1, "y": 1.2},
-                {"matrix": [1, 2], "x": 2, "y": 1},
-                {"matrix": [1, 3], "x": 3, "y": 1.1},
-                {"matrix": [1, 4], "x": 4, "y": 1.15},
-
-                {"matrix": [5, 4], "x": 5, "y": 1.15},
-                {"matrix": [5, 3], "x": 6, "y": 1.1},
-                {"matrix": [5, 2], "x": 7, "y": 1},
-                {"matrix": [5, 1], "x": 8, "y": 1.2},
-                {"matrix": [5, 0], "x": 9, "y": 1.9},
-
-                {"matrix": [2, 0], "x": 0, "y": 2.9},
-                {"matrix": [2, 1], "x": 1, "y": 2.2},
-                {"matrix": [2, 2], "x": 2, "y": 2},
-                {"matrix": [2, 3], "x": 3, "y": 2.1},
-                {"matrix": [2, 4], "x": 4, "y": 2.15},
-
-                {"matrix": [6, 4], "x": 5, "y": 2.15},
-                {"matrix": [6, 3], "x": 6, "y": 2.1},
-                {"matrix": [6, 2], "x": 7, "y": 2},
-                {"matrix": [6, 1], "x": 8, "y": 2.2},
-                {"matrix": [6, 0], "x": 9, "y": 2.9},
-
-                {"matrix": [3, 1], "x": 3, "y": 4.6},
-                {"matrix": [3, 2], "x": 4, "y": 4.65},
-                {"matrix": [3, 3], "x": 3, "y": 3.6},
-                {"matrix": [3, 4], "x": 4, "y": 3.65},
-
-                {"matrix": [7, 4], "x": 5, "y": 3.65},
-                {"matrix": [7, 3], "x": 6, "y": 3.6},
-                {"matrix": [7, 2], "x": 5, "y": 4.65},
-                {"matrix": [7, 1], "x": 6, "y": 4.6}
-            ]
-        }
-    }
-}
diff --git a/keyboards/ibnuda/squiggle/rev1/keyboard.json b/keyboards/ibnuda/squiggle/rev1/keyboard.json
new file mode 100644
index 00000000000..3baafefc841
--- /dev/null
+++ b/keyboards/ibnuda/squiggle/rev1/keyboard.json
@@ -0,0 +1,319 @@
+{
+    "keyboard_name": "squiggle",
+    "manufacturer": "ibnuda",
+    "url": "https://github.com/ibnuda/squiggle",
+    "maintainer": "Ibnu D. Aji",
+    "usb": {
+        "vid": "0x1209",
+        "pid": "0x6969",
+        "device_version": "0.0.1"
+    },
+    "matrix_pins": {
+        "cols": ["C6", "D7", "E6", "B4", "B5"],
+        "rows": ["B1", "B3", "B2", "B6"]
+    },
+    "diode_direction": "COL2ROW",
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "D0"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
+    "features": {
+        "bootmagic": false,
+        "mousekey": false,
+        "extrakey": false,
+        "console": true
+    },
+    "community_layouts": ["split_3x5_3"],
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0.9},
+                {"matrix": [0, 1], "x": 1, "y": 0.2},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0.1},
+                {"matrix": [0, 4], "x": 4, "y": 0.15},
+
+                {"matrix": [4, 4], "x": 5, "y": 0.15},
+                {"matrix": [4, 3], "x": 6, "y": 0.1},
+                {"matrix": [4, 2], "x": 7, "y": 0},
+                {"matrix": [4, 1], "x": 8, "y": 0.2},
+                {"matrix": [4, 0], "x": 9, "y": 0.9},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.9},
+                {"matrix": [1, 1], "x": 1, "y": 1.2},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1.1},
+                {"matrix": [1, 4], "x": 4, "y": 1.15},
+
+                {"matrix": [5, 4], "x": 5, "y": 1.15},
+                {"matrix": [5, 3], "x": 6, "y": 1.1},
+                {"matrix": [5, 2], "x": 7, "y": 1},
+                {"matrix": [5, 1], "x": 8, "y": 1.2},
+                {"matrix": [5, 0], "x": 9, "y": 1.9},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.9},
+                {"matrix": [2, 1], "x": 1, "y": 2.2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2.1},
+                {"matrix": [2, 4], "x": 4, "y": 2.15},
+
+                {"matrix": [6, 4], "x": 5, "y": 2.15},
+                {"matrix": [6, 3], "x": 6, "y": 2.1},
+                {"matrix": [6, 2], "x": 7, "y": 2},
+                {"matrix": [6, 1], "x": 8, "y": 2.2},
+                {"matrix": [6, 0], "x": 9, "y": 2.9},
+
+                {"matrix": [3, 3], "x": 3, "y": 3.6, "h": 2},
+                {"matrix": [3, 4], "x": 4, "y": 3.65, "h": 2},
+
+                {"matrix": [7, 4], "x": 5, "y": 3.65, "h": 2},
+                {"matrix": [7, 3], "x": 6, "y": 3.6, "h": 2}
+            ]
+        },
+        "LAYOUT_complicated": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0.9},
+                {"matrix": [0, 1], "x": 1, "y": 0.2},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0.1},
+                {"matrix": [0, 4], "x": 4, "y": 0.15},
+
+                {"matrix": [4, 4], "x": 5, "y": 0.15},
+                {"matrix": [4, 3], "x": 6, "y": 0.1},
+                {"matrix": [4, 2], "x": 7, "y": 0},
+                {"matrix": [4, 1], "x": 8, "y": 0.2},
+                {"matrix": [4, 0], "x": 9, "y": 0.9},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.9},
+                {"matrix": [1, 1], "x": 1, "y": 1.2},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1.1},
+                {"matrix": [1, 4], "x": 4, "y": 1.15},
+
+                {"matrix": [5, 4], "x": 5, "y": 1.15},
+                {"matrix": [5, 3], "x": 6, "y": 1.1},
+                {"matrix": [5, 2], "x": 7, "y": 1},
+                {"matrix": [5, 1], "x": 8, "y": 1.2},
+                {"matrix": [5, 0], "x": 9, "y": 1.9},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.9},
+                {"matrix": [2, 1], "x": 1, "y": 2.2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2.1},
+                {"matrix": [2, 4], "x": 4, "y": 2.15},
+
+                {"matrix": [6, 4], "x": 5, "y": 2.15},
+                {"matrix": [6, 3], "x": 6, "y": 2.1},
+                {"matrix": [6, 2], "x": 7, "y": 2},
+                {"matrix": [6, 1], "x": 8, "y": 2.2},
+                {"matrix": [6, 0], "x": 9, "y": 2.9},
+
+                {"matrix": [3, 3], "x": 3, "y": 3.6},
+                {"matrix": [3, 4], "x": 4, "y": 3.65},
+
+                {"matrix": [7, 4], "x": 5, "y": 3.65},
+                {"matrix": [7, 3], "x": 6, "y": 3.6},
+
+                {"matrix": [3, 1], "x": 3, "y": 4.6},
+                {"matrix": [3, 2], "x": 4, "y": 4.65},
+
+                {"matrix": [7, 2], "x": 5, "y": 4.65},
+                {"matrix": [7, 1], "x": 6, "y": 4.6}
+            ]
+        },
+        "LAYOUT_full": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0.9},
+                {"matrix": [0, 1], "x": 1, "y": 0.2},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0.1},
+                {"matrix": [0, 4], "x": 4, "y": 0.15},
+
+                {"matrix": [4, 4], "x": 5, "y": 0.15},
+                {"matrix": [4, 3], "x": 6, "y": 0.1},
+                {"matrix": [4, 2], "x": 7, "y": 0},
+                {"matrix": [4, 1], "x": 8, "y": 0.2},
+                {"matrix": [4, 0], "x": 9, "y": 0.9},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.9},
+                {"matrix": [1, 1], "x": 1, "y": 1.2},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1.1},
+                {"matrix": [1, 4], "x": 4, "y": 1.15},
+
+                {"matrix": [5, 4], "x": 5, "y": 1.15},
+                {"matrix": [5, 3], "x": 6, "y": 1.1},
+                {"matrix": [5, 2], "x": 7, "y": 1},
+                {"matrix": [5, 1], "x": 8, "y": 1.2},
+                {"matrix": [5, 0], "x": 9, "y": 1.9},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.9},
+                {"matrix": [2, 1], "x": 1, "y": 2.2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2.1},
+                {"matrix": [2, 4], "x": 4, "y": 2.15},
+
+                {"matrix": [6, 4], "x": 5, "y": 2.15},
+                {"matrix": [6, 3], "x": 6, "y": 2.1},
+                {"matrix": [6, 2], "x": 7, "y": 2},
+                {"matrix": [6, 1], "x": 8, "y": 2.2},
+                {"matrix": [6, 0], "x": 9, "y": 2.9},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.9},
+                {"matrix": [3, 1], "x": 1, "y": 3.2},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3.1},
+                {"matrix": [3, 4], "x": 4, "y": 3.15},
+
+                {"matrix": [7, 4], "x": 5, "y": 3.15},
+                {"matrix": [7, 3], "x": 6, "y": 3.1},
+                {"matrix": [7, 2], "x": 7, "y": 3},
+                {"matrix": [7, 1], "x": 8, "y": 3.2},
+                {"matrix": [7, 0], "x": 9, "y": 3.9}
+            ]
+        },
+        "LAYOUT_reversed": {
+            "layout": [
+                {"matrix": [4, 0], "x": 0, "y": 0.9},
+                {"matrix": [4, 1], "x": 1, "y": 0.2},
+                {"matrix": [4, 2], "x": 2, "y": 0},
+                {"matrix": [4, 3], "x": 3, "y": 0.1},
+                {"matrix": [4, 4], "x": 4, "y": 0.15},
+
+                {"matrix": [0, 4], "x": 5, "y": 0.15},
+                {"matrix": [0, 3], "x": 6, "y": 0.1},
+                {"matrix": [0, 2], "x": 7, "y": 0},
+                {"matrix": [0, 1], "x": 8, "y": 0.2},
+                {"matrix": [0, 0], "x": 9, "y": 0.9},
+
+                {"matrix": [5, 0], "x": 0, "y": 1.9},
+                {"matrix": [5, 1], "x": 1, "y": 1.2},
+                {"matrix": [5, 2], "x": 2, "y": 1},
+                {"matrix": [5, 3], "x": 3, "y": 1.1},
+                {"matrix": [5, 4], "x": 4, "y": 1.15},
+
+                {"matrix": [1, 4], "x": 5, "y": 1.15},
+                {"matrix": [1, 3], "x": 6, "y": 1.1},
+                {"matrix": [1, 2], "x": 7, "y": 1},
+                {"matrix": [1, 1], "x": 8, "y": 1.2},
+                {"matrix": [1, 0], "x": 9, "y": 1.9},
+
+                {"matrix": [6, 0], "x": 0, "y": 2.9},
+                {"matrix": [6, 1], "x": 1, "y": 2.2},
+                {"matrix": [6, 2], "x": 2, "y": 2},
+                {"matrix": [6, 3], "x": 3, "y": 2.1},
+                {"matrix": [6, 4], "x": 4, "y": 2.15},
+
+                {"matrix": [2, 4], "x": 5, "y": 2.15},
+                {"matrix": [2, 3], "x": 6, "y": 2.1},
+                {"matrix": [2, 2], "x": 7, "y": 2},
+                {"matrix": [2, 1], "x": 8, "y": 2.2},
+                {"matrix": [2, 0], "x": 9, "y": 2.9},
+
+                {"matrix": [7, 3], "x": 3, "y": 3.6, "h": 2},
+                {"matrix": [7, 4], "x": 4, "y": 3.65, "h": 2},
+
+                {"matrix": [3, 4], "x": 5, "y": 3.65, "h": 2},
+                {"matrix": [3, 3], "x": 6, "y": 3.6, "h": 2}
+            ]
+        },
+        "LAYOUT_split_3x5_3": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0.9},
+                {"matrix": [0, 1], "x": 1, "y": 0.2},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0.1},
+                {"matrix": [0, 4], "x": 4, "y": 0.15},
+
+                {"matrix": [4, 4], "x": 5, "y": 0.15},
+                {"matrix": [4, 3], "x": 6, "y": 0.1},
+                {"matrix": [4, 2], "x": 7, "y": 0},
+                {"matrix": [4, 1], "x": 8, "y": 0.2},
+                {"matrix": [4, 0], "x": 9, "y": 0.9},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.9},
+                {"matrix": [1, 1], "x": 1, "y": 1.2},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1.1},
+                {"matrix": [1, 4], "x": 4, "y": 1.15},
+
+                {"matrix": [5, 4], "x": 5, "y": 1.15},
+                {"matrix": [5, 3], "x": 6, "y": 1.1},
+                {"matrix": [5, 2], "x": 7, "y": 1},
+                {"matrix": [5, 1], "x": 8, "y": 1.2},
+                {"matrix": [5, 0], "x": 9, "y": 1.9},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.9},
+                {"matrix": [2, 1], "x": 1, "y": 2.2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2.1},
+                {"matrix": [2, 4], "x": 4, "y": 2.15},
+
+                {"matrix": [6, 4], "x": 5, "y": 2.15},
+                {"matrix": [6, 3], "x": 6, "y": 2.1},
+                {"matrix": [6, 2], "x": 7, "y": 2},
+                {"matrix": [6, 1], "x": 8, "y": 2.2},
+                {"matrix": [6, 0], "x": 9, "y": 2.9},
+
+                {"matrix": [3, 2], "x": 2, "y": 3.6, "h": 1.25},
+                {"matrix": [3, 3], "x": 3, "y": 3.6, "h": 2},
+                {"matrix": [3, 4], "x": 4, "y": 3.65, "h": 2},
+
+                {"matrix": [7, 4], "x": 5, "y": 3.65, "h": 2},
+                {"matrix": [7, 3], "x": 6, "y": 3.6, "h": 2},
+                {"matrix": [7, 2], "x": 7, "y": 3.6, "h": 1.25}
+            ]
+        },
+        "LAYOUT_thumbrow": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0.9},
+                {"matrix": [0, 1], "x": 1, "y": 0.2},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0.1},
+                {"matrix": [0, 4], "x": 4, "y": 0.15},
+
+                {"matrix": [4, 4], "x": 5, "y": 0.15},
+                {"matrix": [4, 3], "x": 6, "y": 0.1},
+                {"matrix": [4, 2], "x": 7, "y": 0},
+                {"matrix": [4, 1], "x": 8, "y": 0.2},
+                {"matrix": [4, 0], "x": 9, "y": 0.9},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.9},
+                {"matrix": [1, 1], "x": 1, "y": 1.2},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1.1},
+                {"matrix": [1, 4], "x": 4, "y": 1.15},
+
+                {"matrix": [5, 4], "x": 5, "y": 1.15},
+                {"matrix": [5, 3], "x": 6, "y": 1.1},
+                {"matrix": [5, 2], "x": 7, "y": 1},
+                {"matrix": [5, 1], "x": 8, "y": 1.2},
+                {"matrix": [5, 0], "x": 9, "y": 1.9},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.9},
+                {"matrix": [2, 1], "x": 1, "y": 2.2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2.1},
+                {"matrix": [2, 4], "x": 4, "y": 2.15},
+
+                {"matrix": [6, 4], "x": 5, "y": 2.15},
+                {"matrix": [6, 3], "x": 6, "y": 2.1},
+                {"matrix": [6, 2], "x": 7, "y": 2},
+                {"matrix": [6, 1], "x": 8, "y": 2.2},
+                {"matrix": [6, 0], "x": 9, "y": 2.9},
+
+                {"matrix": [3, 1], "x": 3, "y": 4.6},
+                {"matrix": [3, 2], "x": 4, "y": 4.65},
+                {"matrix": [3, 3], "x": 3, "y": 3.6},
+                {"matrix": [3, 4], "x": 4, "y": 3.65},
+
+                {"matrix": [7, 4], "x": 5, "y": 3.65},
+                {"matrix": [7, 3], "x": 6, "y": 3.6},
+                {"matrix": [7, 2], "x": 5, "y": 4.65},
+                {"matrix": [7, 1], "x": 6, "y": 4.6}
+            ]
+        }
+    }
+}
diff --git a/keyboards/ibnuda/squiggle/rev1/rules.mk b/keyboards/ibnuda/squiggle/rev1/rules.mk
deleted file mode 100644
index 2382d570350..00000000000
--- a/keyboards/ibnuda/squiggle/rev1/rules.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no       # Mouse keys
-EXTRAKEY_ENABLE = no       # Audio control and System control
-CONSOLE_ENABLE = yes        # Console for debug
-COMMAND_ENABLE = no        # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
diff --git a/keyboards/idobao/id42/info.json b/keyboards/idobao/id42/info.json
deleted file mode 100644
index ace2033493b..00000000000
--- a/keyboards/idobao/id42/info.json
+++ /dev/null
@@ -1,127 +0,0 @@
-{
-    "manufacturer": "IDOBAO",
-    "keyboard_name": "Abacus ID42",
-    "maintainer": "vinorodrigues",
-    "bootloader": "atmel-dfu",
-    "diode_direction": "COL2ROW",
-    "features": {
-        "bootmagic": true,
-        "mousekey": true,
-        "extrakey": true,
-        "console": false,
-        "command": false,
-        "nkro": true
-    },
-    "ws2812": {
-        "pin": "B3"
-    },
-    "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,
-            "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",
-        "max_brightness": 180,
-        "sleep": true
-    },
-    "matrix_pins": {
-        "cols": ["B4", "D7", "D6", "D4", "B5", "C7", "F0", "F7", "F6", "F1", "F4", "F5"],
-        "rows": ["D5", "C6", "B6", "E6"]
-    },
-    "processor": "atmega32u4",
-    "url": "https://idobao.net/search?type=product&q=ID42*",
-    "usb": {
-        "vid": "0x6964",
-        "pid": "0x0042",
-        "device_version": "1.0.0",
-        "force_nkro": true,
-        "polling_interval": 2
-      },
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 0], "label": "Esc", "x": 0, "y": 0},
-                {"matrix": [0, 1], "label": "Q", "x": 1, "y": 0},
-                {"matrix": [0, 2], "label": "W", "x": 2, "y": 0},
-                {"matrix": [0, 3], "label": "E", "x": 3, "y": 0},
-                {"matrix": [0, 4], "label": "R", "x": 4, "y": 0},
-                {"matrix": [0, 5], "label": "T", "x": 5, "y": 0},
-                {"matrix": [0, 6], "label": "Y", "x": 6, "y": 0},
-                {"matrix": [0, 7], "label": "U", "x": 7, "y": 0},
-                {"matrix": [0, 8], "label": "I", "x": 8, "y": 0},
-                {"matrix": [0, 9], "label": "O", "x": 9, "y": 0},
-                {"matrix": [0, 10], "label": "P", "x": 10, "y": 0},
-                {"matrix": [0, 11], "label": "BSpc", "x": 11, "y": 0},
-
-                {"matrix": [1, 0], "label": "Tab", "x": 0, "y": 1, "w": 1.25},
-                {"matrix": [1, 1], "label": "A", "x": 1.25, "y": 1},
-                {"matrix": [1, 2], "label": "S", "x": 2.25, "y": 1},
-                {"matrix": [1, 3], "label": "D", "x": 3.25, "y": 1},
-                {"matrix": [1, 4], "label": "F", "x": 4.25, "y": 1},
-                {"matrix": [1, 5], "label": "G", "x": 5.25, "y": 1},
-                {"matrix": [1, 6], "label": "H", "x": 6.25, "y": 1},
-                {"matrix": [1, 7], "label": "J", "x": 7.25, "y": 1},
-                {"matrix": [1, 8], "label": "K", "x": 8.25, "y": 1},
-                {"matrix": [1, 9], "label": "L", "x": 9.25, "y": 1},
-                {"matrix": [1, 11], "label": "Ent", "x": 10.25, "y": 1, "w": 1.75},
-
-                {"matrix": [2, 0], "label": "Shft", "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "label": "Z", "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "label": "X", "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "label": "C", "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "label": "V", "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "label": "B", "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "label": "N", "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "label": "M", "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "label": "Shft", "x": 8.75, "y": 2, "w": 1.25},
-                {"matrix": [2, 10], "label": "\u21E7", "x": 10, "y": 2},
-                {"matrix": [2, 11], "label": "Del", "x": 11, "y": 2},
-
-                {"matrix": [3, 0], "label": "Ctrl", "x": 0, "y": 3, "w": 1.25},
-                {"matrix": [3, 1], "label": "Win", "x": 1.25, "y": 3},
-                {"matrix": [3, 2], "label": "Alt", "x": 2.25, "y": 3, "w": 1.25},
-                {"matrix": [3, 3], "label": "", "x": 3.5, "y": 3, "w": 2.75},
-                {"matrix": [3, 6], "label": "Fn", "x": 6.25, "y": 3, "w": 2.75},
-                {"matrix": [3, 9], "label": "\u21E6", "x": 9, "y": 3},
-                {"matrix": [3, 10], "label": "\u21E9", "x": 10, "y": 3},
-                {"matrix": [3, 11], "label": "\u21E8", "x": 11, "y": 3}
-            ]
-        }
-    }
-}
diff --git a/keyboards/idobao/id42/keyboard.json b/keyboards/idobao/id42/keyboard.json
new file mode 100644
index 00000000000..14db7641eab
--- /dev/null
+++ b/keyboards/idobao/id42/keyboard.json
@@ -0,0 +1,128 @@
+{
+    "manufacturer": "IDOBAO",
+    "keyboard_name": "Abacus ID42",
+    "maintainer": "vinorodrigues",
+    "bootloader": "atmel-dfu",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "console": false,
+        "command": false,
+        "nkro": true,
+        "rgb_matrix": true
+    },
+    "ws2812": {
+        "pin": "B3"
+    },
+    "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,
+            "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",
+        "max_brightness": 180,
+        "sleep": true
+    },
+    "matrix_pins": {
+        "cols": ["B4", "D7", "D6", "D4", "B5", "C7", "F0", "F7", "F6", "F1", "F4", "F5"],
+        "rows": ["D5", "C6", "B6", "E6"]
+    },
+    "processor": "atmega32u4",
+    "url": "https://idobao.net/search?type=product&q=ID42*",
+    "usb": {
+        "vid": "0x6964",
+        "pid": "0x0042",
+        "device_version": "1.0.0",
+        "force_nkro": true,
+        "polling_interval": 2
+      },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "label": "Esc", "x": 0, "y": 0},
+                {"matrix": [0, 1], "label": "Q", "x": 1, "y": 0},
+                {"matrix": [0, 2], "label": "W", "x": 2, "y": 0},
+                {"matrix": [0, 3], "label": "E", "x": 3, "y": 0},
+                {"matrix": [0, 4], "label": "R", "x": 4, "y": 0},
+                {"matrix": [0, 5], "label": "T", "x": 5, "y": 0},
+                {"matrix": [0, 6], "label": "Y", "x": 6, "y": 0},
+                {"matrix": [0, 7], "label": "U", "x": 7, "y": 0},
+                {"matrix": [0, 8], "label": "I", "x": 8, "y": 0},
+                {"matrix": [0, 9], "label": "O", "x": 9, "y": 0},
+                {"matrix": [0, 10], "label": "P", "x": 10, "y": 0},
+                {"matrix": [0, 11], "label": "BSpc", "x": 11, "y": 0},
+
+                {"matrix": [1, 0], "label": "Tab", "x": 0, "y": 1, "w": 1.25},
+                {"matrix": [1, 1], "label": "A", "x": 1.25, "y": 1},
+                {"matrix": [1, 2], "label": "S", "x": 2.25, "y": 1},
+                {"matrix": [1, 3], "label": "D", "x": 3.25, "y": 1},
+                {"matrix": [1, 4], "label": "F", "x": 4.25, "y": 1},
+                {"matrix": [1, 5], "label": "G", "x": 5.25, "y": 1},
+                {"matrix": [1, 6], "label": "H", "x": 6.25, "y": 1},
+                {"matrix": [1, 7], "label": "J", "x": 7.25, "y": 1},
+                {"matrix": [1, 8], "label": "K", "x": 8.25, "y": 1},
+                {"matrix": [1, 9], "label": "L", "x": 9.25, "y": 1},
+                {"matrix": [1, 11], "label": "Ent", "x": 10.25, "y": 1, "w": 1.75},
+
+                {"matrix": [2, 0], "label": "Shft", "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "label": "Z", "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "label": "X", "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "label": "C", "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "label": "V", "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "label": "B", "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "label": "N", "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "label": "M", "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "label": "Shft", "x": 8.75, "y": 2, "w": 1.25},
+                {"matrix": [2, 10], "label": "\u21E7", "x": 10, "y": 2},
+                {"matrix": [2, 11], "label": "Del", "x": 11, "y": 2},
+
+                {"matrix": [3, 0], "label": "Ctrl", "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "label": "Win", "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "label": "Alt", "x": 2.25, "y": 3, "w": 1.25},
+                {"matrix": [3, 3], "label": "", "x": 3.5, "y": 3, "w": 2.75},
+                {"matrix": [3, 6], "label": "Fn", "x": 6.25, "y": 3, "w": 2.75},
+                {"matrix": [3, 9], "label": "\u21E6", "x": 9, "y": 3},
+                {"matrix": [3, 10], "label": "\u21E9", "x": 10, "y": 3},
+                {"matrix": [3, 11], "label": "\u21E8", "x": 11, "y": 3}
+            ]
+        }
+    }
+}
diff --git a/keyboards/idobao/id42/rules.mk b/keyboards/idobao/id42/rules.mk
deleted file mode 100755
index 58e39b17a55..00000000000
--- a/keyboards/idobao/id42/rules.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-# This file intentionally left blank
-# ** settings are data driven & stored in `info.json` **
-
-RGB_MATRIX_ENABLE = yes
diff --git a/keyboards/idobao/id61/info.json b/keyboards/idobao/id61/info.json
deleted file mode 100644
index 0b1c51279de..00000000000
--- a/keyboards/idobao/id61/info.json
+++ /dev/null
@@ -1,146 +0,0 @@
-{
-    "manufacturer": "IDOBAO",
-    "keyboard_name": "ID61",
-    "maintainer": "vinorodrigues",
-    "bootloader": "atmel-dfu",
-    "diode_direction": "COL2ROW",
-    "features": {
-        "bootmagic": true,
-        "command": false,
-        "console": false,
-        "extrakey": true,
-        "mousekey": true,
-        "nkro": true
-    },
-    "ws2812": {
-        "pin": "F0"
-    },
-    "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,
-            "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",
-        "max_brightness": 170,
-        "sleep": true
-    },
-    "matrix_pins": {
-        "cols": ["C7", "F6", "F5", "F4", "F1", "B7", "D5", "D1", "D2", "D3", "D4", "D0", "D6", "D7"],
-        "rows": ["B0", "B1", "B2", "B3", "F7"]
-    },
-    "processor": "atmega32u4",
-    "url": "https://idobao.net/search?type=product&q=id61*",
-    "usb": {
-        "device_version": "1.0.0",
-        "pid": "0x0061",
-        "vid": "0x6964"
-    },
-    "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": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-
-                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
-                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
-                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
-                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
-                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
-                {"label": "Y", "matrix": [1, 6], "x": 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], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
-                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
-                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
-                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
-                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
-                {"label": "H", "matrix": [2, 6], "x": 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, 12], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
-                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
-                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
-                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
-                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
-                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
-                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
-                {"label": ",<", "matrix": [3, 9], "x": 9.25, "y": 3},
-                {"label": ".>", "matrix": [3, 10], "x": 10.25, "y": 3},
-                {"label": "/?", "matrix": [3, 11], "x": 11.25, "y": 3},
-                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
-
-                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"label": "Space", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
-                {"label": "Fn", "matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
-                {"label": "Alt", "matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
-                {"label": "Menu", "matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
-                {"label": "Ctrl", "matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
-            ]
-        }
-    }
-}
diff --git a/keyboards/idobao/id61/keyboard.json b/keyboards/idobao/id61/keyboard.json
new file mode 100644
index 00000000000..cb55f1750dd
--- /dev/null
+++ b/keyboards/idobao/id61/keyboard.json
@@ -0,0 +1,147 @@
+{
+    "manufacturer": "IDOBAO",
+    "keyboard_name": "ID61",
+    "maintainer": "vinorodrigues",
+    "bootloader": "atmel-dfu",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgb_matrix": true
+    },
+    "ws2812": {
+        "pin": "F0"
+    },
+    "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,
+            "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",
+        "max_brightness": 170,
+        "sleep": true
+    },
+    "matrix_pins": {
+        "cols": ["C7", "F6", "F5", "F4", "F1", "B7", "D5", "D1", "D2", "D3", "D4", "D0", "D6", "D7"],
+        "rows": ["B0", "B1", "B2", "B3", "F7"]
+    },
+    "processor": "atmega32u4",
+    "url": "https://idobao.net/search?type=product&q=id61*",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x0061",
+        "vid": "0x6964"
+    },
+    "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": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 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], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 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, 12], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": ",<", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ".>", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "/?", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "Space", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "Fn", "matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"label": "Alt", "matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"label": "Menu", "matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+                {"label": "Ctrl", "matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/idobao/id61/rules.mk b/keyboards/idobao/id61/rules.mk
deleted file mode 100644
index ed51a576218..00000000000
--- a/keyboards/idobao/id61/rules.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright 2022 Vino Rodrigues (@vinorodrigues)
-# SPDX-License-Identifier: GPL-2.0-or-later
-# ** settings are data driven & stored in `info.json` **
-
-RGB_MATRIX_ENABLE = yes
diff --git a/keyboards/idobao/id63/info.json b/keyboards/idobao/id63/info.json
deleted file mode 100644
index 573fb440303..00000000000
--- a/keyboards/idobao/id63/info.json
+++ /dev/null
@@ -1,151 +0,0 @@
-{
-    "manufacturer": "IDOBAO",
-    "keyboard_name": "ID63",
-    "maintainer": "vinorodrigues",
-    "bootloader": "atmel-dfu",
-    "diode_direction": "COL2ROW",
-    "features": {
-        "bootmagic": true,
-        "command": false,
-        "console": false,
-        "extrakey": true,
-        "mousekey": true,
-        "nkro": true
-    },
-    "ws2812": {
-        "pin": "B7"
-    },
-    "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,
-            "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",
-        "max_brightness": 180,
-        "sleep": true
-    },
-    "matrix_pins": {
-        "cols": ["C7", "F6", "F5", "F4", "F1", "B3", "D0", "D1", "D2", "D3", "D4", "D5", "D6", "D7"],
-        "rows": ["B0", "B1", "B2", "E6", "F7"]
-    },
-    "processor": "atmega32u4",
-    "url": "https://idobao.net/search?type=product&q=id63*",
-    "usb": {
-        "device_version": "1.0.0",
-        "pid": "0x0063",
-        "vid": "0x6964"
-    },
-    "layout_aliases": {
-        "LAYOUT_63_ansi": "LAYOUT_60_ansi_arrow"
-    },
-    "community_layouts": ["60_ansi_arrow"],
-    "layouts": {
-        "LAYOUT_60_ansi_arrow": {
-            "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": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-
-                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
-                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
-                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
-                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
-                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
-                {"label": "Y", "matrix": [1, 6], "x": 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], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"label": "Caps Lock", "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], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
-                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
-                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
-                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
-                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
-                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
-                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
-                {"label": ",<", "matrix": [3, 9], "x": 9.25, "y": 3},
-                {"label": ".>", "matrix": [3, 10], "x": 10.25, "y": 3},
-                {"label": "Shift", "matrix": [3, 11], "x": 11.25, "y": 3, "w": 1.75},
-                {"label": "\u2191", "matrix": [3, 12], "x": 13, "y": 3},
-                {"label": "/?", "matrix": [3, 13], "x": 14, "y": 3},
-
-                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"label": "Alt", "matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25},
-                {"label": "Space", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
-                {"label": "Fn", "matrix": [4, 9], "x": 10, "y": 4},
-                {"label": "Menu", "matrix": [4, 10], "x": 11, "y": 4},
-                {"label": "\u2190", "matrix": [4, 11], "x": 12, "y": 4},
-                {"label": "\u2193", "matrix": [4, 12], "x": 13, "y": 4},
-                {"label": "\u2192", "matrix": [4, 13], "x": 14, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/idobao/id63/keyboard.json b/keyboards/idobao/id63/keyboard.json
new file mode 100644
index 00000000000..1969ca4cf75
--- /dev/null
+++ b/keyboards/idobao/id63/keyboard.json
@@ -0,0 +1,152 @@
+{
+    "manufacturer": "IDOBAO",
+    "keyboard_name": "ID63",
+    "maintainer": "vinorodrigues",
+    "bootloader": "atmel-dfu",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgb_matrix": true
+    },
+    "ws2812": {
+        "pin": "B7"
+    },
+    "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,
+            "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",
+        "max_brightness": 180,
+        "sleep": true
+    },
+    "matrix_pins": {
+        "cols": ["C7", "F6", "F5", "F4", "F1", "B3", "D0", "D1", "D2", "D3", "D4", "D5", "D6", "D7"],
+        "rows": ["B0", "B1", "B2", "E6", "F7"]
+    },
+    "processor": "atmega32u4",
+    "url": "https://idobao.net/search?type=product&q=id63*",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x0063",
+        "vid": "0x6964"
+    },
+    "layout_aliases": {
+        "LAYOUT_63_ansi": "LAYOUT_60_ansi_arrow"
+    },
+    "community_layouts": ["60_ansi_arrow"],
+    "layouts": {
+        "LAYOUT_60_ansi_arrow": {
+            "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": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 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], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"label": "Caps Lock", "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], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": ",<", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ".>", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 11], "x": 11.25, "y": 3, "w": 1.75},
+                {"label": "\u2191", "matrix": [3, 12], "x": 13, "y": 3},
+                {"label": "/?", "matrix": [3, 13], "x": 14, "y": 3},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "Alt", "matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "Space", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "Fn", "matrix": [4, 9], "x": 10, "y": 4},
+                {"label": "Menu", "matrix": [4, 10], "x": 11, "y": 4},
+                {"label": "\u2190", "matrix": [4, 11], "x": 12, "y": 4},
+                {"label": "\u2193", "matrix": [4, 12], "x": 13, "y": 4},
+                {"label": "\u2192", "matrix": [4, 13], "x": 14, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/idobao/id63/rules.mk b/keyboards/idobao/id63/rules.mk
deleted file mode 100644
index 58e39b17a55..00000000000
--- a/keyboards/idobao/id63/rules.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-# This file intentionally left blank
-# ** settings are data driven & stored in `info.json` **
-
-RGB_MATRIX_ENABLE = yes
diff --git a/keyboards/idobao/id67/info.json b/keyboards/idobao/id67/info.json
deleted file mode 100644
index 7c5308d3156..00000000000
--- a/keyboards/idobao/id67/info.json
+++ /dev/null
@@ -1,151 +0,0 @@
-{
-    "manufacturer": "IDOBAO",
-    "keyboard_name": "ID67",
-    "maintainer": "thewerther",
-    "bootloader": "atmel-dfu",
-    "diode_direction": "COL2ROW",
-    "features": {
-        "bootmagic": true,
-        "mousekey": true,
-        "extrakey": true,
-        "command": false,
-        "console": false,
-        "nkro": true
-    },
-    "ws2812": {
-        "pin": "F0"
-    },
-    "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,
-            "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",
-        "max_brightness": 180,
-        "sleep": true
-    },
-    "matrix_pins": {
-        "cols": ["C7", "F6", "F5", "F4", "F1", "B7", "D5", "D1", "D2", "D3", "D4", "D0", "D6", "D7", "B4"],
-        "rows": ["B0", "B1", "B2", "B3", "F7"]
-    },
-    "processor": "atmega32u4",
-    "url": "https://idobao.net/search?type=product&q=ID67*",
-    "usb": {
-        "vid": "0x6964",
-        "pid": "0x0267",
-        "device_version": "2.0.0"
-    },
-    "layouts": {
-        "LAYOUT_65_ansi_blocker": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-                {"matrix": [0, 14], "x": 15, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-                {"matrix": [1, 14], "x": 15, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
-                {"matrix": [2, 14], "x": 15, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 2], "x": 2.25, "y": 3},
-                {"matrix": [3, 3], "x": 3.25, "y": 3},
-                {"matrix": [3, 4], "x": 4.25, "y": 3},
-                {"matrix": [3, 5], "x": 5.25, "y": 3},
-                {"matrix": [3, 6], "x": 6.25, "y": 3},
-                {"matrix": [3, 7], "x": 7.25, "y": 3},
-                {"matrix": [3, 8], "x": 8.25, "y": 3},
-                {"matrix": [3, 9], "x": 9.25, "y": 3},
-                {"matrix": [3, 10], "x": 10.25, "y": 3},
-                {"matrix": [3, 11], "x": 11.25, "y": 3},
-                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"matrix": [3, 13], "x": 14, "y": 3},
-                {"matrix": [3, 14], "x": 15, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 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}
-            ]
-        }
-    }
-}
diff --git a/keyboards/idobao/id67/keyboard.json b/keyboards/idobao/id67/keyboard.json
new file mode 100644
index 00000000000..64c3623fd69
--- /dev/null
+++ b/keyboards/idobao/id67/keyboard.json
@@ -0,0 +1,152 @@
+{
+    "manufacturer": "IDOBAO",
+    "keyboard_name": "ID67",
+    "maintainer": "thewerther",
+    "bootloader": "atmel-dfu",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "command": false,
+        "console": false,
+        "nkro": true,
+        "rgb_matrix": true
+    },
+    "ws2812": {
+        "pin": "F0"
+    },
+    "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,
+            "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",
+        "max_brightness": 180,
+        "sleep": true
+    },
+    "matrix_pins": {
+        "cols": ["C7", "F6", "F5", "F4", "F1", "B7", "D5", "D1", "D2", "D3", "D4", "D0", "D6", "D7", "B4"],
+        "rows": ["B0", "B1", "B2", "B3", "F7"]
+    },
+    "processor": "atmega32u4",
+    "url": "https://idobao.net/search?type=product&q=ID67*",
+    "usb": {
+        "vid": "0x6964",
+        "pid": "0x0267",
+        "device_version": "2.0.0"
+    },
+    "layouts": {
+        "LAYOUT_65_ansi_blocker": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 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}
+            ]
+        }
+    }
+}
diff --git a/keyboards/idobao/id67/rules.mk b/keyboards/idobao/id67/rules.mk
deleted file mode 100644
index 4341508fde4..00000000000
--- a/keyboards/idobao/id67/rules.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-RGB_MATRIX_ENABLE = yes     # Enable RGB Matrix feature
diff --git a/keyboards/idobao/id80/v3/ansi/info.json b/keyboards/idobao/id80/v3/ansi/info.json
deleted file mode 100644
index 19dc8c67a70..00000000000
--- a/keyboards/idobao/id80/v3/ansi/info.json
+++ /dev/null
@@ -1,170 +0,0 @@
-{
-    "manufacturer": "IDOBAO",
-    "keyboard_name": "IDOBAO ID80v3",
-    "maintainer": "vinorodrigues",
-    "bootloader": "atmel-dfu",
-    "diode_direction": "COL2ROW",
-    "features": {
-        "bootmagic": true,
-        "mousekey": true,
-        "extrakey": true,
-        "console": false,
-        "command": false,
-        "nkro": true
-    },
-    "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,
-            "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",
-        "max_brightness": 180,
-        "sleep": true
-    },
-    "matrix_pins": {
-        "cols": ["B7", "B3", "B2", "B1", "B0", "E6", "F1", "F4", "F5", "F6", "F7"],
-        "rows": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4"]
-    },
-    "processor": "atmega32u4",
-    "url": "https://idobao.net/search?type=product&q=id80*",
-    "usb": {
-        "vid": "0x6964",
-        "pid": "0x0380",
-        "device_version": "3.0.0"
-    },
-    "ws2812": {
-        "pin": "E2"
-    },
-    "bootmagic": {
-        "matrix": [0, 5]
-    },
-    "layouts": {
-        "LAYOUT_80_ansi": {
-            "layout": [
-                {"matrix": [0, 5], "x": 0, "y": 0},
-                {"matrix": [1, 5], "x": 1.25, "y": 0},
-                {"matrix": [2, 5], "x": 2.25, "y": 0},
-                {"matrix": [3, 5], "x": 3.25, "y": 0},
-                {"matrix": [4, 5], "x": 4.25, "y": 0},
-                {"matrix": [5, 5], "x": 5.5, "y": 0},
-                {"matrix": [6, 5], "x": 6.5, "y": 0},
-                {"matrix": [7, 5], "x": 7.5, "y": 0},
-                {"matrix": [8, 5], "x": 8.5, "y": 0},
-                {"matrix": [7, 10], "x": 9.75, "y": 0},
-                {"matrix": [5, 10], "x": 10.75, "y": 0},
-                {"matrix": [4, 10], "x": 11.75, "y": 0},
-                {"matrix": [3, 10], "x": 12.75, "y": 0},
-                {"matrix": [6, 10], "x": 14, "y": 0},
-                {"matrix": [2, 10], "x": 15.25, "y": 0},
-
-                {"matrix": [0, 4], "x": 0, "y": 1.25},
-                {"matrix": [1, 4], "x": 1, "y": 1.25},
-                {"matrix": [2, 4], "x": 2, "y": 1.25},
-                {"matrix": [3, 4], "x": 3, "y": 1.25},
-                {"matrix": [4, 4], "x": 4, "y": 1.25},
-                {"matrix": [5, 4], "x": 5, "y": 1.25},
-                {"matrix": [6, 4], "x": 6, "y": 1.25},
-                {"matrix": [7, 4], "x": 7, "y": 1.25},
-                {"matrix": [8, 4], "x": 8, "y": 1.25},
-                {"matrix": [8, 9], "x": 9, "y": 1.25},
-                {"matrix": [7, 9], "x": 10, "y": 1.25},
-                {"matrix": [5, 9], "x": 11, "y": 1.25},
-                {"matrix": [4, 9], "x": 12, "y": 1.25},
-                {"matrix": [6, 9], "x": 13, "y": 1.25, "w": 2},
-                {"matrix": [2, 9], "x": 15.25, "y": 1.25},
-
-                {"matrix": [0, 3], "x": 0, "y": 2.25, "w": 1.5},
-                {"matrix": [1, 3], "x": 1.5, "y": 2.25},
-                {"matrix": [2, 3], "x": 2.5, "y": 2.25},
-                {"matrix": [3, 3], "x": 3.5, "y": 2.25},
-                {"matrix": [4, 3], "x": 4.5, "y": 2.25},
-                {"matrix": [5, 3], "x": 5.5, "y": 2.25},
-                {"matrix": [6, 3], "x": 6.5, "y": 2.25},
-                {"matrix": [7, 3], "x": 7.5, "y": 2.25},
-                {"matrix": [8, 3], "x": 8.5, "y": 2.25},
-                {"matrix": [8, 8], "x": 9.5, "y": 2.25},
-                {"matrix": [7, 8], "x": 10.5, "y": 2.25},
-                {"matrix": [5, 8], "x": 11.5, "y": 2.25},
-                {"matrix": [4, 8], "x": 12.5, "y": 2.25},
-                {"matrix": [3, 8], "x": 13.5, "y": 2.25, "w": 1.5},
-                {"matrix": [2, 8], "x": 15.25, "y": 2.25},
-
-                {"matrix": [0, 2], "x": 0, "y": 3.25, "w": 1.75},
-                {"matrix": [1, 2], "x": 1.75, "y": 3.25},
-                {"matrix": [2, 2], "x": 2.75, "y": 3.25},
-                {"matrix": [3, 2], "x": 3.75, "y": 3.25},
-                {"matrix": [4, 2], "x": 4.75, "y": 3.25},
-                {"matrix": [5, 2], "x": 5.75, "y": 3.25},
-                {"matrix": [6, 2], "x": 6.75, "y": 3.25},
-                {"matrix": [7, 2], "x": 7.75, "y": 3.25},
-                {"matrix": [8, 2], "x": 8.75, "y": 3.25},
-                {"matrix": [8, 7], "x": 9.75, "y": 3.25},
-                {"matrix": [7, 7], "x": 10.75, "y": 3.25},
-                {"matrix": [5, 7], "x": 11.75, "y": 3.25},
-                {"matrix": [4, 7], "x": 12.75, "y": 3.25, "w": 2.25},
-
-                {"matrix": [0, 1], "x": 0, "y": 4.25, "w": 2.25},
-                {"matrix": [2, 1], "x": 2.25, "y": 4.25},
-                {"matrix": [3, 1], "x": 3.25, "y": 4.25},
-                {"matrix": [4, 1], "x": 4.25, "y": 4.25},
-                {"matrix": [5, 1], "x": 5.25, "y": 4.25},
-                {"matrix": [6, 1], "x": 6.25, "y": 4.25},
-                {"matrix": [7, 1], "x": 7.25, "y": 4.25},
-                {"matrix": [8, 1], "x": 8.25, "y": 4.25},
-                {"matrix": [8, 6], "x": 9.25, "y": 4.25},
-                {"matrix": [7, 6], "x": 10.25, "y": 4.25},
-                {"matrix": [5, 6], "x": 11.25, "y": 4.25},
-                {"matrix": [4, 6], "x": 12.25, "y": 4.25, "w": 1.75},
-
-                {"matrix": [3, 6], "x": 14.25, "y": 4.5},
-
-                {"matrix": [0, 0], "x": 0, "y": 5.25, "w": 1.25},
-                {"matrix": [1, 0], "x": 1.25, "y": 5.25, "w": 1.25},
-                {"matrix": [2, 0], "x": 2.5, "y": 5.25, "w": 1.25},
-                {"matrix": [6, 0], "x": 3.75, "y": 5.25, "w": 6.25},
-                {"matrix": [8, 0], "x": 10, "y": 5.25, "w": 1.5},
-                {"matrix": [7, 0], "x": 11.5, "y": 5.25, "w": 1.5},
-
-                {"matrix": [5, 0], "x": 13.25, "y": 5.5},
-                {"matrix": [4, 0], "x": 14.25, "y": 5.5},
-                {"matrix": [3, 0], "x": 15.25, "y": 5.5}
-            ]
-        }
-    }
-}
diff --git a/keyboards/idobao/id80/v3/ansi/keyboard.json b/keyboards/idobao/id80/v3/ansi/keyboard.json
new file mode 100644
index 00000000000..6200c2e88c9
--- /dev/null
+++ b/keyboards/idobao/id80/v3/ansi/keyboard.json
@@ -0,0 +1,171 @@
+{
+    "manufacturer": "IDOBAO",
+    "keyboard_name": "IDOBAO ID80v3",
+    "maintainer": "vinorodrigues",
+    "bootloader": "atmel-dfu",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "console": false,
+        "command": false,
+        "nkro": true,
+        "rgb_matrix": true
+    },
+    "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,
+            "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",
+        "max_brightness": 180,
+        "sleep": true
+    },
+    "matrix_pins": {
+        "cols": ["B7", "B3", "B2", "B1", "B0", "E6", "F1", "F4", "F5", "F6", "F7"],
+        "rows": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4"]
+    },
+    "processor": "atmega32u4",
+    "url": "https://idobao.net/search?type=product&q=id80*",
+    "usb": {
+        "vid": "0x6964",
+        "pid": "0x0380",
+        "device_version": "3.0.0"
+    },
+    "ws2812": {
+        "pin": "E2"
+    },
+    "bootmagic": {
+        "matrix": [0, 5]
+    },
+    "layouts": {
+        "LAYOUT_80_ansi": {
+            "layout": [
+                {"matrix": [0, 5], "x": 0, "y": 0},
+                {"matrix": [1, 5], "x": 1.25, "y": 0},
+                {"matrix": [2, 5], "x": 2.25, "y": 0},
+                {"matrix": [3, 5], "x": 3.25, "y": 0},
+                {"matrix": [4, 5], "x": 4.25, "y": 0},
+                {"matrix": [5, 5], "x": 5.5, "y": 0},
+                {"matrix": [6, 5], "x": 6.5, "y": 0},
+                {"matrix": [7, 5], "x": 7.5, "y": 0},
+                {"matrix": [8, 5], "x": 8.5, "y": 0},
+                {"matrix": [7, 10], "x": 9.75, "y": 0},
+                {"matrix": [5, 10], "x": 10.75, "y": 0},
+                {"matrix": [4, 10], "x": 11.75, "y": 0},
+                {"matrix": [3, 10], "x": 12.75, "y": 0},
+                {"matrix": [6, 10], "x": 14, "y": 0},
+                {"matrix": [2, 10], "x": 15.25, "y": 0},
+
+                {"matrix": [0, 4], "x": 0, "y": 1.25},
+                {"matrix": [1, 4], "x": 1, "y": 1.25},
+                {"matrix": [2, 4], "x": 2, "y": 1.25},
+                {"matrix": [3, 4], "x": 3, "y": 1.25},
+                {"matrix": [4, 4], "x": 4, "y": 1.25},
+                {"matrix": [5, 4], "x": 5, "y": 1.25},
+                {"matrix": [6, 4], "x": 6, "y": 1.25},
+                {"matrix": [7, 4], "x": 7, "y": 1.25},
+                {"matrix": [8, 4], "x": 8, "y": 1.25},
+                {"matrix": [8, 9], "x": 9, "y": 1.25},
+                {"matrix": [7, 9], "x": 10, "y": 1.25},
+                {"matrix": [5, 9], "x": 11, "y": 1.25},
+                {"matrix": [4, 9], "x": 12, "y": 1.25},
+                {"matrix": [6, 9], "x": 13, "y": 1.25, "w": 2},
+                {"matrix": [2, 9], "x": 15.25, "y": 1.25},
+
+                {"matrix": [0, 3], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [1, 3], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 2.5, "y": 2.25},
+                {"matrix": [3, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [4, 3], "x": 4.5, "y": 2.25},
+                {"matrix": [5, 3], "x": 5.5, "y": 2.25},
+                {"matrix": [6, 3], "x": 6.5, "y": 2.25},
+                {"matrix": [7, 3], "x": 7.5, "y": 2.25},
+                {"matrix": [8, 3], "x": 8.5, "y": 2.25},
+                {"matrix": [8, 8], "x": 9.5, "y": 2.25},
+                {"matrix": [7, 8], "x": 10.5, "y": 2.25},
+                {"matrix": [5, 8], "x": 11.5, "y": 2.25},
+                {"matrix": [4, 8], "x": 12.5, "y": 2.25},
+                {"matrix": [3, 8], "x": 13.5, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 8], "x": 15.25, "y": 2.25},
+
+                {"matrix": [0, 2], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [1, 2], "x": 1.75, "y": 3.25},
+                {"matrix": [2, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 3.75, "y": 3.25},
+                {"matrix": [4, 2], "x": 4.75, "y": 3.25},
+                {"matrix": [5, 2], "x": 5.75, "y": 3.25},
+                {"matrix": [6, 2], "x": 6.75, "y": 3.25},
+                {"matrix": [7, 2], "x": 7.75, "y": 3.25},
+                {"matrix": [8, 2], "x": 8.75, "y": 3.25},
+                {"matrix": [8, 7], "x": 9.75, "y": 3.25},
+                {"matrix": [7, 7], "x": 10.75, "y": 3.25},
+                {"matrix": [5, 7], "x": 11.75, "y": 3.25},
+                {"matrix": [4, 7], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"matrix": [0, 1], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [2, 1], "x": 2.25, "y": 4.25},
+                {"matrix": [3, 1], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 1], "x": 4.25, "y": 4.25},
+                {"matrix": [5, 1], "x": 5.25, "y": 4.25},
+                {"matrix": [6, 1], "x": 6.25, "y": 4.25},
+                {"matrix": [7, 1], "x": 7.25, "y": 4.25},
+                {"matrix": [8, 1], "x": 8.25, "y": 4.25},
+                {"matrix": [8, 6], "x": 9.25, "y": 4.25},
+                {"matrix": [7, 6], "x": 10.25, "y": 4.25},
+                {"matrix": [5, 6], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 12.25, "y": 4.25, "w": 1.75},
+
+                {"matrix": [3, 6], "x": 14.25, "y": 4.5},
+
+                {"matrix": [0, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [1, 0], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [2, 0], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [6, 0], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [8, 0], "x": 10, "y": 5.25, "w": 1.5},
+                {"matrix": [7, 0], "x": 11.5, "y": 5.25, "w": 1.5},
+
+                {"matrix": [5, 0], "x": 13.25, "y": 5.5},
+                {"matrix": [4, 0], "x": 14.25, "y": 5.5},
+                {"matrix": [3, 0], "x": 15.25, "y": 5.5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/idobao/id80/v3/ansi/rules.mk b/keyboards/idobao/id80/v3/ansi/rules.mk
deleted file mode 100644
index 58e39b17a55..00000000000
--- a/keyboards/idobao/id80/v3/ansi/rules.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-# This file intentionally left blank
-# ** settings are data driven & stored in `info.json` **
-
-RGB_MATRIX_ENABLE = yes
diff --git a/keyboards/idobao/id87/v2/info.json b/keyboards/idobao/id87/v2/info.json
deleted file mode 100644
index 4a6099207c2..00000000000
--- a/keyboards/idobao/id87/v2/info.json
+++ /dev/null
@@ -1,172 +0,0 @@
-{
-    "manufacturer": "IDOBAO",
-    "keyboard_name": "ID87v2",
-    "maintainer": "vinorodrigues",
-    "bootloader": "atmel-dfu",
-    "diode_direction": "ROW2COL",
-    "features": {
-        "bootmagic": true,
-        "mousekey": true,
-        "extrakey": true,
-        "console": false,
-        "command": false,
-        "nkro": true
-    },
-    "ws2812": {
-        "pin": "E2"
-    },
-    "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,
-            "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",
-        "max_brightness": 180,
-        "sleep": true
-    },
-    "matrix_pins": {
-        "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4"],
-        "rows": ["E6", "B0", "B1", "B2", "B3", "B7", "F7", "F6", "F5", "F4", "F1"]
-    },
-    "processor": "atmega32u4",
-    "url": "https://idobao.net/search?type=product&q=ID87*",
-    "usb": {
-        "vid": "0x6964",
-        "pid": "0x0287",
-        "device_version": "2.0.0"
-    },
-    "layouts": {
-        "LAYOUT_tkl_ansi": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "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.5, "y": 0},
-                {"matrix": [0, 7], "x": 7.5, "y": 0},
-                {"matrix": [0, 8], "x": 8.5, "y": 0},
-                {"matrix": [6, 8], "x": 9.5, "y": 0},
-                {"matrix": [6, 7], "x": 11, "y": 0},
-                {"matrix": [6, 5], "x": 12, "y": 0},
-                {"matrix": [6, 4], "x": 13, "y": 0},
-                {"matrix": [6, 3], "x": 14, "y": 0},
-                {"matrix": [6, 6], "x": 15.25, "y": 0},
-                {"matrix": [6, 2], "x": 16.25, "y": 0},
-                {"matrix": [6, 1], "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": [7, 8], "x": 9, "y": 1.25},
-                {"matrix": [7, 0], "x": 10, "y": 1.25},
-                {"matrix": [7, 7], "x": 11, "y": 1.25},
-                {"matrix": [7, 5], "x": 12, "y": 1.25},
-                {"matrix": [7, 3], "x": 13, "y": 1.25, "w": 2},
-                {"matrix": [7, 6], "x": 15.25, "y": 1.25},
-                {"matrix": [7, 2], "x": 16.25, "y": 1.25},
-                {"matrix": [7, 1], "x": 17.25, "y": 1.25},
-
-                {"matrix": [2, 0], "w": 1.5, "x": 0, "y": 2.25},
-                {"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": [8, 8], "x": 9.5, "y": 2.25},
-                {"matrix": [8, 7], "x": 10.5, "y": 2.25},
-                {"matrix": [8, 5], "x": 11.5, "y": 2.25},
-                {"matrix": [8, 4], "x": 12.5, "y": 2.25},
-                {"matrix": [8, 3], "w": 1.5, "x": 13.5, "y": 2.25},
-                {"matrix": [8, 6], "x": 15.25, "y": 2.25},
-                {"matrix": [8, 2], "x": 16.25, "y": 2.25},
-                {"matrix": [8, 1], "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": [9, 8], "x": 9.75, "y": 3.25},
-                {"matrix": [9, 7], "x": 10.75, "y": 3.25},
-                {"matrix": [9, 5], "x": 11.75, "y": 3.25},
-                {"matrix": [9, 3], "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": [10, 8], "x": 9.25, "y": 4.25},
-                {"matrix": [10, 7], "x": 10.25, "y": 4.25},
-                {"matrix": [10, 5], "x": 11.25, "y": 4.25},
-                {"matrix": [10, 4], "x": 12.25, "y": 4.25, "w": 2.75},
-                {"matrix": [9, 2], "x": 16.25, "y": 4.25},
-
-                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
-                {"matrix": [5, 8], "x": 10, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 7], "x": 11.25, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 4], "x": 12.5, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 3], "x": 13.75, "y": 5.25, "w": 1.25},
-                {"matrix": [10, 6], "x": 15.25, "y": 5.25},
-                {"matrix": [10, 2], "x": 16.25, "y": 5.25},
-                {"matrix": [10, 1], "x": 17.25, "y": 5.25}
-            ]
-        }
-    }
-}
diff --git a/keyboards/idobao/id87/v2/keyboard.json b/keyboards/idobao/id87/v2/keyboard.json
new file mode 100644
index 00000000000..0ece932274f
--- /dev/null
+++ b/keyboards/idobao/id87/v2/keyboard.json
@@ -0,0 +1,173 @@
+{
+    "manufacturer": "IDOBAO",
+    "keyboard_name": "ID87v2",
+    "maintainer": "vinorodrigues",
+    "bootloader": "atmel-dfu",
+    "diode_direction": "ROW2COL",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "console": false,
+        "command": false,
+        "nkro": true,
+        "rgb_matrix": true
+    },
+    "ws2812": {
+        "pin": "E2"
+    },
+    "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,
+            "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",
+        "max_brightness": 180,
+        "sleep": true
+    },
+    "matrix_pins": {
+        "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4"],
+        "rows": ["E6", "B0", "B1", "B2", "B3", "B7", "F7", "F6", "F5", "F4", "F1"]
+    },
+    "processor": "atmega32u4",
+    "url": "https://idobao.net/search?type=product&q=ID87*",
+    "usb": {
+        "vid": "0x6964",
+        "pid": "0x0287",
+        "device_version": "2.0.0"
+    },
+    "layouts": {
+        "LAYOUT_tkl_ansi": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "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.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [6, 8], "x": 9.5, "y": 0},
+                {"matrix": [6, 7], "x": 11, "y": 0},
+                {"matrix": [6, 5], "x": 12, "y": 0},
+                {"matrix": [6, 4], "x": 13, "y": 0},
+                {"matrix": [6, 3], "x": 14, "y": 0},
+                {"matrix": [6, 6], "x": 15.25, "y": 0},
+                {"matrix": [6, 2], "x": 16.25, "y": 0},
+                {"matrix": [6, 1], "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": [7, 8], "x": 9, "y": 1.25},
+                {"matrix": [7, 0], "x": 10, "y": 1.25},
+                {"matrix": [7, 7], "x": 11, "y": 1.25},
+                {"matrix": [7, 5], "x": 12, "y": 1.25},
+                {"matrix": [7, 3], "x": 13, "y": 1.25, "w": 2},
+                {"matrix": [7, 6], "x": 15.25, "y": 1.25},
+                {"matrix": [7, 2], "x": 16.25, "y": 1.25},
+                {"matrix": [7, 1], "x": 17.25, "y": 1.25},
+
+                {"matrix": [2, 0], "w": 1.5, "x": 0, "y": 2.25},
+                {"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": [8, 8], "x": 9.5, "y": 2.25},
+                {"matrix": [8, 7], "x": 10.5, "y": 2.25},
+                {"matrix": [8, 5], "x": 11.5, "y": 2.25},
+                {"matrix": [8, 4], "x": 12.5, "y": 2.25},
+                {"matrix": [8, 3], "w": 1.5, "x": 13.5, "y": 2.25},
+                {"matrix": [8, 6], "x": 15.25, "y": 2.25},
+                {"matrix": [8, 2], "x": 16.25, "y": 2.25},
+                {"matrix": [8, 1], "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": [9, 8], "x": 9.75, "y": 3.25},
+                {"matrix": [9, 7], "x": 10.75, "y": 3.25},
+                {"matrix": [9, 5], "x": 11.75, "y": 3.25},
+                {"matrix": [9, 3], "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": [10, 8], "x": 9.25, "y": 4.25},
+                {"matrix": [10, 7], "x": 10.25, "y": 4.25},
+                {"matrix": [10, 5], "x": 11.25, "y": 4.25},
+                {"matrix": [10, 4], "x": 12.25, "y": 4.25, "w": 2.75},
+                {"matrix": [9, 2], "x": 16.25, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 8], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 7], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 4], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 3], "x": 13.75, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 6], "x": 15.25, "y": 5.25},
+                {"matrix": [10, 2], "x": 16.25, "y": 5.25},
+                {"matrix": [10, 1], "x": 17.25, "y": 5.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/idobao/id87/v2/rules.mk b/keyboards/idobao/id87/v2/rules.mk
deleted file mode 100644
index 58e39b17a55..00000000000
--- a/keyboards/idobao/id87/v2/rules.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-# This file intentionally left blank
-# ** settings are data driven & stored in `info.json` **
-
-RGB_MATRIX_ENABLE = yes
diff --git a/keyboards/idobao/montex/v2/info.json b/keyboards/idobao/montex/v2/info.json
deleted file mode 100755
index aefc3e45611..00000000000
--- a/keyboards/idobao/montex/v2/info.json
+++ /dev/null
@@ -1,97 +0,0 @@
-{
-    "manufacturer": "IDOBAO",
-    "keyboard_name": "Montex ID27v2",
-    "maintainer": "IBNobody",
-    "bootloader": "atmel-dfu",
-    "diode_direction": "ROW2COL",
-    "features": {
-        "bootmagic": true,
-        "command": false,
-        "console": false,
-        "extrakey": true,
-        "mousekey": true,
-        "nkro": true
-    },
-    "ws2812": {
-        "pin": "B1"
-    },
-    "rgb_matrix": {
-        "animations": {
-            "alphas_mods": true,
-            "gradient_up_down": true,
-            "gradient_left_right": true,
-            "breathing": true,
-            "cycle_all": true,
-            "cycle_left_right": true,
-            "cycle_up_down": true,
-            "cycle_out_in": true,
-            "cycle_pinwheel": true,
-            "cycle_spiral": true,
-            "rainbow_beacon": true,
-            "raindrops": true,
-            "jellybean_raindrops": true,
-            "hue_breathing": true,
-            "hue_pendulum": true,
-            "hue_wave": true,
-            "pixel_rain": true,
-            "pixel_flow": true,
-            "solid_reactive": true,
-            "solid_reactive_wide": true,
-            "solid_reactive_multiwide": true,
-            "splash": true,
-            "solid_splash": true
-        },
-        "driver": "ws2812",
-        "max_brightness": 180,
-        "sleep": true
-    },
-    "matrix_pins": {
-        "cols": ["D5", "D3", "D2", "D1", "D0"],
-        "rows": ["D4", "D6", "D7", "B4", "B5", "C6"]
-    },
-    "processor": "atmega32u4",
-    "url": "https://idobao.net/search?type=product&q=montex*",
-    "usb": {
-        "device_version": "2.0.0",
-        "pid": "0x0227",
-        "vid": "0x6964"
-    },
-    "layouts": {
-        "LAYOUT_numpad_6x5": {
-            "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": [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": [1, 4], "x": 4, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2},
-                {"matrix": [2, 1], "x": 1, "y": 2},
-                {"matrix": [2, 2], "x": 2, "y": 2},
-                {"matrix": [2, 3], "x": 3, "y": 2},
-                {"matrix": [2, 4], "x": 4, "y": 2, "h": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3},
-                {"matrix": [3, 1], "x": 1, "y": 3},
-                {"matrix": [3, 2], "x": 2, "y": 3},
-                {"matrix": [3, 3], "x": 3, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4},
-                {"matrix": [4, 1], "x": 1, "y": 4},
-                {"matrix": [4, 2], "x": 2, "y": 4},
-                {"matrix": [4, 3], "x": 3, "y": 4},
-                {"matrix": [5, 3], "x": 4, "y": 4, "h": 2},
-
-                {"matrix": [5, 0], "x": 0, "y": 5},
-                {"matrix": [5, 1], "x": 1, "y": 5, "w": 2},
-                {"matrix": [5, 2], "x": 3, "y": 5}
-            ]
-        }
-    }
-}
diff --git a/keyboards/idobao/montex/v2/keyboard.json b/keyboards/idobao/montex/v2/keyboard.json
new file mode 100755
index 00000000000..6c00fd538d5
--- /dev/null
+++ b/keyboards/idobao/montex/v2/keyboard.json
@@ -0,0 +1,98 @@
+{
+    "manufacturer": "IDOBAO",
+    "keyboard_name": "Montex ID27v2",
+    "maintainer": "IBNobody",
+    "bootloader": "atmel-dfu",
+    "diode_direction": "ROW2COL",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgb_matrix": true
+    },
+    "ws2812": {
+        "pin": "B1"
+    },
+    "rgb_matrix": {
+        "animations": {
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "cycle_out_in": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "rainbow_beacon": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_rain": true,
+            "pixel_flow": true,
+            "solid_reactive": true,
+            "solid_reactive_wide": true,
+            "solid_reactive_multiwide": true,
+            "splash": true,
+            "solid_splash": true
+        },
+        "driver": "ws2812",
+        "max_brightness": 180,
+        "sleep": true
+    },
+    "matrix_pins": {
+        "cols": ["D5", "D3", "D2", "D1", "D0"],
+        "rows": ["D4", "D6", "D7", "B4", "B5", "C6"]
+    },
+    "processor": "atmega32u4",
+    "url": "https://idobao.net/search?type=product&q=montex*",
+    "usb": {
+        "device_version": "2.0.0",
+        "pid": "0x0227",
+        "vid": "0x6964"
+    },
+    "layouts": {
+        "LAYOUT_numpad_6x5": {
+            "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": [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": [1, 4], "x": 4, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2, "h": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+                {"matrix": [4, 2], "x": 2, "y": 4},
+                {"matrix": [4, 3], "x": 3, "y": 4},
+                {"matrix": [5, 3], "x": 4, "y": 4, "h": 2},
+
+                {"matrix": [5, 0], "x": 0, "y": 5},
+                {"matrix": [5, 1], "x": 1, "y": 5, "w": 2},
+                {"matrix": [5, 2], "x": 3, "y": 5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/idobao/montex/v2/rules.mk b/keyboards/idobao/montex/v2/rules.mk
deleted file mode 100755
index d249ac15a7c..00000000000
--- a/keyboards/idobao/montex/v2/rules.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-# This file intentionally mostly left blank
-# ** settings are data driven & stored in `info.json` **
-
-RGB_MATRIX_ENABLE = yes
diff --git a/keyboards/ingrained/info.json b/keyboards/ingrained/info.json
deleted file mode 100644
index d9259d5f322..00000000000
--- a/keyboards/ingrained/info.json
+++ /dev/null
@@ -1,116 +0,0 @@
-{
-    "keyboard_name": "ingrained",
-    "manufacturer": "s8erdude",
-    "url": "https://github.com/jpuerto96",
-    "maintainer": "jpuerto96 (s8erdude)",
-    "usb": {
-        "vid": "0xB33F",
-        "pid": "0x58E4",
-        "device_version": "0.0.1"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "community_layouts": ["split_3x5_3", "split_3x6_3"],
-    "layouts": {
-        "LAYOUT_split_3x6_3": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0.3},
-                {"matrix": [0, 1], "x": 1, "y": 0.3},
-                {"matrix": [0, 2], "x": 2, "y": 0.1},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0.1},
-                {"matrix": [0, 5], "x": 5, "y": 0.2},
-
-                {"matrix": [4, 5], "x": 9, "y": 0.2},
-                {"matrix": [4, 4], "x": 10, "y": 0.1},
-                {"matrix": [4, 3], "x": 11, "y": 0},
-                {"matrix": [4, 2], "x": 12, "y": 0.1},
-                {"matrix": [4, 1], "x": 13, "y": 0.3},
-                {"matrix": [4, 0], "x": 14, "y": 0.3},
-
-                {"matrix": [1, 0], "x": 0, "y": 1.3},
-                {"matrix": [1, 1], "x": 1, "y": 1.3},
-                {"matrix": [1, 2], "x": 2, "y": 1.1},
-                {"matrix": [1, 3], "x": 3, "y": 1},
-                {"matrix": [1, 4], "x": 4, "y": 1.1},
-                {"matrix": [1, 5], "x": 5, "y": 1.2},
-
-                {"matrix": [5, 5], "x": 9, "y": 1.2},
-                {"matrix": [5, 4], "x": 10, "y": 1.1},
-                {"matrix": [5, 3], "x": 11, "y": 1},
-                {"matrix": [5, 2], "x": 12, "y": 1.1},
-                {"matrix": [5, 1], "x": 13, "y": 1.3},
-                {"matrix": [5, 0], "x": 14, "y": 1.3},
-
-                {"matrix": [2, 0], "x": 0, "y": 2.3},
-                {"matrix": [2, 1], "x": 1, "y": 2.3},
-                {"matrix": [2, 2], "x": 2, "y": 2.1},
-                {"matrix": [2, 3], "x": 3, "y": 2},
-                {"matrix": [2, 4], "x": 4, "y": 2.1},
-                {"matrix": [2, 5], "x": 5, "y": 2.2},
-
-                {"matrix": [6, 5], "x": 9, "y": 2.2},
-                {"matrix": [6, 4], "x": 10, "y": 2.1},
-                {"matrix": [6, 3], "x": 11, "y": 2},
-                {"matrix": [6, 2], "x": 12, "y": 2.1},
-                {"matrix": [6, 1], "x": 13, "y": 2.3},
-                {"matrix": [6, 0], "x": 14, "y": 2.3},
-
-                {"matrix": [3, 3], "x": 4, "y": 3.7},
-                {"matrix": [3, 4], "x": 5, "y": 3.7},
-                {"matrix": [3, 5], "x": 6, "y": 3.2, "h": 1.5},
-
-                {"matrix": [7, 5], "x": 8, "y": 3.2, "h": 1.5},
-                {"matrix": [7, 4], "x": 9, "y": 3.7},
-                {"matrix": [7, 3], "x": 10, "y": 3.7}
-            ]
-        },
-        "LAYOUT_split_3x5_3": {
-            "layout": [
-                {"matrix": [0, 1], "x": 0, "y": 0.3},
-                {"matrix": [0, 2], "x": 1, "y": 0.1},
-                {"matrix": [0, 3], "x": 2, "y": 0},
-                {"matrix": [0, 4], "x": 3, "y": 0.1},
-                {"matrix": [0, 5], "x": 4, "y": 0.2},
-
-                {"matrix": [4, 5], "x": 8, "y": 0.2},
-                {"matrix": [4, 4], "x": 9, "y": 0.1},
-                {"matrix": [4, 3], "x": 10, "y": 0},
-                {"matrix": [4, 2], "x": 11, "y": 0.1},
-                {"matrix": [4, 1], "x": 12, "y": 0.3},
-
-                {"matrix": [1, 1], "x": 0, "y": 1.3},
-                {"matrix": [1, 2], "x": 1, "y": 1.1},
-                {"matrix": [1, 3], "x": 2, "y": 1},
-                {"matrix": [1, 4], "x": 3, "y": 1.1},
-                {"matrix": [1, 5], "x": 4, "y": 1.2},
-
-                {"matrix": [5, 5], "x": 8, "y": 1.2},
-                {"matrix": [5, 4], "x": 9, "y": 1.1},
-                {"matrix": [5, 3], "x": 10, "y": 1},
-                {"matrix": [5, 2], "x": 11, "y": 1.1},
-                {"matrix": [5, 1], "x": 12, "y": 1.3},
-
-                {"matrix": [2, 1], "x": 0, "y": 2.3},
-                {"matrix": [2, 2], "x": 1, "y": 2.1},
-                {"matrix": [2, 3], "x": 2, "y": 2},
-                {"matrix": [2, 4], "x": 3, "y": 2.1},
-                {"matrix": [2, 5], "x": 4, "y": 2.2},
-
-                {"matrix": [6, 5], "x": 8, "y": 2.2},
-                {"matrix": [6, 4], "x": 9, "y": 2.1},
-                {"matrix": [6, 3], "x": 10, "y": 2},
-                {"matrix": [6, 2], "x": 11, "y": 2.1},
-                {"matrix": [6, 1], "x": 12, "y": 2.3},
-
-                {"matrix": [3, 3], "x": 3, "y": 3.7},
-                {"matrix": [3, 4], "x": 4, "y": 3.7},
-                {"matrix": [3, 5], "x": 5, "y": 3.2, "h": 1.5},
-
-                {"matrix": [7, 5], "x": 7, "y": 3.2, "h": 1.5},
-                {"matrix": [7, 4], "x": 8, "y": 3.7},
-                {"matrix": [7, 3], "x": 9, "y": 3.7}
-            ]
-        }
-    }
-}
diff --git a/keyboards/ingrained/keyboard.json b/keyboards/ingrained/keyboard.json
new file mode 100644
index 00000000000..ec6422fb0ff
--- /dev/null
+++ b/keyboards/ingrained/keyboard.json
@@ -0,0 +1,126 @@
+{
+    "keyboard_name": "ingrained",
+    "manufacturer": "s8erdude",
+    "url": "https://github.com/jpuerto96",
+    "maintainer": "jpuerto96 (s8erdude)",
+    "usb": {
+        "vid": "0xB33F",
+        "pid": "0x58E4",
+        "device_version": "0.0.1",
+        "no_startup_check": true
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": false,
+        "mousekey": true,
+        "extrakey": true,
+        "unicode": true
+    },
+    "build": {
+        "lto": true
+    },
+    "community_layouts": ["split_3x5_3", "split_3x6_3"],
+    "layouts": {
+        "LAYOUT_split_3x6_3": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0.3},
+                {"matrix": [0, 1], "x": 1, "y": 0.3},
+                {"matrix": [0, 2], "x": 2, "y": 0.1},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0.1},
+                {"matrix": [0, 5], "x": 5, "y": 0.2},
+
+                {"matrix": [4, 5], "x": 9, "y": 0.2},
+                {"matrix": [4, 4], "x": 10, "y": 0.1},
+                {"matrix": [4, 3], "x": 11, "y": 0},
+                {"matrix": [4, 2], "x": 12, "y": 0.1},
+                {"matrix": [4, 1], "x": 13, "y": 0.3},
+                {"matrix": [4, 0], "x": 14, "y": 0.3},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.3},
+                {"matrix": [1, 1], "x": 1, "y": 1.3},
+                {"matrix": [1, 2], "x": 2, "y": 1.1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1.1},
+                {"matrix": [1, 5], "x": 5, "y": 1.2},
+
+                {"matrix": [5, 5], "x": 9, "y": 1.2},
+                {"matrix": [5, 4], "x": 10, "y": 1.1},
+                {"matrix": [5, 3], "x": 11, "y": 1},
+                {"matrix": [5, 2], "x": 12, "y": 1.1},
+                {"matrix": [5, 1], "x": 13, "y": 1.3},
+                {"matrix": [5, 0], "x": 14, "y": 1.3},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.3},
+                {"matrix": [2, 1], "x": 1, "y": 2.3},
+                {"matrix": [2, 2], "x": 2, "y": 2.1},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2.1},
+                {"matrix": [2, 5], "x": 5, "y": 2.2},
+
+                {"matrix": [6, 5], "x": 9, "y": 2.2},
+                {"matrix": [6, 4], "x": 10, "y": 2.1},
+                {"matrix": [6, 3], "x": 11, "y": 2},
+                {"matrix": [6, 2], "x": 12, "y": 2.1},
+                {"matrix": [6, 1], "x": 13, "y": 2.3},
+                {"matrix": [6, 0], "x": 14, "y": 2.3},
+
+                {"matrix": [3, 3], "x": 4, "y": 3.7},
+                {"matrix": [3, 4], "x": 5, "y": 3.7},
+                {"matrix": [3, 5], "x": 6, "y": 3.2, "h": 1.5},
+
+                {"matrix": [7, 5], "x": 8, "y": 3.2, "h": 1.5},
+                {"matrix": [7, 4], "x": 9, "y": 3.7},
+                {"matrix": [7, 3], "x": 10, "y": 3.7}
+            ]
+        },
+        "LAYOUT_split_3x5_3": {
+            "layout": [
+                {"matrix": [0, 1], "x": 0, "y": 0.3},
+                {"matrix": [0, 2], "x": 1, "y": 0.1},
+                {"matrix": [0, 3], "x": 2, "y": 0},
+                {"matrix": [0, 4], "x": 3, "y": 0.1},
+                {"matrix": [0, 5], "x": 4, "y": 0.2},
+
+                {"matrix": [4, 5], "x": 8, "y": 0.2},
+                {"matrix": [4, 4], "x": 9, "y": 0.1},
+                {"matrix": [4, 3], "x": 10, "y": 0},
+                {"matrix": [4, 2], "x": 11, "y": 0.1},
+                {"matrix": [4, 1], "x": 12, "y": 0.3},
+
+                {"matrix": [1, 1], "x": 0, "y": 1.3},
+                {"matrix": [1, 2], "x": 1, "y": 1.1},
+                {"matrix": [1, 3], "x": 2, "y": 1},
+                {"matrix": [1, 4], "x": 3, "y": 1.1},
+                {"matrix": [1, 5], "x": 4, "y": 1.2},
+
+                {"matrix": [5, 5], "x": 8, "y": 1.2},
+                {"matrix": [5, 4], "x": 9, "y": 1.1},
+                {"matrix": [5, 3], "x": 10, "y": 1},
+                {"matrix": [5, 2], "x": 11, "y": 1.1},
+                {"matrix": [5, 1], "x": 12, "y": 1.3},
+
+                {"matrix": [2, 1], "x": 0, "y": 2.3},
+                {"matrix": [2, 2], "x": 1, "y": 2.1},
+                {"matrix": [2, 3], "x": 2, "y": 2},
+                {"matrix": [2, 4], "x": 3, "y": 2.1},
+                {"matrix": [2, 5], "x": 4, "y": 2.2},
+
+                {"matrix": [6, 5], "x": 8, "y": 2.2},
+                {"matrix": [6, 4], "x": 9, "y": 2.1},
+                {"matrix": [6, 3], "x": 10, "y": 2},
+                {"matrix": [6, 2], "x": 11, "y": 2.1},
+                {"matrix": [6, 1], "x": 12, "y": 2.3},
+
+                {"matrix": [3, 3], "x": 3, "y": 3.7},
+                {"matrix": [3, 4], "x": 4, "y": 3.7},
+                {"matrix": [3, 5], "x": 5, "y": 3.2, "h": 1.5},
+
+                {"matrix": [7, 5], "x": 7, "y": 3.2, "h": 1.5},
+                {"matrix": [7, 4], "x": 8, "y": 3.7},
+                {"matrix": [7, 3], "x": 9, "y": 3.7}
+            ]
+        }
+    }
+}
diff --git a/keyboards/ingrained/rules.mk b/keyboards/ingrained/rules.mk
index e9a8002f902..c04c3c92ed3 100644
--- a/keyboards/ingrained/rules.mk
+++ b/keyboards/ingrained/rules.mk
@@ -1,19 +1,4 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-UNICODE_ENABLE = yes
 CUSTOM_MATRIX = lite
-NO_USB_STARTUP_CHECK = yes
-LTO_ENABLE = yes
 
 SRC += matrix.c
 I2C_DRIVER_REQUIRED = yes
diff --git a/keyboards/inland/kb83/info.json b/keyboards/inland/kb83/info.json
deleted file mode 100644
index b4396fb630e..00000000000
--- a/keyboards/inland/kb83/info.json
+++ /dev/null
@@ -1,164 +0,0 @@
-{
-    "keyboard_name": "KB83",
-    "manufacturer": "www.hfd.cn",
-    "maintainer": "hfd",
-    "usb": {
-        "vid": "0xFFFE",
-        "pid": "0x0007",
-        "device_version": "1.0.0",
-        "force_nkro": true
-    },
-    "rgb_matrix": {
-        "animations": {
-            "breathing": true,
-            "cycle_all": true,
-            "cycle_left_right": true,
-            "cycle_up_down": true,
-            "rainbow_moving_chevron": true,
-            "cycle_out_in": true,
-            "cycle_out_in_dual": true,
-            "cycle_pinwheel": true,
-            "cycle_spiral": true,
-            "dual_beacon": true,
-            "rainbow_beacon": true,
-            "raindrops": true,
-            "typing_heatmap": true,
-            "solid_reactive_simple": true,
-            "solid_reactive": true,
-            "multisplash": true
-        },
-        "driver": "snled27351",
-        "max_brightness": 200,
-        "react_on_keyup": true,
-        "sleep": true
-    },
-    "processor": "WB32FQ95",
-    "bootloader": "wb32-dfu",
-    "matrix_pins": {
-        "cols": ["C1", "C2", "C3", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "C4", "C5", "B0", "B1", "B2"],
-        "rows": ["B15", "C6", "C7", "C8", "C9", "A8"]
-    },
-    "diode_direction": "ROW2COL",
-    "dip_switch": {
-        "pins": ["A9"]
-    },
-    "eeprom": {
-        "driver": "wear_leveling",
-        "wear_leveling": {
-            "driver": "spi_flash",
-            "backing_size": 8192
-        }
-    },
-    "encoder": {
-        "rotary": [
-            {"pin_a": "B14", "pin_b": "B13", "resolution": 4}
-        ]
-    },
-    "qmk": {
-        "tap_keycode_delay": 15
-    },
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-
-                {"matrix": [0, 1], "x": 1.25, "y": 0},
-                {"matrix": [0, 2], "x": 2.25, "y": 0},
-                {"matrix": [0, 3], "x": 3.25, "y": 0},
-                {"matrix": [0, 4], "x": 4.25, "y": 0},
-
-                {"matrix": [0, 5], "x": 5.5, "y": 0},
-                {"matrix": [0, 6], "x": 6.5, "y": 0},
-                {"matrix": [0, 7], "x": 7.5, "y": 0},
-                {"matrix": [0, 8], "x": 8.5, "y": 0},
-
-                {"matrix": [0, 9], "x": 9.75, "y": 0},
-                {"matrix": [0, 10], "x": 10.75, "y": 0},
-                {"matrix": [0, 11], "x": 11.75, "y": 0},
-                {"matrix": [0, 12], "x": 12.75, "y": 0},
-
-                {"matrix": [0, 13], "x": 14, "y": 0},
-                {"matrix": [0, 15], "x": 15.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, 15], "x": 15.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": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
-
-                {"matrix": [2, 15], "x": 15.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": [3, 15], "x": 15.25, "y": 3.25},
-
-                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
-                {"matrix": [4, 1], "x": 2.25, "y": 4.25},
-                {"matrix": [4, 2], "x": 3.25, "y": 4.25},
-                {"matrix": [4, 3], "x": 4.25, "y": 4.25},
-                {"matrix": [4, 4], "x": 5.25, "y": 4.25},
-                {"matrix": [4, 5], "x": 6.25, "y": 4.25},
-                {"matrix": [4, 6], "x": 7.25, "y": 4.25},
-                {"matrix": [4, 7], "x": 8.25, "y": 4.25},
-                {"matrix": [4, 8], "x": 9.25, "y": 4.25},
-                {"matrix": [4, 9], "x": 10.25, "y": 4.25},
-                {"matrix": [4, 10], "x": 11.25, "y": 4.25},
-                {"matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 1.75},
-
-                {"matrix": [4, 14], "x": 14.125, "y": 4.375},
-
-                {"matrix": [4, 15], "x": 15.25, "y": 4.25},
-
-                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 5], "x": 3.75, "y": 5.25, "w": 6.25},
-                {"matrix": [5, 9], "x": 10, "y": 5.25},
-                {"matrix": [5, 10], "x": 11, "y": 5.25},
-                {"matrix": [5, 11], "x": 12, "y": 5.25},
-
-                {"matrix": [5, 13], "x": 13.125, "y": 5.375},
-                {"matrix": [5, 14], "x": 14.125, "y": 5.375},
-                {"matrix": [5, 15], "x": 15.125, "y": 5.375}
-            ]
-        }
-    }
-}
diff --git a/keyboards/inland/kb83/keyboard.json b/keyboards/inland/kb83/keyboard.json
new file mode 100644
index 00000000000..31ca8f1bda9
--- /dev/null
+++ b/keyboards/inland/kb83/keyboard.json
@@ -0,0 +1,173 @@
+{
+    "keyboard_name": "KB83",
+    "manufacturer": "www.hfd.cn",
+    "maintainer": "hfd",
+    "usb": {
+        "vid": "0xFFFE",
+        "pid": "0x0007",
+        "device_version": "1.0.0",
+        "force_nkro": true
+    },
+    "rgb_matrix": {
+        "animations": {
+            "breathing": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "raindrops": true,
+            "typing_heatmap": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "multisplash": true
+        },
+        "driver": "snled27351",
+        "max_brightness": 200,
+        "react_on_keyup": true,
+        "sleep": true
+    },
+    "processor": "WB32FQ95",
+    "bootloader": "wb32-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": false,
+        "extrakey": true,
+        "nkro": true,
+        "rgb_matrix": true,
+        "dip_switch": true,
+        "encoder": true
+    },
+    "matrix_pins": {
+        "cols": ["C1", "C2", "C3", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "C4", "C5", "B0", "B1", "B2"],
+        "rows": ["B15", "C6", "C7", "C8", "C9", "A8"]
+    },
+    "diode_direction": "ROW2COL",
+    "dip_switch": {
+        "pins": ["A9"]
+    },
+    "eeprom": {
+        "driver": "wear_leveling",
+        "wear_leveling": {
+            "driver": "spi_flash",
+            "backing_size": 8192
+        }
+    },
+    "encoder": {
+        "rotary": [
+            {"pin_a": "B14", "pin_b": "B13", "resolution": 4}
+        ]
+    },
+    "qmk": {
+        "tap_keycode_delay": 15
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 9.75, "y": 0},
+                {"matrix": [0, 10], "x": 10.75, "y": 0},
+                {"matrix": [0, 11], "x": 11.75, "y": 0},
+                {"matrix": [0, 12], "x": 12.75, "y": 0},
+
+                {"matrix": [0, 13], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15.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, 15], "x": 15.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": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [2, 15], "x": 15.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": [3, 15], "x": 15.25, "y": 3.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 1], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 1.75},
+
+                {"matrix": [4, 14], "x": 14.125, "y": 4.375},
+
+                {"matrix": [4, 15], "x": 15.25, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 5], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 9], "x": 10, "y": 5.25},
+                {"matrix": [5, 10], "x": 11, "y": 5.25},
+                {"matrix": [5, 11], "x": 12, "y": 5.25},
+
+                {"matrix": [5, 13], "x": 13.125, "y": 5.375},
+                {"matrix": [5, 14], "x": 14.125, "y": 5.375},
+                {"matrix": [5, 15], "x": 15.125, "y": 5.375}
+            ]
+        }
+    }
+}
diff --git a/keyboards/inland/kb83/rgb_matrix_kb.inc b/keyboards/inland/kb83/rgb_matrix_kb.inc
deleted file mode 100644
index 56e2bd31cbb..00000000000
--- a/keyboards/inland/kb83/rgb_matrix_kb.inc
+++ /dev/null
@@ -1,51 +0,0 @@
-// !!! DO NOT ADD #pragma once !!! //
-
-// Step 1.
-// Declare custom effects using the RGB_MATRIX_EFFECT macro
-// (note the lack of semicolon after the macro!)
-
-RGB_MATRIX_EFFECT(turn_off_rgb)
-RGB_MATRIX_EFFECT(kb_reset_rgb)
-
-// Step 2.
-// Define effects inside the `RGB_MATRIX_CUSTOM_EFFECT_IMPLS` ifdef block
-
-#ifdef RGB_MATRIX_CUSTOM_EFFECT_IMPLS
-
-// e.g: A simple effect, self-contained within a single method
-static bool turn_off_rgb(effect_params_t *params) {
-  RGB_MATRIX_USE_LIMITS(led_min, led_max);
-  for (uint8_t i = led_min; i < led_max; i++) {
-    rgb_matrix_set_color(i, 0x00, 0x00, 0x00);
-  }
-  return rgb_matrix_check_finished_leds(led_max);
-}
-
-// e.g: A more complex effect, relying on external methods and state, with
-// dedicated init and run methods
-static uint8_t some_global_state;
-static void kb_reset_rgb_init(effect_params_t* params) {
-  some_global_state = 0;
-}
-static bool kb_reset_rgb_run(effect_params_t* params) {
-  RGB_MATRIX_USE_LIMITS(led_min, led_max);
-  some_global_state++;
-  if(some_global_state&0x01){
-      for (uint8_t i = led_min; i < led_max; i++)
-        rgb_matrix_set_color(i, 0, 0, 0);
-  }
-  else{
-      for (uint8_t i = led_min; i < led_max; i++) 
-        rgb_matrix_set_color(i, 0xc0, 0xc0, 0xc0);
-  }
-  if(some_global_state>=7)
-    rgb_matrix_init();
-  return rgb_matrix_check_finished_leds(led_max);
-}
-
-static bool kb_reset_rgb(effect_params_t* params) {
-  if (params->init) kb_reset_rgb_init(params);
-  return kb_reset_rgb_run(params);
-}
-
-#endif // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
diff --git a/keyboards/inland/kb83/rules.mk b/keyboards/inland/kb83/rules.mk
deleted file mode 100644
index aefdb5a168d..00000000000
--- a/keyboards/inland/kb83/rules.mk
+++ /dev/null
@@ -1,17 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-KEYBOARD_SHARED_EP = no
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-DIP_SWITCH_ENABLE = yes		# DPI Switch
-ENCODER_ENABLE = yes
-RGB_MATRIX_ENABLE = yes
-#RGB_MATRIX_CUSTOM_USER = yes #Add turnoff LED
diff --git a/keyboards/input_club/ergodox_infinity/info.json b/keyboards/input_club/ergodox_infinity/info.json
deleted file mode 100644
index 51bf7a5f126..00000000000
--- a/keyboards/input_club/ergodox_infinity/info.json
+++ /dev/null
@@ -1,241 +0,0 @@
-{
-    "keyboard_name": "Infinity Ergodox (QMK)",
-    "manufacturer": "Input:Club",
-    "usb": {
-        "vid": "0x1C11",
-        "pid": "0xB04D",
-        "device_version": "0.0.1"
-    },
-    "led_matrix": {
-        "animations":{
-            "alphas_mods": true,
-            "breathing": true,
-            "band": true,
-            "band_pinwheel": true,
-            "band_spiral": true,
-            "cycle_left_right": true,
-            "cycle_up_down": true,
-            "cycle_out_in": true,
-            "dual_beacon": true,
-            "solid_reactive_simple": 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,
-            "wave_left_right": true,
-            "wave_up_down": true
-        },
-        "driver": "is31fl3731",
-        "sleep": true,
-        "split_count": [38, 38]
-    },
-    "matrix_pins": {
-        "cols": ["D1", "D4", "D5", "D6", "D7"],
-        "rows": ["B2", "B3", "B18", "B19", "C0", "C9", "C10", "C11", "D0"]
-    },
-    "diode_direction": "ROW2COL",
-    "split": {
-        "enabled": true
-    },
-    "processor": "MK20DX256",
-    "bootloader": "kiibohd",
-    "board": "IC_TEENSY_3_1",
-    "tapping": {
-        "toggle": 1
-    },
-    "community_layouts": ["ergodox"],
-    "layouts": {
-        "LAYOUT_ergodox": {
-            "layout": [
-                {"matrix": [8, 0], "x": 0, "y": 0.375, "w": 1.5},
-                {"matrix": [7, 0], "x": 1.5, "y": 0.375},
-                {"matrix": [6, 0], "x": 2.5, "y": 0.125},
-                {"matrix": [5, 0], "x": 3.5, "y": 0},
-                {"matrix": [4, 0], "x": 4.5, "y": 0.125},
-                {"matrix": [3, 0], "x": 5.5, "y": 0.25},
-                {"matrix": [2, 0], "x": 6.5, "y": 0.25},
-
-                {"matrix": [8, 1], "x": 0, "y": 1.375, "w": 1.5},
-                {"matrix": [7, 1], "x": 1.5, "y": 1.375},
-                {"matrix": [6, 1], "x": 2.5, "y": 1.125},
-                {"matrix": [5, 1], "x": 3.5, "y": 1},
-                {"matrix": [4, 1], "x": 4.5, "y": 1.125},
-                {"matrix": [3, 1], "x": 5.5, "y": 1.25},
-                {"matrix": [2, 1], "x": 6.5, "y": 1.25, "h": 1.5},
-
-                {"matrix": [8, 2], "x": 0, "y": 2.375, "w": 1.5},
-                {"matrix": [7, 2], "x": 1.5, "y": 2.375},
-                {"matrix": [6, 2], "x": 2.5, "y": 2.125},
-                {"matrix": [5, 2], "x": 3.5, "y": 2},
-                {"matrix": [4, 2], "x": 4.5, "y": 2.125},
-                {"matrix": [3, 2], "x": 5.5, "y": 2.25},
-
-                {"matrix": [8, 3], "x": 0, "y": 3.375, "w": 1.5},
-                {"matrix": [7, 3], "x": 1.5, "y": 3.375},
-                {"matrix": [6, 3], "x": 2.5, "y": 3.125},
-                {"matrix": [5, 3], "x": 3.5, "y": 3},
-                {"matrix": [4, 3], "x": 4.5, "y": 3.125},
-                {"matrix": [3, 3], "x": 5.5, "y": 3.25},
-                {"matrix": [2, 3], "x": 6.5, "y": 2.75, "h": 1.5},
-
-                {"matrix": [8, 4], "x": 0.5, "y": 4.375},
-                {"matrix": [7, 4], "x": 1.5, "y": 4.375},
-                {"matrix": [6, 4], "x": 2.5, "y": 4.125},
-                {"matrix": [5, 4], "x": 3.5, "y": 4},
-                {"matrix": [4, 4], "x": 4.5, "y": 4.125},
-
-                {"matrix": [1, 3], "x": 6, "y": 5},
-                {"matrix": [0, 3], "x": 7, "y": 5},
-
-                {"matrix": [0, 4], "x": 7, "y": 6},
-                {"matrix": [3, 4], "x": 5, "y": 6, "h": 2},
-                {"matrix": [2, 4], "x": 6, "y": 6, "h": 2},
-
-                {"matrix": [1, 4], "x": 7, "y": 7},
-
-                {"matrix": [11, 0], "x": 9.5, "y": 0.25},
-                {"matrix": [12, 0], "x": 10.5, "y": 0.25},
-                {"matrix": [13, 0], "x": 11.5, "y": 0.125},
-                {"matrix": [14, 0], "x": 12.5, "y": 0},
-                {"matrix": [15, 0], "x": 13.5, "y": 0.125},
-                {"matrix": [16, 0], "x": 14.5, "y": 0.375},
-                {"matrix": [17, 0], "x": 15.5, "y": 0.375, "w": 1.5},
-
-                {"matrix": [11, 1], "x": 9.5, "y": 1.25, "h": 1.5},
-                {"matrix": [12, 1], "x": 10.5, "y": 1.25},
-                {"matrix": [13, 1], "x": 11.5, "y": 1.125},
-                {"matrix": [14, 1], "x": 12.5, "y": 1},
-                {"matrix": [15, 1], "x": 13.5, "y": 1.125},
-                {"matrix": [16, 1], "x": 14.5, "y": 1.375},
-                {"matrix": [17, 1], "x": 15.5, "y": 1.375, "w": 1.5},
-
-                {"matrix": [12, 2], "x": 10.5, "y": 2.25},
-                {"matrix": [13, 2], "x": 11.5, "y": 2.125},
-                {"matrix": [14, 2], "x": 12.5, "y": 2},
-                {"matrix": [15, 2], "x": 13.5, "y": 2.125},
-                {"matrix": [16, 2], "x": 14.5, "y": 2.375},
-                {"matrix": [17, 2], "x": 15.5, "y": 2.375, "w": 1.5},
-                {"matrix": [11, 3], "x": 9.5, "y": 2.75, "h": 1.5},
-
-                {"matrix": [12, 3], "x": 10.5, "y": 3.25},
-                {"matrix": [13, 3], "x": 11.5, "y": 3.125},
-                {"matrix": [14, 3], "x": 12.5, "y": 3},
-                {"matrix": [15, 3], "x": 13.5, "y": 3.125},
-                {"matrix": [16, 3], "x": 14.5, "y": 3.375},
-                {"matrix": [17, 3], "x": 15.5, "y": 3.375, "w": 1.5},
-
-                {"matrix": [13, 4], "x": 11.5, "y": 4.125},
-                {"matrix": [14, 4], "x": 12.5, "y": 4},
-                {"matrix": [15, 4], "x": 13.5, "y": 4.125},
-                {"matrix": [16, 4], "x": 14.5, "y": 4.375},
-                {"matrix": [17, 4], "x": 15.5, "y": 4.375},
-
-                {"matrix": [9, 3], "x": 9, "y": 5},
-                {"matrix": [10, 3], "x": 10, "y": 5},
-
-                {"matrix": [9, 4], "x": 9, "y": 6},
-
-                {"matrix": [10, 4], "x": 9, "y": 7},
-
-                {"matrix": [11, 4], "x": 10, "y": 6, "h": 2},
-                {"matrix": [12, 4], "x": 11, "y": 6, "h": 2}
-            ]
-        },
-        "LAYOUT_ergodox_pretty": {
-            "layout": [
-                {"matrix": [8, 0], "x": 0, "y": 0.375, "w": 1.5},
-                {"matrix": [7, 0], "x": 1.5, "y": 0.375},
-                {"matrix": [6, 0], "x": 2.5, "y": 0.125},
-                {"matrix": [5, 0], "x": 3.5, "y": 0},
-                {"matrix": [4, 0], "x": 4.5, "y": 0.125},
-                {"matrix": [3, 0], "x": 5.5, "y": 0.25},
-                {"matrix": [2, 0], "x": 6.5, "y": 0.25},
-
-                {"matrix": [11, 0], "x": 9.5, "y": 0.25},
-                {"matrix": [12, 0], "x": 10.5, "y": 0.25},
-                {"matrix": [13, 0], "x": 11.5, "y": 0.125},
-                {"matrix": [14, 0], "x": 12.5, "y": 0},
-                {"matrix": [15, 0], "x": 13.5, "y": 0.125},
-                {"matrix": [16, 0], "x": 14.5, "y": 0.375},
-                {"matrix": [17, 0], "x": 15.5, "y": 0.375, "w": 1.5},
-
-                {"matrix": [8, 1], "x": 0, "y": 1.375, "w": 1.5},
-                {"matrix": [7, 1], "x": 1.5, "y": 1.375},
-                {"matrix": [6, 1], "x": 2.5, "y": 1.125},
-                {"matrix": [5, 1], "x": 3.5, "y": 1},
-                {"matrix": [4, 1], "x": 4.5, "y": 1.125},
-                {"matrix": [3, 1], "x": 5.5, "y": 1.25},
-                {"matrix": [2, 1], "x": 6.5, "y": 1.25, "h": 1.5},
-
-                {"matrix": [11, 1], "x": 9.5, "y": 1.25, "h": 1.5},
-                {"matrix": [12, 1], "x": 10.5, "y": 1.25},
-                {"matrix": [13, 1], "x": 11.5, "y": 1.125},
-                {"matrix": [14, 1], "x": 12.5, "y": 1},
-                {"matrix": [15, 1], "x": 13.5, "y": 1.125},
-                {"matrix": [16, 1], "x": 14.5, "y": 1.375},
-                {"matrix": [17, 1], "x": 15.5, "y": 1.375, "w": 1.5},
-
-                {"matrix": [8, 2], "x": 0, "y": 2.375, "w": 1.5},
-                {"matrix": [7, 2], "x": 1.5, "y": 2.375},
-                {"matrix": [6, 2], "x": 2.5, "y": 2.125},
-                {"matrix": [5, 2], "x": 3.5, "y": 2},
-                {"matrix": [4, 2], "x": 4.5, "y": 2.125},
-                {"matrix": [3, 2], "x": 5.5, "y": 2.25},
-
-                {"matrix": [12, 2], "x": 10.5, "y": 2.25},
-                {"matrix": [13, 2], "x": 11.5, "y": 2.125},
-                {"matrix": [14, 2], "x": 12.5, "y": 2},
-                {"matrix": [15, 2], "x": 13.5, "y": 2.125},
-                {"matrix": [16, 2], "x": 14.5, "y": 2.375},
-                {"matrix": [17, 2], "x": 15.5, "y": 2.375, "w": 1.5},
-
-                {"matrix": [8, 3], "x": 0, "y": 3.375, "w": 1.5},
-                {"matrix": [7, 3], "x": 1.5, "y": 3.375},
-                {"matrix": [6, 3], "x": 2.5, "y": 3.125},
-                {"matrix": [5, 3], "x": 3.5, "y": 3},
-                {"matrix": [4, 3], "x": 4.5, "y": 3.125},
-                {"matrix": [3, 3], "x": 5.5, "y": 3.25},
-                {"matrix": [2, 3], "x": 6.5, "y": 2.75, "h": 1.5},
-
-                {"matrix": [11, 3], "x": 9.5, "y": 2.75, "h": 1.5},
-                {"matrix": [12, 3], "x": 10.5, "y": 3.25},
-                {"matrix": [13, 3], "x": 11.5, "y": 3.125},
-                {"matrix": [14, 3], "x": 12.5, "y": 3},
-                {"matrix": [15, 3], "x": 13.5, "y": 3.125},
-                {"matrix": [16, 3], "x": 14.5, "y": 3.375},
-                {"matrix": [17, 3], "x": 15.5, "y": 3.375, "w": 1.5},
-
-                {"matrix": [8, 4], "x": 0.5, "y": 4.375},
-                {"matrix": [7, 4], "x": 1.5, "y": 4.375},
-                {"matrix": [6, 4], "x": 2.5, "y": 4.125},
-                {"matrix": [5, 4], "x": 3.5, "y": 4},
-                {"matrix": [4, 4], "x": 4.5, "y": 4.125},
-                {"matrix": [13, 4], "x": 11.5, "y": 4.125},
-                {"matrix": [14, 4], "x": 12.5, "y": 4},
-                {"matrix": [15, 4], "x": 13.5, "y": 4.125},
-                {"matrix": [16, 4], "x": 14.5, "y": 4.375},
-                {"matrix": [17, 4], "x": 15.5, "y": 4.375},
-
-                {"matrix": [1, 3], "x": 6, "y": 5},
-                {"matrix": [0, 3], "x": 7, "y": 5},
-                {"matrix": [9, 3], "x": 9, "y": 5},
-                {"matrix": [10, 3], "x": 10, "y": 5},
-
-                {"matrix": [0, 4], "x": 7, "y": 6},
-                {"matrix": [9, 4], "x": 9, "y": 6},
-                {"matrix": [3, 4], "x": 5, "y": 6, "h": 2},
-                {"matrix": [2, 4], "x": 6, "y": 6, "h": 2},
-
-                {"matrix": [1, 4], "x": 7, "y": 7},
-                {"matrix": [10, 4], "x": 9, "y": 7},
-
-                {"matrix": [11, 4], "x": 10, "y": 6, "h": 2},
-                {"matrix": [12, 4], "x": 11, "y": 6, "h": 2}
-            ]
-        }
-    }
-}
diff --git a/keyboards/input_club/ergodox_infinity/keyboard.json b/keyboards/input_club/ergodox_infinity/keyboard.json
new file mode 100644
index 00000000000..6f47d72685f
--- /dev/null
+++ b/keyboards/input_club/ergodox_infinity/keyboard.json
@@ -0,0 +1,253 @@
+{
+    "keyboard_name": "Infinity Ergodox (QMK)",
+    "manufacturer": "Input:Club",
+    "usb": {
+        "vid": "0x1C11",
+        "pid": "0xB04D",
+        "device_version": "0.0.1"
+    },
+    "led_matrix": {
+        "animations":{
+            "alphas_mods": true,
+            "breathing": true,
+            "band": true,
+            "band_pinwheel": true,
+            "band_spiral": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "cycle_out_in": true,
+            "dual_beacon": true,
+            "solid_reactive_simple": 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,
+            "wave_left_right": true,
+            "wave_up_down": true
+        },
+        "driver": "is31fl3731",
+        "sleep": true,
+        "split_count": [38, 38]
+    },
+    "matrix_pins": {
+        "cols": ["D1", "D4", "D5", "D6", "D7"],
+        "rows": ["B2", "B3", "B18", "B19", "C0", "C9", "C10", "C11", "D0"]
+    },
+    "diode_direction": "ROW2COL",
+    "split": {
+        "enabled": true
+    },
+    "processor": "MK20DX256",
+    "bootloader": "kiibohd",
+    "features": {
+        "bootmagic": false,
+        "mousekey": true,
+        "extrakey": true,
+        "command": true,
+        "nkro": true,
+        "led_matrix": true,
+        "unicode": true,
+        "swap_hands": true,
+        "sleep_led": true,
+        "st7565": true
+    },
+    "board": "IC_TEENSY_3_1",
+    "tapping": {
+        "toggle": 1
+    },
+    "community_layouts": ["ergodox"],
+    "layouts": {
+        "LAYOUT_ergodox": {
+            "layout": [
+                {"matrix": [8, 0], "x": 0, "y": 0.375, "w": 1.5},
+                {"matrix": [7, 0], "x": 1.5, "y": 0.375},
+                {"matrix": [6, 0], "x": 2.5, "y": 0.125},
+                {"matrix": [5, 0], "x": 3.5, "y": 0},
+                {"matrix": [4, 0], "x": 4.5, "y": 0.125},
+                {"matrix": [3, 0], "x": 5.5, "y": 0.25},
+                {"matrix": [2, 0], "x": 6.5, "y": 0.25},
+
+                {"matrix": [8, 1], "x": 0, "y": 1.375, "w": 1.5},
+                {"matrix": [7, 1], "x": 1.5, "y": 1.375},
+                {"matrix": [6, 1], "x": 2.5, "y": 1.125},
+                {"matrix": [5, 1], "x": 3.5, "y": 1},
+                {"matrix": [4, 1], "x": 4.5, "y": 1.125},
+                {"matrix": [3, 1], "x": 5.5, "y": 1.25},
+                {"matrix": [2, 1], "x": 6.5, "y": 1.25, "h": 1.5},
+
+                {"matrix": [8, 2], "x": 0, "y": 2.375, "w": 1.5},
+                {"matrix": [7, 2], "x": 1.5, "y": 2.375},
+                {"matrix": [6, 2], "x": 2.5, "y": 2.125},
+                {"matrix": [5, 2], "x": 3.5, "y": 2},
+                {"matrix": [4, 2], "x": 4.5, "y": 2.125},
+                {"matrix": [3, 2], "x": 5.5, "y": 2.25},
+
+                {"matrix": [8, 3], "x": 0, "y": 3.375, "w": 1.5},
+                {"matrix": [7, 3], "x": 1.5, "y": 3.375},
+                {"matrix": [6, 3], "x": 2.5, "y": 3.125},
+                {"matrix": [5, 3], "x": 3.5, "y": 3},
+                {"matrix": [4, 3], "x": 4.5, "y": 3.125},
+                {"matrix": [3, 3], "x": 5.5, "y": 3.25},
+                {"matrix": [2, 3], "x": 6.5, "y": 2.75, "h": 1.5},
+
+                {"matrix": [8, 4], "x": 0.5, "y": 4.375},
+                {"matrix": [7, 4], "x": 1.5, "y": 4.375},
+                {"matrix": [6, 4], "x": 2.5, "y": 4.125},
+                {"matrix": [5, 4], "x": 3.5, "y": 4},
+                {"matrix": [4, 4], "x": 4.5, "y": 4.125},
+
+                {"matrix": [1, 3], "x": 6, "y": 5},
+                {"matrix": [0, 3], "x": 7, "y": 5},
+
+                {"matrix": [0, 4], "x": 7, "y": 6},
+                {"matrix": [3, 4], "x": 5, "y": 6, "h": 2},
+                {"matrix": [2, 4], "x": 6, "y": 6, "h": 2},
+
+                {"matrix": [1, 4], "x": 7, "y": 7},
+
+                {"matrix": [11, 0], "x": 9.5, "y": 0.25},
+                {"matrix": [12, 0], "x": 10.5, "y": 0.25},
+                {"matrix": [13, 0], "x": 11.5, "y": 0.125},
+                {"matrix": [14, 0], "x": 12.5, "y": 0},
+                {"matrix": [15, 0], "x": 13.5, "y": 0.125},
+                {"matrix": [16, 0], "x": 14.5, "y": 0.375},
+                {"matrix": [17, 0], "x": 15.5, "y": 0.375, "w": 1.5},
+
+                {"matrix": [11, 1], "x": 9.5, "y": 1.25, "h": 1.5},
+                {"matrix": [12, 1], "x": 10.5, "y": 1.25},
+                {"matrix": [13, 1], "x": 11.5, "y": 1.125},
+                {"matrix": [14, 1], "x": 12.5, "y": 1},
+                {"matrix": [15, 1], "x": 13.5, "y": 1.125},
+                {"matrix": [16, 1], "x": 14.5, "y": 1.375},
+                {"matrix": [17, 1], "x": 15.5, "y": 1.375, "w": 1.5},
+
+                {"matrix": [12, 2], "x": 10.5, "y": 2.25},
+                {"matrix": [13, 2], "x": 11.5, "y": 2.125},
+                {"matrix": [14, 2], "x": 12.5, "y": 2},
+                {"matrix": [15, 2], "x": 13.5, "y": 2.125},
+                {"matrix": [16, 2], "x": 14.5, "y": 2.375},
+                {"matrix": [17, 2], "x": 15.5, "y": 2.375, "w": 1.5},
+                {"matrix": [11, 3], "x": 9.5, "y": 2.75, "h": 1.5},
+
+                {"matrix": [12, 3], "x": 10.5, "y": 3.25},
+                {"matrix": [13, 3], "x": 11.5, "y": 3.125},
+                {"matrix": [14, 3], "x": 12.5, "y": 3},
+                {"matrix": [15, 3], "x": 13.5, "y": 3.125},
+                {"matrix": [16, 3], "x": 14.5, "y": 3.375},
+                {"matrix": [17, 3], "x": 15.5, "y": 3.375, "w": 1.5},
+
+                {"matrix": [13, 4], "x": 11.5, "y": 4.125},
+                {"matrix": [14, 4], "x": 12.5, "y": 4},
+                {"matrix": [15, 4], "x": 13.5, "y": 4.125},
+                {"matrix": [16, 4], "x": 14.5, "y": 4.375},
+                {"matrix": [17, 4], "x": 15.5, "y": 4.375},
+
+                {"matrix": [9, 3], "x": 9, "y": 5},
+                {"matrix": [10, 3], "x": 10, "y": 5},
+
+                {"matrix": [9, 4], "x": 9, "y": 6},
+
+                {"matrix": [10, 4], "x": 9, "y": 7},
+
+                {"matrix": [11, 4], "x": 10, "y": 6, "h": 2},
+                {"matrix": [12, 4], "x": 11, "y": 6, "h": 2}
+            ]
+        },
+        "LAYOUT_ergodox_pretty": {
+            "layout": [
+                {"matrix": [8, 0], "x": 0, "y": 0.375, "w": 1.5},
+                {"matrix": [7, 0], "x": 1.5, "y": 0.375},
+                {"matrix": [6, 0], "x": 2.5, "y": 0.125},
+                {"matrix": [5, 0], "x": 3.5, "y": 0},
+                {"matrix": [4, 0], "x": 4.5, "y": 0.125},
+                {"matrix": [3, 0], "x": 5.5, "y": 0.25},
+                {"matrix": [2, 0], "x": 6.5, "y": 0.25},
+
+                {"matrix": [11, 0], "x": 9.5, "y": 0.25},
+                {"matrix": [12, 0], "x": 10.5, "y": 0.25},
+                {"matrix": [13, 0], "x": 11.5, "y": 0.125},
+                {"matrix": [14, 0], "x": 12.5, "y": 0},
+                {"matrix": [15, 0], "x": 13.5, "y": 0.125},
+                {"matrix": [16, 0], "x": 14.5, "y": 0.375},
+                {"matrix": [17, 0], "x": 15.5, "y": 0.375, "w": 1.5},
+
+                {"matrix": [8, 1], "x": 0, "y": 1.375, "w": 1.5},
+                {"matrix": [7, 1], "x": 1.5, "y": 1.375},
+                {"matrix": [6, 1], "x": 2.5, "y": 1.125},
+                {"matrix": [5, 1], "x": 3.5, "y": 1},
+                {"matrix": [4, 1], "x": 4.5, "y": 1.125},
+                {"matrix": [3, 1], "x": 5.5, "y": 1.25},
+                {"matrix": [2, 1], "x": 6.5, "y": 1.25, "h": 1.5},
+
+                {"matrix": [11, 1], "x": 9.5, "y": 1.25, "h": 1.5},
+                {"matrix": [12, 1], "x": 10.5, "y": 1.25},
+                {"matrix": [13, 1], "x": 11.5, "y": 1.125},
+                {"matrix": [14, 1], "x": 12.5, "y": 1},
+                {"matrix": [15, 1], "x": 13.5, "y": 1.125},
+                {"matrix": [16, 1], "x": 14.5, "y": 1.375},
+                {"matrix": [17, 1], "x": 15.5, "y": 1.375, "w": 1.5},
+
+                {"matrix": [8, 2], "x": 0, "y": 2.375, "w": 1.5},
+                {"matrix": [7, 2], "x": 1.5, "y": 2.375},
+                {"matrix": [6, 2], "x": 2.5, "y": 2.125},
+                {"matrix": [5, 2], "x": 3.5, "y": 2},
+                {"matrix": [4, 2], "x": 4.5, "y": 2.125},
+                {"matrix": [3, 2], "x": 5.5, "y": 2.25},
+
+                {"matrix": [12, 2], "x": 10.5, "y": 2.25},
+                {"matrix": [13, 2], "x": 11.5, "y": 2.125},
+                {"matrix": [14, 2], "x": 12.5, "y": 2},
+                {"matrix": [15, 2], "x": 13.5, "y": 2.125},
+                {"matrix": [16, 2], "x": 14.5, "y": 2.375},
+                {"matrix": [17, 2], "x": 15.5, "y": 2.375, "w": 1.5},
+
+                {"matrix": [8, 3], "x": 0, "y": 3.375, "w": 1.5},
+                {"matrix": [7, 3], "x": 1.5, "y": 3.375},
+                {"matrix": [6, 3], "x": 2.5, "y": 3.125},
+                {"matrix": [5, 3], "x": 3.5, "y": 3},
+                {"matrix": [4, 3], "x": 4.5, "y": 3.125},
+                {"matrix": [3, 3], "x": 5.5, "y": 3.25},
+                {"matrix": [2, 3], "x": 6.5, "y": 2.75, "h": 1.5},
+
+                {"matrix": [11, 3], "x": 9.5, "y": 2.75, "h": 1.5},
+                {"matrix": [12, 3], "x": 10.5, "y": 3.25},
+                {"matrix": [13, 3], "x": 11.5, "y": 3.125},
+                {"matrix": [14, 3], "x": 12.5, "y": 3},
+                {"matrix": [15, 3], "x": 13.5, "y": 3.125},
+                {"matrix": [16, 3], "x": 14.5, "y": 3.375},
+                {"matrix": [17, 3], "x": 15.5, "y": 3.375, "w": 1.5},
+
+                {"matrix": [8, 4], "x": 0.5, "y": 4.375},
+                {"matrix": [7, 4], "x": 1.5, "y": 4.375},
+                {"matrix": [6, 4], "x": 2.5, "y": 4.125},
+                {"matrix": [5, 4], "x": 3.5, "y": 4},
+                {"matrix": [4, 4], "x": 4.5, "y": 4.125},
+                {"matrix": [13, 4], "x": 11.5, "y": 4.125},
+                {"matrix": [14, 4], "x": 12.5, "y": 4},
+                {"matrix": [15, 4], "x": 13.5, "y": 4.125},
+                {"matrix": [16, 4], "x": 14.5, "y": 4.375},
+                {"matrix": [17, 4], "x": 15.5, "y": 4.375},
+
+                {"matrix": [1, 3], "x": 6, "y": 5},
+                {"matrix": [0, 3], "x": 7, "y": 5},
+                {"matrix": [9, 3], "x": 9, "y": 5},
+                {"matrix": [10, 3], "x": 10, "y": 5},
+
+                {"matrix": [0, 4], "x": 7, "y": 6},
+                {"matrix": [9, 4], "x": 9, "y": 6},
+                {"matrix": [3, 4], "x": 5, "y": 6, "h": 2},
+                {"matrix": [2, 4], "x": 6, "y": 6, "h": 2},
+
+                {"matrix": [1, 4], "x": 7, "y": 7},
+                {"matrix": [10, 4], "x": 9, "y": 7},
+
+                {"matrix": [11, 4], "x": 10, "y": 6, "h": 2},
+                {"matrix": [12, 4], "x": 11, "y": 6, "h": 2}
+            ]
+        }
+    }
+}
diff --git a/keyboards/input_club/ergodox_infinity/rules.mk b/keyboards/input_club/ergodox_infinity/rules.mk
index da68a7f25d1..c6e29883213 100644
--- a/keyboards/input_club/ergodox_infinity/rules.mk
+++ b/keyboards/input_club/ergodox_infinity/rules.mk
@@ -1,20 +1 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE  = yes # Mouse keys
-EXTRAKEY_ENABLE  = yes # Audio control and System control
-CONSOLE_ENABLE   = no  # Console for debug
-COMMAND_ENABLE   = yes # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-UNICODE_ENABLE   = yes # Unicode
-SWAP_HANDS_ENABLE= yes # Allow swapping hands of keyboard
-SLEEP_LED_ENABLE = yes
-
-RGBLIGHT_ENABLE = no
-
 SERIAL_DRIVER = usart
-
-ST7565_ENABLE = yes
-
-LED_MATRIX_ENABLE = yes
diff --git a/keyboards/jacky_studio/bear_65/rev1/info.json b/keyboards/jacky_studio/bear_65/rev1/info.json
deleted file mode 100644
index 098817dedb1..00000000000
--- a/keyboards/jacky_studio/bear_65/rev1/info.json
+++ /dev/null
@@ -1,230 +0,0 @@
-{
-    "keyboard_name": "Bear 65",
-    "manufacturer": "Jacky",
-    "url": "https://qmk.fm/keyboards",
-    "maintainer": "qmk",
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "usb": {
-        "vid": "0xA13B",
-        "pid": "0x000A",
-        "device_version": "0.0.1"
-    },
-    "rgb_matrix": {
-        "driver": "ws2812"
-    },
-    "matrix_pins": {
-        "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "F7", "F6", "F5", "F4", "F1", "F0"],
-        "rows": ["B0", "B1", "B2", "B3", "B7"]
-    },
-    "diode_direction": "ROW2COL",
-    "backlight": {
-        "pin": "B6"
-    },
-    "ws2812": {
-        "pin": "E2"
-    },
-    "rgblight": {
-        "saturation_steps": 8,
-        "brightness_steps": 8,
-        "led_count": 20,
-        "max_brightness": 200,
-        "sleep": true,
-        "animations": {
-            "breathing": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "snake": true,
-            "knight": true,
-            "christmas": true,
-            "static_gradient": true,
-            "rgb_test": true,
-            "alternating": true,
-            "twinkle": true
-        },
-        "default": {
-            "val": 50
-        }
-    },
-    "indicators": {
-        "caps_lock": "C7",
-        "on_state": 0
-    },
-    "layouts": {
-        "LAYOUT_all": {
-            "layout": [
-                {"matrix": [3, 1], "x": 0.5, "y": 0},
-
-                {"matrix": [0, 0], "x": 1.75, "y": 0},
-                {"matrix": [0, 1], "x": 2.75, "y": 0},
-                {"matrix": [0, 2], "x": 3.75, "y": 0},
-                {"matrix": [0, 3], "x": 4.75, "y": 0},
-                {"matrix": [0, 4], "x": 5.75, "y": 0},
-                {"matrix": [0, 5], "x": 6.75, "y": 0},
-                {"matrix": [0, 6], "x": 7.75, "y": 0},
-
-                {"matrix": [0, 7], "x": 11.25, "y": 0},
-                {"matrix": [0, 8], "x": 12.25, "y": 0},
-                {"matrix": [0, 9], "x": 13.25, "y": 0},
-                {"matrix": [0, 10], "x": 14.25, "y": 0},
-                {"matrix": [0, 11], "x": 15.25, "y": 0},
-                {"matrix": [0, 12], "x": 16.25, "y": 0},
-                {"matrix": [0, 13], "x": 17.25, "y": 0},
-                {"matrix": [0, 14], "x": 18.25, "y": 0},
-
-                {"matrix": [4, 14], "x": 19.75, "y": 0},
-
-                {"matrix": [1, 14], "x": 0.25, "y": 1},
-
-                {"matrix": [1, 0], "x": 1.75, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 3.25, "y": 1},
-                {"matrix": [1, 2], "x": 4.25, "y": 1},
-                {"matrix": [1, 3], "x": 5.25, "y": 1},
-                {"matrix": [1, 4], "x": 6.25, "y": 1},
-                {"matrix": [1, 5], "x": 7.25, "y": 1},
-
-                {"matrix": [1, 6], "x": 10.75, "y": 1},
-                {"matrix": [1, 7], "x": 11.75, "y": 1},
-                {"matrix": [1, 8], "x": 12.75, "y": 1},
-                {"matrix": [1, 9], "x": 13.75, "y": 1},
-                {"matrix": [1, 10], "x": 14.75, "y": 1},
-                {"matrix": [1, 11], "x": 15.75, "y": 1},
-                {"matrix": [1, 12], "x": 16.75, "y": 1},
-                {"matrix": [1, 13], "x": 17.75, "y": 1, "w": 1.5},
-
-                {"matrix": [2, 14], "x": 0, "y": 2},
-
-                {"matrix": [2, 0], "x": 1.75, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 3.5, "y": 2},
-                {"matrix": [2, 2], "x": 4.5, "y": 2},
-                {"matrix": [2, 3], "x": 5.5, "y": 2},
-                {"matrix": [2, 4], "x": 6.5, "y": 2},
-                {"matrix": [2, 5], "x": 7.5, "y": 2},
-
-                {"matrix": [2, 6], "x": 11, "y": 2},
-                {"matrix": [2, 7], "x": 12, "y": 2},
-                {"matrix": [2, 8], "x": 13, "y": 2},
-                {"matrix": [2, 9], "x": 14, "y": 2},
-                {"matrix": [2, 10], "x": 15, "y": 2},
-                {"matrix": [2, 11], "x": 16, "y": 2},
-                {"matrix": [2, 13], "x": 17, "y": 2, "w": 2.25},
-
-                {"matrix": [3, 0], "x": 1.75, "y": 3, "w": 2.25},
-                {"matrix": [3, 2], "x": 4, "y": 3},
-                {"matrix": [3, 3], "x": 5, "y": 3},
-                {"matrix": [3, 4], "x": 6, "y": 3},
-                {"matrix": [3, 5], "x": 7, "y": 3},
-                {"matrix": [3, 6], "x": 8, "y": 3},
-
-                {"matrix": [3, 7], "x": 10.5, "y": 3},
-                {"matrix": [3, 8], "x": 11.5, "y": 3},
-                {"matrix": [3, 9], "x": 12.5, "y": 3},
-                {"matrix": [3, 10], "x": 13.5, "y": 3},
-                {"matrix": [3, 11], "x": 14.5, "y": 3},
-                {"matrix": [3, 12], "x": 15.5, "y": 3},
-                {"matrix": [3, 13], "x": 16.5, "y": 3, "w": 1.75},
-
-                {"matrix": [3, 14], "x": 18.25, "y": 3},
-
-                {"matrix": [4, 0], "x": 1.75, "y": 4, "w": 1.5},
-                {"matrix": [4, 3], "x": 4.75, "y": 4, "w": 1.25},
-                {"matrix": [4, 5], "x": 6, "y": 4, "w": 2.25},
-                {"matrix": [4, 6], "x": 8.25, "y": 4},
-
-                {"matrix": [4, 8], "x": 10.5, "y": 4, "w": 2.75},
-                {"matrix": [4, 10], "x": 13.25, "y": 4, "w": 1.5},
-
-                {"matrix": [4, 11], "x": 17.25, "y": 4},
-                {"matrix": [4, 12], "x": 18.25, "y": 4},
-                {"matrix": [4, 13], "x": 19.25, "y": 4}
-            ]
-        },
-        "LAYOUT_full_bs": {
-            "layout": [
-                {"matrix": [3, 1], "x": 0.5, "y": 0},
-
-                {"matrix": [0, 0], "x": 1.75, "y": 0},
-                {"matrix": [0, 1], "x": 2.75, "y": 0},
-                {"matrix": [0, 2], "x": 3.75, "y": 0},
-                {"matrix": [0, 3], "x": 4.75, "y": 0},
-                {"matrix": [0, 4], "x": 5.75, "y": 0},
-                {"matrix": [0, 5], "x": 6.75, "y": 0},
-                {"matrix": [0, 6], "x": 7.75, "y": 0},
-
-                {"matrix": [0, 7], "x": 11.25, "y": 0},
-                {"matrix": [0, 8], "x": 12.25, "y": 0},
-                {"matrix": [0, 9], "x": 13.25, "y": 0},
-                {"matrix": [0, 10], "x": 14.25, "y": 0},
-                {"matrix": [0, 11], "x": 15.25, "y": 0},
-                {"matrix": [0, 12], "x": 16.25, "y": 0},
-                {"matrix": [0, 13], "x": 17.25, "y": 0, "w": 2},
-
-                {"matrix": [4, 14], "x": 19.75, "y": 0},
-
-                {"matrix": [1, 14], "x": 0.25, "y": 1},
-
-                {"matrix": [1, 0], "x": 1.75, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 3.25, "y": 1},
-                {"matrix": [1, 2], "x": 4.25, "y": 1},
-                {"matrix": [1, 3], "x": 5.25, "y": 1},
-                {"matrix": [1, 4], "x": 6.25, "y": 1},
-                {"matrix": [1, 5], "x": 7.25, "y": 1},
-
-                {"matrix": [1, 6], "x": 10.75, "y": 1},
-                {"matrix": [1, 7], "x": 11.75, "y": 1},
-                {"matrix": [1, 8], "x": 12.75, "y": 1},
-                {"matrix": [1, 9], "x": 13.75, "y": 1},
-                {"matrix": [1, 10], "x": 14.75, "y": 1},
-                {"matrix": [1, 11], "x": 15.75, "y": 1},
-                {"matrix": [1, 12], "x": 16.75, "y": 1},
-                {"matrix": [1, 13], "x": 17.75, "y": 1, "w": 1.5},
-
-                {"matrix": [2, 14], "x": 0, "y": 2},
-
-                {"matrix": [2, 0], "x": 1.75, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 3.5, "y": 2},
-                {"matrix": [2, 2], "x": 4.5, "y": 2},
-                {"matrix": [2, 3], "x": 5.5, "y": 2},
-                {"matrix": [2, 4], "x": 6.5, "y": 2},
-                {"matrix": [2, 5], "x": 7.5, "y": 2},
-
-                {"matrix": [2, 6], "x": 11, "y": 2},
-                {"matrix": [2, 7], "x": 12, "y": 2},
-                {"matrix": [2, 8], "x": 13, "y": 2},
-                {"matrix": [2, 9], "x": 14, "y": 2},
-                {"matrix": [2, 10], "x": 15, "y": 2},
-                {"matrix": [2, 11], "x": 16, "y": 2},
-                {"matrix": [2, 13], "x": 17, "y": 2, "w": 2.25},
-
-                {"matrix": [3, 0], "x": 1.75, "y": 3, "w": 2.25},
-                {"matrix": [3, 2], "x": 4, "y": 3},
-                {"matrix": [3, 3], "x": 5, "y": 3},
-                {"matrix": [3, 4], "x": 6, "y": 3},
-                {"matrix": [3, 5], "x": 7, "y": 3},
-                {"matrix": [3, 6], "x": 8, "y": 3},
-
-                {"matrix": [3, 7], "x": 10.5, "y": 3},
-                {"matrix": [3, 8], "x": 11.5, "y": 3},
-                {"matrix": [3, 9], "x": 12.5, "y": 3},
-                {"matrix": [3, 10], "x": 13.5, "y": 3},
-                {"matrix": [3, 11], "x": 14.5, "y": 3},
-                {"matrix": [3, 12], "x": 15.5, "y": 3},
-                {"matrix": [3, 13], "x": 16.5, "y": 3, "w": 1.75},
-
-                {"matrix": [3, 14], "x": 18.25, "y": 3},
-
-                {"matrix": [4, 0], "x": 1.75, "y": 4, "w": 1.5},
-                {"matrix": [4, 3], "x": 4.75, "y": 4, "w": 1.25},
-                {"matrix": [4, 5], "x": 6, "y": 4, "w": 2.25},
-                {"matrix": [4, 6], "x": 8.25, "y": 4},
-
-                {"matrix": [4, 8], "x": 10.5, "y": 4, "w": 2.75},
-                {"matrix": [4, 10], "x": 13.25, "y": 4, "w": 1.5},
-
-                {"matrix": [4, 11], "x": 17.25, "y": 4},
-                {"matrix": [4, 12], "x": 18.25, "y": 4},
-                {"matrix": [4, 13], "x": 19.25, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/jacky_studio/bear_65/rev1/keyboard.json b/keyboards/jacky_studio/bear_65/rev1/keyboard.json
new file mode 100644
index 00000000000..2c79dc41f52
--- /dev/null
+++ b/keyboards/jacky_studio/bear_65/rev1/keyboard.json
@@ -0,0 +1,240 @@
+{
+    "keyboard_name": "Bear 65",
+    "manufacturer": "Jacky",
+    "url": "https://qmk.fm/keyboards",
+    "maintainer": "qmk",
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "backlight": true,
+        "rgblight": true
+    },
+    "build": {
+        "lto": true
+    },
+    "usb": {
+        "vid": "0xA13B",
+        "pid": "0x000A",
+        "device_version": "0.0.1"
+    },
+    "rgb_matrix": {
+        "driver": "ws2812"
+    },
+    "matrix_pins": {
+        "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "F7", "F6", "F5", "F4", "F1", "F0"],
+        "rows": ["B0", "B1", "B2", "B3", "B7"]
+    },
+    "diode_direction": "ROW2COL",
+    "backlight": {
+        "pin": "B6"
+    },
+    "ws2812": {
+        "pin": "E2"
+    },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 20,
+        "max_brightness": 200,
+        "sleep": true,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": true,
+            "twinkle": true
+        },
+        "default": {
+            "val": 50
+        }
+    },
+    "indicators": {
+        "caps_lock": "C7",
+        "on_state": 0
+    },
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                {"matrix": [3, 1], "x": 0.5, "y": 0},
+
+                {"matrix": [0, 0], "x": 1.75, "y": 0},
+                {"matrix": [0, 1], "x": 2.75, "y": 0},
+                {"matrix": [0, 2], "x": 3.75, "y": 0},
+                {"matrix": [0, 3], "x": 4.75, "y": 0},
+                {"matrix": [0, 4], "x": 5.75, "y": 0},
+                {"matrix": [0, 5], "x": 6.75, "y": 0},
+                {"matrix": [0, 6], "x": 7.75, "y": 0},
+
+                {"matrix": [0, 7], "x": 11.25, "y": 0},
+                {"matrix": [0, 8], "x": 12.25, "y": 0},
+                {"matrix": [0, 9], "x": 13.25, "y": 0},
+                {"matrix": [0, 10], "x": 14.25, "y": 0},
+                {"matrix": [0, 11], "x": 15.25, "y": 0},
+                {"matrix": [0, 12], "x": 16.25, "y": 0},
+                {"matrix": [0, 13], "x": 17.25, "y": 0},
+                {"matrix": [0, 14], "x": 18.25, "y": 0},
+
+                {"matrix": [4, 14], "x": 19.75, "y": 0},
+
+                {"matrix": [1, 14], "x": 0.25, "y": 1},
+
+                {"matrix": [1, 0], "x": 1.75, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 3.25, "y": 1},
+                {"matrix": [1, 2], "x": 4.25, "y": 1},
+                {"matrix": [1, 3], "x": 5.25, "y": 1},
+                {"matrix": [1, 4], "x": 6.25, "y": 1},
+                {"matrix": [1, 5], "x": 7.25, "y": 1},
+
+                {"matrix": [1, 6], "x": 10.75, "y": 1},
+                {"matrix": [1, 7], "x": 11.75, "y": 1},
+                {"matrix": [1, 8], "x": 12.75, "y": 1},
+                {"matrix": [1, 9], "x": 13.75, "y": 1},
+                {"matrix": [1, 10], "x": 14.75, "y": 1},
+                {"matrix": [1, 11], "x": 15.75, "y": 1},
+                {"matrix": [1, 12], "x": 16.75, "y": 1},
+                {"matrix": [1, 13], "x": 17.75, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 14], "x": 0, "y": 2},
+
+                {"matrix": [2, 0], "x": 1.75, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 3.5, "y": 2},
+                {"matrix": [2, 2], "x": 4.5, "y": 2},
+                {"matrix": [2, 3], "x": 5.5, "y": 2},
+                {"matrix": [2, 4], "x": 6.5, "y": 2},
+                {"matrix": [2, 5], "x": 7.5, "y": 2},
+
+                {"matrix": [2, 6], "x": 11, "y": 2},
+                {"matrix": [2, 7], "x": 12, "y": 2},
+                {"matrix": [2, 8], "x": 13, "y": 2},
+                {"matrix": [2, 9], "x": 14, "y": 2},
+                {"matrix": [2, 10], "x": 15, "y": 2},
+                {"matrix": [2, 11], "x": 16, "y": 2},
+                {"matrix": [2, 13], "x": 17, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 1.75, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 4, "y": 3},
+                {"matrix": [3, 3], "x": 5, "y": 3},
+                {"matrix": [3, 4], "x": 6, "y": 3},
+                {"matrix": [3, 5], "x": 7, "y": 3},
+                {"matrix": [3, 6], "x": 8, "y": 3},
+
+                {"matrix": [3, 7], "x": 10.5, "y": 3},
+                {"matrix": [3, 8], "x": 11.5, "y": 3},
+                {"matrix": [3, 9], "x": 12.5, "y": 3},
+                {"matrix": [3, 10], "x": 13.5, "y": 3},
+                {"matrix": [3, 11], "x": 14.5, "y": 3},
+                {"matrix": [3, 12], "x": 15.5, "y": 3},
+                {"matrix": [3, 13], "x": 16.5, "y": 3, "w": 1.75},
+
+                {"matrix": [3, 14], "x": 18.25, "y": 3},
+
+                {"matrix": [4, 0], "x": 1.75, "y": 4, "w": 1.5},
+                {"matrix": [4, 3], "x": 4.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 6, "y": 4, "w": 2.25},
+                {"matrix": [4, 6], "x": 8.25, "y": 4},
+
+                {"matrix": [4, 8], "x": 10.5, "y": 4, "w": 2.75},
+                {"matrix": [4, 10], "x": 13.25, "y": 4, "w": 1.5},
+
+                {"matrix": [4, 11], "x": 17.25, "y": 4},
+                {"matrix": [4, 12], "x": 18.25, "y": 4},
+                {"matrix": [4, 13], "x": 19.25, "y": 4}
+            ]
+        },
+        "LAYOUT_full_bs": {
+            "layout": [
+                {"matrix": [3, 1], "x": 0.5, "y": 0},
+
+                {"matrix": [0, 0], "x": 1.75, "y": 0},
+                {"matrix": [0, 1], "x": 2.75, "y": 0},
+                {"matrix": [0, 2], "x": 3.75, "y": 0},
+                {"matrix": [0, 3], "x": 4.75, "y": 0},
+                {"matrix": [0, 4], "x": 5.75, "y": 0},
+                {"matrix": [0, 5], "x": 6.75, "y": 0},
+                {"matrix": [0, 6], "x": 7.75, "y": 0},
+
+                {"matrix": [0, 7], "x": 11.25, "y": 0},
+                {"matrix": [0, 8], "x": 12.25, "y": 0},
+                {"matrix": [0, 9], "x": 13.25, "y": 0},
+                {"matrix": [0, 10], "x": 14.25, "y": 0},
+                {"matrix": [0, 11], "x": 15.25, "y": 0},
+                {"matrix": [0, 12], "x": 16.25, "y": 0},
+                {"matrix": [0, 13], "x": 17.25, "y": 0, "w": 2},
+
+                {"matrix": [4, 14], "x": 19.75, "y": 0},
+
+                {"matrix": [1, 14], "x": 0.25, "y": 1},
+
+                {"matrix": [1, 0], "x": 1.75, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 3.25, "y": 1},
+                {"matrix": [1, 2], "x": 4.25, "y": 1},
+                {"matrix": [1, 3], "x": 5.25, "y": 1},
+                {"matrix": [1, 4], "x": 6.25, "y": 1},
+                {"matrix": [1, 5], "x": 7.25, "y": 1},
+
+                {"matrix": [1, 6], "x": 10.75, "y": 1},
+                {"matrix": [1, 7], "x": 11.75, "y": 1},
+                {"matrix": [1, 8], "x": 12.75, "y": 1},
+                {"matrix": [1, 9], "x": 13.75, "y": 1},
+                {"matrix": [1, 10], "x": 14.75, "y": 1},
+                {"matrix": [1, 11], "x": 15.75, "y": 1},
+                {"matrix": [1, 12], "x": 16.75, "y": 1},
+                {"matrix": [1, 13], "x": 17.75, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 14], "x": 0, "y": 2},
+
+                {"matrix": [2, 0], "x": 1.75, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 3.5, "y": 2},
+                {"matrix": [2, 2], "x": 4.5, "y": 2},
+                {"matrix": [2, 3], "x": 5.5, "y": 2},
+                {"matrix": [2, 4], "x": 6.5, "y": 2},
+                {"matrix": [2, 5], "x": 7.5, "y": 2},
+
+                {"matrix": [2, 6], "x": 11, "y": 2},
+                {"matrix": [2, 7], "x": 12, "y": 2},
+                {"matrix": [2, 8], "x": 13, "y": 2},
+                {"matrix": [2, 9], "x": 14, "y": 2},
+                {"matrix": [2, 10], "x": 15, "y": 2},
+                {"matrix": [2, 11], "x": 16, "y": 2},
+                {"matrix": [2, 13], "x": 17, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 1.75, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 4, "y": 3},
+                {"matrix": [3, 3], "x": 5, "y": 3},
+                {"matrix": [3, 4], "x": 6, "y": 3},
+                {"matrix": [3, 5], "x": 7, "y": 3},
+                {"matrix": [3, 6], "x": 8, "y": 3},
+
+                {"matrix": [3, 7], "x": 10.5, "y": 3},
+                {"matrix": [3, 8], "x": 11.5, "y": 3},
+                {"matrix": [3, 9], "x": 12.5, "y": 3},
+                {"matrix": [3, 10], "x": 13.5, "y": 3},
+                {"matrix": [3, 11], "x": 14.5, "y": 3},
+                {"matrix": [3, 12], "x": 15.5, "y": 3},
+                {"matrix": [3, 13], "x": 16.5, "y": 3, "w": 1.75},
+
+                {"matrix": [3, 14], "x": 18.25, "y": 3},
+
+                {"matrix": [4, 0], "x": 1.75, "y": 4, "w": 1.5},
+                {"matrix": [4, 3], "x": 4.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 6, "y": 4, "w": 2.25},
+                {"matrix": [4, 6], "x": 8.25, "y": 4},
+
+                {"matrix": [4, 8], "x": 10.5, "y": 4, "w": 2.75},
+                {"matrix": [4, 10], "x": 13.25, "y": 4, "w": 1.5},
+
+                {"matrix": [4, 11], "x": 17.25, "y": 4},
+                {"matrix": [4, 12], "x": 18.25, "y": 4},
+                {"matrix": [4, 13], "x": 19.25, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/jacky_studio/bear_65/rev1/rules.mk b/keyboards/jacky_studio/bear_65/rev1/rules.mk
deleted file mode 100644
index 7e038109428..00000000000
--- a/keyboards/jacky_studio/bear_65/rev1/rules.mk
+++ /dev/null
@@ -1,16 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
-LTO_ENABLE = yes            # Use LTO flags to reduce firmware size
-
-RGB_MATRIX_ENABLE = no		# Enable keyboard RGB matrix (do not use together with RGBLIGHT_ENABLE)
diff --git a/keyboards/jacky_studio/bear_65/rev2/info.json b/keyboards/jacky_studio/bear_65/rev2/info.json
deleted file mode 100644
index 52e8354fabd..00000000000
--- a/keyboards/jacky_studio/bear_65/rev2/info.json
+++ /dev/null
@@ -1,409 +0,0 @@
-{
-    "keyboard_name": "Bear65 V2",
-    "manufacturer": "Jacky",
-    "url": "https://qmk.fm/keyboards",
-    "maintainer": "qmk",
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "usb": {
-        "vid": "0x45D4",
-        "pid": "0x0428",
-        "device_version": "0.0.1"
-    },
-    "rgb_matrix": {
-        "driver": "ws2812"
-    },
-    "matrix_pins": {
-        "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "F7", "F6", "F5", "F4", "F1", "F0"],
-        "rows": ["B0", "B1", "B2", "B3", "B7"]
-    },
-    "diode_direction": "ROW2COL",
-    "backlight": {
-        "pin": "B6"
-    },
-    "ws2812": {
-        "pin": "E2"
-    },
-    "rgblight": {
-        "saturation_steps": 8,
-        "brightness_steps": 8,
-        "led_count": 20,
-        "max_brightness": 200,
-        "sleep": true,
-        "animations": {
-            "breathing": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "snake": true,
-            "knight": true,
-            "christmas": true,
-            "static_gradient": true,
-            "rgb_test": true,
-            "alternating": true,
-            "twinkle": true
-        },
-        "default": {
-            "val": 50
-        }
-    },
-    "indicators": {
-        "caps_lock": "C7",
-        "on_state": 0
-    },
-    "layout_aliases": {
-        "LAYOUT_all": "LAYOUT_wkl_full",
-        "LAYOUT_full_bs": "LAYOUT_wkl_bs"
-    },
-    "layouts": {
-        "LAYOUT_wk_full": {
-            "layout": [
-                {"matrix": [3, 1], "x": 0.5, "y": 0},
-
-                {"matrix": [0, 0], "x": 1.75, "y": 0},
-                {"matrix": [0, 1], "x": 2.75, "y": 0},
-                {"matrix": [0, 2], "x": 3.75, "y": 0},
-                {"matrix": [0, 3], "x": 4.75, "y": 0},
-                {"matrix": [0, 4], "x": 5.75, "y": 0},
-                {"matrix": [0, 5], "x": 6.75, "y": 0},
-                {"matrix": [0, 6], "x": 7.75, "y": 0},
-
-                {"matrix": [0, 7], "x": 11.25, "y": 0},
-                {"matrix": [0, 8], "x": 12.25, "y": 0},
-                {"matrix": [0, 9], "x": 13.25, "y": 0},
-                {"matrix": [0, 10], "x": 14.25, "y": 0},
-                {"matrix": [0, 11], "x": 15.25, "y": 0},
-                {"matrix": [0, 12], "x": 16.25, "y": 0},
-                {"matrix": [0, 13], "x": 17.25, "y": 0},
-                {"matrix": [0, 14], "x": 18.25, "y": 0},
-
-                {"matrix": [4, 14], "x": 19.75, "y": 0},
-
-                {"matrix": [1, 14], "x": 0.25, "y": 1},
-
-                {"matrix": [1, 0], "x": 1.75, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 3.25, "y": 1},
-                {"matrix": [1, 2], "x": 4.25, "y": 1},
-                {"matrix": [1, 3], "x": 5.25, "y": 1},
-                {"matrix": [1, 4], "x": 6.25, "y": 1},
-                {"matrix": [1, 5], "x": 7.25, "y": 1},
-
-                {"matrix": [1, 6], "x": 10.75, "y": 1},
-                {"matrix": [1, 7], "x": 11.75, "y": 1},
-                {"matrix": [1, 8], "x": 12.75, "y": 1},
-                {"matrix": [1, 9], "x": 13.75, "y": 1},
-                {"matrix": [1, 10], "x": 14.75, "y": 1},
-                {"matrix": [1, 11], "x": 15.75, "y": 1},
-                {"matrix": [1, 12], "x": 16.75, "y": 1},
-                {"matrix": [1, 13], "x": 17.75, "y": 1, "w": 1.5},
-
-                {"matrix": [2, 14], "x": 0, "y": 2},
-
-                {"matrix": [2, 0], "x": 1.75, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 3.5, "y": 2},
-                {"matrix": [2, 2], "x": 4.5, "y": 2},
-                {"matrix": [2, 3], "x": 5.5, "y": 2},
-                {"matrix": [2, 4], "x": 6.5, "y": 2},
-                {"matrix": [2, 5], "x": 7.5, "y": 2},
-
-                {"matrix": [2, 6], "x": 11, "y": 2},
-                {"matrix": [2, 7], "x": 12, "y": 2},
-                {"matrix": [2, 8], "x": 13, "y": 2},
-                {"matrix": [2, 9], "x": 14, "y": 2},
-                {"matrix": [2, 10], "x": 15, "y": 2},
-                {"matrix": [2, 11], "x": 16, "y": 2},
-                {"matrix": [2, 13], "x": 17, "y": 2, "w": 2.25},
-
-                {"matrix": [3, 0], "x": 1.75, "y": 3, "w": 2.25},
-                {"matrix": [3, 2], "x": 4, "y": 3},
-                {"matrix": [3, 3], "x": 5, "y": 3},
-                {"matrix": [3, 4], "x": 6, "y": 3},
-                {"matrix": [3, 5], "x": 7, "y": 3},
-                {"matrix": [3, 6], "x": 8, "y": 3},
-
-                {"matrix": [3, 7], "x": 10.5, "y": 3},
-                {"matrix": [3, 8], "x": 11.5, "y": 3},
-                {"matrix": [3, 9], "x": 12.5, "y": 3},
-                {"matrix": [3, 10], "x": 13.5, "y": 3},
-                {"matrix": [3, 11], "x": 14.5, "y": 3},
-                {"matrix": [3, 12], "x": 15.5, "y": 3},
-                {"matrix": [3, 13], "x": 16.5, "y": 3, "w": 1.75},
-                {"matrix": [3, 14], "x": 18.25, "y": 3},
-
-                {"matrix": [4, 0], "x": 1.75, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 3, "y": 4},
-                {"matrix": [4, 3], "x": 4, "y": 4, "w": 1.25},
-                {"matrix": [4, 5], "x": 5.25, "y": 4, "w": 2.25},
-                {"matrix": [4, 6], "x": 8.25, "y": 4},
-
-                {"matrix": [4, 8], "x": 11, "y": 4, "w": 2.75},
-                {"matrix": [4, 9], "x": 13.75, "y": 4, "w": 1.25},
-                {"matrix": [4, 10], "x": 15, "y": 4},
-
-                {"matrix": [4, 11], "x": 17.25, "y": 4},
-                {"matrix": [4, 12], "x": 18.25, "y": 4},
-                {"matrix": [4, 13], "x": 19.25, "y": 4}
-            ]
-        },
-        "LAYOUT_wkl_full": {
-            "layout": [
-                {"matrix": [3, 1], "x": 0.5, "y": 0},
-
-                {"matrix": [0, 0], "x": 1.75, "y": 0},
-                {"matrix": [0, 1], "x": 2.75, "y": 0},
-                {"matrix": [0, 2], "x": 3.75, "y": 0},
-                {"matrix": [0, 3], "x": 4.75, "y": 0},
-                {"matrix": [0, 4], "x": 5.75, "y": 0},
-                {"matrix": [0, 5], "x": 6.75, "y": 0},
-                {"matrix": [0, 6], "x": 7.75, "y": 0},
-
-                {"matrix": [0, 7], "x": 11.25, "y": 0},
-                {"matrix": [0, 8], "x": 12.25, "y": 0},
-                {"matrix": [0, 9], "x": 13.25, "y": 0},
-                {"matrix": [0, 10], "x": 14.25, "y": 0},
-                {"matrix": [0, 11], "x": 15.25, "y": 0},
-                {"matrix": [0, 12], "x": 16.25, "y": 0},
-                {"matrix": [0, 13], "x": 17.25, "y": 0},
-                {"matrix": [0, 14], "x": 18.25, "y": 0},
-
-                {"matrix": [4, 14], "x": 19.75, "y": 0},
-
-                {"matrix": [1, 14], "x": 0.25, "y": 1},
-
-                {"matrix": [1, 0], "x": 1.75, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 3.25, "y": 1},
-                {"matrix": [1, 2], "x": 4.25, "y": 1},
-                {"matrix": [1, 3], "x": 5.25, "y": 1},
-                {"matrix": [1, 4], "x": 6.25, "y": 1},
-                {"matrix": [1, 5], "x": 7.25, "y": 1},
-
-                {"matrix": [1, 6], "x": 10.75, "y": 1},
-                {"matrix": [1, 7], "x": 11.75, "y": 1},
-                {"matrix": [1, 8], "x": 12.75, "y": 1},
-                {"matrix": [1, 9], "x": 13.75, "y": 1},
-                {"matrix": [1, 10], "x": 14.75, "y": 1},
-                {"matrix": [1, 11], "x": 15.75, "y": 1},
-                {"matrix": [1, 12], "x": 16.75, "y": 1},
-                {"matrix": [1, 13], "x": 17.75, "y": 1, "w": 1.5},
-
-                {"matrix": [2, 14], "x": 0, "y": 2},
-
-                {"matrix": [2, 0], "x": 1.75, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 3.5, "y": 2},
-                {"matrix": [2, 2], "x": 4.5, "y": 2},
-                {"matrix": [2, 3], "x": 5.5, "y": 2},
-                {"matrix": [2, 4], "x": 6.5, "y": 2},
-                {"matrix": [2, 5], "x": 7.5, "y": 2},
-
-                {"matrix": [2, 6], "x": 11, "y": 2},
-                {"matrix": [2, 7], "x": 12, "y": 2},
-                {"matrix": [2, 8], "x": 13, "y": 2},
-                {"matrix": [2, 9], "x": 14, "y": 2},
-                {"matrix": [2, 10], "x": 15, "y": 2},
-                {"matrix": [2, 11], "x": 16, "y": 2},
-                {"matrix": [2, 13], "x": 17, "y": 2, "w": 2.25},
-
-                {"matrix": [3, 0], "x": 1.75, "y": 3, "w": 2.25},
-                {"matrix": [3, 2], "x": 4, "y": 3},
-                {"matrix": [3, 3], "x": 5, "y": 3},
-                {"matrix": [3, 4], "x": 6, "y": 3},
-                {"matrix": [3, 5], "x": 7, "y": 3},
-                {"matrix": [3, 6], "x": 8, "y": 3},
-
-                {"matrix": [3, 7], "x": 10.5, "y": 3},
-                {"matrix": [3, 8], "x": 11.5, "y": 3},
-                {"matrix": [3, 9], "x": 12.5, "y": 3},
-                {"matrix": [3, 10], "x": 13.5, "y": 3},
-                {"matrix": [3, 11], "x": 14.5, "y": 3},
-                {"matrix": [3, 12], "x": 15.5, "y": 3},
-                {"matrix": [3, 13], "x": 16.5, "y": 3, "w": 1.75},
-                {"matrix": [3, 14], "x": 18.25, "y": 3},
-
-                {"matrix": [4, 0], "x": 1.75, "y": 4, "w": 1.25},
-                {"matrix": [4, 3], "x": 3, "y": 4},
-                {"matrix": [4, 5], "x": 5.25, "y": 4, "w": 2.25},
-                {"matrix": [4, 6], "x": 8.25, "y": 4},
-
-                {"matrix": [4, 8], "x": 11, "y": 4, "w": 2.75},
-                {"matrix": [4, 9], "x": 13.75, "y": 4, "w": 1.25},
-
-                {"matrix": [4, 11], "x": 17.25, "y": 4},
-                {"matrix": [4, 12], "x": 18.25, "y": 4},
-                {"matrix": [4, 13], "x": 19.25, "y": 4}
-            ]
-        },
-        "LAYOUT_wk_bs": {
-            "layout": [
-                {"matrix": [3, 1], "x": 0.5, "y": 0},
-
-                {"matrix": [0, 0], "x": 1.75, "y": 0},
-                {"matrix": [0, 1], "x": 2.75, "y": 0},
-                {"matrix": [0, 2], "x": 3.75, "y": 0},
-                {"matrix": [0, 3], "x": 4.75, "y": 0},
-                {"matrix": [0, 4], "x": 5.75, "y": 0},
-                {"matrix": [0, 5], "x": 6.75, "y": 0},
-                {"matrix": [0, 6], "x": 7.75, "y": 0},
-
-                {"matrix": [0, 7], "x": 11.25, "y": 0},
-                {"matrix": [0, 8], "x": 12.25, "y": 0},
-                {"matrix": [0, 9], "x": 13.25, "y": 0},
-                {"matrix": [0, 10], "x": 14.25, "y": 0},
-                {"matrix": [0, 11], "x": 15.25, "y": 0},
-                {"matrix": [0, 12], "x": 16.25, "y": 0},
-                {"matrix": [0, 13], "x": 17.25, "y": 0},
-
-                {"matrix": [4, 14], "x": 19.75, "y": 0},
-
-                {"matrix": [1, 14], "x": 0.25, "y": 1},
-
-                {"matrix": [1, 0], "x": 1.75, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 3.25, "y": 1},
-                {"matrix": [1, 2], "x": 4.25, "y": 1},
-                {"matrix": [1, 3], "x": 5.25, "y": 1},
-                {"matrix": [1, 4], "x": 6.25, "y": 1},
-                {"matrix": [1, 5], "x": 7.25, "y": 1},
-
-                {"matrix": [1, 6], "x": 10.75, "y": 1},
-                {"matrix": [1, 7], "x": 11.75, "y": 1},
-                {"matrix": [1, 8], "x": 12.75, "y": 1},
-                {"matrix": [1, 9], "x": 13.75, "y": 1},
-                {"matrix": [1, 10], "x": 14.75, "y": 1},
-                {"matrix": [1, 11], "x": 15.75, "y": 1},
-                {"matrix": [1, 12], "x": 16.75, "y": 1},
-                {"matrix": [1, 13], "x": 17.75, "y": 1, "w": 1.5},
-
-                {"matrix": [2, 14], "x": 0, "y": 2},
-
-                {"matrix": [2, 0], "x": 1.75, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 3.5, "y": 2},
-                {"matrix": [2, 2], "x": 4.5, "y": 2},
-                {"matrix": [2, 3], "x": 5.5, "y": 2},
-                {"matrix": [2, 4], "x": 6.5, "y": 2},
-                {"matrix": [2, 5], "x": 7.5, "y": 2},
-
-                {"matrix": [2, 6], "x": 11, "y": 2},
-                {"matrix": [2, 7], "x": 12, "y": 2},
-                {"matrix": [2, 8], "x": 13, "y": 2},
-                {"matrix": [2, 9], "x": 14, "y": 2},
-                {"matrix": [2, 10], "x": 15, "y": 2},
-                {"matrix": [2, 11], "x": 16, "y": 2},
-                {"matrix": [2, 13], "x": 17, "y": 2, "w": 2.25},
-
-                {"matrix": [3, 0], "x": 1.75, "y": 3, "w": 2.25},
-                {"matrix": [3, 2], "x": 4, "y": 3},
-                {"matrix": [3, 3], "x": 5, "y": 3},
-                {"matrix": [3, 4], "x": 6, "y": 3},
-                {"matrix": [3, 5], "x": 7, "y": 3},
-                {"matrix": [3, 6], "x": 8, "y": 3},
-
-                {"matrix": [3, 7], "x": 10.5, "y": 3},
-                {"matrix": [3, 8], "x": 11.5, "y": 3},
-                {"matrix": [3, 9], "x": 12.5, "y": 3},
-                {"matrix": [3, 10], "x": 13.5, "y": 3},
-                {"matrix": [3, 11], "x": 14.5, "y": 3},
-                {"matrix": [3, 12], "x": 15.5, "y": 3},
-                {"matrix": [3, 13], "x": 16.5, "y": 3, "w": 1.75},
-                {"matrix": [3, 14], "x": 18.25, "y": 3},
-
-                {"matrix": [4, 0], "x": 1.75, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 3, "y": 4},
-                {"matrix": [4, 3], "x": 4, "y": 4, "w": 1.25},
-                {"matrix": [4, 5], "x": 5.25, "y": 4, "w": 2.25},
-                {"matrix": [4, 6], "x": 8.25, "y": 4},
-
-                {"matrix": [4, 8], "x": 11, "y": 4, "w": 2.75},
-                {"matrix": [4, 9], "x": 13.75, "y": 4, "w": 1.25},
-                {"matrix": [4, 10], "x": 15, "y": 4},
-
-                {"matrix": [4, 11], "x": 17.25, "y": 4},
-                {"matrix": [4, 12], "x": 18.25, "y": 4},
-                {"matrix": [4, 13], "x": 19.25, "y": 4}
-            ]
-        },
-        "LAYOUT_wkl_bs": {
-            "layout": [
-                {"matrix": [3, 1], "x": 0.5, "y": 0},
-
-                {"matrix": [0, 0], "x": 1.75, "y": 0},
-                {"matrix": [0, 1], "x": 2.75, "y": 0},
-                {"matrix": [0, 2], "x": 3.75, "y": 0},
-                {"matrix": [0, 3], "x": 4.75, "y": 0},
-                {"matrix": [0, 4], "x": 5.75, "y": 0},
-                {"matrix": [0, 5], "x": 6.75, "y": 0},
-                {"matrix": [0, 6], "x": 7.75, "y": 0},
-
-                {"matrix": [0, 7], "x": 11.25, "y": 0},
-                {"matrix": [0, 8], "x": 12.25, "y": 0},
-                {"matrix": [0, 9], "x": 13.25, "y": 0},
-                {"matrix": [0, 10], "x": 14.25, "y": 0},
-                {"matrix": [0, 11], "x": 15.25, "y": 0},
-                {"matrix": [0, 12], "x": 16.25, "y": 0},
-                {"matrix": [0, 13], "x": 17.25, "y": 0},
-
-                {"matrix": [4, 14], "x": 19.75, "y": 0},
-
-                {"matrix": [1, 14], "x": 0.25, "y": 1},
-
-                {"matrix": [1, 0], "x": 1.75, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 3.25, "y": 1},
-                {"matrix": [1, 2], "x": 4.25, "y": 1},
-                {"matrix": [1, 3], "x": 5.25, "y": 1},
-                {"matrix": [1, 4], "x": 6.25, "y": 1},
-                {"matrix": [1, 5], "x": 7.25, "y": 1},
-
-                {"matrix": [1, 6], "x": 10.75, "y": 1},
-                {"matrix": [1, 7], "x": 11.75, "y": 1},
-                {"matrix": [1, 8], "x": 12.75, "y": 1},
-                {"matrix": [1, 9], "x": 13.75, "y": 1},
-                {"matrix": [1, 10], "x": 14.75, "y": 1},
-                {"matrix": [1, 11], "x": 15.75, "y": 1},
-                {"matrix": [1, 12], "x": 16.75, "y": 1},
-                {"matrix": [1, 13], "x": 17.75, "y": 1, "w": 1.5},
-
-                {"matrix": [2, 14], "x": 0, "y": 2},
-
-                {"matrix": [2, 0], "x": 1.75, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 3.5, "y": 2},
-                {"matrix": [2, 2], "x": 4.5, "y": 2},
-                {"matrix": [2, 3], "x": 5.5, "y": 2},
-                {"matrix": [2, 4], "x": 6.5, "y": 2},
-                {"matrix": [2, 5], "x": 7.5, "y": 2},
-
-                {"matrix": [2, 6], "x": 11, "y": 2},
-                {"matrix": [2, 7], "x": 12, "y": 2},
-                {"matrix": [2, 8], "x": 13, "y": 2},
-                {"matrix": [2, 9], "x": 14, "y": 2},
-                {"matrix": [2, 10], "x": 15, "y": 2},
-                {"matrix": [2, 11], "x": 16, "y": 2},
-                {"matrix": [2, 13], "x": 17, "y": 2, "w": 2.25},
-
-                {"matrix": [3, 0], "x": 1.75, "y": 3, "w": 2.25},
-                {"matrix": [3, 2], "x": 4, "y": 3},
-                {"matrix": [3, 3], "x": 5, "y": 3},
-                {"matrix": [3, 4], "x": 6, "y": 3},
-                {"matrix": [3, 5], "x": 7, "y": 3},
-                {"matrix": [3, 6], "x": 8, "y": 3},
-
-                {"matrix": [3, 7], "x": 10.5, "y": 3},
-                {"matrix": [3, 8], "x": 11.5, "y": 3},
-                {"matrix": [3, 9], "x": 12.5, "y": 3},
-                {"matrix": [3, 10], "x": 13.5, "y": 3},
-                {"matrix": [3, 11], "x": 14.5, "y": 3},
-                {"matrix": [3, 12], "x": 15.5, "y": 3},
-                {"matrix": [3, 13], "x": 16.5, "y": 3, "w": 1.75},
-                {"matrix": [3, 14], "x": 18.25, "y": 3},
-
-                {"matrix": [4, 0], "x": 1.75, "y": 4, "w": 1.5},
-                {"matrix": [4, 3], "x": 4.75, "y": 4, "w": 1.25},
-                {"matrix": [4, 5], "x": 6, "y": 4, "w": 2.25},
-                {"matrix": [4, 6], "x": 8.25, "y": 4},
-
-                {"matrix": [4, 8], "x": 10.5, "y": 4, "w": 2.75},
-                {"matrix": [4, 10], "x": 13.25, "y": 4, "w": 1.5},
-
-                {"matrix": [4, 11], "x": 17.25, "y": 4},
-                {"matrix": [4, 12], "x": 18.25, "y": 4},
-                {"matrix": [4, 13], "x": 19.25, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/jacky_studio/bear_65/rev2/keyboard.json b/keyboards/jacky_studio/bear_65/rev2/keyboard.json
new file mode 100644
index 00000000000..ec2ff1b7c78
--- /dev/null
+++ b/keyboards/jacky_studio/bear_65/rev2/keyboard.json
@@ -0,0 +1,419 @@
+{
+    "keyboard_name": "Bear65 V2",
+    "manufacturer": "Jacky",
+    "url": "https://qmk.fm/keyboards",
+    "maintainer": "qmk",
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "backlight": true,
+        "rgblight": true
+    },
+    "build": {
+        "lto": true
+    },
+    "usb": {
+        "vid": "0x45D4",
+        "pid": "0x0428",
+        "device_version": "0.0.1"
+    },
+    "rgb_matrix": {
+        "driver": "ws2812"
+    },
+    "matrix_pins": {
+        "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "F7", "F6", "F5", "F4", "F1", "F0"],
+        "rows": ["B0", "B1", "B2", "B3", "B7"]
+    },
+    "diode_direction": "ROW2COL",
+    "backlight": {
+        "pin": "B6"
+    },
+    "ws2812": {
+        "pin": "E2"
+    },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 20,
+        "max_brightness": 200,
+        "sleep": true,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": true,
+            "twinkle": true
+        },
+        "default": {
+            "val": 50
+        }
+    },
+    "indicators": {
+        "caps_lock": "C7",
+        "on_state": 0
+    },
+    "layout_aliases": {
+        "LAYOUT_all": "LAYOUT_wkl_full",
+        "LAYOUT_full_bs": "LAYOUT_wkl_bs"
+    },
+    "layouts": {
+        "LAYOUT_wk_full": {
+            "layout": [
+                {"matrix": [3, 1], "x": 0.5, "y": 0},
+
+                {"matrix": [0, 0], "x": 1.75, "y": 0},
+                {"matrix": [0, 1], "x": 2.75, "y": 0},
+                {"matrix": [0, 2], "x": 3.75, "y": 0},
+                {"matrix": [0, 3], "x": 4.75, "y": 0},
+                {"matrix": [0, 4], "x": 5.75, "y": 0},
+                {"matrix": [0, 5], "x": 6.75, "y": 0},
+                {"matrix": [0, 6], "x": 7.75, "y": 0},
+
+                {"matrix": [0, 7], "x": 11.25, "y": 0},
+                {"matrix": [0, 8], "x": 12.25, "y": 0},
+                {"matrix": [0, 9], "x": 13.25, "y": 0},
+                {"matrix": [0, 10], "x": 14.25, "y": 0},
+                {"matrix": [0, 11], "x": 15.25, "y": 0},
+                {"matrix": [0, 12], "x": 16.25, "y": 0},
+                {"matrix": [0, 13], "x": 17.25, "y": 0},
+                {"matrix": [0, 14], "x": 18.25, "y": 0},
+
+                {"matrix": [4, 14], "x": 19.75, "y": 0},
+
+                {"matrix": [1, 14], "x": 0.25, "y": 1},
+
+                {"matrix": [1, 0], "x": 1.75, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 3.25, "y": 1},
+                {"matrix": [1, 2], "x": 4.25, "y": 1},
+                {"matrix": [1, 3], "x": 5.25, "y": 1},
+                {"matrix": [1, 4], "x": 6.25, "y": 1},
+                {"matrix": [1, 5], "x": 7.25, "y": 1},
+
+                {"matrix": [1, 6], "x": 10.75, "y": 1},
+                {"matrix": [1, 7], "x": 11.75, "y": 1},
+                {"matrix": [1, 8], "x": 12.75, "y": 1},
+                {"matrix": [1, 9], "x": 13.75, "y": 1},
+                {"matrix": [1, 10], "x": 14.75, "y": 1},
+                {"matrix": [1, 11], "x": 15.75, "y": 1},
+                {"matrix": [1, 12], "x": 16.75, "y": 1},
+                {"matrix": [1, 13], "x": 17.75, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 14], "x": 0, "y": 2},
+
+                {"matrix": [2, 0], "x": 1.75, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 3.5, "y": 2},
+                {"matrix": [2, 2], "x": 4.5, "y": 2},
+                {"matrix": [2, 3], "x": 5.5, "y": 2},
+                {"matrix": [2, 4], "x": 6.5, "y": 2},
+                {"matrix": [2, 5], "x": 7.5, "y": 2},
+
+                {"matrix": [2, 6], "x": 11, "y": 2},
+                {"matrix": [2, 7], "x": 12, "y": 2},
+                {"matrix": [2, 8], "x": 13, "y": 2},
+                {"matrix": [2, 9], "x": 14, "y": 2},
+                {"matrix": [2, 10], "x": 15, "y": 2},
+                {"matrix": [2, 11], "x": 16, "y": 2},
+                {"matrix": [2, 13], "x": 17, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 1.75, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 4, "y": 3},
+                {"matrix": [3, 3], "x": 5, "y": 3},
+                {"matrix": [3, 4], "x": 6, "y": 3},
+                {"matrix": [3, 5], "x": 7, "y": 3},
+                {"matrix": [3, 6], "x": 8, "y": 3},
+
+                {"matrix": [3, 7], "x": 10.5, "y": 3},
+                {"matrix": [3, 8], "x": 11.5, "y": 3},
+                {"matrix": [3, 9], "x": 12.5, "y": 3},
+                {"matrix": [3, 10], "x": 13.5, "y": 3},
+                {"matrix": [3, 11], "x": 14.5, "y": 3},
+                {"matrix": [3, 12], "x": 15.5, "y": 3},
+                {"matrix": [3, 13], "x": 16.5, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 18.25, "y": 3},
+
+                {"matrix": [4, 0], "x": 1.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 3, "y": 4},
+                {"matrix": [4, 3], "x": 4, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4, "w": 2.25},
+                {"matrix": [4, 6], "x": 8.25, "y": 4},
+
+                {"matrix": [4, 8], "x": 11, "y": 4, "w": 2.75},
+                {"matrix": [4, 9], "x": 13.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "x": 15, "y": 4},
+
+                {"matrix": [4, 11], "x": 17.25, "y": 4},
+                {"matrix": [4, 12], "x": 18.25, "y": 4},
+                {"matrix": [4, 13], "x": 19.25, "y": 4}
+            ]
+        },
+        "LAYOUT_wkl_full": {
+            "layout": [
+                {"matrix": [3, 1], "x": 0.5, "y": 0},
+
+                {"matrix": [0, 0], "x": 1.75, "y": 0},
+                {"matrix": [0, 1], "x": 2.75, "y": 0},
+                {"matrix": [0, 2], "x": 3.75, "y": 0},
+                {"matrix": [0, 3], "x": 4.75, "y": 0},
+                {"matrix": [0, 4], "x": 5.75, "y": 0},
+                {"matrix": [0, 5], "x": 6.75, "y": 0},
+                {"matrix": [0, 6], "x": 7.75, "y": 0},
+
+                {"matrix": [0, 7], "x": 11.25, "y": 0},
+                {"matrix": [0, 8], "x": 12.25, "y": 0},
+                {"matrix": [0, 9], "x": 13.25, "y": 0},
+                {"matrix": [0, 10], "x": 14.25, "y": 0},
+                {"matrix": [0, 11], "x": 15.25, "y": 0},
+                {"matrix": [0, 12], "x": 16.25, "y": 0},
+                {"matrix": [0, 13], "x": 17.25, "y": 0},
+                {"matrix": [0, 14], "x": 18.25, "y": 0},
+
+                {"matrix": [4, 14], "x": 19.75, "y": 0},
+
+                {"matrix": [1, 14], "x": 0.25, "y": 1},
+
+                {"matrix": [1, 0], "x": 1.75, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 3.25, "y": 1},
+                {"matrix": [1, 2], "x": 4.25, "y": 1},
+                {"matrix": [1, 3], "x": 5.25, "y": 1},
+                {"matrix": [1, 4], "x": 6.25, "y": 1},
+                {"matrix": [1, 5], "x": 7.25, "y": 1},
+
+                {"matrix": [1, 6], "x": 10.75, "y": 1},
+                {"matrix": [1, 7], "x": 11.75, "y": 1},
+                {"matrix": [1, 8], "x": 12.75, "y": 1},
+                {"matrix": [1, 9], "x": 13.75, "y": 1},
+                {"matrix": [1, 10], "x": 14.75, "y": 1},
+                {"matrix": [1, 11], "x": 15.75, "y": 1},
+                {"matrix": [1, 12], "x": 16.75, "y": 1},
+                {"matrix": [1, 13], "x": 17.75, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 14], "x": 0, "y": 2},
+
+                {"matrix": [2, 0], "x": 1.75, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 3.5, "y": 2},
+                {"matrix": [2, 2], "x": 4.5, "y": 2},
+                {"matrix": [2, 3], "x": 5.5, "y": 2},
+                {"matrix": [2, 4], "x": 6.5, "y": 2},
+                {"matrix": [2, 5], "x": 7.5, "y": 2},
+
+                {"matrix": [2, 6], "x": 11, "y": 2},
+                {"matrix": [2, 7], "x": 12, "y": 2},
+                {"matrix": [2, 8], "x": 13, "y": 2},
+                {"matrix": [2, 9], "x": 14, "y": 2},
+                {"matrix": [2, 10], "x": 15, "y": 2},
+                {"matrix": [2, 11], "x": 16, "y": 2},
+                {"matrix": [2, 13], "x": 17, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 1.75, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 4, "y": 3},
+                {"matrix": [3, 3], "x": 5, "y": 3},
+                {"matrix": [3, 4], "x": 6, "y": 3},
+                {"matrix": [3, 5], "x": 7, "y": 3},
+                {"matrix": [3, 6], "x": 8, "y": 3},
+
+                {"matrix": [3, 7], "x": 10.5, "y": 3},
+                {"matrix": [3, 8], "x": 11.5, "y": 3},
+                {"matrix": [3, 9], "x": 12.5, "y": 3},
+                {"matrix": [3, 10], "x": 13.5, "y": 3},
+                {"matrix": [3, 11], "x": 14.5, "y": 3},
+                {"matrix": [3, 12], "x": 15.5, "y": 3},
+                {"matrix": [3, 13], "x": 16.5, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 18.25, "y": 3},
+
+                {"matrix": [4, 0], "x": 1.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 3, "y": 4},
+                {"matrix": [4, 5], "x": 5.25, "y": 4, "w": 2.25},
+                {"matrix": [4, 6], "x": 8.25, "y": 4},
+
+                {"matrix": [4, 8], "x": 11, "y": 4, "w": 2.75},
+                {"matrix": [4, 9], "x": 13.75, "y": 4, "w": 1.25},
+
+                {"matrix": [4, 11], "x": 17.25, "y": 4},
+                {"matrix": [4, 12], "x": 18.25, "y": 4},
+                {"matrix": [4, 13], "x": 19.25, "y": 4}
+            ]
+        },
+        "LAYOUT_wk_bs": {
+            "layout": [
+                {"matrix": [3, 1], "x": 0.5, "y": 0},
+
+                {"matrix": [0, 0], "x": 1.75, "y": 0},
+                {"matrix": [0, 1], "x": 2.75, "y": 0},
+                {"matrix": [0, 2], "x": 3.75, "y": 0},
+                {"matrix": [0, 3], "x": 4.75, "y": 0},
+                {"matrix": [0, 4], "x": 5.75, "y": 0},
+                {"matrix": [0, 5], "x": 6.75, "y": 0},
+                {"matrix": [0, 6], "x": 7.75, "y": 0},
+
+                {"matrix": [0, 7], "x": 11.25, "y": 0},
+                {"matrix": [0, 8], "x": 12.25, "y": 0},
+                {"matrix": [0, 9], "x": 13.25, "y": 0},
+                {"matrix": [0, 10], "x": 14.25, "y": 0},
+                {"matrix": [0, 11], "x": 15.25, "y": 0},
+                {"matrix": [0, 12], "x": 16.25, "y": 0},
+                {"matrix": [0, 13], "x": 17.25, "y": 0},
+
+                {"matrix": [4, 14], "x": 19.75, "y": 0},
+
+                {"matrix": [1, 14], "x": 0.25, "y": 1},
+
+                {"matrix": [1, 0], "x": 1.75, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 3.25, "y": 1},
+                {"matrix": [1, 2], "x": 4.25, "y": 1},
+                {"matrix": [1, 3], "x": 5.25, "y": 1},
+                {"matrix": [1, 4], "x": 6.25, "y": 1},
+                {"matrix": [1, 5], "x": 7.25, "y": 1},
+
+                {"matrix": [1, 6], "x": 10.75, "y": 1},
+                {"matrix": [1, 7], "x": 11.75, "y": 1},
+                {"matrix": [1, 8], "x": 12.75, "y": 1},
+                {"matrix": [1, 9], "x": 13.75, "y": 1},
+                {"matrix": [1, 10], "x": 14.75, "y": 1},
+                {"matrix": [1, 11], "x": 15.75, "y": 1},
+                {"matrix": [1, 12], "x": 16.75, "y": 1},
+                {"matrix": [1, 13], "x": 17.75, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 14], "x": 0, "y": 2},
+
+                {"matrix": [2, 0], "x": 1.75, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 3.5, "y": 2},
+                {"matrix": [2, 2], "x": 4.5, "y": 2},
+                {"matrix": [2, 3], "x": 5.5, "y": 2},
+                {"matrix": [2, 4], "x": 6.5, "y": 2},
+                {"matrix": [2, 5], "x": 7.5, "y": 2},
+
+                {"matrix": [2, 6], "x": 11, "y": 2},
+                {"matrix": [2, 7], "x": 12, "y": 2},
+                {"matrix": [2, 8], "x": 13, "y": 2},
+                {"matrix": [2, 9], "x": 14, "y": 2},
+                {"matrix": [2, 10], "x": 15, "y": 2},
+                {"matrix": [2, 11], "x": 16, "y": 2},
+                {"matrix": [2, 13], "x": 17, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 1.75, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 4, "y": 3},
+                {"matrix": [3, 3], "x": 5, "y": 3},
+                {"matrix": [3, 4], "x": 6, "y": 3},
+                {"matrix": [3, 5], "x": 7, "y": 3},
+                {"matrix": [3, 6], "x": 8, "y": 3},
+
+                {"matrix": [3, 7], "x": 10.5, "y": 3},
+                {"matrix": [3, 8], "x": 11.5, "y": 3},
+                {"matrix": [3, 9], "x": 12.5, "y": 3},
+                {"matrix": [3, 10], "x": 13.5, "y": 3},
+                {"matrix": [3, 11], "x": 14.5, "y": 3},
+                {"matrix": [3, 12], "x": 15.5, "y": 3},
+                {"matrix": [3, 13], "x": 16.5, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 18.25, "y": 3},
+
+                {"matrix": [4, 0], "x": 1.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 3, "y": 4},
+                {"matrix": [4, 3], "x": 4, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4, "w": 2.25},
+                {"matrix": [4, 6], "x": 8.25, "y": 4},
+
+                {"matrix": [4, 8], "x": 11, "y": 4, "w": 2.75},
+                {"matrix": [4, 9], "x": 13.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "x": 15, "y": 4},
+
+                {"matrix": [4, 11], "x": 17.25, "y": 4},
+                {"matrix": [4, 12], "x": 18.25, "y": 4},
+                {"matrix": [4, 13], "x": 19.25, "y": 4}
+            ]
+        },
+        "LAYOUT_wkl_bs": {
+            "layout": [
+                {"matrix": [3, 1], "x": 0.5, "y": 0},
+
+                {"matrix": [0, 0], "x": 1.75, "y": 0},
+                {"matrix": [0, 1], "x": 2.75, "y": 0},
+                {"matrix": [0, 2], "x": 3.75, "y": 0},
+                {"matrix": [0, 3], "x": 4.75, "y": 0},
+                {"matrix": [0, 4], "x": 5.75, "y": 0},
+                {"matrix": [0, 5], "x": 6.75, "y": 0},
+                {"matrix": [0, 6], "x": 7.75, "y": 0},
+
+                {"matrix": [0, 7], "x": 11.25, "y": 0},
+                {"matrix": [0, 8], "x": 12.25, "y": 0},
+                {"matrix": [0, 9], "x": 13.25, "y": 0},
+                {"matrix": [0, 10], "x": 14.25, "y": 0},
+                {"matrix": [0, 11], "x": 15.25, "y": 0},
+                {"matrix": [0, 12], "x": 16.25, "y": 0},
+                {"matrix": [0, 13], "x": 17.25, "y": 0},
+
+                {"matrix": [4, 14], "x": 19.75, "y": 0},
+
+                {"matrix": [1, 14], "x": 0.25, "y": 1},
+
+                {"matrix": [1, 0], "x": 1.75, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 3.25, "y": 1},
+                {"matrix": [1, 2], "x": 4.25, "y": 1},
+                {"matrix": [1, 3], "x": 5.25, "y": 1},
+                {"matrix": [1, 4], "x": 6.25, "y": 1},
+                {"matrix": [1, 5], "x": 7.25, "y": 1},
+
+                {"matrix": [1, 6], "x": 10.75, "y": 1},
+                {"matrix": [1, 7], "x": 11.75, "y": 1},
+                {"matrix": [1, 8], "x": 12.75, "y": 1},
+                {"matrix": [1, 9], "x": 13.75, "y": 1},
+                {"matrix": [1, 10], "x": 14.75, "y": 1},
+                {"matrix": [1, 11], "x": 15.75, "y": 1},
+                {"matrix": [1, 12], "x": 16.75, "y": 1},
+                {"matrix": [1, 13], "x": 17.75, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 14], "x": 0, "y": 2},
+
+                {"matrix": [2, 0], "x": 1.75, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 3.5, "y": 2},
+                {"matrix": [2, 2], "x": 4.5, "y": 2},
+                {"matrix": [2, 3], "x": 5.5, "y": 2},
+                {"matrix": [2, 4], "x": 6.5, "y": 2},
+                {"matrix": [2, 5], "x": 7.5, "y": 2},
+
+                {"matrix": [2, 6], "x": 11, "y": 2},
+                {"matrix": [2, 7], "x": 12, "y": 2},
+                {"matrix": [2, 8], "x": 13, "y": 2},
+                {"matrix": [2, 9], "x": 14, "y": 2},
+                {"matrix": [2, 10], "x": 15, "y": 2},
+                {"matrix": [2, 11], "x": 16, "y": 2},
+                {"matrix": [2, 13], "x": 17, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 1.75, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 4, "y": 3},
+                {"matrix": [3, 3], "x": 5, "y": 3},
+                {"matrix": [3, 4], "x": 6, "y": 3},
+                {"matrix": [3, 5], "x": 7, "y": 3},
+                {"matrix": [3, 6], "x": 8, "y": 3},
+
+                {"matrix": [3, 7], "x": 10.5, "y": 3},
+                {"matrix": [3, 8], "x": 11.5, "y": 3},
+                {"matrix": [3, 9], "x": 12.5, "y": 3},
+                {"matrix": [3, 10], "x": 13.5, "y": 3},
+                {"matrix": [3, 11], "x": 14.5, "y": 3},
+                {"matrix": [3, 12], "x": 15.5, "y": 3},
+                {"matrix": [3, 13], "x": 16.5, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 18.25, "y": 3},
+
+                {"matrix": [4, 0], "x": 1.75, "y": 4, "w": 1.5},
+                {"matrix": [4, 3], "x": 4.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 6, "y": 4, "w": 2.25},
+                {"matrix": [4, 6], "x": 8.25, "y": 4},
+
+                {"matrix": [4, 8], "x": 10.5, "y": 4, "w": 2.75},
+                {"matrix": [4, 10], "x": 13.25, "y": 4, "w": 1.5},
+
+                {"matrix": [4, 11], "x": 17.25, "y": 4},
+                {"matrix": [4, 12], "x": 18.25, "y": 4},
+                {"matrix": [4, 13], "x": 19.25, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/jacky_studio/bear_65/rev2/rules.mk b/keyboards/jacky_studio/bear_65/rev2/rules.mk
deleted file mode 100644
index 7e038109428..00000000000
--- a/keyboards/jacky_studio/bear_65/rev2/rules.mk
+++ /dev/null
@@ -1,16 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
-LTO_ENABLE = yes            # Use LTO flags to reduce firmware size
-
-RGB_MATRIX_ENABLE = no		# Enable keyboard RGB matrix (do not use together with RGBLIGHT_ENABLE)
diff --git a/keyboards/jacky_studio/piggy60/rev2/info.json b/keyboards/jacky_studio/piggy60/rev2/keyboard.json
similarity index 100%
rename from keyboards/jacky_studio/piggy60/rev2/info.json
rename to keyboards/jacky_studio/piggy60/rev2/keyboard.json
diff --git a/keyboards/janus/info.json b/keyboards/janus/keyboard.json
similarity index 100%
rename from keyboards/janus/info.json
rename to keyboards/janus/keyboard.json
diff --git a/keyboards/jaykeeb/jk65/info.json b/keyboards/jaykeeb/jk65/info.json
new file mode 100644
index 00000000000..0be07caacdc
--- /dev/null
+++ b/keyboards/jaykeeb/jk65/info.json
@@ -0,0 +1,410 @@
+{
+    "manufacturer": "Jaykeeb Studio",
+    "keyboard_name": "JK65",
+    "maintainer": "Alabahuy",
+    "bootloader": "rp2040",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "matrix_pins": {
+        "cols": ["GP24", "GP14", "GP13", "GP12", "GP11", "GP10", "GP9", "GP8", "GP7", "GP6", "GP5", "GP4", "GP3", "GP2", "GP1"],
+        "rows": ["GP29", "GP0", "GP15", "GP26", "GP27"]
+    },
+    "indicators": {
+        "caps_lock": "GP25",
+        "on_state": 0
+    },
+    "processor": "RP2040",
+    "url": "",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x7765",
+        "vid": "0x414C"
+    },
+    "community_layouts": ["65_ansi_blocker", "65_ansi_blocker_split_bs", "65_ansi_blocker_tsangan", "65_ansi_blocker_tsangan_split_bs"],
+    "layouts": {
+        "LAYOUT_all": {
+            "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": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "Delete", "matrix": [1, 13], "x": 14, "y": 0},
+                {"label": "Home", "matrix": [0, 14], "x": 15, "y": 0},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 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": [2, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"label": "End", "matrix": [1, 14], "x": 15, "y": 1},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 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, 12], "x": 12.75, "y": 2, "w": 2.25},
+                {"label": "Page Up", "matrix": [2, 14], "x": 15, "y": 2},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"label": "\\", "matrix": [3, 1], "x": 1.25, "y": 3},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
+                {"label": "Page Down", "matrix": [3, 14], "x": 15, "y": 3},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "Space", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "Alt", "matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"label": "Ctrl", "matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"label": "\u2190", "matrix": [4, 12], "x": 13, "y": 4},
+                {"label": "\u2193", "matrix": [4, 13], "x": 14, "y": 4},
+                {"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_65_ansi_blocker": {
+            "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": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"label": "Home", "matrix": [0, 14], "x": 15, "y": 0},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 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": [2, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"label": "End", "matrix": [1, 14], "x": 15, "y": 1},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 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, 12], "x": 12.75, "y": 2, "w": 2.25},
+                {"label": "Page Up", "matrix": [2, 14], "x": 15, "y": 2},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
+                {"label": "Page Down", "matrix": [3, 14], "x": 15, "y": 3},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "Space", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "Alt", "matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"label": "Ctrl", "matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"label": "\u2190", "matrix": [4, 12], "x": 13, "y": 4},
+                {"label": "\u2193", "matrix": [4, 13], "x": 14, "y": 4},
+                {"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_65_ansi_blocker_split_bs": {
+            "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": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "Delete", "matrix": [1, 13], "x": 14, "y": 0},
+                {"label": "Home", "matrix": [0, 14], "x": 15, "y": 0},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 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": [2, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"label": "End", "matrix": [1, 14], "x": 15, "y": 1},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 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, 12], "x": 12.75, "y": 2, "w": 2.25},
+                {"label": "Page Up", "matrix": [2, 14], "x": 15, "y": 2},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
+                {"label": "Page Down", "matrix": [3, 14], "x": 15, "y": 3},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "Space", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "Alt", "matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"label": "Ctrl", "matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"label": "\u2190", "matrix": [4, 12], "x": 13, "y": 4},
+                {"label": "\u2193", "matrix": [4, 13], "x": 14, "y": 4},
+                {"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_65_ansi_blocker_tsangan": {
+            "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": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"label": "Home", "matrix": [0, 14], "x": 15, "y": 0},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 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": [2, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"label": "End", "matrix": [1, 14], "x": 15, "y": 1},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 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, 12], "x": 12.75, "y": 2, "w": 2.25},
+                {"label": "Page Up", "matrix": [2, 14], "x": 15, "y": 2},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
+                {"label": "Page Down", "matrix": [3, 14], "x": 15, "y": 3},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"label": "GUI", "matrix": [4, 1], "x": 1.5, "y": 4},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"label": "Space", "matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"label": "Ctrl", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+                {"label": "\u2190", "matrix": [4, 12], "x": 13, "y": 4},
+                {"label": "\u2193", "matrix": [4, 13], "x": 14, "y": 4},
+                {"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_65_ansi_blocker_tsangan_split_bs": {
+            "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": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "Delete", "matrix": [1, 13], "x": 14, "y": 0},
+                {"label": "Home", "matrix": [0, 14], "x": 15, "y": 0},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 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": [2, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"label": "End", "matrix": [1, 14], "x": 15, "y": 1},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 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, 12], "x": 12.75, "y": 2, "w": 2.25},
+                {"label": "Page Up", "matrix": [2, 14], "x": 15, "y": 2},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
+                {"label": "Page Down", "matrix": [3, 14], "x": 15, "y": 3},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"label": "GUI", "matrix": [4, 1], "x": 1.5, "y": 4},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"label": "Space", "matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"label": "Ctrl", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+                {"label": "\u2190", "matrix": [4, 12], "x": 13, "y": 4},
+                {"label": "\u2193", "matrix": [4, 13], "x": 14, "y": 4},
+                {"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/jaykeeb/jk65/keymaps/default/keymap.c b/keyboards/jaykeeb/jk65/keymaps/default/keymap.c
new file mode 100644
index 00000000000..de10b49a6cf
--- /dev/null
+++ b/keyboards/jaykeeb/jk65/keymaps/default/keymap.c
@@ -0,0 +1,22 @@
+// Copyright 2024 Alabahuy
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT_65_ansi_blocker(
+        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_HOME,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,  KC_PGDN,
+        KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,   KC_END,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             MO(1),   KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+
+    [1] = LAYOUT_65_ansi_blocker(
+        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_PSCR, KC_SCRL, KC_PAUS, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
+        _______,          _______, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______, _______,
+        _______, _______, _______,                            QK_BOOT,                            _______, _______, _______, _______, _______
+    )
+};
diff --git a/keyboards/jaykeeb/jk65/keymaps/via/keymap.c b/keyboards/jaykeeb/jk65/keymaps/via/keymap.c
new file mode 100644
index 00000000000..bc93e7ea2be
--- /dev/null
+++ b/keyboards/jaykeeb/jk65/keymaps/via/keymap.c
@@ -0,0 +1,21 @@
+// Copyright 2024 Alabahuy
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#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_BSPC, KC_DEL,  KC_HOME,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,  KC_PGDN,
+        KC_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_UP,   KC_END,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             MO(1),   KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    [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_PSCR, KC_SCRL, KC_PAUS, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______, _______,
+        _______, _______, _______,                            QK_BOOT,                            _______, _______, _______, _______, _______
+    )
+};
diff --git a/keyboards/jaykeeb/jk65/keymaps/via/rules.mk b/keyboards/jaykeeb/jk65/keymaps/via/rules.mk
new file mode 100644
index 00000000000..1e5b99807cb
--- /dev/null
+++ b/keyboards/jaykeeb/jk65/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/jaykeeb/jk65/matrix_diagram.md b/keyboards/jaykeeb/jk65/matrix_diagram.md
new file mode 100644
index 00000000000..7a36c0ae662
--- /dev/null
+++ b/keyboards/jaykeeb/jk65/matrix_diagram.md
@@ -0,0 +1,24 @@
+# Matrix Diagram for Jaykeeb JK65
+
+```
+                                                    ┌───────┐
+                                       2u Backspace │0D     │
+                                                    └───────┘
+┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+│00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │1D │0E │
+├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤
+│10   │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │2D   │1E │
+├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
+│20    │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C      │2E │
+├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
+│30  │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3C    │3D │3E │
+├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
+│40  │41  │42  │46                      │4A  │4B  │ │4C │4D │4E │
+└────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘
+┌────────┐
+│30      │ 2.25u LShift
+└────────┘
+┌─────┬───┬─────┬───────────────────────────┬─────┐
+│40   │41 │42   │46                         │4B   │ Blocker Tsangan
+└─────┴───┴─────┴───────────────────────────┴─────┘
+```
diff --git a/keyboards/jaykeeb/jk65/readme.md b/keyboards/jaykeeb/jk65/readme.md
new file mode 100644
index 00000000000..e0dbe05c581
--- /dev/null
+++ b/keyboards/jaykeeb/jk65/readme.md
@@ -0,0 +1,27 @@
+# JK65
+
+![jk65]( https://i.imgur.com/NysDAOy.png )
+
+Layout 65% support multi layout and keyboard case exiting
+
+* Keyboard Maintainer: [Alabahuy](https://github.com/Alabahuy)
+* Hardware Supported: JK65 PCB, RP2040
+* Hardware Availability: Private GB
+
+Make example for this keyboard (after setting up your build environment):
+
+    make jaykeeb/jk65:default
+
+Flashing example for this keyboard:
+
+    make jaykeeb/jk65: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
diff --git a/keyboards/rose75/rules.mk b/keyboards/jaykeeb/jk65/rules.mk
similarity index 100%
rename from keyboards/rose75/rules.mk
rename to keyboards/jaykeeb/jk65/rules.mk
diff --git a/keyboards/jaykeeb/joker/keyboard.json b/keyboards/jaykeeb/joker/keyboard.json
new file mode 100644
index 00000000000..ed8b59d03f4
--- /dev/null
+++ b/keyboards/jaykeeb/joker/keyboard.json
@@ -0,0 +1,493 @@
+{
+    "manufacturer": "Jaykeeb Studio",
+    "keyboard_name": "Joker",
+    "maintainer": "Alabahuy",
+    "bootloader": "rp2040",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "matrix_pins": {
+        "cols": ["GP29", "GP28", "GP27", "GP26", "GP25", "GP24", "GP23", "GP22", "GP21", "GP20", "GP19", "GP18", "GP15", "GP14", "GP10", "GP4", "GP3", "GP2", "GP1"],
+        "rows": ["GP5", "GP6", "GP0", "GP9", "GP7", "GP8"]
+    },
+    "indicators": {
+        "caps_lock": "GP12",
+        "num_lock": "GP11",
+        "scroll_lock": "GP13",
+        "on_state": 0
+    },
+    "processor": "RP2040",
+    "url": "",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x0795",
+        "vid": "0x414C"
+    },
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0},
+                {"label": "F2", "matrix": [0, 2], "x": 2.25, "y": 0},
+                {"label": "F3", "matrix": [0, 3], "x": 3.25, "y": 0},
+                {"label": "F4", "matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"label": "F5", "matrix": [0, 5], "x": 5.5, "y": 0},
+                {"label": "F6", "matrix": [0, 6], "x": 6.5, "y": 0},
+                {"label": "F7", "matrix": [0, 7], "x": 7.5, "y": 0},
+                {"label": "F8", "matrix": [0, 8], "x": 8.5, "y": 0},
+
+                {"label": "F9", "matrix": [0, 9], "x": 9.75, "y": 0},
+                {"label": "F10", "matrix": [0, 10], "x": 10.75, "y": 0},
+                {"label": "F11", "matrix": [0, 11], "x": 11.75, "y": 0},
+                {"label": "F12", "matrix": [0, 12], "x": 12.75, "y": 0},
+
+                {"label": "Print Screen", "matrix": [0, 13], "x": 14, "y": 0},
+
+                {"label": "Scroll Lock", "matrix": [0, 14], "x": 15.25, "y": 0},
+
+                {"label": "Pause", "matrix": [0, 15], "x": 16.5, "y": 0},
+                {"label": "Home", "matrix": [0, 16], "x": 17.5, "y": 0},
+                {"label": "End", "matrix": [0, 17], "x": 18.5, "y": 0},
+                {"label": "Delete", "matrix": [0, 18], "x": 19.5, "y": 0},
+
+                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
+                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
+                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
+                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
+                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
+                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
+                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
+                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
+                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
+                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
+                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
+                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
+                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
+                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25},
+                {"label": "Backspace", "matrix": [2, 13], "x": 14, "y": 1.25},
+
+                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
+
+                {"label": "Num Lock", "matrix": [1, 15], "x": 16.5, "y": 1.25},
+                {"label": "/", "matrix": [1, 16], "x": 17.5, "y": 1.25},
+                {"label": "*", "matrix": [1, 17], "x": 18.5, "y": 1.25},
+                {"label": "-", "matrix": [1, 18], "x": 19.5, "y": 1.25},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"label": "\\", "matrix": [3, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"label": "Page Up", "matrix": [2, 14], "x": 15.25, "y": 2.25},
+
+                {"label": "7", "matrix": [2, 15], "x": 16.5, "y": 2.25},
+                {"label": "8", "matrix": [2, 16], "x": 17.5, "y": 2.25},
+                {"label": "9", "matrix": [2, 17], "x": 18.5, "y": 2.25},
+                {"label": "+", "matrix": [2, 18], "x": 19.5, "y": 2.25, "h": 2},
+
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"label": "Enter", "matrix": [3, 12], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"label": "Page Down", "matrix": [3, 14], "x": 15.25, "y": 3.25},
+
+                {"label": "4", "matrix": [3, 15], "x": 16.5, "y": 3.25},
+                {"label": "5", "matrix": [3, 16], "x": 17.5, "y": 3.25},
+                {"label": "6", "matrix": [3, 17], "x": 18.5, "y": 3.25},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+
+                {"label": "\u2191", "matrix": [4, 13], "x": 14.25, "y": 4.5},
+
+                {"label": "1", "matrix": [4, 15], "x": 16.5, "y": 4.25},
+                {"label": "2", "matrix": [4, 16], "x": 17.5, "y": 4.25},
+                {"label": "3", "matrix": [4, 17], "x": 18.5, "y": 4.25},
+                {"label": "Enter", "matrix": [4, 18], "x": 19.5, "y": 4.25, "h": 2},
+
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"label": "GUI", "matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"label": "Space", "matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"label": "Alt", "matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.5},
+                {"label": "Ctrl", "matrix": [5, 11], "x": 11.5, "y": 5.25, "w": 1.5},
+
+                {"label": "\u2190", "matrix": [5, 12], "x": 13.25, "y": 5.5},
+                {"label": "\u2193", "matrix": [5, 13], "x": 14.25, "y": 5.5},
+                {"label": "\u2192", "matrix": [5, 14], "x": 15.25, "y": 5.5},
+
+                {"label": "0", "matrix": [5, 15], "x": 16.5, "y": 5.25, "w": 2},
+                {"label": ".", "matrix": [5, 17], "x": 18.5, "y": 5.25}
+            ]
+        },
+        "LAYOUT_ansi": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0},
+                {"label": "F2", "matrix": [0, 2], "x": 2.25, "y": 0},
+                {"label": "F3", "matrix": [0, 3], "x": 3.25, "y": 0},
+                {"label": "F4", "matrix": [0, 4], "x": 4.25, "y": 0},
+                {"label": "F5", "matrix": [0, 5], "x": 5.5, "y": 0},
+                {"label": "F6", "matrix": [0, 6], "x": 6.5, "y": 0},
+                {"label": "F7", "matrix": [0, 7], "x": 7.5, "y": 0},
+                {"label": "F8", "matrix": [0, 8], "x": 8.5, "y": 0},
+                {"label": "F9", "matrix": [0, 9], "x": 9.75, "y": 0},
+                {"label": "F10", "matrix": [0, 10], "x": 10.75, "y": 0},
+                {"label": "F11", "matrix": [0, 11], "x": 11.75, "y": 0},
+                {"label": "F12", "matrix": [0, 12], "x": 12.75, "y": 0},
+                {"label": "Print Screen", "matrix": [0, 13], "x": 14, "y": 0},
+                {"label": "Scroll Lock", "matrix": [0, 14], "x": 15.25, "y": 0},
+                {"label": "Pause", "matrix": [0, 15], "x": 16.5, "y": 0},
+                {"label": "Home", "matrix": [0, 16], "x": 17.5, "y": 0},
+                {"label": "End", "matrix": [0, 17], "x": 18.5, "y": 0},
+                {"label": "Delete", "matrix": [0, 18], "x": 19.5, "y": 0},
+
+                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
+                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
+                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
+                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
+                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
+                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
+                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
+                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
+                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
+                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
+                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
+                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
+                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
+                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"label": "Num Lock", "matrix": [1, 15], "x": 16.5, "y": 1.25},
+                {"label": "/", "matrix": [1, 16], "x": 17.5, "y": 1.25},
+                {"label": "*", "matrix": [1, 17], "x": 18.5, "y": 1.25},
+                {"label": "-", "matrix": [1, 18], "x": 19.5, "y": 1.25},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"label": "\\", "matrix": [3, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+                {"label": "Page Up", "matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"label": "7", "matrix": [2, 15], "x": 16.5, "y": 2.25},
+                {"label": "8", "matrix": [2, 16], "x": 17.5, "y": 2.25},
+                {"label": "9", "matrix": [2, 17], "x": 18.5, "y": 2.25},
+                {"label": "+", "matrix": [2, 18], "x": 19.5, "y": 2.25, "h": 2},
+
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"label": "Enter", "matrix": [3, 12], "x": 12.75, "y": 3.25, "w": 2.25},
+                {"label": "Page Down", "matrix": [3, 14], "x": 15.25, "y": 3.25},
+                {"label": "4", "matrix": [3, 15], "x": 16.5, "y": 3.25},
+                {"label": "5", "matrix": [3, 16], "x": 17.5, "y": 3.25},
+                {"label": "6", "matrix": [3, 17], "x": 18.5, "y": 3.25},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"label": "Up", "matrix": [4, 13], "x": 14.25, "y": 4.5},
+                {"label": "1", "matrix": [4, 15], "x": 16.5, "y": 4.25},
+                {"label": "2", "matrix": [4, 16], "x": 17.5, "y": 4.25},
+                {"label": "3", "matrix": [4, 17], "x": 18.5, "y": 4.25},
+                {"label": "Enter", "matrix": [4, 18], "x": 19.5, "y": 4.25, "h": 2},
+
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"label": "GUI", "matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"label": "Space", "matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"label": "Alt", "matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.5},
+                {"label": "Ctrl", "matrix": [5, 11], "x": 11.5, "y": 5.25, "w": 1.5},
+                {"label": "Left", "matrix": [5, 12], "x": 13.25, "y": 5.5},
+                {"label": "Down", "matrix": [5, 13], "x": 14.25, "y": 5.5},
+                {"label": "Right", "matrix": [5, 14], "x": 15.25, "y": 5.5},
+                {"label": "0", "matrix": [5, 15], "x": 16.5, "y": 5.25, "w": 2},
+                {"label": ".", "matrix": [5, 17], "x": 18.5, "y": 5.25}
+            ]
+        },"LAYOUT_ansi_wkl": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0},
+                {"label": "F2", "matrix": [0, 2], "x": 2.25, "y": 0},
+                {"label": "F3", "matrix": [0, 3], "x": 3.25, "y": 0},
+                {"label": "F4", "matrix": [0, 4], "x": 4.25, "y": 0},
+                {"label": "F5", "matrix": [0, 5], "x": 5.5, "y": 0},
+                {"label": "F6", "matrix": [0, 6], "x": 6.5, "y": 0},
+                {"label": "F7", "matrix": [0, 7], "x": 7.5, "y": 0},
+                {"label": "F8", "matrix": [0, 8], "x": 8.5, "y": 0},
+                {"label": "F9", "matrix": [0, 9], "x": 9.75, "y": 0},
+                {"label": "F10", "matrix": [0, 10], "x": 10.75, "y": 0},
+                {"label": "F11", "matrix": [0, 11], "x": 11.75, "y": 0},
+                {"label": "F12", "matrix": [0, 12], "x": 12.75, "y": 0},
+                {"label": "Print Screen", "matrix": [0, 13], "x": 14, "y": 0},
+                {"label": "Scroll Lock", "matrix": [0, 14], "x": 15.25, "y": 0},
+                {"label": "Pause", "matrix": [0, 15], "x": 16.5, "y": 0},
+                {"label": "Home", "matrix": [0, 16], "x": 17.5, "y": 0},
+                {"label": "End", "matrix": [0, 17], "x": 18.5, "y": 0},
+                {"label": "Delete", "matrix": [0, 18], "x": 19.5, "y": 0},
+
+                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
+                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
+                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
+                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
+                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
+                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
+                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
+                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
+                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
+                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
+                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
+                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
+                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
+                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"label": "Num Lock", "matrix": [1, 15], "x": 16.5, "y": 1.25},
+                {"label": "/", "matrix": [1, 16], "x": 17.5, "y": 1.25},
+                {"label": "*", "matrix": [1, 17], "x": 18.5, "y": 1.25},
+                {"label": "-", "matrix": [1, 18], "x": 19.5, "y": 1.25},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"label": "\\", "matrix": [3, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+                {"label": "Page Up", "matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"label": "7", "matrix": [2, 15], "x": 16.5, "y": 2.25},
+                {"label": "8", "matrix": [2, 16], "x": 17.5, "y": 2.25},
+                {"label": "9", "matrix": [2, 17], "x": 18.5, "y": 2.25},
+                {"label": "+", "matrix": [2, 18], "x": 19.5, "y": 2.25, "h": 2},
+
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"label": "Enter", "matrix": [3, 12], "x": 12.75, "y": 3.25, "w": 2.25},
+                {"label": "Page Down", "matrix": [3, 14], "x": 15.25, "y": 3.25},
+                {"label": "4", "matrix": [3, 15], "x": 16.5, "y": 3.25},
+                {"label": "5", "matrix": [3, 16], "x": 17.5, "y": 3.25},
+                {"label": "6", "matrix": [3, 17], "x": 18.5, "y": 3.25},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"label": "Up", "matrix": [4, 13], "x": 14.25, "y": 4.5},
+                {"label": "1", "matrix": [4, 15], "x": 16.5, "y": 4.25},
+                {"label": "2", "matrix": [4, 16], "x": 17.5, "y": 4.25},
+                {"label": "3", "matrix": [4, 17], "x": 18.5, "y": 4.25},
+                {"label": "Enter", "matrix": [4, 18], "x": 19.5, "y": 4.25, "h": 2},
+
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"label": "Alt", "matrix": [5, 1], "x": 1.5, "y": 5.25, "w": 1.5},
+                {"label": "Space", "matrix": [5, 6], "x": 3, "y": 5.25, "w": 7},
+                {"label": "Alt", "matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.5},
+                {"label": "Ctrl", "matrix": [5, 11], "x": 11.5, "y": 5.25, "w": 1.5},
+                {"label": "Left", "matrix": [5, 12], "x": 13.25, "y": 5.5},
+                {"label": "Down", "matrix": [5, 13], "x": 14.25, "y": 5.5},
+                {"label": "Right", "matrix": [5, 14], "x": 15.25, "y": 5.5},
+                {"label": "0", "matrix": [5, 15], "x": 16.5, "y": 5.25, "w": 2},
+                {"label": ".", "matrix": [5, 17], "x": 18.5, "y": 5.25}
+            ]
+        },
+        "LAYOUT_ansi_wkl_split_bs": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0},
+                {"label": "F2", "matrix": [0, 2], "x": 2.25, "y": 0},
+                {"label": "F3", "matrix": [0, 3], "x": 3.25, "y": 0},
+                {"label": "F4", "matrix": [0, 4], "x": 4.25, "y": 0},
+                {"label": "F5", "matrix": [0, 5], "x": 5.5, "y": 0},
+                {"label": "F6", "matrix": [0, 6], "x": 6.5, "y": 0},
+                {"label": "F7", "matrix": [0, 7], "x": 7.5, "y": 0},
+                {"label": "F8", "matrix": [0, 8], "x": 8.5, "y": 0},
+                {"label": "F9", "matrix": [0, 9], "x": 9.75, "y": 0},
+                {"label": "F10", "matrix": [0, 10], "x": 10.75, "y": 0},
+                {"label": "F11", "matrix": [0, 11], "x": 11.75, "y": 0},
+                {"label": "F12", "matrix": [0, 12], "x": 12.75, "y": 0},
+                {"label": "Print Screen", "matrix": [0, 13], "x": 14, "y": 0},
+                {"label": "Scroll Lock", "matrix": [0, 14], "x": 15.25, "y": 0},
+                {"label": "Pause", "matrix": [0, 15], "x": 16.5, "y": 0},
+                {"label": "Home", "matrix": [0, 16], "x": 17.5, "y": 0},
+                {"label": "End", "matrix": [0, 17], "x": 18.5, "y": 0},
+                {"label": "Delete", "matrix": [0, 18], "x": 19.5, "y": 0},
+
+                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
+                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
+                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
+                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
+                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
+                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
+                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
+                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
+                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
+                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
+                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
+                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
+                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
+                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25},
+                {"label": "Backspace", "matrix": [2, 13], "x": 14, "y": 1.25},
+                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"label": "Num Lock", "matrix": [1, 15], "x": 16.5, "y": 1.25},
+                {"label": "/", "matrix": [1, 16], "x": 17.5, "y": 1.25},
+                {"label": "*", "matrix": [1, 17], "x": 18.5, "y": 1.25},
+                {"label": "-", "matrix": [1, 18], "x": 19.5, "y": 1.25},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"label": "\\", "matrix": [3, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+                {"label": "Page Up", "matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"label": "7", "matrix": [2, 15], "x": 16.5, "y": 2.25},
+                {"label": "8", "matrix": [2, 16], "x": 17.5, "y": 2.25},
+                {"label": "9", "matrix": [2, 17], "x": 18.5, "y": 2.25},
+                {"label": "+", "matrix": [2, 18], "x": 19.5, "y": 2.25, "h": 2},
+
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"label": "Enter", "matrix": [3, 12], "x": 12.75, "y": 3.25, "w": 2.25},
+                {"label": "Page Down", "matrix": [3, 14], "x": 15.25, "y": 3.25},
+                {"label": "4", "matrix": [3, 15], "x": 16.5, "y": 3.25},
+                {"label": "5", "matrix": [3, 16], "x": 17.5, "y": 3.25},
+                {"label": "6", "matrix": [3, 17], "x": 18.5, "y": 3.25},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"label": "Up", "matrix": [4, 13], "x": 14.25, "y": 4.5},
+                {"label": "1", "matrix": [4, 15], "x": 16.5, "y": 4.25},
+                {"label": "2", "matrix": [4, 16], "x": 17.5, "y": 4.25},
+                {"label": "3", "matrix": [4, 17], "x": 18.5, "y": 4.25},
+                {"label": "Enter", "matrix": [4, 18], "x": 19.5, "y": 4.25, "h": 2},
+
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"label": "Alt", "matrix": [5, 1], "x": 1.5, "y": 5.25, "w": 1.5},
+                {"label": "Space", "matrix": [5, 6], "x": 3, "y": 5.25, "w": 7},
+                {"label": "Alt", "matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.5},
+                {"label": "Ctrl", "matrix": [5, 11], "x": 11.5, "y": 5.25, "w": 1.5},
+                {"label": "Left", "matrix": [5, 12], "x": 13.25, "y": 5.5},
+                {"label": "Down", "matrix": [5, 13], "x": 14.25, "y": 5.5},
+                {"label": "Right", "matrix": [5, 14], "x": 15.25, "y": 5.5},
+                {"label": "0", "matrix": [5, 15], "x": 16.5, "y": 5.25, "w": 2},
+                {"label": ".", "matrix": [5, 17], "x": 18.5, "y": 5.25}
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/keyboards/jaykeeb/joker/keymaps/default/keymap.c b/keyboards/jaykeeb/joker/keymaps/default/keymap.c
new file mode 100644
index 00000000000..a9f71941604
--- /dev/null
+++ b/keyboards/jaykeeb/joker/keymaps/default/keymap.c
@@ -0,0 +1,15 @@
+// Copyright 2024 Alabahuy
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+   [0] = LAYOUT_ansi(
+        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_HOME, KC_END , KC_DEL ,
+        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_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
+        KC_TAB , KC_Q   , KC_W   , KC_E   , KC_R   , KC_T   , KC_Y   , KC_U   , KC_I   , KC_O   , KC_P   , KC_LBRC, KC_RBRC, KC_BSLS,            KC_PGUP,   KC_P7  , KC_P8  , KC_P9  , KC_PPLS,
+        KC_CAPS, KC_A   , KC_S   , KC_D   , KC_F   , KC_G   , KC_H   , KC_J   , KC_K   , KC_L   , KC_SCLN, KC_QUOT, KC_ENT ,                     KC_PGDN,   KC_P4  , KC_P5  , KC_P6  , 
+        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_P1  , KC_P2  , KC_P3  , KC_PENT,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC ,                            KC_RALT, KC_RCTL,   KC_LEFT, KC_DOWN, KC_RGHT,            KC_P0  ,          KC_PDOT  
+    )
+};
\ No newline at end of file
diff --git a/keyboards/jaykeeb/joker/keymaps/via/keymap.c b/keyboards/jaykeeb/joker/keymaps/via/keymap.c
new file mode 100644
index 00000000000..a9f71941604
--- /dev/null
+++ b/keyboards/jaykeeb/joker/keymaps/via/keymap.c
@@ -0,0 +1,15 @@
+// Copyright 2024 Alabahuy
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+   [0] = LAYOUT_ansi(
+        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_HOME, KC_END , KC_DEL ,
+        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_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
+        KC_TAB , KC_Q   , KC_W   , KC_E   , KC_R   , KC_T   , KC_Y   , KC_U   , KC_I   , KC_O   , KC_P   , KC_LBRC, KC_RBRC, KC_BSLS,            KC_PGUP,   KC_P7  , KC_P8  , KC_P9  , KC_PPLS,
+        KC_CAPS, KC_A   , KC_S   , KC_D   , KC_F   , KC_G   , KC_H   , KC_J   , KC_K   , KC_L   , KC_SCLN, KC_QUOT, KC_ENT ,                     KC_PGDN,   KC_P4  , KC_P5  , KC_P6  , 
+        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_P1  , KC_P2  , KC_P3  , KC_PENT,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC ,                            KC_RALT, KC_RCTL,   KC_LEFT, KC_DOWN, KC_RGHT,            KC_P0  ,          KC_PDOT  
+    )
+};
\ No newline at end of file
diff --git a/keyboards/jaykeeb/joker/keymaps/via/rules.mk b/keyboards/jaykeeb/joker/keymaps/via/rules.mk
new file mode 100644
index 00000000000..1e5b99807cb
--- /dev/null
+++ b/keyboards/jaykeeb/joker/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/jaykeeb/joker/matrix_diagram.md b/keyboards/jaykeeb/joker/matrix_diagram.md
new file mode 100644
index 00000000000..d7b79bf97af
--- /dev/null
+++ b/keyboards/jaykeeb/joker/matrix_diagram.md
@@ -0,0 +1,23 @@
+# Matrix Diagram for jaykeeb joker
+
+```
+┌───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┐┌───┐┌───┬───┬───┬───┐
+│00 ││01 │02 │03 │04 ││05 │06 │07 │08 ││09 │0A │0B │0C ││0D ││0E ││0F │0G │0H │0I │
+└───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┘└───┘└───┴───┴───┴───┘
+┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐┌───┐┌───┬───┬───┬───┐    ┌───────┐
+│10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D │2D ││1E ││1F │1G │1H │1I │    │1E     │ 2u Backspace
+├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤├───┤├───┼───┼───┼───┤    └───────┘
+│20   │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │3D   ││2E ││2F │2G │2H │   │  
+├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤├───┤├───┼───┼───┤2I │ 
+│30    │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3C      ││3E ││3F │3G │3H │   │ 
+├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┘└───┘├───┼───┼───┼───┤ 
+│40      │42 │43 │44 │45 │46 │47 │48 │49 │4A │4B │4C    │┌───┐    │4F │4G │4H │   │
+├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┴┬──┴──┬───┘│4D │    ├───┴───┼───┤4I │
+│50  │51  │52  │56                      │5A   │5B   │┌───┼───┼───┐│5F     │5H │   │
+└────┴────┴────┴────────────────────────┴─────┴─────┘│5C │5D │5E │└───────┴───┴───┘
+                                                     └───┴───┴───┘
+
+┌─────┬─────┬───────────────────────────┬─────┬─────┐
+│50   │51   │56                         │5A   │5B   │ WKL
+└─────┴─────┴───────────────────────────┴─────┴─────┘
+```
\ No newline at end of file
diff --git a/keyboards/jaykeeb/joker/readme.md b/keyboards/jaykeeb/joker/readme.md
new file mode 100644
index 00000000000..d356b5b3c22
--- /dev/null
+++ b/keyboards/jaykeeb/joker/readme.md
@@ -0,0 +1,27 @@
+# Joker
+
+![joker](https://i.imgur.com/7uNPp7r.png)
+
+1800 layout pcb replace for austin
+
+* Keyboard Maintainer: [Alabahuy](https://github.com/Alabahuy)
+* Hardware Supported: RP2040
+* Hardware Availability: Private GB
+
+Make example for this keyboard (after setting up your build environment):
+
+    make jaykeeb/joker:default
+
+Flashing example for this keyboard:
+
+    make jaykeeb/joker: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
diff --git a/keyboards/jaykeeb/kamigakushi/info.json b/keyboards/jaykeeb/kamigakushi/keyboard.json
similarity index 100%
rename from keyboards/jaykeeb/kamigakushi/info.json
rename to keyboards/jaykeeb/kamigakushi/keyboard.json
diff --git a/keyboards/jian/handwired/info.json b/keyboards/jian/handwired/keyboard.json
similarity index 100%
rename from keyboards/jian/handwired/info.json
rename to keyboards/jian/handwired/keyboard.json
diff --git a/keyboards/jian/handwired/rules.mk b/keyboards/jian/handwired/rules.mk
deleted file mode 100644
index a0c271ea25c..00000000000
--- a/keyboards/jian/handwired/rules.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-BACKLIGHT_ENABLE = no
-RGBLIGHT_ENABLE = no
diff --git a/keyboards/jian/info.json b/keyboards/jian/info.json
index f0b0261dc95..c9f6f46c1a7 100644
--- a/keyboards/jian/info.json
+++ b/keyboards/jian/info.json
@@ -5,5 +5,8 @@
     "usb": {
         "vid": "0xC0DE",
         "pid": "0x1337"
+    },
+    "build": {
+        "lto": true
     }
 }
diff --git a/keyboards/jian/nsrev2/info.json b/keyboards/jian/nsrev2/info.json
deleted file mode 100644
index 4ea315f51e0..00000000000
--- a/keyboards/jian/nsrev2/info.json
+++ /dev/null
@@ -1,100 +0,0 @@
-{
-    "keyboard_name": "Huma",
-    "usb": {
-        "device_version": "2.1.0"
-    },
-    "matrix_pins": {
-        "cols": ["D3", "D2", "B4", "F6", "F7", "B2"],
-        "rows": ["F4", "F5", "B1", "B3", "D1", "D0", "D7", "E6"]
-    },
-    "diode_direction": "COL2ROW",
-    "backlight": {
-        "pin": "C6",
-        "levels": 5,
-        "breathing": true
-    },
-    "rgblight": {
-        "hue_steps": 10,
-        "led_count": 7,
-        "sleep": true,
-        "split": true,
-        "animations": {
-            "breathing": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "snake": true,
-            "knight": true,
-            "christmas": true,
-            "static_gradient": true,
-            "rgb_test": true,
-            "alternating": true,
-            "twinkle": true
-        }
-    },
-    "ws2812": {
-        "pin": "D4"
-    },
-    "qmk_lufa_bootloader": {
-        "esc_input": "B1",
-        "esc_output": "D3"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "qmk-dfu",
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [2, 0], "x": 0, "y": 1.5},
-                {"matrix": [0, 0], "x": 1, "y": 0.75},
-                {"matrix": [0, 1], "x": 2, "y": 0.625},
-                {"matrix": [1, 2], "x": 3, "y": 0.25},
-                {"matrix": [0, 2], "x": 4, "y": 0},
-                {"matrix": [0, 3], "x": 5, "y": 0.25},
-                {"matrix": [0, 4], "x": 6, "y": 0.375},
-
-                {"matrix": [4, 4], "x": 10, "y": 0.375},
-                {"matrix": [4, 3], "x": 11, "y": 0.25},
-                {"matrix": [4, 2], "x": 12, "y": 0},
-                {"matrix": [5, 2], "x": 13, "y": 0.25},
-                {"matrix": [4, 1], "x": 14, "y": 0.625},
-                {"matrix": [4, 0], "x": 15, "y": 0.75},
-                {"matrix": [6, 0], "x": 16, "y": 1.5},
-
-                {"matrix": [1, 0], "x": 1, "y": 1.75},
-                {"matrix": [1, 1], "x": 2, "y": 1.625},
-                {"matrix": [2, 2], "x": 3, "y": 1.25},
-                {"matrix": [1, 3], "x": 4, "y": 1},
-                {"matrix": [1, 4], "x": 5, "y": 1.25},
-                {"matrix": [0, 5], "x": 6, "y": 1.375},
-
-                {"matrix": [4, 5], "x": 10, "y": 1.375},
-                {"matrix": [5, 4], "x": 11, "y": 1.25},
-                {"matrix": [5, 3], "x": 12, "y": 1},
-                {"matrix": [6, 2], "x": 13, "y": 1.25},
-                {"matrix": [5, 1], "x": 14, "y": 1.625},
-                {"matrix": [5, 0], "x": 15, "y": 1.75},
-
-                {"matrix": [2, 1], "x": 1, "y": 2.75},
-                {"matrix": [3, 2], "x": 2, "y": 2.625},
-                {"matrix": [3, 3], "x": 3, "y": 2.25},
-                {"matrix": [2, 3], "x": 4, "y": 2},
-                {"matrix": [2, 4], "x": 5, "y": 2.25},
-                {"matrix": [1, 5], "x": 6, "y": 2.375},
-
-                {"matrix": [5, 5], "x": 10, "y": 2.375},
-                {"matrix": [6, 4], "x": 11, "y": 2.25},
-                {"matrix": [6, 3], "x": 12, "y": 2},
-                {"matrix": [7, 3], "x": 13, "y": 2.25},
-                {"matrix": [7, 2], "x": 14, "y": 2.625},
-                {"matrix": [6, 1], "x": 15, "y": 2.75},
-
-                {"matrix": [3, 4], "x": 5, "y": 3.25},
-                {"matrix": [2, 5], "x": 6, "y": 3.375},
-                {"matrix": [3, 5], "x": 7, "y": 3.5},
-
-                {"matrix": [7, 5], "x": 9, "y": 3.5},
-                {"matrix": [6, 5], "x": 10, "y": 3.375},
-                {"matrix": [7, 4], "x": 11, "y": 3.25}
-            ]
-        }
-    }
-}
diff --git a/keyboards/jian/nsrev2/keyboard.json b/keyboards/jian/nsrev2/keyboard.json
new file mode 100644
index 00000000000..2981adf9b5a
--- /dev/null
+++ b/keyboards/jian/nsrev2/keyboard.json
@@ -0,0 +1,103 @@
+{
+    "keyboard_name": "Huma",
+    "usb": {
+        "device_version": "2.1.0"
+    },
+    "matrix_pins": {
+        "cols": ["D3", "D2", "B4", "F6", "F7", "B2"],
+        "rows": ["F4", "F5", "B1", "B3", "D1", "D0", "D7", "E6"]
+    },
+    "diode_direction": "COL2ROW",
+    "backlight": {
+        "pin": "C6",
+        "levels": 5,
+        "breathing": true
+    },
+    "rgblight": {
+        "hue_steps": 10,
+        "led_count": 7,
+        "sleep": true,
+        "split": true,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": true,
+            "twinkle": true
+        }
+    },
+    "ws2812": {
+        "pin": "D4"
+    },
+    "qmk_lufa_bootloader": {
+        "esc_input": "B1",
+        "esc_output": "D3"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "qmk-dfu",
+    "features": {
+        "backlight": true
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [2, 0], "x": 0, "y": 1.5},
+                {"matrix": [0, 0], "x": 1, "y": 0.75},
+                {"matrix": [0, 1], "x": 2, "y": 0.625},
+                {"matrix": [1, 2], "x": 3, "y": 0.25},
+                {"matrix": [0, 2], "x": 4, "y": 0},
+                {"matrix": [0, 3], "x": 5, "y": 0.25},
+                {"matrix": [0, 4], "x": 6, "y": 0.375},
+
+                {"matrix": [4, 4], "x": 10, "y": 0.375},
+                {"matrix": [4, 3], "x": 11, "y": 0.25},
+                {"matrix": [4, 2], "x": 12, "y": 0},
+                {"matrix": [5, 2], "x": 13, "y": 0.25},
+                {"matrix": [4, 1], "x": 14, "y": 0.625},
+                {"matrix": [4, 0], "x": 15, "y": 0.75},
+                {"matrix": [6, 0], "x": 16, "y": 1.5},
+
+                {"matrix": [1, 0], "x": 1, "y": 1.75},
+                {"matrix": [1, 1], "x": 2, "y": 1.625},
+                {"matrix": [2, 2], "x": 3, "y": 1.25},
+                {"matrix": [1, 3], "x": 4, "y": 1},
+                {"matrix": [1, 4], "x": 5, "y": 1.25},
+                {"matrix": [0, 5], "x": 6, "y": 1.375},
+
+                {"matrix": [4, 5], "x": 10, "y": 1.375},
+                {"matrix": [5, 4], "x": 11, "y": 1.25},
+                {"matrix": [5, 3], "x": 12, "y": 1},
+                {"matrix": [6, 2], "x": 13, "y": 1.25},
+                {"matrix": [5, 1], "x": 14, "y": 1.625},
+                {"matrix": [5, 0], "x": 15, "y": 1.75},
+
+                {"matrix": [2, 1], "x": 1, "y": 2.75},
+                {"matrix": [3, 2], "x": 2, "y": 2.625},
+                {"matrix": [3, 3], "x": 3, "y": 2.25},
+                {"matrix": [2, 3], "x": 4, "y": 2},
+                {"matrix": [2, 4], "x": 5, "y": 2.25},
+                {"matrix": [1, 5], "x": 6, "y": 2.375},
+
+                {"matrix": [5, 5], "x": 10, "y": 2.375},
+                {"matrix": [6, 4], "x": 11, "y": 2.25},
+                {"matrix": [6, 3], "x": 12, "y": 2},
+                {"matrix": [7, 3], "x": 13, "y": 2.25},
+                {"matrix": [7, 2], "x": 14, "y": 2.625},
+                {"matrix": [6, 1], "x": 15, "y": 2.75},
+
+                {"matrix": [3, 4], "x": 5, "y": 3.25},
+                {"matrix": [2, 5], "x": 6, "y": 3.375},
+                {"matrix": [3, 5], "x": 7, "y": 3.5},
+
+                {"matrix": [7, 5], "x": 9, "y": 3.5},
+                {"matrix": [6, 5], "x": 10, "y": 3.375},
+                {"matrix": [7, 4], "x": 11, "y": 3.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/jian/nsrev2/rules.mk b/keyboards/jian/nsrev2/rules.mk
deleted file mode 100644
index a05436d218b..00000000000
--- a/keyboards/jian/nsrev2/rules.mk
+++ /dev/null
@@ -1,6 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-CONSOLE_ENABLE = no
-BACKLIGHT_ENABLE = yes
-RGBLIGHT_ENABLE = no
diff --git a/keyboards/jian/rev1/info.json b/keyboards/jian/rev1/info.json
deleted file mode 100644
index 3cfc0266670..00000000000
--- a/keyboards/jian/rev1/info.json
+++ /dev/null
@@ -1,104 +0,0 @@
-{
-    "keyboard_name": "Jian",
-    "usb": {
-        "device_version": "1.0.0"
-    },
-    "split": {
-        "enabled": true
-    },
-    "matrix_pins": {
-        "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"],
-        "rows": ["D3", "D2", "E6", "B4"]
-    },
-    "diode_direction": "COL2ROW",
-    "dip_switch": {
-        "matrix_grid": [
-            [1, 0], [2, 0], [3, 0], [3, 1], [3, 2], [3, 3],
-            [7, 3], [7, 2], [7, 1], [7, 0], [6, 0], [5, 0]
-        ]
-    },
-    "backlight": {
-        "pin": "B6",
-        "levels": 5
-    },
-    "rgblight": {
-        "hue_steps": 10,
-        "led_count": 7,
-        "sleep": true,
-        "split": true,
-        "animations": {
-            "breathing": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "snake": true,
-            "knight": true,
-            "christmas": true,
-            "static_gradient": true,
-            "rgb_test": true,
-            "alternating": true,
-            "twinkle": true
-        }
-    },
-    "ws2812": {
-        "pin": "D4"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 1.5},
-                {"matrix": [0, 1], "x": 1, "y": 0.75},
-                {"matrix": [0, 2], "x": 2, "y": 0.625},
-                {"matrix": [0, 3], "x": 3, "y": 0.25},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0.25},
-                {"matrix": [0, 6], "x": 6, "y": 0.375},
-
-                {"matrix": [4, 6], "x": 10, "y": 0.375},
-                {"matrix": [4, 5], "x": 11, "y": 0.25},
-                {"matrix": [4, 4], "x": 12, "y": 0},
-                {"matrix": [4, 3], "x": 13, "y": 0.25},
-                {"matrix": [4, 2], "x": 14, "y": 0.625},
-                {"matrix": [4, 1], "x": 15, "y": 0.75},
-                {"matrix": [4, 0], "x": 16, "y": 1.5},
-
-                {"matrix": [1, 1], "x": 1, "y": 1.75},
-                {"matrix": [1, 2], "x": 2, "y": 1.625},
-                {"matrix": [1, 3], "x": 3, "y": 1.25},
-                {"matrix": [1, 4], "x": 4, "y": 1},
-                {"matrix": [1, 5], "x": 5, "y": 1.25},
-                {"matrix": [1, 6], "x": 6, "y": 1.375},
-
-                {"matrix": [5, 6], "x": 10, "y": 1.375},
-                {"matrix": [5, 5], "x": 11, "y": 1.25},
-                {"matrix": [5, 4], "x": 12, "y": 1},
-                {"matrix": [5, 3], "x": 13, "y": 1.25},
-                {"matrix": [5, 2], "x": 14, "y": 1.625},
-                {"matrix": [5, 1], "x": 15, "y": 1.75},
-
-                {"matrix": [2, 1], "x": 1, "y": 2.75},
-                {"matrix": [2, 2], "x": 2, "y": 2.625},
-                {"matrix": [2, 3], "x": 3, "y": 2.25},
-                {"matrix": [2, 4], "x": 4, "y": 2},
-                {"matrix": [2, 5], "x": 5, "y": 2.25},
-                {"matrix": [2, 6], "x": 6, "y": 2.375},
-
-                {"matrix": [6, 6], "x": 10, "y": 2.375},
-                {"matrix": [6, 5], "x": 11, "y": 2.25},
-                {"matrix": [6, 4], "x": 12, "y": 2},
-                {"matrix": [6, 3], "x": 13, "y": 2.25},
-                {"matrix": [6, 2], "x": 14, "y": 2.625},
-                {"matrix": [6, 1], "x": 15, "y": 2.75},
-
-                {"matrix": [3, 4], "x": 5, "y": 3.25},
-                {"matrix": [3, 5], "x": 6, "y": 3.375},
-                {"matrix": [3, 6], "x": 7, "y": 3.5},
-
-                {"matrix": [7, 6], "x": 9, "y": 3.5},
-                {"matrix": [7, 5], "x": 10, "y": 3.375},
-                {"matrix": [7, 4], "x": 11, "y": 3.25}
-            ]
-        }
-    }
-}
diff --git a/keyboards/jian/rev1/keyboard.json b/keyboards/jian/rev1/keyboard.json
new file mode 100644
index 00000000000..1a8957d8b3c
--- /dev/null
+++ b/keyboards/jian/rev1/keyboard.json
@@ -0,0 +1,109 @@
+{
+    "keyboard_name": "Jian",
+    "usb": {
+        "device_version": "1.0.0"
+    },
+    "split": {
+        "enabled": true
+    },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"],
+        "rows": ["D3", "D2", "E6", "B4"]
+    },
+    "diode_direction": "COL2ROW",
+    "dip_switch": {
+        "matrix_grid": [
+            [1, 0], [2, 0], [3, 0], [3, 1], [3, 2], [3, 3],
+            [7, 3], [7, 2], [7, 1], [7, 0], [6, 0], [5, 0]
+        ]
+    },
+    "backlight": {
+        "pin": "B6",
+        "levels": 5
+    },
+    "rgblight": {
+        "hue_steps": 10,
+        "led_count": 7,
+        "sleep": true,
+        "split": true,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": true,
+            "twinkle": true
+        }
+    },
+    "ws2812": {
+        "pin": "D4"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
+    "features": {
+        "backlight": true,
+        "rgblight": true,
+        "dip_switch": true
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 1.5},
+                {"matrix": [0, 1], "x": 1, "y": 0.75},
+                {"matrix": [0, 2], "x": 2, "y": 0.625},
+                {"matrix": [0, 3], "x": 3, "y": 0.25},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0.25},
+                {"matrix": [0, 6], "x": 6, "y": 0.375},
+
+                {"matrix": [4, 6], "x": 10, "y": 0.375},
+                {"matrix": [4, 5], "x": 11, "y": 0.25},
+                {"matrix": [4, 4], "x": 12, "y": 0},
+                {"matrix": [4, 3], "x": 13, "y": 0.25},
+                {"matrix": [4, 2], "x": 14, "y": 0.625},
+                {"matrix": [4, 1], "x": 15, "y": 0.75},
+                {"matrix": [4, 0], "x": 16, "y": 1.5},
+
+                {"matrix": [1, 1], "x": 1, "y": 1.75},
+                {"matrix": [1, 2], "x": 2, "y": 1.625},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.375},
+
+                {"matrix": [5, 6], "x": 10, "y": 1.375},
+                {"matrix": [5, 5], "x": 11, "y": 1.25},
+                {"matrix": [5, 4], "x": 12, "y": 1},
+                {"matrix": [5, 3], "x": 13, "y": 1.25},
+                {"matrix": [5, 2], "x": 14, "y": 1.625},
+                {"matrix": [5, 1], "x": 15, "y": 1.75},
+
+                {"matrix": [2, 1], "x": 1, "y": 2.75},
+                {"matrix": [2, 2], "x": 2, "y": 2.625},
+                {"matrix": [2, 3], "x": 3, "y": 2.25},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6, "y": 2.375},
+
+                {"matrix": [6, 6], "x": 10, "y": 2.375},
+                {"matrix": [6, 5], "x": 11, "y": 2.25},
+                {"matrix": [6, 4], "x": 12, "y": 2},
+                {"matrix": [6, 3], "x": 13, "y": 2.25},
+                {"matrix": [6, 2], "x": 14, "y": 2.625},
+                {"matrix": [6, 1], "x": 15, "y": 2.75},
+
+                {"matrix": [3, 4], "x": 5, "y": 3.25},
+                {"matrix": [3, 5], "x": 6, "y": 3.375},
+                {"matrix": [3, 6], "x": 7, "y": 3.5},
+
+                {"matrix": [7, 6], "x": 9, "y": 3.5},
+                {"matrix": [7, 5], "x": 10, "y": 3.375},
+                {"matrix": [7, 4], "x": 11, "y": 3.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/jian/rev1/rules.mk b/keyboards/jian/rev1/rules.mk
deleted file mode 100644
index bd3228c26eb..00000000000
--- a/keyboards/jian/rev1/rules.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-CONSOLE_ENABLE = no
-BACKLIGHT_ENABLE = yes
-RGBLIGHT_ENABLE = yes
-DIP_SWITCH_ENABLE = yes
diff --git a/keyboards/jian/rev2/info.json b/keyboards/jian/rev2/info.json
deleted file mode 100644
index ebd015c9a4a..00000000000
--- a/keyboards/jian/rev2/info.json
+++ /dev/null
@@ -1,103 +0,0 @@
-{
-    "keyboard_name": "Jian",
-    "usb": {
-        "device_version": "2.0.0"
-    },
-    "matrix_pins": {
-        "cols": ["D3", "D2", "B4", "F6", "F7", "B2"],
-        "rows": ["F4", "F5", "B1", "B3"]
-    },
-    "diode_direction": "COL2ROW",
-    "backlight": {
-        "pin": "C6",
-        "levels": 5
-    },
-    "rgblight": {
-        "hue_steps": 10,
-        "led_count": 7,
-        "sleep": true,
-        "split": true,
-        "animations": {
-            "breathing": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "snake": true,
-            "knight": true,
-            "christmas": true,
-            "static_gradient": true,
-            "rgb_test": true,
-            "alternating": true,
-            "twinkle": true
-        }
-    },
-    "ws2812": {
-        "pin": "D4"
-    },
-    "qmk_lufa_bootloader": {
-        "esc_input": "B1",
-        "esc_output": "D3"
-    },
-    "split": {
-        "enabled": true,
-        "soft_serial_pin": "D1"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "qmk-dfu",
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [2, 0], "x": 0, "y": 1.5},
-                {"matrix": [0, 0], "x": 1, "y": 0.75},
-                {"matrix": [0, 1], "x": 2, "y": 0.625},
-                {"matrix": [1, 2], "x": 3, "y": 0.25},
-                {"matrix": [0, 2], "x": 4, "y": 0},
-                {"matrix": [0, 3], "x": 5, "y": 0.25},
-                {"matrix": [0, 4], "x": 6, "y": 0.375},
-
-                {"matrix": [4, 4], "x": 10, "y": 0.375},
-                {"matrix": [4, 3], "x": 11, "y": 0.25},
-                {"matrix": [4, 2], "x": 12, "y": 0},
-                {"matrix": [5, 2], "x": 13, "y": 0.25},
-                {"matrix": [4, 1], "x": 14, "y": 0.625},
-                {"matrix": [4, 0], "x": 15, "y": 0.75},
-                {"matrix": [6, 0], "x": 16, "y": 1.5},
-
-                {"matrix": [1, 0], "x": 1, "y": 1.75},
-                {"matrix": [1, 1], "x": 2, "y": 1.625},
-                {"matrix": [2, 2], "x": 3, "y": 1.25},
-                {"matrix": [1, 3], "x": 4, "y": 1},
-                {"matrix": [1, 4], "x": 5, "y": 1.25},
-                {"matrix": [0, 5], "x": 6, "y": 1.375},
-
-                {"matrix": [4, 5], "x": 10, "y": 1.375},
-                {"matrix": [5, 4], "x": 11, "y": 1.25},
-                {"matrix": [5, 3], "x": 12, "y": 1},
-                {"matrix": [6, 2], "x": 13, "y": 1.25},
-                {"matrix": [5, 1], "x": 14, "y": 1.625},
-                {"matrix": [5, 0], "x": 15, "y": 1.75},
-
-                {"matrix": [2, 1], "x": 1, "y": 2.75},
-                {"matrix": [3, 2], "x": 2, "y": 2.625},
-                {"matrix": [3, 3], "x": 3, "y": 2.25},
-                {"matrix": [2, 3], "x": 4, "y": 2},
-                {"matrix": [2, 4], "x": 5, "y": 2.25},
-                {"matrix": [1, 5], "x": 6, "y": 2.375},
-
-                {"matrix": [5, 5], "x": 10, "y": 2.375},
-                {"matrix": [6, 4], "x": 11, "y": 2.25},
-                {"matrix": [6, 3], "x": 12, "y": 2},
-                {"matrix": [7, 3], "x": 13, "y": 2.25},
-                {"matrix": [7, 2], "x": 14, "y": 2.625},
-                {"matrix": [6, 1], "x": 15, "y": 2.75},
-
-                {"matrix": [3, 4], "x": 5, "y": 3.25},
-                {"matrix": [2, 5], "x": 6, "y": 3.375},
-                {"matrix": [3, 5], "x": 7, "y": 3.5},
-
-                {"matrix": [7, 5], "x": 9, "y": 3.5},
-                {"matrix": [6, 5], "x": 10, "y": 3.375},
-                {"matrix": [7, 4], "x": 11, "y": 3.25}
-            ]
-        }
-    }
-}
diff --git a/keyboards/jian/rev2/keyboard.json b/keyboards/jian/rev2/keyboard.json
new file mode 100644
index 00000000000..e64df224a5f
--- /dev/null
+++ b/keyboards/jian/rev2/keyboard.json
@@ -0,0 +1,107 @@
+{
+    "keyboard_name": "Jian",
+    "usb": {
+        "device_version": "2.0.0"
+    },
+    "matrix_pins": {
+        "cols": ["D3", "D2", "B4", "F6", "F7", "B2"],
+        "rows": ["F4", "F5", "B1", "B3"]
+    },
+    "diode_direction": "COL2ROW",
+    "backlight": {
+        "pin": "C6",
+        "levels": 5
+    },
+    "rgblight": {
+        "hue_steps": 10,
+        "led_count": 7,
+        "sleep": true,
+        "split": true,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": true,
+            "twinkle": true
+        }
+    },
+    "ws2812": {
+        "pin": "D4"
+    },
+    "qmk_lufa_bootloader": {
+        "esc_input": "B1",
+        "esc_output": "D3"
+    },
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "D1"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "qmk-dfu",
+    "features": {
+        "backlight": true,
+        "rgblight": true
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [2, 0], "x": 0, "y": 1.5},
+                {"matrix": [0, 0], "x": 1, "y": 0.75},
+                {"matrix": [0, 1], "x": 2, "y": 0.625},
+                {"matrix": [1, 2], "x": 3, "y": 0.25},
+                {"matrix": [0, 2], "x": 4, "y": 0},
+                {"matrix": [0, 3], "x": 5, "y": 0.25},
+                {"matrix": [0, 4], "x": 6, "y": 0.375},
+
+                {"matrix": [4, 4], "x": 10, "y": 0.375},
+                {"matrix": [4, 3], "x": 11, "y": 0.25},
+                {"matrix": [4, 2], "x": 12, "y": 0},
+                {"matrix": [5, 2], "x": 13, "y": 0.25},
+                {"matrix": [4, 1], "x": 14, "y": 0.625},
+                {"matrix": [4, 0], "x": 15, "y": 0.75},
+                {"matrix": [6, 0], "x": 16, "y": 1.5},
+
+                {"matrix": [1, 0], "x": 1, "y": 1.75},
+                {"matrix": [1, 1], "x": 2, "y": 1.625},
+                {"matrix": [2, 2], "x": 3, "y": 1.25},
+                {"matrix": [1, 3], "x": 4, "y": 1},
+                {"matrix": [1, 4], "x": 5, "y": 1.25},
+                {"matrix": [0, 5], "x": 6, "y": 1.375},
+
+                {"matrix": [4, 5], "x": 10, "y": 1.375},
+                {"matrix": [5, 4], "x": 11, "y": 1.25},
+                {"matrix": [5, 3], "x": 12, "y": 1},
+                {"matrix": [6, 2], "x": 13, "y": 1.25},
+                {"matrix": [5, 1], "x": 14, "y": 1.625},
+                {"matrix": [5, 0], "x": 15, "y": 1.75},
+
+                {"matrix": [2, 1], "x": 1, "y": 2.75},
+                {"matrix": [3, 2], "x": 2, "y": 2.625},
+                {"matrix": [3, 3], "x": 3, "y": 2.25},
+                {"matrix": [2, 3], "x": 4, "y": 2},
+                {"matrix": [2, 4], "x": 5, "y": 2.25},
+                {"matrix": [1, 5], "x": 6, "y": 2.375},
+
+                {"matrix": [5, 5], "x": 10, "y": 2.375},
+                {"matrix": [6, 4], "x": 11, "y": 2.25},
+                {"matrix": [6, 3], "x": 12, "y": 2},
+                {"matrix": [7, 3], "x": 13, "y": 2.25},
+                {"matrix": [7, 2], "x": 14, "y": 2.625},
+                {"matrix": [6, 1], "x": 15, "y": 2.75},
+
+                {"matrix": [3, 4], "x": 5, "y": 3.25},
+                {"matrix": [2, 5], "x": 6, "y": 3.375},
+                {"matrix": [3, 5], "x": 7, "y": 3.5},
+
+                {"matrix": [7, 5], "x": 9, "y": 3.5},
+                {"matrix": [6, 5], "x": 10, "y": 3.375},
+                {"matrix": [7, 4], "x": 11, "y": 3.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/jian/rev2/rules.mk b/keyboards/jian/rev2/rules.mk
deleted file mode 100644
index e8415063bc2..00000000000
--- a/keyboards/jian/rev2/rules.mk
+++ /dev/null
@@ -1,6 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-CONSOLE_ENABLE = no
-BACKLIGHT_ENABLE = yes
-RGBLIGHT_ENABLE = yes
diff --git a/keyboards/jian/rules.mk b/keyboards/jian/rules.mk
index 72270833056..c19fa00b5cb 100644
--- a/keyboards/jian/rules.mk
+++ b/keyboards/jian/rules.mk
@@ -1,2 +1 @@
 DEFAULT_FOLDER = jian/rev2
-LTO_ENABLE = yes
diff --git a/keyboards/jiran/rev1/info.json b/keyboards/jiran/rev1/info.json
deleted file mode 100644
index b9a6d56fe6b..00000000000
--- a/keyboards/jiran/rev1/info.json
+++ /dev/null
@@ -1,77 +0,0 @@
-{
-    "backlight": {
-        "pin": "B6",
-        "levels": 5
-    },
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 0], "x": 1, "y": 0.75},
-                {"matrix": [0, 1], "x": 2, "y": 0.62},
-                {"matrix": [0, 2], "x": 3, "y": 0.25},
-                {"matrix": [0, 3], "x": 4, "y": 0},
-                {"matrix": [0, 4], "x": 5, "y": 0.25},
-                {"matrix": [0, 5], "x": 6, "y": 0.37},
-
-                {"matrix": [5, 5], "x": 11.75, "y": 0.37},
-                {"matrix": [5, 4], "x": 12.75, "y": 0.25},
-                {"matrix": [5, 3], "x": 13.75, "y": 0},
-                {"matrix": [5, 2], "x": 14.75, "y": 0.25},
-                {"matrix": [5, 1], "x": 15.75, "y": 0.62},
-                {"matrix": [5, 0], "x": 16.75, "y": 0.75},
-
-                {"matrix": [4, 0], "x": 0, "y": 2.5},
-                {"matrix": [1, 0], "x": 1, "y": 1.75},
-                {"matrix": [1, 1], "x": 2, "y": 1.62},
-                {"matrix": [1, 2], "x": 3, "y": 1.25},
-                {"matrix": [1, 3], "x": 4, "y": 1},
-                {"matrix": [1, 4], "x": 5, "y": 1.25},
-                {"matrix": [1, 5], "x": 6, "y": 1.37},
-
-                {"matrix": [6, 5], "x": 11.75, "y": 1.37},
-                {"matrix": [6, 4], "x": 12.75, "y": 1.25},
-                {"matrix": [6, 3], "x": 13.75, "y": 1},
-                {"matrix": [6, 2], "x": 14.75, "y": 1.25},
-                {"matrix": [6, 1], "x": 15.75, "y": 1.62},
-                {"matrix": [6, 0], "x": 16.75, "y": 1.75},
-                {"matrix": [9, 0], "x": 17.75, "y": 2.5},
-
-                {"matrix": [2, 0], "x": 1, "y": 2.75},
-                {"matrix": [2, 1], "x": 2, "y": 2.62},
-                {"matrix": [2, 2], "x": 3, "y": 2.25},
-                {"matrix": [2, 3], "x": 4, "y": 2},
-                {"matrix": [2, 4], "x": 5, "y": 2.25},
-                {"matrix": [2, 5], "x": 6, "y": 2.37},
-
-                {"matrix": [7, 5], "x": 11.75, "y": 2.37},
-                {"matrix": [7, 4], "x": 12.75, "y": 2.25},
-                {"matrix": [7, 3], "x": 13.75, "y": 2},
-                {"matrix": [7, 2], "x": 14.75, "y": 2.25},
-                {"matrix": [7, 1], "x": 15.75, "y": 2.62},
-                {"matrix": [7, 0], "x": 16.75, "y": 2.75},
-
-                {"matrix": [3, 0], "x": 1, "y": 3.75},
-                {"matrix": [3, 1], "x": 2, "y": 3.62},
-                {"matrix": [3, 2], "x": 3, "y": 3.25},
-                {"matrix": [3, 3], "x": 4, "y": 3},
-                {"matrix": [3, 4], "x": 5, "y": 3.25},
-                {"matrix": [3, 5], "x": 6, "y": 3.37},
-
-                {"matrix": [8, 5], "x": 11.75, "y": 3.37},
-                {"matrix": [8, 4], "x": 12.75, "y": 3.25},
-                {"matrix": [8, 3], "x": 13.75, "y": 3},
-                {"matrix": [8, 2], "x": 14.75, "y": 3.25},
-                {"matrix": [8, 1], "x": 15.75, "y": 3.62},
-                {"matrix": [8, 0], "x": 16.75, "y": 3.75},
-
-                {"matrix": [4, 3], "x": 5, "y": 4.25},
-                {"matrix": [4, 4], "x": 6, "y": 4.37},
-                {"matrix": [4, 5], "x": 7, "y": 4.5},
-
-                {"matrix": [9, 5], "x": 10.75, "y": 4.5},
-                {"matrix": [9, 4], "x": 11.75, "y": 4.37},
-                {"matrix": [9, 3], "x": 12.75, "y": 4.25}
-            ]
-        }
-    }
-}
diff --git a/keyboards/jiran/rev1/keyboard.json b/keyboards/jiran/rev1/keyboard.json
new file mode 100644
index 00000000000..1e36d757caf
--- /dev/null
+++ b/keyboards/jiran/rev1/keyboard.json
@@ -0,0 +1,83 @@
+{
+    "backlight": {
+        "pin": "B6",
+        "levels": 5
+    },
+    "features": {
+        "bootmagic": false,
+        "mousekey": false,
+        "extrakey": false,
+        "backlight": true
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 1, "y": 0.75},
+                {"matrix": [0, 1], "x": 2, "y": 0.62},
+                {"matrix": [0, 2], "x": 3, "y": 0.25},
+                {"matrix": [0, 3], "x": 4, "y": 0},
+                {"matrix": [0, 4], "x": 5, "y": 0.25},
+                {"matrix": [0, 5], "x": 6, "y": 0.37},
+
+                {"matrix": [5, 5], "x": 11.75, "y": 0.37},
+                {"matrix": [5, 4], "x": 12.75, "y": 0.25},
+                {"matrix": [5, 3], "x": 13.75, "y": 0},
+                {"matrix": [5, 2], "x": 14.75, "y": 0.25},
+                {"matrix": [5, 1], "x": 15.75, "y": 0.62},
+                {"matrix": [5, 0], "x": 16.75, "y": 0.75},
+
+                {"matrix": [4, 0], "x": 0, "y": 2.5},
+                {"matrix": [1, 0], "x": 1, "y": 1.75},
+                {"matrix": [1, 1], "x": 2, "y": 1.62},
+                {"matrix": [1, 2], "x": 3, "y": 1.25},
+                {"matrix": [1, 3], "x": 4, "y": 1},
+                {"matrix": [1, 4], "x": 5, "y": 1.25},
+                {"matrix": [1, 5], "x": 6, "y": 1.37},
+
+                {"matrix": [6, 5], "x": 11.75, "y": 1.37},
+                {"matrix": [6, 4], "x": 12.75, "y": 1.25},
+                {"matrix": [6, 3], "x": 13.75, "y": 1},
+                {"matrix": [6, 2], "x": 14.75, "y": 1.25},
+                {"matrix": [6, 1], "x": 15.75, "y": 1.62},
+                {"matrix": [6, 0], "x": 16.75, "y": 1.75},
+                {"matrix": [9, 0], "x": 17.75, "y": 2.5},
+
+                {"matrix": [2, 0], "x": 1, "y": 2.75},
+                {"matrix": [2, 1], "x": 2, "y": 2.62},
+                {"matrix": [2, 2], "x": 3, "y": 2.25},
+                {"matrix": [2, 3], "x": 4, "y": 2},
+                {"matrix": [2, 4], "x": 5, "y": 2.25},
+                {"matrix": [2, 5], "x": 6, "y": 2.37},
+
+                {"matrix": [7, 5], "x": 11.75, "y": 2.37},
+                {"matrix": [7, 4], "x": 12.75, "y": 2.25},
+                {"matrix": [7, 3], "x": 13.75, "y": 2},
+                {"matrix": [7, 2], "x": 14.75, "y": 2.25},
+                {"matrix": [7, 1], "x": 15.75, "y": 2.62},
+                {"matrix": [7, 0], "x": 16.75, "y": 2.75},
+
+                {"matrix": [3, 0], "x": 1, "y": 3.75},
+                {"matrix": [3, 1], "x": 2, "y": 3.62},
+                {"matrix": [3, 2], "x": 3, "y": 3.25},
+                {"matrix": [3, 3], "x": 4, "y": 3},
+                {"matrix": [3, 4], "x": 5, "y": 3.25},
+                {"matrix": [3, 5], "x": 6, "y": 3.37},
+
+                {"matrix": [8, 5], "x": 11.75, "y": 3.37},
+                {"matrix": [8, 4], "x": 12.75, "y": 3.25},
+                {"matrix": [8, 3], "x": 13.75, "y": 3},
+                {"matrix": [8, 2], "x": 14.75, "y": 3.25},
+                {"matrix": [8, 1], "x": 15.75, "y": 3.62},
+                {"matrix": [8, 0], "x": 16.75, "y": 3.75},
+
+                {"matrix": [4, 3], "x": 5, "y": 4.25},
+                {"matrix": [4, 4], "x": 6, "y": 4.37},
+                {"matrix": [4, 5], "x": 7, "y": 4.5},
+
+                {"matrix": [9, 5], "x": 10.75, "y": 4.5},
+                {"matrix": [9, 4], "x": 11.75, "y": 4.37},
+                {"matrix": [9, 3], "x": 12.75, "y": 4.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/jiran/rev1/rules.mk b/keyboards/jiran/rev1/rules.mk
deleted file mode 100644
index bd518d8f273..00000000000
--- a/keyboards/jiran/rev1/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-BACKLIGHT_ENABLE = yes
diff --git a/keyboards/jiran/rev2/info.json b/keyboards/jiran/rev2/info.json
deleted file mode 100644
index 8f52510ff76..00000000000
--- a/keyboards/jiran/rev2/info.json
+++ /dev/null
@@ -1,93 +0,0 @@
-{
-   "rgblight": {
-       "hue_steps": 10,
-       "led_count": 56,
-       "split_count": [28, 28],
-       "animations": {
-            "breathing": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "snake": true,
-            "knight": true,
-            "christmas": true,
-            "static_gradient": true,
-            "rgb_test": true,
-            "alternating": true,
-            "twinkle": true
-        }
-   },
-   "ws2812": {
-       "pin": "B6"
-   },
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 0], "x": 1, "y": 0.75},
-                {"matrix": [0, 1], "x": 2, "y": 0.62},
-                {"matrix": [0, 2], "x": 3, "y": 0.25},
-                {"matrix": [0, 3], "x": 4, "y": 0},
-                {"matrix": [0, 4], "x": 5, "y": 0.25},
-                {"matrix": [0, 5], "x": 6, "y": 0.37},
-
-                {"matrix": [5, 5], "x": 11.75, "y": 0.37},
-                {"matrix": [5, 4], "x": 12.75, "y": 0.25},
-                {"matrix": [5, 3], "x": 13.75, "y": 0},
-                {"matrix": [5, 2], "x": 14.75, "y": 0.25},
-                {"matrix": [5, 1], "x": 15.75, "y": 0.62},
-                {"matrix": [5, 0], "x": 16.75, "y": 0.75},
-
-                {"matrix": [4, 0], "x": 0, "y": 2.5},
-                {"matrix": [1, 0], "x": 1, "y": 1.75},
-                {"matrix": [1, 1], "x": 2, "y": 1.62},
-                {"matrix": [1, 2], "x": 3, "y": 1.25},
-                {"matrix": [1, 3], "x": 4, "y": 1},
-                {"matrix": [1, 4], "x": 5, "y": 1.25},
-                {"matrix": [1, 5], "x": 6, "y": 1.37},
-
-                {"matrix": [6, 5], "x": 11.75, "y": 1.37},
-                {"matrix": [6, 4], "x": 12.75, "y": 1.25},
-                {"matrix": [6, 3], "x": 13.75, "y": 1},
-                {"matrix": [6, 2], "x": 14.75, "y": 1.25},
-                {"matrix": [6, 1], "x": 15.75, "y": 1.62},
-                {"matrix": [6, 0], "x": 16.75, "y": 1.75},
-                {"matrix": [9, 0], "x": 17.75, "y": 2.5},
-
-                {"matrix": [2, 0], "x": 1, "y": 2.75},
-                {"matrix": [2, 1], "x": 2, "y": 2.62},
-                {"matrix": [2, 2], "x": 3, "y": 2.25},
-                {"matrix": [2, 3], "x": 4, "y": 2},
-                {"matrix": [2, 4], "x": 5, "y": 2.25},
-                {"matrix": [2, 5], "x": 6, "y": 2.37},
-
-                {"matrix": [7, 5], "x": 11.75, "y": 2.37},
-                {"matrix": [7, 4], "x": 12.75, "y": 2.25},
-                {"matrix": [7, 3], "x": 13.75, "y": 2},
-                {"matrix": [7, 2], "x": 14.75, "y": 2.25},
-                {"matrix": [7, 1], "x": 15.75, "y": 2.62},
-                {"matrix": [7, 0], "x": 16.75, "y": 2.75},
-
-                {"matrix": [3, 0], "x": 1, "y": 3.75},
-                {"matrix": [3, 1], "x": 2, "y": 3.62},
-                {"matrix": [3, 2], "x": 3, "y": 3.25},
-                {"matrix": [3, 3], "x": 4, "y": 3},
-                {"matrix": [3, 4], "x": 5, "y": 3.25},
-                {"matrix": [3, 5], "x": 6, "y": 3.37},
-
-                {"matrix": [8, 5], "x": 11.75, "y": 3.37},
-                {"matrix": [8, 4], "x": 12.75, "y": 3.25},
-                {"matrix": [8, 3], "x": 13.75, "y": 3},
-                {"matrix": [8, 2], "x": 14.75, "y": 3.25},
-                {"matrix": [8, 1], "x": 15.75, "y": 3.62},
-                {"matrix": [8, 0], "x": 16.75, "y": 3.75},
-
-                {"matrix": [4, 3], "x": 5, "y": 4.25},
-                {"matrix": [4, 4], "x": 6, "y": 4.37},
-                {"matrix": [4, 5], "x": 7, "y": 4.5},
-
-                {"matrix": [9, 5], "x": 10.75, "y": 4.5},
-                {"matrix": [9, 4], "x": 11.75, "y": 4.37},
-                {"matrix": [9, 3], "x": 12.75, "y": 4.25}
-            ]
-        }
-    }
-}
diff --git a/keyboards/jiran/rev2/keyboard.json b/keyboards/jiran/rev2/keyboard.json
new file mode 100644
index 00000000000..37bed5c7960
--- /dev/null
+++ b/keyboards/jiran/rev2/keyboard.json
@@ -0,0 +1,99 @@
+{
+   "rgblight": {
+       "hue_steps": 10,
+       "led_count": 56,
+       "split_count": [28, 28],
+       "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": true,
+            "twinkle": true
+        }
+   },
+   "ws2812": {
+       "pin": "B6"
+   },
+    "features": {
+        "bootmagic": false,
+        "mousekey": false,
+        "extrakey": false,
+        "rgblight": true
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 1, "y": 0.75},
+                {"matrix": [0, 1], "x": 2, "y": 0.62},
+                {"matrix": [0, 2], "x": 3, "y": 0.25},
+                {"matrix": [0, 3], "x": 4, "y": 0},
+                {"matrix": [0, 4], "x": 5, "y": 0.25},
+                {"matrix": [0, 5], "x": 6, "y": 0.37},
+
+                {"matrix": [5, 5], "x": 11.75, "y": 0.37},
+                {"matrix": [5, 4], "x": 12.75, "y": 0.25},
+                {"matrix": [5, 3], "x": 13.75, "y": 0},
+                {"matrix": [5, 2], "x": 14.75, "y": 0.25},
+                {"matrix": [5, 1], "x": 15.75, "y": 0.62},
+                {"matrix": [5, 0], "x": 16.75, "y": 0.75},
+
+                {"matrix": [4, 0], "x": 0, "y": 2.5},
+                {"matrix": [1, 0], "x": 1, "y": 1.75},
+                {"matrix": [1, 1], "x": 2, "y": 1.62},
+                {"matrix": [1, 2], "x": 3, "y": 1.25},
+                {"matrix": [1, 3], "x": 4, "y": 1},
+                {"matrix": [1, 4], "x": 5, "y": 1.25},
+                {"matrix": [1, 5], "x": 6, "y": 1.37},
+
+                {"matrix": [6, 5], "x": 11.75, "y": 1.37},
+                {"matrix": [6, 4], "x": 12.75, "y": 1.25},
+                {"matrix": [6, 3], "x": 13.75, "y": 1},
+                {"matrix": [6, 2], "x": 14.75, "y": 1.25},
+                {"matrix": [6, 1], "x": 15.75, "y": 1.62},
+                {"matrix": [6, 0], "x": 16.75, "y": 1.75},
+                {"matrix": [9, 0], "x": 17.75, "y": 2.5},
+
+                {"matrix": [2, 0], "x": 1, "y": 2.75},
+                {"matrix": [2, 1], "x": 2, "y": 2.62},
+                {"matrix": [2, 2], "x": 3, "y": 2.25},
+                {"matrix": [2, 3], "x": 4, "y": 2},
+                {"matrix": [2, 4], "x": 5, "y": 2.25},
+                {"matrix": [2, 5], "x": 6, "y": 2.37},
+
+                {"matrix": [7, 5], "x": 11.75, "y": 2.37},
+                {"matrix": [7, 4], "x": 12.75, "y": 2.25},
+                {"matrix": [7, 3], "x": 13.75, "y": 2},
+                {"matrix": [7, 2], "x": 14.75, "y": 2.25},
+                {"matrix": [7, 1], "x": 15.75, "y": 2.62},
+                {"matrix": [7, 0], "x": 16.75, "y": 2.75},
+
+                {"matrix": [3, 0], "x": 1, "y": 3.75},
+                {"matrix": [3, 1], "x": 2, "y": 3.62},
+                {"matrix": [3, 2], "x": 3, "y": 3.25},
+                {"matrix": [3, 3], "x": 4, "y": 3},
+                {"matrix": [3, 4], "x": 5, "y": 3.25},
+                {"matrix": [3, 5], "x": 6, "y": 3.37},
+
+                {"matrix": [8, 5], "x": 11.75, "y": 3.37},
+                {"matrix": [8, 4], "x": 12.75, "y": 3.25},
+                {"matrix": [8, 3], "x": 13.75, "y": 3},
+                {"matrix": [8, 2], "x": 14.75, "y": 3.25},
+                {"matrix": [8, 1], "x": 15.75, "y": 3.62},
+                {"matrix": [8, 0], "x": 16.75, "y": 3.75},
+
+                {"matrix": [4, 3], "x": 5, "y": 4.25},
+                {"matrix": [4, 4], "x": 6, "y": 4.37},
+                {"matrix": [4, 5], "x": 7, "y": 4.5},
+
+                {"matrix": [9, 5], "x": 10.75, "y": 4.5},
+                {"matrix": [9, 4], "x": 11.75, "y": 4.37},
+                {"matrix": [9, 3], "x": 12.75, "y": 4.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/jiran/rev2/rules.mk b/keyboards/jiran/rev2/rules.mk
deleted file mode 100644
index 1e3cebb1451..00000000000
--- a/keyboards/jiran/rev2/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-RGBLIGHT_ENABLE = yes
diff --git a/keyboards/jiran/rules.mk b/keyboards/jiran/rules.mk
index d1450315061..3ffe13302d3 100644
--- a/keyboards/jiran/rules.mk
+++ b/keyboards/jiran/rules.mk
@@ -1,14 +1 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = no        # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
 DEFAULT_FOLDER = jiran/rev1
diff --git a/keyboards/jlw/bruce_le_clavier/info.json b/keyboards/jlw/bruce_le_clavier/info.json
new file mode 100644
index 00000000000..998140599dd
--- /dev/null
+++ b/keyboards/jlw/bruce_le_clavier/info.json
@@ -0,0 +1,82 @@
+{
+    "keyboard_name": "Bruce the Keyboard",
+    "manufacturer": "jlw",
+    "url": "https://github.com/josh-l-wang/Bruce-the-Keyboard-the-Resources",
+    "maintainer": "jlw",
+    "usb": {
+        "vid": "0x1209",
+        "pid": "0xA460",
+        "device_version": "0.0.1"
+    },
+    "processor": "STM32F072",
+    "bootloader": "stm32-dfu",
+    "diode_direction": "COL2ROW",
+    "matrix_pins": {
+        "cols": ["B1", "B0", "A7", "A4", "A3", "B7", "B6", "B5", "B4", "B3", "B14"],
+        "rows": ["B11", "B9", "A5", "A6", "B15"]
+    },
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "encoder": true
+    },
+    "bootmagic": {
+        "matrix": [4, 10]
+    },
+    "encoder": {
+        "rotary": [
+            {"pin_a": "B12", "pin_b": "B13"}
+        ]
+    },
+    "ws2812": {
+        "pin": "B8"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0, "h":1.75},
+                {"matrix": [0, 1], "x": 1, "y": 0, "h":1.5},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0, "h":1.25},
+                {"matrix": [0, 4], "x": 4, "y": 0, "h":1.25},
+
+                {"matrix": [4, 10], "x": 5.25, "y": 0},
+
+                {"matrix": [0, 5], "x": 6.5, "y": 0, "h":1.25},
+                {"matrix": [0, 6], "x": 7.5, "y": 0, "h":1.25},
+                {"matrix": [0, 7], "x": 8.5, "y": 0},
+                {"matrix": [0, 8], "x": 9.5, "y": 0, "h":1.5},
+                {"matrix": [0, 9], "x": 10.5, "y": 0, "h":1.75},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.75},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 6.5, "y": 1.25},
+                {"matrix": [1, 6], "x": 7.5, "y": 1.25},
+                {"matrix": [1, 7], "x": 8.5, "y": 1},
+                {"matrix": [1, 8], "x": 9.5, "y": 1.5},
+                {"matrix": [1, 9], "x": 10.5,"y": 1.75},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.75, "h":1.5},
+                {"matrix": [2, 1], "x": 1, "y": 2.5, "h":1.75},
+                {"matrix": [2, 2], "x": 2, "y": 2, "h":1.25},
+                {"matrix": [2, 3], "x": 3, "y": 2.25},
+                {"matrix": [2, 4], "x": 4, "y": 2.25},
+                {"matrix": [2, 5], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 8.5, "y": 2, "h":1.25},
+                {"matrix": [2, 8], "x": 9.5, "y": 2.5, "h":1.75},
+                {"matrix": [2, 9], "x": 10.5,"y": 2.75, "h":1.5},
+
+                {"matrix": [3, 2], "x": 2, "y": 3.25},
+                {"matrix": [3, 3], "x": 3, "y": 3.25, "w": 2},
+                {"matrix": [3, 5], "x": 6.5, "y": 3.25, "w": 2},
+                {"matrix": [3, 7], "x": 8.5, "y": 3.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/jlw/bruce_le_clavier/keymaps/default/keymap.c b/keyboards/jlw/bruce_le_clavier/keymaps/default/keymap.c
new file mode 100644
index 00000000000..51a8f0939d4
--- /dev/null
+++ b/keyboards/jlw/bruce_le_clavier/keymaps/default/keymap.c
@@ -0,0 +1,43 @@
+// Copyright 2023 jlw
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT(
+         KC_Q,          KC_W,           KC_F,           KC_P,   KC_B,    QK_BOOT,   KC_J,   KC_L,   KC_U,           KC_Y,           KC_QUOT,
+         LGUI_T(KC_A),  LALT_T(KC_R),   LCTL_T(KC_S),   KC_T,   KC_G,               KC_M,   KC_N,   RCTL_T(KC_E),   LALT_T(KC_I),   LGUI_T(KC_O),
+         KC_Z,          KC_X,           KC_C,           KC_D,   KC_V,               KC_K,   KC_H,   KC_COMM,        KC_DOT,         KC_SLSH,
+                                        LT(3, KC_TAB), SFT_T(KC_BSPC),              LT(1, KC_SPC),  LT(2,KC_ENT)
+    ),
+
+    [1] = LAYOUT(
+         KC_GRAVE, KC_F2,    XXXXXXX,  KC_F4,    KC_F5,    XXXXXXX,  KC_BSLS,  KC_MINUS, KC_EQUAL, KC_LBRC,  KC_RBRC,
+         KC_1,     KC_2,     KC_3,     KC_4,     KC_5,               KC_6,     KC_7,     KC_8,     KC_9,     KC_0,
+         DF(0),    XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,            DF(1),    XXXXXXX,  _______,  _______,  KC_SCLN,
+                                       _______,  _______,            _______,  _______
+    ),
+
+    [2] = LAYOUT(
+         XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  KC_F11,   KC_F12,   XXXXXXX,  XXXXXXX,
+         KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,              KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,
+         DF(0),    XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,            DF(2),    XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,
+                                       _______,  _______,            _______,  _______
+    ),
+    [3] = LAYOUT(
+         XXXXXXX,  XXXXXXX,  LSG(KC_4),LSG(KC_S),XXXXXXX,  XXXXXXX,  KC_HOME,  XXXXXXX,  KC_UP,    XXXXXXX,  KC_PGUP,
+         KC_LGUI,  KC_LALT,  KC_LCTL,  KC_LGUI,  XXXXXXX,            KC_END,   KC_LEFT,  KC_DOWN,  KC_RIGHT, KC_PGDN,
+         DF(0),    XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,            DF(2),    XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,
+                                       _______,  _______,            _______,  _______
+    )
+};
+
+// Encoder Map
+#ifdef ENCODER_MAP_ENABLE
+    const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
+        [0] =   { ENCODER_CCW_CW(S(KC_F2), KC_F2) },
+        [1] =   { ENCODER_CCW_CW(KC_VOLU, KC_VOLD) },
+        [2] =   { ENCODER_CCW_CW(_______, _______) },
+        [3] =   { ENCODER_CCW_CW(_______, _______) }
+    };
+#endif
diff --git a/keyboards/jlw/bruce_le_clavier/readme.md b/keyboards/jlw/bruce_le_clavier/readme.md
new file mode 100644
index 00000000000..7bef2d5eef7
--- /dev/null
+++ b/keyboards/jlw/bruce_le_clavier/readme.md
@@ -0,0 +1,53 @@
+# Bruce le Clavier
+
+Please note that Bruce le Clavier is a keyboard, not a human, and is also not Bruce the Keyboard.
+
+Bruce the Keyboard is a column staggered unibody split 35-key board created by [jlw](github.com/josh-l-wang), with the option to replace the middle key for an EC11 rotary encoder (with or without switch function).
+
+This keyboard has RGB, 3.3V, and GND pins broken out if you wish to add an LED strip.
+
+![Bruce le Clavier](https://i.imgur.com/qL9WHW4.jpg)
+
+* Keyboard Maintainer: [jlw](https://github.com/josh-l-wang)
+* Hardware Supported: [Bruce le Clavier and Cases](https://github.com/josh-l-wang/Bruce-the-Keyboard-the-Resources)
+* Hardware Availability: [jlw-kb.com](https://jlw-kb.com)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make jlw/bruce_le_clavier:default
+
+Flashing example for this keyboard:
+
+    make jlw/bruce_le_clavier: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 (the top left key) and plug in the keyboard
+* **Physical reset button**: Hold button on the back of the PCB while plugging in the PCB
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
+
+
+
+
+# Ceci est le micrologiciel pour Bruce le clavier
+
+Notez bien que Bruce le clavier n'est pas un humain.
+
+Bruce le clavier est un clavier de 35 touches colonnaire créé par [jlw](github.com/josh-l-wang). Il y a une option d'utiliser un encodeur rotatif au centre.
+
+* Maintaineur de clavier: [jlw](https://github.com/josh-l-wang)
+* Matériel supporté: [Bruce le Clavier and Cases](https://github.com/josh-l-wang/Bruce-the-Keyboard-the-Resources)
+* Matériel disponibilité: [jlw-kb.com](https://jlw-kb.com)
+
+Exemple de « make » (après avoir installé votre environnement de développement):
+
+    make jlw/bruce_le_clavier:default
+    
+Exemple de flash pour ce clavier:
+
+    make jlw/bruce_le_clavier:flash
+    
\ No newline at end of file
diff --git a/keyboards/jlw/bruce_le_clavier/rules.mk b/keyboards/jlw/bruce_le_clavier/rules.mk
new file mode 100644
index 00000000000..d4f87a82781
--- /dev/null
+++ b/keyboards/jlw/bruce_le_clavier/rules.mk
@@ -0,0 +1 @@
+#This file intentionally left blank
diff --git a/keyboards/jlw/bruce_the_keyboard/info.json b/keyboards/jlw/bruce_the_keyboard/info.json
new file mode 100644
index 00000000000..0405869d408
--- /dev/null
+++ b/keyboards/jlw/bruce_the_keyboard/info.json
@@ -0,0 +1,68 @@
+{
+    "keyboard_name": "Bruce the Keyboard",
+    "manufacturer": "jlw",
+    "url": "https://github.com/josh-l-wang/Bruce-the-Keyboard-the-Resources",
+    "maintainer": "jlw",
+    "usb": {
+        "vid": "0x1209",
+        "pid": "0xA459",
+        "device_version": "3.0.0"
+    },
+    "processor": "STM32F072",
+    "bootloader": "stm32-dfu",
+    "diode_direction": "COL2ROW",
+    "matrix_pins": {
+        "cols": ["B1", "B0", "A7", "A4", "A3", "B7", "B6", "B5", "B4", "B3"],
+        "rows": ["B11", "B9", "A5", "A6"]
+    },
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0, "h":1.75},
+                {"matrix": [0, 1], "x": 1, "y": 0, "h":1.5},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0, "h":1.25},
+                {"matrix": [0, 4], "x": 4, "y": 0, "h":1.25},
+                {"matrix": [0, 5], "x": 5, "y": 0, "h":1.25},
+                {"matrix": [0, 6], "x": 6, "y": 0, "h":1.25},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0, "h":1.5},
+                {"matrix": [0, 9], "x": 9, "y": 0, "h":1.75},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.75},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"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},
+                {"matrix": [1, 8], "x": 8, "y": 1.5},
+                {"matrix": [1, 9], "x": 9, "y": 1.75},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.75, "h":1.5},
+                {"matrix": [2, 1], "x": 1, "y": 2.5, "h":1.75},
+                {"matrix": [2, 2], "x": 2, "y": 2, "h":1.25},
+                {"matrix": [2, 3], "x": 3, "y": 2.25},
+                {"matrix": [2, 4], "x": 4, "y": 2.25},
+                {"matrix": [2, 5], "x": 5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6, "y": 2.25},
+                {"matrix": [2, 7], "x": 7, "y": 2, "h":1.25},
+                {"matrix": [2, 8], "x": 8, "y": 2.5, "h":1.75},
+                {"matrix": [2, 9], "x": 9, "y": 2.75, "h":1.5},
+
+                {"matrix": [3, 2], "x": 2, "y": 3.25},
+                {"matrix": [3, 3], "x": 3, "y": 3.25, "w": 2},
+                {"matrix": [3, 5], "x": 5, "y": 3.25, "w": 2},
+                {"matrix": [3, 7], "x": 7, "y": 3.25},
+            ]
+        }
+
+    }
+}
diff --git a/keyboards/jlw/bruce_the_keyboard/keymaps/default/keymap.c b/keyboards/jlw/bruce_the_keyboard/keymaps/default/keymap.c
new file mode 100644
index 00000000000..73ef2e0213c
--- /dev/null
+++ b/keyboards/jlw/bruce_the_keyboard/keymaps/default/keymap.c
@@ -0,0 +1,35 @@
+// Copyright 2024 jlw
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT(
+         KC_Q,          KC_W,           KC_F,           KC_P,   KC_B,    KC_J,   KC_L,   KC_U,           KC_Y,           KC_QUOT,
+         LGUI_T(KC_A),  LALT_T(KC_R),   LCTL_T(KC_S),   KC_T,   KC_G,    KC_M,   KC_N,   RCTL_T(KC_E),   LALT_T(KC_I),   LGUI_T(KC_O),
+         KC_Z,          KC_X,           KC_C,           KC_D,   KC_V,    KC_K,   KC_H,   KC_COMM,        KC_DOT,         KC_SLSH,
+                                        LT(3, KC_TAB), SFT_T(KC_BSPC),   LT(1, KC_SPC),  LT(2,KC_ENT)
+    ),
+
+    [1] = LAYOUT(
+         KC_GRAVE, KC_F2,    XXXXXXX,  KC_F4,    KC_F5,    KC_BSLS,  KC_MINUS, KC_EQUAL, KC_LBRC,  KC_RBRC,
+         KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,
+         DF(0),    XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  DF(1),    XXXXXXX,  _______,  _______,  KC_SCLN,
+                                       _______,  _______,  _______,  _______
+    ),
+
+    [2] = LAYOUT(
+         XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  KC_F11,   KC_F12,   XXXXXXX,  XXXXXXX,
+         KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,
+         DF(0),    XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  DF(2),    XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,
+                                       _______,  _______,  _______,  _______
+    ),
+    [3] = LAYOUT(
+         XXXXXXX,  XXXXXXX,  LSG(KC_4),LSG(KC_S),XXXXXXX,  KC_HOME,  XXXXXXX,  KC_UP,    XXXXXXX,  KC_PGUP,
+         KC_LGUI,  KC_LALT,  KC_LCTL,  KC_LGUI,  XXXXXXX,  KC_END,   KC_LEFT,  KC_DOWN,  KC_RIGHT, KC_PGDN,
+         DF(0),    XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  DF(2),    XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,
+                                       _______,  _______,  _______,  _______
+    )
+};
\ No newline at end of file
diff --git a/keyboards/jlw/bruce_the_keyboard/readme.md b/keyboards/jlw/bruce_the_keyboard/readme.md
new file mode 100644
index 00000000000..a12624c3705
--- /dev/null
+++ b/keyboards/jlw/bruce_the_keyboard/readme.md
@@ -0,0 +1,29 @@
+# Bruce the Keyboard
+
+Please note that Bruce is a keyboard, not a human.
+
+Bruce the Keyboard is a column staggered 34-key board created by [jlw](github.com/josh-l-wang) and whydobearsxplod with a single layout.
+
+![Bruce the Keyboard](https://i.imgur.com/HkbwkK0.jpeg)
+
+* Keyboard Maintainer: [jlw](https://github.com/josh-l-wang)
+* Hardware Supported: [Bruce the Keyboard the PCB and the Cases](https://github.com/josh-l-wang/Bruce-the-Keyboard-the-Resources)
+* Hardware Availability: [jlw-kb.com](https://jlw-kb.com)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make jlw/bruce_the_keyboard:default
+
+Flashing example for this keyboard:
+
+    make jlw/bruce_the_keyboard: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 (the top left key) and plug in the keyboard
+* **Physical reset button**: Hold button on the back of the PCB while plugging in the PCB
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
diff --git a/keyboards/jlw/bruce_the_keyboard/rules.mk b/keyboards/jlw/bruce_the_keyboard/rules.mk
new file mode 100644
index 00000000000..218d8921e51
--- /dev/null
+++ b/keyboards/jlw/bruce_the_keyboard/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank.
diff --git a/keyboards/jlw/vault35_wkl_universal/config.h b/keyboards/jlw/vault35_wkl_universal/config.h
new file mode 100644
index 00000000000..7edfb1b7c6b
--- /dev/null
+++ b/keyboards/jlw/vault35_wkl_universal/config.h
@@ -0,0 +1,11 @@
+// Copyright 2024 jlw
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#define WS2812_PWM_DRIVER PWMD17
+#define WS2812_PWM_CHANNEL 1
+#define WS2812_PWM_PAL_MODE 2
+#define WS2812_PWM_COMPLEMENTARY_OUTPUT
+#define WS2812_DMA_STREAM STM32_DMA1_STREAM1
+#define WS2812_DMA_CHANNEL 1
diff --git a/keyboards/jlw/vault35_wkl_universal/halconf.h b/keyboards/jlw/vault35_wkl_universal/halconf.h
new file mode 100644
index 00000000000..e5c3093515a
--- /dev/null
+++ b/keyboards/jlw/vault35_wkl_universal/halconf.h
@@ -0,0 +1,8 @@
+// Copyright 2024 jlw
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#define HAL_USE_PWM TRUE
+
+#include_next <halconf.h>
diff --git a/keyboards/jlw/vault35_wkl_universal/info.json b/keyboards/jlw/vault35_wkl_universal/info.json
new file mode 100644
index 00000000000..3274b717731
--- /dev/null
+++ b/keyboards/jlw/vault35_wkl_universal/info.json
@@ -0,0 +1,765 @@
+{
+    "manufacturer": "jlw",
+    "keyboard_name": "vault 35 WKL universal",
+    "maintainer": "jlw",
+    "bootloader": "stm32-dfu",
+    "diode_direction": "COL2ROW",
+    "encoder": {
+        "rotary": [
+            {"pin_a": "B0", "pin_b": "A7"},
+            {"pin_a": "B2", "pin_b": "B1"},
+            {"pin_a": "B3", "pin_b": "A15"},
+            {"pin_a": "B5", "pin_b": "B4"},
+            {"pin_a": "A1", "pin_b": "A2"}
+        ]
+    },
+    "features": {
+        "bootmagic": true,
+        "encoder": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgb_matrix": true
+    },
+    "matrix_pins": {
+        "cols": ["B6", "B8", "A13", "B13", "B14", "A14", "A0", "A3", "A4", "A5", "A6"],
+        "rows": ["B9", "B12", "B15", "A8"]
+    },
+    "processor": "STM32F072",
+    "rgb_matrix": {
+        "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_fractal": 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",
+        "hue_steps": 4,
+        "layout": [
+            {"matrix": [1, 0], "x": 1, "y": 22, "flags": 4},
+            {"matrix": [0, 0], "x": 1, "y": 11, "flags": 4},
+            {"matrix": [0, 0], "x": 3, "y": 2, "flags": 4},
+            {"matrix": [0, 0], "x": 12, "y": 2, "flags": 4},
+            {"matrix": [0, 1], "x": 23, "y": 2, "flags": 4},
+            {"matrix": [1, 1], "x": 30, "y": 2, "flags": 4},
+            {"matrix": [0, 1], "x": 42, "y": 2, "flags": 4},
+            {"matrix": [0, 2], "x": 51, "y": 2, "flags": 4},
+            {"matrix": [1, 2], "x": 60, "y": 2, "flags": 4},
+            {"matrix": [0, 3], "x": 70, "y": 2, "flags": 4},
+            {"matrix": [1, 3], "x": 79, "y": 2, "flags": 4},
+            {"matrix": [0, 4], "x": 88, "y": 2, "flags": 4},
+            {"matrix": [0, 5], "x": 98, "y": 2, "flags": 4},
+            {"matrix": [0, 6], "x": 107, "y": 2, "flags": 4},
+            {"matrix": [0, 7], "x": 116, "y": 2, "flags": 4},
+            {"matrix": [1, 7], "x": 126, "y": 2, "flags": 4},
+            {"matrix": [0, 7], "x": 135, "y": 2, "flags": 4},
+            {"matrix": [0, 8], "x": 144, "y": 2, "flags": 4},
+            {"matrix": [1, 8], "x": 154, "y": 2, "flags": 4},
+            {"matrix": [0, 9], "x": 163, "y": 2, "flags": 4},
+            {"matrix": [1, 9], "x": 173, "y": 2, "flags": 4},
+            {"matrix": [0, 10], "x": 183, "y": 2, "flags": 4},
+            {"matrix": [0, 10], "x": 192, "y": 2, "flags": 4},
+            {"matrix": [0, 10], "x": 195, "y": 13, "flags": 4},
+            {"matrix": [1, 10], "x": 195, "y": 23, "flags": 4},
+            {"matrix": [1, 10], "x": 195, "y": 32, "flags": 4},
+            {"matrix": [1, 10], "x": 195, "y": 43, "flags": 4},
+            {"matrix": [2, 10], "x": 195, "y": 55, "flags": 4},
+            {"matrix": [2, 10], "x": 195, "y": 67, "flags": 4},
+            {"matrix": [3, 10], "x": 190, "y": 79, "flags": 4},
+            {"matrix": [3, 10], "x": 195, "y": 87, "flags": 4},
+            {"matrix": [3, 10], "x": 185, "y": 88, "flags": 4},
+            {"matrix": [3, 9], "x": 176, "y": 88, "flags": 4},
+            {"matrix": [3, 9], "x": 171, "y": 82, "flags": 4},
+            {"matrix": [2, 9], "x": 171, "y": 73, "flags": 4},
+            {"matrix": [2, 9], "x": 170, "y": 67, "flags": 4},
+            {"matrix": [2, 9], "x": 164, "y": 67, "flags": 4},
+            {"matrix": [2, 8], "x": 157, "y": 67, "flags": 4},
+            {"matrix": [2, 8], "x": 151, "y": 67, "flags": 4},
+            {"matrix": [3, 8], "x": 150, "y": 74, "flags": 4},
+            {"matrix": [2, 8], "x": 150, "y": 81, "flags": 4},
+            {"matrix": [3, 8], "x": 147, "y": 88, "flags": 4},
+            {"matrix": [3, 7], "x": 139, "y": 88, "flags": 4},
+            {"matrix": [2, 7], "x": 130, "y": 88, "flags": 4},
+            {"matrix": [3, 7], "x": 122, "y": 88, "flags": 4},
+            {"matrix": [3, 6], "x": 113, "y": 88, "flags": 4},
+            {"matrix": [2, 5], "x": 102, "y": 85, "flags": 4},
+            {"matrix": [3, 5], "x": 94, "y": 85, "flags": 4},
+            {"matrix": [3, 4], "x": 85, "y": 88, "flags": 4},
+            {"matrix": [2, 3], "x": 75, "y": 88, "flags": 4},
+            {"matrix": [3, 3], "x": 66, "y": 88, "flags": 4},
+            {"matrix": [2, 2], "x": 57, "y": 88, "flags": 4},
+            {"matrix": [3, 2], "x": 49, "y": 88, "flags": 4},
+            {"matrix": [3, 2], "x": 46, "y": 83, "flags": 4},
+            {"matrix": [3, 2], "x": 46, "y": 75, "flags": 4},
+            {"matrix": [2, 1], "x": 45, "y": 67, "flags": 4},
+            {"matrix": [2, 1], "x": 39, "y": 67, "flags": 4},
+            {"matrix": [2, 1], "x": 33, "y": 67, "flags": 4},
+            {"matrix": [2, 1], "x": 26, "y": 67, "flags": 4},
+            {"matrix": [3, 0], "x": 25, "y": 73, "flags": 4},
+            {"matrix": [3, 0], "x": 25, "y": 82, "flags": 4},
+            {"matrix": [3, 0], "x": 21, "y": 88, "flags": 4},
+            {"matrix": [3, 0], "x": 12, "y": 88, "flags": 4},
+            {"matrix": [3, 0], "x": 1, "y": 88, "flags": 4},
+            {"matrix": [3, 0], "x": 6, "y": 80, "flags": 4},
+            {"matrix": [3, 0], "x": 1, "y": 70, "flags": 4},
+            {"matrix": [2, 0], "x": 1, "y": 58, "flags": 4},
+            {"matrix": [2, 0], "x": 1, "y": 46, "flags": 4},
+            {"matrix": [1, 0], "x": 1, "y": 34, "flags": 4}
+        ],
+        "sat_steps": 4,
+        "val_steps": 4
+    },
+    "url": "https://jlw-kb.com",
+    "usb": {
+        "device_version": "0.0.1",
+        "pid": "0xA457",
+        "vid": "0x1209"
+    },
+    "ws2812": {
+        "driver": "pwm",
+        "pin": "B7"
+    },
+    "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": [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": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [2, 6], "x": 6, "y": 2},
+                {"matrix": [2, 7], "x": 7, "y": 2},
+                {"matrix": [2, 8], "x": 8, "y": 2},
+                {"matrix": [2, 9], "x": 9, "y": 2},
+                {"matrix": [2, 10], "x": 10, "y": 2},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.5},
+                {"matrix": [3, 2], "x": 2.5, "y": 3},
+                {"matrix": [3, 3], "x": 3.5, "y": 3},
+                {"matrix": [3, 4], "x": 4.5, "y": 3},
+                {"matrix": [3, 5], "x": 5.5, "y": 3},
+                {"matrix": [3, 6], "x": 6.5, "y": 3},
+                {"matrix": [3, 7], "x": 7.5, "y": 3},
+                {"matrix": [3, 10], "x": 9.5, "y": 3, "w": 1.5}
+            ]
+        },
+        "LAYOUT_alpha": {
+            "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": [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": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2},
+                {"matrix": [2, 2], "x": 2.5, "y": 2},
+                {"matrix": [2, 3], "x": 3.5, "y": 2},
+                {"matrix": [2, 4], "x": 4.5, "y": 2},
+                {"matrix": [2, 6], "x": 5.5, "y": 2},
+                {"matrix": [2, 7], "x": 6.5, "y": 2},
+                {"matrix": [2, 8], "x": 7.5, "y": 2},
+                {"matrix": [2, 9], "x": 8.5, "y": 2},
+                {"matrix": [2, 10], "x": 9.5, "y": 2, "w": 1.5},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.5},
+                {"matrix": [3, 2], "x": 2.5, "y": 3},
+                {"matrix": [3, 3], "x": 3.5, "y": 3},
+                {"matrix": [3, 4], "x": 4.5, "y": 3},
+                {"matrix": [3, 5], "x": 5.5, "y": 3},
+                {"matrix": [3, 6], "x": 6.5, "y": 3},
+                {"matrix": [3, 7], "x": 7.5, "y": 3},
+                {"matrix": [3, 10], "x": 9.5, "y": 3, "w": 1.5}
+            ]
+        },
+        "LAYOUT_katana": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0, "w": 1.5},
+                {"matrix": [0, 1], "x": 1.5, "y": 0},
+                {"matrix": [0, 2], "x": 2.5, "y": 0},
+                {"matrix": [0, 3], "x": 3.5, "y": 0},
+                {"matrix": [0, 4], "x": 4.5, "y": 0},
+                {"matrix": [0, 6], "x": 5.5, "y": 0},
+                {"matrix": [0, 7], "x": 6.5, "y": 0},
+                {"matrix": [0, 8], "x": 7.5, "y": 0},
+                {"matrix": [0, 9], "x": 8.5, "y": 0},
+                {"matrix": [0, 10], "x": 9.5, "y": 0, "w": 1.25, "h": 2},
+                {"matrix": [1, 0], "x": 0.25, "y": 1},
+                {"matrix": [1, 1], "x": 1.25, "y": 1},
+                {"matrix": [1, 2], "x": 2.25, "y": 1},
+                {"matrix": [1, 3], "x": 3.25, "y": 1},
+                {"matrix": [1, 4], "x": 4.25, "y": 1},
+                {"matrix": [1, 6], "x": 5.75, "y": 1},
+                {"matrix": [1, 7], "x": 6.75, "y": 1},
+                {"matrix": [1, 8], "x": 7.75, "y": 1},
+                {"matrix": [1, 9], "x": 8.75, "y": 1},
+                {"matrix": [1, 10], "x": 9.75, "y": 1},
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [2, 6], "x": 6, "y": 2},
+                {"matrix": [2, 7], "x": 7, "y": 2},
+                {"matrix": [2, 8], "x": 8, "y": 2},
+                {"matrix": [2, 9], "x": 9, "y": 2},
+                {"matrix": [2, 10], "x": 10, "y": 2},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.5},
+                {"matrix": [3, 2], "x": 2.5, "y": 3},
+                {"matrix": [3, 3], "x": 3.5, "y": 3},
+                {"matrix": [3, 4], "x": 4.5, "y": 3},
+                {"matrix": [3, 5], "x": 5.5, "y": 3},
+                {"matrix": [3, 6], "x": 6.5, "y": 3},
+                {"matrix": [3, 7], "x": 7.5, "y": 3},
+                {"matrix": [3, 10], "x": 9.5, "y": 3, "w": 1.5}
+            ]
+        },
+        "LAYOUT_katana_iso": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0, "w": 1.5},
+                {"matrix": [0, 1], "x": 1.5, "y": 0},
+                {"matrix": [0, 2], "x": 2.5, "y": 0},
+                {"matrix": [0, 3], "x": 3.5, "y": 0},
+                {"matrix": [0, 4], "x": 4.5, "y": 0},
+                {"matrix": [0, 6], "x": 5.5, "y": 0},
+                {"matrix": [0, 7], "x": 6.5, "y": 0},
+                {"matrix": [0, 8], "x": 7.5, "y": 0},
+                {"matrix": [0, 9], "x": 8.5, "y": 0},
+                {"matrix": [0, 10], "x": 9.5, "y": 0, "w": 1.25, "h": 2},
+                {"matrix": [1, 0], "x": 0.25, "y": 1},
+                {"matrix": [1, 1], "x": 1.25, "y": 1},
+                {"matrix": [1, 2], "x": 2.25, "y": 1},
+                {"matrix": [1, 3], "x": 3.25, "y": 1},
+                {"matrix": [1, 4], "x": 4.25, "y": 1},
+                {"matrix": [1, 6], "x": 5.75, "y": 1},
+                {"matrix": [1, 7], "x": 6.75, "y": 1},
+                {"matrix": [1, 8], "x": 7.75, "y": 1},
+                {"matrix": [1, 9], "x": 8.75, "y": 1},
+                {"matrix": [1, 10], "x": 9.75, "y": 1},
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [2, 6], "x": 6, "y": 2},
+                {"matrix": [2, 7], "x": 7, "y": 2},
+                {"matrix": [2, 8], "x": 8, "y": 2},
+                {"matrix": [2, 9], "x": 9, "y": 2},
+                {"matrix": [2, 10], "x": 10, "y": 2},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.5},
+                {"matrix": [3, 2], "x": 2.5, "y": 3},
+                {"matrix": [3, 3], "x": 3.5, "y": 3},
+                {"matrix": [3, 4], "x": 4.5, "y": 3},
+                {"matrix": [3, 5], "x": 5.5, "y": 3},
+                {"matrix": [3, 6], "x": 6.5, "y": 3},
+                {"matrix": [3, 7], "x": 7.5, "y": 3},
+                {"matrix": [3, 10], "x": 9.5, "y": 3, "w": 1.5}
+            ]
+        },
+        "LAYOUT_ortho_125_center1u": {
+            "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": [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": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [2, 6], "x": 6, "y": 2},
+                {"matrix": [2, 7], "x": 7, "y": 2},
+                {"matrix": [2, 8], "x": 8, "y": 2},
+                {"matrix": [2, 9], "x": 9, "y": 2},
+                {"matrix": [2, 10], "x": 10, "y": 2},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.5},
+                {"matrix": [3, 2], "x": 2.5, "y": 3, "w": 1.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3, "w": 1.25},
+                {"matrix": [3, 4], "x": 5, "y": 3},
+                {"matrix": [3, 6], "x": 6, "y": 3, "w": 1.25},
+                {"matrix": [3, 7], "x": 7.25, "y": 3, "w": 1.25},
+                {"matrix": [3, 10], "x": 9.5, "y": 3, "w": 1.5}
+            ]
+        },
+        "LAYOUT_ortho_150_center1u": {
+            "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": [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": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [2, 6], "x": 6, "y": 2},
+                {"matrix": [2, 7], "x": 7, "y": 2},
+                {"matrix": [2, 8], "x": 8, "y": 2},
+                {"matrix": [2, 9], "x": 9, "y": 2},
+                {"matrix": [2, 10], "x": 10, "y": 2},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.5},
+                {"matrix": [3, 2], "x": 2.5, "y": 3},
+                {"matrix": [3, 3], "x": 3.5, "y": 3, "w": 1.5},
+                {"matrix": [3, 4], "x": 5, "y": 3},
+                {"matrix": [3, 6], "x": 6, "y": 3, "w": 1.5},
+                {"matrix": [3, 7], "x": 7.5, "y": 3},
+                {"matrix": [3, 10], "x": 9.5, "y": 3, "w": 1.5}
+            ]
+        },
+        "LAYOUT_ortho_2u_bars": {
+            "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": [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": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [2, 6], "x": 6, "y": 2},
+                {"matrix": [2, 7], "x": 7, "y": 2},
+                {"matrix": [2, 8], "x": 8, "y": 2},
+                {"matrix": [2, 9], "x": 9, "y": 2},
+                {"matrix": [2, 10], "x": 10, "y": 2},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.5},
+                {"matrix": [3, 2], "x": 2.5, "y": 3},
+                {"matrix": [3, 3], "x": 3.5, "y": 3, "w": 2},
+                {"matrix": [3, 6], "x": 5.5, "y": 3, "w": 2},
+                {"matrix": [3, 7], "x": 7.5, "y": 3},
+                {"matrix": [3, 10], "x": 9.5, "y": 3, "w": 1.5}
+            ]
+        },
+        "LAYOUT_ortho_3u_bars": {
+            "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": [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": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [2, 6], "x": 6, "y": 2},
+                {"matrix": [2, 7], "x": 7, "y": 2},
+                {"matrix": [2, 8], "x": 8, "y": 2},
+                {"matrix": [2, 9], "x": 9, "y": 2},
+                {"matrix": [2, 10], "x": 10, "y": 2},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.5},
+                {"matrix": [3, 3], "x": 2.5, "y": 3, "w": 3},
+                {"matrix": [3, 6], "x": 5.5, "y": 3, "w": 3},
+                {"matrix": [3, 10], "x": 9.5, "y": 3, "w": 1.5}
+            ]
+        },
+        "LAYOUT_ortho_6u_bar": {
+            "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": [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": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [2, 6], "x": 6, "y": 2},
+                {"matrix": [2, 7], "x": 7, "y": 2},
+                {"matrix": [2, 8], "x": 8, "y": 2},
+                {"matrix": [2, 9], "x": 9, "y": 2},
+                {"matrix": [2, 10], "x": 10, "y": 2},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.5},
+                {"matrix": [3, 4], "x": 2.5, "y": 3, "w": 6},
+                {"matrix": [3, 10], "x": 9.5, "y": 3, "w": 1.5}
+            ]
+        },
+        "LAYOUT_ortho_cain_bars": {
+            "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": [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": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [2, 6], "x": 6, "y": 2},
+                {"matrix": [2, 7], "x": 7, "y": 2},
+                {"matrix": [2, 8], "x": 8, "y": 2},
+                {"matrix": [2, 9], "x": 9, "y": 2},
+                {"matrix": [2, 10], "x": 10, "y": 2},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.5},
+                {"matrix": [3, 2], "x": 2.5, "y": 3, "w": 1.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3, "w": 1.75},
+                {"matrix": [3, 6], "x": 5.5, "y": 3, "w": 1.75},
+                {"matrix": [3, 7], "x": 7.25, "y": 3, "w": 1.25},
+                {"matrix": [3, 10], "x": 9.5, "y": 3, "w": 1.5}
+            ]
+        },
+        "LAYOUT_ortho_centered_3u": {
+            "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": [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": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [2, 6], "x": 6, "y": 2},
+                {"matrix": [2, 7], "x": 7, "y": 2},
+                {"matrix": [2, 8], "x": 8, "y": 2},
+                {"matrix": [2, 9], "x": 9, "y": 2},
+                {"matrix": [2, 10], "x": 10, "y": 2},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.5},
+                {"matrix": [3, 2], "x": 2.5, "y": 3, "w": 1.5},
+                {"matrix": [3, 4], "x": 4, "y": 3, "w": 3},
+                {"matrix": [3, 7], "x": 7, "y": 3, "w": 1.5},
+                {"matrix": [3, 10], "x": 9.5, "y": 3, "w": 1.5}
+            ]
+        },
+        "LAYOUT_row": {
+            "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": [1, 0], "x": 0, "y": 1, "w": 1.25},
+                {"matrix": [1, 1], "x": 1.25, "y": 1},
+                {"matrix": [1, 2], "x": 2.25, "y": 1},
+                {"matrix": [1, 3], "x": 3.25, "y": 1},
+                {"matrix": [1, 4], "x": 4.25, "y": 1},
+                {"matrix": [1, 6], "x": 5.25, "y": 1},
+                {"matrix": [1, 7], "x": 6.25, "y": 1},
+                {"matrix": [1, 8], "x": 7.25, "y": 1},
+                {"matrix": [1, 9], "x": 8.25, "y": 1},
+                {"matrix": [1, 10], "x": 9.25, "y": 1, "w": 1.75},
+                {"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, 6], "x": 5.75, "y": 2},
+                {"matrix": [2, 7], "x": 6.75, "y": 2},
+                {"matrix": [2, 8], "x": 7.75, "y": 2},
+                {"matrix": [2, 9], "x": 8.75, "y": 2},
+                {"matrix": [2, 10], "x": 9.75, "y": 2, "w": 1.25},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.5},
+                {"matrix": [3, 2], "x": 2.5, "y": 3},
+                {"matrix": [3, 3], "x": 3.5, "y": 3},
+                {"matrix": [3, 4], "x": 4.5, "y": 3},
+                {"matrix": [3, 5], "x": 5.5, "y": 3},
+                {"matrix": [3, 6], "x": 6.5, "y": 3},
+                {"matrix": [3, 7], "x": 7.5, "y": 3},
+                {"matrix": [3, 10], "x": 9.5, "y": 3, "w": 1.5}
+            ]
+        },
+        "LAYOUT_treadstone": {
+            "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": [1, 0], "x": 0.25, "y": 1},
+                {"matrix": [1, 1], "x": 1.25, "y": 1},
+                {"matrix": [1, 2], "x": 2.25, "y": 1},
+                {"matrix": [1, 3], "x": 3.25, "y": 1},
+                {"matrix": [1, 4], "x": 4.25, "y": 1},
+                {"matrix": [1, 6], "x": 5.75, "y": 1},
+                {"matrix": [1, 7], "x": 6.75, "y": 1},
+                {"matrix": [1, 8], "x": 7.75, "y": 1},
+                {"matrix": [1, 9], "x": 8.75, "y": 1},
+                {"matrix": [1, 10], "x": 9.75, "y": 1},
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [2, 6], "x": 6, "y": 2},
+                {"matrix": [2, 7], "x": 7, "y": 2},
+                {"matrix": [2, 8], "x": 8, "y": 2},
+                {"matrix": [2, 9], "x": 9, "y": 2},
+                {"matrix": [2, 10], "x": 10, "y": 2},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.5},
+                {"matrix": [3, 2], "x": 2.5, "y": 3},
+                {"matrix": [3, 3], "x": 3.5, "y": 3},
+                {"matrix": [3, 4], "x": 4.5, "y": 3},
+                {"matrix": [3, 5], "x": 5.5, "y": 3},
+                {"matrix": [3, 6], "x": 6.5, "y": 3},
+                {"matrix": [3, 7], "x": 7.5, "y": 3},
+                {"matrix": [3, 10], "x": 9.5, "y": 3, "w": 1.5}
+            ]
+        },
+        "LAYOUT_uniform": {
+            "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": [1, 0], "x": 0, "y": 1, "w": 1.25},
+                {"matrix": [1, 1], "x": 1.25, "y": 1},
+                {"matrix": [1, 2], "x": 2.25, "y": 1},
+                {"matrix": [1, 3], "x": 3.25, "y": 1},
+                {"matrix": [1, 4], "x": 4.25, "y": 1},
+                {"matrix": [1, 6], "x": 5.25, "y": 1},
+                {"matrix": [1, 7], "x": 6.25, "y": 1},
+                {"matrix": [1, 8], "x": 7.25, "y": 1},
+                {"matrix": [1, 9], "x": 8.25, "y": 1},
+                {"matrix": [1, 10], "x": 9.25, "y": 1, "w": 1.75},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2},
+                {"matrix": [2, 2], "x": 2.5, "y": 2},
+                {"matrix": [2, 3], "x": 3.5, "y": 2},
+                {"matrix": [2, 4], "x": 4.5, "y": 2},
+                {"matrix": [2, 6], "x": 5.5, "y": 2},
+                {"matrix": [2, 7], "x": 6.5, "y": 2},
+                {"matrix": [2, 8], "x": 7.5, "y": 2},
+                {"matrix": [2, 9], "x": 8.5, "y": 2},
+                {"matrix": [2, 10], "x": 9.5, "y": 2, "w": 1.5},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.5},
+                {"matrix": [3, 2], "x": 2.5, "y": 3},
+                {"matrix": [3, 3], "x": 3.5, "y": 3},
+                {"matrix": [3, 4], "x": 4.5, "y": 3},
+                {"matrix": [3, 5], "x": 5.5, "y": 3},
+                {"matrix": [3, 6], "x": 6.5, "y": 3},
+                {"matrix": [3, 7], "x": 7.5, "y": 3},
+                {"matrix": [3, 10], "x": 9.5, "y": 3, "w": 1.5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/jlw/vault35_wkl_universal/keymaps/default/keymap.c b/keyboards/jlw/vault35_wkl_universal/keymaps/default/keymap.c
new file mode 100644
index 00000000000..ae5f304eed6
--- /dev/null
+++ b/keyboards/jlw/vault35_wkl_universal/keymaps/default/keymap.c
@@ -0,0 +1,36 @@
+// Copyright 2024 jlw
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT_all(
+         KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,     KC_VOLU,      KC_Y,   KC_U,   KC_I,    KC_O,   KC_P,
+         KC_A,   KC_S,   KC_D,   KC_F,   KC_G,     KC_VOLD,      KC_H,   KC_J,   KC_K,    KC_L,   KC_QUOT,
+         KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,     RGB_TOG,      KC_N,   KC_M,   KC_COMM, KC_DOT, KC_SLSH,
+         KC_ESC,         MO(1),  KC_ENT, KC_LEFT,  KC_DOWN,      KC_UP,  KC_RIGHT,                KC_BSPC
+    ),
+
+    [1] = LAYOUT_all(
+         _______,  _______,  _______,  _______,  _______,  _______, _______,  KC_7,     KC_8,     KC_9,    KC_0,
+         _______,  _______,  _______,  _______,  _______,  _______, _______,  KC_4,     KC_5,     KC_6,    _______,
+         _______,  _______,  _______,  _______,  _______,  QK_BOOT, _______,  KC_1,     KC_2,     KC_3,    _______,
+         _______,            _______,  _______,  _______,  _______, _______,  MO(2),                       _______
+    ),
+
+    [2] = LAYOUT_all(
+         _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+         _______,  _______,  _______,  _______,  _______,  _______,  KC_LEFT,  KC_DOWN,  KC_UP,    KC_LEFT,  _______,
+         _______,  _______,  _______,  _______,  _______,  QK_BOOT,  _______,  _______,  _______,  _______,  _______,
+         _______,            _______,  _______,  _______,  _______,  _______,  _______,                      _______
+    )
+};
+
+#ifdef 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_HUD, RGB_HUI) },
+    [2] =   { ENCODER_CCW_CW(RGB_VAD, RGB_VAI) }
+};
+#endif
+
diff --git a/keyboards/jlw/vault35_wkl_universal/keymaps/default/rules.mk b/keyboards/jlw/vault35_wkl_universal/keymaps/default/rules.mk
new file mode 100644
index 00000000000..a40474b4d5c
--- /dev/null
+++ b/keyboards/jlw/vault35_wkl_universal/keymaps/default/rules.mk
@@ -0,0 +1 @@
+ENCODER_MAP_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/jlw/vault35_wkl_universal/mcuconf.h b/keyboards/jlw/vault35_wkl_universal/mcuconf.h
new file mode 100644
index 00000000000..3f3e8009459
--- /dev/null
+++ b/keyboards/jlw/vault35_wkl_universal/mcuconf.h
@@ -0,0 +1,11 @@
+// Copyright 2024 jlw
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include_next <mcuconf.h>
+
+#undef STM32_PWM_USE_TIM17
+#define STM32_PWM_USE_TIM17 TRUE
+#define STM32_TIM17_SUPPRESS_ISR
+
diff --git a/keyboards/jlw/vault35_wkl_universal/readme.md b/keyboards/jlw/vault35_wkl_universal/readme.md
new file mode 100644
index 00000000000..d06ee1a998b
--- /dev/null
+++ b/keyboards/jlw/vault35_wkl_universal/readme.md
@@ -0,0 +1,27 @@
+# Vault 35 WKL Universal
+
+![Vault 35 WKL Universal](https://i.imgur.com/gtJwgiv.png)
+
+A drop in replacement PCB for the Vault 35 WKL case, originally designed by ProjectCain Mechvault.
+
+* Keyboard Maintainer: [jlw](https://github.com/josh-l-wang)
+* Hardware Supported: Vault 35 WKL Universal PCB
+* Hardware Availability: [jlw-kb.com](https://jlw-kb.com)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make jlw/vault35_wkl_universal:default
+
+Flashing example for this keyboard:
+
+    make jlw/vault35_wkl_universal: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 (the top left key) and plug in the keyboard
+* **Physical reset button**: Hold button on the back of the PCB while plugging in the PCB
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
diff --git a/keyboards/sharkoon/skiller_sgk50_s2/rules.mk b/keyboards/jlw/vault35_wkl_universal/rules.mk
similarity index 100%
rename from keyboards/sharkoon/skiller_sgk50_s2/rules.mk
rename to keyboards/jlw/vault35_wkl_universal/rules.mk
diff --git a/keyboards/jones/v03/info.json b/keyboards/jones/v03/info.json
deleted file mode 100644
index 2f8a7803d2f..00000000000
--- a/keyboards/jones/v03/info.json
+++ /dev/null
@@ -1,262 +0,0 @@
-{
-  "keyboard_name": "Jones",
-  "manufacturer": "jpskenn",
-  "url": "https://github.com/jpskenn/Jones",
-  "maintainer": "jpskenn",
-  "usb": {
-    "vid": "0xB9DD",
-    "pid": "0x175A",
-    "device_version": "0.3.0"
-  },
-  "encoder": {
-    "rotary": [
-      {"pin_a": "F6", "pin_b": "F7"},
-      {"pin_a": "B3", "pin_b": "B2"}
-    ]
-  },
-  "rgblight": {
-    "saturation_steps": 8,
-    "brightness_steps": 8,
-    "led_count": 6,
-    "animations": {
-      "rainbow_swirl": true,
-      "knight": true
-    }
-  },
-  "ws2812": {
-    "pin": "B7"
-  },
-  "processor": "atmega32u4",
-  "bootloader": "atmel-dfu",
-  "layouts": {
-    "LAYOUT_ansi": {
-      "layout": [
-        {"matrix": [6, 0], "x": 0, "y": 0},
-        {"matrix": [6, 1], "x": 1, "y": 0},
-        {"matrix": [6, 2], "x": 2, "y": 0},
-        {"matrix": [6, 3], "x": 3, "y": 0},
-        {"matrix": [6, 4], "x": 4, "y": 0},
-        {"matrix": [6, 5], "x": 5, "y": 0},
-        {"matrix": [5, 6], "x": 6, "y": 0},
-        {"matrix": [5, 7], "x": 7, "y": 0},
-        {"matrix": [5, 8], "x": 8, "y": 0},
-        {"matrix": [5, 9], "x": 9, "y": 0},
-        {"matrix": [5, 10], "x": 10, "y": 0},
-        {"matrix": [0, 7], "x": 11, "y": 0},
-        {"matrix": [0, 8], "x": 12, "y": 0},
-        {"matrix": [0, 9], "x": 13, "y": 0},
-        {"matrix": [0, 10], "x": 14, "y": 0},
-
-        {"matrix": [7, 0], "x": 0, "y": 1, "w": 1.5},
-        {"matrix": [7, 2], "x": 1.5, "y": 1},
-        {"matrix": [7, 3], "x": 2.5, "y": 1},
-        {"matrix": [7, 4], "x": 3.5, "y": 1},
-        {"matrix": [7, 5], "x": 4.5, "y": 1},
-        {"matrix": [7, 6], "x": 5.5, "y": 1},
-        {"matrix": [6, 7], "x": 6.5, "y": 1},
-        {"matrix": [6, 8], "x": 7.5, "y": 1},
-        {"matrix": [6, 9], "x": 8.5, "y": 1},
-        {"matrix": [6, 10], "x": 9.5, "y": 1},
-        {"matrix": [1, 7], "x": 10.5, "y": 1},
-        {"matrix": [1, 8], "x": 11.5, "y": 1, "w": 1.5},
-        {"matrix": [1, 9], "x": 13, "y": 1},
-        {"matrix": [1, 10], "x": 14, "y": 1},
-
-        {"matrix": [8, 0], "x": 0.25, "y": 2, "w": 1.25},
-        {"matrix": [8, 2], "x": 1.5, "y": 2},
-        {"matrix": [8, 3], "x": 2.5, "y": 2},
-        {"matrix": [8, 4], "x": 3.5, "y": 2},
-        {"matrix": [8, 5], "x": 4.5, "y": 2},
-        {"matrix": [8, 6], "x": 5.5, "y": 2},
-        {"matrix": [8, 7], "x": 6.5, "y": 2},
-        {"matrix": [7, 8], "x": 7.5, "y": 2},
-        {"matrix": [7, 9], "x": 8.5, "y": 2},
-        {"matrix": [7, 10], "x": 9.5, "y": 2},
-        {"matrix": [2, 7], "x": 10.5, "y": 2},
-        {"matrix": [2, 8], "x": 11.5, "y": 2, "w": 2.25},
-        {"matrix": [2, 10], "x": 13.75, "y": 2},
-
-        {"matrix": [9, 0], "x": 0.25, "y": 3, "w": 1.75},
-        {"matrix": [9, 2], "x": 2, "y": 3},
-        {"matrix": [9, 3], "x": 3, "y": 3},
-        {"matrix": [9, 4], "x": 4, "y": 3},
-        {"matrix": [9, 5], "x": 5, "y": 3},
-        {"matrix": [9, 6], "x": 6, "y": 3},
-        {"matrix": [9, 7], "x": 7, "y": 3},
-        {"matrix": [9, 8], "x": 8, "y": 3},
-        {"matrix": [8, 9], "x": 9, "y": 3},
-        {"matrix": [8, 10], "x": 10, "y": 3},
-        {"matrix": [3, 7], "x": 11, "y": 3},
-        {"matrix": [3, 8], "x": 12, "y": 3},
-        {"matrix": [3, 9], "x": 13, "y": 3},
-        {"matrix": [3, 10], "x": 14, "y": 3},
-
-        {"matrix": [10, 0], "x": 0, "y": 4},
-        {"matrix": [10, 1], "x": 1, "y": 4},
-        {"matrix": [10, 2], "x": 2, "y": 4, "w": 1.25},
-        {"matrix": [10, 3], "x": 3.25, "y": 4, "w": 1.25},
-        {"matrix": [10, 5], "x": 4.5, "y": 4, "w": 2},
-        {"matrix": [10, 7], "x": 6.5, "y": 4, "w": 2},
-        {"matrix": [10, 8], "x": 8.5, "y": 4, "w": 1.25},
-        {"matrix": [10, 9], "x": 9.75, "y": 4, "w": 1.25},
-        {"matrix": [4, 7], "x": 11, "y": 4},
-        {"matrix": [4, 8], "x": 12, "y": 4},
-        {"matrix": [4, 9], "x": 13, "y": 4},
-        {"matrix": [4, 10], "x": 14, "y": 4}
-      ]
-    },
-    "LAYOUT_jp": {
-      "layout": [
-        {"matrix": [6, 0], "x": 0, "y": 0},
-        {"matrix": [6, 1], "x": 1, "y": 0},
-        {"matrix": [6, 2], "x": 2, "y": 0},
-        {"matrix": [6, 3], "x": 3, "y": 0},
-        {"matrix": [6, 4], "x": 4, "y": 0},
-        {"matrix": [6, 5], "x": 5, "y": 0},
-        {"matrix": [5, 6], "x": 6, "y": 0},
-        {"matrix": [5, 7], "x": 7, "y": 0},
-        {"matrix": [5, 8], "x": 8, "y": 0},
-        {"matrix": [5, 9], "x": 9, "y": 0},
-        {"matrix": [5, 10], "x": 10, "y": 0},
-        {"matrix": [0, 7], "x": 11, "y": 0},
-        {"matrix": [0, 8], "x": 12, "y": 0},
-        {"matrix": [0, 9], "x": 13, "y": 0},
-        {"matrix": [0, 10], "x": 14, "y": 0},
-
-        {"matrix": [7, 0], "x": 0, "y": 1, "w": 1.5},
-        {"matrix": [7, 2], "x": 1.5, "y": 1},
-        {"matrix": [7, 3], "x": 2.5, "y": 1},
-        {"matrix": [7, 4], "x": 3.5, "y": 1},
-        {"matrix": [7, 5], "x": 4.5, "y": 1},
-        {"matrix": [7, 6], "x": 5.5, "y": 1},
-        {"matrix": [6, 7], "x": 6.5, "y": 1},
-        {"matrix": [6, 8], "x": 7.5, "y": 1},
-        {"matrix": [6, 9], "x": 8.5, "y": 1},
-        {"matrix": [6, 10], "x": 9.5, "y": 1},
-        {"matrix": [1, 7], "x": 10.5, "y": 1},
-        {"matrix": [1, 9], "x": 11.5, "y": 1, "w": 1.25, "h": 2, "r": 180, "rx": 12.125, "ry": 1.5},
-        {"matrix": [1, 10], "x": 12.75, "y": 1},
-        {"matrix": [8, 0], "x": 13.75, "y": 1},
-
-        {"matrix": [8, 2], "x": 0.25, "y": 2, "w": 1.25},
-        {"matrix": [8, 3], "x": 1.5, "y": 2},
-        {"matrix": [8, 4], "x": 2.5, "y": 2},
-        {"matrix": [8, 5], "x": 3.5, "y": 2},
-        {"matrix": [8, 6], "x": 4.5, "y": 2},
-        {"matrix": [8, 7], "x": 5.5, "y": 2},
-        {"matrix": [7, 8], "x": 6.5, "y": 2},
-        {"matrix": [7, 9], "x": 7.5, "y": 2},
-        {"matrix": [7, 10], "x": 8.5, "y": 2},
-        {"matrix": [2, 7], "x": 9.5, "y": 2},
-        {"matrix": [2, 8], "x": 10.5, "y": 2},
-        {"matrix": [2, 9], "x": 13, "y": 2},
-        {"matrix": [2, 10], "x": 14, "y": 2},
-
-        {"matrix": [9, 0], "x": 0.25, "y": 3, "w": 1.75},
-        {"matrix": [9, 2], "x": 2, "y": 3},
-        {"matrix": [9, 3], "x": 3, "y": 3},
-        {"matrix": [9, 4], "x": 4, "y": 3},
-        {"matrix": [9, 5], "x": 5, "y": 3},
-        {"matrix": [9, 6], "x": 6, "y": 3},
-        {"matrix": [9, 7], "x": 7, "y": 3},
-        {"matrix": [9, 8], "x": 8, "y": 3},
-        {"matrix": [8, 9], "x": 9, "y": 3},
-        {"matrix": [8, 10], "x": 10, "y": 3},
-        {"matrix": [3, 7], "x": 11, "y": 3},
-        {"matrix": [3, 8], "x": 12, "y": 3},
-        {"matrix": [3, 9], "x": 13, "y": 3},
-        {"matrix": [3, 10], "x": 14, "y": 3},
-
-        {"matrix": [10, 0], "x": 0, "y": 4},
-        {"matrix": [10, 1], "x": 1, "y": 4},
-        {"matrix": [10, 2], "x": 2, "y": 4, "w": 1.25},
-        {"matrix": [10, 3], "x": 3.25, "y": 4},
-        {"matrix": [10, 5], "x": 4.25, "y": 4, "w": 2.25},
-        {"matrix": [10, 7], "x": 6.5, "y": 4, "w": 2},
-        {"matrix": [10, 8], "x": 8.5, "y": 4, "w": 1.25},
-        {"matrix": [10, 9], "x": 9.75, "y": 4, "w": 1.25},
-        {"matrix": [4, 7], "x": 11, "y": 4},
-        {"matrix": [4, 8], "x": 12, "y": 4},
-        {"matrix": [4, 9], "x": 13, "y": 4},
-        {"matrix": [4, 10], "x": 14, "y": 4}
-      ]
-    },
-    "LAYOUT_all": {
-      "layout": [
-        {"matrix": [6, 0], "x": 0, "y": 0},
-        {"matrix": [6, 1], "x": 1, "y": 0},
-        {"matrix": [6, 2], "x": 2, "y": 0},
-        {"matrix": [6, 3], "x": 3, "y": 0},
-        {"matrix": [6, 4], "x": 4, "y": 0},
-        {"matrix": [6, 5], "x": 5, "y": 0},
-        {"matrix": [5, 6], "x": 6, "y": 0},
-        {"matrix": [5, 7], "x": 7, "y": 0},
-        {"matrix": [5, 8], "x": 8, "y": 0},
-        {"matrix": [5, 9], "x": 9, "y": 0},
-        {"matrix": [5, 10], "x": 10, "y": 0},
-        {"matrix": [0, 7], "x": 11, "y": 0},
-        {"matrix": [0, 8], "x": 12, "y": 0},
-        {"matrix": [0, 9], "x": 13, "y": 0},
-        {"matrix": [0, 10], "x": 14, "y": 0},
-
-        {"matrix": [7, 0], "x": 0, "y": 1, "w": 1.5},
-        {"matrix": [7, 2], "x": 1.5, "y": 1},
-        {"matrix": [7, 3], "x": 2.5, "y": 1},
-        {"matrix": [7, 4], "x": 3.5, "y": 1},
-        {"matrix": [7, 5], "x": 4.5, "y": 1},
-        {"matrix": [7, 6], "x": 5.5, "y": 1},
-        {"matrix": [6, 7], "x": 6.5, "y": 1},
-        {"matrix": [6, 8], "x": 7.5, "y": 1},
-        {"matrix": [6, 9], "x": 8.5, "y": 1},
-        {"matrix": [6, 10], "x": 9.5, "y": 1},
-        {"matrix": [1, 7], "x": 10.5, "y": 1},
-        {"matrix": [1, 8], "x": 11.5, "y": 1, "w": 1.5},
-        {"matrix": [1, 9], "x": 13, "y": 1},
-        {"matrix": [1, 10], "x": 14, "y": 1},
-
-        {"matrix": [8, 0], "x": 0.25, "y": 2, "w": 1.25},
-        {"matrix": [8, 2], "x": 1.5, "y": 2},
-        {"matrix": [8, 3], "x": 2.5, "y": 2},
-        {"matrix": [8, 4], "x": 3.5, "y": 2},
-        {"matrix": [8, 5], "x": 4.5, "y": 2},
-        {"matrix": [8, 6], "x": 5.5, "y": 2},
-        {"matrix": [8, 7], "x": 6.5, "y": 2},
-        {"matrix": [7, 8], "x": 7.5, "y": 2},
-        {"matrix": [7, 9], "x": 8.5, "y": 2},
-        {"matrix": [7, 10], "x": 9.5, "y": 2},
-        {"matrix": [2, 7], "x": 10.5, "y": 2},
-        {"matrix": [2, 8], "x": 11.5, "y": 2, "w": 1.5},
-        {"matrix": [2, 9], "x": 13, "y": 2},
-        {"matrix": [2, 10], "x": 14, "y": 2},
-
-        {"matrix": [9, 0], "x": 0.25, "y": 3, "w": 1.75},
-        {"matrix": [9, 2], "x": 2, "y": 3},
-        {"matrix": [9, 3], "x": 3, "y": 3},
-        {"matrix": [9, 4], "x": 4, "y": 3},
-        {"matrix": [9, 5], "x": 5, "y": 3},
-        {"matrix": [9, 6], "x": 6, "y": 3},
-        {"matrix": [9, 7], "x": 7, "y": 3},
-        {"matrix": [9, 8], "x": 8, "y": 3},
-        {"matrix": [8, 9], "x": 9, "y": 3},
-        {"matrix": [8, 10], "x": 10, "y": 3},
-        {"matrix": [3, 7], "x": 11, "y": 3},
-        {"matrix": [3, 8], "x": 12, "y": 3},
-        {"matrix": [3, 9], "x": 13, "y": 3},
-        {"matrix": [3, 10], "x": 14, "y": 3},
-
-        {"matrix": [10, 0], "x": 0, "y": 4},
-        {"matrix": [10, 1], "x": 1, "y": 4},
-        {"matrix": [10, 2], "x": 2, "y": 4, "w": 1.25},
-        {"matrix": [10, 3], "x": 3.25, "y": 4, "w": 1.25},
-        {"matrix": [10, 5], "x": 4.5, "y": 4, "w": 2},
-        {"matrix": [10, 7], "x": 6.5, "y": 4, "w": 2},
-        {"matrix": [10, 8], "x": 8.5, "y": 4, "w": 1.25},
-        {"matrix": [10, 9], "x": 9.75, "y": 4, "w": 1.25},
-        {"matrix": [4, 7], "x": 11, "y": 4},
-        {"matrix": [4, 8], "x": 12, "y": 4},
-        {"matrix": [4, 9], "x": 13, "y": 4},
-        {"matrix": [4, 10], "x": 14, "y": 4}
-      ]
-    }
-  }
-}
diff --git a/keyboards/jones/v03/keyboard.json b/keyboards/jones/v03/keyboard.json
new file mode 100644
index 00000000000..f5b18c9d2fd
--- /dev/null
+++ b/keyboards/jones/v03/keyboard.json
@@ -0,0 +1,272 @@
+{
+  "keyboard_name": "Jones",
+  "manufacturer": "jpskenn",
+  "url": "https://github.com/jpskenn/Jones",
+  "maintainer": "jpskenn",
+  "usb": {
+    "vid": "0xB9DD",
+    "pid": "0x175A",
+    "device_version": "0.3.0"
+  },
+  "encoder": {
+    "rotary": [
+      {"pin_a": "F6", "pin_b": "F7"},
+      {"pin_a": "B3", "pin_b": "B2"}
+    ]
+  },
+  "rgblight": {
+    "saturation_steps": 8,
+    "brightness_steps": 8,
+    "led_count": 6,
+    "animations": {
+      "rainbow_swirl": true,
+      "knight": true
+    }
+  },
+  "ws2812": {
+    "pin": "B7"
+  },
+  "processor": "atmega32u4",
+  "bootloader": "atmel-dfu",
+  "features": {
+    "bootmagic": false,
+    "mousekey": true,
+    "extrakey": true,
+    "rgblight": true,
+    "encoder": true
+  },
+  "build": {
+    "lto": true
+  },
+  "layouts": {
+    "LAYOUT_ansi": {
+      "layout": [
+        {"matrix": [6, 0], "x": 0, "y": 0},
+        {"matrix": [6, 1], "x": 1, "y": 0},
+        {"matrix": [6, 2], "x": 2, "y": 0},
+        {"matrix": [6, 3], "x": 3, "y": 0},
+        {"matrix": [6, 4], "x": 4, "y": 0},
+        {"matrix": [6, 5], "x": 5, "y": 0},
+        {"matrix": [5, 6], "x": 6, "y": 0},
+        {"matrix": [5, 7], "x": 7, "y": 0},
+        {"matrix": [5, 8], "x": 8, "y": 0},
+        {"matrix": [5, 9], "x": 9, "y": 0},
+        {"matrix": [5, 10], "x": 10, "y": 0},
+        {"matrix": [0, 7], "x": 11, "y": 0},
+        {"matrix": [0, 8], "x": 12, "y": 0},
+        {"matrix": [0, 9], "x": 13, "y": 0},
+        {"matrix": [0, 10], "x": 14, "y": 0},
+
+        {"matrix": [7, 0], "x": 0, "y": 1, "w": 1.5},
+        {"matrix": [7, 2], "x": 1.5, "y": 1},
+        {"matrix": [7, 3], "x": 2.5, "y": 1},
+        {"matrix": [7, 4], "x": 3.5, "y": 1},
+        {"matrix": [7, 5], "x": 4.5, "y": 1},
+        {"matrix": [7, 6], "x": 5.5, "y": 1},
+        {"matrix": [6, 7], "x": 6.5, "y": 1},
+        {"matrix": [6, 8], "x": 7.5, "y": 1},
+        {"matrix": [6, 9], "x": 8.5, "y": 1},
+        {"matrix": [6, 10], "x": 9.5, "y": 1},
+        {"matrix": [1, 7], "x": 10.5, "y": 1},
+        {"matrix": [1, 8], "x": 11.5, "y": 1, "w": 1.5},
+        {"matrix": [1, 9], "x": 13, "y": 1},
+        {"matrix": [1, 10], "x": 14, "y": 1},
+
+        {"matrix": [8, 0], "x": 0.25, "y": 2, "w": 1.25},
+        {"matrix": [8, 2], "x": 1.5, "y": 2},
+        {"matrix": [8, 3], "x": 2.5, "y": 2},
+        {"matrix": [8, 4], "x": 3.5, "y": 2},
+        {"matrix": [8, 5], "x": 4.5, "y": 2},
+        {"matrix": [8, 6], "x": 5.5, "y": 2},
+        {"matrix": [8, 7], "x": 6.5, "y": 2},
+        {"matrix": [7, 8], "x": 7.5, "y": 2},
+        {"matrix": [7, 9], "x": 8.5, "y": 2},
+        {"matrix": [7, 10], "x": 9.5, "y": 2},
+        {"matrix": [2, 7], "x": 10.5, "y": 2},
+        {"matrix": [2, 8], "x": 11.5, "y": 2, "w": 2.25},
+        {"matrix": [2, 10], "x": 13.75, "y": 2},
+
+        {"matrix": [9, 0], "x": 0.25, "y": 3, "w": 1.75},
+        {"matrix": [9, 2], "x": 2, "y": 3},
+        {"matrix": [9, 3], "x": 3, "y": 3},
+        {"matrix": [9, 4], "x": 4, "y": 3},
+        {"matrix": [9, 5], "x": 5, "y": 3},
+        {"matrix": [9, 6], "x": 6, "y": 3},
+        {"matrix": [9, 7], "x": 7, "y": 3},
+        {"matrix": [9, 8], "x": 8, "y": 3},
+        {"matrix": [8, 9], "x": 9, "y": 3},
+        {"matrix": [8, 10], "x": 10, "y": 3},
+        {"matrix": [3, 7], "x": 11, "y": 3},
+        {"matrix": [3, 8], "x": 12, "y": 3},
+        {"matrix": [3, 9], "x": 13, "y": 3},
+        {"matrix": [3, 10], "x": 14, "y": 3},
+
+        {"matrix": [10, 0], "x": 0, "y": 4},
+        {"matrix": [10, 1], "x": 1, "y": 4},
+        {"matrix": [10, 2], "x": 2, "y": 4, "w": 1.25},
+        {"matrix": [10, 3], "x": 3.25, "y": 4, "w": 1.25},
+        {"matrix": [10, 5], "x": 4.5, "y": 4, "w": 2},
+        {"matrix": [10, 7], "x": 6.5, "y": 4, "w": 2},
+        {"matrix": [10, 8], "x": 8.5, "y": 4, "w": 1.25},
+        {"matrix": [10, 9], "x": 9.75, "y": 4, "w": 1.25},
+        {"matrix": [4, 7], "x": 11, "y": 4},
+        {"matrix": [4, 8], "x": 12, "y": 4},
+        {"matrix": [4, 9], "x": 13, "y": 4},
+        {"matrix": [4, 10], "x": 14, "y": 4}
+      ]
+    },
+    "LAYOUT_jp": {
+      "layout": [
+        {"matrix": [6, 0], "x": 0, "y": 0},
+        {"matrix": [6, 1], "x": 1, "y": 0},
+        {"matrix": [6, 2], "x": 2, "y": 0},
+        {"matrix": [6, 3], "x": 3, "y": 0},
+        {"matrix": [6, 4], "x": 4, "y": 0},
+        {"matrix": [6, 5], "x": 5, "y": 0},
+        {"matrix": [5, 6], "x": 6, "y": 0},
+        {"matrix": [5, 7], "x": 7, "y": 0},
+        {"matrix": [5, 8], "x": 8, "y": 0},
+        {"matrix": [5, 9], "x": 9, "y": 0},
+        {"matrix": [5, 10], "x": 10, "y": 0},
+        {"matrix": [0, 7], "x": 11, "y": 0},
+        {"matrix": [0, 8], "x": 12, "y": 0},
+        {"matrix": [0, 9], "x": 13, "y": 0},
+        {"matrix": [0, 10], "x": 14, "y": 0},
+
+        {"matrix": [7, 0], "x": 0, "y": 1, "w": 1.5},
+        {"matrix": [7, 2], "x": 1.5, "y": 1},
+        {"matrix": [7, 3], "x": 2.5, "y": 1},
+        {"matrix": [7, 4], "x": 3.5, "y": 1},
+        {"matrix": [7, 5], "x": 4.5, "y": 1},
+        {"matrix": [7, 6], "x": 5.5, "y": 1},
+        {"matrix": [6, 7], "x": 6.5, "y": 1},
+        {"matrix": [6, 8], "x": 7.5, "y": 1},
+        {"matrix": [6, 9], "x": 8.5, "y": 1},
+        {"matrix": [6, 10], "x": 9.5, "y": 1},
+        {"matrix": [1, 7], "x": 10.5, "y": 1},
+        {"matrix": [1, 9], "x": 11.5, "y": 1, "w": 1.25, "h": 2, "r": 180, "rx": 12.125, "ry": 1.5},
+        {"matrix": [1, 10], "x": 12.75, "y": 1},
+        {"matrix": [8, 0], "x": 13.75, "y": 1},
+
+        {"matrix": [8, 2], "x": 0.25, "y": 2, "w": 1.25},
+        {"matrix": [8, 3], "x": 1.5, "y": 2},
+        {"matrix": [8, 4], "x": 2.5, "y": 2},
+        {"matrix": [8, 5], "x": 3.5, "y": 2},
+        {"matrix": [8, 6], "x": 4.5, "y": 2},
+        {"matrix": [8, 7], "x": 5.5, "y": 2},
+        {"matrix": [7, 8], "x": 6.5, "y": 2},
+        {"matrix": [7, 9], "x": 7.5, "y": 2},
+        {"matrix": [7, 10], "x": 8.5, "y": 2},
+        {"matrix": [2, 7], "x": 9.5, "y": 2},
+        {"matrix": [2, 8], "x": 10.5, "y": 2},
+        {"matrix": [2, 9], "x": 13, "y": 2},
+        {"matrix": [2, 10], "x": 14, "y": 2},
+
+        {"matrix": [9, 0], "x": 0.25, "y": 3, "w": 1.75},
+        {"matrix": [9, 2], "x": 2, "y": 3},
+        {"matrix": [9, 3], "x": 3, "y": 3},
+        {"matrix": [9, 4], "x": 4, "y": 3},
+        {"matrix": [9, 5], "x": 5, "y": 3},
+        {"matrix": [9, 6], "x": 6, "y": 3},
+        {"matrix": [9, 7], "x": 7, "y": 3},
+        {"matrix": [9, 8], "x": 8, "y": 3},
+        {"matrix": [8, 9], "x": 9, "y": 3},
+        {"matrix": [8, 10], "x": 10, "y": 3},
+        {"matrix": [3, 7], "x": 11, "y": 3},
+        {"matrix": [3, 8], "x": 12, "y": 3},
+        {"matrix": [3, 9], "x": 13, "y": 3},
+        {"matrix": [3, 10], "x": 14, "y": 3},
+
+        {"matrix": [10, 0], "x": 0, "y": 4},
+        {"matrix": [10, 1], "x": 1, "y": 4},
+        {"matrix": [10, 2], "x": 2, "y": 4, "w": 1.25},
+        {"matrix": [10, 3], "x": 3.25, "y": 4},
+        {"matrix": [10, 5], "x": 4.25, "y": 4, "w": 2.25},
+        {"matrix": [10, 7], "x": 6.5, "y": 4, "w": 2},
+        {"matrix": [10, 8], "x": 8.5, "y": 4, "w": 1.25},
+        {"matrix": [10, 9], "x": 9.75, "y": 4, "w": 1.25},
+        {"matrix": [4, 7], "x": 11, "y": 4},
+        {"matrix": [4, 8], "x": 12, "y": 4},
+        {"matrix": [4, 9], "x": 13, "y": 4},
+        {"matrix": [4, 10], "x": 14, "y": 4}
+      ]
+    },
+    "LAYOUT_all": {
+      "layout": [
+        {"matrix": [6, 0], "x": 0, "y": 0},
+        {"matrix": [6, 1], "x": 1, "y": 0},
+        {"matrix": [6, 2], "x": 2, "y": 0},
+        {"matrix": [6, 3], "x": 3, "y": 0},
+        {"matrix": [6, 4], "x": 4, "y": 0},
+        {"matrix": [6, 5], "x": 5, "y": 0},
+        {"matrix": [5, 6], "x": 6, "y": 0},
+        {"matrix": [5, 7], "x": 7, "y": 0},
+        {"matrix": [5, 8], "x": 8, "y": 0},
+        {"matrix": [5, 9], "x": 9, "y": 0},
+        {"matrix": [5, 10], "x": 10, "y": 0},
+        {"matrix": [0, 7], "x": 11, "y": 0},
+        {"matrix": [0, 8], "x": 12, "y": 0},
+        {"matrix": [0, 9], "x": 13, "y": 0},
+        {"matrix": [0, 10], "x": 14, "y": 0},
+
+        {"matrix": [7, 0], "x": 0, "y": 1, "w": 1.5},
+        {"matrix": [7, 2], "x": 1.5, "y": 1},
+        {"matrix": [7, 3], "x": 2.5, "y": 1},
+        {"matrix": [7, 4], "x": 3.5, "y": 1},
+        {"matrix": [7, 5], "x": 4.5, "y": 1},
+        {"matrix": [7, 6], "x": 5.5, "y": 1},
+        {"matrix": [6, 7], "x": 6.5, "y": 1},
+        {"matrix": [6, 8], "x": 7.5, "y": 1},
+        {"matrix": [6, 9], "x": 8.5, "y": 1},
+        {"matrix": [6, 10], "x": 9.5, "y": 1},
+        {"matrix": [1, 7], "x": 10.5, "y": 1},
+        {"matrix": [1, 8], "x": 11.5, "y": 1, "w": 1.5},
+        {"matrix": [1, 9], "x": 13, "y": 1},
+        {"matrix": [1, 10], "x": 14, "y": 1},
+
+        {"matrix": [8, 0], "x": 0.25, "y": 2, "w": 1.25},
+        {"matrix": [8, 2], "x": 1.5, "y": 2},
+        {"matrix": [8, 3], "x": 2.5, "y": 2},
+        {"matrix": [8, 4], "x": 3.5, "y": 2},
+        {"matrix": [8, 5], "x": 4.5, "y": 2},
+        {"matrix": [8, 6], "x": 5.5, "y": 2},
+        {"matrix": [8, 7], "x": 6.5, "y": 2},
+        {"matrix": [7, 8], "x": 7.5, "y": 2},
+        {"matrix": [7, 9], "x": 8.5, "y": 2},
+        {"matrix": [7, 10], "x": 9.5, "y": 2},
+        {"matrix": [2, 7], "x": 10.5, "y": 2},
+        {"matrix": [2, 8], "x": 11.5, "y": 2, "w": 1.5},
+        {"matrix": [2, 9], "x": 13, "y": 2},
+        {"matrix": [2, 10], "x": 14, "y": 2},
+
+        {"matrix": [9, 0], "x": 0.25, "y": 3, "w": 1.75},
+        {"matrix": [9, 2], "x": 2, "y": 3},
+        {"matrix": [9, 3], "x": 3, "y": 3},
+        {"matrix": [9, 4], "x": 4, "y": 3},
+        {"matrix": [9, 5], "x": 5, "y": 3},
+        {"matrix": [9, 6], "x": 6, "y": 3},
+        {"matrix": [9, 7], "x": 7, "y": 3},
+        {"matrix": [9, 8], "x": 8, "y": 3},
+        {"matrix": [8, 9], "x": 9, "y": 3},
+        {"matrix": [8, 10], "x": 10, "y": 3},
+        {"matrix": [3, 7], "x": 11, "y": 3},
+        {"matrix": [3, 8], "x": 12, "y": 3},
+        {"matrix": [3, 9], "x": 13, "y": 3},
+        {"matrix": [3, 10], "x": 14, "y": 3},
+
+        {"matrix": [10, 0], "x": 0, "y": 4},
+        {"matrix": [10, 1], "x": 1, "y": 4},
+        {"matrix": [10, 2], "x": 2, "y": 4, "w": 1.25},
+        {"matrix": [10, 3], "x": 3.25, "y": 4, "w": 1.25},
+        {"matrix": [10, 5], "x": 4.5, "y": 4, "w": 2},
+        {"matrix": [10, 7], "x": 6.5, "y": 4, "w": 2},
+        {"matrix": [10, 8], "x": 8.5, "y": 4, "w": 1.25},
+        {"matrix": [10, 9], "x": 9.75, "y": 4, "w": 1.25},
+        {"matrix": [4, 7], "x": 11, "y": 4},
+        {"matrix": [4, 8], "x": 12, "y": 4},
+        {"matrix": [4, 9], "x": 13, "y": 4},
+        {"matrix": [4, 10], "x": 14, "y": 4}
+      ]
+    }
+  }
+}
diff --git a/keyboards/jones/v03/rules.mk b/keyboards/jones/v03/rules.mk
index 0afd3b816aa..30ce5d293b7 100644
--- a/keyboards/jones/v03/rules.mk
+++ b/keyboards/jones/v03/rules.mk
@@ -1,19 +1,2 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
-ENCODER_ENABLE = yes        # Rotary Encoder
-
-CUSTOM_MATRIX = lite        # Custom matrix for "Round-Robin Matrix"
+CUSTOM_MATRIX = lite
 SRC += matrix.c
-
-LTO_ENABLE = yes
diff --git a/keyboards/jones/v03_1/info.json b/keyboards/jones/v03_1/info.json
deleted file mode 100644
index 9e46cdd40a2..00000000000
--- a/keyboards/jones/v03_1/info.json
+++ /dev/null
@@ -1,263 +0,0 @@
-{
-  "keyboard_name": "Jones",
-  "manufacturer": "jpskenn",
-  "url": "https://github.com/jpskenn/Jones",
-  "maintainer": "jpskenn",
-  "usb": {
-    "vid": "0xB9DD",
-    "pid": "0x175A",
-    "device_version": "0.3.1"
-  },
-  "encoder": {
-    "rotary": [
-      {"pin_a": "F6", "pin_b": "F7"},
-      {"pin_a": "B3", "pin_b": "B2"}
-    ]
-  },
-  "rgblight": {
-    "saturation_steps": 8,
-    "brightness_steps": 8,
-    "led_count": 14,
-    "led_map": [0, 1, 2, 3, 13, 12, 4, 5, 6, 7, 8, 9, 10, 11],
-    "animations": {
-      "rainbow_swirl": true,
-      "knight": true
-    }
-  },
-  "ws2812": {
-    "pin": "F0"
-  },
-  "processor": "atmega32u4",
-  "bootloader": "atmel-dfu",
-  "layouts": {
-    "LAYOUT_ansi": {
-      "layout": [
-        {"matrix": [6, 0], "x": 0, "y": 0},
-        {"matrix": [6, 1], "x": 1, "y": 0},
-        {"matrix": [6, 2], "x": 2, "y": 0},
-        {"matrix": [6, 3], "x": 3, "y": 0},
-        {"matrix": [6, 4], "x": 4, "y": 0},
-        {"matrix": [6, 5], "x": 5, "y": 0},
-        {"matrix": [5, 6], "x": 6, "y": 0},
-        {"matrix": [5, 7], "x": 7, "y": 0},
-        {"matrix": [5, 8], "x": 8, "y": 0},
-        {"matrix": [5, 9], "x": 9, "y": 0},
-        {"matrix": [5, 10], "x": 10, "y": 0},
-        {"matrix": [0, 7], "x": 11, "y": 0},
-        {"matrix": [0, 8], "x": 12, "y": 0},
-        {"matrix": [0, 9], "x": 13, "y": 0},
-        {"matrix": [0, 10], "x": 14, "y": 0},
-
-        {"matrix": [7, 0], "x": 0, "y": 1, "w": 1.5},
-        {"matrix": [7, 2], "x": 1.5, "y": 1},
-        {"matrix": [7, 3], "x": 2.5, "y": 1},
-        {"matrix": [7, 4], "x": 3.5, "y": 1},
-        {"matrix": [7, 5], "x": 4.5, "y": 1},
-        {"matrix": [7, 6], "x": 5.5, "y": 1},
-        {"matrix": [6, 7], "x": 6.5, "y": 1},
-        {"matrix": [6, 8], "x": 7.5, "y": 1},
-        {"matrix": [6, 9], "x": 8.5, "y": 1},
-        {"matrix": [6, 10], "x": 9.5, "y": 1},
-        {"matrix": [1, 7], "x": 10.5, "y": 1},
-        {"matrix": [1, 8], "x": 11.5, "y": 1, "w": 1.5},
-        {"matrix": [1, 9], "x": 13, "y": 1},
-        {"matrix": [1, 10], "x": 14, "y": 1},
-
-        {"matrix": [8, 0], "x": 0.25, "y": 2, "w": 1.25},
-        {"matrix": [8, 2], "x": 1.5, "y": 2},
-        {"matrix": [8, 3], "x": 2.5, "y": 2},
-        {"matrix": [8, 4], "x": 3.5, "y": 2},
-        {"matrix": [8, 5], "x": 4.5, "y": 2},
-        {"matrix": [8, 6], "x": 5.5, "y": 2},
-        {"matrix": [8, 7], "x": 6.5, "y": 2},
-        {"matrix": [7, 8], "x": 7.5, "y": 2},
-        {"matrix": [7, 9], "x": 8.5, "y": 2},
-        {"matrix": [7, 10], "x": 9.5, "y": 2},
-        {"matrix": [2, 7], "x": 10.5, "y": 2},
-        {"matrix": [2, 8], "x": 11.5, "y": 2, "w": 2.25},
-        {"matrix": [2, 10], "x": 13.75, "y": 2},
-
-        {"matrix": [9, 0], "x": 0.25, "y": 3, "w": 1.75},
-        {"matrix": [9, 2], "x": 2, "y": 3},
-        {"matrix": [9, 3], "x": 3, "y": 3},
-        {"matrix": [9, 4], "x": 4, "y": 3},
-        {"matrix": [9, 5], "x": 5, "y": 3},
-        {"matrix": [9, 6], "x": 6, "y": 3},
-        {"matrix": [9, 7], "x": 7, "y": 3},
-        {"matrix": [9, 8], "x": 8, "y": 3},
-        {"matrix": [8, 9], "x": 9, "y": 3},
-        {"matrix": [8, 10], "x": 10, "y": 3},
-        {"matrix": [3, 7], "x": 11, "y": 3},
-        {"matrix": [3, 8], "x": 12, "y": 3},
-        {"matrix": [3, 9], "x": 13, "y": 3},
-        {"matrix": [3, 10], "x": 14, "y": 3},
-
-        {"matrix": [10, 0], "x": 0, "y": 4},
-        {"matrix": [10, 1], "x": 1, "y": 4},
-        {"matrix": [10, 2], "x": 2, "y": 4, "w": 1.25},
-        {"matrix": [10, 3], "x": 3.25, "y": 4, "w": 1.25},
-        {"matrix": [10, 5], "x": 4.5, "y": 4, "w": 2},
-        {"matrix": [10, 7], "x": 6.5, "y": 4, "w": 2},
-        {"matrix": [10, 8], "x": 8.5, "y": 4, "w": 1.25},
-        {"matrix": [10, 9], "x": 9.75, "y": 4, "w": 1.25},
-        {"matrix": [4, 7], "x": 11, "y": 4},
-        {"matrix": [4, 8], "x": 12, "y": 4},
-        {"matrix": [4, 9], "x": 13, "y": 4},
-        {"matrix": [4, 10], "x": 14, "y": 4}
-      ]
-    },
-    "LAYOUT_jp": {
-      "layout": [
-        {"matrix": [6, 0], "x": 0, "y": 0},
-        {"matrix": [6, 1], "x": 1, "y": 0},
-        {"matrix": [6, 2], "x": 2, "y": 0},
-        {"matrix": [6, 3], "x": 3, "y": 0},
-        {"matrix": [6, 4], "x": 4, "y": 0},
-        {"matrix": [6, 5], "x": 5, "y": 0},
-        {"matrix": [5, 6], "x": 6, "y": 0},
-        {"matrix": [5, 7], "x": 7, "y": 0},
-        {"matrix": [5, 8], "x": 8, "y": 0},
-        {"matrix": [5, 9], "x": 9, "y": 0},
-        {"matrix": [5, 10], "x": 10, "y": 0},
-        {"matrix": [0, 7], "x": 11, "y": 0},
-        {"matrix": [0, 8], "x": 12, "y": 0},
-        {"matrix": [0, 9], "x": 13, "y": 0},
-        {"matrix": [0, 10], "x": 14, "y": 0},
-
-        {"matrix": [7, 0], "x": 0, "y": 1, "w": 1.5},
-        {"matrix": [7, 2], "x": 1.5, "y": 1},
-        {"matrix": [7, 3], "x": 2.5, "y": 1},
-        {"matrix": [7, 4], "x": 3.5, "y": 1},
-        {"matrix": [7, 5], "x": 4.5, "y": 1},
-        {"matrix": [7, 6], "x": 5.5, "y": 1},
-        {"matrix": [6, 7], "x": 6.5, "y": 1},
-        {"matrix": [6, 8], "x": 7.5, "y": 1},
-        {"matrix": [6, 9], "x": 8.5, "y": 1},
-        {"matrix": [6, 10], "x": 9.5, "y": 1},
-        {"matrix": [1, 7], "x": 10.5, "y": 1},
-        {"matrix": [1, 9], "x": 11.5, "y": 1, "w": 1.25, "h": 2, "r": 180, "rx": 12.125, "ry": 1.5},
-        {"matrix": [1, 10], "x": 12.75, "y": 1},
-        {"matrix": [8, 0], "x": 13.75, "y": 1},
-
-        {"matrix": [8, 2], "x": 0.25, "y": 2, "w": 1.25},
-        {"matrix": [8, 3], "x": 1.5, "y": 2},
-        {"matrix": [8, 4], "x": 2.5, "y": 2},
-        {"matrix": [8, 5], "x": 3.5, "y": 2},
-        {"matrix": [8, 6], "x": 4.5, "y": 2},
-        {"matrix": [8, 7], "x": 5.5, "y": 2},
-        {"matrix": [7, 8], "x": 6.5, "y": 2},
-        {"matrix": [7, 9], "x": 7.5, "y": 2},
-        {"matrix": [7, 10], "x": 8.5, "y": 2},
-        {"matrix": [2, 7], "x": 9.5, "y": 2},
-        {"matrix": [2, 8], "x": 10.5, "y": 2},
-        {"matrix": [2, 9], "x": 13, "y": 2},
-        {"matrix": [2, 10], "x": 14, "y": 2},
-
-        {"matrix": [9, 0], "x": 0.25, "y": 3, "w": 1.75},
-        {"matrix": [9, 2], "x": 2, "y": 3},
-        {"matrix": [9, 3], "x": 3, "y": 3},
-        {"matrix": [9, 4], "x": 4, "y": 3},
-        {"matrix": [9, 5], "x": 5, "y": 3},
-        {"matrix": [9, 6], "x": 6, "y": 3},
-        {"matrix": [9, 7], "x": 7, "y": 3},
-        {"matrix": [9, 8], "x": 8, "y": 3},
-        {"matrix": [8, 9], "x": 9, "y": 3},
-        {"matrix": [8, 10], "x": 10, "y": 3},
-        {"matrix": [3, 7], "x": 11, "y": 3},
-        {"matrix": [3, 8], "x": 12, "y": 3},
-        {"matrix": [3, 9], "x": 13, "y": 3},
-        {"matrix": [3, 10], "x": 14, "y": 3},
-
-        {"matrix": [10, 0], "x": 0, "y": 4},
-        {"matrix": [10, 1], "x": 1, "y": 4},
-        {"matrix": [10, 2], "x": 2, "y": 4, "w": 1.25},
-        {"matrix": [10, 3], "x": 3.25, "y": 4},
-        {"matrix": [10, 5], "x": 4.25, "y": 4, "w": 2.25},
-        {"matrix": [10, 7], "x": 6.5, "y": 4, "w": 2},
-        {"matrix": [10, 8], "x": 8.5, "y": 4, "w": 1.25},
-        {"matrix": [10, 9], "x": 9.75, "y": 4, "w": 1.25},
-        {"matrix": [4, 7], "x": 11, "y": 4},
-        {"matrix": [4, 8], "x": 12, "y": 4},
-        {"matrix": [4, 9], "x": 13, "y": 4},
-        {"matrix": [4, 10], "x": 14, "y": 4}
-      ]
-    },
-    "LAYOUT_all": {
-      "layout": [
-        {"matrix": [6, 0], "x": 0, "y": 0},
-        {"matrix": [6, 1], "x": 1, "y": 0},
-        {"matrix": [6, 2], "x": 2, "y": 0},
-        {"matrix": [6, 3], "x": 3, "y": 0},
-        {"matrix": [6, 4], "x": 4, "y": 0},
-        {"matrix": [6, 5], "x": 5, "y": 0},
-        {"matrix": [5, 6], "x": 6, "y": 0},
-        {"matrix": [5, 7], "x": 7, "y": 0},
-        {"matrix": [5, 8], "x": 8, "y": 0},
-        {"matrix": [5, 9], "x": 9, "y": 0},
-        {"matrix": [5, 10], "x": 10, "y": 0},
-        {"matrix": [0, 7], "x": 11, "y": 0},
-        {"matrix": [0, 8], "x": 12, "y": 0},
-        {"matrix": [0, 9], "x": 13, "y": 0},
-        {"matrix": [0, 10], "x": 14, "y": 0},
-
-        {"matrix": [7, 0], "x": 0, "y": 1, "w": 1.5},
-        {"matrix": [7, 2], "x": 1.5, "y": 1},
-        {"matrix": [7, 3], "x": 2.5, "y": 1},
-        {"matrix": [7, 4], "x": 3.5, "y": 1},
-        {"matrix": [7, 5], "x": 4.5, "y": 1},
-        {"matrix": [7, 6], "x": 5.5, "y": 1},
-        {"matrix": [6, 7], "x": 6.5, "y": 1},
-        {"matrix": [6, 8], "x": 7.5, "y": 1},
-        {"matrix": [6, 9], "x": 8.5, "y": 1},
-        {"matrix": [6, 10], "x": 9.5, "y": 1},
-        {"matrix": [1, 7], "x": 10.5, "y": 1},
-        {"matrix": [1, 8], "x": 11.5, "y": 1, "w": 1.5},
-        {"matrix": [1, 9], "x": 13, "y": 1},
-        {"matrix": [1, 10], "x": 14, "y": 1},
-
-        {"matrix": [8, 0], "x": 0.25, "y": 2, "w": 1.25},
-        {"matrix": [8, 2], "x": 1.5, "y": 2},
-        {"matrix": [8, 3], "x": 2.5, "y": 2},
-        {"matrix": [8, 4], "x": 3.5, "y": 2},
-        {"matrix": [8, 5], "x": 4.5, "y": 2},
-        {"matrix": [8, 6], "x": 5.5, "y": 2},
-        {"matrix": [8, 7], "x": 6.5, "y": 2},
-        {"matrix": [7, 8], "x": 7.5, "y": 2},
-        {"matrix": [7, 9], "x": 8.5, "y": 2},
-        {"matrix": [7, 10], "x": 9.5, "y": 2},
-        {"matrix": [2, 7], "x": 10.5, "y": 2},
-        {"matrix": [2, 8], "x": 11.5, "y": 2, "w": 1.5},
-        {"matrix": [2, 9], "x": 13, "y": 2},
-        {"matrix": [2, 10], "x": 14, "y": 2},
-
-        {"matrix": [9, 0], "x": 0.25, "y": 3, "w": 1.75},
-        {"matrix": [9, 2], "x": 2, "y": 3},
-        {"matrix": [9, 3], "x": 3, "y": 3},
-        {"matrix": [9, 4], "x": 4, "y": 3},
-        {"matrix": [9, 5], "x": 5, "y": 3},
-        {"matrix": [9, 6], "x": 6, "y": 3},
-        {"matrix": [9, 7], "x": 7, "y": 3},
-        {"matrix": [9, 8], "x": 8, "y": 3},
-        {"matrix": [8, 9], "x": 9, "y": 3},
-        {"matrix": [8, 10], "x": 10, "y": 3},
-        {"matrix": [3, 7], "x": 11, "y": 3},
-        {"matrix": [3, 8], "x": 12, "y": 3},
-        {"matrix": [3, 9], "x": 13, "y": 3},
-        {"matrix": [3, 10], "x": 14, "y": 3},
-
-        {"matrix": [10, 0], "x": 0, "y": 4},
-        {"matrix": [10, 1], "x": 1, "y": 4},
-        {"matrix": [10, 2], "x": 2, "y": 4, "w": 1.25},
-        {"matrix": [10, 3], "x": 3.25, "y": 4, "w": 1.25},
-        {"matrix": [10, 5], "x": 4.5, "y": 4, "w": 2},
-        {"matrix": [10, 7], "x": 6.5, "y": 4, "w": 2},
-        {"matrix": [10, 8], "x": 8.5, "y": 4, "w": 1.25},
-        {"matrix": [10, 9], "x": 9.75, "y": 4, "w": 1.25},
-        {"matrix": [4, 7], "x": 11, "y": 4},
-        {"matrix": [4, 8], "x": 12, "y": 4},
-        {"matrix": [4, 9], "x": 13, "y": 4},
-        {"matrix": [4, 10], "x": 14, "y": 4}
-      ]
-    }
-  }
-}
diff --git a/keyboards/jones/v03_1/keyboard.json b/keyboards/jones/v03_1/keyboard.json
new file mode 100644
index 00000000000..ae89012884f
--- /dev/null
+++ b/keyboards/jones/v03_1/keyboard.json
@@ -0,0 +1,274 @@
+{
+  "keyboard_name": "Jones",
+  "manufacturer": "jpskenn",
+  "url": "https://github.com/jpskenn/Jones",
+  "maintainer": "jpskenn",
+  "usb": {
+    "vid": "0xB9DD",
+    "pid": "0x175A",
+    "device_version": "0.3.1"
+  },
+  "encoder": {
+    "rotary": [
+      {"pin_a": "F6", "pin_b": "F7"},
+      {"pin_a": "B3", "pin_b": "B2"}
+    ]
+  },
+  "rgblight": {
+    "saturation_steps": 8,
+    "brightness_steps": 8,
+    "led_count": 14,
+    "led_map": [0, 1, 2, 3, 13, 12, 4, 5, 6, 7, 8, 9, 10, 11],
+    "animations": {
+      "rainbow_swirl": true,
+      "knight": true
+    }
+  },
+  "ws2812": {
+    "pin": "F0"
+  },
+  "processor": "atmega32u4",
+  "bootloader": "atmel-dfu",
+  "features": {
+    "bootmagic": false,
+    "mousekey": false,
+    "extrakey": true,
+    "rgblight": true,
+    "audio": true,
+    "encoder": true
+  },
+  "build": {
+    "lto": true
+  },
+  "layouts": {
+    "LAYOUT_ansi": {
+      "layout": [
+        {"matrix": [6, 0], "x": 0, "y": 0},
+        {"matrix": [6, 1], "x": 1, "y": 0},
+        {"matrix": [6, 2], "x": 2, "y": 0},
+        {"matrix": [6, 3], "x": 3, "y": 0},
+        {"matrix": [6, 4], "x": 4, "y": 0},
+        {"matrix": [6, 5], "x": 5, "y": 0},
+        {"matrix": [5, 6], "x": 6, "y": 0},
+        {"matrix": [5, 7], "x": 7, "y": 0},
+        {"matrix": [5, 8], "x": 8, "y": 0},
+        {"matrix": [5, 9], "x": 9, "y": 0},
+        {"matrix": [5, 10], "x": 10, "y": 0},
+        {"matrix": [0, 7], "x": 11, "y": 0},
+        {"matrix": [0, 8], "x": 12, "y": 0},
+        {"matrix": [0, 9], "x": 13, "y": 0},
+        {"matrix": [0, 10], "x": 14, "y": 0},
+
+        {"matrix": [7, 0], "x": 0, "y": 1, "w": 1.5},
+        {"matrix": [7, 2], "x": 1.5, "y": 1},
+        {"matrix": [7, 3], "x": 2.5, "y": 1},
+        {"matrix": [7, 4], "x": 3.5, "y": 1},
+        {"matrix": [7, 5], "x": 4.5, "y": 1},
+        {"matrix": [7, 6], "x": 5.5, "y": 1},
+        {"matrix": [6, 7], "x": 6.5, "y": 1},
+        {"matrix": [6, 8], "x": 7.5, "y": 1},
+        {"matrix": [6, 9], "x": 8.5, "y": 1},
+        {"matrix": [6, 10], "x": 9.5, "y": 1},
+        {"matrix": [1, 7], "x": 10.5, "y": 1},
+        {"matrix": [1, 8], "x": 11.5, "y": 1, "w": 1.5},
+        {"matrix": [1, 9], "x": 13, "y": 1},
+        {"matrix": [1, 10], "x": 14, "y": 1},
+
+        {"matrix": [8, 0], "x": 0.25, "y": 2, "w": 1.25},
+        {"matrix": [8, 2], "x": 1.5, "y": 2},
+        {"matrix": [8, 3], "x": 2.5, "y": 2},
+        {"matrix": [8, 4], "x": 3.5, "y": 2},
+        {"matrix": [8, 5], "x": 4.5, "y": 2},
+        {"matrix": [8, 6], "x": 5.5, "y": 2},
+        {"matrix": [8, 7], "x": 6.5, "y": 2},
+        {"matrix": [7, 8], "x": 7.5, "y": 2},
+        {"matrix": [7, 9], "x": 8.5, "y": 2},
+        {"matrix": [7, 10], "x": 9.5, "y": 2},
+        {"matrix": [2, 7], "x": 10.5, "y": 2},
+        {"matrix": [2, 8], "x": 11.5, "y": 2, "w": 2.25},
+        {"matrix": [2, 10], "x": 13.75, "y": 2},
+
+        {"matrix": [9, 0], "x": 0.25, "y": 3, "w": 1.75},
+        {"matrix": [9, 2], "x": 2, "y": 3},
+        {"matrix": [9, 3], "x": 3, "y": 3},
+        {"matrix": [9, 4], "x": 4, "y": 3},
+        {"matrix": [9, 5], "x": 5, "y": 3},
+        {"matrix": [9, 6], "x": 6, "y": 3},
+        {"matrix": [9, 7], "x": 7, "y": 3},
+        {"matrix": [9, 8], "x": 8, "y": 3},
+        {"matrix": [8, 9], "x": 9, "y": 3},
+        {"matrix": [8, 10], "x": 10, "y": 3},
+        {"matrix": [3, 7], "x": 11, "y": 3},
+        {"matrix": [3, 8], "x": 12, "y": 3},
+        {"matrix": [3, 9], "x": 13, "y": 3},
+        {"matrix": [3, 10], "x": 14, "y": 3},
+
+        {"matrix": [10, 0], "x": 0, "y": 4},
+        {"matrix": [10, 1], "x": 1, "y": 4},
+        {"matrix": [10, 2], "x": 2, "y": 4, "w": 1.25},
+        {"matrix": [10, 3], "x": 3.25, "y": 4, "w": 1.25},
+        {"matrix": [10, 5], "x": 4.5, "y": 4, "w": 2},
+        {"matrix": [10, 7], "x": 6.5, "y": 4, "w": 2},
+        {"matrix": [10, 8], "x": 8.5, "y": 4, "w": 1.25},
+        {"matrix": [10, 9], "x": 9.75, "y": 4, "w": 1.25},
+        {"matrix": [4, 7], "x": 11, "y": 4},
+        {"matrix": [4, 8], "x": 12, "y": 4},
+        {"matrix": [4, 9], "x": 13, "y": 4},
+        {"matrix": [4, 10], "x": 14, "y": 4}
+      ]
+    },
+    "LAYOUT_jp": {
+      "layout": [
+        {"matrix": [6, 0], "x": 0, "y": 0},
+        {"matrix": [6, 1], "x": 1, "y": 0},
+        {"matrix": [6, 2], "x": 2, "y": 0},
+        {"matrix": [6, 3], "x": 3, "y": 0},
+        {"matrix": [6, 4], "x": 4, "y": 0},
+        {"matrix": [6, 5], "x": 5, "y": 0},
+        {"matrix": [5, 6], "x": 6, "y": 0},
+        {"matrix": [5, 7], "x": 7, "y": 0},
+        {"matrix": [5, 8], "x": 8, "y": 0},
+        {"matrix": [5, 9], "x": 9, "y": 0},
+        {"matrix": [5, 10], "x": 10, "y": 0},
+        {"matrix": [0, 7], "x": 11, "y": 0},
+        {"matrix": [0, 8], "x": 12, "y": 0},
+        {"matrix": [0, 9], "x": 13, "y": 0},
+        {"matrix": [0, 10], "x": 14, "y": 0},
+
+        {"matrix": [7, 0], "x": 0, "y": 1, "w": 1.5},
+        {"matrix": [7, 2], "x": 1.5, "y": 1},
+        {"matrix": [7, 3], "x": 2.5, "y": 1},
+        {"matrix": [7, 4], "x": 3.5, "y": 1},
+        {"matrix": [7, 5], "x": 4.5, "y": 1},
+        {"matrix": [7, 6], "x": 5.5, "y": 1},
+        {"matrix": [6, 7], "x": 6.5, "y": 1},
+        {"matrix": [6, 8], "x": 7.5, "y": 1},
+        {"matrix": [6, 9], "x": 8.5, "y": 1},
+        {"matrix": [6, 10], "x": 9.5, "y": 1},
+        {"matrix": [1, 7], "x": 10.5, "y": 1},
+        {"matrix": [1, 9], "x": 11.5, "y": 1, "w": 1.25, "h": 2, "r": 180, "rx": 12.125, "ry": 1.5},
+        {"matrix": [1, 10], "x": 12.75, "y": 1},
+        {"matrix": [8, 0], "x": 13.75, "y": 1},
+
+        {"matrix": [8, 2], "x": 0.25, "y": 2, "w": 1.25},
+        {"matrix": [8, 3], "x": 1.5, "y": 2},
+        {"matrix": [8, 4], "x": 2.5, "y": 2},
+        {"matrix": [8, 5], "x": 3.5, "y": 2},
+        {"matrix": [8, 6], "x": 4.5, "y": 2},
+        {"matrix": [8, 7], "x": 5.5, "y": 2},
+        {"matrix": [7, 8], "x": 6.5, "y": 2},
+        {"matrix": [7, 9], "x": 7.5, "y": 2},
+        {"matrix": [7, 10], "x": 8.5, "y": 2},
+        {"matrix": [2, 7], "x": 9.5, "y": 2},
+        {"matrix": [2, 8], "x": 10.5, "y": 2},
+        {"matrix": [2, 9], "x": 13, "y": 2},
+        {"matrix": [2, 10], "x": 14, "y": 2},
+
+        {"matrix": [9, 0], "x": 0.25, "y": 3, "w": 1.75},
+        {"matrix": [9, 2], "x": 2, "y": 3},
+        {"matrix": [9, 3], "x": 3, "y": 3},
+        {"matrix": [9, 4], "x": 4, "y": 3},
+        {"matrix": [9, 5], "x": 5, "y": 3},
+        {"matrix": [9, 6], "x": 6, "y": 3},
+        {"matrix": [9, 7], "x": 7, "y": 3},
+        {"matrix": [9, 8], "x": 8, "y": 3},
+        {"matrix": [8, 9], "x": 9, "y": 3},
+        {"matrix": [8, 10], "x": 10, "y": 3},
+        {"matrix": [3, 7], "x": 11, "y": 3},
+        {"matrix": [3, 8], "x": 12, "y": 3},
+        {"matrix": [3, 9], "x": 13, "y": 3},
+        {"matrix": [3, 10], "x": 14, "y": 3},
+
+        {"matrix": [10, 0], "x": 0, "y": 4},
+        {"matrix": [10, 1], "x": 1, "y": 4},
+        {"matrix": [10, 2], "x": 2, "y": 4, "w": 1.25},
+        {"matrix": [10, 3], "x": 3.25, "y": 4},
+        {"matrix": [10, 5], "x": 4.25, "y": 4, "w": 2.25},
+        {"matrix": [10, 7], "x": 6.5, "y": 4, "w": 2},
+        {"matrix": [10, 8], "x": 8.5, "y": 4, "w": 1.25},
+        {"matrix": [10, 9], "x": 9.75, "y": 4, "w": 1.25},
+        {"matrix": [4, 7], "x": 11, "y": 4},
+        {"matrix": [4, 8], "x": 12, "y": 4},
+        {"matrix": [4, 9], "x": 13, "y": 4},
+        {"matrix": [4, 10], "x": 14, "y": 4}
+      ]
+    },
+    "LAYOUT_all": {
+      "layout": [
+        {"matrix": [6, 0], "x": 0, "y": 0},
+        {"matrix": [6, 1], "x": 1, "y": 0},
+        {"matrix": [6, 2], "x": 2, "y": 0},
+        {"matrix": [6, 3], "x": 3, "y": 0},
+        {"matrix": [6, 4], "x": 4, "y": 0},
+        {"matrix": [6, 5], "x": 5, "y": 0},
+        {"matrix": [5, 6], "x": 6, "y": 0},
+        {"matrix": [5, 7], "x": 7, "y": 0},
+        {"matrix": [5, 8], "x": 8, "y": 0},
+        {"matrix": [5, 9], "x": 9, "y": 0},
+        {"matrix": [5, 10], "x": 10, "y": 0},
+        {"matrix": [0, 7], "x": 11, "y": 0},
+        {"matrix": [0, 8], "x": 12, "y": 0},
+        {"matrix": [0, 9], "x": 13, "y": 0},
+        {"matrix": [0, 10], "x": 14, "y": 0},
+
+        {"matrix": [7, 0], "x": 0, "y": 1, "w": 1.5},
+        {"matrix": [7, 2], "x": 1.5, "y": 1},
+        {"matrix": [7, 3], "x": 2.5, "y": 1},
+        {"matrix": [7, 4], "x": 3.5, "y": 1},
+        {"matrix": [7, 5], "x": 4.5, "y": 1},
+        {"matrix": [7, 6], "x": 5.5, "y": 1},
+        {"matrix": [6, 7], "x": 6.5, "y": 1},
+        {"matrix": [6, 8], "x": 7.5, "y": 1},
+        {"matrix": [6, 9], "x": 8.5, "y": 1},
+        {"matrix": [6, 10], "x": 9.5, "y": 1},
+        {"matrix": [1, 7], "x": 10.5, "y": 1},
+        {"matrix": [1, 8], "x": 11.5, "y": 1, "w": 1.5},
+        {"matrix": [1, 9], "x": 13, "y": 1},
+        {"matrix": [1, 10], "x": 14, "y": 1},
+
+        {"matrix": [8, 0], "x": 0.25, "y": 2, "w": 1.25},
+        {"matrix": [8, 2], "x": 1.5, "y": 2},
+        {"matrix": [8, 3], "x": 2.5, "y": 2},
+        {"matrix": [8, 4], "x": 3.5, "y": 2},
+        {"matrix": [8, 5], "x": 4.5, "y": 2},
+        {"matrix": [8, 6], "x": 5.5, "y": 2},
+        {"matrix": [8, 7], "x": 6.5, "y": 2},
+        {"matrix": [7, 8], "x": 7.5, "y": 2},
+        {"matrix": [7, 9], "x": 8.5, "y": 2},
+        {"matrix": [7, 10], "x": 9.5, "y": 2},
+        {"matrix": [2, 7], "x": 10.5, "y": 2},
+        {"matrix": [2, 8], "x": 11.5, "y": 2, "w": 1.5},
+        {"matrix": [2, 9], "x": 13, "y": 2},
+        {"matrix": [2, 10], "x": 14, "y": 2},
+
+        {"matrix": [9, 0], "x": 0.25, "y": 3, "w": 1.75},
+        {"matrix": [9, 2], "x": 2, "y": 3},
+        {"matrix": [9, 3], "x": 3, "y": 3},
+        {"matrix": [9, 4], "x": 4, "y": 3},
+        {"matrix": [9, 5], "x": 5, "y": 3},
+        {"matrix": [9, 6], "x": 6, "y": 3},
+        {"matrix": [9, 7], "x": 7, "y": 3},
+        {"matrix": [9, 8], "x": 8, "y": 3},
+        {"matrix": [8, 9], "x": 9, "y": 3},
+        {"matrix": [8, 10], "x": 10, "y": 3},
+        {"matrix": [3, 7], "x": 11, "y": 3},
+        {"matrix": [3, 8], "x": 12, "y": 3},
+        {"matrix": [3, 9], "x": 13, "y": 3},
+        {"matrix": [3, 10], "x": 14, "y": 3},
+
+        {"matrix": [10, 0], "x": 0, "y": 4},
+        {"matrix": [10, 1], "x": 1, "y": 4},
+        {"matrix": [10, 2], "x": 2, "y": 4, "w": 1.25},
+        {"matrix": [10, 3], "x": 3.25, "y": 4, "w": 1.25},
+        {"matrix": [10, 5], "x": 4.5, "y": 4, "w": 2},
+        {"matrix": [10, 7], "x": 6.5, "y": 4, "w": 2},
+        {"matrix": [10, 8], "x": 8.5, "y": 4, "w": 1.25},
+        {"matrix": [10, 9], "x": 9.75, "y": 4, "w": 1.25},
+        {"matrix": [4, 7], "x": 11, "y": 4},
+        {"matrix": [4, 8], "x": 12, "y": 4},
+        {"matrix": [4, 9], "x": 13, "y": 4},
+        {"matrix": [4, 10], "x": 14, "y": 4}
+      ]
+    }
+  }
+}
diff --git a/keyboards/jones/v03_1/rules.mk b/keyboards/jones/v03_1/rules.mk
index eff64d9a584..30ce5d293b7 100644
--- a/keyboards/jones/v03_1/rules.mk
+++ b/keyboards/jones/v03_1/rules.mk
@@ -1,19 +1,2 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-AUDIO_ENABLE = yes          # Audio output
-
-ENCODER_ENABLE = yes        # Rotary Encoder
-
-CUSTOM_MATRIX = lite        # Custom matrix for "Round-Robin Matrix"
+CUSTOM_MATRIX = lite
 SRC += matrix.c
-
-LTO_ENABLE = yes
diff --git a/keyboards/jones/v1/info.json b/keyboards/jones/v1/info.json
deleted file mode 100644
index 54496d31649..00000000000
--- a/keyboards/jones/v1/info.json
+++ /dev/null
@@ -1,122 +0,0 @@
-{
-  "keyboard_name": "Jones",
-  "manufacturer": "jpskenn",
-  "url": "https://github.com/jpskenn/Jones",
-  "maintainer": "jpskenn",
-  "usb": {
-    "vid": "0xB9DD",
-    "pid": "0x175A",
-    "device_version": "1.0.0"
-  },
-  "matrix_pins": {
-    "cols": ["B3", "B2", "E6", "D6", "D4", "B0", "B1", "B7", "B4", "D7"],
-    "rows": ["B3", "B2", "E6", "D6", "D4", "B0", "B1", "B7", "B4", "D7"]
-  },
-  "rgblight": {
-    "saturation_steps": 8,
-    "brightness_steps": 8,
-    "led_count": 4
-  },
-  "ws2812": {
-    "pin": "F1"
-  },
-  "diode_direction": "COL2ROW",
-  "dynamic_keymap": {
-    "layer_count": 6
-  },
-  "eeprom": {
-    "driver": "i2c"
-  },
-  "encoder": {
-    "rotary": [
-      {"pin_a": "F5", "pin_b": "F4"},
-      {"pin_a": "D2", "pin_b": "D3"}
-    ]
-  },
-  "bootmagic": {
-    "matrix": [0, 9]
-  },
-  "processor": "atmega32u4",
-  "bootloader": "atmel-dfu",
-  "layouts": {
-    "LAYOUT": {
-      "layout": [
-        {"label": "k09", "matrix": [0, 9], "x": 0, "y": 0},
-        {"label": "k59", "matrix": [5, 9], "x": 1, "y": 0},
-        {"label": "k08", "matrix": [0, 8], "x": 2, "y": 0},
-        {"label": "k54", "matrix": [5, 4], "x": 3, "y": 0},
-        {"label": "k04", "matrix": [0, 4], "x": 4, "y": 0},
-        {"label": "k50", "matrix": [5, 0], "x": 5, "y": 0},
-        {"label": "k56", "matrix": [5, 6], "x": 6, "y": 0},
-        {"label": "k06", "matrix": [0, 6], "x": 7, "y": 0},
-        {"label": "k05", "matrix": [0, 5], "x": 8, "y": 0},
-        {"label": "k52", "matrix": [5, 2], "x": 9, "y": 0},
-        {"label": "k02", "matrix": [0, 2], "x": 10, "y": 0},
-        {"label": "k53", "matrix": [5, 3], "x": 11, "y": 0},
-        {"label": "k07", "matrix": [0, 7], "x": 12, "y": 0},
-        {"label": "k51", "matrix": [5, 1], "x": 13, "y": 0},
-        {"label": "k01", "matrix": [0, 1], "x": 14, "y": 0},
-
-        {"label": "k19", "matrix": [1, 9], "x": 0, "y": 1, "w": 1.5},
-        {"label": "k69", "matrix": [6, 9], "x": 1.5, "y": 1},
-        {"label": "k18", "matrix": [1, 8], "x": 2.5, "y": 1},
-        {"label": "k64", "matrix": [6, 4], "x": 3.5, "y": 1},
-        {"label": "k14", "matrix": [1, 4], "x": 4.5, "y": 1},
-        {"label": "k60", "matrix": [6, 0], "x": 5.5, "y": 1},
-        {"label": "k10", "matrix": [1, 0], "x": 6.5, "y": 1},
-        {"label": "k16", "matrix": [1, 6], "x": 7.5, "y": 1},
-        {"label": "k15", "matrix": [1, 5], "x": 8.5, "y": 1},
-        {"label": "k62", "matrix": [6, 2], "x": 9.5, "y": 1},
-        {"label": "k12", "matrix": [1, 2], "x": 10.5, "y": 1},
-        {"label": "k63", "matrix": [6, 3], "x": 11.5, "y": 1},
-        {"label": "k17", "matrix": [1, 7], "x": 12.5, "y": 1},
-        {"label": "k61", "matrix": [6, 1], "x": 13.5, "y": 1, "w": 1.5},
-
-        {"label": "k29", "matrix": [2, 9], "x": 0, "y": 2, "w": 1.5},
-        {"label": "k79", "matrix": [7, 9], "x": 1.5, "y": 2},
-        {"label": "k28", "matrix": [2, 8], "x": 2.5, "y": 2},
-        {"label": "k74", "matrix": [7, 4], "x": 3.5, "y": 2},
-        {"label": "k24", "matrix": [2, 4], "x": 4.5, "y": 2},
-        {"label": "k70", "matrix": [7, 0], "x": 5.5, "y": 2},
-        {"label": "k20", "matrix": [2, 0], "x": 6.5, "y": 2},
-        {"label": "k26", "matrix": [2, 6], "x": 7.5, "y": 2},
-        {"label": "k25", "matrix": [2, 5], "x": 8.5, "y": 2},
-        {"label": "k72", "matrix": [7, 2], "x": 9.5, "y": 2},
-        {"label": "k23", "matrix": [2, 3], "x": 10.5, "y": 2},
-        {"label": "k73", "matrix": [7, 3], "x": 11.5, "y": 2},
-        {"label": "k27", "matrix": [2, 7], "x": 12.5, "y": 2},
-        {"label": "k71", "matrix": [7, 1], "x": 13.5, "y": 2, "w": 1.5},
-
-        {"label": "k39", "matrix": [3, 9], "x": 0, "y": 3},
-        {"label": "k89", "matrix": [8, 9], "x": 1, "y": 3},
-        {"label": "k38", "matrix": [3, 8], "x": 2, "y": 3},
-        {"label": "k84", "matrix": [8, 4], "x": 3, "y": 3},
-        {"label": "k34", "matrix": [3, 4], "x": 4, "y": 3},
-        {"label": "k80", "matrix": [8, 0], "x": 5, "y": 3},
-        {"label": "k30", "matrix": [3, 0], "x": 6, "y": 3},
-        {"label": "k36", "matrix": [3, 6], "x": 7, "y": 3},
-        {"label": "k35", "matrix": [3, 5], "x": 8, "y": 3},
-        {"label": "k82", "matrix": [8, 2], "x": 9, "y": 3},
-        {"label": "k32", "matrix": [3, 2], "x": 10, "y": 3},
-        {"label": "k83", "matrix": [8, 3], "x": 11, "y": 3},
-        {"label": "k37", "matrix": [3, 7], "x": 12, "y": 3},
-        {"label": "k81", "matrix": [8, 1], "x": 13, "y": 3},
-        {"label": "k31", "matrix": [3, 1], "x": 14, "y": 3},
-
-        {"label": "k49", "matrix": [4, 9], "x": 0, "y": 4},
-        {"label": "k98", "matrix": [9, 8], "x": 1, "y": 4},
-        {"label": "k48", "matrix": [4, 8], "x": 2, "y": 4, "w": 1.25},
-        {"label": "k94", "matrix": [9, 4], "x": 3.25, "y": 4, "w": 1.25},
-        {"label": "k90", "matrix": [9, 0], "x": 4.5, "y": 4, "w": 1.5},
-        {"label": "k46", "matrix": [4, 6], "x": 6, "y": 4},
-        {"label": "k45", "matrix": [4, 5], "x": 7, "y": 4},
-        {"label": "k92", "matrix": [9, 2], "x": 8, "y": 4},
-        {"label": "k42", "matrix": [4, 2], "x": 9, "y": 4, "w": 1.5},
-        {"label": "k93", "matrix": [9, 3], "x": 10.5, "y": 4, "w": 1.25},
-        {"label": "k47", "matrix": [4, 7], "x": 11.75, "y": 4, "w": 1.25},
-        {"label": "k91", "matrix": [9, 1], "x": 13, "y": 4},
-        {"label": "k41", "matrix": [4, 1], "x": 14, "y": 4}
-      ]
-    }
-  }
-}
diff --git a/keyboards/jones/v1/keyboard.json b/keyboards/jones/v1/keyboard.json
new file mode 100644
index 00000000000..df30c596d4c
--- /dev/null
+++ b/keyboards/jones/v1/keyboard.json
@@ -0,0 +1,133 @@
+{
+  "keyboard_name": "Jones",
+  "manufacturer": "jpskenn",
+  "url": "https://github.com/jpskenn/Jones",
+  "maintainer": "jpskenn",
+  "usb": {
+    "vid": "0xB9DD",
+    "pid": "0x175A",
+    "device_version": "1.0.0"
+  },
+  "matrix_pins": {
+    "cols": ["B3", "B2", "E6", "D6", "D4", "B0", "B1", "B7", "B4", "D7"],
+    "rows": ["B3", "B2", "E6", "D6", "D4", "B0", "B1", "B7", "B4", "D7"]
+  },
+  "rgblight": {
+    "saturation_steps": 8,
+    "brightness_steps": 8,
+    "led_count": 4
+  },
+  "ws2812": {
+    "pin": "F1"
+  },
+  "diode_direction": "COL2ROW",
+  "dynamic_keymap": {
+    "layer_count": 6
+  },
+  "eeprom": {
+    "driver": "i2c"
+  },
+  "encoder": {
+    "rotary": [
+      {"pin_a": "F5", "pin_b": "F4"},
+      {"pin_a": "D2", "pin_b": "D3"}
+    ]
+  },
+  "bootmagic": {
+    "matrix": [0, 9]
+  },
+  "processor": "atmega32u4",
+  "bootloader": "atmel-dfu",
+  "features": {
+    "bootmagic": false,
+    "mousekey": true,
+    "extrakey": true,
+    "rgblight": true,
+    "audio": true,
+    "encoder": true
+  },
+  "build": {
+    "lto": true
+  },
+  "layouts": {
+    "LAYOUT": {
+      "layout": [
+        {"label": "k09", "matrix": [0, 9], "x": 0, "y": 0},
+        {"label": "k59", "matrix": [5, 9], "x": 1, "y": 0},
+        {"label": "k08", "matrix": [0, 8], "x": 2, "y": 0},
+        {"label": "k54", "matrix": [5, 4], "x": 3, "y": 0},
+        {"label": "k04", "matrix": [0, 4], "x": 4, "y": 0},
+        {"label": "k50", "matrix": [5, 0], "x": 5, "y": 0},
+        {"label": "k56", "matrix": [5, 6], "x": 6, "y": 0},
+        {"label": "k06", "matrix": [0, 6], "x": 7, "y": 0},
+        {"label": "k05", "matrix": [0, 5], "x": 8, "y": 0},
+        {"label": "k52", "matrix": [5, 2], "x": 9, "y": 0},
+        {"label": "k02", "matrix": [0, 2], "x": 10, "y": 0},
+        {"label": "k53", "matrix": [5, 3], "x": 11, "y": 0},
+        {"label": "k07", "matrix": [0, 7], "x": 12, "y": 0},
+        {"label": "k51", "matrix": [5, 1], "x": 13, "y": 0},
+        {"label": "k01", "matrix": [0, 1], "x": 14, "y": 0},
+
+        {"label": "k19", "matrix": [1, 9], "x": 0, "y": 1, "w": 1.5},
+        {"label": "k69", "matrix": [6, 9], "x": 1.5, "y": 1},
+        {"label": "k18", "matrix": [1, 8], "x": 2.5, "y": 1},
+        {"label": "k64", "matrix": [6, 4], "x": 3.5, "y": 1},
+        {"label": "k14", "matrix": [1, 4], "x": 4.5, "y": 1},
+        {"label": "k60", "matrix": [6, 0], "x": 5.5, "y": 1},
+        {"label": "k10", "matrix": [1, 0], "x": 6.5, "y": 1},
+        {"label": "k16", "matrix": [1, 6], "x": 7.5, "y": 1},
+        {"label": "k15", "matrix": [1, 5], "x": 8.5, "y": 1},
+        {"label": "k62", "matrix": [6, 2], "x": 9.5, "y": 1},
+        {"label": "k12", "matrix": [1, 2], "x": 10.5, "y": 1},
+        {"label": "k63", "matrix": [6, 3], "x": 11.5, "y": 1},
+        {"label": "k17", "matrix": [1, 7], "x": 12.5, "y": 1},
+        {"label": "k61", "matrix": [6, 1], "x": 13.5, "y": 1, "w": 1.5},
+
+        {"label": "k29", "matrix": [2, 9], "x": 0, "y": 2, "w": 1.5},
+        {"label": "k79", "matrix": [7, 9], "x": 1.5, "y": 2},
+        {"label": "k28", "matrix": [2, 8], "x": 2.5, "y": 2},
+        {"label": "k74", "matrix": [7, 4], "x": 3.5, "y": 2},
+        {"label": "k24", "matrix": [2, 4], "x": 4.5, "y": 2},
+        {"label": "k70", "matrix": [7, 0], "x": 5.5, "y": 2},
+        {"label": "k20", "matrix": [2, 0], "x": 6.5, "y": 2},
+        {"label": "k26", "matrix": [2, 6], "x": 7.5, "y": 2},
+        {"label": "k25", "matrix": [2, 5], "x": 8.5, "y": 2},
+        {"label": "k72", "matrix": [7, 2], "x": 9.5, "y": 2},
+        {"label": "k23", "matrix": [2, 3], "x": 10.5, "y": 2},
+        {"label": "k73", "matrix": [7, 3], "x": 11.5, "y": 2},
+        {"label": "k27", "matrix": [2, 7], "x": 12.5, "y": 2},
+        {"label": "k71", "matrix": [7, 1], "x": 13.5, "y": 2, "w": 1.5},
+
+        {"label": "k39", "matrix": [3, 9], "x": 0, "y": 3},
+        {"label": "k89", "matrix": [8, 9], "x": 1, "y": 3},
+        {"label": "k38", "matrix": [3, 8], "x": 2, "y": 3},
+        {"label": "k84", "matrix": [8, 4], "x": 3, "y": 3},
+        {"label": "k34", "matrix": [3, 4], "x": 4, "y": 3},
+        {"label": "k80", "matrix": [8, 0], "x": 5, "y": 3},
+        {"label": "k30", "matrix": [3, 0], "x": 6, "y": 3},
+        {"label": "k36", "matrix": [3, 6], "x": 7, "y": 3},
+        {"label": "k35", "matrix": [3, 5], "x": 8, "y": 3},
+        {"label": "k82", "matrix": [8, 2], "x": 9, "y": 3},
+        {"label": "k32", "matrix": [3, 2], "x": 10, "y": 3},
+        {"label": "k83", "matrix": [8, 3], "x": 11, "y": 3},
+        {"label": "k37", "matrix": [3, 7], "x": 12, "y": 3},
+        {"label": "k81", "matrix": [8, 1], "x": 13, "y": 3},
+        {"label": "k31", "matrix": [3, 1], "x": 14, "y": 3},
+
+        {"label": "k49", "matrix": [4, 9], "x": 0, "y": 4},
+        {"label": "k98", "matrix": [9, 8], "x": 1, "y": 4},
+        {"label": "k48", "matrix": [4, 8], "x": 2, "y": 4, "w": 1.25},
+        {"label": "k94", "matrix": [9, 4], "x": 3.25, "y": 4, "w": 1.25},
+        {"label": "k90", "matrix": [9, 0], "x": 4.5, "y": 4, "w": 1.5},
+        {"label": "k46", "matrix": [4, 6], "x": 6, "y": 4},
+        {"label": "k45", "matrix": [4, 5], "x": 7, "y": 4},
+        {"label": "k92", "matrix": [9, 2], "x": 8, "y": 4},
+        {"label": "k42", "matrix": [4, 2], "x": 9, "y": 4, "w": 1.5},
+        {"label": "k93", "matrix": [9, 3], "x": 10.5, "y": 4, "w": 1.25},
+        {"label": "k47", "matrix": [4, 7], "x": 11.75, "y": 4, "w": 1.25},
+        {"label": "k91", "matrix": [9, 1], "x": 13, "y": 4},
+        {"label": "k41", "matrix": [4, 1], "x": 14, "y": 4}
+      ]
+    }
+  }
+}
diff --git a/keyboards/jones/v1/rules.mk b/keyboards/jones/v1/rules.mk
deleted file mode 100644
index 6f522a43656..00000000000
--- a/keyboards/jones/v1/rules.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes        # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-AUDIO_ENABLE = yes          # Audio output
-ENCODER_ENABLE = yes        # Rotary Encoder
-
-LTO_ENABLE = yes
diff --git a/keyboards/jorne/rev1/info.json b/keyboards/jorne/rev1/info.json
deleted file mode 100644
index fedab8fd08a..00000000000
--- a/keyboards/jorne/rev1/info.json
+++ /dev/null
@@ -1,92 +0,0 @@
-{
-    "keyboard_name": "Jorne",
-    "manufacturer": "joric",
-    "url": "https://github.com/joric/jorne/wiki",
-    "maintainer": "joric",
-    "usb": {
-        "vid": "0x4753",
-        "pid": "0x0001",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["F4", "F5", "F6", "F7", "B1", "B3"],
-        "rows": ["D4", "C6", "D7", "E6"]
-    },
-    "diode_direction": "COL2ROW",
-    "split": {
-        "enabled": true,
-        "soft_serial_pin": "D2",
-        "transport": {
-            "sync": {
-                "indicators": true,
-                "layer_state": true
-            }
-        }
-    },
-    "rgblight": {
-        "led_count": 56,
-        "split_count": [28, 28]
-    },
-    "ws2812": {
-        "pin": "D3"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [3, 0], "x": 0, "y": 1.125},
-                {"matrix": [0, 0], "x": 1, "y": 0.375},
-                {"matrix": [0, 1], "x": 2, "y": 0.375},
-                {"matrix": [0, 2], "x": 3, "y": 0.125},
-                {"matrix": [0, 3], "x": 4, "y": 0},
-                {"matrix": [0, 4], "x": 5, "y": 0.125},
-                {"matrix": [0, 5], "x": 6, "y": 0.25},
-
-                {"matrix": [4, 5], "x": 10.5, "y": 0.25},
-                {"matrix": [4, 4], "x": 11.5, "y": 0.125},
-                {"matrix": [4, 3], "x": 12.5, "y": 0},
-                {"matrix": [4, 2], "x": 13.5, "y": 0.125},
-                {"matrix": [4, 1], "x": 14.5, "y": 0.375},
-                {"matrix": [4, 0], "x": 15.5, "y": 0.375},
-                {"matrix": [7, 0], "x": 16.5, "y": 1.125},
-
-                {"matrix": [1, 0], "x": 1, "y": 1.375},
-                {"matrix": [1, 1], "x": 2, "y": 1.375},
-                {"matrix": [1, 2], "x": 3, "y": 1.125},
-                {"matrix": [1, 3], "x": 4, "y": 1},
-                {"matrix": [1, 4], "x": 5, "y": 1.125},
-                {"matrix": [1, 5], "x": 6, "y": 1.25},
-
-                {"matrix": [5, 5], "x": 10.5, "y": 1.25},
-                {"matrix": [5, 4], "x": 11.5, "y": 1.125},
-                {"matrix": [5, 3], "x": 12.5, "y": 1},
-                {"matrix": [5, 2], "x": 13.5, "y": 1.125},
-                {"matrix": [5, 1], "x": 14.5, "y": 1.375},
-                {"matrix": [5, 0], "x": 15.5, "y": 1.375},
-
-                {"matrix": [2, 0], "x": 1, "y": 2.375},
-                {"matrix": [2, 1], "x": 2, "y": 2.375},
-                {"matrix": [2, 2], "x": 3, "y": 2.125},
-                {"matrix": [2, 3], "x": 4, "y": 2},
-                {"matrix": [2, 4], "x": 5, "y": 2.125},
-                {"matrix": [2, 5], "x": 6, "y": 2.25},
-
-                {"matrix": [6, 5], "x": 10.5, "y": 2.25},
-                {"matrix": [6, 4], "x": 11.5, "y": 2.125},
-                {"matrix": [6, 3], "x": 12.5, "y": 2},
-                {"matrix": [6, 2], "x": 13.5, "y": 2.125},
-                {"matrix": [6, 1], "x": 14.5, "y": 2.375},
-                {"matrix": [6, 0], "x": 15.5, "y": 2.375},
-
-                {"matrix": [3, 3], "x": 5, "y": 4},
-                {"matrix": [3, 4], "x": 6, "y": 4},
-                {"matrix": [3, 5], "x": 7, "y": 3.5, "h": 1.5},
-
-                {"matrix": [7, 5], "x": 9.5, "y": 3.5, "h": 1.5},
-                {"matrix": [7, 4], "x": 10.5, "y": 4},
-                {"matrix": [7, 3], "x": 11.5, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/jorne/rev1/keyboard.json b/keyboards/jorne/rev1/keyboard.json
new file mode 100644
index 00000000000..93ece816bb9
--- /dev/null
+++ b/keyboards/jorne/rev1/keyboard.json
@@ -0,0 +1,102 @@
+{
+    "keyboard_name": "Jorne",
+    "manufacturer": "joric",
+    "url": "https://github.com/joric/jorne/wiki",
+    "maintainer": "joric",
+    "usb": {
+        "vid": "0x4753",
+        "pid": "0x0001",
+        "device_version": "0.0.1"
+    },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "F6", "F7", "B1", "B3"],
+        "rows": ["D4", "C6", "D7", "E6"]
+    },
+    "diode_direction": "COL2ROW",
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "D2",
+        "transport": {
+            "sync": {
+                "indicators": true,
+                "layer_state": true
+            }
+        }
+    },
+    "rgblight": {
+        "led_count": 56,
+        "split_count": [28, 28]
+    },
+    "ws2812": {
+        "pin": "D3"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
+    "features": {
+        "bootmagic": false,
+        "mousekey": true,
+        "extrakey": true,
+        "rgblight": true,
+        "oled": true
+    },
+    "build": {
+        "lto": true
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [3, 0], "x": 0, "y": 1.125},
+                {"matrix": [0, 0], "x": 1, "y": 0.375},
+                {"matrix": [0, 1], "x": 2, "y": 0.375},
+                {"matrix": [0, 2], "x": 3, "y": 0.125},
+                {"matrix": [0, 3], "x": 4, "y": 0},
+                {"matrix": [0, 4], "x": 5, "y": 0.125},
+                {"matrix": [0, 5], "x": 6, "y": 0.25},
+
+                {"matrix": [4, 5], "x": 10.5, "y": 0.25},
+                {"matrix": [4, 4], "x": 11.5, "y": 0.125},
+                {"matrix": [4, 3], "x": 12.5, "y": 0},
+                {"matrix": [4, 2], "x": 13.5, "y": 0.125},
+                {"matrix": [4, 1], "x": 14.5, "y": 0.375},
+                {"matrix": [4, 0], "x": 15.5, "y": 0.375},
+                {"matrix": [7, 0], "x": 16.5, "y": 1.125},
+
+                {"matrix": [1, 0], "x": 1, "y": 1.375},
+                {"matrix": [1, 1], "x": 2, "y": 1.375},
+                {"matrix": [1, 2], "x": 3, "y": 1.125},
+                {"matrix": [1, 3], "x": 4, "y": 1},
+                {"matrix": [1, 4], "x": 5, "y": 1.125},
+                {"matrix": [1, 5], "x": 6, "y": 1.25},
+
+                {"matrix": [5, 5], "x": 10.5, "y": 1.25},
+                {"matrix": [5, 4], "x": 11.5, "y": 1.125},
+                {"matrix": [5, 3], "x": 12.5, "y": 1},
+                {"matrix": [5, 2], "x": 13.5, "y": 1.125},
+                {"matrix": [5, 1], "x": 14.5, "y": 1.375},
+                {"matrix": [5, 0], "x": 15.5, "y": 1.375},
+
+                {"matrix": [2, 0], "x": 1, "y": 2.375},
+                {"matrix": [2, 1], "x": 2, "y": 2.375},
+                {"matrix": [2, 2], "x": 3, "y": 2.125},
+                {"matrix": [2, 3], "x": 4, "y": 2},
+                {"matrix": [2, 4], "x": 5, "y": 2.125},
+                {"matrix": [2, 5], "x": 6, "y": 2.25},
+
+                {"matrix": [6, 5], "x": 10.5, "y": 2.25},
+                {"matrix": [6, 4], "x": 11.5, "y": 2.125},
+                {"matrix": [6, 3], "x": 12.5, "y": 2},
+                {"matrix": [6, 2], "x": 13.5, "y": 2.125},
+                {"matrix": [6, 1], "x": 14.5, "y": 2.375},
+                {"matrix": [6, 0], "x": 15.5, "y": 2.375},
+
+                {"matrix": [3, 3], "x": 5, "y": 4},
+                {"matrix": [3, 4], "x": 6, "y": 4},
+                {"matrix": [3, 5], "x": 7, "y": 3.5, "h": 1.5},
+
+                {"matrix": [7, 5], "x": 9.5, "y": 3.5, "h": 1.5},
+                {"matrix": [7, 4], "x": 10.5, "y": 4},
+                {"matrix": [7, 3], "x": 11.5, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/jorne/rev1/rules.mk b/keyboards/jorne/rev1/rules.mk
deleted file mode 100644
index 52a6de4da9f..00000000000
--- a/keyboards/jorne/rev1/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-OLED_ENABLE     = yes    # Enable OLED
-RGBLIGHT_ENABLE = yes    # Enable keyboard RGB underglow
diff --git a/keyboards/jorne/rules.mk b/keyboards/jorne/rules.mk
index fb1b47d1065..c43649b3486 100644
--- a/keyboards/jorne/rules.mk
+++ b/keyboards/jorne/rules.mk
@@ -1,14 +1 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes      # Mouse keys
-EXTRAKEY_ENABLE = yes      # Audio control and System control
-CONSOLE_ENABLE = no        # Console for debug
-COMMAND_ENABLE = no        # Commands for debug and configuration
-NKRO_ENABLE = no           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no      # Enable keyboard backlight functionality
-AUDIO_ENABLE = no          # Audio output
-LTO_ENABLE     = yes
-
 DEFAULT_FOLDER = jorne/rev1
diff --git a/keyboards/joshajohnson/hub16/info.json b/keyboards/joshajohnson/hub16/info.json
deleted file mode 100644
index 920b42feec8..00000000000
--- a/keyboards/joshajohnson/hub16/info.json
+++ /dev/null
@@ -1,69 +0,0 @@
-{
-    "keyboard_name": "Hub16",
-    "manufacturer": "Josh Johnson",
-    "url": "https://joshajohnson.com/hub16-keyboard/",
-    "maintainer": "Josh Johnson",
-    "usb": {
-        "vid": "0x6A6A",
-        "pid": "0x4810",
-        "device_version": "0.0.1"
-    },
-    "encoder": {
-        "rotary": [
-            {"pin_a": "F5", "pin_b": "F6"},
-            {"pin_a": "B5", "pin_b": "B4"}
-        ]
-    },
-    "rgblight": {
-        "saturation_steps": 8,
-        "brightness_steps": 8,
-        "led_count": 11,
-        "sleep": true,
-        "animations": {
-            "breathing": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "snake": true,
-            "knight": true,
-            "christmas": true,
-            "static_gradient": true,
-            "rgb_test": true,
-            "alternating": true,
-            "twinkle": true
-        }
-    },
-    "ws2812": {
-        "pin": "D1"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
-    "debounce": 20,
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [4, 0], "x": 0.5, "y": 0},
-                {"matrix": [4, 1], "x": 2.5, "y": 0},
-
-                {"matrix": [0, 0], "x": 0, "y": 1},
-                {"matrix": [0, 1], "x": 1, "y": 1},
-                {"matrix": [0, 2], "x": 2, "y": 1},
-                {"matrix": [0, 3], "x": 3, "y": 1},
-
-                {"matrix": [1, 0], "x": 0, "y": 2},
-                {"matrix": [1, 1], "x": 1, "y": 2},
-                {"matrix": [1, 2], "x": 2, "y": 2},
-                {"matrix": [1, 3], "x": 3, "y": 2},
-
-                {"matrix": [2, 0], "x": 0, "y": 3},
-                {"matrix": [2, 1], "x": 1, "y": 3},
-                {"matrix": [2, 2], "x": 2, "y": 3},
-                {"matrix": [2, 3], "x": 3, "y": 3},
-
-                {"matrix": [3, 0], "x": 0, "y": 4},
-                {"matrix": [3, 1], "x": 1, "y": 4},
-                {"matrix": [3, 2], "x": 2, "y": 4},
-                {"matrix": [3, 3], "x": 3, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/joshajohnson/hub16/keyboard.json b/keyboards/joshajohnson/hub16/keyboard.json
new file mode 100644
index 00000000000..7d8f0ab3568
--- /dev/null
+++ b/keyboards/joshajohnson/hub16/keyboard.json
@@ -0,0 +1,76 @@
+{
+    "keyboard_name": "Hub16",
+    "manufacturer": "Josh Johnson",
+    "url": "https://joshajohnson.com/hub16-keyboard/",
+    "maintainer": "Josh Johnson",
+    "usb": {
+        "vid": "0x6A6A",
+        "pid": "0x4810",
+        "device_version": "0.0.1"
+    },
+    "encoder": {
+        "rotary": [
+            {"pin_a": "F5", "pin_b": "F6"},
+            {"pin_a": "B5", "pin_b": "B4"}
+        ]
+    },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 11,
+        "sleep": true,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": true,
+            "twinkle": true
+        }
+    },
+    "ws2812": {
+        "pin": "D1"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "rgblight": true,
+        "encoder": true
+    },
+    "debounce": 20,
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [4, 0], "x": 0.5, "y": 0},
+                {"matrix": [4, 1], "x": 2.5, "y": 0},
+
+                {"matrix": [0, 0], "x": 0, "y": 1},
+                {"matrix": [0, 1], "x": 1, "y": 1},
+                {"matrix": [0, 2], "x": 2, "y": 1},
+                {"matrix": [0, 3], "x": 3, "y": 1},
+
+                {"matrix": [1, 0], "x": 0, "y": 2},
+                {"matrix": [1, 1], "x": 1, "y": 2},
+                {"matrix": [1, 2], "x": 2, "y": 2},
+                {"matrix": [1, 3], "x": 3, "y": 2},
+
+                {"matrix": [2, 0], "x": 0, "y": 3},
+                {"matrix": [2, 1], "x": 1, "y": 3},
+                {"matrix": [2, 2], "x": 2, "y": 3},
+                {"matrix": [2, 3], "x": 3, "y": 3},
+
+                {"matrix": [3, 0], "x": 0, "y": 4},
+                {"matrix": [3, 1], "x": 1, "y": 4},
+                {"matrix": [3, 2], "x": 2, "y": 4},
+                {"matrix": [3, 3], "x": 3, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/joshajohnson/hub16/rules.mk b/keyboards/joshajohnson/hub16/rules.mk
index 51fa8f6ee62..9a337c23b8a 100755
--- a/keyboards/joshajohnson/hub16/rules.mk
+++ b/keyboards/joshajohnson/hub16/rules.mk
@@ -1,16 +1,3 @@
-# Build Options
-#   change yes to no to disable
-#
 CUSTOM_MATRIX = lite		# Custom scanning of matrix
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-ENCODER_ENABLE = yes        # Rotary Encoder support
 
 SRC = matrix.c
diff --git a/keyboards/jpe230/big_knob/info.json b/keyboards/jpe230/big_knob/info.json
deleted file mode 100644
index 083a1ae690a..00000000000
--- a/keyboards/jpe230/big_knob/info.json
+++ /dev/null
@@ -1,68 +0,0 @@
-{
-    "manufacturer": "jpe230",
-    "keyboard_name": "big_knob",
-    "maintainer": "jpe230",
-    "bootloader": "rp2040",
-    "processor": "RP2040",
-    "url": "https://github.com/Jpe230/big_knob",
-    "usb": {
-        "device_version": "1.0.0",
-        "vid": "0xE230",
-        "pid": "0x1337"
-    },
-    "features": {
-        "rgblight": true,
-        "bootmagic": true,
-        "extrakey": true,
-        "mousekey": true,
-        "encoder": true,
-        "backlight": true
-    },
-    "matrix_pins": {
-        "direct": [
-            ["GP1"]
-        ]
-    },
-    "encoder": {
-        "rotary": [
-            {"pin_a": "GP2", "pin_b": "GP3"}
-        ]
-    },
-    "backlight": {
-        "pin": "GP7",
-        "levels": 7,
-        "default": {
-            "brightness": 6
-        }
-    },
-    "rgblight": {
-        "driver": "ws2812",
-        "led_count": 10,
-        "max_brightness": 200,
-        "sleep": true,
-        "animations": {
-            "breathing": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "snake": true,
-            "knight": true,
-            "christmas": true,
-            "static_gradient": true,
-            "rgb_test": true,
-            "alternating": true,
-            "twinkle": true
-        }
-    },
-    "ws2812": {
-        "pin": "GP0",
-        "driver": "vendor"
-    },
-    "community_layouts": ["ortho_1x1"],
-    "layouts": {
-        "LAYOUT_ortho_1x1": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0}
-            ]
-        }
-    }
-}
diff --git a/keyboards/jpe230/big_knob/keyboard.json b/keyboards/jpe230/big_knob/keyboard.json
new file mode 100644
index 00000000000..e46aba594fb
--- /dev/null
+++ b/keyboards/jpe230/big_knob/keyboard.json
@@ -0,0 +1,69 @@
+{
+    "manufacturer": "jpe230",
+    "keyboard_name": "big_knob",
+    "maintainer": "jpe230",
+    "bootloader": "rp2040",
+    "processor": "RP2040",
+    "url": "https://github.com/Jpe230/big_knob",
+    "usb": {
+        "device_version": "1.0.0",
+        "vid": "0xE230",
+        "pid": "0x1337"
+    },
+    "features": {
+        "rgblight": true,
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": true,
+        "encoder": true,
+        "backlight": true,
+        "quantum_painter": true
+    },
+    "matrix_pins": {
+        "direct": [
+            ["GP1"]
+        ]
+    },
+    "encoder": {
+        "rotary": [
+            {"pin_a": "GP2", "pin_b": "GP3"}
+        ]
+    },
+    "backlight": {
+        "pin": "GP7",
+        "levels": 7,
+        "default": {
+            "brightness": 6
+        }
+    },
+    "rgblight": {
+        "driver": "ws2812",
+        "led_count": 10,
+        "max_brightness": 200,
+        "sleep": true,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": true,
+            "twinkle": true
+        }
+    },
+    "ws2812": {
+        "pin": "GP0",
+        "driver": "vendor"
+    },
+    "community_layouts": ["ortho_1x1"],
+    "layouts": {
+        "LAYOUT_ortho_1x1": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0}
+            ]
+        }
+    }
+}
diff --git a/keyboards/jpe230/big_knob/rules.mk b/keyboards/jpe230/big_knob/rules.mk
index 5f7b604a803..2031911ced4 100644
--- a/keyboards/jpe230/big_knob/rules.mk
+++ b/keyboards/jpe230/big_knob/rules.mk
@@ -1,3 +1,2 @@
-QUANTUM_PAINTER_ENABLE = yes
 QUANTUM_PAINTER_DRIVERS += st7735_spi
 SRC += gfx/logo.qgf.c
diff --git a/keyboards/kagizaraya/chidori/info.json b/keyboards/kagizaraya/chidori/info.json
deleted file mode 100644
index 6603f54b036..00000000000
--- a/keyboards/kagizaraya/chidori/info.json
+++ /dev/null
@@ -1,162 +0,0 @@
-{
-    "keyboard_name": "Chidori",
-    "manufacturer": "Kagizaraya",
-    "url": "",
-    "maintainer": "ka2hiro",
-    "usb": {
-        "vid": "0xFEED",
-        "pid": "0x3942",
-        "device_version": "0.0.1",
-        "max_power": 100
-    },
-    "processor": "atmega328p",
-    "bootloader": "usbasploader",
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-
-                {"matrix": [4, 0], "x": 7, "y": 0},
-                {"matrix": [4, 1], "x": 8, "y": 0},
-                {"matrix": [4, 2], "x": 9, "y": 0},
-                {"matrix": [4, 3], "x": 10, "y": 0},
-                {"matrix": [4, 4], "x": 11, "y": 0},
-                {"matrix": [4, 5], "x": 12, "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": [1, 4], "x": 4, "y": 1},
-                {"matrix": [1, 5], "x": 5, "y": 1},
-
-                {"matrix": [5, 0], "x": 7, "y": 1},
-                {"matrix": [5, 1], "x": 8, "y": 1},
-                {"matrix": [5, 2], "x": 9, "y": 1},
-                {"matrix": [5, 3], "x": 10, "y": 1},
-                {"matrix": [5, 4], "x": 11, "y": 1},
-                {"matrix": [5, 5], "x": 12, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2},
-                {"matrix": [2, 1], "x": 1, "y": 2},
-                {"matrix": [2, 2], "x": 2, "y": 2},
-                {"matrix": [2, 3], "x": 3, "y": 2},
-                {"matrix": [2, 4], "x": 4, "y": 2},
-                {"matrix": [2, 5], "x": 5, "y": 2},
-
-                {"matrix": [6, 0], "x": 7, "y": 2},
-                {"matrix": [6, 1], "x": 8, "y": 2},
-                {"matrix": [6, 2], "x": 9, "y": 2},
-                {"matrix": [6, 3], "x": 10, "y": 2},
-                {"matrix": [6, 4], "x": 11, "y": 2},
-                {"matrix": [6, 5], "x": 12, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3},
-                {"matrix": [3, 1], "x": 1, "y": 3},
-                {"matrix": [3, 2], "x": 2, "y": 3},
-                {"matrix": [3, 3], "x": 3, "y": 3},
-                {"matrix": [3, 4], "x": 4, "y": 3},
-                {"matrix": [3, 5], "x": 5, "y": 3},
-
-                {"matrix": [7, 0], "x": 7, "y": 3},
-                {"matrix": [7, 1], "x": 8, "y": 3},
-                {"matrix": [7, 2], "x": 9, "y": 3},
-                {"matrix": [7, 3], "x": 10, "y": 3},
-                {"matrix": [7, 4], "x": 11, "y": 3},
-                {"matrix": [7, 5], "x": 12, "y": 3}
-            ]
-        },
-        "LAYOUT_extended": {
-            "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": [4, 0], "x": 7, "y": 0},
-                {"matrix": [4, 1], "x": 8, "y": 0},
-                {"matrix": [4, 2], "x": 9, "y": 0},
-                {"matrix": [4, 3], "x": 10, "y": 0},
-                {"matrix": [4, 4], "x": 11, "y": 0},
-                {"matrix": [4, 5], "x": 12, "y": 0},
-
-                {"matrix": [8, 0], "x": 14, "y": 0},
-                {"matrix": [8, 1], "x": 15, "y": 0},
-                {"matrix": [8, 2], "x": 16, "y": 0},
-                {"matrix": [8, 3], "x": 17, "y": 0},
-                {"matrix": [8, 4], "x": 18, "y": 0},
-                {"matrix": [8, 5], "x": 19, "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": [1, 4], "x": 4, "y": 1},
-                {"matrix": [1, 5], "x": 5, "y": 1},
-
-                {"matrix": [5, 0], "x": 7, "y": 1},
-                {"matrix": [5, 1], "x": 8, "y": 1},
-                {"matrix": [5, 2], "x": 9, "y": 1},
-                {"matrix": [5, 3], "x": 10, "y": 1},
-                {"matrix": [5, 4], "x": 11, "y": 1},
-                {"matrix": [5, 5], "x": 12, "y": 1},
-
-                {"matrix": [9, 0], "x": 14, "y": 1},
-                {"matrix": [9, 1], "x": 15, "y": 1},
-                {"matrix": [9, 2], "x": 16, "y": 1},
-                {"matrix": [9, 3], "x": 17, "y": 1},
-                {"matrix": [9, 4], "x": 18, "y": 1},
-                {"matrix": [9, 5], "x": 19, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2},
-                {"matrix": [2, 1], "x": 1, "y": 2},
-                {"matrix": [2, 2], "x": 2, "y": 2},
-                {"matrix": [2, 3], "x": 3, "y": 2},
-                {"matrix": [2, 4], "x": 4, "y": 2},
-                {"matrix": [2, 5], "x": 5, "y": 2},
-
-                {"matrix": [6, 0], "x": 7, "y": 2},
-                {"matrix": [6, 1], "x": 8, "y": 2},
-                {"matrix": [6, 2], "x": 9, "y": 2},
-                {"matrix": [6, 3], "x": 10, "y": 2},
-                {"matrix": [6, 4], "x": 11, "y": 2},
-                {"matrix": [6, 5], "x": 12, "y": 2},
-
-                {"matrix": [10, 0], "x": 14, "y": 2},
-                {"matrix": [10, 1], "x": 15, "y": 2},
-                {"matrix": [10, 2], "x": 16, "y": 2},
-                {"matrix": [10, 3], "x": 17, "y": 2},
-                {"matrix": [10, 4], "x": 18, "y": 2},
-                {"matrix": [10, 5], "x": 19, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3},
-                {"matrix": [3, 1], "x": 1, "y": 3},
-                {"matrix": [3, 2], "x": 2, "y": 3},
-                {"matrix": [3, 3], "x": 3, "y": 3},
-                {"matrix": [3, 4], "x": 4, "y": 3},
-                {"matrix": [3, 5], "x": 5, "y": 3},
-
-                {"matrix": [7, 0], "x": 7, "y": 3},
-                {"matrix": [7, 1], "x": 8, "y": 3},
-                {"matrix": [7, 2], "x": 9, "y": 3},
-                {"matrix": [7, 3], "x": 10, "y": 3},
-                {"matrix": [7, 4], "x": 11, "y": 3},
-                {"matrix": [7, 5], "x": 12, "y": 3},
-
-                {"matrix": [11, 0], "x": 14, "y": 3},
-                {"matrix": [11, 1], "x": 15, "y": 3},
-                {"matrix": [11, 2], "x": 16, "y": 3},
-                {"matrix": [11, 3], "x": 17, "y": 3},
-                {"matrix": [11, 4], "x": 18, "y": 3},
-                {"matrix": [11, 5], "x": 19, "y": 3}
-            ]
-        }
-    }
-}
diff --git a/keyboards/kagizaraya/chidori/keyboard.json b/keyboards/kagizaraya/chidori/keyboard.json
new file mode 100644
index 00000000000..f1b064baba0
--- /dev/null
+++ b/keyboards/kagizaraya/chidori/keyboard.json
@@ -0,0 +1,167 @@
+{
+    "keyboard_name": "Chidori",
+    "manufacturer": "Kagizaraya",
+    "url": "",
+    "maintainer": "ka2hiro",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0x3942",
+        "device_version": "0.0.1",
+        "max_power": 100
+    },
+    "processor": "atmega328p",
+    "bootloader": "usbasploader",
+    "features": {
+        "bootmagic": false,
+        "mousekey": false,
+        "extrakey": true
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+
+                {"matrix": [4, 0], "x": 7, "y": 0},
+                {"matrix": [4, 1], "x": 8, "y": 0},
+                {"matrix": [4, 2], "x": 9, "y": 0},
+                {"matrix": [4, 3], "x": 10, "y": 0},
+                {"matrix": [4, 4], "x": 11, "y": 0},
+                {"matrix": [4, 5], "x": 12, "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": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+
+                {"matrix": [5, 0], "x": 7, "y": 1},
+                {"matrix": [5, 1], "x": 8, "y": 1},
+                {"matrix": [5, 2], "x": 9, "y": 1},
+                {"matrix": [5, 3], "x": 10, "y": 1},
+                {"matrix": [5, 4], "x": 11, "y": 1},
+                {"matrix": [5, 5], "x": 12, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+
+                {"matrix": [6, 0], "x": 7, "y": 2},
+                {"matrix": [6, 1], "x": 8, "y": 2},
+                {"matrix": [6, 2], "x": 9, "y": 2},
+                {"matrix": [6, 3], "x": 10, "y": 2},
+                {"matrix": [6, 4], "x": 11, "y": 2},
+                {"matrix": [6, 5], "x": 12, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
+
+                {"matrix": [7, 0], "x": 7, "y": 3},
+                {"matrix": [7, 1], "x": 8, "y": 3},
+                {"matrix": [7, 2], "x": 9, "y": 3},
+                {"matrix": [7, 3], "x": 10, "y": 3},
+                {"matrix": [7, 4], "x": 11, "y": 3},
+                {"matrix": [7, 5], "x": 12, "y": 3}
+            ]
+        },
+        "LAYOUT_extended": {
+            "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": [4, 0], "x": 7, "y": 0},
+                {"matrix": [4, 1], "x": 8, "y": 0},
+                {"matrix": [4, 2], "x": 9, "y": 0},
+                {"matrix": [4, 3], "x": 10, "y": 0},
+                {"matrix": [4, 4], "x": 11, "y": 0},
+                {"matrix": [4, 5], "x": 12, "y": 0},
+
+                {"matrix": [8, 0], "x": 14, "y": 0},
+                {"matrix": [8, 1], "x": 15, "y": 0},
+                {"matrix": [8, 2], "x": 16, "y": 0},
+                {"matrix": [8, 3], "x": 17, "y": 0},
+                {"matrix": [8, 4], "x": 18, "y": 0},
+                {"matrix": [8, 5], "x": 19, "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": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+
+                {"matrix": [5, 0], "x": 7, "y": 1},
+                {"matrix": [5, 1], "x": 8, "y": 1},
+                {"matrix": [5, 2], "x": 9, "y": 1},
+                {"matrix": [5, 3], "x": 10, "y": 1},
+                {"matrix": [5, 4], "x": 11, "y": 1},
+                {"matrix": [5, 5], "x": 12, "y": 1},
+
+                {"matrix": [9, 0], "x": 14, "y": 1},
+                {"matrix": [9, 1], "x": 15, "y": 1},
+                {"matrix": [9, 2], "x": 16, "y": 1},
+                {"matrix": [9, 3], "x": 17, "y": 1},
+                {"matrix": [9, 4], "x": 18, "y": 1},
+                {"matrix": [9, 5], "x": 19, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+
+                {"matrix": [6, 0], "x": 7, "y": 2},
+                {"matrix": [6, 1], "x": 8, "y": 2},
+                {"matrix": [6, 2], "x": 9, "y": 2},
+                {"matrix": [6, 3], "x": 10, "y": 2},
+                {"matrix": [6, 4], "x": 11, "y": 2},
+                {"matrix": [6, 5], "x": 12, "y": 2},
+
+                {"matrix": [10, 0], "x": 14, "y": 2},
+                {"matrix": [10, 1], "x": 15, "y": 2},
+                {"matrix": [10, 2], "x": 16, "y": 2},
+                {"matrix": [10, 3], "x": 17, "y": 2},
+                {"matrix": [10, 4], "x": 18, "y": 2},
+                {"matrix": [10, 5], "x": 19, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
+
+                {"matrix": [7, 0], "x": 7, "y": 3},
+                {"matrix": [7, 1], "x": 8, "y": 3},
+                {"matrix": [7, 2], "x": 9, "y": 3},
+                {"matrix": [7, 3], "x": 10, "y": 3},
+                {"matrix": [7, 4], "x": 11, "y": 3},
+                {"matrix": [7, 5], "x": 12, "y": 3},
+
+                {"matrix": [11, 0], "x": 14, "y": 3},
+                {"matrix": [11, 1], "x": 15, "y": 3},
+                {"matrix": [11, 2], "x": 16, "y": 3},
+                {"matrix": [11, 3], "x": 17, "y": 3},
+                {"matrix": [11, 4], "x": 18, "y": 3},
+                {"matrix": [11, 5], "x": 19, "y": 3}
+            ]
+        }
+    }
+}
diff --git a/keyboards/kagizaraya/chidori/rules.mk b/keyboards/kagizaraya/chidori/rules.mk
index f94317cf22f..6641bc6b5a2 100644
--- a/keyboards/kagizaraya/chidori/rules.mk
+++ b/keyboards/kagizaraya/chidori/rules.mk
@@ -1,16 +1,6 @@
 # Build Options
 #   change yes to no to disable
 #
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
 CUSTOM_MATRIX = lite
 
 # project specific files
diff --git a/keyboards/kagizaraya/scythe/info.json b/keyboards/kagizaraya/scythe/info.json
deleted file mode 100644
index 0900eee5a6d..00000000000
--- a/keyboards/kagizaraya/scythe/info.json
+++ /dev/null
@@ -1,129 +0,0 @@
-{
-    "keyboard_name": "Scythe",
-    "manufacturer": "Kagizaraya",
-    "url": "",
-    "maintainer": "ka2hiro",
-    "usb": {
-        "vid": "0xFEED",
-        "pid": "0x3941",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["D6", "D7", "B4", "B5", "B6", "C6", "C7"],
-        "rows": ["F7", "F6", "F5", "F4", "D5"]
-    },
-    "diode_direction": "COL2ROW",
-    "backlight": {
-        "pin": "B7"
-    },
-    "split": {
-        "enabled": true,
-        "soft_serial_pin": "D0"
-    },
-    "rgblight": {
-        "saturation_steps": 8,
-        "brightness_steps": 8,
-        "led_count": 9,
-        "split": true,
-        "animations": {
-            "breathing": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "snake": true,
-            "knight": true,
-            "christmas": true,
-            "static_gradient": true,
-            "rgb_test": true,
-            "alternating": true,
-            "twinkle": true
-        }
-    },
-    "tapping": {
-        "term": 120
-    },
-    "ws2812": {
-        "pin": "F0"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 0], "x": 2, "y": 0},
-                {"matrix": [0, 1], "x": 3, "y": 0},
-                {"matrix": [0, 2], "x": 4, "y": 0},
-                {"matrix": [0, 3], "x": 5, "y": 0},
-                {"matrix": [0, 4], "x": 6, "y": 0},
-                {"matrix": [0, 5], "x": 7, "y": 0},
-                {"matrix": [0, 6], "x": 8, "y": 0},
-
-                {"matrix": [5, 0], "x": 9.5, "y": 0},
-                {"matrix": [5, 1], "x": 10.5, "y": 0},
-                {"matrix": [5, 2], "x": 11.5, "y": 0},
-                {"matrix": [5, 3], "x": 12.5, "y": 0},
-                {"matrix": [5, 4], "x": 13.5, "y": 0},
-                {"matrix": [5, 5], "x": 14.5, "y": 0},
-                {"matrix": [5, 6], "x": 15.5, "y": 0},
-
-                {"matrix": [1, 0], "x": 1.25, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 2.75, "y": 1},
-                {"matrix": [1, 2], "x": 3.75, "y": 1},
-                {"matrix": [1, 3], "x": 4.75, "y": 1},
-                {"matrix": [1, 4], "x": 5.75, "y": 1},
-                {"matrix": [1, 5], "x": 6.75, "y": 1},
-                {"matrix": [1, 6], "x": 7.75, "y": 1},
-
-                {"matrix": [6, 0], "x": 9.75, "y": 1},
-                {"matrix": [6, 1], "x": 10.75, "y": 1},
-                {"matrix": [6, 2], "x": 11.75, "y": 1},
-                {"matrix": [6, 3], "x": 12.75, "y": 1},
-                {"matrix": [6, 4], "x": 13.75, "y": 1},
-                {"matrix": [6, 5], "x": 14.75, "y": 1},
-                {"matrix": [6, 6], "x": 15.75, "y": 1, "w": 1.5},
-
-                {"matrix": [2, 0], "x": 0.75, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 2.5, "y": 2},
-                {"matrix": [2, 2], "x": 3.5, "y": 2},
-                {"matrix": [2, 3], "x": 4.5, "y": 2},
-                {"matrix": [2, 4], "x": 5.5, "y": 2},
-                {"matrix": [2, 5], "x": 6.5, "y": 2},
-                {"matrix": [2, 6], "x": 7.5, "y": 2},
-
-                {"matrix": [7, 0], "x": 10, "y": 2},
-                {"matrix": [7, 1], "x": 11, "y": 2},
-                {"matrix": [7, 2], "x": 12, "y": 2},
-                {"matrix": [7, 3], "x": 13, "y": 2},
-                {"matrix": [7, 4], "x": 14, "y": 2},
-                {"matrix": [7, 5], "x": 15, "y": 2},
-                {"matrix": [7, 6], "x": 16, "y": 2, "w": 2.25},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 1], "x": 2.25, "y": 3},
-                {"matrix": [3, 2], "x": 3.25, "y": 3},
-                {"matrix": [3, 3], "x": 4.25, "y": 3},
-                {"matrix": [3, 4], "x": 5.25, "y": 3},
-                {"matrix": [3, 5], "x": 6.25, "y": 3},
-                {"matrix": [3, 6], "x": 7.25, "y": 3},
-
-                {"matrix": [8, 0], "x": 10.25, "y": 3},
-                {"matrix": [8, 1], "x": 11.25, "y": 3},
-                {"matrix": [8, 2], "x": 12.25, "y": 3},
-                {"matrix": [8, 3], "x": 13.25, "y": 3},
-                {"matrix": [8, 4], "x": 14.25, "y": 3},
-                {"matrix": [8, 5], "x": 15.25, "y": 3},
-                {"matrix": [8, 6], "x": 16.25, "y": 3, "w": 1.75},
-                {"matrix": [9, 6], "x": 18, "y": 3},
-
-                {"matrix": [4, 0], "x": 2.75, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 4, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 5.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 3], "x": 6.5, "y": 4, "w": 2},
-
-                {"matrix": [9, 0], "x": 10, "y": 4, "w": 2},
-                {"matrix": [9, 1], "x": 12, "y": 4, "w": 1.25},
-                {"matrix": [9, 2], "x": 13.25, "y": 4, "w": 1.25},
-                {"matrix": [9, 3], "x": 14.5, "y": 4, "w": 1.25}
-            ]
-        }
-    }
-}
diff --git a/keyboards/kagizaraya/scythe/keyboard.json b/keyboards/kagizaraya/scythe/keyboard.json
new file mode 100644
index 00000000000..eeebbe85a62
--- /dev/null
+++ b/keyboards/kagizaraya/scythe/keyboard.json
@@ -0,0 +1,136 @@
+{
+    "keyboard_name": "Scythe",
+    "manufacturer": "Kagizaraya",
+    "url": "",
+    "maintainer": "ka2hiro",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0x3941",
+        "device_version": "0.0.1"
+    },
+    "matrix_pins": {
+        "cols": ["D6", "D7", "B4", "B5", "B6", "C6", "C7"],
+        "rows": ["F7", "F6", "F5", "F4", "D5"]
+    },
+    "diode_direction": "COL2ROW",
+    "backlight": {
+        "pin": "B7"
+    },
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "D0"
+    },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 9,
+        "split": true,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": true,
+            "twinkle": true
+        }
+    },
+    "tapping": {
+        "term": 120
+    },
+    "ws2812": {
+        "pin": "F0"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": false,
+        "extrakey": true,
+        "backlight": true,
+        "rgblight": true
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 2, "y": 0},
+                {"matrix": [0, 1], "x": 3, "y": 0},
+                {"matrix": [0, 2], "x": 4, "y": 0},
+                {"matrix": [0, 3], "x": 5, "y": 0},
+                {"matrix": [0, 4], "x": 6, "y": 0},
+                {"matrix": [0, 5], "x": 7, "y": 0},
+                {"matrix": [0, 6], "x": 8, "y": 0},
+
+                {"matrix": [5, 0], "x": 9.5, "y": 0},
+                {"matrix": [5, 1], "x": 10.5, "y": 0},
+                {"matrix": [5, 2], "x": 11.5, "y": 0},
+                {"matrix": [5, 3], "x": 12.5, "y": 0},
+                {"matrix": [5, 4], "x": 13.5, "y": 0},
+                {"matrix": [5, 5], "x": 14.5, "y": 0},
+                {"matrix": [5, 6], "x": 15.5, "y": 0},
+
+                {"matrix": [1, 0], "x": 1.25, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 2.75, "y": 1},
+                {"matrix": [1, 2], "x": 3.75, "y": 1},
+                {"matrix": [1, 3], "x": 4.75, "y": 1},
+                {"matrix": [1, 4], "x": 5.75, "y": 1},
+                {"matrix": [1, 5], "x": 6.75, "y": 1},
+                {"matrix": [1, 6], "x": 7.75, "y": 1},
+
+                {"matrix": [6, 0], "x": 9.75, "y": 1},
+                {"matrix": [6, 1], "x": 10.75, "y": 1},
+                {"matrix": [6, 2], "x": 11.75, "y": 1},
+                {"matrix": [6, 3], "x": 12.75, "y": 1},
+                {"matrix": [6, 4], "x": 13.75, "y": 1},
+                {"matrix": [6, 5], "x": 14.75, "y": 1},
+                {"matrix": [6, 6], "x": 15.75, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0.75, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 2.5, "y": 2},
+                {"matrix": [2, 2], "x": 3.5, "y": 2},
+                {"matrix": [2, 3], "x": 4.5, "y": 2},
+                {"matrix": [2, 4], "x": 5.5, "y": 2},
+                {"matrix": [2, 5], "x": 6.5, "y": 2},
+                {"matrix": [2, 6], "x": 7.5, "y": 2},
+
+                {"matrix": [7, 0], "x": 10, "y": 2},
+                {"matrix": [7, 1], "x": 11, "y": 2},
+                {"matrix": [7, 2], "x": 12, "y": 2},
+                {"matrix": [7, 3], "x": 13, "y": 2},
+                {"matrix": [7, 4], "x": 14, "y": 2},
+                {"matrix": [7, 5], "x": 15, "y": 2},
+                {"matrix": [7, 6], "x": 16, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+
+                {"matrix": [8, 0], "x": 10.25, "y": 3},
+                {"matrix": [8, 1], "x": 11.25, "y": 3},
+                {"matrix": [8, 2], "x": 12.25, "y": 3},
+                {"matrix": [8, 3], "x": 13.25, "y": 3},
+                {"matrix": [8, 4], "x": 14.25, "y": 3},
+                {"matrix": [8, 5], "x": 15.25, "y": 3},
+                {"matrix": [8, 6], "x": 16.25, "y": 3, "w": 1.75},
+                {"matrix": [9, 6], "x": 18, "y": 3},
+
+                {"matrix": [4, 0], "x": 2.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 4, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 5.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 6.5, "y": 4, "w": 2},
+
+                {"matrix": [9, 0], "x": 10, "y": 4, "w": 2},
+                {"matrix": [9, 1], "x": 12, "y": 4, "w": 1.25},
+                {"matrix": [9, 2], "x": 13.25, "y": 4, "w": 1.25},
+                {"matrix": [9, 3], "x": 14.5, "y": 4, "w": 1.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/kagizaraya/scythe/rules.mk b/keyboards/kagizaraya/scythe/rules.mk
deleted file mode 100644
index 4b976051f32..00000000000
--- a/keyboards/kagizaraya/scythe/rules.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
-RGBLIGHT_SPLIT = yes
diff --git a/keyboards/kakunpc/angel17/alpha/info.json b/keyboards/kakunpc/angel17/alpha/info.json
deleted file mode 100644
index 8e0df61513a..00000000000
--- a/keyboards/kakunpc/angel17/alpha/info.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-    "matrix_pins": {
-        "cols": ["F4", "F5", "F6", "F7", "B1"],
-        "rows": ["D4", "C6", "D7", "E6"]
-    },
-    "diode_direction": "COL2ROW",
-    "layouts": {
-        "LAYOUT_numpad_5x4": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [2, 0], "x": 1, "y": 0},
-                {"matrix": [1, 0], "x": 2, "y": 0},
-                {"matrix": [3, 0], "x": 3, "y": 0},
-
-                {"matrix": [0, 1], "x": 0, "y": 1},
-                {"matrix": [2, 1], "x": 1, "y": 1},
-                {"matrix": [1, 1], "x": 2, "y": 1},
-
-                {"matrix": [0, 2], "x": 0, "y": 2},
-                {"matrix": [2, 2], "x": 1, "y": 2},
-                {"matrix": [1, 2], "x": 2, "y": 2},
-                {"matrix": [3, 1], "x": 3, "y": 1, "h": 2},
-
-                {"matrix": [3, 2], "x": 0, "y": 3},
-                {"matrix": [0, 3], "x": 1, "y": 3},
-                {"matrix": [2, 3], "x": 2, "y": 3},
-
-                {"matrix": [3, 3], "x": 0, "y": 4, "w": 2},
-                {"matrix": [0, 4], "x": 2, "y": 4},
-                {"matrix": [1, 3], "x": 3, "y": 3, "h": 2}
-            ]
-        }
-    }
-}
diff --git a/keyboards/kakunpc/angel17/alpha/keyboard.json b/keyboards/kakunpc/angel17/alpha/keyboard.json
new file mode 100644
index 00000000000..425ac12f578
--- /dev/null
+++ b/keyboards/kakunpc/angel17/alpha/keyboard.json
@@ -0,0 +1,41 @@
+{
+    "matrix_pins": {
+        "cols": ["F4", "F5", "F6", "F7", "B1"],
+        "rows": ["D4", "C6", "D7", "E6"]
+    },
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": false,
+        "mousekey": true,
+        "extrakey": true,
+        "console": true,
+        "command": true
+    },
+    "layouts": {
+        "LAYOUT_numpad_5x4": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [2, 0], "x": 1, "y": 0},
+                {"matrix": [1, 0], "x": 2, "y": 0},
+                {"matrix": [3, 0], "x": 3, "y": 0},
+
+                {"matrix": [0, 1], "x": 0, "y": 1},
+                {"matrix": [2, 1], "x": 1, "y": 1},
+                {"matrix": [1, 1], "x": 2, "y": 1},
+
+                {"matrix": [0, 2], "x": 0, "y": 2},
+                {"matrix": [2, 2], "x": 1, "y": 2},
+                {"matrix": [1, 2], "x": 2, "y": 2},
+                {"matrix": [3, 1], "x": 3, "y": 1, "h": 2},
+
+                {"matrix": [3, 2], "x": 0, "y": 3},
+                {"matrix": [0, 3], "x": 1, "y": 3},
+                {"matrix": [2, 3], "x": 2, "y": 3},
+
+                {"matrix": [3, 3], "x": 0, "y": 4, "w": 2},
+                {"matrix": [0, 4], "x": 2, "y": 4},
+                {"matrix": [1, 3], "x": 3, "y": 3, "h": 2}
+            ]
+        }
+    }
+}
diff --git a/keyboards/kakunpc/angel17/alpha/rules.mk b/keyboards/kakunpc/angel17/alpha/rules.mk
deleted file mode 100644
index fce764c22d4..00000000000
--- a/keyboards/kakunpc/angel17/alpha/rules.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = yes        # Console for debug
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
diff --git a/keyboards/kakunpc/angel17/info.json b/keyboards/kakunpc/angel17/info.json
index c50e1b6e7ff..a8a4f2c1480 100644
--- a/keyboards/kakunpc/angel17/info.json
+++ b/keyboards/kakunpc/angel17/info.json
@@ -3,14 +3,6 @@
     "manufacturer": "kakunpc",
     "url": "https://kakunpc.booth.pm/",
     "maintainer": "kakunpc",
-    "features": {
-        "bootmagic": false,
-        "command": true,
-        "console": true,
-        "extrakey": true,
-        "mousekey": true,
-        "nkro": false
-    },
     "usb": {
         "vid": "0xFEED",
         "pid": "0x0000",
diff --git a/keyboards/kakunpc/angel17/rev1/info.json b/keyboards/kakunpc/angel17/rev1/info.json
deleted file mode 100644
index 8395cf391c0..00000000000
--- a/keyboards/kakunpc/angel17/rev1/info.json
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-    "matrix_pins": {
-        "cols": ["F4", "F5", "F6", "F7", "B1"],
-        "rows": ["D4", "C6", "D7", "E6"]
-    },
-    "rgblight": {
-        "saturation_steps": 8,
-        "brightness_steps": 8,
-        "led_count": 17,
-        "sleep": true
-    },
-    "ws2812": {
-        "pin": "D3"
-    },
-    "diode_direction": "COL2ROW",
-    "layouts": {
-        "LAYOUT_numpad_5x4": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [2, 0], "x": 1, "y": 0},
-                {"matrix": [1, 0], "x": 2, "y": 0},
-                {"matrix": [3, 0], "x": 3, "y": 0},
-
-                {"matrix": [0, 1], "x": 0, "y": 1},
-                {"matrix": [2, 1], "x": 1, "y": 1},
-                {"matrix": [1, 1], "x": 2, "y": 1},
-
-                {"matrix": [0, 2], "x": 0, "y": 2},
-                {"matrix": [2, 2], "x": 1, "y": 2},
-                {"matrix": [1, 2], "x": 2, "y": 2},
-                {"matrix": [3, 1], "x": 3, "y": 1, "h": 2},
-
-                {"matrix": [3, 2], "x": 0, "y": 3},
-                {"matrix": [0, 3], "x": 1, "y": 3},
-                {"matrix": [2, 3], "x": 2, "y": 3},
-
-                {"matrix": [3, 3], "x": 0, "y": 4, "w": 2},
-                {"matrix": [0, 4], "x": 2, "y": 4},
-                {"matrix": [1, 3], "x": 3, "y": 3, "h": 2}
-            ]
-        }
-    }
-}
diff --git a/keyboards/kakunpc/angel17/rev1/keyboard.json b/keyboards/kakunpc/angel17/rev1/keyboard.json
new file mode 100644
index 00000000000..ef609ba2387
--- /dev/null
+++ b/keyboards/kakunpc/angel17/rev1/keyboard.json
@@ -0,0 +1,51 @@
+{
+    "matrix_pins": {
+        "cols": ["F4", "F5", "F6", "F7", "B1"],
+        "rows": ["D4", "C6", "D7", "E6"]
+    },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 17,
+        "sleep": true
+    },
+    "ws2812": {
+        "pin": "D3"
+    },
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": false,
+        "mousekey": true,
+        "extrakey": true,
+        "console": true,
+        "command": true,
+        "rgblight": true
+    },
+    "layouts": {
+        "LAYOUT_numpad_5x4": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [2, 0], "x": 1, "y": 0},
+                {"matrix": [1, 0], "x": 2, "y": 0},
+                {"matrix": [3, 0], "x": 3, "y": 0},
+
+                {"matrix": [0, 1], "x": 0, "y": 1},
+                {"matrix": [2, 1], "x": 1, "y": 1},
+                {"matrix": [1, 1], "x": 2, "y": 1},
+
+                {"matrix": [0, 2], "x": 0, "y": 2},
+                {"matrix": [2, 2], "x": 1, "y": 2},
+                {"matrix": [1, 2], "x": 2, "y": 2},
+                {"matrix": [3, 1], "x": 3, "y": 1, "h": 2},
+
+                {"matrix": [3, 2], "x": 0, "y": 3},
+                {"matrix": [0, 3], "x": 1, "y": 3},
+                {"matrix": [2, 3], "x": 2, "y": 3},
+
+                {"matrix": [3, 3], "x": 0, "y": 4, "w": 2},
+                {"matrix": [0, 4], "x": 2, "y": 4},
+                {"matrix": [1, 3], "x": 3, "y": 3, "h": 2}
+            ]
+        }
+    }
+}
diff --git a/keyboards/kakunpc/angel17/rev1/rules.mk b/keyboards/kakunpc/angel17/rev1/rules.mk
deleted file mode 100644
index 7585984f784..00000000000
--- a/keyboards/kakunpc/angel17/rev1/rules.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = yes        # Console for debug
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
diff --git a/keyboards/kakunpc/angel64/alpha/keyboard.json b/keyboards/kakunpc/angel64/alpha/keyboard.json
index cfa52eb172e..f00dd3b42bc 100644
--- a/keyboards/kakunpc/angel64/alpha/keyboard.json
+++ b/keyboards/kakunpc/angel64/alpha/keyboard.json
@@ -32,6 +32,13 @@
     },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": false,
+        "mousekey": true,
+        "extrakey": false,
+        "rgblight": true,
+        "oled": true
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/kakunpc/angel64/rev1/keyboard.json b/keyboards/kakunpc/angel64/rev1/keyboard.json
index 46f619462aa..eade3a5ec9d 100644
--- a/keyboards/kakunpc/angel64/rev1/keyboard.json
+++ b/keyboards/kakunpc/angel64/rev1/keyboard.json
@@ -32,6 +32,13 @@
     },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": false,
+        "mousekey": true,
+        "extrakey": false,
+        "rgblight": true,
+        "oled": true
+    },
     "layouts": {
         "LAYOUT_all": {
             "layout": [
diff --git a/keyboards/kakunpc/angel64/rules.mk b/keyboards/kakunpc/angel64/rules.mk
index 213576dfbd5..c95d5297bd7 100644
--- a/keyboards/kakunpc/angel64/rules.mk
+++ b/keyboards/kakunpc/angel64/rules.mk
@@ -1,16 +1,3 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = no        # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-OLED_ENABLE = yes
 CUSTOM_MATRIX = yes
 
 SRC += matrix.c
diff --git a/keyboards/kakunpc/business_card/alpha/info.json b/keyboards/kakunpc/business_card/alpha/info.json
deleted file mode 100644
index 3270f8e4bcc..00000000000
--- a/keyboards/kakunpc/business_card/alpha/info.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-    "keyboard_name": "business_card alpha",
-    "manufacturer": "kakunpc",
-    "url": "",
-    "maintainer": "kakunpc",
-    "usb": {
-        "vid": "0xFEED",
-        "pid": "0x0000",
-        "device_version": "0.0.1"
-    },
-    "rgblight": {
-        "saturation_steps": 8,
-        "brightness_steps": 8,
-        "led_count": 6,
-        "sleep": true
-    },
-    "ws2812": {
-        "pin": "D3"
-    },
-    "matrix_pins": {
-        "cols": ["E6", "B4", "B5"],
-        "rows": ["B2", "B6"]
-    },
-    "diode_direction": "COL2ROW",
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1},
-                {"matrix": [1, 1], "x": 1, "y": 1},
-                {"matrix": [1, 2], "x": 2, "y": 1}
-            ]
-        }
-    }
-}
diff --git a/keyboards/kakunpc/business_card/alpha/keyboard.json b/keyboards/kakunpc/business_card/alpha/keyboard.json
new file mode 100644
index 00000000000..02c4604c446
--- /dev/null
+++ b/keyboards/kakunpc/business_card/alpha/keyboard.json
@@ -0,0 +1,47 @@
+{
+    "keyboard_name": "business_card alpha",
+    "manufacturer": "kakunpc",
+    "url": "",
+    "maintainer": "kakunpc",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0x0000",
+        "device_version": "0.0.1"
+    },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 6,
+        "sleep": true
+    },
+    "ws2812": {
+        "pin": "D3"
+    },
+    "matrix_pins": {
+        "cols": ["E6", "B4", "B5"],
+        "rows": ["B2", "B6"]
+    },
+    "diode_direction": "COL2ROW",
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": false,
+        "mousekey": false,
+        "extrakey": false,
+        "rgblight": true,
+        "oled": true
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1}
+            ]
+        }
+    }
+}
diff --git a/keyboards/kakunpc/business_card/alpha/rules.mk b/keyboards/kakunpc/business_card/alpha/rules.mk
deleted file mode 100644
index 6744c64e1ba..00000000000
--- a/keyboards/kakunpc/business_card/alpha/rules.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no       # Mouse keys
-EXTRAKEY_ENABLE = no       # Audio control and System control
-CONSOLE_ENABLE = no        # Console for debug
-COMMAND_ENABLE = no        # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-OLED_ENABLE = yes
diff --git a/keyboards/kakunpc/business_card/beta/info.json b/keyboards/kakunpc/business_card/beta/info.json
deleted file mode 100644
index ef09a0ac906..00000000000
--- a/keyboards/kakunpc/business_card/beta/info.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-    "keyboard_name": "business_card beta",
-    "manufacturer": "kakunpc",
-    "url": "",
-    "maintainer": "kakunpc",
-    "usb": {
-        "vid": "0xFEED",
-        "pid": "0x0000",
-        "device_version": "0.0.1"
-    },
-    "rgblight": {
-        "saturation_steps": 8,
-        "brightness_steps": 8,
-        "led_count": 6,
-        "sleep": true
-    },
-    "ws2812": {
-        "pin": "D3"
-    },
-    "matrix_pins": {
-        "cols": ["B4", "B5"],
-        "rows": ["B3", "B2", "B6"]
-    },
-    "diode_direction": "COL2ROW",
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [2, 1], "x": 0, "y": 0},
-                {"matrix": [2, 0], "x": 1, "y": 0},
-
-                {"matrix": [1, 1], "x": 0, "y": 1},
-                {"matrix": [1, 0], "x": 1, "y": 1},
-
-                {"matrix": [0, 1], "x": 0, "y": 2},
-                {"matrix": [0, 0], "x": 1, "y": 2}
-            ]
-        }
-    }
-}
diff --git a/keyboards/kakunpc/business_card/beta/keyboard.json b/keyboards/kakunpc/business_card/beta/keyboard.json
new file mode 100644
index 00000000000..da18001a906
--- /dev/null
+++ b/keyboards/kakunpc/business_card/beta/keyboard.json
@@ -0,0 +1,48 @@
+{
+    "keyboard_name": "business_card beta",
+    "manufacturer": "kakunpc",
+    "url": "",
+    "maintainer": "kakunpc",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0x0000",
+        "device_version": "0.0.1"
+    },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 6,
+        "sleep": true
+    },
+    "ws2812": {
+        "pin": "D3"
+    },
+    "matrix_pins": {
+        "cols": ["B4", "B5"],
+        "rows": ["B3", "B2", "B6"]
+    },
+    "diode_direction": "COL2ROW",
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": false,
+        "mousekey": false,
+        "extrakey": false,
+        "rgblight": true,
+        "oled": true
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [2, 1], "x": 0, "y": 0},
+                {"matrix": [2, 0], "x": 1, "y": 0},
+
+                {"matrix": [1, 1], "x": 0, "y": 1},
+                {"matrix": [1, 0], "x": 1, "y": 1},
+
+                {"matrix": [0, 1], "x": 0, "y": 2},
+                {"matrix": [0, 0], "x": 1, "y": 2}
+            ]
+        }
+    }
+}
diff --git a/keyboards/kakunpc/business_card/beta/rules.mk b/keyboards/kakunpc/business_card/beta/rules.mk
deleted file mode 100644
index 6744c64e1ba..00000000000
--- a/keyboards/kakunpc/business_card/beta/rules.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no       # Mouse keys
-EXTRAKEY_ENABLE = no       # Audio control and System control
-CONSOLE_ENABLE = no        # Console for debug
-COMMAND_ENABLE = no        # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-OLED_ENABLE = yes
diff --git a/keyboards/kakunpc/business_card/rules.mk b/keyboards/kakunpc/business_card/rules.mk
index ffdd81c22b5..4525d52332a 100644
--- a/keyboards/kakunpc/business_card/rules.mk
+++ b/keyboards/kakunpc/business_card/rules.mk
@@ -1,14 +1 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no       # Mouse keys
-EXTRAKEY_ENABLE = no       # Audio control and System control
-CONSOLE_ENABLE = no        # Console for debug
-COMMAND_ENABLE = no        # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
 DEFAULT_FOLDER = kakunpc/business_card/beta
diff --git a/keyboards/kakunpc/choc_taro/info.json b/keyboards/kakunpc/choc_taro/info.json
deleted file mode 100644
index 6adbb3280a7..00000000000
--- a/keyboards/kakunpc/choc_taro/info.json
+++ /dev/null
@@ -1,575 +0,0 @@
-{
-    "keyboard_name": "choc_taro",
-    "manufacturer": "kakunpc",
-    "url": "https://kakunpc.booth.pm/",
-    "maintainer": "kakunpc",
-    "usb": {
-        "vid": "0x04D8",
-        "pid": "0xEB60",
-        "device_version": "0.0.1"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "layouts": {
-        "LAYOUT_all": {
-            "layout": [
-                {"matrix": [8, 0], "x": 0, "y": 0},
-                {"matrix": [9, 0], "x": 1, "y": 0},
-                {"matrix": [10, 0], "x": 2, "y": 0},
-                {"matrix": [11, 0], "x": 3, "y": 0},
-                {"matrix": [12, 0], "x": 4, "y": 0},
-                {"matrix": [13, 0], "x": 5, "y": 0},
-                {"matrix": [14, 0], "x": 6, "y": 0},
-                {"matrix": [15, 0], "x": 7, "y": 0},
-                {"matrix": [0, 0], "x": 8, "y": 0},
-                {"matrix": [1, 0], "x": 9, "y": 0},
-                {"matrix": [2, 0], "x": 10, "y": 0},
-                {"matrix": [3, 0], "x": 11, "y": 0},
-                {"matrix": [4, 0], "x": 12, "y": 0},
-                {"matrix": [5, 0], "x": 13, "y": 0},
-                {"matrix": [6, 0], "x": 14, "y": 0},
-
-                {"matrix": [8, 1], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [9, 1], "x": 1.5, "y": 1},
-                {"matrix": [10, 1], "x": 2.5, "y": 1},
-                {"matrix": [11, 1], "x": 3.5, "y": 1},
-                {"matrix": [12, 1], "x": 4.5, "y": 1},
-                {"matrix": [13, 1], "x": 5.5, "y": 1},
-                {"matrix": [14, 1], "x": 6.5, "y": 1},
-                {"matrix": [15, 1], "x": 7.5, "y": 1},
-                {"matrix": [0, 1], "x": 8.5, "y": 1},
-                {"matrix": [1, 1], "x": 9.5, "y": 1},
-                {"matrix": [2, 1], "x": 10.5, "y": 1},
-                {"matrix": [3, 1], "x": 11.5, "y": 1},
-                {"matrix": [4, 1], "x": 12.5, "y": 1},
-                {"matrix": [5, 1], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"matrix": [8, 2], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [9, 2], "x": 1.75, "y": 2},
-                {"matrix": [10, 2], "x": 2.75, "y": 2},
-                {"matrix": [11, 2], "x": 3.75, "y": 2},
-                {"matrix": [12, 2], "x": 4.75, "y": 2},
-                {"matrix": [13, 2], "x": 5.75, "y": 2},
-                {"matrix": [14, 2], "x": 6.75, "y": 2},
-                {"matrix": [15, 2], "x": 7.75, "y": 2},
-                {"matrix": [0, 2], "x": 8.75, "y": 2},
-                {"matrix": [1, 2], "x": 9.75, "y": 2},
-                {"matrix": [2, 2], "x": 10.75, "y": 2},
-                {"matrix": [3, 2], "x": 11.75, "y": 2},
-                {"matrix": [4, 2], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"matrix": [8, 3], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [9, 3], "x": 2.25, "y": 3},
-                {"matrix": [10, 3], "x": 3.25, "y": 3},
-                {"matrix": [11, 3], "x": 4.25, "y": 3},
-                {"matrix": [12, 3], "x": 5.25, "y": 3},
-                {"matrix": [13, 3], "x": 6.25, "y": 3},
-                {"matrix": [14, 3], "x": 7.25, "y": 3},
-                {"matrix": [15, 3], "x": 8.25, "y": 3},
-                {"matrix": [0, 3], "x": 9.25, "y": 3},
-                {"matrix": [1, 3], "x": 10.25, "y": 3},
-                {"matrix": [2, 3], "x": 11.25, "y": 3},
-                {"matrix": [3, 3], "x": 12.25, "y": 3, "w": 1.75},
-                {"matrix": [4, 3], "x": 14, "y": 3},
-
-                {"matrix": [8, 4], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [9, 4], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [10, 4], "x": 3.75, "y": 4, "w": 2.25},
-                {"matrix": [11, 4], "x": 6, "y": 4, "w": 1.25},
-                {"matrix": [12, 4], "x": 7.25, "y": 4, "w": 2.75},
-                {"matrix": [13, 4], "x": 10, "y": 4, "w": 1.25},
-                {"matrix": [14, 4], "x": 11.25, "y": 4, "w": 1.25},
-                {"matrix": [15, 4], "x": 12.5, "y": 4, "w": 1.25}
-            ]
-        },
-        "LAYOUT_ansi": {
-            "layout": [
-                {"matrix": [8, 0], "x": 0, "y": 0},
-                {"matrix": [9, 0], "x": 1, "y": 0},
-                {"matrix": [10, 0], "x": 2, "y": 0},
-                {"matrix": [11, 0], "x": 3, "y": 0},
-                {"matrix": [12, 0], "x": 4, "y": 0},
-                {"matrix": [13, 0], "x": 5, "y": 0},
-                {"matrix": [14, 0], "x": 6, "y": 0},
-                {"matrix": [15, 0], "x": 7, "y": 0},
-                {"matrix": [0, 0], "x": 8, "y": 0},
-                {"matrix": [1, 0], "x": 9, "y": 0},
-                {"matrix": [2, 0], "x": 10, "y": 0},
-                {"matrix": [3, 0], "x": 11, "y": 0},
-                {"matrix": [4, 0], "x": 12, "y": 0},
-                {"matrix": [5, 0], "x": 13, "y": 0, "w": 2},
-
-                {"matrix": [8, 1], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [9, 1], "x": 1.5, "y": 1},
-                {"matrix": [10, 1], "x": 2.5, "y": 1},
-                {"matrix": [11, 1], "x": 3.5, "y": 1},
-                {"matrix": [12, 1], "x": 4.5, "y": 1},
-                {"matrix": [13, 1], "x": 5.5, "y": 1},
-                {"matrix": [14, 1], "x": 6.5, "y": 1},
-                {"matrix": [15, 1], "x": 7.5, "y": 1},
-                {"matrix": [0, 1], "x": 8.5, "y": 1},
-                {"matrix": [1, 1], "x": 9.5, "y": 1},
-                {"matrix": [2, 1], "x": 10.5, "y": 1},
-                {"matrix": [3, 1], "x": 11.5, "y": 1},
-                {"matrix": [4, 1], "x": 12.5, "y": 1},
-                {"matrix": [5, 1], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"matrix": [8, 2], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [9, 2], "x": 1.75, "y": 2},
-                {"matrix": [10, 2], "x": 2.75, "y": 2},
-                {"matrix": [11, 2], "x": 3.75, "y": 2},
-                {"matrix": [12, 2], "x": 4.75, "y": 2},
-                {"matrix": [13, 2], "x": 5.75, "y": 2},
-                {"matrix": [14, 2], "x": 6.75, "y": 2},
-                {"matrix": [15, 2], "x": 7.75, "y": 2},
-                {"matrix": [0, 2], "x": 8.75, "y": 2},
-                {"matrix": [1, 2], "x": 9.75, "y": 2},
-                {"matrix": [2, 2], "x": 10.75, "y": 2},
-                {"matrix": [3, 2], "x": 11.75, "y": 2},
-                {"matrix": [4, 2], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"matrix": [8, 3], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [9, 3], "x": 2.25, "y": 3},
-                {"matrix": [10, 3], "x": 3.25, "y": 3},
-                {"matrix": [11, 3], "x": 4.25, "y": 3},
-                {"matrix": [12, 3], "x": 5.25, "y": 3},
-                {"matrix": [13, 3], "x": 6.25, "y": 3},
-                {"matrix": [14, 3], "x": 7.25, "y": 3},
-                {"matrix": [15, 3], "x": 8.25, "y": 3},
-                {"matrix": [0, 3], "x": 9.25, "y": 3},
-                {"matrix": [1, 3], "x": 10.25, "y": 3},
-                {"matrix": [2, 3], "x": 11.25, "y": 3},
-                {"matrix": [3, 3], "x": 12.25, "y": 3, "w": 2.75},
-
-                {"matrix": [8, 4], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [9, 4], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [10, 4], "x": 3.75, "y": 4, "w": 2.25},
-                {"matrix": [11, 4], "x": 6, "y": 4, "w": 1.25},
-                {"matrix": [12, 4], "x": 7.25, "y": 4, "w": 2.75},
-                {"matrix": [13, 4], "x": 10, "y": 4, "w": 1.25},
-                {"matrix": [14, 4], "x": 11.25, "y": 4, "w": 1.25},
-                {"matrix": [15, 4], "x": 12.5, "y": 4, "w": 1.25}
-            ]
-        },
-        "LAYOUT_ansi_split_bs": {
-            "layout": [
-                {"matrix": [8, 0], "x": 0, "y": 0},
-                {"matrix": [9, 0], "x": 1, "y": 0},
-                {"matrix": [10, 0], "x": 2, "y": 0},
-                {"matrix": [11, 0], "x": 3, "y": 0},
-                {"matrix": [12, 0], "x": 4, "y": 0},
-                {"matrix": [13, 0], "x": 5, "y": 0},
-                {"matrix": [14, 0], "x": 6, "y": 0},
-                {"matrix": [15, 0], "x": 7, "y": 0},
-                {"matrix": [0, 0], "x": 8, "y": 0},
-                {"matrix": [1, 0], "x": 9, "y": 0},
-                {"matrix": [2, 0], "x": 10, "y": 0},
-                {"matrix": [3, 0], "x": 11, "y": 0},
-                {"matrix": [4, 0], "x": 12, "y": 0},
-                {"matrix": [5, 0], "x": 13, "y": 0},
-                {"matrix": [6, 0], "x": 14, "y": 0},
-
-                {"matrix": [8, 1], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [9, 1], "x": 1.5, "y": 1},
-                {"matrix": [10, 1], "x": 2.5, "y": 1},
-                {"matrix": [11, 1], "x": 3.5, "y": 1},
-                {"matrix": [12, 1], "x": 4.5, "y": 1},
-                {"matrix": [13, 1], "x": 5.5, "y": 1},
-                {"matrix": [14, 1], "x": 6.5, "y": 1},
-                {"matrix": [15, 1], "x": 7.5, "y": 1},
-                {"matrix": [0, 1], "x": 8.5, "y": 1},
-                {"matrix": [1, 1], "x": 9.5, "y": 1},
-                {"matrix": [2, 1], "x": 10.5, "y": 1},
-                {"matrix": [3, 1], "x": 11.5, "y": 1},
-                {"matrix": [4, 1], "x": 12.5, "y": 1},
-                {"matrix": [5, 1], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"matrix": [8, 2], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [9, 2], "x": 1.75, "y": 2},
-                {"matrix": [10, 2], "x": 2.75, "y": 2},
-                {"matrix": [11, 2], "x": 3.75, "y": 2},
-                {"matrix": [12, 2], "x": 4.75, "y": 2},
-                {"matrix": [13, 2], "x": 5.75, "y": 2},
-                {"matrix": [14, 2], "x": 6.75, "y": 2},
-                {"matrix": [15, 2], "x": 7.75, "y": 2},
-                {"matrix": [0, 2], "x": 8.75, "y": 2},
-                {"matrix": [1, 2], "x": 9.75, "y": 2},
-                {"matrix": [2, 2], "x": 10.75, "y": 2},
-                {"matrix": [3, 2], "x": 11.75, "y": 2},
-                {"matrix": [4, 2], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"matrix": [8, 3], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [9, 3], "x": 2.25, "y": 3},
-                {"matrix": [10, 3], "x": 3.25, "y": 3},
-                {"matrix": [11, 3], "x": 4.25, "y": 3},
-                {"matrix": [12, 3], "x": 5.25, "y": 3},
-                {"matrix": [13, 3], "x": 6.25, "y": 3},
-                {"matrix": [14, 3], "x": 7.25, "y": 3},
-                {"matrix": [15, 3], "x": 8.25, "y": 3},
-                {"matrix": [0, 3], "x": 9.25, "y": 3},
-                {"matrix": [1, 3], "x": 10.25, "y": 3},
-                {"matrix": [2, 3], "x": 11.25, "y": 3},
-                {"matrix": [3, 3], "x": 12.25, "y": 3, "w": 2.75},
-
-                {"matrix": [8, 4], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [9, 4], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [10, 4], "x": 3.75, "y": 4, "w": 2.25},
-                {"matrix": [11, 4], "x": 6, "y": 4, "w": 1.25},
-                {"matrix": [12, 4], "x": 7.25, "y": 4, "w": 2.75},
-                {"matrix": [13, 4], "x": 10, "y": 4, "w": 1.25},
-                {"matrix": [14, 4], "x": 11.25, "y": 4, "w": 1.25},
-                {"matrix": [15, 4], "x": 12.5, "y": 4, "w": 1.25}
-            ]
-        },
-        "LAYOUT_ansi_split_rshift": {
-            "layout": [
-                {"matrix": [8, 0], "x": 0, "y": 0},
-                {"matrix": [9, 0], "x": 1, "y": 0},
-                {"matrix": [10, 0], "x": 2, "y": 0},
-                {"matrix": [11, 0], "x": 3, "y": 0},
-                {"matrix": [12, 0], "x": 4, "y": 0},
-                {"matrix": [13, 0], "x": 5, "y": 0},
-                {"matrix": [14, 0], "x": 6, "y": 0},
-                {"matrix": [15, 0], "x": 7, "y": 0},
-                {"matrix": [0, 0], "x": 8, "y": 0},
-                {"matrix": [1, 0], "x": 9, "y": 0},
-                {"matrix": [2, 0], "x": 10, "y": 0},
-                {"matrix": [3, 0], "x": 11, "y": 0},
-                {"matrix": [4, 0], "x": 12, "y": 0},
-                {"matrix": [5, 0], "x": 13, "y": 0, "w": 2},
-
-                {"matrix": [8, 1], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [9, 1], "x": 1.5, "y": 1},
-                {"matrix": [10, 1], "x": 2.5, "y": 1},
-                {"matrix": [11, 1], "x": 3.5, "y": 1},
-                {"matrix": [12, 1], "x": 4.5, "y": 1},
-                {"matrix": [13, 1], "x": 5.5, "y": 1},
-                {"matrix": [14, 1], "x": 6.5, "y": 1},
-                {"matrix": [15, 1], "x": 7.5, "y": 1},
-                {"matrix": [0, 1], "x": 8.5, "y": 1},
-                {"matrix": [1, 1], "x": 9.5, "y": 1},
-                {"matrix": [2, 1], "x": 10.5, "y": 1},
-                {"matrix": [3, 1], "x": 11.5, "y": 1},
-                {"matrix": [4, 1], "x": 12.5, "y": 1},
-                {"matrix": [5, 1], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"matrix": [8, 2], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [9, 2], "x": 1.75, "y": 2},
-                {"matrix": [10, 2], "x": 2.75, "y": 2},
-                {"matrix": [11, 2], "x": 3.75, "y": 2},
-                {"matrix": [12, 2], "x": 4.75, "y": 2},
-                {"matrix": [13, 2], "x": 5.75, "y": 2},
-                {"matrix": [14, 2], "x": 6.75, "y": 2},
-                {"matrix": [15, 2], "x": 7.75, "y": 2},
-                {"matrix": [0, 2], "x": 8.75, "y": 2},
-                {"matrix": [1, 2], "x": 9.75, "y": 2},
-                {"matrix": [2, 2], "x": 10.75, "y": 2},
-                {"matrix": [3, 2], "x": 11.75, "y": 2},
-                {"matrix": [4, 2], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"matrix": [8, 3], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [9, 3], "x": 2.25, "y": 3},
-                {"matrix": [10, 3], "x": 3.25, "y": 3},
-                {"matrix": [11, 3], "x": 4.25, "y": 3},
-                {"matrix": [12, 3], "x": 5.25, "y": 3},
-                {"matrix": [13, 3], "x": 6.25, "y": 3},
-                {"matrix": [14, 3], "x": 7.25, "y": 3},
-                {"matrix": [15, 3], "x": 8.25, "y": 3},
-                {"matrix": [0, 3], "x": 9.25, "y": 3},
-                {"matrix": [1, 3], "x": 10.25, "y": 3},
-                {"matrix": [2, 3], "x": 11.25, "y": 3},
-                {"matrix": [3, 3], "x": 12.25, "y": 3, "w": 1.75},
-                {"matrix": [4, 3], "x": 14, "y": 3},
-
-                {"matrix": [8, 4], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [9, 4], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [10, 4], "x": 3.75, "y": 4, "w": 2.25},
-                {"matrix": [11, 4], "x": 6, "y": 4, "w": 1.25},
-                {"matrix": [12, 4], "x": 7.25, "y": 4, "w": 2.75},
-                {"matrix": [13, 4], "x": 10, "y": 4, "w": 1.25},
-                {"matrix": [14, 4], "x": 11.25, "y": 4, "w": 1.25},
-                {"matrix": [15, 4], "x": 12.5, "y": 4, "w": 1.25}
-            ]
-        },
-        "LAYOUT_iso": {
-            "layout": [
-                {"matrix": [8, 0], "x": 0, "y": 0},
-                {"matrix": [9, 0], "x": 1, "y": 0},
-                {"matrix": [10, 0], "x": 2, "y": 0},
-                {"matrix": [11, 0], "x": 3, "y": 0},
-                {"matrix": [12, 0], "x": 4, "y": 0},
-                {"matrix": [13, 0], "x": 5, "y": 0},
-                {"matrix": [14, 0], "x": 6, "y": 0},
-                {"matrix": [15, 0], "x": 7, "y": 0},
-                {"matrix": [0, 0], "x": 8, "y": 0},
-                {"matrix": [1, 0], "x": 9, "y": 0},
-                {"matrix": [2, 0], "x": 10, "y": 0},
-                {"matrix": [3, 0], "x": 11, "y": 0},
-                {"matrix": [4, 0], "x": 12, "y": 0},
-                {"matrix": [5, 0], "x": 13, "y": 0, "w": 2},
-
-                {"matrix": [8, 1], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [9, 1], "x": 1.5, "y": 1},
-                {"matrix": [10, 1], "x": 2.5, "y": 1},
-                {"matrix": [11, 1], "x": 3.5, "y": 1},
-                {"matrix": [12, 1], "x": 4.5, "y": 1},
-                {"matrix": [13, 1], "x": 5.5, "y": 1},
-                {"matrix": [14, 1], "x": 6.5, "y": 1},
-                {"matrix": [15, 1], "x": 7.5, "y": 1},
-                {"matrix": [0, 1], "x": 8.5, "y": 1},
-                {"matrix": [1, 1], "x": 9.5, "y": 1},
-                {"matrix": [2, 1], "x": 10.5, "y": 1},
-                {"matrix": [3, 1], "x": 11.5, "y": 1},
-                {"matrix": [4, 1], "x": 12.5, "y": 1},
-                {"matrix": [5, 1], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
-
-                {"matrix": [8, 2], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [9, 2], "x": 1.75, "y": 2},
-                {"matrix": [10, 2], "x": 2.75, "y": 2},
-                {"matrix": [11, 2], "x": 3.75, "y": 2},
-                {"matrix": [12, 2], "x": 4.75, "y": 2},
-                {"matrix": [13, 2], "x": 5.75, "y": 2},
-                {"matrix": [14, 2], "x": 6.75, "y": 2},
-                {"matrix": [15, 2], "x": 7.75, "y": 2},
-                {"matrix": [0, 2], "x": 8.75, "y": 2},
-                {"matrix": [1, 2], "x": 9.75, "y": 2},
-                {"matrix": [2, 2], "x": 10.75, "y": 2},
-                {"matrix": [3, 2], "x": 11.75, "y": 2},
-                {"matrix": [4, 2], "x": 12.75, "y": 2},
-
-                {"matrix": [8, 3], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [9, 3], "x": 2.25, "y": 3},
-                {"matrix": [10, 3], "x": 3.25, "y": 3},
-                {"matrix": [11, 3], "x": 4.25, "y": 3},
-                {"matrix": [12, 3], "x": 5.25, "y": 3},
-                {"matrix": [13, 3], "x": 6.25, "y": 3},
-                {"matrix": [14, 3], "x": 7.25, "y": 3},
-                {"matrix": [15, 3], "x": 8.25, "y": 3},
-                {"matrix": [0, 3], "x": 9.25, "y": 3},
-                {"matrix": [1, 3], "x": 10.25, "y": 3},
-                {"matrix": [2, 3], "x": 11.25, "y": 3},
-                {"matrix": [3, 3], "x": 12.25, "y": 3, "w": 2.75},
-
-                {"matrix": [8, 4], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [9, 4], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [10, 4], "x": 3.75, "y": 4, "w": 2.25},
-                {"matrix": [11, 4], "x": 6, "y": 4, "w": 1.25},
-                {"matrix": [12, 4], "x": 7.25, "y": 4, "w": 2.75},
-                {"matrix": [13, 4], "x": 10, "y": 4, "w": 1.25},
-                {"matrix": [14, 4], "x": 11.25, "y": 4, "w": 1.25},
-                {"matrix": [15, 4], "x": 12.5, "y": 4, "w": 1.25}
-            ]
-        },
-        "LAYOUT_iso_split_rshift": {
-            "layout": [
-                {"matrix": [8, 0], "x": 0, "y": 0},
-                {"matrix": [9, 0], "x": 1, "y": 0},
-                {"matrix": [10, 0], "x": 2, "y": 0},
-                {"matrix": [11, 0], "x": 3, "y": 0},
-                {"matrix": [12, 0], "x": 4, "y": 0},
-                {"matrix": [13, 0], "x": 5, "y": 0},
-                {"matrix": [14, 0], "x": 6, "y": 0},
-                {"matrix": [15, 0], "x": 7, "y": 0},
-                {"matrix": [0, 0], "x": 8, "y": 0},
-                {"matrix": [1, 0], "x": 9, "y": 0},
-                {"matrix": [2, 0], "x": 10, "y": 0},
-                {"matrix": [3, 0], "x": 11, "y": 0},
-                {"matrix": [4, 0], "x": 12, "y": 0},
-                {"matrix": [5, 0], "x": 13, "y": 0, "w": 2},
-
-                {"matrix": [8, 1], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [9, 1], "x": 1.5, "y": 1},
-                {"matrix": [10, 1], "x": 2.5, "y": 1},
-                {"matrix": [11, 1], "x": 3.5, "y": 1},
-                {"matrix": [12, 1], "x": 4.5, "y": 1},
-                {"matrix": [13, 1], "x": 5.5, "y": 1},
-                {"matrix": [14, 1], "x": 6.5, "y": 1},
-                {"matrix": [15, 1], "x": 7.5, "y": 1},
-                {"matrix": [0, 1], "x": 8.5, "y": 1},
-                {"matrix": [1, 1], "x": 9.5, "y": 1},
-                {"matrix": [2, 1], "x": 10.5, "y": 1},
-                {"matrix": [3, 1], "x": 11.5, "y": 1},
-                {"matrix": [4, 1], "x": 12.5, "y": 1},
-                {"matrix": [5, 1], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
-
-                {"matrix": [8, 2], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [9, 2], "x": 1.75, "y": 2},
-                {"matrix": [10, 2], "x": 2.75, "y": 2},
-                {"matrix": [11, 2], "x": 3.75, "y": 2},
-                {"matrix": [12, 2], "x": 4.75, "y": 2},
-                {"matrix": [13, 2], "x": 5.75, "y": 2},
-                {"matrix": [14, 2], "x": 6.75, "y": 2},
-                {"matrix": [15, 2], "x": 7.75, "y": 2},
-                {"matrix": [0, 2], "x": 8.75, "y": 2},
-                {"matrix": [1, 2], "x": 9.75, "y": 2},
-                {"matrix": [2, 2], "x": 10.75, "y": 2},
-                {"matrix": [3, 2], "x": 11.75, "y": 2},
-                {"matrix": [4, 2], "x": 12.75, "y": 2},
-
-                {"matrix": [8, 3], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [9, 3], "x": 2.25, "y": 3},
-                {"matrix": [10, 3], "x": 3.25, "y": 3},
-                {"matrix": [11, 3], "x": 4.25, "y": 3},
-                {"matrix": [12, 3], "x": 5.25, "y": 3},
-                {"matrix": [13, 3], "x": 6.25, "y": 3},
-                {"matrix": [14, 3], "x": 7.25, "y": 3},
-                {"matrix": [15, 3], "x": 8.25, "y": 3},
-                {"matrix": [0, 3], "x": 9.25, "y": 3},
-                {"matrix": [1, 3], "x": 10.25, "y": 3},
-                {"matrix": [2, 3], "x": 11.25, "y": 3},
-                {"matrix": [3, 3], "x": 12.25, "y": 3, "w": 1.75},
-                {"matrix": [4, 3], "x": 14, "y": 3},
-
-                {"matrix": [8, 4], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [9, 4], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [10, 4], "x": 3.75, "y": 4, "w": 2.25},
-                {"matrix": [11, 4], "x": 6, "y": 4, "w": 1.25},
-                {"matrix": [12, 4], "x": 7.25, "y": 4, "w": 2.75},
-                {"matrix": [13, 4], "x": 10, "y": 4, "w": 1.25},
-                {"matrix": [14, 4], "x": 11.25, "y": 4, "w": 1.25},
-                {"matrix": [15, 4], "x": 12.5, "y": 4, "w": 1.25}
-            ]
-        },
-        "LAYOUT_iso_split_bs": {
-            "layout": [
-                {"matrix": [8, 0], "x": 0, "y": 0},
-                {"matrix": [9, 0], "x": 1, "y": 0},
-                {"matrix": [10, 0], "x": 2, "y": 0},
-                {"matrix": [11, 0], "x": 3, "y": 0},
-                {"matrix": [12, 0], "x": 4, "y": 0},
-                {"matrix": [13, 0], "x": 5, "y": 0},
-                {"matrix": [14, 0], "x": 6, "y": 0},
-                {"matrix": [15, 0], "x": 7, "y": 0},
-                {"matrix": [0, 0], "x": 8, "y": 0},
-                {"matrix": [1, 0], "x": 9, "y": 0},
-                {"matrix": [2, 0], "x": 10, "y": 0},
-                {"matrix": [3, 0], "x": 11, "y": 0},
-                {"matrix": [4, 0], "x": 12, "y": 0},
-                {"matrix": [5, 0], "x": 13, "y": 0},
-                {"matrix": [6, 0], "x": 14, "y": 0},
-
-                {"matrix": [8, 1], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [9, 1], "x": 1.5, "y": 1},
-                {"matrix": [10, 1], "x": 2.5, "y": 1},
-                {"matrix": [11, 1], "x": 3.5, "y": 1},
-                {"matrix": [12, 1], "x": 4.5, "y": 1},
-                {"matrix": [13, 1], "x": 5.5, "y": 1},
-                {"matrix": [14, 1], "x": 6.5, "y": 1},
-                {"matrix": [15, 1], "x": 7.5, "y": 1},
-                {"matrix": [0, 1], "x": 8.5, "y": 1},
-                {"matrix": [1, 1], "x": 9.5, "y": 1},
-                {"matrix": [2, 1], "x": 10.5, "y": 1},
-                {"matrix": [3, 1], "x": 11.5, "y": 1},
-                {"matrix": [4, 1], "x": 12.5, "y": 1},
-                {"matrix": [5, 1], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
-
-                {"matrix": [8, 2], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [9, 2], "x": 1.75, "y": 2},
-                {"matrix": [10, 2], "x": 2.75, "y": 2},
-                {"matrix": [11, 2], "x": 3.75, "y": 2},
-                {"matrix": [12, 2], "x": 4.75, "y": 2},
-                {"matrix": [13, 2], "x": 5.75, "y": 2},
-                {"matrix": [14, 2], "x": 6.75, "y": 2},
-                {"matrix": [15, 2], "x": 7.75, "y": 2},
-                {"matrix": [0, 2], "x": 8.75, "y": 2},
-                {"matrix": [1, 2], "x": 9.75, "y": 2},
-                {"matrix": [2, 2], "x": 10.75, "y": 2},
-                {"matrix": [3, 2], "x": 11.75, "y": 2},
-                {"matrix": [4, 2], "x": 12.75, "y": 2},
-
-                {"matrix": [8, 3], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [9, 3], "x": 2.25, "y": 3},
-                {"matrix": [10, 3], "x": 3.25, "y": 3},
-                {"matrix": [11, 3], "x": 4.25, "y": 3},
-                {"matrix": [12, 3], "x": 5.25, "y": 3},
-                {"matrix": [13, 3], "x": 6.25, "y": 3},
-                {"matrix": [14, 3], "x": 7.25, "y": 3},
-                {"matrix": [15, 3], "x": 8.25, "y": 3},
-                {"matrix": [0, 3], "x": 9.25, "y": 3},
-                {"matrix": [1, 3], "x": 10.25, "y": 3},
-                {"matrix": [2, 3], "x": 11.25, "y": 3},
-                {"matrix": [3, 3], "x": 12.25, "y": 3, "w": 2.75},
-
-                {"matrix": [8, 4], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [9, 4], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [10, 4], "x": 3.75, "y": 4, "w": 2.25},
-                {"matrix": [11, 4], "x": 6, "y": 4, "w": 1.25},
-                {"matrix": [12, 4], "x": 7.25, "y": 4, "w": 2.75},
-                {"matrix": [13, 4], "x": 10, "y": 4, "w": 1.25},
-                {"matrix": [14, 4], "x": 11.25, "y": 4, "w": 1.25},
-                {"matrix": [15, 4], "x": 12.5, "y": 4, "w": 1.25}
-            ]
-        },
-        "LAYOUT_iso_split_bs_rshift": {
-            "layout": [
-                {"matrix": [8, 0], "x": 0, "y": 0},
-                {"matrix": [9, 0], "x": 1, "y": 0},
-                {"matrix": [10, 0], "x": 2, "y": 0},
-                {"matrix": [11, 0], "x": 3, "y": 0},
-                {"matrix": [12, 0], "x": 4, "y": 0},
-                {"matrix": [13, 0], "x": 5, "y": 0},
-                {"matrix": [14, 0], "x": 6, "y": 0},
-                {"matrix": [15, 0], "x": 7, "y": 0},
-                {"matrix": [0, 0], "x": 8, "y": 0},
-                {"matrix": [1, 0], "x": 9, "y": 0},
-                {"matrix": [2, 0], "x": 10, "y": 0},
-                {"matrix": [3, 0], "x": 11, "y": 0},
-                {"matrix": [4, 0], "x": 12, "y": 0},
-                {"matrix": [5, 0], "x": 13, "y": 0},
-                {"matrix": [6, 0], "x": 14, "y": 0},
-
-                {"matrix": [8, 1], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [9, 1], "x": 1.5, "y": 1},
-                {"matrix": [10, 1], "x": 2.5, "y": 1},
-                {"matrix": [11, 1], "x": 3.5, "y": 1},
-                {"matrix": [12, 1], "x": 4.5, "y": 1},
-                {"matrix": [13, 1], "x": 5.5, "y": 1},
-                {"matrix": [14, 1], "x": 6.5, "y": 1},
-                {"matrix": [15, 1], "x": 7.5, "y": 1},
-                {"matrix": [0, 1], "x": 8.5, "y": 1},
-                {"matrix": [1, 1], "x": 9.5, "y": 1},
-                {"matrix": [2, 1], "x": 10.5, "y": 1},
-                {"matrix": [3, 1], "x": 11.5, "y": 1},
-                {"matrix": [4, 1], "x": 12.5, "y": 1},
-                {"matrix": [5, 1], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
-
-                {"matrix": [8, 2], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [9, 2], "x": 1.75, "y": 2},
-                {"matrix": [10, 2], "x": 2.75, "y": 2},
-                {"matrix": [11, 2], "x": 3.75, "y": 2},
-                {"matrix": [12, 2], "x": 4.75, "y": 2},
-                {"matrix": [13, 2], "x": 5.75, "y": 2},
-                {"matrix": [14, 2], "x": 6.75, "y": 2},
-                {"matrix": [15, 2], "x": 7.75, "y": 2},
-                {"matrix": [0, 2], "x": 8.75, "y": 2},
-                {"matrix": [1, 2], "x": 9.75, "y": 2},
-                {"matrix": [2, 2], "x": 10.75, "y": 2},
-                {"matrix": [3, 2], "x": 11.75, "y": 2},
-                {"matrix": [4, 2], "x": 12.75, "y": 2},
-
-                {"matrix": [8, 3], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [9, 3], "x": 2.25, "y": 3},
-                {"matrix": [10, 3], "x": 3.25, "y": 3},
-                {"matrix": [11, 3], "x": 4.25, "y": 3},
-                {"matrix": [12, 3], "x": 5.25, "y": 3},
-                {"matrix": [13, 3], "x": 6.25, "y": 3},
-                {"matrix": [14, 3], "x": 7.25, "y": 3},
-                {"matrix": [15, 3], "x": 8.25, "y": 3},
-                {"matrix": [0, 3], "x": 9.25, "y": 3},
-                {"matrix": [1, 3], "x": 10.25, "y": 3},
-                {"matrix": [2, 3], "x": 11.25, "y": 3},
-                {"matrix": [3, 3], "x": 12.25, "y": 3, "w": 1.75},
-                {"matrix": [4, 3], "x": 14, "y": 3},
-
-                {"matrix": [8, 4], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [9, 4], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [10, 4], "x": 3.75, "y": 4, "w": 2.25},
-                {"matrix": [11, 4], "x": 6, "y": 4, "w": 1.25},
-                {"matrix": [12, 4], "x": 7.25, "y": 4, "w": 2.75},
-                {"matrix": [13, 4], "x": 10, "y": 4, "w": 1.25},
-                {"matrix": [14, 4], "x": 11.25, "y": 4, "w": 1.25},
-                {"matrix": [15, 4], "x": 12.5, "y": 4, "w": 1.25}
-            ]
-        }
-    }
-}
diff --git a/keyboards/kakunpc/choc_taro/keyboard.json b/keyboards/kakunpc/choc_taro/keyboard.json
new file mode 100644
index 00000000000..b17e5e39206
--- /dev/null
+++ b/keyboards/kakunpc/choc_taro/keyboard.json
@@ -0,0 +1,582 @@
+{
+    "keyboard_name": "choc_taro",
+    "manufacturer": "kakunpc",
+    "url": "https://kakunpc.booth.pm/",
+    "maintainer": "kakunpc",
+    "usb": {
+        "vid": "0x04D8",
+        "pid": "0xEB60",
+        "device_version": "0.0.1"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "console": true,
+        "command": true
+    },
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                {"matrix": [8, 0], "x": 0, "y": 0},
+                {"matrix": [9, 0], "x": 1, "y": 0},
+                {"matrix": [10, 0], "x": 2, "y": 0},
+                {"matrix": [11, 0], "x": 3, "y": 0},
+                {"matrix": [12, 0], "x": 4, "y": 0},
+                {"matrix": [13, 0], "x": 5, "y": 0},
+                {"matrix": [14, 0], "x": 6, "y": 0},
+                {"matrix": [15, 0], "x": 7, "y": 0},
+                {"matrix": [0, 0], "x": 8, "y": 0},
+                {"matrix": [1, 0], "x": 9, "y": 0},
+                {"matrix": [2, 0], "x": 10, "y": 0},
+                {"matrix": [3, 0], "x": 11, "y": 0},
+                {"matrix": [4, 0], "x": 12, "y": 0},
+                {"matrix": [5, 0], "x": 13, "y": 0},
+                {"matrix": [6, 0], "x": 14, "y": 0},
+
+                {"matrix": [8, 1], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [9, 1], "x": 1.5, "y": 1},
+                {"matrix": [10, 1], "x": 2.5, "y": 1},
+                {"matrix": [11, 1], "x": 3.5, "y": 1},
+                {"matrix": [12, 1], "x": 4.5, "y": 1},
+                {"matrix": [13, 1], "x": 5.5, "y": 1},
+                {"matrix": [14, 1], "x": 6.5, "y": 1},
+                {"matrix": [15, 1], "x": 7.5, "y": 1},
+                {"matrix": [0, 1], "x": 8.5, "y": 1},
+                {"matrix": [1, 1], "x": 9.5, "y": 1},
+                {"matrix": [2, 1], "x": 10.5, "y": 1},
+                {"matrix": [3, 1], "x": 11.5, "y": 1},
+                {"matrix": [4, 1], "x": 12.5, "y": 1},
+                {"matrix": [5, 1], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [8, 2], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [9, 2], "x": 1.75, "y": 2},
+                {"matrix": [10, 2], "x": 2.75, "y": 2},
+                {"matrix": [11, 2], "x": 3.75, "y": 2},
+                {"matrix": [12, 2], "x": 4.75, "y": 2},
+                {"matrix": [13, 2], "x": 5.75, "y": 2},
+                {"matrix": [14, 2], "x": 6.75, "y": 2},
+                {"matrix": [15, 2], "x": 7.75, "y": 2},
+                {"matrix": [0, 2], "x": 8.75, "y": 2},
+                {"matrix": [1, 2], "x": 9.75, "y": 2},
+                {"matrix": [2, 2], "x": 10.75, "y": 2},
+                {"matrix": [3, 2], "x": 11.75, "y": 2},
+                {"matrix": [4, 2], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [8, 3], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [9, 3], "x": 2.25, "y": 3},
+                {"matrix": [10, 3], "x": 3.25, "y": 3},
+                {"matrix": [11, 3], "x": 4.25, "y": 3},
+                {"matrix": [12, 3], "x": 5.25, "y": 3},
+                {"matrix": [13, 3], "x": 6.25, "y": 3},
+                {"matrix": [14, 3], "x": 7.25, "y": 3},
+                {"matrix": [15, 3], "x": 8.25, "y": 3},
+                {"matrix": [0, 3], "x": 9.25, "y": 3},
+                {"matrix": [1, 3], "x": 10.25, "y": 3},
+                {"matrix": [2, 3], "x": 11.25, "y": 3},
+                {"matrix": [3, 3], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [4, 3], "x": 14, "y": 3},
+
+                {"matrix": [8, 4], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [9, 4], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [10, 4], "x": 3.75, "y": 4, "w": 2.25},
+                {"matrix": [11, 4], "x": 6, "y": 4, "w": 1.25},
+                {"matrix": [12, 4], "x": 7.25, "y": 4, "w": 2.75},
+                {"matrix": [13, 4], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [14, 4], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [15, 4], "x": 12.5, "y": 4, "w": 1.25}
+            ]
+        },
+        "LAYOUT_ansi": {
+            "layout": [
+                {"matrix": [8, 0], "x": 0, "y": 0},
+                {"matrix": [9, 0], "x": 1, "y": 0},
+                {"matrix": [10, 0], "x": 2, "y": 0},
+                {"matrix": [11, 0], "x": 3, "y": 0},
+                {"matrix": [12, 0], "x": 4, "y": 0},
+                {"matrix": [13, 0], "x": 5, "y": 0},
+                {"matrix": [14, 0], "x": 6, "y": 0},
+                {"matrix": [15, 0], "x": 7, "y": 0},
+                {"matrix": [0, 0], "x": 8, "y": 0},
+                {"matrix": [1, 0], "x": 9, "y": 0},
+                {"matrix": [2, 0], "x": 10, "y": 0},
+                {"matrix": [3, 0], "x": 11, "y": 0},
+                {"matrix": [4, 0], "x": 12, "y": 0},
+                {"matrix": [5, 0], "x": 13, "y": 0, "w": 2},
+
+                {"matrix": [8, 1], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [9, 1], "x": 1.5, "y": 1},
+                {"matrix": [10, 1], "x": 2.5, "y": 1},
+                {"matrix": [11, 1], "x": 3.5, "y": 1},
+                {"matrix": [12, 1], "x": 4.5, "y": 1},
+                {"matrix": [13, 1], "x": 5.5, "y": 1},
+                {"matrix": [14, 1], "x": 6.5, "y": 1},
+                {"matrix": [15, 1], "x": 7.5, "y": 1},
+                {"matrix": [0, 1], "x": 8.5, "y": 1},
+                {"matrix": [1, 1], "x": 9.5, "y": 1},
+                {"matrix": [2, 1], "x": 10.5, "y": 1},
+                {"matrix": [3, 1], "x": 11.5, "y": 1},
+                {"matrix": [4, 1], "x": 12.5, "y": 1},
+                {"matrix": [5, 1], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [8, 2], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [9, 2], "x": 1.75, "y": 2},
+                {"matrix": [10, 2], "x": 2.75, "y": 2},
+                {"matrix": [11, 2], "x": 3.75, "y": 2},
+                {"matrix": [12, 2], "x": 4.75, "y": 2},
+                {"matrix": [13, 2], "x": 5.75, "y": 2},
+                {"matrix": [14, 2], "x": 6.75, "y": 2},
+                {"matrix": [15, 2], "x": 7.75, "y": 2},
+                {"matrix": [0, 2], "x": 8.75, "y": 2},
+                {"matrix": [1, 2], "x": 9.75, "y": 2},
+                {"matrix": [2, 2], "x": 10.75, "y": 2},
+                {"matrix": [3, 2], "x": 11.75, "y": 2},
+                {"matrix": [4, 2], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [8, 3], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [9, 3], "x": 2.25, "y": 3},
+                {"matrix": [10, 3], "x": 3.25, "y": 3},
+                {"matrix": [11, 3], "x": 4.25, "y": 3},
+                {"matrix": [12, 3], "x": 5.25, "y": 3},
+                {"matrix": [13, 3], "x": 6.25, "y": 3},
+                {"matrix": [14, 3], "x": 7.25, "y": 3},
+                {"matrix": [15, 3], "x": 8.25, "y": 3},
+                {"matrix": [0, 3], "x": 9.25, "y": 3},
+                {"matrix": [1, 3], "x": 10.25, "y": 3},
+                {"matrix": [2, 3], "x": 11.25, "y": 3},
+                {"matrix": [3, 3], "x": 12.25, "y": 3, "w": 2.75},
+
+                {"matrix": [8, 4], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [9, 4], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [10, 4], "x": 3.75, "y": 4, "w": 2.25},
+                {"matrix": [11, 4], "x": 6, "y": 4, "w": 1.25},
+                {"matrix": [12, 4], "x": 7.25, "y": 4, "w": 2.75},
+                {"matrix": [13, 4], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [14, 4], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [15, 4], "x": 12.5, "y": 4, "w": 1.25}
+            ]
+        },
+        "LAYOUT_ansi_split_bs": {
+            "layout": [
+                {"matrix": [8, 0], "x": 0, "y": 0},
+                {"matrix": [9, 0], "x": 1, "y": 0},
+                {"matrix": [10, 0], "x": 2, "y": 0},
+                {"matrix": [11, 0], "x": 3, "y": 0},
+                {"matrix": [12, 0], "x": 4, "y": 0},
+                {"matrix": [13, 0], "x": 5, "y": 0},
+                {"matrix": [14, 0], "x": 6, "y": 0},
+                {"matrix": [15, 0], "x": 7, "y": 0},
+                {"matrix": [0, 0], "x": 8, "y": 0},
+                {"matrix": [1, 0], "x": 9, "y": 0},
+                {"matrix": [2, 0], "x": 10, "y": 0},
+                {"matrix": [3, 0], "x": 11, "y": 0},
+                {"matrix": [4, 0], "x": 12, "y": 0},
+                {"matrix": [5, 0], "x": 13, "y": 0},
+                {"matrix": [6, 0], "x": 14, "y": 0},
+
+                {"matrix": [8, 1], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [9, 1], "x": 1.5, "y": 1},
+                {"matrix": [10, 1], "x": 2.5, "y": 1},
+                {"matrix": [11, 1], "x": 3.5, "y": 1},
+                {"matrix": [12, 1], "x": 4.5, "y": 1},
+                {"matrix": [13, 1], "x": 5.5, "y": 1},
+                {"matrix": [14, 1], "x": 6.5, "y": 1},
+                {"matrix": [15, 1], "x": 7.5, "y": 1},
+                {"matrix": [0, 1], "x": 8.5, "y": 1},
+                {"matrix": [1, 1], "x": 9.5, "y": 1},
+                {"matrix": [2, 1], "x": 10.5, "y": 1},
+                {"matrix": [3, 1], "x": 11.5, "y": 1},
+                {"matrix": [4, 1], "x": 12.5, "y": 1},
+                {"matrix": [5, 1], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [8, 2], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [9, 2], "x": 1.75, "y": 2},
+                {"matrix": [10, 2], "x": 2.75, "y": 2},
+                {"matrix": [11, 2], "x": 3.75, "y": 2},
+                {"matrix": [12, 2], "x": 4.75, "y": 2},
+                {"matrix": [13, 2], "x": 5.75, "y": 2},
+                {"matrix": [14, 2], "x": 6.75, "y": 2},
+                {"matrix": [15, 2], "x": 7.75, "y": 2},
+                {"matrix": [0, 2], "x": 8.75, "y": 2},
+                {"matrix": [1, 2], "x": 9.75, "y": 2},
+                {"matrix": [2, 2], "x": 10.75, "y": 2},
+                {"matrix": [3, 2], "x": 11.75, "y": 2},
+                {"matrix": [4, 2], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [8, 3], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [9, 3], "x": 2.25, "y": 3},
+                {"matrix": [10, 3], "x": 3.25, "y": 3},
+                {"matrix": [11, 3], "x": 4.25, "y": 3},
+                {"matrix": [12, 3], "x": 5.25, "y": 3},
+                {"matrix": [13, 3], "x": 6.25, "y": 3},
+                {"matrix": [14, 3], "x": 7.25, "y": 3},
+                {"matrix": [15, 3], "x": 8.25, "y": 3},
+                {"matrix": [0, 3], "x": 9.25, "y": 3},
+                {"matrix": [1, 3], "x": 10.25, "y": 3},
+                {"matrix": [2, 3], "x": 11.25, "y": 3},
+                {"matrix": [3, 3], "x": 12.25, "y": 3, "w": 2.75},
+
+                {"matrix": [8, 4], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [9, 4], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [10, 4], "x": 3.75, "y": 4, "w": 2.25},
+                {"matrix": [11, 4], "x": 6, "y": 4, "w": 1.25},
+                {"matrix": [12, 4], "x": 7.25, "y": 4, "w": 2.75},
+                {"matrix": [13, 4], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [14, 4], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [15, 4], "x": 12.5, "y": 4, "w": 1.25}
+            ]
+        },
+        "LAYOUT_ansi_split_rshift": {
+            "layout": [
+                {"matrix": [8, 0], "x": 0, "y": 0},
+                {"matrix": [9, 0], "x": 1, "y": 0},
+                {"matrix": [10, 0], "x": 2, "y": 0},
+                {"matrix": [11, 0], "x": 3, "y": 0},
+                {"matrix": [12, 0], "x": 4, "y": 0},
+                {"matrix": [13, 0], "x": 5, "y": 0},
+                {"matrix": [14, 0], "x": 6, "y": 0},
+                {"matrix": [15, 0], "x": 7, "y": 0},
+                {"matrix": [0, 0], "x": 8, "y": 0},
+                {"matrix": [1, 0], "x": 9, "y": 0},
+                {"matrix": [2, 0], "x": 10, "y": 0},
+                {"matrix": [3, 0], "x": 11, "y": 0},
+                {"matrix": [4, 0], "x": 12, "y": 0},
+                {"matrix": [5, 0], "x": 13, "y": 0, "w": 2},
+
+                {"matrix": [8, 1], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [9, 1], "x": 1.5, "y": 1},
+                {"matrix": [10, 1], "x": 2.5, "y": 1},
+                {"matrix": [11, 1], "x": 3.5, "y": 1},
+                {"matrix": [12, 1], "x": 4.5, "y": 1},
+                {"matrix": [13, 1], "x": 5.5, "y": 1},
+                {"matrix": [14, 1], "x": 6.5, "y": 1},
+                {"matrix": [15, 1], "x": 7.5, "y": 1},
+                {"matrix": [0, 1], "x": 8.5, "y": 1},
+                {"matrix": [1, 1], "x": 9.5, "y": 1},
+                {"matrix": [2, 1], "x": 10.5, "y": 1},
+                {"matrix": [3, 1], "x": 11.5, "y": 1},
+                {"matrix": [4, 1], "x": 12.5, "y": 1},
+                {"matrix": [5, 1], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [8, 2], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [9, 2], "x": 1.75, "y": 2},
+                {"matrix": [10, 2], "x": 2.75, "y": 2},
+                {"matrix": [11, 2], "x": 3.75, "y": 2},
+                {"matrix": [12, 2], "x": 4.75, "y": 2},
+                {"matrix": [13, 2], "x": 5.75, "y": 2},
+                {"matrix": [14, 2], "x": 6.75, "y": 2},
+                {"matrix": [15, 2], "x": 7.75, "y": 2},
+                {"matrix": [0, 2], "x": 8.75, "y": 2},
+                {"matrix": [1, 2], "x": 9.75, "y": 2},
+                {"matrix": [2, 2], "x": 10.75, "y": 2},
+                {"matrix": [3, 2], "x": 11.75, "y": 2},
+                {"matrix": [4, 2], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [8, 3], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [9, 3], "x": 2.25, "y": 3},
+                {"matrix": [10, 3], "x": 3.25, "y": 3},
+                {"matrix": [11, 3], "x": 4.25, "y": 3},
+                {"matrix": [12, 3], "x": 5.25, "y": 3},
+                {"matrix": [13, 3], "x": 6.25, "y": 3},
+                {"matrix": [14, 3], "x": 7.25, "y": 3},
+                {"matrix": [15, 3], "x": 8.25, "y": 3},
+                {"matrix": [0, 3], "x": 9.25, "y": 3},
+                {"matrix": [1, 3], "x": 10.25, "y": 3},
+                {"matrix": [2, 3], "x": 11.25, "y": 3},
+                {"matrix": [3, 3], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [4, 3], "x": 14, "y": 3},
+
+                {"matrix": [8, 4], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [9, 4], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [10, 4], "x": 3.75, "y": 4, "w": 2.25},
+                {"matrix": [11, 4], "x": 6, "y": 4, "w": 1.25},
+                {"matrix": [12, 4], "x": 7.25, "y": 4, "w": 2.75},
+                {"matrix": [13, 4], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [14, 4], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [15, 4], "x": 12.5, "y": 4, "w": 1.25}
+            ]
+        },
+        "LAYOUT_iso": {
+            "layout": [
+                {"matrix": [8, 0], "x": 0, "y": 0},
+                {"matrix": [9, 0], "x": 1, "y": 0},
+                {"matrix": [10, 0], "x": 2, "y": 0},
+                {"matrix": [11, 0], "x": 3, "y": 0},
+                {"matrix": [12, 0], "x": 4, "y": 0},
+                {"matrix": [13, 0], "x": 5, "y": 0},
+                {"matrix": [14, 0], "x": 6, "y": 0},
+                {"matrix": [15, 0], "x": 7, "y": 0},
+                {"matrix": [0, 0], "x": 8, "y": 0},
+                {"matrix": [1, 0], "x": 9, "y": 0},
+                {"matrix": [2, 0], "x": 10, "y": 0},
+                {"matrix": [3, 0], "x": 11, "y": 0},
+                {"matrix": [4, 0], "x": 12, "y": 0},
+                {"matrix": [5, 0], "x": 13, "y": 0, "w": 2},
+
+                {"matrix": [8, 1], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [9, 1], "x": 1.5, "y": 1},
+                {"matrix": [10, 1], "x": 2.5, "y": 1},
+                {"matrix": [11, 1], "x": 3.5, "y": 1},
+                {"matrix": [12, 1], "x": 4.5, "y": 1},
+                {"matrix": [13, 1], "x": 5.5, "y": 1},
+                {"matrix": [14, 1], "x": 6.5, "y": 1},
+                {"matrix": [15, 1], "x": 7.5, "y": 1},
+                {"matrix": [0, 1], "x": 8.5, "y": 1},
+                {"matrix": [1, 1], "x": 9.5, "y": 1},
+                {"matrix": [2, 1], "x": 10.5, "y": 1},
+                {"matrix": [3, 1], "x": 11.5, "y": 1},
+                {"matrix": [4, 1], "x": 12.5, "y": 1},
+                {"matrix": [5, 1], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+                {"matrix": [8, 2], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [9, 2], "x": 1.75, "y": 2},
+                {"matrix": [10, 2], "x": 2.75, "y": 2},
+                {"matrix": [11, 2], "x": 3.75, "y": 2},
+                {"matrix": [12, 2], "x": 4.75, "y": 2},
+                {"matrix": [13, 2], "x": 5.75, "y": 2},
+                {"matrix": [14, 2], "x": 6.75, "y": 2},
+                {"matrix": [15, 2], "x": 7.75, "y": 2},
+                {"matrix": [0, 2], "x": 8.75, "y": 2},
+                {"matrix": [1, 2], "x": 9.75, "y": 2},
+                {"matrix": [2, 2], "x": 10.75, "y": 2},
+                {"matrix": [3, 2], "x": 11.75, "y": 2},
+                {"matrix": [4, 2], "x": 12.75, "y": 2},
+
+                {"matrix": [8, 3], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [9, 3], "x": 2.25, "y": 3},
+                {"matrix": [10, 3], "x": 3.25, "y": 3},
+                {"matrix": [11, 3], "x": 4.25, "y": 3},
+                {"matrix": [12, 3], "x": 5.25, "y": 3},
+                {"matrix": [13, 3], "x": 6.25, "y": 3},
+                {"matrix": [14, 3], "x": 7.25, "y": 3},
+                {"matrix": [15, 3], "x": 8.25, "y": 3},
+                {"matrix": [0, 3], "x": 9.25, "y": 3},
+                {"matrix": [1, 3], "x": 10.25, "y": 3},
+                {"matrix": [2, 3], "x": 11.25, "y": 3},
+                {"matrix": [3, 3], "x": 12.25, "y": 3, "w": 2.75},
+
+                {"matrix": [8, 4], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [9, 4], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [10, 4], "x": 3.75, "y": 4, "w": 2.25},
+                {"matrix": [11, 4], "x": 6, "y": 4, "w": 1.25},
+                {"matrix": [12, 4], "x": 7.25, "y": 4, "w": 2.75},
+                {"matrix": [13, 4], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [14, 4], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [15, 4], "x": 12.5, "y": 4, "w": 1.25}
+            ]
+        },
+        "LAYOUT_iso_split_rshift": {
+            "layout": [
+                {"matrix": [8, 0], "x": 0, "y": 0},
+                {"matrix": [9, 0], "x": 1, "y": 0},
+                {"matrix": [10, 0], "x": 2, "y": 0},
+                {"matrix": [11, 0], "x": 3, "y": 0},
+                {"matrix": [12, 0], "x": 4, "y": 0},
+                {"matrix": [13, 0], "x": 5, "y": 0},
+                {"matrix": [14, 0], "x": 6, "y": 0},
+                {"matrix": [15, 0], "x": 7, "y": 0},
+                {"matrix": [0, 0], "x": 8, "y": 0},
+                {"matrix": [1, 0], "x": 9, "y": 0},
+                {"matrix": [2, 0], "x": 10, "y": 0},
+                {"matrix": [3, 0], "x": 11, "y": 0},
+                {"matrix": [4, 0], "x": 12, "y": 0},
+                {"matrix": [5, 0], "x": 13, "y": 0, "w": 2},
+
+                {"matrix": [8, 1], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [9, 1], "x": 1.5, "y": 1},
+                {"matrix": [10, 1], "x": 2.5, "y": 1},
+                {"matrix": [11, 1], "x": 3.5, "y": 1},
+                {"matrix": [12, 1], "x": 4.5, "y": 1},
+                {"matrix": [13, 1], "x": 5.5, "y": 1},
+                {"matrix": [14, 1], "x": 6.5, "y": 1},
+                {"matrix": [15, 1], "x": 7.5, "y": 1},
+                {"matrix": [0, 1], "x": 8.5, "y": 1},
+                {"matrix": [1, 1], "x": 9.5, "y": 1},
+                {"matrix": [2, 1], "x": 10.5, "y": 1},
+                {"matrix": [3, 1], "x": 11.5, "y": 1},
+                {"matrix": [4, 1], "x": 12.5, "y": 1},
+                {"matrix": [5, 1], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+                {"matrix": [8, 2], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [9, 2], "x": 1.75, "y": 2},
+                {"matrix": [10, 2], "x": 2.75, "y": 2},
+                {"matrix": [11, 2], "x": 3.75, "y": 2},
+                {"matrix": [12, 2], "x": 4.75, "y": 2},
+                {"matrix": [13, 2], "x": 5.75, "y": 2},
+                {"matrix": [14, 2], "x": 6.75, "y": 2},
+                {"matrix": [15, 2], "x": 7.75, "y": 2},
+                {"matrix": [0, 2], "x": 8.75, "y": 2},
+                {"matrix": [1, 2], "x": 9.75, "y": 2},
+                {"matrix": [2, 2], "x": 10.75, "y": 2},
+                {"matrix": [3, 2], "x": 11.75, "y": 2},
+                {"matrix": [4, 2], "x": 12.75, "y": 2},
+
+                {"matrix": [8, 3], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [9, 3], "x": 2.25, "y": 3},
+                {"matrix": [10, 3], "x": 3.25, "y": 3},
+                {"matrix": [11, 3], "x": 4.25, "y": 3},
+                {"matrix": [12, 3], "x": 5.25, "y": 3},
+                {"matrix": [13, 3], "x": 6.25, "y": 3},
+                {"matrix": [14, 3], "x": 7.25, "y": 3},
+                {"matrix": [15, 3], "x": 8.25, "y": 3},
+                {"matrix": [0, 3], "x": 9.25, "y": 3},
+                {"matrix": [1, 3], "x": 10.25, "y": 3},
+                {"matrix": [2, 3], "x": 11.25, "y": 3},
+                {"matrix": [3, 3], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [4, 3], "x": 14, "y": 3},
+
+                {"matrix": [8, 4], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [9, 4], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [10, 4], "x": 3.75, "y": 4, "w": 2.25},
+                {"matrix": [11, 4], "x": 6, "y": 4, "w": 1.25},
+                {"matrix": [12, 4], "x": 7.25, "y": 4, "w": 2.75},
+                {"matrix": [13, 4], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [14, 4], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [15, 4], "x": 12.5, "y": 4, "w": 1.25}
+            ]
+        },
+        "LAYOUT_iso_split_bs": {
+            "layout": [
+                {"matrix": [8, 0], "x": 0, "y": 0},
+                {"matrix": [9, 0], "x": 1, "y": 0},
+                {"matrix": [10, 0], "x": 2, "y": 0},
+                {"matrix": [11, 0], "x": 3, "y": 0},
+                {"matrix": [12, 0], "x": 4, "y": 0},
+                {"matrix": [13, 0], "x": 5, "y": 0},
+                {"matrix": [14, 0], "x": 6, "y": 0},
+                {"matrix": [15, 0], "x": 7, "y": 0},
+                {"matrix": [0, 0], "x": 8, "y": 0},
+                {"matrix": [1, 0], "x": 9, "y": 0},
+                {"matrix": [2, 0], "x": 10, "y": 0},
+                {"matrix": [3, 0], "x": 11, "y": 0},
+                {"matrix": [4, 0], "x": 12, "y": 0},
+                {"matrix": [5, 0], "x": 13, "y": 0},
+                {"matrix": [6, 0], "x": 14, "y": 0},
+
+                {"matrix": [8, 1], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [9, 1], "x": 1.5, "y": 1},
+                {"matrix": [10, 1], "x": 2.5, "y": 1},
+                {"matrix": [11, 1], "x": 3.5, "y": 1},
+                {"matrix": [12, 1], "x": 4.5, "y": 1},
+                {"matrix": [13, 1], "x": 5.5, "y": 1},
+                {"matrix": [14, 1], "x": 6.5, "y": 1},
+                {"matrix": [15, 1], "x": 7.5, "y": 1},
+                {"matrix": [0, 1], "x": 8.5, "y": 1},
+                {"matrix": [1, 1], "x": 9.5, "y": 1},
+                {"matrix": [2, 1], "x": 10.5, "y": 1},
+                {"matrix": [3, 1], "x": 11.5, "y": 1},
+                {"matrix": [4, 1], "x": 12.5, "y": 1},
+                {"matrix": [5, 1], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+                {"matrix": [8, 2], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [9, 2], "x": 1.75, "y": 2},
+                {"matrix": [10, 2], "x": 2.75, "y": 2},
+                {"matrix": [11, 2], "x": 3.75, "y": 2},
+                {"matrix": [12, 2], "x": 4.75, "y": 2},
+                {"matrix": [13, 2], "x": 5.75, "y": 2},
+                {"matrix": [14, 2], "x": 6.75, "y": 2},
+                {"matrix": [15, 2], "x": 7.75, "y": 2},
+                {"matrix": [0, 2], "x": 8.75, "y": 2},
+                {"matrix": [1, 2], "x": 9.75, "y": 2},
+                {"matrix": [2, 2], "x": 10.75, "y": 2},
+                {"matrix": [3, 2], "x": 11.75, "y": 2},
+                {"matrix": [4, 2], "x": 12.75, "y": 2},
+
+                {"matrix": [8, 3], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [9, 3], "x": 2.25, "y": 3},
+                {"matrix": [10, 3], "x": 3.25, "y": 3},
+                {"matrix": [11, 3], "x": 4.25, "y": 3},
+                {"matrix": [12, 3], "x": 5.25, "y": 3},
+                {"matrix": [13, 3], "x": 6.25, "y": 3},
+                {"matrix": [14, 3], "x": 7.25, "y": 3},
+                {"matrix": [15, 3], "x": 8.25, "y": 3},
+                {"matrix": [0, 3], "x": 9.25, "y": 3},
+                {"matrix": [1, 3], "x": 10.25, "y": 3},
+                {"matrix": [2, 3], "x": 11.25, "y": 3},
+                {"matrix": [3, 3], "x": 12.25, "y": 3, "w": 2.75},
+
+                {"matrix": [8, 4], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [9, 4], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [10, 4], "x": 3.75, "y": 4, "w": 2.25},
+                {"matrix": [11, 4], "x": 6, "y": 4, "w": 1.25},
+                {"matrix": [12, 4], "x": 7.25, "y": 4, "w": 2.75},
+                {"matrix": [13, 4], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [14, 4], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [15, 4], "x": 12.5, "y": 4, "w": 1.25}
+            ]
+        },
+        "LAYOUT_iso_split_bs_rshift": {
+            "layout": [
+                {"matrix": [8, 0], "x": 0, "y": 0},
+                {"matrix": [9, 0], "x": 1, "y": 0},
+                {"matrix": [10, 0], "x": 2, "y": 0},
+                {"matrix": [11, 0], "x": 3, "y": 0},
+                {"matrix": [12, 0], "x": 4, "y": 0},
+                {"matrix": [13, 0], "x": 5, "y": 0},
+                {"matrix": [14, 0], "x": 6, "y": 0},
+                {"matrix": [15, 0], "x": 7, "y": 0},
+                {"matrix": [0, 0], "x": 8, "y": 0},
+                {"matrix": [1, 0], "x": 9, "y": 0},
+                {"matrix": [2, 0], "x": 10, "y": 0},
+                {"matrix": [3, 0], "x": 11, "y": 0},
+                {"matrix": [4, 0], "x": 12, "y": 0},
+                {"matrix": [5, 0], "x": 13, "y": 0},
+                {"matrix": [6, 0], "x": 14, "y": 0},
+
+                {"matrix": [8, 1], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [9, 1], "x": 1.5, "y": 1},
+                {"matrix": [10, 1], "x": 2.5, "y": 1},
+                {"matrix": [11, 1], "x": 3.5, "y": 1},
+                {"matrix": [12, 1], "x": 4.5, "y": 1},
+                {"matrix": [13, 1], "x": 5.5, "y": 1},
+                {"matrix": [14, 1], "x": 6.5, "y": 1},
+                {"matrix": [15, 1], "x": 7.5, "y": 1},
+                {"matrix": [0, 1], "x": 8.5, "y": 1},
+                {"matrix": [1, 1], "x": 9.5, "y": 1},
+                {"matrix": [2, 1], "x": 10.5, "y": 1},
+                {"matrix": [3, 1], "x": 11.5, "y": 1},
+                {"matrix": [4, 1], "x": 12.5, "y": 1},
+                {"matrix": [5, 1], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+                {"matrix": [8, 2], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [9, 2], "x": 1.75, "y": 2},
+                {"matrix": [10, 2], "x": 2.75, "y": 2},
+                {"matrix": [11, 2], "x": 3.75, "y": 2},
+                {"matrix": [12, 2], "x": 4.75, "y": 2},
+                {"matrix": [13, 2], "x": 5.75, "y": 2},
+                {"matrix": [14, 2], "x": 6.75, "y": 2},
+                {"matrix": [15, 2], "x": 7.75, "y": 2},
+                {"matrix": [0, 2], "x": 8.75, "y": 2},
+                {"matrix": [1, 2], "x": 9.75, "y": 2},
+                {"matrix": [2, 2], "x": 10.75, "y": 2},
+                {"matrix": [3, 2], "x": 11.75, "y": 2},
+                {"matrix": [4, 2], "x": 12.75, "y": 2},
+
+                {"matrix": [8, 3], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [9, 3], "x": 2.25, "y": 3},
+                {"matrix": [10, 3], "x": 3.25, "y": 3},
+                {"matrix": [11, 3], "x": 4.25, "y": 3},
+                {"matrix": [12, 3], "x": 5.25, "y": 3},
+                {"matrix": [13, 3], "x": 6.25, "y": 3},
+                {"matrix": [14, 3], "x": 7.25, "y": 3},
+                {"matrix": [15, 3], "x": 8.25, "y": 3},
+                {"matrix": [0, 3], "x": 9.25, "y": 3},
+                {"matrix": [1, 3], "x": 10.25, "y": 3},
+                {"matrix": [2, 3], "x": 11.25, "y": 3},
+                {"matrix": [3, 3], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [4, 3], "x": 14, "y": 3},
+
+                {"matrix": [8, 4], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [9, 4], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [10, 4], "x": 3.75, "y": 4, "w": 2.25},
+                {"matrix": [11, 4], "x": 6, "y": 4, "w": 1.25},
+                {"matrix": [12, 4], "x": 7.25, "y": 4, "w": 2.75},
+                {"matrix": [13, 4], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [14, 4], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [15, 4], "x": 12.5, "y": 4, "w": 1.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/kakunpc/choc_taro/rules.mk b/keyboards/kakunpc/choc_taro/rules.mk
index 46d6848acef..30ce5d293b7 100644
--- a/keyboards/kakunpc/choc_taro/rules.mk
+++ b/keyboards/kakunpc/choc_taro/rules.mk
@@ -1,15 +1,2 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = yes        # Console for debug
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
 CUSTOM_MATRIX = lite
 SRC += matrix.c
diff --git a/keyboards/kakunpc/suihankey/alpha/info.json b/keyboards/kakunpc/suihankey/alpha/info.json
deleted file mode 100644
index fb9249ab837..00000000000
--- a/keyboards/kakunpc/suihankey/alpha/info.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "keyboard_name": "Suihankey",
-    "manufacturer": "kakunpc",
-    "url": "https://kakunpc.booth.pm/",
-    "maintainer": "kakunpc",
-    "usb": {
-        "vid": "0xFEED",
-        "pid": "0x0000",
-        "device_version": "0.0.1"
-    },
-    "rgblight": {
-        "saturation_steps": 8,
-        "brightness_steps": 8,
-        "led_count": 18,
-        "sleep": true,
-        "animations": {
-            "breathing": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "snake": true,
-            "knight": true,
-            "christmas": true,
-            "static_gradient": true,
-            "rgb_test": true,
-            "alternating": true,
-            "twinkle": true
-        }
-    },
-    "ws2812": {
-        "pin": "D3"
-    },
-    "matrix_pins": {
-        "cols": ["D4", "C6", "D7", "E6", "B4"],
-        "rows": ["F4", "F5", "F6", "F7"]
-    },
-    "diode_direction": "COL2ROW",
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0.375},
-                {"matrix": [0, 1], "x": 1, "y": 0.125},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0.125},
-                {"matrix": [0, 4], "x": 4, "y": 0.25},
-
-                {"matrix": [1, 0], "x": 0, "y": 1.375},
-                {"matrix": [1, 1], "x": 1, "y": 1.125},
-                {"matrix": [1, 2], "x": 2, "y": 1},
-                {"matrix": [1, 3], "x": 3, "y": 1.125},
-                {"matrix": [1, 4], "x": 4, "y": 1.25},
-
-                {"matrix": [2, 0], "x": 0, "y": 2.375},
-                {"matrix": [2, 1], "x": 1, "y": 2.125},
-                {"matrix": [2, 2], "x": 2, "y": 2},
-                {"matrix": [2, 3], "x": 3, "y": 2.125},
-                {"matrix": [2, 4], "x": 4, "y": 2.25},
-
-                {"matrix": [3, 0], "x": 3.4, "y": 3.25},
-                {"matrix": [3, 1], "x": 4.4, "y": 3.55},
-                {"matrix": [3, 2], "x": 5.4, "y": 3.85}
-            ]
-        }
-    }
-}
diff --git a/keyboards/kakunpc/suihankey/alpha/keyboard.json b/keyboards/kakunpc/suihankey/alpha/keyboard.json
new file mode 100644
index 00000000000..f76c56d746d
--- /dev/null
+++ b/keyboards/kakunpc/suihankey/alpha/keyboard.json
@@ -0,0 +1,73 @@
+{
+    "keyboard_name": "Suihankey",
+    "manufacturer": "kakunpc",
+    "url": "https://kakunpc.booth.pm/",
+    "maintainer": "kakunpc",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0x0000",
+        "device_version": "0.0.1"
+    },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 18,
+        "sleep": true,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": true,
+            "twinkle": true
+        }
+    },
+    "ws2812": {
+        "pin": "D3"
+    },
+    "matrix_pins": {
+        "cols": ["D4", "C6", "D7", "E6", "B4"],
+        "rows": ["F4", "F5", "F6", "F7"]
+    },
+    "diode_direction": "COL2ROW",
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": false,
+        "extrakey": false,
+        "rgblight": true,
+        "oled": true
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0.375},
+                {"matrix": [0, 1], "x": 1, "y": 0.125},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0.125},
+                {"matrix": [0, 4], "x": 4, "y": 0.25},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.375},
+                {"matrix": [1, 1], "x": 1, "y": 1.125},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1.125},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.375},
+                {"matrix": [2, 1], "x": 1, "y": 2.125},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2.125},
+                {"matrix": [2, 4], "x": 4, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 3.4, "y": 3.25},
+                {"matrix": [3, 1], "x": 4.4, "y": 3.55},
+                {"matrix": [3, 2], "x": 5.4, "y": 3.85}
+            ]
+        }
+    }
+}
diff --git a/keyboards/kakunpc/suihankey/alpha/rules.mk b/keyboards/kakunpc/suihankey/alpha/rules.mk
deleted file mode 100644
index 1e3cebb1451..00000000000
--- a/keyboards/kakunpc/suihankey/alpha/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-RGBLIGHT_ENABLE = yes
diff --git a/keyboards/kakunpc/suihankey/rev1/info.json b/keyboards/kakunpc/suihankey/rev1/info.json
deleted file mode 100644
index 37215632cf4..00000000000
--- a/keyboards/kakunpc/suihankey/rev1/info.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "keyboard_name": "Suihankey",
-    "manufacturer": "kakunpc",
-    "url": "https://kakunpc.booth.pm/",
-    "maintainer": "kakunpc",
-    "usb": {
-        "vid": "0xFEED",
-        "pid": "0x0000",
-        "device_version": "0.0.1"
-    },
-    "rgblight": {
-        "saturation_steps": 8,
-        "brightness_steps": 8,
-        "led_count": 18,
-        "sleep": true,
-        "animations": {
-            "breathing": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "snake": true,
-            "knight": true,
-            "christmas": true,
-            "static_gradient": true,
-            "rgb_test": true,
-            "alternating": true,
-            "twinkle": true
-        }
-    },
-    "ws2812": {
-        "pin": "D3"
-    },
-    "matrix_pins": {
-        "cols": ["F4", "F5", "F6", "F7"],
-        "rows": ["D4", "C6", "D7", "E6", "B4"]
-    },
-    "diode_direction": "COL2ROW",
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0.375},
-                {"matrix": [1, 0], "x": 1, "y": 0.125},
-                {"matrix": [2, 0], "x": 2, "y": 0},
-                {"matrix": [3, 0], "x": 3, "y": 0.125},
-                {"matrix": [4, 0], "x": 4, "y": 0.25},
-
-                {"matrix": [0, 1], "x": 0, "y": 1.375},
-                {"matrix": [1, 1], "x": 1, "y": 1.125},
-                {"matrix": [2, 1], "x": 2, "y": 1},
-                {"matrix": [3, 1], "x": 3, "y": 1.125},
-                {"matrix": [4, 1], "x": 4, "y": 1.25},
-
-                {"matrix": [0, 2], "x": 0, "y": 2.375},
-                {"matrix": [1, 2], "x": 1, "y": 2.125},
-                {"matrix": [2, 2], "x": 2, "y": 2},
-                {"matrix": [3, 2], "x": 3, "y": 2.125},
-                {"matrix": [4, 2], "x": 4, "y": 2.25},
-
-                {"matrix": [0, 3], "x": 3.4, "y": 3.25},
-                {"matrix": [1, 3], "x": 4.4, "y": 3.55},
-                {"matrix": [2, 3], "x": 5.4, "y": 3.85}
-            ]
-        }
-    }
-}
diff --git a/keyboards/kakunpc/suihankey/rev1/keyboard.json b/keyboards/kakunpc/suihankey/rev1/keyboard.json
new file mode 100644
index 00000000000..0e801b1963b
--- /dev/null
+++ b/keyboards/kakunpc/suihankey/rev1/keyboard.json
@@ -0,0 +1,73 @@
+{
+    "keyboard_name": "Suihankey",
+    "manufacturer": "kakunpc",
+    "url": "https://kakunpc.booth.pm/",
+    "maintainer": "kakunpc",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0x0000",
+        "device_version": "0.0.1"
+    },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 18,
+        "sleep": true,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": true,
+            "twinkle": true
+        }
+    },
+    "ws2812": {
+        "pin": "D3"
+    },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "F6", "F7"],
+        "rows": ["D4", "C6", "D7", "E6", "B4"]
+    },
+    "diode_direction": "COL2ROW",
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": false,
+        "extrakey": false,
+        "rgblight": true,
+        "oled": true
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0.375},
+                {"matrix": [1, 0], "x": 1, "y": 0.125},
+                {"matrix": [2, 0], "x": 2, "y": 0},
+                {"matrix": [3, 0], "x": 3, "y": 0.125},
+                {"matrix": [4, 0], "x": 4, "y": 0.25},
+
+                {"matrix": [0, 1], "x": 0, "y": 1.375},
+                {"matrix": [1, 1], "x": 1, "y": 1.125},
+                {"matrix": [2, 1], "x": 2, "y": 1},
+                {"matrix": [3, 1], "x": 3, "y": 1.125},
+                {"matrix": [4, 1], "x": 4, "y": 1.25},
+
+                {"matrix": [0, 2], "x": 0, "y": 2.375},
+                {"matrix": [1, 2], "x": 1, "y": 2.125},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [3, 2], "x": 3, "y": 2.125},
+                {"matrix": [4, 2], "x": 4, "y": 2.25},
+
+                {"matrix": [0, 3], "x": 3.4, "y": 3.25},
+                {"matrix": [1, 3], "x": 4.4, "y": 3.55},
+                {"matrix": [2, 3], "x": 5.4, "y": 3.85}
+            ]
+        }
+    }
+}
diff --git a/keyboards/kakunpc/suihankey/rev1/rules.mk b/keyboards/kakunpc/suihankey/rev1/rules.mk
deleted file mode 100644
index 1e3cebb1451..00000000000
--- a/keyboards/kakunpc/suihankey/rev1/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-RGBLIGHT_ENABLE = yes
diff --git a/keyboards/kakunpc/suihankey/rules.mk b/keyboards/kakunpc/suihankey/rules.mk
index f777eaf8613..46a0114bd57 100644
--- a/keyboards/kakunpc/suihankey/rules.mk
+++ b/keyboards/kakunpc/suihankey/rules.mk
@@ -1,15 +1 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no       # Mouse keys
-EXTRAKEY_ENABLE = no       # Audio control and System control
-CONSOLE_ENABLE = no        # Console for debug
-COMMAND_ENABLE = no        # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-OLED_ENABLE = yes
-
 DEFAULT_FOLDER = kakunpc/suihankey/rev1
diff --git a/keyboards/kakunpc/suihankey/split/alpha/info.json b/keyboards/kakunpc/suihankey/split/alpha/info.json
deleted file mode 100644
index fb7a619d0e1..00000000000
--- a/keyboards/kakunpc/suihankey/split/alpha/info.json
+++ /dev/null
@@ -1,68 +0,0 @@
-{
-    "rgblight": {
-        "saturation_steps": 8,
-        "brightness_steps": 8,
-        "led_count": 18,
-        "sleep": true
-    },
-    "ws2812": {
-        "pin": "D3"
-    },
-    "matrix_pins": {
-        "cols": ["D4", "C6", "D7", "E6", "B4"],
-        "rows": ["F4", "F5", "F6", "F7"]
-    },
-    "diode_direction": "COL2ROW",
-    "layout_aliases": {
-        "LAYOUT": "LAYOUT_split_3x5_3"
-    },
-    "layouts": {
-        "LAYOUT_split_3x5_3": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0.375},
-                {"matrix": [0, 1], "x": 1, "y": 0.125},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0.125},
-                {"matrix": [0, 4], "x": 4, "y": 0.25},
-
-                {"matrix": [4, 4], "x": 8.2, "y": 0.25},
-                {"matrix": [4, 3], "x": 9.2, "y": 0.125},
-                {"matrix": [4, 2], "x": 10.2, "y": 0},
-                {"matrix": [4, 1], "x": 11.2, "y": 0.125},
-                {"matrix": [4, 0], "x": 12.2, "y": 0.375},
-
-                {"matrix": [1, 0], "x": 0, "y": 1.375},
-                {"matrix": [1, 1], "x": 1, "y": 1.125},
-                {"matrix": [1, 2], "x": 2, "y": 1},
-                {"matrix": [1, 3], "x": 3, "y": 1.125},
-                {"matrix": [1, 4], "x": 4, "y": 1.25},
-
-                {"matrix": [5, 4], "x": 8.2, "y": 1.25},
-                {"matrix": [5, 3], "x": 9.2, "y": 1.125},
-                {"matrix": [5, 2], "x": 10.2, "y": 1},
-                {"matrix": [5, 1], "x": 11.2, "y": 1.125},
-                {"matrix": [5, 0], "x": 12.2, "y": 1.375},
-
-                {"matrix": [2, 0], "x": 0, "y": 2.375},
-                {"matrix": [2, 1], "x": 1, "y": 2.125},
-                {"matrix": [2, 2], "x": 2, "y": 2},
-                {"matrix": [2, 3], "x": 3, "y": 2.125},
-                {"matrix": [2, 4], "x": 4, "y": 2.25},
-
-                {"matrix": [6, 4], "x": 8.2, "y": 2.25},
-                {"matrix": [6, 3], "x": 9.2, "y": 2.125},
-                {"matrix": [6, 2], "x": 10.2, "y": 2},
-                {"matrix": [6, 1], "x": 11.2, "y": 2.125},
-                {"matrix": [6, 0], "x": 12.2, "y": 2.375},
-
-                {"matrix": [3, 0], "x": 3.4, "y": 3.25},
-                {"matrix": [3, 1], "x": 4.4, "y": 3.55},
-                {"matrix": [3, 2], "x": 5.4, "y": 3.85},
-
-                {"matrix": [7, 2], "x": 6.8, "y": 3.85},
-                {"matrix": [7, 1], "x": 7.8, "y": 3.55},
-                {"matrix": [7, 0], "x": 8.8, "y": 3.25}
-            ]
-        }
-    }
-}
diff --git a/keyboards/kakunpc/suihankey/split/alpha/keyboard.json b/keyboards/kakunpc/suihankey/split/alpha/keyboard.json
new file mode 100644
index 00000000000..956ee3357c7
--- /dev/null
+++ b/keyboards/kakunpc/suihankey/split/alpha/keyboard.json
@@ -0,0 +1,74 @@
+{
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 18,
+        "sleep": true
+    },
+    "ws2812": {
+        "pin": "D3"
+    },
+    "matrix_pins": {
+        "cols": ["D4", "C6", "D7", "E6", "B4"],
+        "rows": ["F4", "F5", "F6", "F7"]
+    },
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "mousekey": false,
+        "extrakey": false,
+        "rgblight": true
+    },
+    "layout_aliases": {
+        "LAYOUT": "LAYOUT_split_3x5_3"
+    },
+    "layouts": {
+        "LAYOUT_split_3x5_3": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0.375},
+                {"matrix": [0, 1], "x": 1, "y": 0.125},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0.125},
+                {"matrix": [0, 4], "x": 4, "y": 0.25},
+
+                {"matrix": [4, 4], "x": 8.2, "y": 0.25},
+                {"matrix": [4, 3], "x": 9.2, "y": 0.125},
+                {"matrix": [4, 2], "x": 10.2, "y": 0},
+                {"matrix": [4, 1], "x": 11.2, "y": 0.125},
+                {"matrix": [4, 0], "x": 12.2, "y": 0.375},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.375},
+                {"matrix": [1, 1], "x": 1, "y": 1.125},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1.125},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+
+                {"matrix": [5, 4], "x": 8.2, "y": 1.25},
+                {"matrix": [5, 3], "x": 9.2, "y": 1.125},
+                {"matrix": [5, 2], "x": 10.2, "y": 1},
+                {"matrix": [5, 1], "x": 11.2, "y": 1.125},
+                {"matrix": [5, 0], "x": 12.2, "y": 1.375},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.375},
+                {"matrix": [2, 1], "x": 1, "y": 2.125},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2.125},
+                {"matrix": [2, 4], "x": 4, "y": 2.25},
+
+                {"matrix": [6, 4], "x": 8.2, "y": 2.25},
+                {"matrix": [6, 3], "x": 9.2, "y": 2.125},
+                {"matrix": [6, 2], "x": 10.2, "y": 2},
+                {"matrix": [6, 1], "x": 11.2, "y": 2.125},
+                {"matrix": [6, 0], "x": 12.2, "y": 2.375},
+
+                {"matrix": [3, 0], "x": 3.4, "y": 3.25},
+                {"matrix": [3, 1], "x": 4.4, "y": 3.55},
+                {"matrix": [3, 2], "x": 5.4, "y": 3.85},
+
+                {"matrix": [7, 2], "x": 6.8, "y": 3.85},
+                {"matrix": [7, 1], "x": 7.8, "y": 3.55},
+                {"matrix": [7, 0], "x": 8.8, "y": 3.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/kakunpc/suihankey/split/alpha/rules.mk b/keyboards/kakunpc/suihankey/split/alpha/rules.mk
deleted file mode 100644
index 1e3cebb1451..00000000000
--- a/keyboards/kakunpc/suihankey/split/alpha/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-RGBLIGHT_ENABLE = yes
diff --git a/keyboards/kakunpc/suihankey/split/rev1/info.json b/keyboards/kakunpc/suihankey/split/rev1/info.json
deleted file mode 100644
index 4410ad5bb10..00000000000
--- a/keyboards/kakunpc/suihankey/split/rev1/info.json
+++ /dev/null
@@ -1,80 +0,0 @@
-{
-    "rgblight": {
-        "saturation_steps": 8,
-        "brightness_steps": 8,
-        "led_count": 18,
-        "sleep": true,
-        "animations": {
-            "breathing": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "snake": true,
-            "knight": true,
-            "christmas": true,
-            "static_gradient": true,
-            "rgb_test": true,
-            "alternating": true,
-            "twinkle": true
-        }
-    },
-    "ws2812": {
-        "pin": "D3"
-    },
-    "matrix_pins": {
-        "cols": ["F4", "F5", "F6", "F7"],
-        "rows": ["D4", "C6", "D7", "E6", "B4"]
-    },
-    "diode_direction": "COL2ROW",
-    "layout_aliases": {
-        "LAYOUT": "LAYOUT_split_3x5_3"
-    },
-    "layouts": {
-        "LAYOUT_split_3x5_3": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0.375},
-                {"matrix": [1, 0], "x": 1, "y": 0.125},
-                {"matrix": [2, 0], "x": 2, "y": 0},
-                {"matrix": [3, 0], "x": 3, "y": 0.125},
-                {"matrix": [4, 0], "x": 4, "y": 0.25},
-
-                {"matrix": [9, 0], "x": 8.2, "y": 0.25},
-                {"matrix": [8, 0], "x": 9.2, "y": 0.125},
-                {"matrix": [7, 0], "x": 10.2, "y": 0},
-                {"matrix": [6, 0], "x": 11.2, "y": 0.125},
-                {"matrix": [5, 0], "x": 12.2, "y": 0.375},
-
-                {"matrix": [0, 1], "x": 0, "y": 1.375},
-                {"matrix": [1, 1], "x": 1, "y": 1.125},
-                {"matrix": [2, 1], "x": 2, "y": 1},
-                {"matrix": [3, 1], "x": 3, "y": 1.125},
-                {"matrix": [4, 1], "x": 4, "y": 1.25},
-
-                {"matrix": [9, 1], "x": 8.2, "y": 1.25},
-                {"matrix": [8, 1], "x": 9.2, "y": 1.125},
-                {"matrix": [7, 1], "x": 10.2, "y": 1},
-                {"matrix": [6, 1], "x": 11.2, "y": 1.125},
-                {"matrix": [5, 1], "x": 12.2, "y": 1.375},
-
-                {"matrix": [0, 2], "x": 0, "y": 2.375},
-                {"matrix": [1, 2], "x": 1, "y": 2.125},
-                {"matrix": [2, 2], "x": 2, "y": 2},
-                {"matrix": [3, 2], "x": 3, "y": 2.125},
-                {"matrix": [4, 2], "x": 4, "y": 2.25},
-
-                {"matrix": [9, 2], "x": 8.2, "y": 2.25},
-                {"matrix": [8, 2], "x": 9.2, "y": 2.125},
-                {"matrix": [7, 2], "x": 10.2, "y": 2},
-                {"matrix": [6, 2], "x": 11.2, "y": 2.125},
-                {"matrix": [5, 2], "x": 12.2, "y": 2.375},
-
-                {"matrix": [0, 3], "x": 3.4, "y": 3.25},
-                {"matrix": [1, 3], "x": 4.4, "y": 3.55},
-                {"matrix": [2, 3], "x": 5.4, "y": 3.85},
-
-                {"matrix": [7, 3], "x": 6.8, "y": 3.85},
-                {"matrix": [6, 3], "x": 7.8, "y": 3.55},
-                {"matrix": [5, 3], "x": 8.8, "y": 3.25}
-            ]
-        }
-    }
-}
diff --git a/keyboards/kakunpc/suihankey/split/rev1/keyboard.json b/keyboards/kakunpc/suihankey/split/rev1/keyboard.json
new file mode 100644
index 00000000000..0640e4e26a0
--- /dev/null
+++ b/keyboards/kakunpc/suihankey/split/rev1/keyboard.json
@@ -0,0 +1,86 @@
+{
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 18,
+        "sleep": true,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": true,
+            "twinkle": true
+        }
+    },
+    "ws2812": {
+        "pin": "D3"
+    },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "F6", "F7"],
+        "rows": ["D4", "C6", "D7", "E6", "B4"]
+    },
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "mousekey": false,
+        "extrakey": false,
+        "rgblight": true
+    },
+    "layout_aliases": {
+        "LAYOUT": "LAYOUT_split_3x5_3"
+    },
+    "layouts": {
+        "LAYOUT_split_3x5_3": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0.375},
+                {"matrix": [1, 0], "x": 1, "y": 0.125},
+                {"matrix": [2, 0], "x": 2, "y": 0},
+                {"matrix": [3, 0], "x": 3, "y": 0.125},
+                {"matrix": [4, 0], "x": 4, "y": 0.25},
+
+                {"matrix": [9, 0], "x": 8.2, "y": 0.25},
+                {"matrix": [8, 0], "x": 9.2, "y": 0.125},
+                {"matrix": [7, 0], "x": 10.2, "y": 0},
+                {"matrix": [6, 0], "x": 11.2, "y": 0.125},
+                {"matrix": [5, 0], "x": 12.2, "y": 0.375},
+
+                {"matrix": [0, 1], "x": 0, "y": 1.375},
+                {"matrix": [1, 1], "x": 1, "y": 1.125},
+                {"matrix": [2, 1], "x": 2, "y": 1},
+                {"matrix": [3, 1], "x": 3, "y": 1.125},
+                {"matrix": [4, 1], "x": 4, "y": 1.25},
+
+                {"matrix": [9, 1], "x": 8.2, "y": 1.25},
+                {"matrix": [8, 1], "x": 9.2, "y": 1.125},
+                {"matrix": [7, 1], "x": 10.2, "y": 1},
+                {"matrix": [6, 1], "x": 11.2, "y": 1.125},
+                {"matrix": [5, 1], "x": 12.2, "y": 1.375},
+
+                {"matrix": [0, 2], "x": 0, "y": 2.375},
+                {"matrix": [1, 2], "x": 1, "y": 2.125},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [3, 2], "x": 3, "y": 2.125},
+                {"matrix": [4, 2], "x": 4, "y": 2.25},
+
+                {"matrix": [9, 2], "x": 8.2, "y": 2.25},
+                {"matrix": [8, 2], "x": 9.2, "y": 2.125},
+                {"matrix": [7, 2], "x": 10.2, "y": 2},
+                {"matrix": [6, 2], "x": 11.2, "y": 2.125},
+                {"matrix": [5, 2], "x": 12.2, "y": 2.375},
+
+                {"matrix": [0, 3], "x": 3.4, "y": 3.25},
+                {"matrix": [1, 3], "x": 4.4, "y": 3.55},
+                {"matrix": [2, 3], "x": 5.4, "y": 3.85},
+
+                {"matrix": [7, 3], "x": 6.8, "y": 3.85},
+                {"matrix": [6, 3], "x": 7.8, "y": 3.55},
+                {"matrix": [5, 3], "x": 8.8, "y": 3.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/kakunpc/suihankey/split/rev1/rules.mk b/keyboards/kakunpc/suihankey/split/rev1/rules.mk
deleted file mode 100644
index 1e3cebb1451..00000000000
--- a/keyboards/kakunpc/suihankey/split/rev1/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-RGBLIGHT_ENABLE = yes
diff --git a/keyboards/kakunpc/suihankey/split/rules.mk b/keyboards/kakunpc/suihankey/split/rules.mk
index 08f9eb20bd9..1dc7b014f02 100644
--- a/keyboards/kakunpc/suihankey/split/rules.mk
+++ b/keyboards/kakunpc/suihankey/split/rules.mk
@@ -1,3 +1 @@
-OLED_ENABLE = no
-
 DEFAULT_FOLDER = kakunpc/suihankey/split/rev1
diff --git a/keyboards/kakunpc/thedogkeyboard/info.json b/keyboards/kakunpc/thedogkeyboard/info.json
deleted file mode 100644
index 79ed132f68c..00000000000
--- a/keyboards/kakunpc/thedogkeyboard/info.json
+++ /dev/null
@@ -1,287 +0,0 @@
-{
-    "keyboard_name": "TheDogKeyboard",
-    "manufacturer": "kakunpc",
-    "url": "https://kakunpc.booth.pm/",
-    "maintainer": "kakunpc",
-    "usb": {
-        "vid": "0xFEED",
-        "pid": "0x0000",
-        "device_version": "0.0.1"
-    },
-    "ws2812": {
-        "pin": "D3"
-    },
-    "rgblight": {
-        "saturation_steps": 8,
-        "brightness_steps": 8,
-        "led_count": 111,
-        "max_brightness": 50,
-        "sleep": true
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "community_layouts": [
-        "fullsize_ansi"
-    ],
-    "layouts": {
-        "LAYOUT_all": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-                 
-                {"label": "F1", "matrix": [1, 0], "x": 2, "y": 0},
-                {"label": "F2", "matrix": [2, 0], "x": 3, "y": 0},
-                {"label": "F3", "matrix": [3, 0], "x": 4, "y": 0},
-                {"label": "F4", "matrix": [4, 0], "x": 5, "y": 0},
-                 
-                {"label": "F5", "matrix": [5, 0], "x": 6.5, "y": 0},
-                {"label": "F6", "matrix": [6, 0], "x": 7.5, "y": 0},
-                {"label": "F7", "matrix": [7, 0], "x": 8.5, "y": 0},
-                {"label": "F8", "matrix": [8, 0], "x": 9.5, "y": 0},
-                 
-                {"label": "F9", "matrix": [9, 0], "x": 11, "y": 0},
-                {"label": "F10", "matrix": [10, 0], "x": 12, "y": 0},
-                {"label": "F11", "matrix": [11, 0], "x": 13, "y": 0},
-                {"label": "F12", "matrix": [12, 0], "x": 14, "y": 0},
-                 
-                {"label": "Print Screen", "matrix": [13, 0], "x": 15.25, "y": 0},
-                {"label": "Scroll Lock", "matrix": [14, 0], "x": 16.25, "y": 0},
-                {"label": "Pause", "matrix": [15, 0], "x": 17.25, "y": 0},
-                                               
-                {"label": "`", "matrix": [0, 1], "x": 0, "y": 1.5},
-                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.5},
-                {"label": "2", "matrix": [2, 1], "x": 2, "y": 1.5},
-                {"label": "3", "matrix": [3, 1], "x": 3, "y": 1.5},
-                {"label": "4", "matrix": [4, 1], "x": 4, "y": 1.5},
-                {"label": "5", "matrix": [5, 1], "x": 5, "y": 1.5},
-                {"label": "6", "matrix": [6, 1], "x": 6, "y": 1.5},
-                {"label": "7", "matrix": [7, 1], "x": 7, "y": 1.5},
-                {"label": "8", "matrix": [8, 1], "x": 8, "y": 1.5},
-                {"label": "9", "matrix": [9, 1], "x": 9, "y": 1.5},
-                {"label": "0", "matrix": [10, 1], "x": 10, "y": 1.5},
-                {"label": "-", "matrix": [11, 1], "x": 11, "y": 1.5},
-                {"label": "=", "matrix": [12, 1], "x": 12, "y": 1.5},
-                {"label": "Backspace", "matrix": [13, 1], "x": 13, "y": 1.5, "w": 2},
-                 
-                {"label": "Insert", "matrix": [14, 1], "x": 15.25, "y": 1.5},
-                {"label": "Home", "matrix": [15, 2], "x": 16.25, "y": 1.5},
-                {"label": "Page Up", "matrix": [15, 1], "x": 17.25, "y": 1.5},
-                 
-                {"label": "Num Lock", "matrix": [16, 0], "x": 18.5, "y": 1.5},
-                {"label": "/", "matrix": [17, 0], "x": 19.5, "y": 1.5},
-                {"label": "*", "matrix": [18, 0], "x": 20.5, "y": 1.5},
-                {"label": "-", "matrix": [19, 0], "x": 21.5, "y": 1.5},
-                                               
-                {"label": "Tab", "matrix": [0, 2], "x": 0, "y": 2.5, "w": 1.5},
-                {"label": "Q", "matrix": [1, 2], "x": 1.5, "y": 2.5},
-                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.5},
-                {"label": "E", "matrix": [3, 2], "x": 3.5, "y": 2.5},
-                {"label": "R", "matrix": [4, 2], "x": 4.5, "y": 2.5},
-                {"label": "T", "matrix": [5, 2], "x": 5.5, "y": 2.5},
-                {"label": "Y", "matrix": [6, 2], "x": 6.5, "y": 2.5},
-                {"label": "U", "matrix": [7, 2], "x": 7.5, "y": 2.5},
-                {"label": "I", "matrix": [8, 2], "x": 8.5, "y": 2.5},
-                {"label": "O", "matrix": [9, 2], "x": 9.5, "y": 2.5},
-                {"label": "P", "matrix": [10, 2], "x": 10.5, "y": 2.5},
-                {"label": "[", "matrix": [11, 2], "x": 11.5, "y": 2.5},
-                {"label": "]", "matrix": [12, 2], "x": 12.5, "y": 2.5},
-                {"label": "\\", "matrix": [13, 2], "x": 13.5, "y": 2.5, "w": 1.5},
-                 
-                {"label": "Delete", "matrix": [14, 2], "x": 15.25, "y": 2.5},
-                {"label": "End", "matrix": [15, 4], "x": 16.25, "y": 2.5},
-                {"label": "Page Down", "matrix": [15, 3], "x": 17.25, "y": 2.5},
-                 
-                {"label": "7", "matrix": [16, 1], "x": 18.5, "y": 2.5},
-                {"label": "8", "matrix": [17, 1], "x": 19.5, "y": 2.5},
-                {"label": "9", "matrix": [18, 1], "x": 20.5, "y": 2.5},
-                {"label": "+", "matrix": [19, 1], "x": 21.5, "y": 2.5},
-                                               
-                {"label": "Caps Lock", "matrix": [0, 3], "x": 0, "y": 3.5, "w": 1.75},
-                {"label": "A", "matrix": [1, 3], "x": 1.75, "y": 3.5},
-                {"label": "S", "matrix": [2, 3], "x": 2.75, "y": 3.5},
-                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.5},
-                {"label": "F", "matrix": [4, 3], "x": 4.75, "y": 3.5},
-                {"label": "G", "matrix": [5, 3], "x": 5.75, "y": 3.5},
-                {"label": "H", "matrix": [6, 3], "x": 6.75, "y": 3.5},
-                {"label": "J", "matrix": [7, 3], "x": 7.75, "y": 3.5},
-                {"label": "K", "matrix": [8, 3], "x": 8.75, "y": 3.5},
-                {"label": "L", "matrix": [9, 3], "x": 9.75, "y": 3.5},
-                {"label": ";", "matrix": [10, 3], "x": 10.75, "y": 3.5},
-                {"label": "'", "matrix": [11, 3], "x": 11.75, "y": 3.5},
-                {"label": "Enter", "matrix": [13, 3], "x": 12.75, "y": 3.5, "w": 2.25},
-                 
-                {"label": "4", "matrix": [16, 2], "x": 18.5, "y": 3.5},
-                {"label": "5", "matrix": [17, 2], "x": 19.5, "y": 3.5},
-                {"label": "6", "matrix": [18, 2], "x": 20.5, "y": 3.5},
-                {"label": "\u2298", "matrix": [19, 3], "x": 21.5, "y": 3.5},
-                                               
-                {"label": "Shift", "matrix": [0, 4], "x": 0, "y": 4.5, "w": 2.25},
-                {"label": "Z", "matrix": [1, 4], "x": 2.25, "y": 4.5},
-                {"label": "X", "matrix": [2, 4], "x": 3.25, "y": 4.5},
-                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 4.5},
-                {"label": "V", "matrix": [4, 4], "x": 5.25, "y": 4.5},
-                {"label": "B", "matrix": [5, 4], "x": 6.25, "y": 4.5},
-                {"label": "N", "matrix": [6, 4], "x": 7.25, "y": 4.5},
-                {"label": "M", "matrix": [7, 4], "x": 8.25, "y": 4.5},
-                {"label": ",", "matrix": [8, 4], "x": 9.25, "y": 4.5},
-                {"label": ".", "matrix": [9, 4], "x": 10.25, "y": 4.5},
-                {"label": "/", "matrix": [10, 4], "x": 11.25, "y": 4.5},
-                {"label": "Shift", "matrix": [13, 4], "x": 12.25, "y": 4.5, "w": 2.75},
-                 
-                {"label": "\u2191", "matrix": [15, 5], "x": 16.25, "y": 4.5},
-                 
-                {"label": "1", "matrix": [16, 3], "x": 18.5, "y": 4.5},
-                {"label": "2", "matrix": [17, 3], "x": 19.5, "y": 4.5},
-                {"label": "3", "matrix": [18, 3], "x": 20.5, "y": 4.5},
-                {"label": "Enter", "matrix": [19, 2], "x": 21.5, "y": 4.5},
-                                               
-                {"label": "Ctrl", "matrix": [0, 5], "x": 0, "y": 5.5, "w": 1.25},
-                {"label": "GUI", "matrix": [1, 5], "x": 1.25, "y": 5.5, "w": 1.25},
-                {"label": "Alt", "matrix": [2, 5], "x": 2.5, "y": 5.5, "w": 1.25},
-                {"label": "\u2298", "matrix": [3, 5], "x": 3.75, "y": 5.5, "w": 1.25},
-                {"label": "\u2298", "matrix": [4, 5], "x": 5, "y": 5.5, "w": 1.25},
-                {"label": "Space", "matrix": [5, 5], "x": 6.25, "y": 5.5, "w": 1.25},
-                {"label": "\u2298", "matrix": [6, 5], "x": 7.5, "y": 5.5, "w": 1.25},
-                {"label": "\u2298", "matrix": [7, 5], "x": 8.75, "y": 5.5, "w": 1.25},
-                {"label": "Alt", "matrix": [9, 5], "x": 10, "y": 5.5, "w": 1.25},
-                {"label": "GUI", "matrix": [10, 5], "x": 11.25, "y": 5.5, "w": 1.25},
-                {"label": "Space", "matrix": [12, 3], "x": 12.5, "y": 5.5, "w": 1.25},
-                {"label": "Ctrl", "matrix": [13, 5], "x": 13.75, "y": 5.5, "w": 1.25},
-                 
-                {"label": "\u2190", "matrix": [14, 3], "x": 15.25, "y": 5.5},
-                {"label": "\u2193", "matrix": [14, 4], "x": 16.25, "y": 5.5},
-                {"label": "\u2192", "matrix": [14, 5], "x": 17.25, "y": 5.5},
-                 
-                {"label": "0", "matrix": [16, 4], "x": 18.5, "y": 5.5},
-                {"label": "\u2298", "matrix": [17, 4], "x": 19.5, "y": 5.5},
-                {"label": ".", "matrix": [18, 4], "x": 20.5, "y": 5.5},
-                {"label": "\u2298", "matrix": [19, 4], "x": 21.5, "y": 5.5}
-            ]
-        },
-        "LAYOUT_fullsize_ansi": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-
-                {"label": "F1", "matrix": [1, 0], "x": 2, "y": 0},
-                {"label": "F2", "matrix": [2, 0], "x": 3, "y": 0},
-                {"label": "F3", "matrix": [3, 0], "x": 4, "y": 0},
-                {"label": "F4", "matrix": [4, 0], "x": 5, "y": 0},
-
-                {"label": "F5", "matrix": [5, 0], "x": 6.5, "y": 0},
-                {"label": "F6", "matrix": [6, 0], "x": 7.5, "y": 0},
-                {"label": "F7", "matrix": [7, 0], "x": 8.5, "y": 0},
-                {"label": "F8", "matrix": [8, 0], "x": 9.5, "y": 0},
-
-                {"label": "F9", "matrix": [9, 0], "x": 11, "y": 0},
-                {"label": "F10", "matrix": [10, 0], "x": 12, "y": 0},
-                {"label": "F11", "matrix": [11, 0], "x": 13, "y": 0},
-                {"label": "F12", "matrix": [12, 0], "x": 14, "y": 0},
-
-                {"label": "Print Screen", "matrix": [13, 0], "x": 15.25, "y": 0},
-                {"label": "Scroll Lock", "matrix": [14, 0], "x": 16.25, "y": 0},
-                {"label": "Pause", "matrix": [15, 0], "x": 17.25, "y": 0},
-
-                {"label": "`", "matrix": [0, 1], "x": 0, "y": 1.5},
-                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.5},
-                {"label": "2", "matrix": [2, 1], "x": 2, "y": 1.5},
-                {"label": "3", "matrix": [3, 1], "x": 3, "y": 1.5},
-                {"label": "4", "matrix": [4, 1], "x": 4, "y": 1.5},
-                {"label": "5", "matrix": [5, 1], "x": 5, "y": 1.5},
-                {"label": "6", "matrix": [6, 1], "x": 6, "y": 1.5},
-                {"label": "7", "matrix": [7, 1], "x": 7, "y": 1.5},
-                {"label": "8", "matrix": [8, 1], "x": 8, "y": 1.5},
-                {"label": "9", "matrix": [9, 1], "x": 9, "y": 1.5},
-                {"label": "0", "matrix": [10, 1], "x": 10, "y": 1.5},
-                {"label": "-", "matrix": [11, 1], "x": 11, "y": 1.5},
-                {"label": "=", "matrix": [12, 1], "x": 12, "y": 1.5},
-                {"label": "Backspace", "matrix": [13, 1], "x": 13, "y": 1.5, "w": 2},
-
-                {"label": "Insert", "matrix": [14, 1], "x": 15.25, "y": 1.5},
-                {"label": "Home", "matrix": [15, 2], "x": 16.25, "y": 1.5},
-                {"label": "Page Up", "matrix": [15, 1], "x": 17.25, "y": 1.5},
-
-                {"label": "Num Lock", "matrix": [16, 0], "x": 18.5, "y": 1.5},
-                {"label": "/", "matrix": [17, 0], "x": 19.5, "y": 1.5},
-                {"label": "*", "matrix": [18, 0], "x": 20.5, "y": 1.5},
-                {"label": "-", "matrix": [19, 0], "x": 21.5, "y": 1.5},
-
-                {"label": "Tab", "matrix": [0, 2], "x": 0, "y": 2.5, "w": 1.5},
-                {"label": "Q", "matrix": [1, 2], "x": 1.5, "y": 2.5},
-                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.5},
-                {"label": "E", "matrix": [3, 2], "x": 3.5, "y": 2.5},
-                {"label": "R", "matrix": [4, 2], "x": 4.5, "y": 2.5},
-                {"label": "T", "matrix": [5, 2], "x": 5.5, "y": 2.5},
-                {"label": "Y", "matrix": [6, 2], "x": 6.5, "y": 2.5},
-                {"label": "U", "matrix": [7, 2], "x": 7.5, "y": 2.5},
-                {"label": "I", "matrix": [8, 2], "x": 8.5, "y": 2.5},
-                {"label": "O", "matrix": [9, 2], "x": 9.5, "y": 2.5},
-                {"label": "P", "matrix": [10, 2], "x": 10.5, "y": 2.5},
-                {"label": "[", "matrix": [11, 2], "x": 11.5, "y": 2.5},
-                {"label": "]", "matrix": [12, 2], "x": 12.5, "y": 2.5},
-                {"label": "\\", "matrix": [13, 2], "x": 13.5, "y": 2.5, "w": 1.5},
-
-                {"label": "Delete", "matrix": [14, 2], "x": 15.25, "y": 2.5},
-                {"label": "End", "matrix": [15, 4], "x": 16.25, "y": 2.5},
-                {"label": "Page Down", "matrix": [15, 3], "x": 17.25, "y": 2.5},
-
-                {"label": "7", "matrix": [16, 1], "x": 18.5, "y": 2.5},
-                {"label": "8", "matrix": [17, 1], "x": 19.5, "y": 2.5},
-                {"label": "9", "matrix": [18, 1], "x": 20.5, "y": 2.5},
-                {"label": "+", "matrix": [19, 1], "x": 21.5, "y": 2.5, "h": 2},
-
-                {"label": "Caps Lock", "matrix": [0, 3], "x": 0, "y": 3.5, "w": 1.75},
-                {"label": "A", "matrix": [1, 3], "x": 1.75, "y": 3.5},
-                {"label": "S", "matrix": [2, 3], "x": 2.75, "y": 3.5},
-                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.5},
-                {"label": "F", "matrix": [4, 3], "x": 4.75, "y": 3.5},
-                {"label": "G", "matrix": [5, 3], "x": 5.75, "y": 3.5},
-                {"label": "H", "matrix": [6, 3], "x": 6.75, "y": 3.5},
-                {"label": "J", "matrix": [7, 3], "x": 7.75, "y": 3.5},
-                {"label": "K", "matrix": [8, 3], "x": 8.75, "y": 3.5},
-                {"label": "L", "matrix": [9, 3], "x": 9.75, "y": 3.5},
-                {"label": ";", "matrix": [10, 3], "x": 10.75, "y": 3.5},
-                {"label": "'", "matrix": [11, 3], "x": 11.75, "y": 3.5},
-                {"label": "Enter", "matrix": [13, 3], "x": 12.75, "y": 3.5, "w": 2.25},
-
-                {"label": "4", "matrix": [16, 2], "x": 18.5, "y": 3.5},
-                {"label": "5", "matrix": [17, 2], "x": 19.5, "y": 3.5},
-                {"label": "6", "matrix": [18, 2], "x": 20.5, "y": 3.5},
-
-                {"label": "Shift", "matrix": [0, 4], "x": 0, "y": 4.5, "w": 2.25},
-                {"label": "Z", "matrix": [1, 4], "x": 2.25, "y": 4.5},
-                {"label": "X", "matrix": [2, 4], "x": 3.25, "y": 4.5},
-                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 4.5},
-                {"label": "V", "matrix": [4, 4], "x": 5.25, "y": 4.5},
-                {"label": "B", "matrix": [5, 4], "x": 6.25, "y": 4.5},
-                {"label": "N", "matrix": [6, 4], "x": 7.25, "y": 4.5},
-                {"label": "M", "matrix": [7, 4], "x": 8.25, "y": 4.5},
-                {"label": ",", "matrix": [8, 4], "x": 9.25, "y": 4.5},
-                {"label": ".", "matrix": [9, 4], "x": 10.25, "y": 4.5},
-                {"label": "/", "matrix": [10, 4], "x": 11.25, "y": 4.5},
-                {"label": "Shift", "matrix": [13, 4], "x": 12.25, "y": 4.5, "w": 2.75},
-
-                {"label": "\u2191", "matrix": [15, 5], "x": 16.25, "y": 4.5},
-
-                {"label": "1", "matrix": [16, 3], "x": 18.5, "y": 4.5},
-                {"label": "2", "matrix": [17, 3], "x": 19.5, "y": 4.5},
-                {"label": "3", "matrix": [18, 3], "x": 20.5, "y": 4.5},
-                {"label": "Enter", "matrix": [19, 2], "x": 21.5, "y": 4.5, "h": 2},
-
-                {"label": "Ctrl", "matrix": [0, 5], "x": 0, "y": 5.5, "w": 1.25},
-                {"label": "GUI", "matrix": [1, 5], "x": 1.25, "y": 5.5, "w": 1.25},
-                {"label": "Alt", "matrix": [2, 5], "x": 2.5, "y": 5.5, "w": 1.25},
-                {"label": "Space", "matrix": [5, 5], "x": 3.75, "y": 5.5, "w": 6.25},
-                {"label": "Alt", "matrix": [9, 5], "x": 10, "y": 5.5, "w": 1.25},
-                {"label": "GUI", "matrix": [10, 5], "x": 11.25, "y": 5.5, "w": 1.25},
-                {"label": "Space", "matrix": [12, 3], "x": 12.5, "y": 5.5, "w": 1.25},
-                {"label": "Ctrl", "matrix": [13, 5], "x": 13.75, "y": 5.5, "w": 1.25},
-
-                {"label": "\u2190", "matrix": [14, 3], "x": 15.25, "y": 5.5},
-                {"label": "\u2193", "matrix": [14, 4], "x": 16.25, "y": 5.5},
-                {"label": "\u2192", "matrix": [14, 5], "x": 17.25, "y": 5.5},
-
-                {"label": "0", "matrix": [16, 4], "x": 18.5, "y": 5.5, "w": 2},
-                {"label": ".", "matrix": [18, 4], "x": 20.5, "y": 5.5}
-            ]
-        }
-    }
-}
diff --git a/keyboards/kakunpc/thedogkeyboard/keyboard.json b/keyboards/kakunpc/thedogkeyboard/keyboard.json
new file mode 100644
index 00000000000..185b4c4fe0a
--- /dev/null
+++ b/keyboards/kakunpc/thedogkeyboard/keyboard.json
@@ -0,0 +1,295 @@
+{
+    "keyboard_name": "TheDogKeyboard",
+    "manufacturer": "kakunpc",
+    "url": "https://kakunpc.booth.pm/",
+    "maintainer": "kakunpc",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0x0000",
+        "device_version": "0.0.1"
+    },
+    "ws2812": {
+        "pin": "D3"
+    },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 111,
+        "max_brightness": 50,
+        "sleep": true
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": false,
+        "mousekey": true,
+        "extrakey": true,
+        "console": true,
+        "command": true,
+        "rgblight": true
+    },
+    "community_layouts": [
+        "fullsize_ansi"
+    ],
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                 
+                {"label": "F1", "matrix": [1, 0], "x": 2, "y": 0},
+                {"label": "F2", "matrix": [2, 0], "x": 3, "y": 0},
+                {"label": "F3", "matrix": [3, 0], "x": 4, "y": 0},
+                {"label": "F4", "matrix": [4, 0], "x": 5, "y": 0},
+                 
+                {"label": "F5", "matrix": [5, 0], "x": 6.5, "y": 0},
+                {"label": "F6", "matrix": [6, 0], "x": 7.5, "y": 0},
+                {"label": "F7", "matrix": [7, 0], "x": 8.5, "y": 0},
+                {"label": "F8", "matrix": [8, 0], "x": 9.5, "y": 0},
+                 
+                {"label": "F9", "matrix": [9, 0], "x": 11, "y": 0},
+                {"label": "F10", "matrix": [10, 0], "x": 12, "y": 0},
+                {"label": "F11", "matrix": [11, 0], "x": 13, "y": 0},
+                {"label": "F12", "matrix": [12, 0], "x": 14, "y": 0},
+                 
+                {"label": "Print Screen", "matrix": [13, 0], "x": 15.25, "y": 0},
+                {"label": "Scroll Lock", "matrix": [14, 0], "x": 16.25, "y": 0},
+                {"label": "Pause", "matrix": [15, 0], "x": 17.25, "y": 0},
+                                               
+                {"label": "`", "matrix": [0, 1], "x": 0, "y": 1.5},
+                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.5},
+                {"label": "2", "matrix": [2, 1], "x": 2, "y": 1.5},
+                {"label": "3", "matrix": [3, 1], "x": 3, "y": 1.5},
+                {"label": "4", "matrix": [4, 1], "x": 4, "y": 1.5},
+                {"label": "5", "matrix": [5, 1], "x": 5, "y": 1.5},
+                {"label": "6", "matrix": [6, 1], "x": 6, "y": 1.5},
+                {"label": "7", "matrix": [7, 1], "x": 7, "y": 1.5},
+                {"label": "8", "matrix": [8, 1], "x": 8, "y": 1.5},
+                {"label": "9", "matrix": [9, 1], "x": 9, "y": 1.5},
+                {"label": "0", "matrix": [10, 1], "x": 10, "y": 1.5},
+                {"label": "-", "matrix": [11, 1], "x": 11, "y": 1.5},
+                {"label": "=", "matrix": [12, 1], "x": 12, "y": 1.5},
+                {"label": "Backspace", "matrix": [13, 1], "x": 13, "y": 1.5, "w": 2},
+                 
+                {"label": "Insert", "matrix": [14, 1], "x": 15.25, "y": 1.5},
+                {"label": "Home", "matrix": [15, 2], "x": 16.25, "y": 1.5},
+                {"label": "Page Up", "matrix": [15, 1], "x": 17.25, "y": 1.5},
+                 
+                {"label": "Num Lock", "matrix": [16, 0], "x": 18.5, "y": 1.5},
+                {"label": "/", "matrix": [17, 0], "x": 19.5, "y": 1.5},
+                {"label": "*", "matrix": [18, 0], "x": 20.5, "y": 1.5},
+                {"label": "-", "matrix": [19, 0], "x": 21.5, "y": 1.5},
+                                               
+                {"label": "Tab", "matrix": [0, 2], "x": 0, "y": 2.5, "w": 1.5},
+                {"label": "Q", "matrix": [1, 2], "x": 1.5, "y": 2.5},
+                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.5},
+                {"label": "E", "matrix": [3, 2], "x": 3.5, "y": 2.5},
+                {"label": "R", "matrix": [4, 2], "x": 4.5, "y": 2.5},
+                {"label": "T", "matrix": [5, 2], "x": 5.5, "y": 2.5},
+                {"label": "Y", "matrix": [6, 2], "x": 6.5, "y": 2.5},
+                {"label": "U", "matrix": [7, 2], "x": 7.5, "y": 2.5},
+                {"label": "I", "matrix": [8, 2], "x": 8.5, "y": 2.5},
+                {"label": "O", "matrix": [9, 2], "x": 9.5, "y": 2.5},
+                {"label": "P", "matrix": [10, 2], "x": 10.5, "y": 2.5},
+                {"label": "[", "matrix": [11, 2], "x": 11.5, "y": 2.5},
+                {"label": "]", "matrix": [12, 2], "x": 12.5, "y": 2.5},
+                {"label": "\\", "matrix": [13, 2], "x": 13.5, "y": 2.5, "w": 1.5},
+                 
+                {"label": "Delete", "matrix": [14, 2], "x": 15.25, "y": 2.5},
+                {"label": "End", "matrix": [15, 4], "x": 16.25, "y": 2.5},
+                {"label": "Page Down", "matrix": [15, 3], "x": 17.25, "y": 2.5},
+                 
+                {"label": "7", "matrix": [16, 1], "x": 18.5, "y": 2.5},
+                {"label": "8", "matrix": [17, 1], "x": 19.5, "y": 2.5},
+                {"label": "9", "matrix": [18, 1], "x": 20.5, "y": 2.5},
+                {"label": "+", "matrix": [19, 1], "x": 21.5, "y": 2.5},
+                                               
+                {"label": "Caps Lock", "matrix": [0, 3], "x": 0, "y": 3.5, "w": 1.75},
+                {"label": "A", "matrix": [1, 3], "x": 1.75, "y": 3.5},
+                {"label": "S", "matrix": [2, 3], "x": 2.75, "y": 3.5},
+                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.5},
+                {"label": "F", "matrix": [4, 3], "x": 4.75, "y": 3.5},
+                {"label": "G", "matrix": [5, 3], "x": 5.75, "y": 3.5},
+                {"label": "H", "matrix": [6, 3], "x": 6.75, "y": 3.5},
+                {"label": "J", "matrix": [7, 3], "x": 7.75, "y": 3.5},
+                {"label": "K", "matrix": [8, 3], "x": 8.75, "y": 3.5},
+                {"label": "L", "matrix": [9, 3], "x": 9.75, "y": 3.5},
+                {"label": ";", "matrix": [10, 3], "x": 10.75, "y": 3.5},
+                {"label": "'", "matrix": [11, 3], "x": 11.75, "y": 3.5},
+                {"label": "Enter", "matrix": [13, 3], "x": 12.75, "y": 3.5, "w": 2.25},
+                 
+                {"label": "4", "matrix": [16, 2], "x": 18.5, "y": 3.5},
+                {"label": "5", "matrix": [17, 2], "x": 19.5, "y": 3.5},
+                {"label": "6", "matrix": [18, 2], "x": 20.5, "y": 3.5},
+                {"label": "\u2298", "matrix": [19, 3], "x": 21.5, "y": 3.5},
+                                               
+                {"label": "Shift", "matrix": [0, 4], "x": 0, "y": 4.5, "w": 2.25},
+                {"label": "Z", "matrix": [1, 4], "x": 2.25, "y": 4.5},
+                {"label": "X", "matrix": [2, 4], "x": 3.25, "y": 4.5},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 4.5},
+                {"label": "V", "matrix": [4, 4], "x": 5.25, "y": 4.5},
+                {"label": "B", "matrix": [5, 4], "x": 6.25, "y": 4.5},
+                {"label": "N", "matrix": [6, 4], "x": 7.25, "y": 4.5},
+                {"label": "M", "matrix": [7, 4], "x": 8.25, "y": 4.5},
+                {"label": ",", "matrix": [8, 4], "x": 9.25, "y": 4.5},
+                {"label": ".", "matrix": [9, 4], "x": 10.25, "y": 4.5},
+                {"label": "/", "matrix": [10, 4], "x": 11.25, "y": 4.5},
+                {"label": "Shift", "matrix": [13, 4], "x": 12.25, "y": 4.5, "w": 2.75},
+                 
+                {"label": "\u2191", "matrix": [15, 5], "x": 16.25, "y": 4.5},
+                 
+                {"label": "1", "matrix": [16, 3], "x": 18.5, "y": 4.5},
+                {"label": "2", "matrix": [17, 3], "x": 19.5, "y": 4.5},
+                {"label": "3", "matrix": [18, 3], "x": 20.5, "y": 4.5},
+                {"label": "Enter", "matrix": [19, 2], "x": 21.5, "y": 4.5},
+                                               
+                {"label": "Ctrl", "matrix": [0, 5], "x": 0, "y": 5.5, "w": 1.25},
+                {"label": "GUI", "matrix": [1, 5], "x": 1.25, "y": 5.5, "w": 1.25},
+                {"label": "Alt", "matrix": [2, 5], "x": 2.5, "y": 5.5, "w": 1.25},
+                {"label": "\u2298", "matrix": [3, 5], "x": 3.75, "y": 5.5, "w": 1.25},
+                {"label": "\u2298", "matrix": [4, 5], "x": 5, "y": 5.5, "w": 1.25},
+                {"label": "Space", "matrix": [5, 5], "x": 6.25, "y": 5.5, "w": 1.25},
+                {"label": "\u2298", "matrix": [6, 5], "x": 7.5, "y": 5.5, "w": 1.25},
+                {"label": "\u2298", "matrix": [7, 5], "x": 8.75, "y": 5.5, "w": 1.25},
+                {"label": "Alt", "matrix": [9, 5], "x": 10, "y": 5.5, "w": 1.25},
+                {"label": "GUI", "matrix": [10, 5], "x": 11.25, "y": 5.5, "w": 1.25},
+                {"label": "Space", "matrix": [12, 3], "x": 12.5, "y": 5.5, "w": 1.25},
+                {"label": "Ctrl", "matrix": [13, 5], "x": 13.75, "y": 5.5, "w": 1.25},
+                 
+                {"label": "\u2190", "matrix": [14, 3], "x": 15.25, "y": 5.5},
+                {"label": "\u2193", "matrix": [14, 4], "x": 16.25, "y": 5.5},
+                {"label": "\u2192", "matrix": [14, 5], "x": 17.25, "y": 5.5},
+                 
+                {"label": "0", "matrix": [16, 4], "x": 18.5, "y": 5.5},
+                {"label": "\u2298", "matrix": [17, 4], "x": 19.5, "y": 5.5},
+                {"label": ".", "matrix": [18, 4], "x": 20.5, "y": 5.5},
+                {"label": "\u2298", "matrix": [19, 4], "x": 21.5, "y": 5.5}
+            ]
+        },
+        "LAYOUT_fullsize_ansi": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "F1", "matrix": [1, 0], "x": 2, "y": 0},
+                {"label": "F2", "matrix": [2, 0], "x": 3, "y": 0},
+                {"label": "F3", "matrix": [3, 0], "x": 4, "y": 0},
+                {"label": "F4", "matrix": [4, 0], "x": 5, "y": 0},
+
+                {"label": "F5", "matrix": [5, 0], "x": 6.5, "y": 0},
+                {"label": "F6", "matrix": [6, 0], "x": 7.5, "y": 0},
+                {"label": "F7", "matrix": [7, 0], "x": 8.5, "y": 0},
+                {"label": "F8", "matrix": [8, 0], "x": 9.5, "y": 0},
+
+                {"label": "F9", "matrix": [9, 0], "x": 11, "y": 0},
+                {"label": "F10", "matrix": [10, 0], "x": 12, "y": 0},
+                {"label": "F11", "matrix": [11, 0], "x": 13, "y": 0},
+                {"label": "F12", "matrix": [12, 0], "x": 14, "y": 0},
+
+                {"label": "Print Screen", "matrix": [13, 0], "x": 15.25, "y": 0},
+                {"label": "Scroll Lock", "matrix": [14, 0], "x": 16.25, "y": 0},
+                {"label": "Pause", "matrix": [15, 0], "x": 17.25, "y": 0},
+
+                {"label": "`", "matrix": [0, 1], "x": 0, "y": 1.5},
+                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.5},
+                {"label": "2", "matrix": [2, 1], "x": 2, "y": 1.5},
+                {"label": "3", "matrix": [3, 1], "x": 3, "y": 1.5},
+                {"label": "4", "matrix": [4, 1], "x": 4, "y": 1.5},
+                {"label": "5", "matrix": [5, 1], "x": 5, "y": 1.5},
+                {"label": "6", "matrix": [6, 1], "x": 6, "y": 1.5},
+                {"label": "7", "matrix": [7, 1], "x": 7, "y": 1.5},
+                {"label": "8", "matrix": [8, 1], "x": 8, "y": 1.5},
+                {"label": "9", "matrix": [9, 1], "x": 9, "y": 1.5},
+                {"label": "0", "matrix": [10, 1], "x": 10, "y": 1.5},
+                {"label": "-", "matrix": [11, 1], "x": 11, "y": 1.5},
+                {"label": "=", "matrix": [12, 1], "x": 12, "y": 1.5},
+                {"label": "Backspace", "matrix": [13, 1], "x": 13, "y": 1.5, "w": 2},
+
+                {"label": "Insert", "matrix": [14, 1], "x": 15.25, "y": 1.5},
+                {"label": "Home", "matrix": [15, 2], "x": 16.25, "y": 1.5},
+                {"label": "Page Up", "matrix": [15, 1], "x": 17.25, "y": 1.5},
+
+                {"label": "Num Lock", "matrix": [16, 0], "x": 18.5, "y": 1.5},
+                {"label": "/", "matrix": [17, 0], "x": 19.5, "y": 1.5},
+                {"label": "*", "matrix": [18, 0], "x": 20.5, "y": 1.5},
+                {"label": "-", "matrix": [19, 0], "x": 21.5, "y": 1.5},
+
+                {"label": "Tab", "matrix": [0, 2], "x": 0, "y": 2.5, "w": 1.5},
+                {"label": "Q", "matrix": [1, 2], "x": 1.5, "y": 2.5},
+                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.5},
+                {"label": "E", "matrix": [3, 2], "x": 3.5, "y": 2.5},
+                {"label": "R", "matrix": [4, 2], "x": 4.5, "y": 2.5},
+                {"label": "T", "matrix": [5, 2], "x": 5.5, "y": 2.5},
+                {"label": "Y", "matrix": [6, 2], "x": 6.5, "y": 2.5},
+                {"label": "U", "matrix": [7, 2], "x": 7.5, "y": 2.5},
+                {"label": "I", "matrix": [8, 2], "x": 8.5, "y": 2.5},
+                {"label": "O", "matrix": [9, 2], "x": 9.5, "y": 2.5},
+                {"label": "P", "matrix": [10, 2], "x": 10.5, "y": 2.5},
+                {"label": "[", "matrix": [11, 2], "x": 11.5, "y": 2.5},
+                {"label": "]", "matrix": [12, 2], "x": 12.5, "y": 2.5},
+                {"label": "\\", "matrix": [13, 2], "x": 13.5, "y": 2.5, "w": 1.5},
+
+                {"label": "Delete", "matrix": [14, 2], "x": 15.25, "y": 2.5},
+                {"label": "End", "matrix": [15, 4], "x": 16.25, "y": 2.5},
+                {"label": "Page Down", "matrix": [15, 3], "x": 17.25, "y": 2.5},
+
+                {"label": "7", "matrix": [16, 1], "x": 18.5, "y": 2.5},
+                {"label": "8", "matrix": [17, 1], "x": 19.5, "y": 2.5},
+                {"label": "9", "matrix": [18, 1], "x": 20.5, "y": 2.5},
+                {"label": "+", "matrix": [19, 1], "x": 21.5, "y": 2.5, "h": 2},
+
+                {"label": "Caps Lock", "matrix": [0, 3], "x": 0, "y": 3.5, "w": 1.75},
+                {"label": "A", "matrix": [1, 3], "x": 1.75, "y": 3.5},
+                {"label": "S", "matrix": [2, 3], "x": 2.75, "y": 3.5},
+                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.5},
+                {"label": "F", "matrix": [4, 3], "x": 4.75, "y": 3.5},
+                {"label": "G", "matrix": [5, 3], "x": 5.75, "y": 3.5},
+                {"label": "H", "matrix": [6, 3], "x": 6.75, "y": 3.5},
+                {"label": "J", "matrix": [7, 3], "x": 7.75, "y": 3.5},
+                {"label": "K", "matrix": [8, 3], "x": 8.75, "y": 3.5},
+                {"label": "L", "matrix": [9, 3], "x": 9.75, "y": 3.5},
+                {"label": ";", "matrix": [10, 3], "x": 10.75, "y": 3.5},
+                {"label": "'", "matrix": [11, 3], "x": 11.75, "y": 3.5},
+                {"label": "Enter", "matrix": [13, 3], "x": 12.75, "y": 3.5, "w": 2.25},
+
+                {"label": "4", "matrix": [16, 2], "x": 18.5, "y": 3.5},
+                {"label": "5", "matrix": [17, 2], "x": 19.5, "y": 3.5},
+                {"label": "6", "matrix": [18, 2], "x": 20.5, "y": 3.5},
+
+                {"label": "Shift", "matrix": [0, 4], "x": 0, "y": 4.5, "w": 2.25},
+                {"label": "Z", "matrix": [1, 4], "x": 2.25, "y": 4.5},
+                {"label": "X", "matrix": [2, 4], "x": 3.25, "y": 4.5},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 4.5},
+                {"label": "V", "matrix": [4, 4], "x": 5.25, "y": 4.5},
+                {"label": "B", "matrix": [5, 4], "x": 6.25, "y": 4.5},
+                {"label": "N", "matrix": [6, 4], "x": 7.25, "y": 4.5},
+                {"label": "M", "matrix": [7, 4], "x": 8.25, "y": 4.5},
+                {"label": ",", "matrix": [8, 4], "x": 9.25, "y": 4.5},
+                {"label": ".", "matrix": [9, 4], "x": 10.25, "y": 4.5},
+                {"label": "/", "matrix": [10, 4], "x": 11.25, "y": 4.5},
+                {"label": "Shift", "matrix": [13, 4], "x": 12.25, "y": 4.5, "w": 2.75},
+
+                {"label": "\u2191", "matrix": [15, 5], "x": 16.25, "y": 4.5},
+
+                {"label": "1", "matrix": [16, 3], "x": 18.5, "y": 4.5},
+                {"label": "2", "matrix": [17, 3], "x": 19.5, "y": 4.5},
+                {"label": "3", "matrix": [18, 3], "x": 20.5, "y": 4.5},
+                {"label": "Enter", "matrix": [19, 2], "x": 21.5, "y": 4.5, "h": 2},
+
+                {"label": "Ctrl", "matrix": [0, 5], "x": 0, "y": 5.5, "w": 1.25},
+                {"label": "GUI", "matrix": [1, 5], "x": 1.25, "y": 5.5, "w": 1.25},
+                {"label": "Alt", "matrix": [2, 5], "x": 2.5, "y": 5.5, "w": 1.25},
+                {"label": "Space", "matrix": [5, 5], "x": 3.75, "y": 5.5, "w": 6.25},
+                {"label": "Alt", "matrix": [9, 5], "x": 10, "y": 5.5, "w": 1.25},
+                {"label": "GUI", "matrix": [10, 5], "x": 11.25, "y": 5.5, "w": 1.25},
+                {"label": "Space", "matrix": [12, 3], "x": 12.5, "y": 5.5, "w": 1.25},
+                {"label": "Ctrl", "matrix": [13, 5], "x": 13.75, "y": 5.5, "w": 1.25},
+
+                {"label": "\u2190", "matrix": [14, 3], "x": 15.25, "y": 5.5},
+                {"label": "\u2193", "matrix": [14, 4], "x": 16.25, "y": 5.5},
+                {"label": "\u2192", "matrix": [14, 5], "x": 17.25, "y": 5.5},
+
+                {"label": "0", "matrix": [16, 4], "x": 18.5, "y": 5.5, "w": 2},
+                {"label": ".", "matrix": [18, 4], "x": 20.5, "y": 5.5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/kakunpc/thedogkeyboard/rules.mk b/keyboards/kakunpc/thedogkeyboard/rules.mk
index cc71e1e7cb1..09c02c88b0d 100644
--- a/keyboards/kakunpc/thedogkeyboard/rules.mk
+++ b/keyboards/kakunpc/thedogkeyboard/rules.mk
@@ -1,15 +1,3 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = yes        # Console for debug
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
 CUSTOM_MATRIX = yes
 
 SRC += matrix.c
diff --git a/keyboards/kaly/kaly42/info.json b/keyboards/kaly/kaly42/keyboard.json
similarity index 100%
rename from keyboards/kaly/kaly42/info.json
rename to keyboards/kaly/kaly42/keyboard.json
diff --git a/keyboards/kapl/rev1/info.json b/keyboards/kapl/rev1/info.json
deleted file mode 100644
index dbbfde0e2a4..00000000000
--- a/keyboards/kapl/rev1/info.json
+++ /dev/null
@@ -1,160 +0,0 @@
-{
-  "keyboard_name": "Kapl",
-  "manufacturer": "keyzog",
-  "url": "https://github.com/keyzog/kapl",
-  "maintainer": "keyzog",
-  "usb": {
-    "vid": "0x4C41",
-    "pid": "0x0001",
-    "device_version": "0.0.1"
-  },
-  "ws2812": {
-    "pin": "D4"
-  },
-  "rgb_matrix": {
-    "animations":{
-      "alphas_mods": true,
-      "gradient_up_down": true,
-      "gradient_left_right": true,
-      "breathing": 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_spiral": true,
-      "hue_breathing": true,
-      "hue_wave": true,
-      "solid_reactive_simple": true,
-      "solid_reactive": true,
-      "solid_reactive_multiwide": true,
-      "solid_reactive_multicross": true,
-      "solid_reactive_multinexus": true,
-      "multisplash": true,
-      "solid_multisplash": true
-    },
-    "driver": "ws2812",
-    "max_brightness": 120,
-    "speed_steps": 10,
-    "split_count": [44, 44]
-  },
-  "rgblight": {
-    "saturation_steps": 16,
-    "brightness_steps": 16,
-    "led_count": 88,
-    "max_brightness": 120,
-    "split_count": [44, 44],
-    "animations": {
-      "breathing": true,
-      "rainbow_mood": true,
-      "rainbow_swirl": true,
-      "christmas": true,
-      "static_gradient": true,
-      "twinkle": true
-    }
-  },
-  "matrix_pins": {
-    "cols": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"],
-    "rows": ["C6", "D7", "E6", "B4", "B5"]
-  },
-  "diode_direction": "COL2ROW",
-  "split": {
-    "enabled": true,
-    "soft_serial_pin": "D2",
-    "transport": {
-      "sync": {
-          "indicators": true,
-          "layer_state": true,
-          "matrix_state": true
-      }
-    }
-  },
-  "processor": "atmega32u4",
-  "bootloader": "caterina",
-  "layouts": {
-    "LAYOUT": {
-      "layout": [
-        {"matrix": [0, 0], "x": 0, "y": 0.38},
-        {"matrix": [0, 1], "x": 1, "y": 0.38},
-        {"matrix": [0, 2], "x": 2, "y": 0.13},
-        {"matrix": [0, 3], "x": 3, "y": 0},
-        {"matrix": [0, 4], "x": 4, "y": 0.13},
-        {"matrix": [0, 5], "x": 5, "y": 0.25},
-        {"matrix": [0, 6], "x": 6, "y": 0.35},
-
-        {"matrix": [5, 6], "x": 8.67, "y": 0.35},
-        {"matrix": [5, 5], "x": 9.67, "y": 0.25},
-        {"matrix": [5, 4], "x": 10.67, "y": 0.13},
-        {"matrix": [5, 3], "x": 11.67, "y": 0},
-        {"matrix": [5, 2], "x": 12.67, "y": 0.13},
-        {"matrix": [5, 1], "x": 13.67, "y": 0.38},
-        {"matrix": [5, 0], "x": 14.67, "y": 0.38},
-
-        {"matrix": [1, 0], "x": 0, "y": 1.38},
-        {"matrix": [1, 1], "x": 1, "y": 1.38},
-        {"matrix": [1, 2], "x": 2, "y": 1.13},
-        {"matrix": [1, 3], "x": 3, "y": 1},
-        {"matrix": [1, 4], "x": 4, "y": 1.13},
-        {"matrix": [1, 5], "x": 5, "y": 1.25},
-        {"matrix": [1, 6], "x": 6, "y": 1.35},
-
-        {"matrix": [6, 6], "x": 8.67, "y": 1.35},
-        {"matrix": [6, 5], "x": 9.67, "y": 1.25},
-        {"matrix": [6, 4], "x": 10.67, "y": 1.13},
-        {"matrix": [6, 3], "x": 11.67, "y": 1},
-        {"matrix": [6, 2], "x": 12.67, "y": 1.13},
-        {"matrix": [6, 1], "x": 13.67, "y": 1.38},
-        {"matrix": [6, 0], "x": 14.67, "y": 1.38},
-
-        {"matrix": [2, 0], "x": 0, "y": 2.38},
-        {"matrix": [2, 1], "x": 1, "y": 2.38},
-        {"matrix": [2, 2], "x": 2, "y": 2.13},
-        {"matrix": [2, 3], "x": 3, "y": 2},
-        {"matrix": [2, 4], "x": 4, "y": 2.13},
-        {"matrix": [2, 5], "x": 5, "y": 2.25},
-        {"matrix": [2, 6], "x": 6, "y": 2.35},
-
-        {"matrix": [7, 6], "x": 8.67, "y": 2.35},
-        {"matrix": [7, 5], "x": 9.67, "y": 2.25},
-        {"matrix": [7, 4], "x": 10.67, "y": 2.13},
-        {"matrix": [7, 3], "x": 11.67, "y": 2},
-        {"matrix": [7, 2], "x": 12.67, "y": 2.13},
-        {"matrix": [7, 1], "x": 13.67, "y": 2.38},
-        {"matrix": [7, 0], "x": 14.67, "y": 2.38},
-
-        {"matrix": [3, 0], "x": 0, "y": 3.38},
-        {"matrix": [3, 1], "x": 1, "y": 3.38},
-        {"matrix": [3, 2], "x": 2, "y": 3.13},
-        {"matrix": [3, 3], "x": 3, "y": 3},
-        {"matrix": [3, 4], "x": 4, "y": 3.13},
-        {"matrix": [3, 5], "x": 5, "y": 3.25},
-        {"matrix": [3, 6], "x": 6, "y": 3.35},
-
-        {"matrix": [8, 6], "x": 8.67, "y": 3.35},
-        {"matrix": [8, 5], "x": 9.67, "y": 3.25},
-        {"matrix": [8, 4], "x": 10.67, "y": 3.13},
-        {"matrix": [8, 3], "x": 11.67, "y": 3},
-        {"matrix": [8, 2], "x": 12.67, "y": 3.13},
-        {"matrix": [8, 1], "x": 13.67, "y": 3.38},
-        {"matrix": [8, 0], "x": 14.67, "y": 3.38},
-
-        {"matrix": [4, 0], "x": 0, "y": 4.38},
-        {"matrix": [4, 1], "x": 1, "y": 4.38},
-        {"matrix": [4, 2], "x": 2, "y": 4.13},
-        {"matrix": [4, 3], "x": 3, "y": 4},
-        {"matrix": [4, 4], "x": 4, "y": 4.13},
-        {"matrix": [4, 5], "x": 5.35, "y": 4.92},
-        {"matrix": [4, 6], "x": 6.35, "y": 4.45, "h": 1.5},
-
-        {"matrix": [9, 6], "x": 8.02, "y": 4.45, "h": 1.5},
-        {"matrix": [9, 5], "x": 9.02, "y": 4.92},
-        {"matrix": [9, 4], "x": 10.67, "y": 4.13},
-        {"matrix": [9, 3], "x": 11.67, "y": 4},
-        {"matrix": [9, 2], "x": 12.67, "y": 4.13},
-        {"matrix": [9, 1], "x": 13.67, "y": 4.38},
-        {"matrix": [9, 0], "x": 14.67, "y": 4.38}
-      ]
-    }
-  }
-}
diff --git a/keyboards/kapl/rev1/keyboard.json b/keyboards/kapl/rev1/keyboard.json
new file mode 100644
index 00000000000..650702ba5fc
--- /dev/null
+++ b/keyboards/kapl/rev1/keyboard.json
@@ -0,0 +1,169 @@
+{
+  "keyboard_name": "Kapl",
+  "manufacturer": "keyzog",
+  "url": "https://github.com/keyzog/kapl",
+  "maintainer": "keyzog",
+  "usb": {
+    "vid": "0x4C41",
+    "pid": "0x0001",
+    "device_version": "0.0.1"
+  },
+  "ws2812": {
+    "pin": "D4"
+  },
+  "rgb_matrix": {
+    "animations":{
+      "alphas_mods": true,
+      "gradient_up_down": true,
+      "gradient_left_right": true,
+      "breathing": 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_spiral": true,
+      "hue_breathing": true,
+      "hue_wave": true,
+      "solid_reactive_simple": true,
+      "solid_reactive": true,
+      "solid_reactive_multiwide": true,
+      "solid_reactive_multicross": true,
+      "solid_reactive_multinexus": true,
+      "multisplash": true,
+      "solid_multisplash": true
+    },
+    "driver": "ws2812",
+    "max_brightness": 120,
+    "speed_steps": 10,
+    "split_count": [44, 44]
+  },
+  "rgblight": {
+    "saturation_steps": 16,
+    "brightness_steps": 16,
+    "led_count": 88,
+    "max_brightness": 120,
+    "split_count": [44, 44],
+    "animations": {
+      "breathing": true,
+      "rainbow_mood": true,
+      "rainbow_swirl": true,
+      "christmas": true,
+      "static_gradient": true,
+      "twinkle": true
+    }
+  },
+  "matrix_pins": {
+    "cols": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"],
+    "rows": ["C6", "D7", "E6", "B4", "B5"]
+  },
+  "diode_direction": "COL2ROW",
+  "split": {
+    "enabled": true,
+    "soft_serial_pin": "D2",
+    "transport": {
+      "sync": {
+          "indicators": true,
+          "layer_state": true,
+          "matrix_state": true
+      }
+    }
+  },
+  "processor": "atmega32u4",
+  "bootloader": "caterina",
+  "features": {
+    "bootmagic": false,
+    "mousekey": true,
+    "extrakey": true,
+    "rgb_matrix": true
+  },
+  "build": {
+    "lto": true
+  },
+  "layouts": {
+    "LAYOUT": {
+      "layout": [
+        {"matrix": [0, 0], "x": 0, "y": 0.38},
+        {"matrix": [0, 1], "x": 1, "y": 0.38},
+        {"matrix": [0, 2], "x": 2, "y": 0.13},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0.13},
+        {"matrix": [0, 5], "x": 5, "y": 0.25},
+        {"matrix": [0, 6], "x": 6, "y": 0.35},
+
+        {"matrix": [5, 6], "x": 8.67, "y": 0.35},
+        {"matrix": [5, 5], "x": 9.67, "y": 0.25},
+        {"matrix": [5, 4], "x": 10.67, "y": 0.13},
+        {"matrix": [5, 3], "x": 11.67, "y": 0},
+        {"matrix": [5, 2], "x": 12.67, "y": 0.13},
+        {"matrix": [5, 1], "x": 13.67, "y": 0.38},
+        {"matrix": [5, 0], "x": 14.67, "y": 0.38},
+
+        {"matrix": [1, 0], "x": 0, "y": 1.38},
+        {"matrix": [1, 1], "x": 1, "y": 1.38},
+        {"matrix": [1, 2], "x": 2, "y": 1.13},
+        {"matrix": [1, 3], "x": 3, "y": 1},
+        {"matrix": [1, 4], "x": 4, "y": 1.13},
+        {"matrix": [1, 5], "x": 5, "y": 1.25},
+        {"matrix": [1, 6], "x": 6, "y": 1.35},
+
+        {"matrix": [6, 6], "x": 8.67, "y": 1.35},
+        {"matrix": [6, 5], "x": 9.67, "y": 1.25},
+        {"matrix": [6, 4], "x": 10.67, "y": 1.13},
+        {"matrix": [6, 3], "x": 11.67, "y": 1},
+        {"matrix": [6, 2], "x": 12.67, "y": 1.13},
+        {"matrix": [6, 1], "x": 13.67, "y": 1.38},
+        {"matrix": [6, 0], "x": 14.67, "y": 1.38},
+
+        {"matrix": [2, 0], "x": 0, "y": 2.38},
+        {"matrix": [2, 1], "x": 1, "y": 2.38},
+        {"matrix": [2, 2], "x": 2, "y": 2.13},
+        {"matrix": [2, 3], "x": 3, "y": 2},
+        {"matrix": [2, 4], "x": 4, "y": 2.13},
+        {"matrix": [2, 5], "x": 5, "y": 2.25},
+        {"matrix": [2, 6], "x": 6, "y": 2.35},
+
+        {"matrix": [7, 6], "x": 8.67, "y": 2.35},
+        {"matrix": [7, 5], "x": 9.67, "y": 2.25},
+        {"matrix": [7, 4], "x": 10.67, "y": 2.13},
+        {"matrix": [7, 3], "x": 11.67, "y": 2},
+        {"matrix": [7, 2], "x": 12.67, "y": 2.13},
+        {"matrix": [7, 1], "x": 13.67, "y": 2.38},
+        {"matrix": [7, 0], "x": 14.67, "y": 2.38},
+
+        {"matrix": [3, 0], "x": 0, "y": 3.38},
+        {"matrix": [3, 1], "x": 1, "y": 3.38},
+        {"matrix": [3, 2], "x": 2, "y": 3.13},
+        {"matrix": [3, 3], "x": 3, "y": 3},
+        {"matrix": [3, 4], "x": 4, "y": 3.13},
+        {"matrix": [3, 5], "x": 5, "y": 3.25},
+        {"matrix": [3, 6], "x": 6, "y": 3.35},
+
+        {"matrix": [8, 6], "x": 8.67, "y": 3.35},
+        {"matrix": [8, 5], "x": 9.67, "y": 3.25},
+        {"matrix": [8, 4], "x": 10.67, "y": 3.13},
+        {"matrix": [8, 3], "x": 11.67, "y": 3},
+        {"matrix": [8, 2], "x": 12.67, "y": 3.13},
+        {"matrix": [8, 1], "x": 13.67, "y": 3.38},
+        {"matrix": [8, 0], "x": 14.67, "y": 3.38},
+
+        {"matrix": [4, 0], "x": 0, "y": 4.38},
+        {"matrix": [4, 1], "x": 1, "y": 4.38},
+        {"matrix": [4, 2], "x": 2, "y": 4.13},
+        {"matrix": [4, 3], "x": 3, "y": 4},
+        {"matrix": [4, 4], "x": 4, "y": 4.13},
+        {"matrix": [4, 5], "x": 5.35, "y": 4.92},
+        {"matrix": [4, 6], "x": 6.35, "y": 4.45, "h": 1.5},
+
+        {"matrix": [9, 6], "x": 8.02, "y": 4.45, "h": 1.5},
+        {"matrix": [9, 5], "x": 9.02, "y": 4.92},
+        {"matrix": [9, 4], "x": 10.67, "y": 4.13},
+        {"matrix": [9, 3], "x": 11.67, "y": 4},
+        {"matrix": [9, 2], "x": 12.67, "y": 4.13},
+        {"matrix": [9, 1], "x": 13.67, "y": 4.38},
+        {"matrix": [9, 0], "x": 14.67, "y": 4.38}
+      ]
+    }
+  }
+}
diff --git a/keyboards/kapl/rev1/rules.mk b/keyboards/kapl/rev1/rules.mk
deleted file mode 100644
index 95bef6d3a7a..00000000000
--- a/keyboards/kapl/rev1/rules.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-# Do not enable RGB_MATRIX_ENABLE together with RGBLIGHT_ENABLE
-RGB_MATRIX_ENABLE = yes
-
-LTO_ENABLE = yes
diff --git a/keyboards/kapl/rules.mk b/keyboards/kapl/rules.mk
index 586557a9637..a5dd22ce1c8 100644
--- a/keyboards/kapl/rules.mk
+++ b/keyboards/kapl/rules.mk
@@ -1,14 +1 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes      # Mouse keys
-EXTRAKEY_ENABLE = yes      # Audio control and System control
-CONSOLE_ENABLE = no        # Console for debug
-COMMAND_ENABLE = no        # Commands for debug and configuration
-NKRO_ENABLE = no           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no      # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no       # Enable keyboard RGB underglow
-AUDIO_ENABLE = no          # Audio output
-
 DEFAULT_FOLDER = kapl/rev1
diff --git a/keyboards/karn/info.json b/keyboards/karn/keyboard.json
similarity index 100%
rename from keyboards/karn/info.json
rename to keyboards/karn/keyboard.json
diff --git a/keyboards/kb58/info.json b/keyboards/kb58/info.json
deleted file mode 100644
index 0e32ab834bd..00000000000
--- a/keyboards/kb58/info.json
+++ /dev/null
@@ -1,96 +0,0 @@
-{
-    "keyboard_name": "KB58",
-    "manufacturer": "beanaccle",
-    "url": "https://github.com/beanaccle/kb58_pico",
-    "maintainer": "beanaccle",
-    "usb": {
-        "vid": "0xFEED",
-        "pid": "0x0000",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["F5", "F6", "F7", "B1", "D7", "D4", "D0"],
-        "rows": ["F4", "B6", "E6", "B4", "B5"]
-    },
-    "diode_direction": "COL2ROW",
-    "split": {
-        "enabled": true,
-        "soft_serial_pin": "D2",
-        "matrix_pins": {
-            "right": {
-                "cols": ["F6", "B1", "E6", "D7", "C6", "D4", "D0"],
-                "rows": ["F7", "B5", "B3", "B2", "B6"]
-            }
-        }
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [5, 0], "x": 6, "y": 0},
-                {"matrix": [5, 1], "x": 7, "y": 0},
-                {"matrix": [5, 2], "x": 8, "y": 0},
-                {"matrix": [5, 3], "x": 9, "y": 0},
-                {"matrix": [5, 4], "x": 10, "y": 0},
-                {"matrix": [5, 5], "x": 11, "y": 0},
-                {"matrix": [5, 6], "x": 12, "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": [1, 4], "x": 4, "y": 1},
-                {"matrix": [1, 5], "x": 5, "y": 1},
-                {"matrix": [6, 0], "x": 6, "y": 1},
-                {"matrix": [6, 1], "x": 7, "y": 1},
-                {"matrix": [6, 2], "x": 8, "y": 1},
-                {"matrix": [6, 3], "x": 9, "y": 1},
-                {"matrix": [6, 4], "x": 10, "y": 1},
-                {"matrix": [6, 5], "x": 11, "y": 1},
-                {"matrix": [6, 6], "x": 12, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2},
-                {"matrix": [2, 1], "x": 1, "y": 2},
-                {"matrix": [2, 2], "x": 2, "y": 2},
-                {"matrix": [2, 3], "x": 3, "y": 2},
-                {"matrix": [2, 4], "x": 4, "y": 2},
-                {"matrix": [2, 5], "x": 5, "y": 2},
-                {"matrix": [7, 0], "x": 6, "y": 2},
-                {"matrix": [7, 1], "x": 7, "y": 2},
-                {"matrix": [7, 2], "x": 8, "y": 2},
-                {"matrix": [7, 3], "x": 9, "y": 2},
-                {"matrix": [7, 4], "x": 10, "y": 2},
-                {"matrix": [7, 5], "x": 11, "y": 2},
-                {"matrix": [7, 6], "x": 12, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3},
-                {"matrix": [3, 1], "x": 1, "y": 3},
-                {"matrix": [3, 2], "x": 2, "y": 3},
-                {"matrix": [3, 3], "x": 3, "y": 3},
-                {"matrix": [3, 4], "x": 4, "y": 3},
-                {"matrix": [3, 5], "x": 5, "y": 3},
-                {"matrix": [8, 0], "x": 6, "y": 3},
-                {"matrix": [8, 1], "x": 7, "y": 3},
-                {"matrix": [8, 2], "x": 8, "y": 3},
-                {"matrix": [8, 3], "x": 9, "y": 3},
-                {"matrix": [8, 4], "x": 10, "y": 3},
-                {"matrix": [8, 5], "x": 11, "y": 3},
-                {"matrix": [8, 6], "x": 12, "y": 3},
-
-                {"matrix": [4, 3], "x": 3, "y": 4},
-                {"matrix": [4, 4], "x": 4, "y": 4},
-                {"matrix": [4, 5], "x": 5, "y": 4},
-                {"matrix": [9, 0], "x": 6, "y": 4},
-                {"matrix": [9, 1], "x": 7, "y": 4},
-                {"matrix": [9, 2], "x": 8, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/kb58/keyboard.json b/keyboards/kb58/keyboard.json
new file mode 100644
index 00000000000..950bc51eaf0
--- /dev/null
+++ b/keyboards/kb58/keyboard.json
@@ -0,0 +1,101 @@
+{
+    "keyboard_name": "KB58",
+    "manufacturer": "beanaccle",
+    "url": "https://github.com/beanaccle/kb58_pico",
+    "maintainer": "beanaccle",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0x0000",
+        "device_version": "0.0.1"
+    },
+    "matrix_pins": {
+        "cols": ["F5", "F6", "F7", "B1", "D7", "D4", "D0"],
+        "rows": ["F4", "B6", "E6", "B4", "B5"]
+    },
+    "diode_direction": "COL2ROW",
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "D2",
+        "matrix_pins": {
+            "right": {
+                "cols": ["F6", "B1", "E6", "D7", "C6", "D4", "D0"],
+                "rows": ["F7", "B5", "B3", "B2", "B6"]
+            }
+        }
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": false,
+        "mousekey": false,
+        "extrakey": false
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [5, 0], "x": 6, "y": 0},
+                {"matrix": [5, 1], "x": 7, "y": 0},
+                {"matrix": [5, 2], "x": 8, "y": 0},
+                {"matrix": [5, 3], "x": 9, "y": 0},
+                {"matrix": [5, 4], "x": 10, "y": 0},
+                {"matrix": [5, 5], "x": 11, "y": 0},
+                {"matrix": [5, 6], "x": 12, "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": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [6, 0], "x": 6, "y": 1},
+                {"matrix": [6, 1], "x": 7, "y": 1},
+                {"matrix": [6, 2], "x": 8, "y": 1},
+                {"matrix": [6, 3], "x": 9, "y": 1},
+                {"matrix": [6, 4], "x": 10, "y": 1},
+                {"matrix": [6, 5], "x": 11, "y": 1},
+                {"matrix": [6, 6], "x": 12, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [7, 0], "x": 6, "y": 2},
+                {"matrix": [7, 1], "x": 7, "y": 2},
+                {"matrix": [7, 2], "x": 8, "y": 2},
+                {"matrix": [7, 3], "x": 9, "y": 2},
+                {"matrix": [7, 4], "x": 10, "y": 2},
+                {"matrix": [7, 5], "x": 11, "y": 2},
+                {"matrix": [7, 6], "x": 12, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
+                {"matrix": [8, 0], "x": 6, "y": 3},
+                {"matrix": [8, 1], "x": 7, "y": 3},
+                {"matrix": [8, 2], "x": 8, "y": 3},
+                {"matrix": [8, 3], "x": 9, "y": 3},
+                {"matrix": [8, 4], "x": 10, "y": 3},
+                {"matrix": [8, 5], "x": 11, "y": 3},
+                {"matrix": [8, 6], "x": 12, "y": 3},
+
+                {"matrix": [4, 3], "x": 3, "y": 4},
+                {"matrix": [4, 4], "x": 4, "y": 4},
+                {"matrix": [4, 5], "x": 5, "y": 4},
+                {"matrix": [9, 0], "x": 6, "y": 4},
+                {"matrix": [9, 1], "x": 7, "y": 4},
+                {"matrix": [9, 2], "x": 8, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/kb58/rules.mk b/keyboards/kb58/rules.mk
deleted file mode 100644
index 164c05712b1..00000000000
--- a/keyboards/kb58/rules.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = no        # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
diff --git a/keyboards/kb_elmo/aek2_usb/info.json b/keyboards/kb_elmo/aek2_usb/info.json
deleted file mode 100644
index 884390278d1..00000000000
--- a/keyboards/kb_elmo/aek2_usb/info.json
+++ /dev/null
@@ -1,156 +0,0 @@
-{
-    "keyboard_name": "AEK II USB",
-    "manufacturer": "kb-elmo",
-    "url": "https://github.com/kb-elmo/aek2_usb",
-    "maintainer": "kb-elmo",
-    "usb": {
-        "vid": "0xA68C",
-        "pid": "0xDB52",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["A1", "A0", "A2", "A3", "A4", "A5", "A6", "A7", "C7", "C6", "C5", "C0", "D6", "D1"],
-        "rows": ["D5", "C1", "C4", "D0", "C3", "C2", "B3", "B4"]
-    },
-    "diode_direction": "COL2ROW",
-    "dynamic_keymap": {
-        "layer_count": 3
-    },
-    "indicators": {
-        "caps_lock": "B1",
-        "num_lock": "B2",
-        "scroll_lock": "B0"
-    },
-    "processor": "atmega32a",
-    "bootloader": "usbasploader",
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "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.5, "y": 0},
-                {"matrix": [0, 7], "x": 7.5, "y": 0},
-                {"matrix": [0, 8], "x": 8.5, "y": 0},
-                {"matrix": [0, 9], "x": 9.5, "y": 0},
-
-                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"matrix": [3, 11], "x": 13, "y": 0},
-                {"matrix": [0, 13], "x": 14, "y": 0},
-
-                {"matrix": [7, 13], "x": 15.5, "y": 0},
-                {"matrix": [6, 13], "x": 16.5, "y": 0},
-                {"matrix": [6, 12], "x": 17.5, "y": 0},
-
-                {"matrix": [6, 6], "x": 22, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 2},
-                {"matrix": [1, 1], "x": 1, "y": 2},
-                {"matrix": [1, 2], "x": 2, "y": 2},
-                {"matrix": [1, 3], "x": 3, "y": 2},
-                {"matrix": [1, 4], "x": 4, "y": 2},
-                {"matrix": [1, 5], "x": 5, "y": 2},
-                {"matrix": [1, 6], "x": 6, "y": 2},
-                {"matrix": [1, 7], "x": 7, "y": 2},
-                {"matrix": [1, 8], "x": 8, "y": 2},
-                {"matrix": [1, 9], "x": 9, "y": 2},
-                {"matrix": [1, 10], "x": 10, "y": 2},
-                {"matrix": [1, 11], "x": 11, "y": 2},
-                {"matrix": [1, 12], "x": 12, "y": 2},
-                {"matrix": [1, 13], "x": 13, "y": 2, "w": 2},
-
-                {"matrix": [7, 12], "x": 15.5, "y": 2},
-                {"matrix": [6, 0], "x": 16.5, "y": 2},
-                {"matrix": [6, 1], "x": 17.5, "y": 2},
-
-                {"matrix": [6, 2], "x": 19, "y": 2},
-                {"matrix": [6, 3], "x": 20, "y": 2},
-                {"matrix": [6, 5], "x": 21, "y": 2},
-                {"matrix": [6, 7], "x": 22, "y": 2},
-
-                {"matrix": [2, 0], "x": 0, "y": 3, "w": 1.5},
-                {"matrix": [2, 1], "x": 1.5, "y": 3},
-                {"matrix": [2, 2], "x": 2.5, "y": 3},
-                {"matrix": [2, 3], "x": 3.5, "y": 3},
-                {"matrix": [2, 4], "x": 4.5, "y": 3},
-                {"matrix": [2, 5], "x": 5.5, "y": 3},
-                {"matrix": [2, 6], "x": 6.5, "y": 3},
-                {"matrix": [2, 7], "x": 7.5, "y": 3},
-                {"matrix": [2, 8], "x": 8.5, "y": 3},
-                {"matrix": [2, 9], "x": 9.5, "y": 3},
-                {"matrix": [2, 10], "x": 10.5, "y": 3},
-                {"matrix": [2, 11], "x": 11.5, "y": 3},
-                {"matrix": [2, 12], "x": 12.5, "y": 3},
-                {"matrix": [2, 13], "x": 13.5, "y": 3, "w": 1.5},
-
-                {"matrix": [7, 0], "x": 15.5, "y": 3},
-                {"matrix": [7, 1], "x": 16.5, "y": 3},
-                {"matrix": [7, 2], "x": 17.5, "y": 3},
-
-                {"matrix": [7, 3], "x": 19, "y": 3},
-                {"matrix": [6, 4], "x": 20, "y": 3},
-                {"matrix": [7, 5], "x": 21, "y": 3},
-                {"matrix": [7, 7], "x": 22, "y": 3},
-
-                {"matrix": [3, 0], "x": 0, "y": 4, "w": 1.75},
-                {"matrix": [3, 1], "x": 1.75, "y": 4},
-                {"matrix": [3, 2], "x": 2.75, "y": 4},
-                {"matrix": [3, 3], "x": 3.75, "y": 4},
-                {"matrix": [3, 4], "x": 4.75, "y": 4},
-                {"matrix": [3, 5], "x": 5.75, "y": 4},
-                {"matrix": [3, 6], "x": 6.75, "y": 4},
-                {"matrix": [3, 7], "x": 7.75, "y": 4},
-                {"matrix": [3, 8], "x": 8.75, "y": 4},
-                {"matrix": [3, 9], "x": 9.75, "y": 4},
-                {"matrix": [3, 10], "x": 10.75, "y": 4},
-                {"matrix": [3, 12], "x": 11.75, "y": 4},
-                {"matrix": [3, 13], "x": 12.75, "y": 4, "w": 2.25},
-
-                {"matrix": [6, 11], "x": 19, "y": 4},
-                {"matrix": [7, 4], "x": 20, "y": 4},
-                {"matrix": [7, 6], "x": 21, "y": 4},
-                {"matrix": [6, 8], "x": 22, "y": 4},
-
-                {"matrix": [4, 0], "x": 0, "y": 5, "w": 2.25},
-                {"matrix": [4, 1], "x": 2.25, "y": 5},
-                {"matrix": [4, 2], "x": 3.25, "y": 5},
-                {"matrix": [4, 3], "x": 4.25, "y": 5},
-                {"matrix": [4, 4], "x": 5.25, "y": 5},
-                {"matrix": [4, 5], "x": 6.25, "y": 5},
-                {"matrix": [4, 6], "x": 7.25, "y": 5},
-                {"matrix": [4, 7], "x": 8.25, "y": 5},
-                {"matrix": [4, 8], "x": 9.25, "y": 5},
-                {"matrix": [4, 9], "x": 10.25, "y": 5},
-                {"matrix": [4, 10], "x": 11.25, "y": 5},
-                {"matrix": [4, 13], "x": 12.25, "y": 5, "w": 2.75},
-
-                {"matrix": [5, 8], "x": 16.5, "y": 5},
-
-                {"matrix": [7, 11], "x": 19, "y": 5},
-                {"matrix": [6, 10], "x": 20, "y": 5},
-                {"matrix": [6, 9], "x": 21, "y": 5},
-
-                {"matrix": [5, 0], "x": 0, "y": 6, "w": 1.5},
-                {"matrix": [5, 1], "x": 1.5, "y": 6, "w": 1.25},
-                {"matrix": [5, 2], "x": 2.75, "y": 6, "w": 1.5},
-                {"matrix": [5, 5], "x": 4.25, "y": 6, "w": 6.5},
-                {"matrix": [5, 10], "x": 10.75, "y": 6, "w": 1.5},
-                {"matrix": [5, 11], "x": 12.25, "y": 6, "w": 1.25},
-                {"matrix": [5, 13], "x": 13.5, "y": 6, "w": 1.5},
-
-                {"matrix": [5, 7], "x": 15.5, "y": 6},
-                {"matrix": [5, 9], "x": 16.5, "y": 6},
-                {"matrix": [5, 6], "x": 17.5, "y": 6},
-
-                {"matrix": [7, 10], "x": 19, "y": 6, "w": 2},
-                {"matrix": [7, 9], "x": 21, "y": 6},
-                {"matrix": [7, 8], "x": 22, "y": 5, "h": 2}
-            ]
-        }
-    }
-}
diff --git a/keyboards/kb_elmo/aek2_usb/keyboard.json b/keyboards/kb_elmo/aek2_usb/keyboard.json
new file mode 100644
index 00000000000..3ee3c521f73
--- /dev/null
+++ b/keyboards/kb_elmo/aek2_usb/keyboard.json
@@ -0,0 +1,161 @@
+{
+    "keyboard_name": "AEK II USB",
+    "manufacturer": "kb-elmo",
+    "url": "https://github.com/kb-elmo/aek2_usb",
+    "maintainer": "kb-elmo",
+    "usb": {
+        "vid": "0xA68C",
+        "pid": "0xDB52",
+        "device_version": "0.0.1"
+    },
+    "matrix_pins": {
+        "cols": ["A1", "A0", "A2", "A3", "A4", "A5", "A6", "A7", "C7", "C6", "C5", "C0", "D6", "D1"],
+        "rows": ["D5", "C1", "C4", "D0", "C3", "C2", "B3", "B4"]
+    },
+    "diode_direction": "COL2ROW",
+    "dynamic_keymap": {
+        "layer_count": 3
+    },
+    "indicators": {
+        "caps_lock": "B1",
+        "num_lock": "B2",
+        "scroll_lock": "B0"
+    },
+    "processor": "atmega32a",
+    "bootloader": "usbasploader",
+    "features": {
+        "bootmagic": true,
+        "mousekey": false,
+        "extrakey": true
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "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.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [3, 11], "x": 13, "y": 0},
+                {"matrix": [0, 13], "x": 14, "y": 0},
+
+                {"matrix": [7, 13], "x": 15.5, "y": 0},
+                {"matrix": [6, 13], "x": 16.5, "y": 0},
+                {"matrix": [6, 12], "x": 17.5, "y": 0},
+
+                {"matrix": [6, 6], "x": 22, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 2},
+                {"matrix": [1, 1], "x": 1, "y": 2},
+                {"matrix": [1, 2], "x": 2, "y": 2},
+                {"matrix": [1, 3], "x": 3, "y": 2},
+                {"matrix": [1, 4], "x": 4, "y": 2},
+                {"matrix": [1, 5], "x": 5, "y": 2},
+                {"matrix": [1, 6], "x": 6, "y": 2},
+                {"matrix": [1, 7], "x": 7, "y": 2},
+                {"matrix": [1, 8], "x": 8, "y": 2},
+                {"matrix": [1, 9], "x": 9, "y": 2},
+                {"matrix": [1, 10], "x": 10, "y": 2},
+                {"matrix": [1, 11], "x": 11, "y": 2},
+                {"matrix": [1, 12], "x": 12, "y": 2},
+                {"matrix": [1, 13], "x": 13, "y": 2, "w": 2},
+
+                {"matrix": [7, 12], "x": 15.5, "y": 2},
+                {"matrix": [6, 0], "x": 16.5, "y": 2},
+                {"matrix": [6, 1], "x": 17.5, "y": 2},
+
+                {"matrix": [6, 2], "x": 19, "y": 2},
+                {"matrix": [6, 3], "x": 20, "y": 2},
+                {"matrix": [6, 5], "x": 21, "y": 2},
+                {"matrix": [6, 7], "x": 22, "y": 2},
+
+                {"matrix": [2, 0], "x": 0, "y": 3, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 3},
+                {"matrix": [2, 2], "x": 2.5, "y": 3},
+                {"matrix": [2, 3], "x": 3.5, "y": 3},
+                {"matrix": [2, 4], "x": 4.5, "y": 3},
+                {"matrix": [2, 5], "x": 5.5, "y": 3},
+                {"matrix": [2, 6], "x": 6.5, "y": 3},
+                {"matrix": [2, 7], "x": 7.5, "y": 3},
+                {"matrix": [2, 8], "x": 8.5, "y": 3},
+                {"matrix": [2, 9], "x": 9.5, "y": 3},
+                {"matrix": [2, 10], "x": 10.5, "y": 3},
+                {"matrix": [2, 11], "x": 11.5, "y": 3},
+                {"matrix": [2, 12], "x": 12.5, "y": 3},
+                {"matrix": [2, 13], "x": 13.5, "y": 3, "w": 1.5},
+
+                {"matrix": [7, 0], "x": 15.5, "y": 3},
+                {"matrix": [7, 1], "x": 16.5, "y": 3},
+                {"matrix": [7, 2], "x": 17.5, "y": 3},
+
+                {"matrix": [7, 3], "x": 19, "y": 3},
+                {"matrix": [6, 4], "x": 20, "y": 3},
+                {"matrix": [7, 5], "x": 21, "y": 3},
+                {"matrix": [7, 7], "x": 22, "y": 3},
+
+                {"matrix": [3, 0], "x": 0, "y": 4, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 4},
+                {"matrix": [3, 2], "x": 2.75, "y": 4},
+                {"matrix": [3, 3], "x": 3.75, "y": 4},
+                {"matrix": [3, 4], "x": 4.75, "y": 4},
+                {"matrix": [3, 5], "x": 5.75, "y": 4},
+                {"matrix": [3, 6], "x": 6.75, "y": 4},
+                {"matrix": [3, 7], "x": 7.75, "y": 4},
+                {"matrix": [3, 8], "x": 8.75, "y": 4},
+                {"matrix": [3, 9], "x": 9.75, "y": 4},
+                {"matrix": [3, 10], "x": 10.75, "y": 4},
+                {"matrix": [3, 12], "x": 11.75, "y": 4},
+                {"matrix": [3, 13], "x": 12.75, "y": 4, "w": 2.25},
+
+                {"matrix": [6, 11], "x": 19, "y": 4},
+                {"matrix": [7, 4], "x": 20, "y": 4},
+                {"matrix": [7, 6], "x": 21, "y": 4},
+                {"matrix": [6, 8], "x": 22, "y": 4},
+
+                {"matrix": [4, 0], "x": 0, "y": 5, "w": 2.25},
+                {"matrix": [4, 1], "x": 2.25, "y": 5},
+                {"matrix": [4, 2], "x": 3.25, "y": 5},
+                {"matrix": [4, 3], "x": 4.25, "y": 5},
+                {"matrix": [4, 4], "x": 5.25, "y": 5},
+                {"matrix": [4, 5], "x": 6.25, "y": 5},
+                {"matrix": [4, 6], "x": 7.25, "y": 5},
+                {"matrix": [4, 7], "x": 8.25, "y": 5},
+                {"matrix": [4, 8], "x": 9.25, "y": 5},
+                {"matrix": [4, 9], "x": 10.25, "y": 5},
+                {"matrix": [4, 10], "x": 11.25, "y": 5},
+                {"matrix": [4, 13], "x": 12.25, "y": 5, "w": 2.75},
+
+                {"matrix": [5, 8], "x": 16.5, "y": 5},
+
+                {"matrix": [7, 11], "x": 19, "y": 5},
+                {"matrix": [6, 10], "x": 20, "y": 5},
+                {"matrix": [6, 9], "x": 21, "y": 5},
+
+                {"matrix": [5, 0], "x": 0, "y": 6, "w": 1.5},
+                {"matrix": [5, 1], "x": 1.5, "y": 6, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.75, "y": 6, "w": 1.5},
+                {"matrix": [5, 5], "x": 4.25, "y": 6, "w": 6.5},
+                {"matrix": [5, 10], "x": 10.75, "y": 6, "w": 1.5},
+                {"matrix": [5, 11], "x": 12.25, "y": 6, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.5, "y": 6, "w": 1.5},
+
+                {"matrix": [5, 7], "x": 15.5, "y": 6},
+                {"matrix": [5, 9], "x": 16.5, "y": 6},
+                {"matrix": [5, 6], "x": 17.5, "y": 6},
+
+                {"matrix": [7, 10], "x": 19, "y": 6, "w": 2},
+                {"matrix": [7, 9], "x": 21, "y": 6},
+                {"matrix": [7, 8], "x": 22, "y": 5, "h": 2}
+            ]
+        }
+    }
+}
diff --git a/keyboards/kb_elmo/aek2_usb/rules.mk b/keyboards/kb_elmo/aek2_usb/rules.mk
index 31ac76281ab..c2ee0bc86f9 100644
--- a/keyboards/kb_elmo/aek2_usb/rules.mk
+++ b/keyboards/kb_elmo/aek2_usb/rules.mk
@@ -1,15 +1,2 @@
 # Processor frequency
 F_CPU = 16000000
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
diff --git a/keyboards/kb_elmo/elmopad/info.json b/keyboards/kb_elmo/elmopad/info.json
deleted file mode 100644
index 600daf3099b..00000000000
--- a/keyboards/kb_elmo/elmopad/info.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-    "keyboard_name": "ElmoPad",
-    "manufacturer": "kb-elmo",
-    "url": "https://github.com/kb-elmo/numpad",
-    "maintainer": "kb-elmo",
-    "usb": {
-        "vid": "0xA68C",
-        "pid": "0x8B35",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["C0", "C1", "C2", "C3"],
-        "rows": ["C5", "C4", "B2", "B1", "D7", "B0"]
-    },
-    "diode_direction": "COL2ROW",
-    "processor": "atmega328p",
-    "bootloader": "usbasploader",
-    "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": [3, 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, 0], "x": 0, "y": 5, "w": 2},
-                {"matrix": [5, 2], "x": 2, "y": 5},
-                {"matrix": [5, 3], "x": 3, "y": 4, "h": 2}
-            ]
-        }
-    }
-}
diff --git a/keyboards/kb_elmo/elmopad/keyboard.json b/keyboards/kb_elmo/elmopad/keyboard.json
new file mode 100644
index 00000000000..584bd31d4e1
--- /dev/null
+++ b/keyboards/kb_elmo/elmopad/keyboard.json
@@ -0,0 +1,56 @@
+{
+    "keyboard_name": "ElmoPad",
+    "manufacturer": "kb-elmo",
+    "url": "https://github.com/kb-elmo/numpad",
+    "maintainer": "kb-elmo",
+    "usb": {
+        "vid": "0xA68C",
+        "pid": "0x8B35",
+        "device_version": "0.0.1"
+    },
+    "matrix_pins": {
+        "cols": ["C0", "C1", "C2", "C3"],
+        "rows": ["C5", "C4", "B2", "B1", "D7", "B0"]
+    },
+    "diode_direction": "COL2ROW",
+    "processor": "atmega328p",
+    "bootloader": "usbasploader",
+    "features": {
+        "bootmagic": true,
+        "mousekey": false,
+        "extrakey": true
+    },
+    "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": [3, 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, 0], "x": 0, "y": 5, "w": 2},
+                {"matrix": [5, 2], "x": 2, "y": 5},
+                {"matrix": [5, 3], "x": 3, "y": 4, "h": 2}
+            ]
+        }
+    }
+}
diff --git a/keyboards/kb_elmo/elmopad/rules.mk b/keyboards/kb_elmo/elmopad/rules.mk
index 31ac76281ab..c2ee0bc86f9 100644
--- a/keyboards/kb_elmo/elmopad/rules.mk
+++ b/keyboards/kb_elmo/elmopad/rules.mk
@@ -1,15 +1,2 @@
 # Processor frequency
 F_CPU = 16000000
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
diff --git a/keyboards/kb_elmo/isolation/info.json b/keyboards/kb_elmo/isolation/info.json
deleted file mode 100644
index c381c62f702..00000000000
--- a/keyboards/kb_elmo/isolation/info.json
+++ /dev/null
@@ -1,45 +0,0 @@
-{
-    "keyboard_name": "ISOlation",
-    "manufacturer": "kb-elmo",
-    "url": "",
-    "maintainer": "kb-elmo",
-    "usb": {
-        "vid": "0xA68C",
-        "pid": "0x4EE6",
-        "device_version": "0.0.1"
-    },
-    "rgblight": {
-        "saturation_steps": 8,
-        "brightness_steps": 8,
-        "led_count": 3,
-        "sleep": true,
-        "animations": {
-            "breathing": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "knight": true,
-            "christmas": true,
-            "static_gradient": true,
-            "rgb_test": true,
-            "alternating": true,
-            "twinkle": true
-        }
-    },
-    "ws2812": {
-        "pin": "B2"
-    },
-    "processor": "atmega328p",
-    "bootloader": "usbasploader",
-    "matrix_pins": {
-        "direct": [
-            ["B0"]
-        ]
-    },
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"x": 0.25, "y": 0, "w": 1.25, "h": 2, "matrix": [0, 0]}
-            ]
-        }
-    }
-}
diff --git a/keyboards/kb_elmo/isolation/keyboard.json b/keyboards/kb_elmo/isolation/keyboard.json
new file mode 100644
index 00000000000..e7a40a55e63
--- /dev/null
+++ b/keyboards/kb_elmo/isolation/keyboard.json
@@ -0,0 +1,51 @@
+{
+    "keyboard_name": "ISOlation",
+    "manufacturer": "kb-elmo",
+    "url": "",
+    "maintainer": "kb-elmo",
+    "usb": {
+        "vid": "0xA68C",
+        "pid": "0x4EE6",
+        "device_version": "0.0.1"
+    },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 3,
+        "sleep": true,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": true,
+            "twinkle": true
+        }
+    },
+    "ws2812": {
+        "pin": "B2"
+    },
+    "processor": "atmega328p",
+    "bootloader": "usbasploader",
+    "features": {
+        "bootmagic": true,
+        "mousekey": false,
+        "extrakey": true,
+        "rgblight": true
+    },
+    "matrix_pins": {
+        "direct": [
+            ["B0"]
+        ]
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"x": 0.25, "y": 0, "w": 1.25, "h": 2, "matrix": [0, 0]}
+            ]
+        }
+    }
+}
diff --git a/keyboards/kb_elmo/isolation/rules.mk b/keyboards/kb_elmo/isolation/rules.mk
index f1b708c074f..c2ee0bc86f9 100644
--- a/keyboards/kb_elmo/isolation/rules.mk
+++ b/keyboards/kb_elmo/isolation/rules.mk
@@ -1,15 +1,2 @@
 # Processor frequency
 F_CPU = 16000000
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
diff --git a/keyboards/kb_elmo/m0110a_usb/info.json b/keyboards/kb_elmo/m0110a_usb/info.json
deleted file mode 100644
index 419efe5be35..00000000000
--- a/keyboards/kb_elmo/m0110a_usb/info.json
+++ /dev/null
@@ -1,112 +0,0 @@
-{
-    "keyboard_name": "M0110A USB",
-    "manufacturer": "kb-elmo",
-    "url": "https://github.com/kb-elmo/m0110a_usb",
-    "maintainer": "kb-elmo",
-    "usb": {
-        "vid": "0xA68C",
-        "pid": "0xDB4B",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["D7", "C0", "C1", "C2", "C3", "D1", "B4", "C6", "C7", "A7", "A6", "A5", "A4", "A3", "A2", "A1", "A0"],
-        "rows": ["B0", "B1", "B2", "B3", "D5"]
-    },
-    "diode_direction": "COL2ROW",
-    "processor": "atmega32a",
-    "bootloader": "usbasploader",
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 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": [4, 8], "x": 13, "y": 0, "w": 1.5},
-
-                {"matrix": [0, 13], "x": 15.25, "y": 0},
-                {"matrix": [0, 14], "x": 16.25, "y": 0},
-                {"matrix": [0, 15], "x": 17.25, "y": 0},
-                {"matrix": [0, 16], "x": 18.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, 13], "x": 15.25, "y": 1},
-                {"matrix": [1, 14], "x": 16.25, "y": 1},
-                {"matrix": [1, 15], "x": 17.25, "y": 1},
-                {"matrix": [1, 16], "x": 18.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": [2, 12], "x": 13.5, "y": 1, "h": 2},
-
-                {"matrix": [2, 13], "x": 15.25, "y": 2},
-                {"matrix": [2, 14], "x": 16.25, "y": 2},
-                {"matrix": [2, 15], "x": 17.25, "y": 2},
-                {"matrix": [2, 16], "x": 18.25, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 1], "x": 2.25, "y": 3},
-                {"matrix": [3, 2], "x": 3.25, "y": 3},
-                {"matrix": [3, 3], "x": 4.25, "y": 3},
-                {"matrix": [3, 4], "x": 5.25, "y": 3},
-                {"matrix": [3, 5], "x": 6.25, "y": 3},
-                {"matrix": [3, 6], "x": 7.25, "y": 3},
-                {"matrix": [3, 7], "x": 8.25, "y": 3},
-                {"matrix": [3, 8], "x": 9.25, "y": 3},
-                {"matrix": [3, 9], "x": 10.25, "y": 3},
-                {"matrix": [3, 10], "x": 11.25, "y": 3},
-                {"matrix": [3, 11], "x": 12.25, "y": 3, "w": 1.25},
-
-                {"matrix": [3, 12], "x": 13.5, "y": 3},
-
-                {"matrix": [3, 13], "x": 15.25, "y": 3},
-                {"matrix": [3, 14], "x": 16.25, "y": 3},
-                {"matrix": [3, 15], "x": 17.25, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
-                {"matrix": [4, 1], "x": 1.5, "y": 4, "w": 2},
-                {"matrix": [4, 4], "x": 3.5, "y": 4, "w": 7},
-                {"matrix": [4, 9], "x": 10.5, "y": 4},
-                {"matrix": [4, 10], "x": 11.5, "y": 4},
-                {"matrix": [4, 11], "x": 12.5, "y": 4},
-                {"matrix": [4, 12], "x": 13.5, "y": 4},
-
-                {"matrix": [4, 13], "x": 15.25, "y": 4, "w": 2},
-                {"matrix": [4, 15], "x": 17.25, "y": 4},
-                {"matrix": [4, 16], "x": 18.25, "y": 3, "h": 2}
-            ]
-        }
-    }
-}
diff --git a/keyboards/kb_elmo/m0110a_usb/keyboard.json b/keyboards/kb_elmo/m0110a_usb/keyboard.json
new file mode 100644
index 00000000000..c106e35c301
--- /dev/null
+++ b/keyboards/kb_elmo/m0110a_usb/keyboard.json
@@ -0,0 +1,117 @@
+{
+    "keyboard_name": "M0110A USB",
+    "manufacturer": "kb-elmo",
+    "url": "https://github.com/kb-elmo/m0110a_usb",
+    "maintainer": "kb-elmo",
+    "usb": {
+        "vid": "0xA68C",
+        "pid": "0xDB4B",
+        "device_version": "0.0.1"
+    },
+    "matrix_pins": {
+        "cols": ["D7", "C0", "C1", "C2", "C3", "D1", "B4", "C6", "C7", "A7", "A6", "A5", "A4", "A3", "A2", "A1", "A0"],
+        "rows": ["B0", "B1", "B2", "B3", "D5"]
+    },
+    "diode_direction": "COL2ROW",
+    "processor": "atmega32a",
+    "bootloader": "usbasploader",
+    "features": {
+        "bootmagic": true,
+        "mousekey": false,
+        "extrakey": true
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 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": [4, 8], "x": 13, "y": 0, "w": 1.5},
+
+                {"matrix": [0, 13], "x": 15.25, "y": 0},
+                {"matrix": [0, 14], "x": 16.25, "y": 0},
+                {"matrix": [0, 15], "x": 17.25, "y": 0},
+                {"matrix": [0, 16], "x": 18.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, 13], "x": 15.25, "y": 1},
+                {"matrix": [1, 14], "x": 16.25, "y": 1},
+                {"matrix": [1, 15], "x": 17.25, "y": 1},
+                {"matrix": [1, 16], "x": 18.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": [2, 12], "x": 13.5, "y": 1, "h": 2},
+
+                {"matrix": [2, 13], "x": 15.25, "y": 2},
+                {"matrix": [2, 14], "x": 16.25, "y": 2},
+                {"matrix": [2, 15], "x": 17.25, "y": 2},
+                {"matrix": [2, 16], "x": 18.25, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 10], "x": 11.25, "y": 3},
+                {"matrix": [3, 11], "x": 12.25, "y": 3, "w": 1.25},
+
+                {"matrix": [3, 12], "x": 13.5, "y": 3},
+
+                {"matrix": [3, 13], "x": 15.25, "y": 3},
+                {"matrix": [3, 14], "x": 16.25, "y": 3},
+                {"matrix": [3, 15], "x": 17.25, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4, "w": 2},
+                {"matrix": [4, 4], "x": 3.5, "y": 4, "w": 7},
+                {"matrix": [4, 9], "x": 10.5, "y": 4},
+                {"matrix": [4, 10], "x": 11.5, "y": 4},
+                {"matrix": [4, 11], "x": 12.5, "y": 4},
+                {"matrix": [4, 12], "x": 13.5, "y": 4},
+
+                {"matrix": [4, 13], "x": 15.25, "y": 4, "w": 2},
+                {"matrix": [4, 15], "x": 17.25, "y": 4},
+                {"matrix": [4, 16], "x": 18.25, "y": 3, "h": 2}
+            ]
+        }
+    }
+}
diff --git a/keyboards/kb_elmo/m0110a_usb/rules.mk b/keyboards/kb_elmo/m0110a_usb/rules.mk
index 31ac76281ab..c2ee0bc86f9 100644
--- a/keyboards/kb_elmo/m0110a_usb/rules.mk
+++ b/keyboards/kb_elmo/m0110a_usb/rules.mk
@@ -1,15 +1,2 @@
 # Processor frequency
 F_CPU = 16000000
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
diff --git a/keyboards/kb_elmo/m0116_usb/info.json b/keyboards/kb_elmo/m0116_usb/info.json
deleted file mode 100644
index 436d42a973a..00000000000
--- a/keyboards/kb_elmo/m0116_usb/info.json
+++ /dev/null
@@ -1,119 +0,0 @@
-{
-    "keyboard_name": "M0116 USB",
-    "manufacturer": "kb-elmo",
-    "url": "https://github.com/kb-elmo/m0116_usb",
-    "maintainer": "kb-elmo",
-    "usb": {
-        "vid": "0xA68C",
-        "pid": "0x8F7E",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["D6", "D5", "D1", "D0", "D7", "C0", "C1", "C2", "C3", "C4", "C5", "C6", "C7", "A7", "A6", "A5", "A4", "A3"],
-        "rows": ["B1", "A0", "B2", "A2", "A1"]
-    },
-    "diode_direction": "COL2ROW",
-    "bootmagic": {
-        "matrix": [4, 5]
-    },
-    "processor": "atmega32a",
-    "bootloader": "usbasploader",
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [4, 5], "x": 5, "y": 0, "w": 2},
-
-                {"matrix": [0, 0], "x": 0, "y": 1.15},
-                {"matrix": [0, 1], "x": 1, "y": 1.15},
-                {"matrix": [0, 2], "x": 2, "y": 1.15},
-                {"matrix": [0, 3], "x": 3, "y": 1.15},
-                {"matrix": [0, 4], "x": 4, "y": 1.15},
-                {"matrix": [0, 5], "x": 5, "y": 1.15},
-                {"matrix": [0, 6], "x": 6, "y": 1.15},
-                {"matrix": [0, 7], "x": 7, "y": 1.15},
-                {"matrix": [0, 8], "x": 8, "y": 1.15},
-                {"matrix": [0, 9], "x": 9, "y": 1.15},
-                {"matrix": [0, 10], "x": 10, "y": 1.15},
-                {"matrix": [0, 11], "x": 11, "y": 1.15},
-                {"matrix": [0, 12], "x": 12, "y": 1.15},
-                {"matrix": [0, 13], "x": 13, "y": 1.15, "w": 1.5},
-
-                {"matrix": [0, 14], "x": 15.25, "y": 1.15},
-                {"matrix": [0, 15], "x": 16.25, "y": 1.15},
-                {"matrix": [0, 16], "x": 17.25, "y": 1.15},
-                {"matrix": [0, 17], "x": 18.25, "y": 1.15},
-
-                {"matrix": [1, 0], "x": 0, "y": 2.15, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 2.15},
-                {"matrix": [1, 2], "x": 2.5, "y": 2.15},
-                {"matrix": [1, 3], "x": 3.5, "y": 2.15},
-                {"matrix": [1, 4], "x": 4.5, "y": 2.15},
-                {"matrix": [1, 5], "x": 5.5, "y": 2.15},
-                {"matrix": [1, 6], "x": 6.5, "y": 2.15},
-                {"matrix": [1, 7], "x": 7.5, "y": 2.15},
-                {"matrix": [1, 8], "x": 8.5, "y": 2.15},
-                {"matrix": [1, 9], "x": 9.5, "y": 2.15},
-                {"matrix": [1, 10], "x": 10.5, "y": 2.15},
-                {"matrix": [1, 11], "x": 11.5, "y": 2.15},
-                {"matrix": [1, 12], "x": 12.5, "y": 2.15},
-                {"matrix": [1, 14], "x": 15.25, "y": 2.15},
-                {"matrix": [1, 15], "x": 16.25, "y": 2.15},
-                {"matrix": [1, 16], "x": 17.25, "y": 2.15},
-                {"matrix": [1, 17], "x": 18.25, "y": 2.15},
-                {"matrix": [2, 0], "x": 0, "y": 3.15, "w": 1.75},
-
-                {"matrix": [2, 1], "x": 1.75, "y": 3.15},
-                {"matrix": [2, 2], "x": 2.75, "y": 3.15},
-                {"matrix": [2, 3], "x": 3.75, "y": 3.15},
-                {"matrix": [2, 4], "x": 4.75, "y": 3.15},
-                {"matrix": [2, 5], "x": 5.75, "y": 3.15},
-                {"matrix": [2, 6], "x": 6.75, "y": 3.15},
-                {"matrix": [2, 7], "x": 7.75, "y": 3.15},
-                {"matrix": [2, 8], "x": 8.75, "y": 3.15},
-                {"matrix": [2, 9], "x": 9.75, "y": 3.15},
-                {"matrix": [2, 10], "x": 10.75, "y": 3.15},
-                {"matrix": [2, 11], "x": 11.75, "y": 3.15},
-                {"matrix": [1, 13], "x": 13.5, "y": 2.15, "h": 2},
-
-                {"matrix": [2, 14], "x": 15.25, "y": 3.15},
-                {"matrix": [2, 15], "x": 16.25, "y": 3.15},
-                {"matrix": [2, 16], "x": 17.25, "y": 3.15},
-                {"matrix": [2, 17], "x": 18.25, "y": 3.15},
-
-                {"matrix": [3, 0], "x": 0, "y": 4.15, "w": 2.25},
-                {"matrix": [3, 1], "x": 2.25, "y": 4.15},
-                {"matrix": [3, 2], "x": 3.25, "y": 4.15},
-                {"matrix": [3, 3], "x": 4.25, "y": 4.15},
-                {"matrix": [3, 4], "x": 5.25, "y": 4.15},
-                {"matrix": [3, 5], "x": 6.25, "y": 4.15},
-                {"matrix": [3, 6], "x": 7.25, "y": 4.15},
-                {"matrix": [3, 7], "x": 8.25, "y": 4.15},
-                {"matrix": [3, 8], "x": 9.25, "y": 4.15},
-                {"matrix": [3, 9], "x": 10.25, "y": 4.15},
-                {"matrix": [3, 10], "x": 11.25, "y": 4.15},
-                {"matrix": [3, 13], "x": 12.25, "y": 4.15, "w": 2.25},
-
-                {"matrix": [3, 14], "x": 15.25, "y": 4.15},
-                {"matrix": [3, 15], "x": 16.25, "y": 4.15},
-                {"matrix": [3, 16], "x": 17.25, "y": 4.15},
-
-                {"matrix": [4, 0], "x": 0, "y": 5.15},
-                {"matrix": [4, 1], "x": 1, "y": 5.15},
-                {"matrix": [4, 2], "x": 2, "y": 5.15, "w": 1.75},
-                {"matrix": [4, 3], "x": 3.75, "y": 5.15},
-                {"matrix": [4, 7], "x": 4.75, "y": 5.15, "w": 4.75},
-                {"matrix": [4, 8], "x": 9.5, "y": 5.15},
-
-                {"matrix": [4, 9], "x": 10.5, "y": 5.15},
-                {"matrix": [4, 10], "x": 11.5, "y": 5.15},
-                {"matrix": [4, 11], "x": 12.5, "y": 5.15},
-
-                {"matrix": [4, 13], "x": 13.5, "y": 5.15},
-
-                {"matrix": [4, 14], "x": 15.25, "y": 5.15, "w": 2},
-                {"matrix": [4, 16], "x": 17.25, "y": 5.15},
-                {"matrix": [4, 17], "x": 18.25, "y": 4.15, "h": 2}
-            ]
-        }
-    }
-}
diff --git a/keyboards/kb_elmo/m0116_usb/keyboard.json b/keyboards/kb_elmo/m0116_usb/keyboard.json
new file mode 100644
index 00000000000..7279dc3c861
--- /dev/null
+++ b/keyboards/kb_elmo/m0116_usb/keyboard.json
@@ -0,0 +1,124 @@
+{
+    "keyboard_name": "M0116 USB",
+    "manufacturer": "kb-elmo",
+    "url": "https://github.com/kb-elmo/m0116_usb",
+    "maintainer": "kb-elmo",
+    "usb": {
+        "vid": "0xA68C",
+        "pid": "0x8F7E",
+        "device_version": "0.0.1"
+    },
+    "matrix_pins": {
+        "cols": ["D6", "D5", "D1", "D0", "D7", "C0", "C1", "C2", "C3", "C4", "C5", "C6", "C7", "A7", "A6", "A5", "A4", "A3"],
+        "rows": ["B1", "A0", "B2", "A2", "A1"]
+    },
+    "diode_direction": "COL2ROW",
+    "bootmagic": {
+        "matrix": [4, 5]
+    },
+    "processor": "atmega32a",
+    "bootloader": "usbasploader",
+    "features": {
+        "bootmagic": true,
+        "mousekey": false,
+        "extrakey": true
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [4, 5], "x": 5, "y": 0, "w": 2},
+
+                {"matrix": [0, 0], "x": 0, "y": 1.15},
+                {"matrix": [0, 1], "x": 1, "y": 1.15},
+                {"matrix": [0, 2], "x": 2, "y": 1.15},
+                {"matrix": [0, 3], "x": 3, "y": 1.15},
+                {"matrix": [0, 4], "x": 4, "y": 1.15},
+                {"matrix": [0, 5], "x": 5, "y": 1.15},
+                {"matrix": [0, 6], "x": 6, "y": 1.15},
+                {"matrix": [0, 7], "x": 7, "y": 1.15},
+                {"matrix": [0, 8], "x": 8, "y": 1.15},
+                {"matrix": [0, 9], "x": 9, "y": 1.15},
+                {"matrix": [0, 10], "x": 10, "y": 1.15},
+                {"matrix": [0, 11], "x": 11, "y": 1.15},
+                {"matrix": [0, 12], "x": 12, "y": 1.15},
+                {"matrix": [0, 13], "x": 13, "y": 1.15, "w": 1.5},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 1.15},
+                {"matrix": [0, 15], "x": 16.25, "y": 1.15},
+                {"matrix": [0, 16], "x": 17.25, "y": 1.15},
+                {"matrix": [0, 17], "x": 18.25, "y": 1.15},
+
+                {"matrix": [1, 0], "x": 0, "y": 2.15, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 2.15},
+                {"matrix": [1, 2], "x": 2.5, "y": 2.15},
+                {"matrix": [1, 3], "x": 3.5, "y": 2.15},
+                {"matrix": [1, 4], "x": 4.5, "y": 2.15},
+                {"matrix": [1, 5], "x": 5.5, "y": 2.15},
+                {"matrix": [1, 6], "x": 6.5, "y": 2.15},
+                {"matrix": [1, 7], "x": 7.5, "y": 2.15},
+                {"matrix": [1, 8], "x": 8.5, "y": 2.15},
+                {"matrix": [1, 9], "x": 9.5, "y": 2.15},
+                {"matrix": [1, 10], "x": 10.5, "y": 2.15},
+                {"matrix": [1, 11], "x": 11.5, "y": 2.15},
+                {"matrix": [1, 12], "x": 12.5, "y": 2.15},
+                {"matrix": [1, 14], "x": 15.25, "y": 2.15},
+                {"matrix": [1, 15], "x": 16.25, "y": 2.15},
+                {"matrix": [1, 16], "x": 17.25, "y": 2.15},
+                {"matrix": [1, 17], "x": 18.25, "y": 2.15},
+                {"matrix": [2, 0], "x": 0, "y": 3.15, "w": 1.75},
+
+                {"matrix": [2, 1], "x": 1.75, "y": 3.15},
+                {"matrix": [2, 2], "x": 2.75, "y": 3.15},
+                {"matrix": [2, 3], "x": 3.75, "y": 3.15},
+                {"matrix": [2, 4], "x": 4.75, "y": 3.15},
+                {"matrix": [2, 5], "x": 5.75, "y": 3.15},
+                {"matrix": [2, 6], "x": 6.75, "y": 3.15},
+                {"matrix": [2, 7], "x": 7.75, "y": 3.15},
+                {"matrix": [2, 8], "x": 8.75, "y": 3.15},
+                {"matrix": [2, 9], "x": 9.75, "y": 3.15},
+                {"matrix": [2, 10], "x": 10.75, "y": 3.15},
+                {"matrix": [2, 11], "x": 11.75, "y": 3.15},
+                {"matrix": [1, 13], "x": 13.5, "y": 2.15, "h": 2},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 3.15},
+                {"matrix": [2, 15], "x": 16.25, "y": 3.15},
+                {"matrix": [2, 16], "x": 17.25, "y": 3.15},
+                {"matrix": [2, 17], "x": 18.25, "y": 3.15},
+
+                {"matrix": [3, 0], "x": 0, "y": 4.15, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 4.15},
+                {"matrix": [3, 2], "x": 3.25, "y": 4.15},
+                {"matrix": [3, 3], "x": 4.25, "y": 4.15},
+                {"matrix": [3, 4], "x": 5.25, "y": 4.15},
+                {"matrix": [3, 5], "x": 6.25, "y": 4.15},
+                {"matrix": [3, 6], "x": 7.25, "y": 4.15},
+                {"matrix": [3, 7], "x": 8.25, "y": 4.15},
+                {"matrix": [3, 8], "x": 9.25, "y": 4.15},
+                {"matrix": [3, 9], "x": 10.25, "y": 4.15},
+                {"matrix": [3, 10], "x": 11.25, "y": 4.15},
+                {"matrix": [3, 13], "x": 12.25, "y": 4.15, "w": 2.25},
+
+                {"matrix": [3, 14], "x": 15.25, "y": 4.15},
+                {"matrix": [3, 15], "x": 16.25, "y": 4.15},
+                {"matrix": [3, 16], "x": 17.25, "y": 4.15},
+
+                {"matrix": [4, 0], "x": 0, "y": 5.15},
+                {"matrix": [4, 1], "x": 1, "y": 5.15},
+                {"matrix": [4, 2], "x": 2, "y": 5.15, "w": 1.75},
+                {"matrix": [4, 3], "x": 3.75, "y": 5.15},
+                {"matrix": [4, 7], "x": 4.75, "y": 5.15, "w": 4.75},
+                {"matrix": [4, 8], "x": 9.5, "y": 5.15},
+
+                {"matrix": [4, 9], "x": 10.5, "y": 5.15},
+                {"matrix": [4, 10], "x": 11.5, "y": 5.15},
+                {"matrix": [4, 11], "x": 12.5, "y": 5.15},
+
+                {"matrix": [4, 13], "x": 13.5, "y": 5.15},
+
+                {"matrix": [4, 14], "x": 15.25, "y": 5.15, "w": 2},
+                {"matrix": [4, 16], "x": 17.25, "y": 5.15},
+                {"matrix": [4, 17], "x": 18.25, "y": 4.15, "h": 2}
+            ]
+        }
+    }
+}
diff --git a/keyboards/kb_elmo/m0116_usb/rules.mk b/keyboards/kb_elmo/m0116_usb/rules.mk
index 31ac76281ab..c2ee0bc86f9 100644
--- a/keyboards/kb_elmo/m0116_usb/rules.mk
+++ b/keyboards/kb_elmo/m0116_usb/rules.mk
@@ -1,15 +1,2 @@
 # Processor frequency
 F_CPU = 16000000
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
diff --git a/keyboards/kb_elmo/sesame/info.json b/keyboards/kb_elmo/sesame/info.json
deleted file mode 100644
index ef10a725992..00000000000
--- a/keyboards/kb_elmo/sesame/info.json
+++ /dev/null
@@ -1,348 +0,0 @@
-{
-  "keyboard_name": "Sesame",
-  "manufacturer": "kb-elmo",
-  "url": "https://github.com/kb-elmo/sesame",
-  "maintainer": "kb-elmo",
-  "usb": {
-    "vid": "0xA68C",
-    "pid": "0xE2BD",
-    "device_version": "0.0.1"
-  },
-  "matrix_pins": {
-    "cols": ["D1", "D5", "D6", "D7", "C0", "C1", "C2", "C3", "A6", "A5", "A4", "A3", "A2", "A1", "A0"],
-    "rows": ["C4", "C5", "C6", "C7", "A7"]
-  },
-  "diode_direction": "COL2ROW",
-  "bootmagic": {
-    "matrix": [0, 1]
-  },
-  "processor": "atmega32a",
-  "bootloader": "usbasploader",
-  "community_layouts": ["alice", "alice_split_bs"],
-  "layout_aliases": {
-    "LAYOUT": "LAYOUT_alice",
-    "LAYOUT_all": "LAYOUT_alice_split_bs"
-  },
-  "layouts": {
-    "LAYOUT_alice": {
-      "layout": [
-        {"matrix": [0, 0], "x": 0, "y": 0},
-
-        {"matrix": [0, 1], "x": 1.25, "y": 0},
-        {"matrix": [0, 2], "x": 2.25, "y": 0},
-        {"matrix": [0, 3], "x": 3.25, "y": 0},
-        {"matrix": [0, 4], "x": 4.25, "y": 0},
-        {"matrix": [0, 5], "x": 5.25, "y": 0},
-        {"matrix": [0, 6], "x": 6.25, "y": 0},
-        {"matrix": [0, 7], "x": 7.25, "y": 0},
-
-        {"matrix": [0, 8], "x": 10.25, "y": 0},
-        {"matrix": [0, 9], "x": 11.25, "y": 0},
-        {"matrix": [0, 10], "x": 12.25, "y": 0},
-        {"matrix": [0, 11], "x": 13.25, "y": 0},
-        {"matrix": [0, 12], "x": 14.25, "y": 0},
-        {"matrix": [0, 13], "x": 15.25, "y": 0},
-        {"matrix": [0, 14], "x": 16.25, "y": 0, "w": 2},
-
-        {"matrix": [1, 0], "x": 0, "y": 1},
-
-        {"matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
-        {"matrix": [1, 2], "x": 2.75, "y": 1},
-        {"matrix": [1, 3], "x": 3.75, "y": 1},
-        {"matrix": [1, 4], "x": 4.75, "y": 1},
-        {"matrix": [1, 5], "x": 5.75, "y": 1},
-        {"matrix": [1, 6], "x": 6.75, "y": 1},
-
-        {"matrix": [1, 7], "x": 9.75, "y": 1},
-        {"matrix": [1, 8], "x": 10.75, "y": 1},
-        {"matrix": [1, 9], "x": 11.75, "y": 1},
-        {"matrix": [1, 10], "x": 12.75, "y": 1},
-        {"matrix": [1, 11], "x": 13.75, "y": 1},
-        {"matrix": [1, 12], "x": 14.75, "y": 1},
-        {"matrix": [1, 13], "x": 15.75, "y": 1},
-        {"matrix": [1, 14], "x": 16.75, "y": 1, "w": 1.5},
-
-        {"matrix": [2, 0], "x": 0, "y": 2},
-
-        {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
-        {"matrix": [2, 2], "x": 3, "y": 2},
-        {"matrix": [2, 3], "x": 4, "y": 2},
-        {"matrix": [2, 4], "x": 5, "y": 2},
-        {"matrix": [2, 5], "x": 6, "y": 2},
-        {"matrix": [2, 6], "x": 7, "y": 2},
-
-        {"matrix": [2, 7], "x": 10, "y": 2},
-        {"matrix": [2, 8], "x": 11, "y": 2},
-        {"matrix": [2, 9], "x": 12, "y": 2},
-        {"matrix": [2, 10], "x": 13, "y": 2},
-        {"matrix": [2, 11], "x": 14, "y": 2},
-        {"matrix": [2, 12], "x": 15, "y": 2},
-        {"matrix": [2, 14], "x": 16, "y": 2, "w": 2.25},
-
-        {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
-        {"matrix": [3, 2], "x": 3.5, "y": 3},
-        {"matrix": [3, 3], "x": 4.5, "y": 3},
-        {"matrix": [3, 4], "x": 5.5, "y": 3},
-        {"matrix": [3, 5], "x": 6.5, "y": 3},
-        {"matrix": [3, 6], "x": 7.5, "y": 3},
-
-        {"matrix": [3, 7], "x": 9.5, "y": 3},
-        {"matrix": [3, 8], "x": 10.5, "y": 3},
-        {"matrix": [3, 9], "x": 11.5, "y": 3},
-        {"matrix": [3, 10], "x": 12.5, "y": 3},
-        {"matrix": [3, 11], "x": 13.5, "y": 3},
-        {"matrix": [3, 12], "x": 14.5, "y": 3},
-        {"matrix": [3, 13], "x": 15.5, "y": 3, "w": 1.75},
-        {"matrix": [3, 14], "x": 17.25, "y": 3},
-
-        {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.5},
-        {"matrix": [4, 3], "x": 4.25, "y": 4, "w": 1.5},
-        {"matrix": [4, 5], "x": 5.75, "y": 4, "w": 2},
-        {"matrix": [4, 6], "x": 7.75, "y": 4, "w": 1.25},
-        {"matrix": [4, 8], "x": 9.5, "y": 4, "w": 2.75},
-        {"matrix": [4, 10], "x": 12.25, "y": 4, "w": 1.5},
-        {"matrix": [4, 13], "x": 16.75, "y": 4, "w": 1.5}
-      ]
-    },
-    "LAYOUT_alice_split_bs": {
-      "layout": [
-        {"matrix": [0, 0], "x": 0, "y": 0},
-
-        {"matrix": [0, 1], "x": 1.25, "y": 0},
-        {"matrix": [0, 2], "x": 2.25, "y": 0},
-        {"matrix": [0, 3], "x": 3.25, "y": 0},
-        {"matrix": [0, 4], "x": 4.25, "y": 0},
-        {"matrix": [0, 5], "x": 5.25, "y": 0},
-        {"matrix": [0, 6], "x": 6.25, "y": 0},
-        {"matrix": [0, 7], "x": 7.25, "y": 0},
-
-        {"matrix": [0, 8], "x": 10.25, "y": 0},
-        {"matrix": [0, 9], "x": 11.25, "y": 0},
-        {"matrix": [0, 10], "x": 12.25, "y": 0},
-        {"matrix": [0, 11], "x": 13.25, "y": 0},
-        {"matrix": [0, 12], "x": 14.25, "y": 0},
-        {"matrix": [0, 13], "x": 15.25, "y": 0},
-        {"matrix": [2, 13], "x": 16.25, "y": 0},
-        {"matrix": [0, 14], "x": 17.25, "y": 0},
-
-        {"matrix": [1, 0], "x": 0, "y": 1},
-
-        {"matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
-        {"matrix": [1, 2], "x": 2.75, "y": 1},
-        {"matrix": [1, 3], "x": 3.75, "y": 1},
-        {"matrix": [1, 4], "x": 4.75, "y": 1},
-        {"matrix": [1, 5], "x": 5.75, "y": 1},
-        {"matrix": [1, 6], "x": 6.75, "y": 1},
-
-        {"matrix": [1, 7], "x": 9.75, "y": 1},
-        {"matrix": [1, 8], "x": 10.75, "y": 1},
-        {"matrix": [1, 9], "x": 11.75, "y": 1},
-        {"matrix": [1, 10], "x": 12.75, "y": 1},
-        {"matrix": [1, 11], "x": 13.75, "y": 1},
-        {"matrix": [1, 12], "x": 14.75, "y": 1},
-        {"matrix": [1, 13], "x": 15.75, "y": 1},
-        {"matrix": [1, 14], "x": 16.75, "y": 1, "w": 1.5},
-
-        {"matrix": [2, 0], "x": 0, "y": 2},
-
-        {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
-        {"matrix": [2, 2], "x": 3, "y": 2},
-        {"matrix": [2, 3], "x": 4, "y": 2},
-        {"matrix": [2, 4], "x": 5, "y": 2},
-        {"matrix": [2, 5], "x": 6, "y": 2},
-        {"matrix": [2, 6], "x": 7, "y": 2},
-
-        {"matrix": [2, 7], "x": 10, "y": 2},
-        {"matrix": [2, 8], "x": 11, "y": 2},
-        {"matrix": [2, 9], "x": 12, "y": 2},
-        {"matrix": [2, 10], "x": 13, "y": 2},
-        {"matrix": [2, 11], "x": 14, "y": 2},
-        {"matrix": [2, 12], "x": 15, "y": 2},
-        {"matrix": [2, 14], "x": 16, "y": 2, "w": 2.25},
-
-        {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
-        {"matrix": [3, 2], "x": 3.5, "y": 3},
-        {"matrix": [3, 3], "x": 4.5, "y": 3},
-        {"matrix": [3, 4], "x": 5.5, "y": 3},
-        {"matrix": [3, 5], "x": 6.5, "y": 3},
-        {"matrix": [3, 6], "x": 7.5, "y": 3},
-
-        {"matrix": [3, 7], "x": 9.5, "y": 3},
-        {"matrix": [3, 8], "x": 10.5, "y": 3},
-        {"matrix": [3, 9], "x": 11.5, "y": 3},
-        {"matrix": [3, 10], "x": 12.5, "y": 3},
-        {"matrix": [3, 11], "x": 13.5, "y": 3},
-        {"matrix": [3, 12], "x": 14.5, "y": 3},
-        {"matrix": [3, 13], "x": 15.5, "y": 3, "w": 1.75},
-        {"matrix": [3, 14], "x": 17.25, "y": 3},
-
-        {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.5},
-        {"matrix": [4, 3], "x": 4.25, "y": 4, "w": 1.5},
-        {"matrix": [4, 5], "x": 5.75, "y": 4, "w": 2},
-        {"matrix": [4, 6], "x": 7.75, "y": 4, "w": 1.25},
-        {"matrix": [4, 8], "x": 9.5, "y": 4, "w": 2.75},
-        {"matrix": [4, 10], "x": 12.25, "y": 4, "w": 1.5},
-        {"matrix": [4, 13], "x": 16.75, "y": 4, "w": 1.5}
-      ]
-    },
-    "LAYOUT_long_rshift": {
-      "layout": [
-        {"matrix": [0, 0], "x": 0, "y": 0},
-
-        {"matrix": [0, 1], "x": 1.25, "y": 0},
-        {"matrix": [0, 2], "x": 2.25, "y": 0},
-        {"matrix": [0, 3], "x": 3.25, "y": 0},
-        {"matrix": [0, 4], "x": 4.25, "y": 0},
-        {"matrix": [0, 5], "x": 5.25, "y": 0},
-        {"matrix": [0, 6], "x": 6.25, "y": 0},
-        {"matrix": [0, 7], "x": 7.25, "y": 0},
-
-        {"matrix": [0, 8], "x": 10.25, "y": 0},
-        {"matrix": [0, 9], "x": 11.25, "y": 0},
-        {"matrix": [0, 10], "x": 12.25, "y": 0},
-        {"matrix": [0, 11], "x": 13.25, "y": 0},
-        {"matrix": [0, 12], "x": 14.25, "y": 0},
-        {"matrix": [0, 13], "x": 15.25, "y": 0},
-        {"matrix": [0, 14], "x": 16.25, "y": 0, "w": 2},
-
-        {"matrix": [1, 0], "x": 0, "y": 1},
-
-        {"matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
-        {"matrix": [1, 2], "x": 2.75, "y": 1},
-        {"matrix": [1, 3], "x": 3.75, "y": 1},
-        {"matrix": [1, 4], "x": 4.75, "y": 1},
-        {"matrix": [1, 5], "x": 5.75, "y": 1},
-        {"matrix": [1, 6], "x": 6.75, "y": 1},
-
-        {"matrix": [1, 7], "x": 9.75, "y": 1},
-        {"matrix": [1, 8], "x": 10.75, "y": 1},
-        {"matrix": [1, 9], "x": 11.75, "y": 1},
-        {"matrix": [1, 10], "x": 12.75, "y": 1},
-        {"matrix": [1, 11], "x": 13.75, "y": 1},
-        {"matrix": [1, 12], "x": 14.75, "y": 1},
-        {"matrix": [1, 13], "x": 15.75, "y": 1},
-        {"matrix": [1, 14], "x": 16.75, "y": 1, "w": 1.5},
-
-        {"matrix": [2, 0], "x": 0, "y": 2},
-
-        {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
-        {"matrix": [2, 2], "x": 3, "y": 2},
-        {"matrix": [2, 3], "x": 4, "y": 2},
-        {"matrix": [2, 4], "x": 5, "y": 2},
-        {"matrix": [2, 5], "x": 6, "y": 2},
-        {"matrix": [2, 6], "x": 7, "y": 2},
-
-        {"matrix": [2, 7], "x": 10, "y": 2},
-        {"matrix": [2, 8], "x": 11, "y": 2},
-        {"matrix": [2, 9], "x": 12, "y": 2},
-        {"matrix": [2, 10], "x": 13, "y": 2},
-        {"matrix": [2, 11], "x": 14, "y": 2},
-        {"matrix": [2, 12], "x": 15, "y": 2},
-        {"matrix": [2, 14], "x": 16, "y": 2, "w": 2.25},
-
-        {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
-        {"matrix": [3, 2], "x": 3.5, "y": 3},
-        {"matrix": [3, 3], "x": 4.5, "y": 3},
-        {"matrix": [3, 4], "x": 5.5, "y": 3},
-        {"matrix": [3, 5], "x": 6.5, "y": 3},
-        {"matrix": [3, 6], "x": 7.5, "y": 3},
-
-        {"matrix": [3, 7], "x": 9.5, "y": 3},
-        {"matrix": [3, 8], "x": 10.5, "y": 3},
-        {"matrix": [3, 9], "x": 11.5, "y": 3},
-        {"matrix": [3, 10], "x": 12.5, "y": 3},
-        {"matrix": [3, 11], "x": 13.5, "y": 3},
-        {"matrix": [3, 12], "x": 14.5, "y": 3},
-        {"matrix": [3, 13], "x": 15.5, "y": 3, "w": 2.75},
-
-        {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.5},
-        {"matrix": [4, 3], "x": 4.25, "y": 4, "w": 1.5},
-        {"matrix": [4, 5], "x": 5.75, "y": 4, "w": 2},
-        {"matrix": [4, 6], "x": 7.75, "y": 4, "w": 1.25},
-        {"matrix": [4, 8], "x": 9.5, "y": 4, "w": 2.75},
-        {"matrix": [4, 10], "x": 12.25, "y": 4, "w": 1.5},
-        {"matrix": [4, 13], "x": 16.75, "y": 4, "w": 1.5}
-      ]
-    },
-    "LAYOUT_split_bs": {
-      "layout": [
-        {"matrix": [0, 0], "x": 0, "y": 0},
-
-        {"matrix": [0, 1], "x": 1.25, "y": 0},
-        {"matrix": [0, 2], "x": 2.25, "y": 0},
-        {"matrix": [0, 3], "x": 3.25, "y": 0},
-        {"matrix": [0, 4], "x": 4.25, "y": 0},
-        {"matrix": [0, 5], "x": 5.25, "y": 0},
-        {"matrix": [0, 6], "x": 6.25, "y": 0},
-        {"matrix": [0, 7], "x": 7.25, "y": 0},
-
-        {"matrix": [0, 8], "x": 10.25, "y": 0},
-        {"matrix": [0, 9], "x": 11.25, "y": 0},
-        {"matrix": [0, 10], "x": 12.25, "y": 0},
-        {"matrix": [0, 11], "x": 13.25, "y": 0},
-        {"matrix": [0, 12], "x": 14.25, "y": 0},
-        {"matrix": [0, 13], "x": 15.25, "y": 0},
-        {"matrix": [2, 13], "x": 16.25, "y": 0},
-        {"matrix": [0, 14], "x": 17.25, "y": 0},
-
-        {"matrix": [1, 0], "x": 0, "y": 1},
-
-        {"matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
-        {"matrix": [1, 2], "x": 2.75, "y": 1},
-        {"matrix": [1, 3], "x": 3.75, "y": 1},
-        {"matrix": [1, 4], "x": 4.75, "y": 1},
-        {"matrix": [1, 5], "x": 5.75, "y": 1},
-        {"matrix": [1, 6], "x": 6.75, "y": 1},
-
-        {"matrix": [1, 7], "x": 9.75, "y": 1},
-        {"matrix": [1, 8], "x": 10.75, "y": 1},
-        {"matrix": [1, 9], "x": 11.75, "y": 1},
-        {"matrix": [1, 10], "x": 12.75, "y": 1},
-        {"matrix": [1, 11], "x": 13.75, "y": 1},
-        {"matrix": [1, 12], "x": 14.75, "y": 1},
-        {"matrix": [1, 13], "x": 15.75, "y": 1},
-        {"matrix": [1, 14], "x": 16.75, "y": 1, "w": 1.5},
-
-        {"matrix": [2, 0], "x": 0, "y": 2},
-
-        {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
-        {"matrix": [2, 2], "x": 3, "y": 2},
-        {"matrix": [2, 3], "x": 4, "y": 2},
-        {"matrix": [2, 4], "x": 5, "y": 2},
-        {"matrix": [2, 5], "x": 6, "y": 2},
-        {"matrix": [2, 6], "x": 7, "y": 2},
-
-        {"matrix": [2, 7], "x": 10, "y": 2},
-        {"matrix": [2, 8], "x": 11, "y": 2},
-        {"matrix": [2, 9], "x": 12, "y": 2},
-        {"matrix": [2, 10], "x": 13, "y": 2},
-        {"matrix": [2, 11], "x": 14, "y": 2},
-        {"matrix": [2, 12], "x": 15, "y": 2},
-        {"matrix": [2, 14], "x": 16, "y": 2, "w": 2.25},
-
-        {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
-        {"matrix": [3, 2], "x": 3.5, "y": 3},
-        {"matrix": [3, 3], "x": 4.5, "y": 3},
-        {"matrix": [3, 4], "x": 5.5, "y": 3},
-        {"matrix": [3, 5], "x": 6.5, "y": 3},
-        {"matrix": [3, 6], "x": 7.5, "y": 3},
-
-        {"matrix": [3, 7], "x": 9.5, "y": 3},
-        {"matrix": [3, 8], "x": 10.5, "y": 3},
-        {"matrix": [3, 9], "x": 11.5, "y": 3},
-        {"matrix": [3, 10], "x": 12.5, "y": 3},
-        {"matrix": [3, 11], "x": 13.5, "y": 3},
-        {"matrix": [3, 12], "x": 14.5, "y": 3},
-        {"matrix": [3, 13], "x": 15.5, "y": 3, "w": 2.75},
-
-        {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.5},
-        {"matrix": [4, 3], "x": 4.25, "y": 4, "w": 1.5},
-        {"matrix": [4, 5], "x": 5.75, "y": 4, "w": 2},
-        {"matrix": [4, 6], "x": 7.75, "y": 4, "w": 1.25},
-        {"matrix": [4, 8], "x": 9.5, "y": 4, "w": 2.75},
-        {"matrix": [4, 10], "x": 12.25, "y": 4, "w": 1.5},
-        {"matrix": [4, 13], "x": 16.75, "y": 4, "w": 1.5}
-      ]
-    }
-  }
-}
diff --git a/keyboards/kb_elmo/sesame/keyboard.json b/keyboards/kb_elmo/sesame/keyboard.json
new file mode 100644
index 00000000000..c962ef556d7
--- /dev/null
+++ b/keyboards/kb_elmo/sesame/keyboard.json
@@ -0,0 +1,353 @@
+{
+  "keyboard_name": "Sesame",
+  "manufacturer": "kb-elmo",
+  "url": "https://github.com/kb-elmo/sesame",
+  "maintainer": "kb-elmo",
+  "usb": {
+    "vid": "0xA68C",
+    "pid": "0xE2BD",
+    "device_version": "0.0.1"
+  },
+  "matrix_pins": {
+    "cols": ["D1", "D5", "D6", "D7", "C0", "C1", "C2", "C3", "A6", "A5", "A4", "A3", "A2", "A1", "A0"],
+    "rows": ["C4", "C5", "C6", "C7", "A7"]
+  },
+  "diode_direction": "COL2ROW",
+  "bootmagic": {
+    "matrix": [0, 1]
+  },
+  "processor": "atmega32a",
+  "bootloader": "usbasploader",
+  "features": {
+    "bootmagic": true,
+    "mousekey": false,
+    "extrakey": true
+  },
+  "community_layouts": ["alice", "alice_split_bs"],
+  "layout_aliases": {
+    "LAYOUT": "LAYOUT_alice",
+    "LAYOUT_all": "LAYOUT_alice_split_bs"
+  },
+  "layouts": {
+    "LAYOUT_alice": {
+      "layout": [
+        {"matrix": [0, 0], "x": 0, "y": 0},
+
+        {"matrix": [0, 1], "x": 1.25, "y": 0},
+        {"matrix": [0, 2], "x": 2.25, "y": 0},
+        {"matrix": [0, 3], "x": 3.25, "y": 0},
+        {"matrix": [0, 4], "x": 4.25, "y": 0},
+        {"matrix": [0, 5], "x": 5.25, "y": 0},
+        {"matrix": [0, 6], "x": 6.25, "y": 0},
+        {"matrix": [0, 7], "x": 7.25, "y": 0},
+
+        {"matrix": [0, 8], "x": 10.25, "y": 0},
+        {"matrix": [0, 9], "x": 11.25, "y": 0},
+        {"matrix": [0, 10], "x": 12.25, "y": 0},
+        {"matrix": [0, 11], "x": 13.25, "y": 0},
+        {"matrix": [0, 12], "x": 14.25, "y": 0},
+        {"matrix": [0, 13], "x": 15.25, "y": 0},
+        {"matrix": [0, 14], "x": 16.25, "y": 0, "w": 2},
+
+        {"matrix": [1, 0], "x": 0, "y": 1},
+
+        {"matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
+        {"matrix": [1, 2], "x": 2.75, "y": 1},
+        {"matrix": [1, 3], "x": 3.75, "y": 1},
+        {"matrix": [1, 4], "x": 4.75, "y": 1},
+        {"matrix": [1, 5], "x": 5.75, "y": 1},
+        {"matrix": [1, 6], "x": 6.75, "y": 1},
+
+        {"matrix": [1, 7], "x": 9.75, "y": 1},
+        {"matrix": [1, 8], "x": 10.75, "y": 1},
+        {"matrix": [1, 9], "x": 11.75, "y": 1},
+        {"matrix": [1, 10], "x": 12.75, "y": 1},
+        {"matrix": [1, 11], "x": 13.75, "y": 1},
+        {"matrix": [1, 12], "x": 14.75, "y": 1},
+        {"matrix": [1, 13], "x": 15.75, "y": 1},
+        {"matrix": [1, 14], "x": 16.75, "y": 1, "w": 1.5},
+
+        {"matrix": [2, 0], "x": 0, "y": 2},
+
+        {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
+        {"matrix": [2, 2], "x": 3, "y": 2},
+        {"matrix": [2, 3], "x": 4, "y": 2},
+        {"matrix": [2, 4], "x": 5, "y": 2},
+        {"matrix": [2, 5], "x": 6, "y": 2},
+        {"matrix": [2, 6], "x": 7, "y": 2},
+
+        {"matrix": [2, 7], "x": 10, "y": 2},
+        {"matrix": [2, 8], "x": 11, "y": 2},
+        {"matrix": [2, 9], "x": 12, "y": 2},
+        {"matrix": [2, 10], "x": 13, "y": 2},
+        {"matrix": [2, 11], "x": 14, "y": 2},
+        {"matrix": [2, 12], "x": 15, "y": 2},
+        {"matrix": [2, 14], "x": 16, "y": 2, "w": 2.25},
+
+        {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
+        {"matrix": [3, 2], "x": 3.5, "y": 3},
+        {"matrix": [3, 3], "x": 4.5, "y": 3},
+        {"matrix": [3, 4], "x": 5.5, "y": 3},
+        {"matrix": [3, 5], "x": 6.5, "y": 3},
+        {"matrix": [3, 6], "x": 7.5, "y": 3},
+
+        {"matrix": [3, 7], "x": 9.5, "y": 3},
+        {"matrix": [3, 8], "x": 10.5, "y": 3},
+        {"matrix": [3, 9], "x": 11.5, "y": 3},
+        {"matrix": [3, 10], "x": 12.5, "y": 3},
+        {"matrix": [3, 11], "x": 13.5, "y": 3},
+        {"matrix": [3, 12], "x": 14.5, "y": 3},
+        {"matrix": [3, 13], "x": 15.5, "y": 3, "w": 1.75},
+        {"matrix": [3, 14], "x": 17.25, "y": 3},
+
+        {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.5},
+        {"matrix": [4, 3], "x": 4.25, "y": 4, "w": 1.5},
+        {"matrix": [4, 5], "x": 5.75, "y": 4, "w": 2},
+        {"matrix": [4, 6], "x": 7.75, "y": 4, "w": 1.25},
+        {"matrix": [4, 8], "x": 9.5, "y": 4, "w": 2.75},
+        {"matrix": [4, 10], "x": 12.25, "y": 4, "w": 1.5},
+        {"matrix": [4, 13], "x": 16.75, "y": 4, "w": 1.5}
+      ]
+    },
+    "LAYOUT_alice_split_bs": {
+      "layout": [
+        {"matrix": [0, 0], "x": 0, "y": 0},
+
+        {"matrix": [0, 1], "x": 1.25, "y": 0},
+        {"matrix": [0, 2], "x": 2.25, "y": 0},
+        {"matrix": [0, 3], "x": 3.25, "y": 0},
+        {"matrix": [0, 4], "x": 4.25, "y": 0},
+        {"matrix": [0, 5], "x": 5.25, "y": 0},
+        {"matrix": [0, 6], "x": 6.25, "y": 0},
+        {"matrix": [0, 7], "x": 7.25, "y": 0},
+
+        {"matrix": [0, 8], "x": 10.25, "y": 0},
+        {"matrix": [0, 9], "x": 11.25, "y": 0},
+        {"matrix": [0, 10], "x": 12.25, "y": 0},
+        {"matrix": [0, 11], "x": 13.25, "y": 0},
+        {"matrix": [0, 12], "x": 14.25, "y": 0},
+        {"matrix": [0, 13], "x": 15.25, "y": 0},
+        {"matrix": [2, 13], "x": 16.25, "y": 0},
+        {"matrix": [0, 14], "x": 17.25, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1},
+
+        {"matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
+        {"matrix": [1, 2], "x": 2.75, "y": 1},
+        {"matrix": [1, 3], "x": 3.75, "y": 1},
+        {"matrix": [1, 4], "x": 4.75, "y": 1},
+        {"matrix": [1, 5], "x": 5.75, "y": 1},
+        {"matrix": [1, 6], "x": 6.75, "y": 1},
+
+        {"matrix": [1, 7], "x": 9.75, "y": 1},
+        {"matrix": [1, 8], "x": 10.75, "y": 1},
+        {"matrix": [1, 9], "x": 11.75, "y": 1},
+        {"matrix": [1, 10], "x": 12.75, "y": 1},
+        {"matrix": [1, 11], "x": 13.75, "y": 1},
+        {"matrix": [1, 12], "x": 14.75, "y": 1},
+        {"matrix": [1, 13], "x": 15.75, "y": 1},
+        {"matrix": [1, 14], "x": 16.75, "y": 1, "w": 1.5},
+
+        {"matrix": [2, 0], "x": 0, "y": 2},
+
+        {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
+        {"matrix": [2, 2], "x": 3, "y": 2},
+        {"matrix": [2, 3], "x": 4, "y": 2},
+        {"matrix": [2, 4], "x": 5, "y": 2},
+        {"matrix": [2, 5], "x": 6, "y": 2},
+        {"matrix": [2, 6], "x": 7, "y": 2},
+
+        {"matrix": [2, 7], "x": 10, "y": 2},
+        {"matrix": [2, 8], "x": 11, "y": 2},
+        {"matrix": [2, 9], "x": 12, "y": 2},
+        {"matrix": [2, 10], "x": 13, "y": 2},
+        {"matrix": [2, 11], "x": 14, "y": 2},
+        {"matrix": [2, 12], "x": 15, "y": 2},
+        {"matrix": [2, 14], "x": 16, "y": 2, "w": 2.25},
+
+        {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
+        {"matrix": [3, 2], "x": 3.5, "y": 3},
+        {"matrix": [3, 3], "x": 4.5, "y": 3},
+        {"matrix": [3, 4], "x": 5.5, "y": 3},
+        {"matrix": [3, 5], "x": 6.5, "y": 3},
+        {"matrix": [3, 6], "x": 7.5, "y": 3},
+
+        {"matrix": [3, 7], "x": 9.5, "y": 3},
+        {"matrix": [3, 8], "x": 10.5, "y": 3},
+        {"matrix": [3, 9], "x": 11.5, "y": 3},
+        {"matrix": [3, 10], "x": 12.5, "y": 3},
+        {"matrix": [3, 11], "x": 13.5, "y": 3},
+        {"matrix": [3, 12], "x": 14.5, "y": 3},
+        {"matrix": [3, 13], "x": 15.5, "y": 3, "w": 1.75},
+        {"matrix": [3, 14], "x": 17.25, "y": 3},
+
+        {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.5},
+        {"matrix": [4, 3], "x": 4.25, "y": 4, "w": 1.5},
+        {"matrix": [4, 5], "x": 5.75, "y": 4, "w": 2},
+        {"matrix": [4, 6], "x": 7.75, "y": 4, "w": 1.25},
+        {"matrix": [4, 8], "x": 9.5, "y": 4, "w": 2.75},
+        {"matrix": [4, 10], "x": 12.25, "y": 4, "w": 1.5},
+        {"matrix": [4, 13], "x": 16.75, "y": 4, "w": 1.5}
+      ]
+    },
+    "LAYOUT_long_rshift": {
+      "layout": [
+        {"matrix": [0, 0], "x": 0, "y": 0},
+
+        {"matrix": [0, 1], "x": 1.25, "y": 0},
+        {"matrix": [0, 2], "x": 2.25, "y": 0},
+        {"matrix": [0, 3], "x": 3.25, "y": 0},
+        {"matrix": [0, 4], "x": 4.25, "y": 0},
+        {"matrix": [0, 5], "x": 5.25, "y": 0},
+        {"matrix": [0, 6], "x": 6.25, "y": 0},
+        {"matrix": [0, 7], "x": 7.25, "y": 0},
+
+        {"matrix": [0, 8], "x": 10.25, "y": 0},
+        {"matrix": [0, 9], "x": 11.25, "y": 0},
+        {"matrix": [0, 10], "x": 12.25, "y": 0},
+        {"matrix": [0, 11], "x": 13.25, "y": 0},
+        {"matrix": [0, 12], "x": 14.25, "y": 0},
+        {"matrix": [0, 13], "x": 15.25, "y": 0},
+        {"matrix": [0, 14], "x": 16.25, "y": 0, "w": 2},
+
+        {"matrix": [1, 0], "x": 0, "y": 1},
+
+        {"matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
+        {"matrix": [1, 2], "x": 2.75, "y": 1},
+        {"matrix": [1, 3], "x": 3.75, "y": 1},
+        {"matrix": [1, 4], "x": 4.75, "y": 1},
+        {"matrix": [1, 5], "x": 5.75, "y": 1},
+        {"matrix": [1, 6], "x": 6.75, "y": 1},
+
+        {"matrix": [1, 7], "x": 9.75, "y": 1},
+        {"matrix": [1, 8], "x": 10.75, "y": 1},
+        {"matrix": [1, 9], "x": 11.75, "y": 1},
+        {"matrix": [1, 10], "x": 12.75, "y": 1},
+        {"matrix": [1, 11], "x": 13.75, "y": 1},
+        {"matrix": [1, 12], "x": 14.75, "y": 1},
+        {"matrix": [1, 13], "x": 15.75, "y": 1},
+        {"matrix": [1, 14], "x": 16.75, "y": 1, "w": 1.5},
+
+        {"matrix": [2, 0], "x": 0, "y": 2},
+
+        {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
+        {"matrix": [2, 2], "x": 3, "y": 2},
+        {"matrix": [2, 3], "x": 4, "y": 2},
+        {"matrix": [2, 4], "x": 5, "y": 2},
+        {"matrix": [2, 5], "x": 6, "y": 2},
+        {"matrix": [2, 6], "x": 7, "y": 2},
+
+        {"matrix": [2, 7], "x": 10, "y": 2},
+        {"matrix": [2, 8], "x": 11, "y": 2},
+        {"matrix": [2, 9], "x": 12, "y": 2},
+        {"matrix": [2, 10], "x": 13, "y": 2},
+        {"matrix": [2, 11], "x": 14, "y": 2},
+        {"matrix": [2, 12], "x": 15, "y": 2},
+        {"matrix": [2, 14], "x": 16, "y": 2, "w": 2.25},
+
+        {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
+        {"matrix": [3, 2], "x": 3.5, "y": 3},
+        {"matrix": [3, 3], "x": 4.5, "y": 3},
+        {"matrix": [3, 4], "x": 5.5, "y": 3},
+        {"matrix": [3, 5], "x": 6.5, "y": 3},
+        {"matrix": [3, 6], "x": 7.5, "y": 3},
+
+        {"matrix": [3, 7], "x": 9.5, "y": 3},
+        {"matrix": [3, 8], "x": 10.5, "y": 3},
+        {"matrix": [3, 9], "x": 11.5, "y": 3},
+        {"matrix": [3, 10], "x": 12.5, "y": 3},
+        {"matrix": [3, 11], "x": 13.5, "y": 3},
+        {"matrix": [3, 12], "x": 14.5, "y": 3},
+        {"matrix": [3, 13], "x": 15.5, "y": 3, "w": 2.75},
+
+        {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.5},
+        {"matrix": [4, 3], "x": 4.25, "y": 4, "w": 1.5},
+        {"matrix": [4, 5], "x": 5.75, "y": 4, "w": 2},
+        {"matrix": [4, 6], "x": 7.75, "y": 4, "w": 1.25},
+        {"matrix": [4, 8], "x": 9.5, "y": 4, "w": 2.75},
+        {"matrix": [4, 10], "x": 12.25, "y": 4, "w": 1.5},
+        {"matrix": [4, 13], "x": 16.75, "y": 4, "w": 1.5}
+      ]
+    },
+    "LAYOUT_split_bs": {
+      "layout": [
+        {"matrix": [0, 0], "x": 0, "y": 0},
+
+        {"matrix": [0, 1], "x": 1.25, "y": 0},
+        {"matrix": [0, 2], "x": 2.25, "y": 0},
+        {"matrix": [0, 3], "x": 3.25, "y": 0},
+        {"matrix": [0, 4], "x": 4.25, "y": 0},
+        {"matrix": [0, 5], "x": 5.25, "y": 0},
+        {"matrix": [0, 6], "x": 6.25, "y": 0},
+        {"matrix": [0, 7], "x": 7.25, "y": 0},
+
+        {"matrix": [0, 8], "x": 10.25, "y": 0},
+        {"matrix": [0, 9], "x": 11.25, "y": 0},
+        {"matrix": [0, 10], "x": 12.25, "y": 0},
+        {"matrix": [0, 11], "x": 13.25, "y": 0},
+        {"matrix": [0, 12], "x": 14.25, "y": 0},
+        {"matrix": [0, 13], "x": 15.25, "y": 0},
+        {"matrix": [2, 13], "x": 16.25, "y": 0},
+        {"matrix": [0, 14], "x": 17.25, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1},
+
+        {"matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
+        {"matrix": [1, 2], "x": 2.75, "y": 1},
+        {"matrix": [1, 3], "x": 3.75, "y": 1},
+        {"matrix": [1, 4], "x": 4.75, "y": 1},
+        {"matrix": [1, 5], "x": 5.75, "y": 1},
+        {"matrix": [1, 6], "x": 6.75, "y": 1},
+
+        {"matrix": [1, 7], "x": 9.75, "y": 1},
+        {"matrix": [1, 8], "x": 10.75, "y": 1},
+        {"matrix": [1, 9], "x": 11.75, "y": 1},
+        {"matrix": [1, 10], "x": 12.75, "y": 1},
+        {"matrix": [1, 11], "x": 13.75, "y": 1},
+        {"matrix": [1, 12], "x": 14.75, "y": 1},
+        {"matrix": [1, 13], "x": 15.75, "y": 1},
+        {"matrix": [1, 14], "x": 16.75, "y": 1, "w": 1.5},
+
+        {"matrix": [2, 0], "x": 0, "y": 2},
+
+        {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
+        {"matrix": [2, 2], "x": 3, "y": 2},
+        {"matrix": [2, 3], "x": 4, "y": 2},
+        {"matrix": [2, 4], "x": 5, "y": 2},
+        {"matrix": [2, 5], "x": 6, "y": 2},
+        {"matrix": [2, 6], "x": 7, "y": 2},
+
+        {"matrix": [2, 7], "x": 10, "y": 2},
+        {"matrix": [2, 8], "x": 11, "y": 2},
+        {"matrix": [2, 9], "x": 12, "y": 2},
+        {"matrix": [2, 10], "x": 13, "y": 2},
+        {"matrix": [2, 11], "x": 14, "y": 2},
+        {"matrix": [2, 12], "x": 15, "y": 2},
+        {"matrix": [2, 14], "x": 16, "y": 2, "w": 2.25},
+
+        {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
+        {"matrix": [3, 2], "x": 3.5, "y": 3},
+        {"matrix": [3, 3], "x": 4.5, "y": 3},
+        {"matrix": [3, 4], "x": 5.5, "y": 3},
+        {"matrix": [3, 5], "x": 6.5, "y": 3},
+        {"matrix": [3, 6], "x": 7.5, "y": 3},
+
+        {"matrix": [3, 7], "x": 9.5, "y": 3},
+        {"matrix": [3, 8], "x": 10.5, "y": 3},
+        {"matrix": [3, 9], "x": 11.5, "y": 3},
+        {"matrix": [3, 10], "x": 12.5, "y": 3},
+        {"matrix": [3, 11], "x": 13.5, "y": 3},
+        {"matrix": [3, 12], "x": 14.5, "y": 3},
+        {"matrix": [3, 13], "x": 15.5, "y": 3, "w": 2.75},
+
+        {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.5},
+        {"matrix": [4, 3], "x": 4.25, "y": 4, "w": 1.5},
+        {"matrix": [4, 5], "x": 5.75, "y": 4, "w": 2},
+        {"matrix": [4, 6], "x": 7.75, "y": 4, "w": 1.25},
+        {"matrix": [4, 8], "x": 9.5, "y": 4, "w": 2.75},
+        {"matrix": [4, 10], "x": 12.25, "y": 4, "w": 1.5},
+        {"matrix": [4, 13], "x": 16.75, "y": 4, "w": 1.5}
+      ]
+    }
+  }
+}
diff --git a/keyboards/kb_elmo/sesame/rules.mk b/keyboards/kb_elmo/sesame/rules.mk
index 31ac76281ab..c2ee0bc86f9 100644
--- a/keyboards/kb_elmo/sesame/rules.mk
+++ b/keyboards/kb_elmo/sesame/rules.mk
@@ -1,15 +1,2 @@
 # Processor frequency
 F_CPU = 16000000
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
diff --git a/keyboards/kb_elmo/twelvekey/info.json b/keyboards/kb_elmo/twelvekey/info.json
deleted file mode 100644
index 95091845e33..00000000000
--- a/keyboards/kb_elmo/twelvekey/info.json
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-    "keyboard_name": "Twelvekey",
-    "manufacturer": "kb-elmo",
-    "url": "https://github.com/kb-elmo/twelvekey",
-    "maintainer": "kb-elmo",
-    "usb": {
-        "vid": "0xA68C",
-        "pid": "0x9879",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["C5", "D0", "B0", "D6"],
-        "rows": ["D1", "C4", "D7"]
-    },
-    "diode_direction": "COL2ROW",
-    "backlight": {
-        "pin": "B1",
-        "levels": 8,
-        "on_state": 0
-    },
-    "processor": "atmega328p",
-    "bootloader": "usbasploader",
-    "layouts": {
-        "LAYOUT_ortho_3x4": {
-            "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": [2, 3], "x": 3, "y": 2}
-            ]
-        }
-    }
-}
diff --git a/keyboards/kb_elmo/twelvekey/keyboard.json b/keyboards/kb_elmo/twelvekey/keyboard.json
new file mode 100644
index 00000000000..3d60c081147
--- /dev/null
+++ b/keyboards/kb_elmo/twelvekey/keyboard.json
@@ -0,0 +1,49 @@
+{
+    "keyboard_name": "Twelvekey",
+    "manufacturer": "kb-elmo",
+    "url": "https://github.com/kb-elmo/twelvekey",
+    "maintainer": "kb-elmo",
+    "usb": {
+        "vid": "0xA68C",
+        "pid": "0x9879",
+        "device_version": "0.0.1"
+    },
+    "matrix_pins": {
+        "cols": ["C5", "D0", "B0", "D6"],
+        "rows": ["D1", "C4", "D7"]
+    },
+    "diode_direction": "COL2ROW",
+    "backlight": {
+        "pin": "B1",
+        "levels": 8,
+        "on_state": 0
+    },
+    "processor": "atmega328p",
+    "bootloader": "usbasploader",
+    "features": {
+        "bootmagic": true,
+        "mousekey": false,
+        "extrakey": true,
+        "backlight": true
+    },
+    "layouts": {
+        "LAYOUT_ortho_3x4": {
+            "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": [2, 3], "x": 3, "y": 2}
+            ]
+        }
+    }
+}
diff --git a/keyboards/kb_elmo/twelvekey/rules.mk b/keyboards/kb_elmo/twelvekey/rules.mk
index 7d1ccce5cb8..c2ee0bc86f9 100644
--- a/keyboards/kb_elmo/twelvekey/rules.mk
+++ b/keyboards/kb_elmo/twelvekey/rules.mk
@@ -1,15 +1,2 @@
 # Processor frequency
 F_CPU = 16000000
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
diff --git a/keyboards/kbdfans/bella/rgb/info.json b/keyboards/kbdfans/bella/rgb/info.json
deleted file mode 100644
index c6486e0b39d..00000000000
--- a/keyboards/kbdfans/bella/rgb/info.json
+++ /dev/null
@@ -1,169 +0,0 @@
-{
-    "keyboard_name": "Bella RGB ANSI",
-    "manufacturer": "KBDfans",
-    "url": "",
-    "maintainer": "moyi4681",
-    "usb": {
-        "vid": "0x4B42",
-        "pid": "0x0008",
-        "device_version": "0.0.1"
-    },
-    "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,
-            "rainbow_moving_chevron": true,
-            "cycle_out_in": true,
-            "cycle_out_in_dual": 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_rain": true,
-            "pixel_flow": true,
-            "pixel_fractal": 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,
-            "solid_splash": true
-        },
-        "default": {
-            "animation": "cycle_all"
-        },
-        "driver": "is31fl3741",
-        "led_flush_limit": 26,
-        "led_process_limit": 4,
-        "sleep": true
-    },
-    "matrix_pins": {
-        "cols": ["C6", "C7", "F7", "F6", "F5", "F4", "F1", "F0", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5"],
-        "rows": ["B0", "B1", "B2", "B3", "B7", "B6"]
-    },
-    "diode_direction": "COL2ROW",
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "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.5, "y": 0},
-                {"matrix": [0, 7], "x": 7.5, "y": 0},
-                {"matrix": [0, 8], "x": 8.5, "y": 0},
-                {"matrix": [0, 9], "x": 9.5, "y": 0},
-
-                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"matrix": [0, 13], "x": 13, "y": 0},
-                {"matrix": [0, 14], "x": 14, "y": 0},
-
-                {"matrix": [0, 15], "x": 15.25, "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": [1, 4], "x": 4, "y": 1},
-                {"matrix": [1, 5], "x": 5, "y": 1},
-                {"matrix": [1, 6], "x": 6, "y": 1},
-                {"matrix": [1, 7], "x": 7, "y": 1},
-                {"matrix": [1, 8], "x": 8, "y": 1},
-                {"matrix": [1, 9], "x": 9, "y": 1},
-                {"matrix": [1, 10], "x": 10, "y": 1},
-                {"matrix": [1, 11], "x": 11, "y": 1},
-                {"matrix": [1, 12], "x": 12, "y": 1},
-                {"matrix": [1, 14], "x": 13, "y": 1, "w": 2},
-
-                {"matrix": [1, 15], "x": 15.25, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
-                {"matrix": [2, 1], "x": 1.5, "y": 2},
-                {"matrix": [2, 2], "x": 2.5, "y": 2},
-                {"matrix": [2, 3], "x": 3.5, "y": 2},
-                {"matrix": [2, 4], "x": 4.5, "y": 2},
-                {"matrix": [2, 5], "x": 5.5, "y": 2},
-                {"matrix": [2, 6], "x": 6.5, "y": 2},
-                {"matrix": [2, 7], "x": 7.5, "y": 2},
-                {"matrix": [2, 8], "x": 8.5, "y": 2},
-                {"matrix": [2, 9], "x": 9.5, "y": 2},
-                {"matrix": [2, 10], "x": 10.5, "y": 2},
-                {"matrix": [2, 11], "x": 11.5, "y": 2},
-                {"matrix": [2, 12], "x": 12.5, "y": 2},
-                {"matrix": [2, 13], "x": 13.5, "y": 2, "w": 1.5},
-
-                {"matrix": [2, 15], "x": 15.25, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
-                {"matrix": [3, 1], "x": 1.75, "y": 3},
-                {"matrix": [3, 2], "x": 2.75, "y": 3},
-                {"matrix": [3, 3], "x": 3.75, "y": 3},
-                {"matrix": [3, 4], "x": 4.75, "y": 3},
-                {"matrix": [3, 5], "x": 5.75, "y": 3},
-                {"matrix": [3, 6], "x": 6.75, "y": 3},
-                {"matrix": [3, 7], "x": 7.75, "y": 3},
-                {"matrix": [3, 8], "x": 8.75, "y": 3},
-                {"matrix": [3, 9], "x": 9.75, "y": 3},
-                {"matrix": [3, 10], "x": 10.75, "y": 3},
-                {"matrix": [3, 11], "x": 11.75, "y": 3},
-                {"matrix": [3, 13], "x": 12.75, "y": 3, "w": 2.25},
-
-                {"matrix": [3, 15], "x": 15.25, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 2.25},
-                {"matrix": [4, 2], "x": 2.25, "y": 4},
-                {"matrix": [4, 3], "x": 3.25, "y": 4},
-                {"matrix": [4, 4], "x": 4.25, "y": 4},
-                {"matrix": [4, 5], "x": 5.25, "y": 4},
-                {"matrix": [4, 6], "x": 6.25, "y": 4},
-                {"matrix": [4, 7], "x": 7.25, "y": 4},
-                {"matrix": [4, 8], "x": 8.25, "y": 4},
-                {"matrix": [4, 9], "x": 9.25, "y": 4},
-                {"matrix": [4, 10], "x": 10.25, "y": 4},
-                {"matrix": [4, 11], "x": 11.25, "y": 4},
-                {"matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.75},
-
-                {"matrix": [4, 14], "x": 14.25, "y": 4.25},
-
-                {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
-                {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
-                {"matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25},
-                {"matrix": [5, 6], "x": 3.75, "y": 5, "w": 6.25},
-                {"matrix": [5, 10], "x": 10, "y": 5, "w": 1.5},
-                {"matrix": [5, 11], "x": 11.5, "y": 5, "w": 1.5},
-
-                {"matrix": [5, 12], "x": 13.25, "y": 5.25},
-                {"matrix": [5, 14], "x": 14.25, "y": 5.25},
-                {"matrix": [5, 15], "x": 15.25, "y": 5.25}
-            ]
-        }
-    }
-}
diff --git a/keyboards/kbdfans/bella/rgb/keyboard.json b/keyboards/kbdfans/bella/rgb/keyboard.json
new file mode 100644
index 00000000000..50310e36679
--- /dev/null
+++ b/keyboards/kbdfans/bella/rgb/keyboard.json
@@ -0,0 +1,179 @@
+{
+    "keyboard_name": "Bella RGB ANSI",
+    "manufacturer": "KBDfans",
+    "url": "",
+    "maintainer": "moyi4681",
+    "usb": {
+        "vid": "0x4B42",
+        "pid": "0x0008",
+        "device_version": "0.0.1"
+    },
+    "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,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": 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_rain": true,
+            "pixel_flow": true,
+            "pixel_fractal": 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,
+            "solid_splash": true
+        },
+        "default": {
+            "animation": "cycle_all"
+        },
+        "driver": "is31fl3741",
+        "led_flush_limit": 26,
+        "led_process_limit": 4,
+        "sleep": true
+    },
+    "matrix_pins": {
+        "cols": ["C6", "C7", "F7", "F6", "F5", "F4", "F1", "F0", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5"],
+        "rows": ["B0", "B1", "B2", "B3", "B7", "B6"]
+    },
+    "diode_direction": "COL2ROW",
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "nkro": true,
+        "rgb_matrix": true
+    },
+    "build": {
+        "lto": true
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "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.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+
+                {"matrix": [0, 15], "x": 15.25, "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": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+                {"matrix": [1, 12], "x": 12, "y": 1},
+                {"matrix": [1, 14], "x": 13, "y": 1, "w": 2},
+
+                {"matrix": [1, 15], "x": 15.25, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2},
+                {"matrix": [2, 2], "x": 2.5, "y": 2},
+                {"matrix": [2, 3], "x": 3.5, "y": 2},
+                {"matrix": [2, 4], "x": 4.5, "y": 2},
+                {"matrix": [2, 5], "x": 5.5, "y": 2},
+                {"matrix": [2, 6], "x": 6.5, "y": 2},
+                {"matrix": [2, 7], "x": 7.5, "y": 2},
+                {"matrix": [2, 8], "x": 8.5, "y": 2},
+                {"matrix": [2, 9], "x": 9.5, "y": 2},
+                {"matrix": [2, 10], "x": 10.5, "y": 2},
+                {"matrix": [2, 11], "x": 11.5, "y": 2},
+                {"matrix": [2, 12], "x": 12.5, "y": 2},
+                {"matrix": [2, 13], "x": 13.5, "y": 2, "w": 1.5},
+
+                {"matrix": [2, 15], "x": 15.25, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3},
+                {"matrix": [3, 2], "x": 2.75, "y": 3},
+                {"matrix": [3, 3], "x": 3.75, "y": 3},
+                {"matrix": [3, 4], "x": 4.75, "y": 3},
+                {"matrix": [3, 5], "x": 5.75, "y": 3},
+                {"matrix": [3, 6], "x": 6.75, "y": 3},
+                {"matrix": [3, 7], "x": 7.75, "y": 3},
+                {"matrix": [3, 8], "x": 8.75, "y": 3},
+                {"matrix": [3, 9], "x": 9.75, "y": 3},
+                {"matrix": [3, 10], "x": 10.75, "y": 3},
+                {"matrix": [3, 11], "x": 11.75, "y": 3},
+                {"matrix": [3, 13], "x": 12.75, "y": 3, "w": 2.25},
+
+                {"matrix": [3, 15], "x": 15.25, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4},
+                {"matrix": [4, 3], "x": 3.25, "y": 4},
+                {"matrix": [4, 4], "x": 4.25, "y": 4},
+                {"matrix": [4, 5], "x": 5.25, "y": 4},
+                {"matrix": [4, 6], "x": 6.25, "y": 4},
+                {"matrix": [4, 7], "x": 7.25, "y": 4},
+                {"matrix": [4, 8], "x": 8.25, "y": 4},
+                {"matrix": [4, 9], "x": 9.25, "y": 4},
+                {"matrix": [4, 10], "x": 10.25, "y": 4},
+                {"matrix": [4, 11], "x": 11.25, "y": 4},
+                {"matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.75},
+
+                {"matrix": [4, 14], "x": 14.25, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5, "w": 1.5},
+                {"matrix": [5, 11], "x": 11.5, "y": 5, "w": 1.5},
+
+                {"matrix": [5, 12], "x": 13.25, "y": 5.25},
+                {"matrix": [5, 14], "x": 14.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 15.25, "y": 5.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/kbdfans/bella/rgb/rules.mk b/keyboards/kbdfans/bella/rgb/rules.mk
deleted file mode 100644
index 3d0767ea6d8..00000000000
--- a/keyboards/kbdfans/bella/rgb/rules.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes          # Mouse keys
-EXTRAKEY_ENABLE = yes          # Audio control and System control
-CONSOLE_ENABLE = no            # Console for debug
-COMMAND_ENABLE = no            # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no          # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no           # Enable keyboard RGB underglow
-AUDIO_ENABLE = no              # Audio output
-RGB_MATRIX_ENABLE = yes
-
-LTO_ENABLE = yes
diff --git a/keyboards/kbdfans/bella/rgb_iso/info.json b/keyboards/kbdfans/bella/rgb_iso/info.json
deleted file mode 100644
index 17ca4333fd9..00000000000
--- a/keyboards/kbdfans/bella/rgb_iso/info.json
+++ /dev/null
@@ -1,170 +0,0 @@
-{
-    "keyboard_name": "Bella RGB ISO",
-    "manufacturer": "KBDfans",
-    "url": "",
-    "maintainer": "moyi4681",
-    "usb": {
-        "vid": "0x4B42",
-        "pid": "0x0009",
-        "device_version": "0.0.1"
-    },
-    "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,
-            "rainbow_moving_chevron": true,
-            "cycle_out_in": true,
-            "cycle_out_in_dual": 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_rain": true,
-            "pixel_flow": true,
-            "pixel_fractal": 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,
-            "solid_splash": true
-        },
-        "default": {
-            "animation": "cycle_all"
-        },
-        "driver": "is31fl3741",
-        "led_flush_limit": 26,
-        "led_process_limit": 4,
-        "sleep": true
-    },
-    "matrix_pins": {
-        "cols": ["C6", "C7", "F7", "F6", "F5", "F4", "F1", "F0", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5"],
-        "rows": ["B0", "B1", "B2", "B3", "B7", "B6"]
-    },
-    "diode_direction": "COL2ROW",
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "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.5, "y": 0},
-                {"matrix": [0, 7], "x": 7.5, "y": 0},
-                {"matrix": [0, 8], "x": 8.5, "y": 0},
-                {"matrix": [0, 9], "x": 9.5, "y": 0},
-
-                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"matrix": [0, 13], "x": 13, "y": 0},
-                {"matrix": [0, 14], "x": 14, "y": 0},
-
-                {"matrix": [0, 15], "x": 15.25, "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": [1, 4], "x": 4, "y": 1},
-                {"matrix": [1, 5], "x": 5, "y": 1},
-                {"matrix": [1, 6], "x": 6, "y": 1},
-                {"matrix": [1, 7], "x": 7, "y": 1},
-                {"matrix": [1, 8], "x": 8, "y": 1},
-                {"matrix": [1, 9], "x": 9, "y": 1},
-                {"matrix": [1, 10], "x": 10, "y": 1},
-                {"matrix": [1, 11], "x": 11, "y": 1},
-                {"matrix": [1, 12], "x": 12, "y": 1},
-                {"matrix": [1, 14], "x": 13, "y": 1, "w": 2},
-
-                {"matrix": [1, 15], "x": 15.25, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
-                {"matrix": [2, 1], "x": 1.5, "y": 2},
-                {"matrix": [2, 2], "x": 2.5, "y": 2},
-                {"matrix": [2, 3], "x": 3.5, "y": 2},
-                {"matrix": [2, 4], "x": 4.5, "y": 2},
-                {"matrix": [2, 5], "x": 5.5, "y": 2},
-                {"matrix": [2, 6], "x": 6.5, "y": 2},
-                {"matrix": [2, 7], "x": 7.5, "y": 2},
-                {"matrix": [2, 8], "x": 8.5, "y": 2},
-                {"matrix": [2, 9], "x": 9.5, "y": 2},
-                {"matrix": [2, 10], "x": 10.5, "y": 2},
-                {"matrix": [2, 11], "x": 11.5, "y": 2},
-                {"matrix": [2, 12], "x": 12.5, "y": 2},
-
-                {"matrix": [2, 15], "x": 15.25, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
-                {"matrix": [3, 1], "x": 1.75, "y": 3},
-                {"matrix": [3, 2], "x": 2.75, "y": 3},
-                {"matrix": [3, 3], "x": 3.75, "y": 3},
-                {"matrix": [3, 4], "x": 4.75, "y": 3},
-                {"matrix": [3, 5], "x": 5.75, "y": 3},
-                {"matrix": [3, 6], "x": 6.75, "y": 3},
-                {"matrix": [3, 7], "x": 7.75, "y": 3},
-                {"matrix": [3, 8], "x": 8.75, "y": 3},
-                {"matrix": [3, 9], "x": 9.75, "y": 3},
-                {"matrix": [3, 10], "x": 10.75, "y": 3},
-                {"matrix": [3, 11], "x": 11.75, "y": 3},
-                {"matrix": [2, 13], "x": 12.75, "y": 3},
-                {"matrix": [3, 13], "x": 13.75, "y": 2, "w": 1.25, "h": 2},
-
-                {"matrix": [3, 15], "x": 15.25, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4},
-                {"matrix": [4, 2], "x": 2.25, "y": 4},
-                {"matrix": [4, 3], "x": 3.25, "y": 4},
-                {"matrix": [4, 4], "x": 4.25, "y": 4},
-                {"matrix": [4, 5], "x": 5.25, "y": 4},
-                {"matrix": [4, 6], "x": 6.25, "y": 4},
-                {"matrix": [4, 7], "x": 7.25, "y": 4},
-                {"matrix": [4, 8], "x": 8.25, "y": 4},
-                {"matrix": [4, 9], "x": 9.25, "y": 4},
-                {"matrix": [4, 10], "x": 10.25, "y": 4},
-                {"matrix": [4, 11], "x": 11.25, "y": 4},
-                {"matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.75},
-
-                {"matrix": [4, 14], "x": 14.25, "y": 4.25},
-
-                {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
-                {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
-                {"matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25},
-                {"matrix": [5, 6], "x": 3.75, "y": 5, "w": 6.25},
-                {"matrix": [5, 10], "x": 10, "y": 5, "w": 1.5},
-                {"matrix": [5, 11], "x": 11.5, "y": 5, "w": 1.5},
-
-                {"matrix": [5, 12], "x": 13.25, "y": 5.25},
-                {"matrix": [5, 14], "x": 14.25, "y": 5.25},
-                {"matrix": [5, 15], "x": 15.25, "y": 5.25}
-            ]
-        }
-    }
-}
diff --git a/keyboards/kbdfans/bella/rgb_iso/keyboard.json b/keyboards/kbdfans/bella/rgb_iso/keyboard.json
new file mode 100644
index 00000000000..20b00283ed2
--- /dev/null
+++ b/keyboards/kbdfans/bella/rgb_iso/keyboard.json
@@ -0,0 +1,180 @@
+{
+    "keyboard_name": "Bella RGB ISO",
+    "manufacturer": "KBDfans",
+    "url": "",
+    "maintainer": "moyi4681",
+    "usb": {
+        "vid": "0x4B42",
+        "pid": "0x0009",
+        "device_version": "0.0.1"
+    },
+    "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,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": 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_rain": true,
+            "pixel_flow": true,
+            "pixel_fractal": 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,
+            "solid_splash": true
+        },
+        "default": {
+            "animation": "cycle_all"
+        },
+        "driver": "is31fl3741",
+        "led_flush_limit": 26,
+        "led_process_limit": 4,
+        "sleep": true
+    },
+    "matrix_pins": {
+        "cols": ["C6", "C7", "F7", "F6", "F5", "F4", "F1", "F0", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5"],
+        "rows": ["B0", "B1", "B2", "B3", "B7", "B6"]
+    },
+    "diode_direction": "COL2ROW",
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "nkro": true,
+        "rgb_matrix": true
+    },
+    "build": {
+        "lto": true
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "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.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+
+                {"matrix": [0, 15], "x": 15.25, "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": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+                {"matrix": [1, 12], "x": 12, "y": 1},
+                {"matrix": [1, 14], "x": 13, "y": 1, "w": 2},
+
+                {"matrix": [1, 15], "x": 15.25, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2},
+                {"matrix": [2, 2], "x": 2.5, "y": 2},
+                {"matrix": [2, 3], "x": 3.5, "y": 2},
+                {"matrix": [2, 4], "x": 4.5, "y": 2},
+                {"matrix": [2, 5], "x": 5.5, "y": 2},
+                {"matrix": [2, 6], "x": 6.5, "y": 2},
+                {"matrix": [2, 7], "x": 7.5, "y": 2},
+                {"matrix": [2, 8], "x": 8.5, "y": 2},
+                {"matrix": [2, 9], "x": 9.5, "y": 2},
+                {"matrix": [2, 10], "x": 10.5, "y": 2},
+                {"matrix": [2, 11], "x": 11.5, "y": 2},
+                {"matrix": [2, 12], "x": 12.5, "y": 2},
+
+                {"matrix": [2, 15], "x": 15.25, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3},
+                {"matrix": [3, 2], "x": 2.75, "y": 3},
+                {"matrix": [3, 3], "x": 3.75, "y": 3},
+                {"matrix": [3, 4], "x": 4.75, "y": 3},
+                {"matrix": [3, 5], "x": 5.75, "y": 3},
+                {"matrix": [3, 6], "x": 6.75, "y": 3},
+                {"matrix": [3, 7], "x": 7.75, "y": 3},
+                {"matrix": [3, 8], "x": 8.75, "y": 3},
+                {"matrix": [3, 9], "x": 9.75, "y": 3},
+                {"matrix": [3, 10], "x": 10.75, "y": 3},
+                {"matrix": [3, 11], "x": 11.75, "y": 3},
+                {"matrix": [2, 13], "x": 12.75, "y": 3},
+                {"matrix": [3, 13], "x": 13.75, "y": 2, "w": 1.25, "h": 2},
+
+                {"matrix": [3, 15], "x": 15.25, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4},
+                {"matrix": [4, 2], "x": 2.25, "y": 4},
+                {"matrix": [4, 3], "x": 3.25, "y": 4},
+                {"matrix": [4, 4], "x": 4.25, "y": 4},
+                {"matrix": [4, 5], "x": 5.25, "y": 4},
+                {"matrix": [4, 6], "x": 6.25, "y": 4},
+                {"matrix": [4, 7], "x": 7.25, "y": 4},
+                {"matrix": [4, 8], "x": 8.25, "y": 4},
+                {"matrix": [4, 9], "x": 9.25, "y": 4},
+                {"matrix": [4, 10], "x": 10.25, "y": 4},
+                {"matrix": [4, 11], "x": 11.25, "y": 4},
+                {"matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.75},
+
+                {"matrix": [4, 14], "x": 14.25, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5, "w": 1.5},
+                {"matrix": [5, 11], "x": 11.5, "y": 5, "w": 1.5},
+
+                {"matrix": [5, 12], "x": 13.25, "y": 5.25},
+                {"matrix": [5, 14], "x": 14.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 15.25, "y": 5.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/kbdfans/bella/rgb_iso/rules.mk b/keyboards/kbdfans/bella/rgb_iso/rules.mk
deleted file mode 100644
index 3d0767ea6d8..00000000000
--- a/keyboards/kbdfans/bella/rgb_iso/rules.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes          # Mouse keys
-EXTRAKEY_ENABLE = yes          # Audio control and System control
-CONSOLE_ENABLE = no            # Console for debug
-COMMAND_ENABLE = no            # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no          # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no           # Enable keyboard RGB underglow
-AUDIO_ENABLE = no              # Audio output
-RGB_MATRIX_ENABLE = yes
-
-LTO_ENABLE = yes
diff --git a/keyboards/kbdfans/jm60/info.json b/keyboards/kbdfans/jm60/info.json
deleted file mode 100644
index 496637383f2..00000000000
--- a/keyboards/kbdfans/jm60/info.json
+++ /dev/null
@@ -1,88 +0,0 @@
-{
-    "keyboard_name": "JM60",
-    "manufacturer": "JMWS",
-    "url": "",
-    "maintainer": "qmk",
-    "usb": {
-        "vid": "0xFEED",
-        "pid": "0x6464",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["A15", "C10", "C11", "C12", "D2", "B3", "B4", "B5", "B6", "B7", "B8", "B9", "A2", "A3"],
-        "rows": ["B11", "B10", "B2", "B1", "B0"]
-    },
-    "diode_direction": "ROW2COL",
-    "community_layouts": ["60_ansi"],
-    "layouts": {
-        "LAYOUT_60_ansi": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 12], "x": 11.75, "y": 2},
-                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 1], "x": 2.25, "y": 3},
-                {"matrix": [3, 2], "x": 3.25, "y": 3},
-                {"matrix": [3, 3], "x": 4.25, "y": 3},
-                {"matrix": [3, 4], "x": 5.25, "y": 3},
-                {"matrix": [3, 5], "x": 6.25, "y": 3},
-                {"matrix": [3, 6], "x": 7.25, "y": 3},
-                {"matrix": [3, 7], "x": 8.25, "y": 3},
-                {"matrix": [3, 8], "x": 9.25, "y": 3},
-                {"matrix": [3, 9], "x": 10.25, "y": 3},
-                {"matrix": [3, 11], "x": 11.25, "y": 3},
-                {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 2.75},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
-                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
-                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
-            ]
-        }
-    }
-}
diff --git a/keyboards/kbdfans/jm60/keyboard.json b/keyboards/kbdfans/jm60/keyboard.json
new file mode 100644
index 00000000000..4b0f9609524
--- /dev/null
+++ b/keyboards/kbdfans/jm60/keyboard.json
@@ -0,0 +1,96 @@
+{
+    "keyboard_name": "JM60",
+    "manufacturer": "JMWS",
+    "url": "",
+    "maintainer": "qmk",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0x6464",
+        "device_version": "0.0.1"
+    },
+    "matrix_pins": {
+        "cols": ["A15", "C10", "C11", "C12", "D2", "B3", "B4", "B5", "B6", "B7", "B8", "B9", "A2", "A3"],
+        "rows": ["B11", "B10", "B2", "B1", "B0"]
+    },
+    "diode_direction": "ROW2COL",
+    "features": {
+        "bootmagic": true,
+        "mousekey": false,
+        "extrakey": true,
+        "nkro": true
+    },
+    "bootloader": "custom",
+    "processor": "STM32F103",
+    "community_layouts": ["60_ansi"],
+    "layouts": {
+        "LAYOUT_60_ansi": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 12], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 2.75},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/kbdfans/jm60/rules.mk b/keyboards/kbdfans/jm60/rules.mk
index 5dbf13f5e78..7b2a61d4648 100644
--- a/keyboards/kbdfans/jm60/rules.mk
+++ b/keyboards/kbdfans/jm60/rules.mk
@@ -1,22 +1,3 @@
-# MCU name
-MCU = STM32F103
-
+# custom bootloader
 MCU_LDSCRIPT = jm60_bootloader
 BOARD = ST_NUCLEO64_F103RB
-
-# Bootloader selection
-BOOTLOADER = custom
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
diff --git a/keyboards/kbdfans/kbd4x/info.json b/keyboards/kbdfans/kbd4x/info.json
deleted file mode 100644
index 44c9daceb74..00000000000
--- a/keyboards/kbdfans/kbd4x/info.json
+++ /dev/null
@@ -1,155 +0,0 @@
-{
-    "keyboard_name": "KBD4x",
-    "manufacturer": "KBDfans",
-    "url": "",
-    "maintainer": "qmk",
-    "usb": {
-        "vid": "0xFEED",
-        "pid": "0x0000",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "B3", "B1", "B0", "D5", "B7", "C7"],
-        "rows": ["D0", "D1", "D2", "D3"]
-    },
-    "diode_direction": "COL2ROW",
-    "backlight": {
-        "pin": "B6",
-        "breathing": true
-    },
-    "rgblight": {
-        "saturation_steps": 8,
-        "brightness_steps": 8,
-        "led_count": 16,
-        "sleep": true,
-        "animations": {
-            "breathing": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "snake": true,
-            "knight": true,
-            "christmas": true,
-            "static_gradient": true,
-            "rgb_test": true,
-            "alternating": true,
-            "twinkle": true
-        }
-    },
-    "ws2812": {
-        "pin": "E2"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "community_layouts": ["ortho_4x12", "planck_mit"],
-    "layouts": {
-        "LAYOUT_planck_mit": {
-            "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": [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": [1, 4], "x": 4, "y": 1},
-                {"matrix": [1, 5], "x": 5, "y": 1},
-                {"matrix": [1, 6], "x": 6, "y": 1},
-                {"matrix": [1, 7], "x": 7, "y": 1},
-                {"matrix": [1, 8], "x": 8, "y": 1},
-                {"matrix": [1, 9], "x": 9, "y": 1},
-                {"matrix": [1, 10], "x": 10, "y": 1},
-                {"matrix": [1, 11], "x": 11, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2},
-                {"matrix": [2, 1], "x": 1, "y": 2},
-                {"matrix": [2, 2], "x": 2, "y": 2},
-                {"matrix": [2, 3], "x": 3, "y": 2},
-                {"matrix": [2, 4], "x": 4, "y": 2},
-                {"matrix": [2, 5], "x": 5, "y": 2},
-                {"matrix": [2, 6], "x": 6, "y": 2},
-                {"matrix": [2, 7], "x": 7, "y": 2},
-                {"matrix": [2, 8], "x": 8, "y": 2},
-                {"matrix": [2, 9], "x": 9, "y": 2},
-                {"matrix": [2, 10], "x": 10, "y": 2},
-                {"matrix": [2, 11], "x": 11, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3},
-                {"matrix": [3, 1], "x": 1, "y": 3},
-                {"matrix": [3, 2], "x": 2, "y": 3},
-                {"matrix": [3, 3], "x": 3, "y": 3},
-                {"matrix": [3, 4], "x": 4, "y": 3},
-                {"matrix": [3, 5], "x": 5, "y": 3, "w": 2},
-                {"matrix": [3, 7], "x": 7, "y": 3},
-                {"matrix": [3, 8], "x": 8, "y": 3},
-                {"matrix": [3, 9], "x": 9, "y": 3},
-                {"matrix": [3, 10], "x": 10, "y": 3},
-                {"matrix": [3, 11], "x": 11, "y": 3}
-            ]
-        },
-        "LAYOUT_ortho_4x12": {
-            "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": [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": [1, 4], "x": 4, "y": 1},
-                {"matrix": [1, 5], "x": 5, "y": 1},
-                {"matrix": [1, 6], "x": 6, "y": 1},
-                {"matrix": [1, 7], "x": 7, "y": 1},
-                {"matrix": [1, 8], "x": 8, "y": 1},
-                {"matrix": [1, 9], "x": 9, "y": 1},
-                {"matrix": [1, 10], "x": 10, "y": 1},
-                {"matrix": [1, 11], "x": 11, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2},
-                {"matrix": [2, 1], "x": 1, "y": 2},
-                {"matrix": [2, 2], "x": 2, "y": 2},
-                {"matrix": [2, 3], "x": 3, "y": 2},
-                {"matrix": [2, 4], "x": 4, "y": 2},
-                {"matrix": [2, 5], "x": 5, "y": 2},
-                {"matrix": [2, 6], "x": 6, "y": 2},
-                {"matrix": [2, 7], "x": 7, "y": 2},
-                {"matrix": [2, 8], "x": 8, "y": 2},
-                {"matrix": [2, 9], "x": 9, "y": 2},
-                {"matrix": [2, 10], "x": 10, "y": 2},
-                {"matrix": [2, 11], "x": 11, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3},
-                {"matrix": [3, 1], "x": 1, "y": 3},
-                {"matrix": [3, 2], "x": 2, "y": 3},
-                {"matrix": [3, 3], "x": 3, "y": 3},
-                {"matrix": [3, 4], "x": 4, "y": 3},
-                {"matrix": [3, 5], "x": 5, "y": 3},
-                {"matrix": [3, 6], "x": 6, "y": 3},
-                {"matrix": [3, 7], "x": 7, "y": 3},
-                {"matrix": [3, 8], "x": 8, "y": 3},
-                {"matrix": [3, 9], "x": 9, "y": 3},
-                {"matrix": [3, 10], "x": 10, "y": 3},
-                {"matrix": [3, 11], "x": 11, "y": 3}
-            ]
-        }
-    }
-}
diff --git a/keyboards/kbdfans/kbd4x/keyboard.json b/keyboards/kbdfans/kbd4x/keyboard.json
new file mode 100644
index 00000000000..a1dc8e3dd49
--- /dev/null
+++ b/keyboards/kbdfans/kbd4x/keyboard.json
@@ -0,0 +1,164 @@
+{
+    "keyboard_name": "KBD4x",
+    "manufacturer": "KBDfans",
+    "url": "",
+    "maintainer": "qmk",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0x0000",
+        "device_version": "0.0.1"
+    },
+    "matrix_pins": {
+        "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "B3", "B1", "B0", "D5", "B7", "C7"],
+        "rows": ["D0", "D1", "D2", "D3"]
+    },
+    "diode_direction": "COL2ROW",
+    "backlight": {
+        "pin": "B6",
+        "breathing": true
+    },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 16,
+        "sleep": true,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": true,
+            "twinkle": true
+        }
+    },
+    "ws2812": {
+        "pin": "E2"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": false,
+        "extrakey": true,
+        "command": true,
+        "nkro": true,
+        "backlight": true,
+        "rgblight": true
+    },
+    "community_layouts": ["ortho_4x12", "planck_mit"],
+    "layouts": {
+        "LAYOUT_planck_mit": {
+            "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": [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": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [2, 6], "x": 6, "y": 2},
+                {"matrix": [2, 7], "x": 7, "y": 2},
+                {"matrix": [2, 8], "x": 8, "y": 2},
+                {"matrix": [2, 9], "x": 9, "y": 2},
+                {"matrix": [2, 10], "x": 10, "y": 2},
+                {"matrix": [2, 11], "x": 11, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3, "w": 2},
+                {"matrix": [3, 7], "x": 7, "y": 3},
+                {"matrix": [3, 8], "x": 8, "y": 3},
+                {"matrix": [3, 9], "x": 9, "y": 3},
+                {"matrix": [3, 10], "x": 10, "y": 3},
+                {"matrix": [3, 11], "x": 11, "y": 3}
+            ]
+        },
+        "LAYOUT_ortho_4x12": {
+            "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": [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": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [2, 6], "x": 6, "y": 2},
+                {"matrix": [2, 7], "x": 7, "y": 2},
+                {"matrix": [2, 8], "x": 8, "y": 2},
+                {"matrix": [2, 9], "x": 9, "y": 2},
+                {"matrix": [2, 10], "x": 10, "y": 2},
+                {"matrix": [2, 11], "x": 11, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
+                {"matrix": [3, 6], "x": 6, "y": 3},
+                {"matrix": [3, 7], "x": 7, "y": 3},
+                {"matrix": [3, 8], "x": 8, "y": 3},
+                {"matrix": [3, 9], "x": 9, "y": 3},
+                {"matrix": [3, 10], "x": 10, "y": 3},
+                {"matrix": [3, 11], "x": 11, "y": 3}
+            ]
+        }
+    }
+}
diff --git a/keyboards/kbdfans/kbd4x/rules.mk b/keyboards/kbdfans/kbd4x/rules.mk
index 33020c98c40..271780b75ec 100644
--- a/keyboards/kbdfans/kbd4x/rules.mk
+++ b/keyboards/kbdfans/kbd4x/rules.mk
@@ -1,15 +1,2 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no        # Console for debug
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
 # Disable unsupported hardware
 AUDIO_SUPPORTED = no
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/v3/info.json b/keyboards/kbdfans/kbd67/mkiirgb/v3/info.json
deleted file mode 100644
index 1fd3448de49..00000000000
--- a/keyboards/kbdfans/kbd67/mkiirgb/v3/info.json
+++ /dev/null
@@ -1,129 +0,0 @@
-{
-    "keyboard_name": "kbd67mkiirgb v3",
-    "usb": {
-        "pid": "0x1226",
-        "device_version": "0.0.3"
-    },
-    "rgb_matrix": {
-        "animations": {
-            "alphas_mods": true,
-            "gradient_left_right": true,
-            "breathing": true,
-            "band_val": true,
-            "band_pinwheel_val": true,
-            "band_spiral_val": true,
-            "cycle_all": true,
-            "cycle_left_right": true,
-            "cycle_up_down": true,
-            "rainbow_moving_chevron": true,
-            "cycle_out_in": true,
-            "cycle_out_in_dual": 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_rain": true,
-            "pixel_flow": true,
-            "pixel_fractal": true,
-            "typing_heatmap": true
-        },
-        "default": {
-            "animation": "cycle_all"
-        },
-        "driver": "is31fl3741",
-        "val_steps": 8,
-        "led_flush_limit": 26,
-        "led_process_limit": 4,
-        "sleep": true
-    },
-    "matrix_pins": {
-        "cols": ["F7", "F6", "F5", "C7", "B0", "B1", "B2", "B3", "B4", "D7", "D6", "D4", "D5", "D3", "D2"],
-        "rows": ["F0", "F1", "F4", "E6", "C6"]
-    },
-    "diode_direction": "COL2ROW",
-    "processor": "atmega32u4",
-    "bootloader": "lufa-ms",
-    "layouts": {
-        "LAYOUT_65_ansi_blocker": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-                {"matrix": [0, 14], "x": 15, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-                {"matrix": [1, 14], "x": 15, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
-                {"matrix": [2, 14], "x": 15, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 1], "x": 2.25, "y": 3},
-                {"matrix": [3, 2], "x": 3.25, "y": 3},
-                {"matrix": [3, 3], "x": 4.25, "y": 3},
-                {"matrix": [3, 4], "x": 5.25, "y": 3},
-                {"matrix": [3, 5], "x": 6.25, "y": 3},
-                {"matrix": [3, 6], "x": 7.25, "y": 3},
-                {"matrix": [3, 7], "x": 8.25, "y": 3},
-                {"matrix": [3, 8], "x": 9.25, "y": 3},
-                {"matrix": [3, 9], "x": 10.25, "y": 3},
-                {"matrix": [3, 10], "x": 11.25, "y": 3},
-                {"matrix": [3, 11], "x": 12.25, "y": 3, "w": 1.75},
-                {"matrix": [3, 13], "x": 14, "y": 3},
-                {"matrix": [3, 14], "x": 15, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
-                {"matrix": [4, 8], "x": 10, "y": 4, "w": 1.25},
-                {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 11], "x": 13, "y": 4},
-                {"matrix": [4, 13], "x": 14, "y": 4},
-                {"matrix": [4, 14], "x": 15, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/v3/keyboard.json b/keyboards/kbdfans/kbd67/mkiirgb/v3/keyboard.json
new file mode 100644
index 00000000000..4a3beea9eb9
--- /dev/null
+++ b/keyboards/kbdfans/kbd67/mkiirgb/v3/keyboard.json
@@ -0,0 +1,139 @@
+{
+    "keyboard_name": "kbd67mkiirgb v3",
+    "usb": {
+        "pid": "0x1226",
+        "device_version": "0.0.3"
+    },
+    "rgb_matrix": {
+        "animations": {
+            "alphas_mods": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_val": true,
+            "band_pinwheel_val": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": 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_rain": true,
+            "pixel_flow": true,
+            "pixel_fractal": true,
+            "typing_heatmap": true
+        },
+        "default": {
+            "animation": "cycle_all"
+        },
+        "driver": "is31fl3741",
+        "val_steps": 8,
+        "led_flush_limit": 26,
+        "led_process_limit": 4,
+        "sleep": true
+    },
+    "matrix_pins": {
+        "cols": ["F7", "F6", "F5", "C7", "B0", "B1", "B2", "B3", "B4", "D7", "D6", "D4", "D5", "D3", "D2"],
+        "rows": ["F0", "F1", "F4", "E6", "C6"]
+    },
+    "diode_direction": "COL2ROW",
+    "processor": "atmega32u4",
+    "bootloader": "lufa-ms",
+    "features": {
+        "bootmagic": true,
+        "mousekey": false,
+        "extrakey": true,
+        "nkro": true,
+        "rgb_matrix": true
+    },
+    "build": {
+        "lto": true
+    },
+    "layouts": {
+        "LAYOUT_65_ansi_blocker": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 10], "x": 11.25, "y": 3},
+                {"matrix": [3, 11], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 8], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/v3/rules.mk b/keyboards/kbdfans/kbd67/mkiirgb/v3/rules.mk
index bbe22adb0c5..13252d81696 100755
--- a/keyboards/kbdfans/kbd67/mkiirgb/v3/rules.mk
+++ b/keyboards/kbdfans/kbd67/mkiirgb/v3/rules.mk
@@ -1,16 +1 @@
 BOOTLOADER_SIZE = 6144
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no          # Mouse keys
-EXTRAKEY_ENABLE = yes          # Audio control and System control
-CONSOLE_ENABLE = no            # Console for debug
-COMMAND_ENABLE = no            # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no          # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no           # Enable keyboard RGB underglow
-AUDIO_ENABLE = no              # Audio output
-RGB_MATRIX_ENABLE = yes        # Use RGB matrix
-LTO_ENABLE = yes
diff --git a/keyboards/kbdfans/kbd67/mkiirgb_iso/info.json b/keyboards/kbdfans/kbd67/mkiirgb_iso/info.json
deleted file mode 100644
index 8bbfc9a1500..00000000000
--- a/keyboards/kbdfans/kbd67/mkiirgb_iso/info.json
+++ /dev/null
@@ -1,136 +0,0 @@
-{
-    "keyboard_name": "KBD67MKIIRGB ISO",
-    "manufacturer": "KBDfans",
-    "url": "",
-    "maintainer": "moyi4681",
-    "usb": {
-        "vid": "0x4B42",
-        "pid": "0x0105",
-        "device_version": "0.0.1"
-    },
-    "ws2812": {
-        "pin": "C7"
-    },
-    "rgb_matrix": {
-        "animations": {
-            "alphas_mods": true,
-            "gradient_left_right": true,
-            "breathing": true,
-            "band_val": true,
-            "band_pinwheel_val": true,
-            "band_spiral_val": true,
-            "cycle_all": true,
-            "cycle_left_right": true,
-            "cycle_up_down": true,
-            "rainbow_moving_chevron": true,
-            "cycle_out_in": true,
-            "cycle_out_in_dual": 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,
-            "typing_heatmap": true
-        },
-        "default": {
-            "animation": "cycle_all"
-        },
-        "driver": "ws2812",
-        "sat_steps": 8,
-        "val_steps": 8,
-        "speed_steps": 10,
-        "max_brightness": 150,
-        "sleep": true
-    },
-    "matrix_pins": {
-        "cols": ["F7", "F6", "F5", "F4", "B0", "B7", "D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4"],
-        "rows": ["B1", "F1", "B2", "B3", "C6"]
-    },
-    "diode_direction": "COL2ROW",
-    "processor": "atmega32u4",
-    "bootloader": "lufa-ms",
-    "community_layouts": ["65_iso_blocker"],
-    "layouts": {
-        "LAYOUT_65_iso_blocker": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-                {"matrix": [0, 14], "x": 15, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 14], "x": 15, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 12], "x": 12.75, "y": 2},
-                {"matrix": [1, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
-                {"matrix": [2, 14], "x": 15, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
-                {"matrix": [4, 3], "x": 1.25, "y": 3},
-                {"matrix": [3, 1], "x": 2.25, "y": 3},
-                {"matrix": [3, 2], "x": 3.25, "y": 3},
-                {"matrix": [3, 3], "x": 4.25, "y": 3},
-                {"matrix": [3, 4], "x": 5.25, "y": 3},
-                {"matrix": [3, 5], "x": 6.25, "y": 3},
-                {"matrix": [3, 6], "x": 7.25, "y": 3},
-                {"matrix": [3, 7], "x": 8.25, "y": 3},
-                {"matrix": [3, 8], "x": 9.25, "y": 3},
-                {"matrix": [3, 9], "x": 10.25, "y": 3},
-                {"matrix": [3, 10], "x": 11.25, "y": 3},
-                {"matrix": [3, 11], "x": 12.25, "y": 3, "w": 1.75},
-                {"matrix": [3, 13], "x": 14, "y": 3},
-                {"matrix": [3, 14], "x": 15, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
-                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
-                {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 11], "x": 13, "y": 4},
-                {"matrix": [4, 13], "x": 14, "y": 4},
-                {"matrix": [4, 14], "x": 15, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/kbdfans/kbd67/mkiirgb_iso/keyboard.json b/keyboards/kbdfans/kbd67/mkiirgb_iso/keyboard.json
new file mode 100644
index 00000000000..b8e9fdaf1c4
--- /dev/null
+++ b/keyboards/kbdfans/kbd67/mkiirgb_iso/keyboard.json
@@ -0,0 +1,143 @@
+{
+    "keyboard_name": "KBD67MKIIRGB ISO",
+    "manufacturer": "KBDfans",
+    "url": "",
+    "maintainer": "moyi4681",
+    "usb": {
+        "vid": "0x4B42",
+        "pid": "0x0105",
+        "device_version": "0.0.1"
+    },
+    "ws2812": {
+        "pin": "C7"
+    },
+    "rgb_matrix": {
+        "animations": {
+            "alphas_mods": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_val": true,
+            "band_pinwheel_val": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": 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,
+            "typing_heatmap": true
+        },
+        "default": {
+            "animation": "cycle_all"
+        },
+        "driver": "ws2812",
+        "sat_steps": 8,
+        "val_steps": 8,
+        "speed_steps": 10,
+        "max_brightness": 150,
+        "sleep": true
+    },
+    "matrix_pins": {
+        "cols": ["F7", "F6", "F5", "F4", "B0", "B7", "D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4"],
+        "rows": ["B1", "F1", "B2", "B3", "C6"]
+    },
+    "diode_direction": "COL2ROW",
+    "processor": "atmega32u4",
+    "bootloader": "lufa-ms",
+    "features": {
+        "bootmagic": true,
+        "mousekey": false,
+        "extrakey": true,
+        "nkro": true,
+        "rgb_matrix": true
+    },
+    "community_layouts": ["65_iso_blocker"],
+    "layouts": {
+        "LAYOUT_65_iso_blocker": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [1, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [4, 3], "x": 1.25, "y": 3},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 10], "x": 11.25, "y": 3},
+                {"matrix": [3, 11], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/kbdfans/kbd67/mkiirgb_iso/rules.mk b/keyboards/kbdfans/kbd67/mkiirgb_iso/rules.mk
index 5cd60621348..13252d81696 100644
--- a/keyboards/kbdfans/kbd67/mkiirgb_iso/rules.mk
+++ b/keyboards/kbdfans/kbd67/mkiirgb_iso/rules.mk
@@ -1,15 +1 @@
 BOOTLOADER_SIZE = 6144
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-RGB_MATRIX_ENABLE = yes
diff --git a/keyboards/kbdfans/kbd75/rev1/info.json b/keyboards/kbdfans/kbd75/rev1/info.json
deleted file mode 100644
index efbfbe60ddc..00000000000
--- a/keyboards/kbdfans/kbd75/rev1/info.json
+++ /dev/null
@@ -1,1266 +0,0 @@
-{
-    "keyboard_name": "KBD75 rev1",
-    "manufacturer": "KBDfans",
-    "url": "",
-    "maintainer": "qmk",
-    "usb": {
-        "vid": "0x4B42",
-        "pid": "0x6060",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["F0", "F1", "E6", "C7", "C6", "F5", "D4", "B1", "B0", "B5", "B4", "D7", "D6", "B3", "F4", "F6"],
-        "rows": ["D0", "D1", "D2", "D3", "D5", "B7"]
-    },
-    "diode_direction": "COL2ROW",
-    "backlight": {
-        "pin": "B6",
-        "levels": 5
-    },
-    "indicators": {
-        "caps_lock": "B2",
-        "on_state": 0
-    },
-    "rgblight": {
-        "saturation_steps": 8,
-        "brightness_steps": 8,
-        "led_count": 16,
-        "sleep": true,
-        "animations": {
-            "breathing": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "snake": true,
-            "knight": true,
-            "christmas": true,
-            "static_gradient": true,
-            "rgb_test": true,
-            "alternating": true,
-            "twinkle": true
-        }
-    },
-    "ws2812": {
-        "pin": "E2"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "layout_aliases": {
-        "LAYOUT_ansi_1u": "LAYOUT_75_ansi"
-    },
-    "community_layouts": ["75_ansi", "75_iso"],
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 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, 14], "x": 14, "y": 0},
-                {"matrix": [0, 15], "x": 15, "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": [1, 4], "x": 4, "y": 1},
-                {"matrix": [1, 5], "x": 5, "y": 1},
-                {"matrix": [1, 6], "x": 6, "y": 1},
-                {"matrix": [1, 7], "x": 7, "y": 1},
-                {"matrix": [1, 8], "x": 8, "y": 1},
-                {"matrix": [1, 9], "x": 9, "y": 1},
-                {"matrix": [1, 10], "x": 10, "y": 1},
-                {"matrix": [1, 11], "x": 11, "y": 1},
-                {"matrix": [1, 12], "x": 12, "y": 1},
-                {"matrix": [1, 13], "x": 13, "y": 1},
-                {"matrix": [1, 14], "x": 14, "y": 1},
-                {"matrix": [1, 15], "x": 15, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
-                {"matrix": [2, 2], "x": 1.5, "y": 2},
-                {"matrix": [2, 3], "x": 2.5, "y": 2},
-                {"matrix": [2, 4], "x": 3.5, "y": 2},
-                {"matrix": [2, 5], "x": 4.5, "y": 2},
-                {"matrix": [2, 6], "x": 5.5, "y": 2},
-                {"matrix": [2, 7], "x": 6.5, "y": 2},
-                {"matrix": [2, 8], "x": 7.5, "y": 2},
-                {"matrix": [2, 9], "x": 8.5, "y": 2},
-                {"matrix": [2, 10], "x": 9.5, "y": 2},
-                {"matrix": [2, 11], "x": 10.5, "y": 2},
-                {"matrix": [2, 12], "x": 11.5, "y": 2},
-                {"matrix": [2, 13], "x": 12.5, "y": 2},
-                {"matrix": [2, 14], "x": 13.5, "y": 2, "w": 1.5},
-                {"matrix": [2, 15], "x": 15, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
-                {"matrix": [3, 2], "x": 1.75, "y": 3},
-                {"matrix": [3, 3], "x": 2.75, "y": 3},
-                {"matrix": [3, 4], "x": 3.75, "y": 3},
-                {"matrix": [3, 5], "x": 4.75, "y": 3},
-                {"matrix": [3, 6], "x": 5.75, "y": 3},
-                {"matrix": [3, 7], "x": 6.75, "y": 3},
-                {"matrix": [3, 8], "x": 7.75, "y": 3},
-                {"matrix": [3, 9], "x": 8.75, "y": 3},
-                {"matrix": [3, 10], "x": 9.75, "y": 3},
-                {"matrix": [3, 11], "x": 10.75, "y": 3},
-                {"matrix": [3, 12], "x": 11.75, "y": 3},
-                {"matrix": [3, 13], "x": 12.75, "y": 3, "w": 2.25},
-                {"matrix": [3, 15], "x": 15, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4},
-                {"matrix": [4, 2], "x": 2.25, "y": 4},
-                {"matrix": [4, 3], "x": 3.25, "y": 4},
-                {"matrix": [4, 4], "x": 4.25, "y": 4},
-                {"matrix": [4, 5], "x": 5.25, "y": 4},
-                {"matrix": [4, 6], "x": 6.25, "y": 4},
-                {"matrix": [4, 7], "x": 7.25, "y": 4},
-                {"matrix": [4, 8], "x": 8.25, "y": 4},
-                {"matrix": [4, 9], "x": 9.25, "y": 4},
-                {"matrix": [4, 10], "x": 10.25, "y": 4},
-                {"matrix": [4, 11], "x": 11.25, "y": 4},
-                {"matrix": [4, 13], "x": 12.25, "y": 4, "w": 1.75},
-                {"matrix": [4, 14], "x": 14, "y": 4},
-                {"matrix": [4, 15], "x": 15, "y": 4},
-
-                {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
-                {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
-                {"matrix": [5, 3], "x": 2.5, "y": 5, "w": 1.25},
-                {"matrix": [5, 4], "x": 3.75, "y": 5, "w": 2.25},
-                {"matrix": [5, 6], "x": 6, "y": 5, "w": 1.25},
-                {"matrix": [5, 8], "x": 7.25, "y": 5, "w": 2.75},
-                {"matrix": [5, 10], "x": 10, "y": 5},
-                {"matrix": [5, 11], "x": 11, "y": 5},
-                {"matrix": [5, 12], "x": 12, "y": 5},
-                {"matrix": [5, 13], "x": 13, "y": 5},
-                {"matrix": [5, 14], "x": 14, "y": 5},
-                {"matrix": [5, 15], "x": 15, "y": 5}
-            ]
-        },
-        "LAYOUT_75_ansi": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 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, 14], "x": 14, "y": 0},
-                {"matrix": [0, 15], "x": 15, "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": [1, 4], "x": 4, "y": 1},
-                {"matrix": [1, 5], "x": 5, "y": 1},
-                {"matrix": [1, 6], "x": 6, "y": 1},
-                {"matrix": [1, 7], "x": 7, "y": 1},
-                {"matrix": [1, 8], "x": 8, "y": 1},
-                {"matrix": [1, 9], "x": 9, "y": 1},
-                {"matrix": [1, 10], "x": 10, "y": 1},
-                {"matrix": [1, 11], "x": 11, "y": 1},
-                {"matrix": [1, 12], "x": 12, "y": 1},
-                {"matrix": [1, 14], "x": 13, "y": 1, "w": 2},
-                {"matrix": [1, 15], "x": 15, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
-                {"matrix": [2, 2], "x": 1.5, "y": 2},
-                {"matrix": [2, 3], "x": 2.5, "y": 2},
-                {"matrix": [2, 4], "x": 3.5, "y": 2},
-                {"matrix": [2, 5], "x": 4.5, "y": 2},
-                {"matrix": [2, 6], "x": 5.5, "y": 2},
-                {"matrix": [2, 7], "x": 6.5, "y": 2},
-                {"matrix": [2, 8], "x": 7.5, "y": 2},
-                {"matrix": [2, 9], "x": 8.5, "y": 2},
-                {"matrix": [2, 10], "x": 9.5, "y": 2},
-                {"matrix": [2, 11], "x": 10.5, "y": 2},
-                {"matrix": [2, 12], "x": 11.5, "y": 2},
-                {"matrix": [2, 13], "x": 12.5, "y": 2},
-                {"matrix": [2, 14], "x": 13.5, "y": 2, "w": 1.5},
-                {"matrix": [2, 15], "x": 15, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
-                {"matrix": [3, 2], "x": 1.75, "y": 3},
-                {"matrix": [3, 3], "x": 2.75, "y": 3},
-                {"matrix": [3, 4], "x": 3.75, "y": 3},
-                {"matrix": [3, 5], "x": 4.75, "y": 3},
-                {"matrix": [3, 6], "x": 5.75, "y": 3},
-                {"matrix": [3, 7], "x": 6.75, "y": 3},
-                {"matrix": [3, 8], "x": 7.75, "y": 3},
-                {"matrix": [3, 9], "x": 8.75, "y": 3},
-                {"matrix": [3, 10], "x": 9.75, "y": 3},
-                {"matrix": [3, 11], "x": 10.75, "y": 3},
-                {"matrix": [3, 12], "x": 11.75, "y": 3},
-                {"matrix": [3, 13], "x": 12.75, "y": 3, "w": 2.25},
-                {"matrix": [3, 15], "x": 15, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 2.25},
-                {"matrix": [4, 2], "x": 2.25, "y": 4},
-                {"matrix": [4, 3], "x": 3.25, "y": 4},
-                {"matrix": [4, 4], "x": 4.25, "y": 4},
-                {"matrix": [4, 5], "x": 5.25, "y": 4},
-                {"matrix": [4, 6], "x": 6.25, "y": 4},
-                {"matrix": [4, 7], "x": 7.25, "y": 4},
-                {"matrix": [4, 8], "x": 8.25, "y": 4},
-                {"matrix": [4, 9], "x": 9.25, "y": 4},
-                {"matrix": [4, 10], "x": 10.25, "y": 4},
-                {"matrix": [4, 11], "x": 11.25, "y": 4},
-                {"matrix": [4, 13], "x": 12.25, "y": 4, "w": 1.75},
-                {"matrix": [4, 14], "x": 14, "y": 4},
-                {"matrix": [4, 15], "x": 15, "y": 4},
-
-                {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
-                {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
-                {"matrix": [5, 3], "x": 2.5, "y": 5, "w": 1.25},
-                {"matrix": [5, 6], "x": 3.75, "y": 5, "w": 6.25},
-                {"matrix": [5, 10], "x": 10, "y": 5},
-                {"matrix": [5, 11], "x": 11, "y": 5},
-                {"matrix": [5, 12], "x": 12, "y": 5},
-                {"matrix": [5, 13], "x": 13, "y": 5},
-                {"matrix": [5, 14], "x": 14, "y": 5},
-                {"matrix": [5, 15], "x": 15, "y": 5}
-            ]
-        },
-        "LAYOUT_75_ansi_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, 14], "x": 14, "y": 0},
-                {"matrix": [0, 15], "x": 15, "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": [1, 4], "x": 4, "y": 1},
-                {"matrix": [1, 5], "x": 5, "y": 1},
-                {"matrix": [1, 6], "x": 6, "y": 1},
-                {"matrix": [1, 7], "x": 7, "y": 1},
-                {"matrix": [1, 8], "x": 8, "y": 1},
-                {"matrix": [1, 9], "x": 9, "y": 1},
-                {"matrix": [1, 10], "x": 10, "y": 1},
-                {"matrix": [1, 11], "x": 11, "y": 1},
-                {"matrix": [1, 12], "x": 12, "y": 1},
-                {"matrix": [1, 13], "x": 13, "y": 1},
-                {"matrix": [1, 14], "x": 14, "y": 1},
-                {"matrix": [1, 15], "x": 15, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
-                {"matrix": [2, 2], "x": 1.5, "y": 2},
-                {"matrix": [2, 3], "x": 2.5, "y": 2},
-                {"matrix": [2, 4], "x": 3.5, "y": 2},
-                {"matrix": [2, 5], "x": 4.5, "y": 2},
-                {"matrix": [2, 6], "x": 5.5, "y": 2},
-                {"matrix": [2, 7], "x": 6.5, "y": 2},
-                {"matrix": [2, 8], "x": 7.5, "y": 2},
-                {"matrix": [2, 9], "x": 8.5, "y": 2},
-                {"matrix": [2, 10], "x": 9.5, "y": 2},
-                {"matrix": [2, 11], "x": 10.5, "y": 2},
-                {"matrix": [2, 12], "x": 11.5, "y": 2},
-                {"matrix": [2, 13], "x": 12.5, "y": 2},
-                {"matrix": [2, 14], "x": 13.5, "y": 2, "w": 1.5},
-                {"matrix": [2, 15], "x": 15, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
-                {"matrix": [3, 2], "x": 1.75, "y": 3},
-                {"matrix": [3, 3], "x": 2.75, "y": 3},
-                {"matrix": [3, 4], "x": 3.75, "y": 3},
-                {"matrix": [3, 5], "x": 4.75, "y": 3},
-                {"matrix": [3, 6], "x": 5.75, "y": 3},
-                {"matrix": [3, 7], "x": 6.75, "y": 3},
-                {"matrix": [3, 8], "x": 7.75, "y": 3},
-                {"matrix": [3, 9], "x": 8.75, "y": 3},
-                {"matrix": [3, 10], "x": 9.75, "y": 3},
-                {"matrix": [3, 11], "x": 10.75, "y": 3},
-                {"matrix": [3, 12], "x": 11.75, "y": 3},
-                {"matrix": [3, 13], "x": 12.75, "y": 3, "w": 2.25},
-                {"matrix": [3, 15], "x": 15, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 2.25},
-                {"matrix": [4, 2], "x": 2.25, "y": 4},
-                {"matrix": [4, 3], "x": 3.25, "y": 4},
-                {"matrix": [4, 4], "x": 4.25, "y": 4},
-                {"matrix": [4, 5], "x": 5.25, "y": 4},
-                {"matrix": [4, 6], "x": 6.25, "y": 4},
-                {"matrix": [4, 7], "x": 7.25, "y": 4},
-                {"matrix": [4, 8], "x": 8.25, "y": 4},
-                {"matrix": [4, 9], "x": 9.25, "y": 4},
-                {"matrix": [4, 10], "x": 10.25, "y": 4},
-                {"matrix": [4, 11], "x": 11.25, "y": 4},
-                {"matrix": [4, 13], "x": 12.25, "y": 4, "w": 1.75},
-                {"matrix": [4, 14], "x": 14, "y": 4},
-                {"matrix": [4, 15], "x": 15, "y": 4},
-
-                {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
-                {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
-                {"matrix": [5, 3], "x": 2.5, "y": 5, "w": 1.25},
-                {"matrix": [5, 6], "x": 3.75, "y": 5, "w": 6.25},
-                {"matrix": [5, 10], "x": 10, "y": 5},
-                {"matrix": [5, 11], "x": 11, "y": 5},
-                {"matrix": [5, 12], "x": 12, "y": 5},
-                {"matrix": [5, 13], "x": 13, "y": 5},
-                {"matrix": [5, 14], "x": 14, "y": 5},
-                {"matrix": [5, 15], "x": 15, "y": 5}
-            ]
-        },
-        "LAYOUT_75_ansi_rwkl": {
-            "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, 14], "x": 14, "y": 0},
-                {"matrix": [0, 15], "x": 15, "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": [1, 4], "x": 4, "y": 1},
-                {"matrix": [1, 5], "x": 5, "y": 1},
-                {"matrix": [1, 6], "x": 6, "y": 1},
-                {"matrix": [1, 7], "x": 7, "y": 1},
-                {"matrix": [1, 8], "x": 8, "y": 1},
-                {"matrix": [1, 9], "x": 9, "y": 1},
-                {"matrix": [1, 10], "x": 10, "y": 1},
-                {"matrix": [1, 11], "x": 11, "y": 1},
-                {"matrix": [1, 12], "x": 12, "y": 1},
-                {"matrix": [1, 14], "x": 13, "y": 1, "w": 2},
-                {"matrix": [1, 15], "x": 15, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
-                {"matrix": [2, 2], "x": 1.5, "y": 2},
-                {"matrix": [2, 3], "x": 2.5, "y": 2},
-                {"matrix": [2, 4], "x": 3.5, "y": 2},
-                {"matrix": [2, 5], "x": 4.5, "y": 2},
-                {"matrix": [2, 6], "x": 5.5, "y": 2},
-                {"matrix": [2, 7], "x": 6.5, "y": 2},
-                {"matrix": [2, 8], "x": 7.5, "y": 2},
-                {"matrix": [2, 9], "x": 8.5, "y": 2},
-                {"matrix": [2, 10], "x": 9.5, "y": 2},
-                {"matrix": [2, 11], "x": 10.5, "y": 2},
-                {"matrix": [2, 12], "x": 11.5, "y": 2},
-                {"matrix": [2, 13], "x": 12.5, "y": 2},
-                {"matrix": [2, 14], "x": 13.5, "y": 2, "w": 1.5},
-                {"matrix": [2, 15], "x": 15, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
-                {"matrix": [3, 2], "x": 1.75, "y": 3},
-                {"matrix": [3, 3], "x": 2.75, "y": 3},
-                {"matrix": [3, 4], "x": 3.75, "y": 3},
-                {"matrix": [3, 5], "x": 4.75, "y": 3},
-                {"matrix": [3, 6], "x": 5.75, "y": 3},
-                {"matrix": [3, 7], "x": 6.75, "y": 3},
-                {"matrix": [3, 8], "x": 7.75, "y": 3},
-                {"matrix": [3, 9], "x": 8.75, "y": 3},
-                {"matrix": [3, 10], "x": 9.75, "y": 3},
-                {"matrix": [3, 11], "x": 10.75, "y": 3},
-                {"matrix": [3, 12], "x": 11.75, "y": 3},
-                {"matrix": [3, 13], "x": 12.75, "y": 3, "w": 2.25},
-                {"matrix": [3, 15], "x": 15, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 2.25},
-                {"matrix": [4, 2], "x": 2.25, "y": 4},
-                {"matrix": [4, 3], "x": 3.25, "y": 4},
-                {"matrix": [4, 4], "x": 4.25, "y": 4},
-                {"matrix": [4, 5], "x": 5.25, "y": 4},
-                {"matrix": [4, 6], "x": 6.25, "y": 4},
-                {"matrix": [4, 7], "x": 7.25, "y": 4},
-                {"matrix": [4, 8], "x": 8.25, "y": 4},
-                {"matrix": [4, 9], "x": 9.25, "y": 4},
-                {"matrix": [4, 10], "x": 10.25, "y": 4},
-                {"matrix": [4, 11], "x": 11.25, "y": 4},
-                {"matrix": [4, 13], "x": 12.25, "y": 4, "w": 1.75},
-                {"matrix": [4, 14], "x": 14, "y": 4},
-                {"matrix": [4, 15], "x": 15, "y": 4},
-
-                {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
-                {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
-                {"matrix": [5, 3], "x": 2.5, "y": 5, "w": 1.25},
-                {"matrix": [5, 6], "x": 3.75, "y": 5, "w": 6.25},
-                {"matrix": [5, 10], "x": 10, "y": 5, "w": 1.5},
-                {"matrix": [5, 12], "x": 11.5, "y": 5, "w": 1.5},
-                {"matrix": [5, 13], "x": 13, "y": 5},
-                {"matrix": [5, 14], "x": 14, "y": 5},
-                {"matrix": [5, 15], "x": 15, "y": 5}
-            ]
-        },
-        "LAYOUT_75_ansi_rwkl_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, 14], "x": 14, "y": 0},
-                {"matrix": [0, 15], "x": 15, "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": [1, 4], "x": 4, "y": 1},
-                {"matrix": [1, 5], "x": 5, "y": 1},
-                {"matrix": [1, 6], "x": 6, "y": 1},
-                {"matrix": [1, 7], "x": 7, "y": 1},
-                {"matrix": [1, 8], "x": 8, "y": 1},
-                {"matrix": [1, 9], "x": 9, "y": 1},
-                {"matrix": [1, 10], "x": 10, "y": 1},
-                {"matrix": [1, 11], "x": 11, "y": 1},
-                {"matrix": [1, 12], "x": 12, "y": 1},
-                {"matrix": [1, 13], "x": 13, "y": 1},
-                {"matrix": [1, 14], "x": 14, "y": 1},
-                {"matrix": [1, 15], "x": 15, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
-                {"matrix": [2, 2], "x": 1.5, "y": 2},
-                {"matrix": [2, 3], "x": 2.5, "y": 2},
-                {"matrix": [2, 4], "x": 3.5, "y": 2},
-                {"matrix": [2, 5], "x": 4.5, "y": 2},
-                {"matrix": [2, 6], "x": 5.5, "y": 2},
-                {"matrix": [2, 7], "x": 6.5, "y": 2},
-                {"matrix": [2, 8], "x": 7.5, "y": 2},
-                {"matrix": [2, 9], "x": 8.5, "y": 2},
-                {"matrix": [2, 10], "x": 9.5, "y": 2},
-                {"matrix": [2, 11], "x": 10.5, "y": 2},
-                {"matrix": [2, 12], "x": 11.5, "y": 2},
-                {"matrix": [2, 13], "x": 12.5, "y": 2},
-                {"matrix": [2, 14], "x": 13.5, "y": 2, "w": 1.5},
-                {"matrix": [2, 15], "x": 15, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
-                {"matrix": [3, 2], "x": 1.75, "y": 3},
-                {"matrix": [3, 3], "x": 2.75, "y": 3},
-                {"matrix": [3, 4], "x": 3.75, "y": 3},
-                {"matrix": [3, 5], "x": 4.75, "y": 3},
-                {"matrix": [3, 6], "x": 5.75, "y": 3},
-                {"matrix": [3, 7], "x": 6.75, "y": 3},
-                {"matrix": [3, 8], "x": 7.75, "y": 3},
-                {"matrix": [3, 9], "x": 8.75, "y": 3},
-                {"matrix": [3, 10], "x": 9.75, "y": 3},
-                {"matrix": [3, 11], "x": 10.75, "y": 3},
-                {"matrix": [3, 12], "x": 11.75, "y": 3},
-                {"matrix": [3, 13], "x": 12.75, "y": 3, "w": 2.25},
-                {"matrix": [3, 15], "x": 15, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 2.25},
-                {"matrix": [4, 2], "x": 2.25, "y": 4},
-                {"matrix": [4, 3], "x": 3.25, "y": 4},
-                {"matrix": [4, 4], "x": 4.25, "y": 4},
-                {"matrix": [4, 5], "x": 5.25, "y": 4},
-                {"matrix": [4, 6], "x": 6.25, "y": 4},
-                {"matrix": [4, 7], "x": 7.25, "y": 4},
-                {"matrix": [4, 8], "x": 8.25, "y": 4},
-                {"matrix": [4, 9], "x": 9.25, "y": 4},
-                {"matrix": [4, 10], "x": 10.25, "y": 4},
-                {"matrix": [4, 11], "x": 11.25, "y": 4},
-                {"matrix": [4, 13], "x": 12.25, "y": 4, "w": 1.75},
-                {"matrix": [4, 14], "x": 14, "y": 4},
-                {"matrix": [4, 15], "x": 15, "y": 4},
-
-                {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
-                {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
-                {"matrix": [5, 3], "x": 2.5, "y": 5, "w": 1.25},
-                {"matrix": [5, 6], "x": 3.75, "y": 5, "w": 6.25},
-                {"matrix": [5, 10], "x": 10, "y": 5, "w": 1.5},
-                {"matrix": [5, 12], "x": 11.5, "y": 5, "w": 1.5},
-                {"matrix": [5, 13], "x": 13, "y": 5},
-                {"matrix": [5, 14], "x": 14, "y": 5},
-                {"matrix": [5, 15], "x": 15, "y": 5}
-            ]
-        },
-        "LAYOUT_75_ansi_wkl": {
-            "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, 14], "x": 14, "y": 0},
-                {"matrix": [0, 15], "x": 15, "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": [1, 4], "x": 4, "y": 1},
-                {"matrix": [1, 5], "x": 5, "y": 1},
-                {"matrix": [1, 6], "x": 6, "y": 1},
-                {"matrix": [1, 7], "x": 7, "y": 1},
-                {"matrix": [1, 8], "x": 8, "y": 1},
-                {"matrix": [1, 9], "x": 9, "y": 1},
-                {"matrix": [1, 10], "x": 10, "y": 1},
-                {"matrix": [1, 11], "x": 11, "y": 1},
-                {"matrix": [1, 12], "x": 12, "y": 1},
-                {"matrix": [1, 14], "x": 13, "y": 1, "w": 2},
-                {"matrix": [1, 15], "x": 15, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
-                {"matrix": [2, 2], "x": 1.5, "y": 2},
-                {"matrix": [2, 3], "x": 2.5, "y": 2},
-                {"matrix": [2, 4], "x": 3.5, "y": 2},
-                {"matrix": [2, 5], "x": 4.5, "y": 2},
-                {"matrix": [2, 6], "x": 5.5, "y": 2},
-                {"matrix": [2, 7], "x": 6.5, "y": 2},
-                {"matrix": [2, 8], "x": 7.5, "y": 2},
-                {"matrix": [2, 9], "x": 8.5, "y": 2},
-                {"matrix": [2, 10], "x": 9.5, "y": 2},
-                {"matrix": [2, 11], "x": 10.5, "y": 2},
-                {"matrix": [2, 12], "x": 11.5, "y": 2},
-                {"matrix": [2, 13], "x": 12.5, "y": 2},
-                {"matrix": [2, 14], "x": 13.5, "y": 2, "w": 1.5},
-                {"matrix": [2, 15], "x": 15, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
-                {"matrix": [3, 2], "x": 1.75, "y": 3},
-                {"matrix": [3, 3], "x": 2.75, "y": 3},
-                {"matrix": [3, 4], "x": 3.75, "y": 3},
-                {"matrix": [3, 5], "x": 4.75, "y": 3},
-                {"matrix": [3, 6], "x": 5.75, "y": 3},
-                {"matrix": [3, 7], "x": 6.75, "y": 3},
-                {"matrix": [3, 8], "x": 7.75, "y": 3},
-                {"matrix": [3, 9], "x": 8.75, "y": 3},
-                {"matrix": [3, 10], "x": 9.75, "y": 3},
-                {"matrix": [3, 11], "x": 10.75, "y": 3},
-                {"matrix": [3, 12], "x": 11.75, "y": 3},
-                {"matrix": [3, 13], "x": 12.75, "y": 3, "w": 2.25},
-                {"matrix": [3, 15], "x": 15, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 2.25},
-                {"matrix": [4, 2], "x": 2.25, "y": 4},
-                {"matrix": [4, 3], "x": 3.25, "y": 4},
-                {"matrix": [4, 4], "x": 4.25, "y": 4},
-                {"matrix": [4, 5], "x": 5.25, "y": 4},
-                {"matrix": [4, 6], "x": 6.25, "y": 4},
-                {"matrix": [4, 7], "x": 7.25, "y": 4},
-                {"matrix": [4, 8], "x": 8.25, "y": 4},
-                {"matrix": [4, 9], "x": 9.25, "y": 4},
-                {"matrix": [4, 10], "x": 10.25, "y": 4},
-                {"matrix": [4, 11], "x": 11.25, "y": 4},
-                {"matrix": [4, 13], "x": 12.25, "y": 4, "w": 1.75},
-                {"matrix": [4, 14], "x": 14, "y": 4},
-                {"matrix": [4, 15], "x": 15, "y": 4},
-
-                {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.5},
-                {"matrix": [5, 1], "x": 1.5, "y": 5, "w": 1.5},
-                {"matrix": [5, 6], "x": 3, "y": 5, "w": 7},
-                {"matrix": [5, 10], "x": 10, "y": 5, "w": 1.5},
-                {"matrix": [5, 12], "x": 11.5, "y": 5, "w": 1.5},
-                {"matrix": [5, 13], "x": 13, "y": 5},
-                {"matrix": [5, 14], "x": 14, "y": 5},
-                {"matrix": [5, 15], "x": 15, "y": 5}
-            ]
-        },
-        "LAYOUT_75_ansi_wkl_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, 14], "x": 14, "y": 0},
-                {"matrix": [0, 15], "x": 15, "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": [1, 4], "x": 4, "y": 1},
-                {"matrix": [1, 5], "x": 5, "y": 1},
-                {"matrix": [1, 6], "x": 6, "y": 1},
-                {"matrix": [1, 7], "x": 7, "y": 1},
-                {"matrix": [1, 8], "x": 8, "y": 1},
-                {"matrix": [1, 9], "x": 9, "y": 1},
-                {"matrix": [1, 10], "x": 10, "y": 1},
-                {"matrix": [1, 11], "x": 11, "y": 1},
-                {"matrix": [1, 12], "x": 12, "y": 1},
-                {"matrix": [1, 13], "x": 13, "y": 1},
-                {"matrix": [1, 14], "x": 14, "y": 1},
-                {"matrix": [1, 15], "x": 15, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
-                {"matrix": [2, 2], "x": 1.5, "y": 2},
-                {"matrix": [2, 3], "x": 2.5, "y": 2},
-                {"matrix": [2, 4], "x": 3.5, "y": 2},
-                {"matrix": [2, 5], "x": 4.5, "y": 2},
-                {"matrix": [2, 6], "x": 5.5, "y": 2},
-                {"matrix": [2, 7], "x": 6.5, "y": 2},
-                {"matrix": [2, 8], "x": 7.5, "y": 2},
-                {"matrix": [2, 9], "x": 8.5, "y": 2},
-                {"matrix": [2, 10], "x": 9.5, "y": 2},
-                {"matrix": [2, 11], "x": 10.5, "y": 2},
-                {"matrix": [2, 12], "x": 11.5, "y": 2},
-                {"matrix": [2, 13], "x": 12.5, "y": 2},
-                {"matrix": [2, 14], "x": 13.5, "y": 2, "w": 1.5},
-                {"matrix": [2, 15], "x": 15, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
-                {"matrix": [3, 2], "x": 1.75, "y": 3},
-                {"matrix": [3, 3], "x": 2.75, "y": 3},
-                {"matrix": [3, 4], "x": 3.75, "y": 3},
-                {"matrix": [3, 5], "x": 4.75, "y": 3},
-                {"matrix": [3, 6], "x": 5.75, "y": 3},
-                {"matrix": [3, 7], "x": 6.75, "y": 3},
-                {"matrix": [3, 8], "x": 7.75, "y": 3},
-                {"matrix": [3, 9], "x": 8.75, "y": 3},
-                {"matrix": [3, 10], "x": 9.75, "y": 3},
-                {"matrix": [3, 11], "x": 10.75, "y": 3},
-                {"matrix": [3, 12], "x": 11.75, "y": 3},
-                {"matrix": [3, 13], "x": 12.75, "y": 3, "w": 2.25},
-                {"matrix": [3, 15], "x": 15, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 2.25},
-                {"matrix": [4, 2], "x": 2.25, "y": 4},
-                {"matrix": [4, 3], "x": 3.25, "y": 4},
-                {"matrix": [4, 4], "x": 4.25, "y": 4},
-                {"matrix": [4, 5], "x": 5.25, "y": 4},
-                {"matrix": [4, 6], "x": 6.25, "y": 4},
-                {"matrix": [4, 7], "x": 7.25, "y": 4},
-                {"matrix": [4, 8], "x": 8.25, "y": 4},
-                {"matrix": [4, 9], "x": 9.25, "y": 4},
-                {"matrix": [4, 10], "x": 10.25, "y": 4},
-                {"matrix": [4, 11], "x": 11.25, "y": 4},
-                {"matrix": [4, 13], "x": 12.25, "y": 4, "w": 1.75},
-                {"matrix": [4, 14], "x": 14, "y": 4},
-                {"matrix": [4, 15], "x": 15, "y": 4},
-
-                {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.5},
-                {"matrix": [5, 1], "x": 1.5, "y": 5, "w": 1.5},
-                {"matrix": [5, 6], "x": 3, "y": 5, "w": 7},
-                {"matrix": [5, 10], "x": 10, "y": 5, "w": 1.5},
-                {"matrix": [5, 12], "x": 11.5, "y": 5, "w": 1.5},
-                {"matrix": [5, 13], "x": 13, "y": 5},
-                {"matrix": [5, 14], "x": 14, "y": 5},
-                {"matrix": [5, 15], "x": 15, "y": 5}
-            ]
-        },
-        "LAYOUT_75_iso": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"matrix": [0, 13], "x": 13, "y": 0},
-                {"matrix": [0, 14], "x": 14, "y": 0},
-                {"matrix": [0, 15], "x": 15, "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": [1, 4], "x": 4, "y": 1},
-                {"matrix": [1, 5], "x": 5, "y": 1},
-                {"matrix": [1, 6], "x": 6, "y": 1},
-                {"matrix": [1, 7], "x": 7, "y": 1},
-                {"matrix": [1, 8], "x": 8, "y": 1},
-                {"matrix": [1, 9], "x": 9, "y": 1},
-                {"matrix": [1, 10], "x": 10, "y": 1},
-                {"matrix": [1, 11], "x": 11, "y": 1},
-                {"matrix": [1, 12], "x": 12, "y": 1},
-                {"matrix": [1, 14], "x": 13, "y": 1, "w": 2},
-                {"matrix": [1, 15], "x": 15, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
-                {"matrix": [2, 2], "x": 1.5, "y": 2},
-                {"matrix": [2, 3], "x": 2.5, "y": 2},
-                {"matrix": [2, 4], "x": 3.5, "y": 2},
-                {"matrix": [2, 5], "x": 4.5, "y": 2},
-                {"matrix": [2, 6], "x": 5.5, "y": 2},
-                {"matrix": [2, 7], "x": 6.5, "y": 2},
-                {"matrix": [2, 8], "x": 7.5, "y": 2},
-                {"matrix": [2, 9], "x": 8.5, "y": 2},
-                {"matrix": [2, 10], "x": 9.5, "y": 2},
-                {"matrix": [2, 11], "x": 10.5, "y": 2},
-                {"matrix": [2, 12], "x": 11.5, "y": 2},
-                {"matrix": [2, 13], "x": 12.5, "y": 2},
-                {"matrix": [2, 15], "x": 15, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
-                {"matrix": [3, 2], "x": 1.75, "y": 3},
-                {"matrix": [3, 3], "x": 2.75, "y": 3},
-                {"matrix": [3, 4], "x": 3.75, "y": 3},
-                {"matrix": [3, 5], "x": 4.75, "y": 3},
-                {"matrix": [3, 6], "x": 5.75, "y": 3},
-                {"matrix": [3, 7], "x": 6.75, "y": 3},
-                {"matrix": [3, 8], "x": 7.75, "y": 3},
-                {"matrix": [3, 9], "x": 8.75, "y": 3},
-                {"matrix": [3, 10], "x": 9.75, "y": 3},
-                {"matrix": [3, 11], "x": 10.75, "y": 3},
-                {"matrix": [3, 12], "x": 11.75, "y": 3},
-                {"matrix": [2, 14], "x": 12.75, "y": 3},
-                {"matrix": [3, 13], "x": 13.75, "y": 2, "w": 1.25, "h": 2},
-                {"matrix": [3, 15], "x": 15, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4},
-                {"matrix": [4, 2], "x": 2.25, "y": 4},
-                {"matrix": [4, 3], "x": 3.25, "y": 4},
-                {"matrix": [4, 4], "x": 4.25, "y": 4},
-                {"matrix": [4, 5], "x": 5.25, "y": 4},
-                {"matrix": [4, 6], "x": 6.25, "y": 4},
-                {"matrix": [4, 7], "x": 7.25, "y": 4},
-                {"matrix": [4, 8], "x": 8.25, "y": 4},
-                {"matrix": [4, 9], "x": 9.25, "y": 4},
-                {"matrix": [4, 10], "x": 10.25, "y": 4},
-                {"matrix": [4, 11], "x": 11.25, "y": 4},
-                {"matrix": [4, 13], "x": 12.25, "y": 4, "w": 1.75},
-                {"matrix": [4, 14], "x": 14, "y": 4},
-                {"matrix": [4, 15], "x": 15, "y": 4},
-
-                {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
-                {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
-                {"matrix": [5, 3], "x": 2.5, "y": 5, "w": 1.25},
-                {"matrix": [5, 6], "x": 3.75, "y": 5, "w": 6.25},
-                {"matrix": [5, 10], "x": 10, "y": 5},
-                {"matrix": [5, 11], "x": 11, "y": 5},
-                {"matrix": [5, 12], "x": 12, "y": 5},
-                {"matrix": [5, 13], "x": 13, "y": 5},
-                {"matrix": [5, 14], "x": 14, "y": 5},
-                {"matrix": [5, 15], "x": 15, "y": 5}
-            ]
-        },
-        "LAYOUT_75_iso_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, 14], "x": 14, "y": 0},
-                {"matrix": [0, 15], "x": 15, "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": [1, 4], "x": 4, "y": 1},
-                {"matrix": [1, 5], "x": 5, "y": 1},
-                {"matrix": [1, 6], "x": 6, "y": 1},
-                {"matrix": [1, 7], "x": 7, "y": 1},
-                {"matrix": [1, 8], "x": 8, "y": 1},
-                {"matrix": [1, 9], "x": 9, "y": 1},
-                {"matrix": [1, 10], "x": 10, "y": 1},
-                {"matrix": [1, 11], "x": 11, "y": 1},
-                {"matrix": [1, 12], "x": 12, "y": 1},
-                {"matrix": [1, 13], "x": 13, "y": 1},
-                {"matrix": [1, 14], "x": 14, "y": 1},
-                {"matrix": [1, 15], "x": 15, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
-                {"matrix": [2, 2], "x": 1.5, "y": 2},
-                {"matrix": [2, 3], "x": 2.5, "y": 2},
-                {"matrix": [2, 4], "x": 3.5, "y": 2},
-                {"matrix": [2, 5], "x": 4.5, "y": 2},
-                {"matrix": [2, 6], "x": 5.5, "y": 2},
-                {"matrix": [2, 7], "x": 6.5, "y": 2},
-                {"matrix": [2, 8], "x": 7.5, "y": 2},
-                {"matrix": [2, 9], "x": 8.5, "y": 2},
-                {"matrix": [2, 10], "x": 9.5, "y": 2},
-                {"matrix": [2, 11], "x": 10.5, "y": 2},
-                {"matrix": [2, 12], "x": 11.5, "y": 2},
-                {"matrix": [2, 13], "x": 12.5, "y": 2},
-                {"matrix": [2, 15], "x": 15, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
-                {"matrix": [3, 2], "x": 1.75, "y": 3},
-                {"matrix": [3, 3], "x": 2.75, "y": 3},
-                {"matrix": [3, 4], "x": 3.75, "y": 3},
-                {"matrix": [3, 5], "x": 4.75, "y": 3},
-                {"matrix": [3, 6], "x": 5.75, "y": 3},
-                {"matrix": [3, 7], "x": 6.75, "y": 3},
-                {"matrix": [3, 8], "x": 7.75, "y": 3},
-                {"matrix": [3, 9], "x": 8.75, "y": 3},
-                {"matrix": [3, 10], "x": 9.75, "y": 3},
-                {"matrix": [3, 11], "x": 10.75, "y": 3},
-                {"matrix": [3, 12], "x": 11.75, "y": 3},
-                {"matrix": [2, 14], "x": 12.75, "y": 3},
-                {"matrix": [3, 13], "x": 13.75, "y": 2, "w": 1.25, "h": 2},
-                {"matrix": [3, 15], "x": 15, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4},
-                {"matrix": [4, 2], "x": 2.25, "y": 4},
-                {"matrix": [4, 3], "x": 3.25, "y": 4},
-                {"matrix": [4, 4], "x": 4.25, "y": 4},
-                {"matrix": [4, 5], "x": 5.25, "y": 4},
-                {"matrix": [4, 6], "x": 6.25, "y": 4},
-                {"matrix": [4, 7], "x": 7.25, "y": 4},
-                {"matrix": [4, 8], "x": 8.25, "y": 4},
-                {"matrix": [4, 9], "x": 9.25, "y": 4},
-                {"matrix": [4, 10], "x": 10.25, "y": 4},
-                {"matrix": [4, 11], "x": 11.25, "y": 4},
-                {"matrix": [4, 13], "x": 12.25, "y": 4, "w": 1.75},
-                {"matrix": [4, 14], "x": 14, "y": 4},
-                {"matrix": [4, 15], "x": 15, "y": 4},
-
-                {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
-                {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
-                {"matrix": [5, 3], "x": 2.5, "y": 5, "w": 1.25},
-                {"matrix": [5, 6], "x": 3.75, "y": 5, "w": 6.25},
-                {"matrix": [5, 10], "x": 10, "y": 5},
-                {"matrix": [5, 11], "x": 11, "y": 5},
-                {"matrix": [5, 12], "x": 12, "y": 5},
-                {"matrix": [5, 13], "x": 13, "y": 5},
-                {"matrix": [5, 14], "x": 14, "y": 5},
-                {"matrix": [5, 15], "x": 15, "y": 5}
-            ]
-        },
-        "LAYOUT_75_iso_rwkl": {
-            "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, 14], "x": 14, "y": 0},
-                {"matrix": [0, 15], "x": 15, "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": [1, 4], "x": 4, "y": 1},
-                {"matrix": [1, 5], "x": 5, "y": 1},
-                {"matrix": [1, 6], "x": 6, "y": 1},
-                {"matrix": [1, 7], "x": 7, "y": 1},
-                {"matrix": [1, 8], "x": 8, "y": 1},
-                {"matrix": [1, 9], "x": 9, "y": 1},
-                {"matrix": [1, 10], "x": 10, "y": 1},
-                {"matrix": [1, 11], "x": 11, "y": 1},
-                {"matrix": [1, 12], "x": 12, "y": 1},
-                {"matrix": [1, 14], "x": 13, "y": 1, "w": 2},
-                {"matrix": [1, 15], "x": 15, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
-                {"matrix": [2, 2], "x": 1.5, "y": 2},
-                {"matrix": [2, 3], "x": 2.5, "y": 2},
-                {"matrix": [2, 4], "x": 3.5, "y": 2},
-                {"matrix": [2, 5], "x": 4.5, "y": 2},
-                {"matrix": [2, 6], "x": 5.5, "y": 2},
-                {"matrix": [2, 7], "x": 6.5, "y": 2},
-                {"matrix": [2, 8], "x": 7.5, "y": 2},
-                {"matrix": [2, 9], "x": 8.5, "y": 2},
-                {"matrix": [2, 10], "x": 9.5, "y": 2},
-                {"matrix": [2, 11], "x": 10.5, "y": 2},
-                {"matrix": [2, 12], "x": 11.5, "y": 2},
-                {"matrix": [2, 13], "x": 12.5, "y": 2},
-                {"matrix": [2, 15], "x": 15, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
-                {"matrix": [3, 2], "x": 1.75, "y": 3},
-                {"matrix": [3, 3], "x": 2.75, "y": 3},
-                {"matrix": [3, 4], "x": 3.75, "y": 3},
-                {"matrix": [3, 5], "x": 4.75, "y": 3},
-                {"matrix": [3, 6], "x": 5.75, "y": 3},
-                {"matrix": [3, 7], "x": 6.75, "y": 3},
-                {"matrix": [3, 8], "x": 7.75, "y": 3},
-                {"matrix": [3, 9], "x": 8.75, "y": 3},
-                {"matrix": [3, 10], "x": 9.75, "y": 3},
-                {"matrix": [3, 11], "x": 10.75, "y": 3},
-                {"matrix": [3, 12], "x": 11.75, "y": 3},
-                {"matrix": [2, 14], "x": 12.75, "y": 3},
-                {"matrix": [3, 13], "x": 13.75, "y": 2, "w": 1.25, "h": 2},
-                {"matrix": [3, 15], "x": 15, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4},
-                {"matrix": [4, 2], "x": 2.25, "y": 4},
-                {"matrix": [4, 3], "x": 3.25, "y": 4},
-                {"matrix": [4, 4], "x": 4.25, "y": 4},
-                {"matrix": [4, 5], "x": 5.25, "y": 4},
-                {"matrix": [4, 6], "x": 6.25, "y": 4},
-                {"matrix": [4, 7], "x": 7.25, "y": 4},
-                {"matrix": [4, 8], "x": 8.25, "y": 4},
-                {"matrix": [4, 9], "x": 9.25, "y": 4},
-                {"matrix": [4, 10], "x": 10.25, "y": 4},
-                {"matrix": [4, 11], "x": 11.25, "y": 4},
-                {"matrix": [4, 13], "x": 12.25, "y": 4, "w": 1.75},
-                {"matrix": [4, 14], "x": 14, "y": 4},
-                {"matrix": [4, 15], "x": 15, "y": 4},
-
-                {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
-                {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
-                {"matrix": [5, 3], "x": 2.5, "y": 5, "w": 1.25},
-                {"matrix": [5, 6], "x": 3.75, "y": 5, "w": 6.25},
-                {"matrix": [5, 10], "x": 10, "y": 5, "w": 1.5},
-                {"matrix": [5, 12], "x": 11.5, "y": 5, "w": 1.5},
-                {"matrix": [5, 13], "x": 13, "y": 5},
-                {"matrix": [5, 14], "x": 14, "y": 5},
-                {"matrix": [5, 15], "x": 15, "y": 5}
-            ]
-        },
-        "LAYOUT_75_iso_rwkl_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, 14], "x": 14, "y": 0},
-                {"matrix": [0, 15], "x": 15, "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": [1, 4], "x": 4, "y": 1},
-                {"matrix": [1, 5], "x": 5, "y": 1},
-                {"matrix": [1, 6], "x": 6, "y": 1},
-                {"matrix": [1, 7], "x": 7, "y": 1},
-                {"matrix": [1, 8], "x": 8, "y": 1},
-                {"matrix": [1, 9], "x": 9, "y": 1},
-                {"matrix": [1, 10], "x": 10, "y": 1},
-                {"matrix": [1, 11], "x": 11, "y": 1},
-                {"matrix": [1, 12], "x": 12, "y": 1},
-                {"matrix": [1, 13], "x": 13, "y": 1},
-                {"matrix": [1, 14], "x": 14, "y": 1},
-                {"matrix": [1, 15], "x": 15, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
-                {"matrix": [2, 2], "x": 1.5, "y": 2},
-                {"matrix": [2, 3], "x": 2.5, "y": 2},
-                {"matrix": [2, 4], "x": 3.5, "y": 2},
-                {"matrix": [2, 5], "x": 4.5, "y": 2},
-                {"matrix": [2, 6], "x": 5.5, "y": 2},
-                {"matrix": [2, 7], "x": 6.5, "y": 2},
-                {"matrix": [2, 8], "x": 7.5, "y": 2},
-                {"matrix": [2, 9], "x": 8.5, "y": 2},
-                {"matrix": [2, 10], "x": 9.5, "y": 2},
-                {"matrix": [2, 11], "x": 10.5, "y": 2},
-                {"matrix": [2, 12], "x": 11.5, "y": 2},
-                {"matrix": [2, 13], "x": 12.5, "y": 2},
-                {"matrix": [2, 15], "x": 15, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
-                {"matrix": [3, 2], "x": 1.75, "y": 3},
-                {"matrix": [3, 3], "x": 2.75, "y": 3},
-                {"matrix": [3, 4], "x": 3.75, "y": 3},
-                {"matrix": [3, 5], "x": 4.75, "y": 3},
-                {"matrix": [3, 6], "x": 5.75, "y": 3},
-                {"matrix": [3, 7], "x": 6.75, "y": 3},
-                {"matrix": [3, 8], "x": 7.75, "y": 3},
-                {"matrix": [3, 9], "x": 8.75, "y": 3},
-                {"matrix": [3, 10], "x": 9.75, "y": 3},
-                {"matrix": [3, 11], "x": 10.75, "y": 3},
-                {"matrix": [3, 12], "x": 11.75, "y": 3},
-                {"matrix": [2, 14], "x": 12.75, "y": 3},
-                {"matrix": [3, 13], "x": 13.75, "y": 2, "w": 1.25, "h": 2},
-                {"matrix": [3, 15], "x": 15, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4},
-                {"matrix": [4, 2], "x": 2.25, "y": 4},
-                {"matrix": [4, 3], "x": 3.25, "y": 4},
-                {"matrix": [4, 4], "x": 4.25, "y": 4},
-                {"matrix": [4, 5], "x": 5.25, "y": 4},
-                {"matrix": [4, 6], "x": 6.25, "y": 4},
-                {"matrix": [4, 7], "x": 7.25, "y": 4},
-                {"matrix": [4, 8], "x": 8.25, "y": 4},
-                {"matrix": [4, 9], "x": 9.25, "y": 4},
-                {"matrix": [4, 10], "x": 10.25, "y": 4},
-                {"matrix": [4, 11], "x": 11.25, "y": 4},
-                {"matrix": [4, 13], "x": 12.25, "y": 4, "w": 1.75},
-                {"matrix": [4, 14], "x": 14, "y": 4},
-                {"matrix": [4, 15], "x": 15, "y": 4},
-
-                {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
-                {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
-                {"matrix": [5, 3], "x": 2.5, "y": 5, "w": 1.25},
-                {"matrix": [5, 6], "x": 3.75, "y": 5, "w": 6.25},
-                {"matrix": [5, 10], "x": 10, "y": 5, "w": 1.5},
-                {"matrix": [5, 12], "x": 11.5, "y": 5, "w": 1.5},
-                {"matrix": [5, 13], "x": 13, "y": 5},
-                {"matrix": [5, 14], "x": 14, "y": 5},
-                {"matrix": [5, 15], "x": 15, "y": 5}
-            ]
-        },
-        "LAYOUT_75_iso_wkl": {
-            "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, 14], "x": 14, "y": 0},
-                {"matrix": [0, 15], "x": 15, "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": [1, 4], "x": 4, "y": 1},
-                {"matrix": [1, 5], "x": 5, "y": 1},
-                {"matrix": [1, 6], "x": 6, "y": 1},
-                {"matrix": [1, 7], "x": 7, "y": 1},
-                {"matrix": [1, 8], "x": 8, "y": 1},
-                {"matrix": [1, 9], "x": 9, "y": 1},
-                {"matrix": [1, 10], "x": 10, "y": 1},
-                {"matrix": [1, 11], "x": 11, "y": 1},
-                {"matrix": [1, 12], "x": 12, "y": 1},
-                {"matrix": [1, 14], "x": 13, "y": 1, "w": 2},
-                {"matrix": [1, 15], "x": 15, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
-                {"matrix": [2, 2], "x": 1.5, "y": 2},
-                {"matrix": [2, 3], "x": 2.5, "y": 2},
-                {"matrix": [2, 4], "x": 3.5, "y": 2},
-                {"matrix": [2, 5], "x": 4.5, "y": 2},
-                {"matrix": [2, 6], "x": 5.5, "y": 2},
-                {"matrix": [2, 7], "x": 6.5, "y": 2},
-                {"matrix": [2, 8], "x": 7.5, "y": 2},
-                {"matrix": [2, 9], "x": 8.5, "y": 2},
-                {"matrix": [2, 10], "x": 9.5, "y": 2},
-                {"matrix": [2, 11], "x": 10.5, "y": 2},
-                {"matrix": [2, 12], "x": 11.5, "y": 2},
-                {"matrix": [2, 13], "x": 12.5, "y": 2},
-                {"matrix": [2, 15], "x": 15, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
-                {"matrix": [3, 2], "x": 1.75, "y": 3},
-                {"matrix": [3, 3], "x": 2.75, "y": 3},
-                {"matrix": [3, 4], "x": 3.75, "y": 3},
-                {"matrix": [3, 5], "x": 4.75, "y": 3},
-                {"matrix": [3, 6], "x": 5.75, "y": 3},
-                {"matrix": [3, 7], "x": 6.75, "y": 3},
-                {"matrix": [3, 8], "x": 7.75, "y": 3},
-                {"matrix": [3, 9], "x": 8.75, "y": 3},
-                {"matrix": [3, 10], "x": 9.75, "y": 3},
-                {"matrix": [3, 11], "x": 10.75, "y": 3},
-                {"matrix": [3, 12], "x": 11.75, "y": 3},
-                {"matrix": [2, 14], "x": 12.75, "y": 3},
-                {"matrix": [3, 13], "x": 13.75, "y": 2, "w": 1.25, "h": 2},
-                {"matrix": [3, 15], "x": 15, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4},
-                {"matrix": [4, 2], "x": 2.25, "y": 4},
-                {"matrix": [4, 3], "x": 3.25, "y": 4},
-                {"matrix": [4, 4], "x": 4.25, "y": 4},
-                {"matrix": [4, 5], "x": 5.25, "y": 4},
-                {"matrix": [4, 6], "x": 6.25, "y": 4},
-                {"matrix": [4, 7], "x": 7.25, "y": 4},
-                {"matrix": [4, 8], "x": 8.25, "y": 4},
-                {"matrix": [4, 9], "x": 9.25, "y": 4},
-                {"matrix": [4, 10], "x": 10.25, "y": 4},
-                {"matrix": [4, 11], "x": 11.25, "y": 4},
-                {"matrix": [4, 13], "x": 12.25, "y": 4, "w": 1.75},
-                {"matrix": [4, 14], "x": 14, "y": 4},
-                {"matrix": [4, 15], "x": 15, "y": 4},
-
-                {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.5},
-                {"matrix": [5, 1], "x": 1.5, "y": 5, "w": 1.5},
-                {"matrix": [5, 6], "x": 3, "y": 5, "w": 7},
-                {"matrix": [5, 10], "x": 10, "y": 5, "w": 1.5},
-                {"matrix": [5, 12], "x": 11.5, "y": 5, "w": 1.5},
-                {"matrix": [5, 13], "x": 13, "y": 5},
-                {"matrix": [5, 14], "x": 14, "y": 5},
-                {"matrix": [5, 15], "x": 15, "y": 5}
-            ]
-        },
-        "LAYOUT_75_iso_wkl_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, 14], "x": 14, "y": 0},
-                {"matrix": [0, 15], "x": 15, "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": [1, 4], "x": 4, "y": 1},
-                {"matrix": [1, 5], "x": 5, "y": 1},
-                {"matrix": [1, 6], "x": 6, "y": 1},
-                {"matrix": [1, 7], "x": 7, "y": 1},
-                {"matrix": [1, 8], "x": 8, "y": 1},
-                {"matrix": [1, 9], "x": 9, "y": 1},
-                {"matrix": [1, 10], "x": 10, "y": 1},
-                {"matrix": [1, 11], "x": 11, "y": 1},
-                {"matrix": [1, 12], "x": 12, "y": 1},
-                {"matrix": [1, 13], "x": 13, "y": 1},
-                {"matrix": [1, 14], "x": 14, "y": 1},
-                {"matrix": [1, 15], "x": 15, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
-                {"matrix": [2, 2], "x": 1.5, "y": 2},
-                {"matrix": [2, 3], "x": 2.5, "y": 2},
-                {"matrix": [2, 4], "x": 3.5, "y": 2},
-                {"matrix": [2, 5], "x": 4.5, "y": 2},
-                {"matrix": [2, 6], "x": 5.5, "y": 2},
-                {"matrix": [2, 7], "x": 6.5, "y": 2},
-                {"matrix": [2, 8], "x": 7.5, "y": 2},
-                {"matrix": [2, 9], "x": 8.5, "y": 2},
-                {"matrix": [2, 10], "x": 9.5, "y": 2},
-                {"matrix": [2, 11], "x": 10.5, "y": 2},
-                {"matrix": [2, 12], "x": 11.5, "y": 2},
-                {"matrix": [2, 13], "x": 12.5, "y": 2},
-                {"matrix": [2, 15], "x": 15, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
-                {"matrix": [3, 2], "x": 1.75, "y": 3},
-                {"matrix": [3, 3], "x": 2.75, "y": 3},
-                {"matrix": [3, 4], "x": 3.75, "y": 3},
-                {"matrix": [3, 5], "x": 4.75, "y": 3},
-                {"matrix": [3, 6], "x": 5.75, "y": 3},
-                {"matrix": [3, 7], "x": 6.75, "y": 3},
-                {"matrix": [3, 8], "x": 7.75, "y": 3},
-                {"matrix": [3, 9], "x": 8.75, "y": 3},
-                {"matrix": [3, 10], "x": 9.75, "y": 3},
-                {"matrix": [3, 11], "x": 10.75, "y": 3},
-                {"matrix": [3, 12], "x": 11.75, "y": 3},
-                {"matrix": [2, 14], "x": 12.75, "y": 3},
-                {"matrix": [3, 13], "x": 13.75, "y": 2, "w": 1.25, "h": 2},
-                {"matrix": [3, 15], "x": 15, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4},
-                {"matrix": [4, 2], "x": 2.25, "y": 4},
-                {"matrix": [4, 3], "x": 3.25, "y": 4},
-                {"matrix": [4, 4], "x": 4.25, "y": 4},
-                {"matrix": [4, 5], "x": 5.25, "y": 4},
-                {"matrix": [4, 6], "x": 6.25, "y": 4},
-                {"matrix": [4, 7], "x": 7.25, "y": 4},
-                {"matrix": [4, 8], "x": 8.25, "y": 4},
-                {"matrix": [4, 9], "x": 9.25, "y": 4},
-                {"matrix": [4, 10], "x": 10.25, "y": 4},
-                {"matrix": [4, 11], "x": 11.25, "y": 4},
-                {"matrix": [4, 13], "x": 12.25, "y": 4, "w": 1.75},
-                {"matrix": [4, 14], "x": 14, "y": 4},
-                {"matrix": [4, 15], "x": 15, "y": 4},
-
-                {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.5},
-                {"matrix": [5, 1], "x": 1.5, "y": 5, "w": 1.5},
-                {"matrix": [5, 6], "x": 3, "y": 5, "w": 7},
-                {"matrix": [5, 10], "x": 10, "y": 5, "w": 1.5},
-                {"matrix": [5, 12], "x": 11.5, "y": 5, "w": 1.5},
-                {"matrix": [5, 13], "x": 13, "y": 5},
-                {"matrix": [5, 14], "x": 14, "y": 5},
-                {"matrix": [5, 15], "x": 15, "y": 5}
-            ]
-        }
-    }
-}
diff --git a/keyboards/kbdfans/kbd75/rev1/keyboard.json b/keyboards/kbdfans/kbd75/rev1/keyboard.json
new file mode 100644
index 00000000000..94f96988ffa
--- /dev/null
+++ b/keyboards/kbdfans/kbd75/rev1/keyboard.json
@@ -0,0 +1,1274 @@
+{
+    "keyboard_name": "KBD75 rev1",
+    "manufacturer": "KBDfans",
+    "url": "",
+    "maintainer": "qmk",
+    "usb": {
+        "vid": "0x4B42",
+        "pid": "0x6060",
+        "device_version": "0.0.1"
+    },
+    "matrix_pins": {
+        "cols": ["F0", "F1", "E6", "C7", "C6", "F5", "D4", "B1", "B0", "B5", "B4", "D7", "D6", "B3", "F4", "F6"],
+        "rows": ["D0", "D1", "D2", "D3", "D5", "B7"]
+    },
+    "diode_direction": "COL2ROW",
+    "backlight": {
+        "pin": "B6",
+        "levels": 5
+    },
+    "indicators": {
+        "caps_lock": "B2",
+        "on_state": 0
+    },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 16,
+        "sleep": true,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": true,
+            "twinkle": true
+        }
+    },
+    "ws2812": {
+        "pin": "E2"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "nkro": true,
+        "backlight": true,
+        "rgblight": true
+    },
+    "layout_aliases": {
+        "LAYOUT_ansi_1u": "LAYOUT_75_ansi"
+    },
+    "community_layouts": ["75_ansi", "75_iso"],
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 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, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "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": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+                {"matrix": [1, 12], "x": 12, "y": 1},
+                {"matrix": [1, 13], "x": 13, "y": 1},
+                {"matrix": [1, 14], "x": 14, "y": 1},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [2, 2], "x": 1.5, "y": 2},
+                {"matrix": [2, 3], "x": 2.5, "y": 2},
+                {"matrix": [2, 4], "x": 3.5, "y": 2},
+                {"matrix": [2, 5], "x": 4.5, "y": 2},
+                {"matrix": [2, 6], "x": 5.5, "y": 2},
+                {"matrix": [2, 7], "x": 6.5, "y": 2},
+                {"matrix": [2, 8], "x": 7.5, "y": 2},
+                {"matrix": [2, 9], "x": 8.5, "y": 2},
+                {"matrix": [2, 10], "x": 9.5, "y": 2},
+                {"matrix": [2, 11], "x": 10.5, "y": 2},
+                {"matrix": [2, 12], "x": 11.5, "y": 2},
+                {"matrix": [2, 13], "x": 12.5, "y": 2},
+                {"matrix": [2, 14], "x": 13.5, "y": 2, "w": 1.5},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+                {"matrix": [3, 2], "x": 1.75, "y": 3},
+                {"matrix": [3, 3], "x": 2.75, "y": 3},
+                {"matrix": [3, 4], "x": 3.75, "y": 3},
+                {"matrix": [3, 5], "x": 4.75, "y": 3},
+                {"matrix": [3, 6], "x": 5.75, "y": 3},
+                {"matrix": [3, 7], "x": 6.75, "y": 3},
+                {"matrix": [3, 8], "x": 7.75, "y": 3},
+                {"matrix": [3, 9], "x": 8.75, "y": 3},
+                {"matrix": [3, 10], "x": 9.75, "y": 3},
+                {"matrix": [3, 11], "x": 10.75, "y": 3},
+                {"matrix": [3, 12], "x": 11.75, "y": 3},
+                {"matrix": [3, 13], "x": 12.75, "y": 3, "w": 2.25},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4},
+                {"matrix": [4, 2], "x": 2.25, "y": 4},
+                {"matrix": [4, 3], "x": 3.25, "y": 4},
+                {"matrix": [4, 4], "x": 4.25, "y": 4},
+                {"matrix": [4, 5], "x": 5.25, "y": 4},
+                {"matrix": [4, 6], "x": 6.25, "y": 4},
+                {"matrix": [4, 7], "x": 7.25, "y": 4},
+                {"matrix": [4, 8], "x": 8.25, "y": 4},
+                {"matrix": [4, 9], "x": 9.25, "y": 4},
+                {"matrix": [4, 10], "x": 10.25, "y": 4},
+                {"matrix": [4, 11], "x": 11.25, "y": 4},
+                {"matrix": [4, 13], "x": 12.25, "y": 4, "w": 1.75},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4},
+
+                {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
+                {"matrix": [5, 3], "x": 2.5, "y": 5, "w": 1.25},
+                {"matrix": [5, 4], "x": 3.75, "y": 5, "w": 2.25},
+                {"matrix": [5, 6], "x": 6, "y": 5, "w": 1.25},
+                {"matrix": [5, 8], "x": 7.25, "y": 5, "w": 2.75},
+                {"matrix": [5, 10], "x": 10, "y": 5},
+                {"matrix": [5, 11], "x": 11, "y": 5},
+                {"matrix": [5, 12], "x": 12, "y": 5},
+                {"matrix": [5, 13], "x": 13, "y": 5},
+                {"matrix": [5, 14], "x": 14, "y": 5},
+                {"matrix": [5, 15], "x": 15, "y": 5}
+            ]
+        },
+        "LAYOUT_75_ansi": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 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, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "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": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+                {"matrix": [1, 12], "x": 12, "y": 1},
+                {"matrix": [1, 14], "x": 13, "y": 1, "w": 2},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [2, 2], "x": 1.5, "y": 2},
+                {"matrix": [2, 3], "x": 2.5, "y": 2},
+                {"matrix": [2, 4], "x": 3.5, "y": 2},
+                {"matrix": [2, 5], "x": 4.5, "y": 2},
+                {"matrix": [2, 6], "x": 5.5, "y": 2},
+                {"matrix": [2, 7], "x": 6.5, "y": 2},
+                {"matrix": [2, 8], "x": 7.5, "y": 2},
+                {"matrix": [2, 9], "x": 8.5, "y": 2},
+                {"matrix": [2, 10], "x": 9.5, "y": 2},
+                {"matrix": [2, 11], "x": 10.5, "y": 2},
+                {"matrix": [2, 12], "x": 11.5, "y": 2},
+                {"matrix": [2, 13], "x": 12.5, "y": 2},
+                {"matrix": [2, 14], "x": 13.5, "y": 2, "w": 1.5},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+                {"matrix": [3, 2], "x": 1.75, "y": 3},
+                {"matrix": [3, 3], "x": 2.75, "y": 3},
+                {"matrix": [3, 4], "x": 3.75, "y": 3},
+                {"matrix": [3, 5], "x": 4.75, "y": 3},
+                {"matrix": [3, 6], "x": 5.75, "y": 3},
+                {"matrix": [3, 7], "x": 6.75, "y": 3},
+                {"matrix": [3, 8], "x": 7.75, "y": 3},
+                {"matrix": [3, 9], "x": 8.75, "y": 3},
+                {"matrix": [3, 10], "x": 9.75, "y": 3},
+                {"matrix": [3, 11], "x": 10.75, "y": 3},
+                {"matrix": [3, 12], "x": 11.75, "y": 3},
+                {"matrix": [3, 13], "x": 12.75, "y": 3, "w": 2.25},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4},
+                {"matrix": [4, 3], "x": 3.25, "y": 4},
+                {"matrix": [4, 4], "x": 4.25, "y": 4},
+                {"matrix": [4, 5], "x": 5.25, "y": 4},
+                {"matrix": [4, 6], "x": 6.25, "y": 4},
+                {"matrix": [4, 7], "x": 7.25, "y": 4},
+                {"matrix": [4, 8], "x": 8.25, "y": 4},
+                {"matrix": [4, 9], "x": 9.25, "y": 4},
+                {"matrix": [4, 10], "x": 10.25, "y": 4},
+                {"matrix": [4, 11], "x": 11.25, "y": 4},
+                {"matrix": [4, 13], "x": 12.25, "y": 4, "w": 1.75},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4},
+
+                {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
+                {"matrix": [5, 3], "x": 2.5, "y": 5, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5},
+                {"matrix": [5, 11], "x": 11, "y": 5},
+                {"matrix": [5, 12], "x": 12, "y": 5},
+                {"matrix": [5, 13], "x": 13, "y": 5},
+                {"matrix": [5, 14], "x": 14, "y": 5},
+                {"matrix": [5, 15], "x": 15, "y": 5}
+            ]
+        },
+        "LAYOUT_75_ansi_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, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "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": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+                {"matrix": [1, 12], "x": 12, "y": 1},
+                {"matrix": [1, 13], "x": 13, "y": 1},
+                {"matrix": [1, 14], "x": 14, "y": 1},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [2, 2], "x": 1.5, "y": 2},
+                {"matrix": [2, 3], "x": 2.5, "y": 2},
+                {"matrix": [2, 4], "x": 3.5, "y": 2},
+                {"matrix": [2, 5], "x": 4.5, "y": 2},
+                {"matrix": [2, 6], "x": 5.5, "y": 2},
+                {"matrix": [2, 7], "x": 6.5, "y": 2},
+                {"matrix": [2, 8], "x": 7.5, "y": 2},
+                {"matrix": [2, 9], "x": 8.5, "y": 2},
+                {"matrix": [2, 10], "x": 9.5, "y": 2},
+                {"matrix": [2, 11], "x": 10.5, "y": 2},
+                {"matrix": [2, 12], "x": 11.5, "y": 2},
+                {"matrix": [2, 13], "x": 12.5, "y": 2},
+                {"matrix": [2, 14], "x": 13.5, "y": 2, "w": 1.5},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+                {"matrix": [3, 2], "x": 1.75, "y": 3},
+                {"matrix": [3, 3], "x": 2.75, "y": 3},
+                {"matrix": [3, 4], "x": 3.75, "y": 3},
+                {"matrix": [3, 5], "x": 4.75, "y": 3},
+                {"matrix": [3, 6], "x": 5.75, "y": 3},
+                {"matrix": [3, 7], "x": 6.75, "y": 3},
+                {"matrix": [3, 8], "x": 7.75, "y": 3},
+                {"matrix": [3, 9], "x": 8.75, "y": 3},
+                {"matrix": [3, 10], "x": 9.75, "y": 3},
+                {"matrix": [3, 11], "x": 10.75, "y": 3},
+                {"matrix": [3, 12], "x": 11.75, "y": 3},
+                {"matrix": [3, 13], "x": 12.75, "y": 3, "w": 2.25},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4},
+                {"matrix": [4, 3], "x": 3.25, "y": 4},
+                {"matrix": [4, 4], "x": 4.25, "y": 4},
+                {"matrix": [4, 5], "x": 5.25, "y": 4},
+                {"matrix": [4, 6], "x": 6.25, "y": 4},
+                {"matrix": [4, 7], "x": 7.25, "y": 4},
+                {"matrix": [4, 8], "x": 8.25, "y": 4},
+                {"matrix": [4, 9], "x": 9.25, "y": 4},
+                {"matrix": [4, 10], "x": 10.25, "y": 4},
+                {"matrix": [4, 11], "x": 11.25, "y": 4},
+                {"matrix": [4, 13], "x": 12.25, "y": 4, "w": 1.75},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4},
+
+                {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
+                {"matrix": [5, 3], "x": 2.5, "y": 5, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5},
+                {"matrix": [5, 11], "x": 11, "y": 5},
+                {"matrix": [5, 12], "x": 12, "y": 5},
+                {"matrix": [5, 13], "x": 13, "y": 5},
+                {"matrix": [5, 14], "x": 14, "y": 5},
+                {"matrix": [5, 15], "x": 15, "y": 5}
+            ]
+        },
+        "LAYOUT_75_ansi_rwkl": {
+            "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, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "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": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+                {"matrix": [1, 12], "x": 12, "y": 1},
+                {"matrix": [1, 14], "x": 13, "y": 1, "w": 2},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [2, 2], "x": 1.5, "y": 2},
+                {"matrix": [2, 3], "x": 2.5, "y": 2},
+                {"matrix": [2, 4], "x": 3.5, "y": 2},
+                {"matrix": [2, 5], "x": 4.5, "y": 2},
+                {"matrix": [2, 6], "x": 5.5, "y": 2},
+                {"matrix": [2, 7], "x": 6.5, "y": 2},
+                {"matrix": [2, 8], "x": 7.5, "y": 2},
+                {"matrix": [2, 9], "x": 8.5, "y": 2},
+                {"matrix": [2, 10], "x": 9.5, "y": 2},
+                {"matrix": [2, 11], "x": 10.5, "y": 2},
+                {"matrix": [2, 12], "x": 11.5, "y": 2},
+                {"matrix": [2, 13], "x": 12.5, "y": 2},
+                {"matrix": [2, 14], "x": 13.5, "y": 2, "w": 1.5},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+                {"matrix": [3, 2], "x": 1.75, "y": 3},
+                {"matrix": [3, 3], "x": 2.75, "y": 3},
+                {"matrix": [3, 4], "x": 3.75, "y": 3},
+                {"matrix": [3, 5], "x": 4.75, "y": 3},
+                {"matrix": [3, 6], "x": 5.75, "y": 3},
+                {"matrix": [3, 7], "x": 6.75, "y": 3},
+                {"matrix": [3, 8], "x": 7.75, "y": 3},
+                {"matrix": [3, 9], "x": 8.75, "y": 3},
+                {"matrix": [3, 10], "x": 9.75, "y": 3},
+                {"matrix": [3, 11], "x": 10.75, "y": 3},
+                {"matrix": [3, 12], "x": 11.75, "y": 3},
+                {"matrix": [3, 13], "x": 12.75, "y": 3, "w": 2.25},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4},
+                {"matrix": [4, 3], "x": 3.25, "y": 4},
+                {"matrix": [4, 4], "x": 4.25, "y": 4},
+                {"matrix": [4, 5], "x": 5.25, "y": 4},
+                {"matrix": [4, 6], "x": 6.25, "y": 4},
+                {"matrix": [4, 7], "x": 7.25, "y": 4},
+                {"matrix": [4, 8], "x": 8.25, "y": 4},
+                {"matrix": [4, 9], "x": 9.25, "y": 4},
+                {"matrix": [4, 10], "x": 10.25, "y": 4},
+                {"matrix": [4, 11], "x": 11.25, "y": 4},
+                {"matrix": [4, 13], "x": 12.25, "y": 4, "w": 1.75},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4},
+
+                {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
+                {"matrix": [5, 3], "x": 2.5, "y": 5, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5, "w": 1.5},
+                {"matrix": [5, 12], "x": 11.5, "y": 5, "w": 1.5},
+                {"matrix": [5, 13], "x": 13, "y": 5},
+                {"matrix": [5, 14], "x": 14, "y": 5},
+                {"matrix": [5, 15], "x": 15, "y": 5}
+            ]
+        },
+        "LAYOUT_75_ansi_rwkl_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, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "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": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+                {"matrix": [1, 12], "x": 12, "y": 1},
+                {"matrix": [1, 13], "x": 13, "y": 1},
+                {"matrix": [1, 14], "x": 14, "y": 1},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [2, 2], "x": 1.5, "y": 2},
+                {"matrix": [2, 3], "x": 2.5, "y": 2},
+                {"matrix": [2, 4], "x": 3.5, "y": 2},
+                {"matrix": [2, 5], "x": 4.5, "y": 2},
+                {"matrix": [2, 6], "x": 5.5, "y": 2},
+                {"matrix": [2, 7], "x": 6.5, "y": 2},
+                {"matrix": [2, 8], "x": 7.5, "y": 2},
+                {"matrix": [2, 9], "x": 8.5, "y": 2},
+                {"matrix": [2, 10], "x": 9.5, "y": 2},
+                {"matrix": [2, 11], "x": 10.5, "y": 2},
+                {"matrix": [2, 12], "x": 11.5, "y": 2},
+                {"matrix": [2, 13], "x": 12.5, "y": 2},
+                {"matrix": [2, 14], "x": 13.5, "y": 2, "w": 1.5},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+                {"matrix": [3, 2], "x": 1.75, "y": 3},
+                {"matrix": [3, 3], "x": 2.75, "y": 3},
+                {"matrix": [3, 4], "x": 3.75, "y": 3},
+                {"matrix": [3, 5], "x": 4.75, "y": 3},
+                {"matrix": [3, 6], "x": 5.75, "y": 3},
+                {"matrix": [3, 7], "x": 6.75, "y": 3},
+                {"matrix": [3, 8], "x": 7.75, "y": 3},
+                {"matrix": [3, 9], "x": 8.75, "y": 3},
+                {"matrix": [3, 10], "x": 9.75, "y": 3},
+                {"matrix": [3, 11], "x": 10.75, "y": 3},
+                {"matrix": [3, 12], "x": 11.75, "y": 3},
+                {"matrix": [3, 13], "x": 12.75, "y": 3, "w": 2.25},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4},
+                {"matrix": [4, 3], "x": 3.25, "y": 4},
+                {"matrix": [4, 4], "x": 4.25, "y": 4},
+                {"matrix": [4, 5], "x": 5.25, "y": 4},
+                {"matrix": [4, 6], "x": 6.25, "y": 4},
+                {"matrix": [4, 7], "x": 7.25, "y": 4},
+                {"matrix": [4, 8], "x": 8.25, "y": 4},
+                {"matrix": [4, 9], "x": 9.25, "y": 4},
+                {"matrix": [4, 10], "x": 10.25, "y": 4},
+                {"matrix": [4, 11], "x": 11.25, "y": 4},
+                {"matrix": [4, 13], "x": 12.25, "y": 4, "w": 1.75},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4},
+
+                {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
+                {"matrix": [5, 3], "x": 2.5, "y": 5, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5, "w": 1.5},
+                {"matrix": [5, 12], "x": 11.5, "y": 5, "w": 1.5},
+                {"matrix": [5, 13], "x": 13, "y": 5},
+                {"matrix": [5, 14], "x": 14, "y": 5},
+                {"matrix": [5, 15], "x": 15, "y": 5}
+            ]
+        },
+        "LAYOUT_75_ansi_wkl": {
+            "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, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "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": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+                {"matrix": [1, 12], "x": 12, "y": 1},
+                {"matrix": [1, 14], "x": 13, "y": 1, "w": 2},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [2, 2], "x": 1.5, "y": 2},
+                {"matrix": [2, 3], "x": 2.5, "y": 2},
+                {"matrix": [2, 4], "x": 3.5, "y": 2},
+                {"matrix": [2, 5], "x": 4.5, "y": 2},
+                {"matrix": [2, 6], "x": 5.5, "y": 2},
+                {"matrix": [2, 7], "x": 6.5, "y": 2},
+                {"matrix": [2, 8], "x": 7.5, "y": 2},
+                {"matrix": [2, 9], "x": 8.5, "y": 2},
+                {"matrix": [2, 10], "x": 9.5, "y": 2},
+                {"matrix": [2, 11], "x": 10.5, "y": 2},
+                {"matrix": [2, 12], "x": 11.5, "y": 2},
+                {"matrix": [2, 13], "x": 12.5, "y": 2},
+                {"matrix": [2, 14], "x": 13.5, "y": 2, "w": 1.5},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+                {"matrix": [3, 2], "x": 1.75, "y": 3},
+                {"matrix": [3, 3], "x": 2.75, "y": 3},
+                {"matrix": [3, 4], "x": 3.75, "y": 3},
+                {"matrix": [3, 5], "x": 4.75, "y": 3},
+                {"matrix": [3, 6], "x": 5.75, "y": 3},
+                {"matrix": [3, 7], "x": 6.75, "y": 3},
+                {"matrix": [3, 8], "x": 7.75, "y": 3},
+                {"matrix": [3, 9], "x": 8.75, "y": 3},
+                {"matrix": [3, 10], "x": 9.75, "y": 3},
+                {"matrix": [3, 11], "x": 10.75, "y": 3},
+                {"matrix": [3, 12], "x": 11.75, "y": 3},
+                {"matrix": [3, 13], "x": 12.75, "y": 3, "w": 2.25},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4},
+                {"matrix": [4, 3], "x": 3.25, "y": 4},
+                {"matrix": [4, 4], "x": 4.25, "y": 4},
+                {"matrix": [4, 5], "x": 5.25, "y": 4},
+                {"matrix": [4, 6], "x": 6.25, "y": 4},
+                {"matrix": [4, 7], "x": 7.25, "y": 4},
+                {"matrix": [4, 8], "x": 8.25, "y": 4},
+                {"matrix": [4, 9], "x": 9.25, "y": 4},
+                {"matrix": [4, 10], "x": 10.25, "y": 4},
+                {"matrix": [4, 11], "x": 11.25, "y": 4},
+                {"matrix": [4, 13], "x": 12.25, "y": 4, "w": 1.75},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4},
+
+                {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.5},
+                {"matrix": [5, 1], "x": 1.5, "y": 5, "w": 1.5},
+                {"matrix": [5, 6], "x": 3, "y": 5, "w": 7},
+                {"matrix": [5, 10], "x": 10, "y": 5, "w": 1.5},
+                {"matrix": [5, 12], "x": 11.5, "y": 5, "w": 1.5},
+                {"matrix": [5, 13], "x": 13, "y": 5},
+                {"matrix": [5, 14], "x": 14, "y": 5},
+                {"matrix": [5, 15], "x": 15, "y": 5}
+            ]
+        },
+        "LAYOUT_75_ansi_wkl_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, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "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": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+                {"matrix": [1, 12], "x": 12, "y": 1},
+                {"matrix": [1, 13], "x": 13, "y": 1},
+                {"matrix": [1, 14], "x": 14, "y": 1},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [2, 2], "x": 1.5, "y": 2},
+                {"matrix": [2, 3], "x": 2.5, "y": 2},
+                {"matrix": [2, 4], "x": 3.5, "y": 2},
+                {"matrix": [2, 5], "x": 4.5, "y": 2},
+                {"matrix": [2, 6], "x": 5.5, "y": 2},
+                {"matrix": [2, 7], "x": 6.5, "y": 2},
+                {"matrix": [2, 8], "x": 7.5, "y": 2},
+                {"matrix": [2, 9], "x": 8.5, "y": 2},
+                {"matrix": [2, 10], "x": 9.5, "y": 2},
+                {"matrix": [2, 11], "x": 10.5, "y": 2},
+                {"matrix": [2, 12], "x": 11.5, "y": 2},
+                {"matrix": [2, 13], "x": 12.5, "y": 2},
+                {"matrix": [2, 14], "x": 13.5, "y": 2, "w": 1.5},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+                {"matrix": [3, 2], "x": 1.75, "y": 3},
+                {"matrix": [3, 3], "x": 2.75, "y": 3},
+                {"matrix": [3, 4], "x": 3.75, "y": 3},
+                {"matrix": [3, 5], "x": 4.75, "y": 3},
+                {"matrix": [3, 6], "x": 5.75, "y": 3},
+                {"matrix": [3, 7], "x": 6.75, "y": 3},
+                {"matrix": [3, 8], "x": 7.75, "y": 3},
+                {"matrix": [3, 9], "x": 8.75, "y": 3},
+                {"matrix": [3, 10], "x": 9.75, "y": 3},
+                {"matrix": [3, 11], "x": 10.75, "y": 3},
+                {"matrix": [3, 12], "x": 11.75, "y": 3},
+                {"matrix": [3, 13], "x": 12.75, "y": 3, "w": 2.25},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4},
+                {"matrix": [4, 3], "x": 3.25, "y": 4},
+                {"matrix": [4, 4], "x": 4.25, "y": 4},
+                {"matrix": [4, 5], "x": 5.25, "y": 4},
+                {"matrix": [4, 6], "x": 6.25, "y": 4},
+                {"matrix": [4, 7], "x": 7.25, "y": 4},
+                {"matrix": [4, 8], "x": 8.25, "y": 4},
+                {"matrix": [4, 9], "x": 9.25, "y": 4},
+                {"matrix": [4, 10], "x": 10.25, "y": 4},
+                {"matrix": [4, 11], "x": 11.25, "y": 4},
+                {"matrix": [4, 13], "x": 12.25, "y": 4, "w": 1.75},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4},
+
+                {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.5},
+                {"matrix": [5, 1], "x": 1.5, "y": 5, "w": 1.5},
+                {"matrix": [5, 6], "x": 3, "y": 5, "w": 7},
+                {"matrix": [5, 10], "x": 10, "y": 5, "w": 1.5},
+                {"matrix": [5, 12], "x": 11.5, "y": 5, "w": 1.5},
+                {"matrix": [5, 13], "x": 13, "y": 5},
+                {"matrix": [5, 14], "x": 14, "y": 5},
+                {"matrix": [5, 15], "x": 15, "y": 5}
+            ]
+        },
+        "LAYOUT_75_iso": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "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": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+                {"matrix": [1, 12], "x": 12, "y": 1},
+                {"matrix": [1, 14], "x": 13, "y": 1, "w": 2},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [2, 2], "x": 1.5, "y": 2},
+                {"matrix": [2, 3], "x": 2.5, "y": 2},
+                {"matrix": [2, 4], "x": 3.5, "y": 2},
+                {"matrix": [2, 5], "x": 4.5, "y": 2},
+                {"matrix": [2, 6], "x": 5.5, "y": 2},
+                {"matrix": [2, 7], "x": 6.5, "y": 2},
+                {"matrix": [2, 8], "x": 7.5, "y": 2},
+                {"matrix": [2, 9], "x": 8.5, "y": 2},
+                {"matrix": [2, 10], "x": 9.5, "y": 2},
+                {"matrix": [2, 11], "x": 10.5, "y": 2},
+                {"matrix": [2, 12], "x": 11.5, "y": 2},
+                {"matrix": [2, 13], "x": 12.5, "y": 2},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+                {"matrix": [3, 2], "x": 1.75, "y": 3},
+                {"matrix": [3, 3], "x": 2.75, "y": 3},
+                {"matrix": [3, 4], "x": 3.75, "y": 3},
+                {"matrix": [3, 5], "x": 4.75, "y": 3},
+                {"matrix": [3, 6], "x": 5.75, "y": 3},
+                {"matrix": [3, 7], "x": 6.75, "y": 3},
+                {"matrix": [3, 8], "x": 7.75, "y": 3},
+                {"matrix": [3, 9], "x": 8.75, "y": 3},
+                {"matrix": [3, 10], "x": 9.75, "y": 3},
+                {"matrix": [3, 11], "x": 10.75, "y": 3},
+                {"matrix": [3, 12], "x": 11.75, "y": 3},
+                {"matrix": [2, 14], "x": 12.75, "y": 3},
+                {"matrix": [3, 13], "x": 13.75, "y": 2, "w": 1.25, "h": 2},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4},
+                {"matrix": [4, 2], "x": 2.25, "y": 4},
+                {"matrix": [4, 3], "x": 3.25, "y": 4},
+                {"matrix": [4, 4], "x": 4.25, "y": 4},
+                {"matrix": [4, 5], "x": 5.25, "y": 4},
+                {"matrix": [4, 6], "x": 6.25, "y": 4},
+                {"matrix": [4, 7], "x": 7.25, "y": 4},
+                {"matrix": [4, 8], "x": 8.25, "y": 4},
+                {"matrix": [4, 9], "x": 9.25, "y": 4},
+                {"matrix": [4, 10], "x": 10.25, "y": 4},
+                {"matrix": [4, 11], "x": 11.25, "y": 4},
+                {"matrix": [4, 13], "x": 12.25, "y": 4, "w": 1.75},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4},
+
+                {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
+                {"matrix": [5, 3], "x": 2.5, "y": 5, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5},
+                {"matrix": [5, 11], "x": 11, "y": 5},
+                {"matrix": [5, 12], "x": 12, "y": 5},
+                {"matrix": [5, 13], "x": 13, "y": 5},
+                {"matrix": [5, 14], "x": 14, "y": 5},
+                {"matrix": [5, 15], "x": 15, "y": 5}
+            ]
+        },
+        "LAYOUT_75_iso_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, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "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": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+                {"matrix": [1, 12], "x": 12, "y": 1},
+                {"matrix": [1, 13], "x": 13, "y": 1},
+                {"matrix": [1, 14], "x": 14, "y": 1},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [2, 2], "x": 1.5, "y": 2},
+                {"matrix": [2, 3], "x": 2.5, "y": 2},
+                {"matrix": [2, 4], "x": 3.5, "y": 2},
+                {"matrix": [2, 5], "x": 4.5, "y": 2},
+                {"matrix": [2, 6], "x": 5.5, "y": 2},
+                {"matrix": [2, 7], "x": 6.5, "y": 2},
+                {"matrix": [2, 8], "x": 7.5, "y": 2},
+                {"matrix": [2, 9], "x": 8.5, "y": 2},
+                {"matrix": [2, 10], "x": 9.5, "y": 2},
+                {"matrix": [2, 11], "x": 10.5, "y": 2},
+                {"matrix": [2, 12], "x": 11.5, "y": 2},
+                {"matrix": [2, 13], "x": 12.5, "y": 2},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+                {"matrix": [3, 2], "x": 1.75, "y": 3},
+                {"matrix": [3, 3], "x": 2.75, "y": 3},
+                {"matrix": [3, 4], "x": 3.75, "y": 3},
+                {"matrix": [3, 5], "x": 4.75, "y": 3},
+                {"matrix": [3, 6], "x": 5.75, "y": 3},
+                {"matrix": [3, 7], "x": 6.75, "y": 3},
+                {"matrix": [3, 8], "x": 7.75, "y": 3},
+                {"matrix": [3, 9], "x": 8.75, "y": 3},
+                {"matrix": [3, 10], "x": 9.75, "y": 3},
+                {"matrix": [3, 11], "x": 10.75, "y": 3},
+                {"matrix": [3, 12], "x": 11.75, "y": 3},
+                {"matrix": [2, 14], "x": 12.75, "y": 3},
+                {"matrix": [3, 13], "x": 13.75, "y": 2, "w": 1.25, "h": 2},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4},
+                {"matrix": [4, 2], "x": 2.25, "y": 4},
+                {"matrix": [4, 3], "x": 3.25, "y": 4},
+                {"matrix": [4, 4], "x": 4.25, "y": 4},
+                {"matrix": [4, 5], "x": 5.25, "y": 4},
+                {"matrix": [4, 6], "x": 6.25, "y": 4},
+                {"matrix": [4, 7], "x": 7.25, "y": 4},
+                {"matrix": [4, 8], "x": 8.25, "y": 4},
+                {"matrix": [4, 9], "x": 9.25, "y": 4},
+                {"matrix": [4, 10], "x": 10.25, "y": 4},
+                {"matrix": [4, 11], "x": 11.25, "y": 4},
+                {"matrix": [4, 13], "x": 12.25, "y": 4, "w": 1.75},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4},
+
+                {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
+                {"matrix": [5, 3], "x": 2.5, "y": 5, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5},
+                {"matrix": [5, 11], "x": 11, "y": 5},
+                {"matrix": [5, 12], "x": 12, "y": 5},
+                {"matrix": [5, 13], "x": 13, "y": 5},
+                {"matrix": [5, 14], "x": 14, "y": 5},
+                {"matrix": [5, 15], "x": 15, "y": 5}
+            ]
+        },
+        "LAYOUT_75_iso_rwkl": {
+            "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, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "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": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+                {"matrix": [1, 12], "x": 12, "y": 1},
+                {"matrix": [1, 14], "x": 13, "y": 1, "w": 2},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [2, 2], "x": 1.5, "y": 2},
+                {"matrix": [2, 3], "x": 2.5, "y": 2},
+                {"matrix": [2, 4], "x": 3.5, "y": 2},
+                {"matrix": [2, 5], "x": 4.5, "y": 2},
+                {"matrix": [2, 6], "x": 5.5, "y": 2},
+                {"matrix": [2, 7], "x": 6.5, "y": 2},
+                {"matrix": [2, 8], "x": 7.5, "y": 2},
+                {"matrix": [2, 9], "x": 8.5, "y": 2},
+                {"matrix": [2, 10], "x": 9.5, "y": 2},
+                {"matrix": [2, 11], "x": 10.5, "y": 2},
+                {"matrix": [2, 12], "x": 11.5, "y": 2},
+                {"matrix": [2, 13], "x": 12.5, "y": 2},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+                {"matrix": [3, 2], "x": 1.75, "y": 3},
+                {"matrix": [3, 3], "x": 2.75, "y": 3},
+                {"matrix": [3, 4], "x": 3.75, "y": 3},
+                {"matrix": [3, 5], "x": 4.75, "y": 3},
+                {"matrix": [3, 6], "x": 5.75, "y": 3},
+                {"matrix": [3, 7], "x": 6.75, "y": 3},
+                {"matrix": [3, 8], "x": 7.75, "y": 3},
+                {"matrix": [3, 9], "x": 8.75, "y": 3},
+                {"matrix": [3, 10], "x": 9.75, "y": 3},
+                {"matrix": [3, 11], "x": 10.75, "y": 3},
+                {"matrix": [3, 12], "x": 11.75, "y": 3},
+                {"matrix": [2, 14], "x": 12.75, "y": 3},
+                {"matrix": [3, 13], "x": 13.75, "y": 2, "w": 1.25, "h": 2},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4},
+                {"matrix": [4, 2], "x": 2.25, "y": 4},
+                {"matrix": [4, 3], "x": 3.25, "y": 4},
+                {"matrix": [4, 4], "x": 4.25, "y": 4},
+                {"matrix": [4, 5], "x": 5.25, "y": 4},
+                {"matrix": [4, 6], "x": 6.25, "y": 4},
+                {"matrix": [4, 7], "x": 7.25, "y": 4},
+                {"matrix": [4, 8], "x": 8.25, "y": 4},
+                {"matrix": [4, 9], "x": 9.25, "y": 4},
+                {"matrix": [4, 10], "x": 10.25, "y": 4},
+                {"matrix": [4, 11], "x": 11.25, "y": 4},
+                {"matrix": [4, 13], "x": 12.25, "y": 4, "w": 1.75},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4},
+
+                {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
+                {"matrix": [5, 3], "x": 2.5, "y": 5, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5, "w": 1.5},
+                {"matrix": [5, 12], "x": 11.5, "y": 5, "w": 1.5},
+                {"matrix": [5, 13], "x": 13, "y": 5},
+                {"matrix": [5, 14], "x": 14, "y": 5},
+                {"matrix": [5, 15], "x": 15, "y": 5}
+            ]
+        },
+        "LAYOUT_75_iso_rwkl_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, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "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": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+                {"matrix": [1, 12], "x": 12, "y": 1},
+                {"matrix": [1, 13], "x": 13, "y": 1},
+                {"matrix": [1, 14], "x": 14, "y": 1},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [2, 2], "x": 1.5, "y": 2},
+                {"matrix": [2, 3], "x": 2.5, "y": 2},
+                {"matrix": [2, 4], "x": 3.5, "y": 2},
+                {"matrix": [2, 5], "x": 4.5, "y": 2},
+                {"matrix": [2, 6], "x": 5.5, "y": 2},
+                {"matrix": [2, 7], "x": 6.5, "y": 2},
+                {"matrix": [2, 8], "x": 7.5, "y": 2},
+                {"matrix": [2, 9], "x": 8.5, "y": 2},
+                {"matrix": [2, 10], "x": 9.5, "y": 2},
+                {"matrix": [2, 11], "x": 10.5, "y": 2},
+                {"matrix": [2, 12], "x": 11.5, "y": 2},
+                {"matrix": [2, 13], "x": 12.5, "y": 2},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+                {"matrix": [3, 2], "x": 1.75, "y": 3},
+                {"matrix": [3, 3], "x": 2.75, "y": 3},
+                {"matrix": [3, 4], "x": 3.75, "y": 3},
+                {"matrix": [3, 5], "x": 4.75, "y": 3},
+                {"matrix": [3, 6], "x": 5.75, "y": 3},
+                {"matrix": [3, 7], "x": 6.75, "y": 3},
+                {"matrix": [3, 8], "x": 7.75, "y": 3},
+                {"matrix": [3, 9], "x": 8.75, "y": 3},
+                {"matrix": [3, 10], "x": 9.75, "y": 3},
+                {"matrix": [3, 11], "x": 10.75, "y": 3},
+                {"matrix": [3, 12], "x": 11.75, "y": 3},
+                {"matrix": [2, 14], "x": 12.75, "y": 3},
+                {"matrix": [3, 13], "x": 13.75, "y": 2, "w": 1.25, "h": 2},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4},
+                {"matrix": [4, 2], "x": 2.25, "y": 4},
+                {"matrix": [4, 3], "x": 3.25, "y": 4},
+                {"matrix": [4, 4], "x": 4.25, "y": 4},
+                {"matrix": [4, 5], "x": 5.25, "y": 4},
+                {"matrix": [4, 6], "x": 6.25, "y": 4},
+                {"matrix": [4, 7], "x": 7.25, "y": 4},
+                {"matrix": [4, 8], "x": 8.25, "y": 4},
+                {"matrix": [4, 9], "x": 9.25, "y": 4},
+                {"matrix": [4, 10], "x": 10.25, "y": 4},
+                {"matrix": [4, 11], "x": 11.25, "y": 4},
+                {"matrix": [4, 13], "x": 12.25, "y": 4, "w": 1.75},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4},
+
+                {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
+                {"matrix": [5, 3], "x": 2.5, "y": 5, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5, "w": 1.5},
+                {"matrix": [5, 12], "x": 11.5, "y": 5, "w": 1.5},
+                {"matrix": [5, 13], "x": 13, "y": 5},
+                {"matrix": [5, 14], "x": 14, "y": 5},
+                {"matrix": [5, 15], "x": 15, "y": 5}
+            ]
+        },
+        "LAYOUT_75_iso_wkl": {
+            "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, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "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": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+                {"matrix": [1, 12], "x": 12, "y": 1},
+                {"matrix": [1, 14], "x": 13, "y": 1, "w": 2},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [2, 2], "x": 1.5, "y": 2},
+                {"matrix": [2, 3], "x": 2.5, "y": 2},
+                {"matrix": [2, 4], "x": 3.5, "y": 2},
+                {"matrix": [2, 5], "x": 4.5, "y": 2},
+                {"matrix": [2, 6], "x": 5.5, "y": 2},
+                {"matrix": [2, 7], "x": 6.5, "y": 2},
+                {"matrix": [2, 8], "x": 7.5, "y": 2},
+                {"matrix": [2, 9], "x": 8.5, "y": 2},
+                {"matrix": [2, 10], "x": 9.5, "y": 2},
+                {"matrix": [2, 11], "x": 10.5, "y": 2},
+                {"matrix": [2, 12], "x": 11.5, "y": 2},
+                {"matrix": [2, 13], "x": 12.5, "y": 2},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+                {"matrix": [3, 2], "x": 1.75, "y": 3},
+                {"matrix": [3, 3], "x": 2.75, "y": 3},
+                {"matrix": [3, 4], "x": 3.75, "y": 3},
+                {"matrix": [3, 5], "x": 4.75, "y": 3},
+                {"matrix": [3, 6], "x": 5.75, "y": 3},
+                {"matrix": [3, 7], "x": 6.75, "y": 3},
+                {"matrix": [3, 8], "x": 7.75, "y": 3},
+                {"matrix": [3, 9], "x": 8.75, "y": 3},
+                {"matrix": [3, 10], "x": 9.75, "y": 3},
+                {"matrix": [3, 11], "x": 10.75, "y": 3},
+                {"matrix": [3, 12], "x": 11.75, "y": 3},
+                {"matrix": [2, 14], "x": 12.75, "y": 3},
+                {"matrix": [3, 13], "x": 13.75, "y": 2, "w": 1.25, "h": 2},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4},
+                {"matrix": [4, 2], "x": 2.25, "y": 4},
+                {"matrix": [4, 3], "x": 3.25, "y": 4},
+                {"matrix": [4, 4], "x": 4.25, "y": 4},
+                {"matrix": [4, 5], "x": 5.25, "y": 4},
+                {"matrix": [4, 6], "x": 6.25, "y": 4},
+                {"matrix": [4, 7], "x": 7.25, "y": 4},
+                {"matrix": [4, 8], "x": 8.25, "y": 4},
+                {"matrix": [4, 9], "x": 9.25, "y": 4},
+                {"matrix": [4, 10], "x": 10.25, "y": 4},
+                {"matrix": [4, 11], "x": 11.25, "y": 4},
+                {"matrix": [4, 13], "x": 12.25, "y": 4, "w": 1.75},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4},
+
+                {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.5},
+                {"matrix": [5, 1], "x": 1.5, "y": 5, "w": 1.5},
+                {"matrix": [5, 6], "x": 3, "y": 5, "w": 7},
+                {"matrix": [5, 10], "x": 10, "y": 5, "w": 1.5},
+                {"matrix": [5, 12], "x": 11.5, "y": 5, "w": 1.5},
+                {"matrix": [5, 13], "x": 13, "y": 5},
+                {"matrix": [5, 14], "x": 14, "y": 5},
+                {"matrix": [5, 15], "x": 15, "y": 5}
+            ]
+        },
+        "LAYOUT_75_iso_wkl_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, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "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": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+                {"matrix": [1, 12], "x": 12, "y": 1},
+                {"matrix": [1, 13], "x": 13, "y": 1},
+                {"matrix": [1, 14], "x": 14, "y": 1},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [2, 2], "x": 1.5, "y": 2},
+                {"matrix": [2, 3], "x": 2.5, "y": 2},
+                {"matrix": [2, 4], "x": 3.5, "y": 2},
+                {"matrix": [2, 5], "x": 4.5, "y": 2},
+                {"matrix": [2, 6], "x": 5.5, "y": 2},
+                {"matrix": [2, 7], "x": 6.5, "y": 2},
+                {"matrix": [2, 8], "x": 7.5, "y": 2},
+                {"matrix": [2, 9], "x": 8.5, "y": 2},
+                {"matrix": [2, 10], "x": 9.5, "y": 2},
+                {"matrix": [2, 11], "x": 10.5, "y": 2},
+                {"matrix": [2, 12], "x": 11.5, "y": 2},
+                {"matrix": [2, 13], "x": 12.5, "y": 2},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+                {"matrix": [3, 2], "x": 1.75, "y": 3},
+                {"matrix": [3, 3], "x": 2.75, "y": 3},
+                {"matrix": [3, 4], "x": 3.75, "y": 3},
+                {"matrix": [3, 5], "x": 4.75, "y": 3},
+                {"matrix": [3, 6], "x": 5.75, "y": 3},
+                {"matrix": [3, 7], "x": 6.75, "y": 3},
+                {"matrix": [3, 8], "x": 7.75, "y": 3},
+                {"matrix": [3, 9], "x": 8.75, "y": 3},
+                {"matrix": [3, 10], "x": 9.75, "y": 3},
+                {"matrix": [3, 11], "x": 10.75, "y": 3},
+                {"matrix": [3, 12], "x": 11.75, "y": 3},
+                {"matrix": [2, 14], "x": 12.75, "y": 3},
+                {"matrix": [3, 13], "x": 13.75, "y": 2, "w": 1.25, "h": 2},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4},
+                {"matrix": [4, 2], "x": 2.25, "y": 4},
+                {"matrix": [4, 3], "x": 3.25, "y": 4},
+                {"matrix": [4, 4], "x": 4.25, "y": 4},
+                {"matrix": [4, 5], "x": 5.25, "y": 4},
+                {"matrix": [4, 6], "x": 6.25, "y": 4},
+                {"matrix": [4, 7], "x": 7.25, "y": 4},
+                {"matrix": [4, 8], "x": 8.25, "y": 4},
+                {"matrix": [4, 9], "x": 9.25, "y": 4},
+                {"matrix": [4, 10], "x": 10.25, "y": 4},
+                {"matrix": [4, 11], "x": 11.25, "y": 4},
+                {"matrix": [4, 13], "x": 12.25, "y": 4, "w": 1.75},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4},
+
+                {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.5},
+                {"matrix": [5, 1], "x": 1.5, "y": 5, "w": 1.5},
+                {"matrix": [5, 6], "x": 3, "y": 5, "w": 7},
+                {"matrix": [5, 10], "x": 10, "y": 5, "w": 1.5},
+                {"matrix": [5, 12], "x": 11.5, "y": 5, "w": 1.5},
+                {"matrix": [5, 13], "x": 13, "y": 5},
+                {"matrix": [5, 14], "x": 14, "y": 5},
+                {"matrix": [5, 15], "x": 15, "y": 5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/kbdfans/kbd75/rev1/rules.mk b/keyboards/kbdfans/kbd75/rev1/rules.mk
deleted file mode 100644
index 3d5cb57ad50..00000000000
--- a/keyboards/kbdfans/kbd75/rev1/rules.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
diff --git a/keyboards/kbdfans/kbd75/rev2/info.json b/keyboards/kbdfans/kbd75/rev2/info.json
deleted file mode 100644
index 12a1737eadd..00000000000
--- a/keyboards/kbdfans/kbd75/rev2/info.json
+++ /dev/null
@@ -1,1364 +0,0 @@
-{
-    "keyboard_name": "KBD75 rev2",
-    "manufacturer": "KBDfans",
-    "url": "",
-    "maintainer": "qmk",
-    "usb": {
-        "vid": "0x4B42",
-        "pid": "0x6061",
-        "device_version": "0.0.2"
-    },
-    "matrix_pins": {
-        "cols": ["F0", "F1", "E6", "C7", "C6", "F5", "D4", "B1", "B0", "B5", "B4", "D7", "D6", "B3", "F4", "F6"],
-        "rows": ["D0", "D1", "D2", "D3", "D5", "B7"]
-    },
-    "diode_direction": "COL2ROW",
-    "backlight": {
-        "pin": "B6",
-        "levels": 5
-    },
-    "indicators": {
-        "caps_lock": "B2",
-        "on_state": 0
-    },
-    "rgblight": {
-        "saturation_steps": 8,
-        "brightness_steps": 8,
-        "led_count": 16,
-        "sleep": true,
-        "animations": {
-            "breathing": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "snake": true,
-            "knight": true,
-            "christmas": true,
-            "static_gradient": true,
-            "rgb_test": true,
-            "alternating": true,
-            "twinkle": true
-        }
-    },
-    "ws2812": {
-        "pin": "E2"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "layout_aliases": {
-        "LAYOUT_ansi_1u": "LAYOUT_75_ansi"
-    },
-    "community_layouts": ["75_ansi", "75_iso"],
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 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, 14], "x": 14, "y": 0},
-                {"matrix": [0, 15], "x": 15, "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": [1, 4], "x": 4, "y": 1},
-                {"matrix": [1, 5], "x": 5, "y": 1},
-                {"matrix": [1, 6], "x": 6, "y": 1},
-                {"matrix": [1, 7], "x": 7, "y": 1},
-                {"matrix": [1, 8], "x": 8, "y": 1},
-                {"matrix": [1, 9], "x": 9, "y": 1},
-                {"matrix": [1, 10], "x": 10, "y": 1},
-                {"matrix": [1, 11], "x": 11, "y": 1},
-                {"matrix": [1, 12], "x": 12, "y": 1},
-                {"matrix": [1, 13], "x": 13, "y": 1},
-                {"matrix": [1, 14], "x": 14, "y": 1},
-                {"matrix": [1, 15], "x": 15, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
-                {"matrix": [2, 2], "x": 1.5, "y": 2},
-                {"matrix": [2, 3], "x": 2.5, "y": 2},
-                {"matrix": [2, 4], "x": 3.5, "y": 2},
-                {"matrix": [2, 5], "x": 4.5, "y": 2},
-                {"matrix": [2, 6], "x": 5.5, "y": 2},
-                {"matrix": [2, 7], "x": 6.5, "y": 2},
-                {"matrix": [2, 8], "x": 7.5, "y": 2},
-                {"matrix": [2, 9], "x": 8.5, "y": 2},
-                {"matrix": [2, 10], "x": 9.5, "y": 2},
-                {"matrix": [2, 11], "x": 10.5, "y": 2},
-                {"matrix": [2, 12], "x": 11.5, "y": 2},
-                {"matrix": [2, 13], "x": 12.5, "y": 2},
-                {"matrix": [2, 14], "x": 13.5, "y": 2, "w": 1.5},
-                {"matrix": [2, 15], "x": 15, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
-                {"matrix": [3, 2], "x": 1.75, "y": 3},
-                {"matrix": [3, 3], "x": 2.75, "y": 3},
-                {"matrix": [3, 4], "x": 3.75, "y": 3},
-                {"matrix": [3, 5], "x": 4.75, "y": 3},
-                {"matrix": [3, 6], "x": 5.75, "y": 3},
-                {"matrix": [3, 7], "x": 6.75, "y": 3},
-                {"matrix": [3, 8], "x": 7.75, "y": 3},
-                {"matrix": [3, 9], "x": 8.75, "y": 3},
-                {"matrix": [3, 10], "x": 9.75, "y": 3},
-                {"matrix": [3, 11], "x": 10.75, "y": 3},
-                {"matrix": [3, 12], "x": 11.75, "y": 3},
-                {"matrix": [3, 13], "x": 12.75, "y": 3, "w": 2.25},
-                {"matrix": [3, 15], "x": 15, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4},
-                {"matrix": [4, 2], "x": 2.25, "y": 4},
-                {"matrix": [4, 3], "x": 3.25, "y": 4},
-                {"matrix": [4, 4], "x": 4.25, "y": 4},
-                {"matrix": [4, 5], "x": 5.25, "y": 4},
-                {"matrix": [4, 6], "x": 6.25, "y": 4},
-                {"matrix": [4, 7], "x": 7.25, "y": 4},
-                {"matrix": [4, 8], "x": 8.25, "y": 4},
-                {"matrix": [4, 9], "x": 9.25, "y": 4},
-                {"matrix": [4, 10], "x": 10.25, "y": 4},
-                {"matrix": [4, 11], "x": 11.25, "y": 4},
-                {"matrix": [4, 13], "x": 12.25, "y": 4, "w": 1.75},
-                {"matrix": [4, 14], "x": 14, "y": 4},
-                {"matrix": [4, 15], "x": 15, "y": 4},
-
-                {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
-                {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
-                {"matrix": [5, 3], "x": 2.5, "y": 5, "w": 1.25},
-                {"matrix": [5, 4], "x": 3.75, "y": 5, "w": 2.25},
-                {"matrix": [5, 6], "x": 6, "y": 5, "w": 1.25},
-                {"matrix": [5, 8], "x": 7.25, "y": 5, "w": 2.75},
-                {"matrix": [5, 10], "x": 10, "y": 5},
-                {"matrix": [5, 11], "x": 11, "y": 5},
-                {"matrix": [5, 12], "x": 12, "y": 5},
-                {"matrix": [5, 13], "x": 13, "y": 5},
-                {"matrix": [5, 14], "x": 14, "y": 5},
-                {"matrix": [5, 15], "x": 15, "y": 5}
-            ]
-        },
-        "LAYOUT_75_ansi": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 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, 14], "x": 14, "y": 0},
-                {"matrix": [0, 15], "x": 15, "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": [1, 4], "x": 4, "y": 1},
-                {"matrix": [1, 5], "x": 5, "y": 1},
-                {"matrix": [1, 6], "x": 6, "y": 1},
-                {"matrix": [1, 7], "x": 7, "y": 1},
-                {"matrix": [1, 8], "x": 8, "y": 1},
-                {"matrix": [1, 9], "x": 9, "y": 1},
-                {"matrix": [1, 10], "x": 10, "y": 1},
-                {"matrix": [1, 11], "x": 11, "y": 1},
-                {"matrix": [1, 12], "x": 12, "y": 1},
-                {"matrix": [1, 14], "x": 13, "y": 1, "w": 2},
-                {"matrix": [1, 15], "x": 15, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
-                {"matrix": [2, 2], "x": 1.5, "y": 2},
-                {"matrix": [2, 3], "x": 2.5, "y": 2},
-                {"matrix": [2, 4], "x": 3.5, "y": 2},
-                {"matrix": [2, 5], "x": 4.5, "y": 2},
-                {"matrix": [2, 6], "x": 5.5, "y": 2},
-                {"matrix": [2, 7], "x": 6.5, "y": 2},
-                {"matrix": [2, 8], "x": 7.5, "y": 2},
-                {"matrix": [2, 9], "x": 8.5, "y": 2},
-                {"matrix": [2, 10], "x": 9.5, "y": 2},
-                {"matrix": [2, 11], "x": 10.5, "y": 2},
-                {"matrix": [2, 12], "x": 11.5, "y": 2},
-                {"matrix": [2, 13], "x": 12.5, "y": 2},
-                {"matrix": [2, 14], "x": 13.5, "y": 2, "w": 1.5},
-                {"matrix": [2, 15], "x": 15, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
-                {"matrix": [3, 2], "x": 1.75, "y": 3},
-                {"matrix": [3, 3], "x": 2.75, "y": 3},
-                {"matrix": [3, 4], "x": 3.75, "y": 3},
-                {"matrix": [3, 5], "x": 4.75, "y": 3},
-                {"matrix": [3, 6], "x": 5.75, "y": 3},
-                {"matrix": [3, 7], "x": 6.75, "y": 3},
-                {"matrix": [3, 8], "x": 7.75, "y": 3},
-                {"matrix": [3, 9], "x": 8.75, "y": 3},
-                {"matrix": [3, 10], "x": 9.75, "y": 3},
-                {"matrix": [3, 11], "x": 10.75, "y": 3},
-                {"matrix": [3, 12], "x": 11.75, "y": 3},
-                {"matrix": [3, 13], "x": 12.75, "y": 3, "w": 2.25},
-                {"matrix": [3, 15], "x": 15, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 2.25},
-                {"matrix": [4, 2], "x": 2.25, "y": 4},
-                {"matrix": [4, 3], "x": 3.25, "y": 4},
-                {"matrix": [4, 4], "x": 4.25, "y": 4},
-                {"matrix": [4, 5], "x": 5.25, "y": 4},
-                {"matrix": [4, 6], "x": 6.25, "y": 4},
-                {"matrix": [4, 7], "x": 7.25, "y": 4},
-                {"matrix": [4, 8], "x": 8.25, "y": 4},
-                {"matrix": [4, 9], "x": 9.25, "y": 4},
-                {"matrix": [4, 10], "x": 10.25, "y": 4},
-                {"matrix": [4, 11], "x": 11.25, "y": 4},
-                {"matrix": [4, 13], "x": 12.25, "y": 4, "w": 1.75},
-                {"matrix": [4, 14], "x": 14, "y": 4},
-                {"matrix": [4, 15], "x": 15, "y": 4},
-
-                {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
-                {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
-                {"matrix": [5, 3], "x": 2.5, "y": 5, "w": 1.25},
-                {"matrix": [5, 6], "x": 3.75, "y": 5, "w": 6.25},
-                {"matrix": [5, 10], "x": 10, "y": 5},
-                {"matrix": [5, 11], "x": 11, "y": 5},
-                {"matrix": [5, 12], "x": 12, "y": 5},
-                {"matrix": [5, 13], "x": 13, "y": 5},
-                {"matrix": [5, 14], "x": 14, "y": 5},
-                {"matrix": [5, 15], "x": 15, "y": 5}
-            ]
-        },
-        "LAYOUT_75_ansi_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, 14], "x": 14, "y": 0},
-                {"matrix": [0, 15], "x": 15, "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": [1, 4], "x": 4, "y": 1},
-                {"matrix": [1, 5], "x": 5, "y": 1},
-                {"matrix": [1, 6], "x": 6, "y": 1},
-                {"matrix": [1, 7], "x": 7, "y": 1},
-                {"matrix": [1, 8], "x": 8, "y": 1},
-                {"matrix": [1, 9], "x": 9, "y": 1},
-                {"matrix": [1, 10], "x": 10, "y": 1},
-                {"matrix": [1, 11], "x": 11, "y": 1},
-                {"matrix": [1, 12], "x": 12, "y": 1},
-                {"matrix": [1, 13], "x": 13, "y": 1},
-                {"matrix": [1, 14], "x": 14, "y": 1},
-                {"matrix": [1, 15], "x": 15, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
-                {"matrix": [2, 2], "x": 1.5, "y": 2},
-                {"matrix": [2, 3], "x": 2.5, "y": 2},
-                {"matrix": [2, 4], "x": 3.5, "y": 2},
-                {"matrix": [2, 5], "x": 4.5, "y": 2},
-                {"matrix": [2, 6], "x": 5.5, "y": 2},
-                {"matrix": [2, 7], "x": 6.5, "y": 2},
-                {"matrix": [2, 8], "x": 7.5, "y": 2},
-                {"matrix": [2, 9], "x": 8.5, "y": 2},
-                {"matrix": [2, 10], "x": 9.5, "y": 2},
-                {"matrix": [2, 11], "x": 10.5, "y": 2},
-                {"matrix": [2, 12], "x": 11.5, "y": 2},
-                {"matrix": [2, 13], "x": 12.5, "y": 2},
-                {"matrix": [2, 14], "x": 13.5, "y": 2, "w": 1.5},
-                {"matrix": [2, 15], "x": 15, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
-                {"matrix": [3, 2], "x": 1.75, "y": 3},
-                {"matrix": [3, 3], "x": 2.75, "y": 3},
-                {"matrix": [3, 4], "x": 3.75, "y": 3},
-                {"matrix": [3, 5], "x": 4.75, "y": 3},
-                {"matrix": [3, 6], "x": 5.75, "y": 3},
-                {"matrix": [3, 7], "x": 6.75, "y": 3},
-                {"matrix": [3, 8], "x": 7.75, "y": 3},
-                {"matrix": [3, 9], "x": 8.75, "y": 3},
-                {"matrix": [3, 10], "x": 9.75, "y": 3},
-                {"matrix": [3, 11], "x": 10.75, "y": 3},
-                {"matrix": [3, 12], "x": 11.75, "y": 3},
-                {"matrix": [3, 13], "x": 12.75, "y": 3, "w": 2.25},
-                {"matrix": [3, 15], "x": 15, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 2.25},
-                {"matrix": [4, 2], "x": 2.25, "y": 4},
-                {"matrix": [4, 3], "x": 3.25, "y": 4},
-                {"matrix": [4, 4], "x": 4.25, "y": 4},
-                {"matrix": [4, 5], "x": 5.25, "y": 4},
-                {"matrix": [4, 6], "x": 6.25, "y": 4},
-                {"matrix": [4, 7], "x": 7.25, "y": 4},
-                {"matrix": [4, 8], "x": 8.25, "y": 4},
-                {"matrix": [4, 9], "x": 9.25, "y": 4},
-                {"matrix": [4, 10], "x": 10.25, "y": 4},
-                {"matrix": [4, 11], "x": 11.25, "y": 4},
-                {"matrix": [4, 13], "x": 12.25, "y": 4, "w": 1.75},
-                {"matrix": [4, 14], "x": 14, "y": 4},
-                {"matrix": [4, 15], "x": 15, "y": 4},
-
-                {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
-                {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
-                {"matrix": [5, 3], "x": 2.5, "y": 5, "w": 1.25},
-                {"matrix": [5, 6], "x": 3.75, "y": 5, "w": 6.25},
-                {"matrix": [5, 10], "x": 10, "y": 5},
-                {"matrix": [5, 11], "x": 11, "y": 5},
-                {"matrix": [5, 12], "x": 12, "y": 5},
-                {"matrix": [5, 13], "x": 13, "y": 5},
-                {"matrix": [5, 14], "x": 14, "y": 5},
-                {"matrix": [5, 15], "x": 15, "y": 5}
-            ]
-        },
-        "LAYOUT_75_ansi_rwkl": {
-            "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, 14], "x": 14, "y": 0},
-                {"matrix": [0, 15], "x": 15, "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": [1, 4], "x": 4, "y": 1},
-                {"matrix": [1, 5], "x": 5, "y": 1},
-                {"matrix": [1, 6], "x": 6, "y": 1},
-                {"matrix": [1, 7], "x": 7, "y": 1},
-                {"matrix": [1, 8], "x": 8, "y": 1},
-                {"matrix": [1, 9], "x": 9, "y": 1},
-                {"matrix": [1, 10], "x": 10, "y": 1},
-                {"matrix": [1, 11], "x": 11, "y": 1},
-                {"matrix": [1, 12], "x": 12, "y": 1},
-                {"matrix": [1, 14], "x": 13, "y": 1, "w": 2},
-                {"matrix": [1, 15], "x": 15, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
-                {"matrix": [2, 2], "x": 1.5, "y": 2},
-                {"matrix": [2, 3], "x": 2.5, "y": 2},
-                {"matrix": [2, 4], "x": 3.5, "y": 2},
-                {"matrix": [2, 5], "x": 4.5, "y": 2},
-                {"matrix": [2, 6], "x": 5.5, "y": 2},
-                {"matrix": [2, 7], "x": 6.5, "y": 2},
-                {"matrix": [2, 8], "x": 7.5, "y": 2},
-                {"matrix": [2, 9], "x": 8.5, "y": 2},
-                {"matrix": [2, 10], "x": 9.5, "y": 2},
-                {"matrix": [2, 11], "x": 10.5, "y": 2},
-                {"matrix": [2, 12], "x": 11.5, "y": 2},
-                {"matrix": [2, 13], "x": 12.5, "y": 2},
-                {"matrix": [2, 14], "x": 13.5, "y": 2, "w": 1.5},
-                {"matrix": [2, 15], "x": 15, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
-                {"matrix": [3, 2], "x": 1.75, "y": 3},
-                {"matrix": [3, 3], "x": 2.75, "y": 3},
-                {"matrix": [3, 4], "x": 3.75, "y": 3},
-                {"matrix": [3, 5], "x": 4.75, "y": 3},
-                {"matrix": [3, 6], "x": 5.75, "y": 3},
-                {"matrix": [3, 7], "x": 6.75, "y": 3},
-                {"matrix": [3, 8], "x": 7.75, "y": 3},
-                {"matrix": [3, 9], "x": 8.75, "y": 3},
-                {"matrix": [3, 10], "x": 9.75, "y": 3},
-                {"matrix": [3, 11], "x": 10.75, "y": 3},
-                {"matrix": [3, 12], "x": 11.75, "y": 3},
-                {"matrix": [3, 13], "x": 12.75, "y": 3, "w": 2.25},
-                {"matrix": [3, 15], "x": 15, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 2.25},
-                {"matrix": [4, 2], "x": 2.25, "y": 4},
-                {"matrix": [4, 3], "x": 3.25, "y": 4},
-                {"matrix": [4, 4], "x": 4.25, "y": 4},
-                {"matrix": [4, 5], "x": 5.25, "y": 4},
-                {"matrix": [4, 6], "x": 6.25, "y": 4},
-                {"matrix": [4, 7], "x": 7.25, "y": 4},
-                {"matrix": [4, 8], "x": 8.25, "y": 4},
-                {"matrix": [4, 9], "x": 9.25, "y": 4},
-                {"matrix": [4, 10], "x": 10.25, "y": 4},
-                {"matrix": [4, 11], "x": 11.25, "y": 4},
-                {"matrix": [4, 13], "x": 12.25, "y": 4, "w": 1.75},
-                {"matrix": [4, 14], "x": 14, "y": 4},
-                {"matrix": [4, 15], "x": 15, "y": 4},
-
-                {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
-                {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
-                {"matrix": [5, 3], "x": 2.5, "y": 5, "w": 1.25},
-                {"matrix": [5, 6], "x": 3.75, "y": 5, "w": 6.25},
-                {"matrix": [5, 10], "x": 10, "y": 5, "w": 1.5},
-                {"matrix": [5, 12], "x": 11.5, "y": 5, "w": 1.5},
-                {"matrix": [5, 13], "x": 13, "y": 5},
-                {"matrix": [5, 14], "x": 14, "y": 5},
-                {"matrix": [5, 15], "x": 15, "y": 5}
-            ]
-        },
-        "LAYOUT_75_ansi_rwkl_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, 14], "x": 14, "y": 0},
-                {"matrix": [0, 15], "x": 15, "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": [1, 4], "x": 4, "y": 1},
-                {"matrix": [1, 5], "x": 5, "y": 1},
-                {"matrix": [1, 6], "x": 6, "y": 1},
-                {"matrix": [1, 7], "x": 7, "y": 1},
-                {"matrix": [1, 8], "x": 8, "y": 1},
-                {"matrix": [1, 9], "x": 9, "y": 1},
-                {"matrix": [1, 10], "x": 10, "y": 1},
-                {"matrix": [1, 11], "x": 11, "y": 1},
-                {"matrix": [1, 12], "x": 12, "y": 1},
-                {"matrix": [1, 13], "x": 13, "y": 1},
-                {"matrix": [1, 14], "x": 14, "y": 1},
-                {"matrix": [1, 15], "x": 15, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
-                {"matrix": [2, 2], "x": 1.5, "y": 2},
-                {"matrix": [2, 3], "x": 2.5, "y": 2},
-                {"matrix": [2, 4], "x": 3.5, "y": 2},
-                {"matrix": [2, 5], "x": 4.5, "y": 2},
-                {"matrix": [2, 6], "x": 5.5, "y": 2},
-                {"matrix": [2, 7], "x": 6.5, "y": 2},
-                {"matrix": [2, 8], "x": 7.5, "y": 2},
-                {"matrix": [2, 9], "x": 8.5, "y": 2},
-                {"matrix": [2, 10], "x": 9.5, "y": 2},
-                {"matrix": [2, 11], "x": 10.5, "y": 2},
-                {"matrix": [2, 12], "x": 11.5, "y": 2},
-                {"matrix": [2, 13], "x": 12.5, "y": 2},
-                {"matrix": [2, 14], "x": 13.5, "y": 2, "w": 1.5},
-                {"matrix": [2, 15], "x": 15, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
-                {"matrix": [3, 2], "x": 1.75, "y": 3},
-                {"matrix": [3, 3], "x": 2.75, "y": 3},
-                {"matrix": [3, 4], "x": 3.75, "y": 3},
-                {"matrix": [3, 5], "x": 4.75, "y": 3},
-                {"matrix": [3, 6], "x": 5.75, "y": 3},
-                {"matrix": [3, 7], "x": 6.75, "y": 3},
-                {"matrix": [3, 8], "x": 7.75, "y": 3},
-                {"matrix": [3, 9], "x": 8.75, "y": 3},
-                {"matrix": [3, 10], "x": 9.75, "y": 3},
-                {"matrix": [3, 11], "x": 10.75, "y": 3},
-                {"matrix": [3, 12], "x": 11.75, "y": 3},
-                {"matrix": [3, 13], "x": 12.75, "y": 3, "w": 2.25},
-                {"matrix": [3, 15], "x": 15, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 2.25},
-                {"matrix": [4, 2], "x": 2.25, "y": 4},
-                {"matrix": [4, 3], "x": 3.25, "y": 4},
-                {"matrix": [4, 4], "x": 4.25, "y": 4},
-                {"matrix": [4, 5], "x": 5.25, "y": 4},
-                {"matrix": [4, 6], "x": 6.25, "y": 4},
-                {"matrix": [4, 7], "x": 7.25, "y": 4},
-                {"matrix": [4, 8], "x": 8.25, "y": 4},
-                {"matrix": [4, 9], "x": 9.25, "y": 4},
-                {"matrix": [4, 10], "x": 10.25, "y": 4},
-                {"matrix": [4, 11], "x": 11.25, "y": 4},
-                {"matrix": [4, 13], "x": 12.25, "y": 4, "w": 1.75},
-                {"matrix": [4, 14], "x": 14, "y": 4},
-                {"matrix": [4, 15], "x": 15, "y": 4},
-
-                {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
-                {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
-                {"matrix": [5, 3], "x": 2.5, "y": 5, "w": 1.25},
-                {"matrix": [5, 6], "x": 3.75, "y": 5, "w": 6.25},
-                {"matrix": [5, 10], "x": 10, "y": 5, "w": 1.5},
-                {"matrix": [5, 12], "x": 11.5, "y": 5, "w": 1.5},
-                {"matrix": [5, 13], "x": 13, "y": 5},
-                {"matrix": [5, 14], "x": 14, "y": 5},
-                {"matrix": [5, 15], "x": 15, "y": 5}
-            ]
-        },
-        "LAYOUT_75_ansi_wkl": {
-            "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, 14], "x": 14, "y": 0},
-                {"matrix": [0, 15], "x": 15, "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": [1, 4], "x": 4, "y": 1},
-                {"matrix": [1, 5], "x": 5, "y": 1},
-                {"matrix": [1, 6], "x": 6, "y": 1},
-                {"matrix": [1, 7], "x": 7, "y": 1},
-                {"matrix": [1, 8], "x": 8, "y": 1},
-                {"matrix": [1, 9], "x": 9, "y": 1},
-                {"matrix": [1, 10], "x": 10, "y": 1},
-                {"matrix": [1, 11], "x": 11, "y": 1},
-                {"matrix": [1, 12], "x": 12, "y": 1},
-                {"matrix": [1, 14], "x": 13, "y": 1, "w": 2},
-                {"matrix": [1, 15], "x": 15, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
-                {"matrix": [2, 2], "x": 1.5, "y": 2},
-                {"matrix": [2, 3], "x": 2.5, "y": 2},
-                {"matrix": [2, 4], "x": 3.5, "y": 2},
-                {"matrix": [2, 5], "x": 4.5, "y": 2},
-                {"matrix": [2, 6], "x": 5.5, "y": 2},
-                {"matrix": [2, 7], "x": 6.5, "y": 2},
-                {"matrix": [2, 8], "x": 7.5, "y": 2},
-                {"matrix": [2, 9], "x": 8.5, "y": 2},
-                {"matrix": [2, 10], "x": 9.5, "y": 2},
-                {"matrix": [2, 11], "x": 10.5, "y": 2},
-                {"matrix": [2, 12], "x": 11.5, "y": 2},
-                {"matrix": [2, 13], "x": 12.5, "y": 2},
-                {"matrix": [2, 14], "x": 13.5, "y": 2, "w": 1.5},
-                {"matrix": [2, 15], "x": 15, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
-                {"matrix": [3, 2], "x": 1.75, "y": 3},
-                {"matrix": [3, 3], "x": 2.75, "y": 3},
-                {"matrix": [3, 4], "x": 3.75, "y": 3},
-                {"matrix": [3, 5], "x": 4.75, "y": 3},
-                {"matrix": [3, 6], "x": 5.75, "y": 3},
-                {"matrix": [3, 7], "x": 6.75, "y": 3},
-                {"matrix": [3, 8], "x": 7.75, "y": 3},
-                {"matrix": [3, 9], "x": 8.75, "y": 3},
-                {"matrix": [3, 10], "x": 9.75, "y": 3},
-                {"matrix": [3, 11], "x": 10.75, "y": 3},
-                {"matrix": [3, 12], "x": 11.75, "y": 3},
-                {"matrix": [3, 13], "x": 12.75, "y": 3, "w": 2.25},
-                {"matrix": [3, 15], "x": 15, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 2.25},
-                {"matrix": [4, 2], "x": 2.25, "y": 4},
-                {"matrix": [4, 3], "x": 3.25, "y": 4},
-                {"matrix": [4, 4], "x": 4.25, "y": 4},
-                {"matrix": [4, 5], "x": 5.25, "y": 4},
-                {"matrix": [4, 6], "x": 6.25, "y": 4},
-                {"matrix": [4, 7], "x": 7.25, "y": 4},
-                {"matrix": [4, 8], "x": 8.25, "y": 4},
-                {"matrix": [4, 9], "x": 9.25, "y": 4},
-                {"matrix": [4, 10], "x": 10.25, "y": 4},
-                {"matrix": [4, 11], "x": 11.25, "y": 4},
-                {"matrix": [4, 13], "x": 12.25, "y": 4, "w": 1.75},
-                {"matrix": [4, 14], "x": 14, "y": 4},
-                {"matrix": [4, 15], "x": 15, "y": 4},
-
-                {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.5},
-                {"matrix": [5, 1], "x": 1.5, "y": 5, "w": 1.5},
-                {"matrix": [5, 6], "x": 3, "y": 5, "w": 7},
-                {"matrix": [5, 10], "x": 10, "y": 5, "w": 1.5},
-                {"matrix": [5, 12], "x": 11.5, "y": 5, "w": 1.5},
-                {"matrix": [5, 13], "x": 13, "y": 5},
-                {"matrix": [5, 14], "x": 14, "y": 5},
-                {"matrix": [5, 15], "x": 15, "y": 5}
-            ]
-        },
-        "LAYOUT_75_ansi_wkl_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, 14], "x": 14, "y": 0},
-                {"matrix": [0, 15], "x": 15, "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": [1, 4], "x": 4, "y": 1},
-                {"matrix": [1, 5], "x": 5, "y": 1},
-                {"matrix": [1, 6], "x": 6, "y": 1},
-                {"matrix": [1, 7], "x": 7, "y": 1},
-                {"matrix": [1, 8], "x": 8, "y": 1},
-                {"matrix": [1, 9], "x": 9, "y": 1},
-                {"matrix": [1, 10], "x": 10, "y": 1},
-                {"matrix": [1, 11], "x": 11, "y": 1},
-                {"matrix": [1, 12], "x": 12, "y": 1},
-                {"matrix": [1, 13], "x": 13, "y": 1},
-                {"matrix": [1, 14], "x": 14, "y": 1},
-                {"matrix": [1, 15], "x": 15, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
-                {"matrix": [2, 2], "x": 1.5, "y": 2},
-                {"matrix": [2, 3], "x": 2.5, "y": 2},
-                {"matrix": [2, 4], "x": 3.5, "y": 2},
-                {"matrix": [2, 5], "x": 4.5, "y": 2},
-                {"matrix": [2, 6], "x": 5.5, "y": 2},
-                {"matrix": [2, 7], "x": 6.5, "y": 2},
-                {"matrix": [2, 8], "x": 7.5, "y": 2},
-                {"matrix": [2, 9], "x": 8.5, "y": 2},
-                {"matrix": [2, 10], "x": 9.5, "y": 2},
-                {"matrix": [2, 11], "x": 10.5, "y": 2},
-                {"matrix": [2, 12], "x": 11.5, "y": 2},
-                {"matrix": [2, 13], "x": 12.5, "y": 2},
-                {"matrix": [2, 14], "x": 13.5, "y": 2, "w": 1.5},
-                {"matrix": [2, 15], "x": 15, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
-                {"matrix": [3, 2], "x": 1.75, "y": 3},
-                {"matrix": [3, 3], "x": 2.75, "y": 3},
-                {"matrix": [3, 4], "x": 3.75, "y": 3},
-                {"matrix": [3, 5], "x": 4.75, "y": 3},
-                {"matrix": [3, 6], "x": 5.75, "y": 3},
-                {"matrix": [3, 7], "x": 6.75, "y": 3},
-                {"matrix": [3, 8], "x": 7.75, "y": 3},
-                {"matrix": [3, 9], "x": 8.75, "y": 3},
-                {"matrix": [3, 10], "x": 9.75, "y": 3},
-                {"matrix": [3, 11], "x": 10.75, "y": 3},
-                {"matrix": [3, 12], "x": 11.75, "y": 3},
-                {"matrix": [3, 13], "x": 12.75, "y": 3, "w": 2.25},
-                {"matrix": [3, 15], "x": 15, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 2.25},
-                {"matrix": [4, 2], "x": 2.25, "y": 4},
-                {"matrix": [4, 3], "x": 3.25, "y": 4},
-                {"matrix": [4, 4], "x": 4.25, "y": 4},
-                {"matrix": [4, 5], "x": 5.25, "y": 4},
-                {"matrix": [4, 6], "x": 6.25, "y": 4},
-                {"matrix": [4, 7], "x": 7.25, "y": 4},
-                {"matrix": [4, 8], "x": 8.25, "y": 4},
-                {"matrix": [4, 9], "x": 9.25, "y": 4},
-                {"matrix": [4, 10], "x": 10.25, "y": 4},
-                {"matrix": [4, 11], "x": 11.25, "y": 4},
-                {"matrix": [4, 13], "x": 12.25, "y": 4, "w": 1.75},
-                {"matrix": [4, 14], "x": 14, "y": 4},
-                {"matrix": [4, 15], "x": 15, "y": 4},
-
-                {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.5},
-                {"matrix": [5, 1], "x": 1.5, "y": 5, "w": 1.5},
-                {"matrix": [5, 6], "x": 3, "y": 5, "w": 7},
-                {"matrix": [5, 10], "x": 10, "y": 5, "w": 1.5},
-                {"matrix": [5, 12], "x": 11.5, "y": 5, "w": 1.5},
-                {"matrix": [5, 13], "x": 13, "y": 5},
-                {"matrix": [5, 14], "x": 14, "y": 5},
-                {"matrix": [5, 15], "x": 15, "y": 5}
-            ]
-        },
-        "LAYOUT_75_iso": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"matrix": [0, 13], "x": 13, "y": 0},
-                {"matrix": [0, 14], "x": 14, "y": 0},
-                {"matrix": [0, 15], "x": 15, "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": [1, 4], "x": 4, "y": 1},
-                {"matrix": [1, 5], "x": 5, "y": 1},
-                {"matrix": [1, 6], "x": 6, "y": 1},
-                {"matrix": [1, 7], "x": 7, "y": 1},
-                {"matrix": [1, 8], "x": 8, "y": 1},
-                {"matrix": [1, 9], "x": 9, "y": 1},
-                {"matrix": [1, 10], "x": 10, "y": 1},
-                {"matrix": [1, 11], "x": 11, "y": 1},
-                {"matrix": [1, 12], "x": 12, "y": 1},
-                {"matrix": [1, 14], "x": 13, "y": 1, "w": 2},
-                {"matrix": [1, 15], "x": 15, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
-                {"matrix": [2, 2], "x": 1.5, "y": 2},
-                {"matrix": [2, 3], "x": 2.5, "y": 2},
-                {"matrix": [2, 4], "x": 3.5, "y": 2},
-                {"matrix": [2, 5], "x": 4.5, "y": 2},
-                {"matrix": [2, 6], "x": 5.5, "y": 2},
-                {"matrix": [2, 7], "x": 6.5, "y": 2},
-                {"matrix": [2, 8], "x": 7.5, "y": 2},
-                {"matrix": [2, 9], "x": 8.5, "y": 2},
-                {"matrix": [2, 10], "x": 9.5, "y": 2},
-                {"matrix": [2, 11], "x": 10.5, "y": 2},
-                {"matrix": [2, 12], "x": 11.5, "y": 2},
-                {"matrix": [2, 13], "x": 12.5, "y": 2},
-                {"matrix": [2, 15], "x": 15, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
-                {"matrix": [3, 2], "x": 1.75, "y": 3},
-                {"matrix": [3, 3], "x": 2.75, "y": 3},
-                {"matrix": [3, 4], "x": 3.75, "y": 3},
-                {"matrix": [3, 5], "x": 4.75, "y": 3},
-                {"matrix": [3, 6], "x": 5.75, "y": 3},
-                {"matrix": [3, 7], "x": 6.75, "y": 3},
-                {"matrix": [3, 8], "x": 7.75, "y": 3},
-                {"matrix": [3, 9], "x": 8.75, "y": 3},
-                {"matrix": [3, 10], "x": 9.75, "y": 3},
-                {"matrix": [3, 11], "x": 10.75, "y": 3},
-                {"matrix": [3, 12], "x": 11.75, "y": 3},
-                {"matrix": [2, 14], "x": 12.75, "y": 3},
-                {"matrix": [3, 13], "x": 13.75, "y": 2, "w": 1.25, "h": 2},
-                {"matrix": [3, 15], "x": 15, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4},
-                {"matrix": [4, 2], "x": 2.25, "y": 4},
-                {"matrix": [4, 3], "x": 3.25, "y": 4},
-                {"matrix": [4, 4], "x": 4.25, "y": 4},
-                {"matrix": [4, 5], "x": 5.25, "y": 4},
-                {"matrix": [4, 6], "x": 6.25, "y": 4},
-                {"matrix": [4, 7], "x": 7.25, "y": 4},
-                {"matrix": [4, 8], "x": 8.25, "y": 4},
-                {"matrix": [4, 9], "x": 9.25, "y": 4},
-                {"matrix": [4, 10], "x": 10.25, "y": 4},
-                {"matrix": [4, 11], "x": 11.25, "y": 4},
-                {"matrix": [4, 13], "x": 12.25, "y": 4, "w": 1.75},
-                {"matrix": [4, 14], "x": 14, "y": 4},
-                {"matrix": [4, 15], "x": 15, "y": 4},
-
-                {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
-                {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
-                {"matrix": [5, 3], "x": 2.5, "y": 5, "w": 1.25},
-                {"matrix": [5, 6], "x": 3.75, "y": 5, "w": 6.25},
-                {"matrix": [5, 10], "x": 10, "y": 5},
-                {"matrix": [5, 11], "x": 11, "y": 5},
-                {"matrix": [5, 12], "x": 12, "y": 5},
-                {"matrix": [5, 13], "x": 13, "y": 5},
-                {"matrix": [5, 14], "x": 14, "y": 5},
-                {"matrix": [5, 15], "x": 15, "y": 5}
-            ]
-        },
-        "LAYOUT_75_iso_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, 14], "x": 14, "y": 0},
-                {"matrix": [0, 15], "x": 15, "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": [1, 4], "x": 4, "y": 1},
-                {"matrix": [1, 5], "x": 5, "y": 1},
-                {"matrix": [1, 6], "x": 6, "y": 1},
-                {"matrix": [1, 7], "x": 7, "y": 1},
-                {"matrix": [1, 8], "x": 8, "y": 1},
-                {"matrix": [1, 9], "x": 9, "y": 1},
-                {"matrix": [1, 10], "x": 10, "y": 1},
-                {"matrix": [1, 11], "x": 11, "y": 1},
-                {"matrix": [1, 12], "x": 12, "y": 1},
-                {"matrix": [1, 13], "x": 13, "y": 1},
-                {"matrix": [1, 14], "x": 14, "y": 1},
-                {"matrix": [1, 15], "x": 15, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
-                {"matrix": [2, 2], "x": 1.5, "y": 2},
-                {"matrix": [2, 3], "x": 2.5, "y": 2},
-                {"matrix": [2, 4], "x": 3.5, "y": 2},
-                {"matrix": [2, 5], "x": 4.5, "y": 2},
-                {"matrix": [2, 6], "x": 5.5, "y": 2},
-                {"matrix": [2, 7], "x": 6.5, "y": 2},
-                {"matrix": [2, 8], "x": 7.5, "y": 2},
-                {"matrix": [2, 9], "x": 8.5, "y": 2},
-                {"matrix": [2, 10], "x": 9.5, "y": 2},
-                {"matrix": [2, 11], "x": 10.5, "y": 2},
-                {"matrix": [2, 12], "x": 11.5, "y": 2},
-                {"matrix": [2, 13], "x": 12.5, "y": 2},
-                {"matrix": [2, 15], "x": 15, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
-                {"matrix": [3, 2], "x": 1.75, "y": 3},
-                {"matrix": [3, 3], "x": 2.75, "y": 3},
-                {"matrix": [3, 4], "x": 3.75, "y": 3},
-                {"matrix": [3, 5], "x": 4.75, "y": 3},
-                {"matrix": [3, 6], "x": 5.75, "y": 3},
-                {"matrix": [3, 7], "x": 6.75, "y": 3},
-                {"matrix": [3, 8], "x": 7.75, "y": 3},
-                {"matrix": [3, 9], "x": 8.75, "y": 3},
-                {"matrix": [3, 10], "x": 9.75, "y": 3},
-                {"matrix": [3, 11], "x": 10.75, "y": 3},
-                {"matrix": [3, 12], "x": 11.75, "y": 3},
-                {"matrix": [2, 14], "x": 12.75, "y": 3},
-                {"matrix": [3, 13], "x": 13.75, "y": 2, "w": 1.25, "h": 2},
-                {"matrix": [3, 15], "x": 15, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4},
-                {"matrix": [4, 2], "x": 2.25, "y": 4},
-                {"matrix": [4, 3], "x": 3.25, "y": 4},
-                {"matrix": [4, 4], "x": 4.25, "y": 4},
-                {"matrix": [4, 5], "x": 5.25, "y": 4},
-                {"matrix": [4, 6], "x": 6.25, "y": 4},
-                {"matrix": [4, 7], "x": 7.25, "y": 4},
-                {"matrix": [4, 8], "x": 8.25, "y": 4},
-                {"matrix": [4, 9], "x": 9.25, "y": 4},
-                {"matrix": [4, 10], "x": 10.25, "y": 4},
-                {"matrix": [4, 11], "x": 11.25, "y": 4},
-                {"matrix": [4, 13], "x": 12.25, "y": 4, "w": 1.75},
-                {"matrix": [4, 14], "x": 14, "y": 4},
-                {"matrix": [4, 15], "x": 15, "y": 4},
-
-                {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
-                {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
-                {"matrix": [5, 3], "x": 2.5, "y": 5, "w": 1.25},
-                {"matrix": [5, 6], "x": 3.75, "y": 5, "w": 6.25},
-                {"matrix": [5, 10], "x": 10, "y": 5},
-                {"matrix": [5, 11], "x": 11, "y": 5},
-                {"matrix": [5, 12], "x": 12, "y": 5},
-                {"matrix": [5, 13], "x": 13, "y": 5},
-                {"matrix": [5, 14], "x": 14, "y": 5},
-                {"matrix": [5, 15], "x": 15, "y": 5}
-            ]
-        },
-        "LAYOUT_75_iso_rwkl": {
-            "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, 14], "x": 14, "y": 0},
-                {"matrix": [0, 15], "x": 15, "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": [1, 4], "x": 4, "y": 1},
-                {"matrix": [1, 5], "x": 5, "y": 1},
-                {"matrix": [1, 6], "x": 6, "y": 1},
-                {"matrix": [1, 7], "x": 7, "y": 1},
-                {"matrix": [1, 8], "x": 8, "y": 1},
-                {"matrix": [1, 9], "x": 9, "y": 1},
-                {"matrix": [1, 10], "x": 10, "y": 1},
-                {"matrix": [1, 11], "x": 11, "y": 1},
-                {"matrix": [1, 12], "x": 12, "y": 1},
-                {"matrix": [1, 14], "x": 13, "y": 1, "w": 2},
-                {"matrix": [1, 15], "x": 15, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
-                {"matrix": [2, 2], "x": 1.5, "y": 2},
-                {"matrix": [2, 3], "x": 2.5, "y": 2},
-                {"matrix": [2, 4], "x": 3.5, "y": 2},
-                {"matrix": [2, 5], "x": 4.5, "y": 2},
-                {"matrix": [2, 6], "x": 5.5, "y": 2},
-                {"matrix": [2, 7], "x": 6.5, "y": 2},
-                {"matrix": [2, 8], "x": 7.5, "y": 2},
-                {"matrix": [2, 9], "x": 8.5, "y": 2},
-                {"matrix": [2, 10], "x": 9.5, "y": 2},
-                {"matrix": [2, 11], "x": 10.5, "y": 2},
-                {"matrix": [2, 12], "x": 11.5, "y": 2},
-                {"matrix": [2, 13], "x": 12.5, "y": 2},
-                {"matrix": [2, 15], "x": 15, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
-                {"matrix": [3, 2], "x": 1.75, "y": 3},
-                {"matrix": [3, 3], "x": 2.75, "y": 3},
-                {"matrix": [3, 4], "x": 3.75, "y": 3},
-                {"matrix": [3, 5], "x": 4.75, "y": 3},
-                {"matrix": [3, 6], "x": 5.75, "y": 3},
-                {"matrix": [3, 7], "x": 6.75, "y": 3},
-                {"matrix": [3, 8], "x": 7.75, "y": 3},
-                {"matrix": [3, 9], "x": 8.75, "y": 3},
-                {"matrix": [3, 10], "x": 9.75, "y": 3},
-                {"matrix": [3, 11], "x": 10.75, "y": 3},
-                {"matrix": [3, 12], "x": 11.75, "y": 3},
-                {"matrix": [2, 14], "x": 12.75, "y": 3},
-                {"matrix": [3, 13], "x": 13.75, "y": 2, "w": 1.25, "h": 2},
-                {"matrix": [3, 15], "x": 15, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4},
-                {"matrix": [4, 2], "x": 2.25, "y": 4},
-                {"matrix": [4, 3], "x": 3.25, "y": 4},
-                {"matrix": [4, 4], "x": 4.25, "y": 4},
-                {"matrix": [4, 5], "x": 5.25, "y": 4},
-                {"matrix": [4, 6], "x": 6.25, "y": 4},
-                {"matrix": [4, 7], "x": 7.25, "y": 4},
-                {"matrix": [4, 8], "x": 8.25, "y": 4},
-                {"matrix": [4, 9], "x": 9.25, "y": 4},
-                {"matrix": [4, 10], "x": 10.25, "y": 4},
-                {"matrix": [4, 11], "x": 11.25, "y": 4},
-                {"matrix": [4, 13], "x": 12.25, "y": 4, "w": 1.75},
-                {"matrix": [4, 14], "x": 14, "y": 4},
-                {"matrix": [4, 15], "x": 15, "y": 4},
-
-                {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
-                {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
-                {"matrix": [5, 3], "x": 2.5, "y": 5, "w": 1.25},
-                {"matrix": [5, 6], "x": 3.75, "y": 5, "w": 6.25},
-                {"matrix": [5, 10], "x": 10, "y": 5, "w": 1.5},
-                {"matrix": [5, 12], "x": 11.5, "y": 5, "w": 1.5},
-                {"matrix": [5, 13], "x": 13, "y": 5},
-                {"matrix": [5, 14], "x": 14, "y": 5},
-                {"matrix": [5, 15], "x": 15, "y": 5}
-            ]
-        },
-        "LAYOUT_75_iso_rwkl_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, 14], "x": 14, "y": 0},
-                {"matrix": [0, 15], "x": 15, "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": [1, 4], "x": 4, "y": 1},
-                {"matrix": [1, 5], "x": 5, "y": 1},
-                {"matrix": [1, 6], "x": 6, "y": 1},
-                {"matrix": [1, 7], "x": 7, "y": 1},
-                {"matrix": [1, 8], "x": 8, "y": 1},
-                {"matrix": [1, 9], "x": 9, "y": 1},
-                {"matrix": [1, 10], "x": 10, "y": 1},
-                {"matrix": [1, 11], "x": 11, "y": 1},
-                {"matrix": [1, 12], "x": 12, "y": 1},
-                {"matrix": [1, 13], "x": 13, "y": 1},
-                {"matrix": [1, 14], "x": 14, "y": 1},
-                {"matrix": [1, 15], "x": 15, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
-                {"matrix": [2, 2], "x": 1.5, "y": 2},
-                {"matrix": [2, 3], "x": 2.5, "y": 2},
-                {"matrix": [2, 4], "x": 3.5, "y": 2},
-                {"matrix": [2, 5], "x": 4.5, "y": 2},
-                {"matrix": [2, 6], "x": 5.5, "y": 2},
-                {"matrix": [2, 7], "x": 6.5, "y": 2},
-                {"matrix": [2, 8], "x": 7.5, "y": 2},
-                {"matrix": [2, 9], "x": 8.5, "y": 2},
-                {"matrix": [2, 10], "x": 9.5, "y": 2},
-                {"matrix": [2, 11], "x": 10.5, "y": 2},
-                {"matrix": [2, 12], "x": 11.5, "y": 2},
-                {"matrix": [2, 13], "x": 12.5, "y": 2},
-                {"matrix": [2, 15], "x": 15, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
-                {"matrix": [3, 2], "x": 1.75, "y": 3},
-                {"matrix": [3, 3], "x": 2.75, "y": 3},
-                {"matrix": [3, 4], "x": 3.75, "y": 3},
-                {"matrix": [3, 5], "x": 4.75, "y": 3},
-                {"matrix": [3, 6], "x": 5.75, "y": 3},
-                {"matrix": [3, 7], "x": 6.75, "y": 3},
-                {"matrix": [3, 8], "x": 7.75, "y": 3},
-                {"matrix": [3, 9], "x": 8.75, "y": 3},
-                {"matrix": [3, 10], "x": 9.75, "y": 3},
-                {"matrix": [3, 11], "x": 10.75, "y": 3},
-                {"matrix": [3, 12], "x": 11.75, "y": 3},
-                {"matrix": [2, 14], "x": 12.75, "y": 3},
-                {"matrix": [3, 13], "x": 13.75, "y": 2, "w": 1.25, "h": 2},
-                {"matrix": [3, 15], "x": 15, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4},
-                {"matrix": [4, 2], "x": 2.25, "y": 4},
-                {"matrix": [4, 3], "x": 3.25, "y": 4},
-                {"matrix": [4, 4], "x": 4.25, "y": 4},
-                {"matrix": [4, 5], "x": 5.25, "y": 4},
-                {"matrix": [4, 6], "x": 6.25, "y": 4},
-                {"matrix": [4, 7], "x": 7.25, "y": 4},
-                {"matrix": [4, 8], "x": 8.25, "y": 4},
-                {"matrix": [4, 9], "x": 9.25, "y": 4},
-                {"matrix": [4, 10], "x": 10.25, "y": 4},
-                {"matrix": [4, 11], "x": 11.25, "y": 4},
-                {"matrix": [4, 13], "x": 12.25, "y": 4, "w": 1.75},
-                {"matrix": [4, 14], "x": 14, "y": 4},
-                {"matrix": [4, 15], "x": 15, "y": 4},
-
-                {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
-                {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
-                {"matrix": [5, 3], "x": 2.5, "y": 5, "w": 1.25},
-                {"matrix": [5, 6], "x": 3.75, "y": 5, "w": 6.25},
-                {"matrix": [5, 10], "x": 10, "y": 5, "w": 1.5},
-                {"matrix": [5, 12], "x": 11.5, "y": 5, "w": 1.5},
-                {"matrix": [5, 13], "x": 13, "y": 5},
-                {"matrix": [5, 14], "x": 14, "y": 5},
-                {"matrix": [5, 15], "x": 15, "y": 5}
-            ]
-        },
-        "LAYOUT_75_iso_wkl": {
-            "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, 14], "x": 14, "y": 0},
-                {"matrix": [0, 15], "x": 15, "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": [1, 4], "x": 4, "y": 1},
-                {"matrix": [1, 5], "x": 5, "y": 1},
-                {"matrix": [1, 6], "x": 6, "y": 1},
-                {"matrix": [1, 7], "x": 7, "y": 1},
-                {"matrix": [1, 8], "x": 8, "y": 1},
-                {"matrix": [1, 9], "x": 9, "y": 1},
-                {"matrix": [1, 10], "x": 10, "y": 1},
-                {"matrix": [1, 11], "x": 11, "y": 1},
-                {"matrix": [1, 12], "x": 12, "y": 1},
-                {"matrix": [1, 14], "x": 13, "y": 1, "w": 2},
-                {"matrix": [1, 15], "x": 15, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
-                {"matrix": [2, 2], "x": 1.5, "y": 2},
-                {"matrix": [2, 3], "x": 2.5, "y": 2},
-                {"matrix": [2, 4], "x": 3.5, "y": 2},
-                {"matrix": [2, 5], "x": 4.5, "y": 2},
-                {"matrix": [2, 6], "x": 5.5, "y": 2},
-                {"matrix": [2, 7], "x": 6.5, "y": 2},
-                {"matrix": [2, 8], "x": 7.5, "y": 2},
-                {"matrix": [2, 9], "x": 8.5, "y": 2},
-                {"matrix": [2, 10], "x": 9.5, "y": 2},
-                {"matrix": [2, 11], "x": 10.5, "y": 2},
-                {"matrix": [2, 12], "x": 11.5, "y": 2},
-                {"matrix": [2, 13], "x": 12.5, "y": 2},
-                {"matrix": [2, 15], "x": 15, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
-                {"matrix": [3, 2], "x": 1.75, "y": 3},
-                {"matrix": [3, 3], "x": 2.75, "y": 3},
-                {"matrix": [3, 4], "x": 3.75, "y": 3},
-                {"matrix": [3, 5], "x": 4.75, "y": 3},
-                {"matrix": [3, 6], "x": 5.75, "y": 3},
-                {"matrix": [3, 7], "x": 6.75, "y": 3},
-                {"matrix": [3, 8], "x": 7.75, "y": 3},
-                {"matrix": [3, 9], "x": 8.75, "y": 3},
-                {"matrix": [3, 10], "x": 9.75, "y": 3},
-                {"matrix": [3, 11], "x": 10.75, "y": 3},
-                {"matrix": [3, 12], "x": 11.75, "y": 3},
-                {"matrix": [2, 14], "x": 12.75, "y": 3},
-                {"matrix": [3, 13], "x": 13.75, "y": 2, "w": 1.25, "h": 2},
-                {"matrix": [3, 15], "x": 15, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4},
-                {"matrix": [4, 2], "x": 2.25, "y": 4},
-                {"matrix": [4, 3], "x": 3.25, "y": 4},
-                {"matrix": [4, 4], "x": 4.25, "y": 4},
-                {"matrix": [4, 5], "x": 5.25, "y": 4},
-                {"matrix": [4, 6], "x": 6.25, "y": 4},
-                {"matrix": [4, 7], "x": 7.25, "y": 4},
-                {"matrix": [4, 8], "x": 8.25, "y": 4},
-                {"matrix": [4, 9], "x": 9.25, "y": 4},
-                {"matrix": [4, 10], "x": 10.25, "y": 4},
-                {"matrix": [4, 11], "x": 11.25, "y": 4},
-                {"matrix": [4, 13], "x": 12.25, "y": 4, "w": 1.75},
-                {"matrix": [4, 14], "x": 14, "y": 4},
-                {"matrix": [4, 15], "x": 15, "y": 4},
-
-                {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.5},
-                {"matrix": [5, 1], "x": 1.5, "y": 5, "w": 1.5},
-                {"matrix": [5, 6], "x": 3, "y": 5, "w": 7},
-                {"matrix": [5, 10], "x": 10, "y": 5, "w": 1.5},
-                {"matrix": [5, 12], "x": 11.5, "y": 5, "w": 1.5},
-                {"matrix": [5, 13], "x": 13, "y": 5},
-                {"matrix": [5, 14], "x": 14, "y": 5},
-                {"matrix": [5, 15], "x": 15, "y": 5}
-            ]
-        },
-        "LAYOUT_75_iso_wkl_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, 14], "x": 14, "y": 0},
-                {"matrix": [0, 15], "x": 15, "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": [1, 4], "x": 4, "y": 1},
-                {"matrix": [1, 5], "x": 5, "y": 1},
-                {"matrix": [1, 6], "x": 6, "y": 1},
-                {"matrix": [1, 7], "x": 7, "y": 1},
-                {"matrix": [1, 8], "x": 8, "y": 1},
-                {"matrix": [1, 9], "x": 9, "y": 1},
-                {"matrix": [1, 10], "x": 10, "y": 1},
-                {"matrix": [1, 11], "x": 11, "y": 1},
-                {"matrix": [1, 12], "x": 12, "y": 1},
-                {"matrix": [1, 13], "x": 13, "y": 1},
-                {"matrix": [1, 14], "x": 14, "y": 1},
-                {"matrix": [1, 15], "x": 15, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
-                {"matrix": [2, 2], "x": 1.5, "y": 2},
-                {"matrix": [2, 3], "x": 2.5, "y": 2},
-                {"matrix": [2, 4], "x": 3.5, "y": 2},
-                {"matrix": [2, 5], "x": 4.5, "y": 2},
-                {"matrix": [2, 6], "x": 5.5, "y": 2},
-                {"matrix": [2, 7], "x": 6.5, "y": 2},
-                {"matrix": [2, 8], "x": 7.5, "y": 2},
-                {"matrix": [2, 9], "x": 8.5, "y": 2},
-                {"matrix": [2, 10], "x": 9.5, "y": 2},
-                {"matrix": [2, 11], "x": 10.5, "y": 2},
-                {"matrix": [2, 12], "x": 11.5, "y": 2},
-                {"matrix": [2, 13], "x": 12.5, "y": 2},
-                {"matrix": [2, 15], "x": 15, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
-                {"matrix": [3, 2], "x": 1.75, "y": 3},
-                {"matrix": [3, 3], "x": 2.75, "y": 3},
-                {"matrix": [3, 4], "x": 3.75, "y": 3},
-                {"matrix": [3, 5], "x": 4.75, "y": 3},
-                {"matrix": [3, 6], "x": 5.75, "y": 3},
-                {"matrix": [3, 7], "x": 6.75, "y": 3},
-                {"matrix": [3, 8], "x": 7.75, "y": 3},
-                {"matrix": [3, 9], "x": 8.75, "y": 3},
-                {"matrix": [3, 10], "x": 9.75, "y": 3},
-                {"matrix": [3, 11], "x": 10.75, "y": 3},
-                {"matrix": [3, 12], "x": 11.75, "y": 3},
-                {"matrix": [2, 14], "x": 12.75, "y": 3},
-                {"matrix": [3, 13], "x": 13.75, "y": 2, "w": 1.25, "h": 2},
-                {"matrix": [3, 15], "x": 15, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4},
-                {"matrix": [4, 2], "x": 2.25, "y": 4},
-                {"matrix": [4, 3], "x": 3.25, "y": 4},
-                {"matrix": [4, 4], "x": 4.25, "y": 4},
-                {"matrix": [4, 5], "x": 5.25, "y": 4},
-                {"matrix": [4, 6], "x": 6.25, "y": 4},
-                {"matrix": [4, 7], "x": 7.25, "y": 4},
-                {"matrix": [4, 8], "x": 8.25, "y": 4},
-                {"matrix": [4, 9], "x": 9.25, "y": 4},
-                {"matrix": [4, 10], "x": 10.25, "y": 4},
-                {"matrix": [4, 11], "x": 11.25, "y": 4},
-                {"matrix": [4, 13], "x": 12.25, "y": 4, "w": 1.75},
-                {"matrix": [4, 14], "x": 14, "y": 4},
-                {"matrix": [4, 15], "x": 15, "y": 4},
-
-                {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.5},
-                {"matrix": [5, 1], "x": 1.5, "y": 5, "w": 1.5},
-                {"matrix": [5, 6], "x": 3, "y": 5, "w": 7},
-                {"matrix": [5, 10], "x": 10, "y": 5, "w": 1.5},
-                {"matrix": [5, 12], "x": 11.5, "y": 5, "w": 1.5},
-                {"matrix": [5, 13], "x": 13, "y": 5},
-                {"matrix": [5, 14], "x": 14, "y": 5},
-                {"matrix": [5, 15], "x": 15, "y": 5}
-            ]
-        },
-        "LAYOUT_numpad": {
-            "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, 14], "x": 14, "y": 0},
-                {"matrix": [0, 15], "x": 15, "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": [1, 4], "x": 4, "y": 1},
-                {"matrix": [1, 5], "x": 5, "y": 1},
-                {"matrix": [1, 6], "x": 6, "y": 1},
-                {"matrix": [1, 7], "x": 7, "y": 1},
-                {"matrix": [1, 8], "x": 8, "y": 1},
-                {"matrix": [1, 9], "x": 9, "y": 1},
-                {"matrix": [1, 10], "x": 10, "y": 1},
-                {"matrix": [1, 11], "x": 11, "y": 1},
-                {"matrix": [1, 12], "x": 12, "y": 1},
-                {"matrix": [1, 13], "x": 13, "y": 1},
-                {"matrix": [1, 14], "x": 14, "y": 1},
-                {"matrix": [1, 15], "x": 15, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
-                {"matrix": [2, 2], "x": 1.5, "y": 2},
-                {"matrix": [2, 3], "x": 2.5, "y": 2},
-                {"matrix": [2, 4], "x": 3.5, "y": 2},
-                {"matrix": [2, 5], "x": 4.5, "y": 2},
-                {"matrix": [2, 6], "x": 5.5, "y": 2},
-                {"matrix": [2, 7], "x": 6.5, "y": 2},
-                {"matrix": [2, 8], "x": 7.5, "y": 2},
-                {"matrix": [2, 9], "x": 8.5, "y": 2},
-                {"matrix": [2, 10], "x": 9.5, "y": 2},
-                {"matrix": [2, 11], "x": 10.5, "y": 2},
-                {"matrix": [2, 12], "x": 11.5, "y": 2, "w": 1.5},
-                {"matrix": [2, 13], "x": 13, "y": 2},
-                {"matrix": [2, 14], "x": 14, "y": 2},
-                {"matrix": [2, 15], "x": 15, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
-                {"matrix": [3, 2], "x": 1.75, "y": 3},
-                {"matrix": [3, 3], "x": 2.75, "y": 3},
-                {"matrix": [3, 4], "x": 3.75, "y": 3},
-                {"matrix": [3, 5], "x": 4.75, "y": 3},
-                {"matrix": [3, 6], "x": 5.75, "y": 3},
-                {"matrix": [3, 7], "x": 6.75, "y": 3},
-                {"matrix": [3, 8], "x": 7.75, "y": 3},
-                {"matrix": [3, 9], "x": 8.75, "y": 3},
-                {"matrix": [3, 10], "x": 9.75, "y": 3},
-                {"matrix": [3, 11], "x": 10.75, "y": 3, "w": 2.25},
-                {"matrix": [3, 12], "x": 13, "y": 3},
-                {"matrix": [3, 13], "x": 14, "y": 3},
-                {"matrix": [3, 15], "x": 15, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4},
-                {"matrix": [4, 2], "x": 2.25, "y": 4},
-                {"matrix": [4, 3], "x": 3.25, "y": 4},
-                {"matrix": [4, 4], "x": 4.25, "y": 4},
-                {"matrix": [4, 5], "x": 5.25, "y": 4},
-                {"matrix": [4, 6], "x": 6.25, "y": 4},
-                {"matrix": [4, 7], "x": 7.25, "y": 4},
-                {"matrix": [4, 8], "x": 8.25, "y": 4},
-                {"matrix": [4, 9], "x": 9.25, "y": 4},
-                {"matrix": [4, 10], "x": 10.25, "y": 4, "w": 1.75},
-                {"matrix": [4, 11], "x": 12, "y": 4},
-                {"matrix": [4, 13], "x": 13, "y": 4},
-                {"matrix": [4, 14], "x": 14, "y": 4},
-                {"matrix": [4, 15], "x": 15, "y": 4},
-
-                {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
-                {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
-                {"matrix": [5, 3], "x": 2.5, "y": 5, "w": 1.25},
-                {"matrix": [5, 4], "x": 3.75, "y": 5, "w": 1.25},
-                {"matrix": [5, 6], "x": 5, "y": 5, "w": 2.25},
-                {"matrix": [5, 8], "x": 7.25, "y": 5, "w": 1.75},
-                {"matrix": [5, 9], "x": 9, "y": 5},
-                {"matrix": [5, 10], "x": 10, "y": 5},
-                {"matrix": [5, 11], "x": 11, "y": 5},
-                {"matrix": [5, 12], "x": 12, "y": 5},
-                {"matrix": [5, 13], "x": 13, "y": 5},
-                {"matrix": [5, 14], "x": 14, "y": 5},
-                {"matrix": [5, 15], "x": 15, "y": 5}
-            ]
-        }
-    }
-}
diff --git a/keyboards/kbdfans/kbd75/rev2/keyboard.json b/keyboards/kbdfans/kbd75/rev2/keyboard.json
new file mode 100644
index 00000000000..9bfd69f7fdc
--- /dev/null
+++ b/keyboards/kbdfans/kbd75/rev2/keyboard.json
@@ -0,0 +1,1372 @@
+{
+    "keyboard_name": "KBD75 rev2",
+    "manufacturer": "KBDfans",
+    "url": "",
+    "maintainer": "qmk",
+    "usb": {
+        "vid": "0x4B42",
+        "pid": "0x6061",
+        "device_version": "0.0.2"
+    },
+    "matrix_pins": {
+        "cols": ["F0", "F1", "E6", "C7", "C6", "F5", "D4", "B1", "B0", "B5", "B4", "D7", "D6", "B3", "F4", "F6"],
+        "rows": ["D0", "D1", "D2", "D3", "D5", "B7"]
+    },
+    "diode_direction": "COL2ROW",
+    "backlight": {
+        "pin": "B6",
+        "levels": 5
+    },
+    "indicators": {
+        "caps_lock": "B2",
+        "on_state": 0
+    },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 16,
+        "sleep": true,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": true,
+            "twinkle": true
+        }
+    },
+    "ws2812": {
+        "pin": "E2"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "nkro": true,
+        "backlight": true,
+        "rgblight": true
+    },
+    "layout_aliases": {
+        "LAYOUT_ansi_1u": "LAYOUT_75_ansi"
+    },
+    "community_layouts": ["75_ansi", "75_iso"],
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 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, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "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": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+                {"matrix": [1, 12], "x": 12, "y": 1},
+                {"matrix": [1, 13], "x": 13, "y": 1},
+                {"matrix": [1, 14], "x": 14, "y": 1},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [2, 2], "x": 1.5, "y": 2},
+                {"matrix": [2, 3], "x": 2.5, "y": 2},
+                {"matrix": [2, 4], "x": 3.5, "y": 2},
+                {"matrix": [2, 5], "x": 4.5, "y": 2},
+                {"matrix": [2, 6], "x": 5.5, "y": 2},
+                {"matrix": [2, 7], "x": 6.5, "y": 2},
+                {"matrix": [2, 8], "x": 7.5, "y": 2},
+                {"matrix": [2, 9], "x": 8.5, "y": 2},
+                {"matrix": [2, 10], "x": 9.5, "y": 2},
+                {"matrix": [2, 11], "x": 10.5, "y": 2},
+                {"matrix": [2, 12], "x": 11.5, "y": 2},
+                {"matrix": [2, 13], "x": 12.5, "y": 2},
+                {"matrix": [2, 14], "x": 13.5, "y": 2, "w": 1.5},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+                {"matrix": [3, 2], "x": 1.75, "y": 3},
+                {"matrix": [3, 3], "x": 2.75, "y": 3},
+                {"matrix": [3, 4], "x": 3.75, "y": 3},
+                {"matrix": [3, 5], "x": 4.75, "y": 3},
+                {"matrix": [3, 6], "x": 5.75, "y": 3},
+                {"matrix": [3, 7], "x": 6.75, "y": 3},
+                {"matrix": [3, 8], "x": 7.75, "y": 3},
+                {"matrix": [3, 9], "x": 8.75, "y": 3},
+                {"matrix": [3, 10], "x": 9.75, "y": 3},
+                {"matrix": [3, 11], "x": 10.75, "y": 3},
+                {"matrix": [3, 12], "x": 11.75, "y": 3},
+                {"matrix": [3, 13], "x": 12.75, "y": 3, "w": 2.25},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4},
+                {"matrix": [4, 2], "x": 2.25, "y": 4},
+                {"matrix": [4, 3], "x": 3.25, "y": 4},
+                {"matrix": [4, 4], "x": 4.25, "y": 4},
+                {"matrix": [4, 5], "x": 5.25, "y": 4},
+                {"matrix": [4, 6], "x": 6.25, "y": 4},
+                {"matrix": [4, 7], "x": 7.25, "y": 4},
+                {"matrix": [4, 8], "x": 8.25, "y": 4},
+                {"matrix": [4, 9], "x": 9.25, "y": 4},
+                {"matrix": [4, 10], "x": 10.25, "y": 4},
+                {"matrix": [4, 11], "x": 11.25, "y": 4},
+                {"matrix": [4, 13], "x": 12.25, "y": 4, "w": 1.75},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4},
+
+                {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
+                {"matrix": [5, 3], "x": 2.5, "y": 5, "w": 1.25},
+                {"matrix": [5, 4], "x": 3.75, "y": 5, "w": 2.25},
+                {"matrix": [5, 6], "x": 6, "y": 5, "w": 1.25},
+                {"matrix": [5, 8], "x": 7.25, "y": 5, "w": 2.75},
+                {"matrix": [5, 10], "x": 10, "y": 5},
+                {"matrix": [5, 11], "x": 11, "y": 5},
+                {"matrix": [5, 12], "x": 12, "y": 5},
+                {"matrix": [5, 13], "x": 13, "y": 5},
+                {"matrix": [5, 14], "x": 14, "y": 5},
+                {"matrix": [5, 15], "x": 15, "y": 5}
+            ]
+        },
+        "LAYOUT_75_ansi": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 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, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "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": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+                {"matrix": [1, 12], "x": 12, "y": 1},
+                {"matrix": [1, 14], "x": 13, "y": 1, "w": 2},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [2, 2], "x": 1.5, "y": 2},
+                {"matrix": [2, 3], "x": 2.5, "y": 2},
+                {"matrix": [2, 4], "x": 3.5, "y": 2},
+                {"matrix": [2, 5], "x": 4.5, "y": 2},
+                {"matrix": [2, 6], "x": 5.5, "y": 2},
+                {"matrix": [2, 7], "x": 6.5, "y": 2},
+                {"matrix": [2, 8], "x": 7.5, "y": 2},
+                {"matrix": [2, 9], "x": 8.5, "y": 2},
+                {"matrix": [2, 10], "x": 9.5, "y": 2},
+                {"matrix": [2, 11], "x": 10.5, "y": 2},
+                {"matrix": [2, 12], "x": 11.5, "y": 2},
+                {"matrix": [2, 13], "x": 12.5, "y": 2},
+                {"matrix": [2, 14], "x": 13.5, "y": 2, "w": 1.5},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+                {"matrix": [3, 2], "x": 1.75, "y": 3},
+                {"matrix": [3, 3], "x": 2.75, "y": 3},
+                {"matrix": [3, 4], "x": 3.75, "y": 3},
+                {"matrix": [3, 5], "x": 4.75, "y": 3},
+                {"matrix": [3, 6], "x": 5.75, "y": 3},
+                {"matrix": [3, 7], "x": 6.75, "y": 3},
+                {"matrix": [3, 8], "x": 7.75, "y": 3},
+                {"matrix": [3, 9], "x": 8.75, "y": 3},
+                {"matrix": [3, 10], "x": 9.75, "y": 3},
+                {"matrix": [3, 11], "x": 10.75, "y": 3},
+                {"matrix": [3, 12], "x": 11.75, "y": 3},
+                {"matrix": [3, 13], "x": 12.75, "y": 3, "w": 2.25},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4},
+                {"matrix": [4, 3], "x": 3.25, "y": 4},
+                {"matrix": [4, 4], "x": 4.25, "y": 4},
+                {"matrix": [4, 5], "x": 5.25, "y": 4},
+                {"matrix": [4, 6], "x": 6.25, "y": 4},
+                {"matrix": [4, 7], "x": 7.25, "y": 4},
+                {"matrix": [4, 8], "x": 8.25, "y": 4},
+                {"matrix": [4, 9], "x": 9.25, "y": 4},
+                {"matrix": [4, 10], "x": 10.25, "y": 4},
+                {"matrix": [4, 11], "x": 11.25, "y": 4},
+                {"matrix": [4, 13], "x": 12.25, "y": 4, "w": 1.75},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4},
+
+                {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
+                {"matrix": [5, 3], "x": 2.5, "y": 5, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5},
+                {"matrix": [5, 11], "x": 11, "y": 5},
+                {"matrix": [5, 12], "x": 12, "y": 5},
+                {"matrix": [5, 13], "x": 13, "y": 5},
+                {"matrix": [5, 14], "x": 14, "y": 5},
+                {"matrix": [5, 15], "x": 15, "y": 5}
+            ]
+        },
+        "LAYOUT_75_ansi_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, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "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": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+                {"matrix": [1, 12], "x": 12, "y": 1},
+                {"matrix": [1, 13], "x": 13, "y": 1},
+                {"matrix": [1, 14], "x": 14, "y": 1},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [2, 2], "x": 1.5, "y": 2},
+                {"matrix": [2, 3], "x": 2.5, "y": 2},
+                {"matrix": [2, 4], "x": 3.5, "y": 2},
+                {"matrix": [2, 5], "x": 4.5, "y": 2},
+                {"matrix": [2, 6], "x": 5.5, "y": 2},
+                {"matrix": [2, 7], "x": 6.5, "y": 2},
+                {"matrix": [2, 8], "x": 7.5, "y": 2},
+                {"matrix": [2, 9], "x": 8.5, "y": 2},
+                {"matrix": [2, 10], "x": 9.5, "y": 2},
+                {"matrix": [2, 11], "x": 10.5, "y": 2},
+                {"matrix": [2, 12], "x": 11.5, "y": 2},
+                {"matrix": [2, 13], "x": 12.5, "y": 2},
+                {"matrix": [2, 14], "x": 13.5, "y": 2, "w": 1.5},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+                {"matrix": [3, 2], "x": 1.75, "y": 3},
+                {"matrix": [3, 3], "x": 2.75, "y": 3},
+                {"matrix": [3, 4], "x": 3.75, "y": 3},
+                {"matrix": [3, 5], "x": 4.75, "y": 3},
+                {"matrix": [3, 6], "x": 5.75, "y": 3},
+                {"matrix": [3, 7], "x": 6.75, "y": 3},
+                {"matrix": [3, 8], "x": 7.75, "y": 3},
+                {"matrix": [3, 9], "x": 8.75, "y": 3},
+                {"matrix": [3, 10], "x": 9.75, "y": 3},
+                {"matrix": [3, 11], "x": 10.75, "y": 3},
+                {"matrix": [3, 12], "x": 11.75, "y": 3},
+                {"matrix": [3, 13], "x": 12.75, "y": 3, "w": 2.25},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4},
+                {"matrix": [4, 3], "x": 3.25, "y": 4},
+                {"matrix": [4, 4], "x": 4.25, "y": 4},
+                {"matrix": [4, 5], "x": 5.25, "y": 4},
+                {"matrix": [4, 6], "x": 6.25, "y": 4},
+                {"matrix": [4, 7], "x": 7.25, "y": 4},
+                {"matrix": [4, 8], "x": 8.25, "y": 4},
+                {"matrix": [4, 9], "x": 9.25, "y": 4},
+                {"matrix": [4, 10], "x": 10.25, "y": 4},
+                {"matrix": [4, 11], "x": 11.25, "y": 4},
+                {"matrix": [4, 13], "x": 12.25, "y": 4, "w": 1.75},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4},
+
+                {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
+                {"matrix": [5, 3], "x": 2.5, "y": 5, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5},
+                {"matrix": [5, 11], "x": 11, "y": 5},
+                {"matrix": [5, 12], "x": 12, "y": 5},
+                {"matrix": [5, 13], "x": 13, "y": 5},
+                {"matrix": [5, 14], "x": 14, "y": 5},
+                {"matrix": [5, 15], "x": 15, "y": 5}
+            ]
+        },
+        "LAYOUT_75_ansi_rwkl": {
+            "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, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "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": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+                {"matrix": [1, 12], "x": 12, "y": 1},
+                {"matrix": [1, 14], "x": 13, "y": 1, "w": 2},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [2, 2], "x": 1.5, "y": 2},
+                {"matrix": [2, 3], "x": 2.5, "y": 2},
+                {"matrix": [2, 4], "x": 3.5, "y": 2},
+                {"matrix": [2, 5], "x": 4.5, "y": 2},
+                {"matrix": [2, 6], "x": 5.5, "y": 2},
+                {"matrix": [2, 7], "x": 6.5, "y": 2},
+                {"matrix": [2, 8], "x": 7.5, "y": 2},
+                {"matrix": [2, 9], "x": 8.5, "y": 2},
+                {"matrix": [2, 10], "x": 9.5, "y": 2},
+                {"matrix": [2, 11], "x": 10.5, "y": 2},
+                {"matrix": [2, 12], "x": 11.5, "y": 2},
+                {"matrix": [2, 13], "x": 12.5, "y": 2},
+                {"matrix": [2, 14], "x": 13.5, "y": 2, "w": 1.5},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+                {"matrix": [3, 2], "x": 1.75, "y": 3},
+                {"matrix": [3, 3], "x": 2.75, "y": 3},
+                {"matrix": [3, 4], "x": 3.75, "y": 3},
+                {"matrix": [3, 5], "x": 4.75, "y": 3},
+                {"matrix": [3, 6], "x": 5.75, "y": 3},
+                {"matrix": [3, 7], "x": 6.75, "y": 3},
+                {"matrix": [3, 8], "x": 7.75, "y": 3},
+                {"matrix": [3, 9], "x": 8.75, "y": 3},
+                {"matrix": [3, 10], "x": 9.75, "y": 3},
+                {"matrix": [3, 11], "x": 10.75, "y": 3},
+                {"matrix": [3, 12], "x": 11.75, "y": 3},
+                {"matrix": [3, 13], "x": 12.75, "y": 3, "w": 2.25},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4},
+                {"matrix": [4, 3], "x": 3.25, "y": 4},
+                {"matrix": [4, 4], "x": 4.25, "y": 4},
+                {"matrix": [4, 5], "x": 5.25, "y": 4},
+                {"matrix": [4, 6], "x": 6.25, "y": 4},
+                {"matrix": [4, 7], "x": 7.25, "y": 4},
+                {"matrix": [4, 8], "x": 8.25, "y": 4},
+                {"matrix": [4, 9], "x": 9.25, "y": 4},
+                {"matrix": [4, 10], "x": 10.25, "y": 4},
+                {"matrix": [4, 11], "x": 11.25, "y": 4},
+                {"matrix": [4, 13], "x": 12.25, "y": 4, "w": 1.75},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4},
+
+                {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
+                {"matrix": [5, 3], "x": 2.5, "y": 5, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5, "w": 1.5},
+                {"matrix": [5, 12], "x": 11.5, "y": 5, "w": 1.5},
+                {"matrix": [5, 13], "x": 13, "y": 5},
+                {"matrix": [5, 14], "x": 14, "y": 5},
+                {"matrix": [5, 15], "x": 15, "y": 5}
+            ]
+        },
+        "LAYOUT_75_ansi_rwkl_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, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "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": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+                {"matrix": [1, 12], "x": 12, "y": 1},
+                {"matrix": [1, 13], "x": 13, "y": 1},
+                {"matrix": [1, 14], "x": 14, "y": 1},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [2, 2], "x": 1.5, "y": 2},
+                {"matrix": [2, 3], "x": 2.5, "y": 2},
+                {"matrix": [2, 4], "x": 3.5, "y": 2},
+                {"matrix": [2, 5], "x": 4.5, "y": 2},
+                {"matrix": [2, 6], "x": 5.5, "y": 2},
+                {"matrix": [2, 7], "x": 6.5, "y": 2},
+                {"matrix": [2, 8], "x": 7.5, "y": 2},
+                {"matrix": [2, 9], "x": 8.5, "y": 2},
+                {"matrix": [2, 10], "x": 9.5, "y": 2},
+                {"matrix": [2, 11], "x": 10.5, "y": 2},
+                {"matrix": [2, 12], "x": 11.5, "y": 2},
+                {"matrix": [2, 13], "x": 12.5, "y": 2},
+                {"matrix": [2, 14], "x": 13.5, "y": 2, "w": 1.5},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+                {"matrix": [3, 2], "x": 1.75, "y": 3},
+                {"matrix": [3, 3], "x": 2.75, "y": 3},
+                {"matrix": [3, 4], "x": 3.75, "y": 3},
+                {"matrix": [3, 5], "x": 4.75, "y": 3},
+                {"matrix": [3, 6], "x": 5.75, "y": 3},
+                {"matrix": [3, 7], "x": 6.75, "y": 3},
+                {"matrix": [3, 8], "x": 7.75, "y": 3},
+                {"matrix": [3, 9], "x": 8.75, "y": 3},
+                {"matrix": [3, 10], "x": 9.75, "y": 3},
+                {"matrix": [3, 11], "x": 10.75, "y": 3},
+                {"matrix": [3, 12], "x": 11.75, "y": 3},
+                {"matrix": [3, 13], "x": 12.75, "y": 3, "w": 2.25},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4},
+                {"matrix": [4, 3], "x": 3.25, "y": 4},
+                {"matrix": [4, 4], "x": 4.25, "y": 4},
+                {"matrix": [4, 5], "x": 5.25, "y": 4},
+                {"matrix": [4, 6], "x": 6.25, "y": 4},
+                {"matrix": [4, 7], "x": 7.25, "y": 4},
+                {"matrix": [4, 8], "x": 8.25, "y": 4},
+                {"matrix": [4, 9], "x": 9.25, "y": 4},
+                {"matrix": [4, 10], "x": 10.25, "y": 4},
+                {"matrix": [4, 11], "x": 11.25, "y": 4},
+                {"matrix": [4, 13], "x": 12.25, "y": 4, "w": 1.75},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4},
+
+                {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
+                {"matrix": [5, 3], "x": 2.5, "y": 5, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5, "w": 1.5},
+                {"matrix": [5, 12], "x": 11.5, "y": 5, "w": 1.5},
+                {"matrix": [5, 13], "x": 13, "y": 5},
+                {"matrix": [5, 14], "x": 14, "y": 5},
+                {"matrix": [5, 15], "x": 15, "y": 5}
+            ]
+        },
+        "LAYOUT_75_ansi_wkl": {
+            "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, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "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": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+                {"matrix": [1, 12], "x": 12, "y": 1},
+                {"matrix": [1, 14], "x": 13, "y": 1, "w": 2},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [2, 2], "x": 1.5, "y": 2},
+                {"matrix": [2, 3], "x": 2.5, "y": 2},
+                {"matrix": [2, 4], "x": 3.5, "y": 2},
+                {"matrix": [2, 5], "x": 4.5, "y": 2},
+                {"matrix": [2, 6], "x": 5.5, "y": 2},
+                {"matrix": [2, 7], "x": 6.5, "y": 2},
+                {"matrix": [2, 8], "x": 7.5, "y": 2},
+                {"matrix": [2, 9], "x": 8.5, "y": 2},
+                {"matrix": [2, 10], "x": 9.5, "y": 2},
+                {"matrix": [2, 11], "x": 10.5, "y": 2},
+                {"matrix": [2, 12], "x": 11.5, "y": 2},
+                {"matrix": [2, 13], "x": 12.5, "y": 2},
+                {"matrix": [2, 14], "x": 13.5, "y": 2, "w": 1.5},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+                {"matrix": [3, 2], "x": 1.75, "y": 3},
+                {"matrix": [3, 3], "x": 2.75, "y": 3},
+                {"matrix": [3, 4], "x": 3.75, "y": 3},
+                {"matrix": [3, 5], "x": 4.75, "y": 3},
+                {"matrix": [3, 6], "x": 5.75, "y": 3},
+                {"matrix": [3, 7], "x": 6.75, "y": 3},
+                {"matrix": [3, 8], "x": 7.75, "y": 3},
+                {"matrix": [3, 9], "x": 8.75, "y": 3},
+                {"matrix": [3, 10], "x": 9.75, "y": 3},
+                {"matrix": [3, 11], "x": 10.75, "y": 3},
+                {"matrix": [3, 12], "x": 11.75, "y": 3},
+                {"matrix": [3, 13], "x": 12.75, "y": 3, "w": 2.25},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4},
+                {"matrix": [4, 3], "x": 3.25, "y": 4},
+                {"matrix": [4, 4], "x": 4.25, "y": 4},
+                {"matrix": [4, 5], "x": 5.25, "y": 4},
+                {"matrix": [4, 6], "x": 6.25, "y": 4},
+                {"matrix": [4, 7], "x": 7.25, "y": 4},
+                {"matrix": [4, 8], "x": 8.25, "y": 4},
+                {"matrix": [4, 9], "x": 9.25, "y": 4},
+                {"matrix": [4, 10], "x": 10.25, "y": 4},
+                {"matrix": [4, 11], "x": 11.25, "y": 4},
+                {"matrix": [4, 13], "x": 12.25, "y": 4, "w": 1.75},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4},
+
+                {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.5},
+                {"matrix": [5, 1], "x": 1.5, "y": 5, "w": 1.5},
+                {"matrix": [5, 6], "x": 3, "y": 5, "w": 7},
+                {"matrix": [5, 10], "x": 10, "y": 5, "w": 1.5},
+                {"matrix": [5, 12], "x": 11.5, "y": 5, "w": 1.5},
+                {"matrix": [5, 13], "x": 13, "y": 5},
+                {"matrix": [5, 14], "x": 14, "y": 5},
+                {"matrix": [5, 15], "x": 15, "y": 5}
+            ]
+        },
+        "LAYOUT_75_ansi_wkl_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, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "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": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+                {"matrix": [1, 12], "x": 12, "y": 1},
+                {"matrix": [1, 13], "x": 13, "y": 1},
+                {"matrix": [1, 14], "x": 14, "y": 1},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [2, 2], "x": 1.5, "y": 2},
+                {"matrix": [2, 3], "x": 2.5, "y": 2},
+                {"matrix": [2, 4], "x": 3.5, "y": 2},
+                {"matrix": [2, 5], "x": 4.5, "y": 2},
+                {"matrix": [2, 6], "x": 5.5, "y": 2},
+                {"matrix": [2, 7], "x": 6.5, "y": 2},
+                {"matrix": [2, 8], "x": 7.5, "y": 2},
+                {"matrix": [2, 9], "x": 8.5, "y": 2},
+                {"matrix": [2, 10], "x": 9.5, "y": 2},
+                {"matrix": [2, 11], "x": 10.5, "y": 2},
+                {"matrix": [2, 12], "x": 11.5, "y": 2},
+                {"matrix": [2, 13], "x": 12.5, "y": 2},
+                {"matrix": [2, 14], "x": 13.5, "y": 2, "w": 1.5},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+                {"matrix": [3, 2], "x": 1.75, "y": 3},
+                {"matrix": [3, 3], "x": 2.75, "y": 3},
+                {"matrix": [3, 4], "x": 3.75, "y": 3},
+                {"matrix": [3, 5], "x": 4.75, "y": 3},
+                {"matrix": [3, 6], "x": 5.75, "y": 3},
+                {"matrix": [3, 7], "x": 6.75, "y": 3},
+                {"matrix": [3, 8], "x": 7.75, "y": 3},
+                {"matrix": [3, 9], "x": 8.75, "y": 3},
+                {"matrix": [3, 10], "x": 9.75, "y": 3},
+                {"matrix": [3, 11], "x": 10.75, "y": 3},
+                {"matrix": [3, 12], "x": 11.75, "y": 3},
+                {"matrix": [3, 13], "x": 12.75, "y": 3, "w": 2.25},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4},
+                {"matrix": [4, 3], "x": 3.25, "y": 4},
+                {"matrix": [4, 4], "x": 4.25, "y": 4},
+                {"matrix": [4, 5], "x": 5.25, "y": 4},
+                {"matrix": [4, 6], "x": 6.25, "y": 4},
+                {"matrix": [4, 7], "x": 7.25, "y": 4},
+                {"matrix": [4, 8], "x": 8.25, "y": 4},
+                {"matrix": [4, 9], "x": 9.25, "y": 4},
+                {"matrix": [4, 10], "x": 10.25, "y": 4},
+                {"matrix": [4, 11], "x": 11.25, "y": 4},
+                {"matrix": [4, 13], "x": 12.25, "y": 4, "w": 1.75},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4},
+
+                {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.5},
+                {"matrix": [5, 1], "x": 1.5, "y": 5, "w": 1.5},
+                {"matrix": [5, 6], "x": 3, "y": 5, "w": 7},
+                {"matrix": [5, 10], "x": 10, "y": 5, "w": 1.5},
+                {"matrix": [5, 12], "x": 11.5, "y": 5, "w": 1.5},
+                {"matrix": [5, 13], "x": 13, "y": 5},
+                {"matrix": [5, 14], "x": 14, "y": 5},
+                {"matrix": [5, 15], "x": 15, "y": 5}
+            ]
+        },
+        "LAYOUT_75_iso": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "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": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+                {"matrix": [1, 12], "x": 12, "y": 1},
+                {"matrix": [1, 14], "x": 13, "y": 1, "w": 2},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [2, 2], "x": 1.5, "y": 2},
+                {"matrix": [2, 3], "x": 2.5, "y": 2},
+                {"matrix": [2, 4], "x": 3.5, "y": 2},
+                {"matrix": [2, 5], "x": 4.5, "y": 2},
+                {"matrix": [2, 6], "x": 5.5, "y": 2},
+                {"matrix": [2, 7], "x": 6.5, "y": 2},
+                {"matrix": [2, 8], "x": 7.5, "y": 2},
+                {"matrix": [2, 9], "x": 8.5, "y": 2},
+                {"matrix": [2, 10], "x": 9.5, "y": 2},
+                {"matrix": [2, 11], "x": 10.5, "y": 2},
+                {"matrix": [2, 12], "x": 11.5, "y": 2},
+                {"matrix": [2, 13], "x": 12.5, "y": 2},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+                {"matrix": [3, 2], "x": 1.75, "y": 3},
+                {"matrix": [3, 3], "x": 2.75, "y": 3},
+                {"matrix": [3, 4], "x": 3.75, "y": 3},
+                {"matrix": [3, 5], "x": 4.75, "y": 3},
+                {"matrix": [3, 6], "x": 5.75, "y": 3},
+                {"matrix": [3, 7], "x": 6.75, "y": 3},
+                {"matrix": [3, 8], "x": 7.75, "y": 3},
+                {"matrix": [3, 9], "x": 8.75, "y": 3},
+                {"matrix": [3, 10], "x": 9.75, "y": 3},
+                {"matrix": [3, 11], "x": 10.75, "y": 3},
+                {"matrix": [3, 12], "x": 11.75, "y": 3},
+                {"matrix": [2, 14], "x": 12.75, "y": 3},
+                {"matrix": [3, 13], "x": 13.75, "y": 2, "w": 1.25, "h": 2},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4},
+                {"matrix": [4, 2], "x": 2.25, "y": 4},
+                {"matrix": [4, 3], "x": 3.25, "y": 4},
+                {"matrix": [4, 4], "x": 4.25, "y": 4},
+                {"matrix": [4, 5], "x": 5.25, "y": 4},
+                {"matrix": [4, 6], "x": 6.25, "y": 4},
+                {"matrix": [4, 7], "x": 7.25, "y": 4},
+                {"matrix": [4, 8], "x": 8.25, "y": 4},
+                {"matrix": [4, 9], "x": 9.25, "y": 4},
+                {"matrix": [4, 10], "x": 10.25, "y": 4},
+                {"matrix": [4, 11], "x": 11.25, "y": 4},
+                {"matrix": [4, 13], "x": 12.25, "y": 4, "w": 1.75},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4},
+
+                {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
+                {"matrix": [5, 3], "x": 2.5, "y": 5, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5},
+                {"matrix": [5, 11], "x": 11, "y": 5},
+                {"matrix": [5, 12], "x": 12, "y": 5},
+                {"matrix": [5, 13], "x": 13, "y": 5},
+                {"matrix": [5, 14], "x": 14, "y": 5},
+                {"matrix": [5, 15], "x": 15, "y": 5}
+            ]
+        },
+        "LAYOUT_75_iso_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, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "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": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+                {"matrix": [1, 12], "x": 12, "y": 1},
+                {"matrix": [1, 13], "x": 13, "y": 1},
+                {"matrix": [1, 14], "x": 14, "y": 1},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [2, 2], "x": 1.5, "y": 2},
+                {"matrix": [2, 3], "x": 2.5, "y": 2},
+                {"matrix": [2, 4], "x": 3.5, "y": 2},
+                {"matrix": [2, 5], "x": 4.5, "y": 2},
+                {"matrix": [2, 6], "x": 5.5, "y": 2},
+                {"matrix": [2, 7], "x": 6.5, "y": 2},
+                {"matrix": [2, 8], "x": 7.5, "y": 2},
+                {"matrix": [2, 9], "x": 8.5, "y": 2},
+                {"matrix": [2, 10], "x": 9.5, "y": 2},
+                {"matrix": [2, 11], "x": 10.5, "y": 2},
+                {"matrix": [2, 12], "x": 11.5, "y": 2},
+                {"matrix": [2, 13], "x": 12.5, "y": 2},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+                {"matrix": [3, 2], "x": 1.75, "y": 3},
+                {"matrix": [3, 3], "x": 2.75, "y": 3},
+                {"matrix": [3, 4], "x": 3.75, "y": 3},
+                {"matrix": [3, 5], "x": 4.75, "y": 3},
+                {"matrix": [3, 6], "x": 5.75, "y": 3},
+                {"matrix": [3, 7], "x": 6.75, "y": 3},
+                {"matrix": [3, 8], "x": 7.75, "y": 3},
+                {"matrix": [3, 9], "x": 8.75, "y": 3},
+                {"matrix": [3, 10], "x": 9.75, "y": 3},
+                {"matrix": [3, 11], "x": 10.75, "y": 3},
+                {"matrix": [3, 12], "x": 11.75, "y": 3},
+                {"matrix": [2, 14], "x": 12.75, "y": 3},
+                {"matrix": [3, 13], "x": 13.75, "y": 2, "w": 1.25, "h": 2},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4},
+                {"matrix": [4, 2], "x": 2.25, "y": 4},
+                {"matrix": [4, 3], "x": 3.25, "y": 4},
+                {"matrix": [4, 4], "x": 4.25, "y": 4},
+                {"matrix": [4, 5], "x": 5.25, "y": 4},
+                {"matrix": [4, 6], "x": 6.25, "y": 4},
+                {"matrix": [4, 7], "x": 7.25, "y": 4},
+                {"matrix": [4, 8], "x": 8.25, "y": 4},
+                {"matrix": [4, 9], "x": 9.25, "y": 4},
+                {"matrix": [4, 10], "x": 10.25, "y": 4},
+                {"matrix": [4, 11], "x": 11.25, "y": 4},
+                {"matrix": [4, 13], "x": 12.25, "y": 4, "w": 1.75},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4},
+
+                {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
+                {"matrix": [5, 3], "x": 2.5, "y": 5, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5},
+                {"matrix": [5, 11], "x": 11, "y": 5},
+                {"matrix": [5, 12], "x": 12, "y": 5},
+                {"matrix": [5, 13], "x": 13, "y": 5},
+                {"matrix": [5, 14], "x": 14, "y": 5},
+                {"matrix": [5, 15], "x": 15, "y": 5}
+            ]
+        },
+        "LAYOUT_75_iso_rwkl": {
+            "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, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "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": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+                {"matrix": [1, 12], "x": 12, "y": 1},
+                {"matrix": [1, 14], "x": 13, "y": 1, "w": 2},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [2, 2], "x": 1.5, "y": 2},
+                {"matrix": [2, 3], "x": 2.5, "y": 2},
+                {"matrix": [2, 4], "x": 3.5, "y": 2},
+                {"matrix": [2, 5], "x": 4.5, "y": 2},
+                {"matrix": [2, 6], "x": 5.5, "y": 2},
+                {"matrix": [2, 7], "x": 6.5, "y": 2},
+                {"matrix": [2, 8], "x": 7.5, "y": 2},
+                {"matrix": [2, 9], "x": 8.5, "y": 2},
+                {"matrix": [2, 10], "x": 9.5, "y": 2},
+                {"matrix": [2, 11], "x": 10.5, "y": 2},
+                {"matrix": [2, 12], "x": 11.5, "y": 2},
+                {"matrix": [2, 13], "x": 12.5, "y": 2},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+                {"matrix": [3, 2], "x": 1.75, "y": 3},
+                {"matrix": [3, 3], "x": 2.75, "y": 3},
+                {"matrix": [3, 4], "x": 3.75, "y": 3},
+                {"matrix": [3, 5], "x": 4.75, "y": 3},
+                {"matrix": [3, 6], "x": 5.75, "y": 3},
+                {"matrix": [3, 7], "x": 6.75, "y": 3},
+                {"matrix": [3, 8], "x": 7.75, "y": 3},
+                {"matrix": [3, 9], "x": 8.75, "y": 3},
+                {"matrix": [3, 10], "x": 9.75, "y": 3},
+                {"matrix": [3, 11], "x": 10.75, "y": 3},
+                {"matrix": [3, 12], "x": 11.75, "y": 3},
+                {"matrix": [2, 14], "x": 12.75, "y": 3},
+                {"matrix": [3, 13], "x": 13.75, "y": 2, "w": 1.25, "h": 2},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4},
+                {"matrix": [4, 2], "x": 2.25, "y": 4},
+                {"matrix": [4, 3], "x": 3.25, "y": 4},
+                {"matrix": [4, 4], "x": 4.25, "y": 4},
+                {"matrix": [4, 5], "x": 5.25, "y": 4},
+                {"matrix": [4, 6], "x": 6.25, "y": 4},
+                {"matrix": [4, 7], "x": 7.25, "y": 4},
+                {"matrix": [4, 8], "x": 8.25, "y": 4},
+                {"matrix": [4, 9], "x": 9.25, "y": 4},
+                {"matrix": [4, 10], "x": 10.25, "y": 4},
+                {"matrix": [4, 11], "x": 11.25, "y": 4},
+                {"matrix": [4, 13], "x": 12.25, "y": 4, "w": 1.75},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4},
+
+                {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
+                {"matrix": [5, 3], "x": 2.5, "y": 5, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5, "w": 1.5},
+                {"matrix": [5, 12], "x": 11.5, "y": 5, "w": 1.5},
+                {"matrix": [5, 13], "x": 13, "y": 5},
+                {"matrix": [5, 14], "x": 14, "y": 5},
+                {"matrix": [5, 15], "x": 15, "y": 5}
+            ]
+        },
+        "LAYOUT_75_iso_rwkl_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, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "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": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+                {"matrix": [1, 12], "x": 12, "y": 1},
+                {"matrix": [1, 13], "x": 13, "y": 1},
+                {"matrix": [1, 14], "x": 14, "y": 1},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [2, 2], "x": 1.5, "y": 2},
+                {"matrix": [2, 3], "x": 2.5, "y": 2},
+                {"matrix": [2, 4], "x": 3.5, "y": 2},
+                {"matrix": [2, 5], "x": 4.5, "y": 2},
+                {"matrix": [2, 6], "x": 5.5, "y": 2},
+                {"matrix": [2, 7], "x": 6.5, "y": 2},
+                {"matrix": [2, 8], "x": 7.5, "y": 2},
+                {"matrix": [2, 9], "x": 8.5, "y": 2},
+                {"matrix": [2, 10], "x": 9.5, "y": 2},
+                {"matrix": [2, 11], "x": 10.5, "y": 2},
+                {"matrix": [2, 12], "x": 11.5, "y": 2},
+                {"matrix": [2, 13], "x": 12.5, "y": 2},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+                {"matrix": [3, 2], "x": 1.75, "y": 3},
+                {"matrix": [3, 3], "x": 2.75, "y": 3},
+                {"matrix": [3, 4], "x": 3.75, "y": 3},
+                {"matrix": [3, 5], "x": 4.75, "y": 3},
+                {"matrix": [3, 6], "x": 5.75, "y": 3},
+                {"matrix": [3, 7], "x": 6.75, "y": 3},
+                {"matrix": [3, 8], "x": 7.75, "y": 3},
+                {"matrix": [3, 9], "x": 8.75, "y": 3},
+                {"matrix": [3, 10], "x": 9.75, "y": 3},
+                {"matrix": [3, 11], "x": 10.75, "y": 3},
+                {"matrix": [3, 12], "x": 11.75, "y": 3},
+                {"matrix": [2, 14], "x": 12.75, "y": 3},
+                {"matrix": [3, 13], "x": 13.75, "y": 2, "w": 1.25, "h": 2},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4},
+                {"matrix": [4, 2], "x": 2.25, "y": 4},
+                {"matrix": [4, 3], "x": 3.25, "y": 4},
+                {"matrix": [4, 4], "x": 4.25, "y": 4},
+                {"matrix": [4, 5], "x": 5.25, "y": 4},
+                {"matrix": [4, 6], "x": 6.25, "y": 4},
+                {"matrix": [4, 7], "x": 7.25, "y": 4},
+                {"matrix": [4, 8], "x": 8.25, "y": 4},
+                {"matrix": [4, 9], "x": 9.25, "y": 4},
+                {"matrix": [4, 10], "x": 10.25, "y": 4},
+                {"matrix": [4, 11], "x": 11.25, "y": 4},
+                {"matrix": [4, 13], "x": 12.25, "y": 4, "w": 1.75},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4},
+
+                {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
+                {"matrix": [5, 3], "x": 2.5, "y": 5, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5, "w": 1.5},
+                {"matrix": [5, 12], "x": 11.5, "y": 5, "w": 1.5},
+                {"matrix": [5, 13], "x": 13, "y": 5},
+                {"matrix": [5, 14], "x": 14, "y": 5},
+                {"matrix": [5, 15], "x": 15, "y": 5}
+            ]
+        },
+        "LAYOUT_75_iso_wkl": {
+            "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, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "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": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+                {"matrix": [1, 12], "x": 12, "y": 1},
+                {"matrix": [1, 14], "x": 13, "y": 1, "w": 2},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [2, 2], "x": 1.5, "y": 2},
+                {"matrix": [2, 3], "x": 2.5, "y": 2},
+                {"matrix": [2, 4], "x": 3.5, "y": 2},
+                {"matrix": [2, 5], "x": 4.5, "y": 2},
+                {"matrix": [2, 6], "x": 5.5, "y": 2},
+                {"matrix": [2, 7], "x": 6.5, "y": 2},
+                {"matrix": [2, 8], "x": 7.5, "y": 2},
+                {"matrix": [2, 9], "x": 8.5, "y": 2},
+                {"matrix": [2, 10], "x": 9.5, "y": 2},
+                {"matrix": [2, 11], "x": 10.5, "y": 2},
+                {"matrix": [2, 12], "x": 11.5, "y": 2},
+                {"matrix": [2, 13], "x": 12.5, "y": 2},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+                {"matrix": [3, 2], "x": 1.75, "y": 3},
+                {"matrix": [3, 3], "x": 2.75, "y": 3},
+                {"matrix": [3, 4], "x": 3.75, "y": 3},
+                {"matrix": [3, 5], "x": 4.75, "y": 3},
+                {"matrix": [3, 6], "x": 5.75, "y": 3},
+                {"matrix": [3, 7], "x": 6.75, "y": 3},
+                {"matrix": [3, 8], "x": 7.75, "y": 3},
+                {"matrix": [3, 9], "x": 8.75, "y": 3},
+                {"matrix": [3, 10], "x": 9.75, "y": 3},
+                {"matrix": [3, 11], "x": 10.75, "y": 3},
+                {"matrix": [3, 12], "x": 11.75, "y": 3},
+                {"matrix": [2, 14], "x": 12.75, "y": 3},
+                {"matrix": [3, 13], "x": 13.75, "y": 2, "w": 1.25, "h": 2},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4},
+                {"matrix": [4, 2], "x": 2.25, "y": 4},
+                {"matrix": [4, 3], "x": 3.25, "y": 4},
+                {"matrix": [4, 4], "x": 4.25, "y": 4},
+                {"matrix": [4, 5], "x": 5.25, "y": 4},
+                {"matrix": [4, 6], "x": 6.25, "y": 4},
+                {"matrix": [4, 7], "x": 7.25, "y": 4},
+                {"matrix": [4, 8], "x": 8.25, "y": 4},
+                {"matrix": [4, 9], "x": 9.25, "y": 4},
+                {"matrix": [4, 10], "x": 10.25, "y": 4},
+                {"matrix": [4, 11], "x": 11.25, "y": 4},
+                {"matrix": [4, 13], "x": 12.25, "y": 4, "w": 1.75},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4},
+
+                {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.5},
+                {"matrix": [5, 1], "x": 1.5, "y": 5, "w": 1.5},
+                {"matrix": [5, 6], "x": 3, "y": 5, "w": 7},
+                {"matrix": [5, 10], "x": 10, "y": 5, "w": 1.5},
+                {"matrix": [5, 12], "x": 11.5, "y": 5, "w": 1.5},
+                {"matrix": [5, 13], "x": 13, "y": 5},
+                {"matrix": [5, 14], "x": 14, "y": 5},
+                {"matrix": [5, 15], "x": 15, "y": 5}
+            ]
+        },
+        "LAYOUT_75_iso_wkl_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, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "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": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+                {"matrix": [1, 12], "x": 12, "y": 1},
+                {"matrix": [1, 13], "x": 13, "y": 1},
+                {"matrix": [1, 14], "x": 14, "y": 1},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [2, 2], "x": 1.5, "y": 2},
+                {"matrix": [2, 3], "x": 2.5, "y": 2},
+                {"matrix": [2, 4], "x": 3.5, "y": 2},
+                {"matrix": [2, 5], "x": 4.5, "y": 2},
+                {"matrix": [2, 6], "x": 5.5, "y": 2},
+                {"matrix": [2, 7], "x": 6.5, "y": 2},
+                {"matrix": [2, 8], "x": 7.5, "y": 2},
+                {"matrix": [2, 9], "x": 8.5, "y": 2},
+                {"matrix": [2, 10], "x": 9.5, "y": 2},
+                {"matrix": [2, 11], "x": 10.5, "y": 2},
+                {"matrix": [2, 12], "x": 11.5, "y": 2},
+                {"matrix": [2, 13], "x": 12.5, "y": 2},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+                {"matrix": [3, 2], "x": 1.75, "y": 3},
+                {"matrix": [3, 3], "x": 2.75, "y": 3},
+                {"matrix": [3, 4], "x": 3.75, "y": 3},
+                {"matrix": [3, 5], "x": 4.75, "y": 3},
+                {"matrix": [3, 6], "x": 5.75, "y": 3},
+                {"matrix": [3, 7], "x": 6.75, "y": 3},
+                {"matrix": [3, 8], "x": 7.75, "y": 3},
+                {"matrix": [3, 9], "x": 8.75, "y": 3},
+                {"matrix": [3, 10], "x": 9.75, "y": 3},
+                {"matrix": [3, 11], "x": 10.75, "y": 3},
+                {"matrix": [3, 12], "x": 11.75, "y": 3},
+                {"matrix": [2, 14], "x": 12.75, "y": 3},
+                {"matrix": [3, 13], "x": 13.75, "y": 2, "w": 1.25, "h": 2},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4},
+                {"matrix": [4, 2], "x": 2.25, "y": 4},
+                {"matrix": [4, 3], "x": 3.25, "y": 4},
+                {"matrix": [4, 4], "x": 4.25, "y": 4},
+                {"matrix": [4, 5], "x": 5.25, "y": 4},
+                {"matrix": [4, 6], "x": 6.25, "y": 4},
+                {"matrix": [4, 7], "x": 7.25, "y": 4},
+                {"matrix": [4, 8], "x": 8.25, "y": 4},
+                {"matrix": [4, 9], "x": 9.25, "y": 4},
+                {"matrix": [4, 10], "x": 10.25, "y": 4},
+                {"matrix": [4, 11], "x": 11.25, "y": 4},
+                {"matrix": [4, 13], "x": 12.25, "y": 4, "w": 1.75},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4},
+
+                {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.5},
+                {"matrix": [5, 1], "x": 1.5, "y": 5, "w": 1.5},
+                {"matrix": [5, 6], "x": 3, "y": 5, "w": 7},
+                {"matrix": [5, 10], "x": 10, "y": 5, "w": 1.5},
+                {"matrix": [5, 12], "x": 11.5, "y": 5, "w": 1.5},
+                {"matrix": [5, 13], "x": 13, "y": 5},
+                {"matrix": [5, 14], "x": 14, "y": 5},
+                {"matrix": [5, 15], "x": 15, "y": 5}
+            ]
+        },
+        "LAYOUT_numpad": {
+            "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, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "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": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+                {"matrix": [1, 12], "x": 12, "y": 1},
+                {"matrix": [1, 13], "x": 13, "y": 1},
+                {"matrix": [1, 14], "x": 14, "y": 1},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [2, 2], "x": 1.5, "y": 2},
+                {"matrix": [2, 3], "x": 2.5, "y": 2},
+                {"matrix": [2, 4], "x": 3.5, "y": 2},
+                {"matrix": [2, 5], "x": 4.5, "y": 2},
+                {"matrix": [2, 6], "x": 5.5, "y": 2},
+                {"matrix": [2, 7], "x": 6.5, "y": 2},
+                {"matrix": [2, 8], "x": 7.5, "y": 2},
+                {"matrix": [2, 9], "x": 8.5, "y": 2},
+                {"matrix": [2, 10], "x": 9.5, "y": 2},
+                {"matrix": [2, 11], "x": 10.5, "y": 2},
+                {"matrix": [2, 12], "x": 11.5, "y": 2, "w": 1.5},
+                {"matrix": [2, 13], "x": 13, "y": 2},
+                {"matrix": [2, 14], "x": 14, "y": 2},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+                {"matrix": [3, 2], "x": 1.75, "y": 3},
+                {"matrix": [3, 3], "x": 2.75, "y": 3},
+                {"matrix": [3, 4], "x": 3.75, "y": 3},
+                {"matrix": [3, 5], "x": 4.75, "y": 3},
+                {"matrix": [3, 6], "x": 5.75, "y": 3},
+                {"matrix": [3, 7], "x": 6.75, "y": 3},
+                {"matrix": [3, 8], "x": 7.75, "y": 3},
+                {"matrix": [3, 9], "x": 8.75, "y": 3},
+                {"matrix": [3, 10], "x": 9.75, "y": 3},
+                {"matrix": [3, 11], "x": 10.75, "y": 3, "w": 2.25},
+                {"matrix": [3, 12], "x": 13, "y": 3},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4},
+                {"matrix": [4, 2], "x": 2.25, "y": 4},
+                {"matrix": [4, 3], "x": 3.25, "y": 4},
+                {"matrix": [4, 4], "x": 4.25, "y": 4},
+                {"matrix": [4, 5], "x": 5.25, "y": 4},
+                {"matrix": [4, 6], "x": 6.25, "y": 4},
+                {"matrix": [4, 7], "x": 7.25, "y": 4},
+                {"matrix": [4, 8], "x": 8.25, "y": 4},
+                {"matrix": [4, 9], "x": 9.25, "y": 4},
+                {"matrix": [4, 10], "x": 10.25, "y": 4, "w": 1.75},
+                {"matrix": [4, 11], "x": 12, "y": 4},
+                {"matrix": [4, 13], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4},
+
+                {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
+                {"matrix": [5, 3], "x": 2.5, "y": 5, "w": 1.25},
+                {"matrix": [5, 4], "x": 3.75, "y": 5, "w": 1.25},
+                {"matrix": [5, 6], "x": 5, "y": 5, "w": 2.25},
+                {"matrix": [5, 8], "x": 7.25, "y": 5, "w": 1.75},
+                {"matrix": [5, 9], "x": 9, "y": 5},
+                {"matrix": [5, 10], "x": 10, "y": 5},
+                {"matrix": [5, 11], "x": 11, "y": 5},
+                {"matrix": [5, 12], "x": 12, "y": 5},
+                {"matrix": [5, 13], "x": 13, "y": 5},
+                {"matrix": [5, 14], "x": 14, "y": 5},
+                {"matrix": [5, 15], "x": 15, "y": 5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/kbdfans/kbd75/rev2/rules.mk b/keyboards/kbdfans/kbd75/rev2/rules.mk
deleted file mode 100644
index 3d5cb57ad50..00000000000
--- a/keyboards/kbdfans/kbd75/rev2/rules.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
diff --git a/keyboards/kbdfans/niu_mini/info.json b/keyboards/kbdfans/niu_mini/info.json
deleted file mode 100644
index 32ecfd33c64..00000000000
--- a/keyboards/kbdfans/niu_mini/info.json
+++ /dev/null
@@ -1,157 +0,0 @@
-{
-    "keyboard_name": "NIU Mini",
-    "manufacturer": "KBDFans",
-    "url": "",
-    "maintainer": "qmk",
-    "usb": {
-        "vid": "0x6E6D",
-        "pid": "0x0001",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "B3", "B1", "B0", "D5", "B7", "C7"],
-        "rows": ["D0", "D1", "D2", "D3"]
-    },
-    "diode_direction": "COL2ROW",
-    "backlight": {
-        "pin": "B6",
-        "levels": 4
-    },
-    "rgblight": {
-        "saturation_steps": 8,
-        "brightness_steps": 8,
-        "led_count": 14,
-        "animations": {
-            "breathing": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "snake": true,
-            "knight": true,
-            "christmas": true,
-            "static_gradient": true,
-            "rgb_test": true,
-            "alternating": true,
-            "twinkle": true
-        }
-    },
-    "ws2812": {
-        "pin": "E2"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "community_layouts": ["ortho_4x12", "planck_mit"],
-    "layout_aliases": {
-        "LAYOUT": "LAYOUT_ortho_4x12"
-    },
-    "layouts": {
-        "LAYOUT_ortho_4x12": {
-            "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": [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": [1, 4], "x": 4, "y": 1},
-                {"matrix": [1, 5], "x": 5, "y": 1},
-                {"matrix": [1, 6], "x": 6, "y": 1},
-                {"matrix": [1, 7], "x": 7, "y": 1},
-                {"matrix": [1, 8], "x": 8, "y": 1},
-                {"matrix": [1, 9], "x": 9, "y": 1},
-                {"matrix": [1, 10], "x": 10, "y": 1},
-                {"matrix": [1, 11], "x": 11, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2},
-                {"matrix": [2, 1], "x": 1, "y": 2},
-                {"matrix": [2, 2], "x": 2, "y": 2},
-                {"matrix": [2, 3], "x": 3, "y": 2},
-                {"matrix": [2, 4], "x": 4, "y": 2},
-                {"matrix": [2, 5], "x": 5, "y": 2},
-                {"matrix": [2, 6], "x": 6, "y": 2},
-                {"matrix": [2, 7], "x": 7, "y": 2},
-                {"matrix": [2, 8], "x": 8, "y": 2},
-                {"matrix": [2, 9], "x": 9, "y": 2},
-                {"matrix": [2, 10], "x": 10, "y": 2},
-                {"matrix": [2, 11], "x": 11, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3},
-                {"matrix": [3, 1], "x": 1, "y": 3},
-                {"matrix": [3, 2], "x": 2, "y": 3},
-                {"matrix": [3, 3], "x": 3, "y": 3},
-                {"matrix": [3, 4], "x": 4, "y": 3},
-                {"matrix": [3, 5], "x": 5, "y": 3},
-                {"matrix": [3, 6], "x": 6, "y": 3},
-                {"matrix": [3, 7], "x": 7, "y": 3},
-                {"matrix": [3, 8], "x": 8, "y": 3},
-                {"matrix": [3, 9], "x": 9, "y": 3},
-                {"matrix": [3, 10], "x": 10, "y": 3},
-                {"matrix": [3, 11], "x": 11, "y": 3}
-            ]
-        },
-        "LAYOUT_planck_mit": {
-            "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": [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": [1, 4], "x": 4, "y": 1},
-                {"matrix": [1, 5], "x": 5, "y": 1},
-                {"matrix": [1, 6], "x": 6, "y": 1},
-                {"matrix": [1, 7], "x": 7, "y": 1},
-                {"matrix": [1, 8], "x": 8, "y": 1},
-                {"matrix": [1, 9], "x": 9, "y": 1},
-                {"matrix": [1, 10], "x": 10, "y": 1},
-                {"matrix": [1, 11], "x": 11, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2},
-                {"matrix": [2, 1], "x": 1, "y": 2},
-                {"matrix": [2, 2], "x": 2, "y": 2},
-                {"matrix": [2, 3], "x": 3, "y": 2},
-                {"matrix": [2, 4], "x": 4, "y": 2},
-                {"matrix": [2, 5], "x": 5, "y": 2},
-                {"matrix": [2, 6], "x": 6, "y": 2},
-                {"matrix": [2, 7], "x": 7, "y": 2},
-                {"matrix": [2, 8], "x": 8, "y": 2},
-                {"matrix": [2, 9], "x": 9, "y": 2},
-                {"matrix": [2, 10], "x": 10, "y": 2},
-                {"matrix": [2, 11], "x": 11, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3},
-                {"matrix": [3, 1], "x": 1, "y": 3},
-                {"matrix": [3, 2], "x": 2, "y": 3},
-                {"matrix": [3, 3], "x": 3, "y": 3},
-                {"matrix": [3, 4], "x": 4, "y": 3},
-                {"matrix": [3, 5], "x": 5, "y": 3, "w": 2},
-                {"matrix": [3, 7], "x": 7, "y": 3},
-                {"matrix": [3, 8], "x": 8, "y": 3},
-                {"matrix": [3, 9], "x": 9, "y": 3},
-                {"matrix": [3, 10], "x": 10, "y": 3},
-                {"matrix": [3, 11], "x": 11, "y": 3}
-            ]
-        }
-    }
-}
diff --git a/keyboards/kbdfans/niu_mini/keyboard.json b/keyboards/kbdfans/niu_mini/keyboard.json
new file mode 100644
index 00000000000..d4918e7713e
--- /dev/null
+++ b/keyboards/kbdfans/niu_mini/keyboard.json
@@ -0,0 +1,166 @@
+{
+    "keyboard_name": "NIU Mini",
+    "manufacturer": "KBDFans",
+    "url": "",
+    "maintainer": "qmk",
+    "usb": {
+        "vid": "0x6E6D",
+        "pid": "0x0001",
+        "device_version": "0.0.1"
+    },
+    "matrix_pins": {
+        "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "B3", "B1", "B0", "D5", "B7", "C7"],
+        "rows": ["D0", "D1", "D2", "D3"]
+    },
+    "diode_direction": "COL2ROW",
+    "backlight": {
+        "pin": "B6",
+        "levels": 4
+    },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 14,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": true,
+            "twinkle": true
+        }
+    },
+    "ws2812": {
+        "pin": "E2"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": false,
+        "mousekey": true,
+        "extrakey": true,
+        "console": true,
+        "nkro": true,
+        "backlight": true,
+        "rgblight": true
+    },
+    "community_layouts": ["ortho_4x12", "planck_mit"],
+    "layout_aliases": {
+        "LAYOUT": "LAYOUT_ortho_4x12"
+    },
+    "layouts": {
+        "LAYOUT_ortho_4x12": {
+            "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": [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": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [2, 6], "x": 6, "y": 2},
+                {"matrix": [2, 7], "x": 7, "y": 2},
+                {"matrix": [2, 8], "x": 8, "y": 2},
+                {"matrix": [2, 9], "x": 9, "y": 2},
+                {"matrix": [2, 10], "x": 10, "y": 2},
+                {"matrix": [2, 11], "x": 11, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
+                {"matrix": [3, 6], "x": 6, "y": 3},
+                {"matrix": [3, 7], "x": 7, "y": 3},
+                {"matrix": [3, 8], "x": 8, "y": 3},
+                {"matrix": [3, 9], "x": 9, "y": 3},
+                {"matrix": [3, 10], "x": 10, "y": 3},
+                {"matrix": [3, 11], "x": 11, "y": 3}
+            ]
+        },
+        "LAYOUT_planck_mit": {
+            "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": [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": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [2, 6], "x": 6, "y": 2},
+                {"matrix": [2, 7], "x": 7, "y": 2},
+                {"matrix": [2, 8], "x": 8, "y": 2},
+                {"matrix": [2, 9], "x": 9, "y": 2},
+                {"matrix": [2, 10], "x": 10, "y": 2},
+                {"matrix": [2, 11], "x": 11, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3, "w": 2},
+                {"matrix": [3, 7], "x": 7, "y": 3},
+                {"matrix": [3, 8], "x": 8, "y": 3},
+                {"matrix": [3, 9], "x": 9, "y": 3},
+                {"matrix": [3, 10], "x": 10, "y": 3},
+                {"matrix": [3, 11], "x": 11, "y": 3}
+            ]
+        }
+    }
+}
diff --git a/keyboards/kbdfans/niu_mini/rules.mk b/keyboards/kbdfans/niu_mini/rules.mk
index dfaed88540e..4df55cd2206 100644
--- a/keyboards/kbdfans/niu_mini/rules.mk
+++ b/keyboards/kbdfans/niu_mini/rules.mk
@@ -1,16 +1,3 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = yes        # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
-AUDIO_ENABLE = no           # Audio output
-RGBLIGHT_ENABLE = yes       # Enable WS2812 RGB underlight.
-
 # Disable unsupported hardware
 AUDIO_SUPPORTED = no
 BACKLIGHT_SUPPORTED = no
diff --git a/keyboards/kbdfans/odin75/info.json b/keyboards/kbdfans/odin75/keyboard.json
similarity index 100%
rename from keyboards/kbdfans/odin75/info.json
rename to keyboards/kbdfans/odin75/keyboard.json
diff --git a/keyboards/kbdmania/kmac/info.json b/keyboards/kbdmania/kmac/info.json
deleted file mode 100644
index 0ec6f0b2a99..00000000000
--- a/keyboards/kbdmania/kmac/info.json
+++ /dev/null
@@ -1,228 +0,0 @@
-{
-  "keyboard_name": "KMAC",
-  "manufacturer": "KBDMania",
-  "maintainer": "qmk",
-  "usb": {
-    "vid": "0x4B4D",
-    "pid": "0x4143",
-    "device_version": "1.0.4"
-  },
-  "backlight": {
-    "driver": "custom"
-  },
-  "indicators": {
-    "caps_lock": "B0",
-    "scroll_lock": "E6",
-    "on_state": 0
-  },
-  "processor": "atmega32u4",
-  "bootloader": "atmel-dfu",
-  "community_layouts": ["tkl_ansi"],
-  "layouts": {
-    "LAYOUT_tkl_ansi": {
-      "layout": [
-        {"matrix": [0, 0], "x": 0, "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.5, "y": 0},
-        {"matrix": [0, 7], "x": 7.5, "y": 0},
-        {"matrix": [0, 8], "x": 8.5, "y": 0},
-        {"matrix": [0, 9], "x": 9.5, "y": 0},
-
-        {"matrix": [0, 10], "x": 11, "y": 0},
-        {"matrix": [0, 11], "x": 12, "y": 0},
-        {"matrix": [0, 12], "x": 13, "y": 0},
-        {"matrix": [0, 13], "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.5},
-        {"matrix": [1, 1], "x": 1, "y": 1.5},
-        {"matrix": [1, 2], "x": 2, "y": 1.5},
-        {"matrix": [1, 3], "x": 3, "y": 1.5},
-        {"matrix": [1, 4], "x": 4, "y": 1.5},
-        {"matrix": [1, 5], "x": 5, "y": 1.5},
-        {"matrix": [1, 6], "x": 6, "y": 1.5},
-        {"matrix": [1, 7], "x": 7, "y": 1.5},
-        {"matrix": [1, 8], "x": 8, "y": 1.5},
-        {"matrix": [1, 9], "x": 9, "y": 1.5},
-        {"matrix": [1, 10], "x": 10, "y": 1.5},
-        {"matrix": [1, 11], "x": 11, "y": 1.5},
-        {"matrix": [1, 12], "x": 12, "y": 1.5},
-        {"matrix": [1, 13], "x": 13, "y": 1.5, "w": 2},
-
-        {"matrix": [1, 14], "x": 15.25, "y": 1.5},
-        {"matrix": [1, 15], "x": 16.25, "y": 1.5},
-        {"matrix": [1, 16], "x": 17.25, "y": 1.5},
-
-        {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
-        {"matrix": [2, 1], "x": 1.5, "y": 2.5},
-        {"matrix": [2, 2], "x": 2.5, "y": 2.5},
-        {"matrix": [2, 3], "x": 3.5, "y": 2.5},
-        {"matrix": [2, 4], "x": 4.5, "y": 2.5},
-        {"matrix": [2, 5], "x": 5.5, "y": 2.5},
-        {"matrix": [2, 6], "x": 6.5, "y": 2.5},
-        {"matrix": [2, 7], "x": 7.5, "y": 2.5},
-        {"matrix": [2, 8], "x": 8.5, "y": 2.5},
-        {"matrix": [2, 9], "x": 9.5, "y": 2.5},
-        {"matrix": [2, 10], "x": 10.5, "y": 2.5},
-        {"matrix": [2, 11], "x": 11.5, "y": 2.5},
-        {"matrix": [2, 12], "x": 12.5, "y": 2.5},
-        {"matrix": [2, 13], "x": 13.5, "y": 2.5, "w": 1.5},
-
-        {"matrix": [2, 14], "x": 15.25, "y": 2.5},
-        {"matrix": [2, 15], "x": 16.25, "y": 2.5},
-        {"matrix": [2, 16], "x": 17.25, "y": 2.5},
-
-        {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
-        {"matrix": [3, 1], "x": 1.75, "y": 3.5},
-        {"matrix": [3, 2], "x": 2.75, "y": 3.5},
-        {"matrix": [3, 3], "x": 3.75, "y": 3.5},
-        {"matrix": [3, 4], "x": 4.75, "y": 3.5},
-        {"matrix": [3, 5], "x": 5.75, "y": 3.5},
-        {"matrix": [3, 6], "x": 6.75, "y": 3.5},
-        {"matrix": [3, 7], "x": 7.75, "y": 3.5},
-        {"matrix": [3, 8], "x": 8.75, "y": 3.5},
-        {"matrix": [3, 9], "x": 9.75, "y": 3.5},
-        {"matrix": [3, 10], "x": 10.75, "y": 3.5},
-        {"matrix": [3, 11], "x": 11.75, "y": 3.5},
-        {"matrix": [3, 13], "x": 12.75, "y": 3.5, "w": 2.25},
-
-        {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
-        {"matrix": [4, 1], "x": 2.25, "y": 4.5},
-        {"matrix": [4, 2], "x": 3.25, "y": 4.5},
-        {"matrix": [4, 3], "x": 4.25, "y": 4.5},
-        {"matrix": [4, 4], "x": 5.25, "y": 4.5},
-        {"matrix": [4, 5], "x": 6.25, "y": 4.5},
-        {"matrix": [4, 6], "x": 7.25, "y": 4.5},
-        {"matrix": [4, 7], "x": 8.25, "y": 4.5},
-        {"matrix": [4, 8], "x": 9.25, "y": 4.5},
-        {"matrix": [4, 9], "x": 10.25, "y": 4.5},
-        {"matrix": [4, 10], "x": 11.25, "y": 4.5},
-        {"matrix": [4, 13], "x": 12.25, "y": 4.5, "w": 2.75},
-
-        {"matrix": [4, 15], "x": 16.25, "y": 4.5},
-
-        {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25},
-        {"matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25},
-        {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25},
-        {"matrix": [5, 5], "x": 3.75, "y": 5.5, "w": 6.25},
-        {"matrix": [5, 8], "x": 10, "y": 5.5, "w": 1.25},
-        {"matrix": [5, 10], "x": 11.25, "y": 5.5, "w": 1.25},
-        {"matrix": [5, 12], "x": 12.5, "y": 5.5, "w": 1.25},
-        {"matrix": [5, 13], "x": 13.75, "y": 5.5, "w": 1.25},
-
-        {"matrix": [5, 14], "x": 15.25, "y": 5.5},
-        {"matrix": [5, 15], "x": 16.25, "y": 5.5},
-        {"matrix": [5, 16], "x": 17.25, "y": 5.5}
-      ]
-    },
-    "LAYOUT_tkl_ansi_wkl": {
-      "layout": [
-        {"matrix": [0, 0], "x": 0, "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.5, "y": 0},
-        {"matrix": [0, 7], "x": 7.5, "y": 0},
-        {"matrix": [0, 8], "x": 8.5, "y": 0},
-        {"matrix": [0, 9], "x": 9.5, "y": 0},
-
-        {"matrix": [0, 10], "x": 11, "y": 0},
-        {"matrix": [0, 11], "x": 12, "y": 0},
-        {"matrix": [0, 12], "x": 13, "y": 0},
-        {"matrix": [0, 13], "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.5},
-        {"matrix": [1, 1], "x": 1, "y": 1.5},
-        {"matrix": [1, 2], "x": 2, "y": 1.5},
-        {"matrix": [1, 3], "x": 3, "y": 1.5},
-        {"matrix": [1, 4], "x": 4, "y": 1.5},
-        {"matrix": [1, 5], "x": 5, "y": 1.5},
-        {"matrix": [1, 6], "x": 6, "y": 1.5},
-        {"matrix": [1, 7], "x": 7, "y": 1.5},
-        {"matrix": [1, 8], "x": 8, "y": 1.5},
-        {"matrix": [1, 9], "x": 9, "y": 1.5},
-        {"matrix": [1, 10], "x": 10, "y": 1.5},
-        {"matrix": [1, 11], "x": 11, "y": 1.5},
-        {"matrix": [1, 12], "x": 12, "y": 1.5},
-        {"matrix": [1, 13], "x": 13, "y": 1.5, "w": 2},
-
-        {"matrix": [1, 14], "x": 15.25, "y": 1.5},
-        {"matrix": [1, 15], "x": 16.25, "y": 1.5},
-        {"matrix": [1, 16], "x": 17.25, "y": 1.5},
-
-        {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
-        {"matrix": [2, 1], "x": 1.5, "y": 2.5},
-        {"matrix": [2, 2], "x": 2.5, "y": 2.5},
-        {"matrix": [2, 3], "x": 3.5, "y": 2.5},
-        {"matrix": [2, 4], "x": 4.5, "y": 2.5},
-        {"matrix": [2, 5], "x": 5.5, "y": 2.5},
-        {"matrix": [2, 6], "x": 6.5, "y": 2.5},
-        {"matrix": [2, 7], "x": 7.5, "y": 2.5},
-        {"matrix": [2, 8], "x": 8.5, "y": 2.5},
-        {"matrix": [2, 9], "x": 9.5, "y": 2.5},
-        {"matrix": [2, 10], "x": 10.5, "y": 2.5},
-        {"matrix": [2, 11], "x": 11.5, "y": 2.5},
-        {"matrix": [2, 12], "x": 12.5, "y": 2.5},
-        {"matrix": [2, 13], "x": 13.5, "y": 2.5, "w": 1.5},
-
-        {"matrix": [2, 14], "x": 15.25, "y": 2.5},
-        {"matrix": [2, 15], "x": 16.25, "y": 2.5},
-        {"matrix": [2, 16], "x": 17.25, "y": 2.5},
-
-        {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
-        {"matrix": [3, 1], "x": 1.75, "y": 3.5},
-        {"matrix": [3, 2], "x": 2.75, "y": 3.5},
-        {"matrix": [3, 3], "x": 3.75, "y": 3.5},
-        {"matrix": [3, 4], "x": 4.75, "y": 3.5},
-        {"matrix": [3, 5], "x": 5.75, "y": 3.5},
-        {"matrix": [3, 6], "x": 6.75, "y": 3.5},
-        {"matrix": [3, 7], "x": 7.75, "y": 3.5},
-        {"matrix": [3, 8], "x": 8.75, "y": 3.5},
-        {"matrix": [3, 9], "x": 9.75, "y": 3.5},
-        {"matrix": [3, 10], "x": 10.75, "y": 3.5},
-        {"matrix": [3, 11], "x": 11.75, "y": 3.5},
-        {"matrix": [3, 13], "x": 12.75, "y": 3.5, "w": 2.25},
-
-        {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
-        {"matrix": [4, 1], "x": 2.25, "y": 4.5},
-        {"matrix": [4, 2], "x": 3.25, "y": 4.5},
-        {"matrix": [4, 3], "x": 4.25, "y": 4.5},
-        {"matrix": [4, 4], "x": 5.25, "y": 4.5},
-        {"matrix": [4, 5], "x": 6.25, "y": 4.5},
-        {"matrix": [4, 6], "x": 7.25, "y": 4.5},
-        {"matrix": [4, 7], "x": 8.25, "y": 4.5},
-        {"matrix": [4, 8], "x": 9.25, "y": 4.5},
-        {"matrix": [4, 9], "x": 10.25, "y": 4.5},
-        {"matrix": [4, 10], "x": 11.25, "y": 4.5},
-        {"matrix": [4, 13], "x": 12.25, "y": 4.5, "w": 2.75},
-
-        {"matrix": [4, 15], "x": 16.25, "y": 4.5},
-
-        {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.5},
-        {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.5},
-        {"matrix": [5, 5], "x": 4, "y": 5.5, "w": 7},
-        {"matrix": [5, 8], "x": 11, "y": 5.5, "w": 1.5},
-        {"matrix": [5, 13], "x": 13.5, "y": 5.5, "w": 1.5},
-
-        {"matrix": [5, 14], "x": 15.25, "y": 5.5},
-        {"matrix": [5, 15], "x": 16.25, "y": 5.5},
-        {"matrix": [5, 16], "x": 17.25, "y": 5.5}
-      ]
-    }
-  }
-}
diff --git a/keyboards/kbdmania/kmac/keyboard.json b/keyboards/kbdmania/kmac/keyboard.json
new file mode 100644
index 00000000000..c372cb1fc81
--- /dev/null
+++ b/keyboards/kbdmania/kmac/keyboard.json
@@ -0,0 +1,236 @@
+{
+  "keyboard_name": "KMAC",
+  "manufacturer": "KBDMania",
+  "maintainer": "qmk",
+  "usb": {
+    "vid": "0x4B4D",
+    "pid": "0x4143",
+    "device_version": "1.0.4"
+  },
+  "backlight": {
+    "driver": "custom"
+  },
+  "indicators": {
+    "caps_lock": "B0",
+    "scroll_lock": "E6",
+    "on_state": 0
+  },
+  "processor": "atmega32u4",
+  "bootloader": "atmel-dfu",
+  "features": {
+    "bootmagic": true,
+    "mousekey": true,
+    "extrakey": true,
+    "command": true,
+    "nkro": true,
+    "backlight": true
+  },
+  "community_layouts": ["tkl_ansi"],
+  "layouts": {
+    "LAYOUT_tkl_ansi": {
+      "layout": [
+        {"matrix": [0, 0], "x": 0, "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.5, "y": 0},
+        {"matrix": [0, 7], "x": 7.5, "y": 0},
+        {"matrix": [0, 8], "x": 8.5, "y": 0},
+        {"matrix": [0, 9], "x": 9.5, "y": 0},
+
+        {"matrix": [0, 10], "x": 11, "y": 0},
+        {"matrix": [0, 11], "x": 12, "y": 0},
+        {"matrix": [0, 12], "x": 13, "y": 0},
+        {"matrix": [0, 13], "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.5},
+        {"matrix": [1, 1], "x": 1, "y": 1.5},
+        {"matrix": [1, 2], "x": 2, "y": 1.5},
+        {"matrix": [1, 3], "x": 3, "y": 1.5},
+        {"matrix": [1, 4], "x": 4, "y": 1.5},
+        {"matrix": [1, 5], "x": 5, "y": 1.5},
+        {"matrix": [1, 6], "x": 6, "y": 1.5},
+        {"matrix": [1, 7], "x": 7, "y": 1.5},
+        {"matrix": [1, 8], "x": 8, "y": 1.5},
+        {"matrix": [1, 9], "x": 9, "y": 1.5},
+        {"matrix": [1, 10], "x": 10, "y": 1.5},
+        {"matrix": [1, 11], "x": 11, "y": 1.5},
+        {"matrix": [1, 12], "x": 12, "y": 1.5},
+        {"matrix": [1, 13], "x": 13, "y": 1.5, "w": 2},
+
+        {"matrix": [1, 14], "x": 15.25, "y": 1.5},
+        {"matrix": [1, 15], "x": 16.25, "y": 1.5},
+        {"matrix": [1, 16], "x": 17.25, "y": 1.5},
+
+        {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+        {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+        {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+        {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+        {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+        {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+        {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+        {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+        {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+        {"matrix": [2, 9], "x": 9.5, "y": 2.5},
+        {"matrix": [2, 10], "x": 10.5, "y": 2.5},
+        {"matrix": [2, 11], "x": 11.5, "y": 2.5},
+        {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+        {"matrix": [2, 13], "x": 13.5, "y": 2.5, "w": 1.5},
+
+        {"matrix": [2, 14], "x": 15.25, "y": 2.5},
+        {"matrix": [2, 15], "x": 16.25, "y": 2.5},
+        {"matrix": [2, 16], "x": 17.25, "y": 2.5},
+
+        {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+        {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+        {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+        {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+        {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+        {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+        {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+        {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+        {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+        {"matrix": [3, 9], "x": 9.75, "y": 3.5},
+        {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+        {"matrix": [3, 11], "x": 11.75, "y": 3.5},
+        {"matrix": [3, 13], "x": 12.75, "y": 3.5, "w": 2.25},
+
+        {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
+        {"matrix": [4, 1], "x": 2.25, "y": 4.5},
+        {"matrix": [4, 2], "x": 3.25, "y": 4.5},
+        {"matrix": [4, 3], "x": 4.25, "y": 4.5},
+        {"matrix": [4, 4], "x": 5.25, "y": 4.5},
+        {"matrix": [4, 5], "x": 6.25, "y": 4.5},
+        {"matrix": [4, 6], "x": 7.25, "y": 4.5},
+        {"matrix": [4, 7], "x": 8.25, "y": 4.5},
+        {"matrix": [4, 8], "x": 9.25, "y": 4.5},
+        {"matrix": [4, 9], "x": 10.25, "y": 4.5},
+        {"matrix": [4, 10], "x": 11.25, "y": 4.5},
+        {"matrix": [4, 13], "x": 12.25, "y": 4.5, "w": 2.75},
+
+        {"matrix": [4, 15], "x": 16.25, "y": 4.5},
+
+        {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25},
+        {"matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25},
+        {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25},
+        {"matrix": [5, 5], "x": 3.75, "y": 5.5, "w": 6.25},
+        {"matrix": [5, 8], "x": 10, "y": 5.5, "w": 1.25},
+        {"matrix": [5, 10], "x": 11.25, "y": 5.5, "w": 1.25},
+        {"matrix": [5, 12], "x": 12.5, "y": 5.5, "w": 1.25},
+        {"matrix": [5, 13], "x": 13.75, "y": 5.5, "w": 1.25},
+
+        {"matrix": [5, 14], "x": 15.25, "y": 5.5},
+        {"matrix": [5, 15], "x": 16.25, "y": 5.5},
+        {"matrix": [5, 16], "x": 17.25, "y": 5.5}
+      ]
+    },
+    "LAYOUT_tkl_ansi_wkl": {
+      "layout": [
+        {"matrix": [0, 0], "x": 0, "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.5, "y": 0},
+        {"matrix": [0, 7], "x": 7.5, "y": 0},
+        {"matrix": [0, 8], "x": 8.5, "y": 0},
+        {"matrix": [0, 9], "x": 9.5, "y": 0},
+
+        {"matrix": [0, 10], "x": 11, "y": 0},
+        {"matrix": [0, 11], "x": 12, "y": 0},
+        {"matrix": [0, 12], "x": 13, "y": 0},
+        {"matrix": [0, 13], "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.5},
+        {"matrix": [1, 1], "x": 1, "y": 1.5},
+        {"matrix": [1, 2], "x": 2, "y": 1.5},
+        {"matrix": [1, 3], "x": 3, "y": 1.5},
+        {"matrix": [1, 4], "x": 4, "y": 1.5},
+        {"matrix": [1, 5], "x": 5, "y": 1.5},
+        {"matrix": [1, 6], "x": 6, "y": 1.5},
+        {"matrix": [1, 7], "x": 7, "y": 1.5},
+        {"matrix": [1, 8], "x": 8, "y": 1.5},
+        {"matrix": [1, 9], "x": 9, "y": 1.5},
+        {"matrix": [1, 10], "x": 10, "y": 1.5},
+        {"matrix": [1, 11], "x": 11, "y": 1.5},
+        {"matrix": [1, 12], "x": 12, "y": 1.5},
+        {"matrix": [1, 13], "x": 13, "y": 1.5, "w": 2},
+
+        {"matrix": [1, 14], "x": 15.25, "y": 1.5},
+        {"matrix": [1, 15], "x": 16.25, "y": 1.5},
+        {"matrix": [1, 16], "x": 17.25, "y": 1.5},
+
+        {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+        {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+        {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+        {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+        {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+        {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+        {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+        {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+        {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+        {"matrix": [2, 9], "x": 9.5, "y": 2.5},
+        {"matrix": [2, 10], "x": 10.5, "y": 2.5},
+        {"matrix": [2, 11], "x": 11.5, "y": 2.5},
+        {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+        {"matrix": [2, 13], "x": 13.5, "y": 2.5, "w": 1.5},
+
+        {"matrix": [2, 14], "x": 15.25, "y": 2.5},
+        {"matrix": [2, 15], "x": 16.25, "y": 2.5},
+        {"matrix": [2, 16], "x": 17.25, "y": 2.5},
+
+        {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+        {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+        {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+        {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+        {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+        {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+        {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+        {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+        {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+        {"matrix": [3, 9], "x": 9.75, "y": 3.5},
+        {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+        {"matrix": [3, 11], "x": 11.75, "y": 3.5},
+        {"matrix": [3, 13], "x": 12.75, "y": 3.5, "w": 2.25},
+
+        {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
+        {"matrix": [4, 1], "x": 2.25, "y": 4.5},
+        {"matrix": [4, 2], "x": 3.25, "y": 4.5},
+        {"matrix": [4, 3], "x": 4.25, "y": 4.5},
+        {"matrix": [4, 4], "x": 5.25, "y": 4.5},
+        {"matrix": [4, 5], "x": 6.25, "y": 4.5},
+        {"matrix": [4, 6], "x": 7.25, "y": 4.5},
+        {"matrix": [4, 7], "x": 8.25, "y": 4.5},
+        {"matrix": [4, 8], "x": 9.25, "y": 4.5},
+        {"matrix": [4, 9], "x": 10.25, "y": 4.5},
+        {"matrix": [4, 10], "x": 11.25, "y": 4.5},
+        {"matrix": [4, 13], "x": 12.25, "y": 4.5, "w": 2.75},
+
+        {"matrix": [4, 15], "x": 16.25, "y": 4.5},
+
+        {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.5},
+        {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.5},
+        {"matrix": [5, 5], "x": 4, "y": 5.5, "w": 7},
+        {"matrix": [5, 8], "x": 11, "y": 5.5, "w": 1.5},
+        {"matrix": [5, 13], "x": 13.5, "y": 5.5, "w": 1.5},
+
+        {"matrix": [5, 14], "x": 15.25, "y": 5.5},
+        {"matrix": [5, 15], "x": 16.25, "y": 5.5},
+        {"matrix": [5, 16], "x": 17.25, "y": 5.5}
+      ]
+    }
+  }
+}
diff --git a/keyboards/kbdmania/kmac/rules.mk b/keyboards/kbdmania/kmac/rules.mk
index d9aa87a7dca..b35b955f698 100644
--- a/keyboards/kbdmania/kmac/rules.mk
+++ b/keyboards/kbdmania/kmac/rules.mk
@@ -1,18 +1,7 @@
 # Processor frequency
 F_CPU = 8000000
 
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = yes        # Commands for debug and configuration
 CUSTOM_MATRIX = yes         # Custom matrix file
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
-AUDIO_ENABLE = no           # Audio output
 
 # Project specific files
 SRC += matrix.c
diff --git a/keyboards/kbdmania/kmac_pad/info.json b/keyboards/kbdmania/kmac_pad/info.json
deleted file mode 100644
index f41da8a4526..00000000000
--- a/keyboards/kbdmania/kmac_pad/info.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-  "keyboard_name": "KMAC PAD",
-  "manufacturer": "KBDMania",
-  "maintainer": "talsu",
-  "usb": {
-    "vid": "0x4B4D",
-    "pid": "0x4143",
-    "device_version": "1.0.4"
-  },
-  "processor": "atmega32u4",
-  "bootloader": "atmel-dfu",
-  "layouts": {
-    "LAYOUT": {
-      "layout": [
-        {"matrix": [0, 0], "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": [1, 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, "h": 2},
-
-        {"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": [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, "h": 2},
-
-        {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 2},
-        {"matrix": [5, 2], "x": 2, "y": 5.25}
-      ]
-    }
-  }
-}
diff --git a/keyboards/kbdmania/kmac_pad/keyboard.json b/keyboards/kbdmania/kmac_pad/keyboard.json
new file mode 100644
index 00000000000..8dbb196f3e9
--- /dev/null
+++ b/keyboards/kbdmania/kmac_pad/keyboard.json
@@ -0,0 +1,47 @@
+{
+  "keyboard_name": "KMAC PAD",
+  "manufacturer": "KBDMania",
+  "maintainer": "talsu",
+  "usb": {
+    "vid": "0x4B4D",
+    "pid": "0x4143",
+    "device_version": "1.0.4"
+  },
+  "processor": "atmega32u4",
+  "bootloader": "atmel-dfu",
+  "features": {
+    "bootmagic": true,
+    "mousekey": true,
+    "extrakey": true,
+    "nkro": true
+  },
+  "layouts": {
+    "LAYOUT": {
+      "layout": [
+        {"matrix": [0, 0], "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": [1, 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, "h": 2},
+
+        {"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": [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, "h": 2},
+
+        {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 2},
+        {"matrix": [5, 2], "x": 2, "y": 5.25}
+      ]
+    }
+  }
+}
diff --git a/keyboards/kbdmania/kmac_pad/rules.mk b/keyboards/kbdmania/kmac_pad/rules.mk
index 1c42620aca5..2ec23373842 100644
--- a/keyboards/kbdmania/kmac_pad/rules.mk
+++ b/keyboards/kbdmania/kmac_pad/rules.mk
@@ -1,18 +1,6 @@
 # Processor frequency
 F_CPU = 8000000
 
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
 CUSTOM_MATRIX = lite        # Custom matrix file
 
 # Project specific files
diff --git a/keyboards/kbnordic/nordic65/rev_a/info.json b/keyboards/kbnordic/nordic65/rev_a/keyboard.json
similarity index 100%
rename from keyboards/kbnordic/nordic65/rev_a/info.json
rename to keyboards/kbnordic/nordic65/rev_a/keyboard.json
diff --git a/keyboards/keebformom/info.json b/keyboards/keebformom/info.json
deleted file mode 100644
index 8262b4bf4ee..00000000000
--- a/keyboards/keebformom/info.json
+++ /dev/null
@@ -1,82 +0,0 @@
-{
-    "keyboard_name": "Keeb For Mom",
-    "url": "",
-    "maintainer": "qmk",
-    "manufacturer": "nendezkombet/sandipratama",
-    "usb": {
-        "vid": "0x458F",
-        "pid": "0x14E2",
-        "device_version": "1.0.0"
-    },
-    "ws2812": {
-        "pin": "F4"
-    },
-    "rgblight": {
-        "saturation_steps": 8,
-        "brightness_steps": 8,
-        "led_count": 40,
-        "max_brightness": 150,
-        "sleep": true,
-        "animations": {
-            "breathing": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true
-        }
-    },
-    "matrix_pins": {
-        "cols": ["B3", "B2", "D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5"],
-        "rows": ["F5", "F6", "F7", "B1"]
-    },
-    "diode_direction": "COL2ROW",
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
-    "layouts": {
-        "LAYOUT_ortho_4x10": {
-            "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": [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": [1, 4], "x": 4, "y": 1},
-                {"matrix": [1, 5], "x": 5, "y": 1},
-                {"matrix": [1, 6], "x": 6, "y": 1},
-                {"matrix": [1, 7], "x": 7, "y": 1},
-                {"matrix": [1, 8], "x": 8, "y": 1},
-                {"matrix": [1, 9], "x": 9, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2},
-                {"matrix": [2, 1], "x": 1, "y": 2},
-                {"matrix": [2, 2], "x": 2, "y": 2},
-                {"matrix": [2, 3], "x": 3, "y": 2},
-                {"matrix": [2, 4], "x": 4, "y": 2},
-                {"matrix": [2, 5], "x": 5, "y": 2},
-                {"matrix": [2, 6], "x": 6, "y": 2},
-                {"matrix": [2, 7], "x": 7, "y": 2},
-                {"matrix": [2, 8], "x": 8, "y": 2},
-                {"matrix": [2, 9], "x": 9, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3},
-                {"matrix": [3, 1], "x": 1, "y": 3},
-                {"matrix": [3, 2], "x": 2, "y": 3},
-                {"matrix": [3, 3], "x": 3, "y": 3},
-                {"matrix": [3, 4], "x": 4, "y": 3},
-                {"matrix": [3, 5], "x": 5, "y": 3},
-                {"matrix": [3, 6], "x": 6, "y": 3},
-                {"matrix": [3, 7], "x": 7, "y": 3},
-                {"matrix": [3, 8], "x": 8, "y": 3},
-                {"matrix": [3, 9], "x": 9, "y": 3}
-            ]
-        }
-    }
-}
diff --git a/keyboards/keebformom/keyboard.json b/keyboards/keebformom/keyboard.json
new file mode 100644
index 00000000000..b1ffee0f3da
--- /dev/null
+++ b/keyboards/keebformom/keyboard.json
@@ -0,0 +1,92 @@
+{
+    "keyboard_name": "Keeb For Mom",
+    "url": "",
+    "maintainer": "qmk",
+    "manufacturer": "nendezkombet/sandipratama",
+    "usb": {
+        "vid": "0x458F",
+        "pid": "0x14E2",
+        "device_version": "1.0.0",
+        "no_startup_check": true
+    },
+    "ws2812": {
+        "pin": "F4"
+    },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 40,
+        "max_brightness": 150,
+        "sleep": true,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true
+        }
+    },
+    "matrix_pins": {
+        "cols": ["B3", "B2", "D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5"],
+        "rows": ["F5", "F6", "F7", "B1"]
+    },
+    "diode_direction": "COL2ROW",
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
+    "features": {
+        "bootmagic": false,
+        "mousekey": false,
+        "extrakey": true
+    },
+    "build": {
+        "lto": true
+    },
+    "community_layouts": ["ortho_4x10"],
+    "layouts": {
+        "LAYOUT_ortho_4x10": {
+            "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": [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": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [2, 6], "x": 6, "y": 2},
+                {"matrix": [2, 7], "x": 7, "y": 2},
+                {"matrix": [2, 8], "x": 8, "y": 2},
+                {"matrix": [2, 9], "x": 9, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
+                {"matrix": [3, 6], "x": 6, "y": 3},
+                {"matrix": [3, 7], "x": 7, "y": 3},
+                {"matrix": [3, 8], "x": 8, "y": 3},
+                {"matrix": [3, 9], "x": 9, "y": 3}
+            ]
+        }
+    }
+}
diff --git a/keyboards/keebformom/rules.mk b/keyboards/keebformom/rules.mk
deleted file mode 100644
index 50c95c8bbde..00000000000
--- a/keyboards/keebformom/rules.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no       # Enable keyboard RGB underglow
-AUDIO_ENABLE = no          # Audio output
-LTO_ENABLE = yes
-NO_USB_STARTUP_CHECK = yes  
-LAYOUTS = ortho_4x10 
diff --git a/keyboards/keebio/bdn9/rev1/info.json b/keyboards/keebio/bdn9/rev1/info.json
deleted file mode 100644
index 0167052f6d7..00000000000
--- a/keyboards/keebio/bdn9/rev1/info.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-    "keyboard_name": "BDN9 Rev. 1",
-    "usb": {
-        "pid": "0x1133",
-        "device_version": "1.0.0"
-    },
-    "encoder": {
-        "rotary": [
-            {"pin_a": "D0", "pin_b": "D1"},
-            {"pin_a": "F6", "pin_b": "F5"},
-            {"pin_a": "B6", "pin_b": "F7"}
-        ]
-    },
-    "backlight": {
-        "pin": "B5",
-        "levels": 7
-    },
-    "rgblight": {
-        "saturation_steps": 8,
-        "brightness_steps": 8,
-        "led_count": 4,
-        "sleep": true,
-        "animations": {
-            "breathing": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "snake": true,
-            "knight": true,
-            "christmas": true,
-            "static_gradient": true,
-            "rgb_test": true,
-            "alternating": true,
-            "twinkle": true
-        }
-    },
-    "ws2812": {
-        "pin": "D3"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
-    "matrix_pins": {
-        "direct": [
-            ["D2", "D4", "F4"],
-            ["D7", "B1", "B3"],
-            ["E6", "B4", "B2"]
-        ]
-    }
-}
diff --git a/keyboards/keebio/bdn9/rev1/keyboard.json b/keyboards/keebio/bdn9/rev1/keyboard.json
new file mode 100644
index 00000000000..9ab64e25d6f
--- /dev/null
+++ b/keyboards/keebio/bdn9/rev1/keyboard.json
@@ -0,0 +1,58 @@
+{
+    "keyboard_name": "BDN9 Rev. 1",
+    "usb": {
+        "pid": "0x1133",
+        "device_version": "1.0.0"
+    },
+    "encoder": {
+        "rotary": [
+            {"pin_a": "D0", "pin_b": "D1"},
+            {"pin_a": "F6", "pin_b": "F5"},
+            {"pin_a": "B6", "pin_b": "F7"}
+        ]
+    },
+    "backlight": {
+        "pin": "B5",
+        "levels": 7
+    },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 4,
+        "sleep": true,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": true,
+            "twinkle": true
+        }
+    },
+    "ws2812": {
+        "pin": "D3"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
+    "features": {
+        "bootmagic": false,
+        "mousekey": false,
+        "extrakey": true,
+        "console": true,
+        "command": true,
+        "backlight": true,
+        "rgblight": true,
+        "encoder": true
+    },
+    "matrix_pins": {
+        "direct": [
+            ["D2", "D4", "F4"],
+            ["D7", "B1", "B3"],
+            ["E6", "B4", "B2"]
+        ]
+    }
+}
diff --git a/keyboards/keebio/bdn9/rev1/rules.mk b/keyboards/keebio/bdn9/rev1/rules.mk
deleted file mode 100644
index b0fc1d94e5d..00000000000
--- a/keyboards/keebio/bdn9/rev1/rules.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = yes        # Console for debug
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = yes       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-ENCODER_ENABLE = yes
diff --git a/keyboards/keebio/bdn9/rev2/info.json b/keyboards/keebio/bdn9/rev2/info.json
deleted file mode 100644
index 74d6dac85be..00000000000
--- a/keyboards/keebio/bdn9/rev2/info.json
+++ /dev/null
@@ -1,95 +0,0 @@
-{
-    "keyboard_name": "BDN9 Rev. 2",
-    "usb": {
-        "pid": "0x2133",
-        "device_version": "2.0.0"
-    },
-    "rgblight": {
-        "saturation_steps": 8,
-        "brightness_steps": 8,
-        "led_count": 11,
-        "sleep": true,
-        "animations": {
-            "breathing": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "snake": true,
-            "knight": true,
-            "christmas": true,
-            "static_gradient": true,
-            "rgb_test": true,
-            "alternating": true,
-            "twinkle": true
-        }
-    },
-    "ws2812": {
-        "pin": "B15"
-    },
-    "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,
-            "rainbow_moving_chevron": true,
-            "cycle_out_in": true,
-            "cycle_out_in_dual": 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_rain": true,
-            "pixel_flow": true,
-            "pixel_fractal": 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"
-    },
-    "encoder": {
-        "rotary": [
-            {"pin_a": "A8", "pin_b": "A4"},
-            {"pin_a": "B3", "pin_b": "A15"},
-            {"pin_a": "A10", "pin_b": "A9"}
-        ]
-    },
-    "qmk": {
-        "tap_keycode_delay": 10
-    },
-    "processor": "STM32F072",
-    "bootloader": "stm32-dfu",
-    "matrix_pins": {
-        "direct": [
-            ["B12", "B5", "B6"],
-            ["B14", "B4", "B7"],
-            ["A3", "F1", "F0"]
-        ]
-    }
-}
diff --git a/keyboards/keebio/bdn9/rev2/keyboard.json b/keyboards/keebio/bdn9/rev2/keyboard.json
new file mode 100644
index 00000000000..174c5c826a9
--- /dev/null
+++ b/keyboards/keebio/bdn9/rev2/keyboard.json
@@ -0,0 +1,104 @@
+{
+    "keyboard_name": "BDN9 Rev. 2",
+    "usb": {
+        "pid": "0x2133",
+        "device_version": "2.0.0"
+    },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 11,
+        "sleep": true,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": true,
+            "twinkle": true
+        }
+    },
+    "ws2812": {
+        "pin": "B15"
+    },
+    "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,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": 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_rain": true,
+            "pixel_flow": true,
+            "pixel_fractal": 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"
+    },
+    "encoder": {
+        "rotary": [
+            {"pin_a": "A8", "pin_b": "A4"},
+            {"pin_a": "B3", "pin_b": "A15"},
+            {"pin_a": "A10", "pin_b": "A9"}
+        ]
+    },
+    "qmk": {
+        "tap_keycode_delay": 10
+    },
+    "processor": "STM32F072",
+    "bootloader": "stm32-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "console": true,
+        "command": true,
+        "encoder": true,
+        "rgb_matrix": true
+    },
+    "matrix_pins": {
+        "direct": [
+            ["B12", "B5", "B6"],
+            ["B14", "B4", "B7"],
+            ["A3", "F1", "F0"]
+        ]
+    }
+}
diff --git a/keyboards/keebio/bdn9/rev2/rules.mk b/keyboards/keebio/bdn9/rev2/rules.mk
deleted file mode 100644
index e4077691471..00000000000
--- a/keyboards/keebio/bdn9/rev2/rules.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = yes        # Console for debug
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-ENCODER_ENABLE = yes
-RGB_MATRIX_ENABLE = yes
-
diff --git a/keyboards/keebio/cepstrum/rev1/info.json b/keyboards/keebio/cepstrum/rev1/keyboard.json
similarity index 100%
rename from keyboards/keebio/cepstrum/rev1/info.json
rename to keyboards/keebio/cepstrum/rev1/keyboard.json
diff --git a/keyboards/keebio/dsp40/rev1/info.json b/keyboards/keebio/dsp40/rev1/info.json
deleted file mode 100644
index cc8fa692cdf..00000000000
--- a/keyboards/keebio/dsp40/rev1/info.json
+++ /dev/null
@@ -1,160 +0,0 @@
-{
-    "keyboard_name": "DSP40 Rev. 1",
-    "manufacturer": "Keebio",
-    "url": "https://keeb.io",
-    "maintainer": "nooges",
-    "usb": {
-        "vid": "0xCB10",
-        "pid": "0x144C",
-        "device_version": "1.0.0"
-    },
-    "matrix_pins": {
-        "cols": ["B10", "B2", "A3", "A4", "B7", "B6", "A10", "C13", "C14", "C15", "F0", "F1"],
-        "rows": ["B9", "A9", "A8", "B15"]
-    },
-    "diode_direction": "COL2ROW",
-    "encoder": {
-        "rotary": [
-            {"pin_a": "A1", "pin_b": "A2"}
-        ]
-    },
-    "qmk": {
-        "tap_keycode_delay": 10
-    },
-    "backlight": {
-        "pin": "A6",
-        "levels": 7
-    },
-    "rgblight": {
-        "saturation_steps": 8,
-        "brightness_steps": 8,
-        "led_count": 4,
-        "sleep": true,
-        "animations": {
-            "breathing": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "snake": true,
-            "knight": true,
-            "christmas": true,
-            "static_gradient": true,
-            "rgb_test": true,
-            "alternating": true,
-            "twinkle": true
-        }
-    },
-    "ws2812": {
-        "pin": "D3"
-    },
-    "processor": "STM32F072",
-    "bootloader": "stm32-dfu",
-    "layout_aliases": {
-        "LAYOUT_40_staggered": "LAYOUT"
-    },
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 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": [1, 0], "x": 0, "y": 1, "w": 1.25},
-                {"matrix": [1, 1], "x": 1.25, "y": 1},
-                {"matrix": [1, 2], "x": 2.25, "y": 1},
-                {"matrix": [1, 3], "x": 3.25, "y": 1},
-                {"matrix": [1, 4], "x": 4.25, "y": 1},
-                {"matrix": [1, 5], "x": 5.25, "y": 1},
-                {"matrix": [1, 6], "x": 6.25, "y": 1},
-                {"matrix": [1, 7], "x": 7.25, "y": 1},
-                {"matrix": [1, 8], "x": 8.25, "y": 1},
-                {"matrix": [1, 9], "x": 9.25, "y": 1},
-                {"matrix": [1, 11], "x": 10.25, "y": 1, "w": 1.75},
-
-                {"matrix": [2, 1], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 2], "x": 1.75, "y": 2},
-                {"matrix": [2, 3], "x": 2.75, "y": 2},
-                {"matrix": [2, 4], "x": 3.75, "y": 2},
-                {"matrix": [2, 5], "x": 4.75, "y": 2},
-                {"matrix": [2, 6], "x": 5.75, "y": 2},
-                {"matrix": [2, 7], "x": 6.75, "y": 2},
-                {"matrix": [2, 8], "x": 7.75, "y": 2},
-                {"matrix": [2, 9], "x": 8.75, "y": 2},
-                {"matrix": [2, 10], "x": 9.75, "y": 2, "w": 1.25},
-                {"matrix": [2, 11], "x": 11, "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, "w": 1.25},
-                {"matrix": [3, 4], "x": 3.5, "y": 3, "w": 2.25},
-                {"matrix": [3, 7], "x": 5.75, "y": 3, "w": 2.75},
-                {"matrix": [3, 9], "x": 8.5, "y": 3, "w": 1.25},
-                {"matrix": [3, 10], "x": 9.75, "y": 3},
-                {"matrix": [3, 11], "x": 10.75, "y": 3, "w": 1.25}
-            ]
-        },
-        "LAYOUT_ortho_4x12": {
-            "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": [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": [1, 4], "x": 4, "y": 1},
-                {"matrix": [1, 5], "x": 5, "y": 1},
-                {"matrix": [1, 6], "x": 6, "y": 1},
-                {"matrix": [1, 7], "x": 7, "y": 1},
-                {"matrix": [1, 8], "x": 8, "y": 1},
-                {"matrix": [1, 9], "x": 9, "y": 1},
-                {"matrix": [1, 10], "x": 10, "y": 1},
-                {"matrix": [1, 11], "x": 11, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2},
-                {"matrix": [2, 1], "x": 1, "y": 2},
-                {"matrix": [2, 2], "x": 2, "y": 2},
-                {"matrix": [2, 3], "x": 3, "y": 2},
-                {"matrix": [2, 4], "x": 4, "y": 2},
-                {"matrix": [2, 5], "x": 5, "y": 2},
-                {"matrix": [2, 6], "x": 6, "y": 2},
-                {"matrix": [2, 7], "x": 7, "y": 2},
-                {"matrix": [2, 8], "x": 8, "y": 2},
-                {"matrix": [2, 9], "x": 9, "y": 2},
-                {"matrix": [2, 10], "x": 10, "y": 2},
-                {"matrix": [2, 11], "x": 11, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3},
-                {"matrix": [3, 1], "x": 1, "y": 3},
-                {"matrix": [3, 2], "x": 2, "y": 3},
-                {"matrix": [3, 3], "x": 3, "y": 3},
-                {"matrix": [3, 4], "x": 4, "y": 3},
-                {"matrix": [3, 5], "x": 5, "y": 3},
-                {"matrix": [3, 6], "x": 6, "y": 3},
-                {"matrix": [3, 7], "x": 7, "y": 3},
-                {"matrix": [3, 8], "x": 8, "y": 3},
-                {"matrix": [3, 9], "x": 9, "y": 3},
-                {"matrix": [3, 10], "x": 10, "y": 3},
-                {"matrix": [3, 11], "x": 11, "y": 3}
-            ]
-        }
-    }
-}
diff --git a/keyboards/keebio/dsp40/rev1/keyboard.json b/keyboards/keebio/dsp40/rev1/keyboard.json
new file mode 100644
index 00000000000..2011a23b7e5
--- /dev/null
+++ b/keyboards/keebio/dsp40/rev1/keyboard.json
@@ -0,0 +1,169 @@
+{
+    "keyboard_name": "DSP40 Rev. 1",
+    "manufacturer": "Keebio",
+    "url": "https://keeb.io",
+    "maintainer": "nooges",
+    "usb": {
+        "vid": "0xCB10",
+        "pid": "0x144C",
+        "device_version": "1.0.0"
+    },
+    "matrix_pins": {
+        "cols": ["B10", "B2", "A3", "A4", "B7", "B6", "A10", "C13", "C14", "C15", "F0", "F1"],
+        "rows": ["B9", "A9", "A8", "B15"]
+    },
+    "diode_direction": "COL2ROW",
+    "encoder": {
+        "rotary": [
+            {"pin_a": "A1", "pin_b": "A2"}
+        ]
+    },
+    "qmk": {
+        "tap_keycode_delay": 10
+    },
+    "backlight": {
+        "pin": "A6",
+        "levels": 7
+    },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 4,
+        "sleep": true,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": true,
+            "twinkle": true
+        }
+    },
+    "ws2812": {
+        "pin": "D3"
+    },
+    "processor": "STM32F072",
+    "bootloader": "stm32-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "console": true,
+        "command": true,
+        "backlight": true,
+        "encoder": true
+    },
+    "layout_aliases": {
+        "LAYOUT_40_staggered": "LAYOUT"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 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": [1, 0], "x": 0, "y": 1, "w": 1.25},
+                {"matrix": [1, 1], "x": 1.25, "y": 1},
+                {"matrix": [1, 2], "x": 2.25, "y": 1},
+                {"matrix": [1, 3], "x": 3.25, "y": 1},
+                {"matrix": [1, 4], "x": 4.25, "y": 1},
+                {"matrix": [1, 5], "x": 5.25, "y": 1},
+                {"matrix": [1, 6], "x": 6.25, "y": 1},
+                {"matrix": [1, 7], "x": 7.25, "y": 1},
+                {"matrix": [1, 8], "x": 8.25, "y": 1},
+                {"matrix": [1, 9], "x": 9.25, "y": 1},
+                {"matrix": [1, 11], "x": 10.25, "y": 1, "w": 1.75},
+
+                {"matrix": [2, 1], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 1.75, "y": 2},
+                {"matrix": [2, 3], "x": 2.75, "y": 2},
+                {"matrix": [2, 4], "x": 3.75, "y": 2},
+                {"matrix": [2, 5], "x": 4.75, "y": 2},
+                {"matrix": [2, 6], "x": 5.75, "y": 2},
+                {"matrix": [2, 7], "x": 6.75, "y": 2},
+                {"matrix": [2, 8], "x": 7.75, "y": 2},
+                {"matrix": [2, 9], "x": 8.75, "y": 2},
+                {"matrix": [2, 10], "x": 9.75, "y": 2, "w": 1.25},
+                {"matrix": [2, 11], "x": 11, "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, "w": 1.25},
+                {"matrix": [3, 4], "x": 3.5, "y": 3, "w": 2.25},
+                {"matrix": [3, 7], "x": 5.75, "y": 3, "w": 2.75},
+                {"matrix": [3, 9], "x": 8.5, "y": 3, "w": 1.25},
+                {"matrix": [3, 10], "x": 9.75, "y": 3},
+                {"matrix": [3, 11], "x": 10.75, "y": 3, "w": 1.25}
+            ]
+        },
+        "LAYOUT_ortho_4x12": {
+            "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": [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": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [2, 6], "x": 6, "y": 2},
+                {"matrix": [2, 7], "x": 7, "y": 2},
+                {"matrix": [2, 8], "x": 8, "y": 2},
+                {"matrix": [2, 9], "x": 9, "y": 2},
+                {"matrix": [2, 10], "x": 10, "y": 2},
+                {"matrix": [2, 11], "x": 11, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
+                {"matrix": [3, 6], "x": 6, "y": 3},
+                {"matrix": [3, 7], "x": 7, "y": 3},
+                {"matrix": [3, 8], "x": 8, "y": 3},
+                {"matrix": [3, 9], "x": 9, "y": 3},
+                {"matrix": [3, 10], "x": 10, "y": 3},
+                {"matrix": [3, 11], "x": 11, "y": 3}
+            ]
+        }
+    }
+}
diff --git a/keyboards/keebio/dsp40/rev1/rules.mk b/keyboards/keebio/dsp40/rev1/rules.mk
deleted file mode 100644
index 8c70082a374..00000000000
--- a/keyboards/keebio/dsp40/rev1/rules.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = yes        # Console for debug
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-ENCODER_ENABLE = yes
diff --git a/keyboards/keebio/foldkb/rev1/info.json b/keyboards/keebio/foldkb/rev1/info.json
deleted file mode 100644
index cc3fe50636b..00000000000
--- a/keyboards/keebio/foldkb/rev1/info.json
+++ /dev/null
@@ -1,141 +0,0 @@
-{
-    "keyboard_name": "FoldKB Rev. 1",
-    "manufacturer": "Keebio",
-    "url": "https://keeb.io",
-    "maintainer": "nooges",
-    "usb": {
-        "vid": "0xCB10",
-        "pid": "0x1358",
-        "device_version": "1.0.0"
-    },
-    "matrix_pins": {
-        "cols": ["F4", "F1", "F0", "B7", "B3", "D2", "D3", "D5"],
-        "rows": ["B1", "B2", "C7", "B4", "D7"]
-    },
-    "diode_direction": "COL2ROW",
-    "encoder": {
-        "rotary": [
-            {"pin_a": "F5", "pin_b": "F6"}
-        ]
-    },
-    "backlight": {
-        "pin": "B5"
-    },
-    "split": {
-        "enabled": true,
-        "soft_serial_pin": "D0"
-    },
-    "rgblight": {
-        "led_count": 16,
-        "led_map": [0, 1, 2, 3, 12, 13, 14, 15, 4, 5, 6, 7, 8, 9, 10, 11],
-        "split_count": [8, 8],
-        "animations": {
-            "breathing": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "snake": true,
-            "knight": true,
-            "christmas": true,
-            "static_gradient": true,
-            "rgb_test": true,
-            "alternating": true,
-            "twinkle": true
-        }
-    },
-    "ws2812": {
-        "pin": "E6"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-
-                {"matrix": [0, 1], "x": 1.25, "y": 0},
-                {"matrix": [0, 2], "x": 2.25, "y": 0},
-                {"matrix": [0, 3], "x": 3.25, "y": 0},
-                {"matrix": [0, 4], "x": 4.25, "y": 0},
-                {"matrix": [0, 5], "x": 5.25, "y": 0},
-                {"matrix": [0, 6], "x": 6.25, "y": 0},
-                {"matrix": [0, 7], "x": 7.25, "y": 0},
-
-                {"matrix": [5, 0], "x": 9, "y": 0},
-                {"matrix": [5, 1], "x": 10, "y": 0},
-                {"matrix": [5, 2], "x": 11, "y": 0},
-                {"matrix": [5, 3], "x": 12, "y": 0},
-                {"matrix": [5, 4], "x": 13, "y": 0},
-                {"matrix": [5, 5], "x": 14, "y": 0},
-                {"matrix": [5, 6], "x": 15, "y": 0},
-                {"matrix": [5, 7], "x": 16, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1},
-
-                {"matrix": [1, 2], "x": 1.75, "y": 1, "w": 1.5},
-                {"matrix": [1, 3], "x": 3.25, "y": 1},
-                {"matrix": [1, 4], "x": 4.25, "y": 1},
-                {"matrix": [1, 5], "x": 5.25, "y": 1},
-                {"matrix": [1, 6], "x": 6.25, "y": 1},
-                {"matrix": [1, 7], "x": 7.25, "y": 1},
-
-                {"matrix": [6, 0], "x": 9, "y": 1},
-                {"matrix": [6, 1], "x": 10, "y": 1},
-                {"matrix": [6, 2], "x": 11, "y": 1},
-                {"matrix": [6, 3], "x": 12, "y": 1},
-                {"matrix": [6, 4], "x": 13, "y": 1},
-                {"matrix": [6, 5], "x": 14, "y": 1},
-                {"matrix": [6, 6], "x": 15, "y": 1},
-                {"matrix": [6, 7], "x": 16, "y": 1, "w": 1.5},
-
-                {"matrix": [2, 0], "x": 0, "y": 2},
-
-                {"matrix": [2, 2], "x": 1.5, "y": 2, "w": 1.75},
-                {"matrix": [2, 3], "x": 3.25, "y": 2},
-                {"matrix": [2, 4], "x": 4.25, "y": 2},
-                {"matrix": [2, 5], "x": 5.25, "y": 2},
-                {"matrix": [2, 6], "x": 6.25, "y": 2},
-                {"matrix": [2, 7], "x": 7.25, "y": 2},
-
-                {"matrix": [7, 0], "x": 9, "y": 2},
-                {"matrix": [7, 1], "x": 10, "y": 2},
-                {"matrix": [7, 2], "x": 11, "y": 2},
-                {"matrix": [7, 3], "x": 12, "y": 2},
-                {"matrix": [7, 4], "x": 13, "y": 2},
-                {"matrix": [7, 5], "x": 14, "y": 2},
-                {"matrix": [7, 7], "x": 15, "y": 2, "w": 2.25},
-
-                {"matrix": [3, 0], "x": 0, "y": 3},
-                {"matrix": [3, 2], "x": 1, "y": 3, "w": 2.25},
-                {"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": [8, 0], "x": 9, "y": 3},
-                {"matrix": [8, 1], "x": 10, "y": 3},
-                {"matrix": [8, 2], "x": 11, "y": 3},
-                {"matrix": [8, 3], "x": 12, "y": 3},
-                {"matrix": [8, 4], "x": 13, "y": 3},
-                {"matrix": [8, 5], "x": 14, "y": 3, "w": 1.75},
-                {"matrix": [8, 7], "x": 15.75, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4},
-
-                {"matrix": [4, 2], "x": 1.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 3], "x": 2.75, "y": 4, "w": 1.25},
-                {"matrix": [4, 4], "x": 4, "y": 4, "w": 1.25},
-                {"matrix": [4, 5], "x": 5.25, "y": 4},
-                {"matrix": [4, 6], "x": 6.25, "y": 4},
-                {"matrix": [4, 7], "x": 7.25, "y": 4},
-
-                {"matrix": [9, 0], "x": 9, "y": 4, "w": 1.25},
-                {"matrix": [9, 1], "x": 10.25, "y": 4, "w": 1.5},
-                {"matrix": [9, 3], "x": 11.75, "y": 4, "w": 1.25},
-                {"matrix": [9, 4], "x": 13, "y": 4, "w": 1.25},
-                {"matrix": [9, 5], "x": 14.25, "y": 4, "w": 1.25},
-                {"matrix": [9, 7], "x": 15.5, "y": 4, "w": 1.25}
-            ]
-        }
-    }
-}
diff --git a/keyboards/keebio/foldkb/rev1/keyboard.json b/keyboards/keebio/foldkb/rev1/keyboard.json
new file mode 100644
index 00000000000..891e2ce74bb
--- /dev/null
+++ b/keyboards/keebio/foldkb/rev1/keyboard.json
@@ -0,0 +1,152 @@
+{
+    "keyboard_name": "FoldKB Rev. 1",
+    "manufacturer": "Keebio",
+    "url": "https://keeb.io",
+    "maintainer": "nooges",
+    "usb": {
+        "vid": "0xCB10",
+        "pid": "0x1358",
+        "device_version": "1.0.0"
+    },
+    "matrix_pins": {
+        "cols": ["F4", "F1", "F0", "B7", "B3", "D2", "D3", "D5"],
+        "rows": ["B1", "B2", "C7", "B4", "D7"]
+    },
+    "diode_direction": "COL2ROW",
+    "encoder": {
+        "rotary": [
+            {"pin_a": "F5", "pin_b": "F6"}
+        ]
+    },
+    "backlight": {
+        "pin": "B5"
+    },
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "D0"
+    },
+    "rgblight": {
+        "led_count": 16,
+        "led_map": [0, 1, 2, 3, 12, 13, 14, 15, 4, 5, 6, 7, 8, 9, 10, 11],
+        "split_count": [8, 8],
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": true,
+            "twinkle": true
+        }
+    },
+    "ws2812": {
+        "pin": "E6"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": false,
+        "extrakey": true,
+        "backlight": true,
+        "rgblight": true,
+        "encoder": true
+    },
+    "build": {
+        "lto": true
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+                {"matrix": [0, 5], "x": 5.25, "y": 0},
+                {"matrix": [0, 6], "x": 6.25, "y": 0},
+                {"matrix": [0, 7], "x": 7.25, "y": 0},
+
+                {"matrix": [5, 0], "x": 9, "y": 0},
+                {"matrix": [5, 1], "x": 10, "y": 0},
+                {"matrix": [5, 2], "x": 11, "y": 0},
+                {"matrix": [5, 3], "x": 12, "y": 0},
+                {"matrix": [5, 4], "x": 13, "y": 0},
+                {"matrix": [5, 5], "x": 14, "y": 0},
+                {"matrix": [5, 6], "x": 15, "y": 0},
+                {"matrix": [5, 7], "x": 16, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+
+                {"matrix": [1, 2], "x": 1.75, "y": 1, "w": 1.5},
+                {"matrix": [1, 3], "x": 3.25, "y": 1},
+                {"matrix": [1, 4], "x": 4.25, "y": 1},
+                {"matrix": [1, 5], "x": 5.25, "y": 1},
+                {"matrix": [1, 6], "x": 6.25, "y": 1},
+                {"matrix": [1, 7], "x": 7.25, "y": 1},
+
+                {"matrix": [6, 0], "x": 9, "y": 1},
+                {"matrix": [6, 1], "x": 10, "y": 1},
+                {"matrix": [6, 2], "x": 11, "y": 1},
+                {"matrix": [6, 3], "x": 12, "y": 1},
+                {"matrix": [6, 4], "x": 13, "y": 1},
+                {"matrix": [6, 5], "x": 14, "y": 1},
+                {"matrix": [6, 6], "x": 15, "y": 1},
+                {"matrix": [6, 7], "x": 16, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+
+                {"matrix": [2, 2], "x": 1.5, "y": 2, "w": 1.75},
+                {"matrix": [2, 3], "x": 3.25, "y": 2},
+                {"matrix": [2, 4], "x": 4.25, "y": 2},
+                {"matrix": [2, 5], "x": 5.25, "y": 2},
+                {"matrix": [2, 6], "x": 6.25, "y": 2},
+                {"matrix": [2, 7], "x": 7.25, "y": 2},
+
+                {"matrix": [7, 0], "x": 9, "y": 2},
+                {"matrix": [7, 1], "x": 10, "y": 2},
+                {"matrix": [7, 2], "x": 11, "y": 2},
+                {"matrix": [7, 3], "x": 12, "y": 2},
+                {"matrix": [7, 4], "x": 13, "y": 2},
+                {"matrix": [7, 5], "x": 14, "y": 2},
+                {"matrix": [7, 7], "x": 15, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 2], "x": 1, "y": 3, "w": 2.25},
+                {"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": [8, 0], "x": 9, "y": 3},
+                {"matrix": [8, 1], "x": 10, "y": 3},
+                {"matrix": [8, 2], "x": 11, "y": 3},
+                {"matrix": [8, 3], "x": 12, "y": 3},
+                {"matrix": [8, 4], "x": 13, "y": 3},
+                {"matrix": [8, 5], "x": 14, "y": 3, "w": 1.75},
+                {"matrix": [8, 7], "x": 15.75, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4},
+
+                {"matrix": [4, 2], "x": 1.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 2.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 4, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4},
+                {"matrix": [4, 6], "x": 6.25, "y": 4},
+                {"matrix": [4, 7], "x": 7.25, "y": 4},
+
+                {"matrix": [9, 0], "x": 9, "y": 4, "w": 1.25},
+                {"matrix": [9, 1], "x": 10.25, "y": 4, "w": 1.5},
+                {"matrix": [9, 3], "x": 11.75, "y": 4, "w": 1.25},
+                {"matrix": [9, 4], "x": 13, "y": 4, "w": 1.25},
+                {"matrix": [9, 5], "x": 14.25, "y": 4, "w": 1.25},
+                {"matrix": [9, 7], "x": 15.5, "y": 4, "w": 1.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/keebio/foldkb/rev1/rules.mk b/keyboards/keebio/foldkb/rev1/rules.mk
deleted file mode 100644
index 32e78815991..00000000000
--- a/keyboards/keebio/foldkb/rev1/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-BACKLIGHT_ENABLE = yes
-RGBLIGHT_ENABLE = yes
-ENCODER_ENABLE = yes
diff --git a/keyboards/keebio/foldkb/rules.mk b/keyboards/keebio/foldkb/rules.mk
index b9c01e0aff0..6a0522a902b 100644
--- a/keyboards/keebio/foldkb/rules.mk
+++ b/keyboards/keebio/foldkb/rules.mk
@@ -1,15 +1 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no        # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-LTO_ENABLE = yes
-
 DEFAULT_FOLDER = keebio/foldkb/rev1
diff --git a/keyboards/keebio/iris/keymaps/default/keymap.c b/keyboards/keebio/iris/keymaps/default/keymap.c
deleted file mode 100644
index e1e050ab1d3..00000000000
--- a/keyboards/keebio/iris/keymaps/default/keymap.c
+++ /dev/null
@@ -1,115 +0,0 @@
-// Copyright 2023 Danny Nguyen (@nooges)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include QMK_KEYBOARD_H
-
-#define _QWERTY 0
-#define _LOWER 1
-#define _RAISE 2
-#define _ADJUST 3
-
-enum custom_keycodes {
-  QWERTY = SAFE_RANGE,
-  LOWER,
-  RAISE,
-  ADJUST,
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  [_QWERTY] = LAYOUT(
-  //┌────────┬────────┬────────┬────────┬────────┬────────┐                          ┌────────┬────────┬────────┬────────┬────────┬────────┐
-     KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                               KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    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_DEL,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     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_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_HOME,          KC_END,  KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,
-  //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘        └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘
-                                    KC_LGUI, LOWER,   KC_ENT,                    KC_SPC,  RAISE,   KC_RALT
-                                // └────────┴────────┴────────┘                 └────────┴────────┴────────┘
-  ),
-
-  [_LOWER] = LAYOUT(
-  //┌────────┬────────┬────────┬────────┬────────┬────────┐                          ┌────────┬────────┬────────┬────────┬────────┬────────┐
-     KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC,                            KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     QK_BOOT, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                               KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    _______,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     KC_DEL,  _______, KC_LEFT, KC_RGHT, KC_UP,   KC_LBRC,                            KC_RBRC, KC_P4,   KC_P5,   KC_P6,   KC_PLUS, KC_PIPE,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐        ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     BL_STEP, _______, _______, _______, KC_DOWN, KC_LCBR, KC_LPRN,          KC_RPRN, KC_RCBR, KC_P1,   KC_P2,   KC_P3,   KC_MINS, _______,
-  //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘        └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘
-                                    _______, _______, KC_DEL,                    KC_DEL,  _______, KC_P0
-                                // └────────┴────────┴────────┘                 └────────┴────────┴────────┘
-  ),
-
-  [_RAISE] = LAYOUT(
-  //┌────────┬────────┬────────┬────────┬────────┬────────┐                          ┌────────┬────────┬────────┬────────┬────────┬────────┐
-     KC_F12,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,                              KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     RGB_TOG, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC,                            KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, _______,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     RGB_MOD, KC_MPRV, KC_MNXT, KC_VOLU, KC_PGUP, KC_UNDS,                            KC_EQL,  KC_HOME, RGB_HUI, RGB_SAI, RGB_VAI, KC_BSLS,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐        ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     KC_MUTE, KC_MSTP, KC_MPLY, KC_VOLD, KC_PGDN, KC_MINS, KC_LPRN,          _______, KC_PLUS, KC_END,  RGB_HUD, RGB_SAD, RGB_VAD, _______,
-  //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘        └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘
-                                    _______, _______, _______,                   _______, _______, _______
-                                // └────────┴────────┴────────┘                 └────────┴────────┴────────┘
-  ),
-
-  [_ADJUST] = LAYOUT(
-  //┌────────┬────────┬────────┬────────┬────────┬────────┐                          ┌────────┬────────┬────────┬────────┬────────┬────────┐
-     _______, _______, _______, _______, _______, _______,                            _______, _______, _______, _______, _______, _______,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     _______, _______, _______, _______, _______, _______,                            _______, _______, _______, _______, _______, _______,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     _______, _______, _______, _______, _______, _______,                            _______, _______, _______, _______, _______, _______,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐        ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______, _______, _______,
-  //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘        └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘
-                                    _______, _______, _______,                   _______, _______, _______
-                                // └────────┴────────┴────────┘                 └────────┴────────┴────────┘
-  )
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_QWERTY);
-      }
-      return false;
-      break;
-    case LOWER:
-      if (record->event.pressed) {
-        layer_on(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case RAISE:
-      if (record->event.pressed) {
-        layer_on(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case ADJUST:
-      if (record->event.pressed) {
-        layer_on(_ADJUST);
-      } else {
-        layer_off(_ADJUST);
-      }
-      return false;
-      break;
-  }
-  return true;
-}
diff --git a/keyboards/keebio/iris/keymaps/default/keymap.json b/keyboards/keebio/iris/keymaps/default/keymap.json
new file mode 100644
index 00000000000..8b141d992fd
--- /dev/null
+++ b/keyboards/keebio/iris/keymaps/default/keymap.json
@@ -0,0 +1,29 @@
+{
+    "config": { "features": {"tri_layer": true} },
+    "keyboard": "keebio/iris",
+    "keymap": "default",
+    "layout": "LAYOUT",
+    "layers": [
+        [
+            "QK_GESC", "KC_1"   , "KC_2"   , "KC_3"   , "KC_4"   , "KC_5"   ,                       "KC_6"   , "KC_7"   , "KC_8"   , "KC_9"   , "KC_0"   , "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_DEL" ,
+            "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_LSFT", "KC_Z"   , "KC_X"   , "KC_C"   , "KC_V"   , "KC_B"   , "KC_HOME", "KC_END" , "KC_N"   , "KC_M"   , "KC_COMM", "KC_DOT" , "KC_SLSH", "KC_RSFT",
+                                                        "KC_LGUI", "TL_LOWR", "KC_ENT" , "KC_SPC" , "TL_UPPR", "KC_RALT"
+        ],
+        [
+            "KC_TILD", "KC_EXLM", "KC_AT"  , "KC_HASH", "KC_DLR" , "KC_PERC",                       "KC_CIRC", "KC_AMPR", "KC_ASTR", "KC_LPRN", "KC_RPRN", "KC_PGUP",
+            "KC_GRV" , "_______", "KC_UP"  , "_______", "QK_BOOT", "_______",                       "_______", "KC_P7"  , "KC_P8"  , "KC_P9"  , "KC_P0"  , "KC_PGDN",
+            "KC_DEL" , "KC_LEFT", "KC_DOWN", "KC_RGHT", "_______", "KC_LBRC",                       "KC_RBRC", "KC_P4"  , "KC_P5"  , "KC_P6"  , "KC_PLUS", "KC_PIPE",
+            "RGB_MOD", "EE_CLR" , "_______", "_______", "_______", "KC_LCBR", "KC_LPRN", "KC_RPRN", "KC_RCBR", "KC_P1"  , "KC_P2"  , "KC_P3"  , "KC_MINS", "_______",
+                                                        "_______", "_______", "KC_DEL" , "KC_DEL" , "_______", "KC_P0"
+        ],
+        [
+            "KC_F12" , "KC_F1"  , "KC_F2"  , "KC_F3"  , "KC_F4"  , "KC_F5"  ,                       "KC_F6"  , "KC_F7"  , "KC_F8"  , "KC_F9"  , "KC_F10" , "KC_F11" ,
+            "RGB_TOG", "KC_EXLM", "KC_AT"  , "KC_HASH", "KC_DLR" , "KC_PERC",                       "KC_CIRC", "KC_AMPR", "KC_ASTR", "KC_LPRN", "KC_RPRN", "QK_BOOT",
+            "RGB_MOD", "KC_MPRV", "KC_MNXT", "KC_VOLU", "KC_PGUP", "KC_UNDS",                       "KC_EQL" , "KC_HOME", "RGB_HUI", "RGB_SAI", "RGB_VAI", "KC_BSLS",
+            "KC_MUTE", "KC_MSTP", "KC_MPLY", "KC_VOLD", "KC_PGDN", "KC_MINS", "KC_LPRN", "_______", "KC_PLUS", "KC_END" , "RGB_HUD", "RGB_SAD", "RGB_VAD", "EE_CLR" ,
+                                                        "_______", "_______", "_______", "_______", "_______", "_______"
+        ]
+    ]
+}
diff --git a/keyboards/keebio/iris/keymaps/via/keymap.c b/keyboards/keebio/iris/keymaps/via/keymap.c
index c2753da2a45..04ebf000b8b 100644
--- a/keyboards/keebio/iris/keymaps/via/keymap.c
+++ b/keyboards/keebio/iris/keymaps/via/keymap.c
@@ -7,14 +7,13 @@ enum custom_layer {
     _MAIN,
     _FN1,
     _FN2,
-    _FN3,
 };
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_MAIN] = LAYOUT(
   //┌────────┬────────┬────────┬────────┬────────┬────────┐                          ┌────────┬────────┬────────┬────────┬────────┬────────┐
-     KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                               KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC,
+     QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                               KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    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_DEL,
   //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
@@ -28,13 +27,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_FN1] = LAYOUT(
   //┌────────┬────────┬────────┬────────┬────────┬────────┐                          ┌────────┬────────┬────────┬────────┬────────┬────────┐
-     KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC,                            KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC,
+     KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC,                            KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_PGUP,
   //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     QK_BOOT, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                               KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    _______,
+     KC_GRV,  _______, KC_UP,   _______, QK_BOOT, _______,                            _______, KC_P7,   KC_P8,   KC_P9,   KC_P0,   KC_PGDN,
   //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     KC_DEL,  _______, KC_LEFT, KC_RGHT, KC_UP,   KC_LBRC,                            KC_RBRC, KC_P4,   KC_P5,   KC_P6,   KC_PLUS, KC_PIPE,
+     KC_DEL,  KC_LEFT, KC_DOWN, KC_RGHT, _______, KC_LBRC,                            KC_RBRC, KC_P4,   KC_P5,   KC_P6,   KC_PLUS, KC_PIPE,
   //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐        ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     BL_STEP, _______, _______, _______, KC_DOWN, KC_LCBR, KC_LPRN,          KC_RPRN, KC_RCBR, KC_P1,   KC_P2,   KC_P3,   KC_MINS, _______,
+     RGB_MOD, EE_CLR,  _______, _______, _______, KC_LCBR, KC_LPRN,          KC_RPRN, KC_RCBR, KC_P1,   KC_P2,   KC_P3,   KC_MINS, _______,
   //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘        └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘
                                     _______, _______, KC_DEL,                    KC_DEL,  _______, KC_P0
                                 // └────────┴────────┴────────┘                 └────────┴────────┴────────┘
@@ -44,25 +43,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //┌────────┬────────┬────────┬────────┬────────┬────────┐                          ┌────────┬────────┬────────┬────────┬────────┬────────┐
      KC_F12,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,                              KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,
   //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     RGB_TOG, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC,                            KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, _______,
+     RGB_TOG, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC,                            KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, QK_BOOT,
   //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
      RGB_MOD, KC_MPRV, KC_MNXT, KC_VOLU, KC_PGUP, KC_UNDS,                            KC_EQL,  KC_HOME, RGB_HUI, RGB_SAI, RGB_VAI, KC_BSLS,
   //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐        ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     KC_MUTE, KC_MSTP, KC_MPLY, KC_VOLD, KC_PGDN, KC_MINS, KC_LPRN,          _______, KC_PLUS, KC_END,  RGB_HUD, RGB_SAD, RGB_VAD, _______,
-  //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘        └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘
-                                    _______, _______, _______,                   _______, _______, _______
-                                // └────────┴────────┴────────┘                 └────────┴────────┴────────┘
-  ),
-
-  [_FN3] = LAYOUT(
-  //┌────────┬────────┬────────┬────────┬────────┬────────┐                          ┌────────┬────────┬────────┬────────┬────────┬────────┐
-     _______, _______, _______, _______, _______, _______,                            _______, _______, _______, _______, _______, _______,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     _______, _______, _______, _______, _______, _______,                            _______, _______, _______, _______, _______, _______,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     _______, _______, _______, _______, _______, _______,                            _______, _______, _______, _______, _______, _______,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐        ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______, _______, _______,
+     KC_MUTE, KC_MSTP, KC_MPLY, KC_VOLD, KC_PGDN, KC_MINS, KC_LPRN,          _______, KC_PLUS, KC_END,  RGB_HUD, RGB_SAD, RGB_VAD, EE_CLR,
   //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘        └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘
                                     _______, _______, _______,                   _______, _______, _______
                                 // └────────┴────────┴────────┘                 └────────┴────────┴────────┘
diff --git a/keyboards/keebio/iris/rev2/info.json b/keyboards/keebio/iris/rev2/info.json
deleted file mode 100644
index bbd6f97cf4a..00000000000
--- a/keyboards/keebio/iris/rev2/info.json
+++ /dev/null
@@ -1,112 +0,0 @@
-{
-    "keyboard_name": "Iris Rev. 2",
-    "usb": {
-        "pid": "0x2256",
-        "device_version": "2.0.0"
-    },
-    "matrix_pins": {
-        "cols": ["F6", "F7", "B1", "B3", "B2", "B6"],
-        "rows": ["D7", "E6", "B4", "D2", "D4"]
-    },
-    "diode_direction": "COL2ROW",
-    "backlight": {
-        "pin": "B5",
-        "levels": 5
-    },
-    "split": {
-        "enabled": true,
-        "soft_serial_pin": "D0"
-    },
-    "rgblight": {
-        "led_count": 12,
-        "split_count": [6, 6],
-        "animations": {
-            "breathing": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "snake": true,
-            "knight": true,
-            "christmas": true,
-            "static_gradient": true,
-            "rgb_test": true,
-            "alternating": true,
-            "twinkle": true
-        }
-    },
-    "ws2812": {
-        "pin": "D3"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0.375},
-                {"matrix": [0, 1], "x": 1, "y": 0.375},
-                {"matrix": [0, 2], "x": 2, "y": 0.125},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0.125},
-                {"matrix": [0, 5], "x": 5, "y": 0.25},
-
-                {"matrix": [5, 5], "x": 9, "y": 0.25},
-                {"matrix": [5, 4], "x": 10, "y": 0.125},
-                {"matrix": [5, 3], "x": 11, "y": 0},
-                {"matrix": [5, 2], "x": 12, "y": 0.125},
-                {"matrix": [5, 1], "x": 13, "y": 0.375},
-                {"matrix": [5, 0], "x": 14, "y": 0.375},
-
-                {"matrix": [1, 0], "x": 0, "y": 1.375},
-                {"matrix": [1, 1], "x": 1, "y": 1.375},
-                {"matrix": [1, 2], "x": 2, "y": 1.125},
-                {"matrix": [1, 3], "x": 3, "y": 1},
-                {"matrix": [1, 4], "x": 4, "y": 1.125},
-                {"matrix": [1, 5], "x": 5, "y": 1.25},
-
-                {"matrix": [6, 5], "x": 9, "y": 1.25},
-                {"matrix": [6, 4], "x": 10, "y": 1.125},
-                {"matrix": [6, 3], "x": 11, "y": 1},
-                {"matrix": [6, 2], "x": 12, "y": 1.125},
-                {"matrix": [6, 1], "x": 13, "y": 1.375},
-                {"matrix": [6, 0], "x": 14, "y": 1.375},
-
-                {"matrix": [2, 0], "x": 0, "y": 2.375},
-                {"matrix": [2, 1], "x": 1, "y": 2.375},
-                {"matrix": [2, 2], "x": 2, "y": 2.125},
-                {"matrix": [2, 3], "x": 3, "y": 2},
-                {"matrix": [2, 4], "x": 4, "y": 2.125},
-                {"matrix": [2, 5], "x": 5, "y": 2.25},
-
-                {"matrix": [7, 5], "x": 9, "y": 2.25},
-                {"matrix": [7, 4], "x": 10, "y": 2.125},
-                {"matrix": [7, 3], "x": 11, "y": 2},
-                {"matrix": [7, 2], "x": 12, "y": 2.125},
-                {"matrix": [7, 1], "x": 13, "y": 2.375},
-                {"matrix": [7, 0], "x": 14, "y": 2.375},
-
-                {"matrix": [3, 0], "x": 0, "y": 3.375},
-                {"matrix": [3, 1], "x": 1, "y": 3.375},
-                {"matrix": [3, 2], "x": 2, "y": 3.125},
-                {"matrix": [3, 3], "x": 3, "y": 3},
-                {"matrix": [3, 4], "x": 4, "y": 3.125},
-                {"matrix": [3, 5], "x": 5, "y": 3.25},
-                {"matrix": [4, 2], "x": 6.15, "y": 3.75},
-
-                {"matrix": [9, 2], "x": 7.85, "y": 3.75},
-                {"matrix": [8, 5], "x": 9, "y": 3.25},
-                {"matrix": [8, 4], "x": 10, "y": 3.125},
-                {"matrix": [8, 3], "x": 11, "y": 3},
-                {"matrix": [8, 2], "x": 12, "y": 3.125},
-                {"matrix": [8, 1], "x": 13, "y": 3.375},
-                {"matrix": [8, 0], "x": 14, "y": 3.375},
-
-                {"matrix": [4, 3], "x": 3.5, "y": 4.25},
-                {"matrix": [4, 4], "x": 4.5, "y": 4.375},
-                {"matrix": [4, 5], "x": 5.6, "y": 4.75},
-
-                {"matrix": [9, 5], "x": 8.4, "y": 4.75},
-                {"matrix": [9, 4], "x": 9.5, "y": 4.375},
-                {"matrix": [9, 3], "x": 10.5, "y": 4.25}
-            ]
-        }
-    }
-}
diff --git a/keyboards/keebio/iris/rev2/keyboard.json b/keyboards/keebio/iris/rev2/keyboard.json
new file mode 100644
index 00000000000..fafa9ba9240
--- /dev/null
+++ b/keyboards/keebio/iris/rev2/keyboard.json
@@ -0,0 +1,123 @@
+{
+    "keyboard_name": "Iris Rev. 2",
+    "usb": {
+        "pid": "0x2256",
+        "device_version": "2.0.0"
+    },
+    "matrix_pins": {
+        "cols": ["F6", "F7", "B1", "B3", "B2", "B6"],
+        "rows": ["D7", "E6", "B4", "D2", "D4"]
+    },
+    "diode_direction": "COL2ROW",
+    "backlight": {
+        "pin": "B5",
+        "levels": 5
+    },
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "D0"
+    },
+    "rgblight": {
+        "led_count": 12,
+        "split_count": [6, 6],
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": true,
+            "twinkle": true
+        }
+    },
+    "ws2812": {
+        "pin": "D3"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
+    "features": {
+        "bootmagic": false,
+        "mousekey": false,
+        "extrakey": true,
+        "console": true,
+        "backlight": true,
+        "rgblight": true
+    },
+    "build": {
+        "lto": true
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0.375},
+                {"matrix": [0, 1], "x": 1, "y": 0.375},
+                {"matrix": [0, 2], "x": 2, "y": 0.125},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0.125},
+                {"matrix": [0, 5], "x": 5, "y": 0.25},
+
+                {"matrix": [5, 5], "x": 9, "y": 0.25},
+                {"matrix": [5, 4], "x": 10, "y": 0.125},
+                {"matrix": [5, 3], "x": 11, "y": 0},
+                {"matrix": [5, 2], "x": 12, "y": 0.125},
+                {"matrix": [5, 1], "x": 13, "y": 0.375},
+                {"matrix": [5, 0], "x": 14, "y": 0.375},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.375},
+                {"matrix": [1, 1], "x": 1, "y": 1.375},
+                {"matrix": [1, 2], "x": 2, "y": 1.125},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1.125},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+
+                {"matrix": [6, 5], "x": 9, "y": 1.25},
+                {"matrix": [6, 4], "x": 10, "y": 1.125},
+                {"matrix": [6, 3], "x": 11, "y": 1},
+                {"matrix": [6, 2], "x": 12, "y": 1.125},
+                {"matrix": [6, 1], "x": 13, "y": 1.375},
+                {"matrix": [6, 0], "x": 14, "y": 1.375},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.375},
+                {"matrix": [2, 1], "x": 1, "y": 2.375},
+                {"matrix": [2, 2], "x": 2, "y": 2.125},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2.125},
+                {"matrix": [2, 5], "x": 5, "y": 2.25},
+
+                {"matrix": [7, 5], "x": 9, "y": 2.25},
+                {"matrix": [7, 4], "x": 10, "y": 2.125},
+                {"matrix": [7, 3], "x": 11, "y": 2},
+                {"matrix": [7, 2], "x": 12, "y": 2.125},
+                {"matrix": [7, 1], "x": 13, "y": 2.375},
+                {"matrix": [7, 0], "x": 14, "y": 2.375},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.375},
+                {"matrix": [3, 1], "x": 1, "y": 3.375},
+                {"matrix": [3, 2], "x": 2, "y": 3.125},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3.125},
+                {"matrix": [3, 5], "x": 5, "y": 3.25},
+                {"matrix": [4, 2], "x": 6.15, "y": 3.75},
+
+                {"matrix": [9, 2], "x": 7.85, "y": 3.75},
+                {"matrix": [8, 5], "x": 9, "y": 3.25},
+                {"matrix": [8, 4], "x": 10, "y": 3.125},
+                {"matrix": [8, 3], "x": 11, "y": 3},
+                {"matrix": [8, 2], "x": 12, "y": 3.125},
+                {"matrix": [8, 1], "x": 13, "y": 3.375},
+                {"matrix": [8, 0], "x": 14, "y": 3.375},
+
+                {"matrix": [4, 3], "x": 3.5, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.5, "y": 4.375},
+                {"matrix": [4, 5], "x": 5.6, "y": 4.75},
+
+                {"matrix": [9, 5], "x": 8.4, "y": 4.75},
+                {"matrix": [9, 4], "x": 9.5, "y": 4.375},
+                {"matrix": [9, 3], "x": 10.5, "y": 4.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/keebio/iris/rev2/rules.mk b/keyboards/keebio/iris/rev2/rules.mk
deleted file mode 100644
index d7e69407a24..00000000000
--- a/keyboards/keebio/iris/rev2/rules.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = yes        # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
-AUDIO_ENABLE = no           # Audio output
-RGBLIGHT_ENABLE = yes       # Enable WS2812 RGB underlight.
-
-LTO_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/keebio/iris/rev3/info.json b/keyboards/keebio/iris/rev3/info.json
deleted file mode 100644
index 5014519408f..00000000000
--- a/keyboards/keebio/iris/rev3/info.json
+++ /dev/null
@@ -1,123 +0,0 @@
-{
-    "keyboard_name": "Iris Rev. 3",
-    "usb": {
-        "pid": "0x3256",
-        "device_version": "3.0.0"
-    },
-    "matrix_pins": {
-        "cols": ["F1", "F4", "F5", "F6", "D4", "B4"],
-        "rows": ["D2", "D3", "D5", "D7", "D6"]
-    },
-    "diode_direction": "COL2ROW",
-    "encoder": {
-        "rotary": [
-            {"pin_a": "B5", "pin_b": "B7"}
-        ]
-    },
-    "backlight": {
-        "pin": "B6",
-        "levels": 5
-    },
-    "rgblight": {
-        "led_count": 12,
-        "split_count": [6, 6],
-        "animations": {
-            "breathing": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "snake": true,
-            "knight": true,
-            "christmas": true,
-            "static_gradient": true,
-            "rgb_test": true,
-            "alternating": true,
-            "twinkle": true
-        }
-    },
-    "ws2812": {
-        "pin": "F7"
-    },
-    "qmk_lufa_bootloader": {
-        "esc_input": "D2",
-        "esc_output": "F1",
-        "led": "B0",
-        "speaker": "C6"
-    },
-    "split": {
-        "enabled": true,
-        "soft_serial_pin": "D0"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "qmk-dfu",
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0.375},
-                {"matrix": [0, 1], "x": 1, "y": 0.375},
-                {"matrix": [0, 2], "x": 2, "y": 0.125},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0.125},
-                {"matrix": [0, 5], "x": 5, "y": 0.25},
-
-                {"matrix": [5, 5], "x": 9, "y": 0.25},
-                {"matrix": [5, 4], "x": 10, "y": 0.125},
-                {"matrix": [5, 3], "x": 11, "y": 0},
-                {"matrix": [5, 2], "x": 12, "y": 0.125},
-                {"matrix": [5, 1], "x": 13, "y": 0.375},
-                {"matrix": [5, 0], "x": 14, "y": 0.375},
-
-                {"matrix": [1, 0], "x": 0, "y": 1.375},
-                {"matrix": [1, 1], "x": 1, "y": 1.375},
-                {"matrix": [1, 2], "x": 2, "y": 1.125},
-                {"matrix": [1, 3], "x": 3, "y": 1},
-                {"matrix": [1, 4], "x": 4, "y": 1.125},
-                {"matrix": [1, 5], "x": 5, "y": 1.25},
-
-                {"matrix": [6, 5], "x": 9, "y": 1.25},
-                {"matrix": [6, 4], "x": 10, "y": 1.125},
-                {"matrix": [6, 3], "x": 11, "y": 1},
-                {"matrix": [6, 2], "x": 12, "y": 1.125},
-                {"matrix": [6, 1], "x": 13, "y": 1.375},
-                {"matrix": [6, 0], "x": 14, "y": 1.375},
-
-                {"matrix": [2, 0], "x": 0, "y": 2.375},
-                {"matrix": [2, 1], "x": 1, "y": 2.375},
-                {"matrix": [2, 2], "x": 2, "y": 2.125},
-                {"matrix": [2, 3], "x": 3, "y": 2},
-                {"matrix": [2, 4], "x": 4, "y": 2.125},
-                {"matrix": [2, 5], "x": 5, "y": 2.25},
-
-                {"matrix": [7, 5], "x": 9, "y": 2.25},
-                {"matrix": [7, 4], "x": 10, "y": 2.125},
-                {"matrix": [7, 3], "x": 11, "y": 2},
-                {"matrix": [7, 2], "x": 12, "y": 2.125},
-                {"matrix": [7, 1], "x": 13, "y": 2.375},
-                {"matrix": [7, 0], "x": 14, "y": 2.375},
-
-                {"matrix": [3, 0], "x": 0, "y": 3.375},
-                {"matrix": [3, 1], "x": 1, "y": 3.375},
-                {"matrix": [3, 2], "x": 2, "y": 3.125},
-                {"matrix": [3, 3], "x": 3, "y": 3},
-                {"matrix": [3, 4], "x": 4, "y": 3.125},
-                {"matrix": [3, 5], "x": 5, "y": 3.25},
-                {"matrix": [4, 2], "x": 6.15, "y": 3.75},
-
-                {"matrix": [9, 2], "x": 7.85, "y": 3.75},
-                {"matrix": [8, 5], "x": 9, "y": 3.25},
-                {"matrix": [8, 4], "x": 10, "y": 3.125},
-                {"matrix": [8, 3], "x": 11, "y": 3},
-                {"matrix": [8, 2], "x": 12, "y": 3.125},
-                {"matrix": [8, 1], "x": 13, "y": 3.375},
-                {"matrix": [8, 0], "x": 14, "y": 3.375},
-
-                {"matrix": [4, 3], "x": 3.5, "y": 4.25},
-                {"matrix": [4, 4], "x": 4.5, "y": 4.375},
-                {"matrix": [4, 5], "x": 5.6, "y": 4.75},
-
-                {"matrix": [9, 5], "x": 8.4, "y": 4.75},
-                {"matrix": [9, 4], "x": 9.5, "y": 4.375},
-                {"matrix": [9, 3], "x": 10.5, "y": 4.25}
-            ]
-        }
-    }
-}
diff --git a/keyboards/keebio/iris/rev3/keyboard.json b/keyboards/keebio/iris/rev3/keyboard.json
new file mode 100644
index 00000000000..8ce5ed89794
--- /dev/null
+++ b/keyboards/keebio/iris/rev3/keyboard.json
@@ -0,0 +1,134 @@
+{
+    "keyboard_name": "Iris Rev. 3",
+    "usb": {
+        "pid": "0x3256",
+        "device_version": "3.0.0"
+    },
+    "matrix_pins": {
+        "cols": ["F1", "F4", "F5", "F6", "D4", "B4"],
+        "rows": ["D2", "D3", "D5", "D7", "D6"]
+    },
+    "diode_direction": "COL2ROW",
+    "encoder": {
+        "rotary": [
+            {"pin_a": "B5", "pin_b": "B7"}
+        ]
+    },
+    "backlight": {
+        "pin": "B6",
+        "levels": 5
+    },
+    "rgblight": {
+        "led_count": 12,
+        "split_count": [6, 6],
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": true,
+            "twinkle": true
+        }
+    },
+    "ws2812": {
+        "pin": "F7"
+    },
+    "qmk_lufa_bootloader": {
+        "esc_input": "D2",
+        "esc_output": "F1",
+        "led": "B0",
+        "speaker": "C6"
+    },
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "D0"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "qmk-dfu",
+    "features": {
+        "bootmagic": false,
+        "mousekey": false,
+        "extrakey": true,
+        "backlight": true,
+        "rgblight": true,
+        "encoder": true
+    },
+    "build": {
+        "lto": true
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0.375},
+                {"matrix": [0, 1], "x": 1, "y": 0.375},
+                {"matrix": [0, 2], "x": 2, "y": 0.125},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0.125},
+                {"matrix": [0, 5], "x": 5, "y": 0.25},
+
+                {"matrix": [5, 5], "x": 9, "y": 0.25},
+                {"matrix": [5, 4], "x": 10, "y": 0.125},
+                {"matrix": [5, 3], "x": 11, "y": 0},
+                {"matrix": [5, 2], "x": 12, "y": 0.125},
+                {"matrix": [5, 1], "x": 13, "y": 0.375},
+                {"matrix": [5, 0], "x": 14, "y": 0.375},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.375},
+                {"matrix": [1, 1], "x": 1, "y": 1.375},
+                {"matrix": [1, 2], "x": 2, "y": 1.125},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1.125},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+
+                {"matrix": [6, 5], "x": 9, "y": 1.25},
+                {"matrix": [6, 4], "x": 10, "y": 1.125},
+                {"matrix": [6, 3], "x": 11, "y": 1},
+                {"matrix": [6, 2], "x": 12, "y": 1.125},
+                {"matrix": [6, 1], "x": 13, "y": 1.375},
+                {"matrix": [6, 0], "x": 14, "y": 1.375},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.375},
+                {"matrix": [2, 1], "x": 1, "y": 2.375},
+                {"matrix": [2, 2], "x": 2, "y": 2.125},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2.125},
+                {"matrix": [2, 5], "x": 5, "y": 2.25},
+
+                {"matrix": [7, 5], "x": 9, "y": 2.25},
+                {"matrix": [7, 4], "x": 10, "y": 2.125},
+                {"matrix": [7, 3], "x": 11, "y": 2},
+                {"matrix": [7, 2], "x": 12, "y": 2.125},
+                {"matrix": [7, 1], "x": 13, "y": 2.375},
+                {"matrix": [7, 0], "x": 14, "y": 2.375},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.375},
+                {"matrix": [3, 1], "x": 1, "y": 3.375},
+                {"matrix": [3, 2], "x": 2, "y": 3.125},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3.125},
+                {"matrix": [3, 5], "x": 5, "y": 3.25},
+                {"matrix": [4, 2], "x": 6.15, "y": 3.75},
+
+                {"matrix": [9, 2], "x": 7.85, "y": 3.75},
+                {"matrix": [8, 5], "x": 9, "y": 3.25},
+                {"matrix": [8, 4], "x": 10, "y": 3.125},
+                {"matrix": [8, 3], "x": 11, "y": 3},
+                {"matrix": [8, 2], "x": 12, "y": 3.125},
+                {"matrix": [8, 1], "x": 13, "y": 3.375},
+                {"matrix": [8, 0], "x": 14, "y": 3.375},
+
+                {"matrix": [4, 3], "x": 3.5, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.5, "y": 4.375},
+                {"matrix": [4, 5], "x": 5.6, "y": 4.75},
+
+                {"matrix": [9, 5], "x": 8.4, "y": 4.75},
+                {"matrix": [9, 4], "x": 9.5, "y": 4.375},
+                {"matrix": [9, 3], "x": 10.5, "y": 4.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/keebio/iris/rev3/rules.mk b/keyboards/keebio/iris/rev3/rules.mk
deleted file mode 100644
index 6f0bda4dcc0..00000000000
--- a/keyboards/keebio/iris/rev3/rules.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no        # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
-AUDIO_ENABLE = no           # Audio output
-RGBLIGHT_ENABLE = yes       # Enable WS2812 RGB underlight.
-
-ENCODER_ENABLE = yes
-LTO_ENABLE = yes
diff --git a/keyboards/keebio/iris/rev4/info.json b/keyboards/keebio/iris/rev4/info.json
deleted file mode 100644
index 6faf28ea447..00000000000
--- a/keyboards/keebio/iris/rev4/info.json
+++ /dev/null
@@ -1,136 +0,0 @@
-{
-    "keyboard_name": "Iris Rev. 4",
-    "usb": {
-        "pid": "0x4256",
-        "device_version": "4.0.0"
-    },
-    "matrix_pins": {
-        "cols": ["F1", "F4", "D3", "D2", "B7", "D4"],
-        "rows": ["B1", "F0", "F5", "F6", "F7"]
-    },
-    "diode_direction": "COL2ROW",
-    "encoder": {
-        "rotary": [
-            {"pin_a": "B2", "pin_b": "B3"}
-        ]
-    },
-    "backlight": {
-        "pin": "B5",
-        "levels": 5
-    },
-    "rgblight": {
-        "led_count": 12,
-        "split_count": [6, 6],
-        "animations": {
-            "breathing": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "snake": true,
-            "knight": true,
-            "christmas": true,
-            "static_gradient": true,
-            "rgb_test": true,
-            "alternating": true,
-            "twinkle": true
-        }
-    },
-    "ws2812": {
-        "pin": "D6"
-    },
-    "qmk_lufa_bootloader": {
-        "esc_input": "B1",
-        "esc_output": "F1",
-        "led": "B0",
-        "speaker": "C6"
-    },
-    "split": {
-        "enabled": true,
-        "soft_serial_pin": "D0",
-        "encoder": {
-            "right": {
-                "rotary": [
-                    {"pin_a": "F7", "pin_b": "F6"}
-                ]
-            }
-        },
-        "matrix_pins": {
-            "right": {
-                "cols": ["D4", "D7", "D3", "B7", "F0", "B3"],
-                "rows": ["B1", "B2", "D2", "F1", "F4"]
-            }
-        }
-    },
-    "processor": "atmega32u4",
-    "bootloader": "qmk-dfu",
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0.375},
-                {"matrix": [0, 1], "x": 1, "y": 0.375},
-                {"matrix": [0, 2], "x": 2, "y": 0.125},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0.125},
-                {"matrix": [0, 5], "x": 5, "y": 0.25},
-
-                {"matrix": [5, 5], "x": 9, "y": 0.25},
-                {"matrix": [5, 4], "x": 10, "y": 0.125},
-                {"matrix": [5, 3], "x": 11, "y": 0},
-                {"matrix": [5, 2], "x": 12, "y": 0.125},
-                {"matrix": [5, 1], "x": 13, "y": 0.375},
-                {"matrix": [5, 0], "x": 14, "y": 0.375},
-
-                {"matrix": [1, 0], "x": 0, "y": 1.375},
-                {"matrix": [1, 1], "x": 1, "y": 1.375},
-                {"matrix": [1, 2], "x": 2, "y": 1.125},
-                {"matrix": [1, 3], "x": 3, "y": 1},
-                {"matrix": [1, 4], "x": 4, "y": 1.125},
-                {"matrix": [1, 5], "x": 5, "y": 1.25},
-
-                {"matrix": [6, 5], "x": 9, "y": 1.25},
-                {"matrix": [6, 4], "x": 10, "y": 1.125},
-                {"matrix": [6, 3], "x": 11, "y": 1},
-                {"matrix": [6, 2], "x": 12, "y": 1.125},
-                {"matrix": [6, 1], "x": 13, "y": 1.375},
-                {"matrix": [6, 0], "x": 14, "y": 1.375},
-
-                {"matrix": [2, 0], "x": 0, "y": 2.375},
-                {"matrix": [2, 1], "x": 1, "y": 2.375},
-                {"matrix": [2, 2], "x": 2, "y": 2.125},
-                {"matrix": [2, 3], "x": 3, "y": 2},
-                {"matrix": [2, 4], "x": 4, "y": 2.125},
-                {"matrix": [2, 5], "x": 5, "y": 2.25},
-
-                {"matrix": [7, 5], "x": 9, "y": 2.25},
-                {"matrix": [7, 4], "x": 10, "y": 2.125},
-                {"matrix": [7, 3], "x": 11, "y": 2},
-                {"matrix": [7, 2], "x": 12, "y": 2.125},
-                {"matrix": [7, 1], "x": 13, "y": 2.375},
-                {"matrix": [7, 0], "x": 14, "y": 2.375},
-
-                {"matrix": [3, 0], "x": 0, "y": 3.375},
-                {"matrix": [3, 1], "x": 1, "y": 3.375},
-                {"matrix": [3, 2], "x": 2, "y": 3.125},
-                {"matrix": [3, 3], "x": 3, "y": 3},
-                {"matrix": [3, 4], "x": 4, "y": 3.125},
-                {"matrix": [3, 5], "x": 5, "y": 3.25},
-                {"matrix": [4, 5], "x": 6.15, "y": 3.75},
-
-                {"matrix": [9, 5], "x": 7.85, "y": 3.75},
-                {"matrix": [8, 5], "x": 9, "y": 3.25},
-                {"matrix": [8, 4], "x": 10, "y": 3.125},
-                {"matrix": [8, 3], "x": 11, "y": 3},
-                {"matrix": [8, 2], "x": 12, "y": 3.125},
-                {"matrix": [8, 1], "x": 13, "y": 3.375},
-                {"matrix": [8, 0], "x": 14, "y": 3.375},
-
-                {"matrix": [4, 2], "x": 3.5, "y": 4.25},
-                {"matrix": [4, 3], "x": 4.5, "y": 4.375},
-                {"matrix": [4, 4], "x": 5.6, "y": 4.75},
-
-                {"matrix": [9, 4], "x": 8.4, "y": 4.75},
-                {"matrix": [9, 3], "x": 9.5, "y": 4.375},
-                {"matrix": [9, 2], "x": 10.5, "y": 4.25}
-            ]
-        }
-    }
-}
diff --git a/keyboards/keebio/iris/rev4/keyboard.json b/keyboards/keebio/iris/rev4/keyboard.json
new file mode 100644
index 00000000000..88856e0030f
--- /dev/null
+++ b/keyboards/keebio/iris/rev4/keyboard.json
@@ -0,0 +1,147 @@
+{
+    "keyboard_name": "Iris Rev. 4",
+    "usb": {
+        "pid": "0x4256",
+        "device_version": "4.0.0"
+    },
+    "matrix_pins": {
+        "cols": ["F1", "F4", "D3", "D2", "B7", "D4"],
+        "rows": ["B1", "F0", "F5", "F6", "F7"]
+    },
+    "diode_direction": "COL2ROW",
+    "encoder": {
+        "rotary": [
+            {"pin_a": "B2", "pin_b": "B3"}
+        ]
+    },
+    "backlight": {
+        "pin": "B5",
+        "levels": 5
+    },
+    "rgblight": {
+        "led_count": 12,
+        "split_count": [6, 6],
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": true,
+            "twinkle": true
+        }
+    },
+    "ws2812": {
+        "pin": "D6"
+    },
+    "qmk_lufa_bootloader": {
+        "esc_input": "B1",
+        "esc_output": "F1",
+        "led": "B0",
+        "speaker": "C6"
+    },
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "D0",
+        "encoder": {
+            "right": {
+                "rotary": [
+                    {"pin_a": "F7", "pin_b": "F6"}
+                ]
+            }
+        },
+        "matrix_pins": {
+            "right": {
+                "cols": ["D4", "D7", "D3", "B7", "F0", "B3"],
+                "rows": ["B1", "B2", "D2", "F1", "F4"]
+            }
+        }
+    },
+    "processor": "atmega32u4",
+    "bootloader": "qmk-dfu",
+    "features": {
+        "bootmagic": false,
+        "mousekey": false,
+        "extrakey": true,
+        "backlight": true,
+        "rgblight": true,
+        "encoder": true
+    },
+    "build": {
+        "lto": true
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0.375},
+                {"matrix": [0, 1], "x": 1, "y": 0.375},
+                {"matrix": [0, 2], "x": 2, "y": 0.125},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0.125},
+                {"matrix": [0, 5], "x": 5, "y": 0.25},
+
+                {"matrix": [5, 5], "x": 9, "y": 0.25},
+                {"matrix": [5, 4], "x": 10, "y": 0.125},
+                {"matrix": [5, 3], "x": 11, "y": 0},
+                {"matrix": [5, 2], "x": 12, "y": 0.125},
+                {"matrix": [5, 1], "x": 13, "y": 0.375},
+                {"matrix": [5, 0], "x": 14, "y": 0.375},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.375},
+                {"matrix": [1, 1], "x": 1, "y": 1.375},
+                {"matrix": [1, 2], "x": 2, "y": 1.125},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1.125},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+
+                {"matrix": [6, 5], "x": 9, "y": 1.25},
+                {"matrix": [6, 4], "x": 10, "y": 1.125},
+                {"matrix": [6, 3], "x": 11, "y": 1},
+                {"matrix": [6, 2], "x": 12, "y": 1.125},
+                {"matrix": [6, 1], "x": 13, "y": 1.375},
+                {"matrix": [6, 0], "x": 14, "y": 1.375},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.375},
+                {"matrix": [2, 1], "x": 1, "y": 2.375},
+                {"matrix": [2, 2], "x": 2, "y": 2.125},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2.125},
+                {"matrix": [2, 5], "x": 5, "y": 2.25},
+
+                {"matrix": [7, 5], "x": 9, "y": 2.25},
+                {"matrix": [7, 4], "x": 10, "y": 2.125},
+                {"matrix": [7, 3], "x": 11, "y": 2},
+                {"matrix": [7, 2], "x": 12, "y": 2.125},
+                {"matrix": [7, 1], "x": 13, "y": 2.375},
+                {"matrix": [7, 0], "x": 14, "y": 2.375},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.375},
+                {"matrix": [3, 1], "x": 1, "y": 3.375},
+                {"matrix": [3, 2], "x": 2, "y": 3.125},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3.125},
+                {"matrix": [3, 5], "x": 5, "y": 3.25},
+                {"matrix": [4, 5], "x": 6.15, "y": 3.75},
+
+                {"matrix": [9, 5], "x": 7.85, "y": 3.75},
+                {"matrix": [8, 5], "x": 9, "y": 3.25},
+                {"matrix": [8, 4], "x": 10, "y": 3.125},
+                {"matrix": [8, 3], "x": 11, "y": 3},
+                {"matrix": [8, 2], "x": 12, "y": 3.125},
+                {"matrix": [8, 1], "x": 13, "y": 3.375},
+                {"matrix": [8, 0], "x": 14, "y": 3.375},
+
+                {"matrix": [4, 2], "x": 3.5, "y": 4.25},
+                {"matrix": [4, 3], "x": 4.5, "y": 4.375},
+                {"matrix": [4, 4], "x": 5.6, "y": 4.75},
+
+                {"matrix": [9, 4], "x": 8.4, "y": 4.75},
+                {"matrix": [9, 3], "x": 9.5, "y": 4.375},
+                {"matrix": [9, 2], "x": 10.5, "y": 4.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/keebio/iris/rev4/rules.mk b/keyboards/keebio/iris/rev4/rules.mk
deleted file mode 100644
index 55a08a2117b..00000000000
--- a/keyboards/keebio/iris/rev4/rules.mk
+++ /dev/null
@@ -1,16 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
-AUDIO_ENABLE = no           # Audio output
-RGBLIGHT_ENABLE = yes       # Enable WS2812 RGB underlight.
-
-ENCODER_ENABLE = yes
-
-LTO_ENABLE = yes
diff --git a/keyboards/keebio/iris/rev6/info.json b/keyboards/keebio/iris/rev6/info.json
deleted file mode 100644
index 837bb4e0d06..00000000000
--- a/keyboards/keebio/iris/rev6/info.json
+++ /dev/null
@@ -1,169 +0,0 @@
-{
-    "keyboard_name": "Iris Rev. 6b",
-    "usb": {
-        "pid": "0x6456",
-        "device_version": "6.2.0"
-    },
-    "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,
-            "rainbow_moving_chevron": true,
-            "cycle_out_in": true,
-            "cycle_out_in_dual": true,
-            "cycle_pinwheel": true,
-            "cycle_spiral": true,
-            "dual_beacon": true,
-            "rainbow_beacon": true,
-            "rainbow_pinwheels": 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",
-        "max_brightness": 160,
-        "sleep": true,
-        "split_count": [34, 34]
-    },
-    "matrix_pins": {
-        "cols": ["F1", "F4", "B5", "C7", "D4", "D6"],
-        "rows": ["B1", "F0", "F5", "B4", "D7"]
-    },
-    "diode_direction": "COL2ROW",
-    "encoder": {
-        "rotary": [
-            {"pin_a": "B3", "pin_b": "B2"}
-        ]
-    },
-    "ws2812": {
-        "pin": "E6"
-    },
-    "rgblight": {
-        "saturation_steps": 8,
-        "brightness_steps": 8,
-        "led_count": 68,
-        "max_brightness": 120,
-        "sleep": true,
-        "split_count": [34, 34],
-        "animations": {
-            "breathing": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "snake": true,
-            "knight": true,
-            "christmas": true,
-            "static_gradient": true,
-            "rgb_test": true,
-            "alternating": true,
-            "twinkle": true
-        },
-        "default": {
-            "val": 120
-        }
-    },
-    "split": {
-        "enabled": true,
-        "soft_serial_pin": "D0",
-        "matrix_pins": {
-            "right": {
-                "cols": ["D4", "D6", "D7", "C7", "F1", "F4"],
-                "rows": ["B1", "F0", "F5", "B4", "B5"]
-            }
-        }
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0.375},
-                {"matrix": [0, 1], "x": 1, "y": 0.375},
-                {"matrix": [0, 2], "x": 2, "y": 0.125},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0.125},
-                {"matrix": [0, 5], "x": 5, "y": 0.25},
-
-                {"matrix": [5, 5], "x": 9, "y": 0.25},
-                {"matrix": [5, 4], "x": 10, "y": 0.125},
-                {"matrix": [5, 3], "x": 11, "y": 0},
-                {"matrix": [5, 2], "x": 12, "y": 0.125},
-                {"matrix": [5, 1], "x": 13, "y": 0.375},
-                {"matrix": [5, 0], "x": 14, "y": 0.375},
-
-                {"matrix": [1, 0], "x": 0, "y": 1.375},
-                {"matrix": [1, 1], "x": 1, "y": 1.375},
-                {"matrix": [1, 2], "x": 2, "y": 1.125},
-                {"matrix": [1, 3], "x": 3, "y": 1},
-                {"matrix": [1, 4], "x": 4, "y": 1.125},
-                {"matrix": [1, 5], "x": 5, "y": 1.25},
-
-                {"matrix": [6, 5], "x": 9, "y": 1.25},
-                {"matrix": [6, 4], "x": 10, "y": 1.125},
-                {"matrix": [6, 3], "x": 11, "y": 1},
-                {"matrix": [6, 2], "x": 12, "y": 1.125},
-                {"matrix": [6, 1], "x": 13, "y": 1.375},
-                {"matrix": [6, 0], "x": 14, "y": 1.375},
-
-                {"matrix": [2, 0], "x": 0, "y": 2.375},
-                {"matrix": [2, 1], "x": 1, "y": 2.375},
-                {"matrix": [2, 2], "x": 2, "y": 2.125},
-                {"matrix": [2, 3], "x": 3, "y": 2},
-                {"matrix": [2, 4], "x": 4, "y": 2.125},
-                {"matrix": [2, 5], "x": 5, "y": 2.25},
-
-                {"matrix": [7, 5], "x": 9, "y": 2.25},
-                {"matrix": [7, 4], "x": 10, "y": 2.125},
-                {"matrix": [7, 3], "x": 11, "y": 2},
-                {"matrix": [7, 2], "x": 12, "y": 2.125},
-                {"matrix": [7, 1], "x": 13, "y": 2.375},
-                {"matrix": [7, 0], "x": 14, "y": 2.375},
-
-                {"matrix": [3, 0], "x": 0, "y": 3.375},
-                {"matrix": [3, 1], "x": 1, "y": 3.375},
-                {"matrix": [3, 2], "x": 2, "y": 3.125},
-                {"matrix": [3, 3], "x": 3, "y": 3},
-                {"matrix": [3, 4], "x": 4, "y": 3.125},
-                {"matrix": [3, 5], "x": 5, "y": 3.25},
-                {"matrix": [4, 5], "x": 6.15, "y": 3.75},
-
-                {"matrix": [9, 5], "x": 7.85, "y": 3.75},
-                {"matrix": [8, 5], "x": 9, "y": 3.25},
-                {"matrix": [8, 4], "x": 10, "y": 3.125},
-                {"matrix": [8, 3], "x": 11, "y": 3},
-                {"matrix": [8, 2], "x": 12, "y": 3.125},
-                {"matrix": [8, 1], "x": 13, "y": 3.375},
-                {"matrix": [8, 0], "x": 14, "y": 3.375},
-
-                {"matrix": [4, 2], "x": 3.5, "y": 4.25},
-                {"matrix": [4, 3], "x": 4.5, "y": 4.375},
-                {"matrix": [4, 4], "x": 5.6, "y": 4.75},
-
-                {"matrix": [9, 4], "x": 8.4, "y": 4.75},
-                {"matrix": [9, 3], "x": 9.5, "y": 4.375},
-                {"matrix": [9, 2], "x": 10.5, "y": 4.25}
-            ]
-        }
-    }
-}
diff --git a/keyboards/keebio/iris/rev6/keyboard.json b/keyboards/keebio/iris/rev6/keyboard.json
new file mode 100644
index 00000000000..7bbaabe2770
--- /dev/null
+++ b/keyboards/keebio/iris/rev6/keyboard.json
@@ -0,0 +1,180 @@
+{
+    "keyboard_name": "Iris Rev. 6b",
+    "usb": {
+        "pid": "0x6456",
+        "device_version": "6.2.0"
+    },
+    "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,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": 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",
+        "max_brightness": 160,
+        "sleep": true,
+        "split_count": [34, 34]
+    },
+    "matrix_pins": {
+        "cols": ["F1", "F4", "B5", "C7", "D4", "D6"],
+        "rows": ["B1", "F0", "F5", "B4", "D7"]
+    },
+    "diode_direction": "COL2ROW",
+    "encoder": {
+        "rotary": [
+            {"pin_a": "B3", "pin_b": "B2"}
+        ]
+    },
+    "ws2812": {
+        "pin": "E6"
+    },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 68,
+        "max_brightness": 120,
+        "sleep": true,
+        "split_count": [34, 34],
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": true,
+            "twinkle": true
+        },
+        "default": {
+            "val": 120
+        }
+    },
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "D0",
+        "matrix_pins": {
+            "right": {
+                "cols": ["D4", "D6", "D7", "C7", "F1", "F4"],
+                "rows": ["B1", "F0", "F5", "B4", "B5"]
+            }
+        }
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": false,
+        "mousekey": false,
+        "extrakey": true,
+        "console": true,
+        "rgb_matrix": true,
+        "encoder": true
+    },
+    "build": {
+        "lto": true
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0.375},
+                {"matrix": [0, 1], "x": 1, "y": 0.375},
+                {"matrix": [0, 2], "x": 2, "y": 0.125},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0.125},
+                {"matrix": [0, 5], "x": 5, "y": 0.25},
+
+                {"matrix": [5, 5], "x": 9, "y": 0.25},
+                {"matrix": [5, 4], "x": 10, "y": 0.125},
+                {"matrix": [5, 3], "x": 11, "y": 0},
+                {"matrix": [5, 2], "x": 12, "y": 0.125},
+                {"matrix": [5, 1], "x": 13, "y": 0.375},
+                {"matrix": [5, 0], "x": 14, "y": 0.375},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.375},
+                {"matrix": [1, 1], "x": 1, "y": 1.375},
+                {"matrix": [1, 2], "x": 2, "y": 1.125},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1.125},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+
+                {"matrix": [6, 5], "x": 9, "y": 1.25},
+                {"matrix": [6, 4], "x": 10, "y": 1.125},
+                {"matrix": [6, 3], "x": 11, "y": 1},
+                {"matrix": [6, 2], "x": 12, "y": 1.125},
+                {"matrix": [6, 1], "x": 13, "y": 1.375},
+                {"matrix": [6, 0], "x": 14, "y": 1.375},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.375},
+                {"matrix": [2, 1], "x": 1, "y": 2.375},
+                {"matrix": [2, 2], "x": 2, "y": 2.125},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2.125},
+                {"matrix": [2, 5], "x": 5, "y": 2.25},
+
+                {"matrix": [7, 5], "x": 9, "y": 2.25},
+                {"matrix": [7, 4], "x": 10, "y": 2.125},
+                {"matrix": [7, 3], "x": 11, "y": 2},
+                {"matrix": [7, 2], "x": 12, "y": 2.125},
+                {"matrix": [7, 1], "x": 13, "y": 2.375},
+                {"matrix": [7, 0], "x": 14, "y": 2.375},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.375},
+                {"matrix": [3, 1], "x": 1, "y": 3.375},
+                {"matrix": [3, 2], "x": 2, "y": 3.125},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3.125},
+                {"matrix": [3, 5], "x": 5, "y": 3.25},
+                {"matrix": [4, 5], "x": 6.15, "y": 3.75},
+
+                {"matrix": [9, 5], "x": 7.85, "y": 3.75},
+                {"matrix": [8, 5], "x": 9, "y": 3.25},
+                {"matrix": [8, 4], "x": 10, "y": 3.125},
+                {"matrix": [8, 3], "x": 11, "y": 3},
+                {"matrix": [8, 2], "x": 12, "y": 3.125},
+                {"matrix": [8, 1], "x": 13, "y": 3.375},
+                {"matrix": [8, 0], "x": 14, "y": 3.375},
+
+                {"matrix": [4, 2], "x": 3.5, "y": 4.25},
+                {"matrix": [4, 3], "x": 4.5, "y": 4.375},
+                {"matrix": [4, 4], "x": 5.6, "y": 4.75},
+
+                {"matrix": [9, 4], "x": 8.4, "y": 4.75},
+                {"matrix": [9, 3], "x": 9.5, "y": 4.375},
+                {"matrix": [9, 2], "x": 10.5, "y": 4.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/keebio/iris/rev6/rules.mk b/keyboards/keebio/iris/rev6/rules.mk
deleted file mode 100644
index 69d1764838d..00000000000
--- a/keyboards/keebio/iris/rev6/rules.mk
+++ /dev/null
@@ -1,16 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = yes        # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-ENCODER_ENABLE = yes
-RGB_MATRIX_ENABLE = yes
-
-LTO_ENABLE = yes
diff --git a/keyboards/keebio/iris/rev7/info.json b/keyboards/keebio/iris/rev7/info.json
deleted file mode 100644
index a3f25202ce3..00000000000
--- a/keyboards/keebio/iris/rev7/info.json
+++ /dev/null
@@ -1,168 +0,0 @@
-{
-    "keyboard_name": "Iris Rev. 7",
-    "usb": {
-        "pid": "0x7256",
-        "device_version": "7.0.0"
-    },
-    "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,
-            "rainbow_moving_chevron": true,
-            "cycle_out_in": true,
-            "cycle_out_in_dual": true,
-            "cycle_pinwheel": true,
-            "cycle_spiral": true,
-            "dual_beacon": true,
-            "rainbow_beacon": true,
-            "rainbow_pinwheels": 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
-        },
-        "driver": "ws2812",
-        "max_brightness": 120,
-        "sleep": true,
-        "split_count": [34, 34]
-    },
-    "matrix_pins": {
-        "cols": ["F1", "F4", "B5", "C7", "D4", "D6"],
-        "rows": ["B1", "F0", "F5", "B4", "D7"]
-    },
-    "diode_direction": "COL2ROW",
-    "encoder": {
-        "rotary": [
-            {"pin_a": "B3", "pin_b": "B2"},
-            {"pin_a": "F6", "pin_b": "F7"}
-        ]
-    },
-    "ws2812": {
-        "pin": "E6"
-    },
-    "rgblight": {
-        "saturation_steps": 8,
-        "brightness_steps": 8,
-        "led_count": 68,
-        "max_brightness": 120,
-        "sleep": true,
-        "split_count": [34, 34],
-        "animations": {
-            "breathing": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "snake": true,
-            "knight": true,
-            "christmas": true,
-            "static_gradient": true,
-            "rgb_test": true,
-            "alternating": true,
-            "twinkle": true
-        },
-        "default": {
-            "val": 120
-        }
-    },
-    "split": {
-        "enabled": true,
-        "soft_serial_pin": "D0",
-        "matrix_pins": {
-            "right": {
-                "cols": ["D4", "D6", "D7", "C7", "F1", "F4"],
-                "rows": ["B1", "F0", "F5", "B4", "B5"]
-            }
-        }
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0.375},
-                {"matrix": [0, 1], "x": 1, "y": 0.375},
-                {"matrix": [0, 2], "x": 2, "y": 0.125},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0.125},
-                {"matrix": [0, 5], "x": 5, "y": 0.25},
-
-                {"matrix": [5, 5], "x": 9, "y": 0.25},
-                {"matrix": [5, 4], "x": 10, "y": 0.125},
-                {"matrix": [5, 3], "x": 11, "y": 0},
-                {"matrix": [5, 2], "x": 12, "y": 0.125},
-                {"matrix": [5, 1], "x": 13, "y": 0.375},
-                {"matrix": [5, 0], "x": 14, "y": 0.375},
-
-                {"matrix": [1, 0], "x": 0, "y": 1.375},
-                {"matrix": [1, 1], "x": 1, "y": 1.375},
-                {"matrix": [1, 2], "x": 2, "y": 1.125},
-                {"matrix": [1, 3], "x": 3, "y": 1},
-                {"matrix": [1, 4], "x": 4, "y": 1.125},
-                {"matrix": [1, 5], "x": 5, "y": 1.25},
-
-                {"matrix": [6, 5], "x": 9, "y": 1.25},
-                {"matrix": [6, 4], "x": 10, "y": 1.125},
-                {"matrix": [6, 3], "x": 11, "y": 1},
-                {"matrix": [6, 2], "x": 12, "y": 1.125},
-                {"matrix": [6, 1], "x": 13, "y": 1.375},
-                {"matrix": [6, 0], "x": 14, "y": 1.375},
-
-                {"matrix": [2, 0], "x": 0, "y": 2.375},
-                {"matrix": [2, 1], "x": 1, "y": 2.375},
-                {"matrix": [2, 2], "x": 2, "y": 2.125},
-                {"matrix": [2, 3], "x": 3, "y": 2},
-                {"matrix": [2, 4], "x": 4, "y": 2.125},
-                {"matrix": [2, 5], "x": 5, "y": 2.25},
-
-                {"matrix": [7, 5], "x": 9, "y": 2.25},
-                {"matrix": [7, 4], "x": 10, "y": 2.125},
-                {"matrix": [7, 3], "x": 11, "y": 2},
-                {"matrix": [7, 2], "x": 12, "y": 2.125},
-                {"matrix": [7, 1], "x": 13, "y": 2.375},
-                {"matrix": [7, 0], "x": 14, "y": 2.375},
-
-                {"matrix": [3, 0], "x": 0, "y": 3.375},
-                {"matrix": [3, 1], "x": 1, "y": 3.375},
-                {"matrix": [3, 2], "x": 2, "y": 3.125},
-                {"matrix": [3, 3], "x": 3, "y": 3},
-                {"matrix": [3, 4], "x": 4, "y": 3.125},
-                {"matrix": [3, 5], "x": 5, "y": 3.25},
-                {"matrix": [4, 5], "x": 6.15, "y": 3.75},
-
-                {"matrix": [9, 5], "x": 7.85, "y": 3.75},
-                {"matrix": [8, 5], "x": 9, "y": 3.25},
-                {"matrix": [8, 4], "x": 10, "y": 3.125},
-                {"matrix": [8, 3], "x": 11, "y": 3},
-                {"matrix": [8, 2], "x": 12, "y": 3.125},
-                {"matrix": [8, 1], "x": 13, "y": 3.375},
-                {"matrix": [8, 0], "x": 14, "y": 3.375},
-
-                {"matrix": [4, 2], "x": 3.5, "y": 4.25},
-                {"matrix": [4, 3], "x": 4.5, "y": 4.375},
-                {"matrix": [4, 4], "x": 5.6, "y": 4.75},
-
-                {"matrix": [9, 4], "x": 8.4, "y": 4.75},
-                {"matrix": [9, 3], "x": 9.5, "y": 4.375},
-                {"matrix": [9, 2], "x": 10.5, "y": 4.25}
-            ]
-        }
-    }
-}
diff --git a/keyboards/keebio/iris/rev7/keyboard.json b/keyboards/keebio/iris/rev7/keyboard.json
new file mode 100644
index 00000000000..decb81a18ed
--- /dev/null
+++ b/keyboards/keebio/iris/rev7/keyboard.json
@@ -0,0 +1,179 @@
+{
+    "keyboard_name": "Iris Rev. 7",
+    "usb": {
+        "pid": "0x7256",
+        "device_version": "7.0.0"
+    },
+    "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,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": 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
+        },
+        "driver": "ws2812",
+        "max_brightness": 120,
+        "sleep": true,
+        "split_count": [34, 34]
+    },
+    "matrix_pins": {
+        "cols": ["F1", "F4", "B5", "C7", "D4", "D6"],
+        "rows": ["B1", "F0", "F5", "B4", "D7"]
+    },
+    "diode_direction": "COL2ROW",
+    "encoder": {
+        "rotary": [
+            {"pin_a": "B3", "pin_b": "B2"},
+            {"pin_a": "F6", "pin_b": "F7"}
+        ]
+    },
+    "ws2812": {
+        "pin": "E6"
+    },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 68,
+        "max_brightness": 120,
+        "sleep": true,
+        "split_count": [34, 34],
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": true,
+            "twinkle": true
+        },
+        "default": {
+            "val": 120
+        }
+    },
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "D0",
+        "matrix_pins": {
+            "right": {
+                "cols": ["D4", "D6", "D7", "C7", "F1", "F4"],
+                "rows": ["B1", "F0", "F5", "B4", "B5"]
+            }
+        }
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": false,
+        "mousekey": false,
+        "extrakey": true,
+        "console": true,
+        "rgb_matrix": true,
+        "encoder": true
+    },
+    "build": {
+        "lto": true
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0.375},
+                {"matrix": [0, 1], "x": 1, "y": 0.375},
+                {"matrix": [0, 2], "x": 2, "y": 0.125},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0.125},
+                {"matrix": [0, 5], "x": 5, "y": 0.25},
+
+                {"matrix": [5, 5], "x": 9, "y": 0.25},
+                {"matrix": [5, 4], "x": 10, "y": 0.125},
+                {"matrix": [5, 3], "x": 11, "y": 0},
+                {"matrix": [5, 2], "x": 12, "y": 0.125},
+                {"matrix": [5, 1], "x": 13, "y": 0.375},
+                {"matrix": [5, 0], "x": 14, "y": 0.375},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.375},
+                {"matrix": [1, 1], "x": 1, "y": 1.375},
+                {"matrix": [1, 2], "x": 2, "y": 1.125},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1.125},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+
+                {"matrix": [6, 5], "x": 9, "y": 1.25},
+                {"matrix": [6, 4], "x": 10, "y": 1.125},
+                {"matrix": [6, 3], "x": 11, "y": 1},
+                {"matrix": [6, 2], "x": 12, "y": 1.125},
+                {"matrix": [6, 1], "x": 13, "y": 1.375},
+                {"matrix": [6, 0], "x": 14, "y": 1.375},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.375},
+                {"matrix": [2, 1], "x": 1, "y": 2.375},
+                {"matrix": [2, 2], "x": 2, "y": 2.125},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2.125},
+                {"matrix": [2, 5], "x": 5, "y": 2.25},
+
+                {"matrix": [7, 5], "x": 9, "y": 2.25},
+                {"matrix": [7, 4], "x": 10, "y": 2.125},
+                {"matrix": [7, 3], "x": 11, "y": 2},
+                {"matrix": [7, 2], "x": 12, "y": 2.125},
+                {"matrix": [7, 1], "x": 13, "y": 2.375},
+                {"matrix": [7, 0], "x": 14, "y": 2.375},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.375},
+                {"matrix": [3, 1], "x": 1, "y": 3.375},
+                {"matrix": [3, 2], "x": 2, "y": 3.125},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3.125},
+                {"matrix": [3, 5], "x": 5, "y": 3.25},
+                {"matrix": [4, 5], "x": 6.15, "y": 3.75},
+
+                {"matrix": [9, 5], "x": 7.85, "y": 3.75},
+                {"matrix": [8, 5], "x": 9, "y": 3.25},
+                {"matrix": [8, 4], "x": 10, "y": 3.125},
+                {"matrix": [8, 3], "x": 11, "y": 3},
+                {"matrix": [8, 2], "x": 12, "y": 3.125},
+                {"matrix": [8, 1], "x": 13, "y": 3.375},
+                {"matrix": [8, 0], "x": 14, "y": 3.375},
+
+                {"matrix": [4, 2], "x": 3.5, "y": 4.25},
+                {"matrix": [4, 3], "x": 4.5, "y": 4.375},
+                {"matrix": [4, 4], "x": 5.6, "y": 4.75},
+
+                {"matrix": [9, 4], "x": 8.4, "y": 4.75},
+                {"matrix": [9, 3], "x": 9.5, "y": 4.375},
+                {"matrix": [9, 2], "x": 10.5, "y": 4.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/keebio/iris/rev7/rules.mk b/keyboards/keebio/iris/rev7/rules.mk
deleted file mode 100644
index 69d1764838d..00000000000
--- a/keyboards/keebio/iris/rev7/rules.mk
+++ /dev/null
@@ -1,16 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = yes        # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-ENCODER_ENABLE = yes
-RGB_MATRIX_ENABLE = yes
-
-LTO_ENABLE = yes
diff --git a/keyboards/keebio/iris/rev8/info.json b/keyboards/keebio/iris/rev8/keyboard.json
similarity index 100%
rename from keyboards/keebio/iris/rev8/info.json
rename to keyboards/keebio/iris/rev8/keyboard.json
diff --git a/keyboards/keebio/iris_ce/rev1/info.json b/keyboards/keebio/iris_ce/rev1/keyboard.json
similarity index 100%
rename from keyboards/keebio/iris_ce/rev1/info.json
rename to keyboards/keebio/iris_ce/rev1/keyboard.json
diff --git a/keyboards/keebio/kbo5000/rev1/info.json b/keyboards/keebio/kbo5000/rev1/info.json
deleted file mode 100644
index 939a7723485..00000000000
--- a/keyboards/keebio/kbo5000/rev1/info.json
+++ /dev/null
@@ -1,444 +0,0 @@
-{
-    "keyboard_name": "KBO-5000 Rev. 1",
-    "manufacturer": "Keebio",
-    "url": "https://keeb.io",
-    "maintainer": "nooges",
-    "usb": {
-        "vid": "0xCB10",
-        "pid": "0x136A",
-        "device_version": "1.0.0"
-    },
-    "matrix_pins": {
-        "cols": ["F4", null, "F0", "B7", "B3", "D2", "D3", "D5", "D4", null],
-        "rows": ["B1", "B2", "C7", "B4", "D7", "B0"]
-    },
-    "diode_direction": "COL2ROW",
-    "encoder": {
-        "rotary": [
-            {"pin_a": "F5", "pin_b": "F6"}
-        ]
-    },
-    "backlight": {
-        "pin": "B5"
-    },
-    "rgblight": {
-        "led_count": 16,
-        "led_map": [1, 2, 3, 12, 13, 14, 15, 0, 7, 6, 5, 4, 11, 10, 9, 8],
-        "split_count": [8, 8],
-        "animations": {
-            "breathing": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "snake": true,
-            "knight": true,
-            "christmas": true,
-            "static_gradient": true,
-            "rgb_test": true,
-            "alternating": true,
-            "twinkle": true
-        }
-    },
-    "ws2812": {
-        "pin": "E6"
-    },
-    "split": {
-        "enabled": true,
-        "soft_serial_pin": "D0",
-        "encoder": {
-            "right": {
-                "rotary": [
-                    {"pin_a": "D6", "pin_b": "D4"},
-                    {"pin_a": "C7", "pin_b": "C6"}
-                ]
-            }
-        },
-        "matrix_pins": {
-            "right": {
-                "cols": ["F1", "F0", "F4", "F5", "F6", "D5", "D2", "D3", "B7", "B1"],
-                "rows": ["B3", "B2", "B6", "B4", "D7", "B0"]
-            }
-        }
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "layouts": {
-        "LAYOUT_ansi": {
-            "layout": [
-                {"matrix": [5, 0], "x": 0, "y": 0},
-
-                {"matrix": [5, 3], "x": 2, "y": 0},
-                {"matrix": [5, 4], "x": 3, "y": 0},
-                {"matrix": [5, 5], "x": 4, "y": 0},
-                {"matrix": [5, 6], "x": 5, "y": 0},
-
-                {"matrix": [5, 7], "x": 6.5, "y": 0},
-                {"matrix": [5, 8], "x": 7.5, "y": 0},
-
-                {"matrix": [11, 0], "x": 10, "y": 0},
-                {"matrix": [11, 1], "x": 11, "y": 0},
-
-                {"matrix": [11, 3], "x": 12.5, "y": 0},
-                {"matrix": [11, 4], "x": 13.5, "y": 0},
-                {"matrix": [11, 5], "x": 14.5, "y": 0},
-                {"matrix": [11, 6], "x": 15.5, "y": 0},
-
-                {"matrix": [11, 7], "x": 17.5, "y": 0},
-                {"matrix": [11, 8], "x": 18.5, "y": 0},
-                {"matrix": [11, 9], "x": 19.5, "y": 0},
-
-                {"matrix": [0, 0], "x": 0, "y": 1.25},
-
-                {"matrix": [0, 2], "x": 1.5, "y": 1.25},
-                {"matrix": [0, 3], "x": 2.5, "y": 1.25},
-                {"matrix": [0, 4], "x": 3.5, "y": 1.25},
-                {"matrix": [0, 5], "x": 4.5, "y": 1.25},
-                {"matrix": [0, 6], "x": 5.5, "y": 1.25},
-                {"matrix": [0, 7], "x": 6.5, "y": 1.25},
-                {"matrix": [0, 8], "x": 7.5, "y": 1.25},
-
-                {"matrix": [6, 0], "x": 10, "y": 1.25},
-                {"matrix": [6, 1], "x": 11, "y": 1.25},
-                {"matrix": [6, 2], "x": 12, "y": 1.25},
-                {"matrix": [6, 3], "x": 13, "y": 1.25},
-                {"matrix": [6, 4], "x": 14, "y": 1.25},
-                {"matrix": [6, 5], "x": 15, "y": 1.25},
-                {"matrix": [6, 6], "x": 16, "y": 1.25},
-                {"matrix": [6, 7], "x": 17, "y": 1.25},
-
-                {"matrix": [6, 8], "x": 18.5, "y": 1.25},
-                {"matrix": [6, 9], "x": 19.5, "y": 1.25},
-
-                {"matrix": [1, 0], "x": 0, "y": 2.25},
-
-                {"matrix": [1, 2], "x": 1.5, "y": 2.25, "w": 1.5},
-                {"matrix": [1, 3], "x": 3, "y": 2.25},
-                {"matrix": [1, 4], "x": 4, "y": 2.25},
-                {"matrix": [1, 5], "x": 5, "y": 2.25},
-                {"matrix": [1, 6], "x": 6, "y": 2.25},
-                {"matrix": [1, 7], "x": 7, "y": 2.25},
-
-                {"matrix": [7, 0], "x": 9.5, "y": 2.25},
-                {"matrix": [7, 1], "x": 10.5, "y": 2.25},
-                {"matrix": [7, 2], "x": 11.5, "y": 2.25},
-                {"matrix": [7, 3], "x": 12.5, "y": 2.25},
-                {"matrix": [7, 4], "x": 13.5, "y": 2.25},
-                {"matrix": [7, 5], "x": 14.5, "y": 2.25},
-                {"matrix": [7, 6], "x": 15.5, "y": 2.25},
-                {"matrix": [7, 7], "x": 16.5, "y": 2.25, "w": 1.5},
-
-                {"matrix": [7, 8], "x": 18.5, "y": 2.25},
-                {"matrix": [7, 9], "x": 19.5, "y": 2.25},
-
-                {"matrix": [2, 0], "x": 0, "y": 3.25},
-
-                {"matrix": [2, 2], "x": 1.5, "y": 3.25, "w": 1.75},
-                {"matrix": [2, 3], "x": 3.25, "y": 3.25},
-                {"matrix": [2, 4], "x": 4.25, "y": 3.25},
-                {"matrix": [2, 5], "x": 5.25, "y": 3.25},
-                {"matrix": [2, 6], "x": 6.25, "y": 3.25},
-                {"matrix": [2, 7], "x": 7.25, "y": 3.25},
-
-                {"matrix": [8, 0], "x": 9.75, "y": 3.25},
-                {"matrix": [8, 1], "x": 10.75, "y": 3.25},
-                {"matrix": [8, 2], "x": 11.75, "y": 3.25},
-                {"matrix": [8, 3], "x": 12.75, "y": 3.25},
-                {"matrix": [8, 4], "x": 13.75, "y": 3.25},
-                {"matrix": [8, 5], "x": 14.75, "y": 3.25},
-                {"matrix": [8, 7], "x": 15.75, "y": 3.25, "w": 2.25},
-
-                {"matrix": [8, 8], "x": 18.5, "y": 3.25},
-                {"matrix": [8, 9], "x": 19.5, "y": 3.25},
-
-                {"matrix": [3, 0], "x": 0, "y": 4.25},
-
-                {"matrix": [3, 2], "x": 1.5, "y": 4.25, "w": 2.25},
-                {"matrix": [3, 4], "x": 3.75, "y": 4.25},
-                {"matrix": [3, 5], "x": 4.75, "y": 4.25},
-                {"matrix": [3, 6], "x": 5.75, "y": 4.25},
-                {"matrix": [3, 7], "x": 6.75, "y": 4.25},
-                {"matrix": [3, 8], "x": 7.75, "y": 4.25},
-
-                {"matrix": [9, 0], "x": 10.25, "y": 4.25},
-                {"matrix": [9, 1], "x": 11.25, "y": 4.25},
-                {"matrix": [9, 2], "x": 12.25, "y": 4.25},
-                {"matrix": [9, 3], "x": 13.25, "y": 4.25},
-                {"matrix": [9, 4], "x": 14.25, "y": 4.25},
-                {"matrix": [9, 6], "x": 15.25, "y": 4.25, "w": 1.75},
-
-                {"matrix": [9, 8], "x": 18.5, "y": 4.25},
-
-                {"matrix": [4, 0], "x": 0, "y": 5.25},
-
-                {"matrix": [4, 2], "x": 1.5, "y": 5.25, "w": 1.25},
-                {"matrix": [4, 3], "x": 2.75, "y": 5.25},
-                {"matrix": [4, 4], "x": 3.75, "y": 5.25, "w": 1.25},
-                {"matrix": [4, 5], "x": 5, "y": 5.25, "w": 1.25},
-                {"matrix": [4, 6], "x": 6.25, "y": 5.25},
-                {"matrix": [4, 7], "x": 7.25, "y": 5.25, "w": 1.25},
-
-                {"matrix": [10, 0], "x": 10, "y": 5.25, "w": 1.25},
-                {"matrix": [10, 1], "x": 11.25, "y": 5.25, "w": 2.25},
-                {"matrix": [10, 2], "x": 13.5, "y": 5.25, "w": 1.25},
-                {"matrix": [10, 3], "x": 14.75, "y": 5.25},
-                {"matrix": [10, 6], "x": 15.75, "y": 5.25, "w": 1.25},
-
-                {"matrix": [10, 7], "x": 17.5, "y": 5.25},
-                {"matrix": [10, 8], "x": 18.5, "y": 5.25},
-                {"matrix": [10, 9], "x": 19.5, "y": 5.25}
-            ]
-        },
-        "LAYOUT_iso": {
-            "layout": [
-                {"matrix": [5, 0], "x": 0, "y": 0},
-
-                {"matrix": [5, 3], "x": 2, "y": 0},
-                {"matrix": [5, 4], "x": 3, "y": 0},
-                {"matrix": [5, 5], "x": 4, "y": 0},
-                {"matrix": [5, 6], "x": 5, "y": 0},
-
-                {"matrix": [5, 7], "x": 6.5, "y": 0},
-                {"matrix": [5, 8], "x": 7.5, "y": 0},
-
-                {"matrix": [11, 0], "x": 10, "y": 0},
-                {"matrix": [11, 1], "x": 11, "y": 0},
-
-                {"matrix": [11, 3], "x": 12.5, "y": 0},
-                {"matrix": [11, 4], "x": 13.5, "y": 0},
-                {"matrix": [11, 5], "x": 14.5, "y": 0},
-                {"matrix": [11, 6], "x": 15.5, "y": 0},
-
-                {"matrix": [11, 7], "x": 17.5, "y": 0},
-                {"matrix": [11, 8], "x": 18.5, "y": 0},
-                {"matrix": [11, 9], "x": 19.5, "y": 0},
-
-                {"matrix": [0, 0], "x": 0, "y": 1.25},
-
-                {"matrix": [0, 2], "x": 1.5, "y": 1.25},
-                {"matrix": [0, 3], "x": 2.5, "y": 1.25},
-                {"matrix": [0, 4], "x": 3.5, "y": 1.25},
-                {"matrix": [0, 5], "x": 4.5, "y": 1.25},
-                {"matrix": [0, 6], "x": 5.5, "y": 1.25},
-                {"matrix": [0, 7], "x": 6.5, "y": 1.25},
-                {"matrix": [0, 8], "x": 7.5, "y": 1.25},
-
-                {"matrix": [6, 0], "x": 10, "y": 1.25},
-                {"matrix": [6, 1], "x": 11, "y": 1.25},
-                {"matrix": [6, 2], "x": 12, "y": 1.25},
-                {"matrix": [6, 3], "x": 13, "y": 1.25},
-                {"matrix": [6, 4], "x": 14, "y": 1.25},
-                {"matrix": [6, 5], "x": 15, "y": 1.25},
-                {"matrix": [6, 6], "x": 16, "y": 1.25},
-                {"matrix": [6, 7], "x": 17, "y": 1.25},
-
-                {"matrix": [6, 8], "x": 18.5, "y": 1.25},
-                {"matrix": [6, 9], "x": 19.5, "y": 1.25},
-
-                {"matrix": [1, 0], "x": 0, "y": 2.25},
-
-                {"matrix": [1, 2], "x": 1.5, "y": 2.25, "w": 1.5},
-                {"matrix": [1, 3], "x": 3, "y": 2.25},
-                {"matrix": [1, 4], "x": 4, "y": 2.25},
-                {"matrix": [1, 5], "x": 5, "y": 2.25},
-                {"matrix": [1, 6], "x": 6, "y": 2.25},
-                {"matrix": [1, 7], "x": 7, "y": 2.25},
-
-                {"matrix": [7, 0], "x": 9.5, "y": 2.25},
-                {"matrix": [7, 1], "x": 10.5, "y": 2.25},
-                {"matrix": [7, 2], "x": 11.5, "y": 2.25},
-                {"matrix": [7, 3], "x": 12.5, "y": 2.25},
-                {"matrix": [7, 4], "x": 13.5, "y": 2.25},
-                {"matrix": [7, 5], "x": 14.5, "y": 2.25},
-                {"matrix": [7, 6], "x": 15.5, "y": 2.25},
-
-                {"matrix": [7, 8], "x": 18.5, "y": 2.25},
-                {"matrix": [7, 9], "x": 19.5, "y": 2.25},
-
-                {"matrix": [2, 0], "x": 0, "y": 3.25},
-
-                {"matrix": [2, 2], "x": 1.5, "y": 3.25, "w": 1.75},
-                {"matrix": [2, 3], "x": 3.25, "y": 3.25},
-                {"matrix": [2, 4], "x": 4.25, "y": 3.25},
-                {"matrix": [2, 5], "x": 5.25, "y": 3.25},
-                {"matrix": [2, 6], "x": 6.25, "y": 3.25},
-                {"matrix": [2, 7], "x": 7.25, "y": 3.25},
-
-                {"matrix": [8, 0], "x": 9.75, "y": 3.25},
-                {"matrix": [8, 1], "x": 10.75, "y": 3.25},
-                {"matrix": [8, 2], "x": 11.75, "y": 3.25},
-                {"matrix": [8, 3], "x": 12.75, "y": 3.25},
-                {"matrix": [8, 4], "x": 13.75, "y": 3.25},
-                {"matrix": [8, 5], "x": 14.75, "y": 3.25},
-                {"matrix": [8, 6], "x": 15.75, "y": 3.25},
-                {"matrix": [8, 7], "x": 16.75, "y": 2.25, "w": 1.25, "h": 2},
-
-                {"matrix": [8, 8], "x": 18.5, "y": 3.25},
-                {"matrix": [8, 9], "x": 19.5, "y": 3.25},
-
-                {"matrix": [3, 0], "x": 0, "y": 4.25},
-
-                {"matrix": [3, 2], "x": 1.5, "y": 4.25, "w": 1.25},
-                {"matrix": [3, 3], "x": 2.75, "y": 4.25},
-                {"matrix": [3, 4], "x": 3.75, "y": 4.25},
-                {"matrix": [3, 5], "x": 4.75, "y": 4.25},
-                {"matrix": [3, 6], "x": 5.75, "y": 4.25},
-                {"matrix": [3, 7], "x": 6.75, "y": 4.25},
-                {"matrix": [3, 8], "x": 7.75, "y": 4.25},
-
-                {"matrix": [9, 0], "x": 10.25, "y": 4.25},
-                {"matrix": [9, 1], "x": 11.25, "y": 4.25},
-                {"matrix": [9, 2], "x": 12.25, "y": 4.25},
-                {"matrix": [9, 3], "x": 13.25, "y": 4.25},
-                {"matrix": [9, 4], "x": 14.25, "y": 4.25},
-                {"matrix": [9, 6], "x": 15.25, "y": 4.25, "w": 1.75},
-
-                {"matrix": [9, 8], "x": 18.5, "y": 4.25},
-
-                {"matrix": [4, 0], "x": 0, "y": 5.25},
-
-                {"matrix": [4, 2], "x": 1.5, "y": 5.25, "w": 1.25},
-                {"matrix": [4, 3], "x": 2.75, "y": 5.25},
-                {"matrix": [4, 4], "x": 3.75, "y": 5.25, "w": 1.25},
-                {"matrix": [4, 5], "x": 5, "y": 5.25, "w": 1.25},
-                {"matrix": [4, 6], "x": 6.25, "y": 5.25},
-                {"matrix": [4, 7], "x": 7.25, "y": 5.25, "w": 1.25},
-
-                {"matrix": [10, 0], "x": 10, "y": 5.25, "w": 1.25},
-                {"matrix": [10, 1], "x": 11.25, "y": 5.25, "w": 2.25},
-                {"matrix": [10, 2], "x": 13.5, "y": 5.25, "w": 1.25},
-                {"matrix": [10, 3], "x": 14.75, "y": 5.25},
-                {"matrix": [10, 6], "x": 15.75, "y": 5.25, "w": 1.25},
-
-                {"matrix": [10, 7], "x": 17.5, "y": 5.25},
-                {"matrix": [10, 8], "x": 18.5, "y": 5.25},
-                {"matrix": [10, 9], "x": 19.5, "y": 5.25}
-            ]
-        },
-        "LAYOUT_all": {
-            "layout": [
-                {"matrix": [5, 0], "x": 0, "y": 0},
-
-                {"matrix": [5, 3], "x": 2, "y": 0},
-                {"matrix": [5, 4], "x": 3, "y": 0},
-                {"matrix": [5, 5], "x": 4, "y": 0},
-                {"matrix": [5, 6], "x": 5, "y": 0},
-
-                {"matrix": [5, 7], "x": 6.5, "y": 0},
-                {"matrix": [5, 8], "x": 7.5, "y": 0},
-
-                {"matrix": [11, 0], "x": 10, "y": 0},
-                {"matrix": [11, 1], "x": 11, "y": 0},
-
-                {"matrix": [11, 3], "x": 12.5, "y": 0},
-                {"matrix": [11, 4], "x": 13.5, "y": 0},
-                {"matrix": [11, 5], "x": 14.5, "y": 0},
-                {"matrix": [11, 6], "x": 15.5, "y": 0},
-
-                {"matrix": [11, 7], "x": 17.5, "y": 0},
-                {"matrix": [11, 8], "x": 18.5, "y": 0},
-                {"matrix": [11, 9], "x": 19.5, "y": 0},
-
-                {"matrix": [0, 0], "x": 0, "y": 1.25},
-
-                {"matrix": [0, 2], "x": 1.5, "y": 1.25},
-                {"matrix": [0, 3], "x": 2.5, "y": 1.25},
-                {"matrix": [0, 4], "x": 3.5, "y": 1.25},
-                {"matrix": [0, 5], "x": 4.5, "y": 1.25},
-                {"matrix": [0, 6], "x": 5.5, "y": 1.25},
-                {"matrix": [0, 7], "x": 6.5, "y": 1.25},
-                {"matrix": [0, 8], "x": 7.5, "y": 1.25},
-
-                {"matrix": [6, 0], "x": 10, "y": 1.25},
-                {"matrix": [6, 1], "x": 11, "y": 1.25},
-                {"matrix": [6, 2], "x": 12, "y": 1.25},
-                {"matrix": [6, 3], "x": 13, "y": 1.25},
-                {"matrix": [6, 4], "x": 14, "y": 1.25},
-                {"matrix": [6, 5], "x": 15, "y": 1.25},
-                {"matrix": [6, 6], "x": 16, "y": 1.25},
-                {"matrix": [6, 7], "x": 17, "y": 1.25},
-
-                {"matrix": [6, 8], "x": 18.5, "y": 1.25},
-                {"matrix": [6, 9], "x": 19.5, "y": 1.25},
-
-                {"matrix": [1, 0], "x": 0, "y": 2.25},
-
-                {"matrix": [1, 2], "x": 1.5, "y": 2.25, "w": 1.5},
-                {"matrix": [1, 3], "x": 3, "y": 2.25},
-                {"matrix": [1, 4], "x": 4, "y": 2.25},
-                {"matrix": [1, 5], "x": 5, "y": 2.25},
-                {"matrix": [1, 6], "x": 6, "y": 2.25},
-                {"matrix": [1, 7], "x": 7, "y": 2.25},
-
-                {"matrix": [7, 0], "x": 9.5, "y": 2.25},
-                {"matrix": [7, 1], "x": 10.5, "y": 2.25},
-                {"matrix": [7, 2], "x": 11.5, "y": 2.25},
-                {"matrix": [7, 3], "x": 12.5, "y": 2.25},
-                {"matrix": [7, 4], "x": 13.5, "y": 2.25},
-                {"matrix": [7, 5], "x": 14.5, "y": 2.25},
-                {"matrix": [7, 6], "x": 15.5, "y": 2.25},
-                {"matrix": [7, 7], "x": 16.5, "y": 2.25, "w": 1.5},
-
-                {"matrix": [7, 8], "x": 18.5, "y": 2.25},
-                {"matrix": [7, 9], "x": 19.5, "y": 2.25},
-
-                {"matrix": [2, 0], "x": 0, "y": 3.25},
-
-                {"matrix": [2, 2], "x": 1.5, "y": 3.25, "w": 1.75},
-                {"matrix": [2, 3], "x": 3.25, "y": 3.25},
-                {"matrix": [2, 4], "x": 4.25, "y": 3.25},
-                {"matrix": [2, 5], "x": 5.25, "y": 3.25},
-                {"matrix": [2, 6], "x": 6.25, "y": 3.25},
-                {"matrix": [2, 7], "x": 7.25, "y": 3.25},
-
-                {"matrix": [8, 0], "x": 9.75, "y": 3.25},
-                {"matrix": [8, 1], "x": 10.75, "y": 3.25},
-                {"matrix": [8, 2], "x": 11.75, "y": 3.25},
-                {"matrix": [8, 3], "x": 12.75, "y": 3.25},
-                {"matrix": [8, 4], "x": 13.75, "y": 3.25},
-                {"matrix": [8, 5], "x": 14.75, "y": 3.25},
-                {"matrix": [8, 6], "x": 15.75, "y": 3.25},
-                {"matrix": [8, 7], "x": 16.75, "y": 3.25, "w": 1.25},
-
-                {"matrix": [8, 8], "x": 18.5, "y": 3.25},
-                {"matrix": [8, 9], "x": 19.5, "y": 3.25},
-
-                {"matrix": [3, 0], "x": 0, "y": 4.25},
-
-                {"matrix": [3, 2], "x": 1.5, "y": 4.25, "w": 1.25},
-                {"matrix": [3, 3], "x": 2.75, "y": 4.25},
-                {"matrix": [3, 4], "x": 3.75, "y": 4.25},
-                {"matrix": [3, 5], "x": 4.75, "y": 4.25},
-                {"matrix": [3, 6], "x": 5.75, "y": 4.25},
-                {"matrix": [3, 7], "x": 6.75, "y": 4.25},
-                {"matrix": [3, 8], "x": 7.75, "y": 4.25},
-
-                {"matrix": [9, 0], "x": 10.25, "y": 4.25},
-                {"matrix": [9, 1], "x": 11.25, "y": 4.25},
-                {"matrix": [9, 2], "x": 12.25, "y": 4.25},
-                {"matrix": [9, 3], "x": 13.25, "y": 4.25},
-                {"matrix": [9, 4], "x": 14.25, "y": 4.25},
-                {"matrix": [9, 6], "x": 15.25, "y": 4.25, "w": 1.75},
-
-                {"matrix": [9, 8], "x": 18.5, "y": 4.25},
-
-                {"matrix": [4, 0], "x": 0, "y": 5.25},
-
-                {"matrix": [4, 2], "x": 1.5, "y": 5.25, "w": 1.25},
-                {"matrix": [4, 3], "x": 2.75, "y": 5.25},
-                {"matrix": [4, 4], "x": 3.75, "y": 5.25, "w": 1.25},
-                {"matrix": [4, 5], "x": 5, "y": 5.25, "w": 1.25},
-                {"matrix": [4, 6], "x": 6.25, "y": 5.25},
-                {"matrix": [4, 7], "x": 7.25, "y": 5.25, "w": 1.25},
-
-                {"matrix": [10, 0], "x": 10, "y": 5.25, "w": 1.25},
-                {"matrix": [10, 1], "x": 11.25, "y": 5.25, "w": 2.25},
-                {"matrix": [10, 2], "x": 13.5, "y": 5.25, "w": 1.25},
-                {"matrix": [10, 3], "x": 14.75, "y": 5.25},
-                {"matrix": [10, 6], "x": 15.75, "y": 5.25, "w": 1.25},
-
-                {"matrix": [10, 7], "x": 17.5, "y": 5.25},
-                {"matrix": [10, 8], "x": 18.5, "y": 5.25},
-                {"matrix": [10, 9], "x": 19.5, "y": 5.25}
-            ]
-        }
-    }
-}
diff --git a/keyboards/keebio/kbo5000/rev1/keyboard.json b/keyboards/keebio/kbo5000/rev1/keyboard.json
new file mode 100644
index 00000000000..7733f06efcf
--- /dev/null
+++ b/keyboards/keebio/kbo5000/rev1/keyboard.json
@@ -0,0 +1,455 @@
+{
+    "keyboard_name": "KBO-5000 Rev. 1",
+    "manufacturer": "Keebio",
+    "url": "https://keeb.io",
+    "maintainer": "nooges",
+    "usb": {
+        "vid": "0xCB10",
+        "pid": "0x136A",
+        "device_version": "1.0.0"
+    },
+    "matrix_pins": {
+        "cols": ["F4", null, "F0", "B7", "B3", "D2", "D3", "D5", "D4", null],
+        "rows": ["B1", "B2", "C7", "B4", "D7", "B0"]
+    },
+    "diode_direction": "COL2ROW",
+    "encoder": {
+        "rotary": [
+            {"pin_a": "F5", "pin_b": "F6"}
+        ]
+    },
+    "backlight": {
+        "pin": "B5"
+    },
+    "rgblight": {
+        "led_count": 16,
+        "led_map": [1, 2, 3, 12, 13, 14, 15, 0, 7, 6, 5, 4, 11, 10, 9, 8],
+        "split_count": [8, 8],
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": true,
+            "twinkle": true
+        }
+    },
+    "ws2812": {
+        "pin": "E6"
+    },
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "D0",
+        "encoder": {
+            "right": {
+                "rotary": [
+                    {"pin_a": "D6", "pin_b": "D4"},
+                    {"pin_a": "C7", "pin_b": "C6"}
+                ]
+            }
+        },
+        "matrix_pins": {
+            "right": {
+                "cols": ["F1", "F0", "F4", "F5", "F6", "D5", "D2", "D3", "B7", "B1"],
+                "rows": ["B3", "B2", "B6", "B4", "D7", "B0"]
+            }
+        }
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": false,
+        "extrakey": true,
+        "backlight": true,
+        "rgblight": true,
+        "encoder": true
+    },
+    "build": {
+        "lto": true
+    },
+    "layouts": {
+        "LAYOUT_ansi": {
+            "layout": [
+                {"matrix": [5, 0], "x": 0, "y": 0},
+
+                {"matrix": [5, 3], "x": 2, "y": 0},
+                {"matrix": [5, 4], "x": 3, "y": 0},
+                {"matrix": [5, 5], "x": 4, "y": 0},
+                {"matrix": [5, 6], "x": 5, "y": 0},
+
+                {"matrix": [5, 7], "x": 6.5, "y": 0},
+                {"matrix": [5, 8], "x": 7.5, "y": 0},
+
+                {"matrix": [11, 0], "x": 10, "y": 0},
+                {"matrix": [11, 1], "x": 11, "y": 0},
+
+                {"matrix": [11, 3], "x": 12.5, "y": 0},
+                {"matrix": [11, 4], "x": 13.5, "y": 0},
+                {"matrix": [11, 5], "x": 14.5, "y": 0},
+                {"matrix": [11, 6], "x": 15.5, "y": 0},
+
+                {"matrix": [11, 7], "x": 17.5, "y": 0},
+                {"matrix": [11, 8], "x": 18.5, "y": 0},
+                {"matrix": [11, 9], "x": 19.5, "y": 0},
+
+                {"matrix": [0, 0], "x": 0, "y": 1.25},
+
+                {"matrix": [0, 2], "x": 1.5, "y": 1.25},
+                {"matrix": [0, 3], "x": 2.5, "y": 1.25},
+                {"matrix": [0, 4], "x": 3.5, "y": 1.25},
+                {"matrix": [0, 5], "x": 4.5, "y": 1.25},
+                {"matrix": [0, 6], "x": 5.5, "y": 1.25},
+                {"matrix": [0, 7], "x": 6.5, "y": 1.25},
+                {"matrix": [0, 8], "x": 7.5, "y": 1.25},
+
+                {"matrix": [6, 0], "x": 10, "y": 1.25},
+                {"matrix": [6, 1], "x": 11, "y": 1.25},
+                {"matrix": [6, 2], "x": 12, "y": 1.25},
+                {"matrix": [6, 3], "x": 13, "y": 1.25},
+                {"matrix": [6, 4], "x": 14, "y": 1.25},
+                {"matrix": [6, 5], "x": 15, "y": 1.25},
+                {"matrix": [6, 6], "x": 16, "y": 1.25},
+                {"matrix": [6, 7], "x": 17, "y": 1.25},
+
+                {"matrix": [6, 8], "x": 18.5, "y": 1.25},
+                {"matrix": [6, 9], "x": 19.5, "y": 1.25},
+
+                {"matrix": [1, 0], "x": 0, "y": 2.25},
+
+                {"matrix": [1, 2], "x": 1.5, "y": 2.25, "w": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 2.25},
+                {"matrix": [1, 4], "x": 4, "y": 2.25},
+                {"matrix": [1, 5], "x": 5, "y": 2.25},
+                {"matrix": [1, 6], "x": 6, "y": 2.25},
+                {"matrix": [1, 7], "x": 7, "y": 2.25},
+
+                {"matrix": [7, 0], "x": 9.5, "y": 2.25},
+                {"matrix": [7, 1], "x": 10.5, "y": 2.25},
+                {"matrix": [7, 2], "x": 11.5, "y": 2.25},
+                {"matrix": [7, 3], "x": 12.5, "y": 2.25},
+                {"matrix": [7, 4], "x": 13.5, "y": 2.25},
+                {"matrix": [7, 5], "x": 14.5, "y": 2.25},
+                {"matrix": [7, 6], "x": 15.5, "y": 2.25},
+                {"matrix": [7, 7], "x": 16.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [7, 8], "x": 18.5, "y": 2.25},
+                {"matrix": [7, 9], "x": 19.5, "y": 2.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 3.25},
+
+                {"matrix": [2, 2], "x": 1.5, "y": 3.25, "w": 1.75},
+                {"matrix": [2, 3], "x": 3.25, "y": 3.25},
+                {"matrix": [2, 4], "x": 4.25, "y": 3.25},
+                {"matrix": [2, 5], "x": 5.25, "y": 3.25},
+                {"matrix": [2, 6], "x": 6.25, "y": 3.25},
+                {"matrix": [2, 7], "x": 7.25, "y": 3.25},
+
+                {"matrix": [8, 0], "x": 9.75, "y": 3.25},
+                {"matrix": [8, 1], "x": 10.75, "y": 3.25},
+                {"matrix": [8, 2], "x": 11.75, "y": 3.25},
+                {"matrix": [8, 3], "x": 12.75, "y": 3.25},
+                {"matrix": [8, 4], "x": 13.75, "y": 3.25},
+                {"matrix": [8, 5], "x": 14.75, "y": 3.25},
+                {"matrix": [8, 7], "x": 15.75, "y": 3.25, "w": 2.25},
+
+                {"matrix": [8, 8], "x": 18.5, "y": 3.25},
+                {"matrix": [8, 9], "x": 19.5, "y": 3.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 4.25},
+
+                {"matrix": [3, 2], "x": 1.5, "y": 4.25, "w": 2.25},
+                {"matrix": [3, 4], "x": 3.75, "y": 4.25},
+                {"matrix": [3, 5], "x": 4.75, "y": 4.25},
+                {"matrix": [3, 6], "x": 5.75, "y": 4.25},
+                {"matrix": [3, 7], "x": 6.75, "y": 4.25},
+                {"matrix": [3, 8], "x": 7.75, "y": 4.25},
+
+                {"matrix": [9, 0], "x": 10.25, "y": 4.25},
+                {"matrix": [9, 1], "x": 11.25, "y": 4.25},
+                {"matrix": [9, 2], "x": 12.25, "y": 4.25},
+                {"matrix": [9, 3], "x": 13.25, "y": 4.25},
+                {"matrix": [9, 4], "x": 14.25, "y": 4.25},
+                {"matrix": [9, 6], "x": 15.25, "y": 4.25, "w": 1.75},
+
+                {"matrix": [9, 8], "x": 18.5, "y": 4.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 5.25},
+
+                {"matrix": [4, 2], "x": 1.5, "y": 5.25, "w": 1.25},
+                {"matrix": [4, 3], "x": 2.75, "y": 5.25},
+                {"matrix": [4, 4], "x": 3.75, "y": 5.25, "w": 1.25},
+                {"matrix": [4, 5], "x": 5, "y": 5.25, "w": 1.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 5.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 5.25, "w": 1.25},
+
+                {"matrix": [10, 0], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 1], "x": 11.25, "y": 5.25, "w": 2.25},
+                {"matrix": [10, 2], "x": 13.5, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 3], "x": 14.75, "y": 5.25},
+                {"matrix": [10, 6], "x": 15.75, "y": 5.25, "w": 1.25},
+
+                {"matrix": [10, 7], "x": 17.5, "y": 5.25},
+                {"matrix": [10, 8], "x": 18.5, "y": 5.25},
+                {"matrix": [10, 9], "x": 19.5, "y": 5.25}
+            ]
+        },
+        "LAYOUT_iso": {
+            "layout": [
+                {"matrix": [5, 0], "x": 0, "y": 0},
+
+                {"matrix": [5, 3], "x": 2, "y": 0},
+                {"matrix": [5, 4], "x": 3, "y": 0},
+                {"matrix": [5, 5], "x": 4, "y": 0},
+                {"matrix": [5, 6], "x": 5, "y": 0},
+
+                {"matrix": [5, 7], "x": 6.5, "y": 0},
+                {"matrix": [5, 8], "x": 7.5, "y": 0},
+
+                {"matrix": [11, 0], "x": 10, "y": 0},
+                {"matrix": [11, 1], "x": 11, "y": 0},
+
+                {"matrix": [11, 3], "x": 12.5, "y": 0},
+                {"matrix": [11, 4], "x": 13.5, "y": 0},
+                {"matrix": [11, 5], "x": 14.5, "y": 0},
+                {"matrix": [11, 6], "x": 15.5, "y": 0},
+
+                {"matrix": [11, 7], "x": 17.5, "y": 0},
+                {"matrix": [11, 8], "x": 18.5, "y": 0},
+                {"matrix": [11, 9], "x": 19.5, "y": 0},
+
+                {"matrix": [0, 0], "x": 0, "y": 1.25},
+
+                {"matrix": [0, 2], "x": 1.5, "y": 1.25},
+                {"matrix": [0, 3], "x": 2.5, "y": 1.25},
+                {"matrix": [0, 4], "x": 3.5, "y": 1.25},
+                {"matrix": [0, 5], "x": 4.5, "y": 1.25},
+                {"matrix": [0, 6], "x": 5.5, "y": 1.25},
+                {"matrix": [0, 7], "x": 6.5, "y": 1.25},
+                {"matrix": [0, 8], "x": 7.5, "y": 1.25},
+
+                {"matrix": [6, 0], "x": 10, "y": 1.25},
+                {"matrix": [6, 1], "x": 11, "y": 1.25},
+                {"matrix": [6, 2], "x": 12, "y": 1.25},
+                {"matrix": [6, 3], "x": 13, "y": 1.25},
+                {"matrix": [6, 4], "x": 14, "y": 1.25},
+                {"matrix": [6, 5], "x": 15, "y": 1.25},
+                {"matrix": [6, 6], "x": 16, "y": 1.25},
+                {"matrix": [6, 7], "x": 17, "y": 1.25},
+
+                {"matrix": [6, 8], "x": 18.5, "y": 1.25},
+                {"matrix": [6, 9], "x": 19.5, "y": 1.25},
+
+                {"matrix": [1, 0], "x": 0, "y": 2.25},
+
+                {"matrix": [1, 2], "x": 1.5, "y": 2.25, "w": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 2.25},
+                {"matrix": [1, 4], "x": 4, "y": 2.25},
+                {"matrix": [1, 5], "x": 5, "y": 2.25},
+                {"matrix": [1, 6], "x": 6, "y": 2.25},
+                {"matrix": [1, 7], "x": 7, "y": 2.25},
+
+                {"matrix": [7, 0], "x": 9.5, "y": 2.25},
+                {"matrix": [7, 1], "x": 10.5, "y": 2.25},
+                {"matrix": [7, 2], "x": 11.5, "y": 2.25},
+                {"matrix": [7, 3], "x": 12.5, "y": 2.25},
+                {"matrix": [7, 4], "x": 13.5, "y": 2.25},
+                {"matrix": [7, 5], "x": 14.5, "y": 2.25},
+                {"matrix": [7, 6], "x": 15.5, "y": 2.25},
+
+                {"matrix": [7, 8], "x": 18.5, "y": 2.25},
+                {"matrix": [7, 9], "x": 19.5, "y": 2.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 3.25},
+
+                {"matrix": [2, 2], "x": 1.5, "y": 3.25, "w": 1.75},
+                {"matrix": [2, 3], "x": 3.25, "y": 3.25},
+                {"matrix": [2, 4], "x": 4.25, "y": 3.25},
+                {"matrix": [2, 5], "x": 5.25, "y": 3.25},
+                {"matrix": [2, 6], "x": 6.25, "y": 3.25},
+                {"matrix": [2, 7], "x": 7.25, "y": 3.25},
+
+                {"matrix": [8, 0], "x": 9.75, "y": 3.25},
+                {"matrix": [8, 1], "x": 10.75, "y": 3.25},
+                {"matrix": [8, 2], "x": 11.75, "y": 3.25},
+                {"matrix": [8, 3], "x": 12.75, "y": 3.25},
+                {"matrix": [8, 4], "x": 13.75, "y": 3.25},
+                {"matrix": [8, 5], "x": 14.75, "y": 3.25},
+                {"matrix": [8, 6], "x": 15.75, "y": 3.25},
+                {"matrix": [8, 7], "x": 16.75, "y": 2.25, "w": 1.25, "h": 2},
+
+                {"matrix": [8, 8], "x": 18.5, "y": 3.25},
+                {"matrix": [8, 9], "x": 19.5, "y": 3.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 4.25},
+
+                {"matrix": [3, 2], "x": 1.5, "y": 4.25, "w": 1.25},
+                {"matrix": [3, 3], "x": 2.75, "y": 4.25},
+                {"matrix": [3, 4], "x": 3.75, "y": 4.25},
+                {"matrix": [3, 5], "x": 4.75, "y": 4.25},
+                {"matrix": [3, 6], "x": 5.75, "y": 4.25},
+                {"matrix": [3, 7], "x": 6.75, "y": 4.25},
+                {"matrix": [3, 8], "x": 7.75, "y": 4.25},
+
+                {"matrix": [9, 0], "x": 10.25, "y": 4.25},
+                {"matrix": [9, 1], "x": 11.25, "y": 4.25},
+                {"matrix": [9, 2], "x": 12.25, "y": 4.25},
+                {"matrix": [9, 3], "x": 13.25, "y": 4.25},
+                {"matrix": [9, 4], "x": 14.25, "y": 4.25},
+                {"matrix": [9, 6], "x": 15.25, "y": 4.25, "w": 1.75},
+
+                {"matrix": [9, 8], "x": 18.5, "y": 4.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 5.25},
+
+                {"matrix": [4, 2], "x": 1.5, "y": 5.25, "w": 1.25},
+                {"matrix": [4, 3], "x": 2.75, "y": 5.25},
+                {"matrix": [4, 4], "x": 3.75, "y": 5.25, "w": 1.25},
+                {"matrix": [4, 5], "x": 5, "y": 5.25, "w": 1.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 5.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 5.25, "w": 1.25},
+
+                {"matrix": [10, 0], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 1], "x": 11.25, "y": 5.25, "w": 2.25},
+                {"matrix": [10, 2], "x": 13.5, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 3], "x": 14.75, "y": 5.25},
+                {"matrix": [10, 6], "x": 15.75, "y": 5.25, "w": 1.25},
+
+                {"matrix": [10, 7], "x": 17.5, "y": 5.25},
+                {"matrix": [10, 8], "x": 18.5, "y": 5.25},
+                {"matrix": [10, 9], "x": 19.5, "y": 5.25}
+            ]
+        },
+        "LAYOUT_all": {
+            "layout": [
+                {"matrix": [5, 0], "x": 0, "y": 0},
+
+                {"matrix": [5, 3], "x": 2, "y": 0},
+                {"matrix": [5, 4], "x": 3, "y": 0},
+                {"matrix": [5, 5], "x": 4, "y": 0},
+                {"matrix": [5, 6], "x": 5, "y": 0},
+
+                {"matrix": [5, 7], "x": 6.5, "y": 0},
+                {"matrix": [5, 8], "x": 7.5, "y": 0},
+
+                {"matrix": [11, 0], "x": 10, "y": 0},
+                {"matrix": [11, 1], "x": 11, "y": 0},
+
+                {"matrix": [11, 3], "x": 12.5, "y": 0},
+                {"matrix": [11, 4], "x": 13.5, "y": 0},
+                {"matrix": [11, 5], "x": 14.5, "y": 0},
+                {"matrix": [11, 6], "x": 15.5, "y": 0},
+
+                {"matrix": [11, 7], "x": 17.5, "y": 0},
+                {"matrix": [11, 8], "x": 18.5, "y": 0},
+                {"matrix": [11, 9], "x": 19.5, "y": 0},
+
+                {"matrix": [0, 0], "x": 0, "y": 1.25},
+
+                {"matrix": [0, 2], "x": 1.5, "y": 1.25},
+                {"matrix": [0, 3], "x": 2.5, "y": 1.25},
+                {"matrix": [0, 4], "x": 3.5, "y": 1.25},
+                {"matrix": [0, 5], "x": 4.5, "y": 1.25},
+                {"matrix": [0, 6], "x": 5.5, "y": 1.25},
+                {"matrix": [0, 7], "x": 6.5, "y": 1.25},
+                {"matrix": [0, 8], "x": 7.5, "y": 1.25},
+
+                {"matrix": [6, 0], "x": 10, "y": 1.25},
+                {"matrix": [6, 1], "x": 11, "y": 1.25},
+                {"matrix": [6, 2], "x": 12, "y": 1.25},
+                {"matrix": [6, 3], "x": 13, "y": 1.25},
+                {"matrix": [6, 4], "x": 14, "y": 1.25},
+                {"matrix": [6, 5], "x": 15, "y": 1.25},
+                {"matrix": [6, 6], "x": 16, "y": 1.25},
+                {"matrix": [6, 7], "x": 17, "y": 1.25},
+
+                {"matrix": [6, 8], "x": 18.5, "y": 1.25},
+                {"matrix": [6, 9], "x": 19.5, "y": 1.25},
+
+                {"matrix": [1, 0], "x": 0, "y": 2.25},
+
+                {"matrix": [1, 2], "x": 1.5, "y": 2.25, "w": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 2.25},
+                {"matrix": [1, 4], "x": 4, "y": 2.25},
+                {"matrix": [1, 5], "x": 5, "y": 2.25},
+                {"matrix": [1, 6], "x": 6, "y": 2.25},
+                {"matrix": [1, 7], "x": 7, "y": 2.25},
+
+                {"matrix": [7, 0], "x": 9.5, "y": 2.25},
+                {"matrix": [7, 1], "x": 10.5, "y": 2.25},
+                {"matrix": [7, 2], "x": 11.5, "y": 2.25},
+                {"matrix": [7, 3], "x": 12.5, "y": 2.25},
+                {"matrix": [7, 4], "x": 13.5, "y": 2.25},
+                {"matrix": [7, 5], "x": 14.5, "y": 2.25},
+                {"matrix": [7, 6], "x": 15.5, "y": 2.25},
+                {"matrix": [7, 7], "x": 16.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [7, 8], "x": 18.5, "y": 2.25},
+                {"matrix": [7, 9], "x": 19.5, "y": 2.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 3.25},
+
+                {"matrix": [2, 2], "x": 1.5, "y": 3.25, "w": 1.75},
+                {"matrix": [2, 3], "x": 3.25, "y": 3.25},
+                {"matrix": [2, 4], "x": 4.25, "y": 3.25},
+                {"matrix": [2, 5], "x": 5.25, "y": 3.25},
+                {"matrix": [2, 6], "x": 6.25, "y": 3.25},
+                {"matrix": [2, 7], "x": 7.25, "y": 3.25},
+
+                {"matrix": [8, 0], "x": 9.75, "y": 3.25},
+                {"matrix": [8, 1], "x": 10.75, "y": 3.25},
+                {"matrix": [8, 2], "x": 11.75, "y": 3.25},
+                {"matrix": [8, 3], "x": 12.75, "y": 3.25},
+                {"matrix": [8, 4], "x": 13.75, "y": 3.25},
+                {"matrix": [8, 5], "x": 14.75, "y": 3.25},
+                {"matrix": [8, 6], "x": 15.75, "y": 3.25},
+                {"matrix": [8, 7], "x": 16.75, "y": 3.25, "w": 1.25},
+
+                {"matrix": [8, 8], "x": 18.5, "y": 3.25},
+                {"matrix": [8, 9], "x": 19.5, "y": 3.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 4.25},
+
+                {"matrix": [3, 2], "x": 1.5, "y": 4.25, "w": 1.25},
+                {"matrix": [3, 3], "x": 2.75, "y": 4.25},
+                {"matrix": [3, 4], "x": 3.75, "y": 4.25},
+                {"matrix": [3, 5], "x": 4.75, "y": 4.25},
+                {"matrix": [3, 6], "x": 5.75, "y": 4.25},
+                {"matrix": [3, 7], "x": 6.75, "y": 4.25},
+                {"matrix": [3, 8], "x": 7.75, "y": 4.25},
+
+                {"matrix": [9, 0], "x": 10.25, "y": 4.25},
+                {"matrix": [9, 1], "x": 11.25, "y": 4.25},
+                {"matrix": [9, 2], "x": 12.25, "y": 4.25},
+                {"matrix": [9, 3], "x": 13.25, "y": 4.25},
+                {"matrix": [9, 4], "x": 14.25, "y": 4.25},
+                {"matrix": [9, 6], "x": 15.25, "y": 4.25, "w": 1.75},
+
+                {"matrix": [9, 8], "x": 18.5, "y": 4.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 5.25},
+
+                {"matrix": [4, 2], "x": 1.5, "y": 5.25, "w": 1.25},
+                {"matrix": [4, 3], "x": 2.75, "y": 5.25},
+                {"matrix": [4, 4], "x": 3.75, "y": 5.25, "w": 1.25},
+                {"matrix": [4, 5], "x": 5, "y": 5.25, "w": 1.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 5.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 5.25, "w": 1.25},
+
+                {"matrix": [10, 0], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 1], "x": 11.25, "y": 5.25, "w": 2.25},
+                {"matrix": [10, 2], "x": 13.5, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 3], "x": 14.75, "y": 5.25},
+                {"matrix": [10, 6], "x": 15.75, "y": 5.25, "w": 1.25},
+
+                {"matrix": [10, 7], "x": 17.5, "y": 5.25},
+                {"matrix": [10, 8], "x": 18.5, "y": 5.25},
+                {"matrix": [10, 9], "x": 19.5, "y": 5.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/keebio/kbo5000/rev1/rules.mk b/keyboards/keebio/kbo5000/rev1/rules.mk
deleted file mode 100644
index 32e78815991..00000000000
--- a/keyboards/keebio/kbo5000/rev1/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-BACKLIGHT_ENABLE = yes
-RGBLIGHT_ENABLE = yes
-ENCODER_ENABLE = yes
diff --git a/keyboards/keebio/kbo5000/rules.mk b/keyboards/keebio/kbo5000/rules.mk
index c6a1e8d0d17..06d2f2f4123 100644
--- a/keyboards/keebio/kbo5000/rules.mk
+++ b/keyboards/keebio/kbo5000/rules.mk
@@ -1,15 +1 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no        # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
-AUDIO_ENABLE = no           # Audio output
-RGBLIGHT_ENABLE = yes       # Enable WS2812 RGB underlight.
-LTO_ENABLE = yes
-
 DEFAULT_FOLDER = keebio/kbo5000/rev1
diff --git a/keyboards/keebio/levinson/rev1/info.json b/keyboards/keebio/levinson/rev1/info.json
deleted file mode 100644
index 0a98e032d46..00000000000
--- a/keyboards/keebio/levinson/rev1/info.json
+++ /dev/null
@@ -1,90 +0,0 @@
-{
-    "keyboard_name": "Levinson Rev. 1",
-    "split": {
-        "soft_serial_pin": "D0"
-    },
-    "usb": {
-        "pid": "0x1146",
-        "device_version": "1.0.0"
-    },
-    "matrix_pins": {
-        "cols": ["F6", "F7", "B1", "B3", "B2", "B6"],
-        "rows": ["D7", "E6", "B4", "B5"]
-    },
-    "diode_direction": "COL2ROW",
-    "backlight": {
-        "pin": "C6",
-        "levels": 7
-    },
-    "rgblight": {
-        "led_count": 12,
-        "split_count": [6, 6]
-    },
-    "ws2812": {
-        "pin": "D3"
-    },
-    "layout_aliases": {
-        "LAYOUT": "LAYOUT_ortho_4x12"
-    },
-    "layouts": {
-        "LAYOUT_ortho_4x12": {
-            "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": [4, 5], "x": 7, "y": 0},
-                {"matrix": [4, 4], "x": 8, "y": 0},
-                {"matrix": [4, 3], "x": 9, "y": 0},
-                {"matrix": [4, 2], "x": 10, "y": 0},
-                {"matrix": [4, 1], "x": 11, "y": 0},
-                {"matrix": [4, 0], "x": 12, "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": [1, 4], "x": 4, "y": 1},
-                {"matrix": [1, 5], "x": 5, "y": 1},
-
-                {"matrix": [5, 5], "x": 7, "y": 1},
-                {"matrix": [5, 4], "x": 8, "y": 1},
-                {"matrix": [5, 3], "x": 9, "y": 1},
-                {"matrix": [5, 2], "x": 10, "y": 1},
-                {"matrix": [5, 1], "x": 11, "y": 1},
-                {"matrix": [5, 0], "x": 12, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2},
-                {"matrix": [2, 1], "x": 1, "y": 2},
-                {"matrix": [2, 2], "x": 2, "y": 2},
-                {"matrix": [2, 3], "x": 3, "y": 2},
-                {"matrix": [2, 4], "x": 4, "y": 2},
-                {"matrix": [2, 5], "x": 5, "y": 2},
-
-                {"matrix": [6, 5], "x": 7, "y": 2},
-                {"matrix": [6, 4], "x": 8, "y": 2},
-                {"matrix": [6, 3], "x": 9, "y": 2},
-                {"matrix": [6, 2], "x": 10, "y": 2},
-                {"matrix": [6, 1], "x": 11, "y": 2},
-                {"matrix": [6, 0], "x": 12, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3},
-                {"matrix": [3, 1], "x": 1, "y": 3},
-                {"matrix": [3, 2], "x": 2, "y": 3},
-                {"matrix": [3, 3], "x": 3, "y": 3},
-                {"matrix": [3, 4], "x": 4, "y": 3},
-                {"matrix": [3, 5], "x": 5, "y": 3},
-
-                {"matrix": [7, 5], "x": 7, "y": 3},
-                {"matrix": [7, 4], "x": 8, "y": 3},
-                {"matrix": [7, 3], "x": 9, "y": 3},
-                {"matrix": [7, 2], "x": 10, "y": 3},
-                {"matrix": [7, 1], "x": 11, "y": 3},
-                {"matrix": [7, 0], "x": 12, "y": 3}
-            ]
-        }
-    }
-}
diff --git a/keyboards/keebio/levinson/rev1/keyboard.json b/keyboards/keebio/levinson/rev1/keyboard.json
new file mode 100644
index 00000000000..1ed976b4a9e
--- /dev/null
+++ b/keyboards/keebio/levinson/rev1/keyboard.json
@@ -0,0 +1,96 @@
+{
+    "keyboard_name": "Levinson Rev. 1",
+    "split": {
+        "soft_serial_pin": "D0"
+    },
+    "usb": {
+        "pid": "0x1146",
+        "device_version": "1.0.0"
+    },
+    "matrix_pins": {
+        "cols": ["F6", "F7", "B1", "B3", "B2", "B6"],
+        "rows": ["D7", "E6", "B4", "B5"]
+    },
+    "diode_direction": "COL2ROW",
+    "backlight": {
+        "pin": "C6",
+        "levels": 7
+    },
+    "rgblight": {
+        "led_count": 12,
+        "split_count": [6, 6]
+    },
+    "ws2812": {
+        "pin": "D3"
+    },
+    "features": {
+        "bootmagic": false,
+        "mousekey": true,
+        "extrakey": true,
+        "backlight": true
+    },
+    "layout_aliases": {
+        "LAYOUT": "LAYOUT_ortho_4x12"
+    },
+    "layouts": {
+        "LAYOUT_ortho_4x12": {
+            "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": [4, 5], "x": 7, "y": 0},
+                {"matrix": [4, 4], "x": 8, "y": 0},
+                {"matrix": [4, 3], "x": 9, "y": 0},
+                {"matrix": [4, 2], "x": 10, "y": 0},
+                {"matrix": [4, 1], "x": 11, "y": 0},
+                {"matrix": [4, 0], "x": 12, "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": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+
+                {"matrix": [5, 5], "x": 7, "y": 1},
+                {"matrix": [5, 4], "x": 8, "y": 1},
+                {"matrix": [5, 3], "x": 9, "y": 1},
+                {"matrix": [5, 2], "x": 10, "y": 1},
+                {"matrix": [5, 1], "x": 11, "y": 1},
+                {"matrix": [5, 0], "x": 12, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+
+                {"matrix": [6, 5], "x": 7, "y": 2},
+                {"matrix": [6, 4], "x": 8, "y": 2},
+                {"matrix": [6, 3], "x": 9, "y": 2},
+                {"matrix": [6, 2], "x": 10, "y": 2},
+                {"matrix": [6, 1], "x": 11, "y": 2},
+                {"matrix": [6, 0], "x": 12, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
+
+                {"matrix": [7, 5], "x": 7, "y": 3},
+                {"matrix": [7, 4], "x": 8, "y": 3},
+                {"matrix": [7, 3], "x": 9, "y": 3},
+                {"matrix": [7, 2], "x": 10, "y": 3},
+                {"matrix": [7, 1], "x": 11, "y": 3},
+                {"matrix": [7, 0], "x": 12, "y": 3}
+            ]
+        }
+    }
+}
diff --git a/keyboards/keebio/levinson/rev1/rules.mk b/keyboards/keebio/levinson/rev1/rules.mk
deleted file mode 100644
index bd518d8f273..00000000000
--- a/keyboards/keebio/levinson/rev1/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-BACKLIGHT_ENABLE = yes
diff --git a/keyboards/keebio/levinson/rev2/info.json b/keyboards/keebio/levinson/rev2/info.json
deleted file mode 100644
index 962f555e128..00000000000
--- a/keyboards/keebio/levinson/rev2/info.json
+++ /dev/null
@@ -1,90 +0,0 @@
-{
-    "keyboard_name": "Levinson Rev. 2",
-    "split": {
-        "soft_serial_pin": "D0"
-    },
-    "usb": {
-        "pid": "0x2146",
-        "device_version": "2.0.0"
-    },
-    "matrix_pins": {
-        "cols": ["F6", "F7", "B1", "B3", "B2", "B6"],
-        "rows": ["D4", "D7", "E6", "B4"]
-    },
-    "diode_direction": "COL2ROW",
-    "backlight": {
-        "pin": "B5",
-        "levels": 7
-    },
-    "rgblight": {
-        "led_count": 12,
-        "split_count": [6, 6]
-    },
-    "ws2812": {
-        "pin": "D3"
-    },
-    "layout_aliases": {
-        "LAYOUT": "LAYOUT_ortho_4x12"
-    },
-    "layouts": {
-        "LAYOUT_ortho_4x12": {
-            "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": [4, 5], "x": 7, "y": 0},
-                {"matrix": [4, 4], "x": 8, "y": 0},
-                {"matrix": [4, 3], "x": 9, "y": 0},
-                {"matrix": [4, 2], "x": 10, "y": 0},
-                {"matrix": [4, 1], "x": 11, "y": 0},
-                {"matrix": [4, 0], "x": 12, "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": [1, 4], "x": 4, "y": 1},
-                {"matrix": [1, 5], "x": 5, "y": 1},
-
-                {"matrix": [5, 5], "x": 7, "y": 1},
-                {"matrix": [5, 4], "x": 8, "y": 1},
-                {"matrix": [5, 3], "x": 9, "y": 1},
-                {"matrix": [5, 2], "x": 10, "y": 1},
-                {"matrix": [5, 1], "x": 11, "y": 1},
-                {"matrix": [5, 0], "x": 12, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2},
-                {"matrix": [2, 1], "x": 1, "y": 2},
-                {"matrix": [2, 2], "x": 2, "y": 2},
-                {"matrix": [2, 3], "x": 3, "y": 2},
-                {"matrix": [2, 4], "x": 4, "y": 2},
-                {"matrix": [2, 5], "x": 5, "y": 2},
-
-                {"matrix": [6, 5], "x": 7, "y": 2},
-                {"matrix": [6, 4], "x": 8, "y": 2},
-                {"matrix": [6, 3], "x": 9, "y": 2},
-                {"matrix": [6, 2], "x": 10, "y": 2},
-                {"matrix": [6, 1], "x": 11, "y": 2},
-                {"matrix": [6, 0], "x": 12, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3},
-                {"matrix": [3, 1], "x": 1, "y": 3},
-                {"matrix": [3, 2], "x": 2, "y": 3},
-                {"matrix": [3, 3], "x": 3, "y": 3},
-                {"matrix": [3, 4], "x": 4, "y": 3},
-                {"matrix": [3, 5], "x": 5, "y": 3},
-
-                {"matrix": [7, 5], "x": 7, "y": 3},
-                {"matrix": [7, 4], "x": 8, "y": 3},
-                {"matrix": [7, 3], "x": 9, "y": 3},
-                {"matrix": [7, 2], "x": 10, "y": 3},
-                {"matrix": [7, 1], "x": 11, "y": 3},
-                {"matrix": [7, 0], "x": 12, "y": 3}
-            ]
-        }
-    }
-}
diff --git a/keyboards/keebio/levinson/rev2/keyboard.json b/keyboards/keebio/levinson/rev2/keyboard.json
new file mode 100644
index 00000000000..73969388d18
--- /dev/null
+++ b/keyboards/keebio/levinson/rev2/keyboard.json
@@ -0,0 +1,96 @@
+{
+    "keyboard_name": "Levinson Rev. 2",
+    "split": {
+        "soft_serial_pin": "D0"
+    },
+    "usb": {
+        "pid": "0x2146",
+        "device_version": "2.0.0"
+    },
+    "matrix_pins": {
+        "cols": ["F6", "F7", "B1", "B3", "B2", "B6"],
+        "rows": ["D4", "D7", "E6", "B4"]
+    },
+    "diode_direction": "COL2ROW",
+    "backlight": {
+        "pin": "B5",
+        "levels": 7
+    },
+    "rgblight": {
+        "led_count": 12,
+        "split_count": [6, 6]
+    },
+    "ws2812": {
+        "pin": "D3"
+    },
+    "features": {
+        "bootmagic": false,
+        "mousekey": true,
+        "extrakey": true,
+        "backlight": true
+    },
+    "layout_aliases": {
+        "LAYOUT": "LAYOUT_ortho_4x12"
+    },
+    "layouts": {
+        "LAYOUT_ortho_4x12": {
+            "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": [4, 5], "x": 7, "y": 0},
+                {"matrix": [4, 4], "x": 8, "y": 0},
+                {"matrix": [4, 3], "x": 9, "y": 0},
+                {"matrix": [4, 2], "x": 10, "y": 0},
+                {"matrix": [4, 1], "x": 11, "y": 0},
+                {"matrix": [4, 0], "x": 12, "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": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+
+                {"matrix": [5, 5], "x": 7, "y": 1},
+                {"matrix": [5, 4], "x": 8, "y": 1},
+                {"matrix": [5, 3], "x": 9, "y": 1},
+                {"matrix": [5, 2], "x": 10, "y": 1},
+                {"matrix": [5, 1], "x": 11, "y": 1},
+                {"matrix": [5, 0], "x": 12, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+
+                {"matrix": [6, 5], "x": 7, "y": 2},
+                {"matrix": [6, 4], "x": 8, "y": 2},
+                {"matrix": [6, 3], "x": 9, "y": 2},
+                {"matrix": [6, 2], "x": 10, "y": 2},
+                {"matrix": [6, 1], "x": 11, "y": 2},
+                {"matrix": [6, 0], "x": 12, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
+
+                {"matrix": [7, 5], "x": 7, "y": 3},
+                {"matrix": [7, 4], "x": 8, "y": 3},
+                {"matrix": [7, 3], "x": 9, "y": 3},
+                {"matrix": [7, 2], "x": 10, "y": 3},
+                {"matrix": [7, 1], "x": 11, "y": 3},
+                {"matrix": [7, 0], "x": 12, "y": 3}
+            ]
+        }
+    }
+}
diff --git a/keyboards/keebio/levinson/rev2/rules.mk b/keyboards/keebio/levinson/rev2/rules.mk
deleted file mode 100644
index bd518d8f273..00000000000
--- a/keyboards/keebio/levinson/rev2/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-BACKLIGHT_ENABLE = yes
diff --git a/keyboards/keebio/levinson/rev3/info.json b/keyboards/keebio/levinson/rev3/info.json
deleted file mode 100644
index cac1c3ac351..00000000000
--- a/keyboards/keebio/levinson/rev3/info.json
+++ /dev/null
@@ -1,96 +0,0 @@
-{
-    "keyboard_name": "Levinson Rev. 3",
-    "split": {
-        "soft_serial_pin": "D0",
-        "matrix_pins": {
-            "right": {
-                "cols": ["F4", "F7", "D3", "B5", "B4", "E6"],
-                "rows": ["D4", "B2", "B3", "B1"]
-            }
-        }
-    },
-    "usb": {
-        "pid": "0x3146",
-        "device_version": "3.0.0"
-    },
-    "matrix_pins": {
-        "cols": ["D3", "F4", "F7", "B1", "B3", "B2"],
-        "rows": ["D4", "E6", "B4", "B5"]
-    },
-    "diode_direction": "COL2ROW",
-    "backlight": {
-        "pin": "B6",
-        "levels": 7
-    },
-    "rgblight": {
-        "led_count": 12,
-        "split_count": [6, 6]
-    },
-    "ws2812": {
-        "pin": "D7"
-    },
-    "layout_aliases": {
-        "LAYOUT": "LAYOUT_ortho_4x12"
-    },
-    "layouts": {
-        "LAYOUT_ortho_4x12": {
-            "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": [4, 5], "x": 7, "y": 0},
-                {"matrix": [4, 4], "x": 8, "y": 0},
-                {"matrix": [4, 3], "x": 9, "y": 0},
-                {"matrix": [4, 2], "x": 10, "y": 0},
-                {"matrix": [4, 1], "x": 11, "y": 0},
-                {"matrix": [4, 0], "x": 12, "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": [1, 4], "x": 4, "y": 1},
-                {"matrix": [1, 5], "x": 5, "y": 1},
-
-                {"matrix": [5, 5], "x": 7, "y": 1},
-                {"matrix": [5, 4], "x": 8, "y": 1},
-                {"matrix": [5, 3], "x": 9, "y": 1},
-                {"matrix": [5, 2], "x": 10, "y": 1},
-                {"matrix": [5, 1], "x": 11, "y": 1},
-                {"matrix": [5, 0], "x": 12, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2},
-                {"matrix": [2, 1], "x": 1, "y": 2},
-                {"matrix": [2, 2], "x": 2, "y": 2},
-                {"matrix": [2, 3], "x": 3, "y": 2},
-                {"matrix": [2, 4], "x": 4, "y": 2},
-                {"matrix": [2, 5], "x": 5, "y": 2},
-
-                {"matrix": [6, 5], "x": 7, "y": 2},
-                {"matrix": [6, 4], "x": 8, "y": 2},
-                {"matrix": [6, 3], "x": 9, "y": 2},
-                {"matrix": [6, 2], "x": 10, "y": 2},
-                {"matrix": [6, 1], "x": 11, "y": 2},
-                {"matrix": [6, 0], "x": 12, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3},
-                {"matrix": [3, 1], "x": 1, "y": 3},
-                {"matrix": [3, 2], "x": 2, "y": 3},
-                {"matrix": [3, 3], "x": 3, "y": 3},
-                {"matrix": [3, 4], "x": 4, "y": 3},
-                {"matrix": [3, 5], "x": 5, "y": 3},
-
-                {"matrix": [7, 5], "x": 7, "y": 3},
-                {"matrix": [7, 4], "x": 8, "y": 3},
-                {"matrix": [7, 3], "x": 9, "y": 3},
-                {"matrix": [7, 2], "x": 10, "y": 3},
-                {"matrix": [7, 1], "x": 11, "y": 3},
-                {"matrix": [7, 0], "x": 12, "y": 3}
-            ]
-        }
-    }
-}
diff --git a/keyboards/keebio/levinson/rev3/keyboard.json b/keyboards/keebio/levinson/rev3/keyboard.json
new file mode 100644
index 00000000000..5f38fe9874a
--- /dev/null
+++ b/keyboards/keebio/levinson/rev3/keyboard.json
@@ -0,0 +1,102 @@
+{
+    "keyboard_name": "Levinson Rev. 3",
+    "split": {
+        "soft_serial_pin": "D0",
+        "matrix_pins": {
+            "right": {
+                "cols": ["F4", "F7", "D3", "B5", "B4", "E6"],
+                "rows": ["D4", "B2", "B3", "B1"]
+            }
+        }
+    },
+    "usb": {
+        "pid": "0x3146",
+        "device_version": "3.0.0"
+    },
+    "matrix_pins": {
+        "cols": ["D3", "F4", "F7", "B1", "B3", "B2"],
+        "rows": ["D4", "E6", "B4", "B5"]
+    },
+    "diode_direction": "COL2ROW",
+    "backlight": {
+        "pin": "B6",
+        "levels": 7
+    },
+    "rgblight": {
+        "led_count": 12,
+        "split_count": [6, 6]
+    },
+    "ws2812": {
+        "pin": "D7"
+    },
+    "features": {
+        "bootmagic": false,
+        "mousekey": true,
+        "extrakey": true,
+        "backlight": true
+    },
+    "layout_aliases": {
+        "LAYOUT": "LAYOUT_ortho_4x12"
+    },
+    "layouts": {
+        "LAYOUT_ortho_4x12": {
+            "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": [4, 5], "x": 7, "y": 0},
+                {"matrix": [4, 4], "x": 8, "y": 0},
+                {"matrix": [4, 3], "x": 9, "y": 0},
+                {"matrix": [4, 2], "x": 10, "y": 0},
+                {"matrix": [4, 1], "x": 11, "y": 0},
+                {"matrix": [4, 0], "x": 12, "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": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+
+                {"matrix": [5, 5], "x": 7, "y": 1},
+                {"matrix": [5, 4], "x": 8, "y": 1},
+                {"matrix": [5, 3], "x": 9, "y": 1},
+                {"matrix": [5, 2], "x": 10, "y": 1},
+                {"matrix": [5, 1], "x": 11, "y": 1},
+                {"matrix": [5, 0], "x": 12, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+
+                {"matrix": [6, 5], "x": 7, "y": 2},
+                {"matrix": [6, 4], "x": 8, "y": 2},
+                {"matrix": [6, 3], "x": 9, "y": 2},
+                {"matrix": [6, 2], "x": 10, "y": 2},
+                {"matrix": [6, 1], "x": 11, "y": 2},
+                {"matrix": [6, 0], "x": 12, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
+
+                {"matrix": [7, 5], "x": 7, "y": 3},
+                {"matrix": [7, 4], "x": 8, "y": 3},
+                {"matrix": [7, 3], "x": 9, "y": 3},
+                {"matrix": [7, 2], "x": 10, "y": 3},
+                {"matrix": [7, 1], "x": 11, "y": 3},
+                {"matrix": [7, 0], "x": 12, "y": 3}
+            ]
+        }
+    }
+}
diff --git a/keyboards/keebio/levinson/rev3/rules.mk b/keyboards/keebio/levinson/rev3/rules.mk
index 176c9b97dfb..09057bea54b 100644
--- a/keyboards/keebio/levinson/rev3/rules.mk
+++ b/keyboards/keebio/levinson/rev3/rules.mk
@@ -1,5 +1,3 @@
-BACKLIGHT_ENABLE = yes
-
 # Disable unsupported hardware
 RGBLIGHT_SUPPORTED = no
 AUDIO_SUPPORTED = no
diff --git a/keyboards/keebio/levinson/rules.mk b/keyboards/keebio/levinson/rules.mk
index eab321ff014..44cdce9d12d 100644
--- a/keyboards/keebio/levinson/rules.mk
+++ b/keyboards/keebio/levinson/rules.mk
@@ -1,14 +1 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
-AUDIO_ENABLE = no           # Audio output
-RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight.
-
 DEFAULT_FOLDER = keebio/levinson/rev2
diff --git a/keyboards/keebio/nyquist/rev4/info.json b/keyboards/keebio/nyquist/rev4/keyboard.json
similarity index 100%
rename from keyboards/keebio/nyquist/rev4/info.json
rename to keyboards/keebio/nyquist/rev4/keyboard.json
diff --git a/keyboards/keebio/quefrency/rev1/info.json b/keyboards/keebio/quefrency/rev1/info.json
deleted file mode 100644
index 0bce37ad78b..00000000000
--- a/keyboards/keebio/quefrency/rev1/info.json
+++ /dev/null
@@ -1,508 +0,0 @@
-{
-    "keyboard_name": "Quefrency Rev. 1",
-    "manufacturer": "Keebio",
-    "url": "https://keeb.io",
-    "maintainer": "nooges",
-    "usb": {
-        "vid": "0xCB10",
-        "pid": "0x1257",
-        "device_version": "1.0.0"
-    },
-    "rgblight": {
-        "led_count": 16,
-        "split_count": [8, 8],
-        "animations": {
-            "breathing": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "snake": true,
-            "knight": true,
-            "christmas": true,
-            "static_gradient": true,
-            "rgb_test": true,
-            "alternating": true,
-            "twinkle": true
-        }
-    },
-    "ws2812": {
-        "pin": "D3"
-    },
-    "matrix_pins": {
-        "cols": ["F5", "F6", "F7", "B1", "B3", "B2", "B6", "B5"],
-        "rows": ["F4", "D4", "D7", "E6", "B4", "C6"]
-    },
-    "diode_direction": "COL2ROW",
-    "split": {
-        "soft_serial_pin": "D0",
-        "matrix_pins": {
-            "right": {
-                "cols": ["F5", "F6", "F7", "B1", "B3", "B2", "B6", "C6"],
-                "rows": ["F4", "D4", "D7", "E6", "B4", "B5"]
-            }
-        }
-    },
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-
-                {"matrix": [6, 0], "x": 8, "y": 0},
-                {"matrix": [6, 1], "x": 9, "y": 0},
-                {"matrix": [6, 2], "x": 10, "y": 0},
-                {"matrix": [6, 3], "x": 11, "y": 0},
-                {"matrix": [6, 4], "x": 12, "y": 0},
-                {"matrix": [6, 5], "x": 13, "y": 0},
-                {"matrix": [6, 6], "x": 14, "y": 0},
-                {"matrix": [6, 7], "x": 15, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-
-                {"matrix": [7, 0], "x": 7.5, "y": 1},
-                {"matrix": [7, 1], "x": 8.5, "y": 1},
-                {"matrix": [7, 2], "x": 9.5, "y": 1},
-                {"matrix": [7, 3], "x": 10.5, "y": 1},
-                {"matrix": [7, 4], "x": 11.5, "y": 1},
-                {"matrix": [7, 5], "x": 12.5, "y": 1},
-                {"matrix": [7, 6], "x": 13.5, "y": 1},
-                {"matrix": [7, 7], "x": 14.5, "y": 1, "w": 1.5},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-
-                {"matrix": [8, 0], "x": 7.75, "y": 2},
-                {"matrix": [8, 1], "x": 8.75, "y": 2},
-                {"matrix": [8, 2], "x": 9.75, "y": 2},
-                {"matrix": [8, 3], "x": 10.75, "y": 2},
-                {"matrix": [8, 4], "x": 11.75, "y": 2},
-                {"matrix": [8, 5], "x": 12.75, "y": 2},
-                {"matrix": [8, 7], "x": 13.75, "y": 2, "w": 2.25},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 2], "x": 2.25, "y": 3},
-                {"matrix": [3, 3], "x": 3.25, "y": 3},
-                {"matrix": [3, 4], "x": 4.25, "y": 3},
-                {"matrix": [3, 5], "x": 5.25, "y": 3},
-                {"matrix": [3, 6], "x": 6.25, "y": 3},
-
-                {"matrix": [9, 0], "x": 8.25, "y": 3},
-                {"matrix": [9, 1], "x": 9.25, "y": 3},
-                {"matrix": [9, 2], "x": 10.25, "y": 3},
-                {"matrix": [9, 3], "x": 11.25, "y": 3},
-                {"matrix": [9, 5], "x": 12.25, "y": 3},
-                {"matrix": [9, 6], "x": 13.25, "y": 3, "w": 1.75},
-                {"matrix": [9, 7], "x": 15, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 4], "x": 3.75, "y": 4, "w": 1.25},
-                {"matrix": [4, 6], "x": 5, "y": 4, "w": 2.25},
-
-                {"matrix": [10, 0], "x": 8.25, "y": 4, "w": 1.25},
-                {"matrix": [10, 1], "x": 9.5, "y": 4, "w": 1.5},
-                {"matrix": [10, 3], "x": 11, "y": 4},
-                {"matrix": [10, 4], "x": 12, "y": 4},
-                {"matrix": [10, 5], "x": 13, "y": 4},
-                {"matrix": [10, 6], "x": 14, "y": 4},
-                {"matrix": [10, 7], "x": 15, "y": 4}
-            ]
-        },
-        "LAYOUT_65": {
-            "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": [6, 0], "x": 8, "y": 0},
-                {"matrix": [6, 1], "x": 9, "y": 0},
-                {"matrix": [6, 2], "x": 10, "y": 0},
-                {"matrix": [6, 3], "x": 11, "y": 0},
-                {"matrix": [6, 4], "x": 12, "y": 0},
-                {"matrix": [6, 5], "x": 13, "y": 0},
-                {"matrix": [6, 6], "x": 14, "y": 0},
-                {"matrix": [6, 7], "x": 15, "y": 0},
-                {"matrix": [11, 6], "x": 16, "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": [7, 0], "x": 7.5, "y": 1},
-                {"matrix": [7, 1], "x": 8.5, "y": 1},
-                {"matrix": [7, 2], "x": 9.5, "y": 1},
-                {"matrix": [7, 3], "x": 10.5, "y": 1},
-                {"matrix": [7, 4], "x": 11.5, "y": 1},
-                {"matrix": [7, 5], "x": 12.5, "y": 1},
-                {"matrix": [7, 6], "x": 13.5, "y": 1},
-                {"matrix": [7, 7], "x": 14.5, "y": 1, "w": 1.5},
-                {"matrix": [11, 7], "x": 16, "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": [8, 0], "x": 7.75, "y": 2},
-                {"matrix": [8, 1], "x": 8.75, "y": 2},
-                {"matrix": [8, 2], "x": 9.75, "y": 2},
-                {"matrix": [8, 3], "x": 10.75, "y": 2},
-                {"matrix": [8, 4], "x": 11.75, "y": 2},
-                {"matrix": [8, 5], "x": 12.75, "y": 2},
-                {"matrix": [8, 7], "x": 13.75, "y": 2, "w": 2.25},
-                {"matrix": [8, 6], "x": 16, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 2], "x": 2.25, "y": 3},
-                {"matrix": [3, 3], "x": 3.25, "y": 3},
-                {"matrix": [3, 4], "x": 4.25, "y": 3},
-                {"matrix": [3, 5], "x": 5.25, "y": 3},
-                {"matrix": [3, 6], "x": 6.25, "y": 3},
-
-                {"matrix": [9, 0], "x": 8.25, "y": 3},
-                {"matrix": [9, 1], "x": 9.25, "y": 3},
-                {"matrix": [9, 2], "x": 10.25, "y": 3},
-                {"matrix": [9, 3], "x": 11.25, "y": 3},
-                {"matrix": [9, 5], "x": 12.25, "y": 3},
-                {"matrix": [9, 6], "x": 13.25, "y": 3, "w": 1.75},
-                {"matrix": [9, 7], "x": 15, "y": 3},
-                {"matrix": [9, 4], "x": 16, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 4], "x": 3.75, "y": 4, "w": 1.25},
-                {"matrix": [4, 6], "x": 5, "y": 4, "w": 2.25},
-
-                {"matrix": [10, 0], "x": 8.25, "y": 4, "w": 1.25},
-                {"matrix": [10, 1], "x": 9.5, "y": 4, "w": 1.5},
-                {"matrix": [10, 3], "x": 11, "y": 4},
-                {"matrix": [10, 4], "x": 12, "y": 4},
-                {"matrix": [10, 5], "x": 13, "y": 4},
-                {"matrix": [10, 6], "x": 14, "y": 4},
-                {"matrix": [10, 7], "x": 15, "y": 4},
-                {"matrix": [10, 2], "x": 16, "y": 4}
-            ]
-        },
-        "LAYOUT_60_with_macro": {
-            "layout": [
-                {"matrix": [4, 3], "x": 0, "y": 0},
-                {"matrix": [0, 7], "x": 1, "y": 0},
-
-                {"matrix": [0, 0], "x": 2.25, "y": 0},
-                {"matrix": [0, 1], "x": 3.25, "y": 0},
-                {"matrix": [0, 2], "x": 4.25, "y": 0},
-                {"matrix": [0, 3], "x": 5.25, "y": 0},
-                {"matrix": [0, 4], "x": 6.25, "y": 0},
-                {"matrix": [0, 5], "x": 7.25, "y": 0},
-                {"matrix": [0, 6], "x": 8.25, "y": 0},
-
-                {"matrix": [6, 0], "x": 10.25, "y": 0},
-                {"matrix": [6, 1], "x": 11.25, "y": 0},
-                {"matrix": [6, 2], "x": 12.25, "y": 0},
-                {"matrix": [6, 3], "x": 13.25, "y": 0},
-                {"matrix": [6, 4], "x": 14.25, "y": 0},
-                {"matrix": [6, 5], "x": 15.25, "y": 0},
-                {"matrix": [6, 6], "x": 16.25, "y": 0},
-                {"matrix": [6, 7], "x": 17.25, "y": 0},
-
-                {"matrix": [1, 6], "x": 0, "y": 1},
-                {"matrix": [1, 7], "x": 1, "y": 1},
-
-                {"matrix": [1, 0], "x": 2.25, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 3.75, "y": 1},
-                {"matrix": [1, 2], "x": 4.75, "y": 1},
-                {"matrix": [1, 3], "x": 5.75, "y": 1},
-                {"matrix": [1, 4], "x": 6.75, "y": 1},
-                {"matrix": [1, 5], "x": 7.75, "y": 1},
-
-                {"matrix": [7, 0], "x": 9.75, "y": 1},
-                {"matrix": [7, 1], "x": 10.75, "y": 1},
-                {"matrix": [7, 2], "x": 11.75, "y": 1},
-                {"matrix": [7, 3], "x": 12.75, "y": 1},
-                {"matrix": [7, 4], "x": 13.75, "y": 1},
-                {"matrix": [7, 5], "x": 14.75, "y": 1},
-                {"matrix": [7, 6], "x": 15.75, "y": 1},
-                {"matrix": [7, 7], "x": 16.75, "y": 1, "w": 1.5},
-
-                {"matrix": [2, 6], "x": 0, "y": 2},
-                {"matrix": [2, 7], "x": 1, "y": 2},
-
-                {"matrix": [2, 0], "x": 2.25, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 4, "y": 2},
-                {"matrix": [2, 2], "x": 5, "y": 2},
-                {"matrix": [2, 3], "x": 6, "y": 2},
-                {"matrix": [2, 4], "x": 7, "y": 2},
-                {"matrix": [2, 5], "x": 8, "y": 2},
-
-                {"matrix": [8, 0], "x": 10, "y": 2},
-                {"matrix": [8, 1], "x": 11, "y": 2},
-                {"matrix": [8, 2], "x": 12, "y": 2},
-                {"matrix": [8, 3], "x": 13, "y": 2},
-                {"matrix": [8, 4], "x": 14, "y": 2},
-                {"matrix": [8, 5], "x": 15, "y": 2},
-                {"matrix": [8, 7], "x": 16, "y": 2, "w": 2.25},
-
-                {"matrix": [3, 1], "x": 0, "y": 3},
-                {"matrix": [3, 7], "x": 1, "y": 3},
-
-                {"matrix": [3, 0], "x": 2.25, "y": 3, "w": 2.25},
-                {"matrix": [3, 2], "x": 4.5, "y": 3},
-                {"matrix": [3, 3], "x": 5.5, "y": 3},
-                {"matrix": [3, 4], "x": 6.5, "y": 3},
-                {"matrix": [3, 5], "x": 7.5, "y": 3},
-                {"matrix": [3, 6], "x": 8.5, "y": 3},
-
-                {"matrix": [9, 0], "x": 10.5, "y": 3},
-                {"matrix": [9, 1], "x": 11.5, "y": 3},
-                {"matrix": [9, 2], "x": 12.5, "y": 3},
-                {"matrix": [9, 3], "x": 13.5, "y": 3},
-                {"matrix": [9, 5], "x": 14.5, "y": 3},
-                {"matrix": [9, 6], "x": 15.5, "y": 3, "w": 1.75},
-                {"matrix": [9, 7], "x": 17.25, "y": 3},
-
-                {"matrix": [4, 5], "x": 0, "y": 4},
-                {"matrix": [4, 7], "x": 1, "y": 4},
-
-                {"matrix": [4, 0], "x": 2.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 3.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 4.75, "y": 4, "w": 1.25},
-                {"matrix": [4, 4], "x": 6, "y": 4, "w": 1.25},
-                {"matrix": [4, 6], "x": 7.25, "y": 4, "w": 2.25},
-
-                {"matrix": [10, 0], "x": 10.5, "y": 4, "w": 1.25},
-                {"matrix": [10, 1], "x": 11.75, "y": 4, "w": 1.5},
-                {"matrix": [10, 3], "x": 13.25, "y": 4},
-                {"matrix": [10, 4], "x": 14.25, "y": 4},
-                {"matrix": [10, 5], "x": 15.25, "y": 4},
-                {"matrix": [10, 6], "x": 16.25, "y": 4},
-                {"matrix": [10, 7], "x": 17.25, "y": 4}
-            ]
-        },
-        "LAYOUT_65_with_macro": {
-            "layout": [
-                {"matrix": [4, 3], "x": 0, "y": 0},
-                {"matrix": [0, 7], "x": 1, "y": 0},
-
-                {"matrix": [0, 0], "x": 2.25, "y": 0},
-                {"matrix": [0, 1], "x": 3.25, "y": 0},
-                {"matrix": [0, 2], "x": 4.25, "y": 0},
-                {"matrix": [0, 3], "x": 5.25, "y": 0},
-                {"matrix": [0, 4], "x": 6.25, "y": 0},
-                {"matrix": [0, 5], "x": 7.25, "y": 0},
-                {"matrix": [0, 6], "x": 8.25, "y": 0},
-
-                {"matrix": [6, 0], "x": 10.25, "y": 0},
-                {"matrix": [6, 1], "x": 11.25, "y": 0},
-                {"matrix": [6, 2], "x": 12.25, "y": 0},
-                {"matrix": [6, 3], "x": 13.25, "y": 0},
-                {"matrix": [6, 4], "x": 14.25, "y": 0},
-                {"matrix": [6, 5], "x": 15.25, "y": 0},
-                {"matrix": [6, 6], "x": 16.25, "y": 0},
-                {"matrix": [6, 7], "x": 17.25, "y": 0},
-                {"matrix": [11, 6], "x": 18.25, "y": 0},
-
-                {"matrix": [1, 6], "x": 0, "y": 1},
-                {"matrix": [1, 7], "x": 1, "y": 1},
-
-                {"matrix": [1, 0], "x": 2.25, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 3.75, "y": 1},
-                {"matrix": [1, 2], "x": 4.75, "y": 1},
-                {"matrix": [1, 3], "x": 5.75, "y": 1},
-                {"matrix": [1, 4], "x": 6.75, "y": 1},
-                {"matrix": [1, 5], "x": 7.75, "y": 1},
-
-                {"matrix": [7, 0], "x": 9.75, "y": 1},
-                {"matrix": [7, 1], "x": 10.75, "y": 1},
-                {"matrix": [7, 2], "x": 11.75, "y": 1},
-                {"matrix": [7, 3], "x": 12.75, "y": 1},
-                {"matrix": [7, 4], "x": 13.75, "y": 1},
-                {"matrix": [7, 5], "x": 14.75, "y": 1},
-                {"matrix": [7, 6], "x": 15.75, "y": 1},
-                {"matrix": [7, 7], "x": 16.75, "y": 1, "w": 1.5},
-                {"matrix": [11, 7], "x": 18.25, "y": 1},
-
-                {"matrix": [2, 6], "x": 0, "y": 2},
-                {"matrix": [2, 7], "x": 1, "y": 2},
-
-                {"matrix": [2, 0], "x": 2.25, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 4, "y": 2},
-                {"matrix": [2, 2], "x": 5, "y": 2},
-                {"matrix": [2, 3], "x": 6, "y": 2},
-                {"matrix": [2, 4], "x": 7, "y": 2},
-                {"matrix": [2, 5], "x": 8, "y": 2},
-
-                {"matrix": [8, 0], "x": 10, "y": 2},
-                {"matrix": [8, 1], "x": 11, "y": 2},
-                {"matrix": [8, 2], "x": 12, "y": 2},
-                {"matrix": [8, 3], "x": 13, "y": 2},
-                {"matrix": [8, 4], "x": 14, "y": 2},
-                {"matrix": [8, 5], "x": 15, "y": 2},
-                {"matrix": [8, 7], "x": 16, "y": 2, "w": 2.25},
-                {"matrix": [8, 6], "x": 18.25, "y": 2},
-
-                {"matrix": [3, 1], "x": 0, "y": 3},
-                {"matrix": [3, 7], "x": 1, "y": 3},
-
-                {"matrix": [3, 0], "x": 2.25, "y": 3, "w": 2.25},
-                {"matrix": [3, 2], "x": 4.5, "y": 3},
-                {"matrix": [3, 3], "x": 5.5, "y": 3},
-                {"matrix": [3, 4], "x": 6.5, "y": 3},
-                {"matrix": [3, 5], "x": 7.5, "y": 3},
-                {"matrix": [3, 6], "x": 8.5, "y": 3},
-
-                {"matrix": [9, 0], "x": 10.5, "y": 3},
-                {"matrix": [9, 1], "x": 11.5, "y": 3},
-                {"matrix": [9, 2], "x": 12.5, "y": 3},
-                {"matrix": [9, 3], "x": 13.5, "y": 3},
-                {"matrix": [9, 5], "x": 14.5, "y": 3},
-                {"matrix": [9, 6], "x": 15.5, "y": 3, "w": 1.75},
-                {"matrix": [9, 7], "x": 17.25, "y": 3},
-                {"matrix": [9, 4], "x": 18.25, "y": 3},
-
-                {"matrix": [4, 5], "x": 0, "y": 4},
-                {"matrix": [4, 7], "x": 1, "y": 4},
-
-                {"matrix": [4, 0], "x": 2.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 3.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 4.75, "y": 4, "w": 1.25},
-                {"matrix": [4, 4], "x": 6, "y": 4, "w": 1.25},
-                {"matrix": [4, 6], "x": 7.25, "y": 4, "w": 2.25},
-
-                {"matrix": [10, 0], "x": 10.5, "y": 4, "w": 1.25},
-                {"matrix": [10, 1], "x": 11.75, "y": 4, "w": 1.5},
-                {"matrix": [10, 3], "x": 13.25, "y": 4},
-                {"matrix": [10, 4], "x": 14.25, "y": 4},
-                {"matrix": [10, 5], "x": 15.25, "y": 4},
-                {"matrix": [10, 6], "x": 16.25, "y": 4},
-                {"matrix": [10, 7], "x": 17.25, "y": 4},
-                {"matrix": [10, 2], "x": 18.25, "y": 4}
-            ]
-        },
-        "LAYOUT_all": {
-            "layout": [
-                {"matrix": [4, 3], "x": 0, "y": 0},
-                {"matrix": [0, 7], "x": 1, "y": 0},
-
-                {"matrix": [0, 0], "x": 2.25, "y": 0},
-                {"matrix": [0, 1], "x": 3.25, "y": 0},
-                {"matrix": [0, 2], "x": 4.25, "y": 0},
-                {"matrix": [0, 3], "x": 5.25, "y": 0},
-                {"matrix": [0, 4], "x": 6.25, "y": 0},
-                {"matrix": [0, 5], "x": 7.25, "y": 0},
-                {"matrix": [0, 6], "x": 8.25, "y": 0},
-
-                {"matrix": [6, 0], "x": 10.25, "y": 0},
-                {"matrix": [6, 1], "x": 11.25, "y": 0},
-                {"matrix": [6, 2], "x": 12.25, "y": 0},
-                {"matrix": [6, 3], "x": 13.25, "y": 0},
-                {"matrix": [6, 4], "x": 14.25, "y": 0},
-                {"matrix": [6, 5], "x": 15.25, "y": 0},
-                {"matrix": [6, 6], "x": 16.25, "y": 0},
-                {"matrix": [6, 7], "x": 17.25, "y": 0},
-                {"matrix": [11, 6], "x": 18.25, "y": 0},
-
-                {"matrix": [1, 6], "x": 0, "y": 1},
-                {"matrix": [1, 7], "x": 1, "y": 1},
-
-                {"matrix": [1, 0], "x": 2.25, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 3.75, "y": 1},
-                {"matrix": [1, 2], "x": 4.75, "y": 1},
-                {"matrix": [1, 3], "x": 5.75, "y": 1},
-                {"matrix": [1, 4], "x": 6.75, "y": 1},
-                {"matrix": [1, 5], "x": 7.75, "y": 1},
-
-                {"matrix": [7, 0], "x": 9.75, "y": 1},
-                {"matrix": [7, 1], "x": 10.75, "y": 1},
-                {"matrix": [7, 2], "x": 11.75, "y": 1},
-                {"matrix": [7, 3], "x": 12.75, "y": 1},
-                {"matrix": [7, 4], "x": 13.75, "y": 1},
-                {"matrix": [7, 5], "x": 14.75, "y": 1},
-                {"matrix": [7, 6], "x": 15.75, "y": 1},
-                {"matrix": [7, 7], "x": 16.75, "y": 1, "w": 1.5},
-                {"matrix": [11, 7], "x": 18.25, "y": 1},
-
-                {"matrix": [2, 6], "x": 0, "y": 2},
-                {"matrix": [2, 7], "x": 1, "y": 2},
-
-                {"matrix": [2, 0], "x": 2.25, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 4, "y": 2},
-                {"matrix": [2, 2], "x": 5, "y": 2},
-                {"matrix": [2, 3], "x": 6, "y": 2},
-                {"matrix": [2, 4], "x": 7, "y": 2},
-                {"matrix": [2, 5], "x": 8, "y": 2},
-
-                {"matrix": [8, 0], "x": 10, "y": 2},
-                {"matrix": [8, 1], "x": 11, "y": 2},
-                {"matrix": [8, 2], "x": 12, "y": 2},
-                {"matrix": [8, 3], "x": 13, "y": 2},
-                {"matrix": [8, 4], "x": 14, "y": 2},
-                {"matrix": [8, 5], "x": 15, "y": 2},
-                {"matrix": [8, 7], "x": 16, "y": 2, "w": 2.25},
-                {"matrix": [8, 6], "x": 18.25, "y": 2},
-
-                {"matrix": [3, 1], "x": 0, "y": 3},
-                {"matrix": [3, 7], "x": 1, "y": 3},
-
-                {"matrix": [3, 0], "x": 2.25, "y": 3, "w": 2.25},
-                {"matrix": [3, 2], "x": 4.5, "y": 3},
-                {"matrix": [3, 3], "x": 5.5, "y": 3},
-                {"matrix": [3, 4], "x": 6.5, "y": 3},
-                {"matrix": [3, 5], "x": 7.5, "y": 3},
-                {"matrix": [3, 6], "x": 8.5, "y": 3},
-
-                {"matrix": [9, 0], "x": 10.5, "y": 3},
-                {"matrix": [9, 1], "x": 11.5, "y": 3},
-                {"matrix": [9, 2], "x": 12.5, "y": 3},
-                {"matrix": [9, 3], "x": 13.5, "y": 3},
-                {"matrix": [9, 5], "x": 14.5, "y": 3},
-                {"matrix": [9, 6], "x": 15.5, "y": 3, "w": 1.75},
-                {"matrix": [9, 7], "x": 17.25, "y": 3},
-                {"matrix": [9, 4], "x": 18.25, "y": 3},
-
-                {"matrix": [4, 5], "x": 0, "y": 4},
-                {"matrix": [4, 7], "x": 1, "y": 4},
-
-                {"matrix": [4, 0], "x": 2.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 3.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 4.75, "y": 4, "w": 1.25},
-                {"matrix": [4, 4], "x": 6, "y": 4, "w": 1.25},
-                {"matrix": [4, 6], "x": 7.25, "y": 4, "w": 2.25},
-
-                {"matrix": [10, 0], "x": 10.5, "y": 4, "w": 1.25},
-                {"matrix": [10, 1], "x": 11.75, "y": 4, "w": 1.5},
-                {"matrix": [10, 3], "x": 13.25, "y": 4},
-                {"matrix": [10, 4], "x": 14.25, "y": 4},
-                {"matrix": [10, 5], "x": 15.25, "y": 4},
-                {"matrix": [10, 6], "x": 16.25, "y": 4},
-                {"matrix": [10, 7], "x": 17.25, "y": 4},
-                {"matrix": [10, 2], "x": 18.25, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/keebio/quefrency/rev1/keyboard.json b/keyboards/keebio/quefrency/rev1/keyboard.json
new file mode 100644
index 00000000000..6bca115e660
--- /dev/null
+++ b/keyboards/keebio/quefrency/rev1/keyboard.json
@@ -0,0 +1,517 @@
+{
+    "keyboard_name": "Quefrency Rev. 1",
+    "manufacturer": "Keebio",
+    "url": "https://keeb.io",
+    "maintainer": "nooges",
+    "usb": {
+        "vid": "0xCB10",
+        "pid": "0x1257",
+        "device_version": "1.0.0"
+    },
+    "rgblight": {
+        "led_count": 16,
+        "split_count": [8, 8],
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": true,
+            "twinkle": true
+        }
+    },
+    "ws2812": {
+        "pin": "D3"
+    },
+    "matrix_pins": {
+        "cols": ["F5", "F6", "F7", "B1", "B3", "B2", "B6", "B5"],
+        "rows": ["F4", "D4", "D7", "E6", "B4", "C6"]
+    },
+    "diode_direction": "COL2ROW",
+    "split": {
+        "soft_serial_pin": "D0",
+        "matrix_pins": {
+            "right": {
+                "cols": ["F5", "F6", "F7", "B1", "B3", "B2", "B6", "C6"],
+                "rows": ["F4", "D4", "D7", "E6", "B4", "B5"]
+            }
+        }
+    },
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
+    "features": {
+        "bootmagic": false,
+        "mousekey": true,
+        "extrakey": true,
+        "rgblight": true
+    },
+    "build": {
+        "lto": true
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+
+                {"matrix": [6, 0], "x": 8, "y": 0},
+                {"matrix": [6, 1], "x": 9, "y": 0},
+                {"matrix": [6, 2], "x": 10, "y": 0},
+                {"matrix": [6, 3], "x": 11, "y": 0},
+                {"matrix": [6, 4], "x": 12, "y": 0},
+                {"matrix": [6, 5], "x": 13, "y": 0},
+                {"matrix": [6, 6], "x": 14, "y": 0},
+                {"matrix": [6, 7], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+
+                {"matrix": [7, 0], "x": 7.5, "y": 1},
+                {"matrix": [7, 1], "x": 8.5, "y": 1},
+                {"matrix": [7, 2], "x": 9.5, "y": 1},
+                {"matrix": [7, 3], "x": 10.5, "y": 1},
+                {"matrix": [7, 4], "x": 11.5, "y": 1},
+                {"matrix": [7, 5], "x": 12.5, "y": 1},
+                {"matrix": [7, 6], "x": 13.5, "y": 1},
+                {"matrix": [7, 7], "x": 14.5, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+
+                {"matrix": [8, 0], "x": 7.75, "y": 2},
+                {"matrix": [8, 1], "x": 8.75, "y": 2},
+                {"matrix": [8, 2], "x": 9.75, "y": 2},
+                {"matrix": [8, 3], "x": 10.75, "y": 2},
+                {"matrix": [8, 4], "x": 11.75, "y": 2},
+                {"matrix": [8, 5], "x": 12.75, "y": 2},
+                {"matrix": [8, 7], "x": 13.75, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+
+                {"matrix": [9, 0], "x": 8.25, "y": 3},
+                {"matrix": [9, 1], "x": 9.25, "y": 3},
+                {"matrix": [9, 2], "x": 10.25, "y": 3},
+                {"matrix": [9, 3], "x": 11.25, "y": 3},
+                {"matrix": [9, 5], "x": 12.25, "y": 3},
+                {"matrix": [9, 6], "x": 13.25, "y": 3, "w": 1.75},
+                {"matrix": [9, 7], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 3.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 5, "y": 4, "w": 2.25},
+
+                {"matrix": [10, 0], "x": 8.25, "y": 4, "w": 1.25},
+                {"matrix": [10, 1], "x": 9.5, "y": 4, "w": 1.5},
+                {"matrix": [10, 3], "x": 11, "y": 4},
+                {"matrix": [10, 4], "x": 12, "y": 4},
+                {"matrix": [10, 5], "x": 13, "y": 4},
+                {"matrix": [10, 6], "x": 14, "y": 4},
+                {"matrix": [10, 7], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_65": {
+            "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": [6, 0], "x": 8, "y": 0},
+                {"matrix": [6, 1], "x": 9, "y": 0},
+                {"matrix": [6, 2], "x": 10, "y": 0},
+                {"matrix": [6, 3], "x": 11, "y": 0},
+                {"matrix": [6, 4], "x": 12, "y": 0},
+                {"matrix": [6, 5], "x": 13, "y": 0},
+                {"matrix": [6, 6], "x": 14, "y": 0},
+                {"matrix": [6, 7], "x": 15, "y": 0},
+                {"matrix": [11, 6], "x": 16, "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": [7, 0], "x": 7.5, "y": 1},
+                {"matrix": [7, 1], "x": 8.5, "y": 1},
+                {"matrix": [7, 2], "x": 9.5, "y": 1},
+                {"matrix": [7, 3], "x": 10.5, "y": 1},
+                {"matrix": [7, 4], "x": 11.5, "y": 1},
+                {"matrix": [7, 5], "x": 12.5, "y": 1},
+                {"matrix": [7, 6], "x": 13.5, "y": 1},
+                {"matrix": [7, 7], "x": 14.5, "y": 1, "w": 1.5},
+                {"matrix": [11, 7], "x": 16, "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": [8, 0], "x": 7.75, "y": 2},
+                {"matrix": [8, 1], "x": 8.75, "y": 2},
+                {"matrix": [8, 2], "x": 9.75, "y": 2},
+                {"matrix": [8, 3], "x": 10.75, "y": 2},
+                {"matrix": [8, 4], "x": 11.75, "y": 2},
+                {"matrix": [8, 5], "x": 12.75, "y": 2},
+                {"matrix": [8, 7], "x": 13.75, "y": 2, "w": 2.25},
+                {"matrix": [8, 6], "x": 16, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+
+                {"matrix": [9, 0], "x": 8.25, "y": 3},
+                {"matrix": [9, 1], "x": 9.25, "y": 3},
+                {"matrix": [9, 2], "x": 10.25, "y": 3},
+                {"matrix": [9, 3], "x": 11.25, "y": 3},
+                {"matrix": [9, 5], "x": 12.25, "y": 3},
+                {"matrix": [9, 6], "x": 13.25, "y": 3, "w": 1.75},
+                {"matrix": [9, 7], "x": 15, "y": 3},
+                {"matrix": [9, 4], "x": 16, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 3.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 5, "y": 4, "w": 2.25},
+
+                {"matrix": [10, 0], "x": 8.25, "y": 4, "w": 1.25},
+                {"matrix": [10, 1], "x": 9.5, "y": 4, "w": 1.5},
+                {"matrix": [10, 3], "x": 11, "y": 4},
+                {"matrix": [10, 4], "x": 12, "y": 4},
+                {"matrix": [10, 5], "x": 13, "y": 4},
+                {"matrix": [10, 6], "x": 14, "y": 4},
+                {"matrix": [10, 7], "x": 15, "y": 4},
+                {"matrix": [10, 2], "x": 16, "y": 4}
+            ]
+        },
+        "LAYOUT_60_with_macro": {
+            "layout": [
+                {"matrix": [4, 3], "x": 0, "y": 0},
+                {"matrix": [0, 7], "x": 1, "y": 0},
+
+                {"matrix": [0, 0], "x": 2.25, "y": 0},
+                {"matrix": [0, 1], "x": 3.25, "y": 0},
+                {"matrix": [0, 2], "x": 4.25, "y": 0},
+                {"matrix": [0, 3], "x": 5.25, "y": 0},
+                {"matrix": [0, 4], "x": 6.25, "y": 0},
+                {"matrix": [0, 5], "x": 7.25, "y": 0},
+                {"matrix": [0, 6], "x": 8.25, "y": 0},
+
+                {"matrix": [6, 0], "x": 10.25, "y": 0},
+                {"matrix": [6, 1], "x": 11.25, "y": 0},
+                {"matrix": [6, 2], "x": 12.25, "y": 0},
+                {"matrix": [6, 3], "x": 13.25, "y": 0},
+                {"matrix": [6, 4], "x": 14.25, "y": 0},
+                {"matrix": [6, 5], "x": 15.25, "y": 0},
+                {"matrix": [6, 6], "x": 16.25, "y": 0},
+                {"matrix": [6, 7], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 6], "x": 0, "y": 1},
+                {"matrix": [1, 7], "x": 1, "y": 1},
+
+                {"matrix": [1, 0], "x": 2.25, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 3.75, "y": 1},
+                {"matrix": [1, 2], "x": 4.75, "y": 1},
+                {"matrix": [1, 3], "x": 5.75, "y": 1},
+                {"matrix": [1, 4], "x": 6.75, "y": 1},
+                {"matrix": [1, 5], "x": 7.75, "y": 1},
+
+                {"matrix": [7, 0], "x": 9.75, "y": 1},
+                {"matrix": [7, 1], "x": 10.75, "y": 1},
+                {"matrix": [7, 2], "x": 11.75, "y": 1},
+                {"matrix": [7, 3], "x": 12.75, "y": 1},
+                {"matrix": [7, 4], "x": 13.75, "y": 1},
+                {"matrix": [7, 5], "x": 14.75, "y": 1},
+                {"matrix": [7, 6], "x": 15.75, "y": 1},
+                {"matrix": [7, 7], "x": 16.75, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 6], "x": 0, "y": 2},
+                {"matrix": [2, 7], "x": 1, "y": 2},
+
+                {"matrix": [2, 0], "x": 2.25, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 4, "y": 2},
+                {"matrix": [2, 2], "x": 5, "y": 2},
+                {"matrix": [2, 3], "x": 6, "y": 2},
+                {"matrix": [2, 4], "x": 7, "y": 2},
+                {"matrix": [2, 5], "x": 8, "y": 2},
+
+                {"matrix": [8, 0], "x": 10, "y": 2},
+                {"matrix": [8, 1], "x": 11, "y": 2},
+                {"matrix": [8, 2], "x": 12, "y": 2},
+                {"matrix": [8, 3], "x": 13, "y": 2},
+                {"matrix": [8, 4], "x": 14, "y": 2},
+                {"matrix": [8, 5], "x": 15, "y": 2},
+                {"matrix": [8, 7], "x": 16, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 1], "x": 0, "y": 3},
+                {"matrix": [3, 7], "x": 1, "y": 3},
+
+                {"matrix": [3, 0], "x": 2.25, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 4.5, "y": 3},
+                {"matrix": [3, 3], "x": 5.5, "y": 3},
+                {"matrix": [3, 4], "x": 6.5, "y": 3},
+                {"matrix": [3, 5], "x": 7.5, "y": 3},
+                {"matrix": [3, 6], "x": 8.5, "y": 3},
+
+                {"matrix": [9, 0], "x": 10.5, "y": 3},
+                {"matrix": [9, 1], "x": 11.5, "y": 3},
+                {"matrix": [9, 2], "x": 12.5, "y": 3},
+                {"matrix": [9, 3], "x": 13.5, "y": 3},
+                {"matrix": [9, 5], "x": 14.5, "y": 3},
+                {"matrix": [9, 6], "x": 15.5, "y": 3, "w": 1.75},
+                {"matrix": [9, 7], "x": 17.25, "y": 3},
+
+                {"matrix": [4, 5], "x": 0, "y": 4},
+                {"matrix": [4, 7], "x": 1, "y": 4},
+
+                {"matrix": [4, 0], "x": 2.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 3.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 4.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 6, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 7.25, "y": 4, "w": 2.25},
+
+                {"matrix": [10, 0], "x": 10.5, "y": 4, "w": 1.25},
+                {"matrix": [10, 1], "x": 11.75, "y": 4, "w": 1.5},
+                {"matrix": [10, 3], "x": 13.25, "y": 4},
+                {"matrix": [10, 4], "x": 14.25, "y": 4},
+                {"matrix": [10, 5], "x": 15.25, "y": 4},
+                {"matrix": [10, 6], "x": 16.25, "y": 4},
+                {"matrix": [10, 7], "x": 17.25, "y": 4}
+            ]
+        },
+        "LAYOUT_65_with_macro": {
+            "layout": [
+                {"matrix": [4, 3], "x": 0, "y": 0},
+                {"matrix": [0, 7], "x": 1, "y": 0},
+
+                {"matrix": [0, 0], "x": 2.25, "y": 0},
+                {"matrix": [0, 1], "x": 3.25, "y": 0},
+                {"matrix": [0, 2], "x": 4.25, "y": 0},
+                {"matrix": [0, 3], "x": 5.25, "y": 0},
+                {"matrix": [0, 4], "x": 6.25, "y": 0},
+                {"matrix": [0, 5], "x": 7.25, "y": 0},
+                {"matrix": [0, 6], "x": 8.25, "y": 0},
+
+                {"matrix": [6, 0], "x": 10.25, "y": 0},
+                {"matrix": [6, 1], "x": 11.25, "y": 0},
+                {"matrix": [6, 2], "x": 12.25, "y": 0},
+                {"matrix": [6, 3], "x": 13.25, "y": 0},
+                {"matrix": [6, 4], "x": 14.25, "y": 0},
+                {"matrix": [6, 5], "x": 15.25, "y": 0},
+                {"matrix": [6, 6], "x": 16.25, "y": 0},
+                {"matrix": [6, 7], "x": 17.25, "y": 0},
+                {"matrix": [11, 6], "x": 18.25, "y": 0},
+
+                {"matrix": [1, 6], "x": 0, "y": 1},
+                {"matrix": [1, 7], "x": 1, "y": 1},
+
+                {"matrix": [1, 0], "x": 2.25, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 3.75, "y": 1},
+                {"matrix": [1, 2], "x": 4.75, "y": 1},
+                {"matrix": [1, 3], "x": 5.75, "y": 1},
+                {"matrix": [1, 4], "x": 6.75, "y": 1},
+                {"matrix": [1, 5], "x": 7.75, "y": 1},
+
+                {"matrix": [7, 0], "x": 9.75, "y": 1},
+                {"matrix": [7, 1], "x": 10.75, "y": 1},
+                {"matrix": [7, 2], "x": 11.75, "y": 1},
+                {"matrix": [7, 3], "x": 12.75, "y": 1},
+                {"matrix": [7, 4], "x": 13.75, "y": 1},
+                {"matrix": [7, 5], "x": 14.75, "y": 1},
+                {"matrix": [7, 6], "x": 15.75, "y": 1},
+                {"matrix": [7, 7], "x": 16.75, "y": 1, "w": 1.5},
+                {"matrix": [11, 7], "x": 18.25, "y": 1},
+
+                {"matrix": [2, 6], "x": 0, "y": 2},
+                {"matrix": [2, 7], "x": 1, "y": 2},
+
+                {"matrix": [2, 0], "x": 2.25, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 4, "y": 2},
+                {"matrix": [2, 2], "x": 5, "y": 2},
+                {"matrix": [2, 3], "x": 6, "y": 2},
+                {"matrix": [2, 4], "x": 7, "y": 2},
+                {"matrix": [2, 5], "x": 8, "y": 2},
+
+                {"matrix": [8, 0], "x": 10, "y": 2},
+                {"matrix": [8, 1], "x": 11, "y": 2},
+                {"matrix": [8, 2], "x": 12, "y": 2},
+                {"matrix": [8, 3], "x": 13, "y": 2},
+                {"matrix": [8, 4], "x": 14, "y": 2},
+                {"matrix": [8, 5], "x": 15, "y": 2},
+                {"matrix": [8, 7], "x": 16, "y": 2, "w": 2.25},
+                {"matrix": [8, 6], "x": 18.25, "y": 2},
+
+                {"matrix": [3, 1], "x": 0, "y": 3},
+                {"matrix": [3, 7], "x": 1, "y": 3},
+
+                {"matrix": [3, 0], "x": 2.25, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 4.5, "y": 3},
+                {"matrix": [3, 3], "x": 5.5, "y": 3},
+                {"matrix": [3, 4], "x": 6.5, "y": 3},
+                {"matrix": [3, 5], "x": 7.5, "y": 3},
+                {"matrix": [3, 6], "x": 8.5, "y": 3},
+
+                {"matrix": [9, 0], "x": 10.5, "y": 3},
+                {"matrix": [9, 1], "x": 11.5, "y": 3},
+                {"matrix": [9, 2], "x": 12.5, "y": 3},
+                {"matrix": [9, 3], "x": 13.5, "y": 3},
+                {"matrix": [9, 5], "x": 14.5, "y": 3},
+                {"matrix": [9, 6], "x": 15.5, "y": 3, "w": 1.75},
+                {"matrix": [9, 7], "x": 17.25, "y": 3},
+                {"matrix": [9, 4], "x": 18.25, "y": 3},
+
+                {"matrix": [4, 5], "x": 0, "y": 4},
+                {"matrix": [4, 7], "x": 1, "y": 4},
+
+                {"matrix": [4, 0], "x": 2.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 3.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 4.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 6, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 7.25, "y": 4, "w": 2.25},
+
+                {"matrix": [10, 0], "x": 10.5, "y": 4, "w": 1.25},
+                {"matrix": [10, 1], "x": 11.75, "y": 4, "w": 1.5},
+                {"matrix": [10, 3], "x": 13.25, "y": 4},
+                {"matrix": [10, 4], "x": 14.25, "y": 4},
+                {"matrix": [10, 5], "x": 15.25, "y": 4},
+                {"matrix": [10, 6], "x": 16.25, "y": 4},
+                {"matrix": [10, 7], "x": 17.25, "y": 4},
+                {"matrix": [10, 2], "x": 18.25, "y": 4}
+            ]
+        },
+        "LAYOUT_all": {
+            "layout": [
+                {"matrix": [4, 3], "x": 0, "y": 0},
+                {"matrix": [0, 7], "x": 1, "y": 0},
+
+                {"matrix": [0, 0], "x": 2.25, "y": 0},
+                {"matrix": [0, 1], "x": 3.25, "y": 0},
+                {"matrix": [0, 2], "x": 4.25, "y": 0},
+                {"matrix": [0, 3], "x": 5.25, "y": 0},
+                {"matrix": [0, 4], "x": 6.25, "y": 0},
+                {"matrix": [0, 5], "x": 7.25, "y": 0},
+                {"matrix": [0, 6], "x": 8.25, "y": 0},
+
+                {"matrix": [6, 0], "x": 10.25, "y": 0},
+                {"matrix": [6, 1], "x": 11.25, "y": 0},
+                {"matrix": [6, 2], "x": 12.25, "y": 0},
+                {"matrix": [6, 3], "x": 13.25, "y": 0},
+                {"matrix": [6, 4], "x": 14.25, "y": 0},
+                {"matrix": [6, 5], "x": 15.25, "y": 0},
+                {"matrix": [6, 6], "x": 16.25, "y": 0},
+                {"matrix": [6, 7], "x": 17.25, "y": 0},
+                {"matrix": [11, 6], "x": 18.25, "y": 0},
+
+                {"matrix": [1, 6], "x": 0, "y": 1},
+                {"matrix": [1, 7], "x": 1, "y": 1},
+
+                {"matrix": [1, 0], "x": 2.25, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 3.75, "y": 1},
+                {"matrix": [1, 2], "x": 4.75, "y": 1},
+                {"matrix": [1, 3], "x": 5.75, "y": 1},
+                {"matrix": [1, 4], "x": 6.75, "y": 1},
+                {"matrix": [1, 5], "x": 7.75, "y": 1},
+
+                {"matrix": [7, 0], "x": 9.75, "y": 1},
+                {"matrix": [7, 1], "x": 10.75, "y": 1},
+                {"matrix": [7, 2], "x": 11.75, "y": 1},
+                {"matrix": [7, 3], "x": 12.75, "y": 1},
+                {"matrix": [7, 4], "x": 13.75, "y": 1},
+                {"matrix": [7, 5], "x": 14.75, "y": 1},
+                {"matrix": [7, 6], "x": 15.75, "y": 1},
+                {"matrix": [7, 7], "x": 16.75, "y": 1, "w": 1.5},
+                {"matrix": [11, 7], "x": 18.25, "y": 1},
+
+                {"matrix": [2, 6], "x": 0, "y": 2},
+                {"matrix": [2, 7], "x": 1, "y": 2},
+
+                {"matrix": [2, 0], "x": 2.25, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 4, "y": 2},
+                {"matrix": [2, 2], "x": 5, "y": 2},
+                {"matrix": [2, 3], "x": 6, "y": 2},
+                {"matrix": [2, 4], "x": 7, "y": 2},
+                {"matrix": [2, 5], "x": 8, "y": 2},
+
+                {"matrix": [8, 0], "x": 10, "y": 2},
+                {"matrix": [8, 1], "x": 11, "y": 2},
+                {"matrix": [8, 2], "x": 12, "y": 2},
+                {"matrix": [8, 3], "x": 13, "y": 2},
+                {"matrix": [8, 4], "x": 14, "y": 2},
+                {"matrix": [8, 5], "x": 15, "y": 2},
+                {"matrix": [8, 7], "x": 16, "y": 2, "w": 2.25},
+                {"matrix": [8, 6], "x": 18.25, "y": 2},
+
+                {"matrix": [3, 1], "x": 0, "y": 3},
+                {"matrix": [3, 7], "x": 1, "y": 3},
+
+                {"matrix": [3, 0], "x": 2.25, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 4.5, "y": 3},
+                {"matrix": [3, 3], "x": 5.5, "y": 3},
+                {"matrix": [3, 4], "x": 6.5, "y": 3},
+                {"matrix": [3, 5], "x": 7.5, "y": 3},
+                {"matrix": [3, 6], "x": 8.5, "y": 3},
+
+                {"matrix": [9, 0], "x": 10.5, "y": 3},
+                {"matrix": [9, 1], "x": 11.5, "y": 3},
+                {"matrix": [9, 2], "x": 12.5, "y": 3},
+                {"matrix": [9, 3], "x": 13.5, "y": 3},
+                {"matrix": [9, 5], "x": 14.5, "y": 3},
+                {"matrix": [9, 6], "x": 15.5, "y": 3, "w": 1.75},
+                {"matrix": [9, 7], "x": 17.25, "y": 3},
+                {"matrix": [9, 4], "x": 18.25, "y": 3},
+
+                {"matrix": [4, 5], "x": 0, "y": 4},
+                {"matrix": [4, 7], "x": 1, "y": 4},
+
+                {"matrix": [4, 0], "x": 2.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 3.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 4.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 6, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 7.25, "y": 4, "w": 2.25},
+
+                {"matrix": [10, 0], "x": 10.5, "y": 4, "w": 1.25},
+                {"matrix": [10, 1], "x": 11.75, "y": 4, "w": 1.5},
+                {"matrix": [10, 3], "x": 13.25, "y": 4},
+                {"matrix": [10, 4], "x": 14.25, "y": 4},
+                {"matrix": [10, 5], "x": 15.25, "y": 4},
+                {"matrix": [10, 6], "x": 16.25, "y": 4},
+                {"matrix": [10, 7], "x": 17.25, "y": 4},
+                {"matrix": [10, 2], "x": 18.25, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/keebio/quefrency/rev1/rules.mk b/keyboards/keebio/quefrency/rev1/rules.mk
deleted file mode 100644
index b771d431ad5..00000000000
--- a/keyboards/keebio/quefrency/rev1/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-MOUSEKEY_ENABLE = yes       # Mouse keys
diff --git a/keyboards/keebio/quefrency/rev2/info.json b/keyboards/keebio/quefrency/rev2/info.json
deleted file mode 100644
index 26df29e3f0d..00000000000
--- a/keyboards/keebio/quefrency/rev2/info.json
+++ /dev/null
@@ -1,869 +0,0 @@
-{
-    "keyboard_name": "Quefrency Rev. 2",
-    "manufacturer": "Keebio",
-    "url": "https://keeb.io",
-    "maintainer": "nooges",
-    "usb": {
-        "vid": "0xCB10",
-        "pid": "0x2257",
-        "device_version": "2.0.0"
-    },
-    "matrix_pins": {
-        "cols": ["F4", "F1", "F0", "B7", "B3", "D2", "D3", "D5", "D4"],
-        "rows": ["B1", "B2", "C7", "B4", "D7"]
-    },
-    "diode_direction": "COL2ROW",
-    "encoder": {
-        "rotary": [
-            {"pin_a": "F5", "pin_b": "F6"}
-        ]
-    },
-    "backlight": {
-        "pin": "B5"
-    },
-    "rgblight": {
-        "led_count": 16,
-        "led_map": [1, 2, 3, 12, 13, 14, 15, 0, 7, 6, 5, 4, 11, 10, 9, 8],
-        "split_count": [8, 8],
-        "animations": {
-            "breathing": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "snake": true,
-            "knight": true,
-            "christmas": true,
-            "static_gradient": true,
-            "rgb_test": true,
-            "alternating": true,
-            "twinkle": true
-        }
-    },
-    "ws2812": {
-        "pin": "E6"
-    },
-    "split": {
-        "soft_serial_pin": "D0",
-        "encoder": {
-            "right": {
-                "rotary": [
-                    {"pin_a": "D6", "pin_b": "D4"}
-                ]
-            }
-        },
-        "matrix_pins": {
-            "right": {
-                "cols": ["F1", "F0", "F4", "F5", "F6", "D5", "C7", "D3", "B7"],
-                "rows": ["B3", "B2", "B6", "B4", "D7"]
-            }
-        }
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "layout_aliases": {
-        "LAYOUT": "LAYOUT_60"
-    },
-    "layouts": {
-        "LAYOUT_60": {
-            "layout": [
-                {"matrix": [0, 2], "x": 0, "y": 0},
-                {"matrix": [0, 3], "x": 1, "y": 0},
-                {"matrix": [0, 4], "x": 2, "y": 0},
-                {"matrix": [0, 5], "x": 3, "y": 0},
-                {"matrix": [0, 6], "x": 4, "y": 0},
-                {"matrix": [0, 7], "x": 5, "y": 0},
-                {"matrix": [0, 8], "x": 6, "y": 0},
-
-                {"matrix": [5, 0], "x": 8, "y": 0},
-                {"matrix": [5, 1], "x": 9, "y": 0},
-                {"matrix": [5, 2], "x": 10, "y": 0},
-                {"matrix": [5, 3], "x": 11, "y": 0},
-                {"matrix": [5, 4], "x": 12, "y": 0},
-                {"matrix": [5, 5], "x": 13, "y": 0},
-                {"matrix": [5, 6], "x": 14, "y": 0},
-                {"matrix": [5, 7], "x": 15, "y": 0},
-
-                {"matrix": [1, 2], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 3], "x": 1.5, "y": 1},
-                {"matrix": [1, 4], "x": 2.5, "y": 1},
-                {"matrix": [1, 5], "x": 3.5, "y": 1},
-                {"matrix": [1, 6], "x": 4.5, "y": 1},
-                {"matrix": [1, 7], "x": 5.5, "y": 1},
-
-                {"matrix": [6, 0], "x": 7.5, "y": 1},
-                {"matrix": [6, 1], "x": 8.5, "y": 1},
-                {"matrix": [6, 2], "x": 9.5, "y": 1},
-                {"matrix": [6, 3], "x": 10.5, "y": 1},
-                {"matrix": [6, 4], "x": 11.5, "y": 1},
-                {"matrix": [6, 5], "x": 12.5, "y": 1},
-                {"matrix": [6, 6], "x": 13.5, "y": 1},
-                {"matrix": [6, 7], "x": 14.5, "y": 1, "w": 1.5},
-
-                {"matrix": [2, 2], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 3], "x": 1.75, "y": 2},
-                {"matrix": [2, 4], "x": 2.75, "y": 2},
-                {"matrix": [2, 5], "x": 3.75, "y": 2},
-                {"matrix": [2, 6], "x": 4.75, "y": 2},
-                {"matrix": [2, 7], "x": 5.75, "y": 2},
-
-                {"matrix": [7, 0], "x": 7.75, "y": 2},
-                {"matrix": [7, 1], "x": 8.75, "y": 2},
-                {"matrix": [7, 2], "x": 9.75, "y": 2},
-                {"matrix": [7, 3], "x": 10.75, "y": 2},
-                {"matrix": [7, 4], "x": 11.75, "y": 2},
-                {"matrix": [7, 5], "x": 12.75, "y": 2},
-                {"matrix": [7, 7], "x": 13.75, "y": 2, "w": 2.25},
-
-                {"matrix": [3, 2], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 4], "x": 2.25, "y": 3},
-                {"matrix": [3, 5], "x": 3.25, "y": 3},
-                {"matrix": [3, 6], "x": 4.25, "y": 3},
-                {"matrix": [3, 7], "x": 5.25, "y": 3},
-                {"matrix": [3, 8], "x": 6.25, "y": 3},
-
-                {"matrix": [8, 0], "x": 8.25, "y": 3},
-                {"matrix": [8, 1], "x": 9.25, "y": 3},
-                {"matrix": [8, 2], "x": 10.25, "y": 3},
-                {"matrix": [8, 3], "x": 11.25, "y": 3},
-                {"matrix": [8, 4], "x": 12.25, "y": 3},
-                {"matrix": [8, 6], "x": 13.25, "y": 3, "w": 1.75},
-                {"matrix": [8, 7], "x": 15, "y": 3},
-
-                {"matrix": [4, 2], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 3], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 4], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 1.25},
-                {"matrix": [4, 7], "x": 5, "y": 4, "w": 2.25},
-
-                {"matrix": [9, 0], "x": 8.25, "y": 4, "w": 1.25},
-                {"matrix": [9, 1], "x": 9.5, "y": 4, "w": 1.5},
-                {"matrix": [9, 2], "x": 11, "y": 4},
-                {"matrix": [9, 3], "x": 12, "y": 4},
-                {"matrix": [9, 4], "x": 13, "y": 4},
-                {"matrix": [9, 6], "x": 14, "y": 4},
-                {"matrix": [9, 7], "x": 15, "y": 4}
-            ]
-        },
-        "LAYOUT_65": {
-            "layout": [
-                {"matrix": [0, 2], "x": 0, "y": 0},
-                {"matrix": [0, 3], "x": 1, "y": 0},
-                {"matrix": [0, 4], "x": 2, "y": 0},
-                {"matrix": [0, 5], "x": 3, "y": 0},
-                {"matrix": [0, 6], "x": 4, "y": 0},
-                {"matrix": [0, 7], "x": 5, "y": 0},
-                {"matrix": [0, 8], "x": 6, "y": 0},
-
-                {"matrix": [5, 0], "x": 8, "y": 0},
-                {"matrix": [5, 1], "x": 9, "y": 0},
-                {"matrix": [5, 2], "x": 10, "y": 0},
-                {"matrix": [5, 3], "x": 11, "y": 0},
-                {"matrix": [5, 4], "x": 12, "y": 0},
-                {"matrix": [5, 5], "x": 13, "y": 0},
-                {"matrix": [5, 6], "x": 14, "y": 0},
-                {"matrix": [5, 7], "x": 15, "y": 0},
-                {"matrix": [5, 8], "x": 16, "y": 0},
-
-                {"matrix": [1, 2], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 3], "x": 1.5, "y": 1},
-                {"matrix": [1, 4], "x": 2.5, "y": 1},
-                {"matrix": [1, 5], "x": 3.5, "y": 1},
-                {"matrix": [1, 6], "x": 4.5, "y": 1},
-                {"matrix": [1, 7], "x": 5.5, "y": 1},
-
-                {"matrix": [6, 0], "x": 7.5, "y": 1},
-                {"matrix": [6, 1], "x": 8.5, "y": 1},
-                {"matrix": [6, 2], "x": 9.5, "y": 1},
-                {"matrix": [6, 3], "x": 10.5, "y": 1},
-                {"matrix": [6, 4], "x": 11.5, "y": 1},
-                {"matrix": [6, 5], "x": 12.5, "y": 1},
-                {"matrix": [6, 6], "x": 13.5, "y": 1},
-                {"matrix": [6, 7], "x": 14.5, "y": 1, "w": 1.5},
-                {"matrix": [6, 8], "x": 16, "y": 1},
-
-                {"matrix": [2, 2], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 3], "x": 1.75, "y": 2},
-                {"matrix": [2, 4], "x": 2.75, "y": 2},
-                {"matrix": [2, 5], "x": 3.75, "y": 2},
-                {"matrix": [2, 6], "x": 4.75, "y": 2},
-                {"matrix": [2, 7], "x": 5.75, "y": 2},
-
-                {"matrix": [7, 0], "x": 7.75, "y": 2},
-                {"matrix": [7, 1], "x": 8.75, "y": 2},
-                {"matrix": [7, 2], "x": 9.75, "y": 2},
-                {"matrix": [7, 3], "x": 10.75, "y": 2},
-                {"matrix": [7, 4], "x": 11.75, "y": 2},
-                {"matrix": [7, 5], "x": 12.75, "y": 2},
-                {"matrix": [7, 7], "x": 13.75, "y": 2, "w": 2.25},
-                {"matrix": [7, 8], "x": 16, "y": 2},
-
-                {"matrix": [3, 2], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 4], "x": 2.25, "y": 3},
-                {"matrix": [3, 5], "x": 3.25, "y": 3},
-                {"matrix": [3, 6], "x": 4.25, "y": 3},
-                {"matrix": [3, 7], "x": 5.25, "y": 3},
-                {"matrix": [3, 8], "x": 6.25, "y": 3},
-
-                {"matrix": [8, 0], "x": 8.25, "y": 3},
-                {"matrix": [8, 1], "x": 9.25, "y": 3},
-                {"matrix": [8, 2], "x": 10.25, "y": 3},
-                {"matrix": [8, 3], "x": 11.25, "y": 3},
-                {"matrix": [8, 4], "x": 12.25, "y": 3},
-                {"matrix": [8, 6], "x": 13.25, "y": 3, "w": 1.75},
-                {"matrix": [8, 7], "x": 15, "y": 3},
-                {"matrix": [8, 8], "x": 16, "y": 3},
-
-                {"matrix": [4, 2], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 3], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 4], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 1.25},
-                {"matrix": [4, 7], "x": 5, "y": 4, "w": 2.25},
-
-                {"matrix": [9, 0], "x": 8.25, "y": 4, "w": 1.25},
-                {"matrix": [9, 1], "x": 9.5, "y": 4, "w": 1.5},
-                {"matrix": [9, 2], "x": 11, "y": 4},
-                {"matrix": [9, 3], "x": 12, "y": 4},
-                {"matrix": [9, 4], "x": 13, "y": 4},
-                {"matrix": [9, 6], "x": 14, "y": 4},
-                {"matrix": [9, 7], "x": 15, "y": 4},
-                {"matrix": [9, 8], "x": 16, "y": 4}
-            ]
-        },
-        "LAYOUT_60_with_macro": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2.25, "y": 0},
-                {"matrix": [0, 3], "x": 3.25, "y": 0},
-                {"matrix": [0, 4], "x": 4.25, "y": 0},
-                {"matrix": [0, 5], "x": 5.25, "y": 0},
-                {"matrix": [0, 6], "x": 6.25, "y": 0},
-                {"matrix": [0, 7], "x": 7.25, "y": 0},
-                {"matrix": [0, 8], "x": 8.25, "y": 0},
-
-                {"matrix": [5, 0], "x": 10.25, "y": 0},
-                {"matrix": [5, 1], "x": 11.25, "y": 0},
-                {"matrix": [5, 2], "x": 12.25, "y": 0},
-                {"matrix": [5, 3], "x": 13.25, "y": 0},
-                {"matrix": [5, 4], "x": 14.25, "y": 0},
-                {"matrix": [5, 5], "x": 15.25, "y": 0},
-                {"matrix": [5, 6], "x": 16.25, "y": 0},
-                {"matrix": [5, 7], "x": 17.25, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1},
-                {"matrix": [1, 1], "x": 1, "y": 1},
-                {"matrix": [1, 2], "x": 2.25, "y": 1, "w": 1.5},
-                {"matrix": [1, 3], "x": 3.75, "y": 1},
-                {"matrix": [1, 4], "x": 4.75, "y": 1},
-                {"matrix": [1, 5], "x": 5.75, "y": 1},
-                {"matrix": [1, 6], "x": 6.75, "y": 1},
-                {"matrix": [1, 7], "x": 7.75, "y": 1},
-
-                {"matrix": [6, 0], "x": 9.75, "y": 1},
-                {"matrix": [6, 1], "x": 10.75, "y": 1},
-                {"matrix": [6, 2], "x": 11.75, "y": 1},
-                {"matrix": [6, 3], "x": 12.75, "y": 1},
-                {"matrix": [6, 4], "x": 13.75, "y": 1},
-                {"matrix": [6, 5], "x": 14.75, "y": 1},
-                {"matrix": [6, 6], "x": 15.75, "y": 1},
-                {"matrix": [6, 7], "x": 16.75, "y": 1, "w": 1.5},
-
-                {"matrix": [2, 0], "x": 0, "y": 2},
-                {"matrix": [2, 1], "x": 1, "y": 2},
-                {"matrix": [2, 2], "x": 2.25, "y": 2, "w": 1.75},
-                {"matrix": [2, 3], "x": 4, "y": 2},
-                {"matrix": [2, 4], "x": 5, "y": 2},
-                {"matrix": [2, 5], "x": 6, "y": 2},
-                {"matrix": [2, 6], "x": 7, "y": 2},
-                {"matrix": [2, 7], "x": 8, "y": 2},
-
-                {"matrix": [7, 0], "x": 10, "y": 2},
-                {"matrix": [7, 1], "x": 11, "y": 2},
-                {"matrix": [7, 2], "x": 12, "y": 2},
-                {"matrix": [7, 3], "x": 13, "y": 2},
-                {"matrix": [7, 4], "x": 14, "y": 2},
-                {"matrix": [7, 5], "x": 15, "y": 2},
-                {"matrix": [7, 7], "x": 16, "y": 2, "w": 2.25},
-
-                {"matrix": [3, 0], "x": 0, "y": 3},
-                {"matrix": [3, 1], "x": 1, "y": 3},
-                {"matrix": [3, 2], "x": 2.25, "y": 3, "w": 2.25},
-                {"matrix": [3, 4], "x": 4.5, "y": 3},
-                {"matrix": [3, 5], "x": 5.5, "y": 3},
-                {"matrix": [3, 6], "x": 6.5, "y": 3},
-                {"matrix": [3, 7], "x": 7.5, "y": 3},
-                {"matrix": [3, 8], "x": 8.5, "y": 3},
-
-                {"matrix": [8, 0], "x": 10.5, "y": 3},
-                {"matrix": [8, 1], "x": 11.5, "y": 3},
-                {"matrix": [8, 2], "x": 12.5, "y": 3},
-                {"matrix": [8, 3], "x": 13.5, "y": 3},
-                {"matrix": [8, 4], "x": 14.5, "y": 3},
-                {"matrix": [8, 6], "x": 15.5, "y": 3, "w": 1.75},
-                {"matrix": [8, 7], "x": 17.25, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4},
-                {"matrix": [4, 1], "x": 1, "y": 4},
-                {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 3], "x": 3.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 4], "x": 4.75, "y": 4, "w": 1.25},
-                {"matrix": [4, 5], "x": 6, "y": 4, "w": 1.25},
-                {"matrix": [4, 7], "x": 7.25, "y": 4, "w": 2.25},
-
-                {"matrix": [9, 0], "x": 10.5, "y": 4, "w": 1.25},
-                {"matrix": [9, 1], "x": 11.75, "y": 4, "w": 1.5},
-                {"matrix": [9, 2], "x": 13.25, "y": 4},
-                {"matrix": [9, 3], "x": 14.25, "y": 4},
-                {"matrix": [9, 4], "x": 15.25, "y": 4},
-                {"matrix": [9, 6], "x": 16.25, "y": 4},
-                {"matrix": [9, 7], "x": 17.25, "y": 4}
-            ]
-        },
-        "LAYOUT_65_with_macro": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2.25, "y": 0},
-                {"matrix": [0, 3], "x": 3.25, "y": 0},
-                {"matrix": [0, 4], "x": 4.25, "y": 0},
-                {"matrix": [0, 5], "x": 5.25, "y": 0},
-                {"matrix": [0, 6], "x": 6.25, "y": 0},
-                {"matrix": [0, 7], "x": 7.25, "y": 0},
-                {"matrix": [0, 8], "x": 8.25, "y": 0},
-
-                {"matrix": [5, 0], "x": 10.25, "y": 0},
-                {"matrix": [5, 1], "x": 11.25, "y": 0},
-                {"matrix": [5, 2], "x": 12.25, "y": 0},
-                {"matrix": [5, 3], "x": 13.25, "y": 0},
-                {"matrix": [5, 4], "x": 14.25, "y": 0},
-                {"matrix": [5, 5], "x": 15.25, "y": 0},
-                {"matrix": [5, 6], "x": 16.25, "y": 0},
-                {"matrix": [5, 7], "x": 17.25, "y": 0},
-                {"matrix": [5, 8], "x": 18.25, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1},
-                {"matrix": [1, 1], "x": 1, "y": 1},
-                {"matrix": [1, 2], "x": 2.25, "y": 1, "w": 1.5},
-                {"matrix": [1, 3], "x": 3.75, "y": 1},
-                {"matrix": [1, 4], "x": 4.75, "y": 1},
-                {"matrix": [1, 5], "x": 5.75, "y": 1},
-                {"matrix": [1, 6], "x": 6.75, "y": 1},
-                {"matrix": [1, 7], "x": 7.75, "y": 1},
-
-                {"matrix": [6, 0], "x": 9.75, "y": 1},
-                {"matrix": [6, 1], "x": 10.75, "y": 1},
-                {"matrix": [6, 2], "x": 11.75, "y": 1},
-                {"matrix": [6, 3], "x": 12.75, "y": 1},
-                {"matrix": [6, 4], "x": 13.75, "y": 1},
-                {"matrix": [6, 5], "x": 14.75, "y": 1},
-                {"matrix": [6, 6], "x": 15.75, "y": 1},
-                {"matrix": [6, 7], "x": 16.75, "y": 1, "w": 1.5},
-                {"matrix": [6, 8], "x": 18.25, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2},
-                {"matrix": [2, 1], "x": 1, "y": 2},
-                {"matrix": [2, 2], "x": 2.25, "y": 2, "w": 1.75},
-                {"matrix": [2, 3], "x": 4, "y": 2},
-                {"matrix": [2, 4], "x": 5, "y": 2},
-                {"matrix": [2, 5], "x": 6, "y": 2},
-                {"matrix": [2, 6], "x": 7, "y": 2},
-                {"matrix": [2, 7], "x": 8, "y": 2},
-
-                {"matrix": [7, 0], "x": 10, "y": 2},
-                {"matrix": [7, 1], "x": 11, "y": 2},
-                {"matrix": [7, 2], "x": 12, "y": 2},
-                {"matrix": [7, 3], "x": 13, "y": 2},
-                {"matrix": [7, 4], "x": 14, "y": 2},
-                {"matrix": [7, 5], "x": 15, "y": 2},
-                {"matrix": [7, 7], "x": 16, "y": 2, "w": 2.25},
-                {"matrix": [7, 8], "x": 18.25, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3},
-                {"matrix": [3, 1], "x": 1, "y": 3},
-                {"matrix": [3, 2], "x": 2.25, "y": 3, "w": 2.25},
-                {"matrix": [3, 4], "x": 4.5, "y": 3},
-                {"matrix": [3, 5], "x": 5.5, "y": 3},
-                {"matrix": [3, 6], "x": 6.5, "y": 3},
-                {"matrix": [3, 7], "x": 7.5, "y": 3},
-                {"matrix": [3, 8], "x": 8.5, "y": 3},
-
-                {"matrix": [8, 0], "x": 10.5, "y": 3},
-                {"matrix": [8, 1], "x": 11.5, "y": 3},
-                {"matrix": [8, 2], "x": 12.5, "y": 3},
-                {"matrix": [8, 3], "x": 13.5, "y": 3},
-                {"matrix": [8, 4], "x": 14.5, "y": 3},
-                {"matrix": [8, 6], "x": 15.5, "y": 3, "w": 1.75},
-                {"matrix": [8, 7], "x": 17.25, "y": 3},
-                {"matrix": [8, 8], "x": 18.25, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4},
-                {"matrix": [4, 1], "x": 1, "y": 4},
-                {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 3], "x": 3.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 4], "x": 4.75, "y": 4, "w": 1.25},
-                {"matrix": [4, 5], "x": 6, "y": 4, "w": 1.25},
-                {"matrix": [4, 7], "x": 7.25, "y": 4, "w": 2.25},
-
-                {"matrix": [9, 0], "x": 10.5, "y": 4, "w": 1.25},
-                {"matrix": [9, 1], "x": 11.75, "y": 4, "w": 1.5},
-                {"matrix": [9, 2], "x": 13.25, "y": 4},
-                {"matrix": [9, 3], "x": 14.25, "y": 4},
-                {"matrix": [9, 4], "x": 15.25, "y": 4},
-                {"matrix": [9, 6], "x": 16.25, "y": 4},
-                {"matrix": [9, 7], "x": 17.25, "y": 4},
-                {"matrix": [9, 8], "x": 18.25, "y": 4}
-            ]
-        },
-        "LAYOUT_60_iso": {
-            "layout": [
-                {"matrix": [0, 2], "x": 0, "y": 0},
-                {"matrix": [0, 3], "x": 1, "y": 0},
-                {"matrix": [0, 4], "x": 2, "y": 0},
-                {"matrix": [0, 5], "x": 3, "y": 0},
-                {"matrix": [0, 6], "x": 4, "y": 0},
-                {"matrix": [0, 7], "x": 5, "y": 0},
-                {"matrix": [0, 8], "x": 6, "y": 0},
-
-                {"matrix": [5, 0], "x": 8, "y": 0},
-                {"matrix": [5, 1], "x": 9, "y": 0},
-                {"matrix": [5, 2], "x": 10, "y": 0},
-                {"matrix": [5, 3], "x": 11, "y": 0},
-                {"matrix": [5, 4], "x": 12, "y": 0},
-                {"matrix": [5, 5], "x": 13, "y": 0},
-                {"matrix": [5, 6], "x": 14, "y": 0},
-                {"matrix": [5, 7], "x": 15, "y": 0},
-
-                {"matrix": [1, 2], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 3], "x": 1.5, "y": 1},
-                {"matrix": [1, 4], "x": 2.5, "y": 1},
-                {"matrix": [1, 5], "x": 3.5, "y": 1},
-                {"matrix": [1, 6], "x": 4.5, "y": 1},
-                {"matrix": [1, 7], "x": 5.5, "y": 1},
-
-                {"matrix": [6, 0], "x": 7.5, "y": 1},
-                {"matrix": [6, 1], "x": 8.5, "y": 1},
-                {"matrix": [6, 2], "x": 9.5, "y": 1},
-                {"matrix": [6, 3], "x": 10.5, "y": 1},
-                {"matrix": [6, 4], "x": 11.5, "y": 1},
-                {"matrix": [6, 5], "x": 12.5, "y": 1},
-                {"matrix": [6, 6], "x": 13.5, "y": 1},
-
-                {"matrix": [2, 2], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 3], "x": 1.75, "y": 2},
-                {"matrix": [2, 4], "x": 2.75, "y": 2},
-                {"matrix": [2, 5], "x": 3.75, "y": 2},
-                {"matrix": [2, 6], "x": 4.75, "y": 2},
-                {"matrix": [2, 7], "x": 5.75, "y": 2},
-
-                {"matrix": [7, 0], "x": 7.75, "y": 2},
-                {"matrix": [7, 1], "x": 8.75, "y": 2},
-                {"matrix": [7, 2], "x": 9.75, "y": 2},
-                {"matrix": [7, 3], "x": 10.75, "y": 2},
-                {"matrix": [7, 4], "x": 11.75, "y": 2},
-                {"matrix": [7, 5], "x": 12.75, "y": 2},
-                {"matrix": [7, 6], "x": 13.75, "y": 2},
-                {"matrix": [7, 7], "x": 14.75, "y": 1, "w": 1.25, "h": 2},
-
-                {"matrix": [3, 2], "x": 0, "y": 3, "w": 1.25},
-                {"matrix": [3, 3], "x": 1.25, "y": 3},
-                {"matrix": [3, 4], "x": 2.25, "y": 3},
-                {"matrix": [3, 5], "x": 3.25, "y": 3},
-                {"matrix": [3, 6], "x": 4.25, "y": 3},
-                {"matrix": [3, 7], "x": 5.25, "y": 3},
-                {"matrix": [3, 8], "x": 6.25, "y": 3},
-
-                {"matrix": [8, 0], "x": 8.25, "y": 3},
-                {"matrix": [8, 1], "x": 9.25, "y": 3},
-                {"matrix": [8, 2], "x": 10.25, "y": 3},
-                {"matrix": [8, 3], "x": 11.25, "y": 3},
-                {"matrix": [8, 4], "x": 12.25, "y": 3},
-                {"matrix": [8, 6], "x": 13.25, "y": 3, "w": 1.75},
-                {"matrix": [8, 7], "x": 15, "y": 3},
-
-                {"matrix": [4, 2], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 3], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 4], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 1.25},
-                {"matrix": [4, 7], "x": 5, "y": 4, "w": 2.25},
-
-                {"matrix": [9, 0], "x": 8.25, "y": 4, "w": 1.25},
-                {"matrix": [9, 1], "x": 9.5, "y": 4, "w": 1.5},
-                {"matrix": [9, 2], "x": 11, "y": 4},
-                {"matrix": [9, 3], "x": 12, "y": 4},
-                {"matrix": [9, 4], "x": 13, "y": 4},
-                {"matrix": [9, 6], "x": 14, "y": 4},
-                {"matrix": [9, 7], "x": 15, "y": 4}
-            ]
-        },
-        "LAYOUT_65_iso": {
-            "layout": [
-                {"matrix": [0, 2], "x": 0, "y": 0},
-                {"matrix": [0, 3], "x": 1, "y": 0},
-                {"matrix": [0, 4], "x": 2, "y": 0},
-                {"matrix": [0, 5], "x": 3, "y": 0},
-                {"matrix": [0, 6], "x": 4, "y": 0},
-                {"matrix": [0, 7], "x": 5, "y": 0},
-                {"matrix": [0, 8], "x": 6, "y": 0},
-
-                {"matrix": [5, 0], "x": 8, "y": 0},
-                {"matrix": [5, 1], "x": 9, "y": 0},
-                {"matrix": [5, 2], "x": 10, "y": 0},
-                {"matrix": [5, 3], "x": 11, "y": 0},
-                {"matrix": [5, 4], "x": 12, "y": 0},
-                {"matrix": [5, 5], "x": 13, "y": 0},
-                {"matrix": [5, 6], "x": 14, "y": 0},
-                {"matrix": [5, 7], "x": 15, "y": 0},
-                {"matrix": [5, 8], "x": 16, "y": 0},
-
-                {"matrix": [1, 2], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 3], "x": 1.5, "y": 1},
-                {"matrix": [1, 4], "x": 2.5, "y": 1},
-                {"matrix": [1, 5], "x": 3.5, "y": 1},
-                {"matrix": [1, 6], "x": 4.5, "y": 1},
-                {"matrix": [1, 7], "x": 5.5, "y": 1},
-
-                {"matrix": [6, 0], "x": 7.5, "y": 1},
-                {"matrix": [6, 1], "x": 8.5, "y": 1},
-                {"matrix": [6, 2], "x": 9.5, "y": 1},
-                {"matrix": [6, 3], "x": 10.5, "y": 1},
-                {"matrix": [6, 4], "x": 11.5, "y": 1},
-                {"matrix": [6, 5], "x": 12.5, "y": 1},
-                {"matrix": [6, 6], "x": 13.5, "y": 1},
-                {"matrix": [6, 8], "x": 16, "y": 1},
-
-                {"matrix": [2, 2], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 3], "x": 1.75, "y": 2},
-                {"matrix": [2, 4], "x": 2.75, "y": 2},
-                {"matrix": [2, 5], "x": 3.75, "y": 2},
-                {"matrix": [2, 6], "x": 4.75, "y": 2},
-                {"matrix": [2, 7], "x": 5.75, "y": 2},
-
-                {"matrix": [7, 0], "x": 7.75, "y": 2},
-                {"matrix": [7, 1], "x": 8.75, "y": 2},
-                {"matrix": [7, 2], "x": 9.75, "y": 2},
-                {"matrix": [7, 3], "x": 10.75, "y": 2},
-                {"matrix": [7, 4], "x": 11.75, "y": 2},
-                {"matrix": [7, 5], "x": 12.75, "y": 2},
-                {"matrix": [7, 6], "x": 13.75, "y": 2},
-                {"matrix": [7, 7], "x": 14.75, "y": 1, "w": 1.25, "h": 2},
-                {"matrix": [7, 8], "x": 16, "y": 2},
-
-                {"matrix": [3, 2], "x": 0, "y": 3, "w": 1.25},
-                {"matrix": [3, 3], "x": 1.25, "y": 3},
-                {"matrix": [3, 4], "x": 2.25, "y": 3},
-                {"matrix": [3, 5], "x": 3.25, "y": 3},
-                {"matrix": [3, 6], "x": 4.25, "y": 3},
-                {"matrix": [3, 7], "x": 5.25, "y": 3},
-                {"matrix": [3, 8], "x": 6.25, "y": 3},
-
-                {"matrix": [8, 0], "x": 8.25, "y": 3},
-                {"matrix": [8, 1], "x": 9.25, "y": 3},
-                {"matrix": [8, 2], "x": 10.25, "y": 3},
-                {"matrix": [8, 3], "x": 11.25, "y": 3},
-                {"matrix": [8, 4], "x": 12.25, "y": 3},
-                {"matrix": [8, 6], "x": 13.25, "y": 3, "w": 1.75},
-                {"matrix": [8, 7], "x": 15, "y": 3},
-                {"matrix": [8, 8], "x": 16, "y": 3},
-
-                {"matrix": [4, 2], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 3], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 4], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 1.25},
-                {"matrix": [4, 7], "x": 5, "y": 4, "w": 2.25},
-
-                {"matrix": [9, 0], "x": 8.25, "y": 4, "w": 1.25},
-                {"matrix": [9, 1], "x": 9.5, "y": 4, "w": 1.5},
-                {"matrix": [9, 2], "x": 11, "y": 4},
-                {"matrix": [9, 3], "x": 12, "y": 4},
-                {"matrix": [9, 4], "x": 13, "y": 4},
-                {"matrix": [9, 6], "x": 14, "y": 4},
-                {"matrix": [9, 7], "x": 15, "y": 4},
-                {"matrix": [9, 8], "x": 16, "y": 4}
-            ]
-        },
-        "LAYOUT_60_iso_with_macro": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2.25, "y": 0},
-                {"matrix": [0, 3], "x": 3.25, "y": 0},
-                {"matrix": [0, 4], "x": 4.25, "y": 0},
-                {"matrix": [0, 5], "x": 5.25, "y": 0},
-                {"matrix": [0, 6], "x": 6.25, "y": 0},
-                {"matrix": [0, 7], "x": 7.25, "y": 0},
-                {"matrix": [0, 8], "x": 8.25, "y": 0},
-
-                {"matrix": [5, 0], "x": 10.25, "y": 0},
-                {"matrix": [5, 1], "x": 11.25, "y": 0},
-                {"matrix": [5, 2], "x": 12.25, "y": 0},
-                {"matrix": [5, 3], "x": 13.25, "y": 0},
-                {"matrix": [5, 4], "x": 14.25, "y": 0},
-                {"matrix": [5, 5], "x": 15.25, "y": 0},
-                {"matrix": [5, 6], "x": 16.25, "y": 0},
-                {"matrix": [5, 7], "x": 17.25, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1},
-                {"matrix": [1, 1], "x": 1, "y": 1},
-                {"matrix": [1, 2], "x": 2.25, "y": 1, "w": 1.5},
-                {"matrix": [1, 3], "x": 3.75, "y": 1},
-                {"matrix": [1, 4], "x": 4.75, "y": 1},
-                {"matrix": [1, 5], "x": 5.75, "y": 1},
-                {"matrix": [1, 6], "x": 6.75, "y": 1},
-                {"matrix": [1, 7], "x": 7.75, "y": 1},
-
-                {"matrix": [6, 0], "x": 9.75, "y": 1},
-                {"matrix": [6, 1], "x": 10.75, "y": 1},
-                {"matrix": [6, 2], "x": 11.75, "y": 1},
-                {"matrix": [6, 3], "x": 12.75, "y": 1},
-                {"matrix": [6, 4], "x": 13.75, "y": 1},
-                {"matrix": [6, 5], "x": 14.75, "y": 1},
-                {"matrix": [6, 6], "x": 15.75, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2},
-                {"matrix": [2, 1], "x": 1, "y": 2},
-                {"matrix": [2, 2], "x": 2.25, "y": 2, "w": 1.75},
-                {"matrix": [2, 3], "x": 4, "y": 2},
-                {"matrix": [2, 4], "x": 5, "y": 2},
-                {"matrix": [2, 5], "x": 6, "y": 2},
-                {"matrix": [2, 6], "x": 7, "y": 2},
-                {"matrix": [2, 7], "x": 8, "y": 2},
-
-                {"matrix": [7, 0], "x": 10, "y": 2},
-                {"matrix": [7, 1], "x": 11, "y": 2},
-                {"matrix": [7, 2], "x": 12, "y": 2},
-                {"matrix": [7, 3], "x": 13, "y": 2},
-                {"matrix": [7, 4], "x": 14, "y": 2},
-                {"matrix": [7, 5], "x": 15, "y": 2},
-                {"matrix": [7, 6], "x": 16, "y": 2},
-                {"matrix": [7, 7], "x": 17, "y": 1, "w": 1.25, "h": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3},
-                {"matrix": [3, 1], "x": 1, "y": 3},
-                {"matrix": [3, 2], "x": 2.25, "y": 3, "w": 1.25},
-                {"matrix": [3, 3], "x": 3.5, "y": 3},
-                {"matrix": [3, 4], "x": 4.5, "y": 3},
-                {"matrix": [3, 5], "x": 5.5, "y": 3},
-                {"matrix": [3, 6], "x": 6.5, "y": 3},
-                {"matrix": [3, 7], "x": 7.5, "y": 3},
-                {"matrix": [3, 8], "x": 8.5, "y": 3},
-
-                {"matrix": [8, 0], "x": 10.5, "y": 3},
-                {"matrix": [8, 1], "x": 11.5, "y": 3},
-                {"matrix": [8, 2], "x": 12.5, "y": 3},
-                {"matrix": [8, 3], "x": 13.5, "y": 3},
-                {"matrix": [8, 4], "x": 14.5, "y": 3},
-                {"matrix": [8, 6], "x": 15.5, "y": 3, "w": 1.75},
-                {"matrix": [8, 7], "x": 17.25, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4},
-                {"matrix": [4, 1], "x": 1, "y": 4},
-                {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 3], "x": 3.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 4], "x": 4.75, "y": 4, "w": 1.25},
-                {"matrix": [4, 5], "x": 6, "y": 4, "w": 1.25},
-                {"matrix": [4, 7], "x": 7.25, "y": 4, "w": 2.25},
-
-                {"matrix": [9, 0], "x": 10.5, "y": 4, "w": 1.25},
-                {"matrix": [9, 1], "x": 11.75, "y": 4, "w": 1.5},
-                {"matrix": [9, 2], "x": 13.25, "y": 4},
-                {"matrix": [9, 3], "x": 14.25, "y": 4},
-                {"matrix": [9, 4], "x": 15.25, "y": 4},
-                {"matrix": [9, 6], "x": 16.25, "y": 4},
-                {"matrix": [9, 7], "x": 17.25, "y": 4}
-            ]
-        },
-        "LAYOUT_65_iso_with_macro": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2.25, "y": 0},
-                {"matrix": [0, 3], "x": 3.25, "y": 0},
-                {"matrix": [0, 4], "x": 4.25, "y": 0},
-                {"matrix": [0, 5], "x": 5.25, "y": 0},
-                {"matrix": [0, 6], "x": 6.25, "y": 0},
-                {"matrix": [0, 7], "x": 7.25, "y": 0},
-                {"matrix": [0, 8], "x": 8.25, "y": 0},
-
-                {"matrix": [5, 0], "x": 10.25, "y": 0},
-                {"matrix": [5, 1], "x": 11.25, "y": 0},
-                {"matrix": [5, 2], "x": 12.25, "y": 0},
-                {"matrix": [5, 3], "x": 13.25, "y": 0},
-                {"matrix": [5, 4], "x": 14.25, "y": 0},
-                {"matrix": [5, 5], "x": 15.25, "y": 0},
-                {"matrix": [5, 6], "x": 16.25, "y": 0},
-                {"matrix": [5, 7], "x": 17.25, "y": 0},
-                {"matrix": [5, 8], "x": 18.25, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1},
-                {"matrix": [1, 1], "x": 1, "y": 1},
-                {"matrix": [1, 2], "x": 2.25, "y": 1, "w": 1.5},
-                {"matrix": [1, 3], "x": 3.75, "y": 1},
-                {"matrix": [1, 4], "x": 4.75, "y": 1},
-                {"matrix": [1, 5], "x": 5.75, "y": 1},
-                {"matrix": [1, 6], "x": 6.75, "y": 1},
-                {"matrix": [1, 7], "x": 7.75, "y": 1},
-
-                {"matrix": [6, 0], "x": 9.75, "y": 1},
-                {"matrix": [6, 1], "x": 10.75, "y": 1},
-                {"matrix": [6, 2], "x": 11.75, "y": 1},
-                {"matrix": [6, 3], "x": 12.75, "y": 1},
-                {"matrix": [6, 4], "x": 13.75, "y": 1},
-                {"matrix": [6, 5], "x": 14.75, "y": 1},
-                {"matrix": [6, 6], "x": 15.75, "y": 1},
-                {"matrix": [6, 8], "x": 18.25, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2},
-                {"matrix": [2, 1], "x": 1, "y": 2},
-                {"matrix": [2, 2], "x": 2.25, "y": 2, "w": 1.75},
-                {"matrix": [2, 3], "x": 4, "y": 2},
-                {"matrix": [2, 4], "x": 5, "y": 2},
-                {"matrix": [2, 5], "x": 6, "y": 2},
-                {"matrix": [2, 6], "x": 7, "y": 2},
-                {"matrix": [2, 7], "x": 8, "y": 2},
-
-                {"matrix": [7, 0], "x": 10, "y": 2},
-                {"matrix": [7, 1], "x": 11, "y": 2},
-                {"matrix": [7, 2], "x": 12, "y": 2},
-                {"matrix": [7, 3], "x": 13, "y": 2},
-                {"matrix": [7, 4], "x": 14, "y": 2},
-                {"matrix": [7, 5], "x": 15, "y": 2},
-                {"matrix": [7, 6], "x": 16, "y": 2},
-                {"matrix": [7, 7], "x": 17, "y": 1, "w": 1.25, "h": 2},
-                {"matrix": [7, 8], "x": 18.25, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3},
-                {"matrix": [3, 1], "x": 1, "y": 3},
-                {"matrix": [3, 2], "x": 2.25, "y": 3, "w": 1.25},
-                {"matrix": [3, 3], "x": 3.5, "y": 3},
-                {"matrix": [3, 4], "x": 4.5, "y": 3},
-                {"matrix": [3, 5], "x": 5.5, "y": 3},
-                {"matrix": [3, 6], "x": 6.5, "y": 3},
-                {"matrix": [3, 7], "x": 7.5, "y": 3},
-                {"matrix": [3, 8], "x": 8.5, "y": 3},
-
-                {"matrix": [8, 0], "x": 10.5, "y": 3},
-                {"matrix": [8, 1], "x": 11.5, "y": 3},
-                {"matrix": [8, 2], "x": 12.5, "y": 3},
-                {"matrix": [8, 3], "x": 13.5, "y": 3},
-                {"matrix": [8, 4], "x": 14.5, "y": 3},
-                {"matrix": [8, 6], "x": 15.5, "y": 3, "w": 1.75},
-                {"matrix": [8, 7], "x": 17.25, "y": 3},
-                {"matrix": [8, 8], "x": 18.25, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4},
-                {"matrix": [4, 1], "x": 1, "y": 4},
-                {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 3], "x": 3.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 4], "x": 4.75, "y": 4, "w": 1.25},
-                {"matrix": [4, 5], "x": 6, "y": 4, "w": 1.25},
-                {"matrix": [4, 7], "x": 7.25, "y": 4, "w": 2.25},
-
-                {"matrix": [9, 0], "x": 10.5, "y": 4, "w": 1.25},
-                {"matrix": [9, 1], "x": 11.75, "y": 4, "w": 1.5},
-                {"matrix": [9, 2], "x": 13.25, "y": 4},
-                {"matrix": [9, 3], "x": 14.25, "y": 4},
-                {"matrix": [9, 4], "x": 15.25, "y": 4},
-                {"matrix": [9, 6], "x": 16.25, "y": 4},
-                {"matrix": [9, 7], "x": 17.25, "y": 4},
-                {"matrix": [9, 8], "x": 18.25, "y": 4}
-            ]
-        },
-        "LAYOUT_all": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2.25, "y": 0},
-                {"matrix": [0, 3], "x": 3.25, "y": 0},
-                {"matrix": [0, 4], "x": 4.25, "y": 0},
-                {"matrix": [0, 5], "x": 5.25, "y": 0},
-                {"matrix": [0, 6], "x": 6.25, "y": 0},
-                {"matrix": [0, 7], "x": 7.25, "y": 0},
-                {"matrix": [0, 8], "x": 8.25, "y": 0},
-
-                {"matrix": [5, 0], "x": 10.25, "y": 0},
-                {"matrix": [5, 1], "x": 11.25, "y": 0},
-                {"matrix": [5, 2], "x": 12.25, "y": 0},
-                {"matrix": [5, 3], "x": 13.25, "y": 0},
-                {"matrix": [5, 4], "x": 14.25, "y": 0},
-                {"matrix": [5, 5], "x": 15.25, "y": 0},
-                {"matrix": [5, 6], "x": 16.25, "y": 0},
-                {"matrix": [5, 7], "x": 17.25, "y": 0},
-                {"matrix": [5, 8], "x": 18.25, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1},
-                {"matrix": [1, 1], "x": 1, "y": 1},
-                {"matrix": [1, 2], "x": 2.25, "y": 1, "w": 1.5},
-                {"matrix": [1, 3], "x": 3.75, "y": 1},
-                {"matrix": [1, 4], "x": 4.75, "y": 1},
-                {"matrix": [1, 5], "x": 5.75, "y": 1},
-                {"matrix": [1, 6], "x": 6.75, "y": 1},
-                {"matrix": [1, 7], "x": 7.75, "y": 1},
-
-                {"matrix": [6, 0], "x": 9.75, "y": 1},
-                {"matrix": [6, 1], "x": 10.75, "y": 1},
-                {"matrix": [6, 2], "x": 11.75, "y": 1},
-                {"matrix": [6, 3], "x": 12.75, "y": 1},
-                {"matrix": [6, 4], "x": 13.75, "y": 1},
-                {"matrix": [6, 5], "x": 14.75, "y": 1},
-                {"matrix": [6, 6], "x": 15.75, "y": 1},
-                {"matrix": [6, 7], "x": 16.75, "y": 1, "w": 1.5},
-                {"matrix": [6, 8], "x": 18.25, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2},
-                {"matrix": [2, 1], "x": 1, "y": 2},
-                {"matrix": [2, 2], "x": 2.25, "y": 2, "w": 1.75},
-                {"matrix": [2, 3], "x": 4, "y": 2},
-                {"matrix": [2, 4], "x": 5, "y": 2},
-                {"matrix": [2, 5], "x": 6, "y": 2},
-                {"matrix": [2, 6], "x": 7, "y": 2},
-                {"matrix": [2, 7], "x": 8, "y": 2},
-
-                {"matrix": [7, 0], "x": 10, "y": 2},
-                {"matrix": [7, 1], "x": 11, "y": 2},
-                {"matrix": [7, 2], "x": 12, "y": 2},
-                {"matrix": [7, 3], "x": 13, "y": 2},
-                {"matrix": [7, 4], "x": 14, "y": 2},
-                {"matrix": [7, 5], "x": 15, "y": 2},
-                {"matrix": [7, 6], "x": 16, "y": 2},
-                {"matrix": [7, 7], "x": 17, "y": 2, "w": 1.25},
-                {"matrix": [7, 8], "x": 18.25, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3},
-                {"matrix": [3, 1], "x": 1, "y": 3},
-                {"matrix": [3, 2], "x": 2.25, "y": 3, "w": 1.25},
-                {"matrix": [3, 3], "x": 3.5, "y": 3},
-                {"matrix": [3, 4], "x": 4.5, "y": 3},
-                {"matrix": [3, 5], "x": 5.5, "y": 3},
-                {"matrix": [3, 6], "x": 6.5, "y": 3},
-                {"matrix": [3, 7], "x": 7.5, "y": 3},
-                {"matrix": [3, 8], "x": 8.5, "y": 3},
-
-                {"matrix": [8, 0], "x": 10.5, "y": 3},
-                {"matrix": [8, 1], "x": 11.5, "y": 3},
-                {"matrix": [8, 2], "x": 12.5, "y": 3},
-                {"matrix": [8, 3], "x": 13.5, "y": 3},
-                {"matrix": [8, 4], "x": 14.5, "y": 3},
-                {"matrix": [8, 6], "x": 15.5, "y": 3, "w": 1.75},
-                {"matrix": [8, 7], "x": 17.25, "y": 3},
-                {"matrix": [8, 8], "x": 18.25, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4},
-                {"matrix": [4, 1], "x": 1, "y": 4},
-                {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 3], "x": 3.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 4], "x": 4.75, "y": 4, "w": 1.25},
-                {"matrix": [4, 5], "x": 6, "y": 4, "w": 1.25},
-                {"matrix": [4, 6], "x": 7.25, "y": 4},
-                {"matrix": [4, 7], "x": 8.25, "y": 4, "w": 1.25},
-
-                {"matrix": [9, 0], "x": 10.5, "y": 4, "w": 1.25},
-                {"matrix": [9, 1], "x": 11.75, "y": 4, "w": 1.5},
-                {"matrix": [9, 2], "x": 13.25, "y": 4},
-                {"matrix": [9, 3], "x": 14.25, "y": 4},
-                {"matrix": [9, 4], "x": 15.25, "y": 4},
-                {"matrix": [9, 6], "x": 16.25, "y": 4},
-                {"matrix": [9, 7], "x": 17.25, "y": 4},
-                {"matrix": [9, 8], "x": 18.25, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/keebio/quefrency/rev2/keyboard.json b/keyboards/keebio/quefrency/rev2/keyboard.json
new file mode 100644
index 00000000000..0529fa13a6a
--- /dev/null
+++ b/keyboards/keebio/quefrency/rev2/keyboard.json
@@ -0,0 +1,880 @@
+{
+    "keyboard_name": "Quefrency Rev. 2",
+    "manufacturer": "Keebio",
+    "url": "https://keeb.io",
+    "maintainer": "nooges",
+    "usb": {
+        "vid": "0xCB10",
+        "pid": "0x2257",
+        "device_version": "2.0.0"
+    },
+    "matrix_pins": {
+        "cols": ["F4", "F1", "F0", "B7", "B3", "D2", "D3", "D5", "D4"],
+        "rows": ["B1", "B2", "C7", "B4", "D7"]
+    },
+    "diode_direction": "COL2ROW",
+    "encoder": {
+        "rotary": [
+            {"pin_a": "F5", "pin_b": "F6"}
+        ]
+    },
+    "backlight": {
+        "pin": "B5"
+    },
+    "rgblight": {
+        "led_count": 16,
+        "led_map": [1, 2, 3, 12, 13, 14, 15, 0, 7, 6, 5, 4, 11, 10, 9, 8],
+        "split_count": [8, 8],
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": true,
+            "twinkle": true
+        }
+    },
+    "ws2812": {
+        "pin": "E6"
+    },
+    "split": {
+        "soft_serial_pin": "D0",
+        "encoder": {
+            "right": {
+                "rotary": [
+                    {"pin_a": "D6", "pin_b": "D4"}
+                ]
+            }
+        },
+        "matrix_pins": {
+            "right": {
+                "cols": ["F1", "F0", "F4", "F5", "F6", "D5", "C7", "D3", "B7"],
+                "rows": ["B3", "B2", "B6", "B4", "D7"]
+            }
+        }
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": false,
+        "mousekey": false,
+        "extrakey": true,
+        "backlight": true,
+        "rgblight": true,
+        "encoder": true
+    },
+    "build": {
+        "lto": true
+    },
+    "layout_aliases": {
+        "LAYOUT": "LAYOUT_60"
+    },
+    "layouts": {
+        "LAYOUT_60": {
+            "layout": [
+                {"matrix": [0, 2], "x": 0, "y": 0},
+                {"matrix": [0, 3], "x": 1, "y": 0},
+                {"matrix": [0, 4], "x": 2, "y": 0},
+                {"matrix": [0, 5], "x": 3, "y": 0},
+                {"matrix": [0, 6], "x": 4, "y": 0},
+                {"matrix": [0, 7], "x": 5, "y": 0},
+                {"matrix": [0, 8], "x": 6, "y": 0},
+
+                {"matrix": [5, 0], "x": 8, "y": 0},
+                {"matrix": [5, 1], "x": 9, "y": 0},
+                {"matrix": [5, 2], "x": 10, "y": 0},
+                {"matrix": [5, 3], "x": 11, "y": 0},
+                {"matrix": [5, 4], "x": 12, "y": 0},
+                {"matrix": [5, 5], "x": 13, "y": 0},
+                {"matrix": [5, 6], "x": 14, "y": 0},
+                {"matrix": [5, 7], "x": 15, "y": 0},
+
+                {"matrix": [1, 2], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 3], "x": 1.5, "y": 1},
+                {"matrix": [1, 4], "x": 2.5, "y": 1},
+                {"matrix": [1, 5], "x": 3.5, "y": 1},
+                {"matrix": [1, 6], "x": 4.5, "y": 1},
+                {"matrix": [1, 7], "x": 5.5, "y": 1},
+
+                {"matrix": [6, 0], "x": 7.5, "y": 1},
+                {"matrix": [6, 1], "x": 8.5, "y": 1},
+                {"matrix": [6, 2], "x": 9.5, "y": 1},
+                {"matrix": [6, 3], "x": 10.5, "y": 1},
+                {"matrix": [6, 4], "x": 11.5, "y": 1},
+                {"matrix": [6, 5], "x": 12.5, "y": 1},
+                {"matrix": [6, 6], "x": 13.5, "y": 1},
+                {"matrix": [6, 7], "x": 14.5, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 2], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 3], "x": 1.75, "y": 2},
+                {"matrix": [2, 4], "x": 2.75, "y": 2},
+                {"matrix": [2, 5], "x": 3.75, "y": 2},
+                {"matrix": [2, 6], "x": 4.75, "y": 2},
+                {"matrix": [2, 7], "x": 5.75, "y": 2},
+
+                {"matrix": [7, 0], "x": 7.75, "y": 2},
+                {"matrix": [7, 1], "x": 8.75, "y": 2},
+                {"matrix": [7, 2], "x": 9.75, "y": 2},
+                {"matrix": [7, 3], "x": 10.75, "y": 2},
+                {"matrix": [7, 4], "x": 11.75, "y": 2},
+                {"matrix": [7, 5], "x": 12.75, "y": 2},
+                {"matrix": [7, 7], "x": 13.75, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 2], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 4], "x": 2.25, "y": 3},
+                {"matrix": [3, 5], "x": 3.25, "y": 3},
+                {"matrix": [3, 6], "x": 4.25, "y": 3},
+                {"matrix": [3, 7], "x": 5.25, "y": 3},
+                {"matrix": [3, 8], "x": 6.25, "y": 3},
+
+                {"matrix": [8, 0], "x": 8.25, "y": 3},
+                {"matrix": [8, 1], "x": 9.25, "y": 3},
+                {"matrix": [8, 2], "x": 10.25, "y": 3},
+                {"matrix": [8, 3], "x": 11.25, "y": 3},
+                {"matrix": [8, 4], "x": 12.25, "y": 3},
+                {"matrix": [8, 6], "x": 13.25, "y": 3, "w": 1.75},
+                {"matrix": [8, 7], "x": 15, "y": 3},
+
+                {"matrix": [4, 2], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 7], "x": 5, "y": 4, "w": 2.25},
+
+                {"matrix": [9, 0], "x": 8.25, "y": 4, "w": 1.25},
+                {"matrix": [9, 1], "x": 9.5, "y": 4, "w": 1.5},
+                {"matrix": [9, 2], "x": 11, "y": 4},
+                {"matrix": [9, 3], "x": 12, "y": 4},
+                {"matrix": [9, 4], "x": 13, "y": 4},
+                {"matrix": [9, 6], "x": 14, "y": 4},
+                {"matrix": [9, 7], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_65": {
+            "layout": [
+                {"matrix": [0, 2], "x": 0, "y": 0},
+                {"matrix": [0, 3], "x": 1, "y": 0},
+                {"matrix": [0, 4], "x": 2, "y": 0},
+                {"matrix": [0, 5], "x": 3, "y": 0},
+                {"matrix": [0, 6], "x": 4, "y": 0},
+                {"matrix": [0, 7], "x": 5, "y": 0},
+                {"matrix": [0, 8], "x": 6, "y": 0},
+
+                {"matrix": [5, 0], "x": 8, "y": 0},
+                {"matrix": [5, 1], "x": 9, "y": 0},
+                {"matrix": [5, 2], "x": 10, "y": 0},
+                {"matrix": [5, 3], "x": 11, "y": 0},
+                {"matrix": [5, 4], "x": 12, "y": 0},
+                {"matrix": [5, 5], "x": 13, "y": 0},
+                {"matrix": [5, 6], "x": 14, "y": 0},
+                {"matrix": [5, 7], "x": 15, "y": 0},
+                {"matrix": [5, 8], "x": 16, "y": 0},
+
+                {"matrix": [1, 2], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 3], "x": 1.5, "y": 1},
+                {"matrix": [1, 4], "x": 2.5, "y": 1},
+                {"matrix": [1, 5], "x": 3.5, "y": 1},
+                {"matrix": [1, 6], "x": 4.5, "y": 1},
+                {"matrix": [1, 7], "x": 5.5, "y": 1},
+
+                {"matrix": [6, 0], "x": 7.5, "y": 1},
+                {"matrix": [6, 1], "x": 8.5, "y": 1},
+                {"matrix": [6, 2], "x": 9.5, "y": 1},
+                {"matrix": [6, 3], "x": 10.5, "y": 1},
+                {"matrix": [6, 4], "x": 11.5, "y": 1},
+                {"matrix": [6, 5], "x": 12.5, "y": 1},
+                {"matrix": [6, 6], "x": 13.5, "y": 1},
+                {"matrix": [6, 7], "x": 14.5, "y": 1, "w": 1.5},
+                {"matrix": [6, 8], "x": 16, "y": 1},
+
+                {"matrix": [2, 2], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 3], "x": 1.75, "y": 2},
+                {"matrix": [2, 4], "x": 2.75, "y": 2},
+                {"matrix": [2, 5], "x": 3.75, "y": 2},
+                {"matrix": [2, 6], "x": 4.75, "y": 2},
+                {"matrix": [2, 7], "x": 5.75, "y": 2},
+
+                {"matrix": [7, 0], "x": 7.75, "y": 2},
+                {"matrix": [7, 1], "x": 8.75, "y": 2},
+                {"matrix": [7, 2], "x": 9.75, "y": 2},
+                {"matrix": [7, 3], "x": 10.75, "y": 2},
+                {"matrix": [7, 4], "x": 11.75, "y": 2},
+                {"matrix": [7, 5], "x": 12.75, "y": 2},
+                {"matrix": [7, 7], "x": 13.75, "y": 2, "w": 2.25},
+                {"matrix": [7, 8], "x": 16, "y": 2},
+
+                {"matrix": [3, 2], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 4], "x": 2.25, "y": 3},
+                {"matrix": [3, 5], "x": 3.25, "y": 3},
+                {"matrix": [3, 6], "x": 4.25, "y": 3},
+                {"matrix": [3, 7], "x": 5.25, "y": 3},
+                {"matrix": [3, 8], "x": 6.25, "y": 3},
+
+                {"matrix": [8, 0], "x": 8.25, "y": 3},
+                {"matrix": [8, 1], "x": 9.25, "y": 3},
+                {"matrix": [8, 2], "x": 10.25, "y": 3},
+                {"matrix": [8, 3], "x": 11.25, "y": 3},
+                {"matrix": [8, 4], "x": 12.25, "y": 3},
+                {"matrix": [8, 6], "x": 13.25, "y": 3, "w": 1.75},
+                {"matrix": [8, 7], "x": 15, "y": 3},
+                {"matrix": [8, 8], "x": 16, "y": 3},
+
+                {"matrix": [4, 2], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 7], "x": 5, "y": 4, "w": 2.25},
+
+                {"matrix": [9, 0], "x": 8.25, "y": 4, "w": 1.25},
+                {"matrix": [9, 1], "x": 9.5, "y": 4, "w": 1.5},
+                {"matrix": [9, 2], "x": 11, "y": 4},
+                {"matrix": [9, 3], "x": 12, "y": 4},
+                {"matrix": [9, 4], "x": 13, "y": 4},
+                {"matrix": [9, 6], "x": 14, "y": 4},
+                {"matrix": [9, 7], "x": 15, "y": 4},
+                {"matrix": [9, 8], "x": 16, "y": 4}
+            ]
+        },
+        "LAYOUT_60_with_macro": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+                {"matrix": [0, 5], "x": 5.25, "y": 0},
+                {"matrix": [0, 6], "x": 6.25, "y": 0},
+                {"matrix": [0, 7], "x": 7.25, "y": 0},
+                {"matrix": [0, 8], "x": 8.25, "y": 0},
+
+                {"matrix": [5, 0], "x": 10.25, "y": 0},
+                {"matrix": [5, 1], "x": 11.25, "y": 0},
+                {"matrix": [5, 2], "x": 12.25, "y": 0},
+                {"matrix": [5, 3], "x": 13.25, "y": 0},
+                {"matrix": [5, 4], "x": 14.25, "y": 0},
+                {"matrix": [5, 5], "x": 15.25, "y": 0},
+                {"matrix": [5, 6], "x": 16.25, "y": 0},
+                {"matrix": [5, 7], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2.25, "y": 1, "w": 1.5},
+                {"matrix": [1, 3], "x": 3.75, "y": 1},
+                {"matrix": [1, 4], "x": 4.75, "y": 1},
+                {"matrix": [1, 5], "x": 5.75, "y": 1},
+                {"matrix": [1, 6], "x": 6.75, "y": 1},
+                {"matrix": [1, 7], "x": 7.75, "y": 1},
+
+                {"matrix": [6, 0], "x": 9.75, "y": 1},
+                {"matrix": [6, 1], "x": 10.75, "y": 1},
+                {"matrix": [6, 2], "x": 11.75, "y": 1},
+                {"matrix": [6, 3], "x": 12.75, "y": 1},
+                {"matrix": [6, 4], "x": 13.75, "y": 1},
+                {"matrix": [6, 5], "x": 14.75, "y": 1},
+                {"matrix": [6, 6], "x": 15.75, "y": 1},
+                {"matrix": [6, 7], "x": 16.75, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2.25, "y": 2, "w": 1.75},
+                {"matrix": [2, 3], "x": 4, "y": 2},
+                {"matrix": [2, 4], "x": 5, "y": 2},
+                {"matrix": [2, 5], "x": 6, "y": 2},
+                {"matrix": [2, 6], "x": 7, "y": 2},
+                {"matrix": [2, 7], "x": 8, "y": 2},
+
+                {"matrix": [7, 0], "x": 10, "y": 2},
+                {"matrix": [7, 1], "x": 11, "y": 2},
+                {"matrix": [7, 2], "x": 12, "y": 2},
+                {"matrix": [7, 3], "x": 13, "y": 2},
+                {"matrix": [7, 4], "x": 14, "y": 2},
+                {"matrix": [7, 5], "x": 15, "y": 2},
+                {"matrix": [7, 7], "x": 16, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3, "w": 2.25},
+                {"matrix": [3, 4], "x": 4.5, "y": 3},
+                {"matrix": [3, 5], "x": 5.5, "y": 3},
+                {"matrix": [3, 6], "x": 6.5, "y": 3},
+                {"matrix": [3, 7], "x": 7.5, "y": 3},
+                {"matrix": [3, 8], "x": 8.5, "y": 3},
+
+                {"matrix": [8, 0], "x": 10.5, "y": 3},
+                {"matrix": [8, 1], "x": 11.5, "y": 3},
+                {"matrix": [8, 2], "x": 12.5, "y": 3},
+                {"matrix": [8, 3], "x": 13.5, "y": 3},
+                {"matrix": [8, 4], "x": 14.5, "y": 3},
+                {"matrix": [8, 6], "x": 15.5, "y": 3, "w": 1.75},
+                {"matrix": [8, 7], "x": 17.25, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+                {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 3.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 4.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 6, "y": 4, "w": 1.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4, "w": 2.25},
+
+                {"matrix": [9, 0], "x": 10.5, "y": 4, "w": 1.25},
+                {"matrix": [9, 1], "x": 11.75, "y": 4, "w": 1.5},
+                {"matrix": [9, 2], "x": 13.25, "y": 4},
+                {"matrix": [9, 3], "x": 14.25, "y": 4},
+                {"matrix": [9, 4], "x": 15.25, "y": 4},
+                {"matrix": [9, 6], "x": 16.25, "y": 4},
+                {"matrix": [9, 7], "x": 17.25, "y": 4}
+            ]
+        },
+        "LAYOUT_65_with_macro": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+                {"matrix": [0, 5], "x": 5.25, "y": 0},
+                {"matrix": [0, 6], "x": 6.25, "y": 0},
+                {"matrix": [0, 7], "x": 7.25, "y": 0},
+                {"matrix": [0, 8], "x": 8.25, "y": 0},
+
+                {"matrix": [5, 0], "x": 10.25, "y": 0},
+                {"matrix": [5, 1], "x": 11.25, "y": 0},
+                {"matrix": [5, 2], "x": 12.25, "y": 0},
+                {"matrix": [5, 3], "x": 13.25, "y": 0},
+                {"matrix": [5, 4], "x": 14.25, "y": 0},
+                {"matrix": [5, 5], "x": 15.25, "y": 0},
+                {"matrix": [5, 6], "x": 16.25, "y": 0},
+                {"matrix": [5, 7], "x": 17.25, "y": 0},
+                {"matrix": [5, 8], "x": 18.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2.25, "y": 1, "w": 1.5},
+                {"matrix": [1, 3], "x": 3.75, "y": 1},
+                {"matrix": [1, 4], "x": 4.75, "y": 1},
+                {"matrix": [1, 5], "x": 5.75, "y": 1},
+                {"matrix": [1, 6], "x": 6.75, "y": 1},
+                {"matrix": [1, 7], "x": 7.75, "y": 1},
+
+                {"matrix": [6, 0], "x": 9.75, "y": 1},
+                {"matrix": [6, 1], "x": 10.75, "y": 1},
+                {"matrix": [6, 2], "x": 11.75, "y": 1},
+                {"matrix": [6, 3], "x": 12.75, "y": 1},
+                {"matrix": [6, 4], "x": 13.75, "y": 1},
+                {"matrix": [6, 5], "x": 14.75, "y": 1},
+                {"matrix": [6, 6], "x": 15.75, "y": 1},
+                {"matrix": [6, 7], "x": 16.75, "y": 1, "w": 1.5},
+                {"matrix": [6, 8], "x": 18.25, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2.25, "y": 2, "w": 1.75},
+                {"matrix": [2, 3], "x": 4, "y": 2},
+                {"matrix": [2, 4], "x": 5, "y": 2},
+                {"matrix": [2, 5], "x": 6, "y": 2},
+                {"matrix": [2, 6], "x": 7, "y": 2},
+                {"matrix": [2, 7], "x": 8, "y": 2},
+
+                {"matrix": [7, 0], "x": 10, "y": 2},
+                {"matrix": [7, 1], "x": 11, "y": 2},
+                {"matrix": [7, 2], "x": 12, "y": 2},
+                {"matrix": [7, 3], "x": 13, "y": 2},
+                {"matrix": [7, 4], "x": 14, "y": 2},
+                {"matrix": [7, 5], "x": 15, "y": 2},
+                {"matrix": [7, 7], "x": 16, "y": 2, "w": 2.25},
+                {"matrix": [7, 8], "x": 18.25, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3, "w": 2.25},
+                {"matrix": [3, 4], "x": 4.5, "y": 3},
+                {"matrix": [3, 5], "x": 5.5, "y": 3},
+                {"matrix": [3, 6], "x": 6.5, "y": 3},
+                {"matrix": [3, 7], "x": 7.5, "y": 3},
+                {"matrix": [3, 8], "x": 8.5, "y": 3},
+
+                {"matrix": [8, 0], "x": 10.5, "y": 3},
+                {"matrix": [8, 1], "x": 11.5, "y": 3},
+                {"matrix": [8, 2], "x": 12.5, "y": 3},
+                {"matrix": [8, 3], "x": 13.5, "y": 3},
+                {"matrix": [8, 4], "x": 14.5, "y": 3},
+                {"matrix": [8, 6], "x": 15.5, "y": 3, "w": 1.75},
+                {"matrix": [8, 7], "x": 17.25, "y": 3},
+                {"matrix": [8, 8], "x": 18.25, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+                {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 3.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 4.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 6, "y": 4, "w": 1.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4, "w": 2.25},
+
+                {"matrix": [9, 0], "x": 10.5, "y": 4, "w": 1.25},
+                {"matrix": [9, 1], "x": 11.75, "y": 4, "w": 1.5},
+                {"matrix": [9, 2], "x": 13.25, "y": 4},
+                {"matrix": [9, 3], "x": 14.25, "y": 4},
+                {"matrix": [9, 4], "x": 15.25, "y": 4},
+                {"matrix": [9, 6], "x": 16.25, "y": 4},
+                {"matrix": [9, 7], "x": 17.25, "y": 4},
+                {"matrix": [9, 8], "x": 18.25, "y": 4}
+            ]
+        },
+        "LAYOUT_60_iso": {
+            "layout": [
+                {"matrix": [0, 2], "x": 0, "y": 0},
+                {"matrix": [0, 3], "x": 1, "y": 0},
+                {"matrix": [0, 4], "x": 2, "y": 0},
+                {"matrix": [0, 5], "x": 3, "y": 0},
+                {"matrix": [0, 6], "x": 4, "y": 0},
+                {"matrix": [0, 7], "x": 5, "y": 0},
+                {"matrix": [0, 8], "x": 6, "y": 0},
+
+                {"matrix": [5, 0], "x": 8, "y": 0},
+                {"matrix": [5, 1], "x": 9, "y": 0},
+                {"matrix": [5, 2], "x": 10, "y": 0},
+                {"matrix": [5, 3], "x": 11, "y": 0},
+                {"matrix": [5, 4], "x": 12, "y": 0},
+                {"matrix": [5, 5], "x": 13, "y": 0},
+                {"matrix": [5, 6], "x": 14, "y": 0},
+                {"matrix": [5, 7], "x": 15, "y": 0},
+
+                {"matrix": [1, 2], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 3], "x": 1.5, "y": 1},
+                {"matrix": [1, 4], "x": 2.5, "y": 1},
+                {"matrix": [1, 5], "x": 3.5, "y": 1},
+                {"matrix": [1, 6], "x": 4.5, "y": 1},
+                {"matrix": [1, 7], "x": 5.5, "y": 1},
+
+                {"matrix": [6, 0], "x": 7.5, "y": 1},
+                {"matrix": [6, 1], "x": 8.5, "y": 1},
+                {"matrix": [6, 2], "x": 9.5, "y": 1},
+                {"matrix": [6, 3], "x": 10.5, "y": 1},
+                {"matrix": [6, 4], "x": 11.5, "y": 1},
+                {"matrix": [6, 5], "x": 12.5, "y": 1},
+                {"matrix": [6, 6], "x": 13.5, "y": 1},
+
+                {"matrix": [2, 2], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 3], "x": 1.75, "y": 2},
+                {"matrix": [2, 4], "x": 2.75, "y": 2},
+                {"matrix": [2, 5], "x": 3.75, "y": 2},
+                {"matrix": [2, 6], "x": 4.75, "y": 2},
+                {"matrix": [2, 7], "x": 5.75, "y": 2},
+
+                {"matrix": [7, 0], "x": 7.75, "y": 2},
+                {"matrix": [7, 1], "x": 8.75, "y": 2},
+                {"matrix": [7, 2], "x": 9.75, "y": 2},
+                {"matrix": [7, 3], "x": 10.75, "y": 2},
+                {"matrix": [7, 4], "x": 11.75, "y": 2},
+                {"matrix": [7, 5], "x": 12.75, "y": 2},
+                {"matrix": [7, 6], "x": 13.75, "y": 2},
+                {"matrix": [7, 7], "x": 14.75, "y": 1, "w": 1.25, "h": 2},
+
+                {"matrix": [3, 2], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 3], "x": 1.25, "y": 3},
+                {"matrix": [3, 4], "x": 2.25, "y": 3},
+                {"matrix": [3, 5], "x": 3.25, "y": 3},
+                {"matrix": [3, 6], "x": 4.25, "y": 3},
+                {"matrix": [3, 7], "x": 5.25, "y": 3},
+                {"matrix": [3, 8], "x": 6.25, "y": 3},
+
+                {"matrix": [8, 0], "x": 8.25, "y": 3},
+                {"matrix": [8, 1], "x": 9.25, "y": 3},
+                {"matrix": [8, 2], "x": 10.25, "y": 3},
+                {"matrix": [8, 3], "x": 11.25, "y": 3},
+                {"matrix": [8, 4], "x": 12.25, "y": 3},
+                {"matrix": [8, 6], "x": 13.25, "y": 3, "w": 1.75},
+                {"matrix": [8, 7], "x": 15, "y": 3},
+
+                {"matrix": [4, 2], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 7], "x": 5, "y": 4, "w": 2.25},
+
+                {"matrix": [9, 0], "x": 8.25, "y": 4, "w": 1.25},
+                {"matrix": [9, 1], "x": 9.5, "y": 4, "w": 1.5},
+                {"matrix": [9, 2], "x": 11, "y": 4},
+                {"matrix": [9, 3], "x": 12, "y": 4},
+                {"matrix": [9, 4], "x": 13, "y": 4},
+                {"matrix": [9, 6], "x": 14, "y": 4},
+                {"matrix": [9, 7], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_65_iso": {
+            "layout": [
+                {"matrix": [0, 2], "x": 0, "y": 0},
+                {"matrix": [0, 3], "x": 1, "y": 0},
+                {"matrix": [0, 4], "x": 2, "y": 0},
+                {"matrix": [0, 5], "x": 3, "y": 0},
+                {"matrix": [0, 6], "x": 4, "y": 0},
+                {"matrix": [0, 7], "x": 5, "y": 0},
+                {"matrix": [0, 8], "x": 6, "y": 0},
+
+                {"matrix": [5, 0], "x": 8, "y": 0},
+                {"matrix": [5, 1], "x": 9, "y": 0},
+                {"matrix": [5, 2], "x": 10, "y": 0},
+                {"matrix": [5, 3], "x": 11, "y": 0},
+                {"matrix": [5, 4], "x": 12, "y": 0},
+                {"matrix": [5, 5], "x": 13, "y": 0},
+                {"matrix": [5, 6], "x": 14, "y": 0},
+                {"matrix": [5, 7], "x": 15, "y": 0},
+                {"matrix": [5, 8], "x": 16, "y": 0},
+
+                {"matrix": [1, 2], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 3], "x": 1.5, "y": 1},
+                {"matrix": [1, 4], "x": 2.5, "y": 1},
+                {"matrix": [1, 5], "x": 3.5, "y": 1},
+                {"matrix": [1, 6], "x": 4.5, "y": 1},
+                {"matrix": [1, 7], "x": 5.5, "y": 1},
+
+                {"matrix": [6, 0], "x": 7.5, "y": 1},
+                {"matrix": [6, 1], "x": 8.5, "y": 1},
+                {"matrix": [6, 2], "x": 9.5, "y": 1},
+                {"matrix": [6, 3], "x": 10.5, "y": 1},
+                {"matrix": [6, 4], "x": 11.5, "y": 1},
+                {"matrix": [6, 5], "x": 12.5, "y": 1},
+                {"matrix": [6, 6], "x": 13.5, "y": 1},
+                {"matrix": [6, 8], "x": 16, "y": 1},
+
+                {"matrix": [2, 2], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 3], "x": 1.75, "y": 2},
+                {"matrix": [2, 4], "x": 2.75, "y": 2},
+                {"matrix": [2, 5], "x": 3.75, "y": 2},
+                {"matrix": [2, 6], "x": 4.75, "y": 2},
+                {"matrix": [2, 7], "x": 5.75, "y": 2},
+
+                {"matrix": [7, 0], "x": 7.75, "y": 2},
+                {"matrix": [7, 1], "x": 8.75, "y": 2},
+                {"matrix": [7, 2], "x": 9.75, "y": 2},
+                {"matrix": [7, 3], "x": 10.75, "y": 2},
+                {"matrix": [7, 4], "x": 11.75, "y": 2},
+                {"matrix": [7, 5], "x": 12.75, "y": 2},
+                {"matrix": [7, 6], "x": 13.75, "y": 2},
+                {"matrix": [7, 7], "x": 14.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [7, 8], "x": 16, "y": 2},
+
+                {"matrix": [3, 2], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 3], "x": 1.25, "y": 3},
+                {"matrix": [3, 4], "x": 2.25, "y": 3},
+                {"matrix": [3, 5], "x": 3.25, "y": 3},
+                {"matrix": [3, 6], "x": 4.25, "y": 3},
+                {"matrix": [3, 7], "x": 5.25, "y": 3},
+                {"matrix": [3, 8], "x": 6.25, "y": 3},
+
+                {"matrix": [8, 0], "x": 8.25, "y": 3},
+                {"matrix": [8, 1], "x": 9.25, "y": 3},
+                {"matrix": [8, 2], "x": 10.25, "y": 3},
+                {"matrix": [8, 3], "x": 11.25, "y": 3},
+                {"matrix": [8, 4], "x": 12.25, "y": 3},
+                {"matrix": [8, 6], "x": 13.25, "y": 3, "w": 1.75},
+                {"matrix": [8, 7], "x": 15, "y": 3},
+                {"matrix": [8, 8], "x": 16, "y": 3},
+
+                {"matrix": [4, 2], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 7], "x": 5, "y": 4, "w": 2.25},
+
+                {"matrix": [9, 0], "x": 8.25, "y": 4, "w": 1.25},
+                {"matrix": [9, 1], "x": 9.5, "y": 4, "w": 1.5},
+                {"matrix": [9, 2], "x": 11, "y": 4},
+                {"matrix": [9, 3], "x": 12, "y": 4},
+                {"matrix": [9, 4], "x": 13, "y": 4},
+                {"matrix": [9, 6], "x": 14, "y": 4},
+                {"matrix": [9, 7], "x": 15, "y": 4},
+                {"matrix": [9, 8], "x": 16, "y": 4}
+            ]
+        },
+        "LAYOUT_60_iso_with_macro": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+                {"matrix": [0, 5], "x": 5.25, "y": 0},
+                {"matrix": [0, 6], "x": 6.25, "y": 0},
+                {"matrix": [0, 7], "x": 7.25, "y": 0},
+                {"matrix": [0, 8], "x": 8.25, "y": 0},
+
+                {"matrix": [5, 0], "x": 10.25, "y": 0},
+                {"matrix": [5, 1], "x": 11.25, "y": 0},
+                {"matrix": [5, 2], "x": 12.25, "y": 0},
+                {"matrix": [5, 3], "x": 13.25, "y": 0},
+                {"matrix": [5, 4], "x": 14.25, "y": 0},
+                {"matrix": [5, 5], "x": 15.25, "y": 0},
+                {"matrix": [5, 6], "x": 16.25, "y": 0},
+                {"matrix": [5, 7], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2.25, "y": 1, "w": 1.5},
+                {"matrix": [1, 3], "x": 3.75, "y": 1},
+                {"matrix": [1, 4], "x": 4.75, "y": 1},
+                {"matrix": [1, 5], "x": 5.75, "y": 1},
+                {"matrix": [1, 6], "x": 6.75, "y": 1},
+                {"matrix": [1, 7], "x": 7.75, "y": 1},
+
+                {"matrix": [6, 0], "x": 9.75, "y": 1},
+                {"matrix": [6, 1], "x": 10.75, "y": 1},
+                {"matrix": [6, 2], "x": 11.75, "y": 1},
+                {"matrix": [6, 3], "x": 12.75, "y": 1},
+                {"matrix": [6, 4], "x": 13.75, "y": 1},
+                {"matrix": [6, 5], "x": 14.75, "y": 1},
+                {"matrix": [6, 6], "x": 15.75, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2.25, "y": 2, "w": 1.75},
+                {"matrix": [2, 3], "x": 4, "y": 2},
+                {"matrix": [2, 4], "x": 5, "y": 2},
+                {"matrix": [2, 5], "x": 6, "y": 2},
+                {"matrix": [2, 6], "x": 7, "y": 2},
+                {"matrix": [2, 7], "x": 8, "y": 2},
+
+                {"matrix": [7, 0], "x": 10, "y": 2},
+                {"matrix": [7, 1], "x": 11, "y": 2},
+                {"matrix": [7, 2], "x": 12, "y": 2},
+                {"matrix": [7, 3], "x": 13, "y": 2},
+                {"matrix": [7, 4], "x": 14, "y": 2},
+                {"matrix": [7, 5], "x": 15, "y": 2},
+                {"matrix": [7, 6], "x": 16, "y": 2},
+                {"matrix": [7, 7], "x": 17, "y": 1, "w": 1.25, "h": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3, "w": 1.25},
+                {"matrix": [3, 3], "x": 3.5, "y": 3},
+                {"matrix": [3, 4], "x": 4.5, "y": 3},
+                {"matrix": [3, 5], "x": 5.5, "y": 3},
+                {"matrix": [3, 6], "x": 6.5, "y": 3},
+                {"matrix": [3, 7], "x": 7.5, "y": 3},
+                {"matrix": [3, 8], "x": 8.5, "y": 3},
+
+                {"matrix": [8, 0], "x": 10.5, "y": 3},
+                {"matrix": [8, 1], "x": 11.5, "y": 3},
+                {"matrix": [8, 2], "x": 12.5, "y": 3},
+                {"matrix": [8, 3], "x": 13.5, "y": 3},
+                {"matrix": [8, 4], "x": 14.5, "y": 3},
+                {"matrix": [8, 6], "x": 15.5, "y": 3, "w": 1.75},
+                {"matrix": [8, 7], "x": 17.25, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+                {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 3.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 4.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 6, "y": 4, "w": 1.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4, "w": 2.25},
+
+                {"matrix": [9, 0], "x": 10.5, "y": 4, "w": 1.25},
+                {"matrix": [9, 1], "x": 11.75, "y": 4, "w": 1.5},
+                {"matrix": [9, 2], "x": 13.25, "y": 4},
+                {"matrix": [9, 3], "x": 14.25, "y": 4},
+                {"matrix": [9, 4], "x": 15.25, "y": 4},
+                {"matrix": [9, 6], "x": 16.25, "y": 4},
+                {"matrix": [9, 7], "x": 17.25, "y": 4}
+            ]
+        },
+        "LAYOUT_65_iso_with_macro": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+                {"matrix": [0, 5], "x": 5.25, "y": 0},
+                {"matrix": [0, 6], "x": 6.25, "y": 0},
+                {"matrix": [0, 7], "x": 7.25, "y": 0},
+                {"matrix": [0, 8], "x": 8.25, "y": 0},
+
+                {"matrix": [5, 0], "x": 10.25, "y": 0},
+                {"matrix": [5, 1], "x": 11.25, "y": 0},
+                {"matrix": [5, 2], "x": 12.25, "y": 0},
+                {"matrix": [5, 3], "x": 13.25, "y": 0},
+                {"matrix": [5, 4], "x": 14.25, "y": 0},
+                {"matrix": [5, 5], "x": 15.25, "y": 0},
+                {"matrix": [5, 6], "x": 16.25, "y": 0},
+                {"matrix": [5, 7], "x": 17.25, "y": 0},
+                {"matrix": [5, 8], "x": 18.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2.25, "y": 1, "w": 1.5},
+                {"matrix": [1, 3], "x": 3.75, "y": 1},
+                {"matrix": [1, 4], "x": 4.75, "y": 1},
+                {"matrix": [1, 5], "x": 5.75, "y": 1},
+                {"matrix": [1, 6], "x": 6.75, "y": 1},
+                {"matrix": [1, 7], "x": 7.75, "y": 1},
+
+                {"matrix": [6, 0], "x": 9.75, "y": 1},
+                {"matrix": [6, 1], "x": 10.75, "y": 1},
+                {"matrix": [6, 2], "x": 11.75, "y": 1},
+                {"matrix": [6, 3], "x": 12.75, "y": 1},
+                {"matrix": [6, 4], "x": 13.75, "y": 1},
+                {"matrix": [6, 5], "x": 14.75, "y": 1},
+                {"matrix": [6, 6], "x": 15.75, "y": 1},
+                {"matrix": [6, 8], "x": 18.25, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2.25, "y": 2, "w": 1.75},
+                {"matrix": [2, 3], "x": 4, "y": 2},
+                {"matrix": [2, 4], "x": 5, "y": 2},
+                {"matrix": [2, 5], "x": 6, "y": 2},
+                {"matrix": [2, 6], "x": 7, "y": 2},
+                {"matrix": [2, 7], "x": 8, "y": 2},
+
+                {"matrix": [7, 0], "x": 10, "y": 2},
+                {"matrix": [7, 1], "x": 11, "y": 2},
+                {"matrix": [7, 2], "x": 12, "y": 2},
+                {"matrix": [7, 3], "x": 13, "y": 2},
+                {"matrix": [7, 4], "x": 14, "y": 2},
+                {"matrix": [7, 5], "x": 15, "y": 2},
+                {"matrix": [7, 6], "x": 16, "y": 2},
+                {"matrix": [7, 7], "x": 17, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [7, 8], "x": 18.25, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3, "w": 1.25},
+                {"matrix": [3, 3], "x": 3.5, "y": 3},
+                {"matrix": [3, 4], "x": 4.5, "y": 3},
+                {"matrix": [3, 5], "x": 5.5, "y": 3},
+                {"matrix": [3, 6], "x": 6.5, "y": 3},
+                {"matrix": [3, 7], "x": 7.5, "y": 3},
+                {"matrix": [3, 8], "x": 8.5, "y": 3},
+
+                {"matrix": [8, 0], "x": 10.5, "y": 3},
+                {"matrix": [8, 1], "x": 11.5, "y": 3},
+                {"matrix": [8, 2], "x": 12.5, "y": 3},
+                {"matrix": [8, 3], "x": 13.5, "y": 3},
+                {"matrix": [8, 4], "x": 14.5, "y": 3},
+                {"matrix": [8, 6], "x": 15.5, "y": 3, "w": 1.75},
+                {"matrix": [8, 7], "x": 17.25, "y": 3},
+                {"matrix": [8, 8], "x": 18.25, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+                {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 3.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 4.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 6, "y": 4, "w": 1.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4, "w": 2.25},
+
+                {"matrix": [9, 0], "x": 10.5, "y": 4, "w": 1.25},
+                {"matrix": [9, 1], "x": 11.75, "y": 4, "w": 1.5},
+                {"matrix": [9, 2], "x": 13.25, "y": 4},
+                {"matrix": [9, 3], "x": 14.25, "y": 4},
+                {"matrix": [9, 4], "x": 15.25, "y": 4},
+                {"matrix": [9, 6], "x": 16.25, "y": 4},
+                {"matrix": [9, 7], "x": 17.25, "y": 4},
+                {"matrix": [9, 8], "x": 18.25, "y": 4}
+            ]
+        },
+        "LAYOUT_all": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+                {"matrix": [0, 5], "x": 5.25, "y": 0},
+                {"matrix": [0, 6], "x": 6.25, "y": 0},
+                {"matrix": [0, 7], "x": 7.25, "y": 0},
+                {"matrix": [0, 8], "x": 8.25, "y": 0},
+
+                {"matrix": [5, 0], "x": 10.25, "y": 0},
+                {"matrix": [5, 1], "x": 11.25, "y": 0},
+                {"matrix": [5, 2], "x": 12.25, "y": 0},
+                {"matrix": [5, 3], "x": 13.25, "y": 0},
+                {"matrix": [5, 4], "x": 14.25, "y": 0},
+                {"matrix": [5, 5], "x": 15.25, "y": 0},
+                {"matrix": [5, 6], "x": 16.25, "y": 0},
+                {"matrix": [5, 7], "x": 17.25, "y": 0},
+                {"matrix": [5, 8], "x": 18.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2.25, "y": 1, "w": 1.5},
+                {"matrix": [1, 3], "x": 3.75, "y": 1},
+                {"matrix": [1, 4], "x": 4.75, "y": 1},
+                {"matrix": [1, 5], "x": 5.75, "y": 1},
+                {"matrix": [1, 6], "x": 6.75, "y": 1},
+                {"matrix": [1, 7], "x": 7.75, "y": 1},
+
+                {"matrix": [6, 0], "x": 9.75, "y": 1},
+                {"matrix": [6, 1], "x": 10.75, "y": 1},
+                {"matrix": [6, 2], "x": 11.75, "y": 1},
+                {"matrix": [6, 3], "x": 12.75, "y": 1},
+                {"matrix": [6, 4], "x": 13.75, "y": 1},
+                {"matrix": [6, 5], "x": 14.75, "y": 1},
+                {"matrix": [6, 6], "x": 15.75, "y": 1},
+                {"matrix": [6, 7], "x": 16.75, "y": 1, "w": 1.5},
+                {"matrix": [6, 8], "x": 18.25, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2.25, "y": 2, "w": 1.75},
+                {"matrix": [2, 3], "x": 4, "y": 2},
+                {"matrix": [2, 4], "x": 5, "y": 2},
+                {"matrix": [2, 5], "x": 6, "y": 2},
+                {"matrix": [2, 6], "x": 7, "y": 2},
+                {"matrix": [2, 7], "x": 8, "y": 2},
+
+                {"matrix": [7, 0], "x": 10, "y": 2},
+                {"matrix": [7, 1], "x": 11, "y": 2},
+                {"matrix": [7, 2], "x": 12, "y": 2},
+                {"matrix": [7, 3], "x": 13, "y": 2},
+                {"matrix": [7, 4], "x": 14, "y": 2},
+                {"matrix": [7, 5], "x": 15, "y": 2},
+                {"matrix": [7, 6], "x": 16, "y": 2},
+                {"matrix": [7, 7], "x": 17, "y": 2, "w": 1.25},
+                {"matrix": [7, 8], "x": 18.25, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3, "w": 1.25},
+                {"matrix": [3, 3], "x": 3.5, "y": 3},
+                {"matrix": [3, 4], "x": 4.5, "y": 3},
+                {"matrix": [3, 5], "x": 5.5, "y": 3},
+                {"matrix": [3, 6], "x": 6.5, "y": 3},
+                {"matrix": [3, 7], "x": 7.5, "y": 3},
+                {"matrix": [3, 8], "x": 8.5, "y": 3},
+
+                {"matrix": [8, 0], "x": 10.5, "y": 3},
+                {"matrix": [8, 1], "x": 11.5, "y": 3},
+                {"matrix": [8, 2], "x": 12.5, "y": 3},
+                {"matrix": [8, 3], "x": 13.5, "y": 3},
+                {"matrix": [8, 4], "x": 14.5, "y": 3},
+                {"matrix": [8, 6], "x": 15.5, "y": 3, "w": 1.75},
+                {"matrix": [8, 7], "x": 17.25, "y": 3},
+                {"matrix": [8, 8], "x": 18.25, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+                {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 3.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 4.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 6, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 7.25, "y": 4},
+                {"matrix": [4, 7], "x": 8.25, "y": 4, "w": 1.25},
+
+                {"matrix": [9, 0], "x": 10.5, "y": 4, "w": 1.25},
+                {"matrix": [9, 1], "x": 11.75, "y": 4, "w": 1.5},
+                {"matrix": [9, 2], "x": 13.25, "y": 4},
+                {"matrix": [9, 3], "x": 14.25, "y": 4},
+                {"matrix": [9, 4], "x": 15.25, "y": 4},
+                {"matrix": [9, 6], "x": 16.25, "y": 4},
+                {"matrix": [9, 7], "x": 17.25, "y": 4},
+                {"matrix": [9, 8], "x": 18.25, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/keebio/quefrency/rev2/rules.mk b/keyboards/keebio/quefrency/rev2/rules.mk
deleted file mode 100644
index 32e78815991..00000000000
--- a/keyboards/keebio/quefrency/rev2/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-BACKLIGHT_ENABLE = yes
-RGBLIGHT_ENABLE = yes
-ENCODER_ENABLE = yes
diff --git a/keyboards/keebio/quefrency/rev3/info.json b/keyboards/keebio/quefrency/rev3/info.json
deleted file mode 100644
index dac80973ae9..00000000000
--- a/keyboards/keebio/quefrency/rev3/info.json
+++ /dev/null
@@ -1,869 +0,0 @@
-{
-    "keyboard_name": "Quefrency Rev. 3",
-    "manufacturer": "Keebio",
-    "url": "https://keeb.io",
-    "maintainer": "nooges",
-    "usb": {
-        "vid": "0xCB10",
-        "pid": "0x3357",
-        "device_version": "3.1.0"
-    },
-    "matrix_pins": {
-        "cols": ["F4", "F1", "F0", "B7", "B3", "D2", "D3", "D5", "D4"],
-        "rows": ["B1", "B2", "C7", "B4", "D7"]
-    },
-    "diode_direction": "COL2ROW",
-    "encoder": {
-        "rotary": [
-            {"pin_a": "F5", "pin_b": "F6"}
-        ]
-    },
-    "backlight": {
-        "pin": "B5"
-    },
-    "rgblight": {
-        "led_count": 16,
-        "led_map": [1, 2, 3, 12, 13, 14, 15, 0, 7, 6, 5, 4, 11, 10, 9, 8],
-        "split_count": [8, 8],
-        "animations": {
-            "breathing": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "snake": true,
-            "knight": true,
-            "christmas": true,
-            "static_gradient": true,
-            "rgb_test": true,
-            "alternating": true,
-            "twinkle": true
-        }
-    },
-    "ws2812": {
-        "pin": "E6"
-    },
-    "split": {
-        "soft_serial_pin": "D0",
-        "encoder": {
-            "right": {
-                "rotary": [
-                    {"pin_a": "D6", "pin_b": "D4"}
-                ]
-            }
-        },
-        "matrix_pins": {
-            "right": {
-                "cols": ["F1", "F0", "F4", "F5", "F6", "D5", "C7", "D3", "B7"],
-                "rows": ["B3", "B2", "B6", "B4", "D7"]
-            }
-        }
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "layout_aliases": {
-        "LAYOUT": "LAYOUT_60"
-    },
-    "layouts": {
-        "LAYOUT_60": {
-            "layout": [
-                {"matrix": [0, 2], "x": 0, "y": 0},
-                {"matrix": [0, 3], "x": 1, "y": 0},
-                {"matrix": [0, 4], "x": 2, "y": 0},
-                {"matrix": [0, 5], "x": 3, "y": 0},
-                {"matrix": [0, 6], "x": 4, "y": 0},
-                {"matrix": [0, 7], "x": 5, "y": 0},
-                {"matrix": [0, 8], "x": 6, "y": 0},
-
-                {"matrix": [5, 0], "x": 8, "y": 0},
-                {"matrix": [5, 1], "x": 9, "y": 0},
-                {"matrix": [5, 2], "x": 10, "y": 0},
-                {"matrix": [5, 3], "x": 11, "y": 0},
-                {"matrix": [5, 4], "x": 12, "y": 0},
-                {"matrix": [5, 5], "x": 13, "y": 0},
-                {"matrix": [5, 6], "x": 14, "y": 0},
-                {"matrix": [5, 7], "x": 15, "y": 0},
-
-                {"matrix": [1, 2], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 3], "x": 1.5, "y": 1},
-                {"matrix": [1, 4], "x": 2.5, "y": 1},
-                {"matrix": [1, 5], "x": 3.5, "y": 1},
-                {"matrix": [1, 6], "x": 4.5, "y": 1},
-                {"matrix": [1, 7], "x": 5.5, "y": 1},
-
-                {"matrix": [6, 0], "x": 7.5, "y": 1},
-                {"matrix": [6, 1], "x": 8.5, "y": 1},
-                {"matrix": [6, 2], "x": 9.5, "y": 1},
-                {"matrix": [6, 3], "x": 10.5, "y": 1},
-                {"matrix": [6, 4], "x": 11.5, "y": 1},
-                {"matrix": [6, 5], "x": 12.5, "y": 1},
-                {"matrix": [6, 6], "x": 13.5, "y": 1},
-                {"matrix": [6, 7], "x": 14.5, "y": 1, "w": 1.5},
-
-                {"matrix": [2, 2], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 3], "x": 1.75, "y": 2},
-                {"matrix": [2, 4], "x": 2.75, "y": 2},
-                {"matrix": [2, 5], "x": 3.75, "y": 2},
-                {"matrix": [2, 6], "x": 4.75, "y": 2},
-                {"matrix": [2, 7], "x": 5.75, "y": 2},
-
-                {"matrix": [7, 0], "x": 7.75, "y": 2},
-                {"matrix": [7, 1], "x": 8.75, "y": 2},
-                {"matrix": [7, 2], "x": 9.75, "y": 2},
-                {"matrix": [7, 3], "x": 10.75, "y": 2},
-                {"matrix": [7, 4], "x": 11.75, "y": 2},
-                {"matrix": [7, 5], "x": 12.75, "y": 2},
-                {"matrix": [7, 7], "x": 13.75, "y": 2, "w": 2.25},
-
-                {"matrix": [3, 2], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 4], "x": 2.25, "y": 3},
-                {"matrix": [3, 5], "x": 3.25, "y": 3},
-                {"matrix": [3, 6], "x": 4.25, "y": 3},
-                {"matrix": [3, 7], "x": 5.25, "y": 3},
-                {"matrix": [3, 8], "x": 6.25, "y": 3},
-
-                {"matrix": [8, 0], "x": 8.25, "y": 3},
-                {"matrix": [8, 1], "x": 9.25, "y": 3},
-                {"matrix": [8, 2], "x": 10.25, "y": 3},
-                {"matrix": [8, 3], "x": 11.25, "y": 3},
-                {"matrix": [8, 4], "x": 12.25, "y": 3},
-                {"matrix": [8, 6], "x": 13.25, "y": 3, "w": 1.75},
-                {"matrix": [8, 7], "x": 15, "y": 3},
-
-                {"matrix": [4, 2], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 3], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 4], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 1.25},
-                {"matrix": [4, 7], "x": 5, "y": 4, "w": 2.25},
-
-                {"matrix": [9, 0], "x": 8.25, "y": 4, "w": 1.25},
-                {"matrix": [9, 1], "x": 9.5, "y": 4, "w": 1.5},
-                {"matrix": [9, 2], "x": 11, "y": 4},
-                {"matrix": [9, 3], "x": 12, "y": 4},
-                {"matrix": [9, 4], "x": 13, "y": 4},
-                {"matrix": [9, 6], "x": 14, "y": 4},
-                {"matrix": [9, 7], "x": 15, "y": 4}
-            ]
-        },
-        "LAYOUT_65": {
-            "layout": [
-                {"matrix": [0, 2], "x": 0, "y": 0},
-                {"matrix": [0, 3], "x": 1, "y": 0},
-                {"matrix": [0, 4], "x": 2, "y": 0},
-                {"matrix": [0, 5], "x": 3, "y": 0},
-                {"matrix": [0, 6], "x": 4, "y": 0},
-                {"matrix": [0, 7], "x": 5, "y": 0},
-                {"matrix": [0, 8], "x": 6, "y": 0},
-
-                {"matrix": [5, 0], "x": 8, "y": 0},
-                {"matrix": [5, 1], "x": 9, "y": 0},
-                {"matrix": [5, 2], "x": 10, "y": 0},
-                {"matrix": [5, 3], "x": 11, "y": 0},
-                {"matrix": [5, 4], "x": 12, "y": 0},
-                {"matrix": [5, 5], "x": 13, "y": 0},
-                {"matrix": [5, 6], "x": 14, "y": 0},
-                {"matrix": [5, 7], "x": 15, "y": 0},
-                {"matrix": [5, 8], "x": 16, "y": 0},
-
-                {"matrix": [1, 2], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 3], "x": 1.5, "y": 1},
-                {"matrix": [1, 4], "x": 2.5, "y": 1},
-                {"matrix": [1, 5], "x": 3.5, "y": 1},
-                {"matrix": [1, 6], "x": 4.5, "y": 1},
-                {"matrix": [1, 7], "x": 5.5, "y": 1},
-
-                {"matrix": [6, 0], "x": 7.5, "y": 1},
-                {"matrix": [6, 1], "x": 8.5, "y": 1},
-                {"matrix": [6, 2], "x": 9.5, "y": 1},
-                {"matrix": [6, 3], "x": 10.5, "y": 1},
-                {"matrix": [6, 4], "x": 11.5, "y": 1},
-                {"matrix": [6, 5], "x": 12.5, "y": 1},
-                {"matrix": [6, 6], "x": 13.5, "y": 1},
-                {"matrix": [6, 7], "x": 14.5, "y": 1, "w": 1.5},
-                {"matrix": [6, 8], "x": 16, "y": 1},
-
-                {"matrix": [2, 2], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 3], "x": 1.75, "y": 2},
-                {"matrix": [2, 4], "x": 2.75, "y": 2},
-                {"matrix": [2, 5], "x": 3.75, "y": 2},
-                {"matrix": [2, 6], "x": 4.75, "y": 2},
-                {"matrix": [2, 7], "x": 5.75, "y": 2},
-
-                {"matrix": [7, 0], "x": 7.75, "y": 2},
-                {"matrix": [7, 1], "x": 8.75, "y": 2},
-                {"matrix": [7, 2], "x": 9.75, "y": 2},
-                {"matrix": [7, 3], "x": 10.75, "y": 2},
-                {"matrix": [7, 4], "x": 11.75, "y": 2},
-                {"matrix": [7, 5], "x": 12.75, "y": 2},
-                {"matrix": [7, 7], "x": 13.75, "y": 2, "w": 2.25},
-                {"matrix": [7, 8], "x": 16, "y": 2},
-
-                {"matrix": [3, 2], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 4], "x": 2.25, "y": 3},
-                {"matrix": [3, 5], "x": 3.25, "y": 3},
-                {"matrix": [3, 6], "x": 4.25, "y": 3},
-                {"matrix": [3, 7], "x": 5.25, "y": 3},
-                {"matrix": [3, 8], "x": 6.25, "y": 3},
-
-                {"matrix": [8, 0], "x": 8.25, "y": 3},
-                {"matrix": [8, 1], "x": 9.25, "y": 3},
-                {"matrix": [8, 2], "x": 10.25, "y": 3},
-                {"matrix": [8, 3], "x": 11.25, "y": 3},
-                {"matrix": [8, 4], "x": 12.25, "y": 3},
-                {"matrix": [8, 6], "x": 13.25, "y": 3, "w": 1.75},
-                {"matrix": [8, 7], "x": 15, "y": 3},
-                {"matrix": [8, 8], "x": 16, "y": 3},
-
-                {"matrix": [4, 2], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 3], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 4], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 1.25},
-                {"matrix": [4, 7], "x": 5, "y": 4, "w": 2.25},
-
-                {"matrix": [9, 0], "x": 8.25, "y": 4, "w": 1.25},
-                {"matrix": [9, 1], "x": 9.5, "y": 4, "w": 1.5},
-                {"matrix": [9, 2], "x": 11, "y": 4},
-                {"matrix": [9, 3], "x": 12, "y": 4},
-                {"matrix": [9, 4], "x": 13, "y": 4},
-                {"matrix": [9, 6], "x": 14, "y": 4},
-                {"matrix": [9, 7], "x": 15, "y": 4},
-                {"matrix": [9, 8], "x": 16, "y": 4}
-            ]
-        },
-        "LAYOUT_60_with_macro": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2.25, "y": 0},
-                {"matrix": [0, 3], "x": 3.25, "y": 0},
-                {"matrix": [0, 4], "x": 4.25, "y": 0},
-                {"matrix": [0, 5], "x": 5.25, "y": 0},
-                {"matrix": [0, 6], "x": 6.25, "y": 0},
-                {"matrix": [0, 7], "x": 7.25, "y": 0},
-                {"matrix": [0, 8], "x": 8.25, "y": 0},
-
-                {"matrix": [5, 0], "x": 10.25, "y": 0},
-                {"matrix": [5, 1], "x": 11.25, "y": 0},
-                {"matrix": [5, 2], "x": 12.25, "y": 0},
-                {"matrix": [5, 3], "x": 13.25, "y": 0},
-                {"matrix": [5, 4], "x": 14.25, "y": 0},
-                {"matrix": [5, 5], "x": 15.25, "y": 0},
-                {"matrix": [5, 6], "x": 16.25, "y": 0},
-                {"matrix": [5, 7], "x": 17.25, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1},
-                {"matrix": [1, 1], "x": 1, "y": 1},
-                {"matrix": [1, 2], "x": 2.25, "y": 1, "w": 1.5},
-                {"matrix": [1, 3], "x": 3.75, "y": 1},
-                {"matrix": [1, 4], "x": 4.75, "y": 1},
-                {"matrix": [1, 5], "x": 5.75, "y": 1},
-                {"matrix": [1, 6], "x": 6.75, "y": 1},
-                {"matrix": [1, 7], "x": 7.75, "y": 1},
-
-                {"matrix": [6, 0], "x": 9.75, "y": 1},
-                {"matrix": [6, 1], "x": 10.75, "y": 1},
-                {"matrix": [6, 2], "x": 11.75, "y": 1},
-                {"matrix": [6, 3], "x": 12.75, "y": 1},
-                {"matrix": [6, 4], "x": 13.75, "y": 1},
-                {"matrix": [6, 5], "x": 14.75, "y": 1},
-                {"matrix": [6, 6], "x": 15.75, "y": 1},
-                {"matrix": [6, 7], "x": 16.75, "y": 1, "w": 1.5},
-
-                {"matrix": [2, 0], "x": 0, "y": 2},
-                {"matrix": [2, 1], "x": 1, "y": 2},
-                {"matrix": [2, 2], "x": 2.25, "y": 2, "w": 1.75},
-                {"matrix": [2, 3], "x": 4, "y": 2},
-                {"matrix": [2, 4], "x": 5, "y": 2},
-                {"matrix": [2, 5], "x": 6, "y": 2},
-                {"matrix": [2, 6], "x": 7, "y": 2},
-                {"matrix": [2, 7], "x": 8, "y": 2},
-
-                {"matrix": [7, 0], "x": 10, "y": 2},
-                {"matrix": [7, 1], "x": 11, "y": 2},
-                {"matrix": [7, 2], "x": 12, "y": 2},
-                {"matrix": [7, 3], "x": 13, "y": 2},
-                {"matrix": [7, 4], "x": 14, "y": 2},
-                {"matrix": [7, 5], "x": 15, "y": 2},
-                {"matrix": [7, 7], "x": 16, "y": 2, "w": 2.25},
-
-                {"matrix": [3, 0], "x": 0, "y": 3},
-                {"matrix": [3, 1], "x": 1, "y": 3},
-                {"matrix": [3, 2], "x": 2.25, "y": 3, "w": 2.25},
-                {"matrix": [3, 4], "x": 4.5, "y": 3},
-                {"matrix": [3, 5], "x": 5.5, "y": 3},
-                {"matrix": [3, 6], "x": 6.5, "y": 3},
-                {"matrix": [3, 7], "x": 7.5, "y": 3},
-                {"matrix": [3, 8], "x": 8.5, "y": 3},
-
-                {"matrix": [8, 0], "x": 10.5, "y": 3},
-                {"matrix": [8, 1], "x": 11.5, "y": 3},
-                {"matrix": [8, 2], "x": 12.5, "y": 3},
-                {"matrix": [8, 3], "x": 13.5, "y": 3},
-                {"matrix": [8, 4], "x": 14.5, "y": 3},
-                {"matrix": [8, 6], "x": 15.5, "y": 3, "w": 1.75},
-                {"matrix": [8, 7], "x": 17.25, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4},
-                {"matrix": [4, 1], "x": 1, "y": 4},
-                {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 3], "x": 3.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 4], "x": 4.75, "y": 4, "w": 1.25},
-                {"matrix": [4, 5], "x": 6, "y": 4, "w": 1.25},
-                {"matrix": [4, 7], "x": 7.25, "y": 4, "w": 2.25},
-
-                {"matrix": [9, 0], "x": 10.5, "y": 4, "w": 1.25},
-                {"matrix": [9, 1], "x": 11.75, "y": 4, "w": 1.5},
-                {"matrix": [9, 2], "x": 13.25, "y": 4},
-                {"matrix": [9, 3], "x": 14.25, "y": 4},
-                {"matrix": [9, 4], "x": 15.25, "y": 4},
-                {"matrix": [9, 6], "x": 16.25, "y": 4},
-                {"matrix": [9, 7], "x": 17.25, "y": 4}
-            ]
-        },
-        "LAYOUT_65_with_macro": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2.25, "y": 0},
-                {"matrix": [0, 3], "x": 3.25, "y": 0},
-                {"matrix": [0, 4], "x": 4.25, "y": 0},
-                {"matrix": [0, 5], "x": 5.25, "y": 0},
-                {"matrix": [0, 6], "x": 6.25, "y": 0},
-                {"matrix": [0, 7], "x": 7.25, "y": 0},
-                {"matrix": [0, 8], "x": 8.25, "y": 0},
-
-                {"matrix": [5, 0], "x": 10.25, "y": 0},
-                {"matrix": [5, 1], "x": 11.25, "y": 0},
-                {"matrix": [5, 2], "x": 12.25, "y": 0},
-                {"matrix": [5, 3], "x": 13.25, "y": 0},
-                {"matrix": [5, 4], "x": 14.25, "y": 0},
-                {"matrix": [5, 5], "x": 15.25, "y": 0},
-                {"matrix": [5, 6], "x": 16.25, "y": 0},
-                {"matrix": [5, 7], "x": 17.25, "y": 0},
-                {"matrix": [5, 8], "x": 18.25, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1},
-                {"matrix": [1, 1], "x": 1, "y": 1},
-                {"matrix": [1, 2], "x": 2.25, "y": 1, "w": 1.5},
-                {"matrix": [1, 3], "x": 3.75, "y": 1},
-                {"matrix": [1, 4], "x": 4.75, "y": 1},
-                {"matrix": [1, 5], "x": 5.75, "y": 1},
-                {"matrix": [1, 6], "x": 6.75, "y": 1},
-                {"matrix": [1, 7], "x": 7.75, "y": 1},
-
-                {"matrix": [6, 0], "x": 9.75, "y": 1},
-                {"matrix": [6, 1], "x": 10.75, "y": 1},
-                {"matrix": [6, 2], "x": 11.75, "y": 1},
-                {"matrix": [6, 3], "x": 12.75, "y": 1},
-                {"matrix": [6, 4], "x": 13.75, "y": 1},
-                {"matrix": [6, 5], "x": 14.75, "y": 1},
-                {"matrix": [6, 6], "x": 15.75, "y": 1},
-                {"matrix": [6, 7], "x": 16.75, "y": 1, "w": 1.5},
-                {"matrix": [6, 8], "x": 18.25, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2},
-                {"matrix": [2, 1], "x": 1, "y": 2},
-                {"matrix": [2, 2], "x": 2.25, "y": 2, "w": 1.75},
-                {"matrix": [2, 3], "x": 4, "y": 2},
-                {"matrix": [2, 4], "x": 5, "y": 2},
-                {"matrix": [2, 5], "x": 6, "y": 2},
-                {"matrix": [2, 6], "x": 7, "y": 2},
-                {"matrix": [2, 7], "x": 8, "y": 2},
-
-                {"matrix": [7, 0], "x": 10, "y": 2},
-                {"matrix": [7, 1], "x": 11, "y": 2},
-                {"matrix": [7, 2], "x": 12, "y": 2},
-                {"matrix": [7, 3], "x": 13, "y": 2},
-                {"matrix": [7, 4], "x": 14, "y": 2},
-                {"matrix": [7, 5], "x": 15, "y": 2},
-                {"matrix": [7, 7], "x": 16, "y": 2, "w": 2.25},
-                {"matrix": [7, 8], "x": 18.25, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3},
-                {"matrix": [3, 1], "x": 1, "y": 3},
-                {"matrix": [3, 2], "x": 2.25, "y": 3, "w": 2.25},
-                {"matrix": [3, 4], "x": 4.5, "y": 3},
-                {"matrix": [3, 5], "x": 5.5, "y": 3},
-                {"matrix": [3, 6], "x": 6.5, "y": 3},
-                {"matrix": [3, 7], "x": 7.5, "y": 3},
-                {"matrix": [3, 8], "x": 8.5, "y": 3},
-
-                {"matrix": [8, 0], "x": 10.5, "y": 3},
-                {"matrix": [8, 1], "x": 11.5, "y": 3},
-                {"matrix": [8, 2], "x": 12.5, "y": 3},
-                {"matrix": [8, 3], "x": 13.5, "y": 3},
-                {"matrix": [8, 4], "x": 14.5, "y": 3},
-                {"matrix": [8, 6], "x": 15.5, "y": 3, "w": 1.75},
-                {"matrix": [8, 7], "x": 17.25, "y": 3},
-                {"matrix": [8, 8], "x": 18.25, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4},
-                {"matrix": [4, 1], "x": 1, "y": 4},
-                {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 3], "x": 3.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 4], "x": 4.75, "y": 4, "w": 1.25},
-                {"matrix": [4, 5], "x": 6, "y": 4, "w": 1.25},
-                {"matrix": [4, 7], "x": 7.25, "y": 4, "w": 2.25},
-
-                {"matrix": [9, 0], "x": 10.5, "y": 4, "w": 1.25},
-                {"matrix": [9, 1], "x": 11.75, "y": 4, "w": 1.5},
-                {"matrix": [9, 2], "x": 13.25, "y": 4},
-                {"matrix": [9, 3], "x": 14.25, "y": 4},
-                {"matrix": [9, 4], "x": 15.25, "y": 4},
-                {"matrix": [9, 6], "x": 16.25, "y": 4},
-                {"matrix": [9, 7], "x": 17.25, "y": 4},
-                {"matrix": [9, 8], "x": 18.25, "y": 4}
-            ]
-        },
-        "LAYOUT_60_iso": {
-            "layout": [
-                {"matrix": [0, 2], "x": 0, "y": 0},
-                {"matrix": [0, 3], "x": 1, "y": 0},
-                {"matrix": [0, 4], "x": 2, "y": 0},
-                {"matrix": [0, 5], "x": 3, "y": 0},
-                {"matrix": [0, 6], "x": 4, "y": 0},
-                {"matrix": [0, 7], "x": 5, "y": 0},
-                {"matrix": [0, 8], "x": 6, "y": 0},
-
-                {"matrix": [5, 0], "x": 8, "y": 0},
-                {"matrix": [5, 1], "x": 9, "y": 0},
-                {"matrix": [5, 2], "x": 10, "y": 0},
-                {"matrix": [5, 3], "x": 11, "y": 0},
-                {"matrix": [5, 4], "x": 12, "y": 0},
-                {"matrix": [5, 5], "x": 13, "y": 0},
-                {"matrix": [5, 6], "x": 14, "y": 0},
-                {"matrix": [5, 7], "x": 15, "y": 0},
-
-                {"matrix": [1, 2], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 3], "x": 1.5, "y": 1},
-                {"matrix": [1, 4], "x": 2.5, "y": 1},
-                {"matrix": [1, 5], "x": 3.5, "y": 1},
-                {"matrix": [1, 6], "x": 4.5, "y": 1},
-                {"matrix": [1, 7], "x": 5.5, "y": 1},
-
-                {"matrix": [6, 0], "x": 7.5, "y": 1},
-                {"matrix": [6, 1], "x": 8.5, "y": 1},
-                {"matrix": [6, 2], "x": 9.5, "y": 1},
-                {"matrix": [6, 3], "x": 10.5, "y": 1},
-                {"matrix": [6, 4], "x": 11.5, "y": 1},
-                {"matrix": [6, 5], "x": 12.5, "y": 1},
-                {"matrix": [6, 6], "x": 13.5, "y": 1},
-
-                {"matrix": [2, 2], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 3], "x": 1.75, "y": 2},
-                {"matrix": [2, 4], "x": 2.75, "y": 2},
-                {"matrix": [2, 5], "x": 3.75, "y": 2},
-                {"matrix": [2, 6], "x": 4.75, "y": 2},
-                {"matrix": [2, 7], "x": 5.75, "y": 2},
-
-                {"matrix": [7, 0], "x": 7.75, "y": 2},
-                {"matrix": [7, 1], "x": 8.75, "y": 2},
-                {"matrix": [7, 2], "x": 9.75, "y": 2},
-                {"matrix": [7, 3], "x": 10.75, "y": 2},
-                {"matrix": [7, 4], "x": 11.75, "y": 2},
-                {"matrix": [7, 5], "x": 12.75, "y": 2},
-                {"matrix": [7, 6], "x": 13.75, "y": 2},
-                {"matrix": [7, 7], "x": 14.75, "y": 1, "w": 1.25, "h": 2},
-
-                {"matrix": [3, 2], "x": 0, "y": 3, "w": 1.25},
-                {"matrix": [3, 3], "x": 1.25, "y": 3},
-                {"matrix": [3, 4], "x": 2.25, "y": 3},
-                {"matrix": [3, 5], "x": 3.25, "y": 3},
-                {"matrix": [3, 6], "x": 4.25, "y": 3},
-                {"matrix": [3, 7], "x": 5.25, "y": 3},
-                {"matrix": [3, 8], "x": 6.25, "y": 3},
-
-                {"matrix": [8, 0], "x": 8.25, "y": 3},
-                {"matrix": [8, 1], "x": 9.25, "y": 3},
-                {"matrix": [8, 2], "x": 10.25, "y": 3},
-                {"matrix": [8, 3], "x": 11.25, "y": 3},
-                {"matrix": [8, 4], "x": 12.25, "y": 3},
-                {"matrix": [8, 6], "x": 13.25, "y": 3, "w": 1.75},
-                {"matrix": [8, 7], "x": 15, "y": 3},
-
-                {"matrix": [4, 2], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 3], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 4], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 1.25},
-                {"matrix": [4, 7], "x": 5, "y": 4, "w": 2.25},
-
-                {"matrix": [9, 0], "x": 8.25, "y": 4, "w": 1.25},
-                {"matrix": [9, 1], "x": 9.5, "y": 4, "w": 1.5},
-                {"matrix": [9, 2], "x": 11, "y": 4},
-                {"matrix": [9, 3], "x": 12, "y": 4},
-                {"matrix": [9, 4], "x": 13, "y": 4},
-                {"matrix": [9, 6], "x": 14, "y": 4},
-                {"matrix": [9, 7], "x": 15, "y": 4}
-            ]
-        },
-        "LAYOUT_65_iso": {
-            "layout": [
-                {"matrix": [0, 2], "x": 0, "y": 0},
-                {"matrix": [0, 3], "x": 1, "y": 0},
-                {"matrix": [0, 4], "x": 2, "y": 0},
-                {"matrix": [0, 5], "x": 3, "y": 0},
-                {"matrix": [0, 6], "x": 4, "y": 0},
-                {"matrix": [0, 7], "x": 5, "y": 0},
-                {"matrix": [0, 8], "x": 6, "y": 0},
-
-                {"matrix": [5, 0], "x": 8, "y": 0},
-                {"matrix": [5, 1], "x": 9, "y": 0},
-                {"matrix": [5, 2], "x": 10, "y": 0},
-                {"matrix": [5, 3], "x": 11, "y": 0},
-                {"matrix": [5, 4], "x": 12, "y": 0},
-                {"matrix": [5, 5], "x": 13, "y": 0},
-                {"matrix": [5, 6], "x": 14, "y": 0},
-                {"matrix": [5, 7], "x": 15, "y": 0},
-                {"matrix": [5, 8], "x": 16, "y": 0},
-
-                {"matrix": [1, 2], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 3], "x": 1.5, "y": 1},
-                {"matrix": [1, 4], "x": 2.5, "y": 1},
-                {"matrix": [1, 5], "x": 3.5, "y": 1},
-                {"matrix": [1, 6], "x": 4.5, "y": 1},
-                {"matrix": [1, 7], "x": 5.5, "y": 1},
-
-                {"matrix": [6, 0], "x": 7.5, "y": 1},
-                {"matrix": [6, 1], "x": 8.5, "y": 1},
-                {"matrix": [6, 2], "x": 9.5, "y": 1},
-                {"matrix": [6, 3], "x": 10.5, "y": 1},
-                {"matrix": [6, 4], "x": 11.5, "y": 1},
-                {"matrix": [6, 5], "x": 12.5, "y": 1},
-                {"matrix": [6, 6], "x": 13.5, "y": 1},
-                {"matrix": [6, 8], "x": 16, "y": 1},
-
-                {"matrix": [2, 2], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 3], "x": 1.75, "y": 2},
-                {"matrix": [2, 4], "x": 2.75, "y": 2},
-                {"matrix": [2, 5], "x": 3.75, "y": 2},
-                {"matrix": [2, 6], "x": 4.75, "y": 2},
-                {"matrix": [2, 7], "x": 5.75, "y": 2},
-
-                {"matrix": [7, 0], "x": 7.75, "y": 2},
-                {"matrix": [7, 1], "x": 8.75, "y": 2},
-                {"matrix": [7, 2], "x": 9.75, "y": 2},
-                {"matrix": [7, 3], "x": 10.75, "y": 2},
-                {"matrix": [7, 4], "x": 11.75, "y": 2},
-                {"matrix": [7, 5], "x": 12.75, "y": 2},
-                {"matrix": [7, 6], "x": 13.75, "y": 2},
-                {"matrix": [7, 7], "x": 14.75, "y": 1, "w": 1.25, "h": 2},
-                {"matrix": [7, 8], "x": 16, "y": 2},
-
-                {"matrix": [3, 2], "x": 0, "y": 3, "w": 1.25},
-                {"matrix": [3, 3], "x": 1.25, "y": 3},
-                {"matrix": [3, 4], "x": 2.25, "y": 3},
-                {"matrix": [3, 5], "x": 3.25, "y": 3},
-                {"matrix": [3, 6], "x": 4.25, "y": 3},
-                {"matrix": [3, 7], "x": 5.25, "y": 3},
-                {"matrix": [3, 8], "x": 6.25, "y": 3},
-
-                {"matrix": [8, 0], "x": 8.25, "y": 3},
-                {"matrix": [8, 1], "x": 9.25, "y": 3},
-                {"matrix": [8, 2], "x": 10.25, "y": 3},
-                {"matrix": [8, 3], "x": 11.25, "y": 3},
-                {"matrix": [8, 4], "x": 12.25, "y": 3},
-                {"matrix": [8, 6], "x": 13.25, "y": 3, "w": 1.75},
-                {"matrix": [8, 7], "x": 15, "y": 3},
-                {"matrix": [8, 8], "x": 16, "y": 3},
-
-                {"matrix": [4, 2], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 3], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 4], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 1.25},
-                {"matrix": [4, 7], "x": 5, "y": 4, "w": 2.25},
-
-                {"matrix": [9, 0], "x": 8.25, "y": 4, "w": 1.25},
-                {"matrix": [9, 1], "x": 9.5, "y": 4, "w": 1.5},
-                {"matrix": [9, 2], "x": 11, "y": 4},
-                {"matrix": [9, 3], "x": 12, "y": 4},
-                {"matrix": [9, 4], "x": 13, "y": 4},
-                {"matrix": [9, 6], "x": 14, "y": 4},
-                {"matrix": [9, 7], "x": 15, "y": 4},
-                {"matrix": [9, 8], "x": 16, "y": 4}
-            ]
-        },
-        "LAYOUT_60_iso_with_macro": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2.25, "y": 0},
-                {"matrix": [0, 3], "x": 3.25, "y": 0},
-                {"matrix": [0, 4], "x": 4.25, "y": 0},
-                {"matrix": [0, 5], "x": 5.25, "y": 0},
-                {"matrix": [0, 6], "x": 6.25, "y": 0},
-                {"matrix": [0, 7], "x": 7.25, "y": 0},
-                {"matrix": [0, 8], "x": 8.25, "y": 0},
-
-                {"matrix": [5, 0], "x": 10.25, "y": 0},
-                {"matrix": [5, 1], "x": 11.25, "y": 0},
-                {"matrix": [5, 2], "x": 12.25, "y": 0},
-                {"matrix": [5, 3], "x": 13.25, "y": 0},
-                {"matrix": [5, 4], "x": 14.25, "y": 0},
-                {"matrix": [5, 5], "x": 15.25, "y": 0},
-                {"matrix": [5, 6], "x": 16.25, "y": 0},
-                {"matrix": [5, 7], "x": 17.25, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1},
-                {"matrix": [1, 1], "x": 1, "y": 1},
-                {"matrix": [1, 2], "x": 2.25, "y": 1, "w": 1.5},
-                {"matrix": [1, 3], "x": 3.75, "y": 1},
-                {"matrix": [1, 4], "x": 4.75, "y": 1},
-                {"matrix": [1, 5], "x": 5.75, "y": 1},
-                {"matrix": [1, 6], "x": 6.75, "y": 1},
-                {"matrix": [1, 7], "x": 7.75, "y": 1},
-
-                {"matrix": [6, 0], "x": 9.75, "y": 1},
-                {"matrix": [6, 1], "x": 10.75, "y": 1},
-                {"matrix": [6, 2], "x": 11.75, "y": 1},
-                {"matrix": [6, 3], "x": 12.75, "y": 1},
-                {"matrix": [6, 4], "x": 13.75, "y": 1},
-                {"matrix": [6, 5], "x": 14.75, "y": 1},
-                {"matrix": [6, 6], "x": 15.75, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2},
-                {"matrix": [2, 1], "x": 1, "y": 2},
-                {"matrix": [2, 2], "x": 2.25, "y": 2, "w": 1.75},
-                {"matrix": [2, 3], "x": 4, "y": 2},
-                {"matrix": [2, 4], "x": 5, "y": 2},
-                {"matrix": [2, 5], "x": 6, "y": 2},
-                {"matrix": [2, 6], "x": 7, "y": 2},
-                {"matrix": [2, 7], "x": 8, "y": 2},
-
-                {"matrix": [7, 0], "x": 10, "y": 2},
-                {"matrix": [7, 1], "x": 11, "y": 2},
-                {"matrix": [7, 2], "x": 12, "y": 2},
-                {"matrix": [7, 3], "x": 13, "y": 2},
-                {"matrix": [7, 4], "x": 14, "y": 2},
-                {"matrix": [7, 5], "x": 15, "y": 2},
-                {"matrix": [7, 6], "x": 16, "y": 2},
-                {"matrix": [7, 7], "x": 17, "y": 1, "w": 1.25, "h": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3},
-                {"matrix": [3, 1], "x": 1, "y": 3},
-                {"matrix": [3, 2], "x": 2.25, "y": 3, "w": 1.25},
-                {"matrix": [3, 3], "x": 3.5, "y": 3},
-                {"matrix": [3, 4], "x": 4.5, "y": 3},
-                {"matrix": [3, 5], "x": 5.5, "y": 3},
-                {"matrix": [3, 6], "x": 6.5, "y": 3},
-                {"matrix": [3, 7], "x": 7.5, "y": 3},
-                {"matrix": [3, 8], "x": 8.5, "y": 3},
-
-                {"matrix": [8, 0], "x": 10.5, "y": 3},
-                {"matrix": [8, 1], "x": 11.5, "y": 3},
-                {"matrix": [8, 2], "x": 12.5, "y": 3},
-                {"matrix": [8, 3], "x": 13.5, "y": 3},
-                {"matrix": [8, 4], "x": 14.5, "y": 3},
-                {"matrix": [8, 6], "x": 15.5, "y": 3, "w": 1.75},
-                {"matrix": [8, 7], "x": 17.25, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4},
-                {"matrix": [4, 1], "x": 1, "y": 4},
-                {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 3], "x": 3.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 4], "x": 4.75, "y": 4, "w": 1.25},
-                {"matrix": [4, 5], "x": 6, "y": 4, "w": 1.25},
-                {"matrix": [4, 7], "x": 7.25, "y": 4, "w": 2.25},
-
-                {"matrix": [9, 0], "x": 10.5, "y": 4, "w": 1.25},
-                {"matrix": [9, 1], "x": 11.75, "y": 4, "w": 1.5},
-                {"matrix": [9, 2], "x": 13.25, "y": 4},
-                {"matrix": [9, 3], "x": 14.25, "y": 4},
-                {"matrix": [9, 4], "x": 15.25, "y": 4},
-                {"matrix": [9, 6], "x": 16.25, "y": 4},
-                {"matrix": [9, 7], "x": 17.25, "y": 4}
-            ]
-        },
-        "LAYOUT_65_iso_with_macro": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2.25, "y": 0},
-                {"matrix": [0, 3], "x": 3.25, "y": 0},
-                {"matrix": [0, 4], "x": 4.25, "y": 0},
-                {"matrix": [0, 5], "x": 5.25, "y": 0},
-                {"matrix": [0, 6], "x": 6.25, "y": 0},
-                {"matrix": [0, 7], "x": 7.25, "y": 0},
-                {"matrix": [0, 8], "x": 8.25, "y": 0},
-
-                {"matrix": [5, 0], "x": 10.25, "y": 0},
-                {"matrix": [5, 1], "x": 11.25, "y": 0},
-                {"matrix": [5, 2], "x": 12.25, "y": 0},
-                {"matrix": [5, 3], "x": 13.25, "y": 0},
-                {"matrix": [5, 4], "x": 14.25, "y": 0},
-                {"matrix": [5, 5], "x": 15.25, "y": 0},
-                {"matrix": [5, 6], "x": 16.25, "y": 0},
-                {"matrix": [5, 7], "x": 17.25, "y": 0},
-                {"matrix": [5, 8], "x": 18.25, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1},
-                {"matrix": [1, 1], "x": 1, "y": 1},
-                {"matrix": [1, 2], "x": 2.25, "y": 1, "w": 1.5},
-                {"matrix": [1, 3], "x": 3.75, "y": 1},
-                {"matrix": [1, 4], "x": 4.75, "y": 1},
-                {"matrix": [1, 5], "x": 5.75, "y": 1},
-                {"matrix": [1, 6], "x": 6.75, "y": 1},
-                {"matrix": [1, 7], "x": 7.75, "y": 1},
-
-                {"matrix": [6, 0], "x": 9.75, "y": 1},
-                {"matrix": [6, 1], "x": 10.75, "y": 1},
-                {"matrix": [6, 2], "x": 11.75, "y": 1},
-                {"matrix": [6, 3], "x": 12.75, "y": 1},
-                {"matrix": [6, 4], "x": 13.75, "y": 1},
-                {"matrix": [6, 5], "x": 14.75, "y": 1},
-                {"matrix": [6, 6], "x": 15.75, "y": 1},
-                {"matrix": [6, 8], "x": 18.25, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2},
-                {"matrix": [2, 1], "x": 1, "y": 2},
-                {"matrix": [2, 2], "x": 2.25, "y": 2, "w": 1.75},
-                {"matrix": [2, 3], "x": 4, "y": 2},
-                {"matrix": [2, 4], "x": 5, "y": 2},
-                {"matrix": [2, 5], "x": 6, "y": 2},
-                {"matrix": [2, 6], "x": 7, "y": 2},
-                {"matrix": [2, 7], "x": 8, "y": 2},
-
-                {"matrix": [7, 0], "x": 10, "y": 2},
-                {"matrix": [7, 1], "x": 11, "y": 2},
-                {"matrix": [7, 2], "x": 12, "y": 2},
-                {"matrix": [7, 3], "x": 13, "y": 2},
-                {"matrix": [7, 4], "x": 14, "y": 2},
-                {"matrix": [7, 5], "x": 15, "y": 2},
-                {"matrix": [7, 6], "x": 16, "y": 2},
-                {"matrix": [7, 7], "x": 17, "y": 1, "w": 1.25, "h": 2},
-                {"matrix": [7, 8], "x": 18.25, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3},
-                {"matrix": [3, 1], "x": 1, "y": 3},
-                {"matrix": [3, 2], "x": 2.25, "y": 3, "w": 1.25},
-                {"matrix": [3, 3], "x": 3.5, "y": 3},
-                {"matrix": [3, 4], "x": 4.5, "y": 3},
-                {"matrix": [3, 5], "x": 5.5, "y": 3},
-                {"matrix": [3, 6], "x": 6.5, "y": 3},
-                {"matrix": [3, 7], "x": 7.5, "y": 3},
-                {"matrix": [3, 8], "x": 8.5, "y": 3},
-
-                {"matrix": [8, 0], "x": 10.5, "y": 3},
-                {"matrix": [8, 1], "x": 11.5, "y": 3},
-                {"matrix": [8, 2], "x": 12.5, "y": 3},
-                {"matrix": [8, 3], "x": 13.5, "y": 3},
-                {"matrix": [8, 4], "x": 14.5, "y": 3},
-                {"matrix": [8, 6], "x": 15.5, "y": 3, "w": 1.75},
-                {"matrix": [8, 7], "x": 17.25, "y": 3},
-                {"matrix": [8, 8], "x": 18.25, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4},
-                {"matrix": [4, 1], "x": 1, "y": 4},
-                {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 3], "x": 3.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 4], "x": 4.75, "y": 4, "w": 1.25},
-                {"matrix": [4, 5], "x": 6, "y": 4, "w": 1.25},
-                {"matrix": [4, 7], "x": 7.25, "y": 4, "w": 2.25},
-
-                {"matrix": [9, 0], "x": 10.5, "y": 4, "w": 1.25},
-                {"matrix": [9, 1], "x": 11.75, "y": 4, "w": 1.5},
-                {"matrix": [9, 2], "x": 13.25, "y": 4},
-                {"matrix": [9, 3], "x": 14.25, "y": 4},
-                {"matrix": [9, 4], "x": 15.25, "y": 4},
-                {"matrix": [9, 6], "x": 16.25, "y": 4},
-                {"matrix": [9, 7], "x": 17.25, "y": 4},
-                {"matrix": [9, 8], "x": 18.25, "y": 4}
-            ]
-        },
-        "LAYOUT_all": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2.25, "y": 0},
-                {"matrix": [0, 3], "x": 3.25, "y": 0},
-                {"matrix": [0, 4], "x": 4.25, "y": 0},
-                {"matrix": [0, 5], "x": 5.25, "y": 0},
-                {"matrix": [0, 6], "x": 6.25, "y": 0},
-                {"matrix": [0, 7], "x": 7.25, "y": 0},
-                {"matrix": [0, 8], "x": 8.25, "y": 0},
-
-                {"matrix": [5, 0], "x": 10.25, "y": 0},
-                {"matrix": [5, 1], "x": 11.25, "y": 0},
-                {"matrix": [5, 2], "x": 12.25, "y": 0},
-                {"matrix": [5, 3], "x": 13.25, "y": 0},
-                {"matrix": [5, 4], "x": 14.25, "y": 0},
-                {"matrix": [5, 5], "x": 15.25, "y": 0},
-                {"matrix": [5, 6], "x": 16.25, "y": 0},
-                {"matrix": [5, 7], "x": 17.25, "y": 0},
-                {"matrix": [5, 8], "x": 18.25, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1},
-                {"matrix": [1, 1], "x": 1, "y": 1},
-                {"matrix": [1, 2], "x": 2.25, "y": 1, "w": 1.5},
-                {"matrix": [1, 3], "x": 3.75, "y": 1},
-                {"matrix": [1, 4], "x": 4.75, "y": 1},
-                {"matrix": [1, 5], "x": 5.75, "y": 1},
-                {"matrix": [1, 6], "x": 6.75, "y": 1},
-                {"matrix": [1, 7], "x": 7.75, "y": 1},
-
-                {"matrix": [6, 0], "x": 9.75, "y": 1},
-                {"matrix": [6, 1], "x": 10.75, "y": 1},
-                {"matrix": [6, 2], "x": 11.75, "y": 1},
-                {"matrix": [6, 3], "x": 12.75, "y": 1},
-                {"matrix": [6, 4], "x": 13.75, "y": 1},
-                {"matrix": [6, 5], "x": 14.75, "y": 1},
-                {"matrix": [6, 6], "x": 15.75, "y": 1},
-                {"matrix": [6, 7], "x": 16.75, "y": 1, "w": 1.5},
-                {"matrix": [6, 8], "x": 18.25, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2},
-                {"matrix": [2, 1], "x": 1, "y": 2},
-                {"matrix": [2, 2], "x": 2.25, "y": 2, "w": 1.75},
-                {"matrix": [2, 3], "x": 4, "y": 2},
-                {"matrix": [2, 4], "x": 5, "y": 2},
-                {"matrix": [2, 5], "x": 6, "y": 2},
-                {"matrix": [2, 6], "x": 7, "y": 2},
-                {"matrix": [2, 7], "x": 8, "y": 2},
-
-                {"matrix": [7, 0], "x": 10, "y": 2},
-                {"matrix": [7, 1], "x": 11, "y": 2},
-                {"matrix": [7, 2], "x": 12, "y": 2},
-                {"matrix": [7, 3], "x": 13, "y": 2},
-                {"matrix": [7, 4], "x": 14, "y": 2},
-                {"matrix": [7, 5], "x": 15, "y": 2},
-                {"matrix": [7, 6], "x": 16, "y": 2},
-                {"matrix": [7, 7], "x": 17, "y": 2, "w": 1.25},
-                {"matrix": [7, 8], "x": 18.25, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3},
-                {"matrix": [3, 1], "x": 1, "y": 3},
-                {"matrix": [3, 2], "x": 2.25, "y": 3, "w": 1.25},
-                {"matrix": [3, 3], "x": 3.5, "y": 3},
-                {"matrix": [3, 4], "x": 4.5, "y": 3},
-                {"matrix": [3, 5], "x": 5.5, "y": 3},
-                {"matrix": [3, 6], "x": 6.5, "y": 3},
-                {"matrix": [3, 7], "x": 7.5, "y": 3},
-                {"matrix": [3, 8], "x": 8.5, "y": 3},
-
-                {"matrix": [8, 0], "x": 10.5, "y": 3},
-                {"matrix": [8, 1], "x": 11.5, "y": 3},
-                {"matrix": [8, 2], "x": 12.5, "y": 3},
-                {"matrix": [8, 3], "x": 13.5, "y": 3},
-                {"matrix": [8, 4], "x": 14.5, "y": 3},
-                {"matrix": [8, 6], "x": 15.5, "y": 3, "w": 1.75},
-                {"matrix": [8, 7], "x": 17.25, "y": 3},
-                {"matrix": [8, 8], "x": 18.25, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4},
-                {"matrix": [4, 1], "x": 1, "y": 4},
-                {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 3], "x": 3.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 4], "x": 4.75, "y": 4, "w": 1.25},
-                {"matrix": [4, 5], "x": 6, "y": 4, "w": 1.25},
-                {"matrix": [4, 6], "x": 7.25, "y": 4},
-                {"matrix": [4, 7], "x": 8.25, "y": 4, "w": 1.25},
-
-                {"matrix": [9, 0], "x": 10.5, "y": 4, "w": 1.25},
-                {"matrix": [9, 1], "x": 11.75, "y": 4, "w": 1.5},
-                {"matrix": [9, 2], "x": 13.25, "y": 4},
-                {"matrix": [9, 3], "x": 14.25, "y": 4},
-                {"matrix": [9, 4], "x": 15.25, "y": 4},
-                {"matrix": [9, 6], "x": 16.25, "y": 4},
-                {"matrix": [9, 7], "x": 17.25, "y": 4},
-                {"matrix": [9, 8], "x": 18.25, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/keebio/quefrency/rev3/keyboard.json b/keyboards/keebio/quefrency/rev3/keyboard.json
new file mode 100644
index 00000000000..bd8d86f8849
--- /dev/null
+++ b/keyboards/keebio/quefrency/rev3/keyboard.json
@@ -0,0 +1,880 @@
+{
+    "keyboard_name": "Quefrency Rev. 3",
+    "manufacturer": "Keebio",
+    "url": "https://keeb.io",
+    "maintainer": "nooges",
+    "usb": {
+        "vid": "0xCB10",
+        "pid": "0x3357",
+        "device_version": "3.1.0"
+    },
+    "matrix_pins": {
+        "cols": ["F4", "F1", "F0", "B7", "B3", "D2", "D3", "D5", "D4"],
+        "rows": ["B1", "B2", "C7", "B4", "D7"]
+    },
+    "diode_direction": "COL2ROW",
+    "encoder": {
+        "rotary": [
+            {"pin_a": "F5", "pin_b": "F6"}
+        ]
+    },
+    "backlight": {
+        "pin": "B5"
+    },
+    "rgblight": {
+        "led_count": 16,
+        "led_map": [1, 2, 3, 12, 13, 14, 15, 0, 7, 6, 5, 4, 11, 10, 9, 8],
+        "split_count": [8, 8],
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": true,
+            "twinkle": true
+        }
+    },
+    "ws2812": {
+        "pin": "E6"
+    },
+    "split": {
+        "soft_serial_pin": "D0",
+        "encoder": {
+            "right": {
+                "rotary": [
+                    {"pin_a": "D6", "pin_b": "D4"}
+                ]
+            }
+        },
+        "matrix_pins": {
+            "right": {
+                "cols": ["F1", "F0", "F4", "F5", "F6", "D5", "C7", "D3", "B7"],
+                "rows": ["B3", "B2", "B6", "B4", "D7"]
+            }
+        }
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": false,
+        "mousekey": false,
+        "extrakey": true,
+        "backlight": true,
+        "rgblight": true,
+        "encoder": true
+    },
+    "build": {
+        "lto": true
+    },
+    "layout_aliases": {
+        "LAYOUT": "LAYOUT_60"
+    },
+    "layouts": {
+        "LAYOUT_60": {
+            "layout": [
+                {"matrix": [0, 2], "x": 0, "y": 0},
+                {"matrix": [0, 3], "x": 1, "y": 0},
+                {"matrix": [0, 4], "x": 2, "y": 0},
+                {"matrix": [0, 5], "x": 3, "y": 0},
+                {"matrix": [0, 6], "x": 4, "y": 0},
+                {"matrix": [0, 7], "x": 5, "y": 0},
+                {"matrix": [0, 8], "x": 6, "y": 0},
+
+                {"matrix": [5, 0], "x": 8, "y": 0},
+                {"matrix": [5, 1], "x": 9, "y": 0},
+                {"matrix": [5, 2], "x": 10, "y": 0},
+                {"matrix": [5, 3], "x": 11, "y": 0},
+                {"matrix": [5, 4], "x": 12, "y": 0},
+                {"matrix": [5, 5], "x": 13, "y": 0},
+                {"matrix": [5, 6], "x": 14, "y": 0},
+                {"matrix": [5, 7], "x": 15, "y": 0},
+
+                {"matrix": [1, 2], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 3], "x": 1.5, "y": 1},
+                {"matrix": [1, 4], "x": 2.5, "y": 1},
+                {"matrix": [1, 5], "x": 3.5, "y": 1},
+                {"matrix": [1, 6], "x": 4.5, "y": 1},
+                {"matrix": [1, 7], "x": 5.5, "y": 1},
+
+                {"matrix": [6, 0], "x": 7.5, "y": 1},
+                {"matrix": [6, 1], "x": 8.5, "y": 1},
+                {"matrix": [6, 2], "x": 9.5, "y": 1},
+                {"matrix": [6, 3], "x": 10.5, "y": 1},
+                {"matrix": [6, 4], "x": 11.5, "y": 1},
+                {"matrix": [6, 5], "x": 12.5, "y": 1},
+                {"matrix": [6, 6], "x": 13.5, "y": 1},
+                {"matrix": [6, 7], "x": 14.5, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 2], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 3], "x": 1.75, "y": 2},
+                {"matrix": [2, 4], "x": 2.75, "y": 2},
+                {"matrix": [2, 5], "x": 3.75, "y": 2},
+                {"matrix": [2, 6], "x": 4.75, "y": 2},
+                {"matrix": [2, 7], "x": 5.75, "y": 2},
+
+                {"matrix": [7, 0], "x": 7.75, "y": 2},
+                {"matrix": [7, 1], "x": 8.75, "y": 2},
+                {"matrix": [7, 2], "x": 9.75, "y": 2},
+                {"matrix": [7, 3], "x": 10.75, "y": 2},
+                {"matrix": [7, 4], "x": 11.75, "y": 2},
+                {"matrix": [7, 5], "x": 12.75, "y": 2},
+                {"matrix": [7, 7], "x": 13.75, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 2], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 4], "x": 2.25, "y": 3},
+                {"matrix": [3, 5], "x": 3.25, "y": 3},
+                {"matrix": [3, 6], "x": 4.25, "y": 3},
+                {"matrix": [3, 7], "x": 5.25, "y": 3},
+                {"matrix": [3, 8], "x": 6.25, "y": 3},
+
+                {"matrix": [8, 0], "x": 8.25, "y": 3},
+                {"matrix": [8, 1], "x": 9.25, "y": 3},
+                {"matrix": [8, 2], "x": 10.25, "y": 3},
+                {"matrix": [8, 3], "x": 11.25, "y": 3},
+                {"matrix": [8, 4], "x": 12.25, "y": 3},
+                {"matrix": [8, 6], "x": 13.25, "y": 3, "w": 1.75},
+                {"matrix": [8, 7], "x": 15, "y": 3},
+
+                {"matrix": [4, 2], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 7], "x": 5, "y": 4, "w": 2.25},
+
+                {"matrix": [9, 0], "x": 8.25, "y": 4, "w": 1.25},
+                {"matrix": [9, 1], "x": 9.5, "y": 4, "w": 1.5},
+                {"matrix": [9, 2], "x": 11, "y": 4},
+                {"matrix": [9, 3], "x": 12, "y": 4},
+                {"matrix": [9, 4], "x": 13, "y": 4},
+                {"matrix": [9, 6], "x": 14, "y": 4},
+                {"matrix": [9, 7], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_65": {
+            "layout": [
+                {"matrix": [0, 2], "x": 0, "y": 0},
+                {"matrix": [0, 3], "x": 1, "y": 0},
+                {"matrix": [0, 4], "x": 2, "y": 0},
+                {"matrix": [0, 5], "x": 3, "y": 0},
+                {"matrix": [0, 6], "x": 4, "y": 0},
+                {"matrix": [0, 7], "x": 5, "y": 0},
+                {"matrix": [0, 8], "x": 6, "y": 0},
+
+                {"matrix": [5, 0], "x": 8, "y": 0},
+                {"matrix": [5, 1], "x": 9, "y": 0},
+                {"matrix": [5, 2], "x": 10, "y": 0},
+                {"matrix": [5, 3], "x": 11, "y": 0},
+                {"matrix": [5, 4], "x": 12, "y": 0},
+                {"matrix": [5, 5], "x": 13, "y": 0},
+                {"matrix": [5, 6], "x": 14, "y": 0},
+                {"matrix": [5, 7], "x": 15, "y": 0},
+                {"matrix": [5, 8], "x": 16, "y": 0},
+
+                {"matrix": [1, 2], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 3], "x": 1.5, "y": 1},
+                {"matrix": [1, 4], "x": 2.5, "y": 1},
+                {"matrix": [1, 5], "x": 3.5, "y": 1},
+                {"matrix": [1, 6], "x": 4.5, "y": 1},
+                {"matrix": [1, 7], "x": 5.5, "y": 1},
+
+                {"matrix": [6, 0], "x": 7.5, "y": 1},
+                {"matrix": [6, 1], "x": 8.5, "y": 1},
+                {"matrix": [6, 2], "x": 9.5, "y": 1},
+                {"matrix": [6, 3], "x": 10.5, "y": 1},
+                {"matrix": [6, 4], "x": 11.5, "y": 1},
+                {"matrix": [6, 5], "x": 12.5, "y": 1},
+                {"matrix": [6, 6], "x": 13.5, "y": 1},
+                {"matrix": [6, 7], "x": 14.5, "y": 1, "w": 1.5},
+                {"matrix": [6, 8], "x": 16, "y": 1},
+
+                {"matrix": [2, 2], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 3], "x": 1.75, "y": 2},
+                {"matrix": [2, 4], "x": 2.75, "y": 2},
+                {"matrix": [2, 5], "x": 3.75, "y": 2},
+                {"matrix": [2, 6], "x": 4.75, "y": 2},
+                {"matrix": [2, 7], "x": 5.75, "y": 2},
+
+                {"matrix": [7, 0], "x": 7.75, "y": 2},
+                {"matrix": [7, 1], "x": 8.75, "y": 2},
+                {"matrix": [7, 2], "x": 9.75, "y": 2},
+                {"matrix": [7, 3], "x": 10.75, "y": 2},
+                {"matrix": [7, 4], "x": 11.75, "y": 2},
+                {"matrix": [7, 5], "x": 12.75, "y": 2},
+                {"matrix": [7, 7], "x": 13.75, "y": 2, "w": 2.25},
+                {"matrix": [7, 8], "x": 16, "y": 2},
+
+                {"matrix": [3, 2], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 4], "x": 2.25, "y": 3},
+                {"matrix": [3, 5], "x": 3.25, "y": 3},
+                {"matrix": [3, 6], "x": 4.25, "y": 3},
+                {"matrix": [3, 7], "x": 5.25, "y": 3},
+                {"matrix": [3, 8], "x": 6.25, "y": 3},
+
+                {"matrix": [8, 0], "x": 8.25, "y": 3},
+                {"matrix": [8, 1], "x": 9.25, "y": 3},
+                {"matrix": [8, 2], "x": 10.25, "y": 3},
+                {"matrix": [8, 3], "x": 11.25, "y": 3},
+                {"matrix": [8, 4], "x": 12.25, "y": 3},
+                {"matrix": [8, 6], "x": 13.25, "y": 3, "w": 1.75},
+                {"matrix": [8, 7], "x": 15, "y": 3},
+                {"matrix": [8, 8], "x": 16, "y": 3},
+
+                {"matrix": [4, 2], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 7], "x": 5, "y": 4, "w": 2.25},
+
+                {"matrix": [9, 0], "x": 8.25, "y": 4, "w": 1.25},
+                {"matrix": [9, 1], "x": 9.5, "y": 4, "w": 1.5},
+                {"matrix": [9, 2], "x": 11, "y": 4},
+                {"matrix": [9, 3], "x": 12, "y": 4},
+                {"matrix": [9, 4], "x": 13, "y": 4},
+                {"matrix": [9, 6], "x": 14, "y": 4},
+                {"matrix": [9, 7], "x": 15, "y": 4},
+                {"matrix": [9, 8], "x": 16, "y": 4}
+            ]
+        },
+        "LAYOUT_60_with_macro": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+                {"matrix": [0, 5], "x": 5.25, "y": 0},
+                {"matrix": [0, 6], "x": 6.25, "y": 0},
+                {"matrix": [0, 7], "x": 7.25, "y": 0},
+                {"matrix": [0, 8], "x": 8.25, "y": 0},
+
+                {"matrix": [5, 0], "x": 10.25, "y": 0},
+                {"matrix": [5, 1], "x": 11.25, "y": 0},
+                {"matrix": [5, 2], "x": 12.25, "y": 0},
+                {"matrix": [5, 3], "x": 13.25, "y": 0},
+                {"matrix": [5, 4], "x": 14.25, "y": 0},
+                {"matrix": [5, 5], "x": 15.25, "y": 0},
+                {"matrix": [5, 6], "x": 16.25, "y": 0},
+                {"matrix": [5, 7], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2.25, "y": 1, "w": 1.5},
+                {"matrix": [1, 3], "x": 3.75, "y": 1},
+                {"matrix": [1, 4], "x": 4.75, "y": 1},
+                {"matrix": [1, 5], "x": 5.75, "y": 1},
+                {"matrix": [1, 6], "x": 6.75, "y": 1},
+                {"matrix": [1, 7], "x": 7.75, "y": 1},
+
+                {"matrix": [6, 0], "x": 9.75, "y": 1},
+                {"matrix": [6, 1], "x": 10.75, "y": 1},
+                {"matrix": [6, 2], "x": 11.75, "y": 1},
+                {"matrix": [6, 3], "x": 12.75, "y": 1},
+                {"matrix": [6, 4], "x": 13.75, "y": 1},
+                {"matrix": [6, 5], "x": 14.75, "y": 1},
+                {"matrix": [6, 6], "x": 15.75, "y": 1},
+                {"matrix": [6, 7], "x": 16.75, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2.25, "y": 2, "w": 1.75},
+                {"matrix": [2, 3], "x": 4, "y": 2},
+                {"matrix": [2, 4], "x": 5, "y": 2},
+                {"matrix": [2, 5], "x": 6, "y": 2},
+                {"matrix": [2, 6], "x": 7, "y": 2},
+                {"matrix": [2, 7], "x": 8, "y": 2},
+
+                {"matrix": [7, 0], "x": 10, "y": 2},
+                {"matrix": [7, 1], "x": 11, "y": 2},
+                {"matrix": [7, 2], "x": 12, "y": 2},
+                {"matrix": [7, 3], "x": 13, "y": 2},
+                {"matrix": [7, 4], "x": 14, "y": 2},
+                {"matrix": [7, 5], "x": 15, "y": 2},
+                {"matrix": [7, 7], "x": 16, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3, "w": 2.25},
+                {"matrix": [3, 4], "x": 4.5, "y": 3},
+                {"matrix": [3, 5], "x": 5.5, "y": 3},
+                {"matrix": [3, 6], "x": 6.5, "y": 3},
+                {"matrix": [3, 7], "x": 7.5, "y": 3},
+                {"matrix": [3, 8], "x": 8.5, "y": 3},
+
+                {"matrix": [8, 0], "x": 10.5, "y": 3},
+                {"matrix": [8, 1], "x": 11.5, "y": 3},
+                {"matrix": [8, 2], "x": 12.5, "y": 3},
+                {"matrix": [8, 3], "x": 13.5, "y": 3},
+                {"matrix": [8, 4], "x": 14.5, "y": 3},
+                {"matrix": [8, 6], "x": 15.5, "y": 3, "w": 1.75},
+                {"matrix": [8, 7], "x": 17.25, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+                {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 3.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 4.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 6, "y": 4, "w": 1.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4, "w": 2.25},
+
+                {"matrix": [9, 0], "x": 10.5, "y": 4, "w": 1.25},
+                {"matrix": [9, 1], "x": 11.75, "y": 4, "w": 1.5},
+                {"matrix": [9, 2], "x": 13.25, "y": 4},
+                {"matrix": [9, 3], "x": 14.25, "y": 4},
+                {"matrix": [9, 4], "x": 15.25, "y": 4},
+                {"matrix": [9, 6], "x": 16.25, "y": 4},
+                {"matrix": [9, 7], "x": 17.25, "y": 4}
+            ]
+        },
+        "LAYOUT_65_with_macro": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+                {"matrix": [0, 5], "x": 5.25, "y": 0},
+                {"matrix": [0, 6], "x": 6.25, "y": 0},
+                {"matrix": [0, 7], "x": 7.25, "y": 0},
+                {"matrix": [0, 8], "x": 8.25, "y": 0},
+
+                {"matrix": [5, 0], "x": 10.25, "y": 0},
+                {"matrix": [5, 1], "x": 11.25, "y": 0},
+                {"matrix": [5, 2], "x": 12.25, "y": 0},
+                {"matrix": [5, 3], "x": 13.25, "y": 0},
+                {"matrix": [5, 4], "x": 14.25, "y": 0},
+                {"matrix": [5, 5], "x": 15.25, "y": 0},
+                {"matrix": [5, 6], "x": 16.25, "y": 0},
+                {"matrix": [5, 7], "x": 17.25, "y": 0},
+                {"matrix": [5, 8], "x": 18.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2.25, "y": 1, "w": 1.5},
+                {"matrix": [1, 3], "x": 3.75, "y": 1},
+                {"matrix": [1, 4], "x": 4.75, "y": 1},
+                {"matrix": [1, 5], "x": 5.75, "y": 1},
+                {"matrix": [1, 6], "x": 6.75, "y": 1},
+                {"matrix": [1, 7], "x": 7.75, "y": 1},
+
+                {"matrix": [6, 0], "x": 9.75, "y": 1},
+                {"matrix": [6, 1], "x": 10.75, "y": 1},
+                {"matrix": [6, 2], "x": 11.75, "y": 1},
+                {"matrix": [6, 3], "x": 12.75, "y": 1},
+                {"matrix": [6, 4], "x": 13.75, "y": 1},
+                {"matrix": [6, 5], "x": 14.75, "y": 1},
+                {"matrix": [6, 6], "x": 15.75, "y": 1},
+                {"matrix": [6, 7], "x": 16.75, "y": 1, "w": 1.5},
+                {"matrix": [6, 8], "x": 18.25, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2.25, "y": 2, "w": 1.75},
+                {"matrix": [2, 3], "x": 4, "y": 2},
+                {"matrix": [2, 4], "x": 5, "y": 2},
+                {"matrix": [2, 5], "x": 6, "y": 2},
+                {"matrix": [2, 6], "x": 7, "y": 2},
+                {"matrix": [2, 7], "x": 8, "y": 2},
+
+                {"matrix": [7, 0], "x": 10, "y": 2},
+                {"matrix": [7, 1], "x": 11, "y": 2},
+                {"matrix": [7, 2], "x": 12, "y": 2},
+                {"matrix": [7, 3], "x": 13, "y": 2},
+                {"matrix": [7, 4], "x": 14, "y": 2},
+                {"matrix": [7, 5], "x": 15, "y": 2},
+                {"matrix": [7, 7], "x": 16, "y": 2, "w": 2.25},
+                {"matrix": [7, 8], "x": 18.25, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3, "w": 2.25},
+                {"matrix": [3, 4], "x": 4.5, "y": 3},
+                {"matrix": [3, 5], "x": 5.5, "y": 3},
+                {"matrix": [3, 6], "x": 6.5, "y": 3},
+                {"matrix": [3, 7], "x": 7.5, "y": 3},
+                {"matrix": [3, 8], "x": 8.5, "y": 3},
+
+                {"matrix": [8, 0], "x": 10.5, "y": 3},
+                {"matrix": [8, 1], "x": 11.5, "y": 3},
+                {"matrix": [8, 2], "x": 12.5, "y": 3},
+                {"matrix": [8, 3], "x": 13.5, "y": 3},
+                {"matrix": [8, 4], "x": 14.5, "y": 3},
+                {"matrix": [8, 6], "x": 15.5, "y": 3, "w": 1.75},
+                {"matrix": [8, 7], "x": 17.25, "y": 3},
+                {"matrix": [8, 8], "x": 18.25, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+                {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 3.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 4.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 6, "y": 4, "w": 1.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4, "w": 2.25},
+
+                {"matrix": [9, 0], "x": 10.5, "y": 4, "w": 1.25},
+                {"matrix": [9, 1], "x": 11.75, "y": 4, "w": 1.5},
+                {"matrix": [9, 2], "x": 13.25, "y": 4},
+                {"matrix": [9, 3], "x": 14.25, "y": 4},
+                {"matrix": [9, 4], "x": 15.25, "y": 4},
+                {"matrix": [9, 6], "x": 16.25, "y": 4},
+                {"matrix": [9, 7], "x": 17.25, "y": 4},
+                {"matrix": [9, 8], "x": 18.25, "y": 4}
+            ]
+        },
+        "LAYOUT_60_iso": {
+            "layout": [
+                {"matrix": [0, 2], "x": 0, "y": 0},
+                {"matrix": [0, 3], "x": 1, "y": 0},
+                {"matrix": [0, 4], "x": 2, "y": 0},
+                {"matrix": [0, 5], "x": 3, "y": 0},
+                {"matrix": [0, 6], "x": 4, "y": 0},
+                {"matrix": [0, 7], "x": 5, "y": 0},
+                {"matrix": [0, 8], "x": 6, "y": 0},
+
+                {"matrix": [5, 0], "x": 8, "y": 0},
+                {"matrix": [5, 1], "x": 9, "y": 0},
+                {"matrix": [5, 2], "x": 10, "y": 0},
+                {"matrix": [5, 3], "x": 11, "y": 0},
+                {"matrix": [5, 4], "x": 12, "y": 0},
+                {"matrix": [5, 5], "x": 13, "y": 0},
+                {"matrix": [5, 6], "x": 14, "y": 0},
+                {"matrix": [5, 7], "x": 15, "y": 0},
+
+                {"matrix": [1, 2], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 3], "x": 1.5, "y": 1},
+                {"matrix": [1, 4], "x": 2.5, "y": 1},
+                {"matrix": [1, 5], "x": 3.5, "y": 1},
+                {"matrix": [1, 6], "x": 4.5, "y": 1},
+                {"matrix": [1, 7], "x": 5.5, "y": 1},
+
+                {"matrix": [6, 0], "x": 7.5, "y": 1},
+                {"matrix": [6, 1], "x": 8.5, "y": 1},
+                {"matrix": [6, 2], "x": 9.5, "y": 1},
+                {"matrix": [6, 3], "x": 10.5, "y": 1},
+                {"matrix": [6, 4], "x": 11.5, "y": 1},
+                {"matrix": [6, 5], "x": 12.5, "y": 1},
+                {"matrix": [6, 6], "x": 13.5, "y": 1},
+
+                {"matrix": [2, 2], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 3], "x": 1.75, "y": 2},
+                {"matrix": [2, 4], "x": 2.75, "y": 2},
+                {"matrix": [2, 5], "x": 3.75, "y": 2},
+                {"matrix": [2, 6], "x": 4.75, "y": 2},
+                {"matrix": [2, 7], "x": 5.75, "y": 2},
+
+                {"matrix": [7, 0], "x": 7.75, "y": 2},
+                {"matrix": [7, 1], "x": 8.75, "y": 2},
+                {"matrix": [7, 2], "x": 9.75, "y": 2},
+                {"matrix": [7, 3], "x": 10.75, "y": 2},
+                {"matrix": [7, 4], "x": 11.75, "y": 2},
+                {"matrix": [7, 5], "x": 12.75, "y": 2},
+                {"matrix": [7, 6], "x": 13.75, "y": 2},
+                {"matrix": [7, 7], "x": 14.75, "y": 1, "w": 1.25, "h": 2},
+
+                {"matrix": [3, 2], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 3], "x": 1.25, "y": 3},
+                {"matrix": [3, 4], "x": 2.25, "y": 3},
+                {"matrix": [3, 5], "x": 3.25, "y": 3},
+                {"matrix": [3, 6], "x": 4.25, "y": 3},
+                {"matrix": [3, 7], "x": 5.25, "y": 3},
+                {"matrix": [3, 8], "x": 6.25, "y": 3},
+
+                {"matrix": [8, 0], "x": 8.25, "y": 3},
+                {"matrix": [8, 1], "x": 9.25, "y": 3},
+                {"matrix": [8, 2], "x": 10.25, "y": 3},
+                {"matrix": [8, 3], "x": 11.25, "y": 3},
+                {"matrix": [8, 4], "x": 12.25, "y": 3},
+                {"matrix": [8, 6], "x": 13.25, "y": 3, "w": 1.75},
+                {"matrix": [8, 7], "x": 15, "y": 3},
+
+                {"matrix": [4, 2], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 7], "x": 5, "y": 4, "w": 2.25},
+
+                {"matrix": [9, 0], "x": 8.25, "y": 4, "w": 1.25},
+                {"matrix": [9, 1], "x": 9.5, "y": 4, "w": 1.5},
+                {"matrix": [9, 2], "x": 11, "y": 4},
+                {"matrix": [9, 3], "x": 12, "y": 4},
+                {"matrix": [9, 4], "x": 13, "y": 4},
+                {"matrix": [9, 6], "x": 14, "y": 4},
+                {"matrix": [9, 7], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_65_iso": {
+            "layout": [
+                {"matrix": [0, 2], "x": 0, "y": 0},
+                {"matrix": [0, 3], "x": 1, "y": 0},
+                {"matrix": [0, 4], "x": 2, "y": 0},
+                {"matrix": [0, 5], "x": 3, "y": 0},
+                {"matrix": [0, 6], "x": 4, "y": 0},
+                {"matrix": [0, 7], "x": 5, "y": 0},
+                {"matrix": [0, 8], "x": 6, "y": 0},
+
+                {"matrix": [5, 0], "x": 8, "y": 0},
+                {"matrix": [5, 1], "x": 9, "y": 0},
+                {"matrix": [5, 2], "x": 10, "y": 0},
+                {"matrix": [5, 3], "x": 11, "y": 0},
+                {"matrix": [5, 4], "x": 12, "y": 0},
+                {"matrix": [5, 5], "x": 13, "y": 0},
+                {"matrix": [5, 6], "x": 14, "y": 0},
+                {"matrix": [5, 7], "x": 15, "y": 0},
+                {"matrix": [5, 8], "x": 16, "y": 0},
+
+                {"matrix": [1, 2], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 3], "x": 1.5, "y": 1},
+                {"matrix": [1, 4], "x": 2.5, "y": 1},
+                {"matrix": [1, 5], "x": 3.5, "y": 1},
+                {"matrix": [1, 6], "x": 4.5, "y": 1},
+                {"matrix": [1, 7], "x": 5.5, "y": 1},
+
+                {"matrix": [6, 0], "x": 7.5, "y": 1},
+                {"matrix": [6, 1], "x": 8.5, "y": 1},
+                {"matrix": [6, 2], "x": 9.5, "y": 1},
+                {"matrix": [6, 3], "x": 10.5, "y": 1},
+                {"matrix": [6, 4], "x": 11.5, "y": 1},
+                {"matrix": [6, 5], "x": 12.5, "y": 1},
+                {"matrix": [6, 6], "x": 13.5, "y": 1},
+                {"matrix": [6, 8], "x": 16, "y": 1},
+
+                {"matrix": [2, 2], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 3], "x": 1.75, "y": 2},
+                {"matrix": [2, 4], "x": 2.75, "y": 2},
+                {"matrix": [2, 5], "x": 3.75, "y": 2},
+                {"matrix": [2, 6], "x": 4.75, "y": 2},
+                {"matrix": [2, 7], "x": 5.75, "y": 2},
+
+                {"matrix": [7, 0], "x": 7.75, "y": 2},
+                {"matrix": [7, 1], "x": 8.75, "y": 2},
+                {"matrix": [7, 2], "x": 9.75, "y": 2},
+                {"matrix": [7, 3], "x": 10.75, "y": 2},
+                {"matrix": [7, 4], "x": 11.75, "y": 2},
+                {"matrix": [7, 5], "x": 12.75, "y": 2},
+                {"matrix": [7, 6], "x": 13.75, "y": 2},
+                {"matrix": [7, 7], "x": 14.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [7, 8], "x": 16, "y": 2},
+
+                {"matrix": [3, 2], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 3], "x": 1.25, "y": 3},
+                {"matrix": [3, 4], "x": 2.25, "y": 3},
+                {"matrix": [3, 5], "x": 3.25, "y": 3},
+                {"matrix": [3, 6], "x": 4.25, "y": 3},
+                {"matrix": [3, 7], "x": 5.25, "y": 3},
+                {"matrix": [3, 8], "x": 6.25, "y": 3},
+
+                {"matrix": [8, 0], "x": 8.25, "y": 3},
+                {"matrix": [8, 1], "x": 9.25, "y": 3},
+                {"matrix": [8, 2], "x": 10.25, "y": 3},
+                {"matrix": [8, 3], "x": 11.25, "y": 3},
+                {"matrix": [8, 4], "x": 12.25, "y": 3},
+                {"matrix": [8, 6], "x": 13.25, "y": 3, "w": 1.75},
+                {"matrix": [8, 7], "x": 15, "y": 3},
+                {"matrix": [8, 8], "x": 16, "y": 3},
+
+                {"matrix": [4, 2], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 7], "x": 5, "y": 4, "w": 2.25},
+
+                {"matrix": [9, 0], "x": 8.25, "y": 4, "w": 1.25},
+                {"matrix": [9, 1], "x": 9.5, "y": 4, "w": 1.5},
+                {"matrix": [9, 2], "x": 11, "y": 4},
+                {"matrix": [9, 3], "x": 12, "y": 4},
+                {"matrix": [9, 4], "x": 13, "y": 4},
+                {"matrix": [9, 6], "x": 14, "y": 4},
+                {"matrix": [9, 7], "x": 15, "y": 4},
+                {"matrix": [9, 8], "x": 16, "y": 4}
+            ]
+        },
+        "LAYOUT_60_iso_with_macro": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+                {"matrix": [0, 5], "x": 5.25, "y": 0},
+                {"matrix": [0, 6], "x": 6.25, "y": 0},
+                {"matrix": [0, 7], "x": 7.25, "y": 0},
+                {"matrix": [0, 8], "x": 8.25, "y": 0},
+
+                {"matrix": [5, 0], "x": 10.25, "y": 0},
+                {"matrix": [5, 1], "x": 11.25, "y": 0},
+                {"matrix": [5, 2], "x": 12.25, "y": 0},
+                {"matrix": [5, 3], "x": 13.25, "y": 0},
+                {"matrix": [5, 4], "x": 14.25, "y": 0},
+                {"matrix": [5, 5], "x": 15.25, "y": 0},
+                {"matrix": [5, 6], "x": 16.25, "y": 0},
+                {"matrix": [5, 7], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2.25, "y": 1, "w": 1.5},
+                {"matrix": [1, 3], "x": 3.75, "y": 1},
+                {"matrix": [1, 4], "x": 4.75, "y": 1},
+                {"matrix": [1, 5], "x": 5.75, "y": 1},
+                {"matrix": [1, 6], "x": 6.75, "y": 1},
+                {"matrix": [1, 7], "x": 7.75, "y": 1},
+
+                {"matrix": [6, 0], "x": 9.75, "y": 1},
+                {"matrix": [6, 1], "x": 10.75, "y": 1},
+                {"matrix": [6, 2], "x": 11.75, "y": 1},
+                {"matrix": [6, 3], "x": 12.75, "y": 1},
+                {"matrix": [6, 4], "x": 13.75, "y": 1},
+                {"matrix": [6, 5], "x": 14.75, "y": 1},
+                {"matrix": [6, 6], "x": 15.75, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2.25, "y": 2, "w": 1.75},
+                {"matrix": [2, 3], "x": 4, "y": 2},
+                {"matrix": [2, 4], "x": 5, "y": 2},
+                {"matrix": [2, 5], "x": 6, "y": 2},
+                {"matrix": [2, 6], "x": 7, "y": 2},
+                {"matrix": [2, 7], "x": 8, "y": 2},
+
+                {"matrix": [7, 0], "x": 10, "y": 2},
+                {"matrix": [7, 1], "x": 11, "y": 2},
+                {"matrix": [7, 2], "x": 12, "y": 2},
+                {"matrix": [7, 3], "x": 13, "y": 2},
+                {"matrix": [7, 4], "x": 14, "y": 2},
+                {"matrix": [7, 5], "x": 15, "y": 2},
+                {"matrix": [7, 6], "x": 16, "y": 2},
+                {"matrix": [7, 7], "x": 17, "y": 1, "w": 1.25, "h": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3, "w": 1.25},
+                {"matrix": [3, 3], "x": 3.5, "y": 3},
+                {"matrix": [3, 4], "x": 4.5, "y": 3},
+                {"matrix": [3, 5], "x": 5.5, "y": 3},
+                {"matrix": [3, 6], "x": 6.5, "y": 3},
+                {"matrix": [3, 7], "x": 7.5, "y": 3},
+                {"matrix": [3, 8], "x": 8.5, "y": 3},
+
+                {"matrix": [8, 0], "x": 10.5, "y": 3},
+                {"matrix": [8, 1], "x": 11.5, "y": 3},
+                {"matrix": [8, 2], "x": 12.5, "y": 3},
+                {"matrix": [8, 3], "x": 13.5, "y": 3},
+                {"matrix": [8, 4], "x": 14.5, "y": 3},
+                {"matrix": [8, 6], "x": 15.5, "y": 3, "w": 1.75},
+                {"matrix": [8, 7], "x": 17.25, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+                {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 3.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 4.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 6, "y": 4, "w": 1.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4, "w": 2.25},
+
+                {"matrix": [9, 0], "x": 10.5, "y": 4, "w": 1.25},
+                {"matrix": [9, 1], "x": 11.75, "y": 4, "w": 1.5},
+                {"matrix": [9, 2], "x": 13.25, "y": 4},
+                {"matrix": [9, 3], "x": 14.25, "y": 4},
+                {"matrix": [9, 4], "x": 15.25, "y": 4},
+                {"matrix": [9, 6], "x": 16.25, "y": 4},
+                {"matrix": [9, 7], "x": 17.25, "y": 4}
+            ]
+        },
+        "LAYOUT_65_iso_with_macro": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+                {"matrix": [0, 5], "x": 5.25, "y": 0},
+                {"matrix": [0, 6], "x": 6.25, "y": 0},
+                {"matrix": [0, 7], "x": 7.25, "y": 0},
+                {"matrix": [0, 8], "x": 8.25, "y": 0},
+
+                {"matrix": [5, 0], "x": 10.25, "y": 0},
+                {"matrix": [5, 1], "x": 11.25, "y": 0},
+                {"matrix": [5, 2], "x": 12.25, "y": 0},
+                {"matrix": [5, 3], "x": 13.25, "y": 0},
+                {"matrix": [5, 4], "x": 14.25, "y": 0},
+                {"matrix": [5, 5], "x": 15.25, "y": 0},
+                {"matrix": [5, 6], "x": 16.25, "y": 0},
+                {"matrix": [5, 7], "x": 17.25, "y": 0},
+                {"matrix": [5, 8], "x": 18.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2.25, "y": 1, "w": 1.5},
+                {"matrix": [1, 3], "x": 3.75, "y": 1},
+                {"matrix": [1, 4], "x": 4.75, "y": 1},
+                {"matrix": [1, 5], "x": 5.75, "y": 1},
+                {"matrix": [1, 6], "x": 6.75, "y": 1},
+                {"matrix": [1, 7], "x": 7.75, "y": 1},
+
+                {"matrix": [6, 0], "x": 9.75, "y": 1},
+                {"matrix": [6, 1], "x": 10.75, "y": 1},
+                {"matrix": [6, 2], "x": 11.75, "y": 1},
+                {"matrix": [6, 3], "x": 12.75, "y": 1},
+                {"matrix": [6, 4], "x": 13.75, "y": 1},
+                {"matrix": [6, 5], "x": 14.75, "y": 1},
+                {"matrix": [6, 6], "x": 15.75, "y": 1},
+                {"matrix": [6, 8], "x": 18.25, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2.25, "y": 2, "w": 1.75},
+                {"matrix": [2, 3], "x": 4, "y": 2},
+                {"matrix": [2, 4], "x": 5, "y": 2},
+                {"matrix": [2, 5], "x": 6, "y": 2},
+                {"matrix": [2, 6], "x": 7, "y": 2},
+                {"matrix": [2, 7], "x": 8, "y": 2},
+
+                {"matrix": [7, 0], "x": 10, "y": 2},
+                {"matrix": [7, 1], "x": 11, "y": 2},
+                {"matrix": [7, 2], "x": 12, "y": 2},
+                {"matrix": [7, 3], "x": 13, "y": 2},
+                {"matrix": [7, 4], "x": 14, "y": 2},
+                {"matrix": [7, 5], "x": 15, "y": 2},
+                {"matrix": [7, 6], "x": 16, "y": 2},
+                {"matrix": [7, 7], "x": 17, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [7, 8], "x": 18.25, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3, "w": 1.25},
+                {"matrix": [3, 3], "x": 3.5, "y": 3},
+                {"matrix": [3, 4], "x": 4.5, "y": 3},
+                {"matrix": [3, 5], "x": 5.5, "y": 3},
+                {"matrix": [3, 6], "x": 6.5, "y": 3},
+                {"matrix": [3, 7], "x": 7.5, "y": 3},
+                {"matrix": [3, 8], "x": 8.5, "y": 3},
+
+                {"matrix": [8, 0], "x": 10.5, "y": 3},
+                {"matrix": [8, 1], "x": 11.5, "y": 3},
+                {"matrix": [8, 2], "x": 12.5, "y": 3},
+                {"matrix": [8, 3], "x": 13.5, "y": 3},
+                {"matrix": [8, 4], "x": 14.5, "y": 3},
+                {"matrix": [8, 6], "x": 15.5, "y": 3, "w": 1.75},
+                {"matrix": [8, 7], "x": 17.25, "y": 3},
+                {"matrix": [8, 8], "x": 18.25, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+                {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 3.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 4.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 6, "y": 4, "w": 1.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4, "w": 2.25},
+
+                {"matrix": [9, 0], "x": 10.5, "y": 4, "w": 1.25},
+                {"matrix": [9, 1], "x": 11.75, "y": 4, "w": 1.5},
+                {"matrix": [9, 2], "x": 13.25, "y": 4},
+                {"matrix": [9, 3], "x": 14.25, "y": 4},
+                {"matrix": [9, 4], "x": 15.25, "y": 4},
+                {"matrix": [9, 6], "x": 16.25, "y": 4},
+                {"matrix": [9, 7], "x": 17.25, "y": 4},
+                {"matrix": [9, 8], "x": 18.25, "y": 4}
+            ]
+        },
+        "LAYOUT_all": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+                {"matrix": [0, 5], "x": 5.25, "y": 0},
+                {"matrix": [0, 6], "x": 6.25, "y": 0},
+                {"matrix": [0, 7], "x": 7.25, "y": 0},
+                {"matrix": [0, 8], "x": 8.25, "y": 0},
+
+                {"matrix": [5, 0], "x": 10.25, "y": 0},
+                {"matrix": [5, 1], "x": 11.25, "y": 0},
+                {"matrix": [5, 2], "x": 12.25, "y": 0},
+                {"matrix": [5, 3], "x": 13.25, "y": 0},
+                {"matrix": [5, 4], "x": 14.25, "y": 0},
+                {"matrix": [5, 5], "x": 15.25, "y": 0},
+                {"matrix": [5, 6], "x": 16.25, "y": 0},
+                {"matrix": [5, 7], "x": 17.25, "y": 0},
+                {"matrix": [5, 8], "x": 18.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2.25, "y": 1, "w": 1.5},
+                {"matrix": [1, 3], "x": 3.75, "y": 1},
+                {"matrix": [1, 4], "x": 4.75, "y": 1},
+                {"matrix": [1, 5], "x": 5.75, "y": 1},
+                {"matrix": [1, 6], "x": 6.75, "y": 1},
+                {"matrix": [1, 7], "x": 7.75, "y": 1},
+
+                {"matrix": [6, 0], "x": 9.75, "y": 1},
+                {"matrix": [6, 1], "x": 10.75, "y": 1},
+                {"matrix": [6, 2], "x": 11.75, "y": 1},
+                {"matrix": [6, 3], "x": 12.75, "y": 1},
+                {"matrix": [6, 4], "x": 13.75, "y": 1},
+                {"matrix": [6, 5], "x": 14.75, "y": 1},
+                {"matrix": [6, 6], "x": 15.75, "y": 1},
+                {"matrix": [6, 7], "x": 16.75, "y": 1, "w": 1.5},
+                {"matrix": [6, 8], "x": 18.25, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2.25, "y": 2, "w": 1.75},
+                {"matrix": [2, 3], "x": 4, "y": 2},
+                {"matrix": [2, 4], "x": 5, "y": 2},
+                {"matrix": [2, 5], "x": 6, "y": 2},
+                {"matrix": [2, 6], "x": 7, "y": 2},
+                {"matrix": [2, 7], "x": 8, "y": 2},
+
+                {"matrix": [7, 0], "x": 10, "y": 2},
+                {"matrix": [7, 1], "x": 11, "y": 2},
+                {"matrix": [7, 2], "x": 12, "y": 2},
+                {"matrix": [7, 3], "x": 13, "y": 2},
+                {"matrix": [7, 4], "x": 14, "y": 2},
+                {"matrix": [7, 5], "x": 15, "y": 2},
+                {"matrix": [7, 6], "x": 16, "y": 2},
+                {"matrix": [7, 7], "x": 17, "y": 2, "w": 1.25},
+                {"matrix": [7, 8], "x": 18.25, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3, "w": 1.25},
+                {"matrix": [3, 3], "x": 3.5, "y": 3},
+                {"matrix": [3, 4], "x": 4.5, "y": 3},
+                {"matrix": [3, 5], "x": 5.5, "y": 3},
+                {"matrix": [3, 6], "x": 6.5, "y": 3},
+                {"matrix": [3, 7], "x": 7.5, "y": 3},
+                {"matrix": [3, 8], "x": 8.5, "y": 3},
+
+                {"matrix": [8, 0], "x": 10.5, "y": 3},
+                {"matrix": [8, 1], "x": 11.5, "y": 3},
+                {"matrix": [8, 2], "x": 12.5, "y": 3},
+                {"matrix": [8, 3], "x": 13.5, "y": 3},
+                {"matrix": [8, 4], "x": 14.5, "y": 3},
+                {"matrix": [8, 6], "x": 15.5, "y": 3, "w": 1.75},
+                {"matrix": [8, 7], "x": 17.25, "y": 3},
+                {"matrix": [8, 8], "x": 18.25, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+                {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 3.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 4.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 6, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 7.25, "y": 4},
+                {"matrix": [4, 7], "x": 8.25, "y": 4, "w": 1.25},
+
+                {"matrix": [9, 0], "x": 10.5, "y": 4, "w": 1.25},
+                {"matrix": [9, 1], "x": 11.75, "y": 4, "w": 1.5},
+                {"matrix": [9, 2], "x": 13.25, "y": 4},
+                {"matrix": [9, 3], "x": 14.25, "y": 4},
+                {"matrix": [9, 4], "x": 15.25, "y": 4},
+                {"matrix": [9, 6], "x": 16.25, "y": 4},
+                {"matrix": [9, 7], "x": 17.25, "y": 4},
+                {"matrix": [9, 8], "x": 18.25, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/keebio/quefrency/rev3/rules.mk b/keyboards/keebio/quefrency/rev3/rules.mk
deleted file mode 100644
index 32e78815991..00000000000
--- a/keyboards/keebio/quefrency/rev3/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-BACKLIGHT_ENABLE = yes
-RGBLIGHT_ENABLE = yes
-ENCODER_ENABLE = yes
diff --git a/keyboards/keebio/quefrency/rev4/info.json b/keyboards/keebio/quefrency/rev4/info.json
deleted file mode 100644
index 4eb4275f7af..00000000000
--- a/keyboards/keebio/quefrency/rev4/info.json
+++ /dev/null
@@ -1,512 +0,0 @@
-{
-    "keyboard_name": "Quefrency Rev. 4",
-    "manufacturer": "Keebio",
-    "url": "https://keeb.io",
-    "maintainer": "nooges",
-    "usb": {
-        "vid": "0xCB10",
-        "pid": "0x4357",
-        "device_version": "4.1.0"
-    },
-    "matrix_pins": {
-        "cols": ["F4", "F1", "F0", "B7", "B3", "D2", "D3", "D5", "D4"],
-        "rows": ["B1", "B2", "C7", "B4", "D7"]
-    },
-    "diode_direction": "COL2ROW",
-    "encoder": {
-        "rotary": [
-            {"pin_a": "F5", "pin_b": "F6"}
-        ]
-    },
-    "rgblight": {
-        "led_count": 16,
-        "led_map": [1, 2, 3, 12, 13, 14, 15, 0, 7, 6, 5, 4, 11, 10, 9, 8],
-        "split_count": [8, 8],
-        "animations": {
-            "breathing": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "snake": true,
-            "knight": true,
-            "christmas": true,
-            "static_gradient": true,
-            "rgb_test": true,
-            "alternating": true,
-            "twinkle": true
-        }
-    },
-    "ws2812": {
-        "pin": "E6"
-    },
-    "split": {
-        "soft_serial_pin": "D0",
-        "encoder": {
-            "right": {
-                "rotary": [
-                    {"pin_a": "D6", "pin_b": "D4"}
-                ]
-            }
-        },
-        "matrix_pins": {
-            "right": {
-                "cols": ["F1", "F0", "F4", "F5", "F6", "D5", "C7", "D3", "B7"],
-                "rows": ["B3", "B2", "B6", "B4", "D7"]
-            }
-        }
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "layout_aliases": {
-        "LAYOUT": "LAYOUT_60"
-    },
-    "layouts": {
-        "LAYOUT_60": {
-            "layout": [
-                {"matrix": [0, 2], "x": 0, "y": 0},
-                {"matrix": [0, 3], "x": 1, "y": 0},
-                {"matrix": [0, 4], "x": 2, "y": 0},
-                {"matrix": [0, 5], "x": 3, "y": 0},
-                {"matrix": [0, 6], "x": 4, "y": 0},
-                {"matrix": [0, 7], "x": 5, "y": 0},
-                {"matrix": [0, 8], "x": 6, "y": 0},
-
-                {"matrix": [5, 0], "x": 8, "y": 0},
-                {"matrix": [5, 1], "x": 9, "y": 0},
-                {"matrix": [5, 2], "x": 10, "y": 0},
-                {"matrix": [5, 3], "x": 11, "y": 0},
-                {"matrix": [5, 4], "x": 12, "y": 0},
-                {"matrix": [5, 5], "x": 13, "y": 0},
-                {"matrix": [5, 6], "x": 14, "y": 0},
-                {"matrix": [5, 7], "x": 15, "y": 0},
-
-                {"matrix": [1, 2], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 3], "x": 1.5, "y": 1},
-                {"matrix": [1, 4], "x": 2.5, "y": 1},
-                {"matrix": [1, 5], "x": 3.5, "y": 1},
-                {"matrix": [1, 6], "x": 4.5, "y": 1},
-                {"matrix": [1, 7], "x": 5.5, "y": 1},
-
-                {"matrix": [6, 0], "x": 7.5, "y": 1},
-                {"matrix": [6, 1], "x": 8.5, "y": 1},
-                {"matrix": [6, 2], "x": 9.5, "y": 1},
-                {"matrix": [6, 3], "x": 10.5, "y": 1},
-                {"matrix": [6, 4], "x": 11.5, "y": 1},
-                {"matrix": [6, 5], "x": 12.5, "y": 1},
-                {"matrix": [6, 6], "x": 13.5, "y": 1},
-                {"matrix": [6, 7], "x": 14.5, "y": 1, "w": 1.5},
-
-                {"matrix": [2, 2], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 3], "x": 1.75, "y": 2},
-                {"matrix": [2, 4], "x": 2.75, "y": 2},
-                {"matrix": [2, 5], "x": 3.75, "y": 2},
-                {"matrix": [2, 6], "x": 4.75, "y": 2},
-                {"matrix": [2, 7], "x": 5.75, "y": 2},
-
-                {"matrix": [7, 0], "x": 7.75, "y": 2},
-                {"matrix": [7, 1], "x": 8.75, "y": 2},
-                {"matrix": [7, 2], "x": 9.75, "y": 2},
-                {"matrix": [7, 3], "x": 10.75, "y": 2},
-                {"matrix": [7, 4], "x": 11.75, "y": 2},
-                {"matrix": [7, 5], "x": 12.75, "y": 2},
-                {"matrix": [7, 7], "x": 13.75, "y": 2, "w": 2.25},
-
-                {"matrix": [3, 2], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 4], "x": 2.25, "y": 3},
-                {"matrix": [3, 5], "x": 3.25, "y": 3},
-                {"matrix": [3, 6], "x": 4.25, "y": 3},
-                {"matrix": [3, 7], "x": 5.25, "y": 3},
-                {"matrix": [3, 8], "x": 6.25, "y": 3},
-
-                {"matrix": [8, 0], "x": 8.25, "y": 3},
-                {"matrix": [8, 1], "x": 9.25, "y": 3},
-                {"matrix": [8, 2], "x": 10.25, "y": 3},
-                {"matrix": [8, 3], "x": 11.25, "y": 3},
-                {"matrix": [8, 4], "x": 12.25, "y": 3},
-                {"matrix": [8, 6], "x": 13.25, "y": 3, "w": 1.75},
-                {"matrix": [8, 7], "x": 15, "y": 3},
-
-                {"matrix": [4, 2], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 3], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 4], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 1.25},
-                {"matrix": [4, 7], "x": 5, "y": 4, "w": 2.25},
-
-                {"matrix": [9, 0], "x": 8.25, "y": 4, "w": 1.25},
-                {"matrix": [9, 1], "x": 9.5, "y": 4, "w": 1.5},
-                {"matrix": [9, 2], "x": 11, "y": 4},
-                {"matrix": [9, 3], "x": 12, "y": 4},
-                {"matrix": [9, 4], "x": 13, "y": 4},
-                {"matrix": [9, 6], "x": 14, "y": 4},
-                {"matrix": [9, 7], "x": 15, "y": 4}
-            ]
-        },
-        "LAYOUT_65": {
-            "layout": [
-                {"matrix": [0, 2], "x": 0, "y": 0},
-                {"matrix": [0, 3], "x": 1, "y": 0},
-                {"matrix": [0, 4], "x": 2, "y": 0},
-                {"matrix": [0, 5], "x": 3, "y": 0},
-                {"matrix": [0, 6], "x": 4, "y": 0},
-                {"matrix": [0, 7], "x": 5, "y": 0},
-                {"matrix": [0, 8], "x": 6, "y": 0},
-
-                {"matrix": [5, 0], "x": 8, "y": 0},
-                {"matrix": [5, 1], "x": 9, "y": 0},
-                {"matrix": [5, 2], "x": 10, "y": 0},
-                {"matrix": [5, 3], "x": 11, "y": 0},
-                {"matrix": [5, 4], "x": 12, "y": 0},
-                {"matrix": [5, 5], "x": 13, "y": 0},
-                {"matrix": [5, 6], "x": 14, "y": 0},
-                {"matrix": [5, 7], "x": 15, "y": 0},
-                {"matrix": [5, 8], "x": 16, "y": 0},
-
-                {"matrix": [1, 2], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 3], "x": 1.5, "y": 1},
-                {"matrix": [1, 4], "x": 2.5, "y": 1},
-                {"matrix": [1, 5], "x": 3.5, "y": 1},
-                {"matrix": [1, 6], "x": 4.5, "y": 1},
-                {"matrix": [1, 7], "x": 5.5, "y": 1},
-
-                {"matrix": [6, 0], "x": 7.5, "y": 1},
-                {"matrix": [6, 1], "x": 8.5, "y": 1},
-                {"matrix": [6, 2], "x": 9.5, "y": 1},
-                {"matrix": [6, 3], "x": 10.5, "y": 1},
-                {"matrix": [6, 4], "x": 11.5, "y": 1},
-                {"matrix": [6, 5], "x": 12.5, "y": 1},
-                {"matrix": [6, 6], "x": 13.5, "y": 1},
-                {"matrix": [6, 7], "x": 14.5, "y": 1, "w": 1.5},
-                {"matrix": [6, 8], "x": 16, "y": 1},
-
-                {"matrix": [2, 2], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 3], "x": 1.75, "y": 2},
-                {"matrix": [2, 4], "x": 2.75, "y": 2},
-                {"matrix": [2, 5], "x": 3.75, "y": 2},
-                {"matrix": [2, 6], "x": 4.75, "y": 2},
-                {"matrix": [2, 7], "x": 5.75, "y": 2},
-
-                {"matrix": [7, 0], "x": 7.75, "y": 2},
-                {"matrix": [7, 1], "x": 8.75, "y": 2},
-                {"matrix": [7, 2], "x": 9.75, "y": 2},
-                {"matrix": [7, 3], "x": 10.75, "y": 2},
-                {"matrix": [7, 4], "x": 11.75, "y": 2},
-                {"matrix": [7, 5], "x": 12.75, "y": 2},
-                {"matrix": [7, 7], "x": 13.75, "y": 2, "w": 2.25},
-                {"matrix": [7, 8], "x": 16, "y": 2},
-
-                {"matrix": [3, 2], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 4], "x": 2.25, "y": 3},
-                {"matrix": [3, 5], "x": 3.25, "y": 3},
-                {"matrix": [3, 6], "x": 4.25, "y": 3},
-                {"matrix": [3, 7], "x": 5.25, "y": 3},
-                {"matrix": [3, 8], "x": 6.25, "y": 3},
-
-                {"matrix": [8, 0], "x": 8.25, "y": 3},
-                {"matrix": [8, 1], "x": 9.25, "y": 3},
-                {"matrix": [8, 2], "x": 10.25, "y": 3},
-                {"matrix": [8, 3], "x": 11.25, "y": 3},
-                {"matrix": [8, 4], "x": 12.25, "y": 3},
-                {"matrix": [8, 6], "x": 13.25, "y": 3, "w": 1.75},
-                {"matrix": [8, 7], "x": 15, "y": 3},
-                {"matrix": [8, 8], "x": 16, "y": 3},
-
-                {"matrix": [4, 2], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 3], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 4], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 1.25},
-                {"matrix": [4, 7], "x": 5, "y": 4, "w": 2.25},
-
-                {"matrix": [9, 0], "x": 8.25, "y": 4, "w": 1.25},
-                {"matrix": [9, 1], "x": 9.5, "y": 4, "w": 1.5},
-                {"matrix": [9, 2], "x": 11, "y": 4},
-                {"matrix": [9, 3], "x": 12, "y": 4},
-                {"matrix": [9, 4], "x": 13, "y": 4},
-                {"matrix": [9, 6], "x": 14, "y": 4},
-                {"matrix": [9, 7], "x": 15, "y": 4},
-                {"matrix": [9, 8], "x": 16, "y": 4}
-            ]
-        },
-        "LAYOUT_60_with_macro": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2.25, "y": 0},
-                {"matrix": [0, 3], "x": 3.25, "y": 0},
-                {"matrix": [0, 4], "x": 4.25, "y": 0},
-                {"matrix": [0, 5], "x": 5.25, "y": 0},
-                {"matrix": [0, 6], "x": 6.25, "y": 0},
-                {"matrix": [0, 7], "x": 7.25, "y": 0},
-                {"matrix": [0, 8], "x": 8.25, "y": 0},
-
-                {"matrix": [5, 0], "x": 10.25, "y": 0},
-                {"matrix": [5, 1], "x": 11.25, "y": 0},
-                {"matrix": [5, 2], "x": 12.25, "y": 0},
-                {"matrix": [5, 3], "x": 13.25, "y": 0},
-                {"matrix": [5, 4], "x": 14.25, "y": 0},
-                {"matrix": [5, 5], "x": 15.25, "y": 0},
-                {"matrix": [5, 6], "x": 16.25, "y": 0},
-                {"matrix": [5, 7], "x": 17.25, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1},
-                {"matrix": [1, 1], "x": 1, "y": 1},
-                {"matrix": [1, 2], "x": 2.25, "y": 1, "w": 1.5},
-                {"matrix": [1, 3], "x": 3.75, "y": 1},
-                {"matrix": [1, 4], "x": 4.75, "y": 1},
-                {"matrix": [1, 5], "x": 5.75, "y": 1},
-                {"matrix": [1, 6], "x": 6.75, "y": 1},
-                {"matrix": [1, 7], "x": 7.75, "y": 1},
-
-                {"matrix": [6, 0], "x": 9.75, "y": 1},
-                {"matrix": [6, 1], "x": 10.75, "y": 1},
-                {"matrix": [6, 2], "x": 11.75, "y": 1},
-                {"matrix": [6, 3], "x": 12.75, "y": 1},
-                {"matrix": [6, 4], "x": 13.75, "y": 1},
-                {"matrix": [6, 5], "x": 14.75, "y": 1},
-                {"matrix": [6, 6], "x": 15.75, "y": 1},
-                {"matrix": [6, 7], "x": 16.75, "y": 1, "w": 1.5},
-
-                {"matrix": [2, 0], "x": 0, "y": 2},
-                {"matrix": [2, 1], "x": 1, "y": 2},
-                {"matrix": [2, 2], "x": 2.25, "y": 2, "w": 1.75},
-                {"matrix": [2, 3], "x": 4, "y": 2},
-                {"matrix": [2, 4], "x": 5, "y": 2},
-                {"matrix": [2, 5], "x": 6, "y": 2},
-                {"matrix": [2, 6], "x": 7, "y": 2},
-                {"matrix": [2, 7], "x": 8, "y": 2},
-
-                {"matrix": [7, 0], "x": 10, "y": 2},
-                {"matrix": [7, 1], "x": 11, "y": 2},
-                {"matrix": [7, 2], "x": 12, "y": 2},
-                {"matrix": [7, 3], "x": 13, "y": 2},
-                {"matrix": [7, 4], "x": 14, "y": 2},
-                {"matrix": [7, 5], "x": 15, "y": 2},
-                {"matrix": [7, 7], "x": 16, "y": 2, "w": 2.25},
-
-                {"matrix": [3, 0], "x": 0, "y": 3},
-                {"matrix": [3, 1], "x": 1, "y": 3},
-                {"matrix": [3, 2], "x": 2.25, "y": 3, "w": 2.25},
-                {"matrix": [3, 4], "x": 4.5, "y": 3},
-                {"matrix": [3, 5], "x": 5.5, "y": 3},
-                {"matrix": [3, 6], "x": 6.5, "y": 3},
-                {"matrix": [3, 7], "x": 7.5, "y": 3},
-                {"matrix": [3, 8], "x": 8.5, "y": 3},
-
-                {"matrix": [8, 0], "x": 10.5, "y": 3},
-                {"matrix": [8, 1], "x": 11.5, "y": 3},
-                {"matrix": [8, 2], "x": 12.5, "y": 3},
-                {"matrix": [8, 3], "x": 13.5, "y": 3},
-                {"matrix": [8, 4], "x": 14.5, "y": 3},
-                {"matrix": [8, 6], "x": 15.5, "y": 3, "w": 1.75},
-                {"matrix": [8, 7], "x": 17.25, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4},
-                {"matrix": [4, 1], "x": 1, "y": 4},
-                {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 3], "x": 3.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 4], "x": 4.75, "y": 4, "w": 1.25},
-                {"matrix": [4, 5], "x": 6, "y": 4, "w": 1.25},
-                {"matrix": [4, 7], "x": 7.25, "y": 4, "w": 2.25},
-
-                {"matrix": [9, 0], "x": 10.5, "y": 4, "w": 1.25},
-                {"matrix": [9, 1], "x": 11.75, "y": 4, "w": 1.5},
-                {"matrix": [9, 2], "x": 13.25, "y": 4},
-                {"matrix": [9, 3], "x": 14.25, "y": 4},
-                {"matrix": [9, 4], "x": 15.25, "y": 4},
-                {"matrix": [9, 6], "x": 16.25, "y": 4},
-                {"matrix": [9, 7], "x": 17.25, "y": 4}
-            ]
-        },
-        "LAYOUT_65_with_macro": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2.25, "y": 0},
-                {"matrix": [0, 3], "x": 3.25, "y": 0},
-                {"matrix": [0, 4], "x": 4.25, "y": 0},
-                {"matrix": [0, 5], "x": 5.25, "y": 0},
-                {"matrix": [0, 6], "x": 6.25, "y": 0},
-                {"matrix": [0, 7], "x": 7.25, "y": 0},
-                {"matrix": [0, 8], "x": 8.25, "y": 0},
-
-                {"matrix": [5, 0], "x": 10.25, "y": 0},
-                {"matrix": [5, 1], "x": 11.25, "y": 0},
-                {"matrix": [5, 2], "x": 12.25, "y": 0},
-                {"matrix": [5, 3], "x": 13.25, "y": 0},
-                {"matrix": [5, 4], "x": 14.25, "y": 0},
-                {"matrix": [5, 5], "x": 15.25, "y": 0},
-                {"matrix": [5, 6], "x": 16.25, "y": 0},
-                {"matrix": [5, 7], "x": 17.25, "y": 0},
-                {"matrix": [5, 8], "x": 18.25, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1},
-                {"matrix": [1, 1], "x": 1, "y": 1},
-                {"matrix": [1, 2], "x": 2.25, "y": 1, "w": 1.5},
-                {"matrix": [1, 3], "x": 3.75, "y": 1},
-                {"matrix": [1, 4], "x": 4.75, "y": 1},
-                {"matrix": [1, 5], "x": 5.75, "y": 1},
-                {"matrix": [1, 6], "x": 6.75, "y": 1},
-                {"matrix": [1, 7], "x": 7.75, "y": 1},
-
-                {"matrix": [6, 0], "x": 9.75, "y": 1},
-                {"matrix": [6, 1], "x": 10.75, "y": 1},
-                {"matrix": [6, 2], "x": 11.75, "y": 1},
-                {"matrix": [6, 3], "x": 12.75, "y": 1},
-                {"matrix": [6, 4], "x": 13.75, "y": 1},
-                {"matrix": [6, 5], "x": 14.75, "y": 1},
-                {"matrix": [6, 6], "x": 15.75, "y": 1},
-                {"matrix": [6, 7], "x": 16.75, "y": 1, "w": 1.5},
-                {"matrix": [6, 8], "x": 18.25, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2},
-                {"matrix": [2, 1], "x": 1, "y": 2},
-                {"matrix": [2, 2], "x": 2.25, "y": 2, "w": 1.75},
-                {"matrix": [2, 3], "x": 4, "y": 2},
-                {"matrix": [2, 4], "x": 5, "y": 2},
-                {"matrix": [2, 5], "x": 6, "y": 2},
-                {"matrix": [2, 6], "x": 7, "y": 2},
-                {"matrix": [2, 7], "x": 8, "y": 2},
-
-                {"matrix": [7, 0], "x": 10, "y": 2},
-                {"matrix": [7, 1], "x": 11, "y": 2},
-                {"matrix": [7, 2], "x": 12, "y": 2},
-                {"matrix": [7, 3], "x": 13, "y": 2},
-                {"matrix": [7, 4], "x": 14, "y": 2},
-                {"matrix": [7, 5], "x": 15, "y": 2},
-                {"matrix": [7, 7], "x": 16, "y": 2, "w": 2.25},
-                {"matrix": [7, 8], "x": 18.25, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3},
-                {"matrix": [3, 1], "x": 1, "y": 3},
-                {"matrix": [3, 2], "x": 2.25, "y": 3, "w": 2.25},
-                {"matrix": [3, 4], "x": 4.5, "y": 3},
-                {"matrix": [3, 5], "x": 5.5, "y": 3},
-                {"matrix": [3, 6], "x": 6.5, "y": 3},
-                {"matrix": [3, 7], "x": 7.5, "y": 3},
-                {"matrix": [3, 8], "x": 8.5, "y": 3},
-
-                {"matrix": [8, 0], "x": 10.5, "y": 3},
-                {"matrix": [8, 1], "x": 11.5, "y": 3},
-                {"matrix": [8, 2], "x": 12.5, "y": 3},
-                {"matrix": [8, 3], "x": 13.5, "y": 3},
-                {"matrix": [8, 4], "x": 14.5, "y": 3},
-                {"matrix": [8, 6], "x": 15.5, "y": 3, "w": 1.75},
-                {"matrix": [8, 7], "x": 17.25, "y": 3},
-                {"matrix": [8, 8], "x": 18.25, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4},
-                {"matrix": [4, 1], "x": 1, "y": 4},
-                {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 3], "x": 3.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 4], "x": 4.75, "y": 4, "w": 1.25},
-                {"matrix": [4, 5], "x": 6, "y": 4, "w": 1.25},
-                {"matrix": [4, 7], "x": 7.25, "y": 4, "w": 2.25},
-
-                {"matrix": [9, 0], "x": 10.5, "y": 4, "w": 1.25},
-                {"matrix": [9, 1], "x": 11.75, "y": 4, "w": 1.5},
-                {"matrix": [9, 2], "x": 13.25, "y": 4},
-                {"matrix": [9, 3], "x": 14.25, "y": 4},
-                {"matrix": [9, 4], "x": 15.25, "y": 4},
-                {"matrix": [9, 6], "x": 16.25, "y": 4},
-                {"matrix": [9, 7], "x": 17.25, "y": 4},
-                {"matrix": [9, 8], "x": 18.25, "y": 4}
-            ]
-        },
-        "LAYOUT_all": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2.25, "y": 0},
-                {"matrix": [0, 3], "x": 3.25, "y": 0},
-                {"matrix": [0, 4], "x": 4.25, "y": 0},
-                {"matrix": [0, 5], "x": 5.25, "y": 0},
-                {"matrix": [0, 6], "x": 6.25, "y": 0},
-                {"matrix": [0, 7], "x": 7.25, "y": 0},
-                {"matrix": [0, 8], "x": 8.25, "y": 0},
-
-                {"matrix": [5, 0], "x": 10.25, "y": 0},
-                {"matrix": [5, 1], "x": 11.25, "y": 0},
-                {"matrix": [5, 2], "x": 12.25, "y": 0},
-                {"matrix": [5, 3], "x": 13.25, "y": 0},
-                {"matrix": [5, 4], "x": 14.25, "y": 0},
-                {"matrix": [5, 5], "x": 15.25, "y": 0},
-                {"matrix": [5, 6], "x": 16.25, "y": 0},
-                {"matrix": [5, 7], "x": 17.25, "y": 0},
-                {"matrix": [5, 8], "x": 18.25, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1},
-                {"matrix": [1, 1], "x": 1, "y": 1},
-                {"matrix": [1, 2], "x": 2.25, "y": 1, "w": 1.5},
-                {"matrix": [1, 3], "x": 3.75, "y": 1},
-                {"matrix": [1, 4], "x": 4.75, "y": 1},
-                {"matrix": [1, 5], "x": 5.75, "y": 1},
-                {"matrix": [1, 6], "x": 6.75, "y": 1},
-                {"matrix": [1, 7], "x": 7.75, "y": 1},
-
-                {"matrix": [6, 0], "x": 9.75, "y": 1},
-                {"matrix": [6, 1], "x": 10.75, "y": 1},
-                {"matrix": [6, 2], "x": 11.75, "y": 1},
-                {"matrix": [6, 3], "x": 12.75, "y": 1},
-                {"matrix": [6, 4], "x": 13.75, "y": 1},
-                {"matrix": [6, 5], "x": 14.75, "y": 1},
-                {"matrix": [6, 6], "x": 15.75, "y": 1},
-                {"matrix": [6, 7], "x": 16.75, "y": 1, "w": 1.5},
-                {"matrix": [6, 8], "x": 18.25, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2},
-                {"matrix": [2, 1], "x": 1, "y": 2},
-                {"matrix": [2, 2], "x": 2.25, "y": 2, "w": 1.75},
-                {"matrix": [2, 3], "x": 4, "y": 2},
-                {"matrix": [2, 4], "x": 5, "y": 2},
-                {"matrix": [2, 5], "x": 6, "y": 2},
-                {"matrix": [2, 6], "x": 7, "y": 2},
-                {"matrix": [2, 7], "x": 8, "y": 2},
-
-                {"matrix": [7, 0], "x": 10, "y": 2},
-                {"matrix": [7, 1], "x": 11, "y": 2},
-                {"matrix": [7, 2], "x": 12, "y": 2},
-                {"matrix": [7, 3], "x": 13, "y": 2},
-                {"matrix": [7, 4], "x": 14, "y": 2},
-                {"matrix": [7, 5], "x": 15, "y": 2},
-                {"matrix": [7, 6], "x": 16, "y": 2},
-                {"matrix": [7, 7], "x": 17, "y": 2, "w": 1.25},
-                {"matrix": [7, 8], "x": 18.25, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3},
-                {"matrix": [3, 1], "x": 1, "y": 3},
-                {"matrix": [3, 2], "x": 2.25, "y": 3, "w": 1.25},
-                {"matrix": [3, 3], "x": 3.5, "y": 3},
-                {"matrix": [3, 4], "x": 4.5, "y": 3},
-                {"matrix": [3, 5], "x": 5.5, "y": 3},
-                {"matrix": [3, 6], "x": 6.5, "y": 3},
-                {"matrix": [3, 7], "x": 7.5, "y": 3},
-                {"matrix": [3, 8], "x": 8.5, "y": 3},
-
-                {"matrix": [8, 0], "x": 10.5, "y": 3},
-                {"matrix": [8, 1], "x": 11.5, "y": 3},
-                {"matrix": [8, 2], "x": 12.5, "y": 3},
-                {"matrix": [8, 3], "x": 13.5, "y": 3},
-                {"matrix": [8, 4], "x": 14.5, "y": 3},
-                {"matrix": [8, 6], "x": 15.5, "y": 3, "w": 1.75},
-                {"matrix": [8, 7], "x": 17.25, "y": 3},
-                {"matrix": [8, 8], "x": 18.25, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4},
-                {"matrix": [4, 1], "x": 1, "y": 4},
-                {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 3], "x": 3.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 4], "x": 4.75, "y": 4, "w": 1.25},
-                {"matrix": [4, 5], "x": 6, "y": 4, "w": 1.25},
-                {"matrix": [4, 6], "x": 7.25, "y": 4},
-                {"matrix": [4, 7], "x": 8.25, "y": 4, "w": 1.25},
-
-                {"matrix": [9, 0], "x": 10.5, "y": 4, "w": 1.25},
-                {"matrix": [9, 1], "x": 11.75, "y": 4, "w": 1.5},
-                {"matrix": [9, 2], "x": 13.25, "y": 4},
-                {"matrix": [9, 3], "x": 14.25, "y": 4},
-                {"matrix": [9, 4], "x": 15.25, "y": 4},
-                {"matrix": [9, 6], "x": 16.25, "y": 4},
-                {"matrix": [9, 7], "x": 17.25, "y": 4},
-                {"matrix": [9, 8], "x": 18.25, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/keebio/quefrency/rev4/keyboard.json b/keyboards/keebio/quefrency/rev4/keyboard.json
new file mode 100644
index 00000000000..936502fdcfd
--- /dev/null
+++ b/keyboards/keebio/quefrency/rev4/keyboard.json
@@ -0,0 +1,522 @@
+{
+    "keyboard_name": "Quefrency Rev. 4",
+    "manufacturer": "Keebio",
+    "url": "https://keeb.io",
+    "maintainer": "nooges",
+    "usb": {
+        "vid": "0xCB10",
+        "pid": "0x4357",
+        "device_version": "4.1.0"
+    },
+    "matrix_pins": {
+        "cols": ["F4", "F1", "F0", "B7", "B3", "D2", "D3", "D5", "D4"],
+        "rows": ["B1", "B2", "C7", "B4", "D7"]
+    },
+    "diode_direction": "COL2ROW",
+    "encoder": {
+        "rotary": [
+            {"pin_a": "F5", "pin_b": "F6"}
+        ]
+    },
+    "rgblight": {
+        "led_count": 16,
+        "led_map": [1, 2, 3, 12, 13, 14, 15, 0, 7, 6, 5, 4, 11, 10, 9, 8],
+        "split_count": [8, 8],
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": true,
+            "twinkle": true
+        }
+    },
+    "ws2812": {
+        "pin": "E6"
+    },
+    "split": {
+        "soft_serial_pin": "D0",
+        "encoder": {
+            "right": {
+                "rotary": [
+                    {"pin_a": "D6", "pin_b": "D4"}
+                ]
+            }
+        },
+        "matrix_pins": {
+            "right": {
+                "cols": ["F1", "F0", "F4", "F5", "F6", "D5", "C7", "D3", "B7"],
+                "rows": ["B3", "B2", "B6", "B4", "D7"]
+            }
+        }
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": false,
+        "mousekey": false,
+        "extrakey": true,
+        "rgblight": true,
+        "encoder": true
+    },
+    "build": {
+        "lto": true
+    },
+    "layout_aliases": {
+        "LAYOUT": "LAYOUT_60"
+    },
+    "layouts": {
+        "LAYOUT_60": {
+            "layout": [
+                {"matrix": [0, 2], "x": 0, "y": 0},
+                {"matrix": [0, 3], "x": 1, "y": 0},
+                {"matrix": [0, 4], "x": 2, "y": 0},
+                {"matrix": [0, 5], "x": 3, "y": 0},
+                {"matrix": [0, 6], "x": 4, "y": 0},
+                {"matrix": [0, 7], "x": 5, "y": 0},
+                {"matrix": [0, 8], "x": 6, "y": 0},
+
+                {"matrix": [5, 0], "x": 8, "y": 0},
+                {"matrix": [5, 1], "x": 9, "y": 0},
+                {"matrix": [5, 2], "x": 10, "y": 0},
+                {"matrix": [5, 3], "x": 11, "y": 0},
+                {"matrix": [5, 4], "x": 12, "y": 0},
+                {"matrix": [5, 5], "x": 13, "y": 0},
+                {"matrix": [5, 6], "x": 14, "y": 0},
+                {"matrix": [5, 7], "x": 15, "y": 0},
+
+                {"matrix": [1, 2], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 3], "x": 1.5, "y": 1},
+                {"matrix": [1, 4], "x": 2.5, "y": 1},
+                {"matrix": [1, 5], "x": 3.5, "y": 1},
+                {"matrix": [1, 6], "x": 4.5, "y": 1},
+                {"matrix": [1, 7], "x": 5.5, "y": 1},
+
+                {"matrix": [6, 0], "x": 7.5, "y": 1},
+                {"matrix": [6, 1], "x": 8.5, "y": 1},
+                {"matrix": [6, 2], "x": 9.5, "y": 1},
+                {"matrix": [6, 3], "x": 10.5, "y": 1},
+                {"matrix": [6, 4], "x": 11.5, "y": 1},
+                {"matrix": [6, 5], "x": 12.5, "y": 1},
+                {"matrix": [6, 6], "x": 13.5, "y": 1},
+                {"matrix": [6, 7], "x": 14.5, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 2], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 3], "x": 1.75, "y": 2},
+                {"matrix": [2, 4], "x": 2.75, "y": 2},
+                {"matrix": [2, 5], "x": 3.75, "y": 2},
+                {"matrix": [2, 6], "x": 4.75, "y": 2},
+                {"matrix": [2, 7], "x": 5.75, "y": 2},
+
+                {"matrix": [7, 0], "x": 7.75, "y": 2},
+                {"matrix": [7, 1], "x": 8.75, "y": 2},
+                {"matrix": [7, 2], "x": 9.75, "y": 2},
+                {"matrix": [7, 3], "x": 10.75, "y": 2},
+                {"matrix": [7, 4], "x": 11.75, "y": 2},
+                {"matrix": [7, 5], "x": 12.75, "y": 2},
+                {"matrix": [7, 7], "x": 13.75, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 2], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 4], "x": 2.25, "y": 3},
+                {"matrix": [3, 5], "x": 3.25, "y": 3},
+                {"matrix": [3, 6], "x": 4.25, "y": 3},
+                {"matrix": [3, 7], "x": 5.25, "y": 3},
+                {"matrix": [3, 8], "x": 6.25, "y": 3},
+
+                {"matrix": [8, 0], "x": 8.25, "y": 3},
+                {"matrix": [8, 1], "x": 9.25, "y": 3},
+                {"matrix": [8, 2], "x": 10.25, "y": 3},
+                {"matrix": [8, 3], "x": 11.25, "y": 3},
+                {"matrix": [8, 4], "x": 12.25, "y": 3},
+                {"matrix": [8, 6], "x": 13.25, "y": 3, "w": 1.75},
+                {"matrix": [8, 7], "x": 15, "y": 3},
+
+                {"matrix": [4, 2], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 7], "x": 5, "y": 4, "w": 2.25},
+
+                {"matrix": [9, 0], "x": 8.25, "y": 4, "w": 1.25},
+                {"matrix": [9, 1], "x": 9.5, "y": 4, "w": 1.5},
+                {"matrix": [9, 2], "x": 11, "y": 4},
+                {"matrix": [9, 3], "x": 12, "y": 4},
+                {"matrix": [9, 4], "x": 13, "y": 4},
+                {"matrix": [9, 6], "x": 14, "y": 4},
+                {"matrix": [9, 7], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_65": {
+            "layout": [
+                {"matrix": [0, 2], "x": 0, "y": 0},
+                {"matrix": [0, 3], "x": 1, "y": 0},
+                {"matrix": [0, 4], "x": 2, "y": 0},
+                {"matrix": [0, 5], "x": 3, "y": 0},
+                {"matrix": [0, 6], "x": 4, "y": 0},
+                {"matrix": [0, 7], "x": 5, "y": 0},
+                {"matrix": [0, 8], "x": 6, "y": 0},
+
+                {"matrix": [5, 0], "x": 8, "y": 0},
+                {"matrix": [5, 1], "x": 9, "y": 0},
+                {"matrix": [5, 2], "x": 10, "y": 0},
+                {"matrix": [5, 3], "x": 11, "y": 0},
+                {"matrix": [5, 4], "x": 12, "y": 0},
+                {"matrix": [5, 5], "x": 13, "y": 0},
+                {"matrix": [5, 6], "x": 14, "y": 0},
+                {"matrix": [5, 7], "x": 15, "y": 0},
+                {"matrix": [5, 8], "x": 16, "y": 0},
+
+                {"matrix": [1, 2], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 3], "x": 1.5, "y": 1},
+                {"matrix": [1, 4], "x": 2.5, "y": 1},
+                {"matrix": [1, 5], "x": 3.5, "y": 1},
+                {"matrix": [1, 6], "x": 4.5, "y": 1},
+                {"matrix": [1, 7], "x": 5.5, "y": 1},
+
+                {"matrix": [6, 0], "x": 7.5, "y": 1},
+                {"matrix": [6, 1], "x": 8.5, "y": 1},
+                {"matrix": [6, 2], "x": 9.5, "y": 1},
+                {"matrix": [6, 3], "x": 10.5, "y": 1},
+                {"matrix": [6, 4], "x": 11.5, "y": 1},
+                {"matrix": [6, 5], "x": 12.5, "y": 1},
+                {"matrix": [6, 6], "x": 13.5, "y": 1},
+                {"matrix": [6, 7], "x": 14.5, "y": 1, "w": 1.5},
+                {"matrix": [6, 8], "x": 16, "y": 1},
+
+                {"matrix": [2, 2], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 3], "x": 1.75, "y": 2},
+                {"matrix": [2, 4], "x": 2.75, "y": 2},
+                {"matrix": [2, 5], "x": 3.75, "y": 2},
+                {"matrix": [2, 6], "x": 4.75, "y": 2},
+                {"matrix": [2, 7], "x": 5.75, "y": 2},
+
+                {"matrix": [7, 0], "x": 7.75, "y": 2},
+                {"matrix": [7, 1], "x": 8.75, "y": 2},
+                {"matrix": [7, 2], "x": 9.75, "y": 2},
+                {"matrix": [7, 3], "x": 10.75, "y": 2},
+                {"matrix": [7, 4], "x": 11.75, "y": 2},
+                {"matrix": [7, 5], "x": 12.75, "y": 2},
+                {"matrix": [7, 7], "x": 13.75, "y": 2, "w": 2.25},
+                {"matrix": [7, 8], "x": 16, "y": 2},
+
+                {"matrix": [3, 2], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 4], "x": 2.25, "y": 3},
+                {"matrix": [3, 5], "x": 3.25, "y": 3},
+                {"matrix": [3, 6], "x": 4.25, "y": 3},
+                {"matrix": [3, 7], "x": 5.25, "y": 3},
+                {"matrix": [3, 8], "x": 6.25, "y": 3},
+
+                {"matrix": [8, 0], "x": 8.25, "y": 3},
+                {"matrix": [8, 1], "x": 9.25, "y": 3},
+                {"matrix": [8, 2], "x": 10.25, "y": 3},
+                {"matrix": [8, 3], "x": 11.25, "y": 3},
+                {"matrix": [8, 4], "x": 12.25, "y": 3},
+                {"matrix": [8, 6], "x": 13.25, "y": 3, "w": 1.75},
+                {"matrix": [8, 7], "x": 15, "y": 3},
+                {"matrix": [8, 8], "x": 16, "y": 3},
+
+                {"matrix": [4, 2], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 7], "x": 5, "y": 4, "w": 2.25},
+
+                {"matrix": [9, 0], "x": 8.25, "y": 4, "w": 1.25},
+                {"matrix": [9, 1], "x": 9.5, "y": 4, "w": 1.5},
+                {"matrix": [9, 2], "x": 11, "y": 4},
+                {"matrix": [9, 3], "x": 12, "y": 4},
+                {"matrix": [9, 4], "x": 13, "y": 4},
+                {"matrix": [9, 6], "x": 14, "y": 4},
+                {"matrix": [9, 7], "x": 15, "y": 4},
+                {"matrix": [9, 8], "x": 16, "y": 4}
+            ]
+        },
+        "LAYOUT_60_with_macro": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+                {"matrix": [0, 5], "x": 5.25, "y": 0},
+                {"matrix": [0, 6], "x": 6.25, "y": 0},
+                {"matrix": [0, 7], "x": 7.25, "y": 0},
+                {"matrix": [0, 8], "x": 8.25, "y": 0},
+
+                {"matrix": [5, 0], "x": 10.25, "y": 0},
+                {"matrix": [5, 1], "x": 11.25, "y": 0},
+                {"matrix": [5, 2], "x": 12.25, "y": 0},
+                {"matrix": [5, 3], "x": 13.25, "y": 0},
+                {"matrix": [5, 4], "x": 14.25, "y": 0},
+                {"matrix": [5, 5], "x": 15.25, "y": 0},
+                {"matrix": [5, 6], "x": 16.25, "y": 0},
+                {"matrix": [5, 7], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2.25, "y": 1, "w": 1.5},
+                {"matrix": [1, 3], "x": 3.75, "y": 1},
+                {"matrix": [1, 4], "x": 4.75, "y": 1},
+                {"matrix": [1, 5], "x": 5.75, "y": 1},
+                {"matrix": [1, 6], "x": 6.75, "y": 1},
+                {"matrix": [1, 7], "x": 7.75, "y": 1},
+
+                {"matrix": [6, 0], "x": 9.75, "y": 1},
+                {"matrix": [6, 1], "x": 10.75, "y": 1},
+                {"matrix": [6, 2], "x": 11.75, "y": 1},
+                {"matrix": [6, 3], "x": 12.75, "y": 1},
+                {"matrix": [6, 4], "x": 13.75, "y": 1},
+                {"matrix": [6, 5], "x": 14.75, "y": 1},
+                {"matrix": [6, 6], "x": 15.75, "y": 1},
+                {"matrix": [6, 7], "x": 16.75, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2.25, "y": 2, "w": 1.75},
+                {"matrix": [2, 3], "x": 4, "y": 2},
+                {"matrix": [2, 4], "x": 5, "y": 2},
+                {"matrix": [2, 5], "x": 6, "y": 2},
+                {"matrix": [2, 6], "x": 7, "y": 2},
+                {"matrix": [2, 7], "x": 8, "y": 2},
+
+                {"matrix": [7, 0], "x": 10, "y": 2},
+                {"matrix": [7, 1], "x": 11, "y": 2},
+                {"matrix": [7, 2], "x": 12, "y": 2},
+                {"matrix": [7, 3], "x": 13, "y": 2},
+                {"matrix": [7, 4], "x": 14, "y": 2},
+                {"matrix": [7, 5], "x": 15, "y": 2},
+                {"matrix": [7, 7], "x": 16, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3, "w": 2.25},
+                {"matrix": [3, 4], "x": 4.5, "y": 3},
+                {"matrix": [3, 5], "x": 5.5, "y": 3},
+                {"matrix": [3, 6], "x": 6.5, "y": 3},
+                {"matrix": [3, 7], "x": 7.5, "y": 3},
+                {"matrix": [3, 8], "x": 8.5, "y": 3},
+
+                {"matrix": [8, 0], "x": 10.5, "y": 3},
+                {"matrix": [8, 1], "x": 11.5, "y": 3},
+                {"matrix": [8, 2], "x": 12.5, "y": 3},
+                {"matrix": [8, 3], "x": 13.5, "y": 3},
+                {"matrix": [8, 4], "x": 14.5, "y": 3},
+                {"matrix": [8, 6], "x": 15.5, "y": 3, "w": 1.75},
+                {"matrix": [8, 7], "x": 17.25, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+                {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 3.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 4.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 6, "y": 4, "w": 1.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4, "w": 2.25},
+
+                {"matrix": [9, 0], "x": 10.5, "y": 4, "w": 1.25},
+                {"matrix": [9, 1], "x": 11.75, "y": 4, "w": 1.5},
+                {"matrix": [9, 2], "x": 13.25, "y": 4},
+                {"matrix": [9, 3], "x": 14.25, "y": 4},
+                {"matrix": [9, 4], "x": 15.25, "y": 4},
+                {"matrix": [9, 6], "x": 16.25, "y": 4},
+                {"matrix": [9, 7], "x": 17.25, "y": 4}
+            ]
+        },
+        "LAYOUT_65_with_macro": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+                {"matrix": [0, 5], "x": 5.25, "y": 0},
+                {"matrix": [0, 6], "x": 6.25, "y": 0},
+                {"matrix": [0, 7], "x": 7.25, "y": 0},
+                {"matrix": [0, 8], "x": 8.25, "y": 0},
+
+                {"matrix": [5, 0], "x": 10.25, "y": 0},
+                {"matrix": [5, 1], "x": 11.25, "y": 0},
+                {"matrix": [5, 2], "x": 12.25, "y": 0},
+                {"matrix": [5, 3], "x": 13.25, "y": 0},
+                {"matrix": [5, 4], "x": 14.25, "y": 0},
+                {"matrix": [5, 5], "x": 15.25, "y": 0},
+                {"matrix": [5, 6], "x": 16.25, "y": 0},
+                {"matrix": [5, 7], "x": 17.25, "y": 0},
+                {"matrix": [5, 8], "x": 18.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2.25, "y": 1, "w": 1.5},
+                {"matrix": [1, 3], "x": 3.75, "y": 1},
+                {"matrix": [1, 4], "x": 4.75, "y": 1},
+                {"matrix": [1, 5], "x": 5.75, "y": 1},
+                {"matrix": [1, 6], "x": 6.75, "y": 1},
+                {"matrix": [1, 7], "x": 7.75, "y": 1},
+
+                {"matrix": [6, 0], "x": 9.75, "y": 1},
+                {"matrix": [6, 1], "x": 10.75, "y": 1},
+                {"matrix": [6, 2], "x": 11.75, "y": 1},
+                {"matrix": [6, 3], "x": 12.75, "y": 1},
+                {"matrix": [6, 4], "x": 13.75, "y": 1},
+                {"matrix": [6, 5], "x": 14.75, "y": 1},
+                {"matrix": [6, 6], "x": 15.75, "y": 1},
+                {"matrix": [6, 7], "x": 16.75, "y": 1, "w": 1.5},
+                {"matrix": [6, 8], "x": 18.25, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2.25, "y": 2, "w": 1.75},
+                {"matrix": [2, 3], "x": 4, "y": 2},
+                {"matrix": [2, 4], "x": 5, "y": 2},
+                {"matrix": [2, 5], "x": 6, "y": 2},
+                {"matrix": [2, 6], "x": 7, "y": 2},
+                {"matrix": [2, 7], "x": 8, "y": 2},
+
+                {"matrix": [7, 0], "x": 10, "y": 2},
+                {"matrix": [7, 1], "x": 11, "y": 2},
+                {"matrix": [7, 2], "x": 12, "y": 2},
+                {"matrix": [7, 3], "x": 13, "y": 2},
+                {"matrix": [7, 4], "x": 14, "y": 2},
+                {"matrix": [7, 5], "x": 15, "y": 2},
+                {"matrix": [7, 7], "x": 16, "y": 2, "w": 2.25},
+                {"matrix": [7, 8], "x": 18.25, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3, "w": 2.25},
+                {"matrix": [3, 4], "x": 4.5, "y": 3},
+                {"matrix": [3, 5], "x": 5.5, "y": 3},
+                {"matrix": [3, 6], "x": 6.5, "y": 3},
+                {"matrix": [3, 7], "x": 7.5, "y": 3},
+                {"matrix": [3, 8], "x": 8.5, "y": 3},
+
+                {"matrix": [8, 0], "x": 10.5, "y": 3},
+                {"matrix": [8, 1], "x": 11.5, "y": 3},
+                {"matrix": [8, 2], "x": 12.5, "y": 3},
+                {"matrix": [8, 3], "x": 13.5, "y": 3},
+                {"matrix": [8, 4], "x": 14.5, "y": 3},
+                {"matrix": [8, 6], "x": 15.5, "y": 3, "w": 1.75},
+                {"matrix": [8, 7], "x": 17.25, "y": 3},
+                {"matrix": [8, 8], "x": 18.25, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+                {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 3.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 4.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 6, "y": 4, "w": 1.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4, "w": 2.25},
+
+                {"matrix": [9, 0], "x": 10.5, "y": 4, "w": 1.25},
+                {"matrix": [9, 1], "x": 11.75, "y": 4, "w": 1.5},
+                {"matrix": [9, 2], "x": 13.25, "y": 4},
+                {"matrix": [9, 3], "x": 14.25, "y": 4},
+                {"matrix": [9, 4], "x": 15.25, "y": 4},
+                {"matrix": [9, 6], "x": 16.25, "y": 4},
+                {"matrix": [9, 7], "x": 17.25, "y": 4},
+                {"matrix": [9, 8], "x": 18.25, "y": 4}
+            ]
+        },
+        "LAYOUT_all": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+                {"matrix": [0, 5], "x": 5.25, "y": 0},
+                {"matrix": [0, 6], "x": 6.25, "y": 0},
+                {"matrix": [0, 7], "x": 7.25, "y": 0},
+                {"matrix": [0, 8], "x": 8.25, "y": 0},
+
+                {"matrix": [5, 0], "x": 10.25, "y": 0},
+                {"matrix": [5, 1], "x": 11.25, "y": 0},
+                {"matrix": [5, 2], "x": 12.25, "y": 0},
+                {"matrix": [5, 3], "x": 13.25, "y": 0},
+                {"matrix": [5, 4], "x": 14.25, "y": 0},
+                {"matrix": [5, 5], "x": 15.25, "y": 0},
+                {"matrix": [5, 6], "x": 16.25, "y": 0},
+                {"matrix": [5, 7], "x": 17.25, "y": 0},
+                {"matrix": [5, 8], "x": 18.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2.25, "y": 1, "w": 1.5},
+                {"matrix": [1, 3], "x": 3.75, "y": 1},
+                {"matrix": [1, 4], "x": 4.75, "y": 1},
+                {"matrix": [1, 5], "x": 5.75, "y": 1},
+                {"matrix": [1, 6], "x": 6.75, "y": 1},
+                {"matrix": [1, 7], "x": 7.75, "y": 1},
+
+                {"matrix": [6, 0], "x": 9.75, "y": 1},
+                {"matrix": [6, 1], "x": 10.75, "y": 1},
+                {"matrix": [6, 2], "x": 11.75, "y": 1},
+                {"matrix": [6, 3], "x": 12.75, "y": 1},
+                {"matrix": [6, 4], "x": 13.75, "y": 1},
+                {"matrix": [6, 5], "x": 14.75, "y": 1},
+                {"matrix": [6, 6], "x": 15.75, "y": 1},
+                {"matrix": [6, 7], "x": 16.75, "y": 1, "w": 1.5},
+                {"matrix": [6, 8], "x": 18.25, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2.25, "y": 2, "w": 1.75},
+                {"matrix": [2, 3], "x": 4, "y": 2},
+                {"matrix": [2, 4], "x": 5, "y": 2},
+                {"matrix": [2, 5], "x": 6, "y": 2},
+                {"matrix": [2, 6], "x": 7, "y": 2},
+                {"matrix": [2, 7], "x": 8, "y": 2},
+
+                {"matrix": [7, 0], "x": 10, "y": 2},
+                {"matrix": [7, 1], "x": 11, "y": 2},
+                {"matrix": [7, 2], "x": 12, "y": 2},
+                {"matrix": [7, 3], "x": 13, "y": 2},
+                {"matrix": [7, 4], "x": 14, "y": 2},
+                {"matrix": [7, 5], "x": 15, "y": 2},
+                {"matrix": [7, 6], "x": 16, "y": 2},
+                {"matrix": [7, 7], "x": 17, "y": 2, "w": 1.25},
+                {"matrix": [7, 8], "x": 18.25, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3, "w": 1.25},
+                {"matrix": [3, 3], "x": 3.5, "y": 3},
+                {"matrix": [3, 4], "x": 4.5, "y": 3},
+                {"matrix": [3, 5], "x": 5.5, "y": 3},
+                {"matrix": [3, 6], "x": 6.5, "y": 3},
+                {"matrix": [3, 7], "x": 7.5, "y": 3},
+                {"matrix": [3, 8], "x": 8.5, "y": 3},
+
+                {"matrix": [8, 0], "x": 10.5, "y": 3},
+                {"matrix": [8, 1], "x": 11.5, "y": 3},
+                {"matrix": [8, 2], "x": 12.5, "y": 3},
+                {"matrix": [8, 3], "x": 13.5, "y": 3},
+                {"matrix": [8, 4], "x": 14.5, "y": 3},
+                {"matrix": [8, 6], "x": 15.5, "y": 3, "w": 1.75},
+                {"matrix": [8, 7], "x": 17.25, "y": 3},
+                {"matrix": [8, 8], "x": 18.25, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+                {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 3.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 4.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 6, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 7.25, "y": 4},
+                {"matrix": [4, 7], "x": 8.25, "y": 4, "w": 1.25},
+
+                {"matrix": [9, 0], "x": 10.5, "y": 4, "w": 1.25},
+                {"matrix": [9, 1], "x": 11.75, "y": 4, "w": 1.5},
+                {"matrix": [9, 2], "x": 13.25, "y": 4},
+                {"matrix": [9, 3], "x": 14.25, "y": 4},
+                {"matrix": [9, 4], "x": 15.25, "y": 4},
+                {"matrix": [9, 6], "x": 16.25, "y": 4},
+                {"matrix": [9, 7], "x": 17.25, "y": 4},
+                {"matrix": [9, 8], "x": 18.25, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/keebio/quefrency/rev4/rules.mk b/keyboards/keebio/quefrency/rev4/rules.mk
deleted file mode 100644
index ab97bd78f35..00000000000
--- a/keyboards/keebio/quefrency/rev4/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-BACKLIGHT_ENABLE = no
-RGBLIGHT_ENABLE = yes
-ENCODER_ENABLE = yes
diff --git a/keyboards/keebio/quefrency/rev5/info.json b/keyboards/keebio/quefrency/rev5/info.json
deleted file mode 100644
index 94d77ec8dd4..00000000000
--- a/keyboards/keebio/quefrency/rev5/info.json
+++ /dev/null
@@ -1,512 +0,0 @@
-{
-    "keyboard_name": "Quefrency Rev. 5",
-    "manufacturer": "Keebio",
-    "url": "https://keeb.io",
-    "maintainer": "nooges",
-    "usb": {
-        "vid": "0xCB10",
-        "pid": "0x5357",
-        "device_version": "5.1.0"
-    },
-    "matrix_pins": {
-        "cols": ["F4", "F1", "F0", "B7", "B3", "D2", "D3", "D5", "D4"],
-        "rows": ["B1", "B2", "C7", "B4", "D7"]
-    },
-    "diode_direction": "COL2ROW",
-    "encoder": {
-        "rotary": [
-            {"pin_a": "F5", "pin_b": "F6"}
-        ]
-    },
-    "rgblight": {
-        "led_count": 16,
-        "led_map": [1, 2, 3, 12, 13, 14, 15, 0, 7, 6, 5, 4, 11, 10, 9, 8],
-        "split_count": [8, 8],
-        "animations": {
-            "breathing": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "snake": true,
-            "knight": true,
-            "christmas": true,
-            "static_gradient": true,
-            "rgb_test": true,
-            "alternating": true,
-            "twinkle": true
-        }
-    },
-    "ws2812": {
-        "pin": "E6"
-    },
-    "split": {
-        "soft_serial_pin": "D0",
-        "encoder": {
-            "right": {
-                "rotary": [
-                    {"pin_a": "D6", "pin_b": "D4"}
-                ]
-            }
-        },
-        "matrix_pins": {
-            "right": {
-                "cols": ["F1", "F0", "F4", "F5", "F6", "D5", "C7", "D3", "B7"],
-                "rows": ["B3", "B2", "B6", "B4", "D7"]
-            }
-        }
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "layout_aliases": {
-        "LAYOUT": "LAYOUT_60"
-    },
-    "layouts": {
-        "LAYOUT_60": {
-            "layout": [
-                {"matrix": [0, 2], "x": 0, "y": 0},
-                {"matrix": [0, 3], "x": 1, "y": 0},
-                {"matrix": [0, 4], "x": 2, "y": 0},
-                {"matrix": [0, 5], "x": 3, "y": 0},
-                {"matrix": [0, 6], "x": 4, "y": 0},
-                {"matrix": [0, 7], "x": 5, "y": 0},
-                {"matrix": [0, 8], "x": 6, "y": 0},
-
-                {"matrix": [5, 0], "x": 8, "y": 0},
-                {"matrix": [5, 1], "x": 9, "y": 0},
-                {"matrix": [5, 2], "x": 10, "y": 0},
-                {"matrix": [5, 3], "x": 11, "y": 0},
-                {"matrix": [5, 4], "x": 12, "y": 0},
-                {"matrix": [5, 5], "x": 13, "y": 0},
-                {"matrix": [5, 6], "x": 14, "y": 0},
-                {"matrix": [5, 7], "x": 15, "y": 0},
-
-                {"matrix": [1, 2], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 3], "x": 1.5, "y": 1},
-                {"matrix": [1, 4], "x": 2.5, "y": 1},
-                {"matrix": [1, 5], "x": 3.5, "y": 1},
-                {"matrix": [1, 6], "x": 4.5, "y": 1},
-                {"matrix": [1, 7], "x": 5.5, "y": 1},
-
-                {"matrix": [6, 0], "x": 7.5, "y": 1},
-                {"matrix": [6, 1], "x": 8.5, "y": 1},
-                {"matrix": [6, 2], "x": 9.5, "y": 1},
-                {"matrix": [6, 3], "x": 10.5, "y": 1},
-                {"matrix": [6, 4], "x": 11.5, "y": 1},
-                {"matrix": [6, 5], "x": 12.5, "y": 1},
-                {"matrix": [6, 6], "x": 13.5, "y": 1},
-                {"matrix": [6, 7], "x": 14.5, "y": 1, "w": 1.5},
-
-                {"matrix": [2, 2], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 3], "x": 1.75, "y": 2},
-                {"matrix": [2, 4], "x": 2.75, "y": 2},
-                {"matrix": [2, 5], "x": 3.75, "y": 2},
-                {"matrix": [2, 6], "x": 4.75, "y": 2},
-                {"matrix": [2, 7], "x": 5.75, "y": 2},
-
-                {"matrix": [7, 0], "x": 7.75, "y": 2},
-                {"matrix": [7, 1], "x": 8.75, "y": 2},
-                {"matrix": [7, 2], "x": 9.75, "y": 2},
-                {"matrix": [7, 3], "x": 10.75, "y": 2},
-                {"matrix": [7, 4], "x": 11.75, "y": 2},
-                {"matrix": [7, 5], "x": 12.75, "y": 2},
-                {"matrix": [7, 7], "x": 13.75, "y": 2, "w": 2.25},
-
-                {"matrix": [3, 2], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 4], "x": 2.25, "y": 3},
-                {"matrix": [3, 5], "x": 3.25, "y": 3},
-                {"matrix": [3, 6], "x": 4.25, "y": 3},
-                {"matrix": [3, 7], "x": 5.25, "y": 3},
-                {"matrix": [3, 8], "x": 6.25, "y": 3},
-
-                {"matrix": [8, 0], "x": 8.25, "y": 3},
-                {"matrix": [8, 1], "x": 9.25, "y": 3},
-                {"matrix": [8, 2], "x": 10.25, "y": 3},
-                {"matrix": [8, 3], "x": 11.25, "y": 3},
-                {"matrix": [8, 4], "x": 12.25, "y": 3},
-                {"matrix": [8, 6], "x": 13.25, "y": 3, "w": 1.75},
-                {"matrix": [8, 7], "x": 15, "y": 3},
-
-                {"matrix": [4, 2], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 3], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 4], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 1.25},
-                {"matrix": [4, 7], "x": 5, "y": 4, "w": 2.25},
-
-                {"matrix": [9, 0], "x": 8.25, "y": 4, "w": 1.25},
-                {"matrix": [9, 1], "x": 9.5, "y": 4, "w": 1.5},
-                {"matrix": [9, 2], "x": 11, "y": 4},
-                {"matrix": [9, 3], "x": 12, "y": 4},
-                {"matrix": [9, 4], "x": 13, "y": 4},
-                {"matrix": [9, 6], "x": 14, "y": 4},
-                {"matrix": [9, 7], "x": 15, "y": 4}
-            ]
-        },
-        "LAYOUT_65": {
-            "layout": [
-                {"matrix": [0, 2], "x": 0, "y": 0},
-                {"matrix": [0, 3], "x": 1, "y": 0},
-                {"matrix": [0, 4], "x": 2, "y": 0},
-                {"matrix": [0, 5], "x": 3, "y": 0},
-                {"matrix": [0, 6], "x": 4, "y": 0},
-                {"matrix": [0, 7], "x": 5, "y": 0},
-                {"matrix": [0, 8], "x": 6, "y": 0},
-
-                {"matrix": [5, 0], "x": 8, "y": 0},
-                {"matrix": [5, 1], "x": 9, "y": 0},
-                {"matrix": [5, 2], "x": 10, "y": 0},
-                {"matrix": [5, 3], "x": 11, "y": 0},
-                {"matrix": [5, 4], "x": 12, "y": 0},
-                {"matrix": [5, 5], "x": 13, "y": 0},
-                {"matrix": [5, 6], "x": 14, "y": 0},
-                {"matrix": [5, 7], "x": 15, "y": 0},
-                {"matrix": [5, 8], "x": 16, "y": 0},
-
-                {"matrix": [1, 2], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 3], "x": 1.5, "y": 1},
-                {"matrix": [1, 4], "x": 2.5, "y": 1},
-                {"matrix": [1, 5], "x": 3.5, "y": 1},
-                {"matrix": [1, 6], "x": 4.5, "y": 1},
-                {"matrix": [1, 7], "x": 5.5, "y": 1},
-
-                {"matrix": [6, 0], "x": 7.5, "y": 1},
-                {"matrix": [6, 1], "x": 8.5, "y": 1},
-                {"matrix": [6, 2], "x": 9.5, "y": 1},
-                {"matrix": [6, 3], "x": 10.5, "y": 1},
-                {"matrix": [6, 4], "x": 11.5, "y": 1},
-                {"matrix": [6, 5], "x": 12.5, "y": 1},
-                {"matrix": [6, 6], "x": 13.5, "y": 1},
-                {"matrix": [6, 7], "x": 14.5, "y": 1, "w": 1.5},
-                {"matrix": [6, 8], "x": 16, "y": 1},
-
-                {"matrix": [2, 2], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 3], "x": 1.75, "y": 2},
-                {"matrix": [2, 4], "x": 2.75, "y": 2},
-                {"matrix": [2, 5], "x": 3.75, "y": 2},
-                {"matrix": [2, 6], "x": 4.75, "y": 2},
-                {"matrix": [2, 7], "x": 5.75, "y": 2},
-
-                {"matrix": [7, 0], "x": 7.75, "y": 2},
-                {"matrix": [7, 1], "x": 8.75, "y": 2},
-                {"matrix": [7, 2], "x": 9.75, "y": 2},
-                {"matrix": [7, 3], "x": 10.75, "y": 2},
-                {"matrix": [7, 4], "x": 11.75, "y": 2},
-                {"matrix": [7, 5], "x": 12.75, "y": 2},
-                {"matrix": [7, 7], "x": 13.75, "y": 2, "w": 2.25},
-                {"matrix": [7, 8], "x": 16, "y": 2},
-
-                {"matrix": [3, 2], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 4], "x": 2.25, "y": 3},
-                {"matrix": [3, 5], "x": 3.25, "y": 3},
-                {"matrix": [3, 6], "x": 4.25, "y": 3},
-                {"matrix": [3, 7], "x": 5.25, "y": 3},
-                {"matrix": [3, 8], "x": 6.25, "y": 3},
-
-                {"matrix": [8, 0], "x": 8.25, "y": 3},
-                {"matrix": [8, 1], "x": 9.25, "y": 3},
-                {"matrix": [8, 2], "x": 10.25, "y": 3},
-                {"matrix": [8, 3], "x": 11.25, "y": 3},
-                {"matrix": [8, 4], "x": 12.25, "y": 3},
-                {"matrix": [8, 6], "x": 13.25, "y": 3, "w": 1.75},
-                {"matrix": [8, 7], "x": 15, "y": 3},
-                {"matrix": [8, 8], "x": 16, "y": 3},
-
-                {"matrix": [4, 2], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 3], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 4], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 1.25},
-                {"matrix": [4, 7], "x": 5, "y": 4, "w": 2.25},
-
-                {"matrix": [9, 0], "x": 8.25, "y": 4, "w": 1.25},
-                {"matrix": [9, 1], "x": 9.5, "y": 4, "w": 1.5},
-                {"matrix": [9, 2], "x": 11, "y": 4},
-                {"matrix": [9, 3], "x": 12, "y": 4},
-                {"matrix": [9, 4], "x": 13, "y": 4},
-                {"matrix": [9, 6], "x": 14, "y": 4},
-                {"matrix": [9, 7], "x": 15, "y": 4},
-                {"matrix": [9, 8], "x": 16, "y": 4}
-            ]
-        },
-        "LAYOUT_60_with_macro": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2.25, "y": 0},
-                {"matrix": [0, 3], "x": 3.25, "y": 0},
-                {"matrix": [0, 4], "x": 4.25, "y": 0},
-                {"matrix": [0, 5], "x": 5.25, "y": 0},
-                {"matrix": [0, 6], "x": 6.25, "y": 0},
-                {"matrix": [0, 7], "x": 7.25, "y": 0},
-                {"matrix": [0, 8], "x": 8.25, "y": 0},
-
-                {"matrix": [5, 0], "x": 10.25, "y": 0},
-                {"matrix": [5, 1], "x": 11.25, "y": 0},
-                {"matrix": [5, 2], "x": 12.25, "y": 0},
-                {"matrix": [5, 3], "x": 13.25, "y": 0},
-                {"matrix": [5, 4], "x": 14.25, "y": 0},
-                {"matrix": [5, 5], "x": 15.25, "y": 0},
-                {"matrix": [5, 6], "x": 16.25, "y": 0},
-                {"matrix": [5, 7], "x": 17.25, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1},
-                {"matrix": [1, 1], "x": 1, "y": 1},
-                {"matrix": [1, 2], "x": 2.25, "y": 1, "w": 1.5},
-                {"matrix": [1, 3], "x": 3.75, "y": 1},
-                {"matrix": [1, 4], "x": 4.75, "y": 1},
-                {"matrix": [1, 5], "x": 5.75, "y": 1},
-                {"matrix": [1, 6], "x": 6.75, "y": 1},
-                {"matrix": [1, 7], "x": 7.75, "y": 1},
-
-                {"matrix": [6, 0], "x": 9.75, "y": 1},
-                {"matrix": [6, 1], "x": 10.75, "y": 1},
-                {"matrix": [6, 2], "x": 11.75, "y": 1},
-                {"matrix": [6, 3], "x": 12.75, "y": 1},
-                {"matrix": [6, 4], "x": 13.75, "y": 1},
-                {"matrix": [6, 5], "x": 14.75, "y": 1},
-                {"matrix": [6, 6], "x": 15.75, "y": 1},
-                {"matrix": [6, 7], "x": 16.75, "y": 1, "w": 1.5},
-
-                {"matrix": [2, 0], "x": 0, "y": 2},
-                {"matrix": [2, 1], "x": 1, "y": 2},
-                {"matrix": [2, 2], "x": 2.25, "y": 2, "w": 1.75},
-                {"matrix": [2, 3], "x": 4, "y": 2},
-                {"matrix": [2, 4], "x": 5, "y": 2},
-                {"matrix": [2, 5], "x": 6, "y": 2},
-                {"matrix": [2, 6], "x": 7, "y": 2},
-                {"matrix": [2, 7], "x": 8, "y": 2},
-
-                {"matrix": [7, 0], "x": 10, "y": 2},
-                {"matrix": [7, 1], "x": 11, "y": 2},
-                {"matrix": [7, 2], "x": 12, "y": 2},
-                {"matrix": [7, 3], "x": 13, "y": 2},
-                {"matrix": [7, 4], "x": 14, "y": 2},
-                {"matrix": [7, 5], "x": 15, "y": 2},
-                {"matrix": [7, 7], "x": 16, "y": 2, "w": 2.25},
-
-                {"matrix": [3, 0], "x": 0, "y": 3},
-                {"matrix": [3, 1], "x": 1, "y": 3},
-                {"matrix": [3, 2], "x": 2.25, "y": 3, "w": 2.25},
-                {"matrix": [3, 4], "x": 4.5, "y": 3},
-                {"matrix": [3, 5], "x": 5.5, "y": 3},
-                {"matrix": [3, 6], "x": 6.5, "y": 3},
-                {"matrix": [3, 7], "x": 7.5, "y": 3},
-                {"matrix": [3, 8], "x": 8.5, "y": 3},
-
-                {"matrix": [8, 0], "x": 10.5, "y": 3},
-                {"matrix": [8, 1], "x": 11.5, "y": 3},
-                {"matrix": [8, 2], "x": 12.5, "y": 3},
-                {"matrix": [8, 3], "x": 13.5, "y": 3},
-                {"matrix": [8, 4], "x": 14.5, "y": 3},
-                {"matrix": [8, 6], "x": 15.5, "y": 3, "w": 1.75},
-                {"matrix": [8, 7], "x": 17.25, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4},
-                {"matrix": [4, 1], "x": 1, "y": 4},
-                {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 3], "x": 3.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 4], "x": 4.75, "y": 4, "w": 1.25},
-                {"matrix": [4, 5], "x": 6, "y": 4, "w": 1.25},
-                {"matrix": [4, 7], "x": 7.25, "y": 4, "w": 2.25},
-
-                {"matrix": [9, 0], "x": 10.5, "y": 4, "w": 1.25},
-                {"matrix": [9, 1], "x": 11.75, "y": 4, "w": 1.5},
-                {"matrix": [9, 2], "x": 13.25, "y": 4},
-                {"matrix": [9, 3], "x": 14.25, "y": 4},
-                {"matrix": [9, 4], "x": 15.25, "y": 4},
-                {"matrix": [9, 6], "x": 16.25, "y": 4},
-                {"matrix": [9, 7], "x": 17.25, "y": 4}
-            ]
-        },
-        "LAYOUT_65_with_macro": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2.25, "y": 0},
-                {"matrix": [0, 3], "x": 3.25, "y": 0},
-                {"matrix": [0, 4], "x": 4.25, "y": 0},
-                {"matrix": [0, 5], "x": 5.25, "y": 0},
-                {"matrix": [0, 6], "x": 6.25, "y": 0},
-                {"matrix": [0, 7], "x": 7.25, "y": 0},
-                {"matrix": [0, 8], "x": 8.25, "y": 0},
-
-                {"matrix": [5, 0], "x": 10.25, "y": 0},
-                {"matrix": [5, 1], "x": 11.25, "y": 0},
-                {"matrix": [5, 2], "x": 12.25, "y": 0},
-                {"matrix": [5, 3], "x": 13.25, "y": 0},
-                {"matrix": [5, 4], "x": 14.25, "y": 0},
-                {"matrix": [5, 5], "x": 15.25, "y": 0},
-                {"matrix": [5, 6], "x": 16.25, "y": 0},
-                {"matrix": [5, 7], "x": 17.25, "y": 0},
-                {"matrix": [5, 8], "x": 18.25, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1},
-                {"matrix": [1, 1], "x": 1, "y": 1},
-                {"matrix": [1, 2], "x": 2.25, "y": 1, "w": 1.5},
-                {"matrix": [1, 3], "x": 3.75, "y": 1},
-                {"matrix": [1, 4], "x": 4.75, "y": 1},
-                {"matrix": [1, 5], "x": 5.75, "y": 1},
-                {"matrix": [1, 6], "x": 6.75, "y": 1},
-                {"matrix": [1, 7], "x": 7.75, "y": 1},
-
-                {"matrix": [6, 0], "x": 9.75, "y": 1},
-                {"matrix": [6, 1], "x": 10.75, "y": 1},
-                {"matrix": [6, 2], "x": 11.75, "y": 1},
-                {"matrix": [6, 3], "x": 12.75, "y": 1},
-                {"matrix": [6, 4], "x": 13.75, "y": 1},
-                {"matrix": [6, 5], "x": 14.75, "y": 1},
-                {"matrix": [6, 6], "x": 15.75, "y": 1},
-                {"matrix": [6, 7], "x": 16.75, "y": 1, "w": 1.5},
-                {"matrix": [6, 8], "x": 18.25, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2},
-                {"matrix": [2, 1], "x": 1, "y": 2},
-                {"matrix": [2, 2], "x": 2.25, "y": 2, "w": 1.75},
-                {"matrix": [2, 3], "x": 4, "y": 2},
-                {"matrix": [2, 4], "x": 5, "y": 2},
-                {"matrix": [2, 5], "x": 6, "y": 2},
-                {"matrix": [2, 6], "x": 7, "y": 2},
-                {"matrix": [2, 7], "x": 8, "y": 2},
-
-                {"matrix": [7, 0], "x": 10, "y": 2},
-                {"matrix": [7, 1], "x": 11, "y": 2},
-                {"matrix": [7, 2], "x": 12, "y": 2},
-                {"matrix": [7, 3], "x": 13, "y": 2},
-                {"matrix": [7, 4], "x": 14, "y": 2},
-                {"matrix": [7, 5], "x": 15, "y": 2},
-                {"matrix": [7, 7], "x": 16, "y": 2, "w": 2.25},
-                {"matrix": [7, 8], "x": 18.25, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3},
-                {"matrix": [3, 1], "x": 1, "y": 3},
-                {"matrix": [3, 2], "x": 2.25, "y": 3, "w": 2.25},
-                {"matrix": [3, 4], "x": 4.5, "y": 3},
-                {"matrix": [3, 5], "x": 5.5, "y": 3},
-                {"matrix": [3, 6], "x": 6.5, "y": 3},
-                {"matrix": [3, 7], "x": 7.5, "y": 3},
-                {"matrix": [3, 8], "x": 8.5, "y": 3},
-
-                {"matrix": [8, 0], "x": 10.5, "y": 3},
-                {"matrix": [8, 1], "x": 11.5, "y": 3},
-                {"matrix": [8, 2], "x": 12.5, "y": 3},
-                {"matrix": [8, 3], "x": 13.5, "y": 3},
-                {"matrix": [8, 4], "x": 14.5, "y": 3},
-                {"matrix": [8, 6], "x": 15.5, "y": 3, "w": 1.75},
-                {"matrix": [8, 7], "x": 17.25, "y": 3},
-                {"matrix": [8, 8], "x": 18.25, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4},
-                {"matrix": [4, 1], "x": 1, "y": 4},
-                {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 3], "x": 3.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 4], "x": 4.75, "y": 4, "w": 1.25},
-                {"matrix": [4, 5], "x": 6, "y": 4, "w": 1.25},
-                {"matrix": [4, 7], "x": 7.25, "y": 4, "w": 2.25},
-
-                {"matrix": [9, 0], "x": 10.5, "y": 4, "w": 1.25},
-                {"matrix": [9, 1], "x": 11.75, "y": 4, "w": 1.5},
-                {"matrix": [9, 2], "x": 13.25, "y": 4},
-                {"matrix": [9, 3], "x": 14.25, "y": 4},
-                {"matrix": [9, 4], "x": 15.25, "y": 4},
-                {"matrix": [9, 6], "x": 16.25, "y": 4},
-                {"matrix": [9, 7], "x": 17.25, "y": 4},
-                {"matrix": [9, 8], "x": 18.25, "y": 4}
-            ]
-        },
-        "LAYOUT_all": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2.25, "y": 0},
-                {"matrix": [0, 3], "x": 3.25, "y": 0},
-                {"matrix": [0, 4], "x": 4.25, "y": 0},
-                {"matrix": [0, 5], "x": 5.25, "y": 0},
-                {"matrix": [0, 6], "x": 6.25, "y": 0},
-                {"matrix": [0, 7], "x": 7.25, "y": 0},
-                {"matrix": [0, 8], "x": 8.25, "y": 0},
-
-                {"matrix": [5, 0], "x": 10.25, "y": 0},
-                {"matrix": [5, 1], "x": 11.25, "y": 0},
-                {"matrix": [5, 2], "x": 12.25, "y": 0},
-                {"matrix": [5, 3], "x": 13.25, "y": 0},
-                {"matrix": [5, 4], "x": 14.25, "y": 0},
-                {"matrix": [5, 5], "x": 15.25, "y": 0},
-                {"matrix": [5, 6], "x": 16.25, "y": 0},
-                {"matrix": [5, 7], "x": 17.25, "y": 0},
-                {"matrix": [5, 8], "x": 18.25, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1},
-                {"matrix": [1, 1], "x": 1, "y": 1},
-                {"matrix": [1, 2], "x": 2.25, "y": 1, "w": 1.5},
-                {"matrix": [1, 3], "x": 3.75, "y": 1},
-                {"matrix": [1, 4], "x": 4.75, "y": 1},
-                {"matrix": [1, 5], "x": 5.75, "y": 1},
-                {"matrix": [1, 6], "x": 6.75, "y": 1},
-                {"matrix": [1, 7], "x": 7.75, "y": 1},
-
-                {"matrix": [6, 0], "x": 9.75, "y": 1},
-                {"matrix": [6, 1], "x": 10.75, "y": 1},
-                {"matrix": [6, 2], "x": 11.75, "y": 1},
-                {"matrix": [6, 3], "x": 12.75, "y": 1},
-                {"matrix": [6, 4], "x": 13.75, "y": 1},
-                {"matrix": [6, 5], "x": 14.75, "y": 1},
-                {"matrix": [6, 6], "x": 15.75, "y": 1},
-                {"matrix": [6, 7], "x": 16.75, "y": 1, "w": 1.5},
-                {"matrix": [6, 8], "x": 18.25, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2},
-                {"matrix": [2, 1], "x": 1, "y": 2},
-                {"matrix": [2, 2], "x": 2.25, "y": 2, "w": 1.75},
-                {"matrix": [2, 3], "x": 4, "y": 2},
-                {"matrix": [2, 4], "x": 5, "y": 2},
-                {"matrix": [2, 5], "x": 6, "y": 2},
-                {"matrix": [2, 6], "x": 7, "y": 2},
-                {"matrix": [2, 7], "x": 8, "y": 2},
-
-                {"matrix": [7, 0], "x": 10, "y": 2},
-                {"matrix": [7, 1], "x": 11, "y": 2},
-                {"matrix": [7, 2], "x": 12, "y": 2},
-                {"matrix": [7, 3], "x": 13, "y": 2},
-                {"matrix": [7, 4], "x": 14, "y": 2},
-                {"matrix": [7, 5], "x": 15, "y": 2},
-                {"matrix": [7, 6], "x": 16, "y": 2},
-                {"matrix": [7, 7], "x": 17, "y": 2, "w": 1.25},
-                {"matrix": [7, 8], "x": 18.25, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3},
-                {"matrix": [3, 1], "x": 1, "y": 3},
-                {"matrix": [3, 2], "x": 2.25, "y": 3, "w": 1.25},
-                {"matrix": [3, 3], "x": 3.5, "y": 3},
-                {"matrix": [3, 4], "x": 4.5, "y": 3},
-                {"matrix": [3, 5], "x": 5.5, "y": 3},
-                {"matrix": [3, 6], "x": 6.5, "y": 3},
-                {"matrix": [3, 7], "x": 7.5, "y": 3},
-                {"matrix": [3, 8], "x": 8.5, "y": 3},
-
-                {"matrix": [8, 0], "x": 10.5, "y": 3},
-                {"matrix": [8, 1], "x": 11.5, "y": 3},
-                {"matrix": [8, 2], "x": 12.5, "y": 3},
-                {"matrix": [8, 3], "x": 13.5, "y": 3},
-                {"matrix": [8, 4], "x": 14.5, "y": 3},
-                {"matrix": [8, 6], "x": 15.5, "y": 3, "w": 1.75},
-                {"matrix": [8, 7], "x": 17.25, "y": 3},
-                {"matrix": [8, 8], "x": 18.25, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4},
-                {"matrix": [4, 1], "x": 1, "y": 4},
-                {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 3], "x": 3.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 4], "x": 4.75, "y": 4, "w": 1.25},
-                {"matrix": [4, 5], "x": 6, "y": 4, "w": 1.25},
-                {"matrix": [4, 6], "x": 7.25, "y": 4},
-                {"matrix": [4, 7], "x": 8.25, "y": 4, "w": 1.25},
-
-                {"matrix": [9, 0], "x": 10.5, "y": 4, "w": 1.25},
-                {"matrix": [9, 1], "x": 11.75, "y": 4, "w": 1.5},
-                {"matrix": [9, 2], "x": 13.25, "y": 4},
-                {"matrix": [9, 3], "x": 14.25, "y": 4},
-                {"matrix": [9, 4], "x": 15.25, "y": 4},
-                {"matrix": [9, 6], "x": 16.25, "y": 4},
-                {"matrix": [9, 7], "x": 17.25, "y": 4},
-                {"matrix": [9, 8], "x": 18.25, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/keebio/quefrency/rev5/keyboard.json b/keyboards/keebio/quefrency/rev5/keyboard.json
new file mode 100644
index 00000000000..e0fd9847720
--- /dev/null
+++ b/keyboards/keebio/quefrency/rev5/keyboard.json
@@ -0,0 +1,522 @@
+{
+    "keyboard_name": "Quefrency Rev. 5",
+    "manufacturer": "Keebio",
+    "url": "https://keeb.io",
+    "maintainer": "nooges",
+    "usb": {
+        "vid": "0xCB10",
+        "pid": "0x5357",
+        "device_version": "5.1.0"
+    },
+    "matrix_pins": {
+        "cols": ["F4", "F1", "F0", "B7", "B3", "D2", "D3", "D5", "D4"],
+        "rows": ["B1", "B2", "C7", "B4", "D7"]
+    },
+    "diode_direction": "COL2ROW",
+    "encoder": {
+        "rotary": [
+            {"pin_a": "F5", "pin_b": "F6"}
+        ]
+    },
+    "rgblight": {
+        "led_count": 16,
+        "led_map": [1, 2, 3, 12, 13, 14, 15, 0, 7, 6, 5, 4, 11, 10, 9, 8],
+        "split_count": [8, 8],
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": true,
+            "twinkle": true
+        }
+    },
+    "ws2812": {
+        "pin": "E6"
+    },
+    "split": {
+        "soft_serial_pin": "D0",
+        "encoder": {
+            "right": {
+                "rotary": [
+                    {"pin_a": "D6", "pin_b": "D4"}
+                ]
+            }
+        },
+        "matrix_pins": {
+            "right": {
+                "cols": ["F1", "F0", "F4", "F5", "F6", "D5", "C7", "D3", "B7"],
+                "rows": ["B3", "B2", "B6", "B4", "D7"]
+            }
+        }
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": false,
+        "mousekey": false,
+        "extrakey": true,
+        "rgblight": true,
+        "encoder": true
+    },
+    "build": {
+        "lto": true
+    },
+    "layout_aliases": {
+        "LAYOUT": "LAYOUT_60"
+    },
+    "layouts": {
+        "LAYOUT_60": {
+            "layout": [
+                {"matrix": [0, 2], "x": 0, "y": 0},
+                {"matrix": [0, 3], "x": 1, "y": 0},
+                {"matrix": [0, 4], "x": 2, "y": 0},
+                {"matrix": [0, 5], "x": 3, "y": 0},
+                {"matrix": [0, 6], "x": 4, "y": 0},
+                {"matrix": [0, 7], "x": 5, "y": 0},
+                {"matrix": [0, 8], "x": 6, "y": 0},
+
+                {"matrix": [5, 0], "x": 8, "y": 0},
+                {"matrix": [5, 1], "x": 9, "y": 0},
+                {"matrix": [5, 2], "x": 10, "y": 0},
+                {"matrix": [5, 3], "x": 11, "y": 0},
+                {"matrix": [5, 4], "x": 12, "y": 0},
+                {"matrix": [5, 5], "x": 13, "y": 0},
+                {"matrix": [5, 6], "x": 14, "y": 0},
+                {"matrix": [5, 7], "x": 15, "y": 0},
+
+                {"matrix": [1, 2], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 3], "x": 1.5, "y": 1},
+                {"matrix": [1, 4], "x": 2.5, "y": 1},
+                {"matrix": [1, 5], "x": 3.5, "y": 1},
+                {"matrix": [1, 6], "x": 4.5, "y": 1},
+                {"matrix": [1, 7], "x": 5.5, "y": 1},
+
+                {"matrix": [6, 0], "x": 7.5, "y": 1},
+                {"matrix": [6, 1], "x": 8.5, "y": 1},
+                {"matrix": [6, 2], "x": 9.5, "y": 1},
+                {"matrix": [6, 3], "x": 10.5, "y": 1},
+                {"matrix": [6, 4], "x": 11.5, "y": 1},
+                {"matrix": [6, 5], "x": 12.5, "y": 1},
+                {"matrix": [6, 6], "x": 13.5, "y": 1},
+                {"matrix": [6, 7], "x": 14.5, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 2], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 3], "x": 1.75, "y": 2},
+                {"matrix": [2, 4], "x": 2.75, "y": 2},
+                {"matrix": [2, 5], "x": 3.75, "y": 2},
+                {"matrix": [2, 6], "x": 4.75, "y": 2},
+                {"matrix": [2, 7], "x": 5.75, "y": 2},
+
+                {"matrix": [7, 0], "x": 7.75, "y": 2},
+                {"matrix": [7, 1], "x": 8.75, "y": 2},
+                {"matrix": [7, 2], "x": 9.75, "y": 2},
+                {"matrix": [7, 3], "x": 10.75, "y": 2},
+                {"matrix": [7, 4], "x": 11.75, "y": 2},
+                {"matrix": [7, 5], "x": 12.75, "y": 2},
+                {"matrix": [7, 7], "x": 13.75, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 2], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 4], "x": 2.25, "y": 3},
+                {"matrix": [3, 5], "x": 3.25, "y": 3},
+                {"matrix": [3, 6], "x": 4.25, "y": 3},
+                {"matrix": [3, 7], "x": 5.25, "y": 3},
+                {"matrix": [3, 8], "x": 6.25, "y": 3},
+
+                {"matrix": [8, 0], "x": 8.25, "y": 3},
+                {"matrix": [8, 1], "x": 9.25, "y": 3},
+                {"matrix": [8, 2], "x": 10.25, "y": 3},
+                {"matrix": [8, 3], "x": 11.25, "y": 3},
+                {"matrix": [8, 4], "x": 12.25, "y": 3},
+                {"matrix": [8, 6], "x": 13.25, "y": 3, "w": 1.75},
+                {"matrix": [8, 7], "x": 15, "y": 3},
+
+                {"matrix": [4, 2], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 7], "x": 5, "y": 4, "w": 2.25},
+
+                {"matrix": [9, 0], "x": 8.25, "y": 4, "w": 1.25},
+                {"matrix": [9, 1], "x": 9.5, "y": 4, "w": 1.5},
+                {"matrix": [9, 2], "x": 11, "y": 4},
+                {"matrix": [9, 3], "x": 12, "y": 4},
+                {"matrix": [9, 4], "x": 13, "y": 4},
+                {"matrix": [9, 6], "x": 14, "y": 4},
+                {"matrix": [9, 7], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_65": {
+            "layout": [
+                {"matrix": [0, 2], "x": 0, "y": 0},
+                {"matrix": [0, 3], "x": 1, "y": 0},
+                {"matrix": [0, 4], "x": 2, "y": 0},
+                {"matrix": [0, 5], "x": 3, "y": 0},
+                {"matrix": [0, 6], "x": 4, "y": 0},
+                {"matrix": [0, 7], "x": 5, "y": 0},
+                {"matrix": [0, 8], "x": 6, "y": 0},
+
+                {"matrix": [5, 0], "x": 8, "y": 0},
+                {"matrix": [5, 1], "x": 9, "y": 0},
+                {"matrix": [5, 2], "x": 10, "y": 0},
+                {"matrix": [5, 3], "x": 11, "y": 0},
+                {"matrix": [5, 4], "x": 12, "y": 0},
+                {"matrix": [5, 5], "x": 13, "y": 0},
+                {"matrix": [5, 6], "x": 14, "y": 0},
+                {"matrix": [5, 7], "x": 15, "y": 0},
+                {"matrix": [5, 8], "x": 16, "y": 0},
+
+                {"matrix": [1, 2], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 3], "x": 1.5, "y": 1},
+                {"matrix": [1, 4], "x": 2.5, "y": 1},
+                {"matrix": [1, 5], "x": 3.5, "y": 1},
+                {"matrix": [1, 6], "x": 4.5, "y": 1},
+                {"matrix": [1, 7], "x": 5.5, "y": 1},
+
+                {"matrix": [6, 0], "x": 7.5, "y": 1},
+                {"matrix": [6, 1], "x": 8.5, "y": 1},
+                {"matrix": [6, 2], "x": 9.5, "y": 1},
+                {"matrix": [6, 3], "x": 10.5, "y": 1},
+                {"matrix": [6, 4], "x": 11.5, "y": 1},
+                {"matrix": [6, 5], "x": 12.5, "y": 1},
+                {"matrix": [6, 6], "x": 13.5, "y": 1},
+                {"matrix": [6, 7], "x": 14.5, "y": 1, "w": 1.5},
+                {"matrix": [6, 8], "x": 16, "y": 1},
+
+                {"matrix": [2, 2], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 3], "x": 1.75, "y": 2},
+                {"matrix": [2, 4], "x": 2.75, "y": 2},
+                {"matrix": [2, 5], "x": 3.75, "y": 2},
+                {"matrix": [2, 6], "x": 4.75, "y": 2},
+                {"matrix": [2, 7], "x": 5.75, "y": 2},
+
+                {"matrix": [7, 0], "x": 7.75, "y": 2},
+                {"matrix": [7, 1], "x": 8.75, "y": 2},
+                {"matrix": [7, 2], "x": 9.75, "y": 2},
+                {"matrix": [7, 3], "x": 10.75, "y": 2},
+                {"matrix": [7, 4], "x": 11.75, "y": 2},
+                {"matrix": [7, 5], "x": 12.75, "y": 2},
+                {"matrix": [7, 7], "x": 13.75, "y": 2, "w": 2.25},
+                {"matrix": [7, 8], "x": 16, "y": 2},
+
+                {"matrix": [3, 2], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 4], "x": 2.25, "y": 3},
+                {"matrix": [3, 5], "x": 3.25, "y": 3},
+                {"matrix": [3, 6], "x": 4.25, "y": 3},
+                {"matrix": [3, 7], "x": 5.25, "y": 3},
+                {"matrix": [3, 8], "x": 6.25, "y": 3},
+
+                {"matrix": [8, 0], "x": 8.25, "y": 3},
+                {"matrix": [8, 1], "x": 9.25, "y": 3},
+                {"matrix": [8, 2], "x": 10.25, "y": 3},
+                {"matrix": [8, 3], "x": 11.25, "y": 3},
+                {"matrix": [8, 4], "x": 12.25, "y": 3},
+                {"matrix": [8, 6], "x": 13.25, "y": 3, "w": 1.75},
+                {"matrix": [8, 7], "x": 15, "y": 3},
+                {"matrix": [8, 8], "x": 16, "y": 3},
+
+                {"matrix": [4, 2], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 7], "x": 5, "y": 4, "w": 2.25},
+
+                {"matrix": [9, 0], "x": 8.25, "y": 4, "w": 1.25},
+                {"matrix": [9, 1], "x": 9.5, "y": 4, "w": 1.5},
+                {"matrix": [9, 2], "x": 11, "y": 4},
+                {"matrix": [9, 3], "x": 12, "y": 4},
+                {"matrix": [9, 4], "x": 13, "y": 4},
+                {"matrix": [9, 6], "x": 14, "y": 4},
+                {"matrix": [9, 7], "x": 15, "y": 4},
+                {"matrix": [9, 8], "x": 16, "y": 4}
+            ]
+        },
+        "LAYOUT_60_with_macro": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+                {"matrix": [0, 5], "x": 5.25, "y": 0},
+                {"matrix": [0, 6], "x": 6.25, "y": 0},
+                {"matrix": [0, 7], "x": 7.25, "y": 0},
+                {"matrix": [0, 8], "x": 8.25, "y": 0},
+
+                {"matrix": [5, 0], "x": 10.25, "y": 0},
+                {"matrix": [5, 1], "x": 11.25, "y": 0},
+                {"matrix": [5, 2], "x": 12.25, "y": 0},
+                {"matrix": [5, 3], "x": 13.25, "y": 0},
+                {"matrix": [5, 4], "x": 14.25, "y": 0},
+                {"matrix": [5, 5], "x": 15.25, "y": 0},
+                {"matrix": [5, 6], "x": 16.25, "y": 0},
+                {"matrix": [5, 7], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2.25, "y": 1, "w": 1.5},
+                {"matrix": [1, 3], "x": 3.75, "y": 1},
+                {"matrix": [1, 4], "x": 4.75, "y": 1},
+                {"matrix": [1, 5], "x": 5.75, "y": 1},
+                {"matrix": [1, 6], "x": 6.75, "y": 1},
+                {"matrix": [1, 7], "x": 7.75, "y": 1},
+
+                {"matrix": [6, 0], "x": 9.75, "y": 1},
+                {"matrix": [6, 1], "x": 10.75, "y": 1},
+                {"matrix": [6, 2], "x": 11.75, "y": 1},
+                {"matrix": [6, 3], "x": 12.75, "y": 1},
+                {"matrix": [6, 4], "x": 13.75, "y": 1},
+                {"matrix": [6, 5], "x": 14.75, "y": 1},
+                {"matrix": [6, 6], "x": 15.75, "y": 1},
+                {"matrix": [6, 7], "x": 16.75, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2.25, "y": 2, "w": 1.75},
+                {"matrix": [2, 3], "x": 4, "y": 2},
+                {"matrix": [2, 4], "x": 5, "y": 2},
+                {"matrix": [2, 5], "x": 6, "y": 2},
+                {"matrix": [2, 6], "x": 7, "y": 2},
+                {"matrix": [2, 7], "x": 8, "y": 2},
+
+                {"matrix": [7, 0], "x": 10, "y": 2},
+                {"matrix": [7, 1], "x": 11, "y": 2},
+                {"matrix": [7, 2], "x": 12, "y": 2},
+                {"matrix": [7, 3], "x": 13, "y": 2},
+                {"matrix": [7, 4], "x": 14, "y": 2},
+                {"matrix": [7, 5], "x": 15, "y": 2},
+                {"matrix": [7, 7], "x": 16, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3, "w": 2.25},
+                {"matrix": [3, 4], "x": 4.5, "y": 3},
+                {"matrix": [3, 5], "x": 5.5, "y": 3},
+                {"matrix": [3, 6], "x": 6.5, "y": 3},
+                {"matrix": [3, 7], "x": 7.5, "y": 3},
+                {"matrix": [3, 8], "x": 8.5, "y": 3},
+
+                {"matrix": [8, 0], "x": 10.5, "y": 3},
+                {"matrix": [8, 1], "x": 11.5, "y": 3},
+                {"matrix": [8, 2], "x": 12.5, "y": 3},
+                {"matrix": [8, 3], "x": 13.5, "y": 3},
+                {"matrix": [8, 4], "x": 14.5, "y": 3},
+                {"matrix": [8, 6], "x": 15.5, "y": 3, "w": 1.75},
+                {"matrix": [8, 7], "x": 17.25, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+                {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 3.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 4.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 6, "y": 4, "w": 1.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4, "w": 2.25},
+
+                {"matrix": [9, 0], "x": 10.5, "y": 4, "w": 1.25},
+                {"matrix": [9, 1], "x": 11.75, "y": 4, "w": 1.5},
+                {"matrix": [9, 2], "x": 13.25, "y": 4},
+                {"matrix": [9, 3], "x": 14.25, "y": 4},
+                {"matrix": [9, 4], "x": 15.25, "y": 4},
+                {"matrix": [9, 6], "x": 16.25, "y": 4},
+                {"matrix": [9, 7], "x": 17.25, "y": 4}
+            ]
+        },
+        "LAYOUT_65_with_macro": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+                {"matrix": [0, 5], "x": 5.25, "y": 0},
+                {"matrix": [0, 6], "x": 6.25, "y": 0},
+                {"matrix": [0, 7], "x": 7.25, "y": 0},
+                {"matrix": [0, 8], "x": 8.25, "y": 0},
+
+                {"matrix": [5, 0], "x": 10.25, "y": 0},
+                {"matrix": [5, 1], "x": 11.25, "y": 0},
+                {"matrix": [5, 2], "x": 12.25, "y": 0},
+                {"matrix": [5, 3], "x": 13.25, "y": 0},
+                {"matrix": [5, 4], "x": 14.25, "y": 0},
+                {"matrix": [5, 5], "x": 15.25, "y": 0},
+                {"matrix": [5, 6], "x": 16.25, "y": 0},
+                {"matrix": [5, 7], "x": 17.25, "y": 0},
+                {"matrix": [5, 8], "x": 18.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2.25, "y": 1, "w": 1.5},
+                {"matrix": [1, 3], "x": 3.75, "y": 1},
+                {"matrix": [1, 4], "x": 4.75, "y": 1},
+                {"matrix": [1, 5], "x": 5.75, "y": 1},
+                {"matrix": [1, 6], "x": 6.75, "y": 1},
+                {"matrix": [1, 7], "x": 7.75, "y": 1},
+
+                {"matrix": [6, 0], "x": 9.75, "y": 1},
+                {"matrix": [6, 1], "x": 10.75, "y": 1},
+                {"matrix": [6, 2], "x": 11.75, "y": 1},
+                {"matrix": [6, 3], "x": 12.75, "y": 1},
+                {"matrix": [6, 4], "x": 13.75, "y": 1},
+                {"matrix": [6, 5], "x": 14.75, "y": 1},
+                {"matrix": [6, 6], "x": 15.75, "y": 1},
+                {"matrix": [6, 7], "x": 16.75, "y": 1, "w": 1.5},
+                {"matrix": [6, 8], "x": 18.25, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2.25, "y": 2, "w": 1.75},
+                {"matrix": [2, 3], "x": 4, "y": 2},
+                {"matrix": [2, 4], "x": 5, "y": 2},
+                {"matrix": [2, 5], "x": 6, "y": 2},
+                {"matrix": [2, 6], "x": 7, "y": 2},
+                {"matrix": [2, 7], "x": 8, "y": 2},
+
+                {"matrix": [7, 0], "x": 10, "y": 2},
+                {"matrix": [7, 1], "x": 11, "y": 2},
+                {"matrix": [7, 2], "x": 12, "y": 2},
+                {"matrix": [7, 3], "x": 13, "y": 2},
+                {"matrix": [7, 4], "x": 14, "y": 2},
+                {"matrix": [7, 5], "x": 15, "y": 2},
+                {"matrix": [7, 7], "x": 16, "y": 2, "w": 2.25},
+                {"matrix": [7, 8], "x": 18.25, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3, "w": 2.25},
+                {"matrix": [3, 4], "x": 4.5, "y": 3},
+                {"matrix": [3, 5], "x": 5.5, "y": 3},
+                {"matrix": [3, 6], "x": 6.5, "y": 3},
+                {"matrix": [3, 7], "x": 7.5, "y": 3},
+                {"matrix": [3, 8], "x": 8.5, "y": 3},
+
+                {"matrix": [8, 0], "x": 10.5, "y": 3},
+                {"matrix": [8, 1], "x": 11.5, "y": 3},
+                {"matrix": [8, 2], "x": 12.5, "y": 3},
+                {"matrix": [8, 3], "x": 13.5, "y": 3},
+                {"matrix": [8, 4], "x": 14.5, "y": 3},
+                {"matrix": [8, 6], "x": 15.5, "y": 3, "w": 1.75},
+                {"matrix": [8, 7], "x": 17.25, "y": 3},
+                {"matrix": [8, 8], "x": 18.25, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+                {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 3.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 4.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 6, "y": 4, "w": 1.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4, "w": 2.25},
+
+                {"matrix": [9, 0], "x": 10.5, "y": 4, "w": 1.25},
+                {"matrix": [9, 1], "x": 11.75, "y": 4, "w": 1.5},
+                {"matrix": [9, 2], "x": 13.25, "y": 4},
+                {"matrix": [9, 3], "x": 14.25, "y": 4},
+                {"matrix": [9, 4], "x": 15.25, "y": 4},
+                {"matrix": [9, 6], "x": 16.25, "y": 4},
+                {"matrix": [9, 7], "x": 17.25, "y": 4},
+                {"matrix": [9, 8], "x": 18.25, "y": 4}
+            ]
+        },
+        "LAYOUT_all": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+                {"matrix": [0, 5], "x": 5.25, "y": 0},
+                {"matrix": [0, 6], "x": 6.25, "y": 0},
+                {"matrix": [0, 7], "x": 7.25, "y": 0},
+                {"matrix": [0, 8], "x": 8.25, "y": 0},
+
+                {"matrix": [5, 0], "x": 10.25, "y": 0},
+                {"matrix": [5, 1], "x": 11.25, "y": 0},
+                {"matrix": [5, 2], "x": 12.25, "y": 0},
+                {"matrix": [5, 3], "x": 13.25, "y": 0},
+                {"matrix": [5, 4], "x": 14.25, "y": 0},
+                {"matrix": [5, 5], "x": 15.25, "y": 0},
+                {"matrix": [5, 6], "x": 16.25, "y": 0},
+                {"matrix": [5, 7], "x": 17.25, "y": 0},
+                {"matrix": [5, 8], "x": 18.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2.25, "y": 1, "w": 1.5},
+                {"matrix": [1, 3], "x": 3.75, "y": 1},
+                {"matrix": [1, 4], "x": 4.75, "y": 1},
+                {"matrix": [1, 5], "x": 5.75, "y": 1},
+                {"matrix": [1, 6], "x": 6.75, "y": 1},
+                {"matrix": [1, 7], "x": 7.75, "y": 1},
+
+                {"matrix": [6, 0], "x": 9.75, "y": 1},
+                {"matrix": [6, 1], "x": 10.75, "y": 1},
+                {"matrix": [6, 2], "x": 11.75, "y": 1},
+                {"matrix": [6, 3], "x": 12.75, "y": 1},
+                {"matrix": [6, 4], "x": 13.75, "y": 1},
+                {"matrix": [6, 5], "x": 14.75, "y": 1},
+                {"matrix": [6, 6], "x": 15.75, "y": 1},
+                {"matrix": [6, 7], "x": 16.75, "y": 1, "w": 1.5},
+                {"matrix": [6, 8], "x": 18.25, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2.25, "y": 2, "w": 1.75},
+                {"matrix": [2, 3], "x": 4, "y": 2},
+                {"matrix": [2, 4], "x": 5, "y": 2},
+                {"matrix": [2, 5], "x": 6, "y": 2},
+                {"matrix": [2, 6], "x": 7, "y": 2},
+                {"matrix": [2, 7], "x": 8, "y": 2},
+
+                {"matrix": [7, 0], "x": 10, "y": 2},
+                {"matrix": [7, 1], "x": 11, "y": 2},
+                {"matrix": [7, 2], "x": 12, "y": 2},
+                {"matrix": [7, 3], "x": 13, "y": 2},
+                {"matrix": [7, 4], "x": 14, "y": 2},
+                {"matrix": [7, 5], "x": 15, "y": 2},
+                {"matrix": [7, 6], "x": 16, "y": 2},
+                {"matrix": [7, 7], "x": 17, "y": 2, "w": 1.25},
+                {"matrix": [7, 8], "x": 18.25, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3, "w": 1.25},
+                {"matrix": [3, 3], "x": 3.5, "y": 3},
+                {"matrix": [3, 4], "x": 4.5, "y": 3},
+                {"matrix": [3, 5], "x": 5.5, "y": 3},
+                {"matrix": [3, 6], "x": 6.5, "y": 3},
+                {"matrix": [3, 7], "x": 7.5, "y": 3},
+                {"matrix": [3, 8], "x": 8.5, "y": 3},
+
+                {"matrix": [8, 0], "x": 10.5, "y": 3},
+                {"matrix": [8, 1], "x": 11.5, "y": 3},
+                {"matrix": [8, 2], "x": 12.5, "y": 3},
+                {"matrix": [8, 3], "x": 13.5, "y": 3},
+                {"matrix": [8, 4], "x": 14.5, "y": 3},
+                {"matrix": [8, 6], "x": 15.5, "y": 3, "w": 1.75},
+                {"matrix": [8, 7], "x": 17.25, "y": 3},
+                {"matrix": [8, 8], "x": 18.25, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+                {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 3.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 4.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 6, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 7.25, "y": 4},
+                {"matrix": [4, 7], "x": 8.25, "y": 4, "w": 1.25},
+
+                {"matrix": [9, 0], "x": 10.5, "y": 4, "w": 1.25},
+                {"matrix": [9, 1], "x": 11.75, "y": 4, "w": 1.5},
+                {"matrix": [9, 2], "x": 13.25, "y": 4},
+                {"matrix": [9, 3], "x": 14.25, "y": 4},
+                {"matrix": [9, 4], "x": 15.25, "y": 4},
+                {"matrix": [9, 6], "x": 16.25, "y": 4},
+                {"matrix": [9, 7], "x": 17.25, "y": 4},
+                {"matrix": [9, 8], "x": 18.25, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/keebio/quefrency/rev5/rules.mk b/keyboards/keebio/quefrency/rev5/rules.mk
deleted file mode 100644
index ab97bd78f35..00000000000
--- a/keyboards/keebio/quefrency/rev5/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-BACKLIGHT_ENABLE = no
-RGBLIGHT_ENABLE = yes
-ENCODER_ENABLE = yes
diff --git a/keyboards/keebio/quefrency/rules.mk b/keyboards/keebio/quefrency/rules.mk
index 33c64f3d654..fb40fc8a56f 100644
--- a/keyboards/keebio/quefrency/rules.mk
+++ b/keyboards/keebio/quefrency/rules.mk
@@ -1,12 +1 @@
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-AUDIO_ENABLE = no           # Audio output
-RGBLIGHT_ENABLE = yes       # Enable WS2812 RGB underlight.
-
 DEFAULT_FOLDER = keebio/quefrency/rev1
-LTO_ENABLE = yes
diff --git a/keyboards/keebio/rorschach/rev1/info.json b/keyboards/keebio/rorschach/rev1/info.json
deleted file mode 100644
index 22a5de3b931..00000000000
--- a/keyboards/keebio/rorschach/rev1/info.json
+++ /dev/null
@@ -1,113 +0,0 @@
-{
-  "keyboard_name": "Rorschach Rev. 1",
-  "manufacturer": "Keebio",
-  "url": "https://keeb.io",
-  "maintainer": "nooges",
-  "usb": {
-    "vid": "0xCB10",
-    "pid": "0x1246",
-    "device_version": "1.0.0"
-  },
-  "matrix_pins": {
-    "cols": ["F6", "F7", "B1", "B3", "B2", "B6"],
-    "rows": ["D7", "E6", "B4", "D2", "D4"]
-  },
-  "diode_direction": "COL2ROW",
-  "backlight": {
-    "pin": "B5",
-    "levels": 5
-  },
-  "rgblight": {
-    "saturation_steps": 8,
-    "brightness_steps": 8,
-    "led_count": 12,
-    "animations": {
-      "breathing": true,
-      "rainbow_mood": true,
-      "rainbow_swirl": true,
-      "snake": true,
-      "knight": true,
-      "christmas": true,
-      "static_gradient": true,
-      "rgb_test": true,
-      "alternating": true,
-      "twinkle": true
-    }
-  },
-  "ws2812": {
-    "pin": "D3"
-  },
-  "split": {
-    "enabled": true,
-    "soft_serial_pin": "D0"
-  },
-  "processor": "atmega32u4",
-  "bootloader": "caterina",
-  "layouts": {
-    "LAYOUT": {
-      "layout": [
-        {"matrix": [0, 0], "x": 0, "y": 0},
-        {"matrix": [0, 1], "x": 1, "y": 0},
-        {"matrix": [0, 2], "x": 2, "y": 0},
-        {"matrix": [0, 3], "x": 3, "y": 0},
-        {"matrix": [0, 4], "x": 4, "y": 0},
-        {"matrix": [0, 5], "x": 5, "y": 0},
-
-        {"matrix": [5, 5], "x": 9, "y": 0},
-        {"matrix": [5, 4], "x": 10, "y": 0},
-        {"matrix": [5, 3], "x": 11, "y": 0},
-        {"matrix": [5, 2], "x": 12, "y": 0},
-        {"matrix": [5, 1], "x": 13, "y": 0},
-        {"matrix": [5, 0], "x": 14, "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": [1, 4], "x": 4, "y": 1},
-        {"matrix": [1, 5], "x": 5, "y": 1},
-
-        {"matrix": [6, 5], "x": 9, "y": 1},
-        {"matrix": [6, 4], "x": 10, "y": 1},
-        {"matrix": [6, 3], "x": 11, "y": 1},
-        {"matrix": [6, 2], "x": 12, "y": 1},
-        {"matrix": [6, 1], "x": 13, "y": 1},
-        {"matrix": [6, 0], "x": 14, "y": 1},
-
-        {"matrix": [2, 0], "x": 0, "y": 2},
-        {"matrix": [2, 1], "x": 1, "y": 2},
-        {"matrix": [2, 2], "x": 2, "y": 2},
-        {"matrix": [2, 3], "x": 3, "y": 2},
-        {"matrix": [2, 4], "x": 4, "y": 2},
-        {"matrix": [2, 5], "x": 5, "y": 2},
-
-        {"matrix": [7, 5], "x": 9, "y": 2},
-        {"matrix": [7, 4], "x": 10, "y": 2},
-        {"matrix": [7, 3], "x": 11, "y": 2},
-        {"matrix": [7, 2], "x": 12, "y": 2},
-        {"matrix": [7, 1], "x": 13, "y": 2},
-        {"matrix": [7, 0], "x": 14, "y": 2},
-
-        {"matrix": [3, 0], "x": 0, "y": 3},
-        {"matrix": [3, 1], "x": 1, "y": 3},
-        {"matrix": [3, 2], "x": 2, "y": 3},
-        {"matrix": [3, 3], "x": 3, "y": 3},
-        {"matrix": [3, 4], "x": 4, "y": 3},
-        {"matrix": [3, 5], "x": 5, "y": 3},
-
-        {"matrix": [8, 5], "x": 9, "y": 3},
-        {"matrix": [8, 4], "x": 10, "y": 3},
-        {"matrix": [8, 3], "x": 11, "y": 3},
-        {"matrix": [8, 2], "x": 12, "y": 3},
-        {"matrix": [8, 1], "x": 13, "y": 3},
-        {"matrix": [8, 0], "x": 14, "y": 3},
-
-        {"matrix": [4, 4], "x": 5.5, "y": 4},
-        {"matrix": [4, 5], "x": 6, "y": 5},
-
-        {"matrix": [9, 5], "x": 8, "y": 5},
-        {"matrix": [9, 4], "x": 8.5, "y": 4}
-      ]
-    }
-  }
-}
diff --git a/keyboards/keebio/rorschach/rev1/keyboard.json b/keyboards/keebio/rorschach/rev1/keyboard.json
new file mode 100644
index 00000000000..f7ea8fccc22
--- /dev/null
+++ b/keyboards/keebio/rorschach/rev1/keyboard.json
@@ -0,0 +1,121 @@
+{
+  "keyboard_name": "Rorschach Rev. 1",
+  "manufacturer": "Keebio",
+  "url": "https://keeb.io",
+  "maintainer": "nooges",
+  "usb": {
+    "vid": "0xCB10",
+    "pid": "0x1246",
+    "device_version": "1.0.0"
+  },
+  "matrix_pins": {
+    "cols": ["F6", "F7", "B1", "B3", "B2", "B6"],
+    "rows": ["D7", "E6", "B4", "D2", "D4"]
+  },
+  "diode_direction": "COL2ROW",
+  "backlight": {
+    "pin": "B5",
+    "levels": 5
+  },
+  "rgblight": {
+    "saturation_steps": 8,
+    "brightness_steps": 8,
+    "led_count": 12,
+    "animations": {
+      "breathing": true,
+      "rainbow_mood": true,
+      "rainbow_swirl": true,
+      "snake": true,
+      "knight": true,
+      "christmas": true,
+      "static_gradient": true,
+      "rgb_test": true,
+      "alternating": true,
+      "twinkle": true
+    }
+  },
+  "ws2812": {
+    "pin": "D3"
+  },
+  "split": {
+    "enabled": true,
+    "soft_serial_pin": "D0"
+  },
+  "processor": "atmega32u4",
+  "bootloader": "caterina",
+  "features": {
+    "bootmagic": false,
+    "mousekey": true,
+    "extrakey": true,
+    "command": true,
+    "backlight": true,
+    "rgblight": true
+  },
+  "layouts": {
+    "LAYOUT": {
+      "layout": [
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0},
+        {"matrix": [0, 5], "x": 5, "y": 0},
+
+        {"matrix": [5, 5], "x": 9, "y": 0},
+        {"matrix": [5, 4], "x": 10, "y": 0},
+        {"matrix": [5, 3], "x": 11, "y": 0},
+        {"matrix": [5, 2], "x": 12, "y": 0},
+        {"matrix": [5, 1], "x": 13, "y": 0},
+        {"matrix": [5, 0], "x": 14, "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": [1, 4], "x": 4, "y": 1},
+        {"matrix": [1, 5], "x": 5, "y": 1},
+
+        {"matrix": [6, 5], "x": 9, "y": 1},
+        {"matrix": [6, 4], "x": 10, "y": 1},
+        {"matrix": [6, 3], "x": 11, "y": 1},
+        {"matrix": [6, 2], "x": 12, "y": 1},
+        {"matrix": [6, 1], "x": 13, "y": 1},
+        {"matrix": [6, 0], "x": 14, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2},
+        {"matrix": [2, 1], "x": 1, "y": 2},
+        {"matrix": [2, 2], "x": 2, "y": 2},
+        {"matrix": [2, 3], "x": 3, "y": 2},
+        {"matrix": [2, 4], "x": 4, "y": 2},
+        {"matrix": [2, 5], "x": 5, "y": 2},
+
+        {"matrix": [7, 5], "x": 9, "y": 2},
+        {"matrix": [7, 4], "x": 10, "y": 2},
+        {"matrix": [7, 3], "x": 11, "y": 2},
+        {"matrix": [7, 2], "x": 12, "y": 2},
+        {"matrix": [7, 1], "x": 13, "y": 2},
+        {"matrix": [7, 0], "x": 14, "y": 2},
+
+        {"matrix": [3, 0], "x": 0, "y": 3},
+        {"matrix": [3, 1], "x": 1, "y": 3},
+        {"matrix": [3, 2], "x": 2, "y": 3},
+        {"matrix": [3, 3], "x": 3, "y": 3},
+        {"matrix": [3, 4], "x": 4, "y": 3},
+        {"matrix": [3, 5], "x": 5, "y": 3},
+
+        {"matrix": [8, 5], "x": 9, "y": 3},
+        {"matrix": [8, 4], "x": 10, "y": 3},
+        {"matrix": [8, 3], "x": 11, "y": 3},
+        {"matrix": [8, 2], "x": 12, "y": 3},
+        {"matrix": [8, 1], "x": 13, "y": 3},
+        {"matrix": [8, 0], "x": 14, "y": 3},
+
+        {"matrix": [4, 4], "x": 5.5, "y": 4},
+        {"matrix": [4, 5], "x": 6, "y": 5},
+
+        {"matrix": [9, 5], "x": 8, "y": 5},
+        {"matrix": [9, 4], "x": 8.5, "y": 4}
+      ]
+    }
+  }
+}
diff --git a/keyboards/keebio/rorschach/rev1/rules.mk b/keyboards/keebio/rorschach/rev1/rules.mk
deleted file mode 100644
index bd518d8f273..00000000000
--- a/keyboards/keebio/rorschach/rev1/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-BACKLIGHT_ENABLE = yes
diff --git a/keyboards/keebio/rorschach/rules.mk b/keyboards/keebio/rorschach/rules.mk
index 59170f1516a..6cdac68a4e0 100644
--- a/keyboards/keebio/rorschach/rules.mk
+++ b/keyboards/keebio/rorschach/rules.mk
@@ -1,14 +1 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
-AUDIO_ENABLE = no           # Audio output
-RGBLIGHT_ENABLE = yes       # Enable WS2812 RGB underlight.
-
 DEFAULT_FOLDER = keebio/rorschach/rev1
diff --git a/keyboards/keebio/sinc/rev3/info.json b/keyboards/keebio/sinc/rev3/keyboard.json
similarity index 100%
rename from keyboards/keebio/sinc/rev3/info.json
rename to keyboards/keebio/sinc/rev3/keyboard.json
diff --git a/keyboards/keebio/sinc/rev4/info.json b/keyboards/keebio/sinc/rev4/keyboard.json
similarity index 100%
rename from keyboards/keebio/sinc/rev4/info.json
rename to keyboards/keebio/sinc/rev4/keyboard.json
diff --git a/keyboards/keebio/viterbi/rev1/info.json b/keyboards/keebio/viterbi/rev1/info.json
deleted file mode 100644
index a003331f25d..00000000000
--- a/keyboards/keebio/viterbi/rev1/info.json
+++ /dev/null
@@ -1,110 +0,0 @@
-{
-    "keyboard_name": "Viterbi Rev. 1",
-    "split": {
-        "soft_serial_pin": "D0"
-    },
-    "usb": {
-        "pid": "0x1157",
-        "device_version": "1.0.0"
-    },
-    "rgblight": {
-        "led_count": 14,
-        "split_count": [7, 7]
-    },
-    "ws2812": {
-        "pin": "D3"
-    },
-    "matrix_pins": {
-        "cols": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"],
-        "rows": ["D4", "D7", "E6", "B4", "B5"]
-    },
-    "diode_direction": "COL2ROW",
-    "layout_aliases": {
-        "LAYOUT": "LAYOUT_ortho_5x14"
-    },
-    "layouts": {
-        "LAYOUT_ortho_5x14": {
-            "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": [5, 6], "x": 8, "y": 0},
-                {"matrix": [5, 5], "x": 9, "y": 0},
-                {"matrix": [5, 4], "x": 10, "y": 0},
-                {"matrix": [5, 3], "x": 11, "y": 0},
-                {"matrix": [5, 2], "x": 12, "y": 0},
-                {"matrix": [5, 1], "x": 13, "y": 0},
-                {"matrix": [5, 0], "x": 14, "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": [1, 4], "x": 4, "y": 1},
-                {"matrix": [1, 5], "x": 5, "y": 1},
-                {"matrix": [1, 6], "x": 6, "y": 1},
-
-                {"matrix": [6, 6], "x": 8, "y": 1},
-                {"matrix": [6, 5], "x": 9, "y": 1},
-                {"matrix": [6, 4], "x": 10, "y": 1},
-                {"matrix": [6, 3], "x": 11, "y": 1},
-                {"matrix": [6, 2], "x": 12, "y": 1},
-                {"matrix": [6, 1], "x": 13, "y": 1},
-                {"matrix": [6, 0], "x": 14, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2},
-                {"matrix": [2, 1], "x": 1, "y": 2},
-                {"matrix": [2, 2], "x": 2, "y": 2},
-                {"matrix": [2, 3], "x": 3, "y": 2},
-                {"matrix": [2, 4], "x": 4, "y": 2},
-                {"matrix": [2, 5], "x": 5, "y": 2},
-                {"matrix": [2, 6], "x": 6, "y": 2},
-
-                {"matrix": [7, 6], "x": 8, "y": 2},
-                {"matrix": [7, 5], "x": 9, "y": 2},
-                {"matrix": [7, 4], "x": 10, "y": 2},
-                {"matrix": [7, 3], "x": 11, "y": 2},
-                {"matrix": [7, 2], "x": 12, "y": 2},
-                {"matrix": [7, 1], "x": 13, "y": 2},
-                {"matrix": [7, 0], "x": 14, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3},
-                {"matrix": [3, 1], "x": 1, "y": 3},
-                {"matrix": [3, 2], "x": 2, "y": 3},
-                {"matrix": [3, 3], "x": 3, "y": 3},
-                {"matrix": [3, 4], "x": 4, "y": 3},
-                {"matrix": [3, 5], "x": 5, "y": 3},
-                {"matrix": [3, 6], "x": 6, "y": 3},
-
-                {"matrix": [8, 6], "x": 8, "y": 3},
-                {"matrix": [8, 5], "x": 9, "y": 3},
-                {"matrix": [8, 4], "x": 10, "y": 3},
-                {"matrix": [8, 3], "x": 11, "y": 3},
-                {"matrix": [8, 2], "x": 12, "y": 3},
-                {"matrix": [8, 1], "x": 13, "y": 3},
-                {"matrix": [8, 0], "x": 14, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4},
-                {"matrix": [4, 1], "x": 1, "y": 4},
-                {"matrix": [4, 2], "x": 2, "y": 4},
-                {"matrix": [4, 3], "x": 3, "y": 4},
-                {"matrix": [4, 4], "x": 4, "y": 4},
-                {"matrix": [4, 5], "x": 5, "y": 4},
-                {"matrix": [4, 6], "x": 6, "y": 4},
-
-                {"matrix": [9, 6], "x": 8, "y": 4},
-                {"matrix": [9, 5], "x": 9, "y": 4},
-                {"matrix": [9, 4], "x": 10, "y": 4},
-                {"matrix": [9, 3], "x": 11, "y": 4},
-                {"matrix": [9, 2], "x": 12, "y": 4},
-                {"matrix": [9, 1], "x": 13, "y": 4},
-                {"matrix": [9, 0], "x": 14, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/keebio/viterbi/rev1/keyboard.json b/keyboards/keebio/viterbi/rev1/keyboard.json
new file mode 100644
index 00000000000..ebea5392486
--- /dev/null
+++ b/keyboards/keebio/viterbi/rev1/keyboard.json
@@ -0,0 +1,115 @@
+{
+    "keyboard_name": "Viterbi Rev. 1",
+    "split": {
+        "soft_serial_pin": "D0"
+    },
+    "usb": {
+        "pid": "0x1157",
+        "device_version": "1.0.0"
+    },
+    "rgblight": {
+        "led_count": 14,
+        "split_count": [7, 7]
+    },
+    "ws2812": {
+        "pin": "D3"
+    },
+    "matrix_pins": {
+        "cols": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"],
+        "rows": ["D4", "D7", "E6", "B4", "B5"]
+    },
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": false,
+        "mousekey": true,
+        "extrakey": true
+    },
+    "layout_aliases": {
+        "LAYOUT": "LAYOUT_ortho_5x14"
+    },
+    "layouts": {
+        "LAYOUT_ortho_5x14": {
+            "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": [5, 6], "x": 8, "y": 0},
+                {"matrix": [5, 5], "x": 9, "y": 0},
+                {"matrix": [5, 4], "x": 10, "y": 0},
+                {"matrix": [5, 3], "x": 11, "y": 0},
+                {"matrix": [5, 2], "x": 12, "y": 0},
+                {"matrix": [5, 1], "x": 13, "y": 0},
+                {"matrix": [5, 0], "x": 14, "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": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+
+                {"matrix": [6, 6], "x": 8, "y": 1},
+                {"matrix": [6, 5], "x": 9, "y": 1},
+                {"matrix": [6, 4], "x": 10, "y": 1},
+                {"matrix": [6, 3], "x": 11, "y": 1},
+                {"matrix": [6, 2], "x": 12, "y": 1},
+                {"matrix": [6, 1], "x": 13, "y": 1},
+                {"matrix": [6, 0], "x": 14, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [2, 6], "x": 6, "y": 2},
+
+                {"matrix": [7, 6], "x": 8, "y": 2},
+                {"matrix": [7, 5], "x": 9, "y": 2},
+                {"matrix": [7, 4], "x": 10, "y": 2},
+                {"matrix": [7, 3], "x": 11, "y": 2},
+                {"matrix": [7, 2], "x": 12, "y": 2},
+                {"matrix": [7, 1], "x": 13, "y": 2},
+                {"matrix": [7, 0], "x": 14, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
+                {"matrix": [3, 6], "x": 6, "y": 3},
+
+                {"matrix": [8, 6], "x": 8, "y": 3},
+                {"matrix": [8, 5], "x": 9, "y": 3},
+                {"matrix": [8, 4], "x": 10, "y": 3},
+                {"matrix": [8, 3], "x": 11, "y": 3},
+                {"matrix": [8, 2], "x": 12, "y": 3},
+                {"matrix": [8, 1], "x": 13, "y": 3},
+                {"matrix": [8, 0], "x": 14, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+                {"matrix": [4, 2], "x": 2, "y": 4},
+                {"matrix": [4, 3], "x": 3, "y": 4},
+                {"matrix": [4, 4], "x": 4, "y": 4},
+                {"matrix": [4, 5], "x": 5, "y": 4},
+                {"matrix": [4, 6], "x": 6, "y": 4},
+
+                {"matrix": [9, 6], "x": 8, "y": 4},
+                {"matrix": [9, 5], "x": 9, "y": 4},
+                {"matrix": [9, 4], "x": 10, "y": 4},
+                {"matrix": [9, 3], "x": 11, "y": 4},
+                {"matrix": [9, 2], "x": 12, "y": 4},
+                {"matrix": [9, 1], "x": 13, "y": 4},
+                {"matrix": [9, 0], "x": 14, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/keebio/viterbi/rev1/rules.mk b/keyboards/keebio/viterbi/rev1/rules.mk
deleted file mode 100644
index 7b30c0beff2..00000000000
--- a/keyboards/keebio/viterbi/rev1/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-BACKLIGHT_ENABLE = no
diff --git a/keyboards/keebio/viterbi/rev2/info.json b/keyboards/keebio/viterbi/rev2/info.json
deleted file mode 100644
index 88ab2cd1374..00000000000
--- a/keyboards/keebio/viterbi/rev2/info.json
+++ /dev/null
@@ -1,114 +0,0 @@
-{
-    "keyboard_name": "Viterbi Rev. 2",
-    "split": {
-        "soft_serial_pin": "D0"
-    },
-    "usb": {
-        "pid": "0x2157",
-        "device_version": "2.0.0"
-    },
-    "matrix_pins": {
-        "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"],
-        "rows": ["D4", "D7", "E6", "B4", "B5"]
-    },
-    "diode_direction": "COL2ROW",
-    "backlight": {
-        "pin": "B6",
-        "levels": 7
-    },
-    "rgblight": {
-        "led_count": 14,
-        "split_count": [7, 7]
-    },
-    "ws2812": {
-        "pin": "D3"
-    },
-    "layout_aliases": {
-        "LAYOUT": "LAYOUT_ortho_5x14"
-    },
-    "layouts": {
-        "LAYOUT_ortho_5x14": {
-            "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": [5, 6], "x": 8, "y": 0},
-                {"matrix": [5, 5], "x": 9, "y": 0},
-                {"matrix": [5, 4], "x": 10, "y": 0},
-                {"matrix": [5, 3], "x": 11, "y": 0},
-                {"matrix": [5, 2], "x": 12, "y": 0},
-                {"matrix": [5, 1], "x": 13, "y": 0},
-                {"matrix": [5, 0], "x": 14, "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": [1, 4], "x": 4, "y": 1},
-                {"matrix": [1, 5], "x": 5, "y": 1},
-                {"matrix": [1, 6], "x": 6, "y": 1},
-
-                {"matrix": [6, 6], "x": 8, "y": 1},
-                {"matrix": [6, 5], "x": 9, "y": 1},
-                {"matrix": [6, 4], "x": 10, "y": 1},
-                {"matrix": [6, 3], "x": 11, "y": 1},
-                {"matrix": [6, 2], "x": 12, "y": 1},
-                {"matrix": [6, 1], "x": 13, "y": 1},
-                {"matrix": [6, 0], "x": 14, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2},
-                {"matrix": [2, 1], "x": 1, "y": 2},
-                {"matrix": [2, 2], "x": 2, "y": 2},
-                {"matrix": [2, 3], "x": 3, "y": 2},
-                {"matrix": [2, 4], "x": 4, "y": 2},
-                {"matrix": [2, 5], "x": 5, "y": 2},
-                {"matrix": [2, 6], "x": 6, "y": 2},
-
-                {"matrix": [7, 6], "x": 8, "y": 2},
-                {"matrix": [7, 5], "x": 9, "y": 2},
-                {"matrix": [7, 4], "x": 10, "y": 2},
-                {"matrix": [7, 3], "x": 11, "y": 2},
-                {"matrix": [7, 2], "x": 12, "y": 2},
-                {"matrix": [7, 1], "x": 13, "y": 2},
-                {"matrix": [7, 0], "x": 14, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3},
-                {"matrix": [3, 1], "x": 1, "y": 3},
-                {"matrix": [3, 2], "x": 2, "y": 3},
-                {"matrix": [3, 3], "x": 3, "y": 3},
-                {"matrix": [3, 4], "x": 4, "y": 3},
-                {"matrix": [3, 5], "x": 5, "y": 3},
-                {"matrix": [3, 6], "x": 6, "y": 3},
-
-                {"matrix": [8, 6], "x": 8, "y": 3},
-                {"matrix": [8, 5], "x": 9, "y": 3},
-                {"matrix": [8, 4], "x": 10, "y": 3},
-                {"matrix": [8, 3], "x": 11, "y": 3},
-                {"matrix": [8, 2], "x": 12, "y": 3},
-                {"matrix": [8, 1], "x": 13, "y": 3},
-                {"matrix": [8, 0], "x": 14, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4},
-                {"matrix": [4, 1], "x": 1, "y": 4},
-                {"matrix": [4, 2], "x": 2, "y": 4},
-                {"matrix": [4, 3], "x": 3, "y": 4},
-                {"matrix": [4, 4], "x": 4, "y": 4},
-                {"matrix": [4, 5], "x": 5, "y": 4},
-                {"matrix": [4, 6], "x": 6, "y": 4},
-
-                {"matrix": [9, 6], "x": 8, "y": 4},
-                {"matrix": [9, 5], "x": 9, "y": 4},
-                {"matrix": [9, 4], "x": 10, "y": 4},
-                {"matrix": [9, 3], "x": 11, "y": 4},
-                {"matrix": [9, 2], "x": 12, "y": 4},
-                {"matrix": [9, 1], "x": 13, "y": 4},
-                {"matrix": [9, 0], "x": 14, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/keebio/viterbi/rev2/keyboard.json b/keyboards/keebio/viterbi/rev2/keyboard.json
new file mode 100644
index 00000000000..36570e7c7ac
--- /dev/null
+++ b/keyboards/keebio/viterbi/rev2/keyboard.json
@@ -0,0 +1,123 @@
+{
+    "keyboard_name": "Viterbi Rev. 2",
+    "split": {
+        "soft_serial_pin": "D0"
+    },
+    "usb": {
+        "pid": "0x2157",
+        "device_version": "2.0.0"
+    },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"],
+        "rows": ["D4", "D7", "E6", "B4", "B5"]
+    },
+    "diode_direction": "COL2ROW",
+    "backlight": {
+        "pin": "B6",
+        "levels": 7
+    },
+    "rgblight": {
+        "led_count": 14,
+        "split_count": [7, 7]
+    },
+    "ws2812": {
+        "pin": "D3"
+    },
+    "features": {
+        "bootmagic": false,
+        "mousekey": true,
+        "extrakey": true,
+        "backlight": true
+    },
+    "build": {
+        "lto": true
+    },
+    "layout_aliases": {
+        "LAYOUT": "LAYOUT_ortho_5x14"
+    },
+    "layouts": {
+        "LAYOUT_ortho_5x14": {
+            "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": [5, 6], "x": 8, "y": 0},
+                {"matrix": [5, 5], "x": 9, "y": 0},
+                {"matrix": [5, 4], "x": 10, "y": 0},
+                {"matrix": [5, 3], "x": 11, "y": 0},
+                {"matrix": [5, 2], "x": 12, "y": 0},
+                {"matrix": [5, 1], "x": 13, "y": 0},
+                {"matrix": [5, 0], "x": 14, "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": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+
+                {"matrix": [6, 6], "x": 8, "y": 1},
+                {"matrix": [6, 5], "x": 9, "y": 1},
+                {"matrix": [6, 4], "x": 10, "y": 1},
+                {"matrix": [6, 3], "x": 11, "y": 1},
+                {"matrix": [6, 2], "x": 12, "y": 1},
+                {"matrix": [6, 1], "x": 13, "y": 1},
+                {"matrix": [6, 0], "x": 14, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [2, 6], "x": 6, "y": 2},
+
+                {"matrix": [7, 6], "x": 8, "y": 2},
+                {"matrix": [7, 5], "x": 9, "y": 2},
+                {"matrix": [7, 4], "x": 10, "y": 2},
+                {"matrix": [7, 3], "x": 11, "y": 2},
+                {"matrix": [7, 2], "x": 12, "y": 2},
+                {"matrix": [7, 1], "x": 13, "y": 2},
+                {"matrix": [7, 0], "x": 14, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
+                {"matrix": [3, 6], "x": 6, "y": 3},
+
+                {"matrix": [8, 6], "x": 8, "y": 3},
+                {"matrix": [8, 5], "x": 9, "y": 3},
+                {"matrix": [8, 4], "x": 10, "y": 3},
+                {"matrix": [8, 3], "x": 11, "y": 3},
+                {"matrix": [8, 2], "x": 12, "y": 3},
+                {"matrix": [8, 1], "x": 13, "y": 3},
+                {"matrix": [8, 0], "x": 14, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+                {"matrix": [4, 2], "x": 2, "y": 4},
+                {"matrix": [4, 3], "x": 3, "y": 4},
+                {"matrix": [4, 4], "x": 4, "y": 4},
+                {"matrix": [4, 5], "x": 5, "y": 4},
+                {"matrix": [4, 6], "x": 6, "y": 4},
+
+                {"matrix": [9, 6], "x": 8, "y": 4},
+                {"matrix": [9, 5], "x": 9, "y": 4},
+                {"matrix": [9, 4], "x": 10, "y": 4},
+                {"matrix": [9, 3], "x": 11, "y": 4},
+                {"matrix": [9, 2], "x": 12, "y": 4},
+                {"matrix": [9, 1], "x": 13, "y": 4},
+                {"matrix": [9, 0], "x": 14, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/keebio/viterbi/rev2/rules.mk b/keyboards/keebio/viterbi/rev2/rules.mk
deleted file mode 100644
index 674318183b0..00000000000
--- a/keyboards/keebio/viterbi/rev2/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-BACKLIGHT_ENABLE = yes
-
-LTO_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/keebio/viterbi/rules.mk b/keyboards/keebio/viterbi/rules.mk
index 5192d5ba728..ecf6a3fa875 100644
--- a/keyboards/keebio/viterbi/rules.mk
+++ b/keyboards/keebio/viterbi/rules.mk
@@ -1,14 +1 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-AUDIO_ENABLE = no           # Audio output
-RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight.
-
 DEFAULT_FOLDER = keebio/viterbi/rev2
diff --git a/keyboards/keebio/wavelet/info.json b/keyboards/keebio/wavelet/info.json
deleted file mode 100644
index 3b88fcdd771..00000000000
--- a/keyboards/keebio/wavelet/info.json
+++ /dev/null
@@ -1,93 +0,0 @@
-{
-  "keyboard_name": "Wavelet",
-  "manufacturer": "Keebio",
-  "url": "https://keeb.io",
-  "maintainer": "Keebio",
-  "usb": {
-    "vid": "0xCB10",
-    "pid": "0x1046",
-    "device_version": "1.0.0"
-  },
-  "matrix_pins": {
-    "cols": ["F6", "B1", "B2", "B6", "B4", "E6"],
-    "rows": ["F4", "F5", "F7", "B3", "D2", "D1", "D4", "D7"]
-  },
-  "diode_direction": "COL2ROW",
-  "backlight": {
-    "pin": "B5",
-    "levels": 7
-  },
-  "rgblight": {
-    "led_count": 12
-  },
-  "ws2812": {
-    "pin": "D3"
-  },
-  "processor": "atmega32u4",
-  "bootloader": "caterina",
-  "community_layouts": ["ortho_4x12"],
-  "layout_aliases": {
-    "LAYOUT_ortho_4x12": "LAYOUT"
-  },
-  "layouts": {
-    "LAYOUT": {
-      "layout": [
-        {"matrix": [0, 0], "x": 0, "y": 0},
-        {"matrix": [0, 1], "x": 1, "y": 0},
-        {"matrix": [0, 2], "x": 2, "y": 0},
-        {"matrix": [0, 3], "x": 3, "y": 0},
-        {"matrix": [0, 4], "x": 4, "y": 0},
-        {"matrix": [0, 5], "x": 5, "y": 0},
-
-        {"matrix": [4, 5], "x": 6, "y": 0},
-        {"matrix": [4, 4], "x": 7, "y": 0},
-        {"matrix": [4, 3], "x": 8, "y": 0},
-        {"matrix": [4, 2], "x": 9, "y": 0},
-        {"matrix": [4, 1], "x": 10, "y": 0},
-        {"matrix": [4, 0], "x": 11, "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": [1, 4], "x": 4, "y": 1},
-        {"matrix": [1, 5], "x": 5, "y": 1},
-
-        {"matrix": [5, 5], "x": 6, "y": 1},
-        {"matrix": [5, 4], "x": 7, "y": 1},
-        {"matrix": [5, 3], "x": 8, "y": 1},
-        {"matrix": [5, 2], "x": 9, "y": 1},
-        {"matrix": [5, 1], "x": 10, "y": 1},
-        {"matrix": [5, 0], "x": 11, "y": 1},
-
-        {"matrix": [2, 0], "x": 0, "y": 2},
-        {"matrix": [2, 1], "x": 1, "y": 2},
-        {"matrix": [2, 2], "x": 2, "y": 2},
-        {"matrix": [2, 3], "x": 3, "y": 2},
-        {"matrix": [2, 4], "x": 4, "y": 2},
-        {"matrix": [2, 5], "x": 5, "y": 2},
-
-        {"matrix": [6, 5], "x": 6, "y": 2},
-        {"matrix": [6, 4], "x": 7, "y": 2},
-        {"matrix": [6, 3], "x": 8, "y": 2},
-        {"matrix": [6, 2], "x": 9, "y": 2},
-        {"matrix": [6, 1], "x": 10, "y": 2},
-        {"matrix": [6, 0], "x": 11, "y": 2},
-
-        {"matrix": [3, 0], "x": 0, "y": 3},
-        {"matrix": [3, 1], "x": 1, "y": 3},
-        {"matrix": [3, 2], "x": 2, "y": 3},
-        {"matrix": [3, 3], "x": 3, "y": 3},
-        {"matrix": [3, 4], "x": 4, "y": 3},
-        {"matrix": [3, 5], "x": 5, "y": 3},
-
-        {"matrix": [7, 5], "x": 6, "y": 3},
-        {"matrix": [7, 4], "x": 7, "y": 3},
-        {"matrix": [7, 3], "x": 8, "y": 3},
-        {"matrix": [7, 2], "x": 9, "y": 3},
-        {"matrix": [7, 1], "x": 10, "y": 3},
-        {"matrix": [7, 0], "x": 11, "y": 3}
-      ]
-    }
-  }
-}
diff --git a/keyboards/keebio/wavelet/keyboard.json b/keyboards/keebio/wavelet/keyboard.json
new file mode 100644
index 00000000000..7c87bcf4766
--- /dev/null
+++ b/keyboards/keebio/wavelet/keyboard.json
@@ -0,0 +1,101 @@
+{
+  "keyboard_name": "Wavelet",
+  "manufacturer": "Keebio",
+  "url": "https://keeb.io",
+  "maintainer": "Keebio",
+  "usb": {
+    "vid": "0xCB10",
+    "pid": "0x1046",
+    "device_version": "1.0.0"
+  },
+  "matrix_pins": {
+    "cols": ["F6", "B1", "B2", "B6", "B4", "E6"],
+    "rows": ["F4", "F5", "F7", "B3", "D2", "D1", "D4", "D7"]
+  },
+  "diode_direction": "COL2ROW",
+  "backlight": {
+    "pin": "B5",
+    "levels": 7
+  },
+  "rgblight": {
+    "led_count": 12
+  },
+  "ws2812": {
+    "pin": "D3"
+  },
+  "processor": "atmega32u4",
+  "bootloader": "caterina",
+  "features": {
+    "bootmagic": false,
+    "mousekey": true,
+    "extrakey": true,
+    "command": true,
+    "backlight": true,
+    "rgblight": true
+  },
+  "community_layouts": ["ortho_4x12"],
+  "layout_aliases": {
+    "LAYOUT_ortho_4x12": "LAYOUT"
+  },
+  "layouts": {
+    "LAYOUT": {
+      "layout": [
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0},
+        {"matrix": [0, 5], "x": 5, "y": 0},
+
+        {"matrix": [4, 5], "x": 6, "y": 0},
+        {"matrix": [4, 4], "x": 7, "y": 0},
+        {"matrix": [4, 3], "x": 8, "y": 0},
+        {"matrix": [4, 2], "x": 9, "y": 0},
+        {"matrix": [4, 1], "x": 10, "y": 0},
+        {"matrix": [4, 0], "x": 11, "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": [1, 4], "x": 4, "y": 1},
+        {"matrix": [1, 5], "x": 5, "y": 1},
+
+        {"matrix": [5, 5], "x": 6, "y": 1},
+        {"matrix": [5, 4], "x": 7, "y": 1},
+        {"matrix": [5, 3], "x": 8, "y": 1},
+        {"matrix": [5, 2], "x": 9, "y": 1},
+        {"matrix": [5, 1], "x": 10, "y": 1},
+        {"matrix": [5, 0], "x": 11, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2},
+        {"matrix": [2, 1], "x": 1, "y": 2},
+        {"matrix": [2, 2], "x": 2, "y": 2},
+        {"matrix": [2, 3], "x": 3, "y": 2},
+        {"matrix": [2, 4], "x": 4, "y": 2},
+        {"matrix": [2, 5], "x": 5, "y": 2},
+
+        {"matrix": [6, 5], "x": 6, "y": 2},
+        {"matrix": [6, 4], "x": 7, "y": 2},
+        {"matrix": [6, 3], "x": 8, "y": 2},
+        {"matrix": [6, 2], "x": 9, "y": 2},
+        {"matrix": [6, 1], "x": 10, "y": 2},
+        {"matrix": [6, 0], "x": 11, "y": 2},
+
+        {"matrix": [3, 0], "x": 0, "y": 3},
+        {"matrix": [3, 1], "x": 1, "y": 3},
+        {"matrix": [3, 2], "x": 2, "y": 3},
+        {"matrix": [3, 3], "x": 3, "y": 3},
+        {"matrix": [3, 4], "x": 4, "y": 3},
+        {"matrix": [3, 5], "x": 5, "y": 3},
+
+        {"matrix": [7, 5], "x": 6, "y": 3},
+        {"matrix": [7, 4], "x": 7, "y": 3},
+        {"matrix": [7, 3], "x": 8, "y": 3},
+        {"matrix": [7, 2], "x": 9, "y": 3},
+        {"matrix": [7, 1], "x": 10, "y": 3},
+        {"matrix": [7, 0], "x": 11, "y": 3}
+      ]
+    }
+  }
+}
diff --git a/keyboards/keebio/wavelet/rules.mk b/keyboards/keebio/wavelet/rules.mk
index 74f0e0d5666..271780b75ec 100644
--- a/keyboards/keebio/wavelet/rules.mk
+++ b/keyboards/keebio/wavelet/rules.mk
@@ -1,15 +1,2 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
-AUDIO_ENABLE = no           # Audio output
-RGBLIGHT_ENABLE = yes       # Enable WS2812 RGB underlight. 
-
 # Disable unsupported hardware
 AUDIO_SUPPORTED = no
diff --git a/keyboards/keebwerk/mega/ansi/info.json b/keyboards/keebwerk/mega/ansi/info.json
deleted file mode 100755
index 27ff1b9e8cb..00000000000
--- a/keyboards/keebwerk/mega/ansi/info.json
+++ /dev/null
@@ -1,97 +0,0 @@
-{
-    "keyboard_name": "Keebwerk Mega ANSI",
-    "manufacturer": "Yiancar-Designs",
-    "url": "",
-    "maintainer": "Yiancar",
-    "usb": {
-        "vid": "0x8968",
-        "pid": "0x4B41",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["A13", "A10", "A9", "A14", "A15", "B8", "B9", "C13", "C14", "C15", "A0", "A1", "A2", "A3", "A5"],
-        "rows": ["B3", "B4", "B5", "A8", "A4"]
-    },
-    "diode_direction": "COL2ROW",
-    "processor": "STM32F303",
-    "bootloader": "stm32-dfu",
-    "community_layouts": ["65_ansi"],
-    "layouts": {
-        "LAYOUT_65_ansi": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-                {"matrix": [0, 14], "x": 15, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [2, 12], "x": 13.5, "y": 1, "w": 1.5},
-                {"matrix": [1, 14], "x": 15, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
-                {"matrix": [2, 14], "x": 15, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 2], "x": 2.25, "y": 3},
-                {"matrix": [3, 3], "x": 3.25, "y": 3},
-                {"matrix": [3, 4], "x": 4.25, "y": 3},
-                {"matrix": [3, 5], "x": 5.25, "y": 3},
-                {"matrix": [3, 6], "x": 6.25, "y": 3},
-                {"matrix": [3, 7], "x": 7.25, "y": 3},
-                {"matrix": [3, 8], "x": 8.25, "y": 3},
-                {"matrix": [3, 9], "x": 9.25, "y": 3},
-                {"matrix": [3, 10], "x": 10.25, "y": 3},
-                {"matrix": [3, 11], "x": 11.25, "y": 3},
-                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"matrix": [3, 13], "x": 14, "y": 3},
-                {"matrix": [3, 14], "x": 15, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
-                {"matrix": [4, 9], "x": 10, "y": 4},
-                {"matrix": [4, 10], "x": 11, "y": 4},
-                {"matrix": [4, 11], "x": 12, "y": 4},
-                {"matrix": [4, 12], "x": 13, "y": 4},
-                {"matrix": [4, 13], "x": 14, "y": 4},
-                {"matrix": [4, 14], "x": 15, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/keebwerk/mega/ansi/keyboard.json b/keyboards/keebwerk/mega/ansi/keyboard.json
new file mode 100755
index 00000000000..e5a12585df4
--- /dev/null
+++ b/keyboards/keebwerk/mega/ansi/keyboard.json
@@ -0,0 +1,103 @@
+{
+    "keyboard_name": "Keebwerk Mega ANSI",
+    "manufacturer": "Yiancar-Designs",
+    "url": "",
+    "maintainer": "Yiancar",
+    "usb": {
+        "vid": "0x8968",
+        "pid": "0x4B41",
+        "device_version": "0.0.1"
+    },
+    "matrix_pins": {
+        "cols": ["A13", "A10", "A9", "A14", "A15", "B8", "B9", "C13", "C14", "C15", "A0", "A1", "A2", "A3", "A5"],
+        "rows": ["B3", "B4", "B5", "A8", "A4"]
+    },
+    "diode_direction": "COL2ROW",
+    "processor": "STM32F303",
+    "bootloader": "stm32-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "nkro": true
+    },
+    "community_layouts": ["65_ansi"],
+    "layouts": {
+        "LAYOUT_65_ansi": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [2, 12], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4},
+                {"matrix": [4, 10], "x": 11, "y": 4},
+                {"matrix": [4, 11], "x": 12, "y": 4},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/keebwerk/mega/ansi/rules.mk b/keyboards/keebwerk/mega/ansi/rules.mk
index 82d4a940ede..60dc97f0586 100755
--- a/keyboards/keebwerk/mega/ansi/rules.mk
+++ b/keyboards/keebwerk/mega/ansi/rules.mk
@@ -1,26 +1,13 @@
 # Do not put the microcontroller into power saving mode
 # when we get USB suspend event. We want it to keep updating
 # backlight effects.
-OPT_DEFS += -DNO_SUSPEND_POWER_DOWN
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
+NO_SUSPEND_POWER_DOWN = yes
 
 CIE1931_CURVE = yes
+I2C_DRIVER_REQUIRED = yes
 
 # project specific files
 SRC +=  keyboards/wilba_tech/wt_main.c \
         keyboards/wilba_tech/wt_rgb_backlight.c \
         drivers/led/issi/is31fl3733.c \
         quantum/color.c
-I2C_DRIVER_REQUIRED = yes
diff --git a/keyboards/keebwerk/nano_slider/info.json b/keyboards/keebwerk/nano_slider/info.json
deleted file mode 100644
index fffbd7701bc..00000000000
--- a/keyboards/keebwerk/nano_slider/info.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-    "keyboard_name": "nano. slider",
-    "manufacturer": "keebwerk.",
-    "url": "",
-    "maintainer": "qmk",
-    "usb": {
-        "vid": "0x03A8",
-        "pid": "0x0000",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["B0", "B1", "B2", "B3"],
-        "rows": ["F0", "F1"]
-    },
-    "diode_direction": "COL2ROW",
-    "backlight": {
-        "pin": "B7",
-        "breathing": true
-    },
-    "rgblight": {
-        "saturation_steps": 8,
-        "brightness_steps": 8,
-        "led_count": 4,
-        "sleep": true,
-        "animations": {
-            "breathing": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "snake": true,
-            "knight": true,
-            "christmas": true,
-            "static_gradient": true,
-            "rgb_test": true,
-            "alternating": true,
-            "twinkle": true
-        }
-    },
-    "ws2812": {
-        "pin": "F6"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [1, 1], "x": 0, "y": 0},
-
-                {"matrix": [1, 2], "x": 0, "y": 1.25},
-                {"matrix": [1, 0], "x": 1, "y": 1.25},
-                {"matrix": [0, 0], "x": 2, "y": 1.25},
-
-                {"matrix": [0, 1], "x": 0, "y": 2.25},
-                {"matrix": [0, 2], "x": 1, "y": 2.25},
-                {"matrix": [0, 3], "x": 2, "y": 2.25},
-                {"matrix": [1, 3], "x": 3, "y": 1.25, "h": 2}
-            ]
-        }
-    }
-}
diff --git a/keyboards/keebwerk/nano_slider/keyboard.json b/keyboards/keebwerk/nano_slider/keyboard.json
new file mode 100644
index 00000000000..cc61c497d73
--- /dev/null
+++ b/keyboards/keebwerk/nano_slider/keyboard.json
@@ -0,0 +1,70 @@
+{
+    "keyboard_name": "nano. slider",
+    "manufacturer": "keebwerk.",
+    "url": "",
+    "maintainer": "qmk",
+    "usb": {
+        "vid": "0x03A8",
+        "pid": "0x0000",
+        "device_version": "0.0.1"
+    },
+    "matrix_pins": {
+        "cols": ["B0", "B1", "B2", "B3"],
+        "rows": ["F0", "F1"]
+    },
+    "diode_direction": "COL2ROW",
+    "backlight": {
+        "pin": "B7",
+        "breathing": true
+    },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 4,
+        "sleep": true,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": true,
+            "twinkle": true
+        }
+    },
+    "ws2812": {
+        "pin": "F6"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "nkro": true,
+        "rgblight": true,
+        "midi": true
+    },
+    "build": {
+        "lto": true
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [1, 1], "x": 0, "y": 0},
+
+                {"matrix": [1, 2], "x": 0, "y": 1.25},
+                {"matrix": [1, 0], "x": 1, "y": 1.25},
+                {"matrix": [0, 0], "x": 2, "y": 1.25},
+
+                {"matrix": [0, 1], "x": 0, "y": 2.25},
+                {"matrix": [0, 2], "x": 1, "y": 2.25},
+                {"matrix": [0, 3], "x": 2, "y": 2.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25, "h": 2}
+            ]
+        }
+    }
+}
diff --git a/keyboards/keebwerk/nano_slider/rules.mk b/keyboards/keebwerk/nano_slider/rules.mk
index d133bb6d6ea..cc588202788 100644
--- a/keyboards/keebwerk/nano_slider/rules.mk
+++ b/keyboards/keebwerk/nano_slider/rules.mk
@@ -1,16 +1 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-MIDI_ENABLE = yes           # MIDI support
-AUDIO_ENABLE = no           # Audio output
-LTO_ENABLE = yes
-
 ANALOG_DRIVER_REQUIRED = yes
diff --git a/keyboards/keyboardio/model01/info.json b/keyboards/keyboardio/model01/info.json
deleted file mode 100644
index fd17535be4b..00000000000
--- a/keyboards/keyboardio/model01/info.json
+++ /dev/null
@@ -1,275 +0,0 @@
-{
-  "keyboard_name": "Model 01",
-  "manufacturer": "Keyboardio",
-  "url": "https://keyboard.io",
-  "maintainer": "qmk",
-  "usb": {
-    "vid": "0x1209",
-    "pid": "0x2301",
-    "device_version": "0.0.1"
-  },
-  "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,
-      "rainbow_moving_chevron": true,
-      "cycle_out_in": true,
-      "cycle_out_in_dual": 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_rain": true,
-      "pixel_flow": true,
-      "pixel_fractal": true
-    },
-    "driver": "custom",
-    "layout": [
-        {"matrix": [3, 7], "x": 3, "y": 35, "flags": 4},
-        {"matrix": [2, 7], "x": 0, "y": 26, "flags": 4},
-        {"matrix": [1, 7], "x": 0, "y": 17, "flags": 4},
-        {"matrix": [0, 7], "x": 0, "y": 6, "flags": 4},
-        {"matrix": [0, 6], "x": 14, "y": 5, "flags": 4},
-        {"matrix": [1, 6], "x": 15, "y": 16, "flags": 4},
-        {"matrix": [2, 6], "x": 16, "y": 25, "flags": 4},
-        {"matrix": [3, 6], "x": 17, "y": 34, "flags": 4},
-        {"matrix": [3, 5], "x": 31, "y": 29, "flags": 4},
-        {"matrix": [2, 5], "x": 31, "y": 19, "flags": 4},
-        {"matrix": [1, 5], "x": 30, "y": 11, "flags": 4},
-        {"matrix": [0, 5], "x": 30, "y": 1, "flags": 4},
-        {"matrix": [0, 4], "x": 45, "y": 0, "flags": 4},
-        {"matrix": [1, 4], "x": 45, "y": 8, "flags": 4},
-        {"matrix": [2, 4], "x": 46, "y": 17, "flags": 4},
-        {"matrix": [3, 4], "x": 46, "y": 27, "flags": 4},
-        {"matrix": [3, 3], "x": 60, "y": 27, "flags": 4},
-        {"matrix": [2, 3], "x": 60, "y": 18, "flags": 4},
-        {"matrix": [1, 3], "x": 60, "y": 9, "flags": 4},
-        {"matrix": [0, 3], "x": 60, "y": 0, "flags": 4},
-        {"matrix": [0, 2], "x": 74, "y": 2, "flags": 4},
-        {"matrix": [1, 2], "x": 74, "y": 11, "flags": 4},
-        {"matrix": [2, 2], "x": 75, "y": 20, "flags": 4},
-        {"matrix": [3, 2], "x": 74, "y": 28, "flags": 4},
-        {"matrix": [2, 1], "x": 89, "y": 30, "flags": 4},
-        {"matrix": [1, 1], "x": 89, "y": 19, "flags": 4},
-        {"matrix": [0, 1], "x": 89, "y": 7, "flags": 4},
-        {"matrix": [0, 0], "x": 70, "y": 38, "flags": 1},
-        {"matrix": [1, 0], "x": 82, "y": 41, "flags": 1},
-        {"matrix": [2, 0], "x": 93, "y": 45, "flags": 1},
-        {"matrix": [3, 0], "x": 104, "y": 50, "flags": 1},
-        {"matrix": [3, 1], "x": 74, "y": 64, "flags": 1},
-        {"matrix": [7, 6], "x": 149, "y": 64, "flags": 1},
-        {"matrix": [7, 7], "x": 119, "y": 50, "flags": 1},
-        {"matrix": [6, 7], "x": 130, "y": 45, "flags": 1},
-        {"matrix": [5, 7], "x": 141, "y": 41, "flags": 1},
-        {"matrix": [4, 7], "x": 153, "y": 38, "flags": 1},
-        {"matrix": [4, 6], "x": 134, "y": 7, "flags": 4},
-        {"matrix": [5, 6], "x": 134, "y": 19, "flags": 4},
-        {"matrix": [6, 6], "x": 134, "y": 30, "flags": 4},
-        {"matrix": [7, 5], "x": 149, "y": 28, "flags": 4},
-        {"matrix": [6, 5], "x": 148, "y": 20, "flags": 4},
-        {"matrix": [5, 5], "x": 149, "y": 11, "flags": 4},
-        {"matrix": [4, 5], "x": 149, "y": 2, "flags": 4},
-        {"matrix": [4, 4], "x": 163, "y": 0, "flags": 4},
-        {"matrix": [5, 4], "x": 163, "y": 9, "flags": 4},
-        {"matrix": [6, 4], "x": 163, "y": 18, "flags": 4},
-        {"matrix": [7, 4], "x": 163, "y": 27, "flags": 4},
-        {"matrix": [7, 3], "x": 177, "y": 27, "flags": 4},
-        {"matrix": [6, 3], "x": 177, "y": 17, "flags": 4},
-        {"matrix": [5, 3], "x": 178, "y": 8, "flags": 4},
-        {"matrix": [4, 3], "x": 178, "y": 0, "flags": 4},
-        {"matrix": [4, 2], "x": 193, "y": 1, "flags": 4},
-        {"matrix": [5, 2], "x": 193, "y": 11, "flags": 4},
-        {"matrix": [6, 2], "x": 192, "y": 19, "flags": 4},
-        {"matrix": [7, 2], "x": 192, "y": 29, "flags": 4},
-        {"matrix": [7, 1], "x": 206, "y": 34, "flags": 4},
-        {"matrix": [6, 1], "x": 207, "y": 25, "flags": 4},
-        {"matrix": [5, 1], "x": 208, "y": 16, "flags": 4},
-        {"matrix": [4, 1], "x": 209, "y": 5, "flags": 4},
-        {"matrix": [4, 0], "x": 224, "y": 6, "flags": 4},
-        {"matrix": [5, 0], "x": 223, "y": 17, "flags": 4},
-        {"matrix": [6, 0], "x": 223, "y": 26, "flags": 4},
-        {"matrix": [7, 0], "x": 220, "y": 35, "flags": 4}
-    ]
-  },
-  "processor": "atmega32u4",
-    "bootloader": "caterina",
-  "debounce": 0,
-  "layouts": {
-    "LAYOUT": {
-      "layout": [
-        {"matrix": [0, 7], "x": 0, "y": 0.4, "h": 1.3},
-        {"matrix": [0, 6], "x": 1, "y": 0.2, "h": 1.5},
-        {"matrix": [0, 5], "x": 2, "y": 0.1, "h": 1.1},
-        {"matrix": [0, 4], "x": 3, "y": 0},
-        {"matrix": [0, 3], "x": 4, "y": 0.1},
-        {"matrix": [0, 2], "x": 5, "y": 0.3},
-
-        {"matrix": [4, 5], "x": 12.5, "y": 0.3},
-        {"matrix": [4, 4], "x": 13.5, "y": 0.1},
-        {"matrix": [4, 3], "x": 14.5, "y": 0},
-        {"matrix": [4, 2], "x": 15.5, "y": 0.1, "h": 1.1},
-        {"matrix": [4, 1], "x": 16.5, "y": 0.2, "h": 1.5},
-        {"matrix": [4, 0], "x": 17.5, "y": 0.4, "h": 1.3},
-
-        {"matrix": [1, 7], "x": 0, "y": 1.7},
-        {"matrix": [1, 6], "x": 1, "y": 1.7},
-        {"matrix": [1, 5], "x": 2, "y": 1.2},
-        {"matrix": [1, 4], "x": 3, "y": 1},
-        {"matrix": [1, 3], "x": 4, "y": 1.1},
-        {"matrix": [1, 2], "x": 5, "y": 1.3},
-        {"matrix": [0, 1], "x": 6, "y": 0.6, "h": 1.5},
-
-        {"matrix": [4, 6], "x": 11.5, "y": 0.6, "h": 1.5},
-        {"matrix": [5, 5], "x": 12.5, "y": 1.3},
-        {"matrix": [5, 4], "x": 13.5, "y": 1.1},
-        {"matrix": [5, 3], "x": 14.5, "y": 1},
-        {"matrix": [5, 2], "x": 15.5, "y": 1.2},
-        {"matrix": [5, 1], "x": 16.5, "y": 1.7},
-        {"matrix": [5, 0], "x": 17.5, "y": 1.7},
-
-        {"matrix": [2, 7], "x": 0, "y": 2.7},
-        {"matrix": [2, 6], "x": 1, "y": 2.7},
-        {"matrix": [2, 5], "x": 2, "y": 2.2},
-        {"matrix": [2, 4], "x": 3, "y": 2},
-        {"matrix": [2, 3], "x": 4, "y": 2.1},
-        {"matrix": [2, 2], "x": 5, "y": 2.3},
-        {"matrix": [1, 1], "x": 6, "y": 2.1, "h": 1.3},
-
-        {"matrix": [5, 6], "x": 11.5, "y": 2.1, "h": 1.3},
-        {"matrix": [6, 5], "x": 12.5, "y": 2.3},
-        {"matrix": [6, 4], "x": 13.5, "y": 2.1},
-        {"matrix": [6, 3], "x": 14.5, "y": 2},
-        {"matrix": [6, 2], "x": 15.5, "y": 2.2},
-        {"matrix": [6, 1], "x": 16.5, "y": 2.7},
-        {"matrix": [6, 0], "x": 17.5, "y": 2.7},
-
-        {"matrix": [3, 7], "x": 0, "y": 3.7, "h": 1.2},
-        {"matrix": [3, 6], "x": 1, "y": 3.7},
-        {"matrix": [3, 5], "x": 2, "y": 3.2, "h": 1.15},
-        {"matrix": [3, 4], "x": 3, "y": 3},
-        {"matrix": [3, 3], "x": 4, "y": 3.1},
-        {"matrix": [3, 2], "x": 5, "y": 3.3},
-        {"matrix": [2, 1], "x": 6, "y": 3.4, "h": 1.1},
-
-        {"matrix": [6, 6], "x": 11.5, "y": 3.4, "h": 1.1},
-        {"matrix": [7, 5], "x": 12.5, "y": 3.3},
-        {"matrix": [7, 4], "x": 13.5, "y": 3.1},
-        {"matrix": [7, 3], "x": 14.5, "y": 3},
-        {"matrix": [7, 2], "x": 15.5, "y": 3.2, "h": 1.15},
-        {"matrix": [7, 1], "x": 16.5, "y": 3.7},
-        {"matrix": [7, 0], "x": 17.5, "y": 3.7, "h": 1.2},
-
-        {"matrix": [0, 0], "x": 4.75, "y": 4.3},
-        {"matrix": [4, 7], "x": 12.75, "y": 4.3},
-
-        {"matrix": [1, 0], "x": 5.75, "y": 4.5},
-        {"matrix": [5, 7], "x": 11.75, "y": 4.5},
-
-        {"matrix": [2, 0], "x": 6.75, "y": 4.7},
-        {"matrix": [6, 7], "x": 10.75, "y": 4.7},
-
-        {"matrix": [3, 0], "x": 7.75, "y": 5.1},
-        {"matrix": [7, 7], "x": 9.75, "y": 5.1},
-
-        {"matrix": [3, 1], "x": 6.25, "y": 6.1, "h": 1.4},
-        {"matrix": [7, 6], "x": 11.25, "y": 6.1, "h": 1.4}
-      ]
-    },
-    "LAYOUT_thumb_row": {
-      "layout": [
-        {"matrix": [0, 7], "x": 0, "y": 0.4, "h": 1.3},
-        {"matrix": [0, 6], "x": 1, "y": 0.2, "h": 1.5},
-        {"matrix": [0, 5], "x": 2, "y": 0.1, "h": 1.1},
-        {"matrix": [0, 4], "x": 3, "y": 0},
-        {"matrix": [0, 3], "x": 4, "y": 0.1},
-        {"matrix": [0, 2], "x": 5, "y": 0.3},
-
-        {"matrix": [4, 5], "x": 12.5, "y": 0.3},
-        {"matrix": [4, 4], "x": 13.5, "y": 0.1},
-        {"matrix": [4, 3], "x": 14.5, "y": 0},
-        {"matrix": [4, 2], "x": 15.5, "y": 0.1, "h": 1.1},
-        {"matrix": [4, 1], "x": 16.5, "y": 0.2, "h": 1.5},
-        {"matrix": [4, 0], "x": 17.5, "y": 0.4, "h": 1.3},
-
-        {"matrix": [1, 7], "x": 0, "y": 1.7},
-        {"matrix": [1, 6], "x": 1, "y": 1.7},
-        {"matrix": [1, 5], "x": 2, "y": 1.2},
-        {"matrix": [1, 4], "x": 3, "y": 1},
-        {"matrix": [1, 3], "x": 4, "y": 1.1},
-        {"matrix": [1, 2], "x": 5, "y": 1.3},
-        {"matrix": [0, 1], "x": 6, "y": 0.6, "h": 1.5},
-
-        {"matrix": [4, 6], "x": 11.5, "y": 0.6, "h": 1.5},
-        {"matrix": [5, 5], "x": 12.5, "y": 1.3},
-        {"matrix": [5, 4], "x": 13.5, "y": 1.1},
-        {"matrix": [5, 3], "x": 14.5, "y": 1},
-        {"matrix": [5, 2], "x": 15.5, "y": 1.2},
-        {"matrix": [5, 1], "x": 16.5, "y": 1.7},
-        {"matrix": [5, 0], "x": 17.5, "y": 1.7},
-
-        {"matrix": [2, 7], "x": 0, "y": 2.7},
-        {"matrix": [2, 6], "x": 1, "y": 2.7},
-        {"matrix": [2, 5], "x": 2, "y": 2.2},
-        {"matrix": [2, 4], "x": 3, "y": 2},
-        {"matrix": [2, 3], "x": 4, "y": 2.1},
-        {"matrix": [2, 2], "x": 5, "y": 2.3},
-        {"matrix": [1, 1], "x": 6, "y": 2.1, "h": 1.3},
-
-        {"matrix": [5, 6], "x": 11.5, "y": 2.1, "h": 1.3},
-        {"matrix": [6, 5], "x": 12.5, "y": 2.3},
-        {"matrix": [6, 4], "x": 13.5, "y": 2.1},
-        {"matrix": [6, 3], "x": 14.5, "y": 2},
-        {"matrix": [6, 2], "x": 15.5, "y": 2.2},
-        {"matrix": [6, 1], "x": 16.5, "y": 2.7},
-        {"matrix": [6, 0], "x": 17.5, "y": 2.7},
-
-        {"matrix": [3, 7], "x": 0, "y": 3.7, "h": 1.2},
-        {"matrix": [3, 6], "x": 1, "y": 3.7},
-        {"matrix": [3, 5], "x": 2, "y": 3.2, "h": 1.15},
-        {"matrix": [3, 4], "x": 3, "y": 3},
-        {"matrix": [3, 3], "x": 4, "y": 3.1},
-        {"matrix": [3, 2], "x": 5, "y": 3.3},
-        {"matrix": [2, 1], "x": 6, "y": 3.4, "h": 1.1},
-
-        {"matrix": [6, 6], "x": 11.5, "y": 3.4, "h": 1.1},
-        {"matrix": [7, 5], "x": 12.5, "y": 3.3},
-        {"matrix": [7, 4], "x": 13.5, "y": 3.1},
-        {"matrix": [7, 3], "x": 14.5, "y": 3},
-        {"matrix": [7, 2], "x": 15.5, "y": 3.2, "h": 1.15},
-        {"matrix": [7, 1], "x": 16.5, "y": 3.7},
-        {"matrix": [7, 0], "x": 17.5, "y": 3.7, "h": 1.2},
-
-        {"matrix": [0, 0], "x": 4.75, "y": 4.3},
-        {"matrix": [1, 0], "x": 5.75, "y": 4.5},
-        {"matrix": [2, 0], "x": 6.75, "y": 4.7},
-        {"matrix": [3, 0], "x": 7.75, "y": 5.1},
-
-        {"matrix": [7, 7], "x": 9.75, "y": 5.1},
-        {"matrix": [6, 7], "x": 10.75, "y": 4.7},
-        {"matrix": [5, 7], "x": 11.75, "y": 4.5},
-        {"matrix": [4, 7], "x": 12.75, "y": 4.3},
-
-        {"matrix": [3, 1], "x": 6.25, "y": 6.1, "h": 1.4},
-
-        {"matrix": [7, 6], "x": 11.25, "y": 6.1, "h": 1.4}
-      ]
-    }
-  }
-}
diff --git a/keyboards/keyboardio/model01/keyboard.json b/keyboards/keyboardio/model01/keyboard.json
new file mode 100644
index 00000000000..c2438047b0c
--- /dev/null
+++ b/keyboards/keyboardio/model01/keyboard.json
@@ -0,0 +1,282 @@
+{
+  "keyboard_name": "Model 01",
+  "manufacturer": "Keyboardio",
+  "url": "https://keyboard.io",
+  "maintainer": "qmk",
+  "usb": {
+    "vid": "0x1209",
+    "pid": "0x2301",
+    "device_version": "0.0.1"
+  },
+  "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,
+      "rainbow_moving_chevron": true,
+      "cycle_out_in": true,
+      "cycle_out_in_dual": 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_rain": true,
+      "pixel_flow": true,
+      "pixel_fractal": true
+    },
+    "driver": "custom",
+    "layout": [
+        {"matrix": [3, 7], "x": 3, "y": 35, "flags": 4},
+        {"matrix": [2, 7], "x": 0, "y": 26, "flags": 4},
+        {"matrix": [1, 7], "x": 0, "y": 17, "flags": 4},
+        {"matrix": [0, 7], "x": 0, "y": 6, "flags": 4},
+        {"matrix": [0, 6], "x": 14, "y": 5, "flags": 4},
+        {"matrix": [1, 6], "x": 15, "y": 16, "flags": 4},
+        {"matrix": [2, 6], "x": 16, "y": 25, "flags": 4},
+        {"matrix": [3, 6], "x": 17, "y": 34, "flags": 4},
+        {"matrix": [3, 5], "x": 31, "y": 29, "flags": 4},
+        {"matrix": [2, 5], "x": 31, "y": 19, "flags": 4},
+        {"matrix": [1, 5], "x": 30, "y": 11, "flags": 4},
+        {"matrix": [0, 5], "x": 30, "y": 1, "flags": 4},
+        {"matrix": [0, 4], "x": 45, "y": 0, "flags": 4},
+        {"matrix": [1, 4], "x": 45, "y": 8, "flags": 4},
+        {"matrix": [2, 4], "x": 46, "y": 17, "flags": 4},
+        {"matrix": [3, 4], "x": 46, "y": 27, "flags": 4},
+        {"matrix": [3, 3], "x": 60, "y": 27, "flags": 4},
+        {"matrix": [2, 3], "x": 60, "y": 18, "flags": 4},
+        {"matrix": [1, 3], "x": 60, "y": 9, "flags": 4},
+        {"matrix": [0, 3], "x": 60, "y": 0, "flags": 4},
+        {"matrix": [0, 2], "x": 74, "y": 2, "flags": 4},
+        {"matrix": [1, 2], "x": 74, "y": 11, "flags": 4},
+        {"matrix": [2, 2], "x": 75, "y": 20, "flags": 4},
+        {"matrix": [3, 2], "x": 74, "y": 28, "flags": 4},
+        {"matrix": [2, 1], "x": 89, "y": 30, "flags": 4},
+        {"matrix": [1, 1], "x": 89, "y": 19, "flags": 4},
+        {"matrix": [0, 1], "x": 89, "y": 7, "flags": 4},
+        {"matrix": [0, 0], "x": 70, "y": 38, "flags": 1},
+        {"matrix": [1, 0], "x": 82, "y": 41, "flags": 1},
+        {"matrix": [2, 0], "x": 93, "y": 45, "flags": 1},
+        {"matrix": [3, 0], "x": 104, "y": 50, "flags": 1},
+        {"matrix": [3, 1], "x": 74, "y": 64, "flags": 1},
+        {"matrix": [7, 6], "x": 149, "y": 64, "flags": 1},
+        {"matrix": [7, 7], "x": 119, "y": 50, "flags": 1},
+        {"matrix": [6, 7], "x": 130, "y": 45, "flags": 1},
+        {"matrix": [5, 7], "x": 141, "y": 41, "flags": 1},
+        {"matrix": [4, 7], "x": 153, "y": 38, "flags": 1},
+        {"matrix": [4, 6], "x": 134, "y": 7, "flags": 4},
+        {"matrix": [5, 6], "x": 134, "y": 19, "flags": 4},
+        {"matrix": [6, 6], "x": 134, "y": 30, "flags": 4},
+        {"matrix": [7, 5], "x": 149, "y": 28, "flags": 4},
+        {"matrix": [6, 5], "x": 148, "y": 20, "flags": 4},
+        {"matrix": [5, 5], "x": 149, "y": 11, "flags": 4},
+        {"matrix": [4, 5], "x": 149, "y": 2, "flags": 4},
+        {"matrix": [4, 4], "x": 163, "y": 0, "flags": 4},
+        {"matrix": [5, 4], "x": 163, "y": 9, "flags": 4},
+        {"matrix": [6, 4], "x": 163, "y": 18, "flags": 4},
+        {"matrix": [7, 4], "x": 163, "y": 27, "flags": 4},
+        {"matrix": [7, 3], "x": 177, "y": 27, "flags": 4},
+        {"matrix": [6, 3], "x": 177, "y": 17, "flags": 4},
+        {"matrix": [5, 3], "x": 178, "y": 8, "flags": 4},
+        {"matrix": [4, 3], "x": 178, "y": 0, "flags": 4},
+        {"matrix": [4, 2], "x": 193, "y": 1, "flags": 4},
+        {"matrix": [5, 2], "x": 193, "y": 11, "flags": 4},
+        {"matrix": [6, 2], "x": 192, "y": 19, "flags": 4},
+        {"matrix": [7, 2], "x": 192, "y": 29, "flags": 4},
+        {"matrix": [7, 1], "x": 206, "y": 34, "flags": 4},
+        {"matrix": [6, 1], "x": 207, "y": 25, "flags": 4},
+        {"matrix": [5, 1], "x": 208, "y": 16, "flags": 4},
+        {"matrix": [4, 1], "x": 209, "y": 5, "flags": 4},
+        {"matrix": [4, 0], "x": 224, "y": 6, "flags": 4},
+        {"matrix": [5, 0], "x": 223, "y": 17, "flags": 4},
+        {"matrix": [6, 0], "x": 223, "y": 26, "flags": 4},
+        {"matrix": [7, 0], "x": 220, "y": 35, "flags": 4}
+    ]
+  },
+  "processor": "atmega32u4",
+    "bootloader": "caterina",
+    "features": {
+        "bootmagic": false,
+        "mousekey": true,
+        "extrakey": true,
+        "console": true,
+        "rgb_matrix": true
+    },
+  "debounce": 0,
+  "layouts": {
+    "LAYOUT": {
+      "layout": [
+        {"matrix": [0, 7], "x": 0, "y": 0.4, "h": 1.3},
+        {"matrix": [0, 6], "x": 1, "y": 0.2, "h": 1.5},
+        {"matrix": [0, 5], "x": 2, "y": 0.1, "h": 1.1},
+        {"matrix": [0, 4], "x": 3, "y": 0},
+        {"matrix": [0, 3], "x": 4, "y": 0.1},
+        {"matrix": [0, 2], "x": 5, "y": 0.3},
+
+        {"matrix": [4, 5], "x": 12.5, "y": 0.3},
+        {"matrix": [4, 4], "x": 13.5, "y": 0.1},
+        {"matrix": [4, 3], "x": 14.5, "y": 0},
+        {"matrix": [4, 2], "x": 15.5, "y": 0.1, "h": 1.1},
+        {"matrix": [4, 1], "x": 16.5, "y": 0.2, "h": 1.5},
+        {"matrix": [4, 0], "x": 17.5, "y": 0.4, "h": 1.3},
+
+        {"matrix": [1, 7], "x": 0, "y": 1.7},
+        {"matrix": [1, 6], "x": 1, "y": 1.7},
+        {"matrix": [1, 5], "x": 2, "y": 1.2},
+        {"matrix": [1, 4], "x": 3, "y": 1},
+        {"matrix": [1, 3], "x": 4, "y": 1.1},
+        {"matrix": [1, 2], "x": 5, "y": 1.3},
+        {"matrix": [0, 1], "x": 6, "y": 0.6, "h": 1.5},
+
+        {"matrix": [4, 6], "x": 11.5, "y": 0.6, "h": 1.5},
+        {"matrix": [5, 5], "x": 12.5, "y": 1.3},
+        {"matrix": [5, 4], "x": 13.5, "y": 1.1},
+        {"matrix": [5, 3], "x": 14.5, "y": 1},
+        {"matrix": [5, 2], "x": 15.5, "y": 1.2},
+        {"matrix": [5, 1], "x": 16.5, "y": 1.7},
+        {"matrix": [5, 0], "x": 17.5, "y": 1.7},
+
+        {"matrix": [2, 7], "x": 0, "y": 2.7},
+        {"matrix": [2, 6], "x": 1, "y": 2.7},
+        {"matrix": [2, 5], "x": 2, "y": 2.2},
+        {"matrix": [2, 4], "x": 3, "y": 2},
+        {"matrix": [2, 3], "x": 4, "y": 2.1},
+        {"matrix": [2, 2], "x": 5, "y": 2.3},
+        {"matrix": [1, 1], "x": 6, "y": 2.1, "h": 1.3},
+
+        {"matrix": [5, 6], "x": 11.5, "y": 2.1, "h": 1.3},
+        {"matrix": [6, 5], "x": 12.5, "y": 2.3},
+        {"matrix": [6, 4], "x": 13.5, "y": 2.1},
+        {"matrix": [6, 3], "x": 14.5, "y": 2},
+        {"matrix": [6, 2], "x": 15.5, "y": 2.2},
+        {"matrix": [6, 1], "x": 16.5, "y": 2.7},
+        {"matrix": [6, 0], "x": 17.5, "y": 2.7},
+
+        {"matrix": [3, 7], "x": 0, "y": 3.7, "h": 1.2},
+        {"matrix": [3, 6], "x": 1, "y": 3.7},
+        {"matrix": [3, 5], "x": 2, "y": 3.2, "h": 1.15},
+        {"matrix": [3, 4], "x": 3, "y": 3},
+        {"matrix": [3, 3], "x": 4, "y": 3.1},
+        {"matrix": [3, 2], "x": 5, "y": 3.3},
+        {"matrix": [2, 1], "x": 6, "y": 3.4, "h": 1.1},
+
+        {"matrix": [6, 6], "x": 11.5, "y": 3.4, "h": 1.1},
+        {"matrix": [7, 5], "x": 12.5, "y": 3.3},
+        {"matrix": [7, 4], "x": 13.5, "y": 3.1},
+        {"matrix": [7, 3], "x": 14.5, "y": 3},
+        {"matrix": [7, 2], "x": 15.5, "y": 3.2, "h": 1.15},
+        {"matrix": [7, 1], "x": 16.5, "y": 3.7},
+        {"matrix": [7, 0], "x": 17.5, "y": 3.7, "h": 1.2},
+
+        {"matrix": [0, 0], "x": 4.75, "y": 4.3},
+        {"matrix": [4, 7], "x": 12.75, "y": 4.3},
+
+        {"matrix": [1, 0], "x": 5.75, "y": 4.5},
+        {"matrix": [5, 7], "x": 11.75, "y": 4.5},
+
+        {"matrix": [2, 0], "x": 6.75, "y": 4.7},
+        {"matrix": [6, 7], "x": 10.75, "y": 4.7},
+
+        {"matrix": [3, 0], "x": 7.75, "y": 5.1},
+        {"matrix": [7, 7], "x": 9.75, "y": 5.1},
+
+        {"matrix": [3, 1], "x": 6.25, "y": 6.1, "h": 1.4},
+        {"matrix": [7, 6], "x": 11.25, "y": 6.1, "h": 1.4}
+      ]
+    },
+    "LAYOUT_thumb_row": {
+      "layout": [
+        {"matrix": [0, 7], "x": 0, "y": 0.4, "h": 1.3},
+        {"matrix": [0, 6], "x": 1, "y": 0.2, "h": 1.5},
+        {"matrix": [0, 5], "x": 2, "y": 0.1, "h": 1.1},
+        {"matrix": [0, 4], "x": 3, "y": 0},
+        {"matrix": [0, 3], "x": 4, "y": 0.1},
+        {"matrix": [0, 2], "x": 5, "y": 0.3},
+
+        {"matrix": [4, 5], "x": 12.5, "y": 0.3},
+        {"matrix": [4, 4], "x": 13.5, "y": 0.1},
+        {"matrix": [4, 3], "x": 14.5, "y": 0},
+        {"matrix": [4, 2], "x": 15.5, "y": 0.1, "h": 1.1},
+        {"matrix": [4, 1], "x": 16.5, "y": 0.2, "h": 1.5},
+        {"matrix": [4, 0], "x": 17.5, "y": 0.4, "h": 1.3},
+
+        {"matrix": [1, 7], "x": 0, "y": 1.7},
+        {"matrix": [1, 6], "x": 1, "y": 1.7},
+        {"matrix": [1, 5], "x": 2, "y": 1.2},
+        {"matrix": [1, 4], "x": 3, "y": 1},
+        {"matrix": [1, 3], "x": 4, "y": 1.1},
+        {"matrix": [1, 2], "x": 5, "y": 1.3},
+        {"matrix": [0, 1], "x": 6, "y": 0.6, "h": 1.5},
+
+        {"matrix": [4, 6], "x": 11.5, "y": 0.6, "h": 1.5},
+        {"matrix": [5, 5], "x": 12.5, "y": 1.3},
+        {"matrix": [5, 4], "x": 13.5, "y": 1.1},
+        {"matrix": [5, 3], "x": 14.5, "y": 1},
+        {"matrix": [5, 2], "x": 15.5, "y": 1.2},
+        {"matrix": [5, 1], "x": 16.5, "y": 1.7},
+        {"matrix": [5, 0], "x": 17.5, "y": 1.7},
+
+        {"matrix": [2, 7], "x": 0, "y": 2.7},
+        {"matrix": [2, 6], "x": 1, "y": 2.7},
+        {"matrix": [2, 5], "x": 2, "y": 2.2},
+        {"matrix": [2, 4], "x": 3, "y": 2},
+        {"matrix": [2, 3], "x": 4, "y": 2.1},
+        {"matrix": [2, 2], "x": 5, "y": 2.3},
+        {"matrix": [1, 1], "x": 6, "y": 2.1, "h": 1.3},
+
+        {"matrix": [5, 6], "x": 11.5, "y": 2.1, "h": 1.3},
+        {"matrix": [6, 5], "x": 12.5, "y": 2.3},
+        {"matrix": [6, 4], "x": 13.5, "y": 2.1},
+        {"matrix": [6, 3], "x": 14.5, "y": 2},
+        {"matrix": [6, 2], "x": 15.5, "y": 2.2},
+        {"matrix": [6, 1], "x": 16.5, "y": 2.7},
+        {"matrix": [6, 0], "x": 17.5, "y": 2.7},
+
+        {"matrix": [3, 7], "x": 0, "y": 3.7, "h": 1.2},
+        {"matrix": [3, 6], "x": 1, "y": 3.7},
+        {"matrix": [3, 5], "x": 2, "y": 3.2, "h": 1.15},
+        {"matrix": [3, 4], "x": 3, "y": 3},
+        {"matrix": [3, 3], "x": 4, "y": 3.1},
+        {"matrix": [3, 2], "x": 5, "y": 3.3},
+        {"matrix": [2, 1], "x": 6, "y": 3.4, "h": 1.1},
+
+        {"matrix": [6, 6], "x": 11.5, "y": 3.4, "h": 1.1},
+        {"matrix": [7, 5], "x": 12.5, "y": 3.3},
+        {"matrix": [7, 4], "x": 13.5, "y": 3.1},
+        {"matrix": [7, 3], "x": 14.5, "y": 3},
+        {"matrix": [7, 2], "x": 15.5, "y": 3.2, "h": 1.15},
+        {"matrix": [7, 1], "x": 16.5, "y": 3.7},
+        {"matrix": [7, 0], "x": 17.5, "y": 3.7, "h": 1.2},
+
+        {"matrix": [0, 0], "x": 4.75, "y": 4.3},
+        {"matrix": [1, 0], "x": 5.75, "y": 4.5},
+        {"matrix": [2, 0], "x": 6.75, "y": 4.7},
+        {"matrix": [3, 0], "x": 7.75, "y": 5.1},
+
+        {"matrix": [7, 7], "x": 9.75, "y": 5.1},
+        {"matrix": [6, 7], "x": 10.75, "y": 4.7},
+        {"matrix": [5, 7], "x": 11.75, "y": 4.5},
+        {"matrix": [4, 7], "x": 12.75, "y": 4.3},
+
+        {"matrix": [3, 1], "x": 6.25, "y": 6.1, "h": 1.4},
+
+        {"matrix": [7, 6], "x": 11.25, "y": 6.1, "h": 1.4}
+      ]
+    }
+  }
+}
diff --git a/keyboards/keyboardio/model01/rules.mk b/keyboards/keyboardio/model01/rules.mk
index 29e1f4fea80..952c9f6a4e2 100644
--- a/keyboards/keyboardio/model01/rules.mk
+++ b/keyboards/keyboardio/model01/rules.mk
@@ -1,17 +1,4 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes      # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = yes        # Console for debug
-COMMAND_ENABLE = no        # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-
 CUSTOM_MATRIX = yes
 I2C_DRIVER_REQUIRED = yes
 SRC += leds.c \
 	   matrix.c
-
-# You can set RGB_MATRIX_ENABLE = no in your rules.mk to disable this and save the Flash
-RGB_MATRIX_ENABLE = yes # Enable RGB matrix effects.
diff --git a/keyboards/keycapsss/3w6_2040/info.json b/keyboards/keycapsss/3w6_2040/keyboard.json
similarity index 100%
rename from keyboards/keycapsss/3w6_2040/info.json
rename to keyboards/keycapsss/3w6_2040/keyboard.json
diff --git a/keyboards/keycapsss/plaid_pad/info.json b/keyboards/keycapsss/plaid_pad/info.json
index 0d8de8a1d90..c66bd05f1bc 100644
--- a/keyboards/keycapsss/plaid_pad/info.json
+++ b/keyboards/keycapsss/plaid_pad/info.json
@@ -10,14 +10,6 @@
     "qmk": {
         "tap_keycode_delay": 60
     },
-    "features": {
-        "bootmagic": true,
-        "command": false,
-        "console": false,
-        "extrakey": true,
-        "mousekey": true,
-        "nkro": false
-    },
     "matrix_pins": {
         "cols": ["B0", "D7", "D6", "D5"],
         "rows": ["C0", "C1", "C2", "C3"]
diff --git a/keyboards/keycapsss/plaid_pad/rev1/info.json b/keyboards/keycapsss/plaid_pad/rev1/info.json
deleted file mode 100644
index 08770518586..00000000000
--- a/keyboards/keycapsss/plaid_pad/rev1/info.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-    "keyboard_name": "Plaid-Pad Rev1",
-    "usb": {
-        "device_version": "0.0.1"
-    },
-    "encoder": {
-        "rotary": [
-            {"pin_a": "D1", "pin_b": "D0"},
-            {"pin_a": "B2", "pin_b": "B1"}
-        ]
-    }
-}
diff --git a/keyboards/keycapsss/plaid_pad/rev1/keyboard.json b/keyboards/keycapsss/plaid_pad/rev1/keyboard.json
new file mode 100644
index 00000000000..e4a8a8d3c80
--- /dev/null
+++ b/keyboards/keycapsss/plaid_pad/rev1/keyboard.json
@@ -0,0 +1,21 @@
+{
+    "keyboard_name": "Plaid-Pad Rev1",
+    "usb": {
+        "device_version": "0.0.1"
+    },
+    "encoder": {
+        "rotary": [
+            {"pin_a": "D1", "pin_b": "D0"},
+            {"pin_a": "B2", "pin_b": "B1"}
+        ]
+    },
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": false,
+        "encoder": true
+    }
+}
diff --git a/keyboards/keycapsss/plaid_pad/rev1/rules.mk b/keyboards/keycapsss/plaid_pad/rev1/rules.mk
deleted file mode 100644
index 5af1ba85367..00000000000
--- a/keyboards/keycapsss/plaid_pad/rev1/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-ENCODER_ENABLE = yes
diff --git a/keyboards/keycapsss/plaid_pad/rev2/info.json b/keyboards/keycapsss/plaid_pad/rev2/info.json
deleted file mode 100644
index 637139c5a44..00000000000
--- a/keyboards/keycapsss/plaid_pad/rev2/info.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-    "keyboard_name": "Plaid-Pad Rev2",
-    "usb": {
-        "device_version": "0.0.2"
-    },
-    "encoder": {
-        "rotary": [
-            {"pin_a": "D1", "pin_b": "D0"},
-            {"pin_a": "B2", "pin_b": "B1"},
-            {"pin_a": "B4", "pin_b": "B3"},
-            {"pin_a": "D4", "pin_b": "B5"}
-        ]
-    }
-}
diff --git a/keyboards/keycapsss/plaid_pad/rev2/keyboard.json b/keyboards/keycapsss/plaid_pad/rev2/keyboard.json
new file mode 100644
index 00000000000..8dc84d4ee83
--- /dev/null
+++ b/keyboards/keycapsss/plaid_pad/rev2/keyboard.json
@@ -0,0 +1,23 @@
+{
+    "keyboard_name": "Plaid-Pad Rev2",
+    "usb": {
+        "device_version": "0.0.2"
+    },
+    "encoder": {
+        "rotary": [
+            {"pin_a": "D1", "pin_b": "D0"},
+            {"pin_a": "B2", "pin_b": "B1"},
+            {"pin_a": "B4", "pin_b": "B3"},
+            {"pin_a": "D4", "pin_b": "B5"}
+        ]
+    },
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": false,
+        "encoder": true
+    }
+}
diff --git a/keyboards/keycapsss/plaid_pad/rev2/rules.mk b/keyboards/keycapsss/plaid_pad/rev2/rules.mk
deleted file mode 100644
index 5af1ba85367..00000000000
--- a/keyboards/keycapsss/plaid_pad/rev2/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-ENCODER_ENABLE = yes
diff --git a/keyboards/keycapsss/plaid_pad/rev3/info.json b/keyboards/keycapsss/plaid_pad/rev3/info.json
deleted file mode 100644
index 0468b704994..00000000000
--- a/keyboards/keycapsss/plaid_pad/rev3/info.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-    "keyboard_name": "Plaid-Pad Rev3",
-    "usb": {
-        "device_version": "0.0.3"
-    },
-    "encoder": {
-        "rotary": [
-            {"pin_a": "D1", "pin_b": "D0"},
-            {"pin_a": "B2", "pin_b": "B1"},
-            {"pin_a": "B4", "pin_b": "B3"},
-            {"pin_a": "D4", "pin_b": "B5"}
-        ]
-    }
-}
diff --git a/keyboards/keycapsss/plaid_pad/rev3/keyboard.json b/keyboards/keycapsss/plaid_pad/rev3/keyboard.json
new file mode 100644
index 00000000000..4e1d0712874
--- /dev/null
+++ b/keyboards/keycapsss/plaid_pad/rev3/keyboard.json
@@ -0,0 +1,24 @@
+{
+    "keyboard_name": "Plaid-Pad Rev3",
+    "usb": {
+        "device_version": "0.0.3"
+    },
+    "encoder": {
+        "rotary": [
+            {"pin_a": "D1", "pin_b": "D0"},
+            {"pin_a": "B2", "pin_b": "B1"},
+            {"pin_a": "B4", "pin_b": "B3"},
+            {"pin_a": "D4", "pin_b": "B5"}
+        ]
+    },
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": false,
+        "encoder": true,
+        "oled": true
+    }
+}
diff --git a/keyboards/keycapsss/plaid_pad/rev3/rules.mk b/keyboards/keycapsss/plaid_pad/rev3/rules.mk
deleted file mode 100644
index 5ec06e96091..00000000000
--- a/keyboards/keycapsss/plaid_pad/rev3/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-ENCODER_ENABLE = yes
-OLED_ENABLE = yes
diff --git a/keyboards/keychron/c2_pro/ansi/rgb/info.json b/keyboards/keychron/c2_pro/ansi/rgb/keyboard.json
similarity index 100%
rename from keyboards/keychron/c2_pro/ansi/rgb/info.json
rename to keyboards/keychron/c2_pro/ansi/rgb/keyboard.json
diff --git a/keyboards/keychron/c2_pro/ansi/rgb/rules.mk b/keyboards/keychron/c2_pro/ansi/rgb/rules.mk
index dab15510492..9760649931f 100644
--- a/keyboards/keychron/c2_pro/ansi/rgb/rules.mk
+++ b/keyboards/keychron/c2_pro/ansi/rgb/rules.mk
@@ -1,2 +1,2 @@
-# Build Options
+# custom matrix setup
 SRC += matrix.c
diff --git a/keyboards/keychron/c2_pro/ansi/white/info.json b/keyboards/keychron/c2_pro/ansi/white/keyboard.json
similarity index 100%
rename from keyboards/keychron/c2_pro/ansi/white/info.json
rename to keyboards/keychron/c2_pro/ansi/white/keyboard.json
diff --git a/keyboards/keychron/c2_pro/ansi/white/rules.mk b/keyboards/keychron/c2_pro/ansi/white/rules.mk
index dab15510492..9760649931f 100644
--- a/keyboards/keychron/c2_pro/ansi/white/rules.mk
+++ b/keyboards/keychron/c2_pro/ansi/white/rules.mk
@@ -1,2 +1,2 @@
-# Build Options
+# custom matrix setup
 SRC += matrix.c
diff --git a/keyboards/keychron/q10/ansi_encoder/info.json b/keyboards/keychron/q10/ansi_encoder/info.json
deleted file mode 100644
index c40c6054268..00000000000
--- a/keyboards/keychron/q10/ansi_encoder/info.json
+++ /dev/null
@@ -1,121 +0,0 @@
-{
-    "keyboard_name": "Keychron Q10",
-    "manufacturer": "Keychron",
-    "url": "https://github.com/Keychron",
-    "maintainer": "lalalademaxiya1",
-    "usb": {
-        "vid": "0x3434",
-        "pid": "0x01A1",
-        "device_version": "1.0.0"
-    },
-    "encoder": {
-        "rotary": [
-            {"pin_a": "A10", "pin_b": "A8"}
-        ]
-    },
-    "bootmagic": {
-        "matrix": [0, 1]
-    },
-    "processor": "STM32L432",
-    "bootloader": "stm32-dfu",
-    "layouts": {
-        "LAYOUT_ansi_89": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0.25, "y": 0},
-                {"matrix": [0, 1], "x": 1.75, "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, "y": 0},
-                {"matrix": [0, 6], "x": 7.25, "y": 0},
-                {"matrix": [0, 7], "x": 8.25, "y": 0},
-                {"matrix": [0, 8], "x": 11, "y": 0},
-                {"matrix": [0, 9], "x": 12, "y": 0},
-                {"matrix": [0, 10], "x": 13.25, "y": 0},
-                {"matrix": [0, 11], "x": 14.25, "y": 0},
-                {"matrix": [0, 12], "x": 15.25, "y": 0},
-                {"matrix": [0, 13], "x": 16.25, "y": 0},
-                {"matrix": [0, 14], "x": 17.5, "y": 0},
-                {"matrix": [0, 15], "x": 18.75, "y": 0},
-
-                {"matrix": [1, 0], "x": 0.75, "y": 1.25},
-                {"matrix": [1, 1], "x": 2.25, "y": 1.25},
-                {"matrix": [1, 2], "x": 3.25, "y": 1.25},
-                {"matrix": [1, 3], "x": 4.25, "y": 1.25},
-                {"matrix": [1, 4], "x": 5.25, "y": 1.25},
-                {"matrix": [1, 5], "x": 6.25, "y": 1.25},
-                {"matrix": [1, 6], "x": 7.25, "y": 1.25},
-                {"matrix": [1, 7], "x": 8.25, "y": 1.25},
-                {"matrix": [1, 8], "x": 10.5, "y": 1.25},
-                {"matrix": [1, 9], "x": 11.5, "y": 1.25},
-                {"matrix": [1, 10], "x": 12.5, "y": 1.25},
-                {"matrix": [1, 11], "x": 13.5, "y": 1.25},
-                {"matrix": [1, 12], "x": 14.5, "y": 1.25},
-                {"matrix": [1, 13], "x": 15.5, "y": 1.25},
-                {"matrix": [1, 14], "x": 16.5, "y": 1.25, "w": 2},
-                {"matrix": [1, 15], "x": 19, "y": 1.25},
-
-                {"matrix": [2, 0], "x": 0.5, "y": 2.25},
-                {"matrix": [2, 1], "x": 1.75, "y": 2.25, "w": 1.5},
-                {"matrix": [2, 2], "x": 3.25, "y": 2.25},
-                {"matrix": [2, 3], "x": 4.5, "y": 2.25},
-                {"matrix": [2, 4], "x": 5.5, "y": 2.25},
-                {"matrix": [2, 5], "x": 6.5, "y": 2.25},
-                {"matrix": [2, 6], "x": 7.5, "y": 2.25},
-                {"matrix": [2, 7], "x": 10, "y": 2.25},
-                {"matrix": [2, 8], "x": 11, "y": 2.25},
-                {"matrix": [2, 9], "x": 12, "y": 2.25},
-                {"matrix": [2, 10], "x": 13, "y": 2.25},
-                {"matrix": [2, 11], "x": 14, "y": 2.25},
-                {"matrix": [2, 12], "x": 15.25, "y": 2.25},
-                {"matrix": [2, 13], "x": 16.25, "y": 2.25},
-                {"matrix": [2, 14], "x": 17.25, "y": 2.25, "w": 1.5},
-                {"matrix": [2, 15], "x": 19.25, "y": 2.25},
-
-                {"matrix": [3, 0], "x": 0.25, "y": 3.25},
-                {"matrix": [3, 1], "x": 1.5, "y": 3.25, "w": 1.75},
-                {"matrix": [3, 2], "x": 3.25, "y": 3.25},
-                {"matrix": [3, 3], "x": 4.5, "y": 3.25},
-                {"matrix": [3, 4], "x": 5.5, "y": 3.25},
-                {"matrix": [3, 5], "x": 6.5, "y": 3.25},
-                {"matrix": [3, 6], "x": 7.5, "y": 3.25},
-                {"matrix": [3, 8], "x": 10.25, "y": 3.25},
-                {"matrix": [3, 9], "x": 11.25, "y": 3.25},
-                {"matrix": [3, 10], "x": 12.25, "y": 3.25},
-                {"matrix": [3, 11], "x": 13.25, "y": 3.25},
-                {"matrix": [3, 12], "x": 14.75, "y": 3.25},
-                {"matrix": [3, 13], "x": 15.75, "y": 3.25},
-                {"matrix": [3, 14], "x": 16.75, "y": 3.25, "w": 2.25},
-                {"matrix": [3, 15], "x": 19.5, "y": 3.25},
-
-                {"matrix": [4, 0], "x": 0, "y": 4.25},
-                {"matrix": [4, 1], "x": 1.5, "y": 4.25, "w": 2.25},
-                {"matrix": [4, 3], "x": 3.5, "y": 4.25},
-                {"matrix": [4, 4], "x": 4.75, "y": 4.25},
-                {"matrix": [4, 5], "x": 5.75, "y": 4.25},
-                {"matrix": [4, 6], "x": 6.75, "y": 4.25},
-                {"matrix": [4, 7], "x": 7.75, "y": 4.25},
-                {"matrix": [4, 8], "x": 9.5, "y": 4.25},
-                {"matrix": [4, 9], "x": 10.5, "y": 4.25},
-                {"matrix": [4, 10], "x": 11.5, "y": 4.25},
-                {"matrix": [4, 11], "x": 12.5, "y": 4.25},
-                {"matrix": [4, 12], "x": 13.5, "y": 4.25},
-                {"matrix": [4, 13], "x": 15.25, "y": 4.25},
-                {"matrix": [4, 14], "x": 16.25, "y": 4.25, "w": 1.75},
-                {"matrix": [4, 15], "x": 18.25, "y": 4.5},
-
-                {"matrix": [5, 0], "x": 0, "y": 5.25},
-                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 3], "x": 4.75, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 4], "x": 6, "y": 5.25, "w": 2.25},
-                {"matrix": [5, 7], "x": 8.25, "y": 5.25},
-                {"matrix": [5, 8], "x": 9.5, "y": 5.25, "w": 2.75},
-                {"matrix": [5, 9], "x": 12.25, "y": 5.25},
-                {"matrix": [5, 13], "x": 17.25, "y": 5.5},
-                {"matrix": [5, 14], "x": 18.25, "y": 5.5},
-                {"matrix": [5, 15], "x": 19.25, "y": 5.5}
-            ]
-        }
-    }
-}
diff --git a/keyboards/keychron/q10/ansi_encoder/keyboard.json b/keyboards/keychron/q10/ansi_encoder/keyboard.json
new file mode 100644
index 00000000000..f47136edf72
--- /dev/null
+++ b/keyboards/keychron/q10/ansi_encoder/keyboard.json
@@ -0,0 +1,130 @@
+{
+    "keyboard_name": "Keychron Q10",
+    "manufacturer": "Keychron",
+    "url": "https://github.com/Keychron",
+    "maintainer": "lalalademaxiya1",
+    "usb": {
+        "vid": "0x3434",
+        "pid": "0x01A1",
+        "device_version": "1.0.0"
+    },
+    "encoder": {
+        "rotary": [
+            {"pin_a": "A10", "pin_b": "A8"}
+        ]
+    },
+    "bootmagic": {
+        "matrix": [0, 1]
+    },
+    "processor": "STM32L432",
+    "bootloader": "stm32-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "nkro": true,
+        "rgb_matrix": true,
+        "encoder": true,
+        "dip_switch": true
+    },
+    "layouts": {
+        "LAYOUT_ansi_89": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0.25, "y": 0},
+                {"matrix": [0, 1], "x": 1.75, "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, "y": 0},
+                {"matrix": [0, 6], "x": 7.25, "y": 0},
+                {"matrix": [0, 7], "x": 8.25, "y": 0},
+                {"matrix": [0, 8], "x": 11, "y": 0},
+                {"matrix": [0, 9], "x": 12, "y": 0},
+                {"matrix": [0, 10], "x": 13.25, "y": 0},
+                {"matrix": [0, 11], "x": 14.25, "y": 0},
+                {"matrix": [0, 12], "x": 15.25, "y": 0},
+                {"matrix": [0, 13], "x": 16.25, "y": 0},
+                {"matrix": [0, 14], "x": 17.5, "y": 0},
+                {"matrix": [0, 15], "x": 18.75, "y": 0},
+
+                {"matrix": [1, 0], "x": 0.75, "y": 1.25},
+                {"matrix": [1, 1], "x": 2.25, "y": 1.25},
+                {"matrix": [1, 2], "x": 3.25, "y": 1.25},
+                {"matrix": [1, 3], "x": 4.25, "y": 1.25},
+                {"matrix": [1, 4], "x": 5.25, "y": 1.25},
+                {"matrix": [1, 5], "x": 6.25, "y": 1.25},
+                {"matrix": [1, 6], "x": 7.25, "y": 1.25},
+                {"matrix": [1, 7], "x": 8.25, "y": 1.25},
+                {"matrix": [1, 8], "x": 10.5, "y": 1.25},
+                {"matrix": [1, 9], "x": 11.5, "y": 1.25},
+                {"matrix": [1, 10], "x": 12.5, "y": 1.25},
+                {"matrix": [1, 11], "x": 13.5, "y": 1.25},
+                {"matrix": [1, 12], "x": 14.5, "y": 1.25},
+                {"matrix": [1, 13], "x": 15.5, "y": 1.25},
+                {"matrix": [1, 14], "x": 16.5, "y": 1.25, "w": 2},
+                {"matrix": [1, 15], "x": 19, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0.5, "y": 2.25},
+                {"matrix": [2, 1], "x": 1.75, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 2], "x": 3.25, "y": 2.25},
+                {"matrix": [2, 3], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 10, "y": 2.25},
+                {"matrix": [2, 8], "x": 11, "y": 2.25},
+                {"matrix": [2, 9], "x": 12, "y": 2.25},
+                {"matrix": [2, 10], "x": 13, "y": 2.25},
+                {"matrix": [2, 11], "x": 14, "y": 2.25},
+                {"matrix": [2, 12], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 13], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 14], "x": 17.25, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 15], "x": 19.25, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0.25, "y": 3.25},
+                {"matrix": [3, 1], "x": 1.5, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 2], "x": 3.25, "y": 3.25},
+                {"matrix": [3, 3], "x": 4.5, "y": 3.25},
+                {"matrix": [3, 4], "x": 5.5, "y": 3.25},
+                {"matrix": [3, 5], "x": 6.5, "y": 3.25},
+                {"matrix": [3, 6], "x": 7.5, "y": 3.25},
+                {"matrix": [3, 8], "x": 10.25, "y": 3.25},
+                {"matrix": [3, 9], "x": 11.25, "y": 3.25},
+                {"matrix": [3, 10], "x": 12.25, "y": 3.25},
+                {"matrix": [3, 11], "x": 13.25, "y": 3.25},
+                {"matrix": [3, 12], "x": 14.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 15.75, "y": 3.25},
+                {"matrix": [3, 14], "x": 16.75, "y": 3.25, "w": 2.25},
+                {"matrix": [3, 15], "x": 19.5, "y": 3.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25},
+                {"matrix": [4, 1], "x": 1.5, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 3], "x": 3.5, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.75, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.75, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.75, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.75, "y": 4.25},
+                {"matrix": [4, 8], "x": 9.5, "y": 4.25},
+                {"matrix": [4, 9], "x": 10.5, "y": 4.25},
+                {"matrix": [4, 10], "x": 11.5, "y": 4.25},
+                {"matrix": [4, 11], "x": 12.5, "y": 4.25},
+                {"matrix": [4, 12], "x": 13.5, "y": 4.25},
+                {"matrix": [4, 13], "x": 15.25, "y": 4.25},
+                {"matrix": [4, 14], "x": 16.25, "y": 4.25, "w": 1.75},
+                {"matrix": [4, 15], "x": 18.25, "y": 4.5},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 3], "x": 4.75, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 4], "x": 6, "y": 5.25, "w": 2.25},
+                {"matrix": [5, 7], "x": 8.25, "y": 5.25},
+                {"matrix": [5, 8], "x": 9.5, "y": 5.25, "w": 2.75},
+                {"matrix": [5, 9], "x": 12.25, "y": 5.25},
+                {"matrix": [5, 13], "x": 17.25, "y": 5.5},
+                {"matrix": [5, 14], "x": 18.25, "y": 5.5},
+                {"matrix": [5, 15], "x": 19.25, "y": 5.5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/keychron/q10/ansi_encoder/rules.mk b/keyboards/keychron/q10/ansi_encoder/rules.mk
index 4c6e5bebf00..3652da4b697 100644
--- a/keyboards/keychron/q10/ansi_encoder/rules.mk
+++ b/keyboards/keychron/q10/ansi_encoder/rules.mk
@@ -1,19 +1,3 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable USB N-key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-ENCODER_ENABLE = yes        # Enable Encoder
-DIP_SWITCH_ENABLE = yes
-RGB_MATRIX_ENABLE = yes
-
 # custom matrix setup
 CUSTOM_MATRIX = lite
 
diff --git a/keyboards/keychron/q10/iso_encoder/info.json b/keyboards/keychron/q10/iso_encoder/info.json
deleted file mode 100644
index ce5223df616..00000000000
--- a/keyboards/keychron/q10/iso_encoder/info.json
+++ /dev/null
@@ -1,122 +0,0 @@
-{
-    "keyboard_name": "Keychron Q10",
-    "manufacturer": "Keychron",
-    "url": "https://github.com/Keychron",
-    "maintainer": "lalalademaxiya1",
-    "usb": {
-        "vid": "0x3434",
-        "pid": "0x01A3",
-        "device_version": "1.0.0"
-    },
-    "encoder": {
-        "rotary": [
-            {"pin_a": "A10", "pin_b": "A8"}
-        ]
-    },
-    "bootmagic": {
-        "matrix": [0, 1]
-    },
-    "processor": "STM32L432",
-    "bootloader": "stm32-dfu",
-    "layouts": {
-        "LAYOUT_iso_90": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0.25, "y": 0},
-                {"matrix": [0, 1], "x": 1.75, "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, "y": 0},
-                {"matrix": [0, 6], "x": 7.25, "y": 0},
-                {"matrix": [0, 7], "x": 8.25, "y": 0},
-                {"matrix": [0, 8], "x": 11, "y": 0},
-                {"matrix": [0, 9], "x": 12, "y": 0},
-                {"matrix": [0, 10], "x": 13.25, "y": 0},
-                {"matrix": [0, 11], "x": 14.25, "y": 0},
-                {"matrix": [0, 12], "x": 15.25, "y": 0},
-                {"matrix": [0, 13], "x": 16.25, "y": 0},
-                {"matrix": [0, 14], "x": 17.5, "y": 0},
-                {"matrix": [0, 15], "x": 18.75, "y": 0},
-
-                {"matrix": [1, 0], "x": 0.75, "y": 1.25},
-                {"matrix": [1, 1], "x": 2.25, "y": 1.25},
-                {"matrix": [1, 2], "x": 3.25, "y": 1.25},
-                {"matrix": [1, 3], "x": 4.25, "y": 1.25},
-                {"matrix": [1, 4], "x": 5.25, "y": 1.25},
-                {"matrix": [1, 5], "x": 6.25, "y": 1.25},
-                {"matrix": [1, 6], "x": 7.25, "y": 1.25},
-                {"matrix": [1, 7], "x": 8.25, "y": 1.25},
-                {"matrix": [1, 8], "x": 10.5, "y": 1.25},
-                {"matrix": [1, 9], "x": 11.5, "y": 1.25},
-                {"matrix": [1, 10], "x": 12.5, "y": 1.25},
-                {"matrix": [1, 11], "x": 13.5, "y": 1.25},
-                {"matrix": [1, 12], "x": 14.5, "y": 1.25},
-                {"matrix": [1, 13], "x": 15.5, "y": 1.25},
-                {"matrix": [1, 14], "x": 16.5, "y": 1.25, "w": 2},
-                {"matrix": [1, 15], "x": 19, "y": 1.25},
-
-                {"matrix": [2, 0], "x": 0.5, "y": 2.25},
-                {"matrix": [2, 1], "x": 1.75, "y": 2.25, "w": 1.5},
-                {"matrix": [2, 2], "x": 3.25, "y": 2.25},
-                {"matrix": [2, 3], "x": 4.5, "y": 2.25},
-                {"matrix": [2, 4], "x": 5.5, "y": 2.25},
-                {"matrix": [2, 5], "x": 6.5, "y": 2.25},
-                {"matrix": [2, 6], "x": 7.5, "y": 2.25},
-                {"matrix": [2, 7], "x": 10, "y": 2.25},
-                {"matrix": [2, 8], "x": 11, "y": 2.25},
-                {"matrix": [2, 9], "x": 12, "y": 2.25},
-                {"matrix": [2, 10], "x": 13, "y": 2.25},
-                {"matrix": [2, 11], "x": 14, "y": 2.25},
-                {"matrix": [2, 12], "x": 15.25, "y": 2.25},
-                {"matrix": [2, 13], "x": 16.25, "y": 2.25},
-                {"matrix": [2, 15], "x": 19.25, "y": 2.25},
-
-                {"matrix": [3, 0], "x": 0.25, "y": 3.25},
-                {"matrix": [3, 1], "x": 1.5, "y": 3.25, "w": 1.75},
-                {"matrix": [3, 2], "x": 3.25, "y": 3.25},
-                {"matrix": [3, 3], "x": 4.5, "y": 3.25},
-                {"matrix": [3, 4], "x": 5.5, "y": 3.25},
-                {"matrix": [3, 5], "x": 6.5, "y": 3.25},
-                {"matrix": [3, 6], "x": 7.5, "y": 3.25},
-                {"matrix": [3, 8], "x": 10.25, "y": 3.25},
-                {"matrix": [3, 9], "x": 11.25, "y": 3.25},
-                {"matrix": [3, 10], "x": 12.25, "y": 3.25},
-                {"matrix": [3, 11], "x": 13.25, "y": 3.25},
-                {"matrix": [3, 12], "x": 14.75, "y": 3.25},
-                {"matrix": [3, 13], "x": 15.75, "y": 3.25},
-                {"matrix": [3, 14], "x": 16.75, "y": 3.25},
-                {"matrix": [2, 14], "x": 17.75, "y": 2.25, "w": 1.25, "h": 2},
-                {"matrix": [3, 15], "x": 19.5, "y": 3.25},
-
-                {"matrix": [4, 0], "x": 0, "y": 4.25},
-                {"matrix": [4, 1], "x": 1.5, "y": 4.25},
-                {"matrix": [4, 2], "x": 2.5, "y": 4.25},
-                {"matrix": [4, 3], "x": 3.5, "y": 4.25},
-                {"matrix": [4, 4], "x": 4.75, "y": 4.25},
-                {"matrix": [4, 5], "x": 5.75, "y": 4.25},
-                {"matrix": [4, 6], "x": 6.75, "y": 4.25},
-                {"matrix": [4, 7], "x": 7.75, "y": 4.25},
-                {"matrix": [4, 8], "x": 9.5, "y": 4.25},
-                {"matrix": [4, 9], "x": 10.5, "y": 4.25},
-                {"matrix": [4, 10], "x": 11.5, "y": 4.25},
-                {"matrix": [4, 11], "x": 12.5, "y": 4.25},
-                {"matrix": [4, 12], "x": 13.5, "y": 4.25},
-                {"matrix": [4, 13], "x": 15.25, "y": 4.25},
-                {"matrix": [4, 14], "x": 16.25, "y": 4.25, "w": 1.75},
-                {"matrix": [4, 15], "x": 18.25, "y": 4.5},
-
-                {"matrix": [5, 0], "x": 0, "y": 5.25},
-                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 3], "x": 4.75, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 4], "x": 6, "y": 5.25, "w": 2.25},
-                {"matrix": [5, 7], "x": 8.25, "y": 5.25},
-                {"matrix": [5, 8], "x": 9.5, "y": 5.25, "w": 2.75},
-                {"matrix": [5, 9], "x": 12.25, "y": 5.25},
-                {"matrix": [5, 13], "x": 17.25, "y": 5.5},
-                {"matrix": [5, 14], "x": 18.25, "y": 5.5},
-                {"matrix": [5, 15], "x": 19.25, "y": 5.5}
-            ]
-        }
-    }
-}
diff --git a/keyboards/keychron/q10/iso_encoder/keyboard.json b/keyboards/keychron/q10/iso_encoder/keyboard.json
new file mode 100644
index 00000000000..5ec70d1a146
--- /dev/null
+++ b/keyboards/keychron/q10/iso_encoder/keyboard.json
@@ -0,0 +1,131 @@
+{
+    "keyboard_name": "Keychron Q10",
+    "manufacturer": "Keychron",
+    "url": "https://github.com/Keychron",
+    "maintainer": "lalalademaxiya1",
+    "usb": {
+        "vid": "0x3434",
+        "pid": "0x01A3",
+        "device_version": "1.0.0"
+    },
+    "encoder": {
+        "rotary": [
+            {"pin_a": "A10", "pin_b": "A8"}
+        ]
+    },
+    "bootmagic": {
+        "matrix": [0, 1]
+    },
+    "processor": "STM32L432",
+    "bootloader": "stm32-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "nkro": true,
+        "rgb_matrix": true,
+        "encoder": true,
+        "dip_switch": true
+    },
+    "layouts": {
+        "LAYOUT_iso_90": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0.25, "y": 0},
+                {"matrix": [0, 1], "x": 1.75, "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, "y": 0},
+                {"matrix": [0, 6], "x": 7.25, "y": 0},
+                {"matrix": [0, 7], "x": 8.25, "y": 0},
+                {"matrix": [0, 8], "x": 11, "y": 0},
+                {"matrix": [0, 9], "x": 12, "y": 0},
+                {"matrix": [0, 10], "x": 13.25, "y": 0},
+                {"matrix": [0, 11], "x": 14.25, "y": 0},
+                {"matrix": [0, 12], "x": 15.25, "y": 0},
+                {"matrix": [0, 13], "x": 16.25, "y": 0},
+                {"matrix": [0, 14], "x": 17.5, "y": 0},
+                {"matrix": [0, 15], "x": 18.75, "y": 0},
+
+                {"matrix": [1, 0], "x": 0.75, "y": 1.25},
+                {"matrix": [1, 1], "x": 2.25, "y": 1.25},
+                {"matrix": [1, 2], "x": 3.25, "y": 1.25},
+                {"matrix": [1, 3], "x": 4.25, "y": 1.25},
+                {"matrix": [1, 4], "x": 5.25, "y": 1.25},
+                {"matrix": [1, 5], "x": 6.25, "y": 1.25},
+                {"matrix": [1, 6], "x": 7.25, "y": 1.25},
+                {"matrix": [1, 7], "x": 8.25, "y": 1.25},
+                {"matrix": [1, 8], "x": 10.5, "y": 1.25},
+                {"matrix": [1, 9], "x": 11.5, "y": 1.25},
+                {"matrix": [1, 10], "x": 12.5, "y": 1.25},
+                {"matrix": [1, 11], "x": 13.5, "y": 1.25},
+                {"matrix": [1, 12], "x": 14.5, "y": 1.25},
+                {"matrix": [1, 13], "x": 15.5, "y": 1.25},
+                {"matrix": [1, 14], "x": 16.5, "y": 1.25, "w": 2},
+                {"matrix": [1, 15], "x": 19, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0.5, "y": 2.25},
+                {"matrix": [2, 1], "x": 1.75, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 2], "x": 3.25, "y": 2.25},
+                {"matrix": [2, 3], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 10, "y": 2.25},
+                {"matrix": [2, 8], "x": 11, "y": 2.25},
+                {"matrix": [2, 9], "x": 12, "y": 2.25},
+                {"matrix": [2, 10], "x": 13, "y": 2.25},
+                {"matrix": [2, 11], "x": 14, "y": 2.25},
+                {"matrix": [2, 12], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 13], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 19.25, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0.25, "y": 3.25},
+                {"matrix": [3, 1], "x": 1.5, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 2], "x": 3.25, "y": 3.25},
+                {"matrix": [3, 3], "x": 4.5, "y": 3.25},
+                {"matrix": [3, 4], "x": 5.5, "y": 3.25},
+                {"matrix": [3, 5], "x": 6.5, "y": 3.25},
+                {"matrix": [3, 6], "x": 7.5, "y": 3.25},
+                {"matrix": [3, 8], "x": 10.25, "y": 3.25},
+                {"matrix": [3, 9], "x": 11.25, "y": 3.25},
+                {"matrix": [3, 10], "x": 12.25, "y": 3.25},
+                {"matrix": [3, 11], "x": 13.25, "y": 3.25},
+                {"matrix": [3, 12], "x": 14.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 15.75, "y": 3.25},
+                {"matrix": [3, 14], "x": 16.75, "y": 3.25},
+                {"matrix": [2, 14], "x": 17.75, "y": 2.25, "w": 1.25, "h": 2},
+                {"matrix": [3, 15], "x": 19.5, "y": 3.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25},
+                {"matrix": [4, 1], "x": 1.5, "y": 4.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.5, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.75, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.75, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.75, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.75, "y": 4.25},
+                {"matrix": [4, 8], "x": 9.5, "y": 4.25},
+                {"matrix": [4, 9], "x": 10.5, "y": 4.25},
+                {"matrix": [4, 10], "x": 11.5, "y": 4.25},
+                {"matrix": [4, 11], "x": 12.5, "y": 4.25},
+                {"matrix": [4, 12], "x": 13.5, "y": 4.25},
+                {"matrix": [4, 13], "x": 15.25, "y": 4.25},
+                {"matrix": [4, 14], "x": 16.25, "y": 4.25, "w": 1.75},
+                {"matrix": [4, 15], "x": 18.25, "y": 4.5},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 3], "x": 4.75, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 4], "x": 6, "y": 5.25, "w": 2.25},
+                {"matrix": [5, 7], "x": 8.25, "y": 5.25},
+                {"matrix": [5, 8], "x": 9.5, "y": 5.25, "w": 2.75},
+                {"matrix": [5, 9], "x": 12.25, "y": 5.25},
+                {"matrix": [5, 13], "x": 17.25, "y": 5.5},
+                {"matrix": [5, 14], "x": 18.25, "y": 5.5},
+                {"matrix": [5, 15], "x": 19.25, "y": 5.5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/keychron/q10/iso_encoder/rules.mk b/keyboards/keychron/q10/iso_encoder/rules.mk
index 4c6e5bebf00..3652da4b697 100644
--- a/keyboards/keychron/q10/iso_encoder/rules.mk
+++ b/keyboards/keychron/q10/iso_encoder/rules.mk
@@ -1,19 +1,3 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable USB N-key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-ENCODER_ENABLE = yes        # Enable Encoder
-DIP_SWITCH_ENABLE = yes
-RGB_MATRIX_ENABLE = yes
-
 # custom matrix setup
 CUSTOM_MATRIX = lite
 
diff --git a/keyboards/keychron/q11/ansi_encoder/info.json b/keyboards/keychron/q11/ansi_encoder/keyboard.json
similarity index 100%
rename from keyboards/keychron/q11/ansi_encoder/info.json
rename to keyboards/keychron/q11/ansi_encoder/keyboard.json
diff --git a/keyboards/keychron/q11/iso_encoder/info.json b/keyboards/keychron/q11/iso_encoder/keyboard.json
similarity index 100%
rename from keyboards/keychron/q11/iso_encoder/info.json
rename to keyboards/keychron/q11/iso_encoder/keyboard.json
diff --git a/keyboards/keychron/q11/iso_encoder/rules.mk b/keyboards/keychron/q11/iso_encoder/rules.mk
index ac78b227d60..c6e29883213 100755
--- a/keyboards/keychron/q11/iso_encoder/rules.mk
+++ b/keyboards/keychron/q11/iso_encoder/rules.mk
@@ -1,4 +1 @@
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
-
 SERIAL_DRIVER = usart
diff --git a/keyboards/keychron/q12/ansi_encoder/info.json b/keyboards/keychron/q12/ansi_encoder/info.json
deleted file mode 100644
index 7b1e46beb71..00000000000
--- a/keyboards/keychron/q12/ansi_encoder/info.json
+++ /dev/null
@@ -1,132 +0,0 @@
-{
-    "keyboard_name": "Keychron Q12",
-    "manufacturer": "Keychron",
-    "url": "https://github.com/Keychron",
-    "maintainer": "lalalademaxiya1",
-    "usb": {
-        "vid": "0x3434",
-        "pid": "0x01D1",
-        "device_version": "1.0.0"
-    },
-    "encoder": {
-        "rotary": [
-            {"pin_a": "A2", "pin_b": "C14"}
-        ]
-    },
-    "processor": "STM32L432",
-    "bootloader": "stm32-dfu",
-    "layouts": {
-        "LAYOUT_ansi_103": {
-            "layout": [
-                {"matrix": [0, 15], "x": 0, "y": 0},
-                {"matrix": [0, 16], "x": 1, "y": 0},
-                {"matrix": [0, 17], "x": 2, "y": 0},
-                {"matrix": [5, 16], "x": 3, "y": 0},
-                {"matrix": [0, 0], "x": 4.25, "y": 0},
-                {"matrix": [0, 1], "x": 5.5, "y": 0},
-                {"matrix": [0, 2], "x": 6.5, "y": 0},
-                {"matrix": [0, 3], "x": 7.5, "y": 0},
-                {"matrix": [0, 4], "x": 8.5, "y": 0},
-                {"matrix": [0, 5], "x": 9.75, "y": 0},
-                {"matrix": [0, 6], "x": 10.75, "y": 0},
-                {"matrix": [0, 7], "x": 11.75, "y": 0},
-                {"matrix": [0, 8], "x": 12.75, "y": 0},
-                {"matrix": [0, 9], "x": 14, "y": 0},
-                {"matrix": [0, 10], "x": 15, "y": 0},
-                {"matrix": [0, 11], "x": 16, "y": 0},
-                {"matrix": [0, 12], "x": 17, "y": 0},
-                {"matrix": [0, 13], "x": 18.25, "y": 0},
-                {"matrix": [0, 14], "x": 19.5, "y": 0},
-
-                {"matrix": [1, 15], "x": 0, "y": 1.25},
-                {"matrix": [1, 16], "x": 1, "y": 1.25},
-                {"matrix": [1, 17], "x": 2, "y": 1.25},
-                {"matrix": [5, 5], "x": 3, "y": 1.25},
-                {"matrix": [1, 0], "x": 4.25, "y": 1.25},
-                {"matrix": [1, 1], "x": 5.25, "y": 1.25},
-                {"matrix": [1, 2], "x": 6.25, "y": 1.25},
-                {"matrix": [1, 3], "x": 7.25, "y": 1.25},
-                {"matrix": [1, 4], "x": 8.25, "y": 1.25},
-                {"matrix": [1, 5], "x": 9.25, "y": 1.25},
-                {"matrix": [1, 6], "x": 10.25, "y": 1.25},
-                {"matrix": [1, 7], "x": 11.25, "y": 1.25},
-                {"matrix": [1, 8], "x": 12.25, "y": 1.25},
-                {"matrix": [1, 9], "x": 13.25, "y": 1.25},
-                {"matrix": [1, 10], "x": 14.25, "y": 1.25},
-                {"matrix": [1, 11], "x": 15.25, "y": 1.25},
-                {"matrix": [1, 12], "x": 16.25, "y": 1.25},
-                {"matrix": [1, 13], "x": 17.25, "y": 1.25, "w": 2},
-                {"matrix": [1, 14], "x": 19.5, "y": 1.25},
-
-                {"matrix": [2, 15], "x": 0, "y": 2.25},
-                {"matrix": [2, 16], "x": 1, "y": 2.25},
-                {"matrix": [2, 17], "x": 2, "y": 2.25},
-                {"matrix": [5, 7], "x": 3, "y": 2.25, "h": 2},
-                {"matrix": [2, 0], "x": 4.25, "y": 2.25, "w": 1.5},
-                {"matrix": [2, 1], "x": 5.75, "y": 2.25},
-                {"matrix": [2, 2], "x": 6.75, "y": 2.25},
-                {"matrix": [2, 3], "x": 7.75, "y": 2.25},
-                {"matrix": [2, 4], "x": 8.75, "y": 2.25},
-                {"matrix": [2, 5], "x": 9.75, "y": 2.25},
-                {"matrix": [2, 6], "x": 10.75, "y": 2.25},
-                {"matrix": [2, 7], "x": 11.75, "y": 2.25},
-                {"matrix": [2, 8], "x": 12.75, "y": 2.25},
-                {"matrix": [2, 9], "x": 13.75, "y": 2.25},
-                {"matrix": [2, 10], "x": 14.75, "y": 2.25},
-                {"matrix": [2, 11], "x": 15.75, "y": 2.25},
-                {"matrix": [2, 12], "x": 16.75, "y": 2.25},
-                {"matrix": [2, 13], "x": 17.75, "y": 2.25, "w": 1.5},
-                {"matrix": [2, 14], "x": 19.5, "y": 2.25},
-
-                {"matrix": [3, 15], "x": 0, "y": 3.25},
-                {"matrix": [3, 16], "x": 1, "y": 3.25},
-                {"matrix": [3, 17], "x": 2, "y": 3.25},
-                {"matrix": [3, 0], "x": 4.25, "y": 3.25, "w": 1.75},
-                {"matrix": [3, 1], "x": 6, "y": 3.25},
-                {"matrix": [3, 2], "x": 7, "y": 3.25},
-                {"matrix": [3, 3], "x": 8, "y": 3.25},
-                {"matrix": [3, 4], "x": 9, "y": 3.25},
-                {"matrix": [3, 5], "x": 10, "y": 3.25},
-                {"matrix": [3, 6], "x": 11, "y": 3.25},
-                {"matrix": [3, 7], "x": 12, "y": 3.25},
-                {"matrix": [3, 8], "x": 13, "y": 3.25},
-                {"matrix": [3, 9], "x": 14, "y": 3.25},
-                {"matrix": [3, 10], "x": 15, "y": 3.25},
-                {"matrix": [3, 11], "x": 16, "y": 3.25},
-                {"matrix": [3, 13], "x": 17, "y": 3.25, "w": 2.25},
-                {"matrix": [3, 14], "x": 19.5, "y": 3.25},
-
-                {"matrix": [4, 15], "x": 0, "y": 4.25},
-                {"matrix": [4, 16], "x": 1, "y": 4.25},
-                {"matrix": [4, 17], "x": 2, "y": 4.25},
-                {"matrix": [3, 12], "x": 3, "y": 4.25, "h": 2},
-                {"matrix": [4, 0], "x": 4.25, "y": 4.25, "w": 2.25},
-                {"matrix": [4, 2], "x": 6.5, "y": 4.25},
-                {"matrix": [4, 3], "x": 7.5, "y": 4.25},
-                {"matrix": [4, 4], "x": 8.5, "y": 4.25},
-                {"matrix": [4, 5], "x": 9.5, "y": 4.25},
-                {"matrix": [4, 6], "x": 10.5, "y": 4.25},
-                {"matrix": [4, 7], "x": 11.5, "y": 4.25},
-                {"matrix": [4, 8], "x": 12.5, "y": 4.25},
-                {"matrix": [4, 9], "x": 13.5, "y": 4.25},
-                {"matrix": [4, 10], "x": 14.5, "y": 4.25},
-                {"matrix": [4, 11], "x": 15.5, "y": 4.25},
-                {"matrix": [4, 13], "x": 16.5, "y": 4.25, "w": 1.75},
-                {"matrix": [4, 14], "x": 18.5, "y": 4.5},
-
-                {"matrix": [5, 15], "x": 0, "y": 5.25, "w": 2},
-                {"matrix": [5, 17], "x": 2, "y": 5.25},
-                {"matrix": [5, 0], "x": 4.25, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 1], "x": 5.5, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 2], "x": 6.75, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 6], "x": 8, "y": 5.25, "w": 6.25},
-                {"matrix": [5, 9], "x": 14.25, "y": 5.25},
-                {"matrix": [5, 10], "x": 15.25, "y": 5.25},
-                {"matrix": [5, 11], "x": 16.25, "y": 5.25},
-                {"matrix": [5, 12], "x": 17.5, "y": 5.5},
-                {"matrix": [5, 13], "x": 18.5, "y": 5.5},
-                {"matrix": [5, 14], "x": 19.5, "y": 5.5}
-            ]
-        }
-    }
-}
diff --git a/keyboards/keychron/q12/ansi_encoder/keyboard.json b/keyboards/keychron/q12/ansi_encoder/keyboard.json
new file mode 100644
index 00000000000..d2f90cb8ac6
--- /dev/null
+++ b/keyboards/keychron/q12/ansi_encoder/keyboard.json
@@ -0,0 +1,141 @@
+{
+    "keyboard_name": "Keychron Q12",
+    "manufacturer": "Keychron",
+    "url": "https://github.com/Keychron",
+    "maintainer": "lalalademaxiya1",
+    "usb": {
+        "vid": "0x3434",
+        "pid": "0x01D1",
+        "device_version": "1.0.0"
+    },
+    "encoder": {
+        "rotary": [
+            {"pin_a": "A2", "pin_b": "C14"}
+        ]
+    },
+    "processor": "STM32L432",
+    "bootloader": "stm32-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "nkro": true,
+        "rgb_matrix": true,
+        "encoder": true,
+        "dip_switch": true
+    },
+    "layouts": {
+        "LAYOUT_ansi_103": {
+            "layout": [
+                {"matrix": [0, 15], "x": 0, "y": 0},
+                {"matrix": [0, 16], "x": 1, "y": 0},
+                {"matrix": [0, 17], "x": 2, "y": 0},
+                {"matrix": [5, 16], "x": 3, "y": 0},
+                {"matrix": [0, 0], "x": 4.25, "y": 0},
+                {"matrix": [0, 1], "x": 5.5, "y": 0},
+                {"matrix": [0, 2], "x": 6.5, "y": 0},
+                {"matrix": [0, 3], "x": 7.5, "y": 0},
+                {"matrix": [0, 4], "x": 8.5, "y": 0},
+                {"matrix": [0, 5], "x": 9.75, "y": 0},
+                {"matrix": [0, 6], "x": 10.75, "y": 0},
+                {"matrix": [0, 7], "x": 11.75, "y": 0},
+                {"matrix": [0, 8], "x": 12.75, "y": 0},
+                {"matrix": [0, 9], "x": 14, "y": 0},
+                {"matrix": [0, 10], "x": 15, "y": 0},
+                {"matrix": [0, 11], "x": 16, "y": 0},
+                {"matrix": [0, 12], "x": 17, "y": 0},
+                {"matrix": [0, 13], "x": 18.25, "y": 0},
+                {"matrix": [0, 14], "x": 19.5, "y": 0},
+
+                {"matrix": [1, 15], "x": 0, "y": 1.25},
+                {"matrix": [1, 16], "x": 1, "y": 1.25},
+                {"matrix": [1, 17], "x": 2, "y": 1.25},
+                {"matrix": [5, 5], "x": 3, "y": 1.25},
+                {"matrix": [1, 0], "x": 4.25, "y": 1.25},
+                {"matrix": [1, 1], "x": 5.25, "y": 1.25},
+                {"matrix": [1, 2], "x": 6.25, "y": 1.25},
+                {"matrix": [1, 3], "x": 7.25, "y": 1.25},
+                {"matrix": [1, 4], "x": 8.25, "y": 1.25},
+                {"matrix": [1, 5], "x": 9.25, "y": 1.25},
+                {"matrix": [1, 6], "x": 10.25, "y": 1.25},
+                {"matrix": [1, 7], "x": 11.25, "y": 1.25},
+                {"matrix": [1, 8], "x": 12.25, "y": 1.25},
+                {"matrix": [1, 9], "x": 13.25, "y": 1.25},
+                {"matrix": [1, 10], "x": 14.25, "y": 1.25},
+                {"matrix": [1, 11], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 12], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 13], "x": 17.25, "y": 1.25, "w": 2},
+                {"matrix": [1, 14], "x": 19.5, "y": 1.25},
+
+                {"matrix": [2, 15], "x": 0, "y": 2.25},
+                {"matrix": [2, 16], "x": 1, "y": 2.25},
+                {"matrix": [2, 17], "x": 2, "y": 2.25},
+                {"matrix": [5, 7], "x": 3, "y": 2.25, "h": 2},
+                {"matrix": [2, 0], "x": 4.25, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 5.75, "y": 2.25},
+                {"matrix": [2, 2], "x": 6.75, "y": 2.25},
+                {"matrix": [2, 3], "x": 7.75, "y": 2.25},
+                {"matrix": [2, 4], "x": 8.75, "y": 2.25},
+                {"matrix": [2, 5], "x": 9.75, "y": 2.25},
+                {"matrix": [2, 6], "x": 10.75, "y": 2.25},
+                {"matrix": [2, 7], "x": 11.75, "y": 2.25},
+                {"matrix": [2, 8], "x": 12.75, "y": 2.25},
+                {"matrix": [2, 9], "x": 13.75, "y": 2.25},
+                {"matrix": [2, 10], "x": 14.75, "y": 2.25},
+                {"matrix": [2, 11], "x": 15.75, "y": 2.25},
+                {"matrix": [2, 12], "x": 16.75, "y": 2.25},
+                {"matrix": [2, 13], "x": 17.75, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 14], "x": 19.5, "y": 2.25},
+
+                {"matrix": [3, 15], "x": 0, "y": 3.25},
+                {"matrix": [3, 16], "x": 1, "y": 3.25},
+                {"matrix": [3, 17], "x": 2, "y": 3.25},
+                {"matrix": [3, 0], "x": 4.25, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 6, "y": 3.25},
+                {"matrix": [3, 2], "x": 7, "y": 3.25},
+                {"matrix": [3, 3], "x": 8, "y": 3.25},
+                {"matrix": [3, 4], "x": 9, "y": 3.25},
+                {"matrix": [3, 5], "x": 10, "y": 3.25},
+                {"matrix": [3, 6], "x": 11, "y": 3.25},
+                {"matrix": [3, 7], "x": 12, "y": 3.25},
+                {"matrix": [3, 8], "x": 13, "y": 3.25},
+                {"matrix": [3, 9], "x": 14, "y": 3.25},
+                {"matrix": [3, 10], "x": 15, "y": 3.25},
+                {"matrix": [3, 11], "x": 16, "y": 3.25},
+                {"matrix": [3, 13], "x": 17, "y": 3.25, "w": 2.25},
+                {"matrix": [3, 14], "x": 19.5, "y": 3.25},
+
+                {"matrix": [4, 15], "x": 0, "y": 4.25},
+                {"matrix": [4, 16], "x": 1, "y": 4.25},
+                {"matrix": [4, 17], "x": 2, "y": 4.25},
+                {"matrix": [3, 12], "x": 3, "y": 4.25, "h": 2},
+                {"matrix": [4, 0], "x": 4.25, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 2], "x": 6.5, "y": 4.25},
+                {"matrix": [4, 3], "x": 7.5, "y": 4.25},
+                {"matrix": [4, 4], "x": 8.5, "y": 4.25},
+                {"matrix": [4, 5], "x": 9.5, "y": 4.25},
+                {"matrix": [4, 6], "x": 10.5, "y": 4.25},
+                {"matrix": [4, 7], "x": 11.5, "y": 4.25},
+                {"matrix": [4, 8], "x": 12.5, "y": 4.25},
+                {"matrix": [4, 9], "x": 13.5, "y": 4.25},
+                {"matrix": [4, 10], "x": 14.5, "y": 4.25},
+                {"matrix": [4, 11], "x": 15.5, "y": 4.25},
+                {"matrix": [4, 13], "x": 16.5, "y": 4.25, "w": 1.75},
+                {"matrix": [4, 14], "x": 18.5, "y": 4.5},
+
+                {"matrix": [5, 15], "x": 0, "y": 5.25, "w": 2},
+                {"matrix": [5, 17], "x": 2, "y": 5.25},
+                {"matrix": [5, 0], "x": 4.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 5.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 6.75, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 8, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 9], "x": 14.25, "y": 5.25},
+                {"matrix": [5, 10], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 11], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 12], "x": 17.5, "y": 5.5},
+                {"matrix": [5, 13], "x": 18.5, "y": 5.5},
+                {"matrix": [5, 14], "x": 19.5, "y": 5.5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/keychron/q12/ansi_encoder/rules.mk b/keyboards/keychron/q12/ansi_encoder/rules.mk
index 213c733c9c2..3652da4b697 100644
--- a/keyboards/keychron/q12/ansi_encoder/rules.mk
+++ b/keyboards/keychron/q12/ansi_encoder/rules.mk
@@ -1,19 +1,3 @@
-# Build Options
-#   change yes to no to disable.
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable USB N-key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-ENCODER_ENABLE = yes        # Enable Encoder
-DIP_SWITCH_ENABLE = yes
-RGB_MATRIX_ENABLE = yes
-
 # custom matrix setup
 CUSTOM_MATRIX = lite
 
diff --git a/keyboards/keychron/q12/iso_encoder/info.json b/keyboards/keychron/q12/iso_encoder/info.json
deleted file mode 100644
index c66c1bb665c..00000000000
--- a/keyboards/keychron/q12/iso_encoder/info.json
+++ /dev/null
@@ -1,133 +0,0 @@
-{
-    "keyboard_name": "Keychron Q12",
-    "manufacturer": "Keychron",
-    "url": "https://github.com/Keychron",
-    "maintainer": "lalalademaxiya1",
-    "usb": {
-        "vid": "0x3434",
-        "pid": "0x01D3",
-        "device_version": "1.0.0"
-    },
-    "encoder": {
-        "rotary": [
-            {"pin_a": "A2", "pin_b": "C14"}
-        ]
-    },
-    "processor": "STM32L432",
-    "bootloader": "stm32-dfu",
-    "layouts": {
-        "LAYOUT_iso_104": {
-            "layout": [
-                {"matrix": [0, 15], "x": 0, "y": 0},
-                {"matrix": [0, 16], "x": 1, "y": 0},
-                {"matrix": [0, 17], "x": 2, "y": 0},
-                {"matrix": [5, 16], "x": 3, "y": 0},
-                {"matrix": [0, 0], "x": 4.25, "y": 0},
-                {"matrix": [0, 1], "x": 5.5, "y": 0},
-                {"matrix": [0, 2], "x": 6.5, "y": 0},
-                {"matrix": [0, 3], "x": 7.5, "y": 0},
-                {"matrix": [0, 4], "x": 8.5, "y": 0},
-                {"matrix": [0, 5], "x": 9.75, "y": 0},
-                {"matrix": [0, 6], "x": 10.75, "y": 0},
-                {"matrix": [0, 7], "x": 11.75, "y": 0},
-                {"matrix": [0, 8], "x": 12.75, "y": 0},
-                {"matrix": [0, 9], "x": 14, "y": 0},
-                {"matrix": [0, 10], "x": 15, "y": 0},
-                {"matrix": [0, 11], "x": 16, "y": 0},
-                {"matrix": [0, 12], "x": 17, "y": 0},
-                {"matrix": [0, 13], "x": 18.25, "y": 0},
-                {"matrix": [0, 14], "x": 19.5, "y": 0},
-
-                {"matrix": [1, 15], "x": 0, "y": 1.25},
-                {"matrix": [1, 16], "x": 1, "y": 1.25},
-                {"matrix": [1, 17], "x": 2, "y": 1.25},
-                {"matrix": [5, 5], "x": 3, "y": 1.25},
-                {"matrix": [1, 0], "x": 4.25, "y": 1.25},
-                {"matrix": [1, 1], "x": 5.25, "y": 1.25},
-                {"matrix": [1, 2], "x": 6.25, "y": 1.25},
-                {"matrix": [1, 3], "x": 7.25, "y": 1.25},
-                {"matrix": [1, 4], "x": 8.25, "y": 1.25},
-                {"matrix": [1, 5], "x": 9.25, "y": 1.25},
-                {"matrix": [1, 6], "x": 10.25, "y": 1.25},
-                {"matrix": [1, 7], "x": 11.25, "y": 1.25},
-                {"matrix": [1, 8], "x": 12.25, "y": 1.25},
-                {"matrix": [1, 9], "x": 13.25, "y": 1.25},
-                {"matrix": [1, 10], "x": 14.25, "y": 1.25},
-                {"matrix": [1, 11], "x": 15.25, "y": 1.25},
-                {"matrix": [1, 12], "x": 16.25, "y": 1.25},
-                {"matrix": [1, 13], "x": 17.25, "y": 1.25, "w": 2},
-                {"matrix": [1, 14], "x": 19.5, "y": 1.25},
-
-                {"matrix": [2, 15], "x": 0, "y": 2.25},
-                {"matrix": [2, 16], "x": 1, "y": 2.25},
-                {"matrix": [2, 17], "x": 2, "y": 2.25},
-                {"matrix": [5, 7], "x": 3, "y": 2.25, "h": 2},
-                {"matrix": [2, 0], "x": 4.25, "y": 2.25, "w": 1.5},
-                {"matrix": [2, 1], "x": 5.75, "y": 2.25},
-                {"matrix": [2, 2], "x": 6.75, "y": 2.25},
-                {"matrix": [2, 3], "x": 7.75, "y": 2.25},
-                {"matrix": [2, 4], "x": 8.75, "y": 2.25},
-                {"matrix": [2, 5], "x": 9.75, "y": 2.25},
-                {"matrix": [2, 6], "x": 10.75, "y": 2.25},
-                {"matrix": [2, 7], "x": 11.75, "y": 2.25},
-                {"matrix": [2, 8], "x": 12.75, "y": 2.25},
-                {"matrix": [2, 9], "x": 13.75, "y": 2.25},
-                {"matrix": [2, 10], "x": 14.75, "y": 2.25},
-                {"matrix": [2, 11], "x": 15.75, "y": 2.25},
-                {"matrix": [2, 12], "x": 16.75, "y": 2.25},
-                {"matrix": [2, 14], "x": 19.5, "y": 2.25},
-
-                {"matrix": [3, 15], "x": 0, "y": 3.25},
-                {"matrix": [3, 16], "x": 1, "y": 3.25},
-                {"matrix": [3, 17], "x": 2, "y": 3.25},
-                {"matrix": [3, 0], "x": 4.25, "y": 3.25, "w": 1.75},
-                {"matrix": [3, 1], "x": 6, "y": 3.25},
-                {"matrix": [3, 2], "x": 7, "y": 3.25},
-                {"matrix": [3, 3], "x": 8, "y": 3.25},
-                {"matrix": [3, 4], "x": 9, "y": 3.25},
-                {"matrix": [3, 5], "x": 10, "y": 3.25},
-                {"matrix": [3, 6], "x": 11, "y": 3.25},
-                {"matrix": [3, 7], "x": 12, "y": 3.25},
-                {"matrix": [3, 8], "x": 13, "y": 3.25},
-                {"matrix": [3, 9], "x": 14, "y": 3.25},
-                {"matrix": [3, 10], "x": 15, "y": 3.25},
-                {"matrix": [3, 11], "x": 16, "y": 3.25},
-                {"matrix": [3, 13], "x": 17, "y": 3.25},
-                {"matrix": [2, 13], "x": 18, "y": 2.25, "w": 1.25, "h": 2},
-                {"matrix": [3, 14], "x": 19.5, "y": 3.25},
-
-                {"matrix": [4, 15], "x": 0, "y": 4.25},
-                {"matrix": [4, 16], "x": 1, "y": 4.25},
-                {"matrix": [4, 17], "x": 2, "y": 4.25},
-                {"matrix": [3, 12], "x": 3, "y": 4.25, "h": 2},
-                {"matrix": [4, 0], "x": 4.25, "y": 4.25, "w": 1.25},
-                {"matrix": [4, 1], "x": 5.5, "y": 4.25},
-                {"matrix": [4, 2], "x": 6.5, "y": 4.25},
-                {"matrix": [4, 3], "x": 7.5, "y": 4.25},
-                {"matrix": [4, 4], "x": 8.5, "y": 4.25},
-                {"matrix": [4, 5], "x": 9.5, "y": 4.25},
-                {"matrix": [4, 6], "x": 10.5, "y": 4.25},
-                {"matrix": [4, 7], "x": 11.5, "y": 4.25},
-                {"matrix": [4, 8], "x": 12.5, "y": 4.25},
-                {"matrix": [4, 9], "x": 13.5, "y": 4.25},
-                {"matrix": [4, 10], "x": 14.5, "y": 4.25},
-                {"matrix": [4, 11], "x": 15.5, "y": 4.25},
-                {"matrix": [4, 13], "x": 16.5, "y": 4.25, "w": 1.75},
-                {"matrix": [4, 14], "x": 18.5, "y": 4.5},
-
-                {"matrix": [5, 15], "x": 0, "y": 5.25, "w": 2},
-                {"matrix": [5, 17], "x": 2, "y": 5.25},
-                {"matrix": [5, 0], "x": 4.25, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 1], "x": 5.5, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 2], "x": 6.75, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 6], "x": 8, "y": 5.25, "w": 6.25},
-                {"matrix": [5, 9], "x": 14.25, "y": 5.25},
-                {"matrix": [5, 10], "x": 15.25, "y": 5.25},
-                {"matrix": [5, 11], "x": 16.25, "y": 5.25},
-                {"matrix": [5, 12], "x": 17.5, "y": 5.5},
-                {"matrix": [5, 13], "x": 18.5, "y": 5.5},
-                {"matrix": [5, 14], "x": 19.5, "y": 5.5}
-            ]
-        }
-    }
-}
diff --git a/keyboards/keychron/q12/iso_encoder/keyboard.json b/keyboards/keychron/q12/iso_encoder/keyboard.json
new file mode 100644
index 00000000000..29e24a14913
--- /dev/null
+++ b/keyboards/keychron/q12/iso_encoder/keyboard.json
@@ -0,0 +1,142 @@
+{
+    "keyboard_name": "Keychron Q12",
+    "manufacturer": "Keychron",
+    "url": "https://github.com/Keychron",
+    "maintainer": "lalalademaxiya1",
+    "usb": {
+        "vid": "0x3434",
+        "pid": "0x01D3",
+        "device_version": "1.0.0"
+    },
+    "encoder": {
+        "rotary": [
+            {"pin_a": "A2", "pin_b": "C14"}
+        ]
+    },
+    "processor": "STM32L432",
+    "bootloader": "stm32-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "nkro": true,
+        "rgb_matrix": true,
+        "encoder": true,
+        "dip_switch": true
+    },
+    "layouts": {
+        "LAYOUT_iso_104": {
+            "layout": [
+                {"matrix": [0, 15], "x": 0, "y": 0},
+                {"matrix": [0, 16], "x": 1, "y": 0},
+                {"matrix": [0, 17], "x": 2, "y": 0},
+                {"matrix": [5, 16], "x": 3, "y": 0},
+                {"matrix": [0, 0], "x": 4.25, "y": 0},
+                {"matrix": [0, 1], "x": 5.5, "y": 0},
+                {"matrix": [0, 2], "x": 6.5, "y": 0},
+                {"matrix": [0, 3], "x": 7.5, "y": 0},
+                {"matrix": [0, 4], "x": 8.5, "y": 0},
+                {"matrix": [0, 5], "x": 9.75, "y": 0},
+                {"matrix": [0, 6], "x": 10.75, "y": 0},
+                {"matrix": [0, 7], "x": 11.75, "y": 0},
+                {"matrix": [0, 8], "x": 12.75, "y": 0},
+                {"matrix": [0, 9], "x": 14, "y": 0},
+                {"matrix": [0, 10], "x": 15, "y": 0},
+                {"matrix": [0, 11], "x": 16, "y": 0},
+                {"matrix": [0, 12], "x": 17, "y": 0},
+                {"matrix": [0, 13], "x": 18.25, "y": 0},
+                {"matrix": [0, 14], "x": 19.5, "y": 0},
+
+                {"matrix": [1, 15], "x": 0, "y": 1.25},
+                {"matrix": [1, 16], "x": 1, "y": 1.25},
+                {"matrix": [1, 17], "x": 2, "y": 1.25},
+                {"matrix": [5, 5], "x": 3, "y": 1.25},
+                {"matrix": [1, 0], "x": 4.25, "y": 1.25},
+                {"matrix": [1, 1], "x": 5.25, "y": 1.25},
+                {"matrix": [1, 2], "x": 6.25, "y": 1.25},
+                {"matrix": [1, 3], "x": 7.25, "y": 1.25},
+                {"matrix": [1, 4], "x": 8.25, "y": 1.25},
+                {"matrix": [1, 5], "x": 9.25, "y": 1.25},
+                {"matrix": [1, 6], "x": 10.25, "y": 1.25},
+                {"matrix": [1, 7], "x": 11.25, "y": 1.25},
+                {"matrix": [1, 8], "x": 12.25, "y": 1.25},
+                {"matrix": [1, 9], "x": 13.25, "y": 1.25},
+                {"matrix": [1, 10], "x": 14.25, "y": 1.25},
+                {"matrix": [1, 11], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 12], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 13], "x": 17.25, "y": 1.25, "w": 2},
+                {"matrix": [1, 14], "x": 19.5, "y": 1.25},
+
+                {"matrix": [2, 15], "x": 0, "y": 2.25},
+                {"matrix": [2, 16], "x": 1, "y": 2.25},
+                {"matrix": [2, 17], "x": 2, "y": 2.25},
+                {"matrix": [5, 7], "x": 3, "y": 2.25, "h": 2},
+                {"matrix": [2, 0], "x": 4.25, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 5.75, "y": 2.25},
+                {"matrix": [2, 2], "x": 6.75, "y": 2.25},
+                {"matrix": [2, 3], "x": 7.75, "y": 2.25},
+                {"matrix": [2, 4], "x": 8.75, "y": 2.25},
+                {"matrix": [2, 5], "x": 9.75, "y": 2.25},
+                {"matrix": [2, 6], "x": 10.75, "y": 2.25},
+                {"matrix": [2, 7], "x": 11.75, "y": 2.25},
+                {"matrix": [2, 8], "x": 12.75, "y": 2.25},
+                {"matrix": [2, 9], "x": 13.75, "y": 2.25},
+                {"matrix": [2, 10], "x": 14.75, "y": 2.25},
+                {"matrix": [2, 11], "x": 15.75, "y": 2.25},
+                {"matrix": [2, 12], "x": 16.75, "y": 2.25},
+                {"matrix": [2, 14], "x": 19.5, "y": 2.25},
+
+                {"matrix": [3, 15], "x": 0, "y": 3.25},
+                {"matrix": [3, 16], "x": 1, "y": 3.25},
+                {"matrix": [3, 17], "x": 2, "y": 3.25},
+                {"matrix": [3, 0], "x": 4.25, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 6, "y": 3.25},
+                {"matrix": [3, 2], "x": 7, "y": 3.25},
+                {"matrix": [3, 3], "x": 8, "y": 3.25},
+                {"matrix": [3, 4], "x": 9, "y": 3.25},
+                {"matrix": [3, 5], "x": 10, "y": 3.25},
+                {"matrix": [3, 6], "x": 11, "y": 3.25},
+                {"matrix": [3, 7], "x": 12, "y": 3.25},
+                {"matrix": [3, 8], "x": 13, "y": 3.25},
+                {"matrix": [3, 9], "x": 14, "y": 3.25},
+                {"matrix": [3, 10], "x": 15, "y": 3.25},
+                {"matrix": [3, 11], "x": 16, "y": 3.25},
+                {"matrix": [3, 13], "x": 17, "y": 3.25},
+                {"matrix": [2, 13], "x": 18, "y": 2.25, "w": 1.25, "h": 2},
+                {"matrix": [3, 14], "x": 19.5, "y": 3.25},
+
+                {"matrix": [4, 15], "x": 0, "y": 4.25},
+                {"matrix": [4, 16], "x": 1, "y": 4.25},
+                {"matrix": [4, 17], "x": 2, "y": 4.25},
+                {"matrix": [3, 12], "x": 3, "y": 4.25, "h": 2},
+                {"matrix": [4, 0], "x": 4.25, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 1], "x": 5.5, "y": 4.25},
+                {"matrix": [4, 2], "x": 6.5, "y": 4.25},
+                {"matrix": [4, 3], "x": 7.5, "y": 4.25},
+                {"matrix": [4, 4], "x": 8.5, "y": 4.25},
+                {"matrix": [4, 5], "x": 9.5, "y": 4.25},
+                {"matrix": [4, 6], "x": 10.5, "y": 4.25},
+                {"matrix": [4, 7], "x": 11.5, "y": 4.25},
+                {"matrix": [4, 8], "x": 12.5, "y": 4.25},
+                {"matrix": [4, 9], "x": 13.5, "y": 4.25},
+                {"matrix": [4, 10], "x": 14.5, "y": 4.25},
+                {"matrix": [4, 11], "x": 15.5, "y": 4.25},
+                {"matrix": [4, 13], "x": 16.5, "y": 4.25, "w": 1.75},
+                {"matrix": [4, 14], "x": 18.5, "y": 4.5},
+
+                {"matrix": [5, 15], "x": 0, "y": 5.25, "w": 2},
+                {"matrix": [5, 17], "x": 2, "y": 5.25},
+                {"matrix": [5, 0], "x": 4.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 5.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 6.75, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 8, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 9], "x": 14.25, "y": 5.25},
+                {"matrix": [5, 10], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 11], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 12], "x": 17.5, "y": 5.5},
+                {"matrix": [5, 13], "x": 18.5, "y": 5.5},
+                {"matrix": [5, 14], "x": 19.5, "y": 5.5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/keychron/q12/iso_encoder/rules.mk b/keyboards/keychron/q12/iso_encoder/rules.mk
index 39b05940393..3652da4b697 100644
--- a/keyboards/keychron/q12/iso_encoder/rules.mk
+++ b/keyboards/keychron/q12/iso_encoder/rules.mk
@@ -1,21 +1,4 @@
-# Build Options
-#   change yes to no to disable.
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable USB N-key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-ENCODER_ENABLE = yes        # Enable Encoder
-DIP_SWITCH_ENABLE = yes
-RGB_MATRIX_ENABLE = yes
-
 # custom matrix setup
 CUSTOM_MATRIX = lite
 
-VPATH ?= keyboards/keychron/common
 SRC += matrix.c
diff --git a/keyboards/keychron/q1v2/ansi/info.json b/keyboards/keychron/q1v2/ansi/keyboard.json
similarity index 100%
rename from keyboards/keychron/q1v2/ansi/info.json
rename to keyboards/keychron/q1v2/ansi/keyboard.json
diff --git a/keyboards/keychron/q1v2/ansi_encoder/info.json b/keyboards/keychron/q1v2/ansi_encoder/keyboard.json
similarity index 100%
rename from keyboards/keychron/q1v2/ansi_encoder/info.json
rename to keyboards/keychron/q1v2/ansi_encoder/keyboard.json
diff --git a/keyboards/keychron/q1v2/iso/info.json b/keyboards/keychron/q1v2/iso/keyboard.json
similarity index 100%
rename from keyboards/keychron/q1v2/iso/info.json
rename to keyboards/keychron/q1v2/iso/keyboard.json
diff --git a/keyboards/keychron/q1v2/iso_encoder/info.json b/keyboards/keychron/q1v2/iso_encoder/keyboard.json
similarity index 100%
rename from keyboards/keychron/q1v2/iso_encoder/info.json
rename to keyboards/keychron/q1v2/iso_encoder/keyboard.json
diff --git a/keyboards/keychron/q1v2/jis/info.json b/keyboards/keychron/q1v2/jis/keyboard.json
similarity index 100%
rename from keyboards/keychron/q1v2/jis/info.json
rename to keyboards/keychron/q1v2/jis/keyboard.json
diff --git a/keyboards/keychron/q1v2/jis_encoder/info.json b/keyboards/keychron/q1v2/jis_encoder/keyboard.json
similarity index 100%
rename from keyboards/keychron/q1v2/jis_encoder/info.json
rename to keyboards/keychron/q1v2/jis_encoder/keyboard.json
diff --git a/keyboards/keychron/q3/ansi_encoder/info.json b/keyboards/keychron/q3/ansi_encoder/keyboard.json
similarity index 100%
rename from keyboards/keychron/q3/ansi_encoder/info.json
rename to keyboards/keychron/q3/ansi_encoder/keyboard.json
diff --git a/keyboards/keychron/q3/iso_encoder/info.json b/keyboards/keychron/q3/iso_encoder/keyboard.json
similarity index 100%
rename from keyboards/keychron/q3/iso_encoder/info.json
rename to keyboards/keychron/q3/iso_encoder/keyboard.json
diff --git a/keyboards/keychron/q3/jis_encoder/info.json b/keyboards/keychron/q3/jis_encoder/keyboard.json
similarity index 100%
rename from keyboards/keychron/q3/jis_encoder/info.json
rename to keyboards/keychron/q3/jis_encoder/keyboard.json
diff --git a/keyboards/keychron/q4/ansi/info.json b/keyboards/keychron/q4/ansi/info.json
index 392ef8fc458..2f99641b25c 100644
--- a/keyboards/keychron/q4/ansi/info.json
+++ b/keyboards/keychron/q4/ansi/info.json
@@ -1,7 +1,6 @@
 {
     "usb": {
-        "pid": "0x0140",
-        "device_version": "1.0.6"
+        "pid": "0x0140"
     },
     "rgb_matrix": {
         "layout": [
diff --git a/keyboards/keychron/q4/ansi/v1/keyboard.json b/keyboards/keychron/q4/ansi/v1/keyboard.json
new file mode 100644
index 00000000000..00eef71278e
--- /dev/null
+++ b/keyboards/keychron/q4/ansi/v1/keyboard.json
@@ -0,0 +1,5 @@
+{
+    "usb": {
+        "device_version": "1.0.6"
+    }
+}
diff --git a/keyboards/keychron/q4/ansi/v2/keyboard.json b/keyboards/keychron/q4/ansi/v2/keyboard.json
new file mode 100644
index 00000000000..3bdd63ee287
--- /dev/null
+++ b/keyboards/keychron/q4/ansi/v2/keyboard.json
@@ -0,0 +1,5 @@
+{
+    "usb": {
+        "device_version": "2.0.0"
+    }
+}
diff --git a/keyboards/keychron/q4/ansi/v2/rules.mk b/keyboards/keychron/q4/ansi/v2/rules.mk
deleted file mode 100644
index 7ff128fa692..00000000000
--- a/keyboards/keychron/q4/ansi/v2/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
\ No newline at end of file
diff --git a/keyboards/keychron/q5/ansi/info.json b/keyboards/keychron/q5/ansi/keyboard.json
similarity index 100%
rename from keyboards/keychron/q5/ansi/info.json
rename to keyboards/keychron/q5/ansi/keyboard.json
diff --git a/keyboards/keychron/q5/ansi_encoder/info.json b/keyboards/keychron/q5/ansi_encoder/keyboard.json
similarity index 100%
rename from keyboards/keychron/q5/ansi_encoder/info.json
rename to keyboards/keychron/q5/ansi_encoder/keyboard.json
diff --git a/keyboards/keychron/q5/iso/info.json b/keyboards/keychron/q5/iso/keyboard.json
similarity index 100%
rename from keyboards/keychron/q5/iso/info.json
rename to keyboards/keychron/q5/iso/keyboard.json
diff --git a/keyboards/keychron/q5/iso_encoder/info.json b/keyboards/keychron/q5/iso_encoder/keyboard.json
similarity index 100%
rename from keyboards/keychron/q5/iso_encoder/info.json
rename to keyboards/keychron/q5/iso_encoder/keyboard.json
diff --git a/keyboards/keychron/q6/ansi/info.json b/keyboards/keychron/q6/ansi/info.json
deleted file mode 100644
index d3dbd4a0922..00000000000
--- a/keyboards/keychron/q6/ansi/info.json
+++ /dev/null
@@ -1,132 +0,0 @@
-{
-    "keyboard_name": "Keychron Q6",
-    "manufacturer": "Keychron",
-    "url": "https://github.com/Keychron",
-    "maintainer": "lalalademaxiya1",
-    "usb": {
-        "vid": "0x3434",
-        "pid": "0x0160",
-        "device_version": "1.0.0"
-    },
-    "processor": "STM32L432",
-    "bootloader": "stm32-dfu",
-    "layouts": {
-        "LAYOUT_ansi_108": {
-            "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": [0, 19], "x": 18.5, "y": 0},
-                {"matrix": [1, 19], "x": 19.5, "y": 0},
-                {"matrix": [2, 19], "x": 20.5, "y": 0},
-                {"matrix": [3, 19], "x": 21.5, "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": [1, 17], "x": 18.5, "y": 1.25},
-                {"matrix": [1, 18], "x": 19.5, "y": 1.25},
-                {"matrix": [0, 17], "x": 20.5, "y": 1.25},
-                {"matrix": [0, 18], "x": 21.5, "y": 1.25},
-
-                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
-                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
-                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
-                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
-                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
-                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
-                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
-                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
-                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
-                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
-                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
-                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
-                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
-                {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
-                {"matrix": [2, 14], "x": 15.25, "y": 2.25},
-                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
-                {"matrix": [2, 16], "x": 17.25, "y": 2.25},
-                {"matrix": [2, 17], "x": 18.5, "y": 2.25},
-                {"matrix": [2, 18], "x": 19.5, "y": 2.25},
-                {"matrix": [3, 14], "x": 20.5, "y": 2.25},
-
-                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
-                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
-                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
-                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
-                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
-                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
-                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
-                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
-                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
-                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
-                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
-                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
-                {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
-                {"matrix": [3, 17], "x": 18.5, "y": 3.25},
-                {"matrix": [3, 18], "x": 19.5, "y": 3.25},
-                {"matrix": [3, 16], "x": 20.5, "y": 3.25},
-                {"matrix": [3, 15], "x": 21.5, "y": 2.25, "h": 2},
-
-                {"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, 13], "x": 12.25, "y": 4.25, "w": 2.75},
-                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
-                {"matrix": [4, 17], "x": 18.5, "y": 4.25},
-                {"matrix": [4, 18], "x": 19.5, "y": 4.25},
-                {"matrix": [4, 14], "x": 20.5, "y": 4.25},
-
-                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
-                {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
-                {"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},
-                {"matrix": [5, 17], "x": 18.5, "y": 5.25, "w": 2},
-                {"matrix": [5, 18], "x": 20.5, "y": 5.25},
-                {"matrix": [4, 16], "x": 21.5, "y": 4.25, "h": 2}
-            ]
-        }
-    }
-}
diff --git a/keyboards/keychron/q6/ansi/keyboard.json b/keyboards/keychron/q6/ansi/keyboard.json
new file mode 100644
index 00000000000..664fe870084
--- /dev/null
+++ b/keyboards/keychron/q6/ansi/keyboard.json
@@ -0,0 +1,143 @@
+{
+    "keyboard_name": "Keychron Q6",
+    "manufacturer": "Keychron",
+    "url": "https://github.com/Keychron",
+    "maintainer": "lalalademaxiya1",
+    "usb": {
+        "vid": "0x3434",
+        "pid": "0x0160",
+        "device_version": "1.0.0"
+    },
+    "processor": "STM32L432",
+    "bootloader": "stm32-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "nkro": true,
+        "rgb_matrix": true,
+        "dip_switch": true
+    },
+    "build": {
+        "lto": true
+    },
+    "layouts": {
+        "LAYOUT_ansi_108": {
+            "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": [0, 19], "x": 18.5, "y": 0},
+                {"matrix": [1, 19], "x": 19.5, "y": 0},
+                {"matrix": [2, 19], "x": 20.5, "y": 0},
+                {"matrix": [3, 19], "x": 21.5, "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": [1, 17], "x": 18.5, "y": 1.25},
+                {"matrix": [1, 18], "x": 19.5, "y": 1.25},
+                {"matrix": [0, 17], "x": 20.5, "y": 1.25},
+                {"matrix": [0, 18], "x": 21.5, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+                {"matrix": [2, 17], "x": 18.5, "y": 2.25},
+                {"matrix": [2, 18], "x": 19.5, "y": 2.25},
+                {"matrix": [3, 14], "x": 20.5, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+                {"matrix": [3, 17], "x": 18.5, "y": 3.25},
+                {"matrix": [3, 18], "x": 19.5, "y": 3.25},
+                {"matrix": [3, 16], "x": 20.5, "y": 3.25},
+                {"matrix": [3, 15], "x": 21.5, "y": 2.25, "h": 2},
+
+                {"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, 13], "x": 12.25, "y": 4.25, "w": 2.75},
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+                {"matrix": [4, 17], "x": 18.5, "y": 4.25},
+                {"matrix": [4, 18], "x": 19.5, "y": 4.25},
+                {"matrix": [4, 14], "x": 20.5, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+                {"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},
+                {"matrix": [5, 17], "x": 18.5, "y": 5.25, "w": 2},
+                {"matrix": [5, 18], "x": 20.5, "y": 5.25},
+                {"matrix": [4, 16], "x": 21.5, "y": 4.25, "h": 2}
+            ]
+        }
+    }
+}
diff --git a/keyboards/keychron/q6/ansi/rules.mk b/keyboards/keychron/q6/ansi/rules.mk
index 9383cc955f8..3652da4b697 100644
--- a/keyboards/keychron/q6/ansi/rules.mk
+++ b/keyboards/keychron/q6/ansi/rules.mk
@@ -1,19 +1,3 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable USB N-key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-DIP_SWITCH_ENABLE = yes
-RGB_MATRIX_ENABLE = yes
-LTO_ENABLE = yes
-
 # custom matrix setup
 CUSTOM_MATRIX = lite
 
diff --git a/keyboards/keychron/q6/ansi_encoder/info.json b/keyboards/keychron/q6/ansi_encoder/info.json
deleted file mode 100644
index 8e85336313f..00000000000
--- a/keyboards/keychron/q6/ansi_encoder/info.json
+++ /dev/null
@@ -1,138 +0,0 @@
-{
-    "keyboard_name": "Keychron Q6",
-    "manufacturer": "Keychron",
-    "url": "https://github.com/Keychron",
-    "maintainer": "lalalademaxiya1",
-    "usb": {
-        "vid": "0x3434",
-        "pid": "0x0161",
-        "device_version": "1.0.0"
-    },
-    "encoder": {
-        "rotary": [
-            {"pin_a": "C14", "pin_b": "A2"}
-        ]
-    },
-    "processor": "STM32L432",
-    "bootloader": "stm32-dfu",
-    "layouts": {
-        "LAYOUT_ansi_109": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1.25, "y": 0},
-                {"matrix": [0, 2], "x": 2.25, "y": 0},
-                {"matrix": [0, 3], "x": 3.25, "y": 0},
-                {"matrix": [0, 4], "x": 4.25, "y": 0},
-                {"matrix": [0, 5], "x": 5.5, "y": 0},
-                {"matrix": [0, 6], "x": 6.5, "y": 0},
-                {"matrix": [0, 7], "x": 7.5, "y": 0},
-                {"matrix": [0, 8], "x": 8.5, "y": 0},
-                {"matrix": [0, 9], "x": 9.75, "y": 0},
-                {"matrix": [0, 10], "x": 10.75, "y": 0},
-                {"matrix": [0, 11], "x": 11.75, "y": 0},
-                {"matrix": [0, 12], "x": 12.75, "y": 0},
-                {"matrix": [4, 19], "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": [0, 19], "x": 18.5, "y": 0},
-                {"matrix": [1, 19], "x": 19.5, "y": 0},
-                {"matrix": [2, 19], "x": 20.5, "y": 0},
-                {"matrix": [3, 19], "x": 21.5, "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": [1, 17], "x": 18.5, "y": 1.25},
-                {"matrix": [1, 18], "x": 19.5, "y": 1.25},
-                {"matrix": [0, 17], "x": 20.5, "y": 1.25},
-                {"matrix": [0, 18], "x": 21.5, "y": 1.25},
-
-                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
-                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
-                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
-                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
-                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
-                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
-                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
-                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
-                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
-                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
-                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
-                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
-                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
-                {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
-                {"matrix": [2, 14], "x": 15.25, "y": 2.25},
-                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
-                {"matrix": [2, 16], "x": 17.25, "y": 2.25},
-                {"matrix": [2, 17], "x": 18.5, "y": 2.25},
-                {"matrix": [2, 18], "x": 19.5, "y": 2.25},
-                {"matrix": [3, 14], "x": 20.5, "y": 2.25},
-
-                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
-                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
-                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
-                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
-                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
-                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
-                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
-                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
-                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
-                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
-                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
-                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
-                {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
-                {"matrix": [3, 17], "x": 18.5, "y": 3.25},
-                {"matrix": [3, 18], "x": 19.5, "y": 3.25},
-                {"matrix": [3, 16], "x": 20.5, "y": 3.25},
-                {"matrix": [3, 15], "x": 21.5, "y": 2.25, "h": 2},
-
-                {"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, 13], "x": 12.25, "y": 4.25, "w": 2.75},
-                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
-                {"matrix": [4, 17], "x": 18.5, "y": 4.25},
-                {"matrix": [4, 18], "x": 19.5, "y": 4.25},
-                {"matrix": [4, 14], "x": 20.5, "y": 4.25},
-
-                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
-                {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
-                {"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},
-                {"matrix": [5, 17], "x": 18.5, "y": 5.25, "w": 2},
-                {"matrix": [5, 18], "x": 20.5, "y": 5.25},
-                {"matrix": [4, 16], "x": 21.5, "y": 4.25, "h": 2}
-            ]
-        }
-    }
-}
diff --git a/keyboards/keychron/q6/ansi_encoder/keyboard.json b/keyboards/keychron/q6/ansi_encoder/keyboard.json
new file mode 100644
index 00000000000..a37b68f553a
--- /dev/null
+++ b/keyboards/keychron/q6/ansi_encoder/keyboard.json
@@ -0,0 +1,150 @@
+{
+    "keyboard_name": "Keychron Q6",
+    "manufacturer": "Keychron",
+    "url": "https://github.com/Keychron",
+    "maintainer": "lalalademaxiya1",
+    "usb": {
+        "vid": "0x3434",
+        "pid": "0x0161",
+        "device_version": "1.0.0"
+    },
+    "encoder": {
+        "rotary": [
+            {"pin_a": "C14", "pin_b": "A2"}
+        ]
+    },
+    "processor": "STM32L432",
+    "bootloader": "stm32-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "nkro": true,
+        "rgb_matrix": true,
+        "encoder": true,
+        "dip_switch": true
+    },
+    "build": {
+        "lto": true
+    },
+    "layouts": {
+        "LAYOUT_ansi_109": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.75, "y": 0},
+                {"matrix": [0, 10], "x": 10.75, "y": 0},
+                {"matrix": [0, 11], "x": 11.75, "y": 0},
+                {"matrix": [0, 12], "x": 12.75, "y": 0},
+                {"matrix": [4, 19], "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": [0, 19], "x": 18.5, "y": 0},
+                {"matrix": [1, 19], "x": 19.5, "y": 0},
+                {"matrix": [2, 19], "x": 20.5, "y": 0},
+                {"matrix": [3, 19], "x": 21.5, "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": [1, 17], "x": 18.5, "y": 1.25},
+                {"matrix": [1, 18], "x": 19.5, "y": 1.25},
+                {"matrix": [0, 17], "x": 20.5, "y": 1.25},
+                {"matrix": [0, 18], "x": 21.5, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+                {"matrix": [2, 17], "x": 18.5, "y": 2.25},
+                {"matrix": [2, 18], "x": 19.5, "y": 2.25},
+                {"matrix": [3, 14], "x": 20.5, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+                {"matrix": [3, 17], "x": 18.5, "y": 3.25},
+                {"matrix": [3, 18], "x": 19.5, "y": 3.25},
+                {"matrix": [3, 16], "x": 20.5, "y": 3.25},
+                {"matrix": [3, 15], "x": 21.5, "y": 2.25, "h": 2},
+
+                {"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, 13], "x": 12.25, "y": 4.25, "w": 2.75},
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+                {"matrix": [4, 17], "x": 18.5, "y": 4.25},
+                {"matrix": [4, 18], "x": 19.5, "y": 4.25},
+                {"matrix": [4, 14], "x": 20.5, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+                {"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},
+                {"matrix": [5, 17], "x": 18.5, "y": 5.25, "w": 2},
+                {"matrix": [5, 18], "x": 20.5, "y": 5.25},
+                {"matrix": [4, 16], "x": 21.5, "y": 4.25, "h": 2}
+            ]
+        }
+    }
+}
diff --git a/keyboards/keychron/q6/ansi_encoder/rules.mk b/keyboards/keychron/q6/ansi_encoder/rules.mk
index 929c4532a05..3652da4b697 100644
--- a/keyboards/keychron/q6/ansi_encoder/rules.mk
+++ b/keyboards/keychron/q6/ansi_encoder/rules.mk
@@ -1,20 +1,3 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable USB N-key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-ENCODER_ENABLE = yes        # Enable Encoder
-DIP_SWITCH_ENABLE = yes
-RGB_MATRIX_ENABLE = yes
-LTO_ENABLE = yes
-
 # custom matrix setup
 CUSTOM_MATRIX = lite
 
diff --git a/keyboards/keychron/q6/iso/info.json b/keyboards/keychron/q6/iso/info.json
deleted file mode 100644
index b88af93988d..00000000000
--- a/keyboards/keychron/q6/iso/info.json
+++ /dev/null
@@ -1,133 +0,0 @@
-{
-    "keyboard_name": "Keychron Q6",
-    "manufacturer": "Keychron",
-    "url": "https://github.com/Keychron",
-    "maintainer": "lalalademaxiya1",
-    "usb": {
-        "vid": "0x3434",
-        "pid": "0x0162",
-        "device_version": "1.0.0"
-    },
-    "processor": "STM32L432",
-    "bootloader": "stm32-dfu",
-    "layouts": {
-        "LAYOUT_iso_109": {
-            "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": [0, 19], "x": 18.5, "y": 0},
-                {"matrix": [1, 19], "x": 19.5, "y": 0},
-                {"matrix": [2, 19], "x": 20.5, "y": 0},
-                {"matrix": [3, 19], "x": 21.5, "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": [1, 17], "x": 18.5, "y": 1.25},
-                {"matrix": [1, 18], "x": 19.5, "y": 1.25},
-                {"matrix": [0, 17], "x": 20.5, "y": 1.25},
-                {"matrix": [0, 18], "x": 21.5, "y": 1.25},
-
-                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
-                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
-                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
-                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
-                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
-                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
-                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
-                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
-                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
-                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
-                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
-                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
-                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
-                {"matrix": [2, 14], "x": 15.25, "y": 2.25},
-                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
-                {"matrix": [2, 16], "x": 17.25, "y": 2.25},
-                {"matrix": [2, 17], "x": 18.5, "y": 2.25},
-                {"matrix": [2, 18], "x": 19.5, "y": 2.25},
-                {"matrix": [3, 14], "x": 20.5, "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},
-                {"matrix": [2, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
-                {"matrix": [3, 17], "x": 18.5, "y": 3.25},
-                {"matrix": [3, 18], "x": 19.5, "y": 3.25},
-                {"matrix": [3, 16], "x": 20.5, "y": 3.25},
-                {"matrix": [3, 15], "x": 21.5, "y": 2.25, "h": 2},
-
-                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4.25},
-                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
-                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
-                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
-                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
-                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
-                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
-                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
-                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
-                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
-                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
-                {"matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 2.75},
-                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
-                {"matrix": [4, 17], "x": 18.5, "y": 4.25},
-                {"matrix": [4, 18], "x": 19.5, "y": 4.25},
-                {"matrix": [4, 14], "x": 20.5, "y": 4.25},
-
-                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
-                {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
-                {"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},
-                {"matrix": [5, 17], "x": 18.5, "y": 5.25, "w": 2},
-                {"matrix": [5, 18], "x": 20.5, "y": 5.25},
-                {"matrix": [4, 16], "x": 21.5, "y": 4.25, "h": 2}
-            ]
-        }
-    }
-}
diff --git a/keyboards/keychron/q6/iso/keyboard.json b/keyboards/keychron/q6/iso/keyboard.json
new file mode 100644
index 00000000000..28730b2d740
--- /dev/null
+++ b/keyboards/keychron/q6/iso/keyboard.json
@@ -0,0 +1,144 @@
+{
+    "keyboard_name": "Keychron Q6",
+    "manufacturer": "Keychron",
+    "url": "https://github.com/Keychron",
+    "maintainer": "lalalademaxiya1",
+    "usb": {
+        "vid": "0x3434",
+        "pid": "0x0162",
+        "device_version": "1.0.0"
+    },
+    "processor": "STM32L432",
+    "bootloader": "stm32-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "nkro": true,
+        "rgb_matrix": true,
+        "dip_switch": true
+    },
+    "build": {
+        "lto": true
+    },
+    "layouts": {
+        "LAYOUT_iso_109": {
+            "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": [0, 19], "x": 18.5, "y": 0},
+                {"matrix": [1, 19], "x": 19.5, "y": 0},
+                {"matrix": [2, 19], "x": 20.5, "y": 0},
+                {"matrix": [3, 19], "x": 21.5, "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": [1, 17], "x": 18.5, "y": 1.25},
+                {"matrix": [1, 18], "x": 19.5, "y": 1.25},
+                {"matrix": [0, 17], "x": 20.5, "y": 1.25},
+                {"matrix": [0, 18], "x": 21.5, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+                {"matrix": [2, 17], "x": 18.5, "y": 2.25},
+                {"matrix": [2, 18], "x": 19.5, "y": 2.25},
+                {"matrix": [3, 14], "x": 20.5, "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},
+                {"matrix": [2, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+                {"matrix": [3, 17], "x": 18.5, "y": 3.25},
+                {"matrix": [3, 18], "x": 19.5, "y": 3.25},
+                {"matrix": [3, 16], "x": 20.5, "y": 3.25},
+                {"matrix": [3, 15], "x": 21.5, "y": 2.25, "h": 2},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 2.75},
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+                {"matrix": [4, 17], "x": 18.5, "y": 4.25},
+                {"matrix": [4, 18], "x": 19.5, "y": 4.25},
+                {"matrix": [4, 14], "x": 20.5, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+                {"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},
+                {"matrix": [5, 17], "x": 18.5, "y": 5.25, "w": 2},
+                {"matrix": [5, 18], "x": 20.5, "y": 5.25},
+                {"matrix": [4, 16], "x": 21.5, "y": 4.25, "h": 2}
+            ]
+        }
+    }
+}
diff --git a/keyboards/keychron/q6/iso/rules.mk b/keyboards/keychron/q6/iso/rules.mk
index f16a475f61a..3652da4b697 100644
--- a/keyboards/keychron/q6/iso/rules.mk
+++ b/keyboards/keychron/q6/iso/rules.mk
@@ -1,20 +1,3 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable USB N-key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-DIP_SWITCH_ENABLE = yes
-RGB_MATRIX_ENABLE = yes
-RAW_ENABLE = yes
-LTO_ENABLE = yes
-
 # custom matrix setup
 CUSTOM_MATRIX = lite
 
diff --git a/keyboards/keychron/q6/iso_encoder/info.json b/keyboards/keychron/q6/iso_encoder/info.json
deleted file mode 100644
index 54d4613b9c4..00000000000
--- a/keyboards/keychron/q6/iso_encoder/info.json
+++ /dev/null
@@ -1,139 +0,0 @@
-{
-    "keyboard_name": "Keychron Q6",
-    "manufacturer": "Keychron",
-    "url": "https://github.com/Keychron",
-    "maintainer": "lalalademaxiya1",
-    "usb": {
-        "vid": "0x3434",
-        "pid": "0x0163",
-        "device_version": "1.0.0"
-    },
-    "encoder": {
-        "rotary": [
-            {"pin_a": "C14", "pin_b": "A2"}
-        ]
-    },
-    "processor": "STM32L432",
-    "bootloader": "stm32-dfu",
-    "layouts": {
-        "LAYOUT_iso_110": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1.25, "y": 0},
-                {"matrix": [0, 2], "x": 2.25, "y": 0},
-                {"matrix": [0, 3], "x": 3.25, "y": 0},
-                {"matrix": [0, 4], "x": 4.25, "y": 0},
-                {"matrix": [0, 5], "x": 5.5, "y": 0},
-                {"matrix": [0, 6], "x": 6.5, "y": 0},
-                {"matrix": [0, 7], "x": 7.5, "y": 0},
-                {"matrix": [0, 8], "x": 8.5, "y": 0},
-                {"matrix": [0, 9], "x": 9.75, "y": 0},
-                {"matrix": [0, 10], "x": 10.75, "y": 0},
-                {"matrix": [0, 11], "x": 11.75, "y": 0},
-                {"matrix": [0, 12], "x": 12.75, "y": 0},
-                {"matrix": [4, 19], "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": [0, 19], "x": 18.5, "y": 0},
-                {"matrix": [1, 19], "x": 19.5, "y": 0},
-                {"matrix": [2, 19], "x": 20.5, "y": 0},
-                {"matrix": [3, 19], "x": 21.5, "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": [1, 17], "x": 18.5, "y": 1.25},
-                {"matrix": [1, 18], "x": 19.5, "y": 1.25},
-                {"matrix": [0, 17], "x": 20.5, "y": 1.25},
-                {"matrix": [0, 18], "x": 21.5, "y": 1.25},
-
-                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
-                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
-                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
-                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
-                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
-                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
-                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
-                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
-                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
-                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
-                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
-                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
-                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
-                {"matrix": [2, 14], "x": 15.25, "y": 2.25},
-                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
-                {"matrix": [2, 16], "x": 17.25, "y": 2.25},
-                {"matrix": [2, 17], "x": 18.5, "y": 2.25},
-                {"matrix": [2, 18], "x": 19.5, "y": 2.25},
-                {"matrix": [3, 14], "x": 20.5, "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},
-                {"matrix": [2, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
-                {"matrix": [3, 17], "x": 18.5, "y": 3.25},
-                {"matrix": [3, 18], "x": 19.5, "y": 3.25},
-                {"matrix": [3, 16], "x": 20.5, "y": 3.25},
-                {"matrix": [3, 15], "x": 21.5, "y": 2.25, "h": 2},
-
-                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4.25},
-                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
-                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
-                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
-                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
-                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
-                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
-                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
-                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
-                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
-                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
-                {"matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 2.75},
-                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
-                {"matrix": [4, 17], "x": 18.5, "y": 4.25},
-                {"matrix": [4, 18], "x": 19.5, "y": 4.25},
-                {"matrix": [4, 14], "x": 20.5, "y": 4.25},
-
-                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
-                {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
-                {"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},
-                {"matrix": [5, 17], "x": 18.5, "y": 5.25, "w": 2},
-                {"matrix": [5, 18], "x": 20.5, "y": 5.25},
-                {"matrix": [4, 16], "x": 21.5, "y": 4.25, "h": 2}
-            ]
-        }
-    }
-}
diff --git a/keyboards/keychron/q6/iso_encoder/keyboard.json b/keyboards/keychron/q6/iso_encoder/keyboard.json
new file mode 100644
index 00000000000..3fc4ee8f1cc
--- /dev/null
+++ b/keyboards/keychron/q6/iso_encoder/keyboard.json
@@ -0,0 +1,151 @@
+{
+    "keyboard_name": "Keychron Q6",
+    "manufacturer": "Keychron",
+    "url": "https://github.com/Keychron",
+    "maintainer": "lalalademaxiya1",
+    "usb": {
+        "vid": "0x3434",
+        "pid": "0x0163",
+        "device_version": "1.0.0"
+    },
+    "encoder": {
+        "rotary": [
+            {"pin_a": "C14", "pin_b": "A2"}
+        ]
+    },
+    "processor": "STM32L432",
+    "bootloader": "stm32-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "nkro": true,
+        "rgb_matrix": true,
+        "encoder": true,
+        "dip_switch": true
+    },
+    "build": {
+        "lto": true
+    },
+    "layouts": {
+        "LAYOUT_iso_110": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.75, "y": 0},
+                {"matrix": [0, 10], "x": 10.75, "y": 0},
+                {"matrix": [0, 11], "x": 11.75, "y": 0},
+                {"matrix": [0, 12], "x": 12.75, "y": 0},
+                {"matrix": [4, 19], "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": [0, 19], "x": 18.5, "y": 0},
+                {"matrix": [1, 19], "x": 19.5, "y": 0},
+                {"matrix": [2, 19], "x": 20.5, "y": 0},
+                {"matrix": [3, 19], "x": 21.5, "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": [1, 17], "x": 18.5, "y": 1.25},
+                {"matrix": [1, 18], "x": 19.5, "y": 1.25},
+                {"matrix": [0, 17], "x": 20.5, "y": 1.25},
+                {"matrix": [0, 18], "x": 21.5, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+                {"matrix": [2, 17], "x": 18.5, "y": 2.25},
+                {"matrix": [2, 18], "x": 19.5, "y": 2.25},
+                {"matrix": [3, 14], "x": 20.5, "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},
+                {"matrix": [2, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+                {"matrix": [3, 17], "x": 18.5, "y": 3.25},
+                {"matrix": [3, 18], "x": 19.5, "y": 3.25},
+                {"matrix": [3, 16], "x": 20.5, "y": 3.25},
+                {"matrix": [3, 15], "x": 21.5, "y": 2.25, "h": 2},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 2.75},
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+                {"matrix": [4, 17], "x": 18.5, "y": 4.25},
+                {"matrix": [4, 18], "x": 19.5, "y": 4.25},
+                {"matrix": [4, 14], "x": 20.5, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+                {"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},
+                {"matrix": [5, 17], "x": 18.5, "y": 5.25, "w": 2},
+                {"matrix": [5, 18], "x": 20.5, "y": 5.25},
+                {"matrix": [4, 16], "x": 21.5, "y": 4.25, "h": 2}
+            ]
+        }
+    }
+}
diff --git a/keyboards/keychron/q6/iso_encoder/rules.mk b/keyboards/keychron/q6/iso_encoder/rules.mk
index 712c2ef1fd6..3652da4b697 100644
--- a/keyboards/keychron/q6/iso_encoder/rules.mk
+++ b/keyboards/keychron/q6/iso_encoder/rules.mk
@@ -1,21 +1,3 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable USB N-key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-ENCODER_ENABLE = yes        # Enable Encoder
-DIP_SWITCH_ENABLE = yes
-RGB_MATRIX_ENABLE = yes
-RAW_ENABLE = yes
-LTO_ENABLE = yes
-
 # custom matrix setup
 CUSTOM_MATRIX = lite
 
diff --git a/keyboards/keychron/q65/ansi_encoder/info.json b/keyboards/keychron/q65/ansi_encoder/info.json
deleted file mode 100644
index 2d622b869c4..00000000000
--- a/keyboards/keychron/q65/ansi_encoder/info.json
+++ /dev/null
@@ -1,104 +0,0 @@
-{
-    "keyboard_name": "Keychron Q65",
-    "manufacturer": "Keychron",
-    "url": "https://github.com/Keychron",
-    "maintainer": "lalalademaxiya1",
-    "usb": {
-        "vid": "0x3434",
-        "pid": "0x01B1",
-        "device_version": "1.0.0"
-    },
-    "encoder": {
-        "rotary": [
-            {"pin_a": "A10", "pin_b": "A8"}
-        ]
-    },
-    "bootmagic": {
-        "matrix": [0, 1]
-    },
-    "processor": "STM32L432",
-    "bootloader": "stm32-dfu",
-    "layouts": {
-        "LAYOUT_ansi_73": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1.5, "y": 0.25},
-                {"matrix": [0, 2], "x": 2.5, "y": 0.25},
-                {"matrix": [0, 3], "x": 3.5, "y": 0.25},
-                {"matrix": [0, 4], "x": 4.5, "y": 0.25},
-                {"matrix": [0, 5], "x": 5.5, "y": 0.25},
-                {"matrix": [0, 6], "x": 6.5, "y": 0.25},
-                {"matrix": [0, 7], "x": 7.5, "y": 0.25},
-                {"matrix": [0, 8], "x": 8.5, "y": 0.25},
-                {"matrix": [0, 9], "x": 9.5, "y": 0.25},
-                {"matrix": [0, 10], "x": 10.5, "y": 0.25},
-                {"matrix": [0, 11], "x": 11.5, "y": 0.25},
-                {"matrix": [0, 12], "x": 12.5, "y": 0.25},
-                {"matrix": [0, 13], "x": 13.5, "y": 0.25},
-                {"matrix": [0, 14], "x": 14.5, "y": 0.25, "w": 2},
-                {"matrix": [0, 15], "x": 17, "y": 0.25},
-
-                {"matrix": [1, 0], "x": 0, "y": 1.25},
-                {"matrix": [1, 1], "x": 1.5, "y": 1.25, "w": 1.5},
-                {"matrix": [1, 2], "x": 3, "y": 1.25},
-                {"matrix": [1, 3], "x": 4, "y": 1.25},
-                {"matrix": [1, 4], "x": 5, "y": 1.25},
-                {"matrix": [1, 5], "x": 6, "y": 1.25},
-                {"matrix": [1, 6], "x": 7, "y": 1.25},
-                {"matrix": [1, 7], "x": 8, "y": 1.25},
-                {"matrix": [1, 8], "x": 9, "y": 1.25},
-                {"matrix": [1, 9], "x": 10, "y": 1.25},
-                {"matrix": [1, 10], "x": 11, "y": 1.25},
-                {"matrix": [1, 11], "x": 12, "y": 1.25},
-                {"matrix": [1, 12], "x": 13, "y": 1.25},
-                {"matrix": [1, 13], "x": 14, "y": 1.25},
-                {"matrix": [1, 14], "x": 15, "y": 1.25, "w": 1.5},
-                {"matrix": [1, 15], "x": 17, "y": 1.25},
-
-                {"matrix": [2, 0], "x": 0, "y": 2.25},
-                {"matrix": [2, 1], "x": 1.5, "y": 2.25, "w": 1.75},
-                {"matrix": [2, 2], "x": 3.25, "y": 2.25},
-                {"matrix": [2, 3], "x": 4.25, "y": 2.25},
-                {"matrix": [2, 4], "x": 5.25, "y": 2.25},
-                {"matrix": [2, 5], "x": 6.25, "y": 2.25},
-                {"matrix": [2, 6], "x": 7.25, "y": 2.25},
-                {"matrix": [2, 7], "x": 8.25, "y": 2.25},
-                {"matrix": [2, 8], "x": 9.25, "y": 2.25},
-                {"matrix": [2, 9], "x": 10.25, "y": 2.25},
-                {"matrix": [2, 10], "x": 11.25, "y": 2.25},
-                {"matrix": [2, 11], "x": 12.25, "y": 2.25},
-                {"matrix": [2, 12], "x": 13.25, "y": 2.25},
-                {"matrix": [2, 14], "x": 14.25, "y": 2.25, "w": 2.25},
-                {"matrix": [2, 15], "x": 17, "y": 2.25},
-
-                {"matrix": [3, 0], "x": 0, "y": 3.25},
-                {"matrix": [3, 1], "x": 1.5, "y": 3.25, "w": 2.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, 12], "x": 12.75, "y": 3.25},
-                {"matrix": [3, 13], "x": 13.75, "y": 3.25, "w": 1.75},
-                {"matrix": [3, 14], "x": 17, "y": 3.25},
-                {"matrix": [3, 15], "x": 15.75, "y": 3.5},
-
-                {"matrix": [4, 0], "x": 0, "y": 4.25},
-                {"matrix": [4, 1], "x": 1.5, "y": 4.25, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.75, "y": 4.25, "w": 1.25},
-                {"matrix": [4, 3], "x": 4, "y": 4.25, "w": 1.25},
-                {"matrix": [4, 7], "x": 5.25, "y": 4.25, "w": 6.25},
-                {"matrix": [4, 10], "x": 11.5, "y": 4.25},
-                {"matrix": [4, 11], "x": 12.5, "y": 4.25},
-                {"matrix": [4, 12], "x": 13.5, "y": 4.25},
-                {"matrix": [4, 13], "x": 14.75, "y": 4.5},
-                {"matrix": [4, 14], "x": 15.75, "y": 4.5},
-                {"matrix": [4, 15], "x": 16.75, "y": 4.5}
-            ]
-        }
-    }
-}
diff --git a/keyboards/keychron/q65/ansi_encoder/keyboard.json b/keyboards/keychron/q65/ansi_encoder/keyboard.json
new file mode 100644
index 00000000000..76b17dd5fbd
--- /dev/null
+++ b/keyboards/keychron/q65/ansi_encoder/keyboard.json
@@ -0,0 +1,113 @@
+{
+    "keyboard_name": "Keychron Q65",
+    "manufacturer": "Keychron",
+    "url": "https://github.com/Keychron",
+    "maintainer": "lalalademaxiya1",
+    "usb": {
+        "vid": "0x3434",
+        "pid": "0x01B1",
+        "device_version": "1.0.0"
+    },
+    "encoder": {
+        "rotary": [
+            {"pin_a": "A10", "pin_b": "A8"}
+        ]
+    },
+    "bootmagic": {
+        "matrix": [0, 1]
+    },
+    "processor": "STM32L432",
+    "bootloader": "stm32-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "nkro": true,
+        "encoder": true,
+        "dip_switch": true,
+        "rgb_matrix": true
+    },
+    "layouts": {
+        "LAYOUT_ansi_73": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1.5, "y": 0.25},
+                {"matrix": [0, 2], "x": 2.5, "y": 0.25},
+                {"matrix": [0, 3], "x": 3.5, "y": 0.25},
+                {"matrix": [0, 4], "x": 4.5, "y": 0.25},
+                {"matrix": [0, 5], "x": 5.5, "y": 0.25},
+                {"matrix": [0, 6], "x": 6.5, "y": 0.25},
+                {"matrix": [0, 7], "x": 7.5, "y": 0.25},
+                {"matrix": [0, 8], "x": 8.5, "y": 0.25},
+                {"matrix": [0, 9], "x": 9.5, "y": 0.25},
+                {"matrix": [0, 10], "x": 10.5, "y": 0.25},
+                {"matrix": [0, 11], "x": 11.5, "y": 0.25},
+                {"matrix": [0, 12], "x": 12.5, "y": 0.25},
+                {"matrix": [0, 13], "x": 13.5, "y": 0.25},
+                {"matrix": [0, 14], "x": 14.5, "y": 0.25, "w": 2},
+                {"matrix": [0, 15], "x": 17, "y": 0.25},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1.5, "y": 1.25, "w": 1.5},
+                {"matrix": [1, 2], "x": 3, "y": 1.25},
+                {"matrix": [1, 3], "x": 4, "y": 1.25},
+                {"matrix": [1, 4], "x": 5, "y": 1.25},
+                {"matrix": [1, 5], "x": 6, "y": 1.25},
+                {"matrix": [1, 6], "x": 7, "y": 1.25},
+                {"matrix": [1, 7], "x": 8, "y": 1.25},
+                {"matrix": [1, 8], "x": 9, "y": 1.25},
+                {"matrix": [1, 9], "x": 10, "y": 1.25},
+                {"matrix": [1, 10], "x": 11, "y": 1.25},
+                {"matrix": [1, 11], "x": 12, "y": 1.25},
+                {"matrix": [1, 12], "x": 13, "y": 1.25},
+                {"matrix": [1, 13], "x": 14, "y": 1.25},
+                {"matrix": [1, 14], "x": 15, "y": 1.25, "w": 1.5},
+                {"matrix": [1, 15], "x": 17, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25, "w": 1.75},
+                {"matrix": [2, 2], "x": 3.25, "y": 2.25},
+                {"matrix": [2, 3], "x": 4.25, "y": 2.25},
+                {"matrix": [2, 4], "x": 5.25, "y": 2.25},
+                {"matrix": [2, 5], "x": 6.25, "y": 2.25},
+                {"matrix": [2, 6], "x": 7.25, "y": 2.25},
+                {"matrix": [2, 7], "x": 8.25, "y": 2.25},
+                {"matrix": [2, 8], "x": 9.25, "y": 2.25},
+                {"matrix": [2, 9], "x": 10.25, "y": 2.25},
+                {"matrix": [2, 10], "x": 11.25, "y": 2.25},
+                {"matrix": [2, 11], "x": 12.25, "y": 2.25},
+                {"matrix": [2, 12], "x": 13.25, "y": 2.25},
+                {"matrix": [2, 14], "x": 14.25, "y": 2.25, "w": 2.25},
+                {"matrix": [2, 15], "x": 17, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25},
+                {"matrix": [3, 1], "x": 1.5, "y": 3.25, "w": 2.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, 12], "x": 12.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 13.75, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 14], "x": 17, "y": 3.25},
+                {"matrix": [3, 15], "x": 15.75, "y": 3.5},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25},
+                {"matrix": [4, 1], "x": 1.5, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.75, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 3], "x": 4, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 7], "x": 5.25, "y": 4.25, "w": 6.25},
+                {"matrix": [4, 10], "x": 11.5, "y": 4.25},
+                {"matrix": [4, 11], "x": 12.5, "y": 4.25},
+                {"matrix": [4, 12], "x": 13.5, "y": 4.25},
+                {"matrix": [4, 13], "x": 14.75, "y": 4.5},
+                {"matrix": [4, 14], "x": 15.75, "y": 4.5},
+                {"matrix": [4, 15], "x": 16.75, "y": 4.5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/keychron/q65/ansi_encoder/rules.mk b/keyboards/keychron/q65/ansi_encoder/rules.mk
index 4c6e5bebf00..3652da4b697 100644
--- a/keyboards/keychron/q65/ansi_encoder/rules.mk
+++ b/keyboards/keychron/q65/ansi_encoder/rules.mk
@@ -1,19 +1,3 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable USB N-key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-ENCODER_ENABLE = yes        # Enable Encoder
-DIP_SWITCH_ENABLE = yes
-RGB_MATRIX_ENABLE = yes
-
 # custom matrix setup
 CUSTOM_MATRIX = lite
 
diff --git a/keyboards/keychron/v1/ansi/info.json b/keyboards/keychron/v1/ansi/info.json
deleted file mode 100644
index db2526e244e..00000000000
--- a/keyboards/keychron/v1/ansi/info.json
+++ /dev/null
@@ -1,106 +0,0 @@
-{
-    "keyboard_name": "Keychron V1",
-    "manufacturer": "Keychron",
-    "url": "https://github.com/Keychron",
-    "maintainer": "lalalademaxiya1",
-    "usb": {
-        "vid": "0x3434",
-        "pid": "0x0310",
-        "device_version": "1.0.0"
-    },
-    "processor": "STM32L432",
-    "bootloader": "stm32-dfu",
-    "layouts": {
-        "LAYOUT_ansi_82": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1.25, "y": 0},
-                {"matrix": [0, 2], "x": 2.25, "y": 0},
-                {"matrix": [0, 3], "x": 3.25, "y": 0},
-                {"matrix": [0, 4], "x": 4.25, "y": 0},
-                {"matrix": [0, 5], "x": 5.5, "y": 0},
-                {"matrix": [0, 6], "x": 6.5, "y": 0},
-                {"matrix": [0, 7], "x": 7.5, "y": 0},
-                {"matrix": [0, 8], "x": 8.5, "y": 0},
-                {"matrix": [0, 9], "x": 9.75, "y": 0},
-                {"matrix": [0, 10], "x": 10.75, "y": 0},
-                {"matrix": [0, 11], "x": 11.75, "y": 0},
-                {"matrix": [0, 12], "x": 12.75, "y": 0},
-                {"matrix": [0, 13], "x": 14, "y": 0},
-                {"matrix": [0, 15], "x": 15.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, 15], "x": 15.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": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
-                {"matrix": [2, 15], "x": 15.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": [3, 15], "x": 15.25, "y": 3.25},
-
-                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
-                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
-                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
-                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
-                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
-                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
-                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
-                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
-                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
-                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
-                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
-                {"matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 1.75},
-                {"matrix": [4, 14], "x": 14.25, "y": 4.5},
-
-                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
-                {"matrix": [5, 10], "x": 10, "y": 5.25},
-                {"matrix": [5, 11], "x": 11, "y": 5.25},
-                {"matrix": [5, 12], "x": 12, "y": 5.25},
-                {"matrix": [5, 13], "x": 13.25, "y": 5.5},
-                {"matrix": [5, 14], "x": 14.25, "y": 5.5},
-                {"matrix": [5, 15], "x": 15.25, "y": 5.5}
-            ]
-        }
-    }
-}
diff --git a/keyboards/keychron/v1/ansi/keyboard.json b/keyboards/keychron/v1/ansi/keyboard.json
new file mode 100644
index 00000000000..d4bbca78de2
--- /dev/null
+++ b/keyboards/keychron/v1/ansi/keyboard.json
@@ -0,0 +1,114 @@
+{
+    "keyboard_name": "Keychron V1",
+    "manufacturer": "Keychron",
+    "url": "https://github.com/Keychron",
+    "maintainer": "lalalademaxiya1",
+    "usb": {
+        "vid": "0x3434",
+        "pid": "0x0310",
+        "device_version": "1.0.0"
+    },
+    "processor": "STM32L432",
+    "bootloader": "stm32-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "nkro": true,
+        "dip_switch": true,
+        "rgb_matrix": true
+    },
+    "layouts": {
+        "LAYOUT_ansi_82": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.75, "y": 0},
+                {"matrix": [0, 10], "x": 10.75, "y": 0},
+                {"matrix": [0, 11], "x": 11.75, "y": 0},
+                {"matrix": [0, 12], "x": 12.75, "y": 0},
+                {"matrix": [0, 13], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15.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, 15], "x": 15.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": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 15], "x": 15.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": [3, 15], "x": 15.25, "y": 3.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"matrix": [4, 14], "x": 14.25, "y": 4.5},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.25},
+                {"matrix": [5, 11], "x": 11, "y": 5.25},
+                {"matrix": [5, 12], "x": 12, "y": 5.25},
+                {"matrix": [5, 13], "x": 13.25, "y": 5.5},
+                {"matrix": [5, 14], "x": 14.25, "y": 5.5},
+                {"matrix": [5, 15], "x": 15.25, "y": 5.5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/keychron/v1/ansi/rules.mk b/keyboards/keychron/v1/ansi/rules.mk
index 465dfa93486..3652da4b697 100644
--- a/keyboards/keychron/v1/ansi/rules.mk
+++ b/keyboards/keychron/v1/ansi/rules.mk
@@ -1,18 +1,3 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable USB N-key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-DIP_SWITCH_ENABLE = yes
-RGB_MATRIX_ENABLE = yes
-
 # custom matrix setup
 CUSTOM_MATRIX = lite
 
diff --git a/keyboards/keychron/v1/ansi_encoder/info.json b/keyboards/keychron/v1/ansi_encoder/info.json
deleted file mode 100644
index 621010039d6..00000000000
--- a/keyboards/keychron/v1/ansi_encoder/info.json
+++ /dev/null
@@ -1,111 +0,0 @@
-{
-    "keyboard_name": "Keychron V1",
-    "manufacturer": "Keychron",
-    "url": "https://github.com/Keychron",
-    "maintainer": "lalalademaxiya1",
-    "usb": {
-        "vid": "0x3434",
-        "pid": "0x0311",
-        "device_version": "1.0.0"
-    },
-    "encoder": {
-        "rotary": [
-            {"pin_a": "A10", "pin_b": "A8"}
-        ]
-    },
-    "processor": "STM32L432",
-    "bootloader": "stm32-dfu",
-    "layouts": {
-        "LAYOUT_ansi_82": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1.25, "y": 0},
-                {"matrix": [0, 2], "x": 2.25, "y": 0},
-                {"matrix": [0, 3], "x": 3.25, "y": 0},
-                {"matrix": [0, 4], "x": 4.25, "y": 0},
-                {"matrix": [0, 5], "x": 5.5, "y": 0},
-                {"matrix": [0, 6], "x": 6.5, "y": 0},
-                {"matrix": [0, 7], "x": 7.5, "y": 0},
-                {"matrix": [0, 8], "x": 8.5, "y": 0},
-                {"matrix": [0, 9], "x": 9.75, "y": 0},
-                {"matrix": [0, 10], "x": 10.75, "y": 0},
-                {"matrix": [0, 11], "x": 11.75, "y": 0},
-                {"matrix": [0, 12], "x": 12.75, "y": 0},
-                {"matrix": [0, 13], "x": 14, "y": 0},
-                {"matrix": [0, 15], "x": 15.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, 15], "x": 15.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": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
-                {"matrix": [2, 15], "x": 15.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": [3, 15], "x": 15.25, "y": 3.25},
-
-                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
-                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
-                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
-                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
-                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
-                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
-                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
-                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
-                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
-                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
-                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
-                {"matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 1.75},
-                {"matrix": [4, 14], "x": 14.25, "y": 4.5},
-
-                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
-                {"matrix": [5, 10], "x": 10, "y": 5.25},
-                {"matrix": [5, 11], "x": 11, "y": 5.25},
-                {"matrix": [5, 12], "x": 12, "y": 5.25},
-                {"matrix": [5, 13], "x": 13.25, "y": 5.5},
-                {"matrix": [5, 14], "x": 14.25, "y": 5.5},
-                {"matrix": [5, 15], "x": 15.25, "y": 5.5}
-            ]
-        }
-    }
-}
diff --git a/keyboards/keychron/v1/ansi_encoder/keyboard.json b/keyboards/keychron/v1/ansi_encoder/keyboard.json
new file mode 100644
index 00000000000..62bbeb9d5df
--- /dev/null
+++ b/keyboards/keychron/v1/ansi_encoder/keyboard.json
@@ -0,0 +1,120 @@
+{
+    "keyboard_name": "Keychron V1",
+    "manufacturer": "Keychron",
+    "url": "https://github.com/Keychron",
+    "maintainer": "lalalademaxiya1",
+    "usb": {
+        "vid": "0x3434",
+        "pid": "0x0311",
+        "device_version": "1.0.0"
+    },
+    "encoder": {
+        "rotary": [
+            {"pin_a": "A10", "pin_b": "A8"}
+        ]
+    },
+    "processor": "STM32L432",
+    "bootloader": "stm32-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "nkro": true,
+        "encoder": true,
+        "dip_switch": true,
+        "rgb_matrix": true
+    },
+    "layouts": {
+        "LAYOUT_ansi_82": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.75, "y": 0},
+                {"matrix": [0, 10], "x": 10.75, "y": 0},
+                {"matrix": [0, 11], "x": 11.75, "y": 0},
+                {"matrix": [0, 12], "x": 12.75, "y": 0},
+                {"matrix": [0, 13], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15.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, 15], "x": 15.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": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 15], "x": 15.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": [3, 15], "x": 15.25, "y": 3.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"matrix": [4, 14], "x": 14.25, "y": 4.5},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.25},
+                {"matrix": [5, 11], "x": 11, "y": 5.25},
+                {"matrix": [5, 12], "x": 12, "y": 5.25},
+                {"matrix": [5, 13], "x": 13.25, "y": 5.5},
+                {"matrix": [5, 14], "x": 14.25, "y": 5.5},
+                {"matrix": [5, 15], "x": 15.25, "y": 5.5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/keychron/v1/ansi_encoder/rules.mk b/keyboards/keychron/v1/ansi_encoder/rules.mk
index 4c6e5bebf00..3652da4b697 100644
--- a/keyboards/keychron/v1/ansi_encoder/rules.mk
+++ b/keyboards/keychron/v1/ansi_encoder/rules.mk
@@ -1,19 +1,3 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable USB N-key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-ENCODER_ENABLE = yes        # Enable Encoder
-DIP_SWITCH_ENABLE = yes
-RGB_MATRIX_ENABLE = yes
-
 # custom matrix setup
 CUSTOM_MATRIX = lite
 
diff --git a/keyboards/keychron/v1/iso/info.json b/keyboards/keychron/v1/iso/info.json
deleted file mode 100644
index 9047aa2bb2f..00000000000
--- a/keyboards/keychron/v1/iso/info.json
+++ /dev/null
@@ -1,107 +0,0 @@
-{
-    "keyboard_name": "Keychron V1",
-    "manufacturer": "Keychron",
-    "url": "https://github.com/Keychron",
-    "maintainer": "lalalademaxiya1",
-    "usb": {
-        "vid": "0x3434",
-        "pid": "0x0312",
-        "device_version": "1.0.0"
-    },
-    "processor": "STM32L432",
-    "bootloader": "stm32-dfu",
-    "layouts": {
-        "LAYOUT_iso_83": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1.25, "y": 0},
-                {"matrix": [0, 2], "x": 2.25, "y": 0},
-                {"matrix": [0, 3], "x": 3.25, "y": 0},
-                {"matrix": [0, 4], "x": 4.25, "y": 0},
-                {"matrix": [0, 5], "x": 5.5, "y": 0},
-                {"matrix": [0, 6], "x": 6.5, "y": 0},
-                {"matrix": [0, 7], "x": 7.5, "y": 0},
-                {"matrix": [0, 8], "x": 8.5, "y": 0},
-                {"matrix": [0, 9], "x": 9.75, "y": 0},
-                {"matrix": [0, 10], "x": 10.75, "y": 0},
-                {"matrix": [0, 11], "x": 11.75, "y": 0},
-                {"matrix": [0, 12], "x": 12.75, "y": 0},
-                {"matrix": [0, 13], "x": 14, "y": 0},
-                {"matrix": [0, 15], "x": 15.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, 15], "x": 15.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": [2, 15], "x": 15.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},
-                {"matrix": [2, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
-                {"matrix": [3, 15], "x": 15.25, "y": 3.25},
-
-                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4.25},
-                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
-                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
-                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
-                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
-                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
-                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
-                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
-                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
-                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
-                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
-                {"matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 1.75},
-                {"matrix": [4, 14], "x": 14.25, "y": 4.5},
-
-                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
-                {"matrix": [5, 10], "x": 10, "y": 5.25},
-                {"matrix": [5, 11], "x": 11, "y": 5.25},
-                {"matrix": [5, 12], "x": 12, "y": 5.25},
-                {"matrix": [5, 13], "x": 13.25, "y": 5.5},
-                {"matrix": [5, 14], "x": 14.25, "y": 5.5},
-                {"matrix": [5, 15], "x": 15.25, "y": 5.5}
-            ]
-        }
-    }
-}
diff --git a/keyboards/keychron/v1/iso/keyboard.json b/keyboards/keychron/v1/iso/keyboard.json
new file mode 100644
index 00000000000..6e307ea4df5
--- /dev/null
+++ b/keyboards/keychron/v1/iso/keyboard.json
@@ -0,0 +1,115 @@
+{
+    "keyboard_name": "Keychron V1",
+    "manufacturer": "Keychron",
+    "url": "https://github.com/Keychron",
+    "maintainer": "lalalademaxiya1",
+    "usb": {
+        "vid": "0x3434",
+        "pid": "0x0312",
+        "device_version": "1.0.0"
+    },
+    "processor": "STM32L432",
+    "bootloader": "stm32-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "nkro": true,
+        "rgb_matrix": true,
+        "dip_switch": true
+    },
+    "layouts": {
+        "LAYOUT_iso_83": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.75, "y": 0},
+                {"matrix": [0, 10], "x": 10.75, "y": 0},
+                {"matrix": [0, 11], "x": 11.75, "y": 0},
+                {"matrix": [0, 12], "x": 12.75, "y": 0},
+                {"matrix": [0, 13], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15.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, 15], "x": 15.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": [2, 15], "x": 15.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},
+                {"matrix": [2, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+                {"matrix": [3, 15], "x": 15.25, "y": 3.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"matrix": [4, 14], "x": 14.25, "y": 4.5},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.25},
+                {"matrix": [5, 11], "x": 11, "y": 5.25},
+                {"matrix": [5, 12], "x": 12, "y": 5.25},
+                {"matrix": [5, 13], "x": 13.25, "y": 5.5},
+                {"matrix": [5, 14], "x": 14.25, "y": 5.5},
+                {"matrix": [5, 15], "x": 15.25, "y": 5.5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/keychron/v1/iso/rules.mk b/keyboards/keychron/v1/iso/rules.mk
index 465dfa93486..3652da4b697 100644
--- a/keyboards/keychron/v1/iso/rules.mk
+++ b/keyboards/keychron/v1/iso/rules.mk
@@ -1,18 +1,3 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable USB N-key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-DIP_SWITCH_ENABLE = yes
-RGB_MATRIX_ENABLE = yes
-
 # custom matrix setup
 CUSTOM_MATRIX = lite
 
diff --git a/keyboards/keychron/v1/iso_encoder/info.json b/keyboards/keychron/v1/iso_encoder/info.json
deleted file mode 100644
index 557585f82d9..00000000000
--- a/keyboards/keychron/v1/iso_encoder/info.json
+++ /dev/null
@@ -1,112 +0,0 @@
-{
-    "keyboard_name": "Keychron V1",
-    "manufacturer": "Keychron",
-    "url": "https://github.com/Keychron",
-    "maintainer": "lalalademaxiya1",
-    "usb": {
-        "vid": "0x3434",
-        "pid": "0x0313",
-        "device_version": "1.0.0"
-    },
-    "encoder": {
-        "rotary": [
-            {"pin_a": "A10", "pin_b": "A8"}
-        ]
-    },
-    "processor": "STM32L432",
-    "bootloader": "stm32-dfu",
-    "layouts": {
-        "LAYOUT_iso_83": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1.25, "y": 0},
-                {"matrix": [0, 2], "x": 2.25, "y": 0},
-                {"matrix": [0, 3], "x": 3.25, "y": 0},
-                {"matrix": [0, 4], "x": 4.25, "y": 0},
-                {"matrix": [0, 5], "x": 5.5, "y": 0},
-                {"matrix": [0, 6], "x": 6.5, "y": 0},
-                {"matrix": [0, 7], "x": 7.5, "y": 0},
-                {"matrix": [0, 8], "x": 8.5, "y": 0},
-                {"matrix": [0, 9], "x": 9.75, "y": 0},
-                {"matrix": [0, 10], "x": 10.75, "y": 0},
-                {"matrix": [0, 11], "x": 11.75, "y": 0},
-                {"matrix": [0, 12], "x": 12.75, "y": 0},
-                {"matrix": [0, 13], "x": 14, "y": 0},
-                {"matrix": [0, 15], "x": 15.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, 15], "x": 15.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": [2, 15], "x": 15.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},
-                {"matrix": [2, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
-                {"matrix": [3, 15], "x": 15.25, "y": 3.25},
-
-                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4.25},
-                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
-                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
-                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
-                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
-                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
-                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
-                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
-                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
-                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
-                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
-                {"matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 1.75},
-                {"matrix": [4, 14], "x": 14.25, "y": 4.5},
-
-                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
-                {"matrix": [5, 10], "x": 10, "y": 5.25},
-                {"matrix": [5, 11], "x": 11, "y": 5.25},
-                {"matrix": [5, 12], "x": 12, "y": 5.25},
-                {"matrix": [5, 13], "x": 13.25, "y": 5.5},
-                {"matrix": [5, 14], "x": 14.25, "y": 5.5},
-                {"matrix": [5, 15], "x": 15.25, "y": 5.5}
-            ]
-        }
-    }
-}
diff --git a/keyboards/keychron/v1/iso_encoder/keyboard.json b/keyboards/keychron/v1/iso_encoder/keyboard.json
new file mode 100644
index 00000000000..077cb045b29
--- /dev/null
+++ b/keyboards/keychron/v1/iso_encoder/keyboard.json
@@ -0,0 +1,121 @@
+{
+    "keyboard_name": "Keychron V1",
+    "manufacturer": "Keychron",
+    "url": "https://github.com/Keychron",
+    "maintainer": "lalalademaxiya1",
+    "usb": {
+        "vid": "0x3434",
+        "pid": "0x0313",
+        "device_version": "1.0.0"
+    },
+    "encoder": {
+        "rotary": [
+            {"pin_a": "A10", "pin_b": "A8"}
+        ]
+    },
+    "processor": "STM32L432",
+    "bootloader": "stm32-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "nkro": true,
+        "rgb_matrix": true,
+        "encoder": true,
+        "dip_switch": true
+    },
+    "layouts": {
+        "LAYOUT_iso_83": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.75, "y": 0},
+                {"matrix": [0, 10], "x": 10.75, "y": 0},
+                {"matrix": [0, 11], "x": 11.75, "y": 0},
+                {"matrix": [0, 12], "x": 12.75, "y": 0},
+                {"matrix": [0, 13], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15.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, 15], "x": 15.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": [2, 15], "x": 15.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},
+                {"matrix": [2, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+                {"matrix": [3, 15], "x": 15.25, "y": 3.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"matrix": [4, 14], "x": 14.25, "y": 4.5},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.25},
+                {"matrix": [5, 11], "x": 11, "y": 5.25},
+                {"matrix": [5, 12], "x": 12, "y": 5.25},
+                {"matrix": [5, 13], "x": 13.25, "y": 5.5},
+                {"matrix": [5, 14], "x": 14.25, "y": 5.5},
+                {"matrix": [5, 15], "x": 15.25, "y": 5.5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/keychron/v1/iso_encoder/rules.mk b/keyboards/keychron/v1/iso_encoder/rules.mk
index 4c6e5bebf00..3652da4b697 100644
--- a/keyboards/keychron/v1/iso_encoder/rules.mk
+++ b/keyboards/keychron/v1/iso_encoder/rules.mk
@@ -1,19 +1,3 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable USB N-key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-ENCODER_ENABLE = yes        # Enable Encoder
-DIP_SWITCH_ENABLE = yes
-RGB_MATRIX_ENABLE = yes
-
 # custom matrix setup
 CUSTOM_MATRIX = lite
 
diff --git a/keyboards/keychron/v1/jis/info.json b/keyboards/keychron/v1/jis/info.json
deleted file mode 100644
index 1678c93c668..00000000000
--- a/keyboards/keychron/v1/jis/info.json
+++ /dev/null
@@ -1,110 +0,0 @@
-{
-    "keyboard_name": "Keychron V1",
-    "manufacturer": "Keychron",
-    "url": "https://github.com/Keychron",
-    "maintainer": "lalalademaxiya1",
-    "usb": {
-        "vid": "0x3434",
-        "pid": "0x0314",
-        "device_version": "1.0.0"
-    },
-    "processor": "STM32L432",
-    "bootloader": "stm32-dfu",
-    "layouts": {
-        "LAYOUT_jis_86": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1.25, "y": 0},
-                {"matrix": [0, 2], "x": 2.25, "y": 0},
-                {"matrix": [0, 3], "x": 3.25, "y": 0},
-                {"matrix": [0, 4], "x": 4.25, "y": 0},
-                {"matrix": [0, 5], "x": 5.5, "y": 0},
-                {"matrix": [0, 6], "x": 6.5, "y": 0},
-                {"matrix": [0, 7], "x": 7.5, "y": 0},
-                {"matrix": [0, 8], "x": 8.5, "y": 0},
-                {"matrix": [0, 9], "x": 9.75, "y": 0},
-                {"matrix": [0, 10], "x": 10.75, "y": 0},
-                {"matrix": [0, 11], "x": 11.75, "y": 0},
-                {"matrix": [0, 12], "x": 12.75, "y": 0},
-                {"matrix": [0, 13], "x": 14, "y": 0},
-                {"matrix": [0, 15], "x": 15.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.251},
-                {"matrix": [1, 5], "x": 5, "y": 1.25},
-                {"matrix": [1, 6], "x": 6, "y": 1.25},
-                {"matrix": [1, 7], "x": 7, "y": 1.25},
-                {"matrix": [1, 8], "x": 8, "y": 1.25},
-                {"matrix": [1, 9], "x": 9, "y": 1.25},
-                {"matrix": [1, 10], "x": 10, "y": 1.25},
-                {"matrix": [1, 11], "x": 11, "y": 1.25},
-                {"matrix": [1, 12], "x": 12, "y": 1.25},
-                {"matrix": [1, 13], "x": 13, "y": 1.25},
-                {"matrix": [1, 14], "x": 14, "y": 1.25},
-                {"matrix": [1, 15], "x": 15.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": [2, 15], "x": 15.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},
-                {"matrix": [2, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
-                {"matrix": [3, 15], "x": 15.25, "y": 3.25},
-
-                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
-                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
-                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
-                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
-                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
-                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
-                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
-                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
-                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
-                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
-                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
-                {"matrix": [4, 12], "x": 12.25, "y": 4.25},
-                {"matrix": [4, 13], "x": 13.25, "y": 4.25},
-                {"matrix": [4, 14], "x": 14.25, "y": 4.5},
-
-                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 1], "x": 1.25, "y": 5.25},
-                {"matrix": [5, 2], "x": 2.25, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 3], "x": 3.5, "y": 5.25},
-                {"matrix": [5, 6], "x": 4.5, "y": 5.25, "w": 4.5},
-                {"matrix": [5, 9], "x": 9, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 10], "x": 10.25, "y": 5.25},
-                {"matrix": [5, 11], "x": 11.25, "y": 5.25},
-                {"matrix": [5, 12], "x": 12.25, "y": 5.25},
-                {"matrix": [5, 13], "x": 13.25, "y": 5.25},
-                {"matrix": [5, 14], "x": 14.25, "y": 5.25},
-                {"matrix": [5, 15], "x": 15.25, "y": 5.25}
-            ]
-        }
-    }
-}
diff --git a/keyboards/keychron/v1/jis/keyboard.json b/keyboards/keychron/v1/jis/keyboard.json
new file mode 100644
index 00000000000..a6a43a75daf
--- /dev/null
+++ b/keyboards/keychron/v1/jis/keyboard.json
@@ -0,0 +1,118 @@
+{
+    "keyboard_name": "Keychron V1",
+    "manufacturer": "Keychron",
+    "url": "https://github.com/Keychron",
+    "maintainer": "lalalademaxiya1",
+    "usb": {
+        "vid": "0x3434",
+        "pid": "0x0314",
+        "device_version": "1.0.0"
+    },
+    "processor": "STM32L432",
+    "bootloader": "stm32-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "nkro": true,
+        "rgb_matrix": true,
+        "dip_switch": true
+    },
+    "layouts": {
+        "LAYOUT_jis_86": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.75, "y": 0},
+                {"matrix": [0, 10], "x": 10.75, "y": 0},
+                {"matrix": [0, 11], "x": 11.75, "y": 0},
+                {"matrix": [0, 12], "x": 12.75, "y": 0},
+                {"matrix": [0, 13], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15.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.251},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25},
+                {"matrix": [1, 14], "x": 14, "y": 1.25},
+                {"matrix": [1, 15], "x": 15.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": [2, 15], "x": 15.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},
+                {"matrix": [2, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+                {"matrix": [3, 15], "x": 15.25, "y": 3.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25},
+                {"matrix": [4, 13], "x": 13.25, "y": 4.25},
+                {"matrix": [4, 14], "x": 14.25, "y": 4.5},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25},
+                {"matrix": [5, 2], "x": 2.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 3], "x": 3.5, "y": 5.25},
+                {"matrix": [5, 6], "x": 4.5, "y": 5.25, "w": 4.5},
+                {"matrix": [5, 9], "x": 9, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 10], "x": 10.25, "y": 5.25},
+                {"matrix": [5, 11], "x": 11.25, "y": 5.25},
+                {"matrix": [5, 12], "x": 12.25, "y": 5.25},
+                {"matrix": [5, 13], "x": 13.25, "y": 5.25},
+                {"matrix": [5, 14], "x": 14.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 15.25, "y": 5.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/keychron/v1/jis/rules.mk b/keyboards/keychron/v1/jis/rules.mk
index 465dfa93486..3652da4b697 100644
--- a/keyboards/keychron/v1/jis/rules.mk
+++ b/keyboards/keychron/v1/jis/rules.mk
@@ -1,18 +1,3 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable USB N-key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-DIP_SWITCH_ENABLE = yes
-RGB_MATRIX_ENABLE = yes
-
 # custom matrix setup
 CUSTOM_MATRIX = lite
 
diff --git a/keyboards/keychron/v1/jis_encoder/info.json b/keyboards/keychron/v1/jis_encoder/info.json
deleted file mode 100644
index 7064bcdd552..00000000000
--- a/keyboards/keychron/v1/jis_encoder/info.json
+++ /dev/null
@@ -1,115 +0,0 @@
-{
-    "keyboard_name": "Keychron V1",
-    "manufacturer": "Keychron",
-    "url": "https://github.com/Keychron",
-    "maintainer": "lalalademaxiya1",
-    "usb": {
-        "vid": "0x3434",
-        "pid": "0x0315",
-        "device_version": "1.0.0"
-    },
-    "encoder": {
-        "rotary": [
-            {"pin_a": "A10", "pin_b": "A8"}
-        ]
-    },
-    "processor": "STM32L432",
-    "bootloader": "stm32-dfu",
-    "layouts": {
-        "LAYOUT_jis_86": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1.25, "y": 0},
-                {"matrix": [0, 2], "x": 2.25, "y": 0},
-                {"matrix": [0, 3], "x": 3.25, "y": 0},
-                {"matrix": [0, 4], "x": 4.25, "y": 0},
-                {"matrix": [0, 5], "x": 5.5, "y": 0},
-                {"matrix": [0, 6], "x": 6.5, "y": 0},
-                {"matrix": [0, 7], "x": 7.5, "y": 0},
-                {"matrix": [0, 8], "x": 8.5, "y": 0},
-                {"matrix": [0, 9], "x": 9.75, "y": 0},
-                {"matrix": [0, 10], "x": 10.75, "y": 0},
-                {"matrix": [0, 11], "x": 11.75, "y": 0},
-                {"matrix": [0, 12], "x": 12.75, "y": 0},
-                {"matrix": [0, 13], "x": 14, "y": 0},
-                {"matrix": [0, 15], "x": 15.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.251},
-                {"matrix": [1, 5], "x": 5, "y": 1.25},
-                {"matrix": [1, 6], "x": 6, "y": 1.25},
-                {"matrix": [1, 7], "x": 7, "y": 1.25},
-                {"matrix": [1, 8], "x": 8, "y": 1.25},
-                {"matrix": [1, 9], "x": 9, "y": 1.25},
-                {"matrix": [1, 10], "x": 10, "y": 1.25},
-                {"matrix": [1, 11], "x": 11, "y": 1.25},
-                {"matrix": [1, 12], "x": 12, "y": 1.25},
-                {"matrix": [1, 13], "x": 13, "y": 1.25},
-                {"matrix": [1, 14], "x": 14, "y": 1.25},
-                {"matrix": [1, 15], "x": 15.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": [2, 15], "x": 15.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},
-                {"matrix": [2, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
-                {"matrix": [3, 15], "x": 15.25, "y": 3.25},
-
-                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
-                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
-                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
-                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
-                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
-                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
-                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
-                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
-                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
-                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
-                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
-                {"matrix": [4, 12], "x": 12.25, "y": 4.25},
-                {"matrix": [4, 13], "x": 13.25, "y": 4.25},
-                {"matrix": [4, 14], "x": 14.25, "y": 4.5},
-
-                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 1], "x": 1.25, "y": 5.25},
-                {"matrix": [5, 2], "x": 2.25, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 3], "x": 3.5, "y": 5.25},
-                {"matrix": [5, 6], "x": 4.5, "y": 5.25, "w": 4.5},
-                {"matrix": [5, 9], "x": 9, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 10], "x": 10.25, "y": 5.25},
-                {"matrix": [5, 11], "x": 11.25, "y": 5.25},
-                {"matrix": [5, 12], "x": 12.25, "y": 5.25},
-                {"matrix": [5, 13], "x": 13.25, "y": 5.25},
-                {"matrix": [5, 14], "x": 14.25, "y": 5.25},
-                {"matrix": [5, 15], "x": 15.25, "y": 5.25}
-            ]
-        }
-    }
-}
diff --git a/keyboards/keychron/v1/jis_encoder/keyboard.json b/keyboards/keychron/v1/jis_encoder/keyboard.json
new file mode 100644
index 00000000000..4e39e3d4a88
--- /dev/null
+++ b/keyboards/keychron/v1/jis_encoder/keyboard.json
@@ -0,0 +1,124 @@
+{
+    "keyboard_name": "Keychron V1",
+    "manufacturer": "Keychron",
+    "url": "https://github.com/Keychron",
+    "maintainer": "lalalademaxiya1",
+    "usb": {
+        "vid": "0x3434",
+        "pid": "0x0315",
+        "device_version": "1.0.0"
+    },
+    "encoder": {
+        "rotary": [
+            {"pin_a": "A10", "pin_b": "A8"}
+        ]
+    },
+    "processor": "STM32L432",
+    "bootloader": "stm32-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "nkro": true,
+        "rgb_matrix": true,
+        "encoder": true,
+        "dip_switch": true
+    },
+    "layouts": {
+        "LAYOUT_jis_86": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.75, "y": 0},
+                {"matrix": [0, 10], "x": 10.75, "y": 0},
+                {"matrix": [0, 11], "x": 11.75, "y": 0},
+                {"matrix": [0, 12], "x": 12.75, "y": 0},
+                {"matrix": [0, 13], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15.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.251},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25},
+                {"matrix": [1, 14], "x": 14, "y": 1.25},
+                {"matrix": [1, 15], "x": 15.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": [2, 15], "x": 15.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},
+                {"matrix": [2, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+                {"matrix": [3, 15], "x": 15.25, "y": 3.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25},
+                {"matrix": [4, 13], "x": 13.25, "y": 4.25},
+                {"matrix": [4, 14], "x": 14.25, "y": 4.5},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25},
+                {"matrix": [5, 2], "x": 2.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 3], "x": 3.5, "y": 5.25},
+                {"matrix": [5, 6], "x": 4.5, "y": 5.25, "w": 4.5},
+                {"matrix": [5, 9], "x": 9, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 10], "x": 10.25, "y": 5.25},
+                {"matrix": [5, 11], "x": 11.25, "y": 5.25},
+                {"matrix": [5, 12], "x": 12.25, "y": 5.25},
+                {"matrix": [5, 13], "x": 13.25, "y": 5.25},
+                {"matrix": [5, 14], "x": 14.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 15.25, "y": 5.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/keychron/v1/jis_encoder/rules.mk b/keyboards/keychron/v1/jis_encoder/rules.mk
index 4c6e5bebf00..3652da4b697 100644
--- a/keyboards/keychron/v1/jis_encoder/rules.mk
+++ b/keyboards/keychron/v1/jis_encoder/rules.mk
@@ -1,19 +1,3 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable USB N-key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-ENCODER_ENABLE = yes        # Enable Encoder
-DIP_SWITCH_ENABLE = yes
-RGB_MATRIX_ENABLE = yes
-
 # custom matrix setup
 CUSTOM_MATRIX = lite
 
diff --git a/keyboards/keychron/v10/ansi_encoder/info.json b/keyboards/keychron/v10/ansi_encoder/info.json
deleted file mode 100644
index 6cbc00a7f61..00000000000
--- a/keyboards/keychron/v10/ansi_encoder/info.json
+++ /dev/null
@@ -1,121 +0,0 @@
-{
-    "keyboard_name": "Keychron V10",
-    "manufacturer": "Keychron",
-    "url": "https://github.com/Keychron",
-    "maintainer": "lalalademaxiya1",
-    "usb": {
-        "vid": "0x3434",
-        "pid": "0x03A1",
-        "device_version": "1.0.0"
-    },
-    "encoder": {
-        "rotary": [
-            {"pin_a": "A10", "pin_b": "A8"}
-        ]
-    },
-    "bootmagic": {
-        "matrix": [0, 1]
-    },
-    "processor": "STM32L432",
-    "bootloader": "stm32-dfu",
-    "layouts": {
-        "LAYOUT_ansi_89": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0.25, "y": 0},
-                {"matrix": [0, 1], "x": 1.75, "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, "y": 0},
-                {"matrix": [0, 6], "x": 7.25, "y": 0},
-                {"matrix": [0, 7], "x": 8.25, "y": 0},
-                {"matrix": [0, 8], "x": 11, "y": 0},
-                {"matrix": [0, 9], "x": 12, "y": 0},
-                {"matrix": [0, 10], "x": 13.25, "y": 0},
-                {"matrix": [0, 11], "x": 14.25, "y": 0},
-                {"matrix": [0, 12], "x": 15.25, "y": 0},
-                {"matrix": [0, 13], "x": 16.25, "y": 0},
-                {"matrix": [0, 14], "x": 17.5, "y": 0},
-                {"matrix": [0, 15], "x": 18.75, "y": 0},
-
-                {"matrix": [1, 0], "x": 0.75, "y": 1.25},
-                {"matrix": [1, 1], "x": 2.25, "y": 1.25},
-                {"matrix": [1, 2], "x": 3.25, "y": 1.25},
-                {"matrix": [1, 3], "x": 4.25, "y": 1.25},
-                {"matrix": [1, 4], "x": 5.25, "y": 1.25},
-                {"matrix": [1, 5], "x": 6.25, "y": 1.25},
-                {"matrix": [1, 6], "x": 7.25, "y": 1.25},
-                {"matrix": [1, 7], "x": 8.25, "y": 1.25},
-                {"matrix": [1, 8], "x": 10.5, "y": 1.25},
-                {"matrix": [1, 9], "x": 11.5, "y": 1.25},
-                {"matrix": [1, 10], "x": 12.5, "y": 1.25},
-                {"matrix": [1, 11], "x": 13.5, "y": 1.25},
-                {"matrix": [1, 12], "x": 14.5, "y": 1.25},
-                {"matrix": [1, 13], "x": 15.5, "y": 1.25},
-                {"matrix": [1, 14], "x": 16.5, "y": 1.25, "w": 2},
-                {"matrix": [1, 15], "x": 19, "y": 1.25},
-
-                {"matrix": [2, 0], "x": 0.5, "y": 2.25},
-                {"matrix": [2, 1], "x": 1.75, "y": 2.25, "w": 1.5},
-                {"matrix": [2, 2], "x": 3.25, "y": 2.25},
-                {"matrix": [2, 3], "x": 4.5, "y": 2.25},
-                {"matrix": [2, 4], "x": 5.5, "y": 2.25},
-                {"matrix": [2, 5], "x": 6.5, "y": 2.25},
-                {"matrix": [2, 6], "x": 7.5, "y": 2.25},
-                {"matrix": [2, 7], "x": 10, "y": 2.25},
-                {"matrix": [2, 8], "x": 11, "y": 2.25},
-                {"matrix": [2, 9], "x": 12, "y": 2.25},
-                {"matrix": [2, 10], "x": 13, "y": 2.25},
-                {"matrix": [2, 11], "x": 14, "y": 2.25},
-                {"matrix": [2, 12], "x": 15.25, "y": 2.25},
-                {"matrix": [2, 13], "x": 16.25, "y": 2.25},
-                {"matrix": [2, 14], "x": 17.25, "y": 2.25, "w": 1.5},
-                {"matrix": [2, 15], "x": 19.25, "y": 2.25},
-
-                {"matrix": [3, 0], "x": 0.25, "y": 3.25},
-                {"matrix": [3, 1], "x": 1.5, "y": 3.25, "w": 1.75},
-                {"matrix": [3, 2], "x": 3.25, "y": 3.25},
-                {"matrix": [3, 3], "x": 4.5, "y": 3.25},
-                {"matrix": [3, 4], "x": 5.5, "y": 3.25},
-                {"matrix": [3, 5], "x": 6.5, "y": 3.25},
-                {"matrix": [3, 6], "x": 7.5, "y": 3.25},
-                {"matrix": [3, 8], "x": 10.25, "y": 3.25},
-                {"matrix": [3, 9], "x": 11.25, "y": 3.25},
-                {"matrix": [3, 10], "x": 12.25, "y": 3.25},
-                {"matrix": [3, 11], "x": 13.25, "y": 3.25},
-                {"matrix": [3, 12], "x": 14.75, "y": 3.25},
-                {"matrix": [3, 13], "x": 15.75, "y": 3.25},
-                {"matrix": [3, 14], "x": 16.75, "y": 3.25, "w": 2.25},
-                {"matrix": [3, 15], "x": 19.5, "y": 3.25},
-
-                {"matrix": [4, 0], "x": 0, "y": 4.25},
-                {"matrix": [4, 1], "x": 1.5, "y": 4.25, "w": 2.25},
-                {"matrix": [4, 3], "x": 3.5, "y": 4.25},
-                {"matrix": [4, 4], "x": 4.75, "y": 4.25},
-                {"matrix": [4, 5], "x": 5.75, "y": 4.25},
-                {"matrix": [4, 6], "x": 6.75, "y": 4.25},
-                {"matrix": [4, 7], "x": 7.75, "y": 4.25},
-                {"matrix": [4, 8], "x": 9.5, "y": 4.25},
-                {"matrix": [4, 9], "x": 10.5, "y": 4.25},
-                {"matrix": [4, 10], "x": 11.5, "y": 4.25},
-                {"matrix": [4, 11], "x": 12.5, "y": 4.25},
-                {"matrix": [4, 12], "x": 13.5, "y": 4.25},
-                {"matrix": [4, 13], "x": 15.25, "y": 4.25},
-                {"matrix": [4, 14], "x": 16.25, "y": 4.25, "w": 1.75},
-                {"matrix": [4, 15], "x": 18.25, "y": 4.5},
-
-                {"matrix": [5, 0], "x": 0, "y": 5.25},
-                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 3], "x": 4.75, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 4], "x": 6, "y": 5.25, "w": 2.25},
-                {"matrix": [5, 7], "x": 8.25, "y": 5.25},
-                {"matrix": [5, 8], "x": 9.5, "y": 5.25, "w": 2.75},
-                {"matrix": [5, 9], "x": 12.25, "y": 5.25},
-                {"matrix": [5, 13], "x": 17.25, "y": 5.5},
-                {"matrix": [5, 14], "x": 18.25, "y": 5.5},
-                {"matrix": [5, 15], "x": 19.25, "y": 5.5}
-            ]
-        }
-    }
-}
diff --git a/keyboards/keychron/v10/ansi_encoder/keyboard.json b/keyboards/keychron/v10/ansi_encoder/keyboard.json
new file mode 100644
index 00000000000..825fa65ef87
--- /dev/null
+++ b/keyboards/keychron/v10/ansi_encoder/keyboard.json
@@ -0,0 +1,130 @@
+{
+    "keyboard_name": "Keychron V10",
+    "manufacturer": "Keychron",
+    "url": "https://github.com/Keychron",
+    "maintainer": "lalalademaxiya1",
+    "usb": {
+        "vid": "0x3434",
+        "pid": "0x03A1",
+        "device_version": "1.0.0"
+    },
+    "encoder": {
+        "rotary": [
+            {"pin_a": "A10", "pin_b": "A8"}
+        ]
+    },
+    "bootmagic": {
+        "matrix": [0, 1]
+    },
+    "processor": "STM32L432",
+    "bootloader": "stm32-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "nkro": true,
+        "rgb_matrix": true,
+        "encoder": true,
+        "dip_switch": true
+    },
+    "layouts": {
+        "LAYOUT_ansi_89": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0.25, "y": 0},
+                {"matrix": [0, 1], "x": 1.75, "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, "y": 0},
+                {"matrix": [0, 6], "x": 7.25, "y": 0},
+                {"matrix": [0, 7], "x": 8.25, "y": 0},
+                {"matrix": [0, 8], "x": 11, "y": 0},
+                {"matrix": [0, 9], "x": 12, "y": 0},
+                {"matrix": [0, 10], "x": 13.25, "y": 0},
+                {"matrix": [0, 11], "x": 14.25, "y": 0},
+                {"matrix": [0, 12], "x": 15.25, "y": 0},
+                {"matrix": [0, 13], "x": 16.25, "y": 0},
+                {"matrix": [0, 14], "x": 17.5, "y": 0},
+                {"matrix": [0, 15], "x": 18.75, "y": 0},
+
+                {"matrix": [1, 0], "x": 0.75, "y": 1.25},
+                {"matrix": [1, 1], "x": 2.25, "y": 1.25},
+                {"matrix": [1, 2], "x": 3.25, "y": 1.25},
+                {"matrix": [1, 3], "x": 4.25, "y": 1.25},
+                {"matrix": [1, 4], "x": 5.25, "y": 1.25},
+                {"matrix": [1, 5], "x": 6.25, "y": 1.25},
+                {"matrix": [1, 6], "x": 7.25, "y": 1.25},
+                {"matrix": [1, 7], "x": 8.25, "y": 1.25},
+                {"matrix": [1, 8], "x": 10.5, "y": 1.25},
+                {"matrix": [1, 9], "x": 11.5, "y": 1.25},
+                {"matrix": [1, 10], "x": 12.5, "y": 1.25},
+                {"matrix": [1, 11], "x": 13.5, "y": 1.25},
+                {"matrix": [1, 12], "x": 14.5, "y": 1.25},
+                {"matrix": [1, 13], "x": 15.5, "y": 1.25},
+                {"matrix": [1, 14], "x": 16.5, "y": 1.25, "w": 2},
+                {"matrix": [1, 15], "x": 19, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0.5, "y": 2.25},
+                {"matrix": [2, 1], "x": 1.75, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 2], "x": 3.25, "y": 2.25},
+                {"matrix": [2, 3], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 10, "y": 2.25},
+                {"matrix": [2, 8], "x": 11, "y": 2.25},
+                {"matrix": [2, 9], "x": 12, "y": 2.25},
+                {"matrix": [2, 10], "x": 13, "y": 2.25},
+                {"matrix": [2, 11], "x": 14, "y": 2.25},
+                {"matrix": [2, 12], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 13], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 14], "x": 17.25, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 15], "x": 19.25, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0.25, "y": 3.25},
+                {"matrix": [3, 1], "x": 1.5, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 2], "x": 3.25, "y": 3.25},
+                {"matrix": [3, 3], "x": 4.5, "y": 3.25},
+                {"matrix": [3, 4], "x": 5.5, "y": 3.25},
+                {"matrix": [3, 5], "x": 6.5, "y": 3.25},
+                {"matrix": [3, 6], "x": 7.5, "y": 3.25},
+                {"matrix": [3, 8], "x": 10.25, "y": 3.25},
+                {"matrix": [3, 9], "x": 11.25, "y": 3.25},
+                {"matrix": [3, 10], "x": 12.25, "y": 3.25},
+                {"matrix": [3, 11], "x": 13.25, "y": 3.25},
+                {"matrix": [3, 12], "x": 14.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 15.75, "y": 3.25},
+                {"matrix": [3, 14], "x": 16.75, "y": 3.25, "w": 2.25},
+                {"matrix": [3, 15], "x": 19.5, "y": 3.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25},
+                {"matrix": [4, 1], "x": 1.5, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 3], "x": 3.5, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.75, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.75, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.75, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.75, "y": 4.25},
+                {"matrix": [4, 8], "x": 9.5, "y": 4.25},
+                {"matrix": [4, 9], "x": 10.5, "y": 4.25},
+                {"matrix": [4, 10], "x": 11.5, "y": 4.25},
+                {"matrix": [4, 11], "x": 12.5, "y": 4.25},
+                {"matrix": [4, 12], "x": 13.5, "y": 4.25},
+                {"matrix": [4, 13], "x": 15.25, "y": 4.25},
+                {"matrix": [4, 14], "x": 16.25, "y": 4.25, "w": 1.75},
+                {"matrix": [4, 15], "x": 18.25, "y": 4.5},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 3], "x": 4.75, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 4], "x": 6, "y": 5.25, "w": 2.25},
+                {"matrix": [5, 7], "x": 8.25, "y": 5.25},
+                {"matrix": [5, 8], "x": 9.5, "y": 5.25, "w": 2.75},
+                {"matrix": [5, 9], "x": 12.25, "y": 5.25},
+                {"matrix": [5, 13], "x": 17.25, "y": 5.5},
+                {"matrix": [5, 14], "x": 18.25, "y": 5.5},
+                {"matrix": [5, 15], "x": 19.25, "y": 5.5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/keychron/v10/ansi_encoder/rules.mk b/keyboards/keychron/v10/ansi_encoder/rules.mk
index 4c6e5bebf00..3652da4b697 100644
--- a/keyboards/keychron/v10/ansi_encoder/rules.mk
+++ b/keyboards/keychron/v10/ansi_encoder/rules.mk
@@ -1,19 +1,3 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable USB N-key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-ENCODER_ENABLE = yes        # Enable Encoder
-DIP_SWITCH_ENABLE = yes
-RGB_MATRIX_ENABLE = yes
-
 # custom matrix setup
 CUSTOM_MATRIX = lite
 
diff --git a/keyboards/keychron/v10/iso_encoder/info.json b/keyboards/keychron/v10/iso_encoder/info.json
deleted file mode 100644
index 30763236ba5..00000000000
--- a/keyboards/keychron/v10/iso_encoder/info.json
+++ /dev/null
@@ -1,122 +0,0 @@
-{
-    "keyboard_name": "Keychron V10",
-    "manufacturer": "Keychron",
-    "url": "https://github.com/Keychron",
-    "maintainer": "lalalademaxiya1",
-    "usb": {
-        "vid": "0x3434",
-        "pid": "0x03A3",
-        "device_version": "1.0.0"
-    },
-    "encoder": {
-        "rotary": [
-            {"pin_a": "A10", "pin_b": "A8"}
-        ]
-    },
-    "bootmagic": {
-        "matrix": [0, 1]
-    },
-    "processor": "STM32L432",
-    "bootloader": "stm32-dfu",
-    "layouts": {
-        "LAYOUT_iso_90": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0.25, "y": 0},
-                {"matrix": [0, 1], "x": 1.75, "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, "y": 0},
-                {"matrix": [0, 6], "x": 7.25, "y": 0},
-                {"matrix": [0, 7], "x": 8.25, "y": 0},
-                {"matrix": [0, 8], "x": 11, "y": 0},
-                {"matrix": [0, 9], "x": 12, "y": 0},
-                {"matrix": [0, 10], "x": 13.25, "y": 0},
-                {"matrix": [0, 11], "x": 14.25, "y": 0},
-                {"matrix": [0, 12], "x": 15.25, "y": 0},
-                {"matrix": [0, 13], "x": 16.25, "y": 0},
-                {"matrix": [0, 14], "x": 17.5, "y": 0},
-                {"matrix": [0, 15], "x": 18.75, "y": 0},
-
-                {"matrix": [1, 0], "x": 0.75, "y": 1.25},
-                {"matrix": [1, 1], "x": 2.25, "y": 1.25},
-                {"matrix": [1, 2], "x": 3.25, "y": 1.25},
-                {"matrix": [1, 3], "x": 4.25, "y": 1.25},
-                {"matrix": [1, 4], "x": 5.25, "y": 1.25},
-                {"matrix": [1, 5], "x": 6.25, "y": 1.25},
-                {"matrix": [1, 6], "x": 7.25, "y": 1.25},
-                {"matrix": [1, 7], "x": 8.25, "y": 1.25},
-                {"matrix": [1, 8], "x": 10.5, "y": 1.25},
-                {"matrix": [1, 9], "x": 11.5, "y": 1.25},
-                {"matrix": [1, 10], "x": 12.5, "y": 1.25},
-                {"matrix": [1, 11], "x": 13.5, "y": 1.25},
-                {"matrix": [1, 12], "x": 14.5, "y": 1.25},
-                {"matrix": [1, 13], "x": 15.5, "y": 1.25},
-                {"matrix": [1, 14], "x": 16.5, "y": 1.25, "w": 2},
-                {"matrix": [1, 15], "x": 19, "y": 1.25},
-
-                {"matrix": [2, 0], "x": 0.5, "y": 2.25},
-                {"matrix": [2, 1], "x": 1.75, "y": 2.25, "w": 1.5},
-                {"matrix": [2, 2], "x": 3.25, "y": 2.25},
-                {"matrix": [2, 3], "x": 4.5, "y": 2.25},
-                {"matrix": [2, 4], "x": 5.5, "y": 2.25},
-                {"matrix": [2, 5], "x": 6.5, "y": 2.25},
-                {"matrix": [2, 6], "x": 7.5, "y": 2.25},
-                {"matrix": [2, 7], "x": 10, "y": 2.25},
-                {"matrix": [2, 8], "x": 11, "y": 2.25},
-                {"matrix": [2, 9], "x": 12, "y": 2.25},
-                {"matrix": [2, 10], "x": 13, "y": 2.25},
-                {"matrix": [2, 11], "x": 14, "y": 2.25},
-                {"matrix": [2, 12], "x": 15.25, "y": 2.25},
-                {"matrix": [2, 13], "x": 16.25, "y": 2.25},
-                {"matrix": [2, 15], "x": 19.25, "y": 2.25},
-
-                {"matrix": [3, 0], "x": 0.25, "y": 3.25},
-                {"matrix": [3, 1], "x": 1.5, "y": 3.25, "w": 1.75},
-                {"matrix": [3, 2], "x": 3.25, "y": 3.25},
-                {"matrix": [3, 3], "x": 4.5, "y": 3.25},
-                {"matrix": [3, 4], "x": 5.5, "y": 3.25},
-                {"matrix": [3, 5], "x": 6.5, "y": 3.25},
-                {"matrix": [3, 6], "x": 7.5, "y": 3.25},
-                {"matrix": [3, 8], "x": 10.25, "y": 3.25},
-                {"matrix": [3, 9], "x": 11.25, "y": 3.25},
-                {"matrix": [3, 10], "x": 12.25, "y": 3.25},
-                {"matrix": [3, 11], "x": 13.25, "y": 3.25},
-                {"matrix": [3, 12], "x": 14.75, "y": 3.25},
-                {"matrix": [3, 13], "x": 15.75, "y": 3.25},
-                {"matrix": [3, 14], "x": 16.75, "y": 3.25},
-                {"matrix": [2, 14], "x": 17.75, "y": 2.25, "w": 1.25, "h": 2},
-                {"matrix": [3, 15], "x": 19.5, "y": 3.25},
-
-                {"matrix": [4, 0], "x": 0, "y": 4.25},
-                {"matrix": [4, 1], "x": 1.5, "y": 4.25},
-                {"matrix": [4, 2], "x": 2.5, "y": 4.25},
-                {"matrix": [4, 3], "x": 3.5, "y": 4.25},
-                {"matrix": [4, 4], "x": 4.75, "y": 4.25},
-                {"matrix": [4, 5], "x": 5.75, "y": 4.25},
-                {"matrix": [4, 6], "x": 6.75, "y": 4.25},
-                {"matrix": [4, 7], "x": 7.75, "y": 4.25},
-                {"matrix": [4, 8], "x": 9.5, "y": 4.25},
-                {"matrix": [4, 9], "x": 10.5, "y": 4.25},
-                {"matrix": [4, 10], "x": 11.5, "y": 4.25},
-                {"matrix": [4, 11], "x": 12.5, "y": 4.25},
-                {"matrix": [4, 12], "x": 13.5, "y": 4.25},
-                {"matrix": [4, 13], "x": 15.25, "y": 4.25},
-                {"matrix": [4, 14], "x": 16.25, "y": 4.25, "w": 1.75},
-                {"matrix": [4, 15], "x": 18.25, "y": 4.5},
-
-                {"matrix": [5, 0], "x": 0, "y": 5.25},
-                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 3], "x": 4.75, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 4], "x": 6, "y": 5.25, "w": 2.25},
-                {"matrix": [5, 7], "x": 8.25, "y": 5.25},
-                {"matrix": [5, 8], "x": 9.5, "y": 5.25, "w": 2.75},
-                {"matrix": [5, 9], "x": 12.25, "y": 5.25},
-                {"matrix": [5, 13], "x": 17.25, "y": 5.5},
-                {"matrix": [5, 14], "x": 18.25, "y": 5.5},
-                {"matrix": [5, 15], "x": 19.25, "y": 5.5}
-            ]
-        }
-    }
-}
diff --git a/keyboards/keychron/v10/iso_encoder/keyboard.json b/keyboards/keychron/v10/iso_encoder/keyboard.json
new file mode 100644
index 00000000000..ea2dfb35e2a
--- /dev/null
+++ b/keyboards/keychron/v10/iso_encoder/keyboard.json
@@ -0,0 +1,131 @@
+{
+    "keyboard_name": "Keychron V10",
+    "manufacturer": "Keychron",
+    "url": "https://github.com/Keychron",
+    "maintainer": "lalalademaxiya1",
+    "usb": {
+        "vid": "0x3434",
+        "pid": "0x03A3",
+        "device_version": "1.0.0"
+    },
+    "encoder": {
+        "rotary": [
+            {"pin_a": "A10", "pin_b": "A8"}
+        ]
+    },
+    "bootmagic": {
+        "matrix": [0, 1]
+    },
+    "processor": "STM32L432",
+    "bootloader": "stm32-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "nkro": true,
+        "rgb_matrix": true,
+        "encoder": true,
+        "dip_switch": true
+    },
+    "layouts": {
+        "LAYOUT_iso_90": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0.25, "y": 0},
+                {"matrix": [0, 1], "x": 1.75, "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, "y": 0},
+                {"matrix": [0, 6], "x": 7.25, "y": 0},
+                {"matrix": [0, 7], "x": 8.25, "y": 0},
+                {"matrix": [0, 8], "x": 11, "y": 0},
+                {"matrix": [0, 9], "x": 12, "y": 0},
+                {"matrix": [0, 10], "x": 13.25, "y": 0},
+                {"matrix": [0, 11], "x": 14.25, "y": 0},
+                {"matrix": [0, 12], "x": 15.25, "y": 0},
+                {"matrix": [0, 13], "x": 16.25, "y": 0},
+                {"matrix": [0, 14], "x": 17.5, "y": 0},
+                {"matrix": [0, 15], "x": 18.75, "y": 0},
+
+                {"matrix": [1, 0], "x": 0.75, "y": 1.25},
+                {"matrix": [1, 1], "x": 2.25, "y": 1.25},
+                {"matrix": [1, 2], "x": 3.25, "y": 1.25},
+                {"matrix": [1, 3], "x": 4.25, "y": 1.25},
+                {"matrix": [1, 4], "x": 5.25, "y": 1.25},
+                {"matrix": [1, 5], "x": 6.25, "y": 1.25},
+                {"matrix": [1, 6], "x": 7.25, "y": 1.25},
+                {"matrix": [1, 7], "x": 8.25, "y": 1.25},
+                {"matrix": [1, 8], "x": 10.5, "y": 1.25},
+                {"matrix": [1, 9], "x": 11.5, "y": 1.25},
+                {"matrix": [1, 10], "x": 12.5, "y": 1.25},
+                {"matrix": [1, 11], "x": 13.5, "y": 1.25},
+                {"matrix": [1, 12], "x": 14.5, "y": 1.25},
+                {"matrix": [1, 13], "x": 15.5, "y": 1.25},
+                {"matrix": [1, 14], "x": 16.5, "y": 1.25, "w": 2},
+                {"matrix": [1, 15], "x": 19, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0.5, "y": 2.25},
+                {"matrix": [2, 1], "x": 1.75, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 2], "x": 3.25, "y": 2.25},
+                {"matrix": [2, 3], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 10, "y": 2.25},
+                {"matrix": [2, 8], "x": 11, "y": 2.25},
+                {"matrix": [2, 9], "x": 12, "y": 2.25},
+                {"matrix": [2, 10], "x": 13, "y": 2.25},
+                {"matrix": [2, 11], "x": 14, "y": 2.25},
+                {"matrix": [2, 12], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 13], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 19.25, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0.25, "y": 3.25},
+                {"matrix": [3, 1], "x": 1.5, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 2], "x": 3.25, "y": 3.25},
+                {"matrix": [3, 3], "x": 4.5, "y": 3.25},
+                {"matrix": [3, 4], "x": 5.5, "y": 3.25},
+                {"matrix": [3, 5], "x": 6.5, "y": 3.25},
+                {"matrix": [3, 6], "x": 7.5, "y": 3.25},
+                {"matrix": [3, 8], "x": 10.25, "y": 3.25},
+                {"matrix": [3, 9], "x": 11.25, "y": 3.25},
+                {"matrix": [3, 10], "x": 12.25, "y": 3.25},
+                {"matrix": [3, 11], "x": 13.25, "y": 3.25},
+                {"matrix": [3, 12], "x": 14.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 15.75, "y": 3.25},
+                {"matrix": [3, 14], "x": 16.75, "y": 3.25},
+                {"matrix": [2, 14], "x": 17.75, "y": 2.25, "w": 1.25, "h": 2},
+                {"matrix": [3, 15], "x": 19.5, "y": 3.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25},
+                {"matrix": [4, 1], "x": 1.5, "y": 4.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.5, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.75, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.75, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.75, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.75, "y": 4.25},
+                {"matrix": [4, 8], "x": 9.5, "y": 4.25},
+                {"matrix": [4, 9], "x": 10.5, "y": 4.25},
+                {"matrix": [4, 10], "x": 11.5, "y": 4.25},
+                {"matrix": [4, 11], "x": 12.5, "y": 4.25},
+                {"matrix": [4, 12], "x": 13.5, "y": 4.25},
+                {"matrix": [4, 13], "x": 15.25, "y": 4.25},
+                {"matrix": [4, 14], "x": 16.25, "y": 4.25, "w": 1.75},
+                {"matrix": [4, 15], "x": 18.25, "y": 4.5},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 3], "x": 4.75, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 4], "x": 6, "y": 5.25, "w": 2.25},
+                {"matrix": [5, 7], "x": 8.25, "y": 5.25},
+                {"matrix": [5, 8], "x": 9.5, "y": 5.25, "w": 2.75},
+                {"matrix": [5, 9], "x": 12.25, "y": 5.25},
+                {"matrix": [5, 13], "x": 17.25, "y": 5.5},
+                {"matrix": [5, 14], "x": 18.25, "y": 5.5},
+                {"matrix": [5, 15], "x": 19.25, "y": 5.5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/keychron/v10/iso_encoder/rules.mk b/keyboards/keychron/v10/iso_encoder/rules.mk
index 4c6e5bebf00..3652da4b697 100644
--- a/keyboards/keychron/v10/iso_encoder/rules.mk
+++ b/keyboards/keychron/v10/iso_encoder/rules.mk
@@ -1,19 +1,3 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable USB N-key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-ENCODER_ENABLE = yes        # Enable Encoder
-DIP_SWITCH_ENABLE = yes
-RGB_MATRIX_ENABLE = yes
-
 # custom matrix setup
 CUSTOM_MATRIX = lite
 
diff --git a/keyboards/keychron/v3/ansi_encoder/info.json b/keyboards/keychron/v3/ansi_encoder/info.json
deleted file mode 100644
index 2fc194feccd..00000000000
--- a/keyboards/keychron/v3/ansi_encoder/info.json
+++ /dev/null
@@ -1,117 +0,0 @@
-{
-    "keyboard_name": "Keychron V3",
-    "manufacturer": "Keychron",
-    "url": "https://github.com/Keychron",
-    "maintainer": "lalalademaxiya1",
-    "usb": {
-        "vid": "0x3434",
-        "pid": "0x0331",
-        "device_version": "1.0.0"
-    },
-    "encoder": {
-        "rotary": [
-            {"pin_a": "A10", "pin_b": "A8"}
-        ]
-    },
-    "processor": "STM32L432",
-    "bootloader": "stm32-dfu",
-    "layouts": {
-        "LAYOUT_tkl_f13_ansi": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1.25, "y": 0},
-                {"matrix": [0, 2], "x": 2.25, "y": 0},
-                {"matrix": [0, 3], "x": 3.25, "y": 0},
-                {"matrix": [0, 4], "x": 4.25, "y": 0},
-                {"matrix": [0, 5], "x": 5.5, "y": 0},
-                {"matrix": [0, 6], "x": 6.5, "y": 0},
-                {"matrix": [0, 7], "x": 7.5, "y": 0},
-                {"matrix": [0, 8], "x": 8.5, "y": 0},
-                {"matrix": [0, 9], "x": 9.75, "y": 0},
-                {"matrix": [0, 10], "x": 10.75, "y": 0},
-                {"matrix": [0, 11], "x": 11.75, "y": 0},
-                {"matrix": [0, 12], "x": 12.75, "y": 0},
-                {"matrix": [0, 13], "x": 14, "y": 0},
-                {"matrix": [0, 14], "x": 15.25, "y": 0},
-                {"matrix": [0, 15], "x": 16.25, "y": 0},
-                {"matrix": [3, 14], "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": [3, 15], "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": [2, 13], "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": [3, 12], "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, 13], "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.25},
-                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
-                {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
-                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
-                {"matrix": [4, 14], "x": 17.25, "y": 5.25}
-            ]
-        }
-    }
-}
diff --git a/keyboards/keychron/v3/ansi_encoder/keyboard.json b/keyboards/keychron/v3/ansi_encoder/keyboard.json
new file mode 100644
index 00000000000..5134b47d7e1
--- /dev/null
+++ b/keyboards/keychron/v3/ansi_encoder/keyboard.json
@@ -0,0 +1,126 @@
+{
+    "keyboard_name": "Keychron V3",
+    "manufacturer": "Keychron",
+    "url": "https://github.com/Keychron",
+    "maintainer": "lalalademaxiya1",
+    "usb": {
+        "vid": "0x3434",
+        "pid": "0x0331",
+        "device_version": "1.0.0"
+    },
+    "encoder": {
+        "rotary": [
+            {"pin_a": "A10", "pin_b": "A8"}
+        ]
+    },
+    "processor": "STM32L432",
+    "bootloader": "stm32-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "nkro": true,
+        "rgb_matrix": true,
+        "encoder": true,
+        "dip_switch": true
+    },
+    "layouts": {
+        "LAYOUT_tkl_f13_ansi": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.75, "y": 0},
+                {"matrix": [0, 10], "x": 10.75, "y": 0},
+                {"matrix": [0, 11], "x": 11.75, "y": 0},
+                {"matrix": [0, 12], "x": 12.75, "y": 0},
+                {"matrix": [0, 13], "x": 14, "y": 0},
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [3, 14], "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": [3, 15], "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": [2, 13], "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": [3, 12], "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, 13], "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.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [4, 14], "x": 17.25, "y": 5.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/keychron/v3/ansi_encoder/rules.mk b/keyboards/keychron/v3/ansi_encoder/rules.mk
index 4c6e5bebf00..3652da4b697 100644
--- a/keyboards/keychron/v3/ansi_encoder/rules.mk
+++ b/keyboards/keychron/v3/ansi_encoder/rules.mk
@@ -1,19 +1,3 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable USB N-key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-ENCODER_ENABLE = yes        # Enable Encoder
-DIP_SWITCH_ENABLE = yes
-RGB_MATRIX_ENABLE = yes
-
 # custom matrix setup
 CUSTOM_MATRIX = lite
 
diff --git a/keyboards/keychron/v3/iso_encoder/info.json b/keyboards/keychron/v3/iso_encoder/info.json
deleted file mode 100644
index 1edb29a7410..00000000000
--- a/keyboards/keychron/v3/iso_encoder/info.json
+++ /dev/null
@@ -1,118 +0,0 @@
-{
-    "keyboard_name": "Keychron V3",
-    "manufacturer": "Keychron",
-    "url": "https://github.com/Keychron",
-    "maintainer": "lalalademaxiya1",
-    "usb": {
-        "vid": "0x3434",
-        "pid": "0x0333",
-        "device_version": "1.0.0"
-    },
-    "encoder": {
-        "rotary": [
-            {"pin_a": "A10", "pin_b": "A8"}
-        ]
-    },
-    "processor": "STM32L432",
-    "bootloader": "stm32-dfu",
-    "layouts": {
-        "LAYOUT_tkl_f13_iso": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1.25, "y": 0},
-                {"matrix": [0, 2], "x": 2.25, "y": 0},
-                {"matrix": [0, 3], "x": 3.25, "y": 0},
-                {"matrix": [0, 4], "x": 4.25, "y": 0},
-                {"matrix": [0, 5], "x": 5.5, "y": 0},
-                {"matrix": [0, 6], "x": 6.5, "y": 0},
-                {"matrix": [0, 7], "x": 7.5, "y": 0},
-                {"matrix": [0, 8], "x": 8.5, "y": 0},
-                {"matrix": [0, 9], "x": 9.75, "y": 0},
-                {"matrix": [0, 10], "x": 10.75, "y": 0},
-                {"matrix": [0, 11], "x": 11.75, "y": 0},
-                {"matrix": [0, 12], "x": 12.75, "y": 0},
-                {"matrix": [0, 13], "x": 14, "y": 0},
-                {"matrix": [0, 14], "x": 15.25, "y": 0},
-                {"matrix": [0, 15], "x": 16.25, "y": 0},
-                {"matrix": [3, 14], "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": [3, 15], "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": [2, 14], "x": 15.25, "y": 2.25},
-                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
-                {"matrix": [3, 12], "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},
-                {"matrix": [2, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
-
-                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4.25},
-                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
-                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
-                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
-                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
-                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
-                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
-                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
-                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
-                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
-                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
-                {"matrix": [4, 13], "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.25},
-                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
-                {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
-                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
-                {"matrix": [4, 14], "x": 17.25, "y": 5.25}
-            ]
-        }
-    }
-}
diff --git a/keyboards/keychron/v3/iso_encoder/keyboard.json b/keyboards/keychron/v3/iso_encoder/keyboard.json
new file mode 100644
index 00000000000..8b4f0a9d005
--- /dev/null
+++ b/keyboards/keychron/v3/iso_encoder/keyboard.json
@@ -0,0 +1,127 @@
+{
+    "keyboard_name": "Keychron V3",
+    "manufacturer": "Keychron",
+    "url": "https://github.com/Keychron",
+    "maintainer": "lalalademaxiya1",
+    "usb": {
+        "vid": "0x3434",
+        "pid": "0x0333",
+        "device_version": "1.0.0"
+    },
+    "encoder": {
+        "rotary": [
+            {"pin_a": "A10", "pin_b": "A8"}
+        ]
+    },
+    "processor": "STM32L432",
+    "bootloader": "stm32-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "nkro": true,
+        "rgb_matrix": true,
+        "encoder": true,
+        "dip_switch": true
+    },
+    "layouts": {
+        "LAYOUT_tkl_f13_iso": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.75, "y": 0},
+                {"matrix": [0, 10], "x": 10.75, "y": 0},
+                {"matrix": [0, 11], "x": 11.75, "y": 0},
+                {"matrix": [0, 12], "x": 12.75, "y": 0},
+                {"matrix": [0, 13], "x": 14, "y": 0},
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [3, 14], "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": [3, 15], "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": [2, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"matrix": [3, 12], "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},
+                {"matrix": [2, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 13], "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.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [4, 14], "x": 17.25, "y": 5.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/keychron/v3/iso_encoder/rules.mk b/keyboards/keychron/v3/iso_encoder/rules.mk
index 4c6e5bebf00..3652da4b697 100644
--- a/keyboards/keychron/v3/iso_encoder/rules.mk
+++ b/keyboards/keychron/v3/iso_encoder/rules.mk
@@ -1,19 +1,3 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable USB N-key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-ENCODER_ENABLE = yes        # Enable Encoder
-DIP_SWITCH_ENABLE = yes
-RGB_MATRIX_ENABLE = yes
-
 # custom matrix setup
 CUSTOM_MATRIX = lite
 
diff --git a/keyboards/keychron/v3/jis_encoder/info.json b/keyboards/keychron/v3/jis_encoder/info.json
deleted file mode 100644
index f9a9202eb00..00000000000
--- a/keyboards/keychron/v3/jis_encoder/info.json
+++ /dev/null
@@ -1,121 +0,0 @@
-{
-    "keyboard_name": "Keychron V3",
-    "manufacturer": "Keychron",
-    "url": "https://github.com/Keychron",
-    "maintainer": "lalalademaxiya1",
-    "usb": {
-        "vid": "0x3434",
-        "pid": "0x0335",
-        "device_version": "1.0.0"
-    },
-    "encoder": {
-        "rotary": [
-            {"pin_a": "A10", "pin_b": "A8"}
-        ]
-    },
-    "processor": "STM32L432",
-    "bootloader": "stm32-dfu",
-    "layouts": {
-        "LAYOUT_jis_92": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1.25, "y": 0},
-                {"matrix": [0, 2], "x": 2.25, "y": 0},
-                {"matrix": [0, 3], "x": 3.25, "y": 0},
-                {"matrix": [0, 4], "x": 4.25, "y": 0},
-                {"matrix": [0, 5], "x": 5.5, "y": 0},
-                {"matrix": [0, 6], "x": 6.5, "y": 0},
-                {"matrix": [0, 7], "x": 7.5, "y": 0},
-                {"matrix": [0, 8], "x": 8.5, "y": 0},
-                {"matrix": [0, 9], "x": 9.75, "y": 0},
-                {"matrix": [0, 10], "x": 10.75, "y": 0},
-                {"matrix": [0, 11], "x": 11.75, "y": 0},
-                {"matrix": [0, 12], "x": 12.75, "y": 0},
-                {"matrix": [0, 13], "x": 14, "y": 0},
-                {"matrix": [0, 14], "x": 15.25, "y": 0},
-                {"matrix": [0, 15], "x": 16.25, "y": 0},
-                {"matrix": [3, 14], "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},
-                {"matrix": [5, 5], "x": 14, "y": 1.25},
-                {"matrix": [1, 14], "x": 15.25, "y": 1.25},
-                {"matrix": [1, 15], "x": 16.25, "y": 1.25},
-                {"matrix": [3, 15], "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": [2, 14], "x": 15.25, "y": 2.25},
-                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
-                {"matrix": [3, 12], "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},
-                {"matrix": [2, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
-
-                {"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},
-                {"matrix": [4, 13], "x": 13.25, "y": 4.25, "w": 1.75},
-                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
-
-                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 1], "x": 1.25, "y": 5.25},
-                {"matrix": [5, 2], "x": 2.25, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 3], "x": 3.5, "y": 5.25},
-                {"matrix": [5, 6], "x": 4.5, "y": 5.25, "w": 4.5},
-                {"matrix": [5, 9], "x": 9, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 10], "x": 10.25, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 11], "x": 11.5, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 12], "x": 12.75, "y": 5.25},
-                {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
-                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
-                {"matrix": [4, 14], "x": 17.25, "y": 5.25}
-            ]
-        }
-    }
-}
diff --git a/keyboards/keychron/v3/jis_encoder/keyboard.json b/keyboards/keychron/v3/jis_encoder/keyboard.json
new file mode 100644
index 00000000000..ab9d6ab2a73
--- /dev/null
+++ b/keyboards/keychron/v3/jis_encoder/keyboard.json
@@ -0,0 +1,130 @@
+{
+    "keyboard_name": "Keychron V3",
+    "manufacturer": "Keychron",
+    "url": "https://github.com/Keychron",
+    "maintainer": "lalalademaxiya1",
+    "usb": {
+        "vid": "0x3434",
+        "pid": "0x0335",
+        "device_version": "1.0.0"
+    },
+    "encoder": {
+        "rotary": [
+            {"pin_a": "A10", "pin_b": "A8"}
+        ]
+    },
+    "processor": "STM32L432",
+    "bootloader": "stm32-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "nkro": true,
+        "rgb_matrix": true,
+        "encoder": true,
+        "dip_switch": true
+    },
+    "layouts": {
+        "LAYOUT_jis_92": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.75, "y": 0},
+                {"matrix": [0, 10], "x": 10.75, "y": 0},
+                {"matrix": [0, 11], "x": 11.75, "y": 0},
+                {"matrix": [0, 12], "x": 12.75, "y": 0},
+                {"matrix": [0, 13], "x": 14, "y": 0},
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [3, 14], "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},
+                {"matrix": [5, 5], "x": 14, "y": 1.25},
+                {"matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"matrix": [3, 15], "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": [2, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"matrix": [3, 12], "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},
+                {"matrix": [2, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+
+                {"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},
+                {"matrix": [4, 13], "x": 13.25, "y": 4.25, "w": 1.75},
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25},
+                {"matrix": [5, 2], "x": 2.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 3], "x": 3.5, "y": 5.25},
+                {"matrix": [5, 6], "x": 4.5, "y": 5.25, "w": 4.5},
+                {"matrix": [5, 9], "x": 9, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 10], "x": 10.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "x": 11.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 12], "x": 12.75, "y": 5.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [4, 14], "x": 17.25, "y": 5.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/keychron/v3/jis_encoder/rules.mk b/keyboards/keychron/v3/jis_encoder/rules.mk
index 4c6e5bebf00..3652da4b697 100644
--- a/keyboards/keychron/v3/jis_encoder/rules.mk
+++ b/keyboards/keychron/v3/jis_encoder/rules.mk
@@ -1,19 +1,3 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable USB N-key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-ENCODER_ENABLE = yes        # Enable Encoder
-DIP_SWITCH_ENABLE = yes
-RGB_MATRIX_ENABLE = yes
-
 # custom matrix setup
 CUSTOM_MATRIX = lite
 
diff --git a/keyboards/keychron/v5/ansi/info.json b/keyboards/keychron/v5/ansi/info.json
deleted file mode 100644
index 2f2e33fecdf..00000000000
--- a/keyboards/keychron/v5/ansi/info.json
+++ /dev/null
@@ -1,124 +0,0 @@
-{
-    "keyboard_name": "Keychron V5",
-    "manufacturer": "Keychron",
-    "url": "https://github.com/Keychron",
-    "maintainer": "lalalademaxiya1",
-    "usb": {
-        "vid": "0x3434",
-        "pid": "0x0350",
-        "device_version": "1.0.0"
-    },
-    "processor": "STM32L432",
-    "bootloader": "stm32-dfu",
-    "layouts": {
-        "LAYOUT_ansi_100": {
-            "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, 14], "x": 14, "y": 0},
-                {"matrix": [0, 15], "x": 15.5, "y": 0},
-                {"matrix": [0, 16], "x": 16.5, "y": 0},
-                {"matrix": [0, 17], "x": 17.5, "y": 0},
-                {"matrix": [3, 12], "x": 18.5, "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, 15], "x": 15.5, "y": 1.25},
-                {"matrix": [1, 16], "x": 16.5, "y": 1.25},
-                {"matrix": [1, 17], "x": 17.5, "y": 1.25},
-                {"matrix": [3, 14], "x": 18.5, "y": 1.25},
-
-                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
-                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
-                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
-                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
-                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
-                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
-                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
-                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
-                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
-                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
-                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
-                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
-                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
-                {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
-                {"matrix": [2, 15], "x": 15.5, "y": 2.25},
-                {"matrix": [2, 16], "x": 16.5, "y": 2.25},
-                {"matrix": [2, 17], "x": 17.5, "y": 2.25},
-
-                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
-                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
-                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
-                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
-                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
-                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
-                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
-                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
-                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
-                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
-                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
-                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
-                {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
-                {"matrix": [3, 15], "x": 15.5, "y": 3.25},
-                {"matrix": [3, 16], "x": 16.5, "y": 3.25},
-                {"matrix": [3, 17], "x": 17.5, "y": 3.25},
-                {"matrix": [2, 14], "x": 18.5, "y": 2.25, "h": 2},
-
-                {"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, 13], "x": 12.25, "y": 4.25, "w": 1.75},
-                {"matrix": [4, 14], "x": 14.25, "y": 4.5},
-                {"matrix": [4, 15], "x": 15.5, "y": 4.25},
-                {"matrix": [4, 16], "x": 16.5, "y": 4.25},
-                {"matrix": [4, 17], "x": 17.5, "y": 4.25},
-
-                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
-                {"matrix": [5, 10], "x": 10, "y": 5.25},
-                {"matrix": [5, 11], "x": 11, "y": 5.25},
-                {"matrix": [5, 12], "x": 12, "y": 5.25},
-                {"matrix": [5, 13], "x": 13.25, "y": 5.5},
-                {"matrix": [5, 14], "x": 14.25, "y": 5.5},
-                {"matrix": [5, 15], "x": 15.25, "y": 5.5},
-                {"matrix": [5, 16], "x": 16.5, "y": 5.25},
-                {"matrix": [5, 17], "x": 17.5, "y": 5.25},
-                {"matrix": [5, 5], "x": 18.5, "y": 4.25, "h": 2}
-            ]
-        }
-    }
-}
diff --git a/keyboards/keychron/v5/ansi/keyboard.json b/keyboards/keychron/v5/ansi/keyboard.json
new file mode 100644
index 00000000000..b98302f336d
--- /dev/null
+++ b/keyboards/keychron/v5/ansi/keyboard.json
@@ -0,0 +1,132 @@
+{
+    "keyboard_name": "Keychron V5",
+    "manufacturer": "Keychron",
+    "url": "https://github.com/Keychron",
+    "maintainer": "lalalademaxiya1",
+    "usb": {
+        "vid": "0x3434",
+        "pid": "0x0350",
+        "device_version": "1.0.0"
+    },
+    "processor": "STM32L432",
+    "bootloader": "stm32-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "nkro": true,
+        "rgb_matrix": true,
+        "dip_switch": true
+    },
+    "layouts": {
+        "LAYOUT_ansi_100": {
+            "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, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15.5, "y": 0},
+                {"matrix": [0, 16], "x": 16.5, "y": 0},
+                {"matrix": [0, 17], "x": 17.5, "y": 0},
+                {"matrix": [3, 12], "x": 18.5, "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, 15], "x": 15.5, "y": 1.25},
+                {"matrix": [1, 16], "x": 16.5, "y": 1.25},
+                {"matrix": [1, 17], "x": 17.5, "y": 1.25},
+                {"matrix": [3, 14], "x": 18.5, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 15], "x": 15.5, "y": 2.25},
+                {"matrix": [2, 16], "x": 16.5, "y": 2.25},
+                {"matrix": [2, 17], "x": 17.5, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+                {"matrix": [3, 15], "x": 15.5, "y": 3.25},
+                {"matrix": [3, 16], "x": 16.5, "y": 3.25},
+                {"matrix": [3, 17], "x": 17.5, "y": 3.25},
+                {"matrix": [2, 14], "x": 18.5, "y": 2.25, "h": 2},
+
+                {"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, 13], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"matrix": [4, 14], "x": 14.25, "y": 4.5},
+                {"matrix": [4, 15], "x": 15.5, "y": 4.25},
+                {"matrix": [4, 16], "x": 16.5, "y": 4.25},
+                {"matrix": [4, 17], "x": 17.5, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.25},
+                {"matrix": [5, 11], "x": 11, "y": 5.25},
+                {"matrix": [5, 12], "x": 12, "y": 5.25},
+                {"matrix": [5, 13], "x": 13.25, "y": 5.5},
+                {"matrix": [5, 14], "x": 14.25, "y": 5.5},
+                {"matrix": [5, 15], "x": 15.25, "y": 5.5},
+                {"matrix": [5, 16], "x": 16.5, "y": 5.25},
+                {"matrix": [5, 17], "x": 17.5, "y": 5.25},
+                {"matrix": [5, 5], "x": 18.5, "y": 4.25, "h": 2}
+            ]
+        }
+    }
+}
diff --git a/keyboards/keychron/v5/ansi/rules.mk b/keyboards/keychron/v5/ansi/rules.mk
index 465dfa93486..3652da4b697 100644
--- a/keyboards/keychron/v5/ansi/rules.mk
+++ b/keyboards/keychron/v5/ansi/rules.mk
@@ -1,18 +1,3 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable USB N-key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-DIP_SWITCH_ENABLE = yes
-RGB_MATRIX_ENABLE = yes
-
 # custom matrix setup
 CUSTOM_MATRIX = lite
 
diff --git a/keyboards/keychron/v5/ansi_encoder/info.json b/keyboards/keychron/v5/ansi_encoder/info.json
deleted file mode 100644
index 1ed410eb7bf..00000000000
--- a/keyboards/keychron/v5/ansi_encoder/info.json
+++ /dev/null
@@ -1,127 +0,0 @@
-{
-    "keyboard_name": "Keychron V5",
-    "manufacturer": "Keychron",
-    "url": "https://github.com/Keychron",
-    "maintainer": "lalalademaxiya1",
-    "usb": {
-        "vid": "0x3434",
-        "pid": "0x0351",
-        "device_version": "1.0.0"
-    },
-    "encoder": {
-        "rotary": [
-            {"pin_a": "C14", "pin_b": "A2"}
-        ]
-    },
-    "processor": "STM32L432",
-    "bootloader": "stm32-dfu",
-    "layouts": {
-        "LAYOUT_ansi_98": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "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, 7], "x": 6.5, "y": 0},
-                {"matrix": [0, 8], "x": 7.5, "y": 0},
-                {"matrix": [0, 9], "x": 8.5, "y": 0},
-                {"matrix": [0, 10], "x": 9.5, "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, 14], "x": 14, "y": 0},
-                {"matrix": [0, 15], "x": 15.25, "y": 0},
-                {"matrix": [0, 16], "x": 16.25, "y": 0},
-                {"matrix": [0, 17], "x": 17.25, "y": 0},
-                {"matrix": [3, 12], "x": 18.5, "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, 15], "x": 15.5, "y": 1.25},
-                {"matrix": [1, 16], "x": 16.5, "y": 1.25},
-                {"matrix": [1, 17], "x": 17.5, "y": 1.25},
-                {"matrix": [3, 14], "x": 18.5, "y": 1.25},
-
-                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
-                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
-                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
-                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
-                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
-                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
-                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
-                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
-                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
-                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
-                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
-                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
-                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
-                {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
-                {"matrix": [2, 15], "x": 15.5, "y": 2.25},
-                {"matrix": [2, 16], "x": 16.5, "y": 2.25},
-                {"matrix": [2, 17], "x": 17.5, "y": 2.25},
-
-                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
-                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
-                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
-                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
-                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
-                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
-                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
-                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
-                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
-                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
-                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
-                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
-                {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
-                {"matrix": [3, 15], "x": 15.5, "y": 3.25},
-                {"matrix": [3, 16], "x": 16.5, "y": 3.25},
-                {"matrix": [3, 17], "x": 17.5, "y": 3.25},
-                {"matrix": [2, 14], "x": 18.5, "y": 2.25, "h": 2},
-
-                {"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, 13], "x": 12.25, "y": 4.25, "w": 1.75},
-                {"matrix": [4, 14], "x": 14.25, "y": 4.5},
-                {"matrix": [4, 15], "x": 15.5, "y": 4.25},
-                {"matrix": [4, 16], "x": 16.5, "y": 4.25},
-                {"matrix": [4, 17], "x": 17.5, "y": 4.25},
-
-                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
-                {"matrix": [5, 10], "x": 10, "y": 5.25},
-                {"matrix": [5, 11], "x": 11, "y": 5.25},
-                {"matrix": [5, 12], "x": 12, "y": 5.25},
-                {"matrix": [5, 13], "x": 13.25, "y": 5.5},
-                {"matrix": [5, 14], "x": 14.25, "y": 5.5},
-                {"matrix": [5, 15], "x": 15.25, "y": 5.5},
-                {"matrix": [5, 16], "x": 16.5, "y": 5.25},
-                {"matrix": [5, 17], "x": 17.5, "y": 5.25},
-                {"matrix": [5, 5], "x": 18.5, "y": 4.25, "h": 2}
-            ]
-        }
-    }
-}
diff --git a/keyboards/keychron/v5/ansi_encoder/keyboard.json b/keyboards/keychron/v5/ansi_encoder/keyboard.json
new file mode 100644
index 00000000000..af61e4a15ea
--- /dev/null
+++ b/keyboards/keychron/v5/ansi_encoder/keyboard.json
@@ -0,0 +1,136 @@
+{
+    "keyboard_name": "Keychron V5",
+    "manufacturer": "Keychron",
+    "url": "https://github.com/Keychron",
+    "maintainer": "lalalademaxiya1",
+    "usb": {
+        "vid": "0x3434",
+        "pid": "0x0351",
+        "device_version": "1.0.0"
+    },
+    "encoder": {
+        "rotary": [
+            {"pin_a": "C14", "pin_b": "A2"}
+        ]
+    },
+    "processor": "STM32L432",
+    "bootloader": "stm32-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "nkro": true,
+        "rgb_matrix": true,
+        "encoder": true,
+        "dip_switch": true
+    },
+    "layouts": {
+        "LAYOUT_ansi_98": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "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, 7], "x": 6.5, "y": 0},
+                {"matrix": [0, 8], "x": 7.5, "y": 0},
+                {"matrix": [0, 9], "x": 8.5, "y": 0},
+                {"matrix": [0, 10], "x": 9.5, "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, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15.25, "y": 0},
+                {"matrix": [0, 16], "x": 16.25, "y": 0},
+                {"matrix": [0, 17], "x": 17.25, "y": 0},
+                {"matrix": [3, 12], "x": 18.5, "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, 15], "x": 15.5, "y": 1.25},
+                {"matrix": [1, 16], "x": 16.5, "y": 1.25},
+                {"matrix": [1, 17], "x": 17.5, "y": 1.25},
+                {"matrix": [3, 14], "x": 18.5, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 15], "x": 15.5, "y": 2.25},
+                {"matrix": [2, 16], "x": 16.5, "y": 2.25},
+                {"matrix": [2, 17], "x": 17.5, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+                {"matrix": [3, 15], "x": 15.5, "y": 3.25},
+                {"matrix": [3, 16], "x": 16.5, "y": 3.25},
+                {"matrix": [3, 17], "x": 17.5, "y": 3.25},
+                {"matrix": [2, 14], "x": 18.5, "y": 2.25, "h": 2},
+
+                {"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, 13], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"matrix": [4, 14], "x": 14.25, "y": 4.5},
+                {"matrix": [4, 15], "x": 15.5, "y": 4.25},
+                {"matrix": [4, 16], "x": 16.5, "y": 4.25},
+                {"matrix": [4, 17], "x": 17.5, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.25},
+                {"matrix": [5, 11], "x": 11, "y": 5.25},
+                {"matrix": [5, 12], "x": 12, "y": 5.25},
+                {"matrix": [5, 13], "x": 13.25, "y": 5.5},
+                {"matrix": [5, 14], "x": 14.25, "y": 5.5},
+                {"matrix": [5, 15], "x": 15.25, "y": 5.5},
+                {"matrix": [5, 16], "x": 16.5, "y": 5.25},
+                {"matrix": [5, 17], "x": 17.5, "y": 5.25},
+                {"matrix": [5, 5], "x": 18.5, "y": 4.25, "h": 2}
+            ]
+        }
+    }
+}
diff --git a/keyboards/keychron/v5/ansi_encoder/rules.mk b/keyboards/keychron/v5/ansi_encoder/rules.mk
index 4c6e5bebf00..3652da4b697 100644
--- a/keyboards/keychron/v5/ansi_encoder/rules.mk
+++ b/keyboards/keychron/v5/ansi_encoder/rules.mk
@@ -1,19 +1,3 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable USB N-key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-ENCODER_ENABLE = yes        # Enable Encoder
-DIP_SWITCH_ENABLE = yes
-RGB_MATRIX_ENABLE = yes
-
 # custom matrix setup
 CUSTOM_MATRIX = lite
 
diff --git a/keyboards/keychron/v5/iso/info.json b/keyboards/keychron/v5/iso/info.json
deleted file mode 100644
index 522730b2684..00000000000
--- a/keyboards/keychron/v5/iso/info.json
+++ /dev/null
@@ -1,125 +0,0 @@
-{
-    "keyboard_name": "Keychron V5",
-    "manufacturer": "Keychron",
-    "url": "https://github.com/Keychron",
-    "maintainer": "lalalademaxiya1",
-    "usb": {
-        "vid": "0x3434",
-        "pid": "0x0352",
-        "device_version": "1.0.0"
-    },
-    "processor": "STM32L432",
-    "bootloader": "stm32-dfu",
-    "layouts": {
-        "LAYOUT_iso_101": {
-            "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, 14], "x": 14, "y": 0},
-                {"matrix": [0, 15], "x": 15.5, "y": 0},
-                {"matrix": [0, 16], "x": 16.5, "y": 0},
-                {"matrix": [0, 17], "x": 17.5, "y": 0},
-                {"matrix": [3, 12], "x": 18.5, "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, 15], "x": 15.5, "y": 1.25},
-                {"matrix": [1, 16], "x": 16.5, "y": 1.25},
-                {"matrix": [1, 17], "x": 17.5, "y": 1.25},
-                {"matrix": [3, 14], "x": 18.5, "y": 1.25},
-
-                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
-                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
-                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
-                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
-                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
-                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
-                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
-                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
-                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
-                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
-                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
-                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
-                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
-                {"matrix": [2, 15], "x": 15.5, "y": 2.25},
-                {"matrix": [2, 16], "x": 16.5, "y": 2.25},
-                {"matrix": [2, 17], "x": 17.5, "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},
-                {"matrix": [2, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
-                {"matrix": [3, 15], "x": 15.5, "y": 3.25},
-                {"matrix": [3, 16], "x": 16.5, "y": 3.25},
-                {"matrix": [3, 17], "x": 17.5, "y": 3.25},
-                {"matrix": [2, 14], "x": 18.5, "y": 2.25, "h": 2},
-
-                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4.25},
-                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
-                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
-                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
-                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
-                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
-                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
-                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
-                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
-                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
-                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
-                {"matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 1.75},
-                {"matrix": [4, 14], "x": 14.25, "y": 4.5},
-                {"matrix": [4, 15], "x": 15.5, "y": 4.25},
-                {"matrix": [4, 16], "x": 16.5, "y": 4.25},
-                {"matrix": [4, 17], "x": 17.5, "y": 4.25},
-
-                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
-                {"matrix": [5, 10], "x": 10, "y": 5.25},
-                {"matrix": [5, 11], "x": 11, "y": 5.25},
-                {"matrix": [5, 12], "x": 12, "y": 5.25},
-                {"matrix": [5, 13], "x": 13.25, "y": 5.5},
-                {"matrix": [5, 14], "x": 14.25, "y": 5.5},
-                {"matrix": [5, 15], "x": 15.25, "y": 5.5},
-                {"matrix": [5, 16], "x": 16.5, "y": 5.25},
-                {"matrix": [5, 17], "x": 17.5, "y": 5.25},
-                {"matrix": [5, 5], "x": 18.5, "y": 4.25, "h": 2}
-            ]
-        }
-    }
-}
diff --git a/keyboards/keychron/v5/iso/keyboard.json b/keyboards/keychron/v5/iso/keyboard.json
new file mode 100644
index 00000000000..7e7280d5acb
--- /dev/null
+++ b/keyboards/keychron/v5/iso/keyboard.json
@@ -0,0 +1,133 @@
+{
+    "keyboard_name": "Keychron V5",
+    "manufacturer": "Keychron",
+    "url": "https://github.com/Keychron",
+    "maintainer": "lalalademaxiya1",
+    "usb": {
+        "vid": "0x3434",
+        "pid": "0x0352",
+        "device_version": "1.0.0"
+    },
+    "processor": "STM32L432",
+    "bootloader": "stm32-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "nkro": true,
+        "rgb_matrix": true,
+        "dip_switch": true
+    },
+    "layouts": {
+        "LAYOUT_iso_101": {
+            "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, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15.5, "y": 0},
+                {"matrix": [0, 16], "x": 16.5, "y": 0},
+                {"matrix": [0, 17], "x": 17.5, "y": 0},
+                {"matrix": [3, 12], "x": 18.5, "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, 15], "x": 15.5, "y": 1.25},
+                {"matrix": [1, 16], "x": 16.5, "y": 1.25},
+                {"matrix": [1, 17], "x": 17.5, "y": 1.25},
+                {"matrix": [3, 14], "x": 18.5, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 15], "x": 15.5, "y": 2.25},
+                {"matrix": [2, 16], "x": 16.5, "y": 2.25},
+                {"matrix": [2, 17], "x": 17.5, "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},
+                {"matrix": [2, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+                {"matrix": [3, 15], "x": 15.5, "y": 3.25},
+                {"matrix": [3, 16], "x": 16.5, "y": 3.25},
+                {"matrix": [3, 17], "x": 17.5, "y": 3.25},
+                {"matrix": [2, 14], "x": 18.5, "y": 2.25, "h": 2},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"matrix": [4, 14], "x": 14.25, "y": 4.5},
+                {"matrix": [4, 15], "x": 15.5, "y": 4.25},
+                {"matrix": [4, 16], "x": 16.5, "y": 4.25},
+                {"matrix": [4, 17], "x": 17.5, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.25},
+                {"matrix": [5, 11], "x": 11, "y": 5.25},
+                {"matrix": [5, 12], "x": 12, "y": 5.25},
+                {"matrix": [5, 13], "x": 13.25, "y": 5.5},
+                {"matrix": [5, 14], "x": 14.25, "y": 5.5},
+                {"matrix": [5, 15], "x": 15.25, "y": 5.5},
+                {"matrix": [5, 16], "x": 16.5, "y": 5.25},
+                {"matrix": [5, 17], "x": 17.5, "y": 5.25},
+                {"matrix": [5, 5], "x": 18.5, "y": 4.25, "h": 2}
+            ]
+        }
+    }
+}
diff --git a/keyboards/keychron/v5/iso/rules.mk b/keyboards/keychron/v5/iso/rules.mk
index 465dfa93486..3652da4b697 100644
--- a/keyboards/keychron/v5/iso/rules.mk
+++ b/keyboards/keychron/v5/iso/rules.mk
@@ -1,18 +1,3 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable USB N-key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-DIP_SWITCH_ENABLE = yes
-RGB_MATRIX_ENABLE = yes
-
 # custom matrix setup
 CUSTOM_MATRIX = lite
 
diff --git a/keyboards/keychron/v5/iso_encoder/info.json b/keyboards/keychron/v5/iso_encoder/info.json
deleted file mode 100644
index 2d4cf28cd1d..00000000000
--- a/keyboards/keychron/v5/iso_encoder/info.json
+++ /dev/null
@@ -1,128 +0,0 @@
-{
-    "keyboard_name": "Keychron V5",
-    "manufacturer": "Keychron",
-    "url": "https://github.com/Keychron",
-    "maintainer": "lalalademaxiya1",
-    "usb": {
-        "vid": "0x3434",
-        "pid": "0x0353",
-        "device_version": "1.0.0"
-    },
-    "encoder": {
-        "rotary": [
-            {"pin_a": "C14", "pin_b": "A2"}
-        ]
-    },
-    "processor": "STM32L432",
-    "bootloader": "stm32-dfu",
-    "layouts": {
-        "LAYOUT_iso_99": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "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, 7], "x": 6.5, "y": 0},
-                {"matrix": [0, 8], "x": 7.5, "y": 0},
-                {"matrix": [0, 9], "x": 8.5, "y": 0},
-                {"matrix": [0, 10], "x": 9.5, "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, 14], "x": 14, "y": 0},
-                {"matrix": [0, 15], "x": 15.25, "y": 0},
-                {"matrix": [0, 16], "x": 16.25, "y": 0},
-                {"matrix": [0, 17], "x": 17.25, "y": 0},
-                {"matrix": [3, 12], "x": 18.5, "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, 15], "x": 15.5, "y": 1.25},
-                {"matrix": [1, 16], "x": 16.5, "y": 1.25},
-                {"matrix": [1, 17], "x": 17.5, "y": 1.25},
-                {"matrix": [3, 14], "x": 18.5, "y": 1.25},
-
-                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
-                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
-                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
-                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
-                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
-                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
-                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
-                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
-                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
-                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
-                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
-                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
-                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
-                {"matrix": [2, 15], "x": 15.5, "y": 2.25},
-                {"matrix": [2, 16], "x": 16.5, "y": 2.25},
-                {"matrix": [2, 17], "x": 17.5, "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},
-                {"matrix": [2, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
-                {"matrix": [3, 15], "x": 15.5, "y": 3.25},
-                {"matrix": [3, 16], "x": 16.5, "y": 3.25},
-                {"matrix": [3, 17], "x": 17.5, "y": 3.25},
-                {"matrix": [2, 14], "x": 18.5, "y": 2.25, "h": 2},
-
-                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4.25},
-                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
-                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
-                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
-                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
-                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
-                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
-                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
-                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
-                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
-                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
-                {"matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 1.75},
-                {"matrix": [4, 14], "x": 14.25, "y": 4.5},
-                {"matrix": [4, 15], "x": 15.5, "y": 4.25},
-                {"matrix": [4, 16], "x": 16.5, "y": 4.25},
-                {"matrix": [4, 17], "x": 17.5, "y": 4.25},
-
-                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
-                {"matrix": [5, 10], "x": 10, "y": 5.25},
-                {"matrix": [5, 11], "x": 11, "y": 5.25},
-                {"matrix": [5, 12], "x": 12, "y": 5.25},
-                {"matrix": [5, 13], "x": 13.25, "y": 5.5},
-                {"matrix": [5, 14], "x": 14.25, "y": 5.5},
-                {"matrix": [5, 15], "x": 15.25, "y": 5.5},
-                {"matrix": [5, 16], "x": 16.5, "y": 5.25},
-                {"matrix": [5, 17], "x": 17.5, "y": 5.25},
-                {"matrix": [5, 5], "x": 18.5, "y": 4.25, "h": 2}
-            ]
-        }
-    }
-}
diff --git a/keyboards/keychron/v5/iso_encoder/keyboard.json b/keyboards/keychron/v5/iso_encoder/keyboard.json
new file mode 100644
index 00000000000..dfef0a7be79
--- /dev/null
+++ b/keyboards/keychron/v5/iso_encoder/keyboard.json
@@ -0,0 +1,137 @@
+{
+    "keyboard_name": "Keychron V5",
+    "manufacturer": "Keychron",
+    "url": "https://github.com/Keychron",
+    "maintainer": "lalalademaxiya1",
+    "usb": {
+        "vid": "0x3434",
+        "pid": "0x0353",
+        "device_version": "1.0.0"
+    },
+    "encoder": {
+        "rotary": [
+            {"pin_a": "C14", "pin_b": "A2"}
+        ]
+    },
+    "processor": "STM32L432",
+    "bootloader": "stm32-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "nkro": true,
+        "rgb_matrix": true,
+        "encoder": true,
+        "dip_switch": true
+    },
+    "layouts": {
+        "LAYOUT_iso_99": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "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, 7], "x": 6.5, "y": 0},
+                {"matrix": [0, 8], "x": 7.5, "y": 0},
+                {"matrix": [0, 9], "x": 8.5, "y": 0},
+                {"matrix": [0, 10], "x": 9.5, "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, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15.25, "y": 0},
+                {"matrix": [0, 16], "x": 16.25, "y": 0},
+                {"matrix": [0, 17], "x": 17.25, "y": 0},
+                {"matrix": [3, 12], "x": 18.5, "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, 15], "x": 15.5, "y": 1.25},
+                {"matrix": [1, 16], "x": 16.5, "y": 1.25},
+                {"matrix": [1, 17], "x": 17.5, "y": 1.25},
+                {"matrix": [3, 14], "x": 18.5, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 15], "x": 15.5, "y": 2.25},
+                {"matrix": [2, 16], "x": 16.5, "y": 2.25},
+                {"matrix": [2, 17], "x": 17.5, "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},
+                {"matrix": [2, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+                {"matrix": [3, 15], "x": 15.5, "y": 3.25},
+                {"matrix": [3, 16], "x": 16.5, "y": 3.25},
+                {"matrix": [3, 17], "x": 17.5, "y": 3.25},
+                {"matrix": [2, 14], "x": 18.5, "y": 2.25, "h": 2},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"matrix": [4, 14], "x": 14.25, "y": 4.5},
+                {"matrix": [4, 15], "x": 15.5, "y": 4.25},
+                {"matrix": [4, 16], "x": 16.5, "y": 4.25},
+                {"matrix": [4, 17], "x": 17.5, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.25},
+                {"matrix": [5, 11], "x": 11, "y": 5.25},
+                {"matrix": [5, 12], "x": 12, "y": 5.25},
+                {"matrix": [5, 13], "x": 13.25, "y": 5.5},
+                {"matrix": [5, 14], "x": 14.25, "y": 5.5},
+                {"matrix": [5, 15], "x": 15.25, "y": 5.5},
+                {"matrix": [5, 16], "x": 16.5, "y": 5.25},
+                {"matrix": [5, 17], "x": 17.5, "y": 5.25},
+                {"matrix": [5, 5], "x": 18.5, "y": 4.25, "h": 2}
+            ]
+        }
+    }
+}
diff --git a/keyboards/keychron/v5/iso_encoder/rules.mk b/keyboards/keychron/v5/iso_encoder/rules.mk
index 4c6e5bebf00..3652da4b697 100644
--- a/keyboards/keychron/v5/iso_encoder/rules.mk
+++ b/keyboards/keychron/v5/iso_encoder/rules.mk
@@ -1,19 +1,3 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable USB N-key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-ENCODER_ENABLE = yes        # Enable Encoder
-DIP_SWITCH_ENABLE = yes
-RGB_MATRIX_ENABLE = yes
-
 # custom matrix setup
 CUSTOM_MATRIX = lite
 
diff --git a/keyboards/keychron/v6/ansi/info.json b/keyboards/keychron/v6/ansi/info.json
deleted file mode 100644
index 8b2cc055a8a..00000000000
--- a/keyboards/keychron/v6/ansi/info.json
+++ /dev/null
@@ -1,132 +0,0 @@
-{
-    "keyboard_name": "Keychron V6",
-    "manufacturer": "Keychron",
-    "url": "https://github.com/Keychron",
-    "maintainer": "lalalademaxiya1",
-    "usb": {
-        "vid": "0x3434",
-        "pid": "0x0360",
-        "device_version": "1.0.0"
-    },
-    "processor": "STM32L432",
-    "bootloader": "stm32-dfu",
-    "layouts": {
-        "LAYOUT_ansi_108": {
-            "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": [0, 19], "x": 18.5, "y": 0},
-                {"matrix": [1, 19], "x": 19.5, "y": 0},
-                {"matrix": [2, 19], "x": 20.5, "y": 0},
-                {"matrix": [3, 19], "x": 21.5, "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": [1, 17], "x": 18.5, "y": 1.25},
-                {"matrix": [1, 18], "x": 19.5, "y": 1.25},
-                {"matrix": [0, 17], "x": 20.5, "y": 1.25},
-                {"matrix": [0, 18], "x": 21.5, "y": 1.25},
-
-                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
-                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
-                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
-                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
-                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
-                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
-                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
-                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
-                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
-                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
-                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
-                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
-                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
-                {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
-                {"matrix": [2, 14], "x": 15.25, "y": 2.25},
-                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
-                {"matrix": [2, 16], "x": 17.25, "y": 2.25},
-                {"matrix": [2, 17], "x": 18.5, "y": 2.25},
-                {"matrix": [2, 18], "x": 19.5, "y": 2.25},
-                {"matrix": [3, 14], "x": 20.5, "y": 2.25},
-
-                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
-                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
-                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
-                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
-                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
-                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
-                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
-                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
-                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
-                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
-                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
-                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
-                {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
-                {"matrix": [3, 17], "x": 18.5, "y": 3.25},
-                {"matrix": [3, 18], "x": 19.5, "y": 3.25},
-                {"matrix": [3, 16], "x": 20.5, "y": 3.25},
-                {"matrix": [3, 15], "x": 21.5, "y": 2.25, "h": 2},
-
-                {"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, 13], "x": 12.25, "y": 4.25, "w": 2.75},
-                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
-                {"matrix": [4, 17], "x": 18.5, "y": 4.25},
-                {"matrix": [4, 18], "x": 19.5, "y": 4.25},
-                {"matrix": [4, 14], "x": 20.5, "y": 4.25},
-
-                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
-                {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
-                {"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},
-                {"matrix": [5, 17], "x": 18.5, "y": 5.25, "w": 2},
-                {"matrix": [5, 18], "x": 20.5, "y": 5.25},
-                {"matrix": [4, 16], "x": 21.5, "y": 4.25, "h": 2}
-            ]
-        }
-    }
-}
diff --git a/keyboards/keychron/v6/ansi/keyboard.json b/keyboards/keychron/v6/ansi/keyboard.json
new file mode 100644
index 00000000000..e68f3cdec8a
--- /dev/null
+++ b/keyboards/keychron/v6/ansi/keyboard.json
@@ -0,0 +1,140 @@
+{
+    "keyboard_name": "Keychron V6",
+    "manufacturer": "Keychron",
+    "url": "https://github.com/Keychron",
+    "maintainer": "lalalademaxiya1",
+    "usb": {
+        "vid": "0x3434",
+        "pid": "0x0360",
+        "device_version": "1.0.0"
+    },
+    "processor": "STM32L432",
+    "bootloader": "stm32-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "nkro": true,
+        "rgb_matrix": true,
+        "dip_switch": true
+    },
+    "layouts": {
+        "LAYOUT_ansi_108": {
+            "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": [0, 19], "x": 18.5, "y": 0},
+                {"matrix": [1, 19], "x": 19.5, "y": 0},
+                {"matrix": [2, 19], "x": 20.5, "y": 0},
+                {"matrix": [3, 19], "x": 21.5, "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": [1, 17], "x": 18.5, "y": 1.25},
+                {"matrix": [1, 18], "x": 19.5, "y": 1.25},
+                {"matrix": [0, 17], "x": 20.5, "y": 1.25},
+                {"matrix": [0, 18], "x": 21.5, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+                {"matrix": [2, 17], "x": 18.5, "y": 2.25},
+                {"matrix": [2, 18], "x": 19.5, "y": 2.25},
+                {"matrix": [3, 14], "x": 20.5, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+                {"matrix": [3, 17], "x": 18.5, "y": 3.25},
+                {"matrix": [3, 18], "x": 19.5, "y": 3.25},
+                {"matrix": [3, 16], "x": 20.5, "y": 3.25},
+                {"matrix": [3, 15], "x": 21.5, "y": 2.25, "h": 2},
+
+                {"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, 13], "x": 12.25, "y": 4.25, "w": 2.75},
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+                {"matrix": [4, 17], "x": 18.5, "y": 4.25},
+                {"matrix": [4, 18], "x": 19.5, "y": 4.25},
+                {"matrix": [4, 14], "x": 20.5, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+                {"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},
+                {"matrix": [5, 17], "x": 18.5, "y": 5.25, "w": 2},
+                {"matrix": [5, 18], "x": 20.5, "y": 5.25},
+                {"matrix": [4, 16], "x": 21.5, "y": 4.25, "h": 2}
+            ]
+        }
+    }
+}
diff --git a/keyboards/keychron/v6/ansi/rules.mk b/keyboards/keychron/v6/ansi/rules.mk
index eff255ee8c8..3652da4b697 100644
--- a/keyboards/keychron/v6/ansi/rules.mk
+++ b/keyboards/keychron/v6/ansi/rules.mk
@@ -1,18 +1,3 @@
-# Build Options
-#   change yes to no to disable.
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable USB N-key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-DIP_SWITCH_ENABLE = yes
-RGB_MATRIX_ENABLE = yes
-
 # custom matrix setup
 CUSTOM_MATRIX = lite
 
diff --git a/keyboards/keychron/v6/ansi_encoder/info.json b/keyboards/keychron/v6/ansi_encoder/info.json
deleted file mode 100644
index 86ecc82e350..00000000000
--- a/keyboards/keychron/v6/ansi_encoder/info.json
+++ /dev/null
@@ -1,141 +0,0 @@
-{
-    "keyboard_name": "Keychron V6",
-    "manufacturer": "Keychron",
-    "url": "https://github.com/Keychron",
-    "maintainer": "lalalademaxiya1",
-    "usb": {
-        "vid": "0x3434",
-        "pid": "0x0361",
-        "device_version": "1.0.0"
-    },
-    "rgb_matrix": {
-        "driver": "snled27351"
-    },
-    "encoder": {
-        "rotary": [
-            {"pin_a": "C14", "pin_b": "A2"}
-        ]
-    },
-    "processor": "STM32L432",
-    "bootloader": "stm32-dfu",
-    "layouts": {
-        "LAYOUT_ansi_109": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1.25, "y": 0},
-                {"matrix": [0, 2], "x": 2.25, "y": 0},
-                {"matrix": [0, 3], "x": 3.25, "y": 0},
-                {"matrix": [0, 4], "x": 4.25, "y": 0},
-                {"matrix": [0, 5], "x": 5.5, "y": 0},
-                {"matrix": [0, 6], "x": 6.5, "y": 0},
-                {"matrix": [0, 7], "x": 7.5, "y": 0},
-                {"matrix": [0, 8], "x": 8.5, "y": 0},
-                {"matrix": [0, 9], "x": 9.75, "y": 0},
-                {"matrix": [0, 10], "x": 10.75, "y": 0},
-                {"matrix": [0, 11], "x": 11.75, "y": 0},
-                {"matrix": [0, 12], "x": 12.75, "y": 0},
-                {"matrix": [4, 19], "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": [0, 19], "x": 18.5, "y": 0},
-                {"matrix": [1, 19], "x": 19.5, "y": 0},
-                {"matrix": [2, 19], "x": 20.5, "y": 0},
-                {"matrix": [3, 19], "x": 21.5, "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": [1, 17], "x": 18.5, "y": 1.25},
-                {"matrix": [1, 18], "x": 19.5, "y": 1.25},
-                {"matrix": [0, 17], "x": 20.5, "y": 1.25},
-                {"matrix": [0, 18], "x": 21.5, "y": 1.25},
-
-                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
-                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
-                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
-                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
-                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
-                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
-                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
-                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
-                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
-                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
-                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
-                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
-                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
-                {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
-                {"matrix": [2, 14], "x": 15.25, "y": 2.25},
-                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
-                {"matrix": [2, 16], "x": 17.25, "y": 2.25},
-                {"matrix": [2, 17], "x": 18.5, "y": 2.25},
-                {"matrix": [2, 18], "x": 19.5, "y": 2.25},
-                {"matrix": [3, 14], "x": 20.5, "y": 2.25},
-
-                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
-                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
-                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
-                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
-                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
-                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
-                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
-                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
-                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
-                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
-                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
-                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
-                {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
-                {"matrix": [3, 17], "x": 18.5, "y": 3.25},
-                {"matrix": [3, 18], "x": 19.5, "y": 3.25},
-                {"matrix": [3, 16], "x": 20.5, "y": 3.25},
-                {"matrix": [3, 15], "x": 21.5, "y": 2.25, "h": 2},
-
-                {"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, 13], "x": 12.25, "y": 4.25, "w": 2.75},
-                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
-                {"matrix": [4, 17], "x": 18.5, "y": 4.25},
-                {"matrix": [4, 18], "x": 19.5, "y": 4.25},
-                {"matrix": [4, 14], "x": 20.5, "y": 4.25},
-
-                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
-                {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
-                {"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},
-                {"matrix": [5, 17], "x": 18.5, "y": 5.25, "w": 2},
-                {"matrix": [5, 18], "x": 20.5, "y": 5.25},
-                {"matrix": [4, 16], "x": 21.5, "y": 4.25, "h": 2}
-            ]
-        }
-    }
-}
diff --git a/keyboards/keychron/v6/ansi_encoder/keyboard.json b/keyboards/keychron/v6/ansi_encoder/keyboard.json
new file mode 100644
index 00000000000..6ccc6d415b0
--- /dev/null
+++ b/keyboards/keychron/v6/ansi_encoder/keyboard.json
@@ -0,0 +1,150 @@
+{
+    "keyboard_name": "Keychron V6",
+    "manufacturer": "Keychron",
+    "url": "https://github.com/Keychron",
+    "maintainer": "lalalademaxiya1",
+    "usb": {
+        "vid": "0x3434",
+        "pid": "0x0361",
+        "device_version": "1.0.0"
+    },
+    "rgb_matrix": {
+        "driver": "snled27351"
+    },
+    "encoder": {
+        "rotary": [
+            {"pin_a": "C14", "pin_b": "A2"}
+        ]
+    },
+    "processor": "STM32L432",
+    "bootloader": "stm32-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "nkro": true,
+        "rgb_matrix": true,
+        "encoder": true,
+        "dip_switch": true
+    },
+    "layouts": {
+        "LAYOUT_ansi_109": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.75, "y": 0},
+                {"matrix": [0, 10], "x": 10.75, "y": 0},
+                {"matrix": [0, 11], "x": 11.75, "y": 0},
+                {"matrix": [0, 12], "x": 12.75, "y": 0},
+                {"matrix": [4, 19], "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": [0, 19], "x": 18.5, "y": 0},
+                {"matrix": [1, 19], "x": 19.5, "y": 0},
+                {"matrix": [2, 19], "x": 20.5, "y": 0},
+                {"matrix": [3, 19], "x": 21.5, "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": [1, 17], "x": 18.5, "y": 1.25},
+                {"matrix": [1, 18], "x": 19.5, "y": 1.25},
+                {"matrix": [0, 17], "x": 20.5, "y": 1.25},
+                {"matrix": [0, 18], "x": 21.5, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+                {"matrix": [2, 17], "x": 18.5, "y": 2.25},
+                {"matrix": [2, 18], "x": 19.5, "y": 2.25},
+                {"matrix": [3, 14], "x": 20.5, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+                {"matrix": [3, 17], "x": 18.5, "y": 3.25},
+                {"matrix": [3, 18], "x": 19.5, "y": 3.25},
+                {"matrix": [3, 16], "x": 20.5, "y": 3.25},
+                {"matrix": [3, 15], "x": 21.5, "y": 2.25, "h": 2},
+
+                {"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, 13], "x": 12.25, "y": 4.25, "w": 2.75},
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+                {"matrix": [4, 17], "x": 18.5, "y": 4.25},
+                {"matrix": [4, 18], "x": 19.5, "y": 4.25},
+                {"matrix": [4, 14], "x": 20.5, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+                {"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},
+                {"matrix": [5, 17], "x": 18.5, "y": 5.25, "w": 2},
+                {"matrix": [5, 18], "x": 20.5, "y": 5.25},
+                {"matrix": [4, 16], "x": 21.5, "y": 4.25, "h": 2}
+            ]
+        }
+    }
+}
diff --git a/keyboards/keychron/v6/ansi_encoder/rules.mk b/keyboards/keychron/v6/ansi_encoder/rules.mk
index 213c733c9c2..3652da4b697 100644
--- a/keyboards/keychron/v6/ansi_encoder/rules.mk
+++ b/keyboards/keychron/v6/ansi_encoder/rules.mk
@@ -1,19 +1,3 @@
-# Build Options
-#   change yes to no to disable.
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable USB N-key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-ENCODER_ENABLE = yes        # Enable Encoder
-DIP_SWITCH_ENABLE = yes
-RGB_MATRIX_ENABLE = yes
-
 # custom matrix setup
 CUSTOM_MATRIX = lite
 
diff --git a/keyboards/keychron/v6/iso/info.json b/keyboards/keychron/v6/iso/info.json
deleted file mode 100644
index 242e904cf03..00000000000
--- a/keyboards/keychron/v6/iso/info.json
+++ /dev/null
@@ -1,136 +0,0 @@
-{
-    "keyboard_name": "Keychron V6",
-    "manufacturer": "Keychron",
-    "url": "https://github.com/Keychron",
-    "maintainer": "lalalademaxiya1",
-    "usb": {
-        "vid": "0x3434",
-        "pid": "0x0362",
-        "device_version": "1.0.0"
-    },
-    "rgb_matrix": {
-        "driver": "snled27351"
-    },
-    "processor": "STM32L432",
-    "bootloader": "stm32-dfu",
-    "layouts": {
-        "LAYOUT_iso_109": {
-            "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": [0, 19], "x": 18.5, "y": 0},
-                {"matrix": [1, 19], "x": 19.5, "y": 0},
-                {"matrix": [2, 19], "x": 20.5, "y": 0},
-                {"matrix": [3, 19], "x": 21.5, "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": [1, 17], "x": 18.5, "y": 1.25},
-                {"matrix": [1, 18], "x": 19.5, "y": 1.25},
-                {"matrix": [0, 17], "x": 20.5, "y": 1.25},
-                {"matrix": [0, 18], "x": 21.5, "y": 1.25},
-
-                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
-                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
-                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
-                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
-                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
-                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
-                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
-                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
-                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
-                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
-                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
-                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
-                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
-                {"matrix": [2, 14], "x": 15.25, "y": 2.25},
-                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
-                {"matrix": [2, 16], "x": 17.25, "y": 2.25},
-                {"matrix": [2, 17], "x": 18.5, "y": 2.25},
-                {"matrix": [2, 18], "x": 19.5, "y": 2.25},
-                {"matrix": [3, 14], "x": 20.5, "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},
-                {"matrix": [2, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
-                {"matrix": [3, 17], "x": 18.5, "y": 3.25},
-                {"matrix": [3, 18], "x": 19.5, "y": 3.25},
-                {"matrix": [3, 16], "x": 20.5, "y": 3.25},
-                {"matrix": [3, 15], "x": 21.5, "y": 2.25, "h": 2},
-
-                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4.25},
-                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
-                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
-                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
-                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
-                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
-                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
-                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
-                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
-                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
-                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
-                {"matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 2.75},
-                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
-                {"matrix": [4, 17], "x": 18.5, "y": 4.25},
-                {"matrix": [4, 18], "x": 19.5, "y": 4.25},
-                {"matrix": [4, 14], "x": 20.5, "y": 4.25},
-
-                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
-                {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
-                {"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},
-                {"matrix": [5, 17], "x": 18.5, "y": 5.25, "w": 2},
-                {"matrix": [5, 18], "x": 20.5, "y": 5.25},
-                {"matrix": [4, 16], "x": 21.5, "y": 4.25, "h": 2}
-            ]
-        }
-    }
-}
diff --git a/keyboards/keychron/v6/iso/keyboard.json b/keyboards/keychron/v6/iso/keyboard.json
new file mode 100644
index 00000000000..e2f17e4f6e5
--- /dev/null
+++ b/keyboards/keychron/v6/iso/keyboard.json
@@ -0,0 +1,144 @@
+{
+    "keyboard_name": "Keychron V6",
+    "manufacturer": "Keychron",
+    "url": "https://github.com/Keychron",
+    "maintainer": "lalalademaxiya1",
+    "usb": {
+        "vid": "0x3434",
+        "pid": "0x0362",
+        "device_version": "1.0.0"
+    },
+    "rgb_matrix": {
+        "driver": "snled27351"
+    },
+    "processor": "STM32L432",
+    "bootloader": "stm32-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "nkro": true,
+        "rgb_matrix": true,
+        "dip_switch": true
+    },
+    "layouts": {
+        "LAYOUT_iso_109": {
+            "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": [0, 19], "x": 18.5, "y": 0},
+                {"matrix": [1, 19], "x": 19.5, "y": 0},
+                {"matrix": [2, 19], "x": 20.5, "y": 0},
+                {"matrix": [3, 19], "x": 21.5, "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": [1, 17], "x": 18.5, "y": 1.25},
+                {"matrix": [1, 18], "x": 19.5, "y": 1.25},
+                {"matrix": [0, 17], "x": 20.5, "y": 1.25},
+                {"matrix": [0, 18], "x": 21.5, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+                {"matrix": [2, 17], "x": 18.5, "y": 2.25},
+                {"matrix": [2, 18], "x": 19.5, "y": 2.25},
+                {"matrix": [3, 14], "x": 20.5, "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},
+                {"matrix": [2, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+                {"matrix": [3, 17], "x": 18.5, "y": 3.25},
+                {"matrix": [3, 18], "x": 19.5, "y": 3.25},
+                {"matrix": [3, 16], "x": 20.5, "y": 3.25},
+                {"matrix": [3, 15], "x": 21.5, "y": 2.25, "h": 2},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 2.75},
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+                {"matrix": [4, 17], "x": 18.5, "y": 4.25},
+                {"matrix": [4, 18], "x": 19.5, "y": 4.25},
+                {"matrix": [4, 14], "x": 20.5, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+                {"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},
+                {"matrix": [5, 17], "x": 18.5, "y": 5.25, "w": 2},
+                {"matrix": [5, 18], "x": 20.5, "y": 5.25},
+                {"matrix": [4, 16], "x": 21.5, "y": 4.25, "h": 2}
+            ]
+        }
+    }
+}
diff --git a/keyboards/keychron/v6/iso/rules.mk b/keyboards/keychron/v6/iso/rules.mk
index eff255ee8c8..3652da4b697 100644
--- a/keyboards/keychron/v6/iso/rules.mk
+++ b/keyboards/keychron/v6/iso/rules.mk
@@ -1,18 +1,3 @@
-# Build Options
-#   change yes to no to disable.
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable USB N-key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-DIP_SWITCH_ENABLE = yes
-RGB_MATRIX_ENABLE = yes
-
 # custom matrix setup
 CUSTOM_MATRIX = lite
 
diff --git a/keyboards/keychron/v6/iso_encoder/info.json b/keyboards/keychron/v6/iso_encoder/info.json
deleted file mode 100644
index d4237a69f42..00000000000
--- a/keyboards/keychron/v6/iso_encoder/info.json
+++ /dev/null
@@ -1,142 +0,0 @@
-{
-    "keyboard_name": "Keychron V6",
-    "manufacturer": "Keychron",
-    "url": "https://github.com/Keychron",
-    "maintainer": "lalalademaxiya1",
-    "usb": {
-        "vid": "0x3434",
-        "pid": "0x0363",
-        "device_version": "1.0.0"
-    },
-    "rgb_matrix": {
-        "driver": "snled27351"
-    },
-    "encoder": {
-        "rotary": [
-            {"pin_a": "C14", "pin_b": "A2"}
-        ]
-    },
-    "processor": "STM32L432",
-    "bootloader": "stm32-dfu",
-    "layouts": {
-        "LAYOUT_iso_110": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1.25, "y": 0},
-                {"matrix": [0, 2], "x": 2.25, "y": 0},
-                {"matrix": [0, 3], "x": 3.25, "y": 0},
-                {"matrix": [0, 4], "x": 4.25, "y": 0},
-                {"matrix": [0, 5], "x": 5.5, "y": 0},
-                {"matrix": [0, 6], "x": 6.5, "y": 0},
-                {"matrix": [0, 7], "x": 7.5, "y": 0},
-                {"matrix": [0, 8], "x": 8.5, "y": 0},
-                {"matrix": [0, 9], "x": 9.75, "y": 0},
-                {"matrix": [0, 10], "x": 10.75, "y": 0},
-                {"matrix": [0, 11], "x": 11.75, "y": 0},
-                {"matrix": [0, 12], "x": 12.75, "y": 0},
-                {"matrix": [4, 19], "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": [0, 19], "x": 18.5, "y": 0},
-                {"matrix": [1, 19], "x": 19.5, "y": 0},
-                {"matrix": [2, 19], "x": 20.5, "y": 0},
-                {"matrix": [3, 19], "x": 21.5, "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": [1, 17], "x": 18.5, "y": 1.25},
-                {"matrix": [1, 18], "x": 19.5, "y": 1.25},
-                {"matrix": [0, 17], "x": 20.5, "y": 1.25},
-                {"matrix": [0, 18], "x": 21.5, "y": 1.25},
-
-                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
-                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
-                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
-                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
-                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
-                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
-                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
-                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
-                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
-                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
-                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
-                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
-                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
-                {"matrix": [2, 14], "x": 15.25, "y": 2.25},
-                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
-                {"matrix": [2, 16], "x": 17.25, "y": 2.25},
-                {"matrix": [2, 17], "x": 18.5, "y": 2.25},
-                {"matrix": [2, 18], "x": 19.5, "y": 2.25},
-                {"matrix": [3, 14], "x": 20.5, "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},
-                {"matrix": [2, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
-                {"matrix": [3, 17], "x": 18.5, "y": 3.25},
-                {"matrix": [3, 18], "x": 19.5, "y": 3.25},
-                {"matrix": [3, 16], "x": 20.5, "y": 3.25},
-                {"matrix": [3, 15], "x": 21.5, "y": 2.25, "h": 2},
-
-                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4.25},
-                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
-                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
-                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
-                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
-                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
-                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
-                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
-                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
-                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
-                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
-                {"matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 2.75},
-                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
-                {"matrix": [4, 17], "x": 18.5, "y": 4.25},
-                {"matrix": [4, 18], "x": 19.5, "y": 4.25},
-                {"matrix": [4, 14], "x": 20.5, "y": 4.25},
-
-                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
-                {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
-                {"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},
-                {"matrix": [5, 17], "x": 18.5, "y": 5.25, "w": 2},
-                {"matrix": [5, 18], "x": 20.5, "y": 5.25},
-                {"matrix": [4, 16], "x": 21.5, "y": 4.25, "h": 2}
-            ]
-        }
-    }
-}
diff --git a/keyboards/keychron/v6/iso_encoder/keyboard.json b/keyboards/keychron/v6/iso_encoder/keyboard.json
new file mode 100644
index 00000000000..d7469b54e0d
--- /dev/null
+++ b/keyboards/keychron/v6/iso_encoder/keyboard.json
@@ -0,0 +1,151 @@
+{
+    "keyboard_name": "Keychron V6",
+    "manufacturer": "Keychron",
+    "url": "https://github.com/Keychron",
+    "maintainer": "lalalademaxiya1",
+    "usb": {
+        "vid": "0x3434",
+        "pid": "0x0363",
+        "device_version": "1.0.0"
+    },
+    "rgb_matrix": {
+        "driver": "snled27351"
+    },
+    "encoder": {
+        "rotary": [
+            {"pin_a": "C14", "pin_b": "A2"}
+        ]
+    },
+    "processor": "STM32L432",
+    "bootloader": "stm32-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "nkro": true,
+        "rgb_matrix": true,
+        "encoder": true,
+        "dip_switch": true
+    },
+    "layouts": {
+        "LAYOUT_iso_110": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.75, "y": 0},
+                {"matrix": [0, 10], "x": 10.75, "y": 0},
+                {"matrix": [0, 11], "x": 11.75, "y": 0},
+                {"matrix": [0, 12], "x": 12.75, "y": 0},
+                {"matrix": [4, 19], "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": [0, 19], "x": 18.5, "y": 0},
+                {"matrix": [1, 19], "x": 19.5, "y": 0},
+                {"matrix": [2, 19], "x": 20.5, "y": 0},
+                {"matrix": [3, 19], "x": 21.5, "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": [1, 17], "x": 18.5, "y": 1.25},
+                {"matrix": [1, 18], "x": 19.5, "y": 1.25},
+                {"matrix": [0, 17], "x": 20.5, "y": 1.25},
+                {"matrix": [0, 18], "x": 21.5, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+                {"matrix": [2, 17], "x": 18.5, "y": 2.25},
+                {"matrix": [2, 18], "x": 19.5, "y": 2.25},
+                {"matrix": [3, 14], "x": 20.5, "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},
+                {"matrix": [2, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+                {"matrix": [3, 17], "x": 18.5, "y": 3.25},
+                {"matrix": [3, 18], "x": 19.5, "y": 3.25},
+                {"matrix": [3, 16], "x": 20.5, "y": 3.25},
+                {"matrix": [3, 15], "x": 21.5, "y": 2.25, "h": 2},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 2.75},
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+                {"matrix": [4, 17], "x": 18.5, "y": 4.25},
+                {"matrix": [4, 18], "x": 19.5, "y": 4.25},
+                {"matrix": [4, 14], "x": 20.5, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+                {"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},
+                {"matrix": [5, 17], "x": 18.5, "y": 5.25, "w": 2},
+                {"matrix": [5, 18], "x": 20.5, "y": 5.25},
+                {"matrix": [4, 16], "x": 21.5, "y": 4.25, "h": 2}
+            ]
+        }
+    }
+}
diff --git a/keyboards/keychron/v6/iso_encoder/rules.mk b/keyboards/keychron/v6/iso_encoder/rules.mk
index 39b05940393..3652da4b697 100644
--- a/keyboards/keychron/v6/iso_encoder/rules.mk
+++ b/keyboards/keychron/v6/iso_encoder/rules.mk
@@ -1,21 +1,4 @@
-# Build Options
-#   change yes to no to disable.
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable USB N-key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-ENCODER_ENABLE = yes        # Enable Encoder
-DIP_SWITCH_ENABLE = yes
-RGB_MATRIX_ENABLE = yes
-
 # custom matrix setup
 CUSTOM_MATRIX = lite
 
-VPATH ?= keyboards/keychron/common
 SRC += matrix.c
diff --git a/keyboards/keycult/keycult65/keyboard.json b/keyboards/keycult/keycult65/keyboard.json
new file mode 100644
index 00000000000..f9436b7b824
--- /dev/null
+++ b/keyboards/keycult/keycult65/keyboard.json
@@ -0,0 +1,315 @@
+{
+    "manufacturer": "Yiancar-Designs",
+    "keyboard_name": "Keycult 65",
+    "maintainer": "Yiancar-Designs",
+    "bootloader": "stm32-dfu",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "indicators": {
+        "caps_lock": "B6",
+        "on_state": 0
+    },
+    "matrix_pins": {
+        "cols": ["A13", "A10", "A9", "A14", "A15", "B8", "B9", "B2", "B1", "B0", "A0", "A1", "A2", "A3", "A5"],
+        "rows": ["B3", "B4", "B5", "A8", "A4"]
+    },
+    "processor": "STM32F072",
+    "url": "https://yiancar-designs.com",
+    "usb": {
+        "device_version": "0.0.1",
+        "pid": "0x6335",
+        "vid": "0x8968"
+    },
+    "community_layouts": ["65_ansi_blocker", "65_ansi_blocker_split_bs", "65_ansi_blocker_tsangan", "65_ansi_blocker_tsangan_split_bs"],
+    "layouts": {
+        "LAYOUT_65_ansi_blocker": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [2, 12], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_65_ansi_blocker_split_bs": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [1, 13], "x": 13, "y": 0},
+                {"matrix": [0, 13], "x": 14, "y": 0},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [2, 12], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_65_ansi_blocker_tsangan": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [2, 12], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_65_ansi_blocker_tsangan_split_bs": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [1, 13], "x": 13, "y": 0},
+                {"matrix": [0, 13], "x": 14, "y": 0},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [2, 12], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/keycult/keycult65/keycult65.c b/keyboards/keycult/keycult65/keycult65.c
new file mode 100644
index 00000000000..fdbfa8f2727
--- /dev/null
+++ b/keyboards/keycult/keycult65/keycult65.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
+    gpio_set_pin_output_open_drain(LED_CAPS_LOCK_PIN);
+}
diff --git a/keyboards/keycult/keycult65/keymaps/default/keymap.c b/keyboards/keycult/keycult65/keymaps/default/keymap.c
new file mode 100644
index 00000000000..94ed786b933
--- /dev/null
+++ b/keyboards/keycult/keycult65/keymaps/default/keymap.c
@@ -0,0 +1,32 @@
+/* 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_65_ansi_blocker( /* Base */
+    QK_GESC, KC_1,    KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,
+    KC_TAB,  KC_Q,    KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP,
+    KC_CAPS, KC_A,    KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,  KC_PGDN,
+    KC_LSFT,          KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,   KC_END,
+    KC_LCTL, KC_LGUI, KC_LALT,                        KC_SPC,                           MO(1),   KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
+
+[1] = LAYOUT_65_ansi_blocker( /* FN */
+    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_VOLU, KC_VOLD, KC_MUTE,                            _______,                            _______, _______, _______, _______, _______)
+};
diff --git a/keyboards/keycult/keycult65/keymaps/via/keymap.c b/keyboards/keycult/keycult65/keymaps/via/keymap.c
new file mode 100644
index 00000000000..92c81b41947
--- /dev/null
+++ b/keyboards/keycult/keycult65/keymaps/via/keymap.c
@@ -0,0 +1,32 @@
+/* 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_65_ansi_blocker_split_bs( /* Base */
+    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_DEL,
+    KC_TAB,  KC_Q,    KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,          KC_PGUP,
+    KC_CAPS, KC_A,    KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,           KC_PGDN,
+    KC_LSFT,          KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,            KC_END,
+    KC_LCTL, KC_LGUI, KC_LALT,                        KC_SPC,                           MO(1),   KC_RCTL, KC_LEFT, KC_DOWN,          KC_RGHT),
+
+[1] = LAYOUT_65_ansi_blocker_split_bs( /* FN */
+    KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_DEL, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,         _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,         _______,
+    _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,         _______,
+    KC_VOLU, KC_VOLD, KC_MUTE,                            _______,                            _______, _______, _______, _______,         _______)
+};
diff --git a/keyboards/keycult/keycult65/keymaps/via/rules.mk b/keyboards/keycult/keycult65/keymaps/via/rules.mk
new file mode 100644
index 00000000000..1e5b99807cb
--- /dev/null
+++ b/keyboards/keycult/keycult65/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/keycult/keycult65/readme.md b/keyboards/keycult/keycult65/readme.md
new file mode 100644
index 00000000000..42d5875140c
--- /dev/null
+++ b/keyboards/keycult/keycult65/readme.md
@@ -0,0 +1,32 @@
+# Keycult 65
+
+This is a 65% layout PCB. It supports VIA.
+
+* Keyboard Maintainer: [Yiancar](http://yiancar-designs.com/) and on [GitHub](https://github.com/yiancar)
+* Hardware Supported: A 65% keyboard with STM32F072CB
+* Hardware Availability: https://keycult.com/ 
+
+## Instructions
+
+### Build
+
+Make example for this keyboard (after setting up your build environment):
+
+    make keycult/keycult65: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 keycult/keycult65:<keymap>:flash`)
diff --git a/keyboards/keycult/keycult65/rules.mk b/keyboards/keycult/keycult65/rules.mk
new file mode 100644
index 00000000000..0ab54aaaf71
--- /dev/null
+++ b/keyboards/keycult/keycult65/rules.mk
@@ -0,0 +1,2 @@
+# Wildcard to allow APM32 MCU
+DFU_SUFFIX_ARGS = -v FFFF -p FFFF
diff --git a/keyboards/keygem/kg60ansi/info.json b/keyboards/keygem/kg60ansi/info.json
deleted file mode 100644
index 73d31b8da1c..00000000000
--- a/keyboards/keygem/kg60ansi/info.json
+++ /dev/null
@@ -1,113 +0,0 @@
-{
-    "keyboard_name": "KG60 ANSI",
-    "manufacturer": "FJLabs",
-    "url": "https://www.keygem.store/",
-    "maintainer": "Keygem",
-    "usb": {
-        "vid": "0x4B47",
-        "pid": "0x0001",
-        "device_version": "0.0.1"
-    },
-    "ws2812": {
-        "pin": "F7"
-    },
-    "rgblight": {
-        "led_count": 64,
-        "max_brightness": 108,
-        "animations": {
-            "breathing": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "snake": true,
-            "knight": true,
-            "christmas": true,
-            "static_gradient": true,
-            "rgb_test": true,
-            "alternating": true,
-            "twinkle": true
-        },
-        "default": {
-            "animation": "rainbow_swirl",
-            "speed": 144
-        }
-    },
-    "matrix_pins": {
-        "cols": ["C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "B3", "B2", "B1"],
-        "rows": ["F0", "F1", "F4", "F5", "F6"]
-    },
-    "diode_direction": "COL2ROW",
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "community_layouts": ["60_ansi"],
-    "layouts": {
-        "LAYOUT_60_ansi": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 1], "x": 2.25, "y": 3},
-                {"matrix": [3, 2], "x": 3.25, "y": 3},
-                {"matrix": [3, 3], "x": 4.25, "y": 3},
-                {"matrix": [3, 4], "x": 5.25, "y": 3},
-                {"matrix": [3, 5], "x": 6.25, "y": 3},
-                {"matrix": [3, 6], "x": 7.25, "y": 3},
-                {"matrix": [3, 7], "x": 8.25, "y": 3},
-                {"matrix": [3, 8], "x": 9.25, "y": 3},
-                {"matrix": [3, 9], "x": 10.25, "y": 3},
-                {"matrix": [3, 10], "x": 11.25, "y": 3},
-                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
-                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
-                {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
-            ]
-        }
-    }
-}
diff --git a/keyboards/keygem/kg60ansi/keyboard.json b/keyboards/keygem/kg60ansi/keyboard.json
new file mode 100644
index 00000000000..ea6353516bd
--- /dev/null
+++ b/keyboards/keygem/kg60ansi/keyboard.json
@@ -0,0 +1,121 @@
+{
+    "keyboard_name": "KG60 ANSI",
+    "manufacturer": "FJLabs",
+    "url": "https://www.keygem.store/",
+    "maintainer": "Keygem",
+    "usb": {
+        "vid": "0x4B47",
+        "pid": "0x0001",
+        "device_version": "0.0.1"
+    },
+    "ws2812": {
+        "pin": "F7"
+    },
+    "rgblight": {
+        "led_count": 64,
+        "max_brightness": 108,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": true,
+            "twinkle": true
+        },
+        "default": {
+            "animation": "rainbow_swirl",
+            "speed": 144
+        }
+    },
+    "matrix_pins": {
+        "cols": ["C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "B3", "B2", "B1"],
+        "rows": ["F0", "F1", "F4", "F5", "F6"]
+    },
+    "diode_direction": "COL2ROW",
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "command": true,
+        "nkro": true,
+        "rgblight": true
+    },
+    "community_layouts": ["60_ansi"],
+    "layouts": {
+        "LAYOUT_60_ansi": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 10], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/keygem/kg60ansi/rules.mk b/keyboards/keygem/kg60ansi/rules.mk
index 52a18008f4a..3437a35bdf1 100644
--- a/keyboards/keygem/kg60ansi/rules.mk
+++ b/keyboards/keygem/kg60ansi/rules.mk
@@ -1,15 +1,2 @@
 # Processor frequency
 F_CPU = 8000000
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
diff --git a/keyboards/keygem/kg65rgbv2/info.json b/keyboards/keygem/kg65rgbv2/info.json
deleted file mode 100644
index e7b48dcbb08..00000000000
--- a/keyboards/keygem/kg65rgbv2/info.json
+++ /dev/null
@@ -1,120 +0,0 @@
-{
-    "keyboard_name": "KG65 RGB V2",
-    "manufacturer": "FJLabs",
-    "url": "https://www.keygem.store/",
-    "maintainer": "Keygem",
-    "usb": {
-        "vid": "0x4B47",
-        "pid": "0x0002",
-        "device_version": "0.0.1"
-    },
-    "ws2812": {
-        "pin": "F7"
-    },
-    "rgblight": {
-        "led_count": 68,
-        "max_brightness": 96,
-        "animations": {
-            "breathing": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "snake": true,
-            "knight": true,
-            "christmas": true,
-            "static_gradient": true,
-            "rgb_test": true,
-            "alternating": true,
-            "twinkle": true
-        },
-        "default": {
-            "animation": "rainbow_swirl",
-            "speed": 144
-        }
-    },
-    "matrix_pins": {
-        "cols": ["C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "B3", "B2", "B1", "D1"],
-        "rows": ["F0", "F1", "F4", "F5", "F6"]
-    },
-    "diode_direction": "COL2ROW",
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "community_layouts": ["65_ansi"],
-    "layouts": {
-        "LAYOUT_65_ansi": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-                {"matrix": [0, 14], "x": 15, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-                {"matrix": [1, 14], "x": 15, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
-                {"matrix": [2, 14], "x": 15, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 1], "x": 2.25, "y": 3},
-                {"matrix": [3, 2], "x": 3.25, "y": 3},
-                {"matrix": [3, 3], "x": 4.25, "y": 3},
-                {"matrix": [3, 4], "x": 5.25, "y": 3},
-                {"matrix": [3, 5], "x": 6.25, "y": 3},
-                {"matrix": [3, 6], "x": 7.25, "y": 3},
-                {"matrix": [3, 7], "x": 8.25, "y": 3},
-                {"matrix": [3, 8], "x": 9.25, "y": 3},
-                {"matrix": [3, 9], "x": 10.25, "y": 3},
-                {"matrix": [3, 10], "x": 11.25, "y": 3},
-                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"matrix": [3, 13], "x": 14, "y": 3},
-                {"matrix": [3, 14], "x": 15, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
-                {"matrix": [4, 9], "x": 10, "y": 4},
-                {"matrix": [4, 10], "x": 11, "y": 4},
-                {"matrix": [4, 11], "x": 12, "y": 4},
-                {"matrix": [4, 12], "x": 13, "y": 4},
-                {"matrix": [4, 13], "x": 14, "y": 4},
-                {"matrix": [4, 14], "x": 15, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/keygem/kg65rgbv2/keyboard.json b/keyboards/keygem/kg65rgbv2/keyboard.json
new file mode 100644
index 00000000000..c6738f1e606
--- /dev/null
+++ b/keyboards/keygem/kg65rgbv2/keyboard.json
@@ -0,0 +1,128 @@
+{
+    "keyboard_name": "KG65 RGB V2",
+    "manufacturer": "FJLabs",
+    "url": "https://www.keygem.store/",
+    "maintainer": "Keygem",
+    "usb": {
+        "vid": "0x4B47",
+        "pid": "0x0002",
+        "device_version": "0.0.1"
+    },
+    "ws2812": {
+        "pin": "F7"
+    },
+    "rgblight": {
+        "led_count": 68,
+        "max_brightness": 96,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": true,
+            "twinkle": true
+        },
+        "default": {
+            "animation": "rainbow_swirl",
+            "speed": 144
+        }
+    },
+    "matrix_pins": {
+        "cols": ["C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "B3", "B2", "B1", "D1"],
+        "rows": ["F0", "F1", "F4", "F5", "F6"]
+    },
+    "diode_direction": "COL2ROW",
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "command": true,
+        "nkro": true,
+        "rgblight": true
+    },
+    "community_layouts": ["65_ansi"],
+    "layouts": {
+        "LAYOUT_65_ansi": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 10], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4},
+                {"matrix": [4, 10], "x": 11, "y": 4},
+                {"matrix": [4, 11], "x": 12, "y": 4},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/keygem/kg65rgbv2/rules.mk b/keyboards/keygem/kg65rgbv2/rules.mk
index 52a18008f4a..3437a35bdf1 100644
--- a/keyboards/keygem/kg65rgbv2/rules.mk
+++ b/keyboards/keygem/kg65rgbv2/rules.mk
@@ -1,15 +1,2 @@
 # Processor frequency
 F_CPU = 8000000
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
diff --git a/keyboards/keyhive/honeycomb/info.json b/keyboards/keyhive/honeycomb/info.json
deleted file mode 100644
index 639edee28d5..00000000000
--- a/keyboards/keyhive/honeycomb/info.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-    "keyboard_name": "Honeycomb",
-    "manufacturer": "Keyhive",
-    "url": "",
-    "maintainer": "filoxo",
-    "usb": {
-        "vid": "0xFEED",
-        "pid": "0xACC8",
-        "device_version": "0.0.1"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 12], "x": 0, "y": 0},
-                {"matrix": [0, 13], "x": 1, "y": 0},
-                {"matrix": [0, 14], "x": 2, "y": 0},
-                {"matrix": [0, 15], "x": 3, "y": 0},
-
-                {"matrix": [0, 8], "x": 0, "y": 1},
-                {"matrix": [0, 9], "x": 1, "y": 1},
-                {"matrix": [0, 10], "x": 2, "y": 1},
-                {"matrix": [0, 11], "x": 3, "y": 1},
-
-                {"matrix": [0, 4], "x": 0, "y": 2},
-                {"matrix": [0, 5], "x": 1, "y": 2},
-                {"matrix": [0, 6], "x": 2, "y": 2},
-                {"matrix": [0, 7], "x": 3, "y": 2},
-
-                {"matrix": [0, 0], "x": 0, "y": 3},
-                {"matrix": [0, 1], "x": 1, "y": 3},
-                {"matrix": [0, 2], "x": 2, "y": 3},
-                {"matrix": [0, 3], "x": 3, "y": 3}
-            ]
-        }
-    }
-}
diff --git a/keyboards/keyhive/honeycomb/keyboard.json b/keyboards/keyhive/honeycomb/keyboard.json
new file mode 100644
index 00000000000..768f08275d6
--- /dev/null
+++ b/keyboards/keyhive/honeycomb/keyboard.json
@@ -0,0 +1,47 @@
+{
+    "keyboard_name": "Honeycomb",
+    "manufacturer": "Keyhive",
+    "url": "",
+    "maintainer": "filoxo",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0xACC8",
+        "device_version": "0.0.1"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
+    "features": {
+        "bootmagic": false,
+        "mousekey": false,
+        "extrakey": true,
+        "console": true,
+        "command": true,
+        "nkro": true,
+        "pointing_device": true
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 12], "x": 0, "y": 0},
+                {"matrix": [0, 13], "x": 1, "y": 0},
+                {"matrix": [0, 14], "x": 2, "y": 0},
+                {"matrix": [0, 15], "x": 3, "y": 0},
+
+                {"matrix": [0, 8], "x": 0, "y": 1},
+                {"matrix": [0, 9], "x": 1, "y": 1},
+                {"matrix": [0, 10], "x": 2, "y": 1},
+                {"matrix": [0, 11], "x": 3, "y": 1},
+
+                {"matrix": [0, 4], "x": 0, "y": 2},
+                {"matrix": [0, 5], "x": 1, "y": 2},
+                {"matrix": [0, 6], "x": 2, "y": 2},
+                {"matrix": [0, 7], "x": 3, "y": 2},
+
+                {"matrix": [0, 0], "x": 0, "y": 3},
+                {"matrix": [0, 1], "x": 1, "y": 3},
+                {"matrix": [0, 2], "x": 2, "y": 3},
+                {"matrix": [0, 3], "x": 3, "y": 3}
+            ]
+        }
+    }
+}
diff --git a/keyboards/keyhive/honeycomb/rules.mk b/keyboards/keyhive/honeycomb/rules.mk
index bfa5252a039..fd5fa4db1a9 100755
--- a/keyboards/keyhive/honeycomb/rules.mk
+++ b/keyboards/keyhive/honeycomb/rules.mk
@@ -1,16 +1,5 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-#MOUSEKEY_ENABLE = yes	# Mouse keys
-POINTING_DEVICE_ENABLE = yes # Generic Pointer, not as big as mouse keys hopefully.
 POINTING_DEVICE_DRIVER = custom
-EXTRAKEY_ENABLE = yes	# Audio control and System control
-CONSOLE_ENABLE = yes	# Console for debug
-COMMAND_ENABLE = yes   # Commands for debug and configuration
 CUSTOM_MATRIX = yes    # Remote matrix from the wireless bridge
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-# BACKLIGHT_ENABLE = yes  # Enable keyboard backlight functionality
 
 # # project specific files
 SRC += matrix.c
diff --git a/keyboards/keyhive/lattice60/info.json b/keyboards/keyhive/lattice60/info.json
deleted file mode 100644
index 2c12fb6bfde..00000000000
--- a/keyboards/keyhive/lattice60/info.json
+++ /dev/null
@@ -1,160 +0,0 @@
-{
-    "keyboard_name": "LATTICE60",
-    "manufacturer": "emdarcher",
-    "url": "",
-    "maintainer": "emdarcher",
-    "usb": {
-        "vid": "0x16C0",
-        "pid": "0x27DB",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["D7", "D6", "B0", "D5", "D1", "D4", "D0", "B1"],
-        "rows": ["B2", "B3", "B4", "B5", "C0", "C1", "C2", "C3"]
-    },
-    "diode_direction": "ROW2COL",
-    "processor": "atmega328p",
-    "bootloader": "usbasploader",
-    "community_layouts": ["60_hhkb"],
-    "layouts": {
-        "LAYOUT_all": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [4, 0], "x": 1, "y": 0},
-                {"matrix": [0, 1], "x": 2, "y": 0},
-                {"matrix": [4, 1], "x": 3, "y": 0},
-                {"matrix": [0, 2], "x": 4, "y": 0},
-                {"matrix": [4, 2], "x": 5, "y": 0},
-                {"matrix": [0, 3], "x": 6, "y": 0},
-                {"matrix": [4, 3], "x": 7, "y": 0},
-                {"matrix": [0, 4], "x": 8, "y": 0},
-                {"matrix": [4, 4], "x": 9, "y": 0},
-                {"matrix": [0, 5], "x": 10, "y": 0},
-                {"matrix": [4, 5], "x": 11, "y": 0},
-                {"matrix": [0, 6], "x": 12, "y": 0},
-                {"matrix": [4, 6], "x": 13, "y": 0},
-                {"matrix": [5, 6], "x": 14, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [5, 0], "x": 1.5, "y": 1},
-                {"matrix": [1, 1], "x": 2.5, "y": 1},
-                {"matrix": [5, 1], "x": 3.5, "y": 1},
-                {"matrix": [1, 2], "x": 4.5, "y": 1},
-                {"matrix": [5, 2], "x": 5.5, "y": 1},
-                {"matrix": [1, 3], "x": 6.5, "y": 1},
-                {"matrix": [5, 3], "x": 7.5, "y": 1},
-                {"matrix": [1, 4], "x": 8.5, "y": 1},
-                {"matrix": [5, 4], "x": 9.5, "y": 1},
-                {"matrix": [1, 5], "x": 10.5, "y": 1},
-                {"matrix": [5, 5], "x": 11.5, "y": 1},
-                {"matrix": [1, 6], "x": 12.5, "y": 1},
-                {"matrix": [6, 6], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [6, 0], "x": 1.75, "y": 2},
-                {"matrix": [2, 1], "x": 2.75, "y": 2},
-                {"matrix": [6, 1], "x": 3.75, "y": 2},
-                {"matrix": [2, 2], "x": 4.75, "y": 2},
-                {"matrix": [6, 2], "x": 5.75, "y": 2},
-                {"matrix": [2, 3], "x": 6.75, "y": 2},
-                {"matrix": [6, 3], "x": 7.75, "y": 2},
-                {"matrix": [2, 4], "x": 8.75, "y": 2},
-                {"matrix": [6, 4], "x": 9.75, "y": 2},
-                {"matrix": [2, 5], "x": 10.75, "y": 2},
-                {"matrix": [6, 5], "x": 11.75, "y": 2},
-                {"matrix": [2, 6], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [7, 0], "x": 2.25, "y": 3},
-                {"matrix": [3, 1], "x": 3.25, "y": 3},
-                {"matrix": [7, 1], "x": 4.25, "y": 3},
-                {"matrix": [3, 2], "x": 5.25, "y": 3},
-                {"matrix": [7, 2], "x": 6.25, "y": 3},
-                {"matrix": [7, 3], "x": 7.25, "y": 3},
-                {"matrix": [3, 4], "x": 8.25, "y": 3},
-                {"matrix": [7, 4], "x": 9.25, "y": 3},
-                {"matrix": [3, 5], "x": 10.25, "y": 3},
-                {"matrix": [7, 5], "x": 11.25, "y": 3},
-                {"matrix": [3, 6], "x": 12.25, "y": 3, "w": 1.75},
-                {"matrix": [7, 6], "x": 14, "y": 3},
-
-                {"matrix": [0, 7], "x": 1.5, "y": 4},
-                {"matrix": [1, 7], "x": 2.5, "y": 4, "w": 1.5},
-                {"matrix": [2, 7], "x": 4, "y": 4},
-                {"matrix": [3, 3], "x": 5, "y": 4, "w": 2.25},
-                {"matrix": [4, 7], "x": 7.25, "y": 4, "w": 2.75},
-                {"matrix": [5, 7], "x": 10, "y": 4},
-                {"matrix": [6, 7], "x": 11, "y": 4, "w": 1.5},
-                {"matrix": [7, 7], "x": 12.5, "y": 4}
-            ]
-        },
-        "LAYOUT_60_hhkb": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [4, 0], "x": 1, "y": 0},
-                {"matrix": [0, 1], "x": 2, "y": 0},
-                {"matrix": [4, 1], "x": 3, "y": 0},
-                {"matrix": [0, 2], "x": 4, "y": 0},
-                {"matrix": [4, 2], "x": 5, "y": 0},
-                {"matrix": [0, 3], "x": 6, "y": 0},
-                {"matrix": [4, 3], "x": 7, "y": 0},
-                {"matrix": [0, 4], "x": 8, "y": 0},
-                {"matrix": [4, 4], "x": 9, "y": 0},
-                {"matrix": [0, 5], "x": 10, "y": 0},
-                {"matrix": [4, 5], "x": 11, "y": 0},
-                {"matrix": [0, 6], "x": 12, "y": 0},
-                {"matrix": [4, 6], "x": 13, "y": 0},
-                {"matrix": [5, 6], "x": 14, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [5, 0], "x": 1.5, "y": 1},
-                {"matrix": [1, 1], "x": 2.5, "y": 1},
-                {"matrix": [5, 1], "x": 3.5, "y": 1},
-                {"matrix": [1, 2], "x": 4.5, "y": 1},
-                {"matrix": [5, 2], "x": 5.5, "y": 1},
-                {"matrix": [1, 3], "x": 6.5, "y": 1},
-                {"matrix": [5, 3], "x": 7.5, "y": 1},
-                {"matrix": [1, 4], "x": 8.5, "y": 1},
-                {"matrix": [5, 4], "x": 9.5, "y": 1},
-                {"matrix": [1, 5], "x": 10.5, "y": 1},
-                {"matrix": [5, 5], "x": 11.5, "y": 1},
-                {"matrix": [1, 6], "x": 12.5, "y": 1},
-                {"matrix": [6, 6], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [6, 0], "x": 1.75, "y": 2},
-                {"matrix": [2, 1], "x": 2.75, "y": 2},
-                {"matrix": [6, 1], "x": 3.75, "y": 2},
-                {"matrix": [2, 2], "x": 4.75, "y": 2},
-                {"matrix": [6, 2], "x": 5.75, "y": 2},
-                {"matrix": [2, 3], "x": 6.75, "y": 2},
-                {"matrix": [6, 3], "x": 7.75, "y": 2},
-                {"matrix": [2, 4], "x": 8.75, "y": 2},
-                {"matrix": [6, 4], "x": 9.75, "y": 2},
-                {"matrix": [2, 5], "x": 10.75, "y": 2},
-                {"matrix": [6, 5], "x": 11.75, "y": 2},
-                {"matrix": [2, 6], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [7, 0], "x": 2.25, "y": 3},
-                {"matrix": [3, 1], "x": 3.25, "y": 3},
-                {"matrix": [7, 1], "x": 4.25, "y": 3},
-                {"matrix": [3, 2], "x": 5.25, "y": 3},
-                {"matrix": [7, 2], "x": 6.25, "y": 3},
-                {"matrix": [7, 3], "x": 7.25, "y": 3},
-                {"matrix": [3, 4], "x": 8.25, "y": 3},
-                {"matrix": [7, 4], "x": 9.25, "y": 3},
-                {"matrix": [3, 5], "x": 10.25, "y": 3},
-                {"matrix": [7, 5], "x": 11.25, "y": 3},
-                {"matrix": [3, 6], "x": 12.25, "y": 3, "w": 1.75},
-                {"matrix": [7, 6], "x": 14, "y": 3},
-
-                {"matrix": [0, 7], "x": 1.5, "y": 4},
-                {"matrix": [1, 7], "x": 2.5, "y": 4, "w": 1.5},
-                {"matrix": [3, 3], "x": 4, "y": 4, "w": 7},
-                {"matrix": [6, 7], "x": 11, "y": 4, "w": 1.5},
-                {"matrix": [7, 7], "x": 12.5, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/keyhive/lattice60/keyboard.json b/keyboards/keyhive/lattice60/keyboard.json
new file mode 100644
index 00000000000..4afdd839d00
--- /dev/null
+++ b/keyboards/keyhive/lattice60/keyboard.json
@@ -0,0 +1,165 @@
+{
+    "keyboard_name": "LATTICE60",
+    "manufacturer": "emdarcher",
+    "url": "",
+    "maintainer": "emdarcher",
+    "usb": {
+        "vid": "0x16C0",
+        "pid": "0x27DB",
+        "device_version": "0.0.1"
+    },
+    "matrix_pins": {
+        "cols": ["D7", "D6", "B0", "D5", "D1", "D4", "D0", "B1"],
+        "rows": ["B2", "B3", "B4", "B5", "C0", "C1", "C2", "C3"]
+    },
+    "diode_direction": "ROW2COL",
+    "processor": "atmega328p",
+    "bootloader": "usbasploader",
+    "features": {
+        "bootmagic": false,
+        "mousekey": true,
+        "extrakey": true
+    },
+    "community_layouts": ["60_hhkb"],
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [4, 0], "x": 1, "y": 0},
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [4, 1], "x": 3, "y": 0},
+                {"matrix": [0, 2], "x": 4, "y": 0},
+                {"matrix": [4, 2], "x": 5, "y": 0},
+                {"matrix": [0, 3], "x": 6, "y": 0},
+                {"matrix": [4, 3], "x": 7, "y": 0},
+                {"matrix": [0, 4], "x": 8, "y": 0},
+                {"matrix": [4, 4], "x": 9, "y": 0},
+                {"matrix": [0, 5], "x": 10, "y": 0},
+                {"matrix": [4, 5], "x": 11, "y": 0},
+                {"matrix": [0, 6], "x": 12, "y": 0},
+                {"matrix": [4, 6], "x": 13, "y": 0},
+                {"matrix": [5, 6], "x": 14, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [5, 0], "x": 1.5, "y": 1},
+                {"matrix": [1, 1], "x": 2.5, "y": 1},
+                {"matrix": [5, 1], "x": 3.5, "y": 1},
+                {"matrix": [1, 2], "x": 4.5, "y": 1},
+                {"matrix": [5, 2], "x": 5.5, "y": 1},
+                {"matrix": [1, 3], "x": 6.5, "y": 1},
+                {"matrix": [5, 3], "x": 7.5, "y": 1},
+                {"matrix": [1, 4], "x": 8.5, "y": 1},
+                {"matrix": [5, 4], "x": 9.5, "y": 1},
+                {"matrix": [1, 5], "x": 10.5, "y": 1},
+                {"matrix": [5, 5], "x": 11.5, "y": 1},
+                {"matrix": [1, 6], "x": 12.5, "y": 1},
+                {"matrix": [6, 6], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [6, 0], "x": 1.75, "y": 2},
+                {"matrix": [2, 1], "x": 2.75, "y": 2},
+                {"matrix": [6, 1], "x": 3.75, "y": 2},
+                {"matrix": [2, 2], "x": 4.75, "y": 2},
+                {"matrix": [6, 2], "x": 5.75, "y": 2},
+                {"matrix": [2, 3], "x": 6.75, "y": 2},
+                {"matrix": [6, 3], "x": 7.75, "y": 2},
+                {"matrix": [2, 4], "x": 8.75, "y": 2},
+                {"matrix": [6, 4], "x": 9.75, "y": 2},
+                {"matrix": [2, 5], "x": 10.75, "y": 2},
+                {"matrix": [6, 5], "x": 11.75, "y": 2},
+                {"matrix": [2, 6], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [7, 0], "x": 2.25, "y": 3},
+                {"matrix": [3, 1], "x": 3.25, "y": 3},
+                {"matrix": [7, 1], "x": 4.25, "y": 3},
+                {"matrix": [3, 2], "x": 5.25, "y": 3},
+                {"matrix": [7, 2], "x": 6.25, "y": 3},
+                {"matrix": [7, 3], "x": 7.25, "y": 3},
+                {"matrix": [3, 4], "x": 8.25, "y": 3},
+                {"matrix": [7, 4], "x": 9.25, "y": 3},
+                {"matrix": [3, 5], "x": 10.25, "y": 3},
+                {"matrix": [7, 5], "x": 11.25, "y": 3},
+                {"matrix": [3, 6], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [7, 6], "x": 14, "y": 3},
+
+                {"matrix": [0, 7], "x": 1.5, "y": 4},
+                {"matrix": [1, 7], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [2, 7], "x": 4, "y": 4},
+                {"matrix": [3, 3], "x": 5, "y": 4, "w": 2.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4, "w": 2.75},
+                {"matrix": [5, 7], "x": 10, "y": 4},
+                {"matrix": [6, 7], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [7, 7], "x": 12.5, "y": 4}
+            ]
+        },
+        "LAYOUT_60_hhkb": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [4, 0], "x": 1, "y": 0},
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [4, 1], "x": 3, "y": 0},
+                {"matrix": [0, 2], "x": 4, "y": 0},
+                {"matrix": [4, 2], "x": 5, "y": 0},
+                {"matrix": [0, 3], "x": 6, "y": 0},
+                {"matrix": [4, 3], "x": 7, "y": 0},
+                {"matrix": [0, 4], "x": 8, "y": 0},
+                {"matrix": [4, 4], "x": 9, "y": 0},
+                {"matrix": [0, 5], "x": 10, "y": 0},
+                {"matrix": [4, 5], "x": 11, "y": 0},
+                {"matrix": [0, 6], "x": 12, "y": 0},
+                {"matrix": [4, 6], "x": 13, "y": 0},
+                {"matrix": [5, 6], "x": 14, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [5, 0], "x": 1.5, "y": 1},
+                {"matrix": [1, 1], "x": 2.5, "y": 1},
+                {"matrix": [5, 1], "x": 3.5, "y": 1},
+                {"matrix": [1, 2], "x": 4.5, "y": 1},
+                {"matrix": [5, 2], "x": 5.5, "y": 1},
+                {"matrix": [1, 3], "x": 6.5, "y": 1},
+                {"matrix": [5, 3], "x": 7.5, "y": 1},
+                {"matrix": [1, 4], "x": 8.5, "y": 1},
+                {"matrix": [5, 4], "x": 9.5, "y": 1},
+                {"matrix": [1, 5], "x": 10.5, "y": 1},
+                {"matrix": [5, 5], "x": 11.5, "y": 1},
+                {"matrix": [1, 6], "x": 12.5, "y": 1},
+                {"matrix": [6, 6], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [6, 0], "x": 1.75, "y": 2},
+                {"matrix": [2, 1], "x": 2.75, "y": 2},
+                {"matrix": [6, 1], "x": 3.75, "y": 2},
+                {"matrix": [2, 2], "x": 4.75, "y": 2},
+                {"matrix": [6, 2], "x": 5.75, "y": 2},
+                {"matrix": [2, 3], "x": 6.75, "y": 2},
+                {"matrix": [6, 3], "x": 7.75, "y": 2},
+                {"matrix": [2, 4], "x": 8.75, "y": 2},
+                {"matrix": [6, 4], "x": 9.75, "y": 2},
+                {"matrix": [2, 5], "x": 10.75, "y": 2},
+                {"matrix": [6, 5], "x": 11.75, "y": 2},
+                {"matrix": [2, 6], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [7, 0], "x": 2.25, "y": 3},
+                {"matrix": [3, 1], "x": 3.25, "y": 3},
+                {"matrix": [7, 1], "x": 4.25, "y": 3},
+                {"matrix": [3, 2], "x": 5.25, "y": 3},
+                {"matrix": [7, 2], "x": 6.25, "y": 3},
+                {"matrix": [7, 3], "x": 7.25, "y": 3},
+                {"matrix": [3, 4], "x": 8.25, "y": 3},
+                {"matrix": [7, 4], "x": 9.25, "y": 3},
+                {"matrix": [3, 5], "x": 10.25, "y": 3},
+                {"matrix": [7, 5], "x": 11.25, "y": 3},
+                {"matrix": [3, 6], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [7, 6], "x": 14, "y": 3},
+
+                {"matrix": [0, 7], "x": 1.5, "y": 4},
+                {"matrix": [1, 7], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [3, 3], "x": 4, "y": 4, "w": 7},
+                {"matrix": [6, 7], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [7, 7], "x": 12.5, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/keyhive/lattice60/rules.mk b/keyboards/keyhive/lattice60/rules.mk
index b60fe3290a5..7b459748299 100644
--- a/keyboards/keyhive/lattice60/rules.mk
+++ b/keyboards/keyhive/lattice60/rules.mk
@@ -1,15 +1,2 @@
 # Processor frequency
 F_CPU = 12000000
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
diff --git a/keyboards/keyhive/navi10/rev0/info.json b/keyboards/keyhive/navi10/rev0/info.json
deleted file mode 100644
index 548d9176670..00000000000
--- a/keyboards/keyhive/navi10/rev0/info.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-    "usb": {
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["D1", "D0", "F6"],
-        "rows": ["B6", "B2", "B3", "B4"]
-    },
-    "diode_direction": "COL2ROW",
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1},
-                {"matrix": [1, 1], "x": 1, "y": 1},
-                {"matrix": [1, 2], "x": 2, "y": 1},
-
-                {"matrix": [2, 1], "x": 1, "y": 3},
-
-                {"matrix": [3, 0], "x": 0, "y": 4},
-                {"matrix": [3, 1], "x": 1, "y": 4},
-                {"matrix": [3, 2], "x": 2, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/keyhive/navi10/rev0/keyboard.json b/keyboards/keyhive/navi10/rev0/keyboard.json
new file mode 100644
index 00000000000..092c2343ab5
--- /dev/null
+++ b/keyboards/keyhive/navi10/rev0/keyboard.json
@@ -0,0 +1,38 @@
+{
+    "usb": {
+        "device_version": "0.0.1"
+    },
+    "matrix_pins": {
+        "cols": ["D1", "D0", "F6"],
+        "rows": ["B6", "B2", "B3", "B4"]
+    },
+    "diode_direction": "COL2ROW",
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
+    "features": {
+        "bootmagic": false,
+        "mousekey": false,
+        "extrakey": true,
+        "console": true,
+        "command": true
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+
+                {"matrix": [2, 1], "x": 1, "y": 3},
+
+                {"matrix": [3, 0], "x": 0, "y": 4},
+                {"matrix": [3, 1], "x": 1, "y": 4},
+                {"matrix": [3, 2], "x": 2, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/keyhive/navi10/rev0/rules.mk b/keyboards/keyhive/navi10/rev0/rules.mk
deleted file mode 100644
index 27b0a2549ed..00000000000
--- a/keyboards/keyhive/navi10/rev0/rules.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = yes        # Console for debug
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
diff --git a/keyboards/keyhive/navi10/rev2/info.json b/keyboards/keyhive/navi10/rev2/info.json
deleted file mode 100644
index 8db97e67b71..00000000000
--- a/keyboards/keyhive/navi10/rev2/info.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-    "usb": {
-        "device_version": "0.0.2"
-    },
-    "matrix_pins": {
-        "cols": ["D4", "C6", "B1"],
-        "rows": ["B6", "B2", "B3", "B4"]
-    },
-    "diode_direction": "COL2ROW",
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1},
-                {"matrix": [1, 1], "x": 1, "y": 1},
-                {"matrix": [1, 2], "x": 2, "y": 1},
-
-                {"matrix": [2, 1], "x": 1, "y": 3},
-
-                {"matrix": [3, 0], "x": 0, "y": 4},
-                {"matrix": [3, 1], "x": 1, "y": 4},
-                {"matrix": [3, 2], "x": 2, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/keyhive/navi10/rev2/keyboard.json b/keyboards/keyhive/navi10/rev2/keyboard.json
new file mode 100644
index 00000000000..2c7b9972dfa
--- /dev/null
+++ b/keyboards/keyhive/navi10/rev2/keyboard.json
@@ -0,0 +1,38 @@
+{
+    "usb": {
+        "device_version": "0.0.2"
+    },
+    "matrix_pins": {
+        "cols": ["D4", "C6", "B1"],
+        "rows": ["B6", "B2", "B3", "B4"]
+    },
+    "diode_direction": "COL2ROW",
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
+    "features": {
+        "bootmagic": false,
+        "mousekey": false,
+        "extrakey": true,
+        "console": true,
+        "command": true
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+
+                {"matrix": [2, 1], "x": 1, "y": 3},
+
+                {"matrix": [3, 0], "x": 0, "y": 4},
+                {"matrix": [3, 1], "x": 1, "y": 4},
+                {"matrix": [3, 2], "x": 2, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/keyhive/navi10/rev2/rules.mk b/keyboards/keyhive/navi10/rev2/rules.mk
deleted file mode 100644
index 27b0a2549ed..00000000000
--- a/keyboards/keyhive/navi10/rev2/rules.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = yes        # Console for debug
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
diff --git a/keyboards/keyhive/navi10/rev3/info.json b/keyboards/keyhive/navi10/rev3/info.json
deleted file mode 100644
index 82df44e8667..00000000000
--- a/keyboards/keyhive/navi10/rev3/info.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-    "usb": {
-        "device_version": "0.0.3"
-    },
-    "matrix_pins": {
-        "cols": ["D4", "E6", "B1"],
-        "rows": ["B6", "B2", "B3", "B4"]
-    },
-    "diode_direction": "COL2ROW",
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1},
-                {"matrix": [1, 1], "x": 1, "y": 1},
-                {"matrix": [1, 2], "x": 2, "y": 1},
-
-                {"matrix": [2, 1], "x": 1, "y": 3},
-
-                {"matrix": [3, 0], "x": 0, "y": 4},
-                {"matrix": [3, 1], "x": 1, "y": 4},
-                {"matrix": [3, 2], "x": 2, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/keyhive/navi10/rev3/keyboard.json b/keyboards/keyhive/navi10/rev3/keyboard.json
new file mode 100644
index 00000000000..5e1b27f7ce9
--- /dev/null
+++ b/keyboards/keyhive/navi10/rev3/keyboard.json
@@ -0,0 +1,38 @@
+{
+    "usb": {
+        "device_version": "0.0.3"
+    },
+    "matrix_pins": {
+        "cols": ["D4", "E6", "B1"],
+        "rows": ["B6", "B2", "B3", "B4"]
+    },
+    "diode_direction": "COL2ROW",
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
+    "features": {
+        "bootmagic": false,
+        "mousekey": false,
+        "extrakey": true,
+        "console": true,
+        "command": true
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+
+                {"matrix": [2, 1], "x": 1, "y": 3},
+
+                {"matrix": [3, 0], "x": 0, "y": 4},
+                {"matrix": [3, 1], "x": 1, "y": 4},
+                {"matrix": [3, 2], "x": 2, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/keyhive/navi10/rev3/rules.mk b/keyboards/keyhive/navi10/rev3/rules.mk
deleted file mode 100644
index 27b0a2549ed..00000000000
--- a/keyboards/keyhive/navi10/rev3/rules.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = yes        # Console for debug
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
diff --git a/keyboards/keyhive/uno/rev1/info.json b/keyboards/keyhive/uno/rev1/info.json
deleted file mode 100644
index 61121267d7b..00000000000
--- a/keyboards/keyhive/uno/rev1/info.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-    "keyboard_name": "Uno rev1",
-    "usb": {
-        "device_version": "0.0.1"
-    },
-    "rgblight": {
-        "led_count": 1,
-        "animations": {
-            "rainbow_mood": true
-        }
-    },
-    "ws2812": {
-        "pin": "F6"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
-    "matrix_pins": {
-        "direct": [
-            ["B6"]
-        ]
-    }
-}
diff --git a/keyboards/keyhive/uno/rev1/keyboard.json b/keyboards/keyhive/uno/rev1/keyboard.json
new file mode 100644
index 00000000000..9eaf49c2faa
--- /dev/null
+++ b/keyboards/keyhive/uno/rev1/keyboard.json
@@ -0,0 +1,28 @@
+{
+    "keyboard_name": "Uno rev1",
+    "usb": {
+        "device_version": "0.0.1"
+    },
+    "rgblight": {
+        "led_count": 1,
+        "animations": {
+            "rainbow_mood": true
+        }
+    },
+    "ws2812": {
+        "pin": "F6"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
+    "features": {
+        "bootmagic": false,
+        "mousekey": false,
+        "extrakey": false,
+        "rgblight": true
+    },
+    "matrix_pins": {
+        "direct": [
+            ["B6"]
+        ]
+    }
+}
diff --git a/keyboards/keyhive/uno/rev1/rules.mk b/keyboards/keyhive/uno/rev1/rules.mk
deleted file mode 100644
index 95667aacd75..00000000000
--- a/keyboards/keyhive/uno/rev1/rules.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no       # Mouse keys
-EXTRAKEY_ENABLE = no       # Audio control and System control
-CONSOLE_ENABLE = no        # Console for debug
-COMMAND_ENABLE = no        # Commands for debug and configuration
-NKRO_ENABLE = no           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no      # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes      # Enable keyboard RGB underglow
-AUDIO_ENABLE = no          # Audio output
diff --git a/keyboards/keyhive/uno/rev2/info.json b/keyboards/keyhive/uno/rev2/info.json
deleted file mode 100644
index 908c254babb..00000000000
--- a/keyboards/keyhive/uno/rev2/info.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-    "keyboard_name": "Uno rev2",
-    "usb": {
-        "device_version": "0.0.2"
-    },
-    "rgblight": {
-        "led_count": 1,
-        "animations": {
-            "rainbow_mood": true
-        }
-    },
-    "ws2812": {
-        "pin": "D1"
-    },
-    "encoder": {
-        "rotary": [
-            {"pin_a": "B2", "pin_b": "B3"}
-        ]
-    },
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
-    "matrix_pins": {
-        "direct": [
-            ["D0"]
-        ]
-    }
-}
diff --git a/keyboards/keyhive/uno/rev2/keyboard.jsono b/keyboards/keyhive/uno/rev2/keyboard.jsono
new file mode 100644
index 00000000000..0283c2aa5b8
--- /dev/null
+++ b/keyboards/keyhive/uno/rev2/keyboard.jsono
@@ -0,0 +1,34 @@
+{
+    "keyboard_name": "Uno rev2",
+    "usb": {
+        "device_version": "0.0.2"
+    },
+    "rgblight": {
+        "led_count": 1,
+        "animations": {
+            "rainbow_mood": true
+        }
+    },
+    "ws2812": {
+        "pin": "D1"
+    },
+    "encoder": {
+        "rotary": [
+            {"pin_a": "B2", "pin_b": "B3"}
+        ]
+    },
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
+    "features": {
+        "bootmagic": false,
+        "mousekey": false,
+        "extrakey": false,
+        "rgblight": true,
+        "encoder": true
+    },
+    "matrix_pins": {
+        "direct": [
+            ["D0"]
+        ]
+    }
+}
diff --git a/keyboards/keyhive/uno/rev2/rules.mk b/keyboards/keyhive/uno/rev2/rules.mk
deleted file mode 100644
index 98b5879d7b0..00000000000
--- a/keyboards/keyhive/uno/rev2/rules.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no       # Mouse keys
-EXTRAKEY_ENABLE = no       # Audio control and System control
-CONSOLE_ENABLE = no        # Console for debug
-COMMAND_ENABLE = no        # Commands for debug and configuration
-NKRO_ENABLE = no           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no      # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes      # Enable keyboard RGB underglow
-AUDIO_ENABLE = no          # Audio output
-ENCODER_ENABLE = yes
diff --git a/keyboards/keyten/imi60/info.json b/keyboards/keyten/imi60/info.json
new file mode 100644
index 00000000000..2ccf8314116
--- /dev/null
+++ b/keyboards/keyten/imi60/info.json
@@ -0,0 +1,92 @@
+{
+    "manufacturer": "keyten",
+    "keyboard_name": "imi60",
+    "maintainer": "key10iq",
+    "bootloader": "stm32-dfu",
+    "diode_direction": "COL2ROW",	
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "matrix_pins": {
+        "cols": ["A15", "A5", "F1", "A6", "F0", "A7", "C15", "B0", "C14", "B1", "C13", "B11", "B4", "B3"],
+        "rows": ["B10", "B2", "B7", "B6", "B5"]
+    },
+    "processor": "STM32F072",
+    "usb": {
+        "device_version": "0.0.1",
+        "pid": "0x6005",
+        "vid": "0xEB69"
+    },
+    "community_layouts": ["60_tsangan_hhkb"],
+    "layouts": {
+        "LAYOUT_60_tsangan_hhkb": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [2, 13], "x": 14, "y": 0},
+                {"matrix": [1, 0], "w": 1.5, "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "w": 1.5, "x": 13.5, "y": 1},
+                {"matrix": [2, 0], "w": 1.75, "x": 0, "y": 2},
+                {"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], "w": 2.25, "x": 12.75, "y": 2},
+                {"matrix": [3, 0], "w": 2.25, "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 10], "x": 11.25, "y": 3},
+                {"matrix": [4, 12], "w": 1.75, "x": 12.25, "y": 3},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [4, 0], "w": 1.5, "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 2], "w": 1.5, "x": 2.5, "y": 4},
+                {"matrix": [4, 6], "w": 7, "x": 4, "y": 4},
+                {"matrix": [4, 10], "w": 1.5, "x": 11, "y": 4},
+                {"matrix": [4, 11], "x": 12.5, "y": 4},
+                {"matrix": [4, 13], "w": 1.5, "x": 13.5, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/keyten/imi60/keymaps/default/keymap.c b/keyboards/keyten/imi60/keymaps/default/keymap.c
new file mode 100644
index 00000000000..36859fad550
--- /dev/null
+++ b/keyboards/keyten/imi60/keymaps/default/keymap.c
@@ -0,0 +1,22 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    [0] = LAYOUT_60_tsangan_hhkb(
+        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_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_LCTL, KC_LGUI, KC_LALT, KC_SPC,  KC_RALT, KC_RGUI, KC_RCTL
+    ),
+
+    [1] = LAYOUT_60_tsangan_hhkb(
+        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_INS,  KC_DEL,
+        KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_UP,   KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_TRNS, KC_TRNS, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, KC_TRNS,
+        KC_TRNS, KC_MPRV, KC_MNXT, KC_MPLY, KC_TRNS, KC_TRNS, KC_PPLS, KC_PMNS, KC_END,  KC_PGDN, KC_DOWN, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+    )
+};
diff --git a/keyboards/keyten/imi60/keymaps/via/keymap.c b/keyboards/keyten/imi60/keymaps/via/keymap.c
new file mode 100644
index 00000000000..36859fad550
--- /dev/null
+++ b/keyboards/keyten/imi60/keymaps/via/keymap.c
@@ -0,0 +1,22 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    [0] = LAYOUT_60_tsangan_hhkb(
+        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_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_LCTL, KC_LGUI, KC_LALT, KC_SPC,  KC_RALT, KC_RGUI, KC_RCTL
+    ),
+
+    [1] = LAYOUT_60_tsangan_hhkb(
+        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_INS,  KC_DEL,
+        KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_UP,   KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_TRNS, KC_TRNS, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, KC_TRNS,
+        KC_TRNS, KC_MPRV, KC_MNXT, KC_MPLY, KC_TRNS, KC_TRNS, KC_PPLS, KC_PMNS, KC_END,  KC_PGDN, KC_DOWN, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+    )
+};
diff --git a/keyboards/keyten/imi60/keymaps/via/rules.mk b/keyboards/keyten/imi60/keymaps/via/rules.mk
new file mode 100644
index 00000000000..036bd6d1c3e
--- /dev/null
+++ b/keyboards/keyten/imi60/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/keyten/imi60/readme.md b/keyboards/keyten/imi60/readme.md
new file mode 100644
index 00000000000..0d4db774e09
--- /dev/null
+++ b/keyboards/keyten/imi60/readme.md
@@ -0,0 +1,27 @@
+# keyten imi60
+
+imi60 - 60% PCB compatible with keyboards by La-Versa: Animi, Mirimi and Otsukimi
+
+![imi60](https://i.imgur.com/s37K4wY.png)
+
+* Keyboard Maintainer: [keyten](https://github.com/key10iq)
+* Hardware Supported: keyten imi60
+* Hardware Availability: private GB
+
+Make example for this keyboard (after setting up your build environment):
+
+    make keyten/imi60:default
+	
+Flashing example for this keyboard:
+
+    make keyten/imi60: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
+* Keycode in layout: Press the key mapped to `QK_BOOT` if it is available
+* Physical reset button: Hold the button on the back of the PCB
diff --git a/keyboards/keyten/imi60/rules.mk b/keyboards/keyten/imi60/rules.mk
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/keyboards/keyten/lisa/keyboard.json b/keyboards/keyten/lisa/keyboard.json
new file mode 100644
index 00000000000..deac0f37408
--- /dev/null
+++ b/keyboards/keyten/lisa/keyboard.json
@@ -0,0 +1,81 @@
+{
+    "manufacturer": "keyten",
+    "keyboard_name": "Lisa",
+    "maintainer": "key10iq",
+    "bootloader": "stm32-dfu",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "matrix_pins": {
+        "cols": ["B7", "B6", "B5", "B4", "B3", "A15", "A3", "A4", "A5", "A6", "A7", "B0", "B1"],
+        "rows": ["B13", "B15", "B14", "A8"]
+    },
+	"indicators": {
+        "caps_lock": "B10",
+        "num_lock": "B11"
+    }
+    "processor": "STM32F072",
+    "usb": {
+        "vid": "0xEB69",
+        "pid": "0x4001",
+        "device_version": "0.0.1"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 7.5, "y": 0},
+                {"matrix": [0, 7], "x": 8.5, "y": 0},
+                {"matrix": [0, 8], "x": 9.5, "y": 0},
+                {"matrix": [0, 9], "x": 10.5, "y": 0},
+                {"matrix": [0, 10], "x": 11.5, "y": 0},
+                {"matrix": [0, 11], "x": 12.5, "y": 0},
+                {"matrix": [0, 12], "x": 13.5, "y": 0},
+                {"matrix": [1, 0], "w": 1.25, "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1.25, "y": 1},
+                {"matrix": [1, 2], "x": 2.25, "y": 1},
+                {"matrix": [1, 3], "x": 3.25, "y": 1},
+                {"matrix": [1, 4], "x": 4.25, "y": 1},
+                {"matrix": [1, 5], "x": 5.25, "y": 1},
+                {"matrix": [1, 6], "x": 7.75, "y": 1},
+                {"matrix": [1, 7], "x": 8.75, "y": 1},
+                {"matrix": [1, 8], "x": 9.75, "y": 1},
+                {"matrix": [1, 9], "x": 10.75, "y": 1},
+                {"matrix": [1, 10], "x": 11.75, "y": 1},
+                {"matrix": [1, 12], "w": 1.75, "x": 12.75, "y": 1},
+                {"matrix": [2, 0], "w": 1.75, "x": 0, "y": 2},
+                {"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": 7.25, "y": 2},
+                {"matrix": [2, 7], "x": 8.25, "y": 2},
+                {"matrix": [2, 8], "x": 9.25, "y": 2},
+                {"matrix": [2, 9], "x": 10.25, "y": 2},
+                {"matrix": [2, 10], "x": 11.25, "y": 2},
+                {"matrix": [2, 11], "x": 12.25, "y": 2},
+                {"matrix": [2, 12], "w": 1.25, "x": 13.25, "y": 2},
+                {"matrix": [3, 0], "w": 1.25, "x": 0, "y": 3},
+                {"matrix": [3, 1], "w": 1.25, "x": 1.25, "y": 3},
+                {"matrix": [3, 3], "w": 1.25, "x": 3.5, "y": 3},
+                {"matrix": [3, 5], "w": 2, "x": 4.75, "y": 3},
+                {"matrix": [3, 6], "w": 2.25, "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "w": 1.25, "x": 9.5, "y": 3},
+                {"matrix": [3, 11], "w": 1.25, "x": 12, "y": 3},
+                {"matrix": [3, 12], "w": 1.25, "x": 13.25, "y": 3}
+            ]
+        }
+    }
+}
diff --git a/keyboards/keyten/lisa/keymaps/default/keymap.c b/keyboards/keyten/lisa/keymaps/default/keymap.c
new file mode 100644
index 00000000000..0803f25b6e0
--- /dev/null
+++ b/keyboards/keyten/lisa/keymaps/default/keymap.c
@@ -0,0 +1,28 @@
+// Copyright 2024 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    [0] = LAYOUT(
+        KC_ESC,  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_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_ENT,  KC_N,    KC_M,    KC_COMM,  KC_DOT,  KC_SLSH, KC_RSFT,
+        KC_LCTL, KC_LGUI,          KC_LALT,     LT(1,KC_SPC), LT(2,KC_BSPC),    KC_RALT,                    KC_RGUI, KC_RCTL
+    ),
+
+    [1] = LAYOUT(
+        KC_TRNS, 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_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS,          KC_TRNS,          KC_TRNS, KC_TRNS,          KC_TRNS,                   KC_TRNS, KC_TRNS
+	),
+
+    [2] = LAYOUT(
+        KC_TRNS, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS,          KC_TRNS,          KC_TRNS, KC_TRNS,          KC_TRNS,                   KC_TRNS, KC_TRNS
+	)
+};
diff --git a/keyboards/keyten/lisa/keymaps/via/keymap.c b/keyboards/keyten/lisa/keymaps/via/keymap.c
new file mode 100644
index 00000000000..0803f25b6e0
--- /dev/null
+++ b/keyboards/keyten/lisa/keymaps/via/keymap.c
@@ -0,0 +1,28 @@
+// Copyright 2024 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    [0] = LAYOUT(
+        KC_ESC,  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_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_ENT,  KC_N,    KC_M,    KC_COMM,  KC_DOT,  KC_SLSH, KC_RSFT,
+        KC_LCTL, KC_LGUI,          KC_LALT,     LT(1,KC_SPC), LT(2,KC_BSPC),    KC_RALT,                    KC_RGUI, KC_RCTL
+    ),
+
+    [1] = LAYOUT(
+        KC_TRNS, 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_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS,          KC_TRNS,          KC_TRNS, KC_TRNS,          KC_TRNS,                   KC_TRNS, KC_TRNS
+	),
+
+    [2] = LAYOUT(
+        KC_TRNS, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS,          KC_TRNS,          KC_TRNS, KC_TRNS,          KC_TRNS,                   KC_TRNS, KC_TRNS
+	)
+};
diff --git a/keyboards/keyten/lisa/keymaps/via/rules.mk b/keyboards/keyten/lisa/keymaps/via/rules.mk
new file mode 100644
index 00000000000..036bd6d1c3e
--- /dev/null
+++ b/keyboards/keyten/lisa/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/keyten/lisa/lisa.c b/keyboards/keyten/lisa/lisa.c
new file mode 100644
index 00000000000..2ecff3a642c
--- /dev/null
+++ b/keyboards/keyten/lisa/lisa.c
@@ -0,0 +1,12 @@
+// Copyright 2024 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "quantum.h"
+
+#define LED_INDICATOR_PIN B2
+
+void matrix_init_kb(void) {
+    gpio_set_pin_output(LED_INDICATOR_PIN);
+    gpio_write_pin_high(LED_INDICATOR_PIN);
+    matrix_init_user();
+}
diff --git a/keyboards/keyten/lisa/readme.md b/keyboards/keyten/lisa/readme.md
new file mode 100644
index 00000000000..e5d783e8406
--- /dev/null
+++ b/keyboards/keyten/lisa/readme.md
@@ -0,0 +1,27 @@
+# keyten Lisa
+
+Lisa is a Tadpole mount keyboard with Prime_E layout
+
+![Lisa](https://i.imgur.com/PaVECKC.png)
+
+* Keyboard Maintainer: [keyten](https://github.com/key10iq)
+* Hardware Supported: keyten Lisa
+* Hardware Availability: private GB
+
+Make example for this keyboard (after setting up your build environment):
+
+    make keyten/lisa:default
+	
+Flashing example for this keyboard:
+
+    make keyten/lisa: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
+* Keycode in layout: Press the key mapped to `QK_BOOT` if it is available
+* Physical reset button: Hold the button on the back of the PCB
diff --git a/keyboards/kin80/blackpill401/info.json b/keyboards/kin80/blackpill401/info.json
deleted file mode 100644
index 7591d3f39c7..00000000000
--- a/keyboards/kin80/blackpill401/info.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-    "usb": {
-        "device_version": "0.0.3"
-    },
-    "matrix_pins": {
-        "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A5", "A6", "A7", "B0", "B1", "B10"],
-        "rows": ["A4", "B12", "B13", "B14", "B15", "A8", "B5"]
-    },
-    "diode_direction": "COL2ROW",
-    "indicators": {
-        "caps_lock": "C13",
-        "num_lock": "B4",
-        "scroll_lock": "B3",
-        "on_state": 0
-    },
-    "processor": "STM32F401",
-    "bootloader": "stm32-dfu",
-    "board": "BLACKPILL_STM32_F401"
-}
diff --git a/keyboards/kin80/blackpill401/keyboard.json b/keyboards/kin80/blackpill401/keyboard.json
new file mode 100644
index 00000000000..36d780187e4
--- /dev/null
+++ b/keyboards/kin80/blackpill401/keyboard.json
@@ -0,0 +1,20 @@
+{
+    "usb": {
+        "device_version": "0.0.3",
+        "shared_endpoint": {
+            "keyboard": true
+        }
+    },
+    "matrix_pins": {
+        "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A5", "A6", "A7", "B0", "B1", "B10"],
+        "rows": ["A4", "B12", "B13", "B14", "B15", "A8", "B5"]
+    },
+    "diode_direction": "COL2ROW",
+    "indicators": {
+        "caps_lock": "C13",
+        "num_lock": "B4",
+        "scroll_lock": "B3",
+        "on_state": 0
+    },
+    "development_board": "blackpill_f401"
+}
diff --git a/keyboards/kin80/blackpill401/rules.mk b/keyboards/kin80/blackpill401/rules.mk
deleted file mode 100644
index 1071cf62ee3..00000000000
--- a/keyboards/kin80/blackpill401/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-KEYBOARD_SHARED_EP = yes
diff --git a/keyboards/kin80/blackpill411/info.json b/keyboards/kin80/blackpill411/info.json
deleted file mode 100644
index a1486351edb..00000000000
--- a/keyboards/kin80/blackpill411/info.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-    "usb": {
-        "device_version": "0.0.3"
-    },
-    "matrix_pins": {
-        "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A5", "A6", "A7", "B0", "B1", "B10"],
-        "rows": ["A4", "B12", "B13", "B14", "B15", "A8", "B5"]
-    },
-    "diode_direction": "COL2ROW",
-    "indicators": {
-        "caps_lock": "C13",
-        "num_lock": "B4",
-        "scroll_lock": "B3",
-        "on_state": 0
-    },
-    "processor": "STM32F411",
-    "bootloader": "stm32-dfu",
-    "board": "BLACKPILL_STM32_F411"
-}
diff --git a/keyboards/kin80/blackpill411/keyboard.json b/keyboards/kin80/blackpill411/keyboard.json
new file mode 100644
index 00000000000..7a3c89acded
--- /dev/null
+++ b/keyboards/kin80/blackpill411/keyboard.json
@@ -0,0 +1,20 @@
+{
+    "usb": {
+        "device_version": "0.0.3",
+        "shared_endpoint": {
+            "keyboard": true
+        }
+    },
+    "matrix_pins": {
+        "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A5", "A6", "A7", "B0", "B1", "B10"],
+        "rows": ["A4", "B12", "B13", "B14", "B15", "A8", "B5"]
+    },
+    "diode_direction": "COL2ROW",
+    "indicators": {
+        "caps_lock": "C13",
+        "num_lock": "B4",
+        "scroll_lock": "B3",
+        "on_state": 0
+    },
+    "development_board": "blackpill_f411"
+}
diff --git a/keyboards/kin80/blackpill411/rules.mk b/keyboards/kin80/blackpill411/rules.mk
deleted file mode 100644
index 1071cf62ee3..00000000000
--- a/keyboards/kin80/blackpill411/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-KEYBOARD_SHARED_EP = yes
diff --git a/keyboards/kinesis/alvicstep/info.json b/keyboards/kinesis/alvicstep/keyboard.json
similarity index 100%
rename from keyboards/kinesis/alvicstep/info.json
rename to keyboards/kinesis/alvicstep/keyboard.json
diff --git a/keyboards/kinesis/kint41/info.json b/keyboards/kinesis/kint41/keyboard.json
similarity index 100%
rename from keyboards/kinesis/kint41/info.json
rename to keyboards/kinesis/kint41/keyboard.json
diff --git a/keyboards/kinesis/kintlc/info.json b/keyboards/kinesis/kintlc/keyboard.json
similarity index 100%
rename from keyboards/kinesis/kintlc/info.json
rename to keyboards/kinesis/kintlc/keyboard.json
diff --git a/keyboards/kinesis/nguyenvietyen/info.json b/keyboards/kinesis/nguyenvietyen/info.json
deleted file mode 100644
index 2a99a4e6003..00000000000
--- a/keyboards/kinesis/nguyenvietyen/info.json
+++ /dev/null
@@ -1,119 +0,0 @@
-{
-    "keyboard_name": "Kinesis Classic/Advantage/Contoured",
-    "manufacturer": "QMK",
-    "usb": {
-        "vid": "0xFEED",
-        "pid": "0x6060",
-        "device_version": "0.0.3"
-    },
-    "features": {
-        "bootmagic": true,
-        "console": false,
-        "command": true,
-        "mousekey": true,
-        "extrakey": true,
-        "nkro": true
-    },
-    "indicators": {
-        "caps_lock": "E6",
-        "num_lock": "D4",
-        "scroll_lock": "C6",
-        "compose": "D7",
-        "on_state": 0
-    },
-    "debounce": 1,
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 2], "x": 0, "y": 0, "w": 0.69, "h": 0.85},
-                {"matrix": [2, 2], "x": 0.7, "y": 0, "w": 0.69, "h": 0.85},
-                {"matrix": [1, 2], "x": 1.39, "y": 0, "w": 0.69, "h": 0.85},
-                {"matrix": [0, 1], "x": 2.09, "y": 0, "w": 0.69, "h": 0.85},
-                {"matrix": [2, 1], "x": 2.78, "y": 0, "w": 0.69, "h": 0.85},
-                {"matrix": [1, 1], "x": 3.48, "y": 0, "w": 0.69, "h": 0.85},
-                {"matrix": [0, 0], "x": 4.17, "y": 0, "w": 0.69, "h": 0.85},
-                {"matrix": [2, 0], "x": 4.87, "y": 0, "w": 0.69, "h": 0.85},
-                {"matrix": [1, 0], "x": 5.56, "y": 0, "w": 0.69, "h": 0.85},
-                {"matrix": [0, 3], "x": 9.25, "y": 0, "w": 0.69, "h": 0.85},
-                {"matrix": [2, 3], "x": 9.95, "y": 0, "w": 0.69, "h": 0.85},
-                {"matrix": [1, 3], "x": 10.64, "y": 0, "w": 0.69, "h": 0.85},
-                {"matrix": [0, 4], "x": 11.34, "y": 0, "w": 0.69, "h": 0.85},
-                {"matrix": [2, 4], "x": 12.03, "y": 0, "w": 0.69, "h": 0.85},
-                {"matrix": [1, 4], "x": 12.73, "y": 0, "w": 0.69, "h": 0.85},
-                {"matrix": [0, 5], "x": 13.42, "y": 0, "w": 0.69, "h": 0.85},
-                {"matrix": [12, 0], "x": 14.12, "y": 0, "w": 0.69, "h": 0.85},
-                {"matrix": [12, 1], "x": 14.81, "y": 0, "w": 0.69, "h": 0.85},
-                {"matrix": [8, 0], "x": 0, "y": 1.25, "w": 1.25},
-                {"matrix": [7, 0], "x": 1.25, "y": 1.25},
-                {"matrix": [6, 0], "x": 2.25, "y": 1},
-                {"matrix": [5, 0], "x": 3.25, "y": 1},
-                {"matrix": [4, 0], "x": 4.25, "y": 1},
-                {"matrix": [3, 0], "x": 5.25, "y": 1},
-                {"matrix": [9, 4], "x": 9.25, "y": 1},
-                {"matrix": [10, 4], "x": 10.25, "y": 1},
-                {"matrix": [11, 4], "x": 11.25, "y": 1},
-                {"matrix": [13, 4], "x": 12.25, "y": 1},
-                {"matrix": [14, 4], "x": 13.25, "y": 1.25},
-                {"matrix": [15, 4], "x": 14.25, "y": 1.25, "w": 1.25},
-                {"matrix": [8, 1], "x": 0, "y": 2.25, "w": 1.25},
-                {"matrix": [7, 1], "x": 1.25, "y": 2.25},
-                {"matrix": [6, 1], "x": 2.25, "y": 2},
-                {"matrix": [5, 1], "x": 3.25, "y": 2},
-                {"matrix": [4, 1], "x": 4.25, "y": 2},
-                {"matrix": [3, 1], "x": 5.25, "y": 2},
-                {"matrix": [9, 5], "x": 9.25, "y": 2},
-                {"matrix": [10, 5], "x": 10.25, "y": 2},
-                {"matrix": [11, 5], "x": 11.25, "y": 2},
-                {"matrix": [13, 5], "x": 12.25, "y": 2},
-                {"matrix": [14, 5], "x": 13.25, "y": 2.25},
-                {"matrix": [15, 5], "x": 14.25, "y": 2.25, "w": 1.25},
-                {"matrix": [8, 2], "x": 0, "y": 3.25, "w": 1.25},
-                {"matrix": [7, 2], "x": 1.25, "y": 3.25},
-                {"matrix": [6, 2], "x": 2.25, "y": 3},
-                {"matrix": [5, 2], "x": 3.25, "y": 3},
-                {"matrix": [4, 2], "x": 4.25, "y": 3},
-                {"matrix": [3, 2], "x": 5.25, "y": 3},
-                {"matrix": [9, 6], "x": 9.25, "y": 3},
-                {"matrix": [10, 6], "x": 10.25, "y": 3},
-                {"matrix": [11, 6], "x": 11.25, "y": 3},
-                {"matrix": [13, 6], "x": 12.25, "y": 3},
-                {"matrix": [14, 6], "x": 13.25, "y": 3.25},
-                {"matrix": [15, 6], "x": 14.25, "y": 3.25, "w": 1.25},
-                {"matrix": [8, 3], "x": 0, "y": 4.25, "w": 1.25},
-                {"matrix": [7, 3], "x": 1.25, "y": 4.25},
-                {"matrix": [6, 3], "x": 2.25, "y": 4},
-                {"matrix": [5, 3], "x": 3.25, "y": 4},
-                {"matrix": [4, 3], "x": 4.25, "y": 4},
-                {"matrix": [3, 3], "x": 5.25, "y": 4},
-                {"matrix": [9, 7], "x": 9.25, "y": 4},
-                {"matrix": [10, 7], "x": 10.25, "y": 4},
-                {"matrix": [11, 7], "x": 11.25, "y": 4},
-                {"matrix": [13, 7], "x": 12.25, "y": 4},
-                {"matrix": [14, 7], "x": 13.25, "y": 4.25},
-                {"matrix": [15, 7], "x": 14.25, "y": 4.25, "w": 1.25},
-                {"matrix": [7, 4], "x": 1.25, "y": 5.25},
-                {"matrix": [6, 4], "x": 2.25, "y": 5},
-                {"matrix": [5, 4], "x": 3.25, "y": 5},
-                {"matrix": [3, 4], "x": 4.25, "y": 5},
-                {"matrix": [9, 3], "x": 10.25, "y": 5},
-                {"matrix": [11, 3], "x": 11.25, "y": 5},
-                {"matrix": [13, 3], "x": 12.25, "y": 5},
-                {"matrix": [14, 3], "x": 13.25, "y": 5.25},
-                {"matrix": [3, 6], "x": 5.25, "y": 6},
-                {"matrix": [3, 5], "x": 6.25, "y": 6},
-                {"matrix": [4, 7], "x": 8.25, "y": 6},
-                {"matrix": [6, 6], "x": 9.25, "y": 6},
-                {"matrix": [5, 5], "x": 6.25, "y": 7},
-                {"matrix": [6, 7], "x": 8.25, "y": 7},
-                {"matrix": [5, 6], "x": 4.25, "y": 7, "h": 2},
-                {"matrix": [4, 6], "x": 5.25, "y": 7, "h": 2},
-                {"matrix": [7, 5], "x": 6.25, "y": 8},
-                {"matrix": [8, 7], "x": 8.25, "y": 8},
-                {"matrix": [7, 6], "x": 9.25, "y": 7, "h": 2},
-                {"matrix": [8, 6], "x": 10.25, "y": 7, "h": 2}
-            ]
-        }
-    }
-}
diff --git a/keyboards/kinesis/nguyenvietyen/keyboard.json b/keyboards/kinesis/nguyenvietyen/keyboard.json
new file mode 100644
index 00000000000..68bdd0f767c
--- /dev/null
+++ b/keyboards/kinesis/nguyenvietyen/keyboard.json
@@ -0,0 +1,120 @@
+{
+    "keyboard_name": "Kinesis Classic/Advantage/Contoured",
+    "manufacturer": "QMK",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0x6060",
+        "device_version": "0.0.3"
+    },
+    "features": {
+        "bootmagic": true,
+        "console": false,
+        "command": true,
+        "mousekey": true,
+        "extrakey": true,
+        "nkro": true,
+        "sleep_led": true
+    },
+    "indicators": {
+        "caps_lock": "E6",
+        "num_lock": "D4",
+        "scroll_lock": "C6",
+        "compose": "D7",
+        "on_state": 0
+    },
+    "debounce": 1,
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 2], "x": 0, "y": 0, "w": 0.69, "h": 0.85},
+                {"matrix": [2, 2], "x": 0.7, "y": 0, "w": 0.69, "h": 0.85},
+                {"matrix": [1, 2], "x": 1.39, "y": 0, "w": 0.69, "h": 0.85},
+                {"matrix": [0, 1], "x": 2.09, "y": 0, "w": 0.69, "h": 0.85},
+                {"matrix": [2, 1], "x": 2.78, "y": 0, "w": 0.69, "h": 0.85},
+                {"matrix": [1, 1], "x": 3.48, "y": 0, "w": 0.69, "h": 0.85},
+                {"matrix": [0, 0], "x": 4.17, "y": 0, "w": 0.69, "h": 0.85},
+                {"matrix": [2, 0], "x": 4.87, "y": 0, "w": 0.69, "h": 0.85},
+                {"matrix": [1, 0], "x": 5.56, "y": 0, "w": 0.69, "h": 0.85},
+                {"matrix": [0, 3], "x": 9.25, "y": 0, "w": 0.69, "h": 0.85},
+                {"matrix": [2, 3], "x": 9.95, "y": 0, "w": 0.69, "h": 0.85},
+                {"matrix": [1, 3], "x": 10.64, "y": 0, "w": 0.69, "h": 0.85},
+                {"matrix": [0, 4], "x": 11.34, "y": 0, "w": 0.69, "h": 0.85},
+                {"matrix": [2, 4], "x": 12.03, "y": 0, "w": 0.69, "h": 0.85},
+                {"matrix": [1, 4], "x": 12.73, "y": 0, "w": 0.69, "h": 0.85},
+                {"matrix": [0, 5], "x": 13.42, "y": 0, "w": 0.69, "h": 0.85},
+                {"matrix": [12, 0], "x": 14.12, "y": 0, "w": 0.69, "h": 0.85},
+                {"matrix": [12, 1], "x": 14.81, "y": 0, "w": 0.69, "h": 0.85},
+                {"matrix": [8, 0], "x": 0, "y": 1.25, "w": 1.25},
+                {"matrix": [7, 0], "x": 1.25, "y": 1.25},
+                {"matrix": [6, 0], "x": 2.25, "y": 1},
+                {"matrix": [5, 0], "x": 3.25, "y": 1},
+                {"matrix": [4, 0], "x": 4.25, "y": 1},
+                {"matrix": [3, 0], "x": 5.25, "y": 1},
+                {"matrix": [9, 4], "x": 9.25, "y": 1},
+                {"matrix": [10, 4], "x": 10.25, "y": 1},
+                {"matrix": [11, 4], "x": 11.25, "y": 1},
+                {"matrix": [13, 4], "x": 12.25, "y": 1},
+                {"matrix": [14, 4], "x": 13.25, "y": 1.25},
+                {"matrix": [15, 4], "x": 14.25, "y": 1.25, "w": 1.25},
+                {"matrix": [8, 1], "x": 0, "y": 2.25, "w": 1.25},
+                {"matrix": [7, 1], "x": 1.25, "y": 2.25},
+                {"matrix": [6, 1], "x": 2.25, "y": 2},
+                {"matrix": [5, 1], "x": 3.25, "y": 2},
+                {"matrix": [4, 1], "x": 4.25, "y": 2},
+                {"matrix": [3, 1], "x": 5.25, "y": 2},
+                {"matrix": [9, 5], "x": 9.25, "y": 2},
+                {"matrix": [10, 5], "x": 10.25, "y": 2},
+                {"matrix": [11, 5], "x": 11.25, "y": 2},
+                {"matrix": [13, 5], "x": 12.25, "y": 2},
+                {"matrix": [14, 5], "x": 13.25, "y": 2.25},
+                {"matrix": [15, 5], "x": 14.25, "y": 2.25, "w": 1.25},
+                {"matrix": [8, 2], "x": 0, "y": 3.25, "w": 1.25},
+                {"matrix": [7, 2], "x": 1.25, "y": 3.25},
+                {"matrix": [6, 2], "x": 2.25, "y": 3},
+                {"matrix": [5, 2], "x": 3.25, "y": 3},
+                {"matrix": [4, 2], "x": 4.25, "y": 3},
+                {"matrix": [3, 2], "x": 5.25, "y": 3},
+                {"matrix": [9, 6], "x": 9.25, "y": 3},
+                {"matrix": [10, 6], "x": 10.25, "y": 3},
+                {"matrix": [11, 6], "x": 11.25, "y": 3},
+                {"matrix": [13, 6], "x": 12.25, "y": 3},
+                {"matrix": [14, 6], "x": 13.25, "y": 3.25},
+                {"matrix": [15, 6], "x": 14.25, "y": 3.25, "w": 1.25},
+                {"matrix": [8, 3], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [7, 3], "x": 1.25, "y": 4.25},
+                {"matrix": [6, 3], "x": 2.25, "y": 4},
+                {"matrix": [5, 3], "x": 3.25, "y": 4},
+                {"matrix": [4, 3], "x": 4.25, "y": 4},
+                {"matrix": [3, 3], "x": 5.25, "y": 4},
+                {"matrix": [9, 7], "x": 9.25, "y": 4},
+                {"matrix": [10, 7], "x": 10.25, "y": 4},
+                {"matrix": [11, 7], "x": 11.25, "y": 4},
+                {"matrix": [13, 7], "x": 12.25, "y": 4},
+                {"matrix": [14, 7], "x": 13.25, "y": 4.25},
+                {"matrix": [15, 7], "x": 14.25, "y": 4.25, "w": 1.25},
+                {"matrix": [7, 4], "x": 1.25, "y": 5.25},
+                {"matrix": [6, 4], "x": 2.25, "y": 5},
+                {"matrix": [5, 4], "x": 3.25, "y": 5},
+                {"matrix": [3, 4], "x": 4.25, "y": 5},
+                {"matrix": [9, 3], "x": 10.25, "y": 5},
+                {"matrix": [11, 3], "x": 11.25, "y": 5},
+                {"matrix": [13, 3], "x": 12.25, "y": 5},
+                {"matrix": [14, 3], "x": 13.25, "y": 5.25},
+                {"matrix": [3, 6], "x": 5.25, "y": 6},
+                {"matrix": [3, 5], "x": 6.25, "y": 6},
+                {"matrix": [4, 7], "x": 8.25, "y": 6},
+                {"matrix": [6, 6], "x": 9.25, "y": 6},
+                {"matrix": [5, 5], "x": 6.25, "y": 7},
+                {"matrix": [6, 7], "x": 8.25, "y": 7},
+                {"matrix": [5, 6], "x": 4.25, "y": 7, "h": 2},
+                {"matrix": [4, 6], "x": 5.25, "y": 7, "h": 2},
+                {"matrix": [7, 5], "x": 6.25, "y": 8},
+                {"matrix": [8, 7], "x": 8.25, "y": 8},
+                {"matrix": [7, 6], "x": 9.25, "y": 7, "h": 2},
+                {"matrix": [8, 6], "x": 10.25, "y": 7, "h": 2}
+            ]
+        }
+    }
+}
diff --git a/keyboards/kinesis/nguyenvietyen/rules.mk b/keyboards/kinesis/nguyenvietyen/rules.mk
index 59129f4320d..30ce5d293b7 100644
--- a/keyboards/kinesis/nguyenvietyen/rules.mk
+++ b/keyboards/kinesis/nguyenvietyen/rules.mk
@@ -1,7 +1,2 @@
-# Build Options
-#   change yes to no to disable
-#
-
-SLEEP_LED_ENABLE = yes
 CUSTOM_MATRIX = lite
 SRC += matrix.c
diff --git a/keyboards/kiwikey/borderland/info.json b/keyboards/kiwikey/borderland/info.json
deleted file mode 100644
index 2e6efabb422..00000000000
--- a/keyboards/kiwikey/borderland/info.json
+++ /dev/null
@@ -1,133 +0,0 @@
-{
-    "keyboard_name": "Borderland",
-    "manufacturer": "KiwiKey",
-    "url": "https://kiwikey.vn/borderland/",
-    "maintainer": "KiwiKey",
-    "usb": {
-        "vid": "0x4B57",
-        "pid": "0x424C",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["F0", "F1", "E6", "C7", "C6", "B6", "D4", "B1", "B0", "B7", "B5", "B4", "D7", "D6", "B3"],
-        "rows": ["D0", "D1", "D2", "D3", "D5"]
-    },
-    "diode_direction": "COL2ROW",
-    "encoder": {
-        "rotary": [
-            {"pin_a": "F5", "pin_b": "F6"}
-        ]
-    },
-    "qmk": {
-        "tap_keycode_delay": 10
-    },
-    "rgblight": {
-        "saturation_steps": 8,
-        "brightness_steps": 8,
-        "led_count": 18,
-        "animations": {
-            "breathing": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "snake": true,
-            "knight": true,
-            "christmas": true,
-            "static_gradient": true,
-            "rgb_test": true,
-            "alternating": true,
-            "twinkle": true
-        }
-    },
-    "ws2812": {
-        "pin": "B2"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-
-                {"matrix": [0, 7], "x": 9, "y": 0},
-                {"matrix": [0, 8], "x": 10, "y": 0},
-                {"matrix": [0, 9], "x": 11, "y": 0},
-                {"matrix": [0, 10], "x": 12, "y": 0},
-                {"matrix": [0, 11], "x": 13, "y": 0},
-                {"matrix": [0, 12], "x": 14, "y": 0},
-                {"matrix": [0, 13], "x": 15, "y": 0},
-                {"matrix": [0, 14], "x": 16, "y": 0},
-
-                {"matrix": [1, 14], "x": 17.3, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-
-                {"matrix": [1, 6], "x": 8.5, "y": 1},
-                {"matrix": [1, 7], "x": 9.5, "y": 1},
-                {"matrix": [1, 8], "x": 10.5, "y": 1},
-                {"matrix": [1, 9], "x": 11.5, "y": 1},
-                {"matrix": [1, 10], "x": 12.5, "y": 1},
-                {"matrix": [1, 11], "x": 13.5, "y": 1},
-                {"matrix": [1, 12], "x": 14.5, "y": 1},
-                {"matrix": [1, 13], "x": 15.5, "y": 1, "w": 1.5},
-
-                {"matrix": [2, 14], "x": 17.3, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-
-                {"matrix": [2, 6], "x": 8.75, "y": 2},
-                {"matrix": [2, 7], "x": 9.75, "y": 2},
-                {"matrix": [2, 8], "x": 10.75, "y": 2},
-                {"matrix": [2, 9], "x": 11.75, "y": 2},
-                {"matrix": [2, 10], "x": 12.75, "y": 2},
-                {"matrix": [2, 11], "x": 13.75, "y": 2},
-                {"matrix": [2, 12], "x": 14.75, "y": 2, "w": 2.25},
-
-                {"matrix": [3, 14], "x": 17.3, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 1], "x": 2.25, "y": 3},
-                {"matrix": [3, 2], "x": 3.25, "y": 3},
-                {"matrix": [3, 3], "x": 4.25, "y": 3},
-                {"matrix": [3, 4], "x": 5.25, "y": 3},
-                {"matrix": [3, 5], "x": 6.25, "y": 3},
-
-                {"matrix": [3, 6], "x": 9.25, "y": 3},
-                {"matrix": [3, 7], "x": 10.25, "y": 3},
-                {"matrix": [3, 8], "x": 11.25, "y": 3},
-                {"matrix": [3, 9], "x": 12.25, "y": 3},
-                {"matrix": [3, 10], "x": 13.25, "y": 3},
-                {"matrix": [3, 11], "x": 14.25, "y": 3, "w": 1.75},
-
-                {"matrix": [3, 13], "x": 16.3, "y": 3.25},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
-                {"matrix": [4, 2], "x": 3.25, "y": 4, "w": 1.5},
-                {"matrix": [4, 4], "x": 4.75, "y": 4, "w": 2},
-                {"matrix": [4, 5], "x": 6.75, "y": 4, "w": 1.25},
-
-                {"matrix": [4, 7], "x": 8.75, "y": 4, "w": 2.75},
-                {"matrix": [4, 9], "x": 11.5, "y": 4, "w": 1.5},
-
-                {"matrix": [4, 12], "x": 15.3, "y": 4.25},
-                {"matrix": [4, 13], "x": 16.3, "y": 4.25},
-                {"matrix": [4, 14], "x": 17.3, "y": 4.25}
-            ]
-        }
-    }
-}
diff --git a/keyboards/kiwikey/borderland/keyboard.json b/keyboards/kiwikey/borderland/keyboard.json
new file mode 100644
index 00000000000..247c6b304d4
--- /dev/null
+++ b/keyboards/kiwikey/borderland/keyboard.json
@@ -0,0 +1,141 @@
+{
+    "keyboard_name": "Borderland",
+    "manufacturer": "KiwiKey",
+    "url": "https://kiwikey.vn/borderland/",
+    "maintainer": "KiwiKey",
+    "usb": {
+        "vid": "0x4B57",
+        "pid": "0x424C",
+        "device_version": "0.0.1",
+        "no_startup_check": true
+    },
+    "matrix_pins": {
+        "cols": ["F0", "F1", "E6", "C7", "C6", "B6", "D4", "B1", "B0", "B7", "B5", "B4", "D7", "D6", "B3"],
+        "rows": ["D0", "D1", "D2", "D3", "D5"]
+    },
+    "diode_direction": "COL2ROW",
+    "encoder": {
+        "rotary": [
+            {"pin_a": "F5", "pin_b": "F6"}
+        ]
+    },
+    "qmk": {
+        "tap_keycode_delay": 10
+    },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 18,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": true,
+            "twinkle": true
+        }
+    },
+    "ws2812": {
+        "pin": "B2"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "rgblight": true,
+        "encoder": true
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+
+                {"matrix": [0, 7], "x": 9, "y": 0},
+                {"matrix": [0, 8], "x": 10, "y": 0},
+                {"matrix": [0, 9], "x": 11, "y": 0},
+                {"matrix": [0, 10], "x": 12, "y": 0},
+                {"matrix": [0, 11], "x": 13, "y": 0},
+                {"matrix": [0, 12], "x": 14, "y": 0},
+                {"matrix": [0, 13], "x": 15, "y": 0},
+                {"matrix": [0, 14], "x": 16, "y": 0},
+
+                {"matrix": [1, 14], "x": 17.3, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+
+                {"matrix": [1, 6], "x": 8.5, "y": 1},
+                {"matrix": [1, 7], "x": 9.5, "y": 1},
+                {"matrix": [1, 8], "x": 10.5, "y": 1},
+                {"matrix": [1, 9], "x": 11.5, "y": 1},
+                {"matrix": [1, 10], "x": 12.5, "y": 1},
+                {"matrix": [1, 11], "x": 13.5, "y": 1},
+                {"matrix": [1, 12], "x": 14.5, "y": 1},
+                {"matrix": [1, 13], "x": 15.5, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 14], "x": 17.3, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+
+                {"matrix": [2, 6], "x": 8.75, "y": 2},
+                {"matrix": [2, 7], "x": 9.75, "y": 2},
+                {"matrix": [2, 8], "x": 10.75, "y": 2},
+                {"matrix": [2, 9], "x": 11.75, "y": 2},
+                {"matrix": [2, 10], "x": 12.75, "y": 2},
+                {"matrix": [2, 11], "x": 13.75, "y": 2},
+                {"matrix": [2, 12], "x": 14.75, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 14], "x": 17.3, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+
+                {"matrix": [3, 6], "x": 9.25, "y": 3},
+                {"matrix": [3, 7], "x": 10.25, "y": 3},
+                {"matrix": [3, 8], "x": 11.25, "y": 3},
+                {"matrix": [3, 9], "x": 12.25, "y": 3},
+                {"matrix": [3, 10], "x": 13.25, "y": 3},
+                {"matrix": [3, 11], "x": 14.25, "y": 3, "w": 1.75},
+
+                {"matrix": [3, 13], "x": 16.3, "y": 3.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 2], "x": 3.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 4], "x": 4.75, "y": 4, "w": 2},
+                {"matrix": [4, 5], "x": 6.75, "y": 4, "w": 1.25},
+
+                {"matrix": [4, 7], "x": 8.75, "y": 4, "w": 2.75},
+                {"matrix": [4, 9], "x": 11.5, "y": 4, "w": 1.5},
+
+                {"matrix": [4, 12], "x": 15.3, "y": 4.25},
+                {"matrix": [4, 13], "x": 16.3, "y": 4.25},
+                {"matrix": [4, 14], "x": 17.3, "y": 4.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/kiwikey/borderland/rules.mk b/keyboards/kiwikey/borderland/rules.mk
deleted file mode 100644
index e44305c4fff..00000000000
--- a/keyboards/kiwikey/borderland/rules.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-ENCODER_ENABLE = yes
-NO_USB_STARTUP_CHECK = yes
diff --git a/keyboards/kiwikey/kawii9/info.json b/keyboards/kiwikey/kawii9/info.json
deleted file mode 100644
index ca0e6049517..00000000000
--- a/keyboards/kiwikey/kawii9/info.json
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-    "keyboard_name": "Kawii9",
-    "manufacturer": "KiwiKey",
-    "url": "http://kiwikey.vn/kawii9/",
-    "maintainer": "KiwiKey",
-    "usb": {
-        "vid": "0x4B57",
-        "pid": "0x0303",
-        "device_version": "0.0.2"
-    },
-    "rgblight": {
-        "saturation_steps": 8,
-        "brightness_steps": 8,
-        "led_count": 4,
-        "animations": {
-            "breathing": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "snake": true,
-            "knight": true,
-            "christmas": true,
-            "static_gradient": true,
-            "rgb_test": true,
-            "alternating": true,
-            "twinkle": true
-        }
-    },
-    "ws2812": {
-        "pin": "D3"
-    },
-    "matrix_pins": {
-        "cols": ["F4", "F5", "F6"],
-        "rows": ["B6", "B5", "B4"]
-    },
-    "diode_direction": "COL2ROW",
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "layouts": {
-        "LAYOUT_ortho_3x3": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1},
-                {"matrix": [1, 1], "x": 1, "y": 1},
-                {"matrix": [1, 2], "x": 2, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2},
-                {"matrix": [2, 1], "x": 1, "y": 2},
-                {"matrix": [2, 2], "x": 2, "y": 2}
-            ]
-        }
-    }
-}
diff --git a/keyboards/kiwikey/kawii9/keyboard.json b/keyboards/kiwikey/kawii9/keyboard.json
new file mode 100644
index 00000000000..07b4cca097a
--- /dev/null
+++ b/keyboards/kiwikey/kawii9/keyboard.json
@@ -0,0 +1,62 @@
+{
+    "keyboard_name": "Kawii9",
+    "manufacturer": "KiwiKey",
+    "url": "http://kiwikey.vn/kawii9/",
+    "maintainer": "KiwiKey",
+    "usb": {
+        "vid": "0x4B57",
+        "pid": "0x0303",
+        "device_version": "0.0.2",
+        "no_startup_check": true
+    },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 4,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": true,
+            "twinkle": true
+        }
+    },
+    "ws2812": {
+        "pin": "D3"
+    },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "F6"],
+        "rows": ["B6", "B5", "B4"]
+    },
+    "diode_direction": "COL2ROW",
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "rgblight": true
+    },
+    "layouts": {
+        "LAYOUT_ortho_3x3": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2}
+            ]
+        }
+    }
+}
diff --git a/keyboards/kiwikey/kawii9/rules.mk b/keyboards/kiwikey/kawii9/rules.mk
deleted file mode 100644
index a6f559ca779..00000000000
--- a/keyboards/kiwikey/kawii9/rules.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-NO_USB_STARTUP_CHECK = yes
diff --git a/keyboards/kmini/info.json b/keyboards/kmini/info.json
deleted file mode 100755
index 6af61bbbf1e..00000000000
--- a/keyboards/kmini/info.json
+++ /dev/null
@@ -1,105 +0,0 @@
-{
-  "keyboard_name": "KMAC Mini",
-  "manufacturer": "Revo",
-  "url": "http://kbdmodadmin.cafe24.com/product/detail.html?product_no=12&cate_no=4&display_group=1",
-  "maintainer": "evyd13",
-  "usb": {
-    "vid": "0xFEED",
-    "pid": "0x6050",
-    "device_version": "1.0.4"
-  },
-  "processor": "atmega32u4",
-  "bootloader": "atmel-dfu",
-  "layouts": {
-    "LAYOUT": {
-      "layout": [
-        {"matrix": [0, 0], "x": 0, "y": 0},
-        {"matrix": [0, 1], "x": 1, "y": 0},
-
-        {"matrix": [0, 2], "x": 2.25, "y": 0},
-        {"matrix": [0, 3], "x": 3.25, "y": 0},
-        {"matrix": [0, 4], "x": 4.25, "y": 0},
-        {"matrix": [0, 5], "x": 5.25, "y": 0},
-        {"matrix": [0, 6], "x": 6.25, "y": 0},
-        {"matrix": [0, 7], "x": 7.25, "y": 0},
-        {"matrix": [0, 8], "x": 8.25, "y": 0},
-        {"matrix": [0, 9], "x": 9.25, "y": 0},
-        {"matrix": [0, 10], "x": 10.25, "y": 0},
-        {"matrix": [0, 11], "x": 11.25, "y": 0},
-        {"matrix": [0, 12], "x": 12.25, "y": 0},
-        {"matrix": [0, 13], "x": 13.25, "y": 0},
-        {"matrix": [0, 14], "x": 14.25, "y": 0},
-        {"matrix": [0, 15], "x": 15.25, "y": 0, "w": 2},
-        {"matrix": [0, 16], "x": 17.25, "y": 0},
-
-        {"matrix": [1, 0], "x": 0, "y": 1},
-        {"matrix": [1, 1], "x": 1, "y": 1},
-
-        {"matrix": [1, 2], "x": 2.25, "y": 1, "w": 1.5},
-        {"matrix": [1, 3], "x": 3.75, "y": 1},
-        {"matrix": [1, 4], "x": 4.75, "y": 1},
-        {"matrix": [1, 5], "x": 5.75, "y": 1},
-        {"matrix": [1, 6], "x": 6.75, "y": 1},
-        {"matrix": [1, 7], "x": 7.75, "y": 1},
-        {"matrix": [1, 8], "x": 8.75, "y": 1},
-        {"matrix": [1, 9], "x": 9.75, "y": 1},
-        {"matrix": [1, 10], "x": 10.75, "y": 1},
-        {"matrix": [1, 11], "x": 11.75, "y": 1},
-        {"matrix": [1, 12], "x": 12.75, "y": 1},
-        {"matrix": [1, 13], "x": 13.75, "y": 1},
-        {"matrix": [1, 14], "x": 14.75, "y": 1},
-        {"matrix": [1, 15], "x": 15.75, "y": 1, "w": 1.5},
-        {"matrix": [1, 16], "x": 17.25, "y": 1},
-
-        {"matrix": [2, 0], "x": 0, "y": 2},
-        {"matrix": [2, 1], "x": 1, "y": 2},
-
-        {"matrix": [2, 2], "x": 2.25, "y": 2, "w": 1.75},
-        {"matrix": [2, 3], "x": 4, "y": 2},
-        {"matrix": [2, 4], "x": 5, "y": 2},
-        {"matrix": [2, 5], "x": 6, "y": 2},
-        {"matrix": [2, 6], "x": 7, "y": 2},
-        {"matrix": [2, 7], "x": 8, "y": 2},
-        {"matrix": [2, 8], "x": 9, "y": 2},
-        {"matrix": [2, 9], "x": 10, "y": 2},
-        {"matrix": [2, 10], "x": 11, "y": 2},
-        {"matrix": [2, 11], "x": 12, "y": 2},
-        {"matrix": [2, 12], "x": 13, "y": 2},
-        {"matrix": [2, 13], "x": 14, "y": 2},
-        {"matrix": [2, 15], "x": 15, "y": 2, "w": 2.25},
-        {"matrix": [2, 16], "x": 17.25, "y": 2},
-
-        {"matrix": [3, 0], "x": 0, "y": 3},
-        {"matrix": [3, 1], "x": 1, "y": 3},
-
-        {"matrix": [3, 2], "x": 2.25, "y": 3, "w": 2.25},
-        {"matrix": [3, 3], "x": 4.5, "y": 3},
-        {"matrix": [3, 4], "x": 5.5, "y": 3},
-        {"matrix": [3, 5], "x": 6.5, "y": 3},
-        {"matrix": [3, 6], "x": 7.5, "y": 3},
-        {"matrix": [3, 7], "x": 8.5, "y": 3},
-        {"matrix": [3, 8], "x": 9.5, "y": 3},
-        {"matrix": [3, 9], "x": 10.5, "y": 3},
-        {"matrix": [3, 10], "x": 11.5, "y": 3},
-        {"matrix": [3, 11], "x": 12.5, "y": 3},
-        {"matrix": [3, 12], "x": 13.5, "y": 3},
-        {"matrix": [3, 14], "x": 14.5, "y": 3, "w": 1.75},
-        {"matrix": [3, 15], "x": 16.25, "y": 3},
-        {"matrix": [3, 16], "x": 17.25, "y": 3},
-
-        {"matrix": [4, 0], "x": 0, "y": 4},
-        {"matrix": [4, 1], "x": 1, "y": 4},
-
-        {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.5},
-        {"matrix": [4, 3], "x": 3.75, "y": 4},
-        {"matrix": [4, 4], "x": 4.75, "y": 4, "w": 1.5},
-        {"matrix": [4, 7], "x": 6.25, "y": 4, "w": 7},
-        {"matrix": [4, 12], "x": 13.25, "y": 4, "w": 1.5},
-
-        {"matrix": [4, 14], "x": 15.25, "y": 4},
-        {"matrix": [4, 15], "x": 16.25, "y": 4},
-        {"matrix": [4, 16], "x": 17.25, "y": 4}
-      ]
-    }
-  }
-}
diff --git a/keyboards/kmini/keyboard.json b/keyboards/kmini/keyboard.json
new file mode 100755
index 00000000000..d272baca955
--- /dev/null
+++ b/keyboards/kmini/keyboard.json
@@ -0,0 +1,112 @@
+{
+  "keyboard_name": "KMAC Mini",
+  "manufacturer": "Revo",
+  "url": "http://kbdmodadmin.cafe24.com/product/detail.html?product_no=12&cate_no=4&display_group=1",
+  "maintainer": "evyd13",
+  "usb": {
+    "vid": "0xFEED",
+    "pid": "0x6050",
+    "device_version": "1.0.4"
+  },
+  "processor": "atmega32u4",
+  "bootloader": "atmel-dfu",
+  "features": {
+    "bootmagic": true,
+    "mousekey": true,
+    "extrakey": true,
+    "command": true,
+    "nkro": true
+  },
+  "layouts": {
+    "LAYOUT": {
+      "layout": [
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+
+        {"matrix": [0, 2], "x": 2.25, "y": 0},
+        {"matrix": [0, 3], "x": 3.25, "y": 0},
+        {"matrix": [0, 4], "x": 4.25, "y": 0},
+        {"matrix": [0, 5], "x": 5.25, "y": 0},
+        {"matrix": [0, 6], "x": 6.25, "y": 0},
+        {"matrix": [0, 7], "x": 7.25, "y": 0},
+        {"matrix": [0, 8], "x": 8.25, "y": 0},
+        {"matrix": [0, 9], "x": 9.25, "y": 0},
+        {"matrix": [0, 10], "x": 10.25, "y": 0},
+        {"matrix": [0, 11], "x": 11.25, "y": 0},
+        {"matrix": [0, 12], "x": 12.25, "y": 0},
+        {"matrix": [0, 13], "x": 13.25, "y": 0},
+        {"matrix": [0, 14], "x": 14.25, "y": 0},
+        {"matrix": [0, 15], "x": 15.25, "y": 0, "w": 2},
+        {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1},
+        {"matrix": [1, 1], "x": 1, "y": 1},
+
+        {"matrix": [1, 2], "x": 2.25, "y": 1, "w": 1.5},
+        {"matrix": [1, 3], "x": 3.75, "y": 1},
+        {"matrix": [1, 4], "x": 4.75, "y": 1},
+        {"matrix": [1, 5], "x": 5.75, "y": 1},
+        {"matrix": [1, 6], "x": 6.75, "y": 1},
+        {"matrix": [1, 7], "x": 7.75, "y": 1},
+        {"matrix": [1, 8], "x": 8.75, "y": 1},
+        {"matrix": [1, 9], "x": 9.75, "y": 1},
+        {"matrix": [1, 10], "x": 10.75, "y": 1},
+        {"matrix": [1, 11], "x": 11.75, "y": 1},
+        {"matrix": [1, 12], "x": 12.75, "y": 1},
+        {"matrix": [1, 13], "x": 13.75, "y": 1},
+        {"matrix": [1, 14], "x": 14.75, "y": 1},
+        {"matrix": [1, 15], "x": 15.75, "y": 1, "w": 1.5},
+        {"matrix": [1, 16], "x": 17.25, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2},
+        {"matrix": [2, 1], "x": 1, "y": 2},
+
+        {"matrix": [2, 2], "x": 2.25, "y": 2, "w": 1.75},
+        {"matrix": [2, 3], "x": 4, "y": 2},
+        {"matrix": [2, 4], "x": 5, "y": 2},
+        {"matrix": [2, 5], "x": 6, "y": 2},
+        {"matrix": [2, 6], "x": 7, "y": 2},
+        {"matrix": [2, 7], "x": 8, "y": 2},
+        {"matrix": [2, 8], "x": 9, "y": 2},
+        {"matrix": [2, 9], "x": 10, "y": 2},
+        {"matrix": [2, 10], "x": 11, "y": 2},
+        {"matrix": [2, 11], "x": 12, "y": 2},
+        {"matrix": [2, 12], "x": 13, "y": 2},
+        {"matrix": [2, 13], "x": 14, "y": 2},
+        {"matrix": [2, 15], "x": 15, "y": 2, "w": 2.25},
+        {"matrix": [2, 16], "x": 17.25, "y": 2},
+
+        {"matrix": [3, 0], "x": 0, "y": 3},
+        {"matrix": [3, 1], "x": 1, "y": 3},
+
+        {"matrix": [3, 2], "x": 2.25, "y": 3, "w": 2.25},
+        {"matrix": [3, 3], "x": 4.5, "y": 3},
+        {"matrix": [3, 4], "x": 5.5, "y": 3},
+        {"matrix": [3, 5], "x": 6.5, "y": 3},
+        {"matrix": [3, 6], "x": 7.5, "y": 3},
+        {"matrix": [3, 7], "x": 8.5, "y": 3},
+        {"matrix": [3, 8], "x": 9.5, "y": 3},
+        {"matrix": [3, 9], "x": 10.5, "y": 3},
+        {"matrix": [3, 10], "x": 11.5, "y": 3},
+        {"matrix": [3, 11], "x": 12.5, "y": 3},
+        {"matrix": [3, 12], "x": 13.5, "y": 3},
+        {"matrix": [3, 14], "x": 14.5, "y": 3, "w": 1.75},
+        {"matrix": [3, 15], "x": 16.25, "y": 3},
+        {"matrix": [3, 16], "x": 17.25, "y": 3},
+
+        {"matrix": [4, 0], "x": 0, "y": 4},
+        {"matrix": [4, 1], "x": 1, "y": 4},
+
+        {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.5},
+        {"matrix": [4, 3], "x": 3.75, "y": 4},
+        {"matrix": [4, 4], "x": 4.75, "y": 4, "w": 1.5},
+        {"matrix": [4, 7], "x": 6.25, "y": 4, "w": 7},
+        {"matrix": [4, 12], "x": 13.25, "y": 4, "w": 1.5},
+
+        {"matrix": [4, 14], "x": 15.25, "y": 4},
+        {"matrix": [4, 15], "x": 16.25, "y": 4},
+        {"matrix": [4, 16], "x": 17.25, "y": 4}
+      ]
+    }
+  }
+}
diff --git a/keyboards/kmini/rules.mk b/keyboards/kmini/rules.mk
index c93d5be7ff3..018efde6ca7 100755
--- a/keyboards/kmini/rules.mk
+++ b/keyboards/kmini/rules.mk
@@ -1,18 +1,7 @@
 # Processor frequency
 F_CPU = 8000000
 
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = yes        # Commands for debug and configuration
 CUSTOM_MATRIX = yes         # Custom matrix file
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-AUDIO_ENABLE = no           # Audio output
 
 # Project specific files
 SRC = matrix.c
diff --git a/keyboards/kopibeng/mnk65_stm32/info.json b/keyboards/kopibeng/mnk65_stm32/keyboard.json
similarity index 100%
rename from keyboards/kopibeng/mnk65_stm32/info.json
rename to keyboards/kopibeng/mnk65_stm32/keyboard.json
diff --git a/keyboards/kopibeng/xt87/info.json b/keyboards/kopibeng/xt87/keyboard.json
similarity index 100%
rename from keyboards/kopibeng/xt87/info.json
rename to keyboards/kopibeng/xt87/keyboard.json
diff --git a/keyboards/kopibeng/xt87/rules.mk b/keyboards/kopibeng/xt87/rules.mk
deleted file mode 100644
index a92b0993283..00000000000
--- a/keyboards/kopibeng/xt87/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/kprepublic/bm60hsrgb/rev2/info.json b/keyboards/kprepublic/bm60hsrgb/rev2/info.json
deleted file mode 100644
index 9a77549e685..00000000000
--- a/keyboards/kprepublic/bm60hsrgb/rev2/info.json
+++ /dev/null
@@ -1,160 +0,0 @@
-{
-    "keyboard_name": "BM60V2",
-    "manufacturer": "KP Republic",
-    "url": "",
-    "maintainer": "bdtc123",
-    "usb": {
-        "vid": "0x4B50",
-        "pid": "0x1121",
-        "device_version": "0.0.2"
-    },
-    "ws2812": {
-        "pin": "F0"
-    },
-    "rgb_matrix": {
-        "animations":{
-            "alphas_mods": true,
-            "gradient_left_right": true,
-            "breathing": true,
-            "band_val": true,
-            "band_pinwheel_val": true,
-            "band_spiral_val": true,
-            "cycle_all": true,
-            "cycle_left_right": true,
-            "cycle_up_down": true,
-            "rainbow_moving_chevron": true,
-            "cycle_out_in": true,
-            "cycle_out_in_dual": true,
-            "cycle_pinwheel": true,
-            "cycle_spiral": true,
-            "dual_beacon": true,
-            "rainbow_beacon": true,
-            "rainbow_pinwheels": true,
-            "hue_breathing": true,
-            "hue_pendulum": true,
-            "hue_wave": true,
-            "pixel_rain": true,
-            "pixel_flow": true,
-            "pixel_fractal": 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": "custom",
-        "max_brightness": 120,
-        "sleep": true
-    },
-    "rgblight": {
-        "saturation_steps": 8,
-        "brightness_steps": 8,
-        "led_count": 6,
-        "max_brightness": 150,
-        "animations": {
-            "breathing": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "snake": true,
-            "knight": true,
-            "christmas": true,
-            "static_gradient": true,
-            "rgb_test": true,
-            "alternating": true,
-            "twinkle": true
-        },
-        "default": {
-            "animation": "rainbow_mood"
-        }
-    },
-    "matrix_pins": {
-        "cols": ["B2", "B3", "B7", "B0", "B1", "F7", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7"],
-        "rows": ["E6", "D2", "D3", "D5", "F6"]
-    },
-    "diode_direction": "ROW2COL",
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "debounce": 3,
-    "layouts": {
-        "LAYOUT_60_ansi_arrow": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 1], "x": 2.25, "y": 3},
-                {"matrix": [3, 2], "x": 3.25, "y": 3},
-                {"matrix": [3, 3], "x": 4.25, "y": 3},
-                {"matrix": [3, 4], "x": 5.25, "y": 3},
-                {"matrix": [3, 5], "x": 6.25, "y": 3},
-                {"matrix": [3, 6], "x": 7.25, "y": 3},
-                {"matrix": [3, 7], "x": 8.25, "y": 3},
-                {"matrix": [3, 8], "x": 9.25, "y": 3},
-                {"matrix": [3, 9], "x": 10.25, "y": 3},
-                {"matrix": [3, 11], "x": 11.25, "y": 3, "w": 1.75},
-                {"matrix": [3, 12], "x": 13, "y": 3},
-                {"matrix": [3, 13], "x": 14, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
-                {"matrix": [4, 9], "x": 10, "y": 4},
-                {"matrix": [4, 10], "x": 11, "y": 4},
-                {"matrix": [4, 11], "x": 12, "y": 4},
-                {"matrix": [4, 12], "x": 13, "y": 4},
-                {"matrix": [4, 13], "x": 14, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/kprepublic/bm60hsrgb/rev2/keyboard.json b/keyboards/kprepublic/bm60hsrgb/rev2/keyboard.json
new file mode 100644
index 00000000000..a82d5159cf6
--- /dev/null
+++ b/keyboards/kprepublic/bm60hsrgb/rev2/keyboard.json
@@ -0,0 +1,170 @@
+{
+    "keyboard_name": "BM60V2",
+    "manufacturer": "KP Republic",
+    "url": "",
+    "maintainer": "bdtc123",
+    "usb": {
+        "vid": "0x4B50",
+        "pid": "0x1121",
+        "device_version": "0.0.2"
+    },
+    "ws2812": {
+        "pin": "F0"
+    },
+    "rgb_matrix": {
+        "animations":{
+            "alphas_mods": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_val": true,
+            "band_pinwheel_val": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_rain": true,
+            "pixel_flow": true,
+            "pixel_fractal": 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": "custom",
+        "max_brightness": 120,
+        "sleep": true
+    },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 6,
+        "max_brightness": 150,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": true,
+            "twinkle": true
+        },
+        "default": {
+            "animation": "rainbow_mood"
+        }
+    },
+    "matrix_pins": {
+        "cols": ["B2", "B3", "B7", "B0", "B1", "F7", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7"],
+        "rows": ["E6", "D2", "D3", "D5", "F6"]
+    },
+    "diode_direction": "ROW2COL",
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "nkro": true,
+        "rgb_matrix": true
+    },
+    "build": {
+        "lto": true
+    },
+    "debounce": 3,
+    "layouts": {
+        "LAYOUT_60_ansi_arrow": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 12], "x": 13, "y": 3},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4},
+                {"matrix": [4, 10], "x": 11, "y": 4},
+                {"matrix": [4, 11], "x": 12, "y": 4},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/kprepublic/bm60hsrgb/rev2/rules.mk b/keyboards/kprepublic/bm60hsrgb/rev2/rules.mk
index cbe283378da..bb6c11ea531 100644
--- a/keyboards/kprepublic/bm60hsrgb/rev2/rules.mk
+++ b/keyboards/kprepublic/bm60hsrgb/rev2/rules.mk
@@ -1,17 +1,3 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-LTO_ENABLE = yes
-RGB_MATRIX_ENABLE = yes
 WS2812_DRIVER_REQUIRED = yes
 
 COMMON_VPATH += $(DRIVER_PATH)/led/issi
diff --git a/keyboards/kprepublic/bm60hsrgb_iso/rev2/info.json b/keyboards/kprepublic/bm60hsrgb_iso/rev2/info.json
deleted file mode 100644
index 111534b0f81..00000000000
--- a/keyboards/kprepublic/bm60hsrgb_iso/rev2/info.json
+++ /dev/null
@@ -1,169 +0,0 @@
-{
-    "keyboard_name": "BM60HSRGB_ISO Rev2",
-    "manufacturer": "KPRepublic",
-    "url": "",
-    "maintainer": "kp republic",
-    "usb": {
-        "vid": "0x4B50",
-        "pid": "0x1123",
-        "device_version": "0.0.2"
-    },
-    "ws2812": {
-        "pin": "F0"
-    },
-    "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,
-            "rainbow_moving_chevron": true,
-            "cycle_out_in": true,
-            "cycle_out_in_dual": 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_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
-        },
-        "default": {
-            "animation": "cycle_all"
-        },
-        "driver": "custom",
-        "max_brightness": 180,
-        "sleep": true
-    },
-    "rgblight": {
-        "saturation_steps": 8,
-        "brightness_steps": 8,
-        "led_count": 6,
-        "max_brightness": 150,
-        "animations": {
-            "breathing": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "snake": true,
-            "knight": true,
-            "christmas": true,
-            "static_gradient": true,
-            "rgb_test": true,
-            "alternating": true,
-            "twinkle": true
-        },
-        "default": {
-            "animation": "rainbow_mood"
-        }
-    },
-    "matrix_pins": {
-        "cols": ["B2", "B3", "B7", "B0", "B1", "F7", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7"],
-        "rows": ["E6", "D2", "D3", "D5", "F6"]
-    },
-    "diode_direction": "ROW2COL",
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "debounce": 3,
-    "layouts": {
-        "LAYOUT_60_iso_arrow": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 12], "x": 12.75, "y": 2},
-                {"matrix": [1, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
-                {"matrix": [4, 3], "x": 1.25, "y": 3},
-                {"matrix": [3, 1], "x": 2.25, "y": 3},
-                {"matrix": [3, 2], "x": 3.25, "y": 3},
-                {"matrix": [3, 3], "x": 4.25, "y": 3},
-                {"matrix": [3, 4], "x": 5.25, "y": 3},
-                {"matrix": [3, 5], "x": 6.25, "y": 3},
-                {"matrix": [3, 6], "x": 7.25, "y": 3},
-                {"matrix": [3, 7], "x": 8.25, "y": 3},
-                {"matrix": [3, 8], "x": 9.25, "y": 3},
-                {"matrix": [3, 9], "x": 10.25, "y": 3},
-                {"matrix": [3, 11], "x": 11.25, "y": 3, "w": 1.75},
-                {"matrix": [3, 12], "x": 13, "y": 3},
-                {"matrix": [3, 13], "x": 14, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
-                {"matrix": [4, 9], "x": 10, "y": 4},
-                {"matrix": [4, 10], "x": 11, "y": 4},
-                {"matrix": [4, 11], "x": 12, "y": 4},
-                {"matrix": [4, 12], "x": 13, "y": 4},
-                {"matrix": [4, 13], "x": 14, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/kprepublic/bm60hsrgb_iso/rev2/keyboard.json b/keyboards/kprepublic/bm60hsrgb_iso/rev2/keyboard.json
new file mode 100644
index 00000000000..e84817122e4
--- /dev/null
+++ b/keyboards/kprepublic/bm60hsrgb_iso/rev2/keyboard.json
@@ -0,0 +1,179 @@
+{
+    "keyboard_name": "BM60HSRGB_ISO Rev2",
+    "manufacturer": "KPRepublic",
+    "url": "",
+    "maintainer": "kp republic",
+    "usb": {
+        "vid": "0x4B50",
+        "pid": "0x1123",
+        "device_version": "0.0.2"
+    },
+    "ws2812": {
+        "pin": "F0"
+    },
+    "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,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": 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_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
+        },
+        "default": {
+            "animation": "cycle_all"
+        },
+        "driver": "custom",
+        "max_brightness": 180,
+        "sleep": true
+    },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 6,
+        "max_brightness": 150,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": true,
+            "twinkle": true
+        },
+        "default": {
+            "animation": "rainbow_mood"
+        }
+    },
+    "matrix_pins": {
+        "cols": ["B2", "B3", "B7", "B0", "B1", "F7", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7"],
+        "rows": ["E6", "D2", "D3", "D5", "F6"]
+    },
+    "diode_direction": "ROW2COL",
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "nkro": true,
+        "rgb_matrix": true
+    },
+    "build": {
+        "lto": true
+    },
+    "debounce": 3,
+    "layouts": {
+        "LAYOUT_60_iso_arrow": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [1, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [4, 3], "x": 1.25, "y": 3},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 12], "x": 13, "y": 3},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4},
+                {"matrix": [4, 10], "x": 11, "y": 4},
+                {"matrix": [4, 11], "x": 12, "y": 4},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/kprepublic/bm60hsrgb_iso/rev2/rules.mk b/keyboards/kprepublic/bm60hsrgb_iso/rev2/rules.mk
index d84cbc0bf15..7012deda8c0 100644
--- a/keyboards/kprepublic/bm60hsrgb_iso/rev2/rules.mk
+++ b/keyboards/kprepublic/bm60hsrgb_iso/rev2/rules.mk
@@ -1,20 +1,3 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-AUDIO_ENABLE = no           # Audio output
-LTO_ENABLE = yes
-
-
-# RGB Matrix is required to support per-key LEDs connected to IS31FL3733.
-RGB_MATRIX_ENABLE = yes
-
 # The custom RGB Matrix driver combines IS31FL3733 and WS2812; things that are
 # normally done by common_features.mk for both of these drivers need to be done
 # here manually.
diff --git a/keyboards/kprepublic/bm60hsrgb_poker/rev2/info.json b/keyboards/kprepublic/bm60hsrgb_poker/rev2/info.json
deleted file mode 100644
index 9f16eb21210..00000000000
--- a/keyboards/kprepublic/bm60hsrgb_poker/rev2/info.json
+++ /dev/null
@@ -1,162 +0,0 @@
-{
-    "keyboard_name": "BM60HSRGB Poker Rev2",
-    "manufacturer": "KPrepublic",
-    "url": "",
-    "maintainer": "bdtc123",
-    "usb": {
-        "vid": "0x4B50",
-        "pid": "0x1122",
-        "device_version": "0.0.2"
-    },
-    "ws2812": {
-        "pin": "F0"
-    },
-    "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,
-            "rainbow_moving_chevron": true,
-            "cycle_out_in": true,
-            "cycle_out_in_dual": 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_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": "custom",
-        "max_brightness": 120,
-        "sleep": true
-    },
-    "rgblight": {
-        "saturation_steps": 8,
-        "brightness_steps": 8,
-        "led_count": 6,
-        "max_brightness": 150,
-        "animations": {
-            "breathing": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "snake": true,
-            "knight": true,
-            "christmas": true,
-            "static_gradient": true,
-            "rgb_test": true,
-            "alternating": true
-        },
-        "default": {
-            "animation": "rainbow_mood"
-        }
-    },
-    "matrix_pins": {
-        "cols": ["B2", "B3", "B7", "B0", "B1", "F7", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7"],
-        "rows": ["E6", "D2", "D3", "D5", "F6"]
-    },
-    "diode_direction": "ROW2COL",
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "community_layouts": ["60_ansi"],
-    "layouts": {
-        "LAYOUT_60_ansi": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 1], "x": 2.25, "y": 3},
-                {"matrix": [3, 2], "x": 3.25, "y": 3},
-                {"matrix": [3, 3], "x": 4.25, "y": 3},
-                {"matrix": [3, 4], "x": 5.25, "y": 3},
-                {"matrix": [3, 5], "x": 6.25, "y": 3},
-                {"matrix": [3, 6], "x": 7.25, "y": 3},
-                {"matrix": [3, 7], "x": 8.25, "y": 3},
-                {"matrix": [3, 8], "x": 9.25, "y": 3},
-                {"matrix": [3, 9], "x": 10.25, "y": 3},
-                {"matrix": [3, 10], "x": 11.25, "y": 3},
-                {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 2.75},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
-                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
-                {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 11], "x": 12.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
-            ]
-        }
-    }
-}
diff --git a/keyboards/kprepublic/bm60hsrgb_poker/rev2/keyboard.json b/keyboards/kprepublic/bm60hsrgb_poker/rev2/keyboard.json
new file mode 100644
index 00000000000..62ff452a68c
--- /dev/null
+++ b/keyboards/kprepublic/bm60hsrgb_poker/rev2/keyboard.json
@@ -0,0 +1,172 @@
+{
+    "keyboard_name": "BM60HSRGB Poker Rev2",
+    "manufacturer": "KPrepublic",
+    "url": "",
+    "maintainer": "bdtc123",
+    "usb": {
+        "vid": "0x4B50",
+        "pid": "0x1122",
+        "device_version": "0.0.2"
+    },
+    "ws2812": {
+        "pin": "F0"
+    },
+    "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,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": 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_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": "custom",
+        "max_brightness": 120,
+        "sleep": true
+    },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 6,
+        "max_brightness": 150,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": true
+        },
+        "default": {
+            "animation": "rainbow_mood"
+        }
+    },
+    "matrix_pins": {
+        "cols": ["B2", "B3", "B7", "B0", "B1", "F7", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7"],
+        "rows": ["E6", "D2", "D3", "D5", "F6"]
+    },
+    "diode_direction": "ROW2COL",
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "nkro": true,
+        "rgb_matrix": true
+    },
+    "build": {
+        "lto": true
+    },
+    "community_layouts": ["60_ansi"],
+    "layouts": {
+        "LAYOUT_60_ansi": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 10], "x": 11.25, "y": 3},
+                {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 2.75},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/kprepublic/bm60hsrgb_poker/rev2/rules.mk b/keyboards/kprepublic/bm60hsrgb_poker/rev2/rules.mk
index 92b33edc1f8..7012deda8c0 100644
--- a/keyboards/kprepublic/bm60hsrgb_poker/rev2/rules.mk
+++ b/keyboards/kprepublic/bm60hsrgb_poker/rev2/rules.mk
@@ -1,19 +1,3 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-AUDIO_ENABLE = no           # Audio output
-LTO_ENABLE = yes
-
-# RGB Matrix is required to support per-key LEDs connected to IS31FL3733.
-RGB_MATRIX_ENABLE = yes
-
 # The custom RGB Matrix driver combines IS31FL3733 and WS2812; things that are
 # normally done by common_features.mk for both of these drivers need to be done
 # here manually.
diff --git a/keyboards/ktec/ergodone/info.json b/keyboards/ktec/ergodone/keyboard.json
similarity index 100%
rename from keyboards/ktec/ergodone/info.json
rename to keyboards/ktec/ergodone/keyboard.json
diff --git a/keyboards/kumaokobo/kudox/columner/keyboard.json b/keyboards/kumaokobo/kudox/columner/keyboard.json
index 5f7d4444114..903d0d97a57 100644
--- a/keyboards/kumaokobo/kudox/columner/keyboard.json
+++ b/keyboards/kumaokobo/kudox/columner/keyboard.json
@@ -14,6 +14,7 @@
     },
     "diode_direction": "COL2ROW",
     "split": {
+        "enabled": true,
         "soft_serial_pin": "D0"
     },
     "rgblight": {
@@ -38,6 +39,13 @@
     },
     "processor": "atmega32u4",
     "bootloader": "caterina",
+    "features": {
+        "bootmagic": false,
+        "mousekey": true,
+        "extrakey": true,
+        "command": true,
+        "rgblight": true
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/kumaokobo/kudox/info.json b/keyboards/kumaokobo/kudox/info.json
deleted file mode 100644
index 2b9790e84e6..00000000000
--- a/keyboards/kumaokobo/kudox/info.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "split": {
-        "enabled": true
-    }
-}
diff --git a/keyboards/kumaokobo/kudox/rev1/keyboard.json b/keyboards/kumaokobo/kudox/rev1/keyboard.json
index 52579e1c431..2be4cefc569 100644
--- a/keyboards/kumaokobo/kudox/rev1/keyboard.json
+++ b/keyboards/kumaokobo/kudox/rev1/keyboard.json
@@ -14,6 +14,7 @@
     },
     "diode_direction": "COL2ROW",
     "split": {
+        "enabled": true,
         "soft_serial_pin": "D0"
     },
     "rgblight": {
@@ -38,6 +39,13 @@
     },
     "processor": "atmega32u4",
     "bootloader": "caterina",
+    "features": {
+        "bootmagic": false,
+        "mousekey": true,
+        "extrakey": true,
+        "command": true,
+        "rgblight": true
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/kumaokobo/kudox/rev2/keyboard.json b/keyboards/kumaokobo/kudox/rev2/keyboard.json
index 98cb6bb4319..a5dad94322b 100644
--- a/keyboards/kumaokobo/kudox/rev2/keyboard.json
+++ b/keyboards/kumaokobo/kudox/rev2/keyboard.json
@@ -14,6 +14,7 @@
     },
     "diode_direction": "COL2ROW",
     "split": {
+        "enabled": true,
         "soft_serial_pin": "D0"
     },
     "rgblight": {
@@ -38,6 +39,13 @@
     },
     "processor": "atmega32u4",
     "bootloader": "caterina",
+    "features": {
+        "bootmagic": false,
+        "mousekey": true,
+        "extrakey": true,
+        "command": true,
+        "rgblight": true
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/kumaokobo/kudox/rev3/keyboard.json b/keyboards/kumaokobo/kudox/rev3/keyboard.json
index 35144cc25a1..1fe349a99ef 100644
--- a/keyboards/kumaokobo/kudox/rev3/keyboard.json
+++ b/keyboards/kumaokobo/kudox/rev3/keyboard.json
@@ -14,6 +14,7 @@
     },
     "diode_direction": "COL2ROW",
     "split": {
+        "enabled": true,
         "soft_serial_pin": "D0"
     },
     "rgblight": {
@@ -38,6 +39,13 @@
     },
     "processor": "atmega32u4",
     "bootloader": "caterina",
+    "features": {
+        "bootmagic": false,
+        "mousekey": true,
+        "extrakey": true,
+        "command": true,
+        "rgblight": true
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/kumaokobo/kudox/rules.mk b/keyboards/kumaokobo/kudox/rules.mk
index ff1dfc760e7..16c27e7c3b2 100644
--- a/keyboards/kumaokobo/kudox/rules.mk
+++ b/keyboards/kumaokobo/kudox/rules.mk
@@ -1,14 +1 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-AUDIO_ENABLE = no           # Audio output
-RGBLIGHT_ENABLE = yes       # Enable WS2812 RGB underlight.
-
 DEFAULT_FOLDER = kumaokobo/kudox/rev3
diff --git a/keyboards/kumaokobo/kudox_full/rev1/info.json b/keyboards/kumaokobo/kudox_full/rev1/info.json
deleted file mode 100644
index d12984f16e3..00000000000
--- a/keyboards/kumaokobo/kudox_full/rev1/info.json
+++ /dev/null
@@ -1,128 +0,0 @@
-{
-    "keyboard_name": "The Kudox Full Keyboard Rev1",
-    "manufacturer": "Kumao Kobo",
-    "url": "http://kumaokobo.com/",
-    "maintainer": "Kumao Kobo",
-    "usb": {
-        "vid": "0xABBA",
-        "pid": "0x9693",
-        "device_version": "1.0.0"
-    },
-    "matrix_pins": {
-        "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6", "D4"],
-        "rows": ["C6", "D7", "E6", "B4", "B5"]
-    },
-    "diode_direction": "COL2ROW",
-    "split": {
-        "enabled": true,
-        "soft_serial_pin": "D2"
-    },
-    "rgblight": {
-        "saturation_steps": 8,
-        "brightness_steps": 8,
-        "led_count": 14,
-        "animations": {
-            "breathing": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "snake": true,
-            "knight": true,
-            "christmas": true,
-            "static_gradient": true
-        }
-    },
-    "ws2812": {
-        "pin": "D3"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-
-                {"matrix": [5, 0], "x": 9, "y": 0},
-                {"matrix": [5, 1], "x": 10, "y": 0},
-                {"matrix": [5, 2], "x": 11, "y": 0},
-                {"matrix": [5, 3], "x": 12, "y": 0},
-                {"matrix": [5, 4], "x": 13, "y": 0},
-                {"matrix": [5, 5], "x": 14, "y": 0},
-                {"matrix": [5, 6], "x": 15, "y": 0},
-                {"matrix": [5, 7], "x": 16, "y": 0},
-                {"matrix": [5, 8], "x": 17, "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": [6, 0], "x": 9.5, "y": 1},
-                {"matrix": [6, 1], "x": 10.5, "y": 1},
-                {"matrix": [6, 2], "x": 11.5, "y": 1},
-                {"matrix": [6, 3], "x": 12.5, "y": 1},
-                {"matrix": [6, 4], "x": 13.5, "y": 1},
-                {"matrix": [6, 5], "x": 14.5, "y": 1},
-                {"matrix": [6, 6], "x": 15.5, "y": 1},
-                {"matrix": [6, 7], "x": 16.5, "y": 1, "w": 1.5},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-
-                {"matrix": [7, 0], "x": 9.75, "y": 2},
-                {"matrix": [7, 1], "x": 10.75, "y": 2},
-                {"matrix": [7, 2], "x": 11.75, "y": 2},
-                {"matrix": [7, 3], "x": 12.75, "y": 2},
-                {"matrix": [7, 4], "x": 13.75, "y": 2},
-                {"matrix": [7, 5], "x": 14.75, "y": 2},
-                {"matrix": [7, 6], "x": 15.75, "y": 2},
-                {"matrix": [7, 7], "x": 17, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 1], "x": 2.25, "y": 3},
-                {"matrix": [3, 2], "x": 3.25, "y": 3},
-                {"matrix": [3, 3], "x": 4.25, "y": 3},
-                {"matrix": [3, 4], "x": 5.25, "y": 3},
-                {"matrix": [3, 5], "x": 6.25, "y": 3},
-
-                {"matrix": [8, 0], "x": 9.25, "y": 3},
-                {"matrix": [8, 1], "x": 10.25, "y": 3},
-                {"matrix": [8, 2], "x": 11.25, "y": 3},
-                {"matrix": [8, 3], "x": 12.25, "y": 3},
-                {"matrix": [8, 4], "x": 13.25, "y": 3},
-                {"matrix": [8, 5], "x": 14.25, "y": 3},
-                {"matrix": [8, 6], "x": 15.25, "y": 3},
-                {"matrix": [8, 7], "x": 16.25, "y": 3},
-
-                {"matrix": [8, 8], "x": 17.5, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.5, "y": 4},
-                {"matrix": [4, 2], "x": 2.5, "y": 4},
-                {"matrix": [4, 3], "x": 3.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 4], "x": 5, "y": 4, "w": 1.25},
-                {"matrix": [4, 5], "x": 6.25, "y": 4},
-
-                {"matrix": [9, 0], "x": 9, "y": 4},
-                {"matrix": [9, 1], "x": 10, "y": 4},
-                {"matrix": [9, 2], "x": 11, "y": 4, "w": 1.25},
-
-                {"matrix": [9, 6], "x": 16, "y": 4},
-                {"matrix": [9, 7], "x": 17, "y": 4},
-                {"matrix": [9, 8], "x": 18, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/kumaokobo/kudox_full/rev1/keyboard.json b/keyboards/kumaokobo/kudox_full/rev1/keyboard.json
new file mode 100644
index 00000000000..046bc8e1824
--- /dev/null
+++ b/keyboards/kumaokobo/kudox_full/rev1/keyboard.json
@@ -0,0 +1,139 @@
+{
+    "keyboard_name": "The Kudox Full Keyboard Rev1",
+    "manufacturer": "Kumao Kobo",
+    "url": "http://kumaokobo.com/",
+    "maintainer": "Kumao Kobo",
+    "usb": {
+        "vid": "0xABBA",
+        "pid": "0x9693",
+        "device_version": "1.0.0"
+    },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6", "D4"],
+        "rows": ["C6", "D7", "E6", "B4", "B5"]
+    },
+    "diode_direction": "COL2ROW",
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "D2"
+    },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 14,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true
+        }
+    },
+    "ws2812": {
+        "pin": "D3"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "rgblight": true,
+        "unicode": true,
+        "oled": true
+    },
+    "build": {
+        "lto": true
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+
+                {"matrix": [5, 0], "x": 9, "y": 0},
+                {"matrix": [5, 1], "x": 10, "y": 0},
+                {"matrix": [5, 2], "x": 11, "y": 0},
+                {"matrix": [5, 3], "x": 12, "y": 0},
+                {"matrix": [5, 4], "x": 13, "y": 0},
+                {"matrix": [5, 5], "x": 14, "y": 0},
+                {"matrix": [5, 6], "x": 15, "y": 0},
+                {"matrix": [5, 7], "x": 16, "y": 0},
+                {"matrix": [5, 8], "x": 17, "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": [6, 0], "x": 9.5, "y": 1},
+                {"matrix": [6, 1], "x": 10.5, "y": 1},
+                {"matrix": [6, 2], "x": 11.5, "y": 1},
+                {"matrix": [6, 3], "x": 12.5, "y": 1},
+                {"matrix": [6, 4], "x": 13.5, "y": 1},
+                {"matrix": [6, 5], "x": 14.5, "y": 1},
+                {"matrix": [6, 6], "x": 15.5, "y": 1},
+                {"matrix": [6, 7], "x": 16.5, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+
+                {"matrix": [7, 0], "x": 9.75, "y": 2},
+                {"matrix": [7, 1], "x": 10.75, "y": 2},
+                {"matrix": [7, 2], "x": 11.75, "y": 2},
+                {"matrix": [7, 3], "x": 12.75, "y": 2},
+                {"matrix": [7, 4], "x": 13.75, "y": 2},
+                {"matrix": [7, 5], "x": 14.75, "y": 2},
+                {"matrix": [7, 6], "x": 15.75, "y": 2},
+                {"matrix": [7, 7], "x": 17, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+
+                {"matrix": [8, 0], "x": 9.25, "y": 3},
+                {"matrix": [8, 1], "x": 10.25, "y": 3},
+                {"matrix": [8, 2], "x": 11.25, "y": 3},
+                {"matrix": [8, 3], "x": 12.25, "y": 3},
+                {"matrix": [8, 4], "x": 13.25, "y": 3},
+                {"matrix": [8, 5], "x": 14.25, "y": 3},
+                {"matrix": [8, 6], "x": 15.25, "y": 3},
+                {"matrix": [8, 7], "x": 16.25, "y": 3},
+
+                {"matrix": [8, 8], "x": 17.5, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 2], "x": 2.5, "y": 4},
+                {"matrix": [4, 3], "x": 3.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 5, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 6.25, "y": 4},
+
+                {"matrix": [9, 0], "x": 9, "y": 4},
+                {"matrix": [9, 1], "x": 10, "y": 4},
+                {"matrix": [9, 2], "x": 11, "y": 4, "w": 1.25},
+
+                {"matrix": [9, 6], "x": 16, "y": 4},
+                {"matrix": [9, 7], "x": 17, "y": 4},
+                {"matrix": [9, 8], "x": 18, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/kumaokobo/kudox_full/rev1/rules.mk b/keyboards/kumaokobo/kudox_full/rev1/rules.mk
deleted file mode 100644
index dd68e9d3b09..00000000000
--- a/keyboards/kumaokobo/kudox_full/rev1/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-OLED_ENABLE = yes
diff --git a/keyboards/kumaokobo/kudox_full/rules.mk b/keyboards/kumaokobo/kudox_full/rules.mk
index 2924b7cee57..c912dcd2e5c 100644
--- a/keyboards/kumaokobo/kudox_full/rules.mk
+++ b/keyboards/kumaokobo/kudox_full/rules.mk
@@ -1,16 +1 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-UNICODE_ENABLE = yes        # Unicode
-LTO_ENABLE = yes
-
 DEFAULT_FOLDER = kumaokobo/kudox_full/rev1
diff --git a/keyboards/kumaokobo/kudox_game/info.json b/keyboards/kumaokobo/kudox_game/info.json
index 0c38991bbb0..6968b5e427e 100644
--- a/keyboards/kumaokobo/kudox_game/info.json
+++ b/keyboards/kumaokobo/kudox_game/info.json
@@ -3,14 +3,6 @@
     "manufacturer": "Kumao Kobo",
     "url": "",
     "maintainer": "Kumao Kobo",
-    "features": {
-        "bootmagic": false,
-        "command": true,
-        "console": false,
-        "extrakey": true,
-        "mousekey": true,
-        "nkro": false
-    },
     "usb": {
         "vid": "0xABBA",
         "pid": "0x9696"
diff --git a/keyboards/kumaokobo/kudox_game/rev1/keyboard.json b/keyboards/kumaokobo/kudox_game/rev1/keyboard.json
index e5c39fce316..2163b89d971 100644
--- a/keyboards/kumaokobo/kudox_game/rev1/keyboard.json
+++ b/keyboards/kumaokobo/kudox_game/rev1/keyboard.json
@@ -27,6 +27,14 @@
         "rows": ["D4", "D7", "E6", "B4", "B5"]
     },
     "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": false,
+        "command": true,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": false
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/kumaokobo/kudox_game/rev2/info.json b/keyboards/kumaokobo/kudox_game/rev2/info.json
deleted file mode 100644
index e811c70d5ba..00000000000
--- a/keyboards/kumaokobo/kudox_game/rev2/info.json
+++ /dev/null
@@ -1,67 +0,0 @@
-{
-    "usb": {
-        "device_version": "2.0.0"
-    },
-    "rgblight": {
-        "saturation_steps": 8,
-        "brightness_steps": 8,
-        "led_count": 7,
-        "animations": {
-            "breathing": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "snake": true,
-            "knight": true,
-            "christmas": true,
-            "static_gradient": true,
-            "rgb_test": true,
-            "alternating": true,
-            "twinkle": true
-        }
-    },
-    "ws2812": {
-        "pin": "D3"
-    },
-    "matrix_pins": {
-        "cols": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"],
-        "rows": ["D4", "D7", "E6", "B4", "B5"]
-    },
-    "diode_direction": "COL2ROW",
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-
-                {"matrix": [0, 1], "x": 1.5, "y": 0},
-                {"matrix": [0, 2], "x": 2.5, "y": 0},
-                {"matrix": [0, 3], "x": 3.5, "y": 0},
-                {"matrix": [0, 4], "x": 4.5, "y": 0},
-                {"matrix": [0, 5], "x": 5.5, "y": 0},
-
-                {"matrix": [1, 1], "x": 1.75, "y": 1},
-                {"matrix": [1, 2], "x": 2.75, "y": 1},
-                {"matrix": [1, 3], "x": 3.75, "y": 1},
-                {"matrix": [1, 4], "x": 4.75, "y": 1},
-                {"matrix": [1, 5], "x": 5.75, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2},
-                {"matrix": [2, 1], "x": 1, "y": 2},
-                {"matrix": [2, 2], "x": 2, "y": 2},
-                {"matrix": [2, 3], "x": 3, "y": 2},
-                {"matrix": [2, 4], "x": 4, "y": 2},
-                {"matrix": [2, 5], "x": 5.25, "y": 2},
-                {"matrix": [2, 6], "x": 6.25, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.5},
-                {"matrix": [3, 1], "x": 1.5, "y": 3},
-                {"matrix": [3, 4], "x": 3.75, "y": 3},
-                {"matrix": [3, 5], "x": 4.75, "y": 3},
-                {"matrix": [3, 6], "x": 5.75, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
-                {"matrix": [4, 5], "x": 5.5, "y": 4.25, "h": 1.5},
-                {"matrix": [4, 6], "x": 6.5, "y": 4.75, "h": 2}
-            ]
-        }
-    }
-}
diff --git a/keyboards/kumaokobo/kudox_game/rev2/keyboard.json b/keyboards/kumaokobo/kudox_game/rev2/keyboard.json
new file mode 100644
index 00000000000..554d03c76bd
--- /dev/null
+++ b/keyboards/kumaokobo/kudox_game/rev2/keyboard.json
@@ -0,0 +1,76 @@
+{
+    "usb": {
+        "device_version": "2.0.0"
+    },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 7,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": true,
+            "twinkle": true
+        }
+    },
+    "ws2812": {
+        "pin": "D3"
+    },
+    "matrix_pins": {
+        "cols": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"],
+        "rows": ["D4", "D7", "E6", "B4", "B5"]
+    },
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": false,
+        "command": true,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": false,
+        "rgblight": true
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.5, "y": 0},
+                {"matrix": [0, 2], "x": 2.5, "y": 0},
+                {"matrix": [0, 3], "x": 3.5, "y": 0},
+                {"matrix": [0, 4], "x": 4.5, "y": 0},
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+
+                {"matrix": [1, 1], "x": 1.75, "y": 1},
+                {"matrix": [1, 2], "x": 2.75, "y": 1},
+                {"matrix": [1, 3], "x": 3.75, "y": 1},
+                {"matrix": [1, 4], "x": 4.75, "y": 1},
+                {"matrix": [1, 5], "x": 5.75, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5.25, "y": 2},
+                {"matrix": [2, 6], "x": 6.25, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.5},
+                {"matrix": [3, 1], "x": 1.5, "y": 3},
+                {"matrix": [3, 4], "x": 3.75, "y": 3},
+                {"matrix": [3, 5], "x": 4.75, "y": 3},
+                {"matrix": [3, 6], "x": 5.75, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 5], "x": 5.5, "y": 4.25, "h": 1.5},
+                {"matrix": [4, 6], "x": 6.5, "y": 4.75, "h": 2}
+            ]
+        }
+    }
+}
diff --git a/keyboards/kumaokobo/kudox_game/rev2/rules.mk b/keyboards/kumaokobo/kudox_game/rev2/rules.mk
deleted file mode 100644
index 1e3cebb1451..00000000000
--- a/keyboards/kumaokobo/kudox_game/rev2/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-RGBLIGHT_ENABLE = yes
diff --git a/keyboards/kumaokobo/pico/65keys/keyboard.json b/keyboards/kumaokobo/pico/65keys/keyboard.json
index 260b2db1e90..efcc96e1dcd 100644
--- a/keyboards/kumaokobo/pico/65keys/keyboard.json
+++ b/keyboards/kumaokobo/pico/65keys/keyboard.json
@@ -14,6 +14,7 @@
     },
     "diode_direction": "COL2ROW",
     "split": {
+        "enabled": true,
         "soft_serial_pin": "D0"
     },
     "rgblight": {
@@ -38,6 +39,13 @@
     },
     "processor": "atmega32u4",
     "bootloader": "caterina",
+    "features": {
+        "bootmagic": false,
+        "mousekey": true,
+        "extrakey": true,
+        "command": true,
+        "rgblight": true
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/kumaokobo/pico/70keys/keyboard.json b/keyboards/kumaokobo/pico/70keys/keyboard.json
index ed3c8163d13..8fe91b84cce 100644
--- a/keyboards/kumaokobo/pico/70keys/keyboard.json
+++ b/keyboards/kumaokobo/pico/70keys/keyboard.json
@@ -14,6 +14,7 @@
     },
     "diode_direction": "COL2ROW",
     "split": {
+        "enabled": true,
         "soft_serial_pin": "D0"
     },
     "rgblight": {
@@ -38,6 +39,13 @@
     },
     "processor": "atmega32u4",
     "bootloader": "caterina",
+    "features": {
+        "bootmagic": false,
+        "mousekey": true,
+        "extrakey": true,
+        "command": true,
+        "rgblight": true
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/kumaokobo/pico/info.json b/keyboards/kumaokobo/pico/info.json
deleted file mode 100644
index 2b9790e84e6..00000000000
--- a/keyboards/kumaokobo/pico/info.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "split": {
-        "enabled": true
-    }
-}
diff --git a/keyboards/kumaokobo/pico/rules.mk b/keyboards/kumaokobo/pico/rules.mk
index 36372376ea1..df859afa0fa 100644
--- a/keyboards/kumaokobo/pico/rules.mk
+++ b/keyboards/kumaokobo/pico/rules.mk
@@ -1,14 +1 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-AUDIO_ENABLE = no           # Audio output
-RGBLIGHT_ENABLE = yes       # Enable WS2812 RGB underlight.
-
 DEFAULT_FOLDER = kumaokobo/pico/65keys
diff --git a/keyboards/kv/revt/keyboard.json b/keyboards/kv/revt/keyboard.json
index c54a4ba537c..1c2ee5a84ab 100644
--- a/keyboards/kv/revt/keyboard.json
+++ b/keyboards/kv/revt/keyboard.json
@@ -21,9 +21,7 @@
         "rows": ["A6", "B13", "B8", "A0", "A1", "A2"]
     },
     "diode_direction": "COL2ROW",
-    "processor": "STM32F303",
-    "bootloader": "stm32-dfu",
-    "board": "QMK_PROTON_C",
+    "development_board": "proton_c",
     "layouts": {
         "LAYOUT_default": {
             "layout": [
diff --git a/keyboards/latincompass/latin47ble/info.json b/keyboards/latincompass/latin47ble/info.json
deleted file mode 100644
index 64ab0bd85c9..00000000000
--- a/keyboards/latincompass/latin47ble/info.json
+++ /dev/null
@@ -1,101 +0,0 @@
-{
-    "keyboard_name": "Latin47BLE",
-    "manufacturer": "latincompass",
-    "url": "",
-    "maintainer": "latincompass",
-    "usb": {
-        "vid": "0x6C63",
-        "pid": "0x6C62",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["D6", "D7", "B5", "B6", "C6", "C7", "F7", "F6", "F5", "F4", "F1", "F0"],
-        "rows": ["D0", "D1", "D2", "D3"]
-    },
-    "diode_direction": "COL2ROW",
-    "rgblight": {
-        "saturation_steps": 8,
-        "brightness_steps": 8,
-        "led_count": 3,
-        "animations": {
-            "breathing": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "snake": true,
-            "knight": true,
-            "christmas": true,
-            "static_gradient": true,
-            "rgb_test": true,
-            "alternating": true,
-            "twinkle": true
-        }
-    },
-    "tapping": {
-        "term": 250
-    },
-    "bluetooth": {
-        "driver": "bluefruit_le"
-    },
-    "ws2812": {
-        "pin": "B7"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
-    "community_layouts": ["planck_mit"],
-    "layouts": {
-        "LAYOUT_planck_mit": {
-            "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": [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": [1, 4], "x": 4, "y": 1},
-                {"matrix": [1, 5], "x": 5, "y": 1},
-                {"matrix": [1, 6], "x": 6, "y": 1},
-                {"matrix": [1, 7], "x": 7, "y": 1},
-                {"matrix": [1, 8], "x": 8, "y": 1},
-                {"matrix": [1, 9], "x": 9, "y": 1},
-                {"matrix": [1, 10], "x": 10, "y": 1},
-                {"matrix": [1, 11], "x": 11, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2},
-                {"matrix": [2, 1], "x": 1, "y": 2},
-                {"matrix": [2, 2], "x": 2, "y": 2},
-                {"matrix": [2, 3], "x": 3, "y": 2},
-                {"matrix": [2, 4], "x": 4, "y": 2},
-                {"matrix": [2, 5], "x": 5, "y": 2},
-                {"matrix": [2, 6], "x": 6, "y": 2},
-                {"matrix": [2, 7], "x": 7, "y": 2},
-                {"matrix": [2, 8], "x": 8, "y": 2},
-                {"matrix": [2, 9], "x": 9, "y": 2},
-                {"matrix": [2, 10], "x": 10, "y": 2},
-                {"matrix": [2, 11], "x": 11, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3},
-                {"matrix": [3, 1], "x": 1, "y": 3},
-                {"matrix": [3, 2], "x": 2, "y": 3},
-                {"matrix": [3, 3], "x": 3, "y": 3},
-                {"matrix": [3, 4], "x": 4, "y": 3},
-                {"matrix": [3, 5], "x": 5, "y": 3, "w": 2},
-                {"matrix": [3, 6], "x": 7, "y": 3},
-                {"matrix": [3, 7], "x": 8, "y": 3},
-                {"matrix": [3, 8], "x": 9, "y": 3},
-                {"matrix": [3, 9], "x": 10, "y": 3},
-                {"matrix": [3, 10], "x": 11, "y": 3}
-            ]
-        }
-    }
-}
diff --git a/keyboards/latincompass/latin47ble/keyboard.json b/keyboards/latincompass/latin47ble/keyboard.json
new file mode 100644
index 00000000000..b0b14d66446
--- /dev/null
+++ b/keyboards/latincompass/latin47ble/keyboard.json
@@ -0,0 +1,108 @@
+{
+    "keyboard_name": "Latin47BLE",
+    "manufacturer": "latincompass",
+    "url": "",
+    "maintainer": "latincompass",
+    "usb": {
+        "vid": "0x6C63",
+        "pid": "0x6C62",
+        "device_version": "0.0.1"
+    },
+    "matrix_pins": {
+        "cols": ["D6", "D7", "B5", "B6", "C6", "C7", "F7", "F6", "F5", "F4", "F1", "F0"],
+        "rows": ["D0", "D1", "D2", "D3"]
+    },
+    "diode_direction": "COL2ROW",
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 3,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": true,
+            "twinkle": true
+        }
+    },
+    "tapping": {
+        "term": 250
+    },
+    "bluetooth": {
+        "driver": "bluefruit_le"
+    },
+    "ws2812": {
+        "pin": "B7"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "rgblight": true,
+        "bluetooth": true
+    },
+    "community_layouts": ["planck_mit"],
+    "layouts": {
+        "LAYOUT_planck_mit": {
+            "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": [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": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [2, 6], "x": 6, "y": 2},
+                {"matrix": [2, 7], "x": 7, "y": 2},
+                {"matrix": [2, 8], "x": 8, "y": 2},
+                {"matrix": [2, 9], "x": 9, "y": 2},
+                {"matrix": [2, 10], "x": 10, "y": 2},
+                {"matrix": [2, 11], "x": 11, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3, "w": 2},
+                {"matrix": [3, 6], "x": 7, "y": 3},
+                {"matrix": [3, 7], "x": 8, "y": 3},
+                {"matrix": [3, 8], "x": 9, "y": 3},
+                {"matrix": [3, 9], "x": 10, "y": 3},
+                {"matrix": [3, 10], "x": 11, "y": 3}
+            ]
+        }
+    }
+}
diff --git a/keyboards/latincompass/latin47ble/rules.mk b/keyboards/latincompass/latin47ble/rules.mk
index 1c65d3584ea..3437a35bdf1 100644
--- a/keyboards/latincompass/latin47ble/rules.mk
+++ b/keyboards/latincompass/latin47ble/rules.mk
@@ -1,16 +1,2 @@
 # Processor frequency
 F_CPU = 8000000
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-BLUETOOTH_ENABLE = yes
diff --git a/keyboards/latincompass/latin64ble/info.json b/keyboards/latincompass/latin64ble/info.json
deleted file mode 100644
index cce49aea054..00000000000
--- a/keyboards/latincompass/latin64ble/info.json
+++ /dev/null
@@ -1,114 +0,0 @@
-{
-    "keyboard_name": "Latin64BLE",
-    "manufacturer": "latincompass",
-    "url": "",
-    "maintainer": "latincompass",
-    "usb": {
-        "vid": "0x6C63",
-        "pid": "0x6C71",
-        "device_version": "0.0.1"
-    },
-    "bluetooth": {
-        "driver": "bluefruit_le"
-    },
-    "rgblight": {
-        "brightness_steps": 25,
-        "led_count": 2,
-        "animations": {
-            "breathing": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "snake": true,
-            "knight": true,
-            "christmas": true,
-            "static_gradient": true,
-            "rgb_test": true,
-            "alternating": true,
-            "twinkle": true
-        }
-    },
-    "ws2812": {
-        "pin": "B7"
-    },
-    "matrix_pins": {
-        "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6"],
-        "rows": ["D0", "D1", "D2", "D3", "D6", "D7", "B5", "B6"]
-    },
-    "diode_direction": "ROW2COL",
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [1, 0], "x": 8, "y": 0},
-                {"matrix": [1, 1], "x": 9, "y": 0},
-                {"matrix": [1, 2], "x": 10, "y": 0},
-                {"matrix": [1, 3], "x": 11, "y": 0},
-                {"matrix": [1, 4], "x": 12, "y": 0},
-                {"matrix": [1, 5], "x": 13, "y": 0, "w": 2},
-
-                {"matrix": [1, 6], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 7], "x": 1.5, "y": 1},
-                {"matrix": [2, 0], "x": 2.5, "y": 1},
-                {"matrix": [2, 1], "x": 3.5, "y": 1},
-                {"matrix": [2, 2], "x": 4.5, "y": 1},
-                {"matrix": [2, 3], "x": 5.5, "y": 1},
-                {"matrix": [2, 4], "x": 6.5, "y": 1},
-                {"matrix": [2, 5], "x": 7.5, "y": 1},
-                {"matrix": [2, 6], "x": 8.5, "y": 1},
-                {"matrix": [2, 7], "x": 9.5, "y": 1},
-                {"matrix": [3, 0], "x": 10.5, "y": 1},
-                {"matrix": [3, 1], "x": 11.5, "y": 1},
-                {"matrix": [3, 2], "x": 12.5, "y": 1},
-                {"matrix": [3, 3], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"matrix": [3, 4], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [3, 5], "x": 1.75, "y": 2},
-                {"matrix": [3, 6], "x": 2.75, "y": 2},
-                {"matrix": [3, 7], "x": 3.75, "y": 2},
-                {"matrix": [4, 0], "x": 4.75, "y": 2},
-                {"matrix": [4, 1], "x": 5.75, "y": 2},
-                {"matrix": [4, 2], "x": 6.75, "y": 2},
-                {"matrix": [4, 3], "x": 7.75, "y": 2},
-                {"matrix": [4, 4], "x": 8.75, "y": 2},
-                {"matrix": [4, 5], "x": 9.75, "y": 2},
-                {"matrix": [4, 6], "x": 10.75, "y": 2},
-                {"matrix": [4, 7], "x": 11.75, "y": 2},
-                {"matrix": [5, 0], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"matrix": [5, 1], "x": 0, "y": 3, "w": 2},
-                {"matrix": [5, 2], "x": 2, "y": 3},
-                {"matrix": [5, 3], "x": 3, "y": 3},
-                {"matrix": [5, 4], "x": 4, "y": 3},
-                {"matrix": [5, 5], "x": 5, "y": 3},
-                {"matrix": [5, 6], "x": 6, "y": 3},
-                {"matrix": [5, 7], "x": 7, "y": 3},
-                {"matrix": [6, 0], "x": 8, "y": 3},
-                {"matrix": [6, 1], "x": 9, "y": 3},
-                {"matrix": [6, 2], "x": 10, "y": 3},
-                {"matrix": [6, 3], "x": 11, "y": 3},
-                {"matrix": [6, 4], "x": 12, "y": 3},
-                {"matrix": [6, 5], "x": 13, "y": 3},
-                {"matrix": [6, 6], "x": 14, "y": 3},
-
-                {"matrix": [6, 7], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [7, 0], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [7, 1], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [7, 2], "x": 3.75, "y": 4, "w": 6.25},
-                {"matrix": [7, 3], "x": 10, "y": 4},
-                {"matrix": [7, 4], "x": 11, "y": 4},
-                {"matrix": [7, 5], "x": 12, "y": 4},
-                {"matrix": [7, 6], "x": 13, "y": 4},
-                {"matrix": [7, 7], "x": 14, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/latincompass/latin64ble/keyboard.json b/keyboards/latincompass/latin64ble/keyboard.json
new file mode 100644
index 00000000000..b2563569d30
--- /dev/null
+++ b/keyboards/latincompass/latin64ble/keyboard.json
@@ -0,0 +1,121 @@
+{
+    "keyboard_name": "Latin64BLE",
+    "manufacturer": "latincompass",
+    "url": "",
+    "maintainer": "latincompass",
+    "usb": {
+        "vid": "0x6C63",
+        "pid": "0x6C71",
+        "device_version": "0.0.1"
+    },
+    "bluetooth": {
+        "driver": "bluefruit_le"
+    },
+    "rgblight": {
+        "brightness_steps": 25,
+        "led_count": 2,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": true,
+            "twinkle": true
+        }
+    },
+    "ws2812": {
+        "pin": "B7"
+    },
+    "matrix_pins": {
+        "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6"],
+        "rows": ["D0", "D1", "D2", "D3", "D6", "D7", "B5", "B6"]
+    },
+    "diode_direction": "ROW2COL",
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
+    "features": {
+        "bootmagic": false,
+        "mousekey": true,
+        "extrakey": true,
+        "rgblight": true,
+        "bluetooth": true
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [1, 0], "x": 8, "y": 0},
+                {"matrix": [1, 1], "x": 9, "y": 0},
+                {"matrix": [1, 2], "x": 10, "y": 0},
+                {"matrix": [1, 3], "x": 11, "y": 0},
+                {"matrix": [1, 4], "x": 12, "y": 0},
+                {"matrix": [1, 5], "x": 13, "y": 0, "w": 2},
+
+                {"matrix": [1, 6], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 7], "x": 1.5, "y": 1},
+                {"matrix": [2, 0], "x": 2.5, "y": 1},
+                {"matrix": [2, 1], "x": 3.5, "y": 1},
+                {"matrix": [2, 2], "x": 4.5, "y": 1},
+                {"matrix": [2, 3], "x": 5.5, "y": 1},
+                {"matrix": [2, 4], "x": 6.5, "y": 1},
+                {"matrix": [2, 5], "x": 7.5, "y": 1},
+                {"matrix": [2, 6], "x": 8.5, "y": 1},
+                {"matrix": [2, 7], "x": 9.5, "y": 1},
+                {"matrix": [3, 0], "x": 10.5, "y": 1},
+                {"matrix": [3, 1], "x": 11.5, "y": 1},
+                {"matrix": [3, 2], "x": 12.5, "y": 1},
+                {"matrix": [3, 3], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [3, 4], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [3, 5], "x": 1.75, "y": 2},
+                {"matrix": [3, 6], "x": 2.75, "y": 2},
+                {"matrix": [3, 7], "x": 3.75, "y": 2},
+                {"matrix": [4, 0], "x": 4.75, "y": 2},
+                {"matrix": [4, 1], "x": 5.75, "y": 2},
+                {"matrix": [4, 2], "x": 6.75, "y": 2},
+                {"matrix": [4, 3], "x": 7.75, "y": 2},
+                {"matrix": [4, 4], "x": 8.75, "y": 2},
+                {"matrix": [4, 5], "x": 9.75, "y": 2},
+                {"matrix": [4, 6], "x": 10.75, "y": 2},
+                {"matrix": [4, 7], "x": 11.75, "y": 2},
+                {"matrix": [5, 0], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [5, 1], "x": 0, "y": 3, "w": 2},
+                {"matrix": [5, 2], "x": 2, "y": 3},
+                {"matrix": [5, 3], "x": 3, "y": 3},
+                {"matrix": [5, 4], "x": 4, "y": 3},
+                {"matrix": [5, 5], "x": 5, "y": 3},
+                {"matrix": [5, 6], "x": 6, "y": 3},
+                {"matrix": [5, 7], "x": 7, "y": 3},
+                {"matrix": [6, 0], "x": 8, "y": 3},
+                {"matrix": [6, 1], "x": 9, "y": 3},
+                {"matrix": [6, 2], "x": 10, "y": 3},
+                {"matrix": [6, 3], "x": 11, "y": 3},
+                {"matrix": [6, 4], "x": 12, "y": 3},
+                {"matrix": [6, 5], "x": 13, "y": 3},
+                {"matrix": [6, 6], "x": 14, "y": 3},
+
+                {"matrix": [6, 7], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [7, 0], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [7, 1], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [7, 2], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [7, 3], "x": 10, "y": 4},
+                {"matrix": [7, 4], "x": 11, "y": 4},
+                {"matrix": [7, 5], "x": 12, "y": 4},
+                {"matrix": [7, 6], "x": 13, "y": 4},
+                {"matrix": [7, 7], "x": 14, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/latincompass/latin64ble/rules.mk b/keyboards/latincompass/latin64ble/rules.mk
index 6ad854a5a2b..3437a35bdf1 100644
--- a/keyboards/latincompass/latin64ble/rules.mk
+++ b/keyboards/latincompass/latin64ble/rules.mk
@@ -1,16 +1,2 @@
 # Processor frequency
 F_CPU = 8000000
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-BLUETOOTH_ENABLE = yes
diff --git a/keyboards/latincompass/latin6rgb/info.json b/keyboards/latincompass/latin6rgb/info.json
deleted file mode 100644
index 775b6d259e8..00000000000
--- a/keyboards/latincompass/latin6rgb/info.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-  "keyboard_name": "Latin6rgb",
-  "manufacturer": "18438880",
-  "url": "",
-  "maintainer": "18438880",
-  "usb": {
-    "vid": "0x7C88",
-    "pid": "0x7C96",
-    "device_version": "0.0.1"
-  },
-  "rgb_matrix": {
-    "animations": {
-      "alphas_mods": true,
-      "gradient_left_right": true,
-      "breathing": true,
-      "band_val": true,
-      "band_pinwheel_val": true,
-      "band_spiral_val": true,
-      "cycle_all": true,
-      "cycle_left_right": true,
-      "cycle_up_down": true,
-      "rainbow_moving_chevron": true,
-      "cycle_out_in": true,
-      "cycle_out_in_dual": 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_rain": true,
-      "pixel_flow": true,
-      "pixel_fractal": true,
-      "typing_heatmap": true,
-      "solid_reactive_simple": true,
-      "solid_reactive": true
-    },
-    "driver": "is31fl3731",
-    "sleep": true
-  },
-  "matrix_pins": {
-    "cols": ["F7", "F6", "F5"],
-    "rows": ["C7", "C6"]
-  },
-  "diode_direction": "ROW2COL",
-  "processor": "atmega32u4",
-  "bootloader": "atmel-dfu",
-  "debounce": 3,
-  "layouts": {
-    "LAYOUT_numpad_2x3": {
-      "layout": [
-        {"matrix": [0, 0], "x": 0, "y": 0},
-        {"matrix": [0, 1], "x": 1, "y": 0},
-        {"matrix": [0, 2], "x": 2, "y": 0},
-
-        {"matrix": [1, 0], "x": 0, "y": 1},
-        {"matrix": [1, 1], "x": 1, "y": 1},
-        {"matrix": [1, 2], "x": 2, "y": 1}
-      ]
-    }
-  }
-}
diff --git a/keyboards/latincompass/latin6rgb/keyboard.json b/keyboards/latincompass/latin6rgb/keyboard.json
new file mode 100644
index 00000000000..42aa82a030c
--- /dev/null
+++ b/keyboards/latincompass/latin6rgb/keyboard.json
@@ -0,0 +1,72 @@
+{
+  "keyboard_name": "Latin6rgb",
+  "manufacturer": "18438880",
+  "url": "",
+  "maintainer": "18438880",
+  "usb": {
+    "vid": "0x7C88",
+    "pid": "0x7C96",
+    "device_version": "0.0.1"
+  },
+  "rgb_matrix": {
+    "animations": {
+      "alphas_mods": true,
+      "gradient_left_right": true,
+      "breathing": true,
+      "band_val": true,
+      "band_pinwheel_val": true,
+      "band_spiral_val": true,
+      "cycle_all": true,
+      "cycle_left_right": true,
+      "cycle_up_down": true,
+      "rainbow_moving_chevron": true,
+      "cycle_out_in": true,
+      "cycle_out_in_dual": 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_rain": true,
+      "pixel_flow": true,
+      "pixel_fractal": true,
+      "typing_heatmap": true,
+      "solid_reactive_simple": true,
+      "solid_reactive": true
+    },
+    "driver": "is31fl3731",
+    "sleep": true
+  },
+  "matrix_pins": {
+    "cols": ["F7", "F6", "F5"],
+    "rows": ["C7", "C6"]
+  },
+  "diode_direction": "ROW2COL",
+  "processor": "atmega32u4",
+  "bootloader": "atmel-dfu",
+  "features": {
+    "bootmagic": true,
+    "mousekey": true,
+    "extrakey": true,
+    "rgb_matrix": true
+  },
+  "debounce": 3,
+  "layouts": {
+    "LAYOUT_numpad_2x3": {
+      "layout": [
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1},
+        {"matrix": [1, 1], "x": 1, "y": 1},
+        {"matrix": [1, 2], "x": 2, "y": 1}
+      ]
+    }
+  }
+}
diff --git a/keyboards/latincompass/latin6rgb/rules.mk b/keyboards/latincompass/latin6rgb/rules.mk
deleted file mode 100644
index c05a204a403..00000000000
--- a/keyboards/latincompass/latin6rgb/rules.mk
+++ /dev/null
@@ -1,17 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes          # Mouse keys
-EXTRAKEY_ENABLE = yes          # Audio control and System control
-CONSOLE_ENABLE = no            # Console for debug
-COMMAND_ENABLE = no            # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no          # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no           # Enable keyboard RGB underglow
-
-AUDIO_ENABLE = no              # Audio output
-
-RGB_MATRIX_ENABLE = yes
-
-RGB_MATRIX_SUPPORTED = yes
diff --git a/keyboards/latincompass/latinpadble/info.json b/keyboards/latincompass/latinpadble/keyboard.json
similarity index 100%
rename from keyboards/latincompass/latinpadble/info.json
rename to keyboards/latincompass/latinpadble/keyboard.json
diff --git a/keyboards/lazydesigners/dimple/ortho/info.json b/keyboards/lazydesigners/dimple/ortho/info.json
deleted file mode 100644
index 7328cfca79e..00000000000
--- a/keyboards/lazydesigners/dimple/ortho/info.json
+++ /dev/null
@@ -1,191 +0,0 @@
-{
-    "keyboard_name": "Dimple",
-    "manufacturer": "LazyDesigners",
-    "url": "http://lazydesigners.cn",
-    "maintainer": "Jacky@LAZYDESIGNERS",
-    "usb": {
-        "vid": "0x4C44",
-        "pid": "0x0040",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["B0", "B1", "B2", "B3", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7"],
-        "rows": ["D0", "D1", "D2", "D3"]
-    },
-    "diode_direction": "COL2ROW",
-    "rgblight": {
-        "led_count": 50,
-        "sleep": true,
-        "animations": {
-            "breathing": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "snake": true,
-            "knight": true,
-            "christmas": true,
-            "static_gradient": true,
-            "rgb_test": true,
-            "alternating": true,
-            "twinkle": true
-        }
-    },
-    "ws2812": {
-        "pin": "B7"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "layouts": {
-        "LAYOUT_ortho_2u": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0, "w": 1.25},
-                {"matrix": [0, 1], "x": 1.25, "y": 0},
-                {"matrix": [0, 2], "x": 2.25, "y": 0},
-                {"matrix": [0, 3], "x": 3.25, "y": 0},
-                {"matrix": [0, 4], "x": 4.25, "y": 0},
-                {"matrix": [0, 5], "x": 5.25, "y": 0},
-                {"matrix": [0, 6], "x": 6.25, "y": 0},
-                {"matrix": [0, 7], "x": 7.25, "y": 0},
-                {"matrix": [0, 8], "x": 8.25, "y": 0},
-                {"matrix": [0, 9], "x": 9.25, "y": 0},
-                {"matrix": [0, 10], "x": 10.25, "y": 0},
-                {"matrix": [0, 11], "x": 11.25, "y": 0, "w": 1.25},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
-                {"matrix": [1, 1], "x": 1.25, "y": 1},
-                {"matrix": [1, 2], "x": 2.25, "y": 1},
-                {"matrix": [1, 3], "x": 3.25, "y": 1},
-                {"matrix": [1, 4], "x": 4.25, "y": 1},
-                {"matrix": [1, 5], "x": 5.25, "y": 1},
-                {"matrix": [1, 6], "x": 6.25, "y": 1},
-                {"matrix": [1, 7], "x": 7.25, "y": 1},
-                {"matrix": [1, 8], "x": 8.25, "y": 1},
-                {"matrix": [1, 9], "x": 9.25, "y": 1},
-                {"matrix": [1, 10], "x": 10.25, "y": 1},
-                {"matrix": [1, 11], "x": 11.25, "y": 1, "w": 1.25},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.25},
-                {"matrix": [2, 1], "x": 1.25, "y": 2},
-                {"matrix": [2, 2], "x": 2.25, "y": 2},
-                {"matrix": [2, 3], "x": 3.25, "y": 2},
-                {"matrix": [2, 4], "x": 4.25, "y": 2},
-                {"matrix": [2, 5], "x": 5.25, "y": 2},
-                {"matrix": [2, 6], "x": 6.25, "y": 2},
-                {"matrix": [2, 7], "x": 7.25, "y": 2},
-                {"matrix": [2, 8], "x": 8.25, "y": 2},
-                {"matrix": [2, 9], "x": 9.25, "y": 2},
-                {"matrix": [2, 10], "x": 10.25, "y": 2},
-                {"matrix": [2, 11], "x": 11.25, "y": 2, "w": 1.25},
-
-                {"matrix": [3, 0], "x": 0.75, "y": 3},
-                {"matrix": [3, 2], "x": 1.75, "y": 3},
-                {"matrix": [3, 3], "x": 2.75, "y": 3},
-                {"matrix": [3, 4], "x": 3.75, "y": 3, "w": 2},
-                {"matrix": [3, 5], "x": 5.75, "y": 3},
-                {"matrix": [3, 6], "x": 6.75, "y": 3, "w": 2},
-                {"matrix": [3, 7], "x": 8.75, "y": 3},
-                {"matrix": [3, 8], "x": 9.75, "y": 3},
-                {"matrix": [3, 9], "x": 10.75, "y": 3}
-            ]
-        },
-        "LAYOUT_ortho_3u": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0, "w": 1.25},
-                {"matrix": [0, 1], "x": 1.25, "y": 0},
-                {"matrix": [0, 2], "x": 2.25, "y": 0},
-                {"matrix": [0, 3], "x": 3.25, "y": 0},
-                {"matrix": [0, 4], "x": 4.25, "y": 0},
-                {"matrix": [0, 5], "x": 5.25, "y": 0},
-                {"matrix": [0, 6], "x": 6.25, "y": 0},
-                {"matrix": [0, 7], "x": 7.25, "y": 0},
-                {"matrix": [0, 8], "x": 8.25, "y": 0},
-                {"matrix": [0, 9], "x": 9.25, "y": 0},
-                {"matrix": [0, 10], "x": 10.25, "y": 0},
-                {"matrix": [0, 11], "x": 11.25, "y": 0, "w": 1.25},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
-                {"matrix": [1, 1], "x": 1.25, "y": 1},
-                {"matrix": [1, 2], "x": 2.25, "y": 1},
-                {"matrix": [1, 3], "x": 3.25, "y": 1},
-                {"matrix": [1, 4], "x": 4.25, "y": 1},
-                {"matrix": [1, 5], "x": 5.25, "y": 1},
-                {"matrix": [1, 6], "x": 6.25, "y": 1},
-                {"matrix": [1, 7], "x": 7.25, "y": 1},
-                {"matrix": [1, 8], "x": 8.25, "y": 1},
-                {"matrix": [1, 9], "x": 9.25, "y": 1},
-                {"matrix": [1, 10], "x": 10.25, "y": 1},
-                {"matrix": [1, 11], "x": 11.25, "y": 1, "w": 1.25},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.25},
-                {"matrix": [2, 1], "x": 1.25, "y": 2},
-                {"matrix": [2, 2], "x": 2.25, "y": 2},
-                {"matrix": [2, 3], "x": 3.25, "y": 2},
-                {"matrix": [2, 4], "x": 4.25, "y": 2},
-                {"matrix": [2, 5], "x": 5.25, "y": 2},
-                {"matrix": [2, 6], "x": 6.25, "y": 2},
-                {"matrix": [2, 7], "x": 7.25, "y": 2},
-                {"matrix": [2, 8], "x": 8.25, "y": 2},
-                {"matrix": [2, 9], "x": 9.25, "y": 2},
-                {"matrix": [2, 10], "x": 10.25, "y": 2},
-                {"matrix": [2, 11], "x": 11.25, "y": 2, "w": 1.25},
-
-                {"matrix": [3, 0], "x": 0.75, "y": 3},
-                {"matrix": [3, 2], "x": 1.75, "y": 3},
-                {"matrix": [3, 3], "x": 2.75, "y": 3},
-                {"matrix": [3, 4], "x": 3.75, "y": 3},
-                {"matrix": [3, 5], "x": 4.75, "y": 3, "w": 3},
-                {"matrix": [3, 6], "x": 7.75, "y": 3},
-                {"matrix": [3, 7], "x": 8.75, "y": 3},
-                {"matrix": [3, 8], "x": 9.75, "y": 3},
-                {"matrix": [3, 9], "x": 10.75, "y": 3}
-            ]
-        },
-        "LAYOUT_ortho_7u": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0, "w": 1.25},
-                {"matrix": [0, 1], "x": 1.25, "y": 0},
-                {"matrix": [0, 2], "x": 2.25, "y": 0},
-                {"matrix": [0, 3], "x": 3.25, "y": 0},
-                {"matrix": [0, 4], "x": 4.25, "y": 0},
-                {"matrix": [0, 5], "x": 5.25, "y": 0},
-                {"matrix": [0, 6], "x": 6.25, "y": 0},
-                {"matrix": [0, 7], "x": 7.25, "y": 0},
-                {"matrix": [0, 8], "x": 8.25, "y": 0},
-                {"matrix": [0, 9], "x": 9.25, "y": 0},
-                {"matrix": [0, 10], "x": 10.25, "y": 0},
-                {"matrix": [0, 11], "x": 11.25, "y": 0, "w": 1.25},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
-                {"matrix": [1, 1], "x": 1.25, "y": 1},
-                {"matrix": [1, 2], "x": 2.25, "y": 1},
-                {"matrix": [1, 3], "x": 3.25, "y": 1},
-                {"matrix": [1, 4], "x": 4.25, "y": 1},
-                {"matrix": [1, 5], "x": 5.25, "y": 1},
-                {"matrix": [1, 6], "x": 6.25, "y": 1},
-                {"matrix": [1, 7], "x": 7.25, "y": 1},
-                {"matrix": [1, 8], "x": 8.25, "y": 1},
-                {"matrix": [1, 9], "x": 9.25, "y": 1},
-                {"matrix": [1, 10], "x": 10.25, "y": 1},
-                {"matrix": [1, 11], "x": 11.25, "y": 1, "w": 1.25},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.25},
-                {"matrix": [2, 1], "x": 1.25, "y": 2},
-                {"matrix": [2, 2], "x": 2.25, "y": 2},
-                {"matrix": [2, 3], "x": 3.25, "y": 2},
-                {"matrix": [2, 4], "x": 4.25, "y": 2},
-                {"matrix": [2, 5], "x": 5.25, "y": 2},
-                {"matrix": [2, 6], "x": 6.25, "y": 2},
-                {"matrix": [2, 7], "x": 7.25, "y": 2},
-                {"matrix": [2, 8], "x": 8.25, "y": 2},
-                {"matrix": [2, 9], "x": 9.25, "y": 2},
-                {"matrix": [2, 10], "x": 10.25, "y": 2},
-                {"matrix": [2, 11], "x": 11.25, "y": 2, "w": 1.25},
-
-                {"matrix": [3, 0], "x": 0.75, "y": 3},
-                {"matrix": [3, 2], "x": 1.75, "y": 3},
-                {"matrix": [3, 5], "x": 2.75, "y": 3, "w": 7},
-                {"matrix": [3, 8], "x": 9.75, "y": 3},
-                {"matrix": [3, 9], "x": 10.75, "y": 3}
-            ]
-        }
-    }
-}
diff --git a/keyboards/lazydesigners/dimple/ortho/keyboard.json b/keyboards/lazydesigners/dimple/ortho/keyboard.json
new file mode 100644
index 00000000000..f5c0cf3ad0f
--- /dev/null
+++ b/keyboards/lazydesigners/dimple/ortho/keyboard.json
@@ -0,0 +1,197 @@
+{
+    "keyboard_name": "Dimple",
+    "manufacturer": "LazyDesigners",
+    "url": "http://lazydesigners.cn",
+    "maintainer": "Jacky@LAZYDESIGNERS",
+    "usb": {
+        "vid": "0x4C44",
+        "pid": "0x0040",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "matrix_pins": {
+        "cols": ["B0", "B1", "B2", "B3", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7"],
+        "rows": ["D0", "D1", "D2", "D3"]
+    },
+    "diode_direction": "COL2ROW",
+    "rgblight": {
+        "led_count": 50,
+        "sleep": true,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": true,
+            "twinkle": true
+        }
+    },
+    "ws2812": {
+        "pin": "B7"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "layouts": {
+        "LAYOUT_ortho_2u": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0, "w": 1.25},
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+                {"matrix": [0, 5], "x": 5.25, "y": 0},
+                {"matrix": [0, 6], "x": 6.25, "y": 0},
+                {"matrix": [0, 7], "x": 7.25, "y": 0},
+                {"matrix": [0, 8], "x": 8.25, "y": 0},
+                {"matrix": [0, 9], "x": 9.25, "y": 0},
+                {"matrix": [0, 10], "x": 10.25, "y": 0},
+                {"matrix": [0, 11], "x": 11.25, "y": 0, "w": 1.25},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
+                {"matrix": [1, 1], "x": 1.25, "y": 1},
+                {"matrix": [1, 2], "x": 2.25, "y": 1},
+                {"matrix": [1, 3], "x": 3.25, "y": 1},
+                {"matrix": [1, 4], "x": 4.25, "y": 1},
+                {"matrix": [1, 5], "x": 5.25, "y": 1},
+                {"matrix": [1, 6], "x": 6.25, "y": 1},
+                {"matrix": [1, 7], "x": 7.25, "y": 1},
+                {"matrix": [1, 8], "x": 8.25, "y": 1},
+                {"matrix": [1, 9], "x": 9.25, "y": 1},
+                {"matrix": [1, 10], "x": 10.25, "y": 1},
+                {"matrix": [1, 11], "x": 11.25, "y": 1, "w": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.25},
+                {"matrix": [2, 1], "x": 1.25, "y": 2},
+                {"matrix": [2, 2], "x": 2.25, "y": 2},
+                {"matrix": [2, 3], "x": 3.25, "y": 2},
+                {"matrix": [2, 4], "x": 4.25, "y": 2},
+                {"matrix": [2, 5], "x": 5.25, "y": 2},
+                {"matrix": [2, 6], "x": 6.25, "y": 2},
+                {"matrix": [2, 7], "x": 7.25, "y": 2},
+                {"matrix": [2, 8], "x": 8.25, "y": 2},
+                {"matrix": [2, 9], "x": 9.25, "y": 2},
+                {"matrix": [2, 10], "x": 10.25, "y": 2},
+                {"matrix": [2, 11], "x": 11.25, "y": 2, "w": 1.25},
+
+                {"matrix": [3, 0], "x": 0.75, "y": 3},
+                {"matrix": [3, 2], "x": 1.75, "y": 3},
+                {"matrix": [3, 3], "x": 2.75, "y": 3},
+                {"matrix": [3, 4], "x": 3.75, "y": 3, "w": 2},
+                {"matrix": [3, 5], "x": 5.75, "y": 3},
+                {"matrix": [3, 6], "x": 6.75, "y": 3, "w": 2},
+                {"matrix": [3, 7], "x": 8.75, "y": 3},
+                {"matrix": [3, 8], "x": 9.75, "y": 3},
+                {"matrix": [3, 9], "x": 10.75, "y": 3}
+            ]
+        },
+        "LAYOUT_ortho_3u": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0, "w": 1.25},
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+                {"matrix": [0, 5], "x": 5.25, "y": 0},
+                {"matrix": [0, 6], "x": 6.25, "y": 0},
+                {"matrix": [0, 7], "x": 7.25, "y": 0},
+                {"matrix": [0, 8], "x": 8.25, "y": 0},
+                {"matrix": [0, 9], "x": 9.25, "y": 0},
+                {"matrix": [0, 10], "x": 10.25, "y": 0},
+                {"matrix": [0, 11], "x": 11.25, "y": 0, "w": 1.25},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
+                {"matrix": [1, 1], "x": 1.25, "y": 1},
+                {"matrix": [1, 2], "x": 2.25, "y": 1},
+                {"matrix": [1, 3], "x": 3.25, "y": 1},
+                {"matrix": [1, 4], "x": 4.25, "y": 1},
+                {"matrix": [1, 5], "x": 5.25, "y": 1},
+                {"matrix": [1, 6], "x": 6.25, "y": 1},
+                {"matrix": [1, 7], "x": 7.25, "y": 1},
+                {"matrix": [1, 8], "x": 8.25, "y": 1},
+                {"matrix": [1, 9], "x": 9.25, "y": 1},
+                {"matrix": [1, 10], "x": 10.25, "y": 1},
+                {"matrix": [1, 11], "x": 11.25, "y": 1, "w": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.25},
+                {"matrix": [2, 1], "x": 1.25, "y": 2},
+                {"matrix": [2, 2], "x": 2.25, "y": 2},
+                {"matrix": [2, 3], "x": 3.25, "y": 2},
+                {"matrix": [2, 4], "x": 4.25, "y": 2},
+                {"matrix": [2, 5], "x": 5.25, "y": 2},
+                {"matrix": [2, 6], "x": 6.25, "y": 2},
+                {"matrix": [2, 7], "x": 7.25, "y": 2},
+                {"matrix": [2, 8], "x": 8.25, "y": 2},
+                {"matrix": [2, 9], "x": 9.25, "y": 2},
+                {"matrix": [2, 10], "x": 10.25, "y": 2},
+                {"matrix": [2, 11], "x": 11.25, "y": 2, "w": 1.25},
+
+                {"matrix": [3, 0], "x": 0.75, "y": 3},
+                {"matrix": [3, 2], "x": 1.75, "y": 3},
+                {"matrix": [3, 3], "x": 2.75, "y": 3},
+                {"matrix": [3, 4], "x": 3.75, "y": 3},
+                {"matrix": [3, 5], "x": 4.75, "y": 3, "w": 3},
+                {"matrix": [3, 6], "x": 7.75, "y": 3},
+                {"matrix": [3, 7], "x": 8.75, "y": 3},
+                {"matrix": [3, 8], "x": 9.75, "y": 3},
+                {"matrix": [3, 9], "x": 10.75, "y": 3}
+            ]
+        },
+        "LAYOUT_ortho_7u": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0, "w": 1.25},
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+                {"matrix": [0, 5], "x": 5.25, "y": 0},
+                {"matrix": [0, 6], "x": 6.25, "y": 0},
+                {"matrix": [0, 7], "x": 7.25, "y": 0},
+                {"matrix": [0, 8], "x": 8.25, "y": 0},
+                {"matrix": [0, 9], "x": 9.25, "y": 0},
+                {"matrix": [0, 10], "x": 10.25, "y": 0},
+                {"matrix": [0, 11], "x": 11.25, "y": 0, "w": 1.25},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
+                {"matrix": [1, 1], "x": 1.25, "y": 1},
+                {"matrix": [1, 2], "x": 2.25, "y": 1},
+                {"matrix": [1, 3], "x": 3.25, "y": 1},
+                {"matrix": [1, 4], "x": 4.25, "y": 1},
+                {"matrix": [1, 5], "x": 5.25, "y": 1},
+                {"matrix": [1, 6], "x": 6.25, "y": 1},
+                {"matrix": [1, 7], "x": 7.25, "y": 1},
+                {"matrix": [1, 8], "x": 8.25, "y": 1},
+                {"matrix": [1, 9], "x": 9.25, "y": 1},
+                {"matrix": [1, 10], "x": 10.25, "y": 1},
+                {"matrix": [1, 11], "x": 11.25, "y": 1, "w": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.25},
+                {"matrix": [2, 1], "x": 1.25, "y": 2},
+                {"matrix": [2, 2], "x": 2.25, "y": 2},
+                {"matrix": [2, 3], "x": 3.25, "y": 2},
+                {"matrix": [2, 4], "x": 4.25, "y": 2},
+                {"matrix": [2, 5], "x": 5.25, "y": 2},
+                {"matrix": [2, 6], "x": 6.25, "y": 2},
+                {"matrix": [2, 7], "x": 7.25, "y": 2},
+                {"matrix": [2, 8], "x": 8.25, "y": 2},
+                {"matrix": [2, 9], "x": 9.25, "y": 2},
+                {"matrix": [2, 10], "x": 10.25, "y": 2},
+                {"matrix": [2, 11], "x": 11.25, "y": 2, "w": 1.25},
+
+                {"matrix": [3, 0], "x": 0.75, "y": 3},
+                {"matrix": [3, 2], "x": 1.75, "y": 3},
+                {"matrix": [3, 5], "x": 2.75, "y": 3, "w": 7},
+                {"matrix": [3, 8], "x": 9.75, "y": 3},
+                {"matrix": [3, 9], "x": 10.75, "y": 3}
+            ]
+        }
+    }
+}
diff --git a/keyboards/lazydesigners/dimple/ortho/rules.mk b/keyboards/lazydesigners/dimple/ortho/rules.mk
index 902a3d4bbc7..dcedd7449b5 100644
--- a/keyboards/lazydesigners/dimple/ortho/rules.mk
+++ b/keyboards/lazydesigners/dimple/ortho/rules.mk
@@ -1,3 +1,4 @@
 # Disable unsupported hardware
 BACKLIGHT_SUPPORTED = no
 RGBLIGHT_ENABLE = no
+AUDIO_SUPPORTED = no
diff --git a/keyboards/lazydesigners/dimple/rules.mk b/keyboards/lazydesigners/dimple/rules.mk
index 5316d1bc7e1..cd05623d841 100644
--- a/keyboards/lazydesigners/dimple/rules.mk
+++ b/keyboards/lazydesigners/dimple/rules.mk
@@ -1,17 +1 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
-
-# Disable unsupported hardware
-AUDIO_SUPPORTED = no
 DEFAULT_FOLDER = lazydesigners/dimple/staggered/rev1
diff --git a/keyboards/lazydesigners/dimple/staggered/rev1/info.json b/keyboards/lazydesigners/dimple/staggered/rev1/info.json
deleted file mode 100644
index 65e559b252d..00000000000
--- a/keyboards/lazydesigners/dimple/staggered/rev1/info.json
+++ /dev/null
@@ -1,58 +0,0 @@
-{
-    "indicators": {
-        "caps_lock": "E6",
-        "on_state": 0
-    },
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"label": "Esc", "x": 0, "y": 0, "matrix": [0, 0]},
-                {"label": "Q", "x": 1, "y": 0, "matrix": [0, 1]},
-                {"label": "W", "x": 2, "y": 0, "matrix": [0, 2]},
-                {"label": "E", "x": 3, "y": 0, "matrix": [0, 3]},
-                {"label": "R", "x": 4, "y": 0, "matrix": [0, 4]},
-                {"label": "T", "x": 5, "y": 0, "matrix": [0, 5]},
-                {"label": "Y", "x": 6, "y": 0, "matrix": [0, 6]},
-                {"label": "U", "x": 7, "y": 0, "matrix": [0, 7]},
-                {"label": "I", "x": 8, "y": 0, "matrix": [0, 8]},
-                {"label": "O", "x": 9, "y": 0, "matrix": [0, 9]},
-                {"label": "P", "x": 10, "y": 0, "matrix": [0, 10]},
-                {"label": "Back<br>Space", "x": 11, "y": 0, "w": 1.5, "matrix": [0, 11]},
-
-                {"label": "Tab", "x": 0, "y": 1, "w": 1.25, "matrix": [1, 0]},
-                {"label": "A", "x": 1.25, "y": 1, "matrix": [1, 1]},
-                {"label": "S", "x": 2.25, "y": 1, "matrix": [1, 2]},
-                {"label": "D", "x": 3.25, "y": 1, "matrix": [1, 3]},
-                {"label": "F", "x": 4.25, "y": 1, "matrix": [1, 4]},
-                {"label": "G", "x": 5.25, "y": 1, "matrix": [1, 5]},
-                {"label": "H", "x": 6.25, "y": 1, "matrix": [1, 6]},
-                {"label": "J", "x": 7.25, "y": 1, "matrix": [1, 7]},
-                {"label": "K", "x": 8.25, "y": 1, "matrix": [1, 8]},
-                {"label": "L", "x": 9.25, "y": 1, "matrix": [1, 9]},
-                {"label": "'", "x": 10.25, "y": 1, "matrix": [1, 10]},
-                {"label": "Enter", "x": 11.25, "y": 1, "w": 1.25, "matrix": [1, 11]},
-
-                {"label": "Shift", "x": 0, "y": 2, "w": 1.75, "matrix": [2, 0]},
-                {"label": "Z", "x": 1.75, "y": 2, "matrix": [2, 1]},
-                {"label": "X", "x": 2.75, "y": 2, "matrix": [2, 2]},
-                {"label": "C", "x": 3.75, "y": 2, "matrix": [2, 3]},
-                {"label": "V", "x": 4.75, "y": 2, "matrix": [2, 4]},
-                {"label": "B", "x": 5.75, "y": 2, "matrix": [2, 5]},
-                {"label": "N", "x": 6.75, "y": 2, "matrix": [2, 6]},
-                {"label": "M", "x": 7.75, "y": 2, "matrix": [2, 7]},
-                {"label": ",", "x": 8.75, "y": 2, "matrix": [2, 8]},
-                {"label": "Up", "x": 9.75, "y": 2, "matrix": [2, 9]},
-                {"label": ".", "x": 10.75, "y": 2, "w": 1.75, "matrix": [2, 10]},
-
-                {"label": "Ctrl", "x": 0.75, "y": 3, "matrix": [3, 0]},
-                {"label": "Gui", "x": 1.75, "y": 3, "matrix": [3, 2]},
-                {"label": "Alt", "x": 2.75, "y": 3, "matrix": [3, 3]},
-                {"label": "Space", "x": 3.75, "y": 3, "w": 2.25, "matrix": [3, 4]},
-                {"label": "Space", "x": 6, "y": 3, "w": 2.75, "matrix": [3, 6]},
-                {"label": "Left", "x": 8.75, "y": 3, "matrix": [3, 7]},
-                {"label": "Down", "x": 9.75, "y": 3, "matrix": [3, 8]},
-                {"label": "Right", "x": 10.75, "y": 3, "matrix": [3, 9]}
-            ]
-        }
-    }
-}
diff --git a/keyboards/lazydesigners/dimple/staggered/rev1/keyboard.json b/keyboards/lazydesigners/dimple/staggered/rev1/keyboard.json
new file mode 100644
index 00000000000..bc5822214ab
--- /dev/null
+++ b/keyboards/lazydesigners/dimple/staggered/rev1/keyboard.json
@@ -0,0 +1,65 @@
+{
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgblight": true
+    },
+    "indicators": {
+        "caps_lock": "E6",
+        "on_state": 0
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"label": "Esc", "x": 0, "y": 0, "matrix": [0, 0]},
+                {"label": "Q", "x": 1, "y": 0, "matrix": [0, 1]},
+                {"label": "W", "x": 2, "y": 0, "matrix": [0, 2]},
+                {"label": "E", "x": 3, "y": 0, "matrix": [0, 3]},
+                {"label": "R", "x": 4, "y": 0, "matrix": [0, 4]},
+                {"label": "T", "x": 5, "y": 0, "matrix": [0, 5]},
+                {"label": "Y", "x": 6, "y": 0, "matrix": [0, 6]},
+                {"label": "U", "x": 7, "y": 0, "matrix": [0, 7]},
+                {"label": "I", "x": 8, "y": 0, "matrix": [0, 8]},
+                {"label": "O", "x": 9, "y": 0, "matrix": [0, 9]},
+                {"label": "P", "x": 10, "y": 0, "matrix": [0, 10]},
+                {"label": "Back<br>Space", "x": 11, "y": 0, "w": 1.5, "matrix": [0, 11]},
+
+                {"label": "Tab", "x": 0, "y": 1, "w": 1.25, "matrix": [1, 0]},
+                {"label": "A", "x": 1.25, "y": 1, "matrix": [1, 1]},
+                {"label": "S", "x": 2.25, "y": 1, "matrix": [1, 2]},
+                {"label": "D", "x": 3.25, "y": 1, "matrix": [1, 3]},
+                {"label": "F", "x": 4.25, "y": 1, "matrix": [1, 4]},
+                {"label": "G", "x": 5.25, "y": 1, "matrix": [1, 5]},
+                {"label": "H", "x": 6.25, "y": 1, "matrix": [1, 6]},
+                {"label": "J", "x": 7.25, "y": 1, "matrix": [1, 7]},
+                {"label": "K", "x": 8.25, "y": 1, "matrix": [1, 8]},
+                {"label": "L", "x": 9.25, "y": 1, "matrix": [1, 9]},
+                {"label": "'", "x": 10.25, "y": 1, "matrix": [1, 10]},
+                {"label": "Enter", "x": 11.25, "y": 1, "w": 1.25, "matrix": [1, 11]},
+
+                {"label": "Shift", "x": 0, "y": 2, "w": 1.75, "matrix": [2, 0]},
+                {"label": "Z", "x": 1.75, "y": 2, "matrix": [2, 1]},
+                {"label": "X", "x": 2.75, "y": 2, "matrix": [2, 2]},
+                {"label": "C", "x": 3.75, "y": 2, "matrix": [2, 3]},
+                {"label": "V", "x": 4.75, "y": 2, "matrix": [2, 4]},
+                {"label": "B", "x": 5.75, "y": 2, "matrix": [2, 5]},
+                {"label": "N", "x": 6.75, "y": 2, "matrix": [2, 6]},
+                {"label": "M", "x": 7.75, "y": 2, "matrix": [2, 7]},
+                {"label": ",", "x": 8.75, "y": 2, "matrix": [2, 8]},
+                {"label": "Up", "x": 9.75, "y": 2, "matrix": [2, 9]},
+                {"label": ".", "x": 10.75, "y": 2, "w": 1.75, "matrix": [2, 10]},
+
+                {"label": "Ctrl", "x": 0.75, "y": 3, "matrix": [3, 0]},
+                {"label": "Gui", "x": 1.75, "y": 3, "matrix": [3, 2]},
+                {"label": "Alt", "x": 2.75, "y": 3, "matrix": [3, 3]},
+                {"label": "Space", "x": 3.75, "y": 3, "w": 2.25, "matrix": [3, 4]},
+                {"label": "Space", "x": 6, "y": 3, "w": 2.75, "matrix": [3, 6]},
+                {"label": "Left", "x": 8.75, "y": 3, "matrix": [3, 7]},
+                {"label": "Down", "x": 9.75, "y": 3, "matrix": [3, 8]},
+                {"label": "Right", "x": 10.75, "y": 3, "matrix": [3, 9]}
+            ]
+        }
+    }
+}
diff --git a/keyboards/lazydesigners/dimple/staggered/rev1/rules.mk b/keyboards/lazydesigners/dimple/staggered/rev1/rules.mk
index 2fdb308d164..623023fdb63 100644
--- a/keyboards/lazydesigners/dimple/staggered/rev1/rules.mk
+++ b/keyboards/lazydesigners/dimple/staggered/rev1/rules.mk
@@ -1,4 +1,3 @@
-RGBLIGHT_ENABLE = yes        # Enable keyboard RGB underglow
-
 # Disable unsupported hardware
 BACKLIGHT_SUPPORTED = no
+AUDIO_SUPPORTED = no
diff --git a/keyboards/lazydesigners/dimple/staggered/rev2/info.json b/keyboards/lazydesigners/dimple/staggered/rev2/info.json
deleted file mode 100644
index 5109d49d3c8..00000000000
--- a/keyboards/lazydesigners/dimple/staggered/rev2/info.json
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"label": "Esc", "x": 0, "y": 0, "matrix": [0, 0]},
-                {"label": "Q", "x": 1, "y": 0, "matrix": [0, 1]},
-                {"label": "W", "x": 2, "y": 0, "matrix": [0, 2]},
-                {"label": "E", "x": 3, "y": 0, "matrix": [0, 3]},
-                {"label": "R", "x": 4, "y": 0, "matrix": [0, 4]},
-                {"label": "T", "x": 5, "y": 0, "matrix": [0, 5]},
-                {"label": "Y", "x": 6, "y": 0, "matrix": [0, 6]},
-                {"label": "U", "x": 7, "y": 0, "matrix": [0, 7]},
-                {"label": "I", "x": 8, "y": 0, "matrix": [0, 8]},
-                {"label": "O", "x": 9, "y": 0, "matrix": [0, 9]},
-                {"label": "P", "x": 10, "y": 0, "matrix": [0, 10]},
-                {"label": "Back<br>Space", "x": 11, "y": 0, "w": 1.5, "matrix": [0, 11]},
-
-                {"label": "Tab", "x": 0, "y": 1, "w": 1.25, "matrix": [1, 0]},
-                {"label": "A", "x": 1.25, "y": 1, "matrix": [1, 1]},
-                {"label": "S", "x": 2.25, "y": 1, "matrix": [1, 2]},
-                {"label": "D", "x": 3.25, "y": 1, "matrix": [1, 3]},
-                {"label": "F", "x": 4.25, "y": 1, "matrix": [1, 4]},
-                {"label": "G", "x": 5.25, "y": 1, "matrix": [1, 5]},
-                {"label": "H", "x": 6.25, "y": 1, "matrix": [1, 6]},
-                {"label": "J", "x": 7.25, "y": 1, "matrix": [1, 7]},
-                {"label": "K", "x": 8.25, "y": 1, "matrix": [1, 8]},
-                {"label": "L", "x": 9.25, "y": 1, "matrix": [1, 9]},
-                {"label": "'", "x": 10.25, "y": 1, "matrix": [1, 10]},
-                {"label": "Enter", "x": 11.25, "y": 1, "w": 1.25, "matrix": [1, 11]},
-
-                {"label": "Shift", "x": 0, "y": 2, "w": 1.75, "matrix": [2, 0]},
-                {"label": "Z", "x": 1.75, "y": 2, "matrix": [2, 1]},
-                {"label": "X", "x": 2.75, "y": 2, "matrix": [2, 2]},
-                {"label": "C", "x": 3.75, "y": 2, "matrix": [2, 3]},
-                {"label": "V", "x": 4.75, "y": 2, "matrix": [2, 4]},
-                {"label": "B", "x": 5.75, "y": 2, "matrix": [2, 5]},
-                {"label": "N", "x": 6.75, "y": 2, "matrix": [2, 6]},
-                {"label": "M", "x": 7.75, "y": 2, "matrix": [2, 7]},
-                {"label": ",", "x": 8.75, "y": 2, "matrix": [2, 8]},
-                {"label": "Up", "x": 9.75, "y": 2, "matrix": [2, 9]},
-                {"label": ".", "x": 10.75, "y": 2, "w": 1.75, "matrix": [2, 10]},
-
-                {"label": "Ctrl", "x": 0.75, "y": 3, "matrix": [3, 0]},
-                {"label": "Gui", "x": 1.75, "y": 3, "matrix": [3, 2]},
-                {"label": "Alt", "x": 2.75, "y": 3, "matrix": [3, 3]},
-                {"label": "Space", "x": 3.75, "y": 3, "w": 2.25, "matrix": [3, 4]},
-                {"label": "Space", "x": 6, "y": 3, "w": 2.75, "matrix": [3, 6]},
-                {"label": "Left", "x": 8.75, "y": 3, "matrix": [3, 7]},
-                {"label": "Down", "x": 9.75, "y": 3, "matrix": [3, 8]},
-                {"label": "Right", "x": 10.75, "y": 3, "matrix": [3, 9]}
-            ]
-        }
-    }
-}
diff --git a/keyboards/lazydesigners/dimple/staggered/rev2/keyboard.json b/keyboards/lazydesigners/dimple/staggered/rev2/keyboard.json
new file mode 100644
index 00000000000..d8b051db650
--- /dev/null
+++ b/keyboards/lazydesigners/dimple/staggered/rev2/keyboard.json
@@ -0,0 +1,60 @@
+{
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"label": "Esc", "x": 0, "y": 0, "matrix": [0, 0]},
+                {"label": "Q", "x": 1, "y": 0, "matrix": [0, 1]},
+                {"label": "W", "x": 2, "y": 0, "matrix": [0, 2]},
+                {"label": "E", "x": 3, "y": 0, "matrix": [0, 3]},
+                {"label": "R", "x": 4, "y": 0, "matrix": [0, 4]},
+                {"label": "T", "x": 5, "y": 0, "matrix": [0, 5]},
+                {"label": "Y", "x": 6, "y": 0, "matrix": [0, 6]},
+                {"label": "U", "x": 7, "y": 0, "matrix": [0, 7]},
+                {"label": "I", "x": 8, "y": 0, "matrix": [0, 8]},
+                {"label": "O", "x": 9, "y": 0, "matrix": [0, 9]},
+                {"label": "P", "x": 10, "y": 0, "matrix": [0, 10]},
+                {"label": "Back<br>Space", "x": 11, "y": 0, "w": 1.5, "matrix": [0, 11]},
+
+                {"label": "Tab", "x": 0, "y": 1, "w": 1.25, "matrix": [1, 0]},
+                {"label": "A", "x": 1.25, "y": 1, "matrix": [1, 1]},
+                {"label": "S", "x": 2.25, "y": 1, "matrix": [1, 2]},
+                {"label": "D", "x": 3.25, "y": 1, "matrix": [1, 3]},
+                {"label": "F", "x": 4.25, "y": 1, "matrix": [1, 4]},
+                {"label": "G", "x": 5.25, "y": 1, "matrix": [1, 5]},
+                {"label": "H", "x": 6.25, "y": 1, "matrix": [1, 6]},
+                {"label": "J", "x": 7.25, "y": 1, "matrix": [1, 7]},
+                {"label": "K", "x": 8.25, "y": 1, "matrix": [1, 8]},
+                {"label": "L", "x": 9.25, "y": 1, "matrix": [1, 9]},
+                {"label": "'", "x": 10.25, "y": 1, "matrix": [1, 10]},
+                {"label": "Enter", "x": 11.25, "y": 1, "w": 1.25, "matrix": [1, 11]},
+
+                {"label": "Shift", "x": 0, "y": 2, "w": 1.75, "matrix": [2, 0]},
+                {"label": "Z", "x": 1.75, "y": 2, "matrix": [2, 1]},
+                {"label": "X", "x": 2.75, "y": 2, "matrix": [2, 2]},
+                {"label": "C", "x": 3.75, "y": 2, "matrix": [2, 3]},
+                {"label": "V", "x": 4.75, "y": 2, "matrix": [2, 4]},
+                {"label": "B", "x": 5.75, "y": 2, "matrix": [2, 5]},
+                {"label": "N", "x": 6.75, "y": 2, "matrix": [2, 6]},
+                {"label": "M", "x": 7.75, "y": 2, "matrix": [2, 7]},
+                {"label": ",", "x": 8.75, "y": 2, "matrix": [2, 8]},
+                {"label": "Up", "x": 9.75, "y": 2, "matrix": [2, 9]},
+                {"label": ".", "x": 10.75, "y": 2, "w": 1.75, "matrix": [2, 10]},
+
+                {"label": "Ctrl", "x": 0.75, "y": 3, "matrix": [3, 0]},
+                {"label": "Gui", "x": 1.75, "y": 3, "matrix": [3, 2]},
+                {"label": "Alt", "x": 2.75, "y": 3, "matrix": [3, 3]},
+                {"label": "Space", "x": 3.75, "y": 3, "w": 2.25, "matrix": [3, 4]},
+                {"label": "Space", "x": 6, "y": 3, "w": 2.75, "matrix": [3, 6]},
+                {"label": "Left", "x": 8.75, "y": 3, "matrix": [3, 7]},
+                {"label": "Down", "x": 9.75, "y": 3, "matrix": [3, 8]},
+                {"label": "Right", "x": 10.75, "y": 3, "matrix": [3, 9]}
+            ]
+        }
+    }
+}
diff --git a/keyboards/lazydesigners/dimple/staggered/rev2/rules.mk b/keyboards/lazydesigners/dimple/staggered/rev2/rules.mk
index 1961392f2db..748a459f785 100644
--- a/keyboards/lazydesigners/dimple/staggered/rev2/rules.mk
+++ b/keyboards/lazydesigners/dimple/staggered/rev2/rules.mk
@@ -1,4 +1,3 @@
-BACKLIGHT_ENABLE = no        # Enable keyboard backlight functionality
-
 # Disable unsupported hardware
 RGBLIGHT_ENABLE = no
+AUDIO_SUPPORTED = no
diff --git a/keyboards/lazydesigners/dimple/staggered/rev3/info.json b/keyboards/lazydesigners/dimple/staggered/rev3/info.json
deleted file mode 100644
index 332a554610d..00000000000
--- a/keyboards/lazydesigners/dimple/staggered/rev3/info.json
+++ /dev/null
@@ -1,153 +0,0 @@
-{
-    "backlight": {
-        "pin": "B7"
-    },
-    "layouts": {
-        "LAYOUT_all": {
-            "layout": [
-                {"label": "Esc", "x": 0, "y": 0, "matrix": [0, 0]},
-                {"label": "Q", "x": 1, "y": 0, "matrix": [0, 1]},
-                {"label": "W", "x": 2, "y": 0, "matrix": [0, 2]},
-                {"label": "E", "x": 3, "y": 0, "matrix": [0, 3]},
-                {"label": "R", "x": 4, "y": 0, "matrix": [0, 4]},
-                {"label": "T", "x": 5, "y": 0, "matrix": [0, 5]},
-                {"label": "Y", "x": 6, "y": 0, "matrix": [0, 6]},
-                {"label": "U", "x": 7, "y": 0, "matrix": [0, 7]},
-                {"label": "I", "x": 8, "y": 0, "matrix": [0, 8]},
-                {"label": "O", "x": 9, "y": 0, "matrix": [0, 9]},
-                {"label": "P", "x": 10, "y": 0, "matrix": [0, 10]},
-                {"label": "Back<br>Space", "x": 11, "y": 0, "w": 1.5, "matrix": [0, 11]},
-
-                {"label": "Tab", "x": 0, "y": 1, "w": 1.25, "matrix": [1, 0]},
-                {"label": "A", "x": 1.25, "y": 1, "matrix": [1, 1]},
-                {"label": "S", "x": 2.25, "y": 1, "matrix": [1, 2]},
-                {"label": "D", "x": 3.25, "y": 1, "matrix": [1, 3]},
-                {"label": "F", "x": 4.25, "y": 1, "matrix": [1, 4]},
-                {"label": "G", "x": 5.25, "y": 1, "matrix": [1, 5]},
-                {"label": "H", "x": 6.25, "y": 1, "matrix": [1, 6]},
-                {"label": "J", "x": 7.25, "y": 1, "matrix": [1, 7]},
-                {"label": "K", "x": 8.25, "y": 1, "matrix": [1, 8]},
-                {"label": "L", "x": 9.25, "y": 1, "matrix": [1, 9]},
-                {"label": "'", "x": 10.25, "y": 1, "matrix": [1, 10]},
-                {"label": "Enter", "x": 11.25, "y": 1, "w": 1.25, "matrix": [1, 11]},
-
-                {"label": "Shift", "x": 0, "y": 2, "w": 1.75, "matrix": [2, 0]},
-                {"label": "Z", "x": 1.75, "y": 2, "matrix": [2, 1]},
-                {"label": "X", "x": 2.75, "y": 2, "matrix": [2, 2]},
-                {"label": "C", "x": 3.75, "y": 2, "matrix": [2, 3]},
-                {"label": "V", "x": 4.75, "y": 2, "matrix": [2, 4]},
-                {"label": "B", "x": 5.75, "y": 2, "matrix": [2, 5]},
-                {"label": "N", "x": 6.75, "y": 2, "matrix": [2, 6]},
-                {"label": "M", "x": 7.75, "y": 2, "matrix": [2, 7]},
-                {"label": ",", "x": 8.75, "y": 2, "matrix": [2, 8]},
-                {"label": "Up", "x": 9.75, "y": 2, "matrix": [2, 9]},
-                {"label": ".", "x": 10.75, "y": 2, "w": 1.75, "matrix": [2, 10]},
-
-                {"label": "Ctrl", "x": 0.75, "y": 3, "matrix": [3, 0]},
-                {"label": "Gui", "x": 1.75, "y": 3, "matrix": [3, 2]},
-                {"label": "Alt", "x": 2.75, "y": 3, "matrix": [3, 3]},
-                {"label": "Space", "x": 3.75, "y": 3, "w": 2.25, "matrix": [3, 4]},
-                {"label": "Space", "x": 6, "y": 3, "w": 2.75, "matrix": [3, 6]},
-                {"label": "Left", "x": 8.75, "y": 3, "matrix": [3, 7]},
-                {"label": "Down", "x": 9.75, "y": 3, "matrix": [3, 8]},
-                {"label": "Right", "x": 10.75, "y": 3, "matrix": [3, 9]}
-            ]
-        },
-        "LAYOUT_iso": {
-            "layout": [
-                {"label": "Esc", "x": 0, "y": 0, "matrix": [0, 0]},
-                {"label": "Q", "x": 1, "y": 0, "matrix": [0, 1]},
-                {"label": "W", "x": 2, "y": 0, "matrix": [0, 2]},
-                {"label": "E", "x": 3, "y": 0, "matrix": [0, 3]},
-                {"label": "R", "x": 4, "y": 0, "matrix": [0, 4]},
-                {"label": "T", "x": 5, "y": 0, "matrix": [0, 5]},
-                {"label": "Y", "x": 6, "y": 0, "matrix": [0, 6]},
-                {"label": "U", "x": 7, "y": 0, "matrix": [0, 7]},
-                {"label": "I", "x": 8, "y": 0, "matrix": [0, 8]},
-                {"label": "O", "x": 9, "y": 0, "matrix": [0, 9]},
-                {"label": "P", "x": 10, "y": 0, "matrix": [0, 10]},
-
-                {"label": "Tab", "x": 0, "y": 1, "w": 1.25, "matrix": [1, 0]},
-                {"label": "A", "x": 1.25, "y": 1, "matrix": [1, 1]},
-                {"label": "S", "x": 2.25, "y": 1, "matrix": [1, 2]},
-                {"label": "D", "x": 3.25, "y": 1, "matrix": [1, 3]},
-                {"label": "F", "x": 4.25, "y": 1, "matrix": [1, 4]},
-                {"label": "G", "x": 5.25, "y": 1, "matrix": [1, 5]},
-                {"label": "H", "x": 6.25, "y": 1, "matrix": [1, 6]},
-                {"label": "J", "x": 7.25, "y": 1, "matrix": [1, 7]},
-                {"label": "K", "x": 8.25, "y": 1, "matrix": [1, 8]},
-                {"label": "L", "x": 9.25, "y": 1, "matrix": [1, 9]},
-                {"label": "'", "x": 10.25, "y": 1, "matrix": [1, 10]},
-                {"label": "Enter", "x": 11.25, "y": 0, "w": 1.25, "h": 2, "matrix": [1, 11]},
-
-                {"label": "Shift", "x": 0, "y": 2, "w": 1.75, "matrix": [2, 0]},
-                {"label": "Z", "x": 1.75, "y": 2, "matrix": [2, 1]},
-                {"label": "X", "x": 2.75, "y": 2, "matrix": [2, 2]},
-                {"label": "C", "x": 3.75, "y": 2, "matrix": [2, 3]},
-                {"label": "V", "x": 4.75, "y": 2, "matrix": [2, 4]},
-                {"label": "B", "x": 5.75, "y": 2, "matrix": [2, 5]},
-                {"label": "N", "x": 6.75, "y": 2, "matrix": [2, 6]},
-                {"label": "M", "x": 7.75, "y": 2, "matrix": [2, 7]},
-                {"label": ",", "x": 8.75, "y": 2, "matrix": [2, 8]},
-                {"label": "Up", "x": 9.75, "y": 2, "matrix": [2, 9]},
-                {"label": ".", "x": 10.75, "y": 2, "w": 1.75, "matrix": [2, 10]},
-
-                {"label": "Ctrl", "x": 0.75, "y": 3, "matrix": [3, 0]},
-                {"label": "Gui", "x": 1.75, "y": 3, "matrix": [3, 2]},
-                {"label": "Alt", "x": 2.75, "y": 3, "matrix": [3, 3]},
-                {"label": "Space", "x": 3.75, "y": 3, "w": 2.25, "matrix": [3, 4]},
-                {"label": "Space", "x": 6, "y": 3, "w": 2.75, "matrix": [3, 6]},
-                {"label": "Left", "x": 8.75, "y": 3, "matrix": [3, 7]},
-                {"label": "Down", "x": 9.75, "y": 3, "matrix": [3, 8]},
-                {"label": "Right", "x": 10.75, "y": 3, "matrix": [3, 9]}
-            ]
-        },
-        "LAYOUT_7u": {
-            "layout": [
-                {"label": "Esc", "x": 0, "y": 0, "matrix": [0, 0]},
-                {"label": "Q", "x": 1, "y": 0, "matrix": [0, 1]},
-                {"label": "W", "x": 2, "y": 0, "matrix": [0, 2]},
-                {"label": "E", "x": 3, "y": 0, "matrix": [0, 3]},
-                {"label": "R", "x": 4, "y": 0, "matrix": [0, 4]},
-                {"label": "T", "x": 5, "y": 0, "matrix": [0, 5]},
-                {"label": "Y", "x": 6, "y": 0, "matrix": [0, 6]},
-                {"label": "U", "x": 7, "y": 0, "matrix": [0, 7]},
-                {"label": "I", "x": 8, "y": 0, "matrix": [0, 8]},
-                {"label": "O", "x": 9, "y": 0, "matrix": [0, 9]},
-                {"label": "P", "x": 10, "y": 0, "matrix": [0, 10]},
-                {"label": "Back<br>Space", "x": 11, "y": 0, "w": 1.5, "matrix": [0, 11]},
-
-                {"label": "Tab", "x": 0, "y": 1, "w": 1.25, "matrix": [1, 0]},
-                {"label": "A", "x": 1.25, "y": 1, "matrix": [1, 1]},
-                {"label": "S", "x": 2.25, "y": 1, "matrix": [1, 2]},
-                {"label": "D", "x": 3.25, "y": 1, "matrix": [1, 3]},
-                {"label": "F", "x": 4.25, "y": 1, "matrix": [1, 4]},
-                {"label": "G", "x": 5.25, "y": 1, "matrix": [1, 5]},
-                {"label": "H", "x": 6.25, "y": 1, "matrix": [1, 6]},
-                {"label": "J", "x": 7.25, "y": 1, "matrix": [1, 7]},
-                {"label": "K", "x": 8.25, "y": 1, "matrix": [1, 8]},
-                {"label": "L", "x": 9.25, "y": 1, "matrix": [1, 9]},
-                {"label": "'", "x": 10.25, "y": 1, "matrix": [1, 10]},
-                {"label": "Enter", "x": 11.25, "y": 1, "w": 1.25, "matrix": [1, 11]},
-
-                {"label": "Shift", "x": 0, "y": 2, "w": 1.75, "matrix": [2, 0]},
-                {"label": "Z", "x": 1.75, "y": 2, "matrix": [2, 1]},
-                {"label": "X", "x": 2.75, "y": 2, "matrix": [2, 2]},
-                {"label": "C", "x": 3.75, "y": 2, "matrix": [2, 3]},
-                {"label": "V", "x": 4.75, "y": 2, "matrix": [2, 4]},
-                {"label": "B", "x": 5.75, "y": 2, "matrix": [2, 5]},
-                {"label": "N", "x": 6.75, "y": 2, "matrix": [2, 6]},
-                {"label": "M", "x": 7.75, "y": 2, "matrix": [2, 7]},
-                {"label": ",", "x": 8.75, "y": 2, "matrix": [2, 8]},
-                {"label": "Up", "x": 9.75, "y": 2, "matrix": [2, 9]},
-                {"label": ".", "x": 10.75, "y": 2, "w": 1.75, "matrix": [2, 10]},
-
-                {"label": "Ctrl", "x": 0.75, "y": 3, "matrix": [3, 0]},
-                {"label": "Gui", "x": 1.75, "y": 3, "matrix": [3, 2]},
-                {"label": "Space", "x": 2.75, "y": 3, "w": 7, "matrix": [3, 4]},
-                {"label": "Down", "x": 9.75, "y": 3, "matrix": [3, 8]},
-                {"label": "Right", "x": 10.75, "y": 3, "matrix": [3, 9]}
-            ]
-        }
-    }
-}
diff --git a/keyboards/lazydesigners/dimple/staggered/rev3/keyboard.json b/keyboards/lazydesigners/dimple/staggered/rev3/keyboard.json
new file mode 100644
index 00000000000..9262048c8ab
--- /dev/null
+++ b/keyboards/lazydesigners/dimple/staggered/rev3/keyboard.json
@@ -0,0 +1,160 @@
+{
+    "features": {
+        "backlight": true,
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "backlight": {
+        "pin": "B7"
+    },
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                {"label": "Esc", "x": 0, "y": 0, "matrix": [0, 0]},
+                {"label": "Q", "x": 1, "y": 0, "matrix": [0, 1]},
+                {"label": "W", "x": 2, "y": 0, "matrix": [0, 2]},
+                {"label": "E", "x": 3, "y": 0, "matrix": [0, 3]},
+                {"label": "R", "x": 4, "y": 0, "matrix": [0, 4]},
+                {"label": "T", "x": 5, "y": 0, "matrix": [0, 5]},
+                {"label": "Y", "x": 6, "y": 0, "matrix": [0, 6]},
+                {"label": "U", "x": 7, "y": 0, "matrix": [0, 7]},
+                {"label": "I", "x": 8, "y": 0, "matrix": [0, 8]},
+                {"label": "O", "x": 9, "y": 0, "matrix": [0, 9]},
+                {"label": "P", "x": 10, "y": 0, "matrix": [0, 10]},
+                {"label": "Back<br>Space", "x": 11, "y": 0, "w": 1.5, "matrix": [0, 11]},
+
+                {"label": "Tab", "x": 0, "y": 1, "w": 1.25, "matrix": [1, 0]},
+                {"label": "A", "x": 1.25, "y": 1, "matrix": [1, 1]},
+                {"label": "S", "x": 2.25, "y": 1, "matrix": [1, 2]},
+                {"label": "D", "x": 3.25, "y": 1, "matrix": [1, 3]},
+                {"label": "F", "x": 4.25, "y": 1, "matrix": [1, 4]},
+                {"label": "G", "x": 5.25, "y": 1, "matrix": [1, 5]},
+                {"label": "H", "x": 6.25, "y": 1, "matrix": [1, 6]},
+                {"label": "J", "x": 7.25, "y": 1, "matrix": [1, 7]},
+                {"label": "K", "x": 8.25, "y": 1, "matrix": [1, 8]},
+                {"label": "L", "x": 9.25, "y": 1, "matrix": [1, 9]},
+                {"label": "'", "x": 10.25, "y": 1, "matrix": [1, 10]},
+                {"label": "Enter", "x": 11.25, "y": 1, "w": 1.25, "matrix": [1, 11]},
+
+                {"label": "Shift", "x": 0, "y": 2, "w": 1.75, "matrix": [2, 0]},
+                {"label": "Z", "x": 1.75, "y": 2, "matrix": [2, 1]},
+                {"label": "X", "x": 2.75, "y": 2, "matrix": [2, 2]},
+                {"label": "C", "x": 3.75, "y": 2, "matrix": [2, 3]},
+                {"label": "V", "x": 4.75, "y": 2, "matrix": [2, 4]},
+                {"label": "B", "x": 5.75, "y": 2, "matrix": [2, 5]},
+                {"label": "N", "x": 6.75, "y": 2, "matrix": [2, 6]},
+                {"label": "M", "x": 7.75, "y": 2, "matrix": [2, 7]},
+                {"label": ",", "x": 8.75, "y": 2, "matrix": [2, 8]},
+                {"label": "Up", "x": 9.75, "y": 2, "matrix": [2, 9]},
+                {"label": ".", "x": 10.75, "y": 2, "w": 1.75, "matrix": [2, 10]},
+
+                {"label": "Ctrl", "x": 0.75, "y": 3, "matrix": [3, 0]},
+                {"label": "Gui", "x": 1.75, "y": 3, "matrix": [3, 2]},
+                {"label": "Alt", "x": 2.75, "y": 3, "matrix": [3, 3]},
+                {"label": "Space", "x": 3.75, "y": 3, "w": 2.25, "matrix": [3, 4]},
+                {"label": "Space", "x": 6, "y": 3, "w": 2.75, "matrix": [3, 6]},
+                {"label": "Left", "x": 8.75, "y": 3, "matrix": [3, 7]},
+                {"label": "Down", "x": 9.75, "y": 3, "matrix": [3, 8]},
+                {"label": "Right", "x": 10.75, "y": 3, "matrix": [3, 9]}
+            ]
+        },
+        "LAYOUT_iso": {
+            "layout": [
+                {"label": "Esc", "x": 0, "y": 0, "matrix": [0, 0]},
+                {"label": "Q", "x": 1, "y": 0, "matrix": [0, 1]},
+                {"label": "W", "x": 2, "y": 0, "matrix": [0, 2]},
+                {"label": "E", "x": 3, "y": 0, "matrix": [0, 3]},
+                {"label": "R", "x": 4, "y": 0, "matrix": [0, 4]},
+                {"label": "T", "x": 5, "y": 0, "matrix": [0, 5]},
+                {"label": "Y", "x": 6, "y": 0, "matrix": [0, 6]},
+                {"label": "U", "x": 7, "y": 0, "matrix": [0, 7]},
+                {"label": "I", "x": 8, "y": 0, "matrix": [0, 8]},
+                {"label": "O", "x": 9, "y": 0, "matrix": [0, 9]},
+                {"label": "P", "x": 10, "y": 0, "matrix": [0, 10]},
+
+                {"label": "Tab", "x": 0, "y": 1, "w": 1.25, "matrix": [1, 0]},
+                {"label": "A", "x": 1.25, "y": 1, "matrix": [1, 1]},
+                {"label": "S", "x": 2.25, "y": 1, "matrix": [1, 2]},
+                {"label": "D", "x": 3.25, "y": 1, "matrix": [1, 3]},
+                {"label": "F", "x": 4.25, "y": 1, "matrix": [1, 4]},
+                {"label": "G", "x": 5.25, "y": 1, "matrix": [1, 5]},
+                {"label": "H", "x": 6.25, "y": 1, "matrix": [1, 6]},
+                {"label": "J", "x": 7.25, "y": 1, "matrix": [1, 7]},
+                {"label": "K", "x": 8.25, "y": 1, "matrix": [1, 8]},
+                {"label": "L", "x": 9.25, "y": 1, "matrix": [1, 9]},
+                {"label": "'", "x": 10.25, "y": 1, "matrix": [1, 10]},
+                {"label": "Enter", "x": 11.25, "y": 0, "w": 1.25, "h": 2, "matrix": [1, 11]},
+
+                {"label": "Shift", "x": 0, "y": 2, "w": 1.75, "matrix": [2, 0]},
+                {"label": "Z", "x": 1.75, "y": 2, "matrix": [2, 1]},
+                {"label": "X", "x": 2.75, "y": 2, "matrix": [2, 2]},
+                {"label": "C", "x": 3.75, "y": 2, "matrix": [2, 3]},
+                {"label": "V", "x": 4.75, "y": 2, "matrix": [2, 4]},
+                {"label": "B", "x": 5.75, "y": 2, "matrix": [2, 5]},
+                {"label": "N", "x": 6.75, "y": 2, "matrix": [2, 6]},
+                {"label": "M", "x": 7.75, "y": 2, "matrix": [2, 7]},
+                {"label": ",", "x": 8.75, "y": 2, "matrix": [2, 8]},
+                {"label": "Up", "x": 9.75, "y": 2, "matrix": [2, 9]},
+                {"label": ".", "x": 10.75, "y": 2, "w": 1.75, "matrix": [2, 10]},
+
+                {"label": "Ctrl", "x": 0.75, "y": 3, "matrix": [3, 0]},
+                {"label": "Gui", "x": 1.75, "y": 3, "matrix": [3, 2]},
+                {"label": "Alt", "x": 2.75, "y": 3, "matrix": [3, 3]},
+                {"label": "Space", "x": 3.75, "y": 3, "w": 2.25, "matrix": [3, 4]},
+                {"label": "Space", "x": 6, "y": 3, "w": 2.75, "matrix": [3, 6]},
+                {"label": "Left", "x": 8.75, "y": 3, "matrix": [3, 7]},
+                {"label": "Down", "x": 9.75, "y": 3, "matrix": [3, 8]},
+                {"label": "Right", "x": 10.75, "y": 3, "matrix": [3, 9]}
+            ]
+        },
+        "LAYOUT_7u": {
+            "layout": [
+                {"label": "Esc", "x": 0, "y": 0, "matrix": [0, 0]},
+                {"label": "Q", "x": 1, "y": 0, "matrix": [0, 1]},
+                {"label": "W", "x": 2, "y": 0, "matrix": [0, 2]},
+                {"label": "E", "x": 3, "y": 0, "matrix": [0, 3]},
+                {"label": "R", "x": 4, "y": 0, "matrix": [0, 4]},
+                {"label": "T", "x": 5, "y": 0, "matrix": [0, 5]},
+                {"label": "Y", "x": 6, "y": 0, "matrix": [0, 6]},
+                {"label": "U", "x": 7, "y": 0, "matrix": [0, 7]},
+                {"label": "I", "x": 8, "y": 0, "matrix": [0, 8]},
+                {"label": "O", "x": 9, "y": 0, "matrix": [0, 9]},
+                {"label": "P", "x": 10, "y": 0, "matrix": [0, 10]},
+                {"label": "Back<br>Space", "x": 11, "y": 0, "w": 1.5, "matrix": [0, 11]},
+
+                {"label": "Tab", "x": 0, "y": 1, "w": 1.25, "matrix": [1, 0]},
+                {"label": "A", "x": 1.25, "y": 1, "matrix": [1, 1]},
+                {"label": "S", "x": 2.25, "y": 1, "matrix": [1, 2]},
+                {"label": "D", "x": 3.25, "y": 1, "matrix": [1, 3]},
+                {"label": "F", "x": 4.25, "y": 1, "matrix": [1, 4]},
+                {"label": "G", "x": 5.25, "y": 1, "matrix": [1, 5]},
+                {"label": "H", "x": 6.25, "y": 1, "matrix": [1, 6]},
+                {"label": "J", "x": 7.25, "y": 1, "matrix": [1, 7]},
+                {"label": "K", "x": 8.25, "y": 1, "matrix": [1, 8]},
+                {"label": "L", "x": 9.25, "y": 1, "matrix": [1, 9]},
+                {"label": "'", "x": 10.25, "y": 1, "matrix": [1, 10]},
+                {"label": "Enter", "x": 11.25, "y": 1, "w": 1.25, "matrix": [1, 11]},
+
+                {"label": "Shift", "x": 0, "y": 2, "w": 1.75, "matrix": [2, 0]},
+                {"label": "Z", "x": 1.75, "y": 2, "matrix": [2, 1]},
+                {"label": "X", "x": 2.75, "y": 2, "matrix": [2, 2]},
+                {"label": "C", "x": 3.75, "y": 2, "matrix": [2, 3]},
+                {"label": "V", "x": 4.75, "y": 2, "matrix": [2, 4]},
+                {"label": "B", "x": 5.75, "y": 2, "matrix": [2, 5]},
+                {"label": "N", "x": 6.75, "y": 2, "matrix": [2, 6]},
+                {"label": "M", "x": 7.75, "y": 2, "matrix": [2, 7]},
+                {"label": ",", "x": 8.75, "y": 2, "matrix": [2, 8]},
+                {"label": "Up", "x": 9.75, "y": 2, "matrix": [2, 9]},
+                {"label": ".", "x": 10.75, "y": 2, "w": 1.75, "matrix": [2, 10]},
+
+                {"label": "Ctrl", "x": 0.75, "y": 3, "matrix": [3, 0]},
+                {"label": "Gui", "x": 1.75, "y": 3, "matrix": [3, 2]},
+                {"label": "Space", "x": 2.75, "y": 3, "w": 7, "matrix": [3, 4]},
+                {"label": "Down", "x": 9.75, "y": 3, "matrix": [3, 8]},
+                {"label": "Right", "x": 10.75, "y": 3, "matrix": [3, 9]}
+            ]
+        }
+    }
+}
diff --git a/keyboards/lazydesigners/dimple/staggered/rev3/rules.mk b/keyboards/lazydesigners/dimple/staggered/rev3/rules.mk
index b3b1cc58a19..748a459f785 100644
--- a/keyboards/lazydesigners/dimple/staggered/rev3/rules.mk
+++ b/keyboards/lazydesigners/dimple/staggered/rev3/rules.mk
@@ -1,4 +1,3 @@
-BACKLIGHT_ENABLE = yes        # Enable keyboard backlight functionality
-
 # Disable unsupported hardware
 RGBLIGHT_ENABLE = no
+AUDIO_SUPPORTED = no
diff --git a/keyboards/lets_split/info.json b/keyboards/lets_split/info.json
index 4640bd9e84f..a92a948abd2 100644
--- a/keyboards/lets_split/info.json
+++ b/keyboards/lets_split/info.json
@@ -3,8 +3,5 @@
   "maintainer": "qmk",
   "processor": "atmega32u4",
   "bootloader": "caterina",
-  "split": {
-    "enabled": true
-  },
   "community_layouts": ["ortho_4x12"]
 }
diff --git a/keyboards/lets_split/rev1/keyboard.json b/keyboards/lets_split/rev1/keyboard.json
index 6f00161cd5d..ec85e70519f 100644
--- a/keyboards/lets_split/rev1/keyboard.json
+++ b/keyboards/lets_split/rev1/keyboard.json
@@ -12,6 +12,7 @@
     },
     "diode_direction": "COL2ROW",
     "split": {
+        "enabled": true,
         "soft_serial_pin": "D0"
     },
     "rgblight": {
@@ -20,6 +21,12 @@
     "ws2812": {
         "pin": "D3"
     },
+    "features": {
+        "bootmagic": false,
+        "mousekey": true,
+        "extrakey": true,
+        "command": true
+    },
     "layout_aliases": {
         "LAYOUT": "LAYOUT_ortho_4x12"
     },
diff --git a/keyboards/lets_split/rev2/info.json b/keyboards/lets_split/rev2/info.json
deleted file mode 100644
index 8c6d622732f..00000000000
--- a/keyboards/lets_split/rev2/info.json
+++ /dev/null
@@ -1,87 +0,0 @@
-{
-    "keyboard_name": "Lets Split v2",
-    "manufacturer": "Wootpatoot",
-    "usb": {
-        "vid": "0x6F77",
-        "pid": "0x0002",
-        "device_version": "0.0.2"
-    },
-    "matrix_pins": {
-        "cols": ["F6", "F7", "B1", "B3", "B2", "B6"],
-        "rows": ["D7", "E6", "B4", "B5"]
-    },
-    "diode_direction": "COL2ROW",
-    "split": {
-        "soft_serial_pin": "D0"
-    },
-    "rgblight": {
-        "led_count": 12
-    },
-    "ws2812": {
-        "pin": "D3"
-    },
-    "layout_aliases": {
-        "LAYOUT": "LAYOUT_ortho_4x12"
-    },
-    "layouts": {
-        "LAYOUT_ortho_4x12": {
-            "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": [4, 5], "x": 7, "y": 0},
-                {"matrix": [4, 4], "x": 8, "y": 0},
-                {"matrix": [4, 3], "x": 9, "y": 0},
-                {"matrix": [4, 2], "x": 10, "y": 0},
-                {"matrix": [4, 1], "x": 11, "y": 0},
-                {"matrix": [4, 0], "x": 12, "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": [1, 4], "x": 4, "y": 1},
-                {"matrix": [1, 5], "x": 5, "y": 1},
-
-                {"matrix": [5, 5], "x": 7, "y": 1},
-                {"matrix": [5, 4], "x": 8, "y": 1},
-                {"matrix": [5, 3], "x": 9, "y": 1},
-                {"matrix": [5, 2], "x": 10, "y": 1},
-                {"matrix": [5, 1], "x": 11, "y": 1},
-                {"matrix": [5, 0], "x": 12, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2},
-                {"matrix": [2, 1], "x": 1, "y": 2},
-                {"matrix": [2, 2], "x": 2, "y": 2},
-                {"matrix": [2, 3], "x": 3, "y": 2},
-                {"matrix": [2, 4], "x": 4, "y": 2},
-                {"matrix": [2, 5], "x": 5, "y": 2},
-
-                {"matrix": [6, 5], "x": 7, "y": 2},
-                {"matrix": [6, 4], "x": 8, "y": 2},
-                {"matrix": [6, 3], "x": 9, "y": 2},
-                {"matrix": [6, 2], "x": 10, "y": 2},
-                {"matrix": [6, 1], "x": 11, "y": 2},
-                {"matrix": [6, 0], "x": 12, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3},
-                {"matrix": [3, 1], "x": 1, "y": 3},
-                {"matrix": [3, 2], "x": 2, "y": 3},
-                {"matrix": [3, 3], "x": 3, "y": 3},
-                {"matrix": [3, 4], "x": 4, "y": 3},
-                {"matrix": [3, 5], "x": 5, "y": 3},
-
-                {"matrix": [7, 5], "x": 7, "y": 3},
-                {"matrix": [7, 4], "x": 8, "y": 3},
-                {"matrix": [7, 3], "x": 9, "y": 3},
-                {"matrix": [7, 2], "x": 10, "y": 3},
-                {"matrix": [7, 1], "x": 11, "y": 3},
-                {"matrix": [7, 0], "x": 12, "y": 3}
-            ]
-        }
-    }
-}
diff --git a/keyboards/lets_split/rev2/keyboard.json b/keyboards/lets_split/rev2/keyboard.json
new file mode 100644
index 00000000000..81ad2606b8d
--- /dev/null
+++ b/keyboards/lets_split/rev2/keyboard.json
@@ -0,0 +1,94 @@
+{
+    "keyboard_name": "Lets Split v2",
+    "manufacturer": "Wootpatoot",
+    "usb": {
+        "vid": "0x6F77",
+        "pid": "0x0002",
+        "device_version": "0.0.2"
+    },
+    "matrix_pins": {
+        "cols": ["F6", "F7", "B1", "B3", "B2", "B6"],
+        "rows": ["D7", "E6", "B4", "B5"]
+    },
+    "diode_direction": "COL2ROW",
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "D0"
+    },
+    "rgblight": {
+        "led_count": 12
+    },
+    "ws2812": {
+        "pin": "D3"
+    },
+    "features": {
+        "bootmagic": false,
+        "mousekey": true,
+        "extrakey": true,
+        "command": true
+    },
+    "layout_aliases": {
+        "LAYOUT": "LAYOUT_ortho_4x12"
+    },
+    "layouts": {
+        "LAYOUT_ortho_4x12": {
+            "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": [4, 5], "x": 7, "y": 0},
+                {"matrix": [4, 4], "x": 8, "y": 0},
+                {"matrix": [4, 3], "x": 9, "y": 0},
+                {"matrix": [4, 2], "x": 10, "y": 0},
+                {"matrix": [4, 1], "x": 11, "y": 0},
+                {"matrix": [4, 0], "x": 12, "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": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+
+                {"matrix": [5, 5], "x": 7, "y": 1},
+                {"matrix": [5, 4], "x": 8, "y": 1},
+                {"matrix": [5, 3], "x": 9, "y": 1},
+                {"matrix": [5, 2], "x": 10, "y": 1},
+                {"matrix": [5, 1], "x": 11, "y": 1},
+                {"matrix": [5, 0], "x": 12, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+
+                {"matrix": [6, 5], "x": 7, "y": 2},
+                {"matrix": [6, 4], "x": 8, "y": 2},
+                {"matrix": [6, 3], "x": 9, "y": 2},
+                {"matrix": [6, 2], "x": 10, "y": 2},
+                {"matrix": [6, 1], "x": 11, "y": 2},
+                {"matrix": [6, 0], "x": 12, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
+
+                {"matrix": [7, 5], "x": 7, "y": 3},
+                {"matrix": [7, 4], "x": 8, "y": 3},
+                {"matrix": [7, 3], "x": 9, "y": 3},
+                {"matrix": [7, 2], "x": 10, "y": 3},
+                {"matrix": [7, 1], "x": 11, "y": 3},
+                {"matrix": [7, 0], "x": 12, "y": 3}
+            ]
+        }
+    }
+}
diff --git a/keyboards/lets_split/rules.mk b/keyboards/lets_split/rules.mk
index 11f365e8e9c..0fb6d362043 100644
--- a/keyboards/lets_split/rules.mk
+++ b/keyboards/lets_split/rules.mk
@@ -1,14 +1 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no      # Enable keyboard backlight functionality
-AUDIO_ENABLE = no           # Audio output
-RGBLIGHT_ENABLE = no       # Enable WS2812 RGB underlight.
-
 DEFAULT_FOLDER = lets_split/rev2
diff --git a/keyboards/lets_split/sockets/info.json b/keyboards/lets_split/sockets/info.json
deleted file mode 100644
index 76972243dc4..00000000000
--- a/keyboards/lets_split/sockets/info.json
+++ /dev/null
@@ -1,87 +0,0 @@
-{
-    "keyboard_name": "Lets Split Sockets",
-    "manufacturer": "Duckle29",
-    "usb": {
-        "vid": "0xFEED",
-        "pid": "0x0BEE",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["F4", "F7", "D7", "B3", "B2", "B6"],
-        "rows": ["B1", "B5", "E6", "B4"]
-    },
-    "diode_direction": "COL2ROW",
-    "split": {
-        "soft_serial_pin": "D0"
-    },
-    "rgblight": {
-        "led_count": 12
-    },
-    "ws2812": {
-        "pin": "D4"
-    },
-    "layout_aliases": {
-        "LAYOUT": "LAYOUT_ortho_4x12"
-    },
-    "layouts": {
-        "LAYOUT_ortho_4x12": {
-            "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": [4, 5], "x": 7, "y": 0},
-                {"matrix": [4, 4], "x": 8, "y": 0},
-                {"matrix": [4, 3], "x": 9, "y": 0},
-                {"matrix": [4, 2], "x": 10, "y": 0},
-                {"matrix": [4, 1], "x": 11, "y": 0},
-                {"matrix": [4, 0], "x": 12, "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": [1, 4], "x": 4, "y": 1},
-                {"matrix": [1, 5], "x": 5, "y": 1},
-
-                {"matrix": [5, 5], "x": 7, "y": 1},
-                {"matrix": [5, 4], "x": 8, "y": 1},
-                {"matrix": [5, 3], "x": 9, "y": 1},
-                {"matrix": [5, 2], "x": 10, "y": 1},
-                {"matrix": [5, 1], "x": 11, "y": 1},
-                {"matrix": [5, 0], "x": 12, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2},
-                {"matrix": [2, 1], "x": 1, "y": 2},
-                {"matrix": [2, 2], "x": 2, "y": 2},
-                {"matrix": [2, 3], "x": 3, "y": 2},
-                {"matrix": [2, 4], "x": 4, "y": 2},
-                {"matrix": [2, 5], "x": 5, "y": 2},
-
-                {"matrix": [6, 5], "x": 7, "y": 2},
-                {"matrix": [6, 4], "x": 8, "y": 2},
-                {"matrix": [6, 3], "x": 9, "y": 2},
-                {"matrix": [6, 2], "x": 10, "y": 2},
-                {"matrix": [6, 1], "x": 11, "y": 2},
-                {"matrix": [6, 0], "x": 12, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3},
-                {"matrix": [3, 1], "x": 1, "y": 3},
-                {"matrix": [3, 2], "x": 2, "y": 3},
-                {"matrix": [3, 3], "x": 3, "y": 3},
-                {"matrix": [3, 4], "x": 4, "y": 3},
-                {"matrix": [3, 5], "x": 5, "y": 3},
-
-                {"matrix": [7, 5], "x": 7, "y": 3},
-                {"matrix": [7, 4], "x": 8, "y": 3},
-                {"matrix": [7, 3], "x": 9, "y": 3},
-                {"matrix": [7, 2], "x": 10, "y": 3},
-                {"matrix": [7, 1], "x": 11, "y": 3},
-                {"matrix": [7, 0], "x": 12, "y": 3}
-            ]
-        }
-    }
-}
diff --git a/keyboards/lets_split/sockets/keyboard.json b/keyboards/lets_split/sockets/keyboard.json
new file mode 100644
index 00000000000..1354d9cf70f
--- /dev/null
+++ b/keyboards/lets_split/sockets/keyboard.json
@@ -0,0 +1,99 @@
+{
+    "keyboard_name": "Lets Split Sockets",
+    "manufacturer": "Duckle29",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0x0BEE",
+        "device_version": "0.0.1"
+    },
+    "matrix_pins": {
+        "cols": ["F4", "F7", "D7", "B3", "B2", "B6"],
+        "rows": ["B1", "B5", "E6", "B4"]
+    },
+    "diode_direction": "COL2ROW",
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "D0"
+    },
+    "rgblight": {
+        "led_count": 12
+    },
+    "ws2812": {
+        "pin": "D4"
+    },
+    "features": {
+        "bootmagic": false,
+        "mousekey": true,
+        "extrakey": true,
+        "command": true,
+        "rgblight": true,
+        "audio": true
+    },
+    "build": {
+        "lto": true
+    },
+    "layout_aliases": {
+        "LAYOUT": "LAYOUT_ortho_4x12"
+    },
+    "layouts": {
+        "LAYOUT_ortho_4x12": {
+            "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": [4, 5], "x": 7, "y": 0},
+                {"matrix": [4, 4], "x": 8, "y": 0},
+                {"matrix": [4, 3], "x": 9, "y": 0},
+                {"matrix": [4, 2], "x": 10, "y": 0},
+                {"matrix": [4, 1], "x": 11, "y": 0},
+                {"matrix": [4, 0], "x": 12, "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": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+
+                {"matrix": [5, 5], "x": 7, "y": 1},
+                {"matrix": [5, 4], "x": 8, "y": 1},
+                {"matrix": [5, 3], "x": 9, "y": 1},
+                {"matrix": [5, 2], "x": 10, "y": 1},
+                {"matrix": [5, 1], "x": 11, "y": 1},
+                {"matrix": [5, 0], "x": 12, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+
+                {"matrix": [6, 5], "x": 7, "y": 2},
+                {"matrix": [6, 4], "x": 8, "y": 2},
+                {"matrix": [6, 3], "x": 9, "y": 2},
+                {"matrix": [6, 2], "x": 10, "y": 2},
+                {"matrix": [6, 1], "x": 11, "y": 2},
+                {"matrix": [6, 0], "x": 12, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
+
+                {"matrix": [7, 5], "x": 7, "y": 3},
+                {"matrix": [7, 4], "x": 8, "y": 3},
+                {"matrix": [7, 3], "x": 9, "y": 3},
+                {"matrix": [7, 2], "x": 10, "y": 3},
+                {"matrix": [7, 1], "x": 11, "y": 3},
+                {"matrix": [7, 0], "x": 12, "y": 3}
+            ]
+        }
+    }
+}
diff --git a/keyboards/lets_split/sockets/rules.mk b/keyboards/lets_split/sockets/rules.mk
index 4174af2d0b8..fe598d78616 100644
--- a/keyboards/lets_split/sockets/rules.mk
+++ b/keyboards/lets_split/sockets/rules.mk
@@ -1,8 +1,2 @@
-BACKLIGHT_ENABLE = no
-AUDIO_ENABLE = yes
-RGBLIGHT_ENABLE = yes #Don't enable this along with I2C
-
-LTO_ENABLE = yes
-
 # Disable unsupported hardware
 BACKLIGHT_SUPPORTED = no
diff --git a/keyboards/lfkeyboards/lfk78/revb/keyboard.json b/keyboards/lfkeyboards/lfk78/revb/keyboard.json
index ac98455afaa..7a4d881692b 100644
--- a/keyboards/lfkeyboards/lfk78/revb/keyboard.json
+++ b/keyboards/lfkeyboards/lfk78/revb/keyboard.json
@@ -15,6 +15,12 @@
     "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": false,
+        "mousekey": false,
+        "extrakey": true,
+        "nkro": true
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/lfkeyboards/lfk78/revc/keyboard.json b/keyboards/lfkeyboards/lfk78/revc/keyboard.json
index 7bfaf8cac6d..e1788b68565 100644
--- a/keyboards/lfkeyboards/lfk78/revc/keyboard.json
+++ b/keyboards/lfkeyboards/lfk78/revc/keyboard.json
@@ -15,6 +15,12 @@
     "diode_direction": "COL2ROW",
     "processor": "at90usb1286",
     "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": false,
+        "mousekey": false,
+        "extrakey": true,
+        "nkro": true
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/lfkeyboards/lfk78/revj/info.json b/keyboards/lfkeyboards/lfk78/revj/info.json
deleted file mode 100644
index f99df02ed9e..00000000000
--- a/keyboards/lfkeyboards/lfk78/revj/info.json
+++ /dev/null
@@ -1,403 +0,0 @@
-{
-    "keyboard_name": "LFK78 Rev J",
-    "manufacturer": "LFKeyboards",
-    "url": "",
-    "maintainer": "qmk",
-    "usb": {
-        "vid": "0x4C46",
-        "pid": "0x3738",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "E6", "E7", "F0", "F1", "F2", "F3", "C0", "C1", "C2", "C3"],
-        "rows": ["D2", "D3", "D4", "D5", "D6"]
-    },
-    "diode_direction": "COL2ROW",
-    "processor": "at90usb646",
-    "bootloader": "atmel-dfu",
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-
-                {"matrix": [0, 2], "x": 2.25, "y": 0},
-                {"matrix": [0, 3], "x": 3.25, "y": 0},
-                {"matrix": [0, 4], "x": 4.25, "y": 0},
-                {"matrix": [0, 5], "x": 5.25, "y": 0},
-                {"matrix": [0, 6], "x": 6.25, "y": 0},
-                {"matrix": [0, 7], "x": 7.25, "y": 0},
-                {"matrix": [0, 8], "x": 8.25, "y": 0},
-                {"matrix": [0, 9], "x": 9.25, "y": 0},
-                {"matrix": [0, 10], "x": 10.25, "y": 0},
-                {"matrix": [0, 11], "x": 11.25, "y": 0},
-                {"matrix": [0, 12], "x": 12.25, "y": 0},
-                {"matrix": [0, 13], "x": 13.25, "y": 0},
-                {"matrix": [0, 14], "x": 14.25, "y": 0},
-                {"matrix": [0, 15], "x": 15.25, "y": 0, "w": 2},
-
-                {"matrix": [0, 16], "x": 17.5, "y": 0},
-                {"matrix": [0, 17], "x": 18.5, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1},
-                {"matrix": [1, 1], "x": 1, "y": 1},
-
-                {"matrix": [1, 2], "x": 2.25, "y": 1, "w": 1.5},
-                {"matrix": [1, 3], "x": 3.75, "y": 1},
-                {"matrix": [1, 4], "x": 4.75, "y": 1},
-                {"matrix": [1, 5], "x": 5.75, "y": 1},
-                {"matrix": [1, 6], "x": 6.75, "y": 1},
-                {"matrix": [1, 7], "x": 7.75, "y": 1},
-                {"matrix": [1, 8], "x": 8.75, "y": 1},
-                {"matrix": [1, 9], "x": 9.75, "y": 1},
-                {"matrix": [1, 10], "x": 10.75, "y": 1},
-                {"matrix": [1, 11], "x": 11.75, "y": 1},
-                {"matrix": [1, 12], "x": 12.75, "y": 1},
-                {"matrix": [1, 13], "x": 13.75, "y": 1},
-                {"matrix": [1, 14], "x": 14.75, "y": 1},
-                {"matrix": [1, 15], "x": 15.75, "y": 1, "w": 1.5},
-
-                {"matrix": [1, 16], "x": 17.5, "y": 1},
-                {"matrix": [1, 17], "x": 18.5, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2},
-                {"matrix": [2, 1], "x": 1, "y": 2},
-
-                {"matrix": [2, 2], "x": 2.25, "y": 2, "w": 1.75},
-                {"matrix": [2, 3], "x": 4, "y": 2},
-                {"matrix": [2, 4], "x": 5, "y": 2},
-                {"matrix": [2, 5], "x": 6, "y": 2},
-                {"matrix": [2, 6], "x": 7, "y": 2},
-                {"matrix": [2, 7], "x": 8, "y": 2},
-                {"matrix": [2, 8], "x": 9, "y": 2},
-                {"matrix": [2, 9], "x": 10, "y": 2},
-                {"matrix": [2, 10], "x": 11, "y": 2},
-                {"matrix": [2, 11], "x": 12, "y": 2},
-                {"matrix": [2, 12], "x": 13, "y": 2},
-                {"matrix": [2, 13], "x": 14, "y": 2},
-                {"matrix": [2, 14], "x": 15, "y": 2, "w": 2.25},
-
-                {"matrix": [3, 0], "x": 0, "y": 3},
-                {"matrix": [3, 1], "x": 1, "y": 3},
-
-                {"matrix": [3, 2], "x": 2.25, "y": 3, "w": 2.25},
-                {"matrix": [3, 4], "x": 4.5, "y": 3},
-                {"matrix": [3, 5], "x": 5.5, "y": 3},
-                {"matrix": [3, 6], "x": 6.5, "y": 3},
-                {"matrix": [3, 7], "x": 7.5, "y": 3},
-                {"matrix": [3, 8], "x": 8.5, "y": 3},
-                {"matrix": [3, 9], "x": 9.5, "y": 3},
-                {"matrix": [3, 10], "x": 10.5, "y": 3},
-                {"matrix": [3, 11], "x": 11.5, "y": 3},
-                {"matrix": [3, 12], "x": 12.5, "y": 3},
-                {"matrix": [3, 13], "x": 13.5, "y": 3},
-                {"matrix": [3, 14], "x": 14.5, "y": 3, "w": 2.75},
-
-                {"matrix": [3, 16], "x": 17.5, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4},
-                {"matrix": [4, 1], "x": 1, "y": 4},
-
-                {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 3], "x": 3.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 4], "x": 4.75, "y": 4, "w": 1.25},
-                {"matrix": [4, 8], "x": 6, "y": 4, "w": 6.25},
-                {"matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 14], "x": 14.75, "y": 4, "w": 1.25},
-
-                {"matrix": [4, 15], "x": 16.5, "y": 4},
-                {"matrix": [4, 16], "x": 17.5, "y": 4},
-                {"matrix": [4, 17], "x": 18.5, "y": 4}
-            ]
-        },
-        "LAYOUT_split_bs": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-
-                {"matrix": [0, 2], "x": 2.25, "y": 0},
-                {"matrix": [0, 3], "x": 3.25, "y": 0},
-                {"matrix": [0, 4], "x": 4.25, "y": 0},
-                {"matrix": [0, 5], "x": 5.25, "y": 0},
-                {"matrix": [0, 6], "x": 6.25, "y": 0},
-                {"matrix": [0, 7], "x": 7.25, "y": 0},
-                {"matrix": [0, 8], "x": 8.25, "y": 0},
-                {"matrix": [0, 9], "x": 9.25, "y": 0},
-                {"matrix": [0, 10], "x": 10.25, "y": 0},
-                {"matrix": [0, 11], "x": 11.25, "y": 0},
-                {"matrix": [0, 12], "x": 12.25, "y": 0},
-                {"matrix": [0, 13], "x": 13.25, "y": 0},
-                {"matrix": [0, 14], "x": 14.25, "y": 0},
-                {"matrix": [0, 15], "x": 15.25, "y": 0},
-                {"matrix": [2, 15], "x": 16.25, "y": 0},
-
-                {"matrix": [0, 16], "x": 17.5, "y": 0},
-                {"matrix": [0, 17], "x": 18.5, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1},
-                {"matrix": [1, 1], "x": 1, "y": 1},
-
-                {"matrix": [1, 2], "x": 2.25, "y": 1, "w": 1.5},
-                {"matrix": [1, 3], "x": 3.75, "y": 1},
-                {"matrix": [1, 4], "x": 4.75, "y": 1},
-                {"matrix": [1, 5], "x": 5.75, "y": 1},
-                {"matrix": [1, 6], "x": 6.75, "y": 1},
-                {"matrix": [1, 7], "x": 7.75, "y": 1},
-                {"matrix": [1, 8], "x": 8.75, "y": 1},
-                {"matrix": [1, 9], "x": 9.75, "y": 1},
-                {"matrix": [1, 10], "x": 10.75, "y": 1},
-                {"matrix": [1, 11], "x": 11.75, "y": 1},
-                {"matrix": [1, 12], "x": 12.75, "y": 1},
-                {"matrix": [1, 13], "x": 13.75, "y": 1},
-                {"matrix": [1, 14], "x": 14.75, "y": 1},
-                {"matrix": [1, 15], "x": 15.75, "y": 1, "w": 1.5},
-
-                {"matrix": [1, 16], "x": 17.5, "y": 1},
-                {"matrix": [1, 17], "x": 18.5, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2},
-                {"matrix": [2, 1], "x": 1, "y": 2},
-
-                {"matrix": [2, 2], "x": 2.25, "y": 2, "w": 1.75},
-                {"matrix": [2, 3], "x": 4, "y": 2},
-                {"matrix": [2, 4], "x": 5, "y": 2},
-                {"matrix": [2, 5], "x": 6, "y": 2},
-                {"matrix": [2, 6], "x": 7, "y": 2},
-                {"matrix": [2, 7], "x": 8, "y": 2},
-                {"matrix": [2, 8], "x": 9, "y": 2},
-                {"matrix": [2, 9], "x": 10, "y": 2},
-                {"matrix": [2, 10], "x": 11, "y": 2},
-                {"matrix": [2, 11], "x": 12, "y": 2},
-                {"matrix": [2, 12], "x": 13, "y": 2},
-                {"matrix": [2, 13], "x": 14, "y": 2},
-                {"matrix": [2, 14], "x": 15, "y": 2, "w": 2.25},
-
-                {"matrix": [3, 0], "x": 0, "y": 3},
-                {"matrix": [3, 1], "x": 1, "y": 3},
-
-                {"matrix": [3, 2], "x": 2.25, "y": 3, "w": 2.25},
-                {"matrix": [3, 4], "x": 4.5, "y": 3},
-                {"matrix": [3, 5], "x": 5.5, "y": 3},
-                {"matrix": [3, 6], "x": 6.5, "y": 3},
-                {"matrix": [3, 7], "x": 7.5, "y": 3},
-                {"matrix": [3, 8], "x": 8.5, "y": 3},
-                {"matrix": [3, 9], "x": 9.5, "y": 3},
-                {"matrix": [3, 10], "x": 10.5, "y": 3},
-                {"matrix": [3, 11], "x": 11.5, "y": 3},
-                {"matrix": [3, 12], "x": 12.5, "y": 3},
-                {"matrix": [3, 13], "x": 13.5, "y": 3},
-                {"matrix": [3, 14], "x": 14.5, "y": 3, "w": 2.75},
-
-                {"matrix": [3, 16], "x": 17.5, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4},
-                {"matrix": [4, 1], "x": 1, "y": 4},
-
-                {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 3], "x": 3.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 4], "x": 4.75, "y": 4, "w": 1.25},
-                {"matrix": [4, 8], "x": 6, "y": 4, "w": 6.25},
-                {"matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 14], "x": 14.75, "y": 4, "w": 1.25},
-
-                {"matrix": [4, 15], "x": 16.5, "y": 4},
-                {"matrix": [4, 16], "x": 17.5, "y": 4},
-                {"matrix": [4, 17], "x": 18.5, "y": 4}
-            ]
-        },
-        "LAYOUT_split_rshift": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-
-                {"matrix": [0, 2], "x": 2.25, "y": 0},
-                {"matrix": [0, 3], "x": 3.25, "y": 0},
-                {"matrix": [0, 4], "x": 4.25, "y": 0},
-                {"matrix": [0, 5], "x": 5.25, "y": 0},
-                {"matrix": [0, 6], "x": 6.25, "y": 0},
-                {"matrix": [0, 7], "x": 7.25, "y": 0},
-                {"matrix": [0, 8], "x": 8.25, "y": 0},
-                {"matrix": [0, 9], "x": 9.25, "y": 0},
-                {"matrix": [0, 10], "x": 10.25, "y": 0},
-                {"matrix": [0, 11], "x": 11.25, "y": 0},
-                {"matrix": [0, 12], "x": 12.25, "y": 0},
-                {"matrix": [0, 13], "x": 13.25, "y": 0},
-                {"matrix": [0, 14], "x": 14.25, "y": 0},
-                {"matrix": [0, 15], "x": 15.25, "y": 0, "w": 2},
-
-                {"matrix": [0, 16], "x": 17.5, "y": 0},
-                {"matrix": [0, 17], "x": 18.5, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1},
-                {"matrix": [1, 1], "x": 1, "y": 1},
-
-                {"matrix": [1, 2], "x": 2.25, "y": 1, "w": 1.5},
-                {"matrix": [1, 3], "x": 3.75, "y": 1},
-                {"matrix": [1, 4], "x": 4.75, "y": 1},
-                {"matrix": [1, 5], "x": 5.75, "y": 1},
-                {"matrix": [1, 6], "x": 6.75, "y": 1},
-                {"matrix": [1, 7], "x": 7.75, "y": 1},
-                {"matrix": [1, 8], "x": 8.75, "y": 1},
-                {"matrix": [1, 9], "x": 9.75, "y": 1},
-                {"matrix": [1, 10], "x": 10.75, "y": 1},
-                {"matrix": [1, 11], "x": 11.75, "y": 1},
-                {"matrix": [1, 12], "x": 12.75, "y": 1},
-                {"matrix": [1, 13], "x": 13.75, "y": 1},
-                {"matrix": [1, 14], "x": 14.75, "y": 1},
-                {"matrix": [1, 15], "x": 15.75, "y": 1, "w": 1.5},
-
-                {"matrix": [1, 16], "x": 17.5, "y": 1},
-                {"matrix": [1, 17], "x": 18.5, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2},
-                {"matrix": [2, 1], "x": 1, "y": 2},
-
-                {"matrix": [2, 2], "x": 2.25, "y": 2, "w": 1.75},
-                {"matrix": [2, 3], "x": 4, "y": 2},
-                {"matrix": [2, 4], "x": 5, "y": 2},
-                {"matrix": [2, 5], "x": 6, "y": 2},
-                {"matrix": [2, 6], "x": 7, "y": 2},
-                {"matrix": [2, 7], "x": 8, "y": 2},
-                {"matrix": [2, 8], "x": 9, "y": 2},
-                {"matrix": [2, 9], "x": 10, "y": 2},
-                {"matrix": [2, 10], "x": 11, "y": 2},
-                {"matrix": [2, 11], "x": 12, "y": 2},
-                {"matrix": [2, 12], "x": 13, "y": 2},
-                {"matrix": [2, 13], "x": 14, "y": 2},
-                {"matrix": [2, 14], "x": 15, "y": 2, "w": 2.25},
-
-                {"matrix": [3, 0], "x": 0, "y": 3},
-                {"matrix": [3, 1], "x": 1, "y": 3},
-
-                {"matrix": [3, 2], "x": 2.25, "y": 3, "w": 2.25},
-                {"matrix": [3, 4], "x": 4.5, "y": 3},
-                {"matrix": [3, 5], "x": 5.5, "y": 3},
-                {"matrix": [3, 6], "x": 6.5, "y": 3},
-                {"matrix": [3, 7], "x": 7.5, "y": 3},
-                {"matrix": [3, 8], "x": 8.5, "y": 3},
-                {"matrix": [3, 9], "x": 9.5, "y": 3},
-                {"matrix": [3, 10], "x": 10.5, "y": 3},
-                {"matrix": [3, 11], "x": 11.5, "y": 3},
-                {"matrix": [3, 12], "x": 12.5, "y": 3},
-                {"matrix": [3, 13], "x": 13.5, "y": 3},
-                {"matrix": [3, 14], "x": 14.5, "y": 3, "w": 1.75},
-                {"matrix": [3, 15], "x": 16.25, "y": 3},
-
-                {"matrix": [3, 16], "x": 17.5, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4},
-                {"matrix": [4, 1], "x": 1, "y": 4},
-
-                {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 3], "x": 3.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 4], "x": 4.75, "y": 4, "w": 1.25},
-                {"matrix": [4, 8], "x": 6, "y": 4, "w": 6.25},
-                {"matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 14], "x": 14.75, "y": 4, "w": 1.25},
-
-                {"matrix": [4, 15], "x": 16.5, "y": 4},
-                {"matrix": [4, 16], "x": 17.5, "y": 4},
-                {"matrix": [4, 17], "x": 18.5, "y": 4}
-            ]
-        },
-        "LAYOUT_iso": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-
-                {"matrix": [0, 2], "x": 2.25, "y": 0},
-                {"matrix": [0, 3], "x": 3.25, "y": 0},
-                {"matrix": [0, 4], "x": 4.25, "y": 0},
-                {"matrix": [0, 5], "x": 5.25, "y": 0},
-                {"matrix": [0, 6], "x": 6.25, "y": 0},
-                {"matrix": [0, 7], "x": 7.25, "y": 0},
-                {"matrix": [0, 8], "x": 8.25, "y": 0},
-                {"matrix": [0, 9], "x": 9.25, "y": 0},
-                {"matrix": [0, 10], "x": 10.25, "y": 0},
-                {"matrix": [0, 11], "x": 11.25, "y": 0},
-                {"matrix": [0, 12], "x": 12.25, "y": 0},
-                {"matrix": [0, 13], "x": 13.25, "y": 0},
-                {"matrix": [0, 14], "x": 14.25, "y": 0},
-                {"matrix": [0, 15], "x": 15.25, "y": 0, "w": 2},
-
-                {"matrix": [0, 16], "x": 17.5, "y": 0},
-                {"matrix": [0, 17], "x": 18.5, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1},
-                {"matrix": [1, 1], "x": 1, "y": 1},
-
-                {"matrix": [1, 2], "x": 2.25, "y": 1, "w": 1.5},
-                {"matrix": [1, 3], "x": 3.75, "y": 1},
-                {"matrix": [1, 4], "x": 4.75, "y": 1},
-                {"matrix": [1, 5], "x": 5.75, "y": 1},
-                {"matrix": [1, 6], "x": 6.75, "y": 1},
-                {"matrix": [1, 7], "x": 7.75, "y": 1},
-                {"matrix": [1, 8], "x": 8.75, "y": 1},
-                {"matrix": [1, 9], "x": 9.75, "y": 1},
-                {"matrix": [1, 10], "x": 10.75, "y": 1},
-                {"matrix": [1, 11], "x": 11.75, "y": 1},
-                {"matrix": [1, 12], "x": 12.75, "y": 1},
-                {"matrix": [1, 13], "x": 13.75, "y": 1},
-                {"matrix": [1, 14], "x": 14.75, "y": 1},
-                {"matrix": [1, 15], "x": 16, "y": 1, "w": 1.25, "h": 2},
-
-                {"matrix": [1, 16], "x": 17.5, "y": 1},
-                {"matrix": [1, 17], "x": 18.5, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2},
-                {"matrix": [2, 1], "x": 1, "y": 2},
-
-                {"matrix": [2, 2], "x": 2.25, "y": 2, "w": 1.75},
-                {"matrix": [2, 3], "x": 4, "y": 2},
-                {"matrix": [2, 4], "x": 5, "y": 2},
-                {"matrix": [2, 5], "x": 6, "y": 2},
-                {"matrix": [2, 6], "x": 7, "y": 2},
-                {"matrix": [2, 7], "x": 8, "y": 2},
-                {"matrix": [2, 8], "x": 9, "y": 2},
-                {"matrix": [2, 9], "x": 10, "y": 2},
-                {"matrix": [2, 10], "x": 11, "y": 2},
-                {"matrix": [2, 11], "x": 12, "y": 2},
-                {"matrix": [2, 12], "x": 13, "y": 2},
-                {"matrix": [2, 13], "x": 14, "y": 2},
-                {"matrix": [2, 14], "x": 15, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3},
-                {"matrix": [3, 1], "x": 1, "y": 3},
-
-                {"matrix": [3, 2], "x": 2.25, "y": 3, "w": 1.25},
-                {"matrix": [3, 3], "x": 3.5, "y": 3},
-                {"matrix": [3, 4], "x": 4.5, "y": 3},
-                {"matrix": [3, 5], "x": 5.5, "y": 3},
-                {"matrix": [3, 6], "x": 6.5, "y": 3},
-                {"matrix": [3, 7], "x": 7.5, "y": 3},
-                {"matrix": [3, 8], "x": 8.5, "y": 3},
-                {"matrix": [3, 9], "x": 9.5, "y": 3},
-                {"matrix": [3, 10], "x": 10.5, "y": 3},
-                {"matrix": [3, 11], "x": 11.5, "y": 3},
-                {"matrix": [3, 12], "x": 12.5, "y": 3},
-                {"matrix": [3, 13], "x": 13.5, "y": 3},
-                {"matrix": [3, 14], "x": 14.5, "y": 3, "w": 2.75},
-
-                {"matrix": [3, 16], "x": 17.5, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4},
-                {"matrix": [4, 1], "x": 1, "y": 4},
-
-                {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 3], "x": 3.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 4], "x": 4.75, "y": 4, "w": 1.25},
-                {"matrix": [4, 8], "x": 6, "y": 4, "w": 6.25},
-                {"matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 14], "x": 14.75, "y": 4, "w": 1.25},
-
-                {"matrix": [4, 15], "x": 16.5, "y": 4},
-                {"matrix": [4, 16], "x": 17.5, "y": 4},
-                {"matrix": [4, 17], "x": 18.5, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/lfkeyboards/lfk78/revj/keyboard.json b/keyboards/lfkeyboards/lfk78/revj/keyboard.json
new file mode 100644
index 00000000000..725425f0124
--- /dev/null
+++ b/keyboards/lfkeyboards/lfk78/revj/keyboard.json
@@ -0,0 +1,410 @@
+{
+    "keyboard_name": "LFK78 Rev J",
+    "manufacturer": "LFKeyboards",
+    "url": "",
+    "maintainer": "qmk",
+    "usb": {
+        "vid": "0x4C46",
+        "pid": "0x3738",
+        "device_version": "0.0.1"
+    },
+    "matrix_pins": {
+        "cols": ["A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "E6", "E7", "F0", "F1", "F2", "F3", "C0", "C1", "C2", "C3"],
+        "rows": ["D2", "D3", "D4", "D5", "D6"]
+    },
+    "diode_direction": "COL2ROW",
+    "processor": "at90usb646",
+    "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": false,
+        "mousekey": false,
+        "extrakey": true,
+        "nkro": true,
+        "audio": true
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+                {"matrix": [0, 5], "x": 5.25, "y": 0},
+                {"matrix": [0, 6], "x": 6.25, "y": 0},
+                {"matrix": [0, 7], "x": 7.25, "y": 0},
+                {"matrix": [0, 8], "x": 8.25, "y": 0},
+                {"matrix": [0, 9], "x": 9.25, "y": 0},
+                {"matrix": [0, 10], "x": 10.25, "y": 0},
+                {"matrix": [0, 11], "x": 11.25, "y": 0},
+                {"matrix": [0, 12], "x": 12.25, "y": 0},
+                {"matrix": [0, 13], "x": 13.25, "y": 0},
+                {"matrix": [0, 14], "x": 14.25, "y": 0},
+                {"matrix": [0, 15], "x": 15.25, "y": 0, "w": 2},
+
+                {"matrix": [0, 16], "x": 17.5, "y": 0},
+                {"matrix": [0, 17], "x": 18.5, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+
+                {"matrix": [1, 2], "x": 2.25, "y": 1, "w": 1.5},
+                {"matrix": [1, 3], "x": 3.75, "y": 1},
+                {"matrix": [1, 4], "x": 4.75, "y": 1},
+                {"matrix": [1, 5], "x": 5.75, "y": 1},
+                {"matrix": [1, 6], "x": 6.75, "y": 1},
+                {"matrix": [1, 7], "x": 7.75, "y": 1},
+                {"matrix": [1, 8], "x": 8.75, "y": 1},
+                {"matrix": [1, 9], "x": 9.75, "y": 1},
+                {"matrix": [1, 10], "x": 10.75, "y": 1},
+                {"matrix": [1, 11], "x": 11.75, "y": 1},
+                {"matrix": [1, 12], "x": 12.75, "y": 1},
+                {"matrix": [1, 13], "x": 13.75, "y": 1},
+                {"matrix": [1, 14], "x": 14.75, "y": 1},
+                {"matrix": [1, 15], "x": 15.75, "y": 1, "w": 1.5},
+
+                {"matrix": [1, 16], "x": 17.5, "y": 1},
+                {"matrix": [1, 17], "x": 18.5, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+
+                {"matrix": [2, 2], "x": 2.25, "y": 2, "w": 1.75},
+                {"matrix": [2, 3], "x": 4, "y": 2},
+                {"matrix": [2, 4], "x": 5, "y": 2},
+                {"matrix": [2, 5], "x": 6, "y": 2},
+                {"matrix": [2, 6], "x": 7, "y": 2},
+                {"matrix": [2, 7], "x": 8, "y": 2},
+                {"matrix": [2, 8], "x": 9, "y": 2},
+                {"matrix": [2, 9], "x": 10, "y": 2},
+                {"matrix": [2, 10], "x": 11, "y": 2},
+                {"matrix": [2, 11], "x": 12, "y": 2},
+                {"matrix": [2, 12], "x": 13, "y": 2},
+                {"matrix": [2, 13], "x": 14, "y": 2},
+                {"matrix": [2, 14], "x": 15, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+
+                {"matrix": [3, 2], "x": 2.25, "y": 3, "w": 2.25},
+                {"matrix": [3, 4], "x": 4.5, "y": 3},
+                {"matrix": [3, 5], "x": 5.5, "y": 3},
+                {"matrix": [3, 6], "x": 6.5, "y": 3},
+                {"matrix": [3, 7], "x": 7.5, "y": 3},
+                {"matrix": [3, 8], "x": 8.5, "y": 3},
+                {"matrix": [3, 9], "x": 9.5, "y": 3},
+                {"matrix": [3, 10], "x": 10.5, "y": 3},
+                {"matrix": [3, 11], "x": 11.5, "y": 3},
+                {"matrix": [3, 12], "x": 12.5, "y": 3},
+                {"matrix": [3, 13], "x": 13.5, "y": 3},
+                {"matrix": [3, 14], "x": 14.5, "y": 3, "w": 2.75},
+
+                {"matrix": [3, 16], "x": 17.5, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+
+                {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 3.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 4.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 8], "x": 6, "y": 4, "w": 6.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 14], "x": 14.75, "y": 4, "w": 1.25},
+
+                {"matrix": [4, 15], "x": 16.5, "y": 4},
+                {"matrix": [4, 16], "x": 17.5, "y": 4},
+                {"matrix": [4, 17], "x": 18.5, "y": 4}
+            ]
+        },
+        "LAYOUT_split_bs": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+                {"matrix": [0, 5], "x": 5.25, "y": 0},
+                {"matrix": [0, 6], "x": 6.25, "y": 0},
+                {"matrix": [0, 7], "x": 7.25, "y": 0},
+                {"matrix": [0, 8], "x": 8.25, "y": 0},
+                {"matrix": [0, 9], "x": 9.25, "y": 0},
+                {"matrix": [0, 10], "x": 10.25, "y": 0},
+                {"matrix": [0, 11], "x": 11.25, "y": 0},
+                {"matrix": [0, 12], "x": 12.25, "y": 0},
+                {"matrix": [0, 13], "x": 13.25, "y": 0},
+                {"matrix": [0, 14], "x": 14.25, "y": 0},
+                {"matrix": [0, 15], "x": 15.25, "y": 0},
+                {"matrix": [2, 15], "x": 16.25, "y": 0},
+
+                {"matrix": [0, 16], "x": 17.5, "y": 0},
+                {"matrix": [0, 17], "x": 18.5, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+
+                {"matrix": [1, 2], "x": 2.25, "y": 1, "w": 1.5},
+                {"matrix": [1, 3], "x": 3.75, "y": 1},
+                {"matrix": [1, 4], "x": 4.75, "y": 1},
+                {"matrix": [1, 5], "x": 5.75, "y": 1},
+                {"matrix": [1, 6], "x": 6.75, "y": 1},
+                {"matrix": [1, 7], "x": 7.75, "y": 1},
+                {"matrix": [1, 8], "x": 8.75, "y": 1},
+                {"matrix": [1, 9], "x": 9.75, "y": 1},
+                {"matrix": [1, 10], "x": 10.75, "y": 1},
+                {"matrix": [1, 11], "x": 11.75, "y": 1},
+                {"matrix": [1, 12], "x": 12.75, "y": 1},
+                {"matrix": [1, 13], "x": 13.75, "y": 1},
+                {"matrix": [1, 14], "x": 14.75, "y": 1},
+                {"matrix": [1, 15], "x": 15.75, "y": 1, "w": 1.5},
+
+                {"matrix": [1, 16], "x": 17.5, "y": 1},
+                {"matrix": [1, 17], "x": 18.5, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+
+                {"matrix": [2, 2], "x": 2.25, "y": 2, "w": 1.75},
+                {"matrix": [2, 3], "x": 4, "y": 2},
+                {"matrix": [2, 4], "x": 5, "y": 2},
+                {"matrix": [2, 5], "x": 6, "y": 2},
+                {"matrix": [2, 6], "x": 7, "y": 2},
+                {"matrix": [2, 7], "x": 8, "y": 2},
+                {"matrix": [2, 8], "x": 9, "y": 2},
+                {"matrix": [2, 9], "x": 10, "y": 2},
+                {"matrix": [2, 10], "x": 11, "y": 2},
+                {"matrix": [2, 11], "x": 12, "y": 2},
+                {"matrix": [2, 12], "x": 13, "y": 2},
+                {"matrix": [2, 13], "x": 14, "y": 2},
+                {"matrix": [2, 14], "x": 15, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+
+                {"matrix": [3, 2], "x": 2.25, "y": 3, "w": 2.25},
+                {"matrix": [3, 4], "x": 4.5, "y": 3},
+                {"matrix": [3, 5], "x": 5.5, "y": 3},
+                {"matrix": [3, 6], "x": 6.5, "y": 3},
+                {"matrix": [3, 7], "x": 7.5, "y": 3},
+                {"matrix": [3, 8], "x": 8.5, "y": 3},
+                {"matrix": [3, 9], "x": 9.5, "y": 3},
+                {"matrix": [3, 10], "x": 10.5, "y": 3},
+                {"matrix": [3, 11], "x": 11.5, "y": 3},
+                {"matrix": [3, 12], "x": 12.5, "y": 3},
+                {"matrix": [3, 13], "x": 13.5, "y": 3},
+                {"matrix": [3, 14], "x": 14.5, "y": 3, "w": 2.75},
+
+                {"matrix": [3, 16], "x": 17.5, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+
+                {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 3.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 4.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 8], "x": 6, "y": 4, "w": 6.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 14], "x": 14.75, "y": 4, "w": 1.25},
+
+                {"matrix": [4, 15], "x": 16.5, "y": 4},
+                {"matrix": [4, 16], "x": 17.5, "y": 4},
+                {"matrix": [4, 17], "x": 18.5, "y": 4}
+            ]
+        },
+        "LAYOUT_split_rshift": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+                {"matrix": [0, 5], "x": 5.25, "y": 0},
+                {"matrix": [0, 6], "x": 6.25, "y": 0},
+                {"matrix": [0, 7], "x": 7.25, "y": 0},
+                {"matrix": [0, 8], "x": 8.25, "y": 0},
+                {"matrix": [0, 9], "x": 9.25, "y": 0},
+                {"matrix": [0, 10], "x": 10.25, "y": 0},
+                {"matrix": [0, 11], "x": 11.25, "y": 0},
+                {"matrix": [0, 12], "x": 12.25, "y": 0},
+                {"matrix": [0, 13], "x": 13.25, "y": 0},
+                {"matrix": [0, 14], "x": 14.25, "y": 0},
+                {"matrix": [0, 15], "x": 15.25, "y": 0, "w": 2},
+
+                {"matrix": [0, 16], "x": 17.5, "y": 0},
+                {"matrix": [0, 17], "x": 18.5, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+
+                {"matrix": [1, 2], "x": 2.25, "y": 1, "w": 1.5},
+                {"matrix": [1, 3], "x": 3.75, "y": 1},
+                {"matrix": [1, 4], "x": 4.75, "y": 1},
+                {"matrix": [1, 5], "x": 5.75, "y": 1},
+                {"matrix": [1, 6], "x": 6.75, "y": 1},
+                {"matrix": [1, 7], "x": 7.75, "y": 1},
+                {"matrix": [1, 8], "x": 8.75, "y": 1},
+                {"matrix": [1, 9], "x": 9.75, "y": 1},
+                {"matrix": [1, 10], "x": 10.75, "y": 1},
+                {"matrix": [1, 11], "x": 11.75, "y": 1},
+                {"matrix": [1, 12], "x": 12.75, "y": 1},
+                {"matrix": [1, 13], "x": 13.75, "y": 1},
+                {"matrix": [1, 14], "x": 14.75, "y": 1},
+                {"matrix": [1, 15], "x": 15.75, "y": 1, "w": 1.5},
+
+                {"matrix": [1, 16], "x": 17.5, "y": 1},
+                {"matrix": [1, 17], "x": 18.5, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+
+                {"matrix": [2, 2], "x": 2.25, "y": 2, "w": 1.75},
+                {"matrix": [2, 3], "x": 4, "y": 2},
+                {"matrix": [2, 4], "x": 5, "y": 2},
+                {"matrix": [2, 5], "x": 6, "y": 2},
+                {"matrix": [2, 6], "x": 7, "y": 2},
+                {"matrix": [2, 7], "x": 8, "y": 2},
+                {"matrix": [2, 8], "x": 9, "y": 2},
+                {"matrix": [2, 9], "x": 10, "y": 2},
+                {"matrix": [2, 10], "x": 11, "y": 2},
+                {"matrix": [2, 11], "x": 12, "y": 2},
+                {"matrix": [2, 12], "x": 13, "y": 2},
+                {"matrix": [2, 13], "x": 14, "y": 2},
+                {"matrix": [2, 14], "x": 15, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+
+                {"matrix": [3, 2], "x": 2.25, "y": 3, "w": 2.25},
+                {"matrix": [3, 4], "x": 4.5, "y": 3},
+                {"matrix": [3, 5], "x": 5.5, "y": 3},
+                {"matrix": [3, 6], "x": 6.5, "y": 3},
+                {"matrix": [3, 7], "x": 7.5, "y": 3},
+                {"matrix": [3, 8], "x": 8.5, "y": 3},
+                {"matrix": [3, 9], "x": 9.5, "y": 3},
+                {"matrix": [3, 10], "x": 10.5, "y": 3},
+                {"matrix": [3, 11], "x": 11.5, "y": 3},
+                {"matrix": [3, 12], "x": 12.5, "y": 3},
+                {"matrix": [3, 13], "x": 13.5, "y": 3},
+                {"matrix": [3, 14], "x": 14.5, "y": 3, "w": 1.75},
+                {"matrix": [3, 15], "x": 16.25, "y": 3},
+
+                {"matrix": [3, 16], "x": 17.5, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+
+                {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 3.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 4.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 8], "x": 6, "y": 4, "w": 6.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 14], "x": 14.75, "y": 4, "w": 1.25},
+
+                {"matrix": [4, 15], "x": 16.5, "y": 4},
+                {"matrix": [4, 16], "x": 17.5, "y": 4},
+                {"matrix": [4, 17], "x": 18.5, "y": 4}
+            ]
+        },
+        "LAYOUT_iso": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+                {"matrix": [0, 5], "x": 5.25, "y": 0},
+                {"matrix": [0, 6], "x": 6.25, "y": 0},
+                {"matrix": [0, 7], "x": 7.25, "y": 0},
+                {"matrix": [0, 8], "x": 8.25, "y": 0},
+                {"matrix": [0, 9], "x": 9.25, "y": 0},
+                {"matrix": [0, 10], "x": 10.25, "y": 0},
+                {"matrix": [0, 11], "x": 11.25, "y": 0},
+                {"matrix": [0, 12], "x": 12.25, "y": 0},
+                {"matrix": [0, 13], "x": 13.25, "y": 0},
+                {"matrix": [0, 14], "x": 14.25, "y": 0},
+                {"matrix": [0, 15], "x": 15.25, "y": 0, "w": 2},
+
+                {"matrix": [0, 16], "x": 17.5, "y": 0},
+                {"matrix": [0, 17], "x": 18.5, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+
+                {"matrix": [1, 2], "x": 2.25, "y": 1, "w": 1.5},
+                {"matrix": [1, 3], "x": 3.75, "y": 1},
+                {"matrix": [1, 4], "x": 4.75, "y": 1},
+                {"matrix": [1, 5], "x": 5.75, "y": 1},
+                {"matrix": [1, 6], "x": 6.75, "y": 1},
+                {"matrix": [1, 7], "x": 7.75, "y": 1},
+                {"matrix": [1, 8], "x": 8.75, "y": 1},
+                {"matrix": [1, 9], "x": 9.75, "y": 1},
+                {"matrix": [1, 10], "x": 10.75, "y": 1},
+                {"matrix": [1, 11], "x": 11.75, "y": 1},
+                {"matrix": [1, 12], "x": 12.75, "y": 1},
+                {"matrix": [1, 13], "x": 13.75, "y": 1},
+                {"matrix": [1, 14], "x": 14.75, "y": 1},
+                {"matrix": [1, 15], "x": 16, "y": 1, "w": 1.25, "h": 2},
+
+                {"matrix": [1, 16], "x": 17.5, "y": 1},
+                {"matrix": [1, 17], "x": 18.5, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+
+                {"matrix": [2, 2], "x": 2.25, "y": 2, "w": 1.75},
+                {"matrix": [2, 3], "x": 4, "y": 2},
+                {"matrix": [2, 4], "x": 5, "y": 2},
+                {"matrix": [2, 5], "x": 6, "y": 2},
+                {"matrix": [2, 6], "x": 7, "y": 2},
+                {"matrix": [2, 7], "x": 8, "y": 2},
+                {"matrix": [2, 8], "x": 9, "y": 2},
+                {"matrix": [2, 9], "x": 10, "y": 2},
+                {"matrix": [2, 10], "x": 11, "y": 2},
+                {"matrix": [2, 11], "x": 12, "y": 2},
+                {"matrix": [2, 12], "x": 13, "y": 2},
+                {"matrix": [2, 13], "x": 14, "y": 2},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+
+                {"matrix": [3, 2], "x": 2.25, "y": 3, "w": 1.25},
+                {"matrix": [3, 3], "x": 3.5, "y": 3},
+                {"matrix": [3, 4], "x": 4.5, "y": 3},
+                {"matrix": [3, 5], "x": 5.5, "y": 3},
+                {"matrix": [3, 6], "x": 6.5, "y": 3},
+                {"matrix": [3, 7], "x": 7.5, "y": 3},
+                {"matrix": [3, 8], "x": 8.5, "y": 3},
+                {"matrix": [3, 9], "x": 9.5, "y": 3},
+                {"matrix": [3, 10], "x": 10.5, "y": 3},
+                {"matrix": [3, 11], "x": 11.5, "y": 3},
+                {"matrix": [3, 12], "x": 12.5, "y": 3},
+                {"matrix": [3, 13], "x": 13.5, "y": 3},
+                {"matrix": [3, 14], "x": 14.5, "y": 3, "w": 2.75},
+
+                {"matrix": [3, 16], "x": 17.5, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+
+                {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 3.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 4.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 8], "x": 6, "y": 4, "w": 6.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 14], "x": 14.75, "y": 4, "w": 1.25},
+
+                {"matrix": [4, 15], "x": 16.5, "y": 4},
+                {"matrix": [4, 16], "x": 17.5, "y": 4},
+                {"matrix": [4, 17], "x": 18.5, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/lfkeyboards/lfk78/revj/rules.mk b/keyboards/lfkeyboards/lfk78/revj/rules.mk
deleted file mode 100644
index ef72559a0c1..00000000000
--- a/keyboards/lfkeyboards/lfk78/revj/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-AUDIO_ENABLE = yes
diff --git a/keyboards/lfkeyboards/lfk78/rules.mk b/keyboards/lfkeyboards/lfk78/rules.mk
index 82ffed96f5e..5ebd387c834 100644
--- a/keyboards/lfkeyboards/lfk78/rules.mk
+++ b/keyboards/lfkeyboards/lfk78/rules.mk
@@ -1,13 +1 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no            # Mouse keys
-EXTRAKEY_ENABLE = yes           # Audio control and System control
-CONSOLE_ENABLE = no             # Console for debug
-COMMAND_ENABLE = no             # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-AUDIO_ENABLE = no               # Audio output
-WATCHDOG_ENABLE = no            # Resets keyboard if matrix_scan isn't run every 250ms
-
 DEFAULT_FOLDER = lfkeyboards/lfk78/revj
diff --git a/keyboards/lfkeyboards/mini1800/reva/info.json b/keyboards/lfkeyboards/mini1800/reva/info.json
deleted file mode 100644
index a0204033d8e..00000000000
--- a/keyboards/lfkeyboards/mini1800/reva/info.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "processor": "at90usb1286",
-    "bootloader": "atmel-dfu"
-}
diff --git a/keyboards/lfkeyboards/mini1800/reva/keyboard.json b/keyboards/lfkeyboards/mini1800/reva/keyboard.json
new file mode 100644
index 00000000000..8d93a054e4d
--- /dev/null
+++ b/keyboards/lfkeyboards/mini1800/reva/keyboard.json
@@ -0,0 +1,12 @@
+{
+    "processor": "at90usb1286",
+    "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": false,
+        "mousekey": false,
+        "extrakey": true,
+        "nkro": true,
+        "audio": true,
+        "watchdog": true
+    }
+}
diff --git a/keyboards/lfkeyboards/mini1800/reva/rules.mk b/keyboards/lfkeyboards/mini1800/reva/rules.mk
deleted file mode 100644
index fa0a6ab5b7e..00000000000
--- a/keyboards/lfkeyboards/mini1800/reva/rules.mk
+++ /dev/null
@@ -1,11 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-AUDIO_ENABLE = yes          # Audio output
-WATCHDOG_ENABLE = yes       # Resets keyboard if matrix_scan isn't run every 250ms
diff --git a/keyboards/lfkeyboards/mini1800/revc/info.json b/keyboards/lfkeyboards/mini1800/revc/info.json
deleted file mode 100644
index fd4b030c4ea..00000000000
--- a/keyboards/lfkeyboards/mini1800/revc/info.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "processor": "at90usb646",
-    "bootloader": "atmel-dfu"
-}
diff --git a/keyboards/lfkeyboards/mini1800/revc/keyboard.json b/keyboards/lfkeyboards/mini1800/revc/keyboard.json
new file mode 100644
index 00000000000..408181d3280
--- /dev/null
+++ b/keyboards/lfkeyboards/mini1800/revc/keyboard.json
@@ -0,0 +1,12 @@
+{
+    "processor": "at90usb646",
+    "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": false,
+        "mousekey": false,
+        "extrakey": true,
+        "nkro": true,
+        "audio": true,
+        "watchdog": true
+    }
+}
diff --git a/keyboards/lfkeyboards/mini1800/revc/rules.mk b/keyboards/lfkeyboards/mini1800/revc/rules.mk
deleted file mode 100644
index fa0a6ab5b7e..00000000000
--- a/keyboards/lfkeyboards/mini1800/revc/rules.mk
+++ /dev/null
@@ -1,11 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-AUDIO_ENABLE = yes          # Audio output
-WATCHDOG_ENABLE = yes       # Resets keyboard if matrix_scan isn't run every 250ms
diff --git a/keyboards/lily58/glow_enc/info.json b/keyboards/lily58/glow_enc/info.json
deleted file mode 100644
index 006cf0aa210..00000000000
--- a/keyboards/lily58/glow_enc/info.json
+++ /dev/null
@@ -1,120 +0,0 @@
-{
-    "keyboard_name": "Lily58GlowEnc",
-    "manufacturer": "ORVISEVANS+",
-    "url": "https://keycapsss.com",
-    "maintainer": "BenRoe",
-    "usb": {
-        "vid": "0xFC51",
-        "pid": "0x0059",
-        "device_version": "1.0.0"
-    },
-    "features": {
-        "encoder": true,
-        "oled": true,
-        "rgblight": true
-    },
-    "matrix_pins": {
-        "cols": ["F6", "F7", "B1", "B3", "B2", "B6"],
-        "rows": ["C6", "D7", "E6", "B4", "B5"]
-    },
-    "diode_direction": "COL2ROW",
-    "encoder": {
-        "rotary": [
-            {"pin_a": "F5", "pin_b": "D4"}
-        ]
-    },
-    "split": {
-        "enabled": true,
-        "soft_serial_pin": "D2",
-        "encoder": {
-            "right": {
-                "rotary": [
-                    {"pin_a": "D4", "pin_b": "F5"}
-                ]
-            }
-        }
-    },
-    "ws2812": {
-        "pin": "F4"
-    },
-    "rgblight": {
-        "led_count": 72,
-        "max_brightness": 120,
-        "split_count": [36, 36]
-    },
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0.5},
-                {"matrix": [0, 1], "x": 1, "y": 0.375},
-                {"matrix": [0, 2], "x": 2, "y": 0.125},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0.125},
-                {"matrix": [0, 5], "x": 5, "y": 0.25},
-
-                {"matrix": [5, 5], "x": 10.5, "y": 0.25},
-                {"matrix": [5, 4], "x": 11.5, "y": 0.125},
-                {"matrix": [5, 3], "x": 12.5, "y": 0},
-                {"matrix": [5, 2], "x": 13.5, "y": 0.125},
-                {"matrix": [5, 1], "x": 14.5, "y": 0.375},
-                {"matrix": [5, 0], "x": 15.5, "y": 0.5},
-
-                {"matrix": [1, 0], "x": 0, "y": 1.5},
-                {"matrix": [1, 1], "x": 1, "y": 1.375},
-                {"matrix": [1, 2], "x": 2, "y": 1.125},
-                {"matrix": [1, 3], "x": 3, "y": 1},
-                {"matrix": [1, 4], "x": 4, "y": 1.125},
-                {"matrix": [1, 5], "x": 5, "y": 1.25},
-
-                {"matrix": [6, 5], "x": 10.5, "y": 1.25},
-                {"matrix": [6, 4], "x": 11.5, "y": 1.125},
-                {"matrix": [6, 3], "x": 12.5, "y": 1},
-                {"matrix": [6, 2], "x": 13.5, "y": 1.125},
-                {"matrix": [6, 1], "x": 14.5, "y": 1.375},
-                {"matrix": [6, 0], "x": 15.5, "y": 1.5},
-
-                {"matrix": [2, 0], "x": 0, "y": 2.5},
-                {"matrix": [2, 1], "x": 1, "y": 2.375},
-                {"matrix": [2, 2], "x": 2, "y": 2.125},
-                {"matrix": [2, 3], "x": 3, "y": 2},
-                {"matrix": [2, 4], "x": 4, "y": 2.125},
-                {"matrix": [2, 5], "x": 5, "y": 2.25},
-
-                {"matrix": [7, 5], "x": 10.5, "y": 2.25},
-                {"matrix": [7, 4], "x": 11.5, "y": 2.125},
-                {"matrix": [7, 3], "x": 12.5, "y": 2},
-                {"matrix": [7, 2], "x": 13.5, "y": 2.125},
-                {"matrix": [7, 1], "x": 14.5, "y": 2.375},
-                {"matrix": [7, 0], "x": 15.5, "y": 2.5},
-
-                {"matrix": [3, 0], "x": 0, "y": 3.5},
-                {"matrix": [3, 1], "x": 1, "y": 3.375},
-                {"matrix": [3, 2], "x": 2, "y": 3.125},
-                {"matrix": [3, 3], "x": 3, "y": 3},
-                {"matrix": [3, 4], "x": 4, "y": 3.125},
-                {"matrix": [3, 5], "x": 5, "y": 3.25},
-                {"matrix": [4, 5], "x": 6, "y": 2.75},
-
-                {"matrix": [9, 5], "x": 9.5, "y": 2.75},
-                {"matrix": [8, 5], "x": 10.5, "y": 3.25},
-                {"matrix": [8, 4], "x": 11.5, "y": 3.125},
-                {"matrix": [8, 3], "x": 12.5, "y": 3},
-                {"matrix": [8, 2], "x": 13.5, "y": 3.125},
-                {"matrix": [8, 1], "x": 14.5, "y": 3.375},
-                {"matrix": [8, 0], "x": 15.5, "y": 3.5},
-
-                {"matrix": [4, 1], "x": 2.5, "y": 4.125},
-                {"matrix": [4, 2], "x": 3.5, "y": 4.15},
-                {"matrix": [4, 3], "x": 4.5, "y": 4.25},
-                {"matrix": [4, 4], "x": 6, "y": 4.25, "h": 1.5},
-
-                {"matrix": [9, 4], "x": 9.5, "y": 4.25, "h": 1.5},
-                {"matrix": [9, 3], "x": 11, "y": 4.25},
-                {"matrix": [9, 2], "x": 12, "y": 4.15},
-                {"matrix": [9, 1], "x": 13, "y": 4.15}
-            ]
-        }
-    }
-}
diff --git a/keyboards/lily58/glow_enc/keyboard.json b/keyboards/lily58/glow_enc/keyboard.json
new file mode 100644
index 00000000000..7778069833e
--- /dev/null
+++ b/keyboards/lily58/glow_enc/keyboard.json
@@ -0,0 +1,123 @@
+{
+    "keyboard_name": "Lily58GlowEnc",
+    "manufacturer": "ORVISEVANS+",
+    "url": "https://keycapsss.com",
+    "maintainer": "BenRoe",
+    "usb": {
+        "vid": "0xFC51",
+        "pid": "0x0059",
+        "device_version": "1.0.0"
+    },
+    "features": {
+        "encoder": true,
+        "oled": true,
+        "rgblight": true
+    },
+    "matrix_pins": {
+        "cols": ["F6", "F7", "B1", "B3", "B2", "B6"],
+        "rows": ["C6", "D7", "E6", "B4", "B5"]
+    },
+    "diode_direction": "COL2ROW",
+    "encoder": {
+        "rotary": [
+            {"pin_a": "F5", "pin_b": "D4"}
+        ]
+    },
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "D2",
+        "encoder": {
+            "right": {
+                "rotary": [
+                    {"pin_a": "D4", "pin_b": "F5"}
+                ]
+            }
+        }
+    },
+    "ws2812": {
+        "pin": "F4"
+    },
+    "rgblight": {
+        "led_count": 72,
+        "max_brightness": 120,
+        "split_count": [36, 36]
+    },
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
+    "build": {
+        "lto": true
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0.5},
+                {"matrix": [0, 1], "x": 1, "y": 0.375},
+                {"matrix": [0, 2], "x": 2, "y": 0.125},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0.125},
+                {"matrix": [0, 5], "x": 5, "y": 0.25},
+
+                {"matrix": [5, 5], "x": 10.5, "y": 0.25},
+                {"matrix": [5, 4], "x": 11.5, "y": 0.125},
+                {"matrix": [5, 3], "x": 12.5, "y": 0},
+                {"matrix": [5, 2], "x": 13.5, "y": 0.125},
+                {"matrix": [5, 1], "x": 14.5, "y": 0.375},
+                {"matrix": [5, 0], "x": 15.5, "y": 0.5},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.375},
+                {"matrix": [1, 2], "x": 2, "y": 1.125},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1.125},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+
+                {"matrix": [6, 5], "x": 10.5, "y": 1.25},
+                {"matrix": [6, 4], "x": 11.5, "y": 1.125},
+                {"matrix": [6, 3], "x": 12.5, "y": 1},
+                {"matrix": [6, 2], "x": 13.5, "y": 1.125},
+                {"matrix": [6, 1], "x": 14.5, "y": 1.375},
+                {"matrix": [6, 0], "x": 15.5, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.5},
+                {"matrix": [2, 1], "x": 1, "y": 2.375},
+                {"matrix": [2, 2], "x": 2, "y": 2.125},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2.125},
+                {"matrix": [2, 5], "x": 5, "y": 2.25},
+
+                {"matrix": [7, 5], "x": 10.5, "y": 2.25},
+                {"matrix": [7, 4], "x": 11.5, "y": 2.125},
+                {"matrix": [7, 3], "x": 12.5, "y": 2},
+                {"matrix": [7, 2], "x": 13.5, "y": 2.125},
+                {"matrix": [7, 1], "x": 14.5, "y": 2.375},
+                {"matrix": [7, 0], "x": 15.5, "y": 2.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.5},
+                {"matrix": [3, 1], "x": 1, "y": 3.375},
+                {"matrix": [3, 2], "x": 2, "y": 3.125},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3.125},
+                {"matrix": [3, 5], "x": 5, "y": 3.25},
+                {"matrix": [4, 5], "x": 6, "y": 2.75},
+
+                {"matrix": [9, 5], "x": 9.5, "y": 2.75},
+                {"matrix": [8, 5], "x": 10.5, "y": 3.25},
+                {"matrix": [8, 4], "x": 11.5, "y": 3.125},
+                {"matrix": [8, 3], "x": 12.5, "y": 3},
+                {"matrix": [8, 2], "x": 13.5, "y": 3.125},
+                {"matrix": [8, 1], "x": 14.5, "y": 3.375},
+                {"matrix": [8, 0], "x": 15.5, "y": 3.5},
+
+                {"matrix": [4, 1], "x": 2.5, "y": 4.125},
+                {"matrix": [4, 2], "x": 3.5, "y": 4.15},
+                {"matrix": [4, 3], "x": 4.5, "y": 4.25},
+                {"matrix": [4, 4], "x": 6, "y": 4.25, "h": 1.5},
+
+                {"matrix": [9, 4], "x": 9.5, "y": 4.25, "h": 1.5},
+                {"matrix": [9, 3], "x": 11, "y": 4.25},
+                {"matrix": [9, 2], "x": 12, "y": 4.15},
+                {"matrix": [9, 1], "x": 13, "y": 4.15}
+            ]
+        }
+    }
+}
diff --git a/keyboards/lily58/glow_enc/rules.mk b/keyboards/lily58/glow_enc/rules.mk
deleted file mode 100644
index 4da205a168c..00000000000
--- a/keyboards/lily58/glow_enc/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-LTO_ENABLE = yes
diff --git a/keyboards/lily58/light/info.json b/keyboards/lily58/light/info.json
deleted file mode 100644
index 1c556e429a6..00000000000
--- a/keyboards/lily58/light/info.json
+++ /dev/null
@@ -1,121 +0,0 @@
-{
-    "keyboard_name": "Lily58L",
-    "manufacturer": "Keycapsss",
-    "url": "https://keycapsss.com",
-    "maintainer": "BenRoe",
-    "usb": {
-        "vid": "0x7983",
-        "pid": "0x4C4C",
-        "device_version": "1.0.0"
-    },
-    "features": {
-        "bootmagic": true,
-        "encoder": true,
-        "oled": true,
-        "rgblight": true
-    },
-    "matrix_pins": {
-        "cols": ["F6", "F7", "B1", "B3", "B2", "B6"],
-        "rows": ["C6", "D7", "E6", "B4", "B5"]
-    },
-    "diode_direction": "COL2ROW",
-    "encoder": {
-        "rotary": [
-            {"pin_a": "F4", "pin_b": "F5"}
-        ]
-    },
-    "split": {
-        "enabled": true,
-        "soft_serial_pin": "D2",
-        "encoder": {
-            "right": {
-                "rotary": [
-                    {"pin_a": "F5", "pin_b": "F4"}
-                ]
-            }
-        }
-    },
-    "ws2812": {
-        "pin": "D3"
-    },
-    "rgblight": {
-        "led_count": 70,
-        "max_brightness": 120,
-        "split_count": [35, 35]
-    },
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0.5},
-                {"matrix": [0, 1], "x": 1, "y": 0.375},
-                {"matrix": [0, 2], "x": 2, "y": 0.125},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0.125},
-                {"matrix": [0, 5], "x": 5, "y": 0.25},
-
-                {"matrix": [5, 5], "x": 10.5, "y": 0.25},
-                {"matrix": [5, 4], "x": 11.5, "y": 0.125},
-                {"matrix": [5, 3], "x": 12.5, "y": 0},
-                {"matrix": [5, 2], "x": 13.5, "y": 0.125},
-                {"matrix": [5, 1], "x": 14.5, "y": 0.375},
-                {"matrix": [5, 0], "x": 15.5, "y": 0.5},
-
-                {"matrix": [1, 0], "x": 0, "y": 1.5},
-                {"matrix": [1, 1], "x": 1, "y": 1.375},
-                {"matrix": [1, 2], "x": 2, "y": 1.125},
-                {"matrix": [1, 3], "x": 3, "y": 1},
-                {"matrix": [1, 4], "x": 4, "y": 1.125},
-                {"matrix": [1, 5], "x": 5, "y": 1.25},
-
-                {"matrix": [6, 5], "x": 10.5, "y": 1.25},
-                {"matrix": [6, 4], "x": 11.5, "y": 1.125},
-                {"matrix": [6, 3], "x": 12.5, "y": 1},
-                {"matrix": [6, 2], "x": 13.5, "y": 1.125},
-                {"matrix": [6, 1], "x": 14.5, "y": 1.375},
-                {"matrix": [6, 0], "x": 15.5, "y": 1.5},
-
-                {"matrix": [2, 0], "x": 0, "y": 2.5},
-                {"matrix": [2, 1], "x": 1, "y": 2.375},
-                {"matrix": [2, 2], "x": 2, "y": 2.125},
-                {"matrix": [2, 3], "x": 3, "y": 2},
-                {"matrix": [2, 4], "x": 4, "y": 2.125},
-                {"matrix": [2, 5], "x": 5, "y": 2.25},
-
-                {"matrix": [7, 5], "x": 10.5, "y": 2.25},
-                {"matrix": [7, 4], "x": 11.5, "y": 2.125},
-                {"matrix": [7, 3], "x": 12.5, "y": 2},
-                {"matrix": [7, 2], "x": 13.5, "y": 2.125},
-                {"matrix": [7, 1], "x": 14.5, "y": 2.375},
-                {"matrix": [7, 0], "x": 15.5, "y": 2.5},
-
-                {"matrix": [3, 0], "x": 0, "y": 3.5},
-                {"matrix": [3, 1], "x": 1, "y": 3.375},
-                {"matrix": [3, 2], "x": 2, "y": 3.125},
-                {"matrix": [3, 3], "x": 3, "y": 3},
-                {"matrix": [3, 4], "x": 4, "y": 3.125},
-                {"matrix": [3, 5], "x": 5, "y": 3.25},
-                {"matrix": [4, 5], "x": 6, "y": 2.75},
-
-                {"matrix": [9, 5], "x": 9.5, "y": 2.75},
-                {"matrix": [8, 5], "x": 10.5, "y": 3.25},
-                {"matrix": [8, 4], "x": 11.5, "y": 3.125},
-                {"matrix": [8, 3], "x": 12.5, "y": 3},
-                {"matrix": [8, 2], "x": 13.5, "y": 3.125},
-                {"matrix": [8, 1], "x": 14.5, "y": 3.375},
-                {"matrix": [8, 0], "x": 15.5, "y": 3.5},
-
-                {"matrix": [4, 1], "x": 2.5, "y": 4.125},
-                {"matrix": [4, 2], "x": 3.5, "y": 4.15},
-                {"matrix": [4, 3], "x": 4.5, "y": 4.25},
-                {"matrix": [4, 4], "x": 6, "y": 4.25, "h": 1.5},
-
-                {"matrix": [9, 4], "x": 9.5, "y": 4.25, "h": 1.5},
-                {"matrix": [9, 3], "x": 11, "y": 4.25},
-                {"matrix": [9, 2], "x": 12, "y": 4.15},
-                {"matrix": [9, 1], "x": 13, "y": 4.15}
-            ]
-        }
-    }
-}
diff --git a/keyboards/lily58/light/keyboard.json b/keyboards/lily58/light/keyboard.json
new file mode 100644
index 00000000000..34c4e28b186
--- /dev/null
+++ b/keyboards/lily58/light/keyboard.json
@@ -0,0 +1,124 @@
+{
+    "keyboard_name": "Lily58L",
+    "manufacturer": "Keycapsss",
+    "url": "https://keycapsss.com",
+    "maintainer": "BenRoe",
+    "usb": {
+        "vid": "0x7983",
+        "pid": "0x4C4C",
+        "device_version": "1.0.0"
+    },
+    "features": {
+        "bootmagic": true,
+        "encoder": true,
+        "oled": true,
+        "rgblight": true
+    },
+    "matrix_pins": {
+        "cols": ["F6", "F7", "B1", "B3", "B2", "B6"],
+        "rows": ["C6", "D7", "E6", "B4", "B5"]
+    },
+    "diode_direction": "COL2ROW",
+    "encoder": {
+        "rotary": [
+            {"pin_a": "F4", "pin_b": "F5"}
+        ]
+    },
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "D2",
+        "encoder": {
+            "right": {
+                "rotary": [
+                    {"pin_a": "F5", "pin_b": "F4"}
+                ]
+            }
+        }
+    },
+    "ws2812": {
+        "pin": "D3"
+    },
+    "rgblight": {
+        "led_count": 70,
+        "max_brightness": 120,
+        "split_count": [35, 35]
+    },
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
+    "build": {
+        "lto": true
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0.5},
+                {"matrix": [0, 1], "x": 1, "y": 0.375},
+                {"matrix": [0, 2], "x": 2, "y": 0.125},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0.125},
+                {"matrix": [0, 5], "x": 5, "y": 0.25},
+
+                {"matrix": [5, 5], "x": 10.5, "y": 0.25},
+                {"matrix": [5, 4], "x": 11.5, "y": 0.125},
+                {"matrix": [5, 3], "x": 12.5, "y": 0},
+                {"matrix": [5, 2], "x": 13.5, "y": 0.125},
+                {"matrix": [5, 1], "x": 14.5, "y": 0.375},
+                {"matrix": [5, 0], "x": 15.5, "y": 0.5},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.375},
+                {"matrix": [1, 2], "x": 2, "y": 1.125},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1.125},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+
+                {"matrix": [6, 5], "x": 10.5, "y": 1.25},
+                {"matrix": [6, 4], "x": 11.5, "y": 1.125},
+                {"matrix": [6, 3], "x": 12.5, "y": 1},
+                {"matrix": [6, 2], "x": 13.5, "y": 1.125},
+                {"matrix": [6, 1], "x": 14.5, "y": 1.375},
+                {"matrix": [6, 0], "x": 15.5, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.5},
+                {"matrix": [2, 1], "x": 1, "y": 2.375},
+                {"matrix": [2, 2], "x": 2, "y": 2.125},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2.125},
+                {"matrix": [2, 5], "x": 5, "y": 2.25},
+
+                {"matrix": [7, 5], "x": 10.5, "y": 2.25},
+                {"matrix": [7, 4], "x": 11.5, "y": 2.125},
+                {"matrix": [7, 3], "x": 12.5, "y": 2},
+                {"matrix": [7, 2], "x": 13.5, "y": 2.125},
+                {"matrix": [7, 1], "x": 14.5, "y": 2.375},
+                {"matrix": [7, 0], "x": 15.5, "y": 2.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.5},
+                {"matrix": [3, 1], "x": 1, "y": 3.375},
+                {"matrix": [3, 2], "x": 2, "y": 3.125},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3.125},
+                {"matrix": [3, 5], "x": 5, "y": 3.25},
+                {"matrix": [4, 5], "x": 6, "y": 2.75},
+
+                {"matrix": [9, 5], "x": 9.5, "y": 2.75},
+                {"matrix": [8, 5], "x": 10.5, "y": 3.25},
+                {"matrix": [8, 4], "x": 11.5, "y": 3.125},
+                {"matrix": [8, 3], "x": 12.5, "y": 3},
+                {"matrix": [8, 2], "x": 13.5, "y": 3.125},
+                {"matrix": [8, 1], "x": 14.5, "y": 3.375},
+                {"matrix": [8, 0], "x": 15.5, "y": 3.5},
+
+                {"matrix": [4, 1], "x": 2.5, "y": 4.125},
+                {"matrix": [4, 2], "x": 3.5, "y": 4.15},
+                {"matrix": [4, 3], "x": 4.5, "y": 4.25},
+                {"matrix": [4, 4], "x": 6, "y": 4.25, "h": 1.5},
+
+                {"matrix": [9, 4], "x": 9.5, "y": 4.25, "h": 1.5},
+                {"matrix": [9, 3], "x": 11, "y": 4.25},
+                {"matrix": [9, 2], "x": 12, "y": 4.15},
+                {"matrix": [9, 1], "x": 13, "y": 4.15}
+            ]
+        }
+    }
+}
diff --git a/keyboards/lily58/light/rules.mk b/keyboards/lily58/light/rules.mk
deleted file mode 100644
index 4da205a168c..00000000000
--- a/keyboards/lily58/light/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-LTO_ENABLE = yes
diff --git a/keyboards/lily58/r2g/info.json b/keyboards/lily58/r2g/info.json
deleted file mode 100644
index 3cad3dc8e8e..00000000000
--- a/keyboards/lily58/r2g/info.json
+++ /dev/null
@@ -1,205 +0,0 @@
-{
-    "keyboard_name": "Lily58 R2G",
-    "manufacturer": "Mechboards UK",
-    "url": "",
-    "maintainer": "Elliot Powell",
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "features": {
-        "bootmagic": true,
-        "oled": true,
-        "rgb_matrix": true
-    },
-    "usb": {
-        "vid": "0x04D8",
-        "pid": "0xEB2E",
-        "device_version": "1.0.0"
-    },
-    "diode_direction": "COL2ROW",
-    "matrix_pins": {
-        "rows": ["C6", "D7", "E6", "B4", "B5"],
-        "cols": ["F6", "F7", "B1", "B3", "B2", "B6"]
-    },
-    "split": {
-        "enabled": true,
-        "soft_serial_pin": "D2",
-        "transport": {
-            "sync": {
-                "matrix_state": true
-            }
-        }
-    },
-    "ws2812": {
-        "pin": "D3"
-    },
-    "rgblight": {
-        "max_brightness": 120
-    },
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0.5},
-                {"matrix": [0, 1], "x": 1, "y": 0.375},
-                {"matrix": [0, 2], "x": 2, "y": 0.125},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0.125},
-                {"matrix": [0, 5], "x": 5, "y": 0.25},
-
-                {"matrix": [5, 5], "x": 10.5, "y": 0.25},
-                {"matrix": [5, 4], "x": 11.5, "y": 0.125},
-                {"matrix": [5, 3], "x": 12.5, "y": 0},
-                {"matrix": [5, 2], "x": 13.5, "y": 0.125},
-                {"matrix": [5, 1], "x": 14.5, "y": 0.375},
-                {"matrix": [5, 0], "x": 15.5, "y": 0.5},
-
-                {"matrix": [1, 0], "x": 0, "y": 1.5},
-                {"matrix": [1, 1], "x": 1, "y": 1.375},
-                {"matrix": [1, 2], "x": 2, "y": 1.125},
-                {"matrix": [1, 3], "x": 3, "y": 1},
-                {"matrix": [1, 4], "x": 4, "y": 1.125},
-                {"matrix": [1, 5], "x": 5, "y": 1.25},
-
-                {"matrix": [6, 5], "x": 10.5, "y": 1.25},
-                {"matrix": [6, 4], "x": 11.5, "y": 1.125},
-                {"matrix": [6, 3], "x": 12.5, "y": 1},
-                {"matrix": [6, 2], "x": 13.5, "y": 1.125},
-                {"matrix": [6, 1], "x": 14.5, "y": 1.375},
-                {"matrix": [6, 0], "x": 15.5, "y": 1.5},
-
-                {"matrix": [2, 0], "x": 0, "y": 2.5},
-                {"matrix": [2, 1], "x": 1, "y": 2.375},
-                {"matrix": [2, 2], "x": 2, "y": 2.125},
-                {"matrix": [2, 3], "x": 3, "y": 2},
-                {"matrix": [2, 4], "x": 4, "y": 2.125},
-                {"matrix": [2, 5], "x": 5, "y": 2.25},
-
-                {"matrix": [7, 5], "x": 10.5, "y": 2.25},
-                {"matrix": [7, 4], "x": 11.5, "y": 2.125},
-                {"matrix": [7, 3], "x": 12.5, "y": 2},
-                {"matrix": [7, 2], "x": 13.5, "y": 2.125},
-                {"matrix": [7, 1], "x": 14.5, "y": 2.375},
-                {"matrix": [7, 0], "x": 15.5, "y": 2.5},
-
-                {"matrix": [3, 0], "x": 0, "y": 3.5},
-                {"matrix": [3, 1], "x": 1, "y": 3.375},
-                {"matrix": [3, 2], "x": 2, "y": 3.125},
-                {"matrix": [3, 3], "x": 3, "y": 3},
-                {"matrix": [3, 4], "x": 4, "y": 3.125},
-                {"matrix": [3, 5], "x": 5, "y": 3.25},
-                {"matrix": [4, 5], "x": 6, "y": 2.75},
-
-                {"matrix": [9, 5], "x": 9.5, "y": 2.75},
-                {"matrix": [8, 5], "x": 10.5, "y": 3.25},
-                {"matrix": [8, 4], "x": 11.5, "y": 3.125},
-                {"matrix": [8, 3], "x": 12.5, "y": 3},
-                {"matrix": [8, 2], "x": 13.5, "y": 3.125},
-                {"matrix": [8, 1], "x": 14.5, "y": 3.375},
-                {"matrix": [8, 0], "x": 15.5, "y": 3.5},
-
-                {"matrix": [4, 1], "x": 2.5,"y": 4.125},
-                {"matrix": [4, 2], "x": 3.5, "y": 4.15},
-                {"matrix": [4, 3], "x": 4.5,"y": 4.25},
-                {"matrix": [4, 4], "x": 6, "y": 4.25, "h": 1.5},
-
-                {"matrix": [9, 4], "x": 9.5, "y": 4.25, "h": 1.5},
-                {"matrix": [9, 3], "x": 11, "y": 4.25},
-                {"matrix": [9, 2], "x": 12, "y": 4.15},
-                {"matrix": [9, 1], "x": 13, "y": 4.15}
-            ]
-        }
-    },
-    "rgb_matrix": {
-        "animations": {
-            "gradient_up_down": true,
-            "gradient_left_right": true,
-            "alphas_mods": true,
-            "breathing": true,
-            "hue_wave": true,
-            "rainbow_moving_chevron": true,
-            "rainbow_beacon": true,
-            "solid_reactive_simple": true,
-            "solid_reactive": true
-        },
-        "driver": "ws2812",
-        "split_count": [37, 37],
-        "layout": [
-            {"flags": 4, "matrix": [0, 5], "x": 72, "y": 4},   // L SW06
-            {"flags": 4, "matrix": [0, 4], "x": 58, "y": 2},   // L SW05
-            {"flags": 4, "matrix": [0, 3], "x": 43, "y": 0},   // L SW04
-            {"flags": 4, "matrix": [0, 2], "x": 29, "y": 2},   // L SW03
-            {"flags": 4, "matrix": [0, 1], "x": 14, "y": 6},   // L SW02
-            {"flags": 4, "matrix": [0, 0], "x": 0, "y": 8},    // L SW01
-            {"flags": 4, "matrix": [1, 0], "x": 0, "y": 23},   // L SW07
-            {"flags": 4, "matrix": [1, 1], "x": 14, "y": 21},  // L SW08
-            {"flags": 4, "matrix": [1, 2], "x": 29, "y": 17},  // L SW09
-            {"flags": 4, "matrix": [1, 3], "x": 43, "y": 15},  // L SW10
-            {"flags": 4, "matrix": [1, 4], "x": 58, "y": 17},  // L SW11
-            {"flags": 4, "matrix": [1, 5], "x": 72, "y": 19},  // L SW12
-            {"flags": 4, "matrix": [2, 5], "x": 72, "y": 34},  // L SW18
-            {"flags": 4, "matrix": [2, 4], "x": 58, "y": 32},  // L SW17
-            {"flags": 4, "matrix": [2, 3], "x": 43, "y": 30},  // L SW16
-            {"flags": 4, "matrix": [2, 2], "x": 29, "y": 32},  // L SW15
-            {"flags": 4, "matrix": [2, 1], "x": 14, "y": 36},  // L SW14
-            {"flags": 4, "matrix": [2, 0], "x": 0, "y": 38},   // L SW13
-            {"flags": 4, "matrix": [3, 0], "x": 0, "y": 53},   // L SW20
-            {"flags": 4, "matrix": [3, 1], "x": 14, "y": 51},  // L SW21
-            {"flags": 4, "matrix": [3, 2], "x": 29, "y": 47},  // L SW22
-            {"flags": 4, "matrix": [3, 3], "x": 43, "y": 45},  // L SW23
-            {"flags": 4, "matrix": [3, 4], "x": 58, "y": 47},  // L SW24
-            {"flags": 4, "matrix": [3, 5], "x": 72, "y": 49},  // L SW25
-            {"flags": 4, "matrix": [4, 5], "x": 87, "y": 41},
-            {"flags": 4, "matrix": [4, 4], "x": 87, "y": 64},
-            {"flags": 4, "matrix": [4, 3], "x": 65, "y": 64},
-            {"flags": 4, "matrix": [4, 2], "x": 51, "y": 62},
-            {"flags": 4, "matrix": [4, 1], "x": 36, "y": 62},
-            {"flags": 2, "x": 96, "y": 64},                    // L RGB1
-            {"flags": 2, "x": 32, "y": 64},                    // L RGB2
-            {"flags": 2, "x": 0, "y": 64},                     // L RGB3
-            {"flags": 2, "x": 0, "y": 32},                     // L RGB4
-            {"flags": 2, "x": 16, "y": 0},                     // L RGB5
-            {"flags": 2, "x": 50, "y": 0},                     // L RGB6
-            {"flags": 2, "x": 80, "y": 0},                     // L RGB7
-            {"flags": 2, "x": 96, "y": 32},                    // L RGB8
-            {"flags": 4, "matrix": [5, 5], "x": 152, "y": 4},  // R SW06
-            {"flags": 4, "matrix": [5, 4], "x": 166, "y": 2},  // R SW05
-            {"flags": 4, "matrix": [5, 3], "x": 181, "y": 0},  // R SW04
-            {"flags": 4, "matrix": [5, 2], "x": 195, "y": 2},  // R SW03
-            {"flags": 4, "matrix": [5, 1], "x": 210, "y": 6},  // R SW02
-            {"flags": 4, "matrix": [5, 0], "x": 224, "y": 8},  // R SW01
-            {"flags": 4, "matrix": [6, 0], "x": 224, "y": 23}, // R SW07
-            {"flags": 4, "matrix": [6, 1], "x": 210, "y": 21}, // R SW08
-            {"flags": 4, "matrix": [6, 2], "x": 195, "y": 17}, // R SW09
-            {"flags": 4, "matrix": [6, 3], "x": 181, "y": 15}, // R SW10
-            {"flags": 4, "matrix": [6, 4], "x": 166, "y": 17}, // R SW11
-            {"flags": 4, "matrix": [6, 5], "x": 152, "y": 19}, // R SW12
-            {"flags": 4, "matrix": [7, 5], "x": 152, "y": 34}, // R SW18
-            {"flags": 4, "matrix": [7, 4], "x": 166, "y": 32}, // R SW17
-            {"flags": 4, "matrix": [7, 3], "x": 181, "y": 30}, // R SW16
-            {"flags": 4, "matrix": [7, 2], "x": 195, "y": 32}, // R SW15
-            {"flags": 4, "matrix": [7, 1], "x": 210, "y": 36}, // R SW14
-            {"flags": 4, "matrix": [7, 0], "x": 224, "y": 38}, // R SW13
-            {"flags": 4, "matrix": [8, 0], "x": 224, "y": 53}, // R SW20
-            {"flags": 4, "matrix": [8, 1], "x": 210, "y": 51}, // R SW21
-            {"flags": 4, "matrix": [8, 2], "x": 195, "y": 47}, // R SW22
-            {"flags": 4, "matrix": [8, 3], "x": 181, "y": 45}, // R SW23
-            {"flags": 4, "matrix": [8, 4], "x": 166, "y": 47}, // R SW24
-            {"flags": 4, "matrix": [8, 5], "x": 152, "y": 49}, // R SW25
-            {"flags": 4, "matrix": [9, 5], "x": 137, "y": 41},
-            {"flags": 4, "matrix": [9, 4], "x": 137, "y": 64},
-            {"flags": 4, "matrix": [9, 3], "x": 159, "y": 64},
-            {"flags": 4, "matrix": [9, 2], "x": 173, "y": 62},
-            {"flags": 4, "matrix": [9, 1], "x": 188, "y": 62},
-            {"flags": 2, "x": 128, "y": 64},                   // R RGB1
-            {"flags": 2, "x": 192, "y": 64},                   // R RGB2
-            {"flags": 2, "x": 224, "y": 64},                   // R RGB3
-            {"flags": 2, "x": 224, "y": 32},                   // R RGB4
-            {"flags": 2, "x": 206, "y": 0},                    // R RGB5
-            {"flags": 2, "x": 150, "y": 0},                    // R RGB6
-            {"flags": 2, "x": 140, "y": 0},                    // R RGB7
-            {"flags": 2, "x": 128, "y": 32}                    // R RGB8
-        ],
-        "max_brightness": 120,
-        "react_on_keyup": true,
-        "sleep": true
-    }
-}
diff --git a/keyboards/lily58/r2g/keyboard.json b/keyboards/lily58/r2g/keyboard.json
new file mode 100644
index 00000000000..dbe5cfa9e01
--- /dev/null
+++ b/keyboards/lily58/r2g/keyboard.json
@@ -0,0 +1,208 @@
+{
+    "keyboard_name": "Lily58 R2G",
+    "manufacturer": "Mechboards UK",
+    "url": "",
+    "maintainer": "Elliot Powell",
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": true,
+        "oled": true,
+        "rgb_matrix": true
+    },
+    "build": {
+        "lto": true
+    },
+    "usb": {
+        "vid": "0x04D8",
+        "pid": "0xEB2E",
+        "device_version": "1.0.0"
+    },
+    "diode_direction": "COL2ROW",
+    "matrix_pins": {
+        "rows": ["C6", "D7", "E6", "B4", "B5"],
+        "cols": ["F6", "F7", "B1", "B3", "B2", "B6"]
+    },
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "D2",
+        "transport": {
+            "sync": {
+                "matrix_state": true
+            }
+        }
+    },
+    "ws2812": {
+        "pin": "D3"
+    },
+    "rgblight": {
+        "max_brightness": 120
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0.5},
+                {"matrix": [0, 1], "x": 1, "y": 0.375},
+                {"matrix": [0, 2], "x": 2, "y": 0.125},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0.125},
+                {"matrix": [0, 5], "x": 5, "y": 0.25},
+
+                {"matrix": [5, 5], "x": 10.5, "y": 0.25},
+                {"matrix": [5, 4], "x": 11.5, "y": 0.125},
+                {"matrix": [5, 3], "x": 12.5, "y": 0},
+                {"matrix": [5, 2], "x": 13.5, "y": 0.125},
+                {"matrix": [5, 1], "x": 14.5, "y": 0.375},
+                {"matrix": [5, 0], "x": 15.5, "y": 0.5},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.375},
+                {"matrix": [1, 2], "x": 2, "y": 1.125},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1.125},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+
+                {"matrix": [6, 5], "x": 10.5, "y": 1.25},
+                {"matrix": [6, 4], "x": 11.5, "y": 1.125},
+                {"matrix": [6, 3], "x": 12.5, "y": 1},
+                {"matrix": [6, 2], "x": 13.5, "y": 1.125},
+                {"matrix": [6, 1], "x": 14.5, "y": 1.375},
+                {"matrix": [6, 0], "x": 15.5, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.5},
+                {"matrix": [2, 1], "x": 1, "y": 2.375},
+                {"matrix": [2, 2], "x": 2, "y": 2.125},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2.125},
+                {"matrix": [2, 5], "x": 5, "y": 2.25},
+
+                {"matrix": [7, 5], "x": 10.5, "y": 2.25},
+                {"matrix": [7, 4], "x": 11.5, "y": 2.125},
+                {"matrix": [7, 3], "x": 12.5, "y": 2},
+                {"matrix": [7, 2], "x": 13.5, "y": 2.125},
+                {"matrix": [7, 1], "x": 14.5, "y": 2.375},
+                {"matrix": [7, 0], "x": 15.5, "y": 2.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.5},
+                {"matrix": [3, 1], "x": 1, "y": 3.375},
+                {"matrix": [3, 2], "x": 2, "y": 3.125},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3.125},
+                {"matrix": [3, 5], "x": 5, "y": 3.25},
+                {"matrix": [4, 5], "x": 6, "y": 2.75},
+
+                {"matrix": [9, 5], "x": 9.5, "y": 2.75},
+                {"matrix": [8, 5], "x": 10.5, "y": 3.25},
+                {"matrix": [8, 4], "x": 11.5, "y": 3.125},
+                {"matrix": [8, 3], "x": 12.5, "y": 3},
+                {"matrix": [8, 2], "x": 13.5, "y": 3.125},
+                {"matrix": [8, 1], "x": 14.5, "y": 3.375},
+                {"matrix": [8, 0], "x": 15.5, "y": 3.5},
+
+                {"matrix": [4, 1], "x": 2.5,"y": 4.125},
+                {"matrix": [4, 2], "x": 3.5, "y": 4.15},
+                {"matrix": [4, 3], "x": 4.5,"y": 4.25},
+                {"matrix": [4, 4], "x": 6, "y": 4.25, "h": 1.5},
+
+                {"matrix": [9, 4], "x": 9.5, "y": 4.25, "h": 1.5},
+                {"matrix": [9, 3], "x": 11, "y": 4.25},
+                {"matrix": [9, 2], "x": 12, "y": 4.15},
+                {"matrix": [9, 1], "x": 13, "y": 4.15}
+            ]
+        }
+    },
+    "rgb_matrix": {
+        "animations": {
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "alphas_mods": true,
+            "breathing": true,
+            "hue_wave": true,
+            "rainbow_moving_chevron": true,
+            "rainbow_beacon": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true
+        },
+        "driver": "ws2812",
+        "split_count": [37, 37],
+        "layout": [
+            {"flags": 4, "matrix": [0, 5], "x": 72, "y": 4},   // L SW06
+            {"flags": 4, "matrix": [0, 4], "x": 58, "y": 2},   // L SW05
+            {"flags": 4, "matrix": [0, 3], "x": 43, "y": 0},   // L SW04
+            {"flags": 4, "matrix": [0, 2], "x": 29, "y": 2},   // L SW03
+            {"flags": 4, "matrix": [0, 1], "x": 14, "y": 6},   // L SW02
+            {"flags": 4, "matrix": [0, 0], "x": 0, "y": 8},    // L SW01
+            {"flags": 4, "matrix": [1, 0], "x": 0, "y": 23},   // L SW07
+            {"flags": 4, "matrix": [1, 1], "x": 14, "y": 21},  // L SW08
+            {"flags": 4, "matrix": [1, 2], "x": 29, "y": 17},  // L SW09
+            {"flags": 4, "matrix": [1, 3], "x": 43, "y": 15},  // L SW10
+            {"flags": 4, "matrix": [1, 4], "x": 58, "y": 17},  // L SW11
+            {"flags": 4, "matrix": [1, 5], "x": 72, "y": 19},  // L SW12
+            {"flags": 4, "matrix": [2, 5], "x": 72, "y": 34},  // L SW18
+            {"flags": 4, "matrix": [2, 4], "x": 58, "y": 32},  // L SW17
+            {"flags": 4, "matrix": [2, 3], "x": 43, "y": 30},  // L SW16
+            {"flags": 4, "matrix": [2, 2], "x": 29, "y": 32},  // L SW15
+            {"flags": 4, "matrix": [2, 1], "x": 14, "y": 36},  // L SW14
+            {"flags": 4, "matrix": [2, 0], "x": 0, "y": 38},   // L SW13
+            {"flags": 4, "matrix": [3, 0], "x": 0, "y": 53},   // L SW20
+            {"flags": 4, "matrix": [3, 1], "x": 14, "y": 51},  // L SW21
+            {"flags": 4, "matrix": [3, 2], "x": 29, "y": 47},  // L SW22
+            {"flags": 4, "matrix": [3, 3], "x": 43, "y": 45},  // L SW23
+            {"flags": 4, "matrix": [3, 4], "x": 58, "y": 47},  // L SW24
+            {"flags": 4, "matrix": [3, 5], "x": 72, "y": 49},  // L SW25
+            {"flags": 4, "matrix": [4, 5], "x": 87, "y": 41},
+            {"flags": 4, "matrix": [4, 4], "x": 87, "y": 64},
+            {"flags": 4, "matrix": [4, 3], "x": 65, "y": 64},
+            {"flags": 4, "matrix": [4, 2], "x": 51, "y": 62},
+            {"flags": 4, "matrix": [4, 1], "x": 36, "y": 62},
+            {"flags": 2, "x": 96, "y": 64},                    // L RGB1
+            {"flags": 2, "x": 32, "y": 64},                    // L RGB2
+            {"flags": 2, "x": 0, "y": 64},                     // L RGB3
+            {"flags": 2, "x": 0, "y": 32},                     // L RGB4
+            {"flags": 2, "x": 16, "y": 0},                     // L RGB5
+            {"flags": 2, "x": 50, "y": 0},                     // L RGB6
+            {"flags": 2, "x": 80, "y": 0},                     // L RGB7
+            {"flags": 2, "x": 96, "y": 32},                    // L RGB8
+            {"flags": 4, "matrix": [5, 5], "x": 152, "y": 4},  // R SW06
+            {"flags": 4, "matrix": [5, 4], "x": 166, "y": 2},  // R SW05
+            {"flags": 4, "matrix": [5, 3], "x": 181, "y": 0},  // R SW04
+            {"flags": 4, "matrix": [5, 2], "x": 195, "y": 2},  // R SW03
+            {"flags": 4, "matrix": [5, 1], "x": 210, "y": 6},  // R SW02
+            {"flags": 4, "matrix": [5, 0], "x": 224, "y": 8},  // R SW01
+            {"flags": 4, "matrix": [6, 0], "x": 224, "y": 23}, // R SW07
+            {"flags": 4, "matrix": [6, 1], "x": 210, "y": 21}, // R SW08
+            {"flags": 4, "matrix": [6, 2], "x": 195, "y": 17}, // R SW09
+            {"flags": 4, "matrix": [6, 3], "x": 181, "y": 15}, // R SW10
+            {"flags": 4, "matrix": [6, 4], "x": 166, "y": 17}, // R SW11
+            {"flags": 4, "matrix": [6, 5], "x": 152, "y": 19}, // R SW12
+            {"flags": 4, "matrix": [7, 5], "x": 152, "y": 34}, // R SW18
+            {"flags": 4, "matrix": [7, 4], "x": 166, "y": 32}, // R SW17
+            {"flags": 4, "matrix": [7, 3], "x": 181, "y": 30}, // R SW16
+            {"flags": 4, "matrix": [7, 2], "x": 195, "y": 32}, // R SW15
+            {"flags": 4, "matrix": [7, 1], "x": 210, "y": 36}, // R SW14
+            {"flags": 4, "matrix": [7, 0], "x": 224, "y": 38}, // R SW13
+            {"flags": 4, "matrix": [8, 0], "x": 224, "y": 53}, // R SW20
+            {"flags": 4, "matrix": [8, 1], "x": 210, "y": 51}, // R SW21
+            {"flags": 4, "matrix": [8, 2], "x": 195, "y": 47}, // R SW22
+            {"flags": 4, "matrix": [8, 3], "x": 181, "y": 45}, // R SW23
+            {"flags": 4, "matrix": [8, 4], "x": 166, "y": 47}, // R SW24
+            {"flags": 4, "matrix": [8, 5], "x": 152, "y": 49}, // R SW25
+            {"flags": 4, "matrix": [9, 5], "x": 137, "y": 41},
+            {"flags": 4, "matrix": [9, 4], "x": 137, "y": 64},
+            {"flags": 4, "matrix": [9, 3], "x": 159, "y": 64},
+            {"flags": 4, "matrix": [9, 2], "x": 173, "y": 62},
+            {"flags": 4, "matrix": [9, 1], "x": 188, "y": 62},
+            {"flags": 2, "x": 128, "y": 64},                   // R RGB1
+            {"flags": 2, "x": 192, "y": 64},                   // R RGB2
+            {"flags": 2, "x": 224, "y": 64},                   // R RGB3
+            {"flags": 2, "x": 224, "y": 32},                   // R RGB4
+            {"flags": 2, "x": 206, "y": 0},                    // R RGB5
+            {"flags": 2, "x": 150, "y": 0},                    // R RGB6
+            {"flags": 2, "x": 140, "y": 0},                    // R RGB7
+            {"flags": 2, "x": 128, "y": 32}                    // R RGB8
+        ],
+        "max_brightness": 120,
+        "react_on_keyup": true,
+        "sleep": true
+    }
+}
diff --git a/keyboards/lily58/r2g/rules.mk b/keyboards/lily58/r2g/rules.mk
deleted file mode 100644
index 4da205a168c..00000000000
--- a/keyboards/lily58/r2g/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-LTO_ENABLE = yes
diff --git a/keyboards/lime/rev1/info.json b/keyboards/lime/rev1/info.json
deleted file mode 100644
index 2e395f5e6a7..00000000000
--- a/keyboards/lime/rev1/info.json
+++ /dev/null
@@ -1,124 +0,0 @@
-{
-    "keyboard_name": "Lime",
-    "manufacturer": "HellSingCoder",
-    "url": "https://github.com/HellSingCoder/LimeKeyboard",
-    "maintainer": "HellSingCoder",
-    "usb": {
-        "vid": "0x0666",
-        "pid": "0x2784",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["F6", "F7", "B1", "B3", "B2", "B6"],
-        "rows": ["D4", "C6", "D7", "E6", "B4", "B5"]
-    },
-    "diode_direction": "COL2ROW",
-    "encoder": {
-        "rotary": [
-            {"pin_a": "F5", "pin_b": "F4", "resolution": 2}
-        ]
-    },
-    "split": {
-        "enabled": true,
-        "soft_serial_pin": "D2",
-        "encoder": {
-            "right": {
-                "rotary": [
-                    {"pin_a": "F4", "pin_b": "F5", "resolution": 2}
-                ]
-            }
-        },
-        "transport": {
-            "sync": {
-                "wpm": true
-            }
-        }
-    },
-    "tapping": {
-        "term": 100
-    },
-    "qmk": {
-        "tap_keycode_delay": 10
-    },
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0.5},
-                {"matrix": [0, 1], "x": 1, "y": 0.38},
-                {"matrix": [0, 2], "x": 2, "y": 0.13},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0.13},
-                {"matrix": [0, 5], "x": 5, "y": 0.25},
-
-                {"matrix": [6, 5], "x": 9, "y": 0.25},
-                {"matrix": [6, 4], "x": 10, "y": 0.13},
-                {"matrix": [6, 3], "x": 11, "y": 0},
-                {"matrix": [6, 2], "x": 12, "y": 0.13},
-                {"matrix": [6, 1], "x": 13, "y": 0.38},
-                {"matrix": [6, 0], "x": 14, "y": 0.5},
-
-                {"matrix": [1, 0], "x": 0, "y": 1.5},
-                {"matrix": [1, 1], "x": 1, "y": 1.38},
-                {"matrix": [1, 2], "x": 2, "y": 1.13},
-                {"matrix": [1, 3], "x": 3, "y": 1},
-                {"matrix": [1, 4], "x": 4, "y": 1.13},
-                {"matrix": [1, 5], "x": 5, "y": 1.25},
-
-                {"matrix": [7, 5], "x": 9, "y": 1.25},
-                {"matrix": [7, 4], "x": 10, "y": 1.13},
-                {"matrix": [7, 3], "x": 11, "y": 1},
-                {"matrix": [7, 2], "x": 12, "y": 1.13},
-                {"matrix": [7, 1], "x": 13, "y": 1.38},
-                {"matrix": [7, 0], "x": 14, "y": 1.5},
-
-                {"matrix": [2, 0], "x": 0, "y": 2.5},
-                {"matrix": [2, 1], "x": 1, "y": 2.38},
-                {"matrix": [2, 2], "x": 2, "y": 2.13},
-                {"matrix": [2, 3], "x": 3, "y": 2},
-                {"matrix": [2, 4], "x": 4, "y": 2.13},
-                {"matrix": [2, 5], "x": 5, "y": 2.25},
-
-                {"matrix": [8, 5], "x": 9, "y": 2.25},
-                {"matrix": [8, 4], "x": 10, "y": 2.13},
-                {"matrix": [8, 3], "x": 11, "y": 2},
-                {"matrix": [8, 2], "x": 12, "y": 2.13},
-                {"matrix": [8, 1], "x": 13, "y": 2.38},
-                {"matrix": [8, 0], "x": 14, "y": 2.5},
-
-                {"matrix": [3, 0], "x": 0, "y": 3.5},
-                {"matrix": [3, 1], "x": 1, "y": 3.38},
-                {"matrix": [3, 2], "x": 2, "y": 3.13},
-                {"matrix": [3, 3], "x": 3, "y": 3},
-                {"matrix": [3, 4], "x": 4, "y": 3.13},
-                {"matrix": [3, 5], "x": 5, "y": 3.25},
-
-                {"matrix": [5, 0], "x": 6, "y": 3.25},
-
-                {"matrix": [11, 5], "x": 8, "y": 3.25},
-
-                {"matrix": [9, 5], "x": 9, "y": 3.25},
-                {"matrix": [9, 4], "x": 10, "y": 3.13},
-                {"matrix": [9, 3], "x": 11, "y": 3},
-                {"matrix": [9, 2], "x": 12, "y": 3.13},
-                {"matrix": [9, 1], "x": 13, "y": 3.38},
-                {"matrix": [9, 0], "x": 14, "y": 3.5},
-
-                {"matrix": [4, 0], "x": 0.35, "y": 4.5},
-                {"matrix": [4, 1], "x": 1.35, "y": 4.38},
-                {"matrix": [4, 2], "x": 2.35, "y": 4.13},
-                {"matrix": [4, 3], "x": 3.35, "y": 4.13},
-                {"matrix": [4, 4], "x": 4.55, "y": 4.5},
-                {"matrix": [4, 5], "x": 5.75, "y": 4.25, "h": 1.25},
-
-                {"matrix": [10, 5], "x": 8.25, "y": 4.25, "h": 1.25},
-                {"matrix": [10, 4], "x": 9.45, "y": 4.5},
-                {"matrix": [10, 3], "x": 10.65, "y": 4.13},
-                {"matrix": [10, 2], "x": 11.65, "y": 4.13},
-                {"matrix": [10, 1], "x": 12.65, "y": 4.38},
-                {"matrix": [10, 0], "x": 13.65, "y": 4.5}
-            ]
-        }
-    }
-}
diff --git a/keyboards/lime/rev1/keyboard.json b/keyboards/lime/rev1/keyboard.json
new file mode 100644
index 00000000000..e7d6231a6b9
--- /dev/null
+++ b/keyboards/lime/rev1/keyboard.json
@@ -0,0 +1,132 @@
+{
+    "keyboard_name": "Lime",
+    "manufacturer": "HellSingCoder",
+    "url": "https://github.com/HellSingCoder/LimeKeyboard",
+    "maintainer": "HellSingCoder",
+    "usb": {
+        "vid": "0x0666",
+        "pid": "0x2784",
+        "device_version": "0.0.1"
+    },
+    "matrix_pins": {
+        "cols": ["F6", "F7", "B1", "B3", "B2", "B6"],
+        "rows": ["D4", "C6", "D7", "E6", "B4", "B5"]
+    },
+    "diode_direction": "COL2ROW",
+    "encoder": {
+        "rotary": [
+            {"pin_a": "F5", "pin_b": "F4", "resolution": 2}
+        ]
+    },
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "D2",
+        "encoder": {
+            "right": {
+                "rotary": [
+                    {"pin_a": "F4", "pin_b": "F5", "resolution": 2}
+                ]
+            }
+        },
+        "transport": {
+            "sync": {
+                "wpm": true
+            }
+        }
+    },
+    "tapping": {
+        "term": 100
+    },
+    "qmk": {
+        "tap_keycode_delay": 10
+    },
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
+    "features": {
+        "bootmagic": false,
+        "mousekey": false,
+        "extrakey": false,
+        "swap_hands": true,
+        "encoder": true,
+        "oled": true
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0.5},
+                {"matrix": [0, 1], "x": 1, "y": 0.38},
+                {"matrix": [0, 2], "x": 2, "y": 0.13},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0.13},
+                {"matrix": [0, 5], "x": 5, "y": 0.25},
+
+                {"matrix": [6, 5], "x": 9, "y": 0.25},
+                {"matrix": [6, 4], "x": 10, "y": 0.13},
+                {"matrix": [6, 3], "x": 11, "y": 0},
+                {"matrix": [6, 2], "x": 12, "y": 0.13},
+                {"matrix": [6, 1], "x": 13, "y": 0.38},
+                {"matrix": [6, 0], "x": 14, "y": 0.5},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.38},
+                {"matrix": [1, 2], "x": 2, "y": 1.13},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1.13},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+
+                {"matrix": [7, 5], "x": 9, "y": 1.25},
+                {"matrix": [7, 4], "x": 10, "y": 1.13},
+                {"matrix": [7, 3], "x": 11, "y": 1},
+                {"matrix": [7, 2], "x": 12, "y": 1.13},
+                {"matrix": [7, 1], "x": 13, "y": 1.38},
+                {"matrix": [7, 0], "x": 14, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.5},
+                {"matrix": [2, 1], "x": 1, "y": 2.38},
+                {"matrix": [2, 2], "x": 2, "y": 2.13},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2.13},
+                {"matrix": [2, 5], "x": 5, "y": 2.25},
+
+                {"matrix": [8, 5], "x": 9, "y": 2.25},
+                {"matrix": [8, 4], "x": 10, "y": 2.13},
+                {"matrix": [8, 3], "x": 11, "y": 2},
+                {"matrix": [8, 2], "x": 12, "y": 2.13},
+                {"matrix": [8, 1], "x": 13, "y": 2.38},
+                {"matrix": [8, 0], "x": 14, "y": 2.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.5},
+                {"matrix": [3, 1], "x": 1, "y": 3.38},
+                {"matrix": [3, 2], "x": 2, "y": 3.13},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3.13},
+                {"matrix": [3, 5], "x": 5, "y": 3.25},
+
+                {"matrix": [5, 0], "x": 6, "y": 3.25},
+
+                {"matrix": [11, 5], "x": 8, "y": 3.25},
+
+                {"matrix": [9, 5], "x": 9, "y": 3.25},
+                {"matrix": [9, 4], "x": 10, "y": 3.13},
+                {"matrix": [9, 3], "x": 11, "y": 3},
+                {"matrix": [9, 2], "x": 12, "y": 3.13},
+                {"matrix": [9, 1], "x": 13, "y": 3.38},
+                {"matrix": [9, 0], "x": 14, "y": 3.5},
+
+                {"matrix": [4, 0], "x": 0.35, "y": 4.5},
+                {"matrix": [4, 1], "x": 1.35, "y": 4.38},
+                {"matrix": [4, 2], "x": 2.35, "y": 4.13},
+                {"matrix": [4, 3], "x": 3.35, "y": 4.13},
+                {"matrix": [4, 4], "x": 4.55, "y": 4.5},
+                {"matrix": [4, 5], "x": 5.75, "y": 4.25, "h": 1.25},
+
+                {"matrix": [10, 5], "x": 8.25, "y": 4.25, "h": 1.25},
+                {"matrix": [10, 4], "x": 9.45, "y": 4.5},
+                {"matrix": [10, 3], "x": 10.65, "y": 4.13},
+                {"matrix": [10, 2], "x": 11.65, "y": 4.13},
+                {"matrix": [10, 1], "x": 12.65, "y": 4.38},
+                {"matrix": [10, 0], "x": 13.65, "y": 4.5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/lime/rev1/rules.mk b/keyboards/lime/rev1/rules.mk
deleted file mode 100644
index 8ef96fa9d06..00000000000
--- a/keyboards/lime/rev1/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-ENCODER_ENABLE = yes
-ENCODER_RIGHT_ENABLE = yes
-OLED_ENABLE = yes
diff --git a/keyboards/lime/rules.mk b/keyboards/lime/rules.mk
index cd2da2eedf3..4643abab937 100644
--- a/keyboards/lime/rules.mk
+++ b/keyboards/lime/rules.mk
@@ -1,14 +1 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = no        # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-SWAP_HANDS_ENABLE = yes
 DEFAULT_FOLDER = lime/rev1
diff --git a/keyboards/linworks/fave65h/info.json b/keyboards/linworks/fave65h/info.json
deleted file mode 100644
index 32a3f5252c6..00000000000
--- a/keyboards/linworks/fave65h/info.json
+++ /dev/null
@@ -1,377 +0,0 @@
-{
-    "keyboard_name": "FAve 65H",
-    "manufacturer": "Lx3",
-    "url": "",
-    "maintainer": "ToastyStoemp",
-    "usb": {
-        "vid": "0x4C58",
-        "pid": "0x0007",
-        "device_version": "0.0.1"
-    },
-    "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,
-            "rainbow_moving_chevron": true,
-            "cycle_out_in": true,
-            "cycle_out_in_dual": 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_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
-        },
-        "default": {
-            "animation": "cycle_all"
-        },
-        "driver": "ws2812",
-        "max_brightness": 120,
-        "sleep": true
-    },
-    "matrix_pins": {
-        "cols": ["E6", "F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"],
-        "rows": ["D1", "D0", "D2", "D3", "D5"]
-    },
-    "diode_direction": "COL2ROW",
-    "ws2812": {
-        "pin": "B0"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "layout_aliases": {
-        "LAYOUT": "LAYOUT_65_ansi_blocker_split_bs",
-        "LAYOUT_all": "LAYOUT_65_ansi_blocker_split_bs"
-    },
-    "community_layouts": ["65_ansi_blocker", "65_ansi_blocker_split_bs"],
-    "layouts": {
-        "LAYOUT_65_ansi_blocker": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-                {"matrix": [0, 14], "x": 15, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-                {"matrix": [1, 14], "x": 15, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
-                {"matrix": [2, 14], "x": 15, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 1], "x": 2.25, "y": 3},
-                {"matrix": [3, 2], "x": 3.25, "y": 3},
-                {"matrix": [3, 3], "x": 4.25, "y": 3},
-                {"matrix": [3, 4], "x": 5.25, "y": 3},
-                {"matrix": [3, 5], "x": 6.25, "y": 3},
-                {"matrix": [3, 6], "x": 7.25, "y": 3},
-                {"matrix": [3, 7], "x": 8.25, "y": 3},
-                {"matrix": [3, 8], "x": 9.25, "y": 3},
-                {"matrix": [3, 9], "x": 10.25, "y": 3},
-                {"matrix": [3, 10], "x": 11.25, "y": 3},
-                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"matrix": [3, 13], "x": 14, "y": 3},
-                {"matrix": [3, 14], "x": 15, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
-                {"matrix": [4, 8], "x": 10, "y": 4, "w": 1.25},
-                {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 12], "x": 13, "y": 4},
-                {"matrix": [4, 13], "x": 14, "y": 4},
-                {"matrix": [4, 14], "x": 15, "y": 4}
-            ]
-        },
-        "LAYOUT_65_ansi_blocker_split_bs": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"matrix": [2, 12], "x": 13, "y": 0},
-                {"matrix": [0, 13], "x": 14, "y": 0},
-                {"matrix": [0, 14], "x": 15, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-                {"matrix": [1, 14], "x": 15, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
-                {"matrix": [2, 14], "x": 15, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 1], "x": 2.25, "y": 3},
-                {"matrix": [3, 2], "x": 3.25, "y": 3},
-                {"matrix": [3, 3], "x": 4.25, "y": 3},
-                {"matrix": [3, 4], "x": 5.25, "y": 3},
-                {"matrix": [3, 5], "x": 6.25, "y": 3},
-                {"matrix": [3, 6], "x": 7.25, "y": 3},
-                {"matrix": [3, 7], "x": 8.25, "y": 3},
-                {"matrix": [3, 8], "x": 9.25, "y": 3},
-                {"matrix": [3, 9], "x": 10.25, "y": 3},
-                {"matrix": [3, 10], "x": 11.25, "y": 3},
-                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"matrix": [3, 13], "x": 14, "y": 3},
-                {"matrix": [3, 14], "x": 15, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
-                {"matrix": [4, 8], "x": 10, "y": 4, "w": 1.25},
-                {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 12], "x": 13, "y": 4},
-                {"matrix": [4, 13], "x": 14, "y": 4},
-                {"matrix": [4, 14], "x": 15, "y": 4}
-            ]
-        },
-        "LAYOUT_65_ansi_blocker_wkl": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-                {"matrix": [0, 14], "x": 15, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-                {"matrix": [1, 14], "x": 15, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
-                {"matrix": [2, 14], "x": 15, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 1], "x": 2.25, "y": 3},
-                {"matrix": [3, 2], "x": 3.25, "y": 3},
-                {"matrix": [3, 3], "x": 4.25, "y": 3},
-                {"matrix": [3, 4], "x": 5.25, "y": 3},
-                {"matrix": [3, 5], "x": 6.25, "y": 3},
-                {"matrix": [3, 6], "x": 7.25, "y": 3},
-                {"matrix": [3, 7], "x": 8.25, "y": 3},
-                {"matrix": [3, 8], "x": 9.25, "y": 3},
-                {"matrix": [3, 9], "x": 10.25, "y": 3},
-                {"matrix": [3, 10], "x": 11.25, "y": 3},
-                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"matrix": [3, 13], "x": 14, "y": 3},
-                {"matrix": [3, 14], "x": 15, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
-                {"matrix": [4, 1], "x": 1.5, "y": 4, "w": 1.5},
-                {"matrix": [4, 6], "x": 3, "y": 4, "w": 7},
-                {"matrix": [4, 8], "x": 10, "y": 4, "w": 1.25},
-                {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 12], "x": 13, "y": 4},
-                {"matrix": [4, 13], "x": 14, "y": 4},
-                {"matrix": [4, 14], "x": 15, "y": 4}
-            ]
-        },
-        "LAYOUT_65_ansi_blocker_wkl_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": [2, 12], "x": 13, "y": 0},
-                {"matrix": [0, 13], "x": 14, "y": 0},
-                {"matrix": [0, 14], "x": 15, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-                {"matrix": [1, 14], "x": 15, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
-                {"matrix": [2, 14], "x": 15, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 1], "x": 2.25, "y": 3},
-                {"matrix": [3, 2], "x": 3.25, "y": 3},
-                {"matrix": [3, 3], "x": 4.25, "y": 3},
-                {"matrix": [3, 4], "x": 5.25, "y": 3},
-                {"matrix": [3, 5], "x": 6.25, "y": 3},
-                {"matrix": [3, 6], "x": 7.25, "y": 3},
-                {"matrix": [3, 7], "x": 8.25, "y": 3},
-                {"matrix": [3, 8], "x": 9.25, "y": 3},
-                {"matrix": [3, 9], "x": 10.25, "y": 3},
-                {"matrix": [3, 10], "x": 11.25, "y": 3},
-                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"matrix": [3, 13], "x": 14, "y": 3},
-                {"matrix": [3, 14], "x": 15, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
-                {"matrix": [4, 1], "x": 1.5, "y": 4, "w": 1.5},
-                {"matrix": [4, 6], "x": 3, "y": 4, "w": 7},
-                {"matrix": [4, 8], "x": 10, "y": 4, "w": 1.25},
-                {"matrix": [4, 10], "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}
-            ]
-        }
-    }
-}
diff --git a/keyboards/linworks/fave65h/keyboard.json b/keyboards/linworks/fave65h/keyboard.json
new file mode 100644
index 00000000000..6e35f55a4b4
--- /dev/null
+++ b/keyboards/linworks/fave65h/keyboard.json
@@ -0,0 +1,384 @@
+{
+    "keyboard_name": "FAve 65H",
+    "manufacturer": "Lx3",
+    "url": "",
+    "maintainer": "ToastyStoemp",
+    "usb": {
+        "vid": "0x4C58",
+        "pid": "0x0007",
+        "device_version": "0.0.1"
+    },
+    "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,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": 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_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
+        },
+        "default": {
+            "animation": "cycle_all"
+        },
+        "driver": "ws2812",
+        "max_brightness": 120,
+        "sleep": true
+    },
+    "matrix_pins": {
+        "cols": ["E6", "F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"],
+        "rows": ["D1", "D0", "D2", "D3", "D5"]
+    },
+    "diode_direction": "COL2ROW",
+    "ws2812": {
+        "pin": "B0"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": false,
+        "extrakey": true,
+        "nkro": true,
+        "rgb_matrix": true
+    },
+    "layout_aliases": {
+        "LAYOUT": "LAYOUT_65_ansi_blocker_split_bs",
+        "LAYOUT_all": "LAYOUT_65_ansi_blocker_split_bs"
+    },
+    "community_layouts": ["65_ansi_blocker", "65_ansi_blocker_split_bs"],
+    "layouts": {
+        "LAYOUT_65_ansi_blocker": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 10], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 8], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_65_ansi_blocker_split_bs": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [2, 12], "x": 13, "y": 0},
+                {"matrix": [0, 13], "x": 14, "y": 0},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 10], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 8], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_65_ansi_blocker_wkl": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 10], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 6], "x": 3, "y": 4, "w": 7},
+                {"matrix": [4, 8], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_65_ansi_blocker_wkl_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": [2, 12], "x": 13, "y": 0},
+                {"matrix": [0, 13], "x": 14, "y": 0},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 10], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 6], "x": 3, "y": 4, "w": 7},
+                {"matrix": [4, 8], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "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}
+            ]
+        }
+    }
+}
diff --git a/keyboards/linworks/fave65h/rules.mk b/keyboards/linworks/fave65h/rules.mk
index f92cb03d08c..3437a35bdf1 100644
--- a/keyboards/linworks/fave65h/rules.mk
+++ b/keyboards/linworks/fave65h/rules.mk
@@ -1,16 +1,2 @@
 # Processor frequency
 F_CPU = 8000000
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes     # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no        # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-RGB_MATRIX_ENABLE = yes
diff --git a/keyboards/linworks/fave84h/info.json b/keyboards/linworks/fave84h/keyboard.json
similarity index 100%
rename from keyboards/linworks/fave84h/info.json
rename to keyboards/linworks/fave84h/keyboard.json
diff --git a/keyboards/linworks/fave87h/info.json b/keyboards/linworks/fave87h/info.json
deleted file mode 100644
index 2951b56a434..00000000000
--- a/keyboards/linworks/fave87h/info.json
+++ /dev/null
@@ -1,287 +0,0 @@
-{
-    "keyboard_name": "FAve 87H",
-    "manufacturer": "Lx3",
-    "url": "",
-    "maintainer": "ToastyStoemp",
-    "usb": {
-        "vid": "0x4C58",
-        "pid": "0x0003",
-        "device_version": "0.0.1"
-    },
-    "ws2812": {
-        "pin": "D2"
-    },
-    "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,
-            "rainbow_moving_chevron": true,
-            "cycle_out_in": true,
-            "cycle_out_in_dual": 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_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
-        },
-        "default": {
-            "animation": "cycle_all"
-        },
-        "driver": "ws2812",
-        "max_brightness": 120,
-        "sleep": true
-    },
-    "matrix_pins": {
-        "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "B0", "B7", "E6"],
-        "rows": ["B1", "B2", "B3", "D3", "D1", "D0"]
-    },
-    "diode_direction": "COL2ROW",
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "layout_aliases": {
-        "LAYOUT": "LAYOUT_tkl_ansi_split_bs"
-    },
-    "community_layouts": [
-        "tkl_ansi"
-    ],
-    "layouts": {
-        "LAYOUT_tkl_ansi": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "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.5, "y": 0},
-                {"matrix": [0, 7], "x": 7.5, "y": 0},
-                {"matrix": [0, 8], "x": 8.5, "y": 0},
-                {"matrix": [0, 9], "x": 9.5, "y": 0},
-
-                {"matrix": [0, 10], "x": 11, "y": 0},
-                {"matrix": [0, 11], "x": 12, "y": 0},
-                {"matrix": [0, 12], "x": 13, "y": 0},
-                {"matrix": [0, 13], "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": [2, 13], "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, 1], "x": 2.25, "y": 4.25},
-                {"matrix": [4, 2], "x": 3.25, "y": 4.25},
-                {"matrix": [4, 3], "x": 4.25, "y": 4.25},
-                {"matrix": [4, 4], "x": 5.25, "y": 4.25},
-                {"matrix": [4, 5], "x": 6.25, "y": 4.25},
-                {"matrix": [4, 6], "x": 7.25, "y": 4.25},
-                {"matrix": [4, 7], "x": 8.25, "y": 4.25},
-                {"matrix": [4, 8], "x": 9.25, "y": 4.25},
-                {"matrix": [4, 9], "x": 10.25, "y": 4.25},
-                {"matrix": [4, 10], "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.25},
-                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 5], "x": 3.75, "y": 5.25, "w": 6.25},
-                {"matrix": [5, 9], "x": 10, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 10], "x": 11.25, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
-
-                {"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_split_bs": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "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.5, "y": 0},
-                {"matrix": [0, 7], "x": 7.5, "y": 0},
-                {"matrix": [0, 8], "x": 8.5, "y": 0},
-                {"matrix": [0, 9], "x": 9.5, "y": 0},
-
-                {"matrix": [0, 10], "x": 11, "y": 0},
-                {"matrix": [0, 11], "x": 12, "y": 0},
-                {"matrix": [0, 12], "x": 13, "y": 0},
-                {"matrix": [0, 13], "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},
-                {"matrix": [3, 12], "x": 14, "y": 1.25},
-
-                {"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": [2, 13], "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, 1], "x": 2.25, "y": 4.25},
-                {"matrix": [4, 2], "x": 3.25, "y": 4.25},
-                {"matrix": [4, 3], "x": 4.25, "y": 4.25},
-                {"matrix": [4, 4], "x": 5.25, "y": 4.25},
-                {"matrix": [4, 5], "x": 6.25, "y": 4.25},
-                {"matrix": [4, 6], "x": 7.25, "y": 4.25},
-                {"matrix": [4, 7], "x": 8.25, "y": 4.25},
-                {"matrix": [4, 8], "x": 9.25, "y": 4.25},
-                {"matrix": [4, 9], "x": 10.25, "y": 4.25},
-                {"matrix": [4, 10], "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.25},
-                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 5], "x": 3.75, "y": 5.25, "w": 6.25},
-                {"matrix": [5, 9], "x": 10, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 10], "x": 11.25, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
-
-                {"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}
-            ]
-        }
-    }
-}
diff --git a/keyboards/linworks/fave87h/keyboard.json b/keyboards/linworks/fave87h/keyboard.json
new file mode 100644
index 00000000000..5fb1d4d42aa
--- /dev/null
+++ b/keyboards/linworks/fave87h/keyboard.json
@@ -0,0 +1,294 @@
+{
+    "keyboard_name": "FAve 87H",
+    "manufacturer": "Lx3",
+    "url": "",
+    "maintainer": "ToastyStoemp",
+    "usb": {
+        "vid": "0x4C58",
+        "pid": "0x0003",
+        "device_version": "0.0.1"
+    },
+    "ws2812": {
+        "pin": "D2"
+    },
+    "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,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": 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_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
+        },
+        "default": {
+            "animation": "cycle_all"
+        },
+        "driver": "ws2812",
+        "max_brightness": 120,
+        "sleep": true
+    },
+    "matrix_pins": {
+        "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "B0", "B7", "E6"],
+        "rows": ["B1", "B2", "B3", "D3", "D1", "D0"]
+    },
+    "diode_direction": "COL2ROW",
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": false,
+        "extrakey": true,
+        "nkro": true,
+        "rgb_matrix": true
+    },
+    "layout_aliases": {
+        "LAYOUT": "LAYOUT_tkl_ansi_split_bs"
+    },
+    "community_layouts": [
+        "tkl_ansi"
+    ],
+    "layouts": {
+        "LAYOUT_tkl_ansi": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "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.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 10], "x": 11, "y": 0},
+                {"matrix": [0, 11], "x": 12, "y": 0},
+                {"matrix": [0, 12], "x": 13, "y": 0},
+                {"matrix": [0, 13], "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": [2, 13], "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, 1], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 10], "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.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 5], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 9], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 10], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"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_split_bs": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "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.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 10], "x": 11, "y": 0},
+                {"matrix": [0, 11], "x": 12, "y": 0},
+                {"matrix": [0, 12], "x": 13, "y": 0},
+                {"matrix": [0, 13], "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},
+                {"matrix": [3, 12], "x": 14, "y": 1.25},
+
+                {"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": [2, 13], "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, 1], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 10], "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.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 5], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 9], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 10], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"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}
+            ]
+        }
+    }
+}
diff --git a/keyboards/linworks/fave87h/rules.mk b/keyboards/linworks/fave87h/rules.mk
index f92cb03d08c..3437a35bdf1 100644
--- a/keyboards/linworks/fave87h/rules.mk
+++ b/keyboards/linworks/fave87h/rules.mk
@@ -1,16 +1,2 @@
 # Processor frequency
 F_CPU = 8000000
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes     # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no        # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-RGB_MATRIX_ENABLE = yes
diff --git a/keyboards/loki65/info.json b/keyboards/loki65/info.json
deleted file mode 100644
index 8424f7d437e..00000000000
--- a/keyboards/loki65/info.json
+++ /dev/null
@@ -1,726 +0,0 @@
-{
-    "keyboard_name": "Loki65",
-    "manufacturer": "Yiancar-Designs",
-    "url": "https://yiancar-designs.com",
-    "maintainer": "Yiancar-Designs",
-    "usb": {
-        "vid": "0x8968",
-        "pid": "0x4C36",
-        "device_version": "0.0.1"
-    },
-    "rgblight": {
-        "saturation_steps": 8,
-        "brightness_steps": 8,
-        "led_count": 37,
-        "animations": {
-            "breathing": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "snake": true,
-            "knight": true,
-            "christmas": true,
-            "static_gradient": true,
-            "rgb_test": true,
-            "alternating": true,
-            "twinkle": true
-        }
-    },
-    "ws2812": {
-        "pin": "A9",
-        "driver": "pwm"
-    },
-    "matrix_pins": {
-        "cols": ["A1", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "B2", "B10", "B11", "B12", "B13", "B14", "B15"],
-        "rows": ["A2", "B9", "B8", "B5", "B4"]
-    },
-    "diode_direction": "COL2ROW",
-    "indicators": {
-        "caps_lock": "B6",
-        "on_state": 0
-    },
-    "processor": "STM32F072",
-    "bootloader": "stm32-dfu",
-    "layouts": {
-        "LAYOUT_all": {
-            "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": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
-                {"label": "Delete", "matrix": [0, 14], "x": 14, "y": 0},
-
-                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
-                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
-                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
-                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
-                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
-                {"label": "Y", "matrix": [1, 6], "x": 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], "x": 13.5, "y": 1, "w": 1.5},
-                {"label": "Page Up", "matrix": [1, 14], "x": 15, "y": 1},
-
-                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
-                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
-                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
-                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
-                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
-                {"label": "H", "matrix": [2, 6], "x": 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], "x": 12.75, "y": 2, "w": 2.25},
-                {"label": "Page Down", "matrix": [2, 14], "x": 15, "y": 2},
-
-                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
-                {"label": "\\", "matrix": [3, 1], "x": 1.25, "y": 3},
-                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
-                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
-                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
-                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
-                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
-                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
-                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
-                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
-                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
-                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
-                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
-                {"label": "End", "matrix": [3, 14], "x": 15, "y": 3},
-
-                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"label": "Space", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
-                {"label": "Fn", "matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
-                {"label": "Ctrl", "matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
-
-                {"label": "\u2190", "matrix": [4, 12], "x": 13, "y": 4},
-                {"label": "\u2193", "matrix": [4, 13], "x": 14, "y": 4},
-                {"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4}
-            ]
-        },
-        "LAYOUT_ansi_blocker": {
-            "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": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-
-                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
-                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
-                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
-                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
-                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
-                {"label": "Y", "matrix": [1, 6], "x": 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], "x": 13.5, "y": 1, "w": 1.5},
-                {"label": "Page Up", "matrix": [1, 14], "x": 15, "y": 1},
-
-                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
-                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
-                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
-                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
-                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
-                {"label": "H", "matrix": [2, 6], "x": 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], "x": 12.75, "y": 2, "w": 2.25},
-                {"label": "Page Down", "matrix": [2, 14], "x": 15, "y": 2},
-
-                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
-                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
-                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
-                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
-                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
-                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
-                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
-                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
-                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
-                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
-                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
-                {"label": "End", "matrix": [3, 14], "x": 15, "y": 3},
-
-                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"label": "Space", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
-                {"label": "Fn", "matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
-                {"label": "Ctrl", "matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
-
-                {"label": "\u2190", "matrix": [4, 12], "x": 13, "y": 4},
-                {"label": "\u2193", "matrix": [4, 13], "x": 14, "y": 4},
-                {"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4}
-            ]
-        },
-        "LAYOUT_ansi_blocker_split_bs": {
-            "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": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
-                {"label": "Delete", "matrix": [0, 14], "x": 14, "y": 0},
-
-                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
-                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
-                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
-                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
-                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
-                {"label": "Y", "matrix": [1, 6], "x": 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], "x": 13.5, "y": 1, "w": 1.5},
-                {"label": "Page Up", "matrix": [1, 14], "x": 15, "y": 1},
-
-                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
-                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
-                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
-                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
-                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
-                {"label": "H", "matrix": [2, 6], "x": 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], "x": 12.75, "y": 2, "w": 2.25},
-                {"label": "Page Down", "matrix": [2, 14], "x": 15, "y": 2},
-
-                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
-                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
-                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
-                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
-                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
-                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
-                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
-                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
-                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
-                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
-                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
-                {"label": "End", "matrix": [3, 14], "x": 15, "y": 3},
-
-                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"label": "Space", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
-                {"label": "Fn", "matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
-                {"label": "Ctrl", "matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
-
-                {"label": "\u2190", "matrix": [4, 12], "x": 13, "y": 4},
-                {"label": "\u2193", "matrix": [4, 13], "x": 14, "y": 4},
-                {"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4}
-            ]
-        },
-        "LAYOUT_ansi_blocker_tsangan": {
-            "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": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-
-                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
-                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
-                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
-                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
-                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
-                {"label": "Y", "matrix": [1, 6], "x": 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], "x": 13.5, "y": 1, "w": 1.5},
-                {"label": "Page Up", "matrix": [1, 14], "x": 15, "y": 1},
-
-                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
-                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
-                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
-                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
-                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
-                {"label": "H", "matrix": [2, 6], "x": 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], "x": 12.75, "y": 2, "w": 2.25},
-                {"label": "Page Down", "matrix": [2, 14], "x": 15, "y": 2},
-
-                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
-                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
-                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
-                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
-                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
-                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
-                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
-                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
-                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
-                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
-                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
-                {"label": "End", "matrix": [3, 14], "x": 15, "y": 3},
-
-                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
-                {"label": "GUI", "matrix": [4, 1], "x": 1.5, "y": 4},
-                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
-                {"label": "Space", "matrix": [4, 6], "x": 4, "y": 4, "w": 7},
-                {"label": "Ctrl", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
-
-                {"label": "\u2190", "matrix": [4, 12], "x": 13, "y": 4},
-                {"label": "\u2193", "matrix": [4, 13], "x": 14, "y": 4},
-                {"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4}
-            ]
-        },
-        "LAYOUT_ansi_blocker_tsangan_split_bs": {
-            "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": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
-                {"label": "Delete", "matrix": [0, 14], "x": 14, "y": 0},
-
-                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
-                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
-                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
-                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
-                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
-                {"label": "Y", "matrix": [1, 6], "x": 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], "x": 13.5, "y": 1, "w": 1.5},
-                {"label": "Page Up", "matrix": [1, 14], "x": 15, "y": 1},
-
-                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
-                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
-                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
-                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
-                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
-                {"label": "H", "matrix": [2, 6], "x": 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], "x": 12.75, "y": 2, "w": 2.25},
-                {"label": "Page Down", "matrix": [2, 14], "x": 15, "y": 2},
-
-                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
-                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
-                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
-                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
-                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
-                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
-                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
-                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
-                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
-                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
-                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
-                {"label": "End", "matrix": [3, 14], "x": 15, "y": 3},
-
-                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
-                {"label": "GUI", "matrix": [4, 1], "x": 1.5, "y": 4},
-                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
-                {"label": "Space", "matrix": [4, 6], "x": 4, "y": 4, "w": 7},
-                {"label": "Ctrl", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
-
-                {"label": "\u2190", "matrix": [4, 12], "x": 13, "y": 4},
-                {"label": "\u2193", "matrix": [4, 13], "x": 14, "y": 4},
-                {"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4}
-            ]
-        },
-        "LAYOUT_iso_blocker": {
-            "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": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-
-                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
-                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
-                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
-                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
-                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
-                {"label": "Y", "matrix": [1, 6], "x": 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": "Page Up", "matrix": [1, 14], "x": 15, "y": 1},
-
-                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
-                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
-                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
-                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
-                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
-                {"label": "H", "matrix": [2, 6], "x": 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": "#", "matrix": [1, 13], "x": 12.75, "y": 2},
-                {"label": "Enter", "matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
-                {"label": "Page Down", "matrix": [2, 14], "x": 15, "y": 2},
-
-                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
-                {"label": "\\", "matrix": [3, 1], "x": 1.25, "y": 3},
-                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
-                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
-                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
-                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
-                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
-                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
-                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
-                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
-                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
-                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
-                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
-                {"label": "End", "matrix": [3, 14], "x": 15, "y": 3},
-
-                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"label": "Space", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
-                {"label": "Fn", "matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
-                {"label": "Ctrl", "matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
-
-                {"label": "\u2190", "matrix": [4, 12], "x": 13, "y": 4},
-                {"label": "\u2193", "matrix": [4, 13], "x": 14, "y": 4},
-                {"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4}
-            ]
-        },
-        "LAYOUT_iso_blocker_split_bs": {
-            "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": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
-                {"label": "Delete", "matrix": [0, 14], "x": 14, "y": 0},
-
-                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
-                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
-                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
-                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
-                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
-                {"label": "Y", "matrix": [1, 6], "x": 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": "Page Up", "matrix": [1, 14], "x": 15, "y": 1},
-
-                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
-                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
-                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
-                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
-                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
-                {"label": "H", "matrix": [2, 6], "x": 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": "#", "matrix": [1, 13], "x": 12.75, "y": 2},
-                {"label": "Enter", "matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
-                {"label": "Page Down", "matrix": [2, 14], "x": 15, "y": 2},
-
-                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
-                {"label": "\\", "matrix": [3, 1], "x": 1.25, "y": 3},
-                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
-                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
-                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
-                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
-                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
-                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
-                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
-                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
-                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
-                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
-                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
-                {"label": "End", "matrix": [3, 14], "x": 15, "y": 3},
-
-                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"label": "Space", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
-                {"label": "Fn", "matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
-                {"label": "Ctrl", "matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
-
-                {"label": "\u2190", "matrix": [4, 12], "x": 13, "y": 4},
-                {"label": "\u2193", "matrix": [4, 13], "x": 14, "y": 4},
-                {"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4}
-            ]
-        },
-        "LAYOUT_iso_blocker_tsangan": {
-            "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": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-
-                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
-                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
-                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
-                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
-                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
-                {"label": "Y", "matrix": [1, 6], "x": 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": "Page Up", "matrix": [1, 14], "x": 15, "y": 1},
-
-                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
-                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
-                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
-                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
-                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
-                {"label": "H", "matrix": [2, 6], "x": 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": "#", "matrix": [1, 13], "x": 12.75, "y": 2},
-                {"label": "Enter", "matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
-                {"label": "Page Down", "matrix": [2, 14], "x": 15, "y": 2},
-
-                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
-                {"label": "\\", "matrix": [3, 1], "x": 1.25, "y": 3},
-                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
-                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
-                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
-                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
-                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
-                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
-                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
-                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
-                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
-                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
-                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
-                {"label": "End", "matrix": [3, 14], "x": 15, "y": 3},
-
-                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
-                {"label": "GUI", "matrix": [4, 1], "x": 1.5, "y": 4},
-                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
-                {"label": "Space", "matrix": [4, 6], "x": 4, "y": 4, "w": 7},
-                {"label": "Ctrl", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
-
-                {"label": "\u2190", "matrix": [4, 12], "x": 13, "y": 4},
-                {"label": "\u2193", "matrix": [4, 13], "x": 14, "y": 4},
-                {"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4}
-            ]
-        },
-        "LAYOUT_iso_blocker_tsangan_split_bs": {
-            "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": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
-                {"label": "Delete", "matrix": [0, 14], "x": 14, "y": 0},
-
-                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
-                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
-                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
-                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
-                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
-                {"label": "Y", "matrix": [1, 6], "x": 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": "Page Up", "matrix": [1, 14], "x": 15, "y": 1},
-
-                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
-                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
-                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
-                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
-                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
-                {"label": "H", "matrix": [2, 6], "x": 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": "#", "matrix": [1, 13], "x": 12.75, "y": 2},
-                {"label": "Enter", "matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
-                {"label": "Page Down", "matrix": [2, 14], "x": 15, "y": 2},
-
-                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
-                {"label": "\\", "matrix": [3, 1], "x": 1.25, "y": 3},
-                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
-                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
-                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
-                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
-                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
-                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
-                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
-                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
-                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
-                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
-                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
-                {"label": "End", "matrix": [3, 14], "x": 15, "y": 3},
-
-                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
-                {"label": "GUI", "matrix": [4, 1], "x": 1.5, "y": 4},
-                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
-                {"label": "Space", "matrix": [4, 6], "x": 4, "y": 4, "w": 7},
-                {"label": "Ctrl", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
-
-                {"label": "\u2190", "matrix": [4, 12], "x": 13, "y": 4},
-                {"label": "\u2193", "matrix": [4, 13], "x": 14, "y": 4},
-                {"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/loki65/keyboard.json b/keyboards/loki65/keyboard.json
new file mode 100644
index 00000000000..5f93cde5f80
--- /dev/null
+++ b/keyboards/loki65/keyboard.json
@@ -0,0 +1,733 @@
+{
+    "keyboard_name": "Loki65",
+    "manufacturer": "Yiancar-Designs",
+    "url": "https://yiancar-designs.com",
+    "maintainer": "Yiancar-Designs",
+    "usb": {
+        "vid": "0x8968",
+        "pid": "0x4C36",
+        "device_version": "0.0.1"
+    },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 37,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": true,
+            "twinkle": true
+        }
+    },
+    "ws2812": {
+        "pin": "A9",
+        "driver": "pwm"
+    },
+    "matrix_pins": {
+        "cols": ["A1", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "B2", "B10", "B11", "B12", "B13", "B14", "B15"],
+        "rows": ["A2", "B9", "B8", "B5", "B4"]
+    },
+    "diode_direction": "COL2ROW",
+    "indicators": {
+        "caps_lock": "B6",
+        "on_state": 0
+    },
+    "processor": "STM32F072",
+    "bootloader": "stm32-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "nkro": true,
+        "rgblight": true
+    },
+    "layouts": {
+        "LAYOUT_all": {
+            "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": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "Delete", "matrix": [0, 14], "x": 14, "y": 0},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 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], "x": 13.5, "y": 1, "w": 1.5},
+                {"label": "Page Up", "matrix": [1, 14], "x": 15, "y": 1},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 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], "x": 12.75, "y": 2, "w": 2.25},
+                {"label": "Page Down", "matrix": [2, 14], "x": 15, "y": 2},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"label": "\\", "matrix": [3, 1], "x": 1.25, "y": 3},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
+                {"label": "End", "matrix": [3, 14], "x": 15, "y": 3},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "Space", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "Fn", "matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"label": "Ctrl", "matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+
+                {"label": "\u2190", "matrix": [4, 12], "x": 13, "y": 4},
+                {"label": "\u2193", "matrix": [4, 13], "x": 14, "y": 4},
+                {"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_ansi_blocker": {
+            "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": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 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], "x": 13.5, "y": 1, "w": 1.5},
+                {"label": "Page Up", "matrix": [1, 14], "x": 15, "y": 1},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 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], "x": 12.75, "y": 2, "w": 2.25},
+                {"label": "Page Down", "matrix": [2, 14], "x": 15, "y": 2},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
+                {"label": "End", "matrix": [3, 14], "x": 15, "y": 3},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "Space", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "Fn", "matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"label": "Ctrl", "matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+
+                {"label": "\u2190", "matrix": [4, 12], "x": 13, "y": 4},
+                {"label": "\u2193", "matrix": [4, 13], "x": 14, "y": 4},
+                {"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_ansi_blocker_split_bs": {
+            "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": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "Delete", "matrix": [0, 14], "x": 14, "y": 0},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 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], "x": 13.5, "y": 1, "w": 1.5},
+                {"label": "Page Up", "matrix": [1, 14], "x": 15, "y": 1},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 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], "x": 12.75, "y": 2, "w": 2.25},
+                {"label": "Page Down", "matrix": [2, 14], "x": 15, "y": 2},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
+                {"label": "End", "matrix": [3, 14], "x": 15, "y": 3},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "Space", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "Fn", "matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"label": "Ctrl", "matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+
+                {"label": "\u2190", "matrix": [4, 12], "x": 13, "y": 4},
+                {"label": "\u2193", "matrix": [4, 13], "x": 14, "y": 4},
+                {"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_ansi_blocker_tsangan": {
+            "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": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 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], "x": 13.5, "y": 1, "w": 1.5},
+                {"label": "Page Up", "matrix": [1, 14], "x": 15, "y": 1},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 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], "x": 12.75, "y": 2, "w": 2.25},
+                {"label": "Page Down", "matrix": [2, 14], "x": 15, "y": 2},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
+                {"label": "End", "matrix": [3, 14], "x": 15, "y": 3},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"label": "GUI", "matrix": [4, 1], "x": 1.5, "y": 4},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"label": "Space", "matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"label": "Ctrl", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+
+                {"label": "\u2190", "matrix": [4, 12], "x": 13, "y": 4},
+                {"label": "\u2193", "matrix": [4, 13], "x": 14, "y": 4},
+                {"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_ansi_blocker_tsangan_split_bs": {
+            "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": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "Delete", "matrix": [0, 14], "x": 14, "y": 0},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 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], "x": 13.5, "y": 1, "w": 1.5},
+                {"label": "Page Up", "matrix": [1, 14], "x": 15, "y": 1},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 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], "x": 12.75, "y": 2, "w": 2.25},
+                {"label": "Page Down", "matrix": [2, 14], "x": 15, "y": 2},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
+                {"label": "End", "matrix": [3, 14], "x": 15, "y": 3},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"label": "GUI", "matrix": [4, 1], "x": 1.5, "y": 4},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"label": "Space", "matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"label": "Ctrl", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+
+                {"label": "\u2190", "matrix": [4, 12], "x": 13, "y": 4},
+                {"label": "\u2193", "matrix": [4, 13], "x": 14, "y": 4},
+                {"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_iso_blocker": {
+            "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": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 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": "Page Up", "matrix": [1, 14], "x": 15, "y": 1},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 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": "#", "matrix": [1, 13], "x": 12.75, "y": 2},
+                {"label": "Enter", "matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"label": "Page Down", "matrix": [2, 14], "x": 15, "y": 2},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"label": "\\", "matrix": [3, 1], "x": 1.25, "y": 3},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
+                {"label": "End", "matrix": [3, 14], "x": 15, "y": 3},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "Space", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "Fn", "matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"label": "Ctrl", "matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+
+                {"label": "\u2190", "matrix": [4, 12], "x": 13, "y": 4},
+                {"label": "\u2193", "matrix": [4, 13], "x": 14, "y": 4},
+                {"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_iso_blocker_split_bs": {
+            "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": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "Delete", "matrix": [0, 14], "x": 14, "y": 0},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 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": "Page Up", "matrix": [1, 14], "x": 15, "y": 1},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 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": "#", "matrix": [1, 13], "x": 12.75, "y": 2},
+                {"label": "Enter", "matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"label": "Page Down", "matrix": [2, 14], "x": 15, "y": 2},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"label": "\\", "matrix": [3, 1], "x": 1.25, "y": 3},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
+                {"label": "End", "matrix": [3, 14], "x": 15, "y": 3},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "Space", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "Fn", "matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"label": "Ctrl", "matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+
+                {"label": "\u2190", "matrix": [4, 12], "x": 13, "y": 4},
+                {"label": "\u2193", "matrix": [4, 13], "x": 14, "y": 4},
+                {"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_iso_blocker_tsangan": {
+            "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": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 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": "Page Up", "matrix": [1, 14], "x": 15, "y": 1},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 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": "#", "matrix": [1, 13], "x": 12.75, "y": 2},
+                {"label": "Enter", "matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"label": "Page Down", "matrix": [2, 14], "x": 15, "y": 2},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"label": "\\", "matrix": [3, 1], "x": 1.25, "y": 3},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
+                {"label": "End", "matrix": [3, 14], "x": 15, "y": 3},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"label": "GUI", "matrix": [4, 1], "x": 1.5, "y": 4},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"label": "Space", "matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"label": "Ctrl", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+
+                {"label": "\u2190", "matrix": [4, 12], "x": 13, "y": 4},
+                {"label": "\u2193", "matrix": [4, 13], "x": 14, "y": 4},
+                {"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_iso_blocker_tsangan_split_bs": {
+            "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": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "Delete", "matrix": [0, 14], "x": 14, "y": 0},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 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": "Page Up", "matrix": [1, 14], "x": 15, "y": 1},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 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": "#", "matrix": [1, 13], "x": 12.75, "y": 2},
+                {"label": "Enter", "matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"label": "Page Down", "matrix": [2, 14], "x": 15, "y": 2},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"label": "\\", "matrix": [3, 1], "x": 1.25, "y": 3},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
+                {"label": "End", "matrix": [3, 14], "x": 15, "y": 3},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"label": "GUI", "matrix": [4, 1], "x": 1.5, "y": 4},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"label": "Space", "matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"label": "Ctrl", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+
+                {"label": "\u2190", "matrix": [4, 12], "x": 13, "y": 4},
+                {"label": "\u2193", "matrix": [4, 13], "x": 14, "y": 4},
+                {"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/loki65/rules.mk b/keyboards/loki65/rules.mk
index cc9d7bb3f53..0ab54aaaf71 100644
--- a/keyboards/loki65/rules.mk
+++ b/keyboards/loki65/rules.mk
@@ -1,15 +1,2 @@
 # Wildcard to allow APM32 MCU
 DFU_SUFFIX_ARGS = -v FFFF -p FFFF
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
diff --git a/keyboards/lucid/alexa/info.json b/keyboards/lucid/alexa/info.json
deleted file mode 100644
index 791d2b60d31..00000000000
--- a/keyboards/lucid/alexa/info.json
+++ /dev/null
@@ -1,175 +0,0 @@
-{
-    "keyboard_name": "Alexa",
-    "manufacturer": "Lucid",
-    "url": "https://www.makerkeyboards.com/products/alexa",
-    "maintainer": "mrnoisytiger",
-    "usb": {
-        "vid": "0x7667",
-        "pid": "0x0005",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["F0", "B1", "B2", "B3", "B7", "D0", "D1", "D2", "D3", "D5", "D7", "B4", "B5", "B6", "C6"],
-        "rows": ["F4", "F1", "F7", "F6", "F5"]
-    },
-    "diode_direction": "COL2ROW",
-    "indicators": {
-        "caps_lock": "C7"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "community_layouts": ["65_ansi_blocker", "65_ansi_blocker_split_bs"],
-    "layouts": {
-        "LAYOUT_65_ansi_blocker_split_bs": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"matrix": [0, 13], "x": 13, "y": 0},
-                {"matrix": [2, 13], "x": 14, "y": 0},
-                {"matrix": [0, 14], "x": 15, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-                {"matrix": [1, 14], "x": 15, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-                {"matrix": [2, 14], "x": 15, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 1], "x": 2.25, "y": 3},
-                {"matrix": [3, 2], "x": 3.25, "y": 3},
-                {"matrix": [3, 3], "x": 4.25, "y": 3},
-                {"matrix": [3, 4], "x": 5.25, "y": 3},
-                {"matrix": [3, 5], "x": 6.25, "y": 3},
-                {"matrix": [3, 6], "x": 7.25, "y": 3},
-                {"matrix": [3, 7], "x": 8.25, "y": 3},
-                {"matrix": [3, 8], "x": 9.25, "y": 3},
-                {"matrix": [3, 9], "x": 10.25, "y": 3},
-                {"matrix": [3, 10], "x": 11.25, "y": 3},
-                {"matrix": [3, 11], "x": 12.25, "y": 3, "w": 1.75},
-                {"matrix": [3, 13], "x": 14, "y": 3},
-                {"matrix": [3, 14], "x": 15, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
-                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
-                {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 12], "x": 13, "y": 4},
-                {"matrix": [4, 13], "x": 14, "y": 4},
-                {"matrix": [4, 14], "x": 15, "y": 4}
-            ]
-        },
-        "LAYOUT_65_ansi_blocker": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-                {"matrix": [0, 14], "x": 15, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-                {"matrix": [1, 14], "x": 15, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-                {"matrix": [2, 14], "x": 15, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 1], "x": 2.25, "y": 3},
-                {"matrix": [3, 2], "x": 3.25, "y": 3},
-                {"matrix": [3, 3], "x": 4.25, "y": 3},
-                {"matrix": [3, 4], "x": 5.25, "y": 3},
-                {"matrix": [3, 5], "x": 6.25, "y": 3},
-                {"matrix": [3, 6], "x": 7.25, "y": 3},
-                {"matrix": [3, 7], "x": 8.25, "y": 3},
-                {"matrix": [3, 8], "x": 9.25, "y": 3},
-                {"matrix": [3, 9], "x": 10.25, "y": 3},
-                {"matrix": [3, 10], "x": 11.25, "y": 3},
-                {"matrix": [3, 11], "x": 12.25, "y": 3, "w": 1.75},
-                {"matrix": [3, 13], "x": 14, "y": 3},
-                {"matrix": [3, 14], "x": 15, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
-                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
-                {"matrix": [4, 10], "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}
-            ]
-        }
-    }
-}
diff --git a/keyboards/lucid/alexa/keyboard.json b/keyboards/lucid/alexa/keyboard.json
new file mode 100644
index 00000000000..4c2bd739ca5
--- /dev/null
+++ b/keyboards/lucid/alexa/keyboard.json
@@ -0,0 +1,182 @@
+{
+    "keyboard_name": "Alexa",
+    "manufacturer": "Lucid",
+    "url": "https://www.makerkeyboards.com/products/alexa",
+    "maintainer": "mrnoisytiger",
+    "usb": {
+        "vid": "0x7667",
+        "pid": "0x0005",
+        "device_version": "0.0.1"
+    },
+    "matrix_pins": {
+        "cols": ["F0", "B1", "B2", "B3", "B7", "D0", "D1", "D2", "D3", "D5", "D7", "B4", "B5", "B6", "C6"],
+        "rows": ["F4", "F1", "F7", "F6", "F5"]
+    },
+    "diode_direction": "COL2ROW",
+    "indicators": {
+        "caps_lock": "C7"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "command": true,
+        "nkro": true
+    },
+    "community_layouts": ["65_ansi_blocker", "65_ansi_blocker_split_bs"],
+    "layouts": {
+        "LAYOUT_65_ansi_blocker_split_bs": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [2, 13], "x": 14, "y": 0},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 10], "x": 11.25, "y": 3},
+                {"matrix": [3, 11], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_65_ansi_blocker": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 10], "x": 11.25, "y": 3},
+                {"matrix": [3, 11], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "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}
+            ]
+        }
+    }
+}
diff --git a/keyboards/lucid/alexa/rules.mk b/keyboards/lucid/alexa/rules.mk
index f117516ecce..3437a35bdf1 100644
--- a/keyboards/lucid/alexa/rules.mk
+++ b/keyboards/lucid/alexa/rules.mk
@@ -1,15 +1,2 @@
 # Processor frequency
 F_CPU = 8000000
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
diff --git a/keyboards/lucid/alexa_solder/info.json b/keyboards/lucid/alexa_solder/info.json
deleted file mode 100644
index 469c77126d1..00000000000
--- a/keyboards/lucid/alexa_solder/info.json
+++ /dev/null
@@ -1,725 +0,0 @@
-{
-    "keyboard_name": "Alexa Solder",
-    "manufacturer": "Maker Keyboards",
-    "url": "http://www.makerkeyboards.com",
-    "maintainer": "mrnoisytiger",
-    "usb": {
-        "vid": "0x7667",
-        "pid": "0x0006",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["F0", "B1", "B2", "B3", "B7", "D0", "D1", "D2", "D3", "D5", "D7", "B4", "B5", "B6", "C6"],
-        "rows": ["F4", "F1", "F7", "F6", "F5"]
-    },
-    "diode_direction": "COL2ROW",
-    "indicators": {
-        "caps_lock": "C7"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "community_layouts": [
-        "65_ansi_blocker",
-        "65_ansi_blocker_split_bs",
-        "65_ansi_blocker_tsangan",
-        "65_ansi_blocker_tsangan_split_bs",
-        "65_iso_blocker",
-        "65_iso_blocker_split_bs",
-        "65_iso_blocker_tsangan",
-        "65_iso_blocker_tsangan_split_bs"
-    ],
-    "layouts": {
-        "LAYOUT_all": {
-            "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": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
-                {"label": "Delete", "matrix": [2, 13], "x": 14, "y": 0},
-                {"label": "`", "matrix": [0, 14], "x": 15, "y": 0},
-
-                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
-                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
-                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
-                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
-                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
-                {"label": "Y", "matrix": [1, 6], "x": 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], "x": 13.5, "y": 1, "w": 1.5},
-                {"label": "Page Up", "matrix": [1, 14], "x": 15, "y": 1},
-
-                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
-                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
-                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
-                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
-                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
-                {"label": "H", "matrix": [2, 6], "x": 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, 12], "x": 12.75, "y": 2, "w": 2.25},
-                {"label": "Page Down", "matrix": [2, 14], "x": 15, "y": 2},
-
-                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
-                {"label": "Shift", "matrix": [3, 1], "x": 1.25, "y": 3},
-                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
-                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
-                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
-                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
-                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
-                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
-                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
-                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
-                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
-                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
-                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
-                {"label": "End", "matrix": [3, 14], "x": 15, "y": 3},
-
-                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"label": "Alt", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"label": "GUI", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"label": "Space", "matrix": [4, 3], "x": 3.75, "y": 4, "w": 2.25},
-                {"label": "Space", "matrix": [4, 6], "x": 6, "y": 4, "w": 1.25},
-                {"label": "Space", "matrix": [4, 8], "x": 7.25, "y": 4, "w": 2.75},
-                {"label": "Alt", "matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
-                {"label": "Fn", "matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
-
-                {"label": "\u2190", "matrix": [4, 12], "x": 13, "y": 4},
-                {"label": "\u2193", "matrix": [4, 13], "x": 14, "y": 4},
-                {"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4}
-            ]
-        },
-        "LAYOUT_65_ansi_blocker": {
-            "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": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-                {"label": "`", "matrix": [0, 14], "x": 15, "y": 0},
-
-                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
-                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
-                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
-                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
-                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
-                {"label": "Y", "matrix": [1, 6], "x": 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], "x": 13.5, "y": 1, "w": 1.5},
-                {"label": "Page Up", "matrix": [1, 14], "x": 15, "y": 1},
-
-                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
-                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
-                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
-                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
-                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
-                {"label": "H", "matrix": [2, 6], "x": 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, 12], "x": 12.75, "y": 2, "w": 2.25},
-                {"label": "Page Down", "matrix": [2, 14], "x": 15, "y": 2},
-
-                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
-                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
-                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
-                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
-                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
-                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
-                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
-                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
-                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
-                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
-                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
-                {"label": "End", "matrix": [3, 14], "x": 15, "y": 3},
-
-                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"label": "Alt", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"label": "GUI", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"label": "Space", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
-                {"label": "Alt", "matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
-                {"label": "Fn", "matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
-
-                {"label": "\u2190", "matrix": [4, 12], "x": 13, "y": 4},
-                {"label": "\u2193", "matrix": [4, 13], "x": 14, "y": 4},
-                {"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4}
-            ]
-        },
-        "LAYOUT_65_ansi_blocker_split_bs": {
-            "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": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
-                {"label": "Delete", "matrix": [2, 13], "x": 14, "y": 0},
-                {"label": "`", "matrix": [0, 14], "x": 15, "y": 0},
-
-                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
-                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
-                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
-                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
-                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
-                {"label": "Y", "matrix": [1, 6], "x": 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], "x": 13.5, "y": 1, "w": 1.5},
-                {"label": "Page Up", "matrix": [1, 14], "x": 15, "y": 1},
-
-                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
-                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
-                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
-                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
-                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
-                {"label": "H", "matrix": [2, 6], "x": 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, 12], "x": 12.75, "y": 2, "w": 2.25},
-                {"label": "Page Down", "matrix": [2, 14], "x": 15, "y": 2},
-
-                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
-                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
-                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
-                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
-                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
-                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
-                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
-                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
-                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
-                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
-                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
-                {"label": "End", "matrix": [3, 14], "x": 15, "y": 3},
-
-                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"label": "Alt", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"label": "GUI", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"label": "Space", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
-                {"label": "Alt", "matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
-                {"label": "Fn", "matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
-
-                {"label": "\u2190", "matrix": [4, 12], "x": 13, "y": 4},
-                {"label": "\u2193", "matrix": [4, 13], "x": 14, "y": 4},
-                {"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4}
-            ]
-        },
-        "LAYOUT_65_ansi_blocker_tsangan": {
-            "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": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-                {"label": "`", "matrix": [0, 14], "x": 15, "y": 0},
-
-                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
-                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
-                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
-                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
-                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
-                {"label": "Y", "matrix": [1, 6], "x": 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], "x": 13.5, "y": 1, "w": 1.5},
-                {"label": "Page Up", "matrix": [1, 14], "x": 15, "y": 1},
-
-                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
-                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
-                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
-                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
-                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
-                {"label": "H", "matrix": [2, 6], "x": 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, 12], "x": 12.75, "y": 2, "w": 2.25},
-                {"label": "Page Down", "matrix": [2, 14], "x": 15, "y": 2},
-
-                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
-                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
-                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
-                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
-                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
-                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
-                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
-                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
-                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
-                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
-                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
-                {"label": "End", "matrix": [3, 14], "x": 15, "y": 3},
-
-                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
-                {"label": "Alt", "matrix": [4, 1], "x": 1.5, "y": 4},
-                {"label": "GUI", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
-                {"label": "Space", "matrix": [4, 6], "x": 4, "y": 4, "w": 7},
-                {"label": "Fn", "matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
-
-                {"label": "\u2190", "matrix": [4, 12], "x": 13, "y": 4},
-                {"label": "\u2193", "matrix": [4, 13], "x": 14, "y": 4},
-                {"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4}
-            ]
-        },
-        "LAYOUT_65_ansi_blocker_tsangan_split_bs": {
-            "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": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
-                {"label": "Delete", "matrix": [2, 13], "x": 14, "y": 0},
-                {"label": "`", "matrix": [0, 14], "x": 15, "y": 0},
-
-                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
-                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
-                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
-                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
-                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
-                {"label": "Y", "matrix": [1, 6], "x": 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], "x": 13.5, "y": 1, "w": 1.5},
-                {"label": "Page Up", "matrix": [1, 14], "x": 15, "y": 1},
-
-                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
-                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
-                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
-                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
-                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
-                {"label": "H", "matrix": [2, 6], "x": 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, 12], "x": 12.75, "y": 2, "w": 2.25},
-                {"label": "Page Down", "matrix": [2, 14], "x": 15, "y": 2},
-
-                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
-                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
-                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
-                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
-                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
-                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
-                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
-                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
-                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
-                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
-                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
-                {"label": "End", "matrix": [3, 14], "x": 15, "y": 3},
-
-                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
-                {"label": "Alt", "matrix": [4, 1], "x": 1.5, "y": 4},
-                {"label": "GUI", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
-                {"label": "Space", "matrix": [4, 6], "x": 4, "y": 4, "w": 7},
-                {"label": "Fn", "matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
-
-                {"label": "\u2190", "matrix": [4, 12], "x": 13, "y": 4},
-                {"label": "\u2193", "matrix": [4, 13], "x": 14, "y": 4},
-                {"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4}
-            ]
-        },
-        "LAYOUT_65_iso_blocker": {
-            "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": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-                {"label": "`", "matrix": [0, 14], "x": 15, "y": 0},
-
-                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
-                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
-                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
-                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
-                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
-                {"label": "Y", "matrix": [1, 6], "x": 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": "Page Up", "matrix": [1, 14], "x": 15, "y": 1},
-
-                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
-                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
-                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
-                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
-                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
-                {"label": "H", "matrix": [2, 6], "x": 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": "#", "matrix": [2, 12], "x": 12.75, "y": 2},
-                {"label": "Enter", "matrix": [1, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
-                {"label": "Page Down", "matrix": [2, 14], "x": 15, "y": 2},
-
-                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
-                {"label": "\\", "matrix": [3, 1], "x": 1.25, "y": 3},
-                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
-                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
-                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
-                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
-                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
-                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
-                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
-                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
-                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
-                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
-                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
-                {"label": "End", "matrix": [3, 14], "x": 15, "y": 3},
-
-                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"label": "Alt", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"label": "GUI", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"label": "Space", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
-                {"label": "Alt", "matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
-                {"label": "Fn", "matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
-
-                {"label": "\u2190", "matrix": [4, 12], "x": 13, "y": 4},
-                {"label": "\u2193", "matrix": [4, 13], "x": 14, "y": 4},
-                {"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4}
-            ]
-        },
-        "LAYOUT_65_iso_blocker_split_bs": {
-            "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": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
-                {"label": "Delete", "matrix": [2, 13], "x": 14, "y": 0},
-                {"label": "`", "matrix": [0, 14], "x": 15, "y": 0},
-
-                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
-                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
-                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
-                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
-                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
-                {"label": "Y", "matrix": [1, 6], "x": 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": "Page Up", "matrix": [1, 14], "x": 15, "y": 1},
-
-                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
-                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
-                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
-                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
-                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
-                {"label": "H", "matrix": [2, 6], "x": 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": "#", "matrix": [2, 12], "x": 12.75, "y": 2},
-                {"label": "Enter", "matrix": [1, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
-                {"label": "Page Down", "matrix": [2, 14], "x": 15, "y": 2},
-
-                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
-                {"label": "\\", "matrix": [3, 1], "x": 1.25, "y": 3},
-                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
-                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
-                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
-                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
-                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
-                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
-                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
-                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
-                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
-                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
-                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
-                {"label": "End", "matrix": [3, 14], "x": 15, "y": 3},
-
-                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"label": "Alt", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"label": "GUI", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"label": "Space", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
-                {"label": "Alt", "matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
-                {"label": "Fn", "matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
-
-                {"label": "\u2190", "matrix": [4, 12], "x": 13, "y": 4},
-                {"label": "\u2193", "matrix": [4, 13], "x": 14, "y": 4},
-                {"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4}
-            ]
-        },
-        "LAYOUT_65_iso_blocker_tsangan": {
-            "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": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-                {"label": "`", "matrix": [0, 14], "x": 15, "y": 0},
-
-                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
-                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
-                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
-                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
-                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
-                {"label": "Y", "matrix": [1, 6], "x": 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": "Page Up", "matrix": [1, 14], "x": 15, "y": 1},
-
-                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
-                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
-                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
-                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
-                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
-                {"label": "H", "matrix": [2, 6], "x": 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": "#", "matrix": [2, 12], "x": 12.75, "y": 2},
-                {"label": "Enter", "matrix": [1, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
-                {"label": "Page Down", "matrix": [2, 14], "x": 15, "y": 2},
-
-                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
-                {"label": "\\", "matrix": [3, 1], "x": 1.25, "y": 3},
-                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
-                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
-                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
-                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
-                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
-                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
-                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
-                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
-                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
-                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
-                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
-                {"label": "End", "matrix": [3, 14], "x": 15, "y": 3},
-
-                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
-                {"label": "Alt", "matrix": [4, 1], "x": 1.5, "y": 4},
-                {"label": "GUI", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
-                {"label": "Space", "matrix": [4, 6], "x": 4, "y": 4, "w": 7},
-                {"label": "Fn", "matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
-
-                {"label": "\u2190", "matrix": [4, 12], "x": 13, "y": 4},
-                {"label": "\u2193", "matrix": [4, 13], "x": 14, "y": 4},
-                {"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4}
-            ]
-        },
-        "LAYOUT_65_iso_blocker_tsangan_split_bs": {
-            "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": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
-                {"label": "Delete", "matrix": [2, 13], "x": 14, "y": 0},
-                {"label": "`", "matrix": [0, 14], "x": 15, "y": 0},
-
-                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
-                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
-                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
-                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
-                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
-                {"label": "Y", "matrix": [1, 6], "x": 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": "Page Up", "matrix": [1, 14], "x": 15, "y": 1},
-
-                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
-                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
-                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
-                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
-                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
-                {"label": "H", "matrix": [2, 6], "x": 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": "#", "matrix": [2, 12], "x": 12.75, "y": 2},
-                {"label": "Enter", "matrix": [1, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
-                {"label": "Page Down", "matrix": [2, 14], "x": 15, "y": 2},
-
-                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
-                {"label": "\\", "matrix": [3, 1], "x": 1.25, "y": 3},
-                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
-                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
-                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
-                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
-                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
-                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
-                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
-                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
-                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
-                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
-                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
-                {"label": "End", "matrix": [3, 14], "x": 15, "y": 3},
-
-                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
-                {"label": "Alt", "matrix": [4, 1], "x": 1.5, "y": 4},
-                {"label": "GUI", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
-                {"label": "Space", "matrix": [4, 6], "x": 4, "y": 4, "w": 7},
-                {"label": "Fn", "matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
-
-                {"label": "\u2190", "matrix": [4, 12], "x": 13, "y": 4},
-                {"label": "\u2193", "matrix": [4, 13], "x": 14, "y": 4},
-                {"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/lucid/alexa_solder/keyboard.json b/keyboards/lucid/alexa_solder/keyboard.json
new file mode 100644
index 00000000000..881fed5deee
--- /dev/null
+++ b/keyboards/lucid/alexa_solder/keyboard.json
@@ -0,0 +1,732 @@
+{
+    "keyboard_name": "Alexa Solder",
+    "manufacturer": "Maker Keyboards",
+    "url": "http://www.makerkeyboards.com",
+    "maintainer": "mrnoisytiger",
+    "usb": {
+        "vid": "0x7667",
+        "pid": "0x0006",
+        "device_version": "0.0.1"
+    },
+    "matrix_pins": {
+        "cols": ["F0", "B1", "B2", "B3", "B7", "D0", "D1", "D2", "D3", "D5", "D7", "B4", "B5", "B6", "C6"],
+        "rows": ["F4", "F1", "F7", "F6", "F5"]
+    },
+    "diode_direction": "COL2ROW",
+    "indicators": {
+        "caps_lock": "C7"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "command": true,
+        "nkro": true
+    },
+    "community_layouts": [
+        "65_ansi_blocker",
+        "65_ansi_blocker_split_bs",
+        "65_ansi_blocker_tsangan",
+        "65_ansi_blocker_tsangan_split_bs",
+        "65_iso_blocker",
+        "65_iso_blocker_split_bs",
+        "65_iso_blocker_tsangan",
+        "65_iso_blocker_tsangan_split_bs"
+    ],
+    "layouts": {
+        "LAYOUT_all": {
+            "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": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "Delete", "matrix": [2, 13], "x": 14, "y": 0},
+                {"label": "`", "matrix": [0, 14], "x": 15, "y": 0},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 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], "x": 13.5, "y": 1, "w": 1.5},
+                {"label": "Page Up", "matrix": [1, 14], "x": 15, "y": 1},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 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, 12], "x": 12.75, "y": 2, "w": 2.25},
+                {"label": "Page Down", "matrix": [2, 14], "x": 15, "y": 2},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"label": "Shift", "matrix": [3, 1], "x": 1.25, "y": 3},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
+                {"label": "End", "matrix": [3, 14], "x": 15, "y": 3},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "Alt", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "GUI", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "Space", "matrix": [4, 3], "x": 3.75, "y": 4, "w": 2.25},
+                {"label": "Space", "matrix": [4, 6], "x": 6, "y": 4, "w": 1.25},
+                {"label": "Space", "matrix": [4, 8], "x": 7.25, "y": 4, "w": 2.75},
+                {"label": "Alt", "matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"label": "Fn", "matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+
+                {"label": "\u2190", "matrix": [4, 12], "x": 13, "y": 4},
+                {"label": "\u2193", "matrix": [4, 13], "x": 14, "y": 4},
+                {"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_65_ansi_blocker": {
+            "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": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"label": "`", "matrix": [0, 14], "x": 15, "y": 0},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 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], "x": 13.5, "y": 1, "w": 1.5},
+                {"label": "Page Up", "matrix": [1, 14], "x": 15, "y": 1},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 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, 12], "x": 12.75, "y": 2, "w": 2.25},
+                {"label": "Page Down", "matrix": [2, 14], "x": 15, "y": 2},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
+                {"label": "End", "matrix": [3, 14], "x": 15, "y": 3},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "Alt", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "GUI", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "Space", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "Alt", "matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"label": "Fn", "matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+
+                {"label": "\u2190", "matrix": [4, 12], "x": 13, "y": 4},
+                {"label": "\u2193", "matrix": [4, 13], "x": 14, "y": 4},
+                {"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_65_ansi_blocker_split_bs": {
+            "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": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "Delete", "matrix": [2, 13], "x": 14, "y": 0},
+                {"label": "`", "matrix": [0, 14], "x": 15, "y": 0},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 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], "x": 13.5, "y": 1, "w": 1.5},
+                {"label": "Page Up", "matrix": [1, 14], "x": 15, "y": 1},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 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, 12], "x": 12.75, "y": 2, "w": 2.25},
+                {"label": "Page Down", "matrix": [2, 14], "x": 15, "y": 2},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
+                {"label": "End", "matrix": [3, 14], "x": 15, "y": 3},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "Alt", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "GUI", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "Space", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "Alt", "matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"label": "Fn", "matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+
+                {"label": "\u2190", "matrix": [4, 12], "x": 13, "y": 4},
+                {"label": "\u2193", "matrix": [4, 13], "x": 14, "y": 4},
+                {"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_65_ansi_blocker_tsangan": {
+            "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": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"label": "`", "matrix": [0, 14], "x": 15, "y": 0},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 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], "x": 13.5, "y": 1, "w": 1.5},
+                {"label": "Page Up", "matrix": [1, 14], "x": 15, "y": 1},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 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, 12], "x": 12.75, "y": 2, "w": 2.25},
+                {"label": "Page Down", "matrix": [2, 14], "x": 15, "y": 2},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
+                {"label": "End", "matrix": [3, 14], "x": 15, "y": 3},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"label": "Alt", "matrix": [4, 1], "x": 1.5, "y": 4},
+                {"label": "GUI", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"label": "Space", "matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"label": "Fn", "matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
+
+                {"label": "\u2190", "matrix": [4, 12], "x": 13, "y": 4},
+                {"label": "\u2193", "matrix": [4, 13], "x": 14, "y": 4},
+                {"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_65_ansi_blocker_tsangan_split_bs": {
+            "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": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "Delete", "matrix": [2, 13], "x": 14, "y": 0},
+                {"label": "`", "matrix": [0, 14], "x": 15, "y": 0},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 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], "x": 13.5, "y": 1, "w": 1.5},
+                {"label": "Page Up", "matrix": [1, 14], "x": 15, "y": 1},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 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, 12], "x": 12.75, "y": 2, "w": 2.25},
+                {"label": "Page Down", "matrix": [2, 14], "x": 15, "y": 2},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
+                {"label": "End", "matrix": [3, 14], "x": 15, "y": 3},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"label": "Alt", "matrix": [4, 1], "x": 1.5, "y": 4},
+                {"label": "GUI", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"label": "Space", "matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"label": "Fn", "matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
+
+                {"label": "\u2190", "matrix": [4, 12], "x": 13, "y": 4},
+                {"label": "\u2193", "matrix": [4, 13], "x": 14, "y": 4},
+                {"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_65_iso_blocker": {
+            "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": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"label": "`", "matrix": [0, 14], "x": 15, "y": 0},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 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": "Page Up", "matrix": [1, 14], "x": 15, "y": 1},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 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": "#", "matrix": [2, 12], "x": 12.75, "y": 2},
+                {"label": "Enter", "matrix": [1, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"label": "Page Down", "matrix": [2, 14], "x": 15, "y": 2},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"label": "\\", "matrix": [3, 1], "x": 1.25, "y": 3},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
+                {"label": "End", "matrix": [3, 14], "x": 15, "y": 3},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "Alt", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "GUI", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "Space", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "Alt", "matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"label": "Fn", "matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+
+                {"label": "\u2190", "matrix": [4, 12], "x": 13, "y": 4},
+                {"label": "\u2193", "matrix": [4, 13], "x": 14, "y": 4},
+                {"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_65_iso_blocker_split_bs": {
+            "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": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "Delete", "matrix": [2, 13], "x": 14, "y": 0},
+                {"label": "`", "matrix": [0, 14], "x": 15, "y": 0},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 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": "Page Up", "matrix": [1, 14], "x": 15, "y": 1},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 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": "#", "matrix": [2, 12], "x": 12.75, "y": 2},
+                {"label": "Enter", "matrix": [1, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"label": "Page Down", "matrix": [2, 14], "x": 15, "y": 2},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"label": "\\", "matrix": [3, 1], "x": 1.25, "y": 3},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
+                {"label": "End", "matrix": [3, 14], "x": 15, "y": 3},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "Alt", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "GUI", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "Space", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "Alt", "matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"label": "Fn", "matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+
+                {"label": "\u2190", "matrix": [4, 12], "x": 13, "y": 4},
+                {"label": "\u2193", "matrix": [4, 13], "x": 14, "y": 4},
+                {"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_65_iso_blocker_tsangan": {
+            "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": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"label": "`", "matrix": [0, 14], "x": 15, "y": 0},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 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": "Page Up", "matrix": [1, 14], "x": 15, "y": 1},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 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": "#", "matrix": [2, 12], "x": 12.75, "y": 2},
+                {"label": "Enter", "matrix": [1, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"label": "Page Down", "matrix": [2, 14], "x": 15, "y": 2},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"label": "\\", "matrix": [3, 1], "x": 1.25, "y": 3},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
+                {"label": "End", "matrix": [3, 14], "x": 15, "y": 3},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"label": "Alt", "matrix": [4, 1], "x": 1.5, "y": 4},
+                {"label": "GUI", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"label": "Space", "matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"label": "Fn", "matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
+
+                {"label": "\u2190", "matrix": [4, 12], "x": 13, "y": 4},
+                {"label": "\u2193", "matrix": [4, 13], "x": 14, "y": 4},
+                {"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_65_iso_blocker_tsangan_split_bs": {
+            "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": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "Delete", "matrix": [2, 13], "x": 14, "y": 0},
+                {"label": "`", "matrix": [0, 14], "x": 15, "y": 0},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 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": "Page Up", "matrix": [1, 14], "x": 15, "y": 1},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 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": "#", "matrix": [2, 12], "x": 12.75, "y": 2},
+                {"label": "Enter", "matrix": [1, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"label": "Page Down", "matrix": [2, 14], "x": 15, "y": 2},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"label": "\\", "matrix": [3, 1], "x": 1.25, "y": 3},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
+                {"label": "End", "matrix": [3, 14], "x": 15, "y": 3},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"label": "Alt", "matrix": [4, 1], "x": 1.5, "y": 4},
+                {"label": "GUI", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"label": "Space", "matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"label": "Fn", "matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
+
+                {"label": "\u2190", "matrix": [4, 12], "x": 13, "y": 4},
+                {"label": "\u2193", "matrix": [4, 13], "x": 14, "y": 4},
+                {"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/lucid/alexa_solder/rules.mk b/keyboards/lucid/alexa_solder/rules.mk
index f117516ecce..3437a35bdf1 100644
--- a/keyboards/lucid/alexa_solder/rules.mk
+++ b/keyboards/lucid/alexa_solder/rules.mk
@@ -1,15 +1,2 @@
 # Processor frequency
 F_CPU = 8000000
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
diff --git a/keyboards/lucid/kbd8x_hs/info.json b/keyboards/lucid/kbd8x_hs/info.json
deleted file mode 100644
index ef78933882d..00000000000
--- a/keyboards/lucid/kbd8x_hs/info.json
+++ /dev/null
@@ -1,334 +0,0 @@
-{
-    "keyboard_name": "KBD8X Hotswap",
-    "manufacturer": "Lucid",
-    "url": "http://www.lucidkb.com",
-    "maintainer": "Lucid",
-    "usb": {
-        "vid": "0x7667",
-        "pid": "0x0003",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["F2", "F3", "F4", "F5", "F6", "F7", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "D5", "D6", "D7"],
-        "rows": ["B4", "B5", "B6", "C0", "E1", "E0"]
-    },
-    "diode_direction": "COL2ROW",
-    "indicators": {
-        "caps_lock": "B7"
-    },
-    "processor": "at90usb646",
-    "bootloader": "atmel-dfu",
-    "layouts": {
-        "LAYOUT_tkl_ansi": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "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.5, "y": 0},
-                {"matrix": [0, 7], "x": 7.5, "y": 0},
-                {"matrix": [0, 8], "x": 8.5, "y": 0},
-                {"matrix": [0, 9], "x": 9.5, "y": 0},
-
-                {"matrix": [0, 10], "x": 11, "y": 0},
-                {"matrix": [0, 11], "x": 12, "y": 0},
-                {"matrix": [0, 12], "x": 13, "y": 0},
-                {"matrix": [0, 13], "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": [2, 13], "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, 1], "x": 2.25, "y": 4.25},
-                {"matrix": [4, 2], "x": 3.25, "y": 4.25},
-                {"matrix": [4, 3], "x": 4.25, "y": 4.25},
-                {"matrix": [4, 4], "x": 5.25, "y": 4.25},
-                {"matrix": [4, 5], "x": 6.25, "y": 4.25},
-                {"matrix": [4, 6], "x": 7.25, "y": 4.25},
-                {"matrix": [4, 7], "x": 8.25, "y": 4.25},
-                {"matrix": [4, 8], "x": 9.25, "y": 4.25},
-                {"matrix": [4, 9], "x": 10.25, "y": 4.25},
-                {"matrix": [4, 10], "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.25},
-                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 5], "x": 3.75, "y": 5.25, "w": 6.25},
-                {"matrix": [5, 9], "x": 10, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 10], "x": 11.25, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 11], "x": 12.5, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
-
-                {"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_7u": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "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.5, "y": 0},
-                {"matrix": [0, 7], "x": 7.5, "y": 0},
-                {"matrix": [0, 8], "x": 8.5, "y": 0},
-                {"matrix": [0, 9], "x": 9.5, "y": 0},
-
-                {"matrix": [0, 10], "x": 11, "y": 0},
-                {"matrix": [0, 11], "x": 12, "y": 0},
-                {"matrix": [0, 12], "x": 13, "y": 0},
-                {"matrix": [0, 13], "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": [2, 13], "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, 1], "x": 2.25, "y": 4.25},
-                {"matrix": [4, 2], "x": 3.25, "y": 4.25},
-                {"matrix": [4, 3], "x": 4.25, "y": 4.25},
-                {"matrix": [4, 4], "x": 5.25, "y": 4.25},
-                {"matrix": [4, 5], "x": 6.25, "y": 4.25},
-                {"matrix": [4, 6], "x": 7.25, "y": 4.25},
-                {"matrix": [4, 7], "x": 8.25, "y": 4.25},
-                {"matrix": [4, 8], "x": 9.25, "y": 4.25},
-                {"matrix": [4, 9], "x": 10.25, "y": 4.25},
-                {"matrix": [4, 10], "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, 5], "x": 4, "y": 5.25, "w": 7},
-                {"matrix": [5, 10], "x": 11, "y": 5.25, "w": 1.5},
-                {"matrix": [5, 11], "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_all": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "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.5, "y": 0},
-                {"matrix": [0, 7], "x": 7.5, "y": 0},
-                {"matrix": [0, 8], "x": 8.5, "y": 0},
-                {"matrix": [0, 9], "x": 9.5, "y": 0},
-
-                {"matrix": [0, 10], "x": 11, "y": 0},
-                {"matrix": [0, 11], "x": 12, "y": 0},
-                {"matrix": [0, 12], "x": 13, "y": 0},
-                {"matrix": [0, 13], "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": [2, 13], "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, 1], "x": 2.25, "y": 4.25},
-                {"matrix": [4, 2], "x": 3.25, "y": 4.25},
-                {"matrix": [4, 3], "x": 4.25, "y": 4.25},
-                {"matrix": [4, 4], "x": 5.25, "y": 4.25},
-                {"matrix": [4, 5], "x": 6.25, "y": 4.25},
-                {"matrix": [4, 6], "x": 7.25, "y": 4.25},
-                {"matrix": [4, 7], "x": 8.25, "y": 4.25},
-                {"matrix": [4, 8], "x": 9.25, "y": 4.25},
-                {"matrix": [4, 9], "x": 10.25, "y": 4.25},
-                {"matrix": [4, 10], "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.25},
-                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 5], "x": 3.75, "y": 5.25, "w": 6.25},
-                {"matrix": [5, 9], "x": 10, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 10], "x": 11.25, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 11], "x": 12.5, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
-
-                {"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}
-            ]
-        }
-    }
-}
diff --git a/keyboards/lucid/kbd8x_hs/keyboard.json b/keyboards/lucid/kbd8x_hs/keyboard.json
new file mode 100644
index 00000000000..a542cde0239
--- /dev/null
+++ b/keyboards/lucid/kbd8x_hs/keyboard.json
@@ -0,0 +1,341 @@
+{
+    "keyboard_name": "KBD8X Hotswap",
+    "manufacturer": "Lucid",
+    "url": "http://www.lucidkb.com",
+    "maintainer": "Lucid",
+    "usb": {
+        "vid": "0x7667",
+        "pid": "0x0003",
+        "device_version": "0.0.1"
+    },
+    "matrix_pins": {
+        "cols": ["F2", "F3", "F4", "F5", "F6", "F7", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "D5", "D6", "D7"],
+        "rows": ["B4", "B5", "B6", "C0", "E1", "E0"]
+    },
+    "diode_direction": "COL2ROW",
+    "indicators": {
+        "caps_lock": "B7"
+    },
+    "processor": "at90usb646",
+    "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "command": true,
+        "nkro": true
+    },
+    "layouts": {
+        "LAYOUT_tkl_ansi": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "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.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 10], "x": 11, "y": 0},
+                {"matrix": [0, 11], "x": 12, "y": 0},
+                {"matrix": [0, 12], "x": 13, "y": 0},
+                {"matrix": [0, 13], "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": [2, 13], "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, 1], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 10], "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.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 5], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 9], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 10], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"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_7u": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "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.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 10], "x": 11, "y": 0},
+                {"matrix": [0, 11], "x": 12, "y": 0},
+                {"matrix": [0, 12], "x": 13, "y": 0},
+                {"matrix": [0, 13], "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": [2, 13], "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, 1], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 10], "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, 5], "x": 4, "y": 5.25, "w": 7},
+                {"matrix": [5, 10], "x": 11, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 11], "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_all": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "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.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 10], "x": 11, "y": 0},
+                {"matrix": [0, 11], "x": 12, "y": 0},
+                {"matrix": [0, 12], "x": 13, "y": 0},
+                {"matrix": [0, 13], "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": [2, 13], "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, 1], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 10], "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.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 5], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 9], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 10], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"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}
+            ]
+        }
+    }
+}
diff --git a/keyboards/lucid/kbd8x_hs/rules.mk b/keyboards/lucid/kbd8x_hs/rules.mk
index f117516ecce..3437a35bdf1 100644
--- a/keyboards/lucid/kbd8x_hs/rules.mk
+++ b/keyboards/lucid/kbd8x_hs/rules.mk
@@ -1,15 +1,2 @@
 # Processor frequency
 F_CPU = 8000000
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
diff --git a/keyboards/lucid/phantom_hs/info.json b/keyboards/lucid/phantom_hs/info.json
deleted file mode 100644
index 5709d422d45..00000000000
--- a/keyboards/lucid/phantom_hs/info.json
+++ /dev/null
@@ -1,99 +0,0 @@
-{
-    "keyboard_name": "Phantom",
-    "manufacturer": "Lucid",
-    "url": "http://www.lucidkb.com",
-    "maintainer": "Lucid",
-    "usb": {
-        "vid": "0x7667",
-        "pid": "0x0001",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["F0", "B1", "B2", "B3", "B7", "D0", "D1", "D2", "D3", "D5", "D7", "B4", "B5", "B6", "C6"],
-        "rows": ["F4", "F1", "F7", "F6", "F5"]
-    },
-    "diode_direction": "COL2ROW",
-    "indicators": {
-        "caps_lock": "C7"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "community_layouts": ["65_ansi_blocker"],
-    "layouts": {
-        "LAYOUT_65_ansi_blocker": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-                {"matrix": [0, 14], "x": 15, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-                {"matrix": [1, 14], "x": 15, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-                {"matrix": [2, 14], "x": 15, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 1], "x": 2.25, "y": 3},
-                {"matrix": [3, 2], "x": 3.25, "y": 3},
-                {"matrix": [3, 3], "x": 4.25, "y": 3},
-                {"matrix": [3, 4], "x": 5.25, "y": 3},
-                {"matrix": [3, 5], "x": 6.25, "y": 3},
-                {"matrix": [3, 6], "x": 7.25, "y": 3},
-                {"matrix": [3, 7], "x": 8.25, "y": 3},
-                {"matrix": [3, 8], "x": 9.25, "y": 3},
-                {"matrix": [3, 9], "x": 10.25, "y": 3},
-                {"matrix": [3, 10], "x": 11.25, "y": 3},
-                {"matrix": [3, 11], "x": 12.25, "y": 3, "w": 1.75},
-                {"matrix": [3, 13], "x": 14, "y": 3},
-                {"matrix": [3, 14], "x": 15, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
-                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
-                {"matrix": [4, 10], "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}
-            ]
-        }
-    }
-}
diff --git a/keyboards/lucid/phantom_hs/keyboard.json b/keyboards/lucid/phantom_hs/keyboard.json
new file mode 100644
index 00000000000..ce331051670
--- /dev/null
+++ b/keyboards/lucid/phantom_hs/keyboard.json
@@ -0,0 +1,106 @@
+{
+    "keyboard_name": "Phantom",
+    "manufacturer": "Lucid",
+    "url": "http://www.lucidkb.com",
+    "maintainer": "Lucid",
+    "usb": {
+        "vid": "0x7667",
+        "pid": "0x0001",
+        "device_version": "0.0.1"
+    },
+    "matrix_pins": {
+        "cols": ["F0", "B1", "B2", "B3", "B7", "D0", "D1", "D2", "D3", "D5", "D7", "B4", "B5", "B6", "C6"],
+        "rows": ["F4", "F1", "F7", "F6", "F5"]
+    },
+    "diode_direction": "COL2ROW",
+    "indicators": {
+        "caps_lock": "C7"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "command": true,
+        "nkro": true
+    },
+    "community_layouts": ["65_ansi_blocker"],
+    "layouts": {
+        "LAYOUT_65_ansi_blocker": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 10], "x": 11.25, "y": 3},
+                {"matrix": [3, 11], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "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}
+            ]
+        }
+    }
+}
diff --git a/keyboards/lucid/phantom_hs/rules.mk b/keyboards/lucid/phantom_hs/rules.mk
index f117516ecce..3437a35bdf1 100644
--- a/keyboards/lucid/phantom_hs/rules.mk
+++ b/keyboards/lucid/phantom_hs/rules.mk
@@ -1,15 +1,2 @@
 # Processor frequency
 F_CPU = 8000000
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
diff --git a/keyboards/lucid/phantom_solder/info.json b/keyboards/lucid/phantom_solder/info.json
deleted file mode 100644
index 528068ebf01..00000000000
--- a/keyboards/lucid/phantom_solder/info.json
+++ /dev/null
@@ -1,725 +0,0 @@
-{
-    "keyboard_name": "Phantom Solder",
-    "manufacturer": "Lucid",
-    "url": "http://www.lucidkb.com",
-    "maintainer": "mrnoisytiger",
-    "usb": {
-        "vid": "0x7667",
-        "pid": "0x0002",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["F0", "B1", "B2", "B3", "B7", "D0", "D1", "D2", "D3", "D5", "D7", "B4", "B5", "B6", "C6"],
-        "rows": ["F4", "F1", "F7", "F6", "F5"]
-    },
-    "diode_direction": "COL2ROW",
-    "indicators": {
-        "caps_lock": "C7"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "community_layouts": [
-        "65_ansi_blocker",
-        "65_ansi_blocker_split_bs",
-        "65_ansi_blocker_tsangan",
-        "65_ansi_blocker_tsangan_split_bs",
-        "65_iso_blocker",
-        "65_iso_blocker_split_bs",
-        "65_iso_blocker_tsangan",
-        "65_iso_blocker_tsangan_split_bs"
-    ],
-    "layouts": {
-        "LAYOUT_all": {
-            "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": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
-                {"label": "Delete", "matrix": [2, 13], "x": 14, "y": 0},
-                {"label": "`", "matrix": [0, 14], "x": 15, "y": 0},
-
-                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
-                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
-                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
-                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
-                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
-                {"label": "Y", "matrix": [1, 6], "x": 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], "x": 13.5, "y": 1, "w": 1.5},
-                {"label": "Page Up", "matrix": [1, 14], "x": 15, "y": 1},
-
-                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
-                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
-                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
-                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
-                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
-                {"label": "H", "matrix": [2, 6], "x": 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, 12], "x": 12.75, "y": 2, "w": 2.25},
-                {"label": "Page Down", "matrix": [2, 14], "x": 15, "y": 2},
-
-                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
-                {"label": "Shift", "matrix": [3, 1], "x": 1.25, "y": 3},
-                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
-                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
-                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
-                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
-                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
-                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
-                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
-                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
-                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
-                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
-                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
-                {"label": "End", "matrix": [3, 14], "x": 15, "y": 3},
-
-                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"label": "Alt", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"label": "GUI", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"label": "Space", "matrix": [4, 3], "x": 3.75, "y": 4, "w": 2.25},
-                {"label": "Space", "matrix": [4, 6], "x": 6, "y": 4, "w": 1.25},
-                {"label": "Space", "matrix": [4, 8], "x": 7.25, "y": 4, "w": 2.75},
-                {"label": "Alt", "matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
-                {"label": "Fn", "matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
-
-                {"label": "\u2190", "matrix": [4, 12], "x": 13, "y": 4},
-                {"label": "\u2193", "matrix": [4, 13], "x": 14, "y": 4},
-                {"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4}
-            ]
-        },
-        "LAYOUT_65_ansi_blocker": {
-            "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": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-                {"label": "`", "matrix": [0, 14], "x": 15, "y": 0},
-
-                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
-                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
-                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
-                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
-                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
-                {"label": "Y", "matrix": [1, 6], "x": 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], "x": 13.5, "y": 1, "w": 1.5},
-                {"label": "Page Up", "matrix": [1, 14], "x": 15, "y": 1},
-
-                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
-                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
-                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
-                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
-                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
-                {"label": "H", "matrix": [2, 6], "x": 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, 12], "x": 12.75, "y": 2, "w": 2.25},
-                {"label": "Page Down", "matrix": [2, 14], "x": 15, "y": 2},
-
-                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
-                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
-                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
-                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
-                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
-                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
-                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
-                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
-                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
-                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
-                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
-                {"label": "End", "matrix": [3, 14], "x": 15, "y": 3},
-
-                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"label": "Alt", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"label": "GUI", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"label": "Space", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
-                {"label": "Alt", "matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
-                {"label": "Fn", "matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
-
-                {"label": "\u2190", "matrix": [4, 12], "x": 13, "y": 4},
-                {"label": "\u2193", "matrix": [4, 13], "x": 14, "y": 4},
-                {"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4}
-            ]
-        },
-        "LAYOUT_65_ansi_blocker_split_bs": {
-            "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": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
-                {"label": "Delete", "matrix": [2, 13], "x": 14, "y": 0},
-                {"label": "`", "matrix": [0, 14], "x": 15, "y": 0},
-
-                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
-                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
-                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
-                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
-                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
-                {"label": "Y", "matrix": [1, 6], "x": 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], "x": 13.5, "y": 1, "w": 1.5},
-                {"label": "Page Up", "matrix": [1, 14], "x": 15, "y": 1},
-
-                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
-                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
-                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
-                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
-                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
-                {"label": "H", "matrix": [2, 6], "x": 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, 12], "x": 12.75, "y": 2, "w": 2.25},
-                {"label": "Page Down", "matrix": [2, 14], "x": 15, "y": 2},
-
-                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
-                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
-                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
-                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
-                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
-                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
-                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
-                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
-                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
-                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
-                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
-                {"label": "End", "matrix": [3, 14], "x": 15, "y": 3},
-
-                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"label": "Alt", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"label": "GUI", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"label": "Space", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
-                {"label": "Alt", "matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
-                {"label": "Fn", "matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
-
-                {"label": "\u2190", "matrix": [4, 12], "x": 13, "y": 4},
-                {"label": "\u2193", "matrix": [4, 13], "x": 14, "y": 4},
-                {"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4}
-            ]
-        },
-        "LAYOUT_65_ansi_blocker_tsangan": {
-            "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": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-                {"label": "`", "matrix": [0, 14], "x": 15, "y": 0},
-
-                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
-                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
-                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
-                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
-                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
-                {"label": "Y", "matrix": [1, 6], "x": 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], "x": 13.5, "y": 1, "w": 1.5},
-                {"label": "Page Up", "matrix": [1, 14], "x": 15, "y": 1},
-
-                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
-                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
-                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
-                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
-                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
-                {"label": "H", "matrix": [2, 6], "x": 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, 12], "x": 12.75, "y": 2, "w": 2.25},
-                {"label": "Page Down", "matrix": [2, 14], "x": 15, "y": 2},
-
-                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
-                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
-                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
-                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
-                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
-                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
-                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
-                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
-                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
-                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
-                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
-                {"label": "End", "matrix": [3, 14], "x": 15, "y": 3},
-
-                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
-                {"label": "Alt", "matrix": [4, 1], "x": 1.5, "y": 4},
-                {"label": "GUI", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
-                {"label": "Space", "matrix": [4, 6], "x": 4, "y": 4, "w": 7},
-                {"label": "Fn", "matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
-
-                {"label": "\u2190", "matrix": [4, 12], "x": 13, "y": 4},
-                {"label": "\u2193", "matrix": [4, 13], "x": 14, "y": 4},
-                {"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4}
-            ]
-        },
-        "LAYOUT_65_ansi_blocker_tsangan_split_bs": {
-            "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": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
-                {"label": "Delete", "matrix": [2, 13], "x": 14, "y": 0},
-                {"label": "`", "matrix": [0, 14], "x": 15, "y": 0},
-
-                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
-                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
-                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
-                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
-                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
-                {"label": "Y", "matrix": [1, 6], "x": 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], "x": 13.5, "y": 1, "w": 1.5},
-                {"label": "Page Up", "matrix": [1, 14], "x": 15, "y": 1},
-
-                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
-                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
-                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
-                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
-                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
-                {"label": "H", "matrix": [2, 6], "x": 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, 12], "x": 12.75, "y": 2, "w": 2.25},
-                {"label": "Page Down", "matrix": [2, 14], "x": 15, "y": 2},
-
-                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
-                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
-                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
-                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
-                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
-                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
-                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
-                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
-                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
-                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
-                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
-                {"label": "End", "matrix": [3, 14], "x": 15, "y": 3},
-
-                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
-                {"label": "Alt", "matrix": [4, 1], "x": 1.5, "y": 4},
-                {"label": "GUI", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
-                {"label": "Space", "matrix": [4, 6], "x": 4, "y": 4, "w": 7},
-                {"label": "Fn", "matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
-
-                {"label": "\u2190", "matrix": [4, 12], "x": 13, "y": 4},
-                {"label": "\u2193", "matrix": [4, 13], "x": 14, "y": 4},
-                {"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4}
-            ]
-        },
-        "LAYOUT_65_iso_blocker": {
-            "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": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-                {"label": "`", "matrix": [0, 14], "x": 15, "y": 0},
-
-                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
-                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
-                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
-                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
-                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
-                {"label": "Y", "matrix": [1, 6], "x": 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": "Page Up", "matrix": [1, 14], "x": 15, "y": 1},
-
-                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
-                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
-                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
-                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
-                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
-                {"label": "H", "matrix": [2, 6], "x": 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": "#", "matrix": [2, 12], "x": 12.75, "y": 2},
-                {"label": "Enter", "matrix": [1, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
-                {"label": "Page Down", "matrix": [2, 14], "x": 15, "y": 2},
-
-                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
-                {"label": "\\", "matrix": [3, 1], "x": 1.25, "y": 3},
-                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
-                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
-                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
-                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
-                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
-                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
-                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
-                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
-                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
-                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
-                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
-                {"label": "End", "matrix": [3, 14], "x": 15, "y": 3},
-
-                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"label": "Alt", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"label": "GUI", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"label": "Space", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
-                {"label": "Alt", "matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
-                {"label": "Fn", "matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
-
-                {"label": "\u2190", "matrix": [4, 12], "x": 13, "y": 4},
-                {"label": "\u2193", "matrix": [4, 13], "x": 14, "y": 4},
-                {"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4}
-            ]
-        },
-        "LAYOUT_65_iso_blocker_split_bs": {
-            "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": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
-                {"label": "Delete", "matrix": [2, 13], "x": 14, "y": 0},
-                {"label": "`", "matrix": [0, 14], "x": 15, "y": 0},
-
-                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
-                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
-                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
-                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
-                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
-                {"label": "Y", "matrix": [1, 6], "x": 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": "Page Up", "matrix": [1, 14], "x": 15, "y": 1},
-
-                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
-                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
-                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
-                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
-                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
-                {"label": "H", "matrix": [2, 6], "x": 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": "#", "matrix": [2, 12], "x": 12.75, "y": 2},
-                {"label": "Enter", "matrix": [1, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
-                {"label": "Page Down", "matrix": [2, 14], "x": 15, "y": 2},
-
-                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
-                {"label": "\\", "matrix": [3, 1], "x": 1.25, "y": 3},
-                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
-                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
-                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
-                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
-                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
-                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
-                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
-                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
-                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
-                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
-                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
-                {"label": "End", "matrix": [3, 14], "x": 15, "y": 3},
-
-                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"label": "Alt", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"label": "GUI", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"label": "Space", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
-                {"label": "Alt", "matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
-                {"label": "Fn", "matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
-
-                {"label": "\u2190", "matrix": [4, 12], "x": 13, "y": 4},
-                {"label": "\u2193", "matrix": [4, 13], "x": 14, "y": 4},
-                {"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4}
-            ]
-        },
-        "LAYOUT_65_iso_blocker_tsangan": {
-            "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": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-                {"label": "`", "matrix": [0, 14], "x": 15, "y": 0},
-
-                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
-                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
-                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
-                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
-                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
-                {"label": "Y", "matrix": [1, 6], "x": 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": "Page Up", "matrix": [1, 14], "x": 15, "y": 1},
-
-                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
-                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
-                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
-                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
-                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
-                {"label": "H", "matrix": [2, 6], "x": 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": "#", "matrix": [2, 12], "x": 12.75, "y": 2},
-                {"label": "Enter", "matrix": [1, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
-                {"label": "Page Down", "matrix": [2, 14], "x": 15, "y": 2},
-
-                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
-                {"label": "\\", "matrix": [3, 1], "x": 1.25, "y": 3},
-                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
-                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
-                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
-                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
-                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
-                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
-                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
-                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
-                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
-                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
-                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
-                {"label": "End", "matrix": [3, 14], "x": 15, "y": 3},
-
-                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
-                {"label": "Alt", "matrix": [4, 1], "x": 1.5, "y": 4},
-                {"label": "GUI", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
-                {"label": "Space", "matrix": [4, 6], "x": 4, "y": 4, "w": 7},
-                {"label": "Fn", "matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
-
-                {"label": "\u2190", "matrix": [4, 12], "x": 13, "y": 4},
-                {"label": "\u2193", "matrix": [4, 13], "x": 14, "y": 4},
-                {"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4}
-            ]
-        },
-        "LAYOUT_65_iso_blocker_tsangan_split_bs": {
-            "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": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
-                {"label": "Delete", "matrix": [2, 13], "x": 14, "y": 0},
-                {"label": "`", "matrix": [0, 14], "x": 15, "y": 0},
-
-                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
-                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
-                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
-                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
-                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
-                {"label": "Y", "matrix": [1, 6], "x": 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": "Page Up", "matrix": [1, 14], "x": 15, "y": 1},
-
-                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
-                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
-                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
-                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
-                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
-                {"label": "H", "matrix": [2, 6], "x": 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": "#", "matrix": [2, 12], "x": 12.75, "y": 2},
-                {"label": "Enter", "matrix": [1, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
-                {"label": "Page Down", "matrix": [2, 14], "x": 15, "y": 2},
-
-                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
-                {"label": "\\", "matrix": [3, 1], "x": 1.25, "y": 3},
-                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
-                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
-                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
-                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
-                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
-                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
-                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
-                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
-                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
-                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
-                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
-                {"label": "End", "matrix": [3, 14], "x": 15, "y": 3},
-
-                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
-                {"label": "Alt", "matrix": [4, 1], "x": 1.5, "y": 4},
-                {"label": "GUI", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
-                {"label": "Space", "matrix": [4, 6], "x": 4, "y": 4, "w": 7},
-                {"label": "Fn", "matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
-
-                {"label": "\u2190", "matrix": [4, 12], "x": 13, "y": 4},
-                {"label": "\u2193", "matrix": [4, 13], "x": 14, "y": 4},
-                {"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/lucid/phantom_solder/keyboard.json b/keyboards/lucid/phantom_solder/keyboard.json
new file mode 100644
index 00000000000..53ba8eaeaa8
--- /dev/null
+++ b/keyboards/lucid/phantom_solder/keyboard.json
@@ -0,0 +1,732 @@
+{
+    "keyboard_name": "Phantom Solder",
+    "manufacturer": "Lucid",
+    "url": "http://www.lucidkb.com",
+    "maintainer": "mrnoisytiger",
+    "usb": {
+        "vid": "0x7667",
+        "pid": "0x0002",
+        "device_version": "0.0.1"
+    },
+    "matrix_pins": {
+        "cols": ["F0", "B1", "B2", "B3", "B7", "D0", "D1", "D2", "D3", "D5", "D7", "B4", "B5", "B6", "C6"],
+        "rows": ["F4", "F1", "F7", "F6", "F5"]
+    },
+    "diode_direction": "COL2ROW",
+    "indicators": {
+        "caps_lock": "C7"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "command": true,
+        "nkro": true
+    },
+    "community_layouts": [
+        "65_ansi_blocker",
+        "65_ansi_blocker_split_bs",
+        "65_ansi_blocker_tsangan",
+        "65_ansi_blocker_tsangan_split_bs",
+        "65_iso_blocker",
+        "65_iso_blocker_split_bs",
+        "65_iso_blocker_tsangan",
+        "65_iso_blocker_tsangan_split_bs"
+    ],
+    "layouts": {
+        "LAYOUT_all": {
+            "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": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "Delete", "matrix": [2, 13], "x": 14, "y": 0},
+                {"label": "`", "matrix": [0, 14], "x": 15, "y": 0},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 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], "x": 13.5, "y": 1, "w": 1.5},
+                {"label": "Page Up", "matrix": [1, 14], "x": 15, "y": 1},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 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, 12], "x": 12.75, "y": 2, "w": 2.25},
+                {"label": "Page Down", "matrix": [2, 14], "x": 15, "y": 2},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"label": "Shift", "matrix": [3, 1], "x": 1.25, "y": 3},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
+                {"label": "End", "matrix": [3, 14], "x": 15, "y": 3},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "Alt", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "GUI", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "Space", "matrix": [4, 3], "x": 3.75, "y": 4, "w": 2.25},
+                {"label": "Space", "matrix": [4, 6], "x": 6, "y": 4, "w": 1.25},
+                {"label": "Space", "matrix": [4, 8], "x": 7.25, "y": 4, "w": 2.75},
+                {"label": "Alt", "matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"label": "Fn", "matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+
+                {"label": "\u2190", "matrix": [4, 12], "x": 13, "y": 4},
+                {"label": "\u2193", "matrix": [4, 13], "x": 14, "y": 4},
+                {"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_65_ansi_blocker": {
+            "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": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"label": "`", "matrix": [0, 14], "x": 15, "y": 0},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 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], "x": 13.5, "y": 1, "w": 1.5},
+                {"label": "Page Up", "matrix": [1, 14], "x": 15, "y": 1},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 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, 12], "x": 12.75, "y": 2, "w": 2.25},
+                {"label": "Page Down", "matrix": [2, 14], "x": 15, "y": 2},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
+                {"label": "End", "matrix": [3, 14], "x": 15, "y": 3},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "Alt", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "GUI", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "Space", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "Alt", "matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"label": "Fn", "matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+
+                {"label": "\u2190", "matrix": [4, 12], "x": 13, "y": 4},
+                {"label": "\u2193", "matrix": [4, 13], "x": 14, "y": 4},
+                {"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_65_ansi_blocker_split_bs": {
+            "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": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "Delete", "matrix": [2, 13], "x": 14, "y": 0},
+                {"label": "`", "matrix": [0, 14], "x": 15, "y": 0},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 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], "x": 13.5, "y": 1, "w": 1.5},
+                {"label": "Page Up", "matrix": [1, 14], "x": 15, "y": 1},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 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, 12], "x": 12.75, "y": 2, "w": 2.25},
+                {"label": "Page Down", "matrix": [2, 14], "x": 15, "y": 2},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
+                {"label": "End", "matrix": [3, 14], "x": 15, "y": 3},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "Alt", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "GUI", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "Space", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "Alt", "matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"label": "Fn", "matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+
+                {"label": "\u2190", "matrix": [4, 12], "x": 13, "y": 4},
+                {"label": "\u2193", "matrix": [4, 13], "x": 14, "y": 4},
+                {"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_65_ansi_blocker_tsangan": {
+            "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": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"label": "`", "matrix": [0, 14], "x": 15, "y": 0},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 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], "x": 13.5, "y": 1, "w": 1.5},
+                {"label": "Page Up", "matrix": [1, 14], "x": 15, "y": 1},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 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, 12], "x": 12.75, "y": 2, "w": 2.25},
+                {"label": "Page Down", "matrix": [2, 14], "x": 15, "y": 2},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
+                {"label": "End", "matrix": [3, 14], "x": 15, "y": 3},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"label": "Alt", "matrix": [4, 1], "x": 1.5, "y": 4},
+                {"label": "GUI", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"label": "Space", "matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"label": "Fn", "matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
+
+                {"label": "\u2190", "matrix": [4, 12], "x": 13, "y": 4},
+                {"label": "\u2193", "matrix": [4, 13], "x": 14, "y": 4},
+                {"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_65_ansi_blocker_tsangan_split_bs": {
+            "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": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "Delete", "matrix": [2, 13], "x": 14, "y": 0},
+                {"label": "`", "matrix": [0, 14], "x": 15, "y": 0},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 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], "x": 13.5, "y": 1, "w": 1.5},
+                {"label": "Page Up", "matrix": [1, 14], "x": 15, "y": 1},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 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, 12], "x": 12.75, "y": 2, "w": 2.25},
+                {"label": "Page Down", "matrix": [2, 14], "x": 15, "y": 2},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
+                {"label": "End", "matrix": [3, 14], "x": 15, "y": 3},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"label": "Alt", "matrix": [4, 1], "x": 1.5, "y": 4},
+                {"label": "GUI", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"label": "Space", "matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"label": "Fn", "matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
+
+                {"label": "\u2190", "matrix": [4, 12], "x": 13, "y": 4},
+                {"label": "\u2193", "matrix": [4, 13], "x": 14, "y": 4},
+                {"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_65_iso_blocker": {
+            "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": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"label": "`", "matrix": [0, 14], "x": 15, "y": 0},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 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": "Page Up", "matrix": [1, 14], "x": 15, "y": 1},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 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": "#", "matrix": [2, 12], "x": 12.75, "y": 2},
+                {"label": "Enter", "matrix": [1, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"label": "Page Down", "matrix": [2, 14], "x": 15, "y": 2},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"label": "\\", "matrix": [3, 1], "x": 1.25, "y": 3},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
+                {"label": "End", "matrix": [3, 14], "x": 15, "y": 3},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "Alt", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "GUI", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "Space", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "Alt", "matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"label": "Fn", "matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+
+                {"label": "\u2190", "matrix": [4, 12], "x": 13, "y": 4},
+                {"label": "\u2193", "matrix": [4, 13], "x": 14, "y": 4},
+                {"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_65_iso_blocker_split_bs": {
+            "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": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "Delete", "matrix": [2, 13], "x": 14, "y": 0},
+                {"label": "`", "matrix": [0, 14], "x": 15, "y": 0},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 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": "Page Up", "matrix": [1, 14], "x": 15, "y": 1},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 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": "#", "matrix": [2, 12], "x": 12.75, "y": 2},
+                {"label": "Enter", "matrix": [1, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"label": "Page Down", "matrix": [2, 14], "x": 15, "y": 2},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"label": "\\", "matrix": [3, 1], "x": 1.25, "y": 3},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
+                {"label": "End", "matrix": [3, 14], "x": 15, "y": 3},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "Alt", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "GUI", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "Space", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "Alt", "matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"label": "Fn", "matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+
+                {"label": "\u2190", "matrix": [4, 12], "x": 13, "y": 4},
+                {"label": "\u2193", "matrix": [4, 13], "x": 14, "y": 4},
+                {"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_65_iso_blocker_tsangan": {
+            "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": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"label": "`", "matrix": [0, 14], "x": 15, "y": 0},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 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": "Page Up", "matrix": [1, 14], "x": 15, "y": 1},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 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": "#", "matrix": [2, 12], "x": 12.75, "y": 2},
+                {"label": "Enter", "matrix": [1, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"label": "Page Down", "matrix": [2, 14], "x": 15, "y": 2},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"label": "\\", "matrix": [3, 1], "x": 1.25, "y": 3},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
+                {"label": "End", "matrix": [3, 14], "x": 15, "y": 3},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"label": "Alt", "matrix": [4, 1], "x": 1.5, "y": 4},
+                {"label": "GUI", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"label": "Space", "matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"label": "Fn", "matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
+
+                {"label": "\u2190", "matrix": [4, 12], "x": 13, "y": 4},
+                {"label": "\u2193", "matrix": [4, 13], "x": 14, "y": 4},
+                {"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_65_iso_blocker_tsangan_split_bs": {
+            "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": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "Delete", "matrix": [2, 13], "x": 14, "y": 0},
+                {"label": "`", "matrix": [0, 14], "x": 15, "y": 0},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 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": "Page Up", "matrix": [1, 14], "x": 15, "y": 1},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 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": "#", "matrix": [2, 12], "x": 12.75, "y": 2},
+                {"label": "Enter", "matrix": [1, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"label": "Page Down", "matrix": [2, 14], "x": 15, "y": 2},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"label": "\\", "matrix": [3, 1], "x": 1.25, "y": 3},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
+                {"label": "End", "matrix": [3, 14], "x": 15, "y": 3},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"label": "Alt", "matrix": [4, 1], "x": 1.5, "y": 4},
+                {"label": "GUI", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"label": "Space", "matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"label": "Fn", "matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
+
+                {"label": "\u2190", "matrix": [4, 12], "x": 13, "y": 4},
+                {"label": "\u2193", "matrix": [4, 13], "x": 14, "y": 4},
+                {"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/lucid/phantom_solder/rules.mk b/keyboards/lucid/phantom_solder/rules.mk
index f117516ecce..3437a35bdf1 100644
--- a/keyboards/lucid/phantom_solder/rules.mk
+++ b/keyboards/lucid/phantom_solder/rules.mk
@@ -1,15 +1,2 @@
 # Processor frequency
 F_CPU = 8000000
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
diff --git a/keyboards/lucid/scarlet/info.json b/keyboards/lucid/scarlet/info.json
deleted file mode 100644
index 89cdd218060..00000000000
--- a/keyboards/lucid/scarlet/info.json
+++ /dev/null
@@ -1,124 +0,0 @@
-{
-    "keyboard_name": "Scarlet",
-    "manufacturer": "Lucid",
-    "url": "http://www.lucidkb.com",
-    "maintainer": "Lucid",
-    "usb": {
-        "vid": "0x7667",
-        "pid": "0x0004",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["F2", "F3", "F4", "F5", "F6", "F7", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "D5", "D6", "D7"],
-        "rows": ["B4", "B5", "B6", "C0", "E1", "E0"]
-    },
-    "diode_direction": "COL2ROW",
-    "processor": "at90usb646",
-    "bootloader": "atmel-dfu",
-    "layouts": {
-        "LAYOUT_tkl_all": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "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.5, "y": 0},
-                {"matrix": [0, 7], "x": 7.5, "y": 0},
-                {"matrix": [0, 8], "x": 8.5, "y": 0},
-                {"matrix": [0, 9], "x": 9.5, "y": 0},
-
-                {"matrix": [0, 10], "x": 11, "y": 0},
-                {"matrix": [0, 11], "x": 12, "y": 0},
-                {"matrix": [0, 12], "x": 13, "y": 0},
-                {"matrix": [0, 13], "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": [2, 13], "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, 1], "x": 2.25, "y": 4.25},
-                {"matrix": [4, 2], "x": 3.25, "y": 4.25},
-                {"matrix": [4, 3], "x": 4.25, "y": 4.25},
-                {"matrix": [4, 4], "x": 5.25, "y": 4.25},
-                {"matrix": [4, 5], "x": 6.25, "y": 4.25},
-                {"matrix": [4, 6], "x": 7.25, "y": 4.25},
-                {"matrix": [4, 7], "x": 8.25, "y": 4.25},
-                {"matrix": [4, 8], "x": 9.25, "y": 4.25},
-                {"matrix": [4, 9], "x": 10.25, "y": 4.25},
-                {"matrix": [4, 10], "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.25},
-                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 5], "x": 3.75, "y": 5.25, "w": 6.25},
-                {"matrix": [5, 9], "x": 10, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 10], "x": 11.25, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 11], "x": 12.5, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
-
-                {"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}
-            ]
-        }
-    }
-}
diff --git a/keyboards/lucid/scarlet/keyboard.json b/keyboards/lucid/scarlet/keyboard.json
new file mode 100644
index 00000000000..bcd56281c0d
--- /dev/null
+++ b/keyboards/lucid/scarlet/keyboard.json
@@ -0,0 +1,131 @@
+{
+    "keyboard_name": "Scarlet",
+    "manufacturer": "Lucid",
+    "url": "http://www.lucidkb.com",
+    "maintainer": "Lucid",
+    "usb": {
+        "vid": "0x7667",
+        "pid": "0x0004",
+        "device_version": "0.0.1"
+    },
+    "matrix_pins": {
+        "cols": ["F2", "F3", "F4", "F5", "F6", "F7", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "D5", "D6", "D7"],
+        "rows": ["B4", "B5", "B6", "C0", "E1", "E0"]
+    },
+    "diode_direction": "COL2ROW",
+    "processor": "at90usb646",
+    "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "command": true,
+        "nkro": true
+    },
+    "layouts": {
+        "LAYOUT_tkl_all": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "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.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 10], "x": 11, "y": 0},
+                {"matrix": [0, 11], "x": 12, "y": 0},
+                {"matrix": [0, 12], "x": 13, "y": 0},
+                {"matrix": [0, 13], "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": [2, 13], "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, 1], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 10], "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.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 5], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 9], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 10], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"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}
+            ]
+        }
+    }
+}
diff --git a/keyboards/lucid/scarlet/rules.mk b/keyboards/lucid/scarlet/rules.mk
index f117516ecce..3437a35bdf1 100644
--- a/keyboards/lucid/scarlet/rules.mk
+++ b/keyboards/lucid/scarlet/rules.mk
@@ -1,15 +1,2 @@
 # Processor frequency
 F_CPU = 8000000
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
diff --git a/keyboards/lucid/velvet_hotswap/info.json b/keyboards/lucid/velvet_hotswap/keyboard.json
similarity index 100%
rename from keyboards/lucid/velvet_hotswap/info.json
rename to keyboards/lucid/velvet_hotswap/keyboard.json
diff --git a/keyboards/lucid/velvet_solder/info.json b/keyboards/lucid/velvet_solder/keyboard.json
similarity index 100%
rename from keyboards/lucid/velvet_solder/info.json
rename to keyboards/lucid/velvet_solder/keyboard.json
diff --git a/keyboards/lxxt/info.json b/keyboards/lxxt/info.json
deleted file mode 100644
index 2fcc3c49211..00000000000
--- a/keyboards/lxxt/info.json
+++ /dev/null
@@ -1,136 +0,0 @@
-{
-    "keyboard_name": "LXXT",
-    "manufacturer": "DeskDaily",
-    "url": "",
-    "maintainer": "DeskDaily",
-    "usb": {
-        "vid": "0x5003",
-        "pid": "0x0001",
-        "device_version": "0.0.1"
-    },
-    "encoder": {
-        "rotary": [
-            {"pin_a": "GP27", "pin_b": "GP28"},
-            {"pin_a": "GP8", "pin_b": "GP9"}
-        ]
-    },
-    "processor": "RP2040",
-    "bootloader": "rp2040",
-    "matrix_pins": {
-        "rows": ["GP29", "GP26", "GP22", "GP24", "GP17"],
-        "cols": ["GP25", "GP23", "GP7", "GP0", "GP15", "GP14", "GP13", "GP12", "GP11", "GP10", "GP6", "GP5", "GP4", "GP3", "GP2", "GP1"]
-    },
-    "ws2812": {
-        "pin": "GP21",
-        "driver": "vendor"
-    },
-    "rgblight": {
-    "led_count": 16,
-    "hue_steps": 8,
-    "saturation_steps": 8,
-    "brightness_steps": 8,
-    "max_brightness": 255,
-    "sleep": true,
-    "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
-        }
-    },
-    "diode_direction": "COL2ROW",
-    "features": {
-        "bootmagic": true,
-        "mousekey": true,
-        "extrakey": true,
-        "console": false,
-        "command": false,
-        "nkro": true,
-        "rgblight": true
-    },
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1.25, "y": 0},
-                {"matrix": [0, 2], "x": 2.25, "y": 0},
-                {"matrix": [0, 3], "x": 3.25, "y": 0},
-                {"matrix": [0, 4], "x": 4.25, "y": 0},
-                {"matrix": [0, 5], "x": 5.25, "y": 0},
-                {"matrix": [0, 6], "x": 6.25, "y": 0},
-                {"matrix": [0, 7], "x": 7.25, "y": 0},
-                {"matrix": [0, 8], "x": 8.25, "y": 0},
-                {"matrix": [0, 9], "x": 9.25, "y": 0},
-                {"matrix": [0, 10], "x": 10.25, "y": 0},
-                {"matrix": [0, 11], "x": 11.25, "y": 0},
-                {"matrix": [0, 12], "x": 12.25, "y": 0},
-                {"matrix": [0, 13], "x": 13.25, "y": 0},
-                {"matrix": [0, 14], "x": 14.25, "y": 0},
-                {"matrix": [1, 14], "x": 15.25, "y": 0},
-                {"matrix": [0, 15], "x": 16.5, "y": 0},
-                {"matrix": [1, 0], "x": 0, "y": 1},
-                {"matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
-                {"matrix": [1, 2], "x": 2.75, "y": 1},
-                {"matrix": [1, 3], "x": 3.75, "y": 1},
-                {"matrix": [1, 4], "x": 4.75, "y": 1},
-                {"matrix": [1, 5], "x": 5.75, "y": 1},
-                {"matrix": [1, 6], "x": 6.75, "y": 1},
-                {"matrix": [1, 7], "x": 7.75, "y": 1},
-                {"matrix": [1, 8], "x": 8.75, "y": 1},
-                {"matrix": [1, 9], "x": 9.75, "y": 1},
-                {"matrix": [1, 10], "x": 10.75, "y": 1},
-                {"matrix": [1, 11], "x": 11.75, "y": 1},
-                {"matrix": [1, 12], "x": 12.75, "y": 1},
-                {"matrix": [1, 13], "x": 13.75, "y": 1},
-                {"matrix": [2, 14], "x": 14.75, "y": 1, "w": 1.5},
-                {"matrix": [1, 15], "x": 16.5, "y": 1},
-                {"matrix": [2, 0], "x": 0, "y": 2},
-                {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
-                {"matrix": [2, 2], "x": 3, "y": 2},
-                {"matrix": [2, 3], "x": 4, "y": 2},
-                {"matrix": [2, 4], "x": 5, "y": 2},
-                {"matrix": [2, 5], "x": 6, "y": 2},
-                {"matrix": [2, 6], "x": 7, "y": 2},
-                {"matrix": [2, 7], "x": 8, "y": 2},
-                {"matrix": [2, 8], "x": 9, "y": 2},
-                {"matrix": [2, 9], "x": 10, "y": 2},
-                {"matrix": [2, 10], "x": 11, "y": 2},
-                {"matrix": [2, 11], "x": 12, "y": 2},
-                {"matrix": [2, 12], "x": 13, "y": 2},
-                {"matrix": [2, 13], "x": 14, "y": 2, "w": 2.25},
-                {"matrix": [2, 15], "x": 16.5, "y": 2},
-                {"matrix": [3, 0], "x": 0, "y": 3},
-                {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
-                {"matrix": [3, 3], "x": 3.5, "y": 3},
-                {"matrix": [3, 4], "x": 4.5, "y": 3},
-                {"matrix": [3, 5], "x": 5.5, "y": 3},
-                {"matrix": [3, 6], "x": 6.5, "y": 3},
-                {"matrix": [3, 7], "x": 7.5, "y": 3},
-                {"matrix": [3, 8], "x": 8.5, "y": 3},
-                {"matrix": [3, 9], "x": 9.5, "y": 3},
-                {"matrix": [3, 10], "x": 10.5, "y": 3},
-                {"matrix": [3, 11], "x": 11.5, "y": 3},
-                {"matrix": [3, 12], "x": 12.5, "y": 3},
-                {"matrix": [3, 13], "x": 13.5, "y": 3, "w": 1.75},
-                {"matrix": [3, 14], "x": 15.25, "y": 3},
-                {"matrix": [3, 15], "x": 16.5, "y": 3},
-                {"matrix": [4, 0], "x": 0, "y": 4},
-                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 4], "x": 3.75, "y": 4, "w": 1.25},
-                {"matrix": [4, 8], "x": 5, "y": 4, "w": 6.25},
-                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25},
-                {"matrix": [4, 14], "x": 15, "y": 4, "w": 1.25},
-                {"matrix": [4, 15], "x": 16.5, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/lxxt/keyboard.json b/keyboards/lxxt/keyboard.json
new file mode 100644
index 00000000000..3a2700883d5
--- /dev/null
+++ b/keyboards/lxxt/keyboard.json
@@ -0,0 +1,137 @@
+{
+    "keyboard_name": "LXXT",
+    "manufacturer": "DeskDaily",
+    "url": "",
+    "maintainer": "DeskDaily",
+    "usb": {
+        "vid": "0x5003",
+        "pid": "0x0001",
+        "device_version": "0.0.1"
+    },
+    "encoder": {
+        "rotary": [
+            {"pin_a": "GP27", "pin_b": "GP28"},
+            {"pin_a": "GP8", "pin_b": "GP9"}
+        ]
+    },
+    "processor": "RP2040",
+    "bootloader": "rp2040",
+    "matrix_pins": {
+        "rows": ["GP29", "GP26", "GP22", "GP24", "GP17"],
+        "cols": ["GP25", "GP23", "GP7", "GP0", "GP15", "GP14", "GP13", "GP12", "GP11", "GP10", "GP6", "GP5", "GP4", "GP3", "GP2", "GP1"]
+    },
+    "ws2812": {
+        "pin": "GP21",
+        "driver": "vendor"
+    },
+    "rgblight": {
+    "led_count": 16,
+    "hue_steps": 8,
+    "saturation_steps": 8,
+    "brightness_steps": 8,
+    "max_brightness": 255,
+    "sleep": true,
+    "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
+        }
+    },
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "console": false,
+        "command": false,
+        "nkro": true,
+        "rgblight": true,
+        "encoder": true
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+                {"matrix": [0, 5], "x": 5.25, "y": 0},
+                {"matrix": [0, 6], "x": 6.25, "y": 0},
+                {"matrix": [0, 7], "x": 7.25, "y": 0},
+                {"matrix": [0, 8], "x": 8.25, "y": 0},
+                {"matrix": [0, 9], "x": 9.25, "y": 0},
+                {"matrix": [0, 10], "x": 10.25, "y": 0},
+                {"matrix": [0, 11], "x": 11.25, "y": 0},
+                {"matrix": [0, 12], "x": 12.25, "y": 0},
+                {"matrix": [0, 13], "x": 13.25, "y": 0},
+                {"matrix": [0, 14], "x": 14.25, "y": 0},
+                {"matrix": [1, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.5, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 2.75, "y": 1},
+                {"matrix": [1, 3], "x": 3.75, "y": 1},
+                {"matrix": [1, 4], "x": 4.75, "y": 1},
+                {"matrix": [1, 5], "x": 5.75, "y": 1},
+                {"matrix": [1, 6], "x": 6.75, "y": 1},
+                {"matrix": [1, 7], "x": 7.75, "y": 1},
+                {"matrix": [1, 8], "x": 8.75, "y": 1},
+                {"matrix": [1, 9], "x": 9.75, "y": 1},
+                {"matrix": [1, 10], "x": 10.75, "y": 1},
+                {"matrix": [1, 11], "x": 11.75, "y": 1},
+                {"matrix": [1, 12], "x": 12.75, "y": 1},
+                {"matrix": [1, 13], "x": 13.75, "y": 1},
+                {"matrix": [2, 14], "x": 14.75, "y": 1, "w": 1.5},
+                {"matrix": [1, 15], "x": 16.5, "y": 1},
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 3, "y": 2},
+                {"matrix": [2, 3], "x": 4, "y": 2},
+                {"matrix": [2, 4], "x": 5, "y": 2},
+                {"matrix": [2, 5], "x": 6, "y": 2},
+                {"matrix": [2, 6], "x": 7, "y": 2},
+                {"matrix": [2, 7], "x": 8, "y": 2},
+                {"matrix": [2, 8], "x": 9, "y": 2},
+                {"matrix": [2, 9], "x": 10, "y": 2},
+                {"matrix": [2, 10], "x": 11, "y": 2},
+                {"matrix": [2, 11], "x": 12, "y": 2},
+                {"matrix": [2, 12], "x": 13, "y": 2},
+                {"matrix": [2, 13], "x": 14, "y": 2, "w": 2.25},
+                {"matrix": [2, 15], "x": 16.5, "y": 2},
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
+                {"matrix": [3, 3], "x": 3.5, "y": 3},
+                {"matrix": [3, 4], "x": 4.5, "y": 3},
+                {"matrix": [3, 5], "x": 5.5, "y": 3},
+                {"matrix": [3, 6], "x": 6.5, "y": 3},
+                {"matrix": [3, 7], "x": 7.5, "y": 3},
+                {"matrix": [3, 8], "x": 8.5, "y": 3},
+                {"matrix": [3, 9], "x": 9.5, "y": 3},
+                {"matrix": [3, 10], "x": 10.5, "y": 3},
+                {"matrix": [3, 11], "x": 11.5, "y": 3},
+                {"matrix": [3, 12], "x": 12.5, "y": 3},
+                {"matrix": [3, 13], "x": 13.5, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 15.25, "y": 3},
+                {"matrix": [3, 15], "x": 16.5, "y": 3},
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 3.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 8], "x": 5, "y": 4, "w": 6.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 14], "x": 15, "y": 4, "w": 1.25},
+                {"matrix": [4, 15], "x": 16.5, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/lxxt/rules.mk b/keyboards/lxxt/rules.mk
deleted file mode 100644
index 5af1ba85367..00000000000
--- a/keyboards/lxxt/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-ENCODER_ENABLE = yes
diff --git a/keyboards/lyso1/lck75/info.json b/keyboards/lyso1/lck75/info.json
deleted file mode 100644
index aa2b1350bc4..00000000000
--- a/keyboards/lyso1/lck75/info.json
+++ /dev/null
@@ -1,742 +0,0 @@
-{
-    "keyboard_name": "LCK75",
-    "manufacturer": "Lyso1",
-    "url": "https://github.com/lyso1/LCK75",
-    "maintainer": "Lyso1",
-    "usb": {
-      "vid": "0x7856",
-      "pid": "0x6163",
-      "device_version": "0.0.2"
-    },
-    "matrix_pins": {
-      "cols": ["A0", "B0", "A1", "B1", "A2", "B2", "A3", "B3", "A4", "B4", "A5", "A6", "A7", "D7", "D6", "D5"],
-      "rows": ["C2", "C3", "C7", "C4", "C6", "C5"]
-    },
-    "diode_direction": "COL2ROW",
-    "encoder": {
-      "rotary": [
-        {"pin_a": "D1", "pin_b": "D0", "resolution": 2}
-      ]
-    },
-    "processor": "atmega32a",
-    "bootloader": "usbasploader",
-    "layouts": {
-        "LAYOUT_default": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-
-                {"matrix": [0, 1], "x": 1.25, "y": 0},
-                {"matrix": [0, 2], "x": 2.25, "y": 0},
-                {"matrix": [0, 3], "x": 3.25, "y": 0},
-                {"matrix": [0, 4], "x": 4.25, "y": 0},
-
-                {"matrix": [0, 5], "x": 5.5, "y": 0},
-                {"matrix": [0, 6], "x": 6.5, "y": 0},
-                {"matrix": [0, 7], "x": 7.5, "y": 0},
-                {"matrix": [0, 8], "x": 8.5, "y": 0},
-                {"matrix": [0, 9], "x": 9.75, "y": 0},
-
-                {"matrix": [0, 10], "x": 10.75, "y": 0},
-                {"matrix": [0, 11], "x": 11.75, "y": 0},
-                {"matrix": [0, 12], "x": 12.75, "y": 0},
-
-                {"matrix": [0, 14], "x": 14, "y": 0},
-
-                {"matrix": [0, 15], "x": 15.5, "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, 14], "x": 13, "y": 1.25, "w": 2},
-
-                {"matrix": [1, 15], "x": 15.5, "y": 1.25},
-
-                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
-                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
-                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
-                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
-                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
-                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
-                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
-                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
-                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
-                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
-                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
-                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
-                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
-                {"matrix": [2, 14], "x": 13.5, "y": 2.25, "w": 1.5},
-
-                {"matrix": [2, 15], "x": 15.5, "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, 14], "x": 12.75, "y": 3.25, "w": 2.25},
-
-                {"matrix": [3, 15], "x": 15.5, "y": 3.25},
-
-                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
-                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
-                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
-                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
-                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
-                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
-                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
-                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
-                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
-                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
-                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
-                {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
-
-                {"matrix": [4, 14], "x": 14.25, "y": 4.5},
-
-                {"matrix": [4, 15], "x": 15.5, "y": 4.25},
-
-                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
-                {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.5},
-                {"matrix": [5, 11], "x": 11.5, "y": 5.25, "w": 1.5},
-
-                {"matrix": [5, 12], "x": 13.25, "y": 5.5},
-                {"matrix": [5, 14], "x": 14.25, "y": 5.5},
-                {"matrix": [5, 15], "x": 15.25, "y": 5.5}
-            ]
-        },
-        "LAYOUT_7u": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-
-                {"matrix": [0, 1], "x": 1.25, "y": 0},
-                {"matrix": [0, 2], "x": 2.25, "y": 0},
-                {"matrix": [0, 3], "x": 3.25, "y": 0},
-                {"matrix": [0, 4], "x": 4.25, "y": 0},
-
-                {"matrix": [0, 5], "x": 5.5, "y": 0},
-                {"matrix": [0, 6], "x": 6.5, "y": 0},
-                {"matrix": [0, 7], "x": 7.5, "y": 0},
-                {"matrix": [0, 8], "x": 8.5, "y": 0},
-
-                {"matrix": [0, 9], "x": 9.75, "y": 0},
-                {"matrix": [0, 10], "x": 10.75, "y": 0},
-                {"matrix": [0, 11], "x": 11.75, "y": 0},
-                {"matrix": [0, 12], "x": 12.75, "y": 0},
-
-                {"matrix": [0, 14], "x": 14, "y": 0},
-
-                {"matrix": [0, 15], "x": 15.5, "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, 14], "x": 13, "y": 1.25, "w": 2},
-
-                {"matrix": [1, 15], "x": 15.5, "y": 1.25},
-
-                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
-                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
-                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
-                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
-                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
-                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
-                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
-                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
-                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
-                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
-                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
-                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
-                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
-                {"matrix": [2, 14], "x": 13.5, "y": 2.25, "w": 1.5},
-
-                {"matrix": [2, 15], "x": 15.5, "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, 14], "x": 12.75, "y": 3.25, "w": 2.25},
-
-                {"matrix": [3, 15], "x": 15.5, "y": 3.25},
-
-                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
-                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
-                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
-                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
-                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
-                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
-                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
-                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
-                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
-                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
-                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
-                {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
-
-                {"matrix": [4, 14], "x": 14.25, "y": 4.5},
-
-                {"matrix": [4, 15], "x": 15.5, "y": 4.25},
-
-                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
-                {"matrix": [5, 2], "x": 1.5, "y": 5.25, "w": 1.5},
-                {"matrix": [5, 6], "x": 3, "y": 5.25, "w": 7},
-                {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.5},
-                {"matrix": [5, 11], "x": 11.5, "y": 5.25, "w": 1.5},
-
-                {"matrix": [5, 12], "x": 13.25, "y": 5.5},
-                {"matrix": [5, 14], "x": 14.25, "y": 5.5},
-                {"matrix": [5, 15], "x": 15.25, "y": 5.5}
-            ]
-        },
-        "LAYOUT_7u_iso": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-
-                {"matrix": [0, 1], "x": 1.25, "y": 0},
-                {"matrix": [0, 2], "x": 2.25, "y": 0},
-                {"matrix": [0, 3], "x": 3.25, "y": 0},
-                {"matrix": [0, 4], "x": 4.25, "y": 0},
-
-                {"matrix": [0, 5], "x": 5.5, "y": 0},
-                {"matrix": [0, 6], "x": 6.5, "y": 0},
-                {"matrix": [0, 7], "x": 7.5, "y": 0},
-                {"matrix": [0, 8], "x": 8.5, "y": 0},
-
-                {"matrix": [0, 9], "x": 9.75, "y": 0},
-                {"matrix": [0, 10], "x": 10.75, "y": 0},
-                {"matrix": [0, 11], "x": 11.75, "y": 0},
-                {"matrix": [0, 12], "x": 12.75, "y": 0},
-
-                {"matrix": [0, 14], "x": 14, "y": 0},
-
-                {"matrix": [0, 15], "x": 15.5, "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, 14], "x": 13, "y": 1.25, "w": 2},
-
-                {"matrix": [1, 15], "x": 15.5, "y": 1.25},
-
-                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
-                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
-                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
-                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
-                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
-                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
-                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
-                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
-                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
-                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
-                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
-                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
-                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
-                {"matrix": [2, 15], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
-
-                {"matrix": [3, 0], "x": 15.5, "y": 2.25},
-
-                {"matrix": [3, 1], "x": 0, "y": 3.25, "w": 1.25},
-                {"matrix": [3, 2], "x": 1.75, "y": 3.25},
-                {"matrix": [3, 3], "x": 2.75, "y": 3.25},
-                {"matrix": [3, 4], "x": 3.75, "y": 3.25},
-                {"matrix": [3, 5], "x": 4.75, "y": 3.25},
-                {"matrix": [3, 6], "x": 5.75, "y": 3.25},
-                {"matrix": [3, 7], "x": 6.75, "y": 3.25},
-                {"matrix": [3, 8], "x": 7.75, "y": 3.25},
-                {"matrix": [3, 9], "x": 8.75, "y": 3.25},
-                {"matrix": [3, 10], "x": 9.75, "y": 3.25},
-                {"matrix": [3, 11], "x": 10.75, "y": 3.25},
-                {"matrix": [3, 12], "x": 11.75, "y": 3.25},
-                {"matrix": [3, 14], "x": 12.75, "y": 3.25},
-
-                {"matrix": [3, 15], "x": 15.5, "y": 3.25},
-
-                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4.25},
-                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
-                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
-                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
-                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
-                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
-                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
-                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
-                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
-                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
-                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
-                {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
-                {"matrix": [4, 14], "x": 15.5, "y": 4.25},
-
-                {"matrix": [4, 15], "x": 14.25, "y": 4.5},
-
-                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
-                {"matrix": [5, 2], "x": 1.5, "y": 5.25, "w": 1.5},
-                {"matrix": [5, 6], "x": 3, "y": 5.25, "w": 7},
-                {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.5},
-                {"matrix": [5, 11], "x": 11.5, "y": 5.25, "w": 1.5},
-
-                {"matrix": [5, 12], "x": 13.25, "y": 5.5},
-                {"matrix": [5, 14], "x": 14.25, "y": 5.5},
-                {"matrix": [5, 15], "x": 15.25, "y": 5.5}
-            ]
-        },
-        "LAYOUT_iso": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-
-                {"matrix": [0, 1], "x": 1.25, "y": 0},
-                {"matrix": [0, 2], "x": 2.25, "y": 0},
-                {"matrix": [0, 3], "x": 3.25, "y": 0},
-                {"matrix": [0, 4], "x": 4.25, "y": 0},
-
-                {"matrix": [0, 5], "x": 5.5, "y": 0},
-                {"matrix": [0, 6], "x": 6.5, "y": 0},
-                {"matrix": [0, 7], "x": 7.5, "y": 0},
-                {"matrix": [0, 8], "x": 8.5, "y": 0},
-
-                {"matrix": [0, 9], "x": 9.75, "y": 0},
-                {"matrix": [0, 10], "x": 10.75, "y": 0},
-                {"matrix": [0, 11], "x": 11.75, "y": 0},
-                {"matrix": [0, 12], "x": 12.75, "y": 0},
-
-                {"matrix": [0, 14], "x": 14, "y": 0},
-
-                {"matrix": [0, 15], "x": 15.5, "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, 14], "x": 13, "y": 1.25, "w": 2},
-
-                {"matrix": [1, 15], "x": 15.5, "y": 1.25},
-
-                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
-                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
-                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
-                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
-                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
-                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
-                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
-                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
-                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
-                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
-                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
-                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
-                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
-                {"matrix": [2, 15], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
-
-                {"matrix": [3, 0], "x": 15.5, "y": 2.25},
-
-                {"matrix": [3, 1], "x": 0, "y": 3.25, "w": 1.25},
-                {"matrix": [3, 2], "x": 1.75, "y": 3.25},
-                {"matrix": [3, 3], "x": 2.75, "y": 3.25},
-                {"matrix": [3, 4], "x": 3.75, "y": 3.25},
-                {"matrix": [3, 5], "x": 4.75, "y": 3.25},
-                {"matrix": [3, 6], "x": 5.75, "y": 3.25},
-                {"matrix": [3, 7], "x": 6.75, "y": 3.25},
-                {"matrix": [3, 8], "x": 7.75, "y": 3.25},
-                {"matrix": [3, 9], "x": 8.75, "y": 3.25},
-                {"matrix": [3, 10], "x": 9.75, "y": 3.25},
-                {"matrix": [3, 11], "x": 10.75, "y": 3.25},
-                {"matrix": [3, 12], "x": 11.75, "y": 3.25},
-                {"matrix": [3, 14], "x": 12.75, "y": 3.25},
-
-                {"matrix": [3, 15], "x": 15.5, "y": 3.25},
-
-                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4.25},
-                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
-                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
-                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
-                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
-                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
-                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
-                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
-                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
-                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
-                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
-                {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
-
-                {"matrix": [4, 14], "x": 15.5, "y": 4.25},
-
-                {"matrix": [4, 15], "x": 14.25, "y": 4.5},
-
-                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
-                {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.5},
-                {"matrix": [5, 11], "x": 11.5, "y": 5.25, "w": 1.5},
-
-                {"matrix": [5, 12], "x": 13.25, "y": 5.5},
-                {"matrix": [5, 14], "x": 14.25, "y": 5.5},
-                {"matrix": [5, 15], "x": 15.25, "y": 5.5}
-            ]
-        },
-        "LAYOUT_sbs": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-
-                {"matrix": [0, 1], "x": 1.25, "y": 0},
-                {"matrix": [0, 2], "x": 2.25, "y": 0},
-                {"matrix": [0, 3], "x": 3.25, "y": 0},
-                {"matrix": [0, 4], "x": 4.25, "y": 0},
-
-                {"matrix": [0, 5], "x": 5.5, "y": 0},
-                {"matrix": [0, 6], "x": 6.5, "y": 0},
-                {"matrix": [0, 7], "x": 7.5, "y": 0},
-                {"matrix": [0, 8], "x": 8.5, "y": 0},
-
-                {"matrix": [0, 9], "x": 9.75, "y": 0},
-                {"matrix": [0, 10], "x": 10.75, "y": 0},
-                {"matrix": [0, 11], "x": 11.75, "y": 0},
-                {"matrix": [0, 12], "x": 12.75, "y": 0},
-
-                {"matrix": [0, 14], "x": 14, "y": 0},
-
-                {"matrix": [0, 15], "x": 15.5, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1.25},
-                {"matrix": [1, 1], "x": 1, "y": 1.25},
-                {"matrix": [1, 2], "x": 2, "y": 1.25},
-                {"matrix": [1, 3], "x": 3, "y": 1.25},
-                {"matrix": [1, 4], "x": 4, "y": 1.25},
-                {"matrix": [1, 5], "x": 5, "y": 1.25},
-                {"matrix": [1, 6], "x": 6, "y": 1.25},
-                {"matrix": [1, 7], "x": 7, "y": 1.25},
-                {"matrix": [1, 8], "x": 8, "y": 1.25},
-                {"matrix": [1, 9], "x": 9, "y": 1.25},
-                {"matrix": [1, 10], "x": 10, "y": 1.25},
-                {"matrix": [1, 11], "x": 11, "y": 1.25},
-                {"matrix": [1, 12], "x": 12, "y": 1.25},
-                {"matrix": [1, 13], "x": 13, "y": 1.25},
-                {"matrix": [1, 14], "x": 14, "y": 1.25},
-
-                {"matrix": [1, 15], "x": 15.5, "y": 1.25},
-
-                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
-                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
-                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
-                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
-                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
-                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
-                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
-                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
-                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
-                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
-                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
-                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
-                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
-                {"matrix": [2, 14], "x": 13.5, "y": 2.25, "w": 1.5},
-
-                {"matrix": [2, 15], "x": 15.5, "y": 2.25},
-
-                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.25},
-                {"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, 14], "x": 12.75, "y": 3.25, "w": 2.25},
-
-                {"matrix": [3, 15], "x": 15.5, "y": 3.25},
-
-                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
-                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
-                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
-                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
-                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
-                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
-                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
-                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
-                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
-                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
-                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
-                {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
-
-                {"matrix": [4, 14], "x": 15.5, "y": 4.25},
-
-                {"matrix": [4, 15], "x": 14.25, "y": 4.5},
-
-                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
-                {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.5},
-                {"matrix": [5, 11], "x": 11.5, "y": 5.25, "w": 1.5},
-
-                {"matrix": [5, 12], "x": 13.25, "y": 5.5},
-                {"matrix": [5, 14], "x": 14.25, "y": 5.5},
-                {"matrix": [5, 15], "x": 15.25, "y": 5.5}
-            ]
-        },
-        "LAYOUT_7u_sbs": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-
-                {"matrix": [0, 1], "x": 1.25, "y": 0},
-                {"matrix": [0, 2], "x": 2.25, "y": 0},
-                {"matrix": [0, 3], "x": 3.25, "y": 0},
-                {"matrix": [0, 4], "x": 4.25, "y": 0},
-
-                {"matrix": [0, 5], "x": 5.5, "y": 0},
-                {"matrix": [0, 6], "x": 6.5, "y": 0},
-                {"matrix": [0, 7], "x": 7.5, "y": 0},
-                {"matrix": [0, 8], "x": 8.5, "y": 0},
-
-                {"matrix": [0, 9], "x": 9.75, "y": 0},
-                {"matrix": [0, 10], "x": 10.75, "y": 0},
-                {"matrix": [0, 11], "x": 11.75, "y": 0},
-                {"matrix": [0, 12], "x": 12.75, "y": 0},
-
-                {"matrix": [0, 14], "x": 14, "y": 0},
-
-                {"matrix": [0, 15], "x": 15.5, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1.25},
-                {"matrix": [1, 1], "x": 1, "y": 1.25},
-                {"matrix": [1, 2], "x": 2, "y": 1.25},
-                {"matrix": [1, 3], "x": 3, "y": 1.25},
-                {"matrix": [1, 4], "x": 4, "y": 1.25},
-                {"matrix": [1, 5], "x": 5, "y": 1.25},
-                {"matrix": [1, 6], "x": 6, "y": 1.25},
-                {"matrix": [1, 7], "x": 7, "y": 1.25},
-                {"matrix": [1, 8], "x": 8, "y": 1.25},
-                {"matrix": [1, 9], "x": 9, "y": 1.25},
-                {"matrix": [1, 10], "x": 10, "y": 1.25},
-                {"matrix": [1, 11], "x": 11, "y": 1.25},
-                {"matrix": [1, 12], "x": 12, "y": 1.25},
-                {"matrix": [1, 13], "x": 13, "y": 1.25},
-                {"matrix": [1, 14], "x": 14, "y": 1.25},
-
-                {"matrix": [1, 15], "x": 15.5, "y": 1.25},
-
-                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
-                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
-                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
-                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
-                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
-                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
-                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
-                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
-                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
-                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
-                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
-                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
-                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
-                {"matrix": [2, 14], "x": 13.5, "y": 2.25, "w": 1.5},
-
-                {"matrix": [2, 15], "x": 15.5, "y": 2.25},
-
-                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.25},
-                {"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, 14], "x": 12.75, "y": 3.25, "w": 2.25},
-
-                {"matrix": [3, 15], "x": 15.5, "y": 3.25},
-
-                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
-                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
-                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
-                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
-                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
-                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
-                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
-                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
-                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
-                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
-                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
-                {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
-
-                {"matrix": [4, 14], "x": 15.5, "y": 4.25},
-
-                {"matrix": [4, 15], "x": 14.25, "y": 4.5},
-
-                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
-                {"matrix": [5, 2], "x": 1.5, "y": 5.25, "w": 1.5},
-                {"matrix": [5, 6], "x": 3, "y": 5.25, "w": 7},
-                {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.5},
-                {"matrix": [5, 11], "x": 11.5, "y": 5.25, "w": 1.5},
-
-                {"matrix": [5, 12], "x": 13.25, "y": 5.5},
-                {"matrix": [5, 14], "x": 14.25, "y": 5.5},
-                {"matrix": [5, 15], "x": 15.25, "y": 5.5}
-            ]
-        },
-        "LAYOUT_iso_sbs": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-
-                {"matrix": [0, 1], "x": 1.25, "y": 0},
-                {"matrix": [0, 2], "x": 2.25, "y": 0},
-                {"matrix": [0, 3], "x": 3.25, "y": 0},
-                {"matrix": [0, 4], "x": 4.25, "y": 0},
-
-                {"matrix": [0, 5], "x": 5.5, "y": 0},
-                {"matrix": [0, 6], "x": 6.5, "y": 0},
-                {"matrix": [0, 7], "x": 7.5, "y": 0},
-                {"matrix": [0, 8], "x": 8.5, "y": 0},
-
-                {"matrix": [0, 9], "x": 9.75, "y": 0},
-                {"matrix": [0, 10], "x": 10.75, "y": 0},
-                {"matrix": [0, 11], "x": 11.75, "y": 0},
-                {"matrix": [0, 12], "x": 12.75, "y": 0},
-
-                {"matrix": [0, 14], "x": 14, "y": 0},
-
-                {"matrix": [0, 15], "x": 15.5, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1.25},
-                {"matrix": [1, 1], "x": 1, "y": 1.25},
-                {"matrix": [1, 2], "x": 2, "y": 1.25},
-                {"matrix": [1, 3], "x": 3, "y": 1.25},
-                {"matrix": [1, 4], "x": 4, "y": 1.25},
-                {"matrix": [1, 5], "x": 5, "y": 1.25},
-                {"matrix": [1, 6], "x": 6, "y": 1.25},
-                {"matrix": [1, 7], "x": 7, "y": 1.25},
-                {"matrix": [1, 8], "x": 8, "y": 1.25},
-                {"matrix": [1, 9], "x": 9, "y": 1.25},
-                {"matrix": [1, 10], "x": 10, "y": 1.25},
-                {"matrix": [1, 11], "x": 11, "y": 1.25},
-                {"matrix": [1, 12], "x": 12, "y": 1.25},
-                {"matrix": [1, 13], "x": 13, "y": 1.25},
-
-                {"matrix": [1, 14], "x": 14, "y": 1.25},
-
-                {"matrix": [1, 15], "x": 15.5, "y": 1.25},
-
-                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
-                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
-                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
-                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
-                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
-                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
-                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
-                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
-                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
-                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
-                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
-                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
-                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
-                {"matrix": [2, 15], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
-
-                {"matrix": [3, 0], "x": 15.5, "y": 2.25},
-
-                {"matrix": [3, 1], "x": 0, "y": 3.25, "w": 1.25},
-                {"matrix": [3, 2], "x": 1.75, "y": 3.25},
-                {"matrix": [3, 3], "x": 2.75, "y": 3.25},
-                {"matrix": [3, 4], "x": 3.75, "y": 3.25},
-                {"matrix": [3, 5], "x": 4.75, "y": 3.25},
-                {"matrix": [3, 6], "x": 5.75, "y": 3.25},
-                {"matrix": [3, 7], "x": 6.75, "y": 3.25},
-                {"matrix": [3, 8], "x": 7.75, "y": 3.25},
-                {"matrix": [3, 9], "x": 8.75, "y": 3.25},
-                {"matrix": [3, 10], "x": 9.75, "y": 3.25},
-                {"matrix": [3, 11], "x": 10.75, "y": 3.25},
-                {"matrix": [3, 12], "x": 11.75, "y": 3.25},
-                {"matrix": [3, 14], "x": 12.75, "y": 3.25},
-
-                {"matrix": [3, 15], "x": 15.5, "y": 3.25},
-
-                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4.25},
-                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
-                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
-                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
-                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
-                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
-                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
-                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
-                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
-                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
-                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
-                {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
-
-                {"matrix": [4, 14], "x": 15.5, "y": 4.25},
-
-                {"matrix": [4, 15], "x": 14.25, "y": 4.5},
-
-                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
-                {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.5},
-                {"matrix": [5, 11], "x": 11.5, "y": 5.25, "w": 1.5},
-
-                {"matrix": [5, 12], "x": 13.25, "y": 5.5},
-                {"matrix": [5, 14], "x": 14.25, "y": 5.5},
-                {"matrix": [5, 15], "x": 15.25, "y": 5.5}
-            ]
-        }
-    }
-}
diff --git a/keyboards/lyso1/lck75/keyboard.json b/keyboards/lyso1/lck75/keyboard.json
new file mode 100644
index 00000000000..a161172d490
--- /dev/null
+++ b/keyboards/lyso1/lck75/keyboard.json
@@ -0,0 +1,751 @@
+{
+    "keyboard_name": "LCK75",
+    "manufacturer": "Lyso1",
+    "url": "https://github.com/lyso1/LCK75",
+    "maintainer": "Lyso1",
+    "usb": {
+      "vid": "0x7856",
+      "pid": "0x6163",
+      "device_version": "0.0.2"
+    },
+    "matrix_pins": {
+      "cols": ["A0", "B0", "A1", "B1", "A2", "B2", "A3", "B3", "A4", "B4", "A5", "A6", "A7", "D7", "D6", "D5"],
+      "rows": ["C2", "C3", "C7", "C4", "C6", "C5"]
+    },
+    "diode_direction": "COL2ROW",
+    "encoder": {
+      "rotary": [
+        {"pin_a": "D1", "pin_b": "D0", "resolution": 2}
+      ]
+    },
+    "processor": "atmega32a",
+    "bootloader": "usbasploader",
+    "features": {
+        "bootmagic": true,
+        "mousekey": false,
+        "extrakey": true,
+        "unicode": true,
+        "oled": true,
+        "encoder": true,
+        "wpm": true
+    },
+    "layouts": {
+        "LAYOUT_default": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.75, "y": 0},
+
+                {"matrix": [0, 10], "x": 10.75, "y": 0},
+                {"matrix": [0, 11], "x": 11.75, "y": 0},
+                {"matrix": [0, 12], "x": 12.75, "y": 0},
+
+                {"matrix": [0, 14], "x": 14, "y": 0},
+
+                {"matrix": [0, 15], "x": 15.5, "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, 14], "x": 13, "y": 1.25, "w": 2},
+
+                {"matrix": [1, 15], "x": 15.5, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 14], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [2, 15], "x": 15.5, "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, 14], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"matrix": [3, 15], "x": 15.5, "y": 3.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+
+                {"matrix": [4, 14], "x": 14.25, "y": 4.5},
+
+                {"matrix": [4, 15], "x": 15.5, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 11], "x": 11.5, "y": 5.25, "w": 1.5},
+
+                {"matrix": [5, 12], "x": 13.25, "y": 5.5},
+                {"matrix": [5, 14], "x": 14.25, "y": 5.5},
+                {"matrix": [5, 15], "x": 15.25, "y": 5.5}
+            ]
+        },
+        "LAYOUT_7u": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 9.75, "y": 0},
+                {"matrix": [0, 10], "x": 10.75, "y": 0},
+                {"matrix": [0, 11], "x": 11.75, "y": 0},
+                {"matrix": [0, 12], "x": 12.75, "y": 0},
+
+                {"matrix": [0, 14], "x": 14, "y": 0},
+
+                {"matrix": [0, 15], "x": 15.5, "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, 14], "x": 13, "y": 1.25, "w": 2},
+
+                {"matrix": [1, 15], "x": 15.5, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 14], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [2, 15], "x": 15.5, "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, 14], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"matrix": [3, 15], "x": 15.5, "y": 3.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+
+                {"matrix": [4, 14], "x": 14.25, "y": 4.5},
+
+                {"matrix": [4, 15], "x": 15.5, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 2], "x": 1.5, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 6], "x": 3, "y": 5.25, "w": 7},
+                {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 11], "x": 11.5, "y": 5.25, "w": 1.5},
+
+                {"matrix": [5, 12], "x": 13.25, "y": 5.5},
+                {"matrix": [5, 14], "x": 14.25, "y": 5.5},
+                {"matrix": [5, 15], "x": 15.25, "y": 5.5}
+            ]
+        },
+        "LAYOUT_7u_iso": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 9.75, "y": 0},
+                {"matrix": [0, 10], "x": 10.75, "y": 0},
+                {"matrix": [0, 11], "x": 11.75, "y": 0},
+                {"matrix": [0, 12], "x": 12.75, "y": 0},
+
+                {"matrix": [0, 14], "x": 14, "y": 0},
+
+                {"matrix": [0, 15], "x": 15.5, "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, 14], "x": 13, "y": 1.25, "w": 2},
+
+                {"matrix": [1, 15], "x": 15.5, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 15], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+
+                {"matrix": [3, 0], "x": 15.5, "y": 2.25},
+
+                {"matrix": [3, 1], "x": 0, "y": 3.25, "w": 1.25},
+                {"matrix": [3, 2], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 12], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 14], "x": 12.75, "y": 3.25},
+
+                {"matrix": [3, 15], "x": 15.5, "y": 3.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"matrix": [4, 14], "x": 15.5, "y": 4.25},
+
+                {"matrix": [4, 15], "x": 14.25, "y": 4.5},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 2], "x": 1.5, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 6], "x": 3, "y": 5.25, "w": 7},
+                {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 11], "x": 11.5, "y": 5.25, "w": 1.5},
+
+                {"matrix": [5, 12], "x": 13.25, "y": 5.5},
+                {"matrix": [5, 14], "x": 14.25, "y": 5.5},
+                {"matrix": [5, 15], "x": 15.25, "y": 5.5}
+            ]
+        },
+        "LAYOUT_iso": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 9.75, "y": 0},
+                {"matrix": [0, 10], "x": 10.75, "y": 0},
+                {"matrix": [0, 11], "x": 11.75, "y": 0},
+                {"matrix": [0, 12], "x": 12.75, "y": 0},
+
+                {"matrix": [0, 14], "x": 14, "y": 0},
+
+                {"matrix": [0, 15], "x": 15.5, "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, 14], "x": 13, "y": 1.25, "w": 2},
+
+                {"matrix": [1, 15], "x": 15.5, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 15], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+
+                {"matrix": [3, 0], "x": 15.5, "y": 2.25},
+
+                {"matrix": [3, 1], "x": 0, "y": 3.25, "w": 1.25},
+                {"matrix": [3, 2], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 12], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 14], "x": 12.75, "y": 3.25},
+
+                {"matrix": [3, 15], "x": 15.5, "y": 3.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+
+                {"matrix": [4, 14], "x": 15.5, "y": 4.25},
+
+                {"matrix": [4, 15], "x": 14.25, "y": 4.5},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 11], "x": 11.5, "y": 5.25, "w": 1.5},
+
+                {"matrix": [5, 12], "x": 13.25, "y": 5.5},
+                {"matrix": [5, 14], "x": 14.25, "y": 5.5},
+                {"matrix": [5, 15], "x": 15.25, "y": 5.5}
+            ]
+        },
+        "LAYOUT_sbs": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 9.75, "y": 0},
+                {"matrix": [0, 10], "x": 10.75, "y": 0},
+                {"matrix": [0, 11], "x": 11.75, "y": 0},
+                {"matrix": [0, 12], "x": 12.75, "y": 0},
+
+                {"matrix": [0, 14], "x": 14, "y": 0},
+
+                {"matrix": [0, 15], "x": 15.5, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25},
+                {"matrix": [1, 14], "x": 14, "y": 1.25},
+
+                {"matrix": [1, 15], "x": 15.5, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 14], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [2, 15], "x": 15.5, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.25},
+                {"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, 14], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"matrix": [3, 15], "x": 15.5, "y": 3.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+
+                {"matrix": [4, 14], "x": 15.5, "y": 4.25},
+
+                {"matrix": [4, 15], "x": 14.25, "y": 4.5},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 11], "x": 11.5, "y": 5.25, "w": 1.5},
+
+                {"matrix": [5, 12], "x": 13.25, "y": 5.5},
+                {"matrix": [5, 14], "x": 14.25, "y": 5.5},
+                {"matrix": [5, 15], "x": 15.25, "y": 5.5}
+            ]
+        },
+        "LAYOUT_7u_sbs": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 9.75, "y": 0},
+                {"matrix": [0, 10], "x": 10.75, "y": 0},
+                {"matrix": [0, 11], "x": 11.75, "y": 0},
+                {"matrix": [0, 12], "x": 12.75, "y": 0},
+
+                {"matrix": [0, 14], "x": 14, "y": 0},
+
+                {"matrix": [0, 15], "x": 15.5, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25},
+                {"matrix": [1, 14], "x": 14, "y": 1.25},
+
+                {"matrix": [1, 15], "x": 15.5, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 14], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [2, 15], "x": 15.5, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.25},
+                {"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, 14], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"matrix": [3, 15], "x": 15.5, "y": 3.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+
+                {"matrix": [4, 14], "x": 15.5, "y": 4.25},
+
+                {"matrix": [4, 15], "x": 14.25, "y": 4.5},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 2], "x": 1.5, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 6], "x": 3, "y": 5.25, "w": 7},
+                {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 11], "x": 11.5, "y": 5.25, "w": 1.5},
+
+                {"matrix": [5, 12], "x": 13.25, "y": 5.5},
+                {"matrix": [5, 14], "x": 14.25, "y": 5.5},
+                {"matrix": [5, 15], "x": 15.25, "y": 5.5}
+            ]
+        },
+        "LAYOUT_iso_sbs": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 9.75, "y": 0},
+                {"matrix": [0, 10], "x": 10.75, "y": 0},
+                {"matrix": [0, 11], "x": 11.75, "y": 0},
+                {"matrix": [0, 12], "x": 12.75, "y": 0},
+
+                {"matrix": [0, 14], "x": 14, "y": 0},
+
+                {"matrix": [0, 15], "x": 15.5, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25},
+
+                {"matrix": [1, 14], "x": 14, "y": 1.25},
+
+                {"matrix": [1, 15], "x": 15.5, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 15], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+
+                {"matrix": [3, 0], "x": 15.5, "y": 2.25},
+
+                {"matrix": [3, 1], "x": 0, "y": 3.25, "w": 1.25},
+                {"matrix": [3, 2], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 12], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 14], "x": 12.75, "y": 3.25},
+
+                {"matrix": [3, 15], "x": 15.5, "y": 3.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+
+                {"matrix": [4, 14], "x": 15.5, "y": 4.25},
+
+                {"matrix": [4, 15], "x": 14.25, "y": 4.5},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 11], "x": 11.5, "y": 5.25, "w": 1.5},
+
+                {"matrix": [5, 12], "x": 13.25, "y": 5.5},
+                {"matrix": [5, 14], "x": 14.25, "y": 5.5},
+                {"matrix": [5, 15], "x": 15.25, "y": 5.5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/lyso1/lck75/rules.mk b/keyboards/lyso1/lck75/rules.mk
index 6f3aabc44fc..c2ee0bc86f9 100644
--- a/keyboards/lyso1/lck75/rules.mk
+++ b/keyboards/lyso1/lck75/rules.mk
@@ -1,21 +1,2 @@
 # Processor frequency
 F_CPU = 16000000
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no        # Console for debug
-COMMAND_ENABLE = no        # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-UNICODE_ENABLE = yes
-OLED_ENABLE = yes
-ENCODER_ENABLE = yes
-WPM_ENABLE = yes
-LTO_ENABLE = no
-AUTO_SHIFT_ENABLE = no
diff --git a/keyboards/lz/erghost/info.json b/keyboards/lz/erghost/info.json
deleted file mode 100644
index 68918a38f28..00000000000
--- a/keyboards/lz/erghost/info.json
+++ /dev/null
@@ -1,391 +0,0 @@
-{
-    "keyboard_name": "erGhost",
-    "manufacturer": "Mechlovin Studio",
-    "url": "",
-    "maintainer": "Mechlovin' Studio",
-    "usb": {
-        "vid": "0x6C7A",
-        "pid": "0x0002",
-        "device_version": "0.0.1"
-    },
-    "backlight": {
-        "pin": "B6",
-        "breathing": true
-    },
-    "rgblight": {
-        "saturation_steps": 8,
-        "brightness_steps": 8,
-        "led_count": 28,
-        "sleep": true,
-        "animations": {
-            "breathing": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "snake": true,
-            "knight": true,
-            "christmas": true,
-            "static_gradient": true,
-            "rgb_test": true,
-            "alternating": true,
-            "twinkle": true
-        }
-    },
-    "ws2812": {
-        "pin": "E2"
-    },
-    "indicators": {
-        "caps_lock": "D6",
-        "num_lock": "D7",
-        "scroll_lock": "B4"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "layouts": {
-        "LAYOUT_all": {
-            "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, "y": 0},
-
-                {"matrix": [0, 6], "x": 8.75, "y": 0},
-                {"matrix": [0, 7], "x": 9.75, "y": 0},
-                {"matrix": [0, 8], "x": 10.75, "y": 0},
-                {"matrix": [0, 9], "x": 11.75, "y": 0},
-                {"matrix": [0, 10], "x": 12.75, "y": 0},
-                {"matrix": [0, 11], "x": 13.75, "y": 0},
-                {"matrix": [0, 12], "x": 14.75, "y": 0},
-
-                {"matrix": [0, 14], "x": 17, "y": 0},
-                {"matrix": [0, 15], "x": 18, "y": 0},
-                {"matrix": [0, 16], "x": 19, "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": 8.75, "y": 1.25},
-                {"matrix": [1, 8], "x": 9.75, "y": 1.25},
-                {"matrix": [1, 9], "x": 10.75, "y": 1.25},
-                {"matrix": [1, 10], "x": 11.75, "y": 1.25},
-                {"matrix": [1, 11], "x": 12.75, "y": 1.25},
-                {"matrix": [1, 12], "x": 13.75, "y": 1.25},
-                {"matrix": [1, 13], "x": 14.75, "y": 1.25},
-                {"matrix": [0, 13], "x": 15.75, "y": 1.25},
-
-                {"matrix": [1, 14], "x": 17, "y": 1.25},
-                {"matrix": [1, 15], "x": 18, "y": 1.25},
-                {"matrix": [1, 16], "x": 19, "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": 8.25, "y": 2.25},
-                {"matrix": [2, 7], "x": 9.25, "y": 2.25},
-                {"matrix": [2, 8], "x": 10.25, "y": 2.25},
-                {"matrix": [2, 9], "x": 11.25, "y": 2.25},
-                {"matrix": [2, 10], "x": 12.25, "y": 2.25},
-                {"matrix": [2, 11], "x": 13.25, "y": 2.25},
-                {"matrix": [2, 12], "x": 14.25, "y": 2.25},
-                {"matrix": [2, 13], "x": 15.25, "y": 2.25, "w": 1.5},
-
-                {"matrix": [2, 14], "x": 17, "y": 2.25},
-                {"matrix": [2, 15], "x": 18, "y": 2.25},
-                {"matrix": [2, 16], "x": 19, "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": 8.5, "y": 3.25},
-                {"matrix": [3, 7], "x": 9.5, "y": 3.25},
-                {"matrix": [3, 8], "x": 10.5, "y": 3.25},
-                {"matrix": [3, 9], "x": 11.5, "y": 3.25},
-                {"matrix": [3, 10], "x": 12.5, "y": 3.25},
-                {"matrix": [3, 11], "x": 13.5, "y": 3.25},
-                {"matrix": [3, 12], "x": 14.5, "y": 3.25, "w": 1.25},
-                {"matrix": [3, 13], "x": 15.75, "y": 3.25},
-
-                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4.25},
-                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
-                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
-                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
-                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
-                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
-
-                {"matrix": [5, 7], "x": 8, "y": 4.25},
-                {"matrix": [4, 7], "x": 9, "y": 4.25},
-                {"matrix": [4, 8], "x": 10, "y": 4.25},
-                {"matrix": [4, 9], "x": 11, "y": 4.25},
-                {"matrix": [4, 10], "x": 12, "y": 4.25},
-                {"matrix": [4, 11], "x": 13, "y": 4.25},
-                {"matrix": [4, 12], "x": 14, "y": 4.25, "w": 1.75},
-                {"matrix": [4, 13], "x": 15.75, "y": 4.25},
-
-                {"matrix": [4, 15], "x": 18, "y": 4.25},
-
-                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 4], "x": 3.75, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 5], "x": 5, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 6], "x": 6.25, "y": 5.25},
-
-                {"matrix": [5, 8], "x": 8, "y": 5.25, "w": 1.75},
-                {"matrix": [5, 9], "x": 9.75, "y": 5.25},
-                {"matrix": [5, 10], "x": 10.75, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 11], "x": 12, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 12], "x": 13.25, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 13], "x": 14.5, "y": 5.25, "w": 1.25},
-
-                {"matrix": [5, 14], "x": 17, "y": 5.25},
-                {"matrix": [5, 15], "x": 18, "y": 5.25},
-                {"matrix": [5, 16], "x": 19, "y": 5.25}
-            ]
-        },
-        "LAYOUT_ansi": {
-            "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, "y": 0},
-
-                {"matrix": [0, 6], "x": 8.75, "y": 0},
-                {"matrix": [0, 7], "x": 9.75, "y": 0},
-                {"matrix": [0, 8], "x": 10.75, "y": 0},
-                {"matrix": [0, 9], "x": 11.75, "y": 0},
-                {"matrix": [0, 10], "x": 12.75, "y": 0},
-                {"matrix": [0, 11], "x": 13.75, "y": 0},
-                {"matrix": [0, 12], "x": 14.75, "y": 0},
-
-                {"matrix": [0, 14], "x": 17, "y": 0},
-                {"matrix": [0, 15], "x": 18, "y": 0},
-                {"matrix": [0, 16], "x": 19, "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": 8.75, "y": 1.25},
-                {"matrix": [1, 8], "x": 9.75, "y": 1.25},
-                {"matrix": [1, 9], "x": 10.75, "y": 1.25},
-                {"matrix": [1, 10], "x": 11.75, "y": 1.25},
-                {"matrix": [1, 11], "x": 12.75, "y": 1.25},
-                {"matrix": [1, 12], "x": 13.75, "y": 1.25},
-                {"matrix": [1, 13], "x": 14.75, "y": 1.25, "w": 2},
-
-                {"matrix": [1, 14], "x": 17, "y": 1.25},
-                {"matrix": [1, 15], "x": 18, "y": 1.25},
-                {"matrix": [1, 16], "x": 19, "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": 8.25, "y": 2.25},
-                {"matrix": [2, 7], "x": 9.25, "y": 2.25},
-                {"matrix": [2, 8], "x": 10.25, "y": 2.25},
-                {"matrix": [2, 9], "x": 11.25, "y": 2.25},
-                {"matrix": [2, 10], "x": 12.25, "y": 2.25},
-                {"matrix": [2, 11], "x": 13.25, "y": 2.25},
-                {"matrix": [2, 12], "x": 14.25, "y": 2.25},
-                {"matrix": [2, 13], "x": 15.25, "y": 2.25, "w": 1.5},
-
-                {"matrix": [2, 14], "x": 17, "y": 2.25},
-                {"matrix": [2, 15], "x": 18, "y": 2.25},
-                {"matrix": [2, 16], "x": 19, "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": 8.5, "y": 3.25},
-                {"matrix": [3, 7], "x": 9.5, "y": 3.25},
-                {"matrix": [3, 8], "x": 10.5, "y": 3.25},
-                {"matrix": [3, 9], "x": 11.5, "y": 3.25},
-                {"matrix": [3, 10], "x": 12.5, "y": 3.25},
-                {"matrix": [3, 11], "x": 13.5, "y": 3.25},
-                {"matrix": [3, 13], "x": 14.5, "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": [5, 7], "x": 8, "y": 4.25},
-                {"matrix": [4, 7], "x": 9, "y": 4.25},
-                {"matrix": [4, 8], "x": 10, "y": 4.25},
-                {"matrix": [4, 9], "x": 11, "y": 4.25},
-                {"matrix": [4, 10], "x": 12, "y": 4.25},
-                {"matrix": [4, 11], "x": 13, "y": 4.25},
-                {"matrix": [4, 12], "x": 14, "y": 4.25, "w": 2.75},
-
-                {"matrix": [4, 15], "x": 18, "y": 4.25},
-
-                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 4], "x": 3.75, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 5], "x": 5, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 6], "x": 6.25, "y": 5.25},
-
-                {"matrix": [5, 8], "x": 8, "y": 5.25, "w": 1.75},
-                {"matrix": [5, 9], "x": 9.75, "y": 5.25},
-                {"matrix": [5, 10], "x": 10.75, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 11], "x": 12, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 12], "x": 13.25, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 13], "x": 14.5, "y": 5.25, "w": 1.25},
-
-                {"matrix": [5, 14], "x": 17, "y": 5.25},
-                {"matrix": [5, 15], "x": 18, "y": 5.25},
-                {"matrix": [5, 16], "x": 19, "y": 5.25}
-            ]
-        },
-        "LAYOUT_iso": {
-            "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, "y": 0},
-
-                {"matrix": [0, 6], "x": 8.75, "y": 0},
-                {"matrix": [0, 7], "x": 9.75, "y": 0},
-                {"matrix": [0, 8], "x": 10.75, "y": 0},
-                {"matrix": [0, 9], "x": 11.75, "y": 0},
-                {"matrix": [0, 10], "x": 12.75, "y": 0},
-                {"matrix": [0, 11], "x": 13.75, "y": 0},
-                {"matrix": [0, 12], "x": 14.75, "y": 0},
-
-                {"matrix": [0, 14], "x": 17, "y": 0},
-                {"matrix": [0, 15], "x": 18, "y": 0},
-                {"matrix": [0, 16], "x": 19, "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": 8.75, "y": 1.25},
-                {"matrix": [1, 8], "x": 9.75, "y": 1.25},
-                {"matrix": [1, 9], "x": 10.75, "y": 1.25},
-                {"matrix": [1, 10], "x": 11.75, "y": 1.25},
-                {"matrix": [1, 11], "x": 12.75, "y": 1.25},
-                {"matrix": [1, 12], "x": 13.75, "y": 1.25},
-                {"matrix": [1, 13], "x": 14.75, "y": 1.25, "w": 2},
-
-                {"matrix": [1, 14], "x": 17, "y": 1.25},
-                {"matrix": [1, 15], "x": 18, "y": 1.25},
-                {"matrix": [1, 16], "x": 19, "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": 8.25, "y": 2.25},
-                {"matrix": [2, 7], "x": 9.25, "y": 2.25},
-                {"matrix": [2, 8], "x": 10.25, "y": 2.25},
-                {"matrix": [2, 9], "x": 11.25, "y": 2.25},
-                {"matrix": [2, 10], "x": 12.25, "y": 2.25},
-                {"matrix": [2, 11], "x": 13.25, "y": 2.25},
-                {"matrix": [2, 12], "x": 14.25, "y": 2.25},
-                {"matrix": [2, 14], "x": 15.5, "y": 2.25, "w": 1.25, "h": 2},
-
-                {"matrix": [2, 15], "x": 17, "y": 2.25},
-                {"matrix": [2, 16], "x": 18, "y": 2.25},
-                {"matrix": [3, 0], "x": 19, "y": 2.25},
-
-                {"matrix": [3, 1], "x": 0, "y": 3.25, "w": 1.75},
-                {"matrix": [3, 2], "x": 1.75, "y": 3.25},
-                {"matrix": [3, 3], "x": 2.75, "y": 3.25},
-                {"matrix": [3, 4], "x": 3.75, "y": 3.25},
-                {"matrix": [3, 5], "x": 4.75, "y": 3.25},
-                {"matrix": [3, 6], "x": 5.75, "y": 3.25},
-
-                {"matrix": [3, 7], "x": 8.5, "y": 3.25},
-                {"matrix": [3, 8], "x": 9.5, "y": 3.25},
-                {"matrix": [3, 9], "x": 10.5, "y": 3.25},
-                {"matrix": [3, 10], "x": 11.5, "y": 3.25},
-                {"matrix": [3, 11], "x": 12.5, "y": 3.25},
-                {"matrix": [3, 12], "x": 13.5, "y": 3.25},
-                {"matrix": [3, 13], "x": 14.5, "y": 3.25},
-
-                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4.25},
-                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
-                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
-                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
-                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
-                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
-
-                {"matrix": [5, 7], "x": 8, "y": 4.25},
-                {"matrix": [4, 7], "x": 9, "y": 4.25},
-                {"matrix": [4, 8], "x": 10, "y": 4.25},
-                {"matrix": [4, 9], "x": 11, "y": 4.25},
-                {"matrix": [4, 10], "x": 12, "y": 4.25},
-                {"matrix": [4, 11], "x": 13, "y": 4.25},
-                {"matrix": [4, 12], "x": 14, "y": 4.25, "w": 1.75},
-                {"matrix": [4, 13], "x": 15.75, "y": 4.25},
-
-                {"matrix": [4, 15], "x": 18, "y": 4.25},
-
-                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 4], "x": 3.75, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 5], "x": 5, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 6], "x": 6.25, "y": 5.25},
-
-                {"matrix": [5, 8], "x": 8, "y": 5.25, "w": 1.75},
-                {"matrix": [5, 9], "x": 9.75, "y": 5.25},
-                {"matrix": [5, 10], "x": 10.75, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 11], "x": 12, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 12], "x": 13.25, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 13], "x": 14.5, "y": 5.25, "w": 1.25},
-
-                {"matrix": [5, 14], "x": 17, "y": 5.25},
-                {"matrix": [5, 15], "x": 18, "y": 5.25},
-                {"matrix": [5, 16], "x": 19, "y": 5.25}
-            ]
-        }
-    }
-    ,"meta": "https://noroadsleft.github.io/kbf_qmk_converter/"
-}
diff --git a/keyboards/lz/erghost/keyboard.json b/keyboards/lz/erghost/keyboard.json
new file mode 100644
index 00000000000..ac5ce2edf26
--- /dev/null
+++ b/keyboards/lz/erghost/keyboard.json
@@ -0,0 +1,399 @@
+{
+    "keyboard_name": "erGhost",
+    "manufacturer": "Mechlovin Studio",
+    "url": "",
+    "maintainer": "Mechlovin' Studio",
+    "usb": {
+        "vid": "0x6C7A",
+        "pid": "0x0002",
+        "device_version": "0.0.1"
+    },
+    "backlight": {
+        "pin": "B6",
+        "breathing": true
+    },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 28,
+        "sleep": true,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": true,
+            "twinkle": true
+        }
+    },
+    "ws2812": {
+        "pin": "E2"
+    },
+    "indicators": {
+        "caps_lock": "D6",
+        "num_lock": "D7",
+        "scroll_lock": "B4"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "nkro": true,
+        "backlight": true,
+        "rgblight": true
+    },
+    "layouts": {
+        "LAYOUT_all": {
+            "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, "y": 0},
+
+                {"matrix": [0, 6], "x": 8.75, "y": 0},
+                {"matrix": [0, 7], "x": 9.75, "y": 0},
+                {"matrix": [0, 8], "x": 10.75, "y": 0},
+                {"matrix": [0, 9], "x": 11.75, "y": 0},
+                {"matrix": [0, 10], "x": 12.75, "y": 0},
+                {"matrix": [0, 11], "x": 13.75, "y": 0},
+                {"matrix": [0, 12], "x": 14.75, "y": 0},
+
+                {"matrix": [0, 14], "x": 17, "y": 0},
+                {"matrix": [0, 15], "x": 18, "y": 0},
+                {"matrix": [0, 16], "x": 19, "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": 8.75, "y": 1.25},
+                {"matrix": [1, 8], "x": 9.75, "y": 1.25},
+                {"matrix": [1, 9], "x": 10.75, "y": 1.25},
+                {"matrix": [1, 10], "x": 11.75, "y": 1.25},
+                {"matrix": [1, 11], "x": 12.75, "y": 1.25},
+                {"matrix": [1, 12], "x": 13.75, "y": 1.25},
+                {"matrix": [1, 13], "x": 14.75, "y": 1.25},
+                {"matrix": [0, 13], "x": 15.75, "y": 1.25},
+
+                {"matrix": [1, 14], "x": 17, "y": 1.25},
+                {"matrix": [1, 15], "x": 18, "y": 1.25},
+                {"matrix": [1, 16], "x": 19, "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": 8.25, "y": 2.25},
+                {"matrix": [2, 7], "x": 9.25, "y": 2.25},
+                {"matrix": [2, 8], "x": 10.25, "y": 2.25},
+                {"matrix": [2, 9], "x": 11.25, "y": 2.25},
+                {"matrix": [2, 10], "x": 12.25, "y": 2.25},
+                {"matrix": [2, 11], "x": 13.25, "y": 2.25},
+                {"matrix": [2, 12], "x": 14.25, "y": 2.25},
+                {"matrix": [2, 13], "x": 15.25, "y": 2.25, "w": 1.5},
+
+                {"matrix": [2, 14], "x": 17, "y": 2.25},
+                {"matrix": [2, 15], "x": 18, "y": 2.25},
+                {"matrix": [2, 16], "x": 19, "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": 8.5, "y": 3.25},
+                {"matrix": [3, 7], "x": 9.5, "y": 3.25},
+                {"matrix": [3, 8], "x": 10.5, "y": 3.25},
+                {"matrix": [3, 9], "x": 11.5, "y": 3.25},
+                {"matrix": [3, 10], "x": 12.5, "y": 3.25},
+                {"matrix": [3, 11], "x": 13.5, "y": 3.25},
+                {"matrix": [3, 12], "x": 14.5, "y": 3.25, "w": 1.25},
+                {"matrix": [3, 13], "x": 15.75, "y": 3.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+
+                {"matrix": [5, 7], "x": 8, "y": 4.25},
+                {"matrix": [4, 7], "x": 9, "y": 4.25},
+                {"matrix": [4, 8], "x": 10, "y": 4.25},
+                {"matrix": [4, 9], "x": 11, "y": 4.25},
+                {"matrix": [4, 10], "x": 12, "y": 4.25},
+                {"matrix": [4, 11], "x": 13, "y": 4.25},
+                {"matrix": [4, 12], "x": 14, "y": 4.25, "w": 1.75},
+                {"matrix": [4, 13], "x": 15.75, "y": 4.25},
+
+                {"matrix": [4, 15], "x": 18, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 4], "x": 3.75, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 5], "x": 5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 6.25, "y": 5.25},
+
+                {"matrix": [5, 8], "x": 8, "y": 5.25, "w": 1.75},
+                {"matrix": [5, 9], "x": 9.75, "y": 5.25},
+                {"matrix": [5, 10], "x": 10.75, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "x": 12, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 12], "x": 13.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 13], "x": 14.5, "y": 5.25, "w": 1.25},
+
+                {"matrix": [5, 14], "x": 17, "y": 5.25},
+                {"matrix": [5, 15], "x": 18, "y": 5.25},
+                {"matrix": [5, 16], "x": 19, "y": 5.25}
+            ]
+        },
+        "LAYOUT_ansi": {
+            "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, "y": 0},
+
+                {"matrix": [0, 6], "x": 8.75, "y": 0},
+                {"matrix": [0, 7], "x": 9.75, "y": 0},
+                {"matrix": [0, 8], "x": 10.75, "y": 0},
+                {"matrix": [0, 9], "x": 11.75, "y": 0},
+                {"matrix": [0, 10], "x": 12.75, "y": 0},
+                {"matrix": [0, 11], "x": 13.75, "y": 0},
+                {"matrix": [0, 12], "x": 14.75, "y": 0},
+
+                {"matrix": [0, 14], "x": 17, "y": 0},
+                {"matrix": [0, 15], "x": 18, "y": 0},
+                {"matrix": [0, 16], "x": 19, "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": 8.75, "y": 1.25},
+                {"matrix": [1, 8], "x": 9.75, "y": 1.25},
+                {"matrix": [1, 9], "x": 10.75, "y": 1.25},
+                {"matrix": [1, 10], "x": 11.75, "y": 1.25},
+                {"matrix": [1, 11], "x": 12.75, "y": 1.25},
+                {"matrix": [1, 12], "x": 13.75, "y": 1.25},
+                {"matrix": [1, 13], "x": 14.75, "y": 1.25, "w": 2},
+
+                {"matrix": [1, 14], "x": 17, "y": 1.25},
+                {"matrix": [1, 15], "x": 18, "y": 1.25},
+                {"matrix": [1, 16], "x": 19, "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": 8.25, "y": 2.25},
+                {"matrix": [2, 7], "x": 9.25, "y": 2.25},
+                {"matrix": [2, 8], "x": 10.25, "y": 2.25},
+                {"matrix": [2, 9], "x": 11.25, "y": 2.25},
+                {"matrix": [2, 10], "x": 12.25, "y": 2.25},
+                {"matrix": [2, 11], "x": 13.25, "y": 2.25},
+                {"matrix": [2, 12], "x": 14.25, "y": 2.25},
+                {"matrix": [2, 13], "x": 15.25, "y": 2.25, "w": 1.5},
+
+                {"matrix": [2, 14], "x": 17, "y": 2.25},
+                {"matrix": [2, 15], "x": 18, "y": 2.25},
+                {"matrix": [2, 16], "x": 19, "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": 8.5, "y": 3.25},
+                {"matrix": [3, 7], "x": 9.5, "y": 3.25},
+                {"matrix": [3, 8], "x": 10.5, "y": 3.25},
+                {"matrix": [3, 9], "x": 11.5, "y": 3.25},
+                {"matrix": [3, 10], "x": 12.5, "y": 3.25},
+                {"matrix": [3, 11], "x": 13.5, "y": 3.25},
+                {"matrix": [3, 13], "x": 14.5, "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": [5, 7], "x": 8, "y": 4.25},
+                {"matrix": [4, 7], "x": 9, "y": 4.25},
+                {"matrix": [4, 8], "x": 10, "y": 4.25},
+                {"matrix": [4, 9], "x": 11, "y": 4.25},
+                {"matrix": [4, 10], "x": 12, "y": 4.25},
+                {"matrix": [4, 11], "x": 13, "y": 4.25},
+                {"matrix": [4, 12], "x": 14, "y": 4.25, "w": 2.75},
+
+                {"matrix": [4, 15], "x": 18, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 4], "x": 3.75, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 5], "x": 5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 6.25, "y": 5.25},
+
+                {"matrix": [5, 8], "x": 8, "y": 5.25, "w": 1.75},
+                {"matrix": [5, 9], "x": 9.75, "y": 5.25},
+                {"matrix": [5, 10], "x": 10.75, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "x": 12, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 12], "x": 13.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 13], "x": 14.5, "y": 5.25, "w": 1.25},
+
+                {"matrix": [5, 14], "x": 17, "y": 5.25},
+                {"matrix": [5, 15], "x": 18, "y": 5.25},
+                {"matrix": [5, 16], "x": 19, "y": 5.25}
+            ]
+        },
+        "LAYOUT_iso": {
+            "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, "y": 0},
+
+                {"matrix": [0, 6], "x": 8.75, "y": 0},
+                {"matrix": [0, 7], "x": 9.75, "y": 0},
+                {"matrix": [0, 8], "x": 10.75, "y": 0},
+                {"matrix": [0, 9], "x": 11.75, "y": 0},
+                {"matrix": [0, 10], "x": 12.75, "y": 0},
+                {"matrix": [0, 11], "x": 13.75, "y": 0},
+                {"matrix": [0, 12], "x": 14.75, "y": 0},
+
+                {"matrix": [0, 14], "x": 17, "y": 0},
+                {"matrix": [0, 15], "x": 18, "y": 0},
+                {"matrix": [0, 16], "x": 19, "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": 8.75, "y": 1.25},
+                {"matrix": [1, 8], "x": 9.75, "y": 1.25},
+                {"matrix": [1, 9], "x": 10.75, "y": 1.25},
+                {"matrix": [1, 10], "x": 11.75, "y": 1.25},
+                {"matrix": [1, 11], "x": 12.75, "y": 1.25},
+                {"matrix": [1, 12], "x": 13.75, "y": 1.25},
+                {"matrix": [1, 13], "x": 14.75, "y": 1.25, "w": 2},
+
+                {"matrix": [1, 14], "x": 17, "y": 1.25},
+                {"matrix": [1, 15], "x": 18, "y": 1.25},
+                {"matrix": [1, 16], "x": 19, "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": 8.25, "y": 2.25},
+                {"matrix": [2, 7], "x": 9.25, "y": 2.25},
+                {"matrix": [2, 8], "x": 10.25, "y": 2.25},
+                {"matrix": [2, 9], "x": 11.25, "y": 2.25},
+                {"matrix": [2, 10], "x": 12.25, "y": 2.25},
+                {"matrix": [2, 11], "x": 13.25, "y": 2.25},
+                {"matrix": [2, 12], "x": 14.25, "y": 2.25},
+                {"matrix": [2, 14], "x": 15.5, "y": 2.25, "w": 1.25, "h": 2},
+
+                {"matrix": [2, 15], "x": 17, "y": 2.25},
+                {"matrix": [2, 16], "x": 18, "y": 2.25},
+                {"matrix": [3, 0], "x": 19, "y": 2.25},
+
+                {"matrix": [3, 1], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 2], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 5.75, "y": 3.25},
+
+                {"matrix": [3, 7], "x": 8.5, "y": 3.25},
+                {"matrix": [3, 8], "x": 9.5, "y": 3.25},
+                {"matrix": [3, 9], "x": 10.5, "y": 3.25},
+                {"matrix": [3, 10], "x": 11.5, "y": 3.25},
+                {"matrix": [3, 11], "x": 12.5, "y": 3.25},
+                {"matrix": [3, 12], "x": 13.5, "y": 3.25},
+                {"matrix": [3, 13], "x": 14.5, "y": 3.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+
+                {"matrix": [5, 7], "x": 8, "y": 4.25},
+                {"matrix": [4, 7], "x": 9, "y": 4.25},
+                {"matrix": [4, 8], "x": 10, "y": 4.25},
+                {"matrix": [4, 9], "x": 11, "y": 4.25},
+                {"matrix": [4, 10], "x": 12, "y": 4.25},
+                {"matrix": [4, 11], "x": 13, "y": 4.25},
+                {"matrix": [4, 12], "x": 14, "y": 4.25, "w": 1.75},
+                {"matrix": [4, 13], "x": 15.75, "y": 4.25},
+
+                {"matrix": [4, 15], "x": 18, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 4], "x": 3.75, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 5], "x": 5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 6.25, "y": 5.25},
+
+                {"matrix": [5, 8], "x": 8, "y": 5.25, "w": 1.75},
+                {"matrix": [5, 9], "x": 9.75, "y": 5.25},
+                {"matrix": [5, 10], "x": 10.75, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "x": 12, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 12], "x": 13.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 13], "x": 14.5, "y": 5.25, "w": 1.25},
+
+                {"matrix": [5, 14], "x": 17, "y": 5.25},
+                {"matrix": [5, 15], "x": 18, "y": 5.25},
+                {"matrix": [5, 16], "x": 19, "y": 5.25}
+            ]
+        }
+    }
+    ,"meta": "https://noroadsleft.github.io/kbf_qmk_converter/"
+}
diff --git a/keyboards/lz/erghost/rules.mk b/keyboards/lz/erghost/rules.mk
index 03ea2f1bda0..179d02c3c68 100644
--- a/keyboards/lz/erghost/rules.mk
+++ b/keyboards/lz/erghost/rules.mk
@@ -1,15 +1,3 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
 CUSTOM_MATRIX = lite
 
 SRC += matrix.c
diff --git a/keyboards/malevolti/lyra/rev1/info.json b/keyboards/malevolti/lyra/rev1/info.json
deleted file mode 100644
index 6bbf3477dc0..00000000000
--- a/keyboards/malevolti/lyra/rev1/info.json
+++ /dev/null
@@ -1,110 +0,0 @@
-{
-    "keyboard_name": "Lyra",
-    "manufacturer": "Dom",
-    "url": "",
-    "maintainer": "malevolti",
-    "usb": {
-        "vid": "0x4443",
-        "pid": "0x4C43",
-        "device_version": "30.3.1"
-    },
-    "matrix_pins": {
-        "cols": ["B2", "B3", "B1", "F7", "F6", "F5", "F4"],
-        "rows": ["D4", "C6", "D7", "E6", "B4"]
-    },
-    "diode_direction": "COL2ROW",
-    "split": {
-        "enabled": true,
-        "soft_serial_pin": "D2"
-    },
-    "tapping": {
-        "term": 100
-    },
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0.3},
-                {"matrix": [0, 1], "x": 1, "y": 0.4},
-                {"matrix": [0, 2], "x": 2, "y": 0.3},
-                {"matrix": [0, 3], "x": 3, "y": 0.1},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0.1},
-                {"matrix": [0, 6], "x": 6, "y": 0.25},
-
-                {"matrix": [5, 6], "x": 8, "y": 0.25},
-                {"matrix": [5, 5], "x": 9, "y": 0.1},
-                {"matrix": [5, 4], "x": 10, "y": 0},
-                {"matrix": [5, 3], "x": 11, "y": 0.1},
-                {"matrix": [5, 2], "x": 12, "y": 0.3},
-                {"matrix": [5, 1], "x": 13, "y": 0.4},
-                {"matrix": [5, 0], "x": 14, "y": 0.3},
-
-                {"matrix": [1, 0], "x": 0, "y": 1.3},
-                {"matrix": [1, 1], "x": 1, "y": 1.4},
-                {"matrix": [1, 2], "x": 2, "y": 1.3},
-                {"matrix": [1, 3], "x": 3, "y": 1.1},
-                {"matrix": [1, 4], "x": 4, "y": 1},
-                {"matrix": [1, 5], "x": 5, "y": 1.1},
-                {"matrix": [1, 6], "x": 6, "y": 1.25},
-
-                {"matrix": [6, 6], "x": 8, "y": 1.25},
-                {"matrix": [6, 5], "x": 9, "y": 1.1},
-                {"matrix": [6, 4], "x": 10, "y": 1},
-                {"matrix": [6, 3], "x": 11, "y": 1.1},
-                {"matrix": [6, 2], "x": 12, "y": 1.3},
-                {"matrix": [6, 1], "x": 13, "y": 1.4},
-                {"matrix": [6, 0], "x": 14, "y": 1.3},
-
-                {"matrix": [2, 0], "x": 0, "y": 2.3},
-                {"matrix": [2, 1], "x": 1, "y": 2.4},
-                {"matrix": [2, 2], "x": 2, "y": 2.3},
-                {"matrix": [2, 3], "x": 3, "y": 2.1},
-                {"matrix": [2, 4], "x": 4, "y": 2},
-                {"matrix": [2, 5], "x": 5, "y": 2.1},
-                {"matrix": [2, 6], "x": 6, "y": 2.25},
-
-                {"matrix": [7, 6], "x": 8, "y": 2.25},
-                {"matrix": [7, 5], "x": 9, "y": 2.1},
-                {"matrix": [7, 4], "x": 10, "y": 2},
-                {"matrix": [7, 3], "x": 11, "y": 2.1},
-                {"matrix": [7, 2], "x": 12, "y": 2.3},
-                {"matrix": [7, 1], "x": 13, "y": 2.4},
-                {"matrix": [7, 0], "x": 14, "y": 2.3},
-
-                {"matrix": [3, 0], "x": 0, "y": 3.3},
-                {"matrix": [3, 1], "x": 1, "y": 3.4},
-                {"matrix": [3, 2], "x": 2, "y": 3.3},
-                {"matrix": [3, 3], "x": 3, "y": 3.1},
-                {"matrix": [3, 4], "x": 4, "y": 3},
-                {"matrix": [3, 5], "x": 5, "y": 3.1},
-                {"matrix": [3, 6], "x": 6, "y": 3.25},
-
-                {"matrix": [8, 6], "x": 8, "y": 3.25},
-                {"matrix": [8, 5], "x": 9, "y": 3.1},
-                {"matrix": [8, 4], "x": 10, "y": 3},
-                {"matrix": [8, 3], "x": 11, "y": 3.1},
-                {"matrix": [8, 2], "x": 12, "y": 3.3},
-                {"matrix": [8, 1], "x": 13, "y": 3.4},
-                {"matrix": [8, 0], "x": 14, "y": 3.3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4.3},
-                {"matrix": [4, 1], "x": 1, "y": 4.4},
-                {"matrix": [4, 2], "x": 2, "y": 4.3},
-                {"matrix": [4, 3], "x": 3, "y": 4.1},
-                {"matrix": [4, 4], "x": 4, "y": 4},
-                {"matrix": [4, 5], "x": 5, "y": 4.1},
-                {"matrix": [4, 6], "x": 6.25, "y": 4.5},
-
-                {"matrix": [9, 6], "x": 7.75, "y": 4.5},
-                {"matrix": [9, 5], "x": 9, "y": 4.1},
-                {"matrix": [9, 4], "x": 10, "y": 4},
-                {"matrix": [9, 3], "x": 11, "y": 4.1},
-                {"matrix": [9, 2], "x": 12, "y": 4.3},
-                {"matrix": [9, 1], "x": 13, "y": 4.4},
-                {"matrix": [9, 0], "x": 14, "y": 4.3}
-            ]
-        }
-    }
-}
diff --git a/keyboards/malevolti/lyra/rev1/keyboard.json b/keyboards/malevolti/lyra/rev1/keyboard.json
new file mode 100644
index 00000000000..4c88b71692f
--- /dev/null
+++ b/keyboards/malevolti/lyra/rev1/keyboard.json
@@ -0,0 +1,118 @@
+{
+    "keyboard_name": "Lyra",
+    "manufacturer": "Dom",
+    "url": "",
+    "maintainer": "malevolti",
+    "usb": {
+        "vid": "0x4443",
+        "pid": "0x4C43",
+        "device_version": "30.3.1"
+    },
+    "matrix_pins": {
+        "cols": ["B2", "B3", "B1", "F7", "F6", "F5", "F4"],
+        "rows": ["D4", "C6", "D7", "E6", "B4"]
+    },
+    "diode_direction": "COL2ROW",
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "D2"
+    },
+    "tapping": {
+        "term": 100
+    },
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true
+    },
+    "build": {
+        "lto": true
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0.3},
+                {"matrix": [0, 1], "x": 1, "y": 0.4},
+                {"matrix": [0, 2], "x": 2, "y": 0.3},
+                {"matrix": [0, 3], "x": 3, "y": 0.1},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0.1},
+                {"matrix": [0, 6], "x": 6, "y": 0.25},
+
+                {"matrix": [5, 6], "x": 8, "y": 0.25},
+                {"matrix": [5, 5], "x": 9, "y": 0.1},
+                {"matrix": [5, 4], "x": 10, "y": 0},
+                {"matrix": [5, 3], "x": 11, "y": 0.1},
+                {"matrix": [5, 2], "x": 12, "y": 0.3},
+                {"matrix": [5, 1], "x": 13, "y": 0.4},
+                {"matrix": [5, 0], "x": 14, "y": 0.3},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.3},
+                {"matrix": [1, 1], "x": 1, "y": 1.4},
+                {"matrix": [1, 2], "x": 2, "y": 1.3},
+                {"matrix": [1, 3], "x": 3, "y": 1.1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1.1},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+
+                {"matrix": [6, 6], "x": 8, "y": 1.25},
+                {"matrix": [6, 5], "x": 9, "y": 1.1},
+                {"matrix": [6, 4], "x": 10, "y": 1},
+                {"matrix": [6, 3], "x": 11, "y": 1.1},
+                {"matrix": [6, 2], "x": 12, "y": 1.3},
+                {"matrix": [6, 1], "x": 13, "y": 1.4},
+                {"matrix": [6, 0], "x": 14, "y": 1.3},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.3},
+                {"matrix": [2, 1], "x": 1, "y": 2.4},
+                {"matrix": [2, 2], "x": 2, "y": 2.3},
+                {"matrix": [2, 3], "x": 3, "y": 2.1},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2.1},
+                {"matrix": [2, 6], "x": 6, "y": 2.25},
+
+                {"matrix": [7, 6], "x": 8, "y": 2.25},
+                {"matrix": [7, 5], "x": 9, "y": 2.1},
+                {"matrix": [7, 4], "x": 10, "y": 2},
+                {"matrix": [7, 3], "x": 11, "y": 2.1},
+                {"matrix": [7, 2], "x": 12, "y": 2.3},
+                {"matrix": [7, 1], "x": 13, "y": 2.4},
+                {"matrix": [7, 0], "x": 14, "y": 2.3},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.3},
+                {"matrix": [3, 1], "x": 1, "y": 3.4},
+                {"matrix": [3, 2], "x": 2, "y": 3.3},
+                {"matrix": [3, 3], "x": 3, "y": 3.1},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3.1},
+                {"matrix": [3, 6], "x": 6, "y": 3.25},
+
+                {"matrix": [8, 6], "x": 8, "y": 3.25},
+                {"matrix": [8, 5], "x": 9, "y": 3.1},
+                {"matrix": [8, 4], "x": 10, "y": 3},
+                {"matrix": [8, 3], "x": 11, "y": 3.1},
+                {"matrix": [8, 2], "x": 12, "y": 3.3},
+                {"matrix": [8, 1], "x": 13, "y": 3.4},
+                {"matrix": [8, 0], "x": 14, "y": 3.3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.3},
+                {"matrix": [4, 1], "x": 1, "y": 4.4},
+                {"matrix": [4, 2], "x": 2, "y": 4.3},
+                {"matrix": [4, 3], "x": 3, "y": 4.1},
+                {"matrix": [4, 4], "x": 4, "y": 4},
+                {"matrix": [4, 5], "x": 5, "y": 4.1},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.5},
+
+                {"matrix": [9, 6], "x": 7.75, "y": 4.5},
+                {"matrix": [9, 5], "x": 9, "y": 4.1},
+                {"matrix": [9, 4], "x": 10, "y": 4},
+                {"matrix": [9, 3], "x": 11, "y": 4.1},
+                {"matrix": [9, 2], "x": 12, "y": 4.3},
+                {"matrix": [9, 1], "x": 13, "y": 4.4},
+                {"matrix": [9, 0], "x": 14, "y": 4.3}
+            ]
+        }
+    }
+}
diff --git a/keyboards/malevolti/lyra/rev1/rules.mk b/keyboards/malevolti/lyra/rev1/rules.mk
deleted file mode 100644
index c2c363d51c3..00000000000
--- a/keyboards/malevolti/lyra/rev1/rules.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
-LTO_ENABLE = yes
diff --git a/keyboards/maple_computing/christmas_tree/info.json b/keyboards/maple_computing/christmas_tree/info.json
deleted file mode 100644
index ced352ccaa1..00000000000
--- a/keyboards/maple_computing/christmas_tree/info.json
+++ /dev/null
@@ -1,44 +0,0 @@
-{
-  "keyboard_name": "Christmas Tree",
-  "manufacturer": "Maple Computing",
-  "url": "https://www.reddit.com/r/MechanicalKeyboards/comments/7cqxpf/gb_christmas_tree_pcb_gb_now_live/",
-  "maintainer": "That-Canadian",
-  "usb": {
-    "vid": "0xFEED",
-    "pid": "0x3070"
-  },
-  "features": {
-    "backlight": true,
-    "bootmagic": false,
-    "command": false,
-    "console": true,
-    "extrakey": true,
-    "mousekey": false,
-    "nkro": false
-  },
-  "matrix_pins": {
-    "cols": ["D1"],
-    "rows": ["D3", "F4", "D0", "F6", "F5", "D4"]
-  },
-  "diode_direction": "COL2ROW",
-  "backlight": {
-    "driver": "timer",
-    "pin": "D2"
-  },
-  "processor": "atmega32u4",
-  "bootloader": "caterina",
-  "layouts": {
-    "LAYOUT": {
-      "layout": [
-        {"matrix": [0, 0], "x": 1, "y": 0},
-
-        {"matrix": [1, 0], "x": 0.5, "y": 1},
-        {"matrix": [2, 0], "x": 1.5, "y": 1},
-
-        {"matrix": [3, 0], "x": 0, "y": 2},
-        {"matrix": [4, 0], "x": 1, "y": 2},
-        {"matrix": [5, 0], "x": 2, "y": 2}
-      ]
-    }
-  }
-}
diff --git a/keyboards/maple_computing/christmas_tree/v2017/info.json b/keyboards/maple_computing/christmas_tree/v2017/info.json
deleted file mode 100644
index 6d00c2519fb..00000000000
--- a/keyboards/maple_computing/christmas_tree/v2017/info.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "usb": {
-        "device_version": "20.1.7"
-    }
-}
diff --git a/keyboards/maple_computing/christmas_tree/v2017/keyboard.json b/keyboards/maple_computing/christmas_tree/v2017/keyboard.json
new file mode 100644
index 00000000000..dd54b78f5d4
--- /dev/null
+++ b/keyboards/maple_computing/christmas_tree/v2017/keyboard.json
@@ -0,0 +1,45 @@
+{
+    "keyboard_name": "Christmas Tree",
+    "manufacturer": "Maple Computing",
+    "url": "https://www.reddit.com/r/MechanicalKeyboards/comments/7cqxpf/gb_christmas_tree_pcb_gb_now_live/",
+    "maintainer": "That-Canadian",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0x3070",
+        "device_version": "20.1.7"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
+    "features": {
+        "backlight": true,
+        "bootmagic": false,
+        "command": false,
+        "console": true,
+        "extrakey": true,
+        "mousekey": false,
+        "nkro": false
+    },
+    "matrix_pins": {
+        "cols": ["D1"],
+        "rows": ["D3", "F4", "D0", "F6", "F5", "D4"]
+    },
+    "diode_direction": "COL2ROW",
+    "backlight": {
+        "driver": "timer",
+        "pin": "D2"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [ 0, 0 ], "x": 1, "y": 0},
+
+                {"matrix": [ 1, 0 ], "x": 0.5, "y": 1},
+                {"matrix": [ 2, 0 ], "x": 1.5, "y": 1},
+
+                {"matrix": [ 3, 0 ], "x": 0, "y": 2},
+                {"matrix": [ 4, 0 ], "x": 1, "y": 2},
+                {"matrix": [ 5, 0 ], "x": 2, "y": 2}
+            ]
+        }
+    }
+}
diff --git a/keyboards/maple_computing/christmas_tree/v2017/rules.mk b/keyboards/maple_computing/christmas_tree/v2017/rules.mk
deleted file mode 100644
index 184a1f2247e..00000000000
--- a/keyboards/maple_computing/christmas_tree/v2017/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight.
-AUDIO_ENABLE = no           # Audio output
\ No newline at end of file
diff --git a/keyboards/maple_computing/ivy/rev1/keyboard.json b/keyboards/maple_computing/ivy/rev1/keyboard.json
index de89abee75c..a4c5cdcce3e 100644
--- a/keyboards/maple_computing/ivy/rev1/keyboard.json
+++ b/keyboards/maple_computing/ivy/rev1/keyboard.json
@@ -19,6 +19,12 @@
     },
     "processor": "atmega32u4",
     "bootloader": "caterina",
+    "features": {
+        "bootmagic": false,
+        "mousekey": false,
+        "extrakey": true,
+        "backlight": true
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/maple_computing/ivy/rules.mk b/keyboards/maple_computing/ivy/rules.mk
index 49af313aeb8..2665d44abd7 100644
--- a/keyboards/maple_computing/ivy/rules.mk
+++ b/keyboards/maple_computing/ivy/rules.mk
@@ -1,14 +1 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
-AUDIO_ENABLE = no           # Audio output
-RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight.
-
 DEFAULT_FOLDER = maple_computing/ivy/rev1
diff --git a/keyboards/maple_computing/jnao/config.h b/keyboards/maple_computing/jnao/config.h
deleted file mode 100644
index c2949ab3a7a..00000000000
--- a/keyboards/maple_computing/jnao/config.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
-Copyright 2012 Jun Wako <wakojun@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
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
diff --git a/keyboards/maple_computing/jnao/info.json b/keyboards/maple_computing/jnao/info.json
deleted file mode 100644
index 73ddf107ecb..00000000000
--- a/keyboards/maple_computing/jnao/info.json
+++ /dev/null
@@ -1,148 +0,0 @@
-{
-  "keyboard_name": "JNAO",
-  "manufacturer": "Maple Computing",
-  "url": "",
-  "maintainer": "That-Canadian",
-  "usb": {
-    "vid": "0x1337",
-    "pid": "0x6017",
-    "device_version": "0.0.1"
-  },
-  "matrix_pins": {
-    "cols": ["F1", "F4", "B1", "B2", "B3", "B7", "D1", "D2", "D4", "D6", "D7", "B4"],
-    "rows": ["E6", "F0", "F5", "F6", "F7"]
-  },
-  "diode_direction": "COL2ROW",
-  "backlight": {
-    "driver": "timer",
-    "pin": "D0"
-  },
-  "processor": "atmega32u4",
-  "bootloader": "atmel-dfu",
-  "community_layouts": ["ortho_5x12", "ortho_4x12"],
-  "layouts": {
-    "LAYOUT_ortho_5x12": {
-      "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": [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": [1, 4], "x": 4, "y": 1},
-        {"matrix": [1, 5], "x": 5, "y": 1},
-        {"matrix": [1, 6], "x": 6, "y": 1},
-        {"matrix": [1, 7], "x": 7, "y": 1},
-        {"matrix": [1, 8], "x": 8, "y": 1},
-        {"matrix": [1, 9], "x": 9, "y": 1},
-        {"matrix": [1, 10], "x": 10, "y": 1},
-        {"matrix": [1, 11], "x": 11, "y": 1},
-
-        {"matrix": [2, 0], "x": 0, "y": 2},
-        {"matrix": [2, 1], "x": 1, "y": 2},
-        {"matrix": [2, 2], "x": 2, "y": 2},
-        {"matrix": [2, 3], "x": 3, "y": 2},
-        {"matrix": [2, 4], "x": 4, "y": 2},
-        {"matrix": [2, 5], "x": 5, "y": 2},
-        {"matrix": [2, 6], "x": 6, "y": 2},
-        {"matrix": [2, 7], "x": 7, "y": 2},
-        {"matrix": [2, 8], "x": 8, "y": 2},
-        {"matrix": [2, 9], "x": 9, "y": 2},
-        {"matrix": [2, 10], "x": 10, "y": 2},
-        {"matrix": [2, 11], "x": 11, "y": 2},
-
-        {"matrix": [3, 0], "x": 0, "y": 3},
-        {"matrix": [3, 1], "x": 1, "y": 3},
-        {"matrix": [3, 2], "x": 2, "y": 3},
-        {"matrix": [3, 3], "x": 3, "y": 3},
-        {"matrix": [3, 4], "x": 4, "y": 3},
-        {"matrix": [3, 5], "x": 5, "y": 3},
-        {"matrix": [3, 6], "x": 6, "y": 3},
-        {"matrix": [3, 7], "x": 7, "y": 3},
-        {"matrix": [3, 8], "x": 8, "y": 3},
-        {"matrix": [3, 9], "x": 9, "y": 3},
-        {"matrix": [3, 10], "x": 10, "y": 3},
-        {"matrix": [3, 11], "x": 11, "y": 3},
-
-        {"matrix": [4, 0], "x": 0, "y": 4},
-        {"matrix": [4, 1], "x": 1, "y": 4},
-        {"matrix": [4, 2], "x": 2, "y": 4},
-        {"matrix": [4, 3], "x": 3, "y": 4},
-        {"matrix": [4, 4], "x": 4, "y": 4},
-        {"matrix": [4, 5], "x": 5, "y": 4},
-        {"matrix": [4, 6], "x": 6, "y": 4},
-        {"matrix": [4, 7], "x": 7, "y": 4},
-        {"matrix": [4, 8], "x": 8, "y": 4},
-        {"matrix": [4, 9], "x": 9, "y": 4},
-        {"matrix": [4, 10], "x": 10, "y": 4},
-        {"matrix": [4, 11], "x": 11, "y": 4}
-      ]
-    },
-    "LAYOUT_ortho_4x12": {
-      "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": [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": [1, 4], "x": 4, "y": 1},
-        {"matrix": [1, 5], "x": 5, "y": 1},
-        {"matrix": [1, 6], "x": 6, "y": 1},
-        {"matrix": [1, 7], "x": 7, "y": 1},
-        {"matrix": [1, 8], "x": 8, "y": 1},
-        {"matrix": [1, 9], "x": 9, "y": 1},
-        {"matrix": [1, 10], "x": 10, "y": 1},
-        {"matrix": [1, 11], "x": 11, "y": 1},
-
-        {"matrix": [2, 0], "x": 0, "y": 2},
-        {"matrix": [2, 1], "x": 1, "y": 2},
-        {"matrix": [2, 2], "x": 2, "y": 2},
-        {"matrix": [2, 3], "x": 3, "y": 2},
-        {"matrix": [2, 4], "x": 4, "y": 2},
-        {"matrix": [2, 5], "x": 5, "y": 2},
-        {"matrix": [2, 6], "x": 6, "y": 2},
-        {"matrix": [2, 7], "x": 7, "y": 2},
-        {"matrix": [2, 8], "x": 8, "y": 2},
-        {"matrix": [2, 9], "x": 9, "y": 2},
-        {"matrix": [2, 10], "x": 10, "y": 2},
-        {"matrix": [2, 11], "x": 11, "y": 2},
-
-        {"matrix": [3, 0], "x": 0, "y": 3},
-        {"matrix": [3, 1], "x": 1, "y": 3},
-        {"matrix": [3, 2], "x": 2, "y": 3},
-        {"matrix": [3, 3], "x": 3, "y": 3},
-        {"matrix": [3, 4], "x": 4, "y": 3},
-        {"matrix": [3, 5], "x": 5, "y": 3},
-        {"matrix": [3, 6], "x": 6, "y": 3},
-        {"matrix": [3, 7], "x": 7, "y": 3},
-        {"matrix": [3, 8], "x": 8, "y": 3},
-        {"matrix": [3, 9], "x": 9, "y": 3},
-        {"matrix": [3, 10], "x": 10, "y": 3},
-        {"matrix": [3, 11], "x": 11, "y": 3}
-      ]
-    }
-  }
-}
diff --git a/keyboards/maple_computing/jnao/keyboard.json b/keyboards/maple_computing/jnao/keyboard.json
new file mode 100644
index 00000000000..97b51a7680f
--- /dev/null
+++ b/keyboards/maple_computing/jnao/keyboard.json
@@ -0,0 +1,162 @@
+{
+  "keyboard_name": "JNAO",
+  "manufacturer": "Maple Computing",
+  "url": "",
+  "maintainer": "That-Canadian",
+  "usb": {
+    "vid": "0x1337",
+    "pid": "0x6017",
+    "device_version": "0.0.1"
+  },
+  "matrix_pins": {
+    "cols": ["F1", "F4", "B1", "B2", "B3", "B7", "D1", "D2", "D4", "D6", "D7", "B4"],
+    "rows": ["E6", "F0", "F5", "F6", "F7"]
+  },
+  "diode_direction": "COL2ROW",
+  "backlight": {
+    "driver": "timer",
+    "pin": "D0"
+  },
+  "processor": "atmega32u4",
+  "bootloader": "atmel-dfu",
+  "features": {
+    "bootmagic": false,
+    "mousekey": false,
+    "extrakey": true,
+    "console": true,
+    "command": true,
+    "backlight": true
+  },
+  "qmk": {
+    "locking": {
+      "enabled": true,
+      "resync": true
+    }
+  },
+  "community_layouts": ["ortho_5x12", "ortho_4x12"],
+  "layouts": {
+    "LAYOUT_ortho_5x12": {
+      "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": [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": [1, 4], "x": 4, "y": 1},
+        {"matrix": [1, 5], "x": 5, "y": 1},
+        {"matrix": [1, 6], "x": 6, "y": 1},
+        {"matrix": [1, 7], "x": 7, "y": 1},
+        {"matrix": [1, 8], "x": 8, "y": 1},
+        {"matrix": [1, 9], "x": 9, "y": 1},
+        {"matrix": [1, 10], "x": 10, "y": 1},
+        {"matrix": [1, 11], "x": 11, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2},
+        {"matrix": [2, 1], "x": 1, "y": 2},
+        {"matrix": [2, 2], "x": 2, "y": 2},
+        {"matrix": [2, 3], "x": 3, "y": 2},
+        {"matrix": [2, 4], "x": 4, "y": 2},
+        {"matrix": [2, 5], "x": 5, "y": 2},
+        {"matrix": [2, 6], "x": 6, "y": 2},
+        {"matrix": [2, 7], "x": 7, "y": 2},
+        {"matrix": [2, 8], "x": 8, "y": 2},
+        {"matrix": [2, 9], "x": 9, "y": 2},
+        {"matrix": [2, 10], "x": 10, "y": 2},
+        {"matrix": [2, 11], "x": 11, "y": 2},
+
+        {"matrix": [3, 0], "x": 0, "y": 3},
+        {"matrix": [3, 1], "x": 1, "y": 3},
+        {"matrix": [3, 2], "x": 2, "y": 3},
+        {"matrix": [3, 3], "x": 3, "y": 3},
+        {"matrix": [3, 4], "x": 4, "y": 3},
+        {"matrix": [3, 5], "x": 5, "y": 3},
+        {"matrix": [3, 6], "x": 6, "y": 3},
+        {"matrix": [3, 7], "x": 7, "y": 3},
+        {"matrix": [3, 8], "x": 8, "y": 3},
+        {"matrix": [3, 9], "x": 9, "y": 3},
+        {"matrix": [3, 10], "x": 10, "y": 3},
+        {"matrix": [3, 11], "x": 11, "y": 3},
+
+        {"matrix": [4, 0], "x": 0, "y": 4},
+        {"matrix": [4, 1], "x": 1, "y": 4},
+        {"matrix": [4, 2], "x": 2, "y": 4},
+        {"matrix": [4, 3], "x": 3, "y": 4},
+        {"matrix": [4, 4], "x": 4, "y": 4},
+        {"matrix": [4, 5], "x": 5, "y": 4},
+        {"matrix": [4, 6], "x": 6, "y": 4},
+        {"matrix": [4, 7], "x": 7, "y": 4},
+        {"matrix": [4, 8], "x": 8, "y": 4},
+        {"matrix": [4, 9], "x": 9, "y": 4},
+        {"matrix": [4, 10], "x": 10, "y": 4},
+        {"matrix": [4, 11], "x": 11, "y": 4}
+      ]
+    },
+    "LAYOUT_ortho_4x12": {
+      "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": [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": [1, 4], "x": 4, "y": 1},
+        {"matrix": [1, 5], "x": 5, "y": 1},
+        {"matrix": [1, 6], "x": 6, "y": 1},
+        {"matrix": [1, 7], "x": 7, "y": 1},
+        {"matrix": [1, 8], "x": 8, "y": 1},
+        {"matrix": [1, 9], "x": 9, "y": 1},
+        {"matrix": [1, 10], "x": 10, "y": 1},
+        {"matrix": [1, 11], "x": 11, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2},
+        {"matrix": [2, 1], "x": 1, "y": 2},
+        {"matrix": [2, 2], "x": 2, "y": 2},
+        {"matrix": [2, 3], "x": 3, "y": 2},
+        {"matrix": [2, 4], "x": 4, "y": 2},
+        {"matrix": [2, 5], "x": 5, "y": 2},
+        {"matrix": [2, 6], "x": 6, "y": 2},
+        {"matrix": [2, 7], "x": 7, "y": 2},
+        {"matrix": [2, 8], "x": 8, "y": 2},
+        {"matrix": [2, 9], "x": 9, "y": 2},
+        {"matrix": [2, 10], "x": 10, "y": 2},
+        {"matrix": [2, 11], "x": 11, "y": 2},
+
+        {"matrix": [3, 0], "x": 0, "y": 3},
+        {"matrix": [3, 1], "x": 1, "y": 3},
+        {"matrix": [3, 2], "x": 2, "y": 3},
+        {"matrix": [3, 3], "x": 3, "y": 3},
+        {"matrix": [3, 4], "x": 4, "y": 3},
+        {"matrix": [3, 5], "x": 5, "y": 3},
+        {"matrix": [3, 6], "x": 6, "y": 3},
+        {"matrix": [3, 7], "x": 7, "y": 3},
+        {"matrix": [3, 8], "x": 8, "y": 3},
+        {"matrix": [3, 9], "x": 9, "y": 3},
+        {"matrix": [3, 10], "x": 10, "y": 3},
+        {"matrix": [3, 11], "x": 11, "y": 3}
+      ]
+    }
+  }
+}
diff --git a/keyboards/maple_computing/jnao/rules.mk b/keyboards/maple_computing/jnao/rules.mk
index a18e35e796a..09057bea54b 100644
--- a/keyboards/maple_computing/jnao/rules.mk
+++ b/keyboards/maple_computing/jnao/rules.mk
@@ -1,16 +1,3 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = yes        # Console for debug
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
 # Disable unsupported hardware
 RGBLIGHT_SUPPORTED = no
 AUDIO_SUPPORTED = no
diff --git a/keyboards/maple_computing/launchpad/rev1/keyboard.json b/keyboards/maple_computing/launchpad/rev1/keyboard.json
index a846dd83f50..7308c496702 100644
--- a/keyboards/maple_computing/launchpad/rev1/keyboard.json
+++ b/keyboards/maple_computing/launchpad/rev1/keyboard.json
@@ -33,6 +33,12 @@
     "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "caterina",
+    "features": {
+        "bootmagic": false,
+        "mousekey": false,
+        "extrakey": true,
+        "nkro": true
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/maple_computing/launchpad/rules.mk b/keyboards/maple_computing/launchpad/rules.mk
index 42b694f9180..8c35a608a6a 100644
--- a/keyboards/maple_computing/launchpad/rules.mk
+++ b/keyboards/maple_computing/launchpad/rules.mk
@@ -1,14 +1 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no      # Enable keyboard backlight functionality
-AUDIO_ENABLE = no           # Audio output
-RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight.
-
 DEFAULT_FOLDER = maple_computing/launchpad/rev1
diff --git a/keyboards/maple_computing/lets_split_eh/lets_split_eh.c b/keyboards/maple_computing/lets_split_eh/eh/eh.c
similarity index 100%
rename from keyboards/maple_computing/lets_split_eh/lets_split_eh.c
rename to keyboards/maple_computing/lets_split_eh/eh/eh.c
diff --git a/keyboards/maple_computing/lets_split_eh/eh/info.json b/keyboards/maple_computing/lets_split_eh/eh/info.json
deleted file mode 100644
index 6b680418df3..00000000000
--- a/keyboards/maple_computing/lets_split_eh/eh/info.json
+++ /dev/null
@@ -1,109 +0,0 @@
-{
-    "keyboard_name": "Lets Split Eh?",
-    "manufacturer": "That-Canadian",
-    "url": "",
-    "maintainer": "qmk",
-    "usb": {
-        "vid": "0xFEED",
-        "pid": "0xE401",
-        "device_version": "1.0.0"
-    },
-    "matrix_pins": {
-        "cols": ["F4", "F5", "C6", "B6", "B5", "D5"],
-        "rows": ["B1", "B3", "D7", "B4"]
-    },
-    "diode_direction": "COL2ROW",
-    "backlight": {
-        "pin": "B7"
-    },
-    "rgblight": {
-        "led_count": 12,
-        "split_count": [6, 6],
-        "animations": {
-            "breathing": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "snake": true,
-            "knight": true,
-            "christmas": true,
-            "static_gradient": true,
-            "rgb_test": true,
-            "alternating": true,
-            "twinkle": true
-        }
-    },
-    "ws2812": {
-        "pin": "B2"
-    },
-    "split": {
-        "enabled": true,
-        "soft_serial_pin": "D0"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "community_layouts": ["ortho_4x12"],
-    "layout_aliases": {
-        "LAYOUT": "LAYOUT_ortho_4x12"
-    },
-    "layouts": {
-        "LAYOUT_ortho_4x12": {
-            "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": [4, 0], "x": 7, "y": 0},
-                {"matrix": [4, 1], "x": 8, "y": 0},
-                {"matrix": [4, 2], "x": 9, "y": 0},
-                {"matrix": [4, 3], "x": 10, "y": 0},
-                {"matrix": [4, 4], "x": 11, "y": 0},
-                {"matrix": [4, 5], "x": 12, "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": [1, 4], "x": 4, "y": 1},
-                {"matrix": [1, 5], "x": 5, "y": 1},
-
-                {"matrix": [5, 0], "x": 7, "y": 1},
-                {"matrix": [5, 1], "x": 8, "y": 1},
-                {"matrix": [5, 2], "x": 9, "y": 1},
-                {"matrix": [5, 3], "x": 10, "y": 1},
-                {"matrix": [5, 4], "x": 11, "y": 1},
-                {"matrix": [5, 5], "x": 12, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2},
-                {"matrix": [2, 1], "x": 1, "y": 2},
-                {"matrix": [2, 2], "x": 2, "y": 2},
-                {"matrix": [2, 3], "x": 3, "y": 2},
-                {"matrix": [2, 4], "x": 4, "y": 2},
-                {"matrix": [2, 5], "x": 5, "y": 2},
-
-                {"matrix": [6, 0], "x": 7, "y": 2},
-                {"matrix": [6, 1], "x": 8, "y": 2},
-                {"matrix": [6, 2], "x": 9, "y": 2},
-                {"matrix": [6, 3], "x": 10, "y": 2},
-                {"matrix": [6, 4], "x": 11, "y": 2},
-                {"matrix": [6, 5], "x": 12, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3},
-                {"matrix": [3, 1], "x": 1, "y": 3},
-                {"matrix": [3, 2], "x": 2, "y": 3},
-                {"matrix": [3, 3], "x": 3, "y": 3},
-                {"matrix": [3, 4], "x": 4, "y": 3},
-                {"matrix": [3, 5], "x": 5, "y": 3},
-
-                {"matrix": [7, 0], "x": 7, "y": 3},
-                {"matrix": [7, 1], "x": 8, "y": 3},
-                {"matrix": [7, 2], "x": 9, "y": 3},
-                {"matrix": [7, 3], "x": 10, "y": 3},
-                {"matrix": [7, 4], "x": 11, "y": 3},
-                {"matrix": [7, 5], "x": 12, "y": 3}
-            ]
-        }
-    }
-}
diff --git a/keyboards/maple_computing/lets_split_eh/eh/keyboard.json b/keyboards/maple_computing/lets_split_eh/eh/keyboard.json
new file mode 100644
index 00000000000..f40b15098f5
--- /dev/null
+++ b/keyboards/maple_computing/lets_split_eh/eh/keyboard.json
@@ -0,0 +1,117 @@
+{
+    "keyboard_name": "Lets Split Eh?",
+    "manufacturer": "That-Canadian",
+    "url": "",
+    "maintainer": "qmk",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0xE401",
+        "device_version": "1.0.0"
+    },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "C6", "B6", "B5", "D5"],
+        "rows": ["B1", "B3", "D7", "B4"]
+    },
+    "diode_direction": "COL2ROW",
+    "backlight": {
+        "pin": "B7"
+    },
+    "rgblight": {
+        "led_count": 12,
+        "split_count": [6, 6],
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": true,
+            "twinkle": true
+        }
+    },
+    "ws2812": {
+        "pin": "B2"
+    },
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "D0"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": false,
+        "mousekey": false,
+        "extrakey": true,
+        "nkro": true,
+        "backlight": true,
+        "rgblight": true
+    },
+    "community_layouts": ["ortho_4x12"],
+    "layout_aliases": {
+        "LAYOUT": "LAYOUT_ortho_4x12"
+    },
+    "layouts": {
+        "LAYOUT_ortho_4x12": {
+            "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": [4, 0], "x": 7, "y": 0},
+                {"matrix": [4, 1], "x": 8, "y": 0},
+                {"matrix": [4, 2], "x": 9, "y": 0},
+                {"matrix": [4, 3], "x": 10, "y": 0},
+                {"matrix": [4, 4], "x": 11, "y": 0},
+                {"matrix": [4, 5], "x": 12, "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": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+
+                {"matrix": [5, 0], "x": 7, "y": 1},
+                {"matrix": [5, 1], "x": 8, "y": 1},
+                {"matrix": [5, 2], "x": 9, "y": 1},
+                {"matrix": [5, 3], "x": 10, "y": 1},
+                {"matrix": [5, 4], "x": 11, "y": 1},
+                {"matrix": [5, 5], "x": 12, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+
+                {"matrix": [6, 0], "x": 7, "y": 2},
+                {"matrix": [6, 1], "x": 8, "y": 2},
+                {"matrix": [6, 2], "x": 9, "y": 2},
+                {"matrix": [6, 3], "x": 10, "y": 2},
+                {"matrix": [6, 4], "x": 11, "y": 2},
+                {"matrix": [6, 5], "x": 12, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
+
+                {"matrix": [7, 0], "x": 7, "y": 3},
+                {"matrix": [7, 1], "x": 8, "y": 3},
+                {"matrix": [7, 2], "x": 9, "y": 3},
+                {"matrix": [7, 3], "x": 10, "y": 3},
+                {"matrix": [7, 4], "x": 11, "y": 3},
+                {"matrix": [7, 5], "x": 12, "y": 3}
+            ]
+        }
+    }
+}
diff --git a/keyboards/maple_computing/lets_split_eh/eh/rules.mk b/keyboards/maple_computing/lets_split_eh/eh/rules.mk
index 0c7e1cb04e1..271780b75ec 100644
--- a/keyboards/maple_computing/lets_split_eh/eh/rules.mk
+++ b/keyboards/maple_computing/lets_split_eh/eh/rules.mk
@@ -1,5 +1,2 @@
-BACKLIGHT_ENABLE = yes
-RGBLIGHT_ENABLE = yes
-
 # Disable unsupported hardware
 AUDIO_SUPPORTED = no
diff --git a/keyboards/maple_computing/lets_split_eh/rules.mk b/keyboards/maple_computing/lets_split_eh/rules.mk
index 8e8d4c13b6c..9bae45fde84 100644
--- a/keyboards/maple_computing/lets_split_eh/rules.mk
+++ b/keyboards/maple_computing/lets_split_eh/rules.mk
@@ -1,14 +1 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no        # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no      # Enable keyboard backlight functionality
-AUDIO_ENABLE = no           # Audio output
-RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight.
-
 DEFAULT_FOLDER = maple_computing/lets_split_eh/eh
diff --git a/keyboards/maple_computing/minidox/rev1/info.json b/keyboards/maple_computing/minidox/rev1/info.json
deleted file mode 100644
index 6f3a0dd1fca..00000000000
--- a/keyboards/maple_computing/minidox/rev1/info.json
+++ /dev/null
@@ -1,75 +0,0 @@
-{
-  "keyboard_name": "MiniDox",
-  "manufacturer": "That-Canadian",
-  "url": "",
-  "maintainer": "qmk",
-  "usb": {
-    "vid": "0xFEED",
-    "pid": "0x3060",
-    "device_version": "0.0.1"
-  },
-  "matrix_pins": {
-    "cols": ["F4", "D3", "D2", "D1", "D4"],
-    "rows": ["B2", "B6", "B4", "B5"]
-  },
-  "diode_direction": "COL2ROW",
-  "split": {
-    "enabled": true,
-    "soft_serial_pin": "D0"
-  },
-  "processor": "atmega32u4",
-  "bootloader": "caterina",
-  "community_layouts": ["split_3x5_3"],
-  "layout_aliases": {
-    "LAYOUT": "LAYOUT_split_3x5_3"
-  },
-  "layouts": {
-    "LAYOUT_split_3x5_3": {
-      "layout": [
-        {"matrix": [0, 0], "x": 0, "y": 0.375},
-        {"matrix": [0, 1], "x": 1, "y": 0.125},
-        {"matrix": [0, 2], "x": 2, "y": 0},
-        {"matrix": [0, 3], "x": 3, "y": 0.125},
-        {"matrix": [0, 4], "x": 4, "y": 0.25},
-
-        {"matrix": [4, 4], "x": 7, "y": 0.25},
-        {"matrix": [4, 3], "x": 8, "y": 0.125},
-        {"matrix": [4, 2], "x": 9, "y": 0},
-        {"matrix": [4, 1], "x": 10, "y": 0.125},
-        {"matrix": [4, 0], "x": 11, "y": 0.375},
-
-        {"matrix": [1, 0], "x": 0, "y": 1.375},
-        {"matrix": [1, 1], "x": 1, "y": 1.125},
-        {"matrix": [1, 2], "x": 2, "y": 1},
-        {"matrix": [1, 3], "x": 3, "y": 1.125},
-        {"matrix": [1, 4], "x": 4, "y": 1.25},
-
-        {"matrix": [5, 4], "x": 7, "y": 1.25},
-        {"matrix": [5, 3], "x": 8, "y": 1.125},
-        {"matrix": [5, 2], "x": 9, "y": 1},
-        {"matrix": [5, 1], "x": 10, "y": 1.125},
-        {"matrix": [5, 0], "x": 11, "y": 1.375},
-
-        {"matrix": [2, 0], "x": 0, "y": 2.375},
-        {"matrix": [2, 1], "x": 1, "y": 2.125},
-        {"matrix": [2, 2], "x": 2, "y": 2},
-        {"matrix": [2, 3], "x": 3, "y": 2.125},
-        {"matrix": [2, 4], "x": 4, "y": 2.25},
-
-        {"matrix": [6, 4], "x": 7, "y": 2.25},
-        {"matrix": [6, 3], "x": 8, "y": 2.125},
-        {"matrix": [6, 2], "x": 9, "y": 2},
-        {"matrix": [6, 1], "x": 10, "y": 2.125},
-        {"matrix": [6, 0], "x": 11, "y": 2.375},
-
-        {"matrix": [3, 2], "x": 2.5, "y": 4.75},
-        {"matrix": [3, 3], "x": 3.5, "y": 4.75},
-        {"matrix": [3, 4], "x": 4.5, "y": 3.75, "h": 2},
-
-        {"matrix": [7, 4], "x": 6.5, "y": 3.75, "h": 2},
-        {"matrix": [7, 3], "x": 7.5, "y": 4.75},
-        {"matrix": [7, 2], "x": 8.5, "y": 4.75}
-      ]
-    }
-  }
-}
diff --git a/keyboards/maple_computing/minidox/rev1/keyboard.json b/keyboards/maple_computing/minidox/rev1/keyboard.json
new file mode 100644
index 00000000000..e7f1e027ae5
--- /dev/null
+++ b/keyboards/maple_computing/minidox/rev1/keyboard.json
@@ -0,0 +1,81 @@
+{
+  "keyboard_name": "MiniDox",
+  "manufacturer": "That-Canadian",
+  "url": "",
+  "maintainer": "qmk",
+  "usb": {
+    "vid": "0xFEED",
+    "pid": "0x3060",
+    "device_version": "0.0.1"
+  },
+  "matrix_pins": {
+    "cols": ["F4", "D3", "D2", "D1", "D4"],
+    "rows": ["B2", "B6", "B4", "B5"]
+  },
+  "diode_direction": "COL2ROW",
+  "split": {
+    "enabled": true,
+    "soft_serial_pin": "D0"
+  },
+  "processor": "atmega32u4",
+  "bootloader": "caterina",
+  "features": {
+    "bootmagic": false,
+    "mousekey": true,
+    "extrakey": true,
+    "command": true
+  },
+  "community_layouts": ["split_3x5_3"],
+  "layout_aliases": {
+    "LAYOUT": "LAYOUT_split_3x5_3"
+  },
+  "layouts": {
+    "LAYOUT_split_3x5_3": {
+      "layout": [
+        {"matrix": [0, 0], "x": 0, "y": 0.375},
+        {"matrix": [0, 1], "x": 1, "y": 0.125},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0.125},
+        {"matrix": [0, 4], "x": 4, "y": 0.25},
+
+        {"matrix": [4, 4], "x": 7, "y": 0.25},
+        {"matrix": [4, 3], "x": 8, "y": 0.125},
+        {"matrix": [4, 2], "x": 9, "y": 0},
+        {"matrix": [4, 1], "x": 10, "y": 0.125},
+        {"matrix": [4, 0], "x": 11, "y": 0.375},
+
+        {"matrix": [1, 0], "x": 0, "y": 1.375},
+        {"matrix": [1, 1], "x": 1, "y": 1.125},
+        {"matrix": [1, 2], "x": 2, "y": 1},
+        {"matrix": [1, 3], "x": 3, "y": 1.125},
+        {"matrix": [1, 4], "x": 4, "y": 1.25},
+
+        {"matrix": [5, 4], "x": 7, "y": 1.25},
+        {"matrix": [5, 3], "x": 8, "y": 1.125},
+        {"matrix": [5, 2], "x": 9, "y": 1},
+        {"matrix": [5, 1], "x": 10, "y": 1.125},
+        {"matrix": [5, 0], "x": 11, "y": 1.375},
+
+        {"matrix": [2, 0], "x": 0, "y": 2.375},
+        {"matrix": [2, 1], "x": 1, "y": 2.125},
+        {"matrix": [2, 2], "x": 2, "y": 2},
+        {"matrix": [2, 3], "x": 3, "y": 2.125},
+        {"matrix": [2, 4], "x": 4, "y": 2.25},
+
+        {"matrix": [6, 4], "x": 7, "y": 2.25},
+        {"matrix": [6, 3], "x": 8, "y": 2.125},
+        {"matrix": [6, 2], "x": 9, "y": 2},
+        {"matrix": [6, 1], "x": 10, "y": 2.125},
+        {"matrix": [6, 0], "x": 11, "y": 2.375},
+
+        {"matrix": [3, 2], "x": 2.5, "y": 4.75},
+        {"matrix": [3, 3], "x": 3.5, "y": 4.75},
+        {"matrix": [3, 4], "x": 4.5, "y": 3.75, "h": 2},
+
+        {"matrix": [7, 4], "x": 6.5, "y": 3.75, "h": 2},
+        {"matrix": [7, 3], "x": 7.5, "y": 4.75},
+        {"matrix": [7, 2], "x": 8.5, "y": 4.75}
+      ]
+    }
+  }
+}
diff --git a/keyboards/maple_computing/minidox/rev1/rules.mk b/keyboards/maple_computing/minidox/rev1/rules.mk
deleted file mode 100644
index 7b30c0beff2..00000000000
--- a/keyboards/maple_computing/minidox/rev1/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-BACKLIGHT_ENABLE = no
diff --git a/keyboards/maple_computing/minidox/rules.mk b/keyboards/maple_computing/minidox/rules.mk
index 64efe315122..d5a7f49e402 100644
--- a/keyboards/maple_computing/minidox/rules.mk
+++ b/keyboards/maple_computing/minidox/rules.mk
@@ -1,14 +1 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
 DEFAULT_FOLDER = maple_computing/minidox/rev1
diff --git a/keyboards/marksard/rhymestone/rev1/keyboard.json b/keyboards/marksard/rhymestone/rev1/keyboard.json
index 31eb063c030..86af26b0727 100644
--- a/keyboards/marksard/rhymestone/rev1/keyboard.json
+++ b/keyboards/marksard/rhymestone/rev1/keyboard.json
@@ -44,6 +44,12 @@
     },
     "processor": "atmega32u4",
     "bootloader": "caterina",
+    "features": {
+        "bootmagic": false,
+        "mousekey": false,
+        "extrakey": false,
+        "nkro": true
+    },
     "community_layouts": ["ortho_4x10"],
     "layouts": {
         "LAYOUT_ortho_4x10": {
diff --git a/keyboards/marksard/rhymestone/rules.mk b/keyboards/marksard/rhymestone/rules.mk
index 477a0a7da73..18338887081 100644
--- a/keyboards/marksard/rhymestone/rules.mk
+++ b/keyboards/marksard/rhymestone/rules.mk
@@ -1,15 +1 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = no        # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-RGB_MATRIX_ENABLE = no
-
 DEFAULT_FOLDER = marksard/rhymestone/rev1
diff --git a/keyboards/marksard/treadstone48/rev1/keyboard.json b/keyboards/marksard/treadstone48/rev1/keyboard.json
index 07ad96140d9..f8da65b7b50 100644
--- a/keyboards/marksard/treadstone48/rev1/keyboard.json
+++ b/keyboards/marksard/treadstone48/rev1/keyboard.json
@@ -34,6 +34,13 @@
   },
   "processor": "atmega32u4",
   "bootloader": "caterina",
+    "features": {
+        "bootmagic": false,
+        "mousekey": true,
+        "extrakey": false,
+        "rgblight": true,
+        "oled": true
+    },
     "layouts": {
         "LAYOUT_base": {
             "layout": [
diff --git a/keyboards/marksard/treadstone48/rev2/info.json b/keyboards/marksard/treadstone48/rev2/info.json
deleted file mode 100644
index 59af38e55d9..00000000000
--- a/keyboards/marksard/treadstone48/rev2/info.json
+++ /dev/null
@@ -1,94 +0,0 @@
-{
-    "keyboard_name": "Treadstone48",
-    "manufacturer": "marksard",
-    "url": "https://github.com/marksard/Keyboards",
-    "maintainer": "marksard",
-    "usb": {
-        "vid": "0xFEED",
-        "pid": "0xDFA3",
-        "device_version": "0.2.0"
-    },
-    "ws2812": {
-        "pin": "D3"
-    },
-    "rgblight": {
-        "saturation_steps": 8,
-        "brightness_steps": 8,
-        "led_count": 12,
-        "max_brightness": 220,
-        "sleep": true,
-        "animations": {
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "knight": true,
-            "static_gradient": true
-        }
-    },
-    "matrix_pins": {
-        "cols": ["D4", "C6", "D7", "E6", "B4", "B5"],
-        "rows": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6"]
-    },
-    "diode_direction": "COL2ROW",
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
-    "layout_aliases": {
-        "LAYOUT_full": "LAYOUT_base"
-    },
-    "layouts": {
-        "LAYOUT_base": {
-            "layout": [
-                {"matrix": [4, 5], "x": 1, "y": 0},
-                {"matrix": [4, 4], "x": 2.25, "y": 0},
-                {"matrix": [4, 3], "x": 3.25, "y": 0},
-                {"matrix": [4, 2], "x": 4.25, "y": 0},
-                {"matrix": [4, 1], "x": 5.25, "y": 0},
-                {"matrix": [4, 0], "x": 6.25, "y": 0},
-                {"matrix": [0, 5], "x": 7.75, "y": 0},
-                {"matrix": [0, 4], "x": 8.75, "y": 0},
-                {"matrix": [0, 3], "x": 9.75, "y": 0},
-                {"matrix": [0, 2], "x": 10.75, "y": 0},
-                {"matrix": [0, 1], "x": 11.75, "y": 0},
-                {"matrix": [0, 0], "x": 12.75, "y": 0, "w": 2},
-
-                {"matrix": [5, 5], "x": 1, "y": 1, "w": 1.5},
-                {"matrix": [5, 4], "x": 2.5, "y": 1},
-                {"matrix": [5, 3], "x": 3.5, "y": 1},
-                {"matrix": [5, 2], "x": 4.5, "y": 1},
-                {"matrix": [5, 1], "x": 5.5, "y": 1},
-                {"matrix": [5, 0], "x": 6.5, "y": 1},
-                {"matrix": [1, 5], "x": 7.5, "y": 1},
-                {"matrix": [1, 4], "x": 8.5, "y": 1},
-                {"matrix": [1, 3], "x": 9.5, "y": 1},
-                {"matrix": [1, 2], "x": 10.5, "y": 1},
-                {"matrix": [1, 1], "x": 11.5, "y": 1},
-                {"matrix": [1, 0], "x": 12.5, "y": 1, "w": 2.25},
-
-                {"matrix": [6, 5], "x": 0, "y": 2, "w": 2.25},
-                {"matrix": [6, 4], "x": 2.25, "y": 2},
-                {"matrix": [6, 3], "x": 3.25, "y": 2},
-                {"matrix": [6, 2], "x": 4.25, "y": 2},
-                {"matrix": [6, 1], "x": 5.25, "y": 2},
-                {"matrix": [6, 0], "x": 6.25, "y": 2},
-                {"matrix": [2, 5], "x": 7.75, "y": 2},
-                {"matrix": [2, 4], "x": 8.75, "y": 2},
-                {"matrix": [2, 3], "x": 9.75, "y": 2},
-                {"matrix": [2, 2], "x": 10.75, "y": 2},
-                {"matrix": [2, 1], "x": 11.75, "y": 2},
-                {"matrix": [2, 0], "x": 12.75, "y": 2},
-
-                {"matrix": [7, 5], "x": 0.75, "y": 3, "w": 1.25},
-                {"matrix": [7, 4], "x": 2, "y": 3, "w": 1.25},
-                {"matrix": [7, 3], "x": 3.25, "y": 3, "w": 1.25},
-                {"matrix": [7, 2], "x": 4.5, "y": 3},
-                {"matrix": [7, 1], "x": 5.5, "y": 3, "w": 2},
-                {"matrix": [7, 0], "x": 7.5, "y": 3, "w": 2},
-                {"matrix": [3, 5], "x": 9.5, "y": 3},
-                {"matrix": [3, 4], "x": 10.5, "y": 3, "w": 1.25},
-                {"matrix": [3, 3], "x": 11.75, "y": 3},
-                {"matrix": [3, 2], "x": 12.75, "y": 3},
-                {"matrix": [3, 1], "x": 13.75, "y": 3},
-                {"matrix": [3, 0], "x": 13.75, "y": 2}
-            ]
-        }
-    }
-}
diff --git a/keyboards/marksard/treadstone48/rev2/keyboard.json b/keyboards/marksard/treadstone48/rev2/keyboard.json
new file mode 100644
index 00000000000..56346d080a6
--- /dev/null
+++ b/keyboards/marksard/treadstone48/rev2/keyboard.json
@@ -0,0 +1,101 @@
+{
+    "keyboard_name": "Treadstone48",
+    "manufacturer": "marksard",
+    "url": "https://github.com/marksard/Keyboards",
+    "maintainer": "marksard",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0xDFA3",
+        "device_version": "0.2.0"
+    },
+    "ws2812": {
+        "pin": "D3"
+    },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 12,
+        "max_brightness": 220,
+        "sleep": true,
+        "animations": {
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "knight": true,
+            "static_gradient": true
+        }
+    },
+    "matrix_pins": {
+        "cols": ["D4", "C6", "D7", "E6", "B4", "B5"],
+        "rows": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6"]
+    },
+    "diode_direction": "COL2ROW",
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
+    "features": {
+        "bootmagic": false,
+        "mousekey": true,
+        "extrakey": false,
+        "rgblight": true,
+        "oled": true
+    },
+    "layout_aliases": {
+        "LAYOUT_full": "LAYOUT_base"
+    },
+    "layouts": {
+        "LAYOUT_base": {
+            "layout": [
+                {"matrix": [4, 5], "x": 1, "y": 0},
+                {"matrix": [4, 4], "x": 2.25, "y": 0},
+                {"matrix": [4, 3], "x": 3.25, "y": 0},
+                {"matrix": [4, 2], "x": 4.25, "y": 0},
+                {"matrix": [4, 1], "x": 5.25, "y": 0},
+                {"matrix": [4, 0], "x": 6.25, "y": 0},
+                {"matrix": [0, 5], "x": 7.75, "y": 0},
+                {"matrix": [0, 4], "x": 8.75, "y": 0},
+                {"matrix": [0, 3], "x": 9.75, "y": 0},
+                {"matrix": [0, 2], "x": 10.75, "y": 0},
+                {"matrix": [0, 1], "x": 11.75, "y": 0},
+                {"matrix": [0, 0], "x": 12.75, "y": 0, "w": 2},
+
+                {"matrix": [5, 5], "x": 1, "y": 1, "w": 1.5},
+                {"matrix": [5, 4], "x": 2.5, "y": 1},
+                {"matrix": [5, 3], "x": 3.5, "y": 1},
+                {"matrix": [5, 2], "x": 4.5, "y": 1},
+                {"matrix": [5, 1], "x": 5.5, "y": 1},
+                {"matrix": [5, 0], "x": 6.5, "y": 1},
+                {"matrix": [1, 5], "x": 7.5, "y": 1},
+                {"matrix": [1, 4], "x": 8.5, "y": 1},
+                {"matrix": [1, 3], "x": 9.5, "y": 1},
+                {"matrix": [1, 2], "x": 10.5, "y": 1},
+                {"matrix": [1, 1], "x": 11.5, "y": 1},
+                {"matrix": [1, 0], "x": 12.5, "y": 1, "w": 2.25},
+
+                {"matrix": [6, 5], "x": 0, "y": 2, "w": 2.25},
+                {"matrix": [6, 4], "x": 2.25, "y": 2},
+                {"matrix": [6, 3], "x": 3.25, "y": 2},
+                {"matrix": [6, 2], "x": 4.25, "y": 2},
+                {"matrix": [6, 1], "x": 5.25, "y": 2},
+                {"matrix": [6, 0], "x": 6.25, "y": 2},
+                {"matrix": [2, 5], "x": 7.75, "y": 2},
+                {"matrix": [2, 4], "x": 8.75, "y": 2},
+                {"matrix": [2, 3], "x": 9.75, "y": 2},
+                {"matrix": [2, 2], "x": 10.75, "y": 2},
+                {"matrix": [2, 1], "x": 11.75, "y": 2},
+                {"matrix": [2, 0], "x": 12.75, "y": 2},
+
+                {"matrix": [7, 5], "x": 0.75, "y": 3, "w": 1.25},
+                {"matrix": [7, 4], "x": 2, "y": 3, "w": 1.25},
+                {"matrix": [7, 3], "x": 3.25, "y": 3, "w": 1.25},
+                {"matrix": [7, 2], "x": 4.5, "y": 3},
+                {"matrix": [7, 1], "x": 5.5, "y": 3, "w": 2},
+                {"matrix": [7, 0], "x": 7.5, "y": 3, "w": 2},
+                {"matrix": [3, 5], "x": 9.5, "y": 3},
+                {"matrix": [3, 4], "x": 10.5, "y": 3, "w": 1.25},
+                {"matrix": [3, 3], "x": 11.75, "y": 3},
+                {"matrix": [3, 2], "x": 12.75, "y": 3},
+                {"matrix": [3, 1], "x": 13.75, "y": 3},
+                {"matrix": [3, 0], "x": 13.75, "y": 2}
+            ]
+        }
+    }
+}
diff --git a/keyboards/marksard/treadstone48/rev2/rules.mk b/keyboards/marksard/treadstone48/rev2/rules.mk
deleted file mode 100644
index 3bbd2614291..00000000000
--- a/keyboards/marksard/treadstone48/rev2/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# File intentionally blank
diff --git a/keyboards/marksard/treadstone48/rules.mk b/keyboards/marksard/treadstone48/rules.mk
index dddb6f07296..23865d27e63 100644
--- a/keyboards/marksard/treadstone48/rules.mk
+++ b/keyboards/marksard/treadstone48/rules.mk
@@ -1,17 +1 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-EXTRAKEY_ENABLE = no       # Audio control and System control
-CONSOLE_ENABLE = no        # Console for debug
-COMMAND_ENABLE = no        # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-AUDIO_ENABLE = no           # Audio output
-
-MOUSEKEY_ENABLE = yes       # Mouse keys
-
-RGBLIGHT_ENABLE = yes        # Enable keyboard RGB underglow
-OLED_ENABLE = yes
-
 DEFAULT_FOLDER = marksard/treadstone48/rev1
diff --git a/keyboards/massdrop/alt/info.json b/keyboards/massdrop/alt/info.json
deleted file mode 100644
index 90de8c69047..00000000000
--- a/keyboards/massdrop/alt/info.json
+++ /dev/null
@@ -1,100 +0,0 @@
-{
-    "keyboard_name": "ALT Keyboard",
-    "manufacturer": "Massdrop Inc.",
-    "url": "https://www.massdrop.com/buy/massdrop-alt-mechanical-keyboard",
-    "maintainer": "Massdrop",
-    "usb": {
-        "vid": "0x04D8",
-        "pid": "0xEED3",
-        "device_version": "1.0.1"
-    },
-    "rgb_matrix": {
-        "driver": "custom"
-    },
-    "matrix_pins": {
-        "cols": ["B04", "B05", "B06", "B07", "B08", "B09", "B10", "B11", "B12", "B13", "A05", "A06", "A07", "A10", "A11"],
-        "rows": ["A00", "A01", "A02", "A03", "A04"]
-    },
-    "diode_direction": "COL2ROW",
-    "community_layouts": ["65_ansi_blocker"],
-    "layout_aliases": {
-        "LAYOUT": "LAYOUT_65_ansi_blocker"
-    },
-    "layouts": {
-        "LAYOUT_65_ansi_blocker": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-                {"matrix": [0, 14], "x": 15, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-                {"matrix": [1, 14], "x": 15, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
-                {"matrix": [2, 14], "x": 15, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 2], "x": 2.25, "y": 3},
-                {"matrix": [3, 3], "x": 3.25, "y": 3},
-                {"matrix": [3, 4], "x": 4.25, "y": 3},
-                {"matrix": [3, 5], "x": 5.25, "y": 3},
-                {"matrix": [3, 6], "x": 6.25, "y": 3},
-                {"matrix": [3, 7], "x": 7.25, "y": 3},
-                {"matrix": [3, 8], "x": 8.25, "y": 3},
-                {"matrix": [3, 9], "x": 9.25, "y": 3},
-                {"matrix": [3, 10], "x": 10.25, "y": 3},
-                {"matrix": [3, 11], "x": 11.25, "y": 3},
-                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"matrix": [3, 13], "x": 14, "y": 3},
-                {"matrix": [3, 14], "x": 15, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
-                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
-                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 12], "x": 13, "y": 4},
-                {"matrix": [4, 13], "x": 14, "y": 4},
-                {"matrix": [4, 14], "x": 15, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/massdrop/alt/keyboard.json b/keyboards/massdrop/alt/keyboard.json
new file mode 100644
index 00000000000..7598a43b7dd
--- /dev/null
+++ b/keyboards/massdrop/alt/keyboard.json
@@ -0,0 +1,107 @@
+{
+    "keyboard_name": "ALT Keyboard",
+    "manufacturer": "Massdrop Inc.",
+    "url": "https://www.massdrop.com/buy/massdrop-alt-mechanical-keyboard",
+    "maintainer": "Massdrop",
+    "usb": {
+        "vid": "0x04D8",
+        "pid": "0xEED3",
+        "device_version": "1.0.1"
+    },
+    "rgb_matrix": {
+        "driver": "custom"
+    },
+    "matrix_pins": {
+        "cols": ["B04", "B05", "B06", "B07", "B08", "B09", "B10", "B11", "B12", "B13", "A05", "A06", "A07", "A10", "A11"],
+        "rows": ["A00", "A01", "A02", "A03", "A04"]
+    },
+    "diode_direction": "COL2ROW",
+    "community_layouts": ["65_ansi_blocker"],
+    "features": {
+        "bootmagic": false,
+        "mousekey": false,
+        "extrakey": true,
+        "nkro": true,
+        "rgb_matrix": true
+    },
+    "layout_aliases": {
+        "LAYOUT": "LAYOUT_65_ansi_blocker"
+    },
+    "layouts": {
+        "LAYOUT_65_ansi_blocker": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/massdrop/alt/rules.mk b/keyboards/massdrop/alt/rules.mk
index e176fa733da..869853e858e 100644
--- a/keyboards/massdrop/alt/rules.mk
+++ b/keyboards/massdrop/alt/rules.mk
@@ -7,22 +7,3 @@ MCU = cortex-m4
 
 # Bootloader selection
 BOOTLOADER = md-boot
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-VIRTSER_ENABLE = no         # USB Serial Driver
-RAW_ENABLE = no             # Raw device
-AUTO_SHIFT_ENABLE = no      # Auto Shift
-
-# Custom RGB matrix handling
-RGB_MATRIX_ENABLE = yes
diff --git a/keyboards/massdrop/ctrl/info.json b/keyboards/massdrop/ctrl/info.json
deleted file mode 100644
index e030881ca82..00000000000
--- a/keyboards/massdrop/ctrl/info.json
+++ /dev/null
@@ -1,125 +0,0 @@
-{
-    "keyboard_name": "CTRL Keyboard",
-    "manufacturer": "Massdrop Inc.",
-    "url": "https://www.massdrop.com/buy/massdrop-ctrl-mechanical-keyboard",
-    "maintainer": "Massdrop",
-    "usb": {
-        "vid": "0x04D8",
-        "pid": "0xEED2",
-        "device_version": "1.0.1"
-    },
-    "rgb_matrix": {
-        "driver": "custom"
-    },
-    "matrix_pins": {
-        "cols": ["A00", "A01", "A02", "A03", "A04", "A05", "A06", "A07"],
-        "rows": ["B04", "B05", "B06", "B07", "B08", "B09", "A10", "A11", "B10", "B11", "B12"]
-    },
-    "diode_direction": "COL2ROW",
-    "layouts": {
-        "LAYOUT": {
-            "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": [6, 0], "x": 9.5, "y": 0},
-
-                {"matrix": [6, 1], "x": 11, "y": 0},
-                {"matrix": [6, 2], "x": 12, "y": 0},
-                {"matrix": [6, 3], "x": 13, "y": 0},
-                {"matrix": [6, 4], "x": 14, "y": 0},
-
-                {"matrix": [6, 5], "x": 15.5, "y": 0},
-                {"matrix": [6, 6], "x": 16.5, "y": 0},
-                {"matrix": [6, 7], "x": 17.5, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1.5},
-                {"matrix": [1, 1], "x": 1, "y": 1.5},
-                {"matrix": [1, 2], "x": 2, "y": 1.5},
-                {"matrix": [1, 3], "x": 3, "y": 1.5},
-                {"matrix": [1, 4], "x": 4, "y": 1.5},
-                {"matrix": [1, 5], "x": 5, "y": 1.5},
-                {"matrix": [1, 6], "x": 6, "y": 1.5},
-                {"matrix": [1, 7], "x": 7, "y": 1.5},
-                {"matrix": [7, 0], "x": 8, "y": 1.5},
-                {"matrix": [7, 1], "x": 9, "y": 1.5},
-                {"matrix": [7, 2], "x": 10, "y": 1.5},
-                {"matrix": [7, 3], "x": 11, "y": 1.5},
-                {"matrix": [7, 4], "x": 12, "y": 1.5},
-                {"matrix": [7, 5], "x": 13, "y": 1.5, "w": 2},
-
-                {"matrix": [7, 6], "x": 15.5, "y": 1.5},
-                {"matrix": [7, 7], "x": 16.5, "y": 1.5},
-                {"matrix": [9, 7], "x": 17.5, "y": 1.5},
-
-                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
-                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
-                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
-                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
-                {"matrix": [2, 4], "x": 4.5, "y": 2.5},
-                {"matrix": [2, 5], "x": 5.5, "y": 2.5},
-                {"matrix": [2, 6], "x": 6.5, "y": 2.5},
-                {"matrix": [2, 7], "x": 7.5, "y": 2.5},
-                {"matrix": [8, 0], "x": 8.5, "y": 2.5},
-                {"matrix": [8, 1], "x": 9.5, "y": 2.5},
-                {"matrix": [8, 2], "x": 10.5, "y": 2.5},
-                {"matrix": [8, 3], "x": 11.5, "y": 2.5},
-                {"matrix": [8, 4], "x": 12.5, "y": 2.5},
-                {"matrix": [8, 5], "x": 13.5, "y": 2.5, "w": 1.5},
-
-                {"matrix": [8, 6], "x": 15.5, "y": 2.5},
-                {"matrix": [8, 7], "x": 16.5, "y": 2.5},
-                {"matrix": [9, 6], "x": 17.5, "y": 2.5},
-
-                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
-                {"matrix": [3, 1], "x": 1.75, "y": 3.5},
-                {"matrix": [3, 2], "x": 2.75, "y": 3.5},
-                {"matrix": [3, 3], "x": 3.75, "y": 3.5},
-                {"matrix": [3, 4], "x": 4.75, "y": 3.5},
-                {"matrix": [3, 5], "x": 5.75, "y": 3.5},
-                {"matrix": [3, 6], "x": 6.75, "y": 3.5},
-                {"matrix": [3, 7], "x": 7.75, "y": 3.5},
-                {"matrix": [9, 0], "x": 8.75, "y": 3.5},
-                {"matrix": [9, 1], "x": 9.75, "y": 3.5},
-                {"matrix": [9, 2], "x": 10.75, "y": 3.5},
-                {"matrix": [9, 3], "x": 11.75, "y": 3.5},
-                {"matrix": [9, 4], "x": 12.75, "y": 3.5, "w": 2.25},
-
-                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
-                {"matrix": [4, 1], "x": 2.25, "y": 4.5},
-                {"matrix": [4, 2], "x": 3.25, "y": 4.5},
-                {"matrix": [4, 3], "x": 4.25, "y": 4.5},
-                {"matrix": [4, 4], "x": 5.25, "y": 4.5},
-                {"matrix": [4, 5], "x": 6.25, "y": 4.5},
-                {"matrix": [4, 6], "x": 7.25, "y": 4.5},
-                {"matrix": [4, 7], "x": 8.25, "y": 4.5},
-                {"matrix": [10, 0], "x": 9.25, "y": 4.5},
-                {"matrix": [10, 1], "x": 10.25, "y": 4.5},
-                {"matrix": [10, 2], "x": 11.25, "y": 4.5},
-                {"matrix": [10, 3], "x": 12.25, "y": 4.5, "w": 2.75},
-
-                {"matrix": [9, 5], "x": 16.5, "y": 4.5},
-
-                {"matrix": [5, 0], "x": 0.005, "y": 5.5, "w": 1.25},
-                {"matrix": [5, 1], "x": 1.255, "y": 5.5, "w": 1.25},
-                {"matrix": [5, 2], "x": 2.505, "y": 5.5, "w": 1.25},
-                {"matrix": [5, 3], "x": 3.75, "y": 5.5, "w": 6.25},
-                {"matrix": [5, 4], "x": 10, "y": 5.5, "w": 1.25},
-                {"matrix": [5, 5], "x": 11.25, "y": 5.5, "w": 1.25},
-                {"matrix": [5, 6], "x": 12.5, "y": 5.5, "w": 1.25},
-                {"matrix": [5, 7], "x": 13.75, "y": 5.5, "w": 1.25},
-
-                {"matrix": [10, 4], "x": 15.5, "y": 5.5},
-                {"matrix": [10, 5], "x": 16.5, "y": 5.5},
-                {"matrix": [10, 6], "x": 17.5, "y": 5.5}
-            ]
-        }
-    }
-}
diff --git a/keyboards/massdrop/ctrl/keyboard.json b/keyboards/massdrop/ctrl/keyboard.json
new file mode 100644
index 00000000000..d3488ebd6bb
--- /dev/null
+++ b/keyboards/massdrop/ctrl/keyboard.json
@@ -0,0 +1,132 @@
+{
+    "keyboard_name": "CTRL Keyboard",
+    "manufacturer": "Massdrop Inc.",
+    "url": "https://www.massdrop.com/buy/massdrop-ctrl-mechanical-keyboard",
+    "maintainer": "Massdrop",
+    "usb": {
+        "vid": "0x04D8",
+        "pid": "0xEED2",
+        "device_version": "1.0.1"
+    },
+    "rgb_matrix": {
+        "driver": "custom"
+    },
+    "matrix_pins": {
+        "cols": ["A00", "A01", "A02", "A03", "A04", "A05", "A06", "A07"],
+        "rows": ["B04", "B05", "B06", "B07", "B08", "B09", "A10", "A11", "B10", "B11", "B12"]
+    },
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": false,
+        "mousekey": false,
+        "extrakey": true,
+        "nkro": true,
+        "rgb_matrix": true
+    },
+    "layouts": {
+        "LAYOUT": {
+            "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": [6, 0], "x": 9.5, "y": 0},
+
+                {"matrix": [6, 1], "x": 11, "y": 0},
+                {"matrix": [6, 2], "x": 12, "y": 0},
+                {"matrix": [6, 3], "x": 13, "y": 0},
+                {"matrix": [6, 4], "x": 14, "y": 0},
+
+                {"matrix": [6, 5], "x": 15.5, "y": 0},
+                {"matrix": [6, 6], "x": 16.5, "y": 0},
+                {"matrix": [6, 7], "x": 17.5, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1.5},
+                {"matrix": [1, 4], "x": 4, "y": 1.5},
+                {"matrix": [1, 5], "x": 5, "y": 1.5},
+                {"matrix": [1, 6], "x": 6, "y": 1.5},
+                {"matrix": [1, 7], "x": 7, "y": 1.5},
+                {"matrix": [7, 0], "x": 8, "y": 1.5},
+                {"matrix": [7, 1], "x": 9, "y": 1.5},
+                {"matrix": [7, 2], "x": 10, "y": 1.5},
+                {"matrix": [7, 3], "x": 11, "y": 1.5},
+                {"matrix": [7, 4], "x": 12, "y": 1.5},
+                {"matrix": [7, 5], "x": 13, "y": 1.5, "w": 2},
+
+                {"matrix": [7, 6], "x": 15.5, "y": 1.5},
+                {"matrix": [7, 7], "x": 16.5, "y": 1.5},
+                {"matrix": [9, 7], "x": 17.5, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+                {"matrix": [8, 0], "x": 8.5, "y": 2.5},
+                {"matrix": [8, 1], "x": 9.5, "y": 2.5},
+                {"matrix": [8, 2], "x": 10.5, "y": 2.5},
+                {"matrix": [8, 3], "x": 11.5, "y": 2.5},
+                {"matrix": [8, 4], "x": 12.5, "y": 2.5},
+                {"matrix": [8, 5], "x": 13.5, "y": 2.5, "w": 1.5},
+
+                {"matrix": [8, 6], "x": 15.5, "y": 2.5},
+                {"matrix": [8, 7], "x": 16.5, "y": 2.5},
+                {"matrix": [9, 6], "x": 17.5, "y": 2.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+                {"matrix": [9, 0], "x": 8.75, "y": 3.5},
+                {"matrix": [9, 1], "x": 9.75, "y": 3.5},
+                {"matrix": [9, 2], "x": 10.75, "y": 3.5},
+                {"matrix": [9, 3], "x": 11.75, "y": 3.5},
+                {"matrix": [9, 4], "x": 12.75, "y": 3.5, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
+                {"matrix": [4, 1], "x": 2.25, "y": 4.5},
+                {"matrix": [4, 2], "x": 3.25, "y": 4.5},
+                {"matrix": [4, 3], "x": 4.25, "y": 4.5},
+                {"matrix": [4, 4], "x": 5.25, "y": 4.5},
+                {"matrix": [4, 5], "x": 6.25, "y": 4.5},
+                {"matrix": [4, 6], "x": 7.25, "y": 4.5},
+                {"matrix": [4, 7], "x": 8.25, "y": 4.5},
+                {"matrix": [10, 0], "x": 9.25, "y": 4.5},
+                {"matrix": [10, 1], "x": 10.25, "y": 4.5},
+                {"matrix": [10, 2], "x": 11.25, "y": 4.5},
+                {"matrix": [10, 3], "x": 12.25, "y": 4.5, "w": 2.75},
+
+                {"matrix": [9, 5], "x": 16.5, "y": 4.5},
+
+                {"matrix": [5, 0], "x": 0.005, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.255, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.505, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 3], "x": 3.75, "y": 5.5, "w": 6.25},
+                {"matrix": [5, 4], "x": 10, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 5], "x": 11.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 6], "x": 12.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 7], "x": 13.75, "y": 5.5, "w": 1.25},
+
+                {"matrix": [10, 4], "x": 15.5, "y": 5.5},
+                {"matrix": [10, 5], "x": 16.5, "y": 5.5},
+                {"matrix": [10, 6], "x": 17.5, "y": 5.5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/massdrop/ctrl/rules.mk b/keyboards/massdrop/ctrl/rules.mk
index e176fa733da..869853e858e 100644
--- a/keyboards/massdrop/ctrl/rules.mk
+++ b/keyboards/massdrop/ctrl/rules.mk
@@ -7,22 +7,3 @@ MCU = cortex-m4
 
 # Bootloader selection
 BOOTLOADER = md-boot
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-VIRTSER_ENABLE = no         # USB Serial Driver
-RAW_ENABLE = no             # Raw device
-AUTO_SHIFT_ENABLE = no      # Auto Shift
-
-# Custom RGB matrix handling
-RGB_MATRIX_ENABLE = yes
diff --git a/keyboards/matrix/abelx/info.json b/keyboards/matrix/abelx/info.json
deleted file mode 100644
index b9aa23b7566..00000000000
--- a/keyboards/matrix/abelx/info.json
+++ /dev/null
@@ -1,240 +0,0 @@
-{
-  "keyboard_name": "ABELX",
-  "manufacturer": "Matrix",
-  "url": "",
-  "maintainer": "qmk",
-  "usb": {
-    "vid": "0x4D58",
-    "pid": "0xAB87",
-    "device_version": "0.0.1"
-  },
-  "rgblight": {
-    "led_count": 9,
-    "driver": "custom",
-    "animations": {
-      "breathing": true,
-      "rainbow_mood": true,
-      "rainbow_swirl": true,
-      "snake": true,
-      "knight": true,
-      "christmas": true,
-      "static_gradient": true,
-      "rgb_test": true,
-      "alternating": true,
-      "twinkle": true
-    }
-  },
-  "ws2812": {
-    "pin": "B4"
-  },
-  "layouts": {
-    "LAYOUT_tkl_ansi": {
-      "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, 13], "x": 15.25, "y": 0},
-        {"matrix": [0, 14], "x": 16.25, "y": 0},
-        {"matrix": [0, 15], "x": 17.25, "y": 0},
-
-        {"matrix": [1, 0], "x": 0, "y": 1.5},
-        {"matrix": [1, 1], "x": 1, "y": 1.5},
-        {"matrix": [1, 2], "x": 2, "y": 1.5},
-        {"matrix": [1, 3], "x": 3, "y": 1.5},
-        {"matrix": [1, 4], "x": 4, "y": 1.5},
-        {"matrix": [1, 5], "x": 5, "y": 1.5},
-        {"matrix": [1, 6], "x": 6, "y": 1.5},
-        {"matrix": [1, 7], "x": 7, "y": 1.5},
-        {"matrix": [1, 8], "x": 8, "y": 1.5},
-        {"matrix": [1, 9], "x": 9, "y": 1.5},
-        {"matrix": [1, 10], "x": 10, "y": 1.5},
-        {"matrix": [1, 11], "x": 11, "y": 1.5},
-        {"matrix": [1, 12], "x": 12, "y": 1.5},
-        {"matrix": [1, 13], "x": 13, "y": 1.5, "w": 2},
-
-        {"matrix": [1, 14], "x": 15.25, "y": 1.5},
-        {"matrix": [1, 15], "x": 16.25, "y": 1.5},
-        {"matrix": [2, 15], "x": 17.25, "y": 1.5},
-
-        {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
-        {"matrix": [2, 1], "x": 1.5, "y": 2.5},
-        {"matrix": [2, 2], "x": 2.5, "y": 2.5},
-        {"matrix": [2, 3], "x": 3.5, "y": 2.5},
-        {"matrix": [2, 4], "x": 4.5, "y": 2.5},
-        {"matrix": [2, 5], "x": 5.5, "y": 2.5},
-        {"matrix": [2, 6], "x": 6.5, "y": 2.5},
-        {"matrix": [2, 7], "x": 7.5, "y": 2.5},
-        {"matrix": [2, 8], "x": 8.5, "y": 2.5},
-        {"matrix": [2, 9], "x": 9.5, "y": 2.5},
-        {"matrix": [2, 10], "x": 10.5, "y": 2.5},
-        {"matrix": [2, 11], "x": 11.5, "y": 2.5},
-        {"matrix": [2, 12], "x": 12.5, "y": 2.5},
-        {"matrix": [2, 13], "x": 13.5, "y": 2.5, "w": 1.5},
-
-        {"matrix": [2, 14], "x": 15.25, "y": 2.5},
-        {"matrix": [3, 14], "x": 16.25, "y": 2.5},
-        {"matrix": [3, 15], "x": 17.25, "y": 2.5},
-
-        {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
-        {"matrix": [3, 1], "x": 1.75, "y": 3.5},
-        {"matrix": [3, 2], "x": 2.75, "y": 3.5},
-        {"matrix": [3, 3], "x": 3.75, "y": 3.5},
-        {"matrix": [3, 4], "x": 4.75, "y": 3.5},
-        {"matrix": [3, 5], "x": 5.75, "y": 3.5},
-        {"matrix": [3, 6], "x": 6.75, "y": 3.5},
-        {"matrix": [3, 7], "x": 7.75, "y": 3.5},
-        {"matrix": [3, 8], "x": 8.75, "y": 3.5},
-        {"matrix": [3, 9], "x": 9.75, "y": 3.5},
-        {"matrix": [3, 10], "x": 10.75, "y": 3.5},
-        {"matrix": [3, 11], "x": 11.75, "y": 3.5},
-        {"matrix": [3, 13], "x": 12.75, "y": 3.5, "w": 2.25},
-
-        {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
-        {"matrix": [4, 2], "x": 2.25, "y": 4.5},
-        {"matrix": [4, 3], "x": 3.25, "y": 4.5},
-        {"matrix": [4, 4], "x": 4.25, "y": 4.5},
-        {"matrix": [4, 5], "x": 5.25, "y": 4.5},
-        {"matrix": [4, 6], "x": 6.25, "y": 4.5},
-        {"matrix": [4, 7], "x": 7.25, "y": 4.5},
-        {"matrix": [4, 8], "x": 8.25, "y": 4.5},
-        {"matrix": [4, 9], "x": 9.25, "y": 4.5},
-        {"matrix": [4, 10], "x": 10.25, "y": 4.5},
-        {"matrix": [4, 11], "x": 11.25, "y": 4.5},
-        {"matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 2.75},
-
-        {"matrix": [4, 14], "x": 16.25, "y": 4.5},
-
-        {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25},
-        {"matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25},
-        {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25},
-        {"matrix": [5, 6], "x": 3.75, "y": 5.5, "w": 6.25},
-        {"matrix": [5, 7], "x": 10, "y": 5.5, "w": 1.25},
-        {"matrix": [5, 8], "x": 11.25, "y": 5.5, "w": 1.25},
-        {"matrix": [5, 9], "x": 12.5, "y": 5.5, "w": 1.25},
-        {"matrix": [5, 10], "x": 13.75, "y": 5.5, "w": 1.25},
-
-        {"matrix": [5, 11], "x": 15.25, "y": 5.5},
-        {"matrix": [5, 12], "x": 16.25, "y": 5.5},
-        {"matrix": [5, 14], "x": 17.25, "y": 5.5}
-      ]
-    },
-    "LAYOUT_tkl_iso": {
-      "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, 13], "x": 15.25, "y": 0},
-        {"matrix": [0, 14], "x": 16.25, "y": 0},
-        {"matrix": [0, 15], "x": 17.25, "y": 0},
-
-        {"matrix": [1, 0], "x": 0, "y": 1.5},
-        {"matrix": [1, 1], "x": 1, "y": 1.5},
-        {"matrix": [1, 2], "x": 2, "y": 1.5},
-        {"matrix": [1, 3], "x": 3, "y": 1.5},
-        {"matrix": [1, 4], "x": 4, "y": 1.5},
-        {"matrix": [1, 5], "x": 5, "y": 1.5},
-        {"matrix": [1, 6], "x": 6, "y": 1.5},
-        {"matrix": [1, 7], "x": 7, "y": 1.5},
-        {"matrix": [1, 8], "x": 8, "y": 1.5},
-        {"matrix": [1, 9], "x": 9, "y": 1.5},
-        {"matrix": [1, 10], "x": 10, "y": 1.5},
-        {"matrix": [1, 11], "x": 11, "y": 1.5},
-        {"matrix": [1, 12], "x": 12, "y": 1.5},
-        {"matrix": [1, 13], "x": 13, "y": 1.5, "w": 2},
-
-        {"matrix": [1, 14], "x": 15.25, "y": 1.5},
-        {"matrix": [1, 15], "x": 16.25, "y": 1.5},
-        {"matrix": [2, 15], "x": 17.25, "y": 1.5},
-
-        {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
-        {"matrix": [2, 1], "x": 1.5, "y": 2.5},
-        {"matrix": [2, 2], "x": 2.5, "y": 2.5},
-        {"matrix": [2, 3], "x": 3.5, "y": 2.5},
-        {"matrix": [2, 4], "x": 4.5, "y": 2.5},
-        {"matrix": [2, 5], "x": 5.5, "y": 2.5},
-        {"matrix": [2, 6], "x": 6.5, "y": 2.5},
-        {"matrix": [2, 7], "x": 7.5, "y": 2.5},
-        {"matrix": [2, 8], "x": 8.5, "y": 2.5},
-        {"matrix": [2, 9], "x": 9.5, "y": 2.5},
-        {"matrix": [2, 10], "x": 10.5, "y": 2.5},
-        {"matrix": [2, 11], "x": 11.5, "y": 2.5},
-        {"matrix": [2, 12], "x": 12.5, "y": 2.5},
-        {"matrix": [2, 14], "x": 15.25, "y": 2.5},
-        {"matrix": [3, 14], "x": 16.25, "y": 2.5},
-        {"matrix": [3, 15], "x": 17.25, "y": 2.5},
-
-        {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
-        {"matrix": [3, 1], "x": 1.75, "y": 3.5},
-        {"matrix": [3, 2], "x": 2.75, "y": 3.5},
-        {"matrix": [3, 3], "x": 3.75, "y": 3.5},
-        {"matrix": [3, 4], "x": 4.75, "y": 3.5},
-        {"matrix": [3, 5], "x": 5.75, "y": 3.5},
-        {"matrix": [3, 6], "x": 6.75, "y": 3.5},
-        {"matrix": [3, 7], "x": 7.75, "y": 3.5},
-        {"matrix": [3, 8], "x": 8.75, "y": 3.5},
-        {"matrix": [3, 9], "x": 9.75, "y": 3.5},
-        {"matrix": [3, 10], "x": 10.75, "y": 3.5},
-        {"matrix": [3, 11], "x": 11.75, "y": 3.5},
-        {"matrix": [3, 12], "x": 12.75, "y": 3.5},
-        {"matrix": [3, 13], "x": 13.75, "y": 2.5, "w": 1.25, "h": 2},
-
-        {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 1.25},
-        {"matrix": [4, 1], "x": 1.25, "y": 4.5},
-        {"matrix": [4, 2], "x": 2.25, "y": 4.5},
-        {"matrix": [4, 3], "x": 3.25, "y": 4.5},
-        {"matrix": [4, 4], "x": 4.25, "y": 4.5},
-        {"matrix": [4, 5], "x": 5.25, "y": 4.5},
-        {"matrix": [4, 6], "x": 6.25, "y": 4.5},
-        {"matrix": [4, 7], "x": 7.25, "y": 4.5},
-        {"matrix": [4, 8], "x": 8.25, "y": 4.5},
-        {"matrix": [4, 9], "x": 9.25, "y": 4.5},
-        {"matrix": [4, 10], "x": 10.25, "y": 4.5},
-        {"matrix": [4, 11], "x": 11.25, "y": 4.5},
-        {"matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 2.75},
-
-        {"matrix": [4, 14], "x": 16.25, "y": 4.5},
-
-        {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25},
-        {"matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25},
-        {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25},
-        {"matrix": [5, 6], "x": 3.75, "y": 5.5, "w": 6.25},
-        {"matrix": [5, 7], "x": 10, "y": 5.5, "w": 1.25},
-        {"matrix": [5, 8], "x": 11.25, "y": 5.5, "w": 1.25},
-        {"matrix": [5, 9], "x": 12.5, "y": 5.5, "w": 1.25},
-        {"matrix": [5, 10], "x": 13.75, "y": 5.5, "w": 1.25},
-
-        {"matrix": [5, 11], "x": 15.25, "y": 5.5},
-        {"matrix": [5, 12], "x": 16.25, "y": 5.5},
-        {"matrix": [5, 14], "x": 17.25, "y": 5.5}
-      ]
-    }
-  }
-}
diff --git a/keyboards/matrix/abelx/keyboard.json b/keyboards/matrix/abelx/keyboard.json
new file mode 100644
index 00000000000..7fcad281da2
--- /dev/null
+++ b/keyboards/matrix/abelx/keyboard.json
@@ -0,0 +1,249 @@
+{
+  "keyboard_name": "ABELX",
+  "manufacturer": "Matrix",
+  "url": "",
+  "maintainer": "qmk",
+  "usb": {
+    "vid": "0x4D58",
+    "pid": "0xAB87",
+    "device_version": "0.0.1",
+    "no_startup_check": true
+  },
+  "rgblight": {
+    "led_count": 9,
+    "driver": "custom",
+    "animations": {
+      "breathing": true,
+      "rainbow_mood": true,
+      "rainbow_swirl": true,
+      "snake": true,
+      "knight": true,
+      "christmas": true,
+      "static_gradient": true,
+      "rgb_test": true,
+      "alternating": true,
+      "twinkle": true
+    }
+  },
+  "ws2812": {
+    "pin": "B4"
+  },
+  "features": {
+    "bootmagic": true,
+    "mousekey": true,
+    "extrakey": true,
+    "rgblight": true
+  },
+  "processor": "STM32F411",
+  "bootloader": "custom",
+  "layouts": {
+    "LAYOUT_tkl_ansi": {
+      "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, 13], "x": 15.25, "y": 0},
+        {"matrix": [0, 14], "x": 16.25, "y": 0},
+        {"matrix": [0, 15], "x": 17.25, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1.5},
+        {"matrix": [1, 1], "x": 1, "y": 1.5},
+        {"matrix": [1, 2], "x": 2, "y": 1.5},
+        {"matrix": [1, 3], "x": 3, "y": 1.5},
+        {"matrix": [1, 4], "x": 4, "y": 1.5},
+        {"matrix": [1, 5], "x": 5, "y": 1.5},
+        {"matrix": [1, 6], "x": 6, "y": 1.5},
+        {"matrix": [1, 7], "x": 7, "y": 1.5},
+        {"matrix": [1, 8], "x": 8, "y": 1.5},
+        {"matrix": [1, 9], "x": 9, "y": 1.5},
+        {"matrix": [1, 10], "x": 10, "y": 1.5},
+        {"matrix": [1, 11], "x": 11, "y": 1.5},
+        {"matrix": [1, 12], "x": 12, "y": 1.5},
+        {"matrix": [1, 13], "x": 13, "y": 1.5, "w": 2},
+
+        {"matrix": [1, 14], "x": 15.25, "y": 1.5},
+        {"matrix": [1, 15], "x": 16.25, "y": 1.5},
+        {"matrix": [2, 15], "x": 17.25, "y": 1.5},
+
+        {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+        {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+        {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+        {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+        {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+        {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+        {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+        {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+        {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+        {"matrix": [2, 9], "x": 9.5, "y": 2.5},
+        {"matrix": [2, 10], "x": 10.5, "y": 2.5},
+        {"matrix": [2, 11], "x": 11.5, "y": 2.5},
+        {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+        {"matrix": [2, 13], "x": 13.5, "y": 2.5, "w": 1.5},
+
+        {"matrix": [2, 14], "x": 15.25, "y": 2.5},
+        {"matrix": [3, 14], "x": 16.25, "y": 2.5},
+        {"matrix": [3, 15], "x": 17.25, "y": 2.5},
+
+        {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+        {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+        {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+        {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+        {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+        {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+        {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+        {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+        {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+        {"matrix": [3, 9], "x": 9.75, "y": 3.5},
+        {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+        {"matrix": [3, 11], "x": 11.75, "y": 3.5},
+        {"matrix": [3, 13], "x": 12.75, "y": 3.5, "w": 2.25},
+
+        {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
+        {"matrix": [4, 2], "x": 2.25, "y": 4.5},
+        {"matrix": [4, 3], "x": 3.25, "y": 4.5},
+        {"matrix": [4, 4], "x": 4.25, "y": 4.5},
+        {"matrix": [4, 5], "x": 5.25, "y": 4.5},
+        {"matrix": [4, 6], "x": 6.25, "y": 4.5},
+        {"matrix": [4, 7], "x": 7.25, "y": 4.5},
+        {"matrix": [4, 8], "x": 8.25, "y": 4.5},
+        {"matrix": [4, 9], "x": 9.25, "y": 4.5},
+        {"matrix": [4, 10], "x": 10.25, "y": 4.5},
+        {"matrix": [4, 11], "x": 11.25, "y": 4.5},
+        {"matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 2.75},
+
+        {"matrix": [4, 14], "x": 16.25, "y": 4.5},
+
+        {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25},
+        {"matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25},
+        {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25},
+        {"matrix": [5, 6], "x": 3.75, "y": 5.5, "w": 6.25},
+        {"matrix": [5, 7], "x": 10, "y": 5.5, "w": 1.25},
+        {"matrix": [5, 8], "x": 11.25, "y": 5.5, "w": 1.25},
+        {"matrix": [5, 9], "x": 12.5, "y": 5.5, "w": 1.25},
+        {"matrix": [5, 10], "x": 13.75, "y": 5.5, "w": 1.25},
+
+        {"matrix": [5, 11], "x": 15.25, "y": 5.5},
+        {"matrix": [5, 12], "x": 16.25, "y": 5.5},
+        {"matrix": [5, 14], "x": 17.25, "y": 5.5}
+      ]
+    },
+    "LAYOUT_tkl_iso": {
+      "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, 13], "x": 15.25, "y": 0},
+        {"matrix": [0, 14], "x": 16.25, "y": 0},
+        {"matrix": [0, 15], "x": 17.25, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1.5},
+        {"matrix": [1, 1], "x": 1, "y": 1.5},
+        {"matrix": [1, 2], "x": 2, "y": 1.5},
+        {"matrix": [1, 3], "x": 3, "y": 1.5},
+        {"matrix": [1, 4], "x": 4, "y": 1.5},
+        {"matrix": [1, 5], "x": 5, "y": 1.5},
+        {"matrix": [1, 6], "x": 6, "y": 1.5},
+        {"matrix": [1, 7], "x": 7, "y": 1.5},
+        {"matrix": [1, 8], "x": 8, "y": 1.5},
+        {"matrix": [1, 9], "x": 9, "y": 1.5},
+        {"matrix": [1, 10], "x": 10, "y": 1.5},
+        {"matrix": [1, 11], "x": 11, "y": 1.5},
+        {"matrix": [1, 12], "x": 12, "y": 1.5},
+        {"matrix": [1, 13], "x": 13, "y": 1.5, "w": 2},
+
+        {"matrix": [1, 14], "x": 15.25, "y": 1.5},
+        {"matrix": [1, 15], "x": 16.25, "y": 1.5},
+        {"matrix": [2, 15], "x": 17.25, "y": 1.5},
+
+        {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+        {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+        {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+        {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+        {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+        {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+        {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+        {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+        {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+        {"matrix": [2, 9], "x": 9.5, "y": 2.5},
+        {"matrix": [2, 10], "x": 10.5, "y": 2.5},
+        {"matrix": [2, 11], "x": 11.5, "y": 2.5},
+        {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+        {"matrix": [2, 14], "x": 15.25, "y": 2.5},
+        {"matrix": [3, 14], "x": 16.25, "y": 2.5},
+        {"matrix": [3, 15], "x": 17.25, "y": 2.5},
+
+        {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+        {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+        {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+        {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+        {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+        {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+        {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+        {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+        {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+        {"matrix": [3, 9], "x": 9.75, "y": 3.5},
+        {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+        {"matrix": [3, 11], "x": 11.75, "y": 3.5},
+        {"matrix": [3, 12], "x": 12.75, "y": 3.5},
+        {"matrix": [3, 13], "x": 13.75, "y": 2.5, "w": 1.25, "h": 2},
+
+        {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 1.25},
+        {"matrix": [4, 1], "x": 1.25, "y": 4.5},
+        {"matrix": [4, 2], "x": 2.25, "y": 4.5},
+        {"matrix": [4, 3], "x": 3.25, "y": 4.5},
+        {"matrix": [4, 4], "x": 4.25, "y": 4.5},
+        {"matrix": [4, 5], "x": 5.25, "y": 4.5},
+        {"matrix": [4, 6], "x": 6.25, "y": 4.5},
+        {"matrix": [4, 7], "x": 7.25, "y": 4.5},
+        {"matrix": [4, 8], "x": 8.25, "y": 4.5},
+        {"matrix": [4, 9], "x": 9.25, "y": 4.5},
+        {"matrix": [4, 10], "x": 10.25, "y": 4.5},
+        {"matrix": [4, 11], "x": 11.25, "y": 4.5},
+        {"matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 2.75},
+
+        {"matrix": [4, 14], "x": 16.25, "y": 4.5},
+
+        {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25},
+        {"matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25},
+        {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25},
+        {"matrix": [5, 6], "x": 3.75, "y": 5.5, "w": 6.25},
+        {"matrix": [5, 7], "x": 10, "y": 5.5, "w": 1.25},
+        {"matrix": [5, 8], "x": 11.25, "y": 5.5, "w": 1.25},
+        {"matrix": [5, 9], "x": 12.5, "y": 5.5, "w": 1.25},
+        {"matrix": [5, 10], "x": 13.75, "y": 5.5, "w": 1.25},
+
+        {"matrix": [5, 11], "x": 15.25, "y": 5.5},
+        {"matrix": [5, 12], "x": 16.25, "y": 5.5},
+        {"matrix": [5, 14], "x": 17.25, "y": 5.5}
+      ]
+    }
+  }
+}
diff --git a/keyboards/matrix/abelx/rules.mk b/keyboards/matrix/abelx/rules.mk
index 83142dd71c6..ee9c23c0864 100644
--- a/keyboards/matrix/abelx/rules.mk
+++ b/keyboards/matrix/abelx/rules.mk
@@ -1,47 +1,7 @@
-## chip/board settings
-# - the next two should match the directories in
-#   <chibios>/os/hal/ports/$(MCU_FAMILY)/$(MCU_SERIES)
-MCU_FAMILY = STM32
-MCU_SERIES = STM32F4xx
-
-# Linker script to use
-# - it should exist either in <chibios>/os/common/ports/ARMCMx/compilers/GCC/ld/
-#   or <this_dir>/ld/
+# custom bootloader
 MCU_LDSCRIPT = abelx_boot
-
-# Startup code to use
-#  - it should exist in <chibios>/os/common/startup/ARMCMx/compilers/GCC/mk/
-MCU_STARTUP = stm32f4xx
-
-# Board: it should exist either in <chibios>/os/hal/boards/
-#  or <this_dir>/boards
 BOARD = abelx_bd
 
-# Cortex version
-MCU  = cortex-m4
-
-# ARM version, CORTEX-M0/M1 are 6, CORTEX-M3/M4/M7 are 7
-ARMV = 7
-
-USE_FPU = yes
-
-# Bootloader selection
-BOOTLOADER = custom
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-NO_USB_STARTUP_CHECK = yes  # Disable initialization only when usb is plugged in
-
 CUSTOM_MATRIX = lite
 # project specific files
 SRC += matrix.c tca6424.c aw9523b.c
diff --git a/keyboards/matrix/m12og/rev1/info.json b/keyboards/matrix/m12og/rev1/info.json
deleted file mode 100644
index 38a9de45acc..00000000000
--- a/keyboards/matrix/m12og/rev1/info.json
+++ /dev/null
@@ -1,246 +0,0 @@
-{
-    "keyboard_name": "m12og_v1",
-    "manufacturer": "Matrix",
-    "url": "",
-    "maintainer": "kb-elmo",
-    "usb": {
-        "vid": "0x4D58",
-        "pid": "0x0369",
-        "device_version": "0.0.1"
-    },
-    "indicators": {
-        "caps_lock": "B6",
-        "scroll_lock": "B5"
-    },
-    "rgblight": {
-        "led_count": 16,
-        "sleep": true,
-        "animations": {
-            "breathing": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "snake": true,
-            "knight": true,
-            "christmas": true,
-            "static_gradient": true,
-            "rgb_test": true,
-            "alternating": true,
-            "twinkle": true
-        }
-    },
-    "ws2812": {
-        "pin": "B8"
-    },
-    "layout_aliases": {
-        "LAYOUT_all": "LAYOUT_tkl_ansi_tsangan"
-    },
-    "community_layouts": [
-        "tkl_ansi_tsangan"
-    ],
-    "layouts": {
-        "LAYOUT_tkl_ansi_tsangan": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-
-                {"label": "F1", "matrix": [0, 1], "x": 2, "y": 0},
-                {"label": "F2", "matrix": [0, 2], "x": 3, "y": 0},
-                {"label": "F3", "matrix": [0, 3], "x": 4, "y": 0},
-                {"label": "F4", "matrix": [0, 4], "x": 5, "y": 0},
-
-                {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 0},
-                {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 0},
-                {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 0},
-                {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 0},
-
-                {"label": "F9", "matrix": [0, 9], "x": 11, "y": 0},
-                {"label": "F10", "matrix": [0, 10], "x": 12, "y": 0},
-                {"label": "F11", "matrix": [0, 11], "x": 13, "y": 0},
-                {"label": "F12", "matrix": [0, 12], "x": 14, "y": 0},
-
-                {"label": "Print Screen", "matrix": [0, 13], "x": 15.25, "y": 0},
-                {"label": "Scroll Lock", "matrix": [0, 14], "x": 16.25, "y": 0},
-                {"label": "Pause", "matrix": [0, 15], "x": 17.25, "y": 0},
-
-                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
-                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
-                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
-                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
-                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
-                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
-                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
-                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
-                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
-                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
-                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
-                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
-                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
-                {"label": "Backspace", "matrix": [2, 13], "x": 13, "y": 1.25, "w": 2},
-
-                {"label": "Insert", "matrix": [3, 13], "x": 15.25, "y": 1.25},
-                {"label": "Home", "matrix": [1, 14], "x": 16.25, "y": 1.25},
-                {"label": "Page Up", "matrix": [1, 15], "x": 17.25, "y": 1.25},
-
-                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
-                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
-                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
-                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
-                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
-                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
-                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
-                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
-                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
-                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
-                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
-                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
-                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
-                {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 2.25, "w": 1.5},
-
-                {"label": "Delete", "matrix": [3, 14], "x": 15.25, "y": 2.25},
-                {"label": "End", "matrix": [2, 14], "x": 16.25, "y": 2.25},
-                {"label": "Page Down", "matrix": [2, 15], "x": 17.25, "y": 2.25},
-
-                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
-                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
-                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
-                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
-                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
-                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
-                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
-                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
-                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
-                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
-                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
-                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
-                {"label": "Enter", "matrix": [3, 12], "x": 12.75, "y": 3.25, "w": 2.25},
-
-                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
-                {"label": "Z", "matrix": [4, 1], "x": 2.25, "y": 4.25},
-                {"label": "X", "matrix": [4, 2], "x": 3.25, "y": 4.25},
-                {"label": "C", "matrix": [4, 3], "x": 4.25, "y": 4.25},
-                {"label": "V", "matrix": [4, 4], "x": 5.25, "y": 4.25},
-                {"label": "B", "matrix": [4, 5], "x": 6.25, "y": 4.25},
-                {"label": "N", "matrix": [4, 6], "x": 7.25, "y": 4.25},
-                {"label": "M", "matrix": [4, 7], "x": 8.25, "y": 4.25},
-                {"label": ",", "matrix": [4, 8], "x": 9.25, "y": 4.25},
-                {"label": ".", "matrix": [4, 9], "x": 10.25, "y": 4.25},
-                {"label": "/", "matrix": [4, 10], "x": 11.25, "y": 4.25},
-                {"label": "Shift", "matrix": [4, 11], "x": 12.25, "y": 4.25, "w": 2.75},
-
-                {"label": "\u2191", "matrix": [4, 12], "x": 16.25, "y": 4.25},
-
-                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
-                {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 5.25},
-                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
-                {"label": "Space", "matrix": [5, 5], "x": 4, "y": 5.25, "w": 7},
-                {"label": "Alt", "matrix": [5, 6], "x": 11, "y": 5.25, "w": 1.5},
-                {"label": "Fn", "matrix": [5, 7], "x": 12.5, "y": 5.25},
-                {"label": "Ctrl", "matrix": [5, 8], "x": 13.5, "y": 5.25, "w": 1.5},
-
-                {"label": "\u2190", "matrix": [4, 13], "x": 15.25, "y": 5.25},
-                {"label": "\u2193", "matrix": [4, 14], "x": 16.25, "y": 5.25},
-                {"label": "\u2192", "matrix": [3, 15], "x": 17.25, "y": 5.25}
-            ]
-        },
-        "LAYOUT_tkl_ansi_wkl": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-
-                {"label": "F1", "matrix": [0, 1], "x": 2, "y": 0},
-                {"label": "F2", "matrix": [0, 2], "x": 3, "y": 0},
-                {"label": "F3", "matrix": [0, 3], "x": 4, "y": 0},
-                {"label": "F4", "matrix": [0, 4], "x": 5, "y": 0},
-
-                {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 0},
-                {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 0},
-                {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 0},
-                {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 0},
-
-                {"label": "F9", "matrix": [0, 9], "x": 11, "y": 0},
-                {"label": "F10", "matrix": [0, 10], "x": 12, "y": 0},
-                {"label": "F11", "matrix": [0, 11], "x": 13, "y": 0},
-                {"label": "F12", "matrix": [0, 12], "x": 14, "y": 0},
-
-                {"label": "Print Screen", "matrix": [0, 13], "x": 15.25, "y": 0},
-                {"label": "Scroll Lock", "matrix": [0, 14], "x": 16.25, "y": 0},
-                {"label": "Pause", "matrix": [0, 15], "x": 17.25, "y": 0},
-
-                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
-                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
-                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
-                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
-                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
-                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
-                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
-                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
-                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
-                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
-                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
-                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
-                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
-                {"label": "Backspace", "matrix": [2, 13], "x": 13, "y": 1.25, "w": 2},
-
-                {"label": "Insert", "matrix": [3, 13], "x": 15.25, "y": 1.25},
-                {"label": "Home", "matrix": [1, 14], "x": 16.25, "y": 1.25},
-                {"label": "Page Up", "matrix": [1, 15], "x": 17.25, "y": 1.25},
-
-                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
-                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
-                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
-                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
-                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
-                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
-                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
-                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
-                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
-                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
-                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
-                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
-                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
-                {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 2.25, "w": 1.5},
-
-                {"label": "Delete", "matrix": [3, 14], "x": 15.25, "y": 2.25},
-                {"label": "End", "matrix": [2, 14], "x": 16.25, "y": 2.25},
-                {"label": "Page Down", "matrix": [2, 15], "x": 17.25, "y": 2.25},
-
-                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
-                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
-                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
-                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
-                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
-                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
-                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
-                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
-                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
-                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
-                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
-                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
-                {"label": "Enter", "matrix": [3, 12], "x": 12.75, "y": 3.25, "w": 2.25},
-
-                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
-                {"label": "Z", "matrix": [4, 1], "x": 2.25, "y": 4.25},
-                {"label": "X", "matrix": [4, 2], "x": 3.25, "y": 4.25},
-                {"label": "C", "matrix": [4, 3], "x": 4.25, "y": 4.25},
-                {"label": "V", "matrix": [4, 4], "x": 5.25, "y": 4.25},
-                {"label": "B", "matrix": [4, 5], "x": 6.25, "y": 4.25},
-                {"label": "N", "matrix": [4, 6], "x": 7.25, "y": 4.25},
-                {"label": "M", "matrix": [4, 7], "x": 8.25, "y": 4.25},
-                {"label": ",", "matrix": [4, 8], "x": 9.25, "y": 4.25},
-                {"label": ".", "matrix": [4, 9], "x": 10.25, "y": 4.25},
-                {"label": "/", "matrix": [4, 10], "x": 11.25, "y": 4.25},
-                {"label": "Shift", "matrix": [4, 11], "x": 12.25, "y": 4.25, "w": 2.75},
-
-                {"label": "\u2191", "matrix": [4, 12], "x": 16.25, "y": 4.25},
-
-                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
-                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
-                {"label": "Space", "matrix": [5, 5], "x": 4, "y": 5.25, "w": 7},
-                {"label": "Alt", "matrix": [5, 6], "x": 11, "y": 5.25, "w": 1.5},
-                {"label": "Ctrl", "matrix": [5, 8], "x": 13.5, "y": 5.25, "w": 1.5},
-
-                {"label": "\u2190", "matrix": [4, 13], "x": 15.25, "y": 5.25},
-                {"label": "\u2193", "matrix": [4, 14], "x": 16.25, "y": 5.25},
-                {"label": "\u2192", "matrix": [3, 15], "x": 17.25, "y": 5.25}
-            ]
-        }
-    }
-}
diff --git a/keyboards/matrix/m12og/rev1/keyboard.json b/keyboards/matrix/m12og/rev1/keyboard.json
new file mode 100644
index 00000000000..c956720a8d0
--- /dev/null
+++ b/keyboards/matrix/m12og/rev1/keyboard.json
@@ -0,0 +1,257 @@
+{
+    "keyboard_name": "m12og_v1",
+    "manufacturer": "Matrix",
+    "url": "",
+    "maintainer": "kb-elmo",
+    "usb": {
+        "vid": "0x4D58",
+        "pid": "0x0369",
+        "device_version": "0.0.1"
+    },
+    "indicators": {
+        "caps_lock": "B6",
+        "scroll_lock": "B5"
+    },
+    "rgblight": {
+        "led_count": 16,
+        "sleep": true,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": true,
+            "twinkle": true
+        }
+    },
+    "ws2812": {
+        "pin": "B8"
+    },
+    "features": {
+        "bootmagic": false,
+        "mousekey": false,
+        "extrakey": true,
+        "rgblight": true
+    },
+    "build": {
+        "lto": true
+    },
+    "bootloader": "custom",
+    "processor": "STM32F103",
+    "layout_aliases": {
+        "LAYOUT_all": "LAYOUT_tkl_ansi_tsangan"
+    },
+    "community_layouts": [
+        "tkl_ansi_tsangan"
+    ],
+    "layouts": {
+        "LAYOUT_tkl_ansi_tsangan": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "F1", "matrix": [0, 1], "x": 2, "y": 0},
+                {"label": "F2", "matrix": [0, 2], "x": 3, "y": 0},
+                {"label": "F3", "matrix": [0, 3], "x": 4, "y": 0},
+                {"label": "F4", "matrix": [0, 4], "x": 5, "y": 0},
+
+                {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 0},
+                {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 0},
+                {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 0},
+                {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 0},
+
+                {"label": "F9", "matrix": [0, 9], "x": 11, "y": 0},
+                {"label": "F10", "matrix": [0, 10], "x": 12, "y": 0},
+                {"label": "F11", "matrix": [0, 11], "x": 13, "y": 0},
+                {"label": "F12", "matrix": [0, 12], "x": 14, "y": 0},
+
+                {"label": "Print Screen", "matrix": [0, 13], "x": 15.25, "y": 0},
+                {"label": "Scroll Lock", "matrix": [0, 14], "x": 16.25, "y": 0},
+                {"label": "Pause", "matrix": [0, 15], "x": 17.25, "y": 0},
+
+                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
+                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
+                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
+                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
+                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
+                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
+                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
+                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
+                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
+                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
+                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
+                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
+                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
+                {"label": "Backspace", "matrix": [2, 13], "x": 13, "y": 1.25, "w": 2},
+
+                {"label": "Insert", "matrix": [3, 13], "x": 15.25, "y": 1.25},
+                {"label": "Home", "matrix": [1, 14], "x": 16.25, "y": 1.25},
+                {"label": "Page Up", "matrix": [1, 15], "x": 17.25, "y": 1.25},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"label": "Delete", "matrix": [3, 14], "x": 15.25, "y": 2.25},
+                {"label": "End", "matrix": [2, 14], "x": 16.25, "y": 2.25},
+                {"label": "Page Down", "matrix": [2, 15], "x": 17.25, "y": 2.25},
+
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"label": "Enter", "matrix": [3, 12], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"label": "Z", "matrix": [4, 1], "x": 2.25, "y": 4.25},
+                {"label": "X", "matrix": [4, 2], "x": 3.25, "y": 4.25},
+                {"label": "C", "matrix": [4, 3], "x": 4.25, "y": 4.25},
+                {"label": "V", "matrix": [4, 4], "x": 5.25, "y": 4.25},
+                {"label": "B", "matrix": [4, 5], "x": 6.25, "y": 4.25},
+                {"label": "N", "matrix": [4, 6], "x": 7.25, "y": 4.25},
+                {"label": "M", "matrix": [4, 7], "x": 8.25, "y": 4.25},
+                {"label": ",", "matrix": [4, 8], "x": 9.25, "y": 4.25},
+                {"label": ".", "matrix": [4, 9], "x": 10.25, "y": 4.25},
+                {"label": "/", "matrix": [4, 10], "x": 11.25, "y": 4.25},
+                {"label": "Shift", "matrix": [4, 11], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"label": "\u2191", "matrix": [4, 12], "x": 16.25, "y": 4.25},
+
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 5.25},
+                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"label": "Space", "matrix": [5, 5], "x": 4, "y": 5.25, "w": 7},
+                {"label": "Alt", "matrix": [5, 6], "x": 11, "y": 5.25, "w": 1.5},
+                {"label": "Fn", "matrix": [5, 7], "x": 12.5, "y": 5.25},
+                {"label": "Ctrl", "matrix": [5, 8], "x": 13.5, "y": 5.25, "w": 1.5},
+
+                {"label": "\u2190", "matrix": [4, 13], "x": 15.25, "y": 5.25},
+                {"label": "\u2193", "matrix": [4, 14], "x": 16.25, "y": 5.25},
+                {"label": "\u2192", "matrix": [3, 15], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_ansi_wkl": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "F1", "matrix": [0, 1], "x": 2, "y": 0},
+                {"label": "F2", "matrix": [0, 2], "x": 3, "y": 0},
+                {"label": "F3", "matrix": [0, 3], "x": 4, "y": 0},
+                {"label": "F4", "matrix": [0, 4], "x": 5, "y": 0},
+
+                {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 0},
+                {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 0},
+                {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 0},
+                {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 0},
+
+                {"label": "F9", "matrix": [0, 9], "x": 11, "y": 0},
+                {"label": "F10", "matrix": [0, 10], "x": 12, "y": 0},
+                {"label": "F11", "matrix": [0, 11], "x": 13, "y": 0},
+                {"label": "F12", "matrix": [0, 12], "x": 14, "y": 0},
+
+                {"label": "Print Screen", "matrix": [0, 13], "x": 15.25, "y": 0},
+                {"label": "Scroll Lock", "matrix": [0, 14], "x": 16.25, "y": 0},
+                {"label": "Pause", "matrix": [0, 15], "x": 17.25, "y": 0},
+
+                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
+                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
+                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
+                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
+                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
+                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
+                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
+                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
+                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
+                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
+                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
+                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
+                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
+                {"label": "Backspace", "matrix": [2, 13], "x": 13, "y": 1.25, "w": 2},
+
+                {"label": "Insert", "matrix": [3, 13], "x": 15.25, "y": 1.25},
+                {"label": "Home", "matrix": [1, 14], "x": 16.25, "y": 1.25},
+                {"label": "Page Up", "matrix": [1, 15], "x": 17.25, "y": 1.25},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"label": "Delete", "matrix": [3, 14], "x": 15.25, "y": 2.25},
+                {"label": "End", "matrix": [2, 14], "x": 16.25, "y": 2.25},
+                {"label": "Page Down", "matrix": [2, 15], "x": 17.25, "y": 2.25},
+
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"label": "Enter", "matrix": [3, 12], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"label": "Z", "matrix": [4, 1], "x": 2.25, "y": 4.25},
+                {"label": "X", "matrix": [4, 2], "x": 3.25, "y": 4.25},
+                {"label": "C", "matrix": [4, 3], "x": 4.25, "y": 4.25},
+                {"label": "V", "matrix": [4, 4], "x": 5.25, "y": 4.25},
+                {"label": "B", "matrix": [4, 5], "x": 6.25, "y": 4.25},
+                {"label": "N", "matrix": [4, 6], "x": 7.25, "y": 4.25},
+                {"label": "M", "matrix": [4, 7], "x": 8.25, "y": 4.25},
+                {"label": ",", "matrix": [4, 8], "x": 9.25, "y": 4.25},
+                {"label": ".", "matrix": [4, 9], "x": 10.25, "y": 4.25},
+                {"label": "/", "matrix": [4, 10], "x": 11.25, "y": 4.25},
+                {"label": "Shift", "matrix": [4, 11], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"label": "\u2191", "matrix": [4, 12], "x": 16.25, "y": 4.25},
+
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"label": "Space", "matrix": [5, 5], "x": 4, "y": 5.25, "w": 7},
+                {"label": "Alt", "matrix": [5, 6], "x": 11, "y": 5.25, "w": 1.5},
+                {"label": "Ctrl", "matrix": [5, 8], "x": 13.5, "y": 5.25, "w": 1.5},
+
+                {"label": "\u2190", "matrix": [4, 13], "x": 15.25, "y": 5.25},
+                {"label": "\u2193", "matrix": [4, 14], "x": 16.25, "y": 5.25},
+                {"label": "\u2192", "matrix": [3, 15], "x": 17.25, "y": 5.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/matrix/m12og/rev1/rev1.c b/keyboards/matrix/m12og/rev1/rev1.c
index 702d3857c4b..f517703c605 100644
--- a/keyboards/matrix/m12og/rev1/rev1.c
+++ b/keyboards/matrix/m12og/rev1/rev1.c
@@ -29,4 +29,6 @@ void keyboard_post_init_kb(void) {
     rgblight_enable_noeeprom();
     rgblight_sethsv_noeeprom(5, 255, 255);
     rgblight_mode_noeeprom(37);
+
+    keyboard_post_init_user();
 }
diff --git a/keyboards/matrix/m12og/rev1/rules.mk b/keyboards/matrix/m12og/rev1/rules.mk
index 136d07cbaad..077011cdc16 100644
--- a/keyboards/matrix/m12og/rev1/rules.mk
+++ b/keyboards/matrix/m12og/rev1/rules.mk
@@ -1,26 +1,6 @@
-# MCU name
-MCU = STM32F103
-
+# custom bootloader
 MCU_LDSCRIPT = m12og_v1
-
 BOARD = m12og_v1
 
-# Bootloader selection
-BOOTLOADER = custom
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes       # HAS TO BE ON! Otherwise the custom matrix doesn't work
-AUDIO_ENABLE = no           # Audio output
-LTO_ENABLE = yes
-
 CUSTOM_MATRIX = lite
 SRC += matrix.c
diff --git a/keyboards/matrix/m12og/rev2/rev2.c b/keyboards/matrix/m12og/rev2/rev2.c
index 1a35dff7a90..fb424b164fb 100644
--- a/keyboards/matrix/m12og/rev2/rev2.c
+++ b/keyboards/matrix/m12og/rev2/rev2.c
@@ -4,10 +4,12 @@
 
 #include "quantum.h"
 
-void matrix_init_user(void) {
+void matrix_init_kb(void) {
 	setPinOutput(C6);
 	setPinOutput(B2);
 	setPinOutput(B1);
+
+    matrix_init_user();
 }
 
 bool led_update_kb(led_t led_state) {
diff --git a/keyboards/matrix/m20add/info.json b/keyboards/matrix/m20add/info.json
deleted file mode 100644
index 6e1a1c493f3..00000000000
--- a/keyboards/matrix/m20add/info.json
+++ /dev/null
@@ -1,239 +0,0 @@
-{
-  "keyboard_name": "8XV2.0 Additional",
-  "manufacturer": "Matrix",
-  "url": "",
-  "maintainer": "qmk",
-  "usb": {
-    "vid": "0x4D58",
-    "pid": "0x20AD",
-    "device_version": "0.0.1"
-  },
-  "rgblight": {
-    "led_count": 20,
-    "driver": "custom",
-    "animations": {
-      "breathing": true,
-      "rainbow_mood": true,
-      "rainbow_swirl": true,
-      "snake": true,
-      "knight": true,
-      "christmas": true,
-      "static_gradient": true,
-      "rgb_test": true,
-      "alternating": true,
-      "twinkle": true
-    }
-  },
-  "ws2812": {
-    "pin": "B4"
-  },
-  "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, 13], "x": 15.25, "y": 0},
-        {"matrix": [0, 14], "x": 16.25, "y": 0},
-        {"matrix": [0, 15], "x": 17.25, "y": 0},
-
-        {"matrix": [1, 0], "x": 0, "y": 1.5},
-        {"matrix": [1, 1], "x": 1, "y": 1.5},
-        {"matrix": [1, 2], "x": 2, "y": 1.5},
-        {"matrix": [1, 3], "x": 3, "y": 1.5},
-        {"matrix": [1, 4], "x": 4, "y": 1.5},
-        {"matrix": [1, 5], "x": 5, "y": 1.5},
-        {"matrix": [1, 6], "x": 6, "y": 1.5},
-        {"matrix": [1, 7], "x": 7, "y": 1.5},
-        {"matrix": [1, 8], "x": 8, "y": 1.5},
-        {"matrix": [1, 9], "x": 9, "y": 1.5},
-        {"matrix": [1, 10], "x": 10, "y": 1.5},
-        {"matrix": [1, 11], "x": 11, "y": 1.5},
-        {"matrix": [1, 12], "x": 12, "y": 1.5},
-        {"matrix": [1, 13], "x": 13, "y": 1.5, "w": 2},
-
-        {"matrix": [1, 14], "x": 15.25, "y": 1.5},
-        {"matrix": [1, 15], "x": 16.25, "y": 1.5},
-        {"matrix": [2, 15], "x": 17.25, "y": 1.5},
-
-        {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
-        {"matrix": [2, 1], "x": 1.5, "y": 2.5},
-        {"matrix": [2, 2], "x": 2.5, "y": 2.5},
-        {"matrix": [2, 3], "x": 3.5, "y": 2.5},
-        {"matrix": [2, 4], "x": 4.5, "y": 2.5},
-        {"matrix": [2, 5], "x": 5.5, "y": 2.5},
-        {"matrix": [2, 6], "x": 6.5, "y": 2.5},
-        {"matrix": [2, 7], "x": 7.5, "y": 2.5},
-        {"matrix": [2, 8], "x": 8.5, "y": 2.5},
-        {"matrix": [2, 9], "x": 9.5, "y": 2.5},
-        {"matrix": [2, 10], "x": 10.5, "y": 2.5},
-        {"matrix": [2, 11], "x": 11.5, "y": 2.5},
-        {"matrix": [2, 12], "x": 12.5, "y": 2.5},
-        {"matrix": [2, 13], "x": 13.5, "y": 2.5, "w": 1.5},
-
-        {"matrix": [2, 14], "x": 15.25, "y": 2.5},
-        {"matrix": [3, 14], "x": 16.25, "y": 2.5},
-        {"matrix": [3, 15], "x": 17.25, "y": 2.5},
-
-        {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
-        {"matrix": [3, 1], "x": 1.75, "y": 3.5},
-        {"matrix": [3, 2], "x": 2.75, "y": 3.5},
-        {"matrix": [3, 3], "x": 3.75, "y": 3.5},
-        {"matrix": [3, 4], "x": 4.75, "y": 3.5},
-        {"matrix": [3, 5], "x": 5.75, "y": 3.5},
-        {"matrix": [3, 6], "x": 6.75, "y": 3.5},
-        {"matrix": [3, 7], "x": 7.75, "y": 3.5},
-        {"matrix": [3, 8], "x": 8.75, "y": 3.5},
-        {"matrix": [3, 9], "x": 9.75, "y": 3.5},
-        {"matrix": [3, 10], "x": 10.75, "y": 3.5},
-        {"matrix": [3, 11], "x": 11.75, "y": 3.5},
-        {"matrix": [3, 13], "x": 12.75, "y": 3.5, "w": 2.25},
-
-        {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
-        {"matrix": [4, 2], "x": 2.25, "y": 4.5},
-        {"matrix": [4, 3], "x": 3.25, "y": 4.5},
-        {"matrix": [4, 4], "x": 4.25, "y": 4.5},
-        {"matrix": [4, 5], "x": 5.25, "y": 4.5},
-        {"matrix": [4, 6], "x": 6.25, "y": 4.5},
-        {"matrix": [4, 7], "x": 7.25, "y": 4.5},
-        {"matrix": [4, 8], "x": 8.25, "y": 4.5},
-        {"matrix": [4, 9], "x": 9.25, "y": 4.5},
-        {"matrix": [4, 10], "x": 10.25, "y": 4.5},
-        {"matrix": [4, 11], "x": 11.25, "y": 4.5},
-        {"matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 2.75},
-
-        {"matrix": [4, 14], "x": 16.25, "y": 4.5},
-
-        {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.5},
-        {"matrix": [5, 1], "x": 1.5, "y": 5.5},
-        {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.5},
-        {"matrix": [5, 6], "x": 4, "y": 5.5, "w": 7},
-        {"matrix": [5, 8], "x": 11, "y": 5.5, "w": 1.5},
-        {"matrix": [5, 9], "x": 12.5, "y": 5.5},
-        {"matrix": [5, 10], "x": 13.5, "y": 5.5, "w": 1.5},
-
-        {"matrix": [5, 11], "x": 15.25, "y": 5.5},
-        {"matrix": [5, 12], "x": 16.25, "y": 5.5},
-        {"matrix": [5, 14], "x": 17.25, "y": 5.5}
-      ]
-    },
-    "LAYOUT_tkl_iso_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, 13], "x": 15.25, "y": 0},
-        {"matrix": [0, 14], "x": 16.25, "y": 0},
-        {"matrix": [0, 15], "x": 17.25, "y": 0},
-
-        {"matrix": [1, 0], "x": 0, "y": 1.5},
-        {"matrix": [1, 1], "x": 1, "y": 1.5},
-        {"matrix": [1, 2], "x": 2, "y": 1.5},
-        {"matrix": [1, 3], "x": 3, "y": 1.5},
-        {"matrix": [1, 4], "x": 4, "y": 1.5},
-        {"matrix": [1, 5], "x": 5, "y": 1.5},
-        {"matrix": [1, 6], "x": 6, "y": 1.5},
-        {"matrix": [1, 7], "x": 7, "y": 1.5},
-        {"matrix": [1, 8], "x": 8, "y": 1.5},
-        {"matrix": [1, 9], "x": 9, "y": 1.5},
-        {"matrix": [1, 10], "x": 10, "y": 1.5},
-        {"matrix": [1, 11], "x": 11, "y": 1.5},
-        {"matrix": [1, 12], "x": 12, "y": 1.5},
-        {"matrix": [1, 13], "x": 13, "y": 1.5, "w": 2},
-
-        {"matrix": [1, 14], "x": 15.25, "y": 1.5},
-        {"matrix": [1, 15], "x": 16.25, "y": 1.5},
-        {"matrix": [2, 15], "x": 17.25, "y": 1.5},
-
-        {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
-        {"matrix": [2, 1], "x": 1.5, "y": 2.5},
-        {"matrix": [2, 2], "x": 2.5, "y": 2.5},
-        {"matrix": [2, 3], "x": 3.5, "y": 2.5},
-        {"matrix": [2, 4], "x": 4.5, "y": 2.5},
-        {"matrix": [2, 5], "x": 5.5, "y": 2.5},
-        {"matrix": [2, 6], "x": 6.5, "y": 2.5},
-        {"matrix": [2, 7], "x": 7.5, "y": 2.5},
-        {"matrix": [2, 8], "x": 8.5, "y": 2.5},
-        {"matrix": [2, 9], "x": 9.5, "y": 2.5},
-        {"matrix": [2, 10], "x": 10.5, "y": 2.5},
-        {"matrix": [2, 11], "x": 11.5, "y": 2.5},
-        {"matrix": [2, 12], "x": 12.5, "y": 2.5},
-
-        {"matrix": [2, 14], "x": 15.25, "y": 2.5},
-        {"matrix": [3, 14], "x": 16.25, "y": 2.5},
-        {"matrix": [3, 15], "x": 17.25, "y": 2.5},
-
-        {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
-        {"matrix": [3, 1], "x": 1.75, "y": 3.5},
-        {"matrix": [3, 2], "x": 2.75, "y": 3.5},
-        {"matrix": [3, 3], "x": 3.75, "y": 3.5},
-        {"matrix": [3, 4], "x": 4.75, "y": 3.5},
-        {"matrix": [3, 5], "x": 5.75, "y": 3.5},
-        {"matrix": [3, 6], "x": 6.75, "y": 3.5},
-        {"matrix": [3, 7], "x": 7.75, "y": 3.5},
-        {"matrix": [3, 8], "x": 8.75, "y": 3.5},
-        {"matrix": [3, 9], "x": 9.75, "y": 3.5},
-        {"matrix": [3, 10], "x": 10.75, "y": 3.5},
-        {"matrix": [3, 11], "x": 11.75, "y": 3.5},
-        {"matrix": [3, 12], "x": 12.75, "y": 3.5},
-        {"matrix": [3, 13], "x": 13.75, "y": 2.5, "w": 1.25, "h": 2},
-
-        {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 1.25},
-        {"matrix": [4, 1], "x": 1.25, "y": 4.5},
-        {"matrix": [4, 2], "x": 2.25, "y": 4.5},
-        {"matrix": [4, 3], "x": 3.25, "y": 4.5},
-        {"matrix": [4, 4], "x": 4.25, "y": 4.5},
-        {"matrix": [4, 5], "x": 5.25, "y": 4.5},
-        {"matrix": [4, 6], "x": 6.25, "y": 4.5},
-        {"matrix": [4, 7], "x": 7.25, "y": 4.5},
-        {"matrix": [4, 8], "x": 8.25, "y": 4.5},
-        {"matrix": [4, 9], "x": 9.25, "y": 4.5},
-        {"matrix": [4, 10], "x": 10.25, "y": 4.5},
-        {"matrix": [4, 11], "x": 11.25, "y": 4.5},
-        {"matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 2.75},
-
-        {"matrix": [4, 14], "x": 16.25, "y": 4.5},
-
-        {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.5},
-        {"matrix": [5, 1], "x": 1.5, "y": 5.5},
-        {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.5},
-        {"matrix": [5, 6], "x": 4, "y": 5.5, "w": 7},
-        {"matrix": [5, 8], "x": 11, "y": 5.5, "w": 1.5},
-        {"matrix": [5, 9], "x": 12.5, "y": 5.5},
-        {"matrix": [5, 10], "x": 13.5, "y": 5.5, "w": 1.5},
-
-        {"matrix": [5, 11], "x": 15.25, "y": 5.5},
-        {"matrix": [5, 12], "x": 16.25, "y": 5.5},
-        {"matrix": [5, 14], "x": 17.25, "y": 5.5}
-      ]
-    }
-  }
-}
diff --git a/keyboards/matrix/m20add/keyboard.json b/keyboards/matrix/m20add/keyboard.json
new file mode 100644
index 00000000000..fc58d242e60
--- /dev/null
+++ b/keyboards/matrix/m20add/keyboard.json
@@ -0,0 +1,248 @@
+{
+  "keyboard_name": "8XV2.0 Additional",
+  "manufacturer": "Matrix",
+  "url": "",
+  "maintainer": "qmk",
+  "usb": {
+    "vid": "0x4D58",
+    "pid": "0x20AD",
+    "device_version": "0.0.1",
+    "no_startup_check": true
+  },
+  "rgblight": {
+    "led_count": 20,
+    "driver": "custom",
+    "animations": {
+      "breathing": true,
+      "rainbow_mood": true,
+      "rainbow_swirl": true,
+      "snake": true,
+      "knight": true,
+      "christmas": true,
+      "static_gradient": true,
+      "rgb_test": true,
+      "alternating": true,
+      "twinkle": true
+    }
+  },
+  "ws2812": {
+    "pin": "B4"
+  },
+  "features": {
+    "bootmagic": true,
+    "mousekey": true,
+    "extrakey": true,
+    "rgblight": true
+  },
+  "processor": "STM32F411",
+  "bootloader": "custom",
+  "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, 13], "x": 15.25, "y": 0},
+        {"matrix": [0, 14], "x": 16.25, "y": 0},
+        {"matrix": [0, 15], "x": 17.25, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1.5},
+        {"matrix": [1, 1], "x": 1, "y": 1.5},
+        {"matrix": [1, 2], "x": 2, "y": 1.5},
+        {"matrix": [1, 3], "x": 3, "y": 1.5},
+        {"matrix": [1, 4], "x": 4, "y": 1.5},
+        {"matrix": [1, 5], "x": 5, "y": 1.5},
+        {"matrix": [1, 6], "x": 6, "y": 1.5},
+        {"matrix": [1, 7], "x": 7, "y": 1.5},
+        {"matrix": [1, 8], "x": 8, "y": 1.5},
+        {"matrix": [1, 9], "x": 9, "y": 1.5},
+        {"matrix": [1, 10], "x": 10, "y": 1.5},
+        {"matrix": [1, 11], "x": 11, "y": 1.5},
+        {"matrix": [1, 12], "x": 12, "y": 1.5},
+        {"matrix": [1, 13], "x": 13, "y": 1.5, "w": 2},
+
+        {"matrix": [1, 14], "x": 15.25, "y": 1.5},
+        {"matrix": [1, 15], "x": 16.25, "y": 1.5},
+        {"matrix": [2, 15], "x": 17.25, "y": 1.5},
+
+        {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+        {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+        {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+        {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+        {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+        {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+        {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+        {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+        {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+        {"matrix": [2, 9], "x": 9.5, "y": 2.5},
+        {"matrix": [2, 10], "x": 10.5, "y": 2.5},
+        {"matrix": [2, 11], "x": 11.5, "y": 2.5},
+        {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+        {"matrix": [2, 13], "x": 13.5, "y": 2.5, "w": 1.5},
+
+        {"matrix": [2, 14], "x": 15.25, "y": 2.5},
+        {"matrix": [3, 14], "x": 16.25, "y": 2.5},
+        {"matrix": [3, 15], "x": 17.25, "y": 2.5},
+
+        {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+        {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+        {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+        {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+        {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+        {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+        {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+        {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+        {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+        {"matrix": [3, 9], "x": 9.75, "y": 3.5},
+        {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+        {"matrix": [3, 11], "x": 11.75, "y": 3.5},
+        {"matrix": [3, 13], "x": 12.75, "y": 3.5, "w": 2.25},
+
+        {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
+        {"matrix": [4, 2], "x": 2.25, "y": 4.5},
+        {"matrix": [4, 3], "x": 3.25, "y": 4.5},
+        {"matrix": [4, 4], "x": 4.25, "y": 4.5},
+        {"matrix": [4, 5], "x": 5.25, "y": 4.5},
+        {"matrix": [4, 6], "x": 6.25, "y": 4.5},
+        {"matrix": [4, 7], "x": 7.25, "y": 4.5},
+        {"matrix": [4, 8], "x": 8.25, "y": 4.5},
+        {"matrix": [4, 9], "x": 9.25, "y": 4.5},
+        {"matrix": [4, 10], "x": 10.25, "y": 4.5},
+        {"matrix": [4, 11], "x": 11.25, "y": 4.5},
+        {"matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 2.75},
+
+        {"matrix": [4, 14], "x": 16.25, "y": 4.5},
+
+        {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.5},
+        {"matrix": [5, 1], "x": 1.5, "y": 5.5},
+        {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.5},
+        {"matrix": [5, 6], "x": 4, "y": 5.5, "w": 7},
+        {"matrix": [5, 8], "x": 11, "y": 5.5, "w": 1.5},
+        {"matrix": [5, 9], "x": 12.5, "y": 5.5},
+        {"matrix": [5, 10], "x": 13.5, "y": 5.5, "w": 1.5},
+
+        {"matrix": [5, 11], "x": 15.25, "y": 5.5},
+        {"matrix": [5, 12], "x": 16.25, "y": 5.5},
+        {"matrix": [5, 14], "x": 17.25, "y": 5.5}
+      ]
+    },
+    "LAYOUT_tkl_iso_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, 13], "x": 15.25, "y": 0},
+        {"matrix": [0, 14], "x": 16.25, "y": 0},
+        {"matrix": [0, 15], "x": 17.25, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1.5},
+        {"matrix": [1, 1], "x": 1, "y": 1.5},
+        {"matrix": [1, 2], "x": 2, "y": 1.5},
+        {"matrix": [1, 3], "x": 3, "y": 1.5},
+        {"matrix": [1, 4], "x": 4, "y": 1.5},
+        {"matrix": [1, 5], "x": 5, "y": 1.5},
+        {"matrix": [1, 6], "x": 6, "y": 1.5},
+        {"matrix": [1, 7], "x": 7, "y": 1.5},
+        {"matrix": [1, 8], "x": 8, "y": 1.5},
+        {"matrix": [1, 9], "x": 9, "y": 1.5},
+        {"matrix": [1, 10], "x": 10, "y": 1.5},
+        {"matrix": [1, 11], "x": 11, "y": 1.5},
+        {"matrix": [1, 12], "x": 12, "y": 1.5},
+        {"matrix": [1, 13], "x": 13, "y": 1.5, "w": 2},
+
+        {"matrix": [1, 14], "x": 15.25, "y": 1.5},
+        {"matrix": [1, 15], "x": 16.25, "y": 1.5},
+        {"matrix": [2, 15], "x": 17.25, "y": 1.5},
+
+        {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+        {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+        {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+        {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+        {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+        {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+        {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+        {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+        {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+        {"matrix": [2, 9], "x": 9.5, "y": 2.5},
+        {"matrix": [2, 10], "x": 10.5, "y": 2.5},
+        {"matrix": [2, 11], "x": 11.5, "y": 2.5},
+        {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+
+        {"matrix": [2, 14], "x": 15.25, "y": 2.5},
+        {"matrix": [3, 14], "x": 16.25, "y": 2.5},
+        {"matrix": [3, 15], "x": 17.25, "y": 2.5},
+
+        {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+        {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+        {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+        {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+        {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+        {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+        {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+        {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+        {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+        {"matrix": [3, 9], "x": 9.75, "y": 3.5},
+        {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+        {"matrix": [3, 11], "x": 11.75, "y": 3.5},
+        {"matrix": [3, 12], "x": 12.75, "y": 3.5},
+        {"matrix": [3, 13], "x": 13.75, "y": 2.5, "w": 1.25, "h": 2},
+
+        {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 1.25},
+        {"matrix": [4, 1], "x": 1.25, "y": 4.5},
+        {"matrix": [4, 2], "x": 2.25, "y": 4.5},
+        {"matrix": [4, 3], "x": 3.25, "y": 4.5},
+        {"matrix": [4, 4], "x": 4.25, "y": 4.5},
+        {"matrix": [4, 5], "x": 5.25, "y": 4.5},
+        {"matrix": [4, 6], "x": 6.25, "y": 4.5},
+        {"matrix": [4, 7], "x": 7.25, "y": 4.5},
+        {"matrix": [4, 8], "x": 8.25, "y": 4.5},
+        {"matrix": [4, 9], "x": 9.25, "y": 4.5},
+        {"matrix": [4, 10], "x": 10.25, "y": 4.5},
+        {"matrix": [4, 11], "x": 11.25, "y": 4.5},
+        {"matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 2.75},
+
+        {"matrix": [4, 14], "x": 16.25, "y": 4.5},
+
+        {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.5},
+        {"matrix": [5, 1], "x": 1.5, "y": 5.5},
+        {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.5},
+        {"matrix": [5, 6], "x": 4, "y": 5.5, "w": 7},
+        {"matrix": [5, 8], "x": 11, "y": 5.5, "w": 1.5},
+        {"matrix": [5, 9], "x": 12.5, "y": 5.5},
+        {"matrix": [5, 10], "x": 13.5, "y": 5.5, "w": 1.5},
+
+        {"matrix": [5, 11], "x": 15.25, "y": 5.5},
+        {"matrix": [5, 12], "x": 16.25, "y": 5.5},
+        {"matrix": [5, 14], "x": 17.25, "y": 5.5}
+      ]
+    }
+  }
+}
diff --git a/keyboards/matrix/m20add/rules.mk b/keyboards/matrix/m20add/rules.mk
index 1b005b8c174..980cf9518bd 100644
--- a/keyboards/matrix/m20add/rules.mk
+++ b/keyboards/matrix/m20add/rules.mk
@@ -1,31 +1,7 @@
-# MCU name
-MCU = STM32F411
-
-# Linker script to use
-# - it should exist either in <chibios>/os/common/ports/ARMCMx/compilers/GCC/ld/
-#   or <this_dir>/ld/
+# custom bootloader
 MCU_LDSCRIPT = m20add_boot
-
-# Board: it should exist either in <chibios>/os/hal/boards/
-#  or <this_dir>/boards
 BOARD = ST_NUCLEO64_F411RE
 
-# Bootloader selection
-BOOTLOADER = custom
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes	    # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-NO_USB_STARTUP_CHECK = yes	# Disable initialization only when usb is plugged in
-
-RGBLIGHT_ENABLE = yes
-
 CUSTOM_MATRIX = lite
 # project specific files
 SRC += matrix.c tca6424.c rgb_ring.c drivers/led/issi/is31fl3731.c
diff --git a/keyboards/matrix/noah/info.json b/keyboards/matrix/noah/info.json
deleted file mode 100644
index bc546cffc91..00000000000
--- a/keyboards/matrix/noah/info.json
+++ /dev/null
@@ -1,461 +0,0 @@
-{
-  "keyboard_name": "NOAH",
-  "manufacturer": "Matrix",
-  "url": "",
-  "maintainer": "astro",
-  "usb": {
-    "vid": "0x4D58",
-    "pid": "0x0065",
-    "device_version": "0.0.1"
-  },
-  "rgblight": {
-    "driver": "custom",
-    "led_count": 7,
-    "animations": {
-      "breathing": true,
-      "rainbow_mood": true,
-      "rainbow_swirl": true,
-      "snake": true,
-      "knight": true,
-      "christmas": true,
-      "static_gradient": true,
-      "rgb_test": true,
-      "alternating": true,
-      "twinkle": true
-    }
-  },
-  "ws2812": {
-    "pin": "B1"
-  },
-  "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,
-      "rainbow_moving_chevron": true,
-      "cycle_out_in": true,
-      "cycle_out_in_dual": 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_rain": true,
-      "pixel_flow": true,
-      "pixel_fractal": 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": "is31fl3731"
-  },
-  "community_layouts": ["65_iso_blocker"],
-  "layouts": {
-    "LAYOUT_default": {
-      "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, 14], "x": 14, "y": 0},
-        {"matrix": [4, 14], "x": 15, "y": 0},
-
-        {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-        {"matrix": [1, 1], "x": 1.5, "y": 1},
-        {"matrix": [1, 2], "x": 2.5, "y": 1},
-        {"matrix": [1, 3], "x": 3.5, "y": 1},
-        {"matrix": [1, 4], "x": 4.5, "y": 1},
-        {"matrix": [1, 5], "x": 5.5, "y": 1},
-        {"matrix": [1, 6], "x": 6.5, "y": 1},
-        {"matrix": [1, 7], "x": 7.5, "y": 1},
-        {"matrix": [1, 8], "x": 8.5, "y": 1},
-        {"matrix": [1, 9], "x": 9.5, "y": 1},
-        {"matrix": [1, 10], "x": 10.5, "y": 1},
-        {"matrix": [1, 11], "x": 11.5, "y": 1},
-        {"matrix": [1, 12], "x": 12.5, "y": 1},
-        {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-        {"matrix": [4, 11], "x": 15, "y": 1},
-
-        {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-        {"matrix": [2, 1], "x": 1.75, "y": 2},
-        {"matrix": [2, 2], "x": 2.75, "y": 2},
-        {"matrix": [2, 3], "x": 3.75, "y": 2},
-        {"matrix": [2, 4], "x": 4.75, "y": 2},
-        {"matrix": [2, 5], "x": 5.75, "y": 2},
-        {"matrix": [2, 6], "x": 6.75, "y": 2},
-        {"matrix": [2, 7], "x": 7.75, "y": 2},
-        {"matrix": [2, 8], "x": 8.75, "y": 2},
-        {"matrix": [2, 9], "x": 9.75, "y": 2},
-        {"matrix": [2, 10], "x": 10.75, "y": 2},
-        {"matrix": [2, 11], "x": 11.75, "y": 2},
-        {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
-        {"matrix": [4, 12], "x": 15, "y": 2},
-
-        {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-        {"matrix": [3, 2], "x": 2.25, "y": 3},
-        {"matrix": [3, 3], "x": 3.25, "y": 3},
-        {"matrix": [3, 4], "x": 4.25, "y": 3},
-        {"matrix": [3, 5], "x": 5.25, "y": 3},
-        {"matrix": [3, 6], "x": 6.25, "y": 3},
-        {"matrix": [3, 7], "x": 7.25, "y": 3},
-        {"matrix": [3, 8], "x": 8.25, "y": 3},
-        {"matrix": [3, 9], "x": 9.25, "y": 3},
-        {"matrix": [3, 10], "x": 10.25, "y": 3},
-        {"matrix": [3, 11], "x": 11.25, "y": 3},
-        {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-        {"matrix": [3, 13], "x": 14, "y": 3},
-        {"matrix": [4, 13], "x": 15, "y": 3},
-
-        {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-        {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-        {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-        {"matrix": [4, 4], "x": 3.75, "y": 4, "w": 6.25},
-        {"matrix": [4, 6], "x": 10, "y": 4, "w": 1.25},
-        {"matrix": [4, 7], "x": 11.25, "y": 4, "w": 1.25},
-        {"matrix": [4, 8], "x": 13, "y": 4},
-        {"matrix": [4, 9], "x": 14, "y": 4},
-        {"matrix": [4, 10], "x": 15, "y": 4}
-      ]
-    },
-    "LAYOUT_default_splitspace": {
-      "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, 14], "x": 14, "y": 0},
-        {"matrix": [4, 14], "x": 15, "y": 0},
-
-        {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-        {"matrix": [1, 1], "x": 1.5, "y": 1},
-        {"matrix": [1, 2], "x": 2.5, "y": 1},
-        {"matrix": [1, 3], "x": 3.5, "y": 1},
-        {"matrix": [1, 4], "x": 4.5, "y": 1},
-        {"matrix": [1, 5], "x": 5.5, "y": 1},
-        {"matrix": [1, 6], "x": 6.5, "y": 1},
-        {"matrix": [1, 7], "x": 7.5, "y": 1},
-        {"matrix": [1, 8], "x": 8.5, "y": 1},
-        {"matrix": [1, 9], "x": 9.5, "y": 1},
-        {"matrix": [1, 10], "x": 10.5, "y": 1},
-        {"matrix": [1, 11], "x": 11.5, "y": 1},
-        {"matrix": [1, 12], "x": 12.5, "y": 1},
-        {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-        {"matrix": [4, 11], "x": 15, "y": 1},
-
-        {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-        {"matrix": [2, 1], "x": 1.75, "y": 2},
-        {"matrix": [2, 2], "x": 2.75, "y": 2},
-        {"matrix": [2, 3], "x": 3.75, "y": 2},
-        {"matrix": [2, 4], "x": 4.75, "y": 2},
-        {"matrix": [2, 5], "x": 5.75, "y": 2},
-        {"matrix": [2, 6], "x": 6.75, "y": 2},
-        {"matrix": [2, 7], "x": 7.75, "y": 2},
-        {"matrix": [2, 8], "x": 8.75, "y": 2},
-        {"matrix": [2, 9], "x": 9.75, "y": 2},
-        {"matrix": [2, 10], "x": 10.75, "y": 2},
-        {"matrix": [2, 11], "x": 11.75, "y": 2},
-        {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
-        {"matrix": [4, 12], "x": 15, "y": 2},
-
-        {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-        {"matrix": [3, 2], "x": 2.25, "y": 3},
-        {"matrix": [3, 3], "x": 3.25, "y": 3},
-        {"matrix": [3, 4], "x": 4.25, "y": 3},
-        {"matrix": [3, 5], "x": 5.25, "y": 3},
-        {"matrix": [3, 6], "x": 6.25, "y": 3},
-        {"matrix": [3, 7], "x": 7.25, "y": 3},
-        {"matrix": [3, 8], "x": 8.25, "y": 3},
-        {"matrix": [3, 9], "x": 9.25, "y": 3},
-        {"matrix": [3, 10], "x": 10.25, "y": 3},
-        {"matrix": [3, 11], "x": 11.25, "y": 3},
-        {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-        {"matrix": [3, 13], "x": 14, "y": 3},
-        {"matrix": [4, 13], "x": 15, "y": 3},
-
-        {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-        {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-        {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-        {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 2.25},
-        {"matrix": [4, 4], "x": 6, "y": 4, "w": 1.25},
-        {"matrix": [4, 5], "x": 7.25, "y": 4, "w": 2.75},
-        {"matrix": [4, 6], "x": 10, "y": 4, "w": 1.25},
-        {"matrix": [4, 7], "x": 11.25, "y": 4, "w": 1.25},
-        {"matrix": [4, 8], "x": 13, "y": 4},
-        {"matrix": [4, 9], "x": 14, "y": 4},
-        {"matrix": [4, 10], "x": 15, "y": 4}
-      ]
-    },
-    "LAYOUT_wkl": {
-      "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, 14], "x": 14, "y": 0},
-        {"matrix": [4, 14], "x": 15, "y": 0},
-
-        {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-        {"matrix": [1, 1], "x": 1.5, "y": 1},
-        {"matrix": [1, 2], "x": 2.5, "y": 1},
-        {"matrix": [1, 3], "x": 3.5, "y": 1},
-        {"matrix": [1, 4], "x": 4.5, "y": 1},
-        {"matrix": [1, 5], "x": 5.5, "y": 1},
-        {"matrix": [1, 6], "x": 6.5, "y": 1},
-        {"matrix": [1, 7], "x": 7.5, "y": 1},
-        {"matrix": [1, 8], "x": 8.5, "y": 1},
-        {"matrix": [1, 9], "x": 9.5, "y": 1},
-        {"matrix": [1, 10], "x": 10.5, "y": 1},
-        {"matrix": [1, 11], "x": 11.5, "y": 1},
-        {"matrix": [1, 12], "x": 12.5, "y": 1},
-        {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-        {"matrix": [4, 11], "x": 15, "y": 1},
-
-        {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-        {"matrix": [2, 1], "x": 1.75, "y": 2},
-        {"matrix": [2, 2], "x": 2.75, "y": 2},
-        {"matrix": [2, 3], "x": 3.75, "y": 2},
-        {"matrix": [2, 4], "x": 4.75, "y": 2},
-        {"matrix": [2, 5], "x": 5.75, "y": 2},
-        {"matrix": [2, 6], "x": 6.75, "y": 2},
-        {"matrix": [2, 7], "x": 7.75, "y": 2},
-        {"matrix": [2, 8], "x": 8.75, "y": 2},
-        {"matrix": [2, 9], "x": 9.75, "y": 2},
-        {"matrix": [2, 10], "x": 10.75, "y": 2},
-        {"matrix": [2, 11], "x": 11.75, "y": 2},
-        {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
-        {"matrix": [4, 12], "x": 15, "y": 2},
-
-        {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-        {"matrix": [3, 2], "x": 2.25, "y": 3},
-        {"matrix": [3, 3], "x": 3.25, "y": 3},
-        {"matrix": [3, 4], "x": 4.25, "y": 3},
-        {"matrix": [3, 5], "x": 5.25, "y": 3},
-        {"matrix": [3, 6], "x": 6.25, "y": 3},
-        {"matrix": [3, 7], "x": 7.25, "y": 3},
-        {"matrix": [3, 8], "x": 8.25, "y": 3},
-        {"matrix": [3, 9], "x": 9.25, "y": 3},
-        {"matrix": [3, 10], "x": 10.25, "y": 3},
-        {"matrix": [3, 11], "x": 11.25, "y": 3},
-        {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-        {"matrix": [3, 13], "x": 14, "y": 3},
-        {"matrix": [4, 13], "x": 15, "y": 3},
-
-        {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
-        {"matrix": [4, 1], "x": 1.5, "y": 4},
-        {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
-        {"matrix": [4, 4], "x": 4, "y": 4, "w": 7},
-        {"matrix": [4, 7], "x": 11, "y": 4, "w": 1.5},
-        {"matrix": [4, 8], "x": 13, "y": 4},
-        {"matrix": [4, 9], "x": 14, "y": 4},
-        {"matrix": [4, 10], "x": 15, "y": 4}
-      ]
-    },
-    "LAYOUT_iso": {
-      "layout": [
-        {"matrix": [0, 0], "x": 0, "y": 0},
-        {"matrix": [0, 1], "x": 1, "y": 0},
-        {"matrix": [0, 2], "x": 2, "y": 0},
-        {"matrix": [0, 3], "x": 3, "y": 0},
-        {"matrix": [0, 4], "x": 4, "y": 0},
-        {"matrix": [0, 5], "x": 5, "y": 0},
-        {"matrix": [0, 6], "x": 6, "y": 0},
-        {"matrix": [0, 7], "x": 7, "y": 0},
-        {"matrix": [0, 8], "x": 8, "y": 0},
-        {"matrix": [0, 9], "x": 9, "y": 0},
-        {"matrix": [0, 10], "x": 10, "y": 0},
-        {"matrix": [0, 11], "x": 11, "y": 0},
-        {"matrix": [0, 12], "x": 12, "y": 0},
-        {"matrix": [0, 14], "x": 13, "y": 0, "w": 2},
-        {"matrix": [4, 14], "x": 15, "y": 0},
-
-        {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-        {"matrix": [1, 1], "x": 1.5, "y": 1},
-        {"matrix": [1, 2], "x": 2.5, "y": 1},
-        {"matrix": [1, 3], "x": 3.5, "y": 1},
-        {"matrix": [1, 4], "x": 4.5, "y": 1},
-        {"matrix": [1, 5], "x": 5.5, "y": 1},
-        {"matrix": [1, 6], "x": 6.5, "y": 1},
-        {"matrix": [1, 7], "x": 7.5, "y": 1},
-        {"matrix": [1, 8], "x": 8.5, "y": 1},
-        {"matrix": [1, 9], "x": 9.5, "y": 1},
-        {"matrix": [1, 10], "x": 10.5, "y": 1},
-        {"matrix": [1, 11], "x": 11.5, "y": 1},
-        {"matrix": [1, 12], "x": 12.5, "y": 1},
-        {"matrix": [4, 11], "x": 15, "y": 1},
-
-        {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-        {"matrix": [2, 1], "x": 1.75, "y": 2},
-        {"matrix": [2, 2], "x": 2.75, "y": 2},
-        {"matrix": [2, 3], "x": 3.75, "y": 2},
-        {"matrix": [2, 4], "x": 4.75, "y": 2},
-        {"matrix": [2, 5], "x": 5.75, "y": 2},
-        {"matrix": [2, 6], "x": 6.75, "y": 2},
-        {"matrix": [2, 7], "x": 7.75, "y": 2},
-        {"matrix": [2, 8], "x": 8.75, "y": 2},
-        {"matrix": [2, 9], "x": 9.75, "y": 2},
-        {"matrix": [2, 10], "x": 10.75, "y": 2},
-        {"matrix": [2, 11], "x": 11.75, "y": 2},
-        {"matrix": [2, 12], "x": 12.75, "y": 2},
-        {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
-        {"matrix": [4, 12], "x": 15, "y": 2},
-
-        {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
-        {"matrix": [3, 1], "x": 1.25, "y": 3},
-        {"matrix": [3, 2], "x": 2.25, "y": 3},
-        {"matrix": [3, 3], "x": 3.25, "y": 3},
-        {"matrix": [3, 4], "x": 4.25, "y": 3},
-        {"matrix": [3, 5], "x": 5.25, "y": 3},
-        {"matrix": [3, 6], "x": 6.25, "y": 3},
-        {"matrix": [3, 7], "x": 7.25, "y": 3},
-        {"matrix": [3, 8], "x": 8.25, "y": 3},
-        {"matrix": [3, 9], "x": 9.25, "y": 3},
-        {"matrix": [3, 10], "x": 10.25, "y": 3},
-        {"matrix": [3, 11], "x": 11.25, "y": 3},
-        {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-        {"matrix": [3, 13], "x": 14, "y": 3},
-        {"matrix": [4, 13], "x": 15, "y": 3},
-
-        {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
-        {"matrix": [4, 1], "x": 1.5, "y": 4},
-        {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
-        {"matrix": [4, 4], "x": 4, "y": 4, "w": 7},
-        {"matrix": [4, 7], "x": 11, "y": 4, "w": 1.5},
-        {"matrix": [4, 8], "x": 13, "y": 4},
-        {"matrix": [4, 9], "x": 14, "y": 4},
-        {"matrix": [4, 10], "x": 15, "y": 4}
-      ]
-    },
-    "LAYOUT_65_iso_blocker": {
-      "layout": [
-        {"matrix": [0, 0], "x": 0, "y": 0},
-        {"matrix": [0, 1], "x": 1, "y": 0},
-        {"matrix": [0, 2], "x": 2, "y": 0},
-        {"matrix": [0, 3], "x": 3, "y": 0},
-        {"matrix": [0, 4], "x": 4, "y": 0},
-        {"matrix": [0, 5], "x": 5, "y": 0},
-        {"matrix": [0, 6], "x": 6, "y": 0},
-        {"matrix": [0, 7], "x": 7, "y": 0},
-        {"matrix": [0, 8], "x": 8, "y": 0},
-        {"matrix": [0, 9], "x": 9, "y": 0},
-        {"matrix": [0, 10], "x": 10, "y": 0},
-        {"matrix": [0, 11], "x": 11, "y": 0},
-        {"matrix": [0, 12], "x": 12, "y": 0},
-        {"matrix": [0, 14], "x": 13, "y": 0, "w": 2},
-        {"matrix": [4, 14], "x": 15, "y": 0},
-
-        {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-        {"matrix": [1, 1], "x": 1.5, "y": 1},
-        {"matrix": [1, 2], "x": 2.5, "y": 1},
-        {"matrix": [1, 3], "x": 3.5, "y": 1},
-        {"matrix": [1, 4], "x": 4.5, "y": 1},
-        {"matrix": [1, 5], "x": 5.5, "y": 1},
-        {"matrix": [1, 6], "x": 6.5, "y": 1},
-        {"matrix": [1, 7], "x": 7.5, "y": 1},
-        {"matrix": [1, 8], "x": 8.5, "y": 1},
-        {"matrix": [1, 9], "x": 9.5, "y": 1},
-        {"matrix": [1, 10], "x": 10.5, "y": 1},
-        {"matrix": [1, 11], "x": 11.5, "y": 1},
-        {"matrix": [1, 12], "x": 12.5, "y": 1},
-        {"matrix": [4, 11], "x": 15, "y": 1},
-
-        {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-        {"matrix": [2, 1], "x": 1.75, "y": 2},
-        {"matrix": [2, 2], "x": 2.75, "y": 2},
-        {"matrix": [2, 3], "x": 3.75, "y": 2},
-        {"matrix": [2, 4], "x": 4.75, "y": 2},
-        {"matrix": [2, 5], "x": 5.75, "y": 2},
-        {"matrix": [2, 6], "x": 6.75, "y": 2},
-        {"matrix": [2, 7], "x": 7.75, "y": 2},
-        {"matrix": [2, 8], "x": 8.75, "y": 2},
-        {"matrix": [2, 9], "x": 9.75, "y": 2},
-        {"matrix": [2, 10], "x": 10.75, "y": 2},
-        {"matrix": [2, 11], "x": 11.75, "y": 2},
-        {"matrix": [2, 12], "x": 12.75, "y": 2},
-        {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
-        {"matrix": [4, 12], "x": 15, "y": 2},
-
-        {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
-        {"matrix": [3, 1], "x": 1.25, "y": 3},
-        {"matrix": [3, 2], "x": 2.25, "y": 3},
-        {"matrix": [3, 3], "x": 3.25, "y": 3},
-        {"matrix": [3, 4], "x": 4.25, "y": 3},
-        {"matrix": [3, 5], "x": 5.25, "y": 3},
-        {"matrix": [3, 6], "x": 6.25, "y": 3},
-        {"matrix": [3, 7], "x": 7.25, "y": 3},
-        {"matrix": [3, 8], "x": 8.25, "y": 3},
-        {"matrix": [3, 9], "x": 9.25, "y": 3},
-        {"matrix": [3, 10], "x": 10.25, "y": 3},
-        {"matrix": [3, 11], "x": 11.25, "y": 3},
-        {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-        {"matrix": [3, 13], "x": 14, "y": 3},
-        {"matrix": [4, 13], "x": 15, "y": 3},
-
-        {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-        {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-        {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-        {"matrix": [4, 4], "x": 3.75, "y": 4, "w": 6.25},
-        {"matrix": [4, 6], "x": 10, "y": 4, "w": 1.25},
-        {"matrix": [4, 7], "x": 11.25, "y": 4, "w": 1.25},
-        {"matrix": [4, 8], "x": 13, "y": 4},
-        {"matrix": [4, 9], "x": 14, "y": 4},
-        {"matrix": [4, 10], "x": 15, "y": 4}
-      ]
-    }
-  }
-}
diff --git a/keyboards/matrix/noah/keyboard.json b/keyboards/matrix/noah/keyboard.json
new file mode 100644
index 00000000000..eb13e16aa2b
--- /dev/null
+++ b/keyboards/matrix/noah/keyboard.json
@@ -0,0 +1,471 @@
+{
+  "keyboard_name": "NOAH",
+  "manufacturer": "Matrix",
+  "url": "",
+  "maintainer": "astro",
+  "usb": {
+    "vid": "0x4D58",
+    "pid": "0x0065",
+    "device_version": "0.0.1",
+    "no_startup_check": true
+  },
+  "rgblight": {
+    "driver": "custom",
+    "led_count": 7,
+    "animations": {
+      "breathing": true,
+      "rainbow_mood": true,
+      "rainbow_swirl": true,
+      "snake": true,
+      "knight": true,
+      "christmas": true,
+      "static_gradient": true,
+      "rgb_test": true,
+      "alternating": true,
+      "twinkle": true
+    }
+  },
+  "ws2812": {
+    "pin": "B1"
+  },
+  "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,
+      "rainbow_moving_chevron": true,
+      "cycle_out_in": true,
+      "cycle_out_in_dual": 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_rain": true,
+      "pixel_flow": true,
+      "pixel_fractal": 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": "is31fl3731"
+  },
+  "features": {
+    "bootmagic": true,
+    "mousekey": true,
+    "extrakey": true,
+    "rgblight": true,
+    "rgb_matrix": true
+  },
+  "processor": "STM32F411",
+  "bootloader": "custom",
+  "community_layouts": ["65_iso_blocker"],
+  "layouts": {
+    "LAYOUT_default": {
+      "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, 14], "x": 14, "y": 0},
+        {"matrix": [4, 14], "x": 15, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+        {"matrix": [1, 1], "x": 1.5, "y": 1},
+        {"matrix": [1, 2], "x": 2.5, "y": 1},
+        {"matrix": [1, 3], "x": 3.5, "y": 1},
+        {"matrix": [1, 4], "x": 4.5, "y": 1},
+        {"matrix": [1, 5], "x": 5.5, "y": 1},
+        {"matrix": [1, 6], "x": 6.5, "y": 1},
+        {"matrix": [1, 7], "x": 7.5, "y": 1},
+        {"matrix": [1, 8], "x": 8.5, "y": 1},
+        {"matrix": [1, 9], "x": 9.5, "y": 1},
+        {"matrix": [1, 10], "x": 10.5, "y": 1},
+        {"matrix": [1, 11], "x": 11.5, "y": 1},
+        {"matrix": [1, 12], "x": 12.5, "y": 1},
+        {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+        {"matrix": [4, 11], "x": 15, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+        {"matrix": [2, 1], "x": 1.75, "y": 2},
+        {"matrix": [2, 2], "x": 2.75, "y": 2},
+        {"matrix": [2, 3], "x": 3.75, "y": 2},
+        {"matrix": [2, 4], "x": 4.75, "y": 2},
+        {"matrix": [2, 5], "x": 5.75, "y": 2},
+        {"matrix": [2, 6], "x": 6.75, "y": 2},
+        {"matrix": [2, 7], "x": 7.75, "y": 2},
+        {"matrix": [2, 8], "x": 8.75, "y": 2},
+        {"matrix": [2, 9], "x": 9.75, "y": 2},
+        {"matrix": [2, 10], "x": 10.75, "y": 2},
+        {"matrix": [2, 11], "x": 11.75, "y": 2},
+        {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+        {"matrix": [4, 12], "x": 15, "y": 2},
+
+        {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+        {"matrix": [3, 2], "x": 2.25, "y": 3},
+        {"matrix": [3, 3], "x": 3.25, "y": 3},
+        {"matrix": [3, 4], "x": 4.25, "y": 3},
+        {"matrix": [3, 5], "x": 5.25, "y": 3},
+        {"matrix": [3, 6], "x": 6.25, "y": 3},
+        {"matrix": [3, 7], "x": 7.25, "y": 3},
+        {"matrix": [3, 8], "x": 8.25, "y": 3},
+        {"matrix": [3, 9], "x": 9.25, "y": 3},
+        {"matrix": [3, 10], "x": 10.25, "y": 3},
+        {"matrix": [3, 11], "x": 11.25, "y": 3},
+        {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+        {"matrix": [3, 13], "x": 14, "y": 3},
+        {"matrix": [4, 13], "x": 15, "y": 3},
+
+        {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+        {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+        {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+        {"matrix": [4, 4], "x": 3.75, "y": 4, "w": 6.25},
+        {"matrix": [4, 6], "x": 10, "y": 4, "w": 1.25},
+        {"matrix": [4, 7], "x": 11.25, "y": 4, "w": 1.25},
+        {"matrix": [4, 8], "x": 13, "y": 4},
+        {"matrix": [4, 9], "x": 14, "y": 4},
+        {"matrix": [4, 10], "x": 15, "y": 4}
+      ]
+    },
+    "LAYOUT_default_splitspace": {
+      "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, 14], "x": 14, "y": 0},
+        {"matrix": [4, 14], "x": 15, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+        {"matrix": [1, 1], "x": 1.5, "y": 1},
+        {"matrix": [1, 2], "x": 2.5, "y": 1},
+        {"matrix": [1, 3], "x": 3.5, "y": 1},
+        {"matrix": [1, 4], "x": 4.5, "y": 1},
+        {"matrix": [1, 5], "x": 5.5, "y": 1},
+        {"matrix": [1, 6], "x": 6.5, "y": 1},
+        {"matrix": [1, 7], "x": 7.5, "y": 1},
+        {"matrix": [1, 8], "x": 8.5, "y": 1},
+        {"matrix": [1, 9], "x": 9.5, "y": 1},
+        {"matrix": [1, 10], "x": 10.5, "y": 1},
+        {"matrix": [1, 11], "x": 11.5, "y": 1},
+        {"matrix": [1, 12], "x": 12.5, "y": 1},
+        {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+        {"matrix": [4, 11], "x": 15, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+        {"matrix": [2, 1], "x": 1.75, "y": 2},
+        {"matrix": [2, 2], "x": 2.75, "y": 2},
+        {"matrix": [2, 3], "x": 3.75, "y": 2},
+        {"matrix": [2, 4], "x": 4.75, "y": 2},
+        {"matrix": [2, 5], "x": 5.75, "y": 2},
+        {"matrix": [2, 6], "x": 6.75, "y": 2},
+        {"matrix": [2, 7], "x": 7.75, "y": 2},
+        {"matrix": [2, 8], "x": 8.75, "y": 2},
+        {"matrix": [2, 9], "x": 9.75, "y": 2},
+        {"matrix": [2, 10], "x": 10.75, "y": 2},
+        {"matrix": [2, 11], "x": 11.75, "y": 2},
+        {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+        {"matrix": [4, 12], "x": 15, "y": 2},
+
+        {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+        {"matrix": [3, 2], "x": 2.25, "y": 3},
+        {"matrix": [3, 3], "x": 3.25, "y": 3},
+        {"matrix": [3, 4], "x": 4.25, "y": 3},
+        {"matrix": [3, 5], "x": 5.25, "y": 3},
+        {"matrix": [3, 6], "x": 6.25, "y": 3},
+        {"matrix": [3, 7], "x": 7.25, "y": 3},
+        {"matrix": [3, 8], "x": 8.25, "y": 3},
+        {"matrix": [3, 9], "x": 9.25, "y": 3},
+        {"matrix": [3, 10], "x": 10.25, "y": 3},
+        {"matrix": [3, 11], "x": 11.25, "y": 3},
+        {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+        {"matrix": [3, 13], "x": 14, "y": 3},
+        {"matrix": [4, 13], "x": 15, "y": 3},
+
+        {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+        {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+        {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+        {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 2.25},
+        {"matrix": [4, 4], "x": 6, "y": 4, "w": 1.25},
+        {"matrix": [4, 5], "x": 7.25, "y": 4, "w": 2.75},
+        {"matrix": [4, 6], "x": 10, "y": 4, "w": 1.25},
+        {"matrix": [4, 7], "x": 11.25, "y": 4, "w": 1.25},
+        {"matrix": [4, 8], "x": 13, "y": 4},
+        {"matrix": [4, 9], "x": 14, "y": 4},
+        {"matrix": [4, 10], "x": 15, "y": 4}
+      ]
+    },
+    "LAYOUT_wkl": {
+      "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, 14], "x": 14, "y": 0},
+        {"matrix": [4, 14], "x": 15, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+        {"matrix": [1, 1], "x": 1.5, "y": 1},
+        {"matrix": [1, 2], "x": 2.5, "y": 1},
+        {"matrix": [1, 3], "x": 3.5, "y": 1},
+        {"matrix": [1, 4], "x": 4.5, "y": 1},
+        {"matrix": [1, 5], "x": 5.5, "y": 1},
+        {"matrix": [1, 6], "x": 6.5, "y": 1},
+        {"matrix": [1, 7], "x": 7.5, "y": 1},
+        {"matrix": [1, 8], "x": 8.5, "y": 1},
+        {"matrix": [1, 9], "x": 9.5, "y": 1},
+        {"matrix": [1, 10], "x": 10.5, "y": 1},
+        {"matrix": [1, 11], "x": 11.5, "y": 1},
+        {"matrix": [1, 12], "x": 12.5, "y": 1},
+        {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+        {"matrix": [4, 11], "x": 15, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+        {"matrix": [2, 1], "x": 1.75, "y": 2},
+        {"matrix": [2, 2], "x": 2.75, "y": 2},
+        {"matrix": [2, 3], "x": 3.75, "y": 2},
+        {"matrix": [2, 4], "x": 4.75, "y": 2},
+        {"matrix": [2, 5], "x": 5.75, "y": 2},
+        {"matrix": [2, 6], "x": 6.75, "y": 2},
+        {"matrix": [2, 7], "x": 7.75, "y": 2},
+        {"matrix": [2, 8], "x": 8.75, "y": 2},
+        {"matrix": [2, 9], "x": 9.75, "y": 2},
+        {"matrix": [2, 10], "x": 10.75, "y": 2},
+        {"matrix": [2, 11], "x": 11.75, "y": 2},
+        {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+        {"matrix": [4, 12], "x": 15, "y": 2},
+
+        {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+        {"matrix": [3, 2], "x": 2.25, "y": 3},
+        {"matrix": [3, 3], "x": 3.25, "y": 3},
+        {"matrix": [3, 4], "x": 4.25, "y": 3},
+        {"matrix": [3, 5], "x": 5.25, "y": 3},
+        {"matrix": [3, 6], "x": 6.25, "y": 3},
+        {"matrix": [3, 7], "x": 7.25, "y": 3},
+        {"matrix": [3, 8], "x": 8.25, "y": 3},
+        {"matrix": [3, 9], "x": 9.25, "y": 3},
+        {"matrix": [3, 10], "x": 10.25, "y": 3},
+        {"matrix": [3, 11], "x": 11.25, "y": 3},
+        {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+        {"matrix": [3, 13], "x": 14, "y": 3},
+        {"matrix": [4, 13], "x": 15, "y": 3},
+
+        {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+        {"matrix": [4, 1], "x": 1.5, "y": 4},
+        {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+        {"matrix": [4, 4], "x": 4, "y": 4, "w": 7},
+        {"matrix": [4, 7], "x": 11, "y": 4, "w": 1.5},
+        {"matrix": [4, 8], "x": 13, "y": 4},
+        {"matrix": [4, 9], "x": 14, "y": 4},
+        {"matrix": [4, 10], "x": 15, "y": 4}
+      ]
+    },
+    "LAYOUT_iso": {
+      "layout": [
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0},
+        {"matrix": [0, 5], "x": 5, "y": 0},
+        {"matrix": [0, 6], "x": 6, "y": 0},
+        {"matrix": [0, 7], "x": 7, "y": 0},
+        {"matrix": [0, 8], "x": 8, "y": 0},
+        {"matrix": [0, 9], "x": 9, "y": 0},
+        {"matrix": [0, 10], "x": 10, "y": 0},
+        {"matrix": [0, 11], "x": 11, "y": 0},
+        {"matrix": [0, 12], "x": 12, "y": 0},
+        {"matrix": [0, 14], "x": 13, "y": 0, "w": 2},
+        {"matrix": [4, 14], "x": 15, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+        {"matrix": [1, 1], "x": 1.5, "y": 1},
+        {"matrix": [1, 2], "x": 2.5, "y": 1},
+        {"matrix": [1, 3], "x": 3.5, "y": 1},
+        {"matrix": [1, 4], "x": 4.5, "y": 1},
+        {"matrix": [1, 5], "x": 5.5, "y": 1},
+        {"matrix": [1, 6], "x": 6.5, "y": 1},
+        {"matrix": [1, 7], "x": 7.5, "y": 1},
+        {"matrix": [1, 8], "x": 8.5, "y": 1},
+        {"matrix": [1, 9], "x": 9.5, "y": 1},
+        {"matrix": [1, 10], "x": 10.5, "y": 1},
+        {"matrix": [1, 11], "x": 11.5, "y": 1},
+        {"matrix": [1, 12], "x": 12.5, "y": 1},
+        {"matrix": [4, 11], "x": 15, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+        {"matrix": [2, 1], "x": 1.75, "y": 2},
+        {"matrix": [2, 2], "x": 2.75, "y": 2},
+        {"matrix": [2, 3], "x": 3.75, "y": 2},
+        {"matrix": [2, 4], "x": 4.75, "y": 2},
+        {"matrix": [2, 5], "x": 5.75, "y": 2},
+        {"matrix": [2, 6], "x": 6.75, "y": 2},
+        {"matrix": [2, 7], "x": 7.75, "y": 2},
+        {"matrix": [2, 8], "x": 8.75, "y": 2},
+        {"matrix": [2, 9], "x": 9.75, "y": 2},
+        {"matrix": [2, 10], "x": 10.75, "y": 2},
+        {"matrix": [2, 11], "x": 11.75, "y": 2},
+        {"matrix": [2, 12], "x": 12.75, "y": 2},
+        {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+        {"matrix": [4, 12], "x": 15, "y": 2},
+
+        {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+        {"matrix": [3, 1], "x": 1.25, "y": 3},
+        {"matrix": [3, 2], "x": 2.25, "y": 3},
+        {"matrix": [3, 3], "x": 3.25, "y": 3},
+        {"matrix": [3, 4], "x": 4.25, "y": 3},
+        {"matrix": [3, 5], "x": 5.25, "y": 3},
+        {"matrix": [3, 6], "x": 6.25, "y": 3},
+        {"matrix": [3, 7], "x": 7.25, "y": 3},
+        {"matrix": [3, 8], "x": 8.25, "y": 3},
+        {"matrix": [3, 9], "x": 9.25, "y": 3},
+        {"matrix": [3, 10], "x": 10.25, "y": 3},
+        {"matrix": [3, 11], "x": 11.25, "y": 3},
+        {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+        {"matrix": [3, 13], "x": 14, "y": 3},
+        {"matrix": [4, 13], "x": 15, "y": 3},
+
+        {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+        {"matrix": [4, 1], "x": 1.5, "y": 4},
+        {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+        {"matrix": [4, 4], "x": 4, "y": 4, "w": 7},
+        {"matrix": [4, 7], "x": 11, "y": 4, "w": 1.5},
+        {"matrix": [4, 8], "x": 13, "y": 4},
+        {"matrix": [4, 9], "x": 14, "y": 4},
+        {"matrix": [4, 10], "x": 15, "y": 4}
+      ]
+    },
+    "LAYOUT_65_iso_blocker": {
+      "layout": [
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0},
+        {"matrix": [0, 5], "x": 5, "y": 0},
+        {"matrix": [0, 6], "x": 6, "y": 0},
+        {"matrix": [0, 7], "x": 7, "y": 0},
+        {"matrix": [0, 8], "x": 8, "y": 0},
+        {"matrix": [0, 9], "x": 9, "y": 0},
+        {"matrix": [0, 10], "x": 10, "y": 0},
+        {"matrix": [0, 11], "x": 11, "y": 0},
+        {"matrix": [0, 12], "x": 12, "y": 0},
+        {"matrix": [0, 14], "x": 13, "y": 0, "w": 2},
+        {"matrix": [4, 14], "x": 15, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+        {"matrix": [1, 1], "x": 1.5, "y": 1},
+        {"matrix": [1, 2], "x": 2.5, "y": 1},
+        {"matrix": [1, 3], "x": 3.5, "y": 1},
+        {"matrix": [1, 4], "x": 4.5, "y": 1},
+        {"matrix": [1, 5], "x": 5.5, "y": 1},
+        {"matrix": [1, 6], "x": 6.5, "y": 1},
+        {"matrix": [1, 7], "x": 7.5, "y": 1},
+        {"matrix": [1, 8], "x": 8.5, "y": 1},
+        {"matrix": [1, 9], "x": 9.5, "y": 1},
+        {"matrix": [1, 10], "x": 10.5, "y": 1},
+        {"matrix": [1, 11], "x": 11.5, "y": 1},
+        {"matrix": [1, 12], "x": 12.5, "y": 1},
+        {"matrix": [4, 11], "x": 15, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+        {"matrix": [2, 1], "x": 1.75, "y": 2},
+        {"matrix": [2, 2], "x": 2.75, "y": 2},
+        {"matrix": [2, 3], "x": 3.75, "y": 2},
+        {"matrix": [2, 4], "x": 4.75, "y": 2},
+        {"matrix": [2, 5], "x": 5.75, "y": 2},
+        {"matrix": [2, 6], "x": 6.75, "y": 2},
+        {"matrix": [2, 7], "x": 7.75, "y": 2},
+        {"matrix": [2, 8], "x": 8.75, "y": 2},
+        {"matrix": [2, 9], "x": 9.75, "y": 2},
+        {"matrix": [2, 10], "x": 10.75, "y": 2},
+        {"matrix": [2, 11], "x": 11.75, "y": 2},
+        {"matrix": [2, 12], "x": 12.75, "y": 2},
+        {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+        {"matrix": [4, 12], "x": 15, "y": 2},
+
+        {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+        {"matrix": [3, 1], "x": 1.25, "y": 3},
+        {"matrix": [3, 2], "x": 2.25, "y": 3},
+        {"matrix": [3, 3], "x": 3.25, "y": 3},
+        {"matrix": [3, 4], "x": 4.25, "y": 3},
+        {"matrix": [3, 5], "x": 5.25, "y": 3},
+        {"matrix": [3, 6], "x": 6.25, "y": 3},
+        {"matrix": [3, 7], "x": 7.25, "y": 3},
+        {"matrix": [3, 8], "x": 8.25, "y": 3},
+        {"matrix": [3, 9], "x": 9.25, "y": 3},
+        {"matrix": [3, 10], "x": 10.25, "y": 3},
+        {"matrix": [3, 11], "x": 11.25, "y": 3},
+        {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+        {"matrix": [3, 13], "x": 14, "y": 3},
+        {"matrix": [4, 13], "x": 15, "y": 3},
+
+        {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+        {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+        {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+        {"matrix": [4, 4], "x": 3.75, "y": 4, "w": 6.25},
+        {"matrix": [4, 6], "x": 10, "y": 4, "w": 1.25},
+        {"matrix": [4, 7], "x": 11.25, "y": 4, "w": 1.25},
+        {"matrix": [4, 8], "x": 13, "y": 4},
+        {"matrix": [4, 9], "x": 14, "y": 4},
+        {"matrix": [4, 10], "x": 15, "y": 4}
+      ]
+    }
+  }
+}
diff --git a/keyboards/matrix/noah/rules.mk b/keyboards/matrix/noah/rules.mk
index 3b75264222d..407c120a524 100644
--- a/keyboards/matrix/noah/rules.mk
+++ b/keyboards/matrix/noah/rules.mk
@@ -1,32 +1,7 @@
-# MCU name
-MCU = STM32F411
-
-# Linker script to use
-# - it should exist either in <chibios>/os/common/ports/ARMCMx/compilers/GCC/ld/
-#   or <this_dir>/ld/
+# custom bootloader
 MCU_LDSCRIPT = noah_boot
-
-# Board: it should exist either in <chibios>/os/hal/boards/
-#  or <this_dir>/boards
 BOARD = ST_NUCLEO64_F411RE
 
-# Bootloader selection
-BOOTLOADER = custom
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes	    # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-NO_USB_STARTUP_CHECK = yes	# Disable initialization only when usb is plugged in
-
-RGB_MATRIX_ENABLE = yes
-
-RGBLIGHT_ENABLE = yes
 WS2812_DRIVER_REQUIRED = yes
 
 CUSTOM_MATRIX = yes
diff --git a/keyboards/mechkeys/acr60/keyboard.json b/keyboards/mechkeys/acr60/keyboard.json
index f2d618b8bd1..916a750b963 100644
--- a/keyboards/mechkeys/acr60/keyboard.json
+++ b/keyboards/mechkeys/acr60/keyboard.json
@@ -53,8 +53,10 @@
     },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
+    "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_ansi_arrow", "64_ansi", "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", "64_iso"],
     "layout_aliases": {
-        "LAYOUT_2_shifts": "LAYOUT_all"
+        "LAYOUT_2_shifts": "LAYOUT_all",
+        "LAYOUT_mitchsplit": "LAYOUT_60_ansi_split_space_split_rshift"
     },
     "layouts": {
         "LAYOUT_all": {
@@ -133,6 +135,1623 @@
                 {"matrix": [4, 14], "x": 14, "y": 4}
             ]
         },
+        "LAYOUT_60_ansi": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 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, 14], "x": 13, "y": 0, "w": 2},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 1.5, "y": 1},
+                {"matrix": [1, 3], "x": 2.5, "y": 1},
+                {"matrix": [1, 4], "x": 3.5, "y": 1},
+                {"matrix": [1, 5], "x": 4.5, "y": 1},
+                {"matrix": [1, 6], "x": 5.5, "y": 1},
+                {"matrix": [1, 7], "x": 6.5, "y": 1},
+                {"matrix": [1, 8], "x": 7.5, "y": 1},
+                {"matrix": [1, 9], "x": 8.5, "y": 1},
+                {"matrix": [1, 10], "x": 9.5, "y": 1},
+                {"matrix": [1, 11], "x": 10.5, "y": 1},
+                {"matrix": [1, 12], "x": 11.5, "y": 1},
+                {"matrix": [1, 13], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 1.75, "y": 2},
+                {"matrix": [2, 3], "x": 2.75, "y": 2},
+                {"matrix": [2, 4], "x": 3.75, "y": 2},
+                {"matrix": [2, 5], "x": 4.75, "y": 2},
+                {"matrix": [2, 6], "x": 5.75, "y": 2},
+                {"matrix": [2, 7], "x": 6.75, "y": 2},
+                {"matrix": [2, 8], "x": 7.75, "y": 2},
+                {"matrix": [2, 9], "x": 8.75, "y": 2},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
+                {"matrix": [2, 12], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 2.75},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 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, 13], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 14], "x": 13.75, "y": 4, "w": 1.25}
+            ]
+        },
+        "LAYOUT_60_ansi_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": [0, 14], "x": 14, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 1.5, "y": 1},
+                {"matrix": [1, 3], "x": 2.5, "y": 1},
+                {"matrix": [1, 4], "x": 3.5, "y": 1},
+                {"matrix": [1, 5], "x": 4.5, "y": 1},
+                {"matrix": [1, 6], "x": 5.5, "y": 1},
+                {"matrix": [1, 7], "x": 6.5, "y": 1},
+                {"matrix": [1, 8], "x": 7.5, "y": 1},
+                {"matrix": [1, 9], "x": 8.5, "y": 1},
+                {"matrix": [1, 10], "x": 9.5, "y": 1},
+                {"matrix": [1, 11], "x": 10.5, "y": 1},
+                {"matrix": [1, 12], "x": 11.5, "y": 1},
+                {"matrix": [1, 13], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 1.75, "y": 2},
+                {"matrix": [2, 3], "x": 2.75, "y": 2},
+                {"matrix": [2, 4], "x": 3.75, "y": 2},
+                {"matrix": [2, 5], "x": 4.75, "y": 2},
+                {"matrix": [2, 6], "x": 5.75, "y": 2},
+                {"matrix": [2, 7], "x": 6.75, "y": 2},
+                {"matrix": [2, 8], "x": 7.75, "y": 2},
+                {"matrix": [2, 9], "x": 8.75, "y": 2},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
+                {"matrix": [2, 12], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "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, 13], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 14], "x": 13.75, "y": 4, "w": 1.25}
+            ]
+        },
+        "LAYOUT_60_ansi_tsangan": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 14], "x": 13, "y": 0, "w": 2},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 1.5, "y": 1},
+                {"matrix": [1, 3], "x": 2.5, "y": 1},
+                {"matrix": [1, 4], "x": 3.5, "y": 1},
+                {"matrix": [1, 5], "x": 4.5, "y": 1},
+                {"matrix": [1, 6], "x": 5.5, "y": 1},
+                {"matrix": [1, 7], "x": 6.5, "y": 1},
+                {"matrix": [1, 8], "x": 7.5, "y": 1},
+                {"matrix": [1, 9], "x": 8.5, "y": 1},
+                {"matrix": [1, 10], "x": 9.5, "y": 1},
+                {"matrix": [1, 11], "x": 10.5, "y": 1},
+                {"matrix": [1, 12], "x": 11.5, "y": 1},
+                {"matrix": [1, 13], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 1.75, "y": 2},
+                {"matrix": [2, 3], "x": 2.75, "y": 2},
+                {"matrix": [2, 4], "x": 3.75, "y": 2},
+                {"matrix": [2, 5], "x": 4.75, "y": 2},
+                {"matrix": [2, 6], "x": 5.75, "y": 2},
+                {"matrix": [2, 7], "x": 6.75, "y": 2},
+                {"matrix": [2, 8], "x": 7.75, "y": 2},
+                {"matrix": [2, 9], "x": 8.75, "y": 2},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
+                {"matrix": [2, 12], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 2.75},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 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, 13], "x": 12.5, "y": 4},
+                {"matrix": [4, 14], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_60_tsangan_hhkb": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 1.5, "y": 1},
+                {"matrix": [1, 3], "x": 2.5, "y": 1},
+                {"matrix": [1, 4], "x": 3.5, "y": 1},
+                {"matrix": [1, 5], "x": 4.5, "y": 1},
+                {"matrix": [1, 6], "x": 5.5, "y": 1},
+                {"matrix": [1, 7], "x": 6.5, "y": 1},
+                {"matrix": [1, 8], "x": 7.5, "y": 1},
+                {"matrix": [1, 9], "x": 8.5, "y": 1},
+                {"matrix": [1, 10], "x": 9.5, "y": 1},
+                {"matrix": [1, 11], "x": 10.5, "y": 1},
+                {"matrix": [1, 12], "x": 11.5, "y": 1},
+                {"matrix": [1, 13], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 1.75, "y": 2},
+                {"matrix": [2, 3], "x": 2.75, "y": 2},
+                {"matrix": [2, 4], "x": 3.75, "y": 2},
+                {"matrix": [2, 5], "x": 4.75, "y": 2},
+                {"matrix": [2, 6], "x": 5.75, "y": 2},
+                {"matrix": [2, 7], "x": 6.75, "y": 2},
+                {"matrix": [2, 8], "x": 7.75, "y": 2},
+                {"matrix": [2, 9], "x": 8.75, "y": 2},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
+                {"matrix": [2, 12], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "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, 13], "x": 12.5, "y": 4},
+                {"matrix": [4, 14], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_60_ansi_wkl": {
+            "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, 14], "x": 13, "y": 0, "w": 2},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 1.5, "y": 1},
+                {"matrix": [1, 3], "x": 2.5, "y": 1},
+                {"matrix": [1, 4], "x": 3.5, "y": 1},
+                {"matrix": [1, 5], "x": 4.5, "y": 1},
+                {"matrix": [1, 6], "x": 5.5, "y": 1},
+                {"matrix": [1, 7], "x": 6.5, "y": 1},
+                {"matrix": [1, 8], "x": 7.5, "y": 1},
+                {"matrix": [1, 9], "x": 8.5, "y": 1},
+                {"matrix": [1, 10], "x": 9.5, "y": 1},
+                {"matrix": [1, 11], "x": 10.5, "y": 1},
+                {"matrix": [1, 12], "x": 11.5, "y": 1},
+                {"matrix": [1, 13], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 1.75, "y": 2},
+                {"matrix": [2, 3], "x": 2.75, "y": 2},
+                {"matrix": [2, 4], "x": 3.75, "y": 2},
+                {"matrix": [2, 5], "x": 4.75, "y": 2},
+                {"matrix": [2, 6], "x": 5.75, "y": 2},
+                {"matrix": [2, 7], "x": 6.75, "y": 2},
+                {"matrix": [2, 8], "x": 7.75, "y": 2},
+                {"matrix": [2, 9], "x": 8.75, "y": 2},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
+                {"matrix": [2, 12], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 2.75},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"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, 14], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_60_ansi_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": [0, 14], "x": 14, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 1.5, "y": 1},
+                {"matrix": [1, 3], "x": 2.5, "y": 1},
+                {"matrix": [1, 4], "x": 3.5, "y": 1},
+                {"matrix": [1, 5], "x": 4.5, "y": 1},
+                {"matrix": [1, 6], "x": 5.5, "y": 1},
+                {"matrix": [1, 7], "x": 6.5, "y": 1},
+                {"matrix": [1, 8], "x": 7.5, "y": 1},
+                {"matrix": [1, 9], "x": 8.5, "y": 1},
+                {"matrix": [1, 10], "x": 9.5, "y": 1},
+                {"matrix": [1, 11], "x": 10.5, "y": 1},
+                {"matrix": [1, 12], "x": 11.5, "y": 1},
+                {"matrix": [1, 13], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 1.75, "y": 2},
+                {"matrix": [2, 3], "x": 2.75, "y": 2},
+                {"matrix": [2, 4], "x": 3.75, "y": 2},
+                {"matrix": [2, 5], "x": 4.75, "y": 2},
+                {"matrix": [2, 6], "x": 5.75, "y": 2},
+                {"matrix": [2, 7], "x": 6.75, "y": 2},
+                {"matrix": [2, 8], "x": 7.75, "y": 2},
+                {"matrix": [2, 9], "x": 8.75, "y": 2},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
+                {"matrix": [2, 12], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"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, 14], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_60_ansi_arrow": {
+            "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, 14], "x": 13, "y": 0, "w": 2},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 1.5, "y": 1},
+                {"matrix": [1, 3], "x": 2.5, "y": 1},
+                {"matrix": [1, 4], "x": 3.5, "y": 1},
+                {"matrix": [1, 5], "x": 4.5, "y": 1},
+                {"matrix": [1, 6], "x": 5.5, "y": 1},
+                {"matrix": [1, 7], "x": 6.5, "y": 1},
+                {"matrix": [1, 8], "x": 7.5, "y": 1},
+                {"matrix": [1, 9], "x": 8.5, "y": 1},
+                {"matrix": [1, 10], "x": 9.5, "y": 1},
+                {"matrix": [1, 11], "x": 10.5, "y": 1},
+                {"matrix": [1, 12], "x": 11.5, "y": 1},
+                {"matrix": [1, 13], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 1.75, "y": 2},
+                {"matrix": [2, 3], "x": 2.75, "y": 2},
+                {"matrix": [2, 4], "x": 3.75, "y": 2},
+                {"matrix": [2, 5], "x": 4.75, "y": 2},
+                {"matrix": [2, 6], "x": 5.75, "y": 2},
+                {"matrix": [2, 7], "x": 6.75, "y": 2},
+                {"matrix": [2, 8], "x": 7.75, "y": 2},
+                {"matrix": [2, 9], "x": 8.75, "y": 2},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
+                {"matrix": [2, 12], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 12], "x": 11.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 13, "y": 3},
+                {"matrix": [3, 14], "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},
+                {"matrix": [4, 11], "x": 11, "y": 4},
+                {"matrix": [4, 12], "x": 12, "y": 4},
+                {"matrix": [4, 13], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4}
+            ]
+        },
+        "LAYOUT_60_ansi_arrow_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, 14], "x": 14, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 1.5, "y": 1},
+                {"matrix": [1, 3], "x": 2.5, "y": 1},
+                {"matrix": [1, 4], "x": 3.5, "y": 1},
+                {"matrix": [1, 5], "x": 4.5, "y": 1},
+                {"matrix": [1, 6], "x": 5.5, "y": 1},
+                {"matrix": [1, 7], "x": 6.5, "y": 1},
+                {"matrix": [1, 8], "x": 7.5, "y": 1},
+                {"matrix": [1, 9], "x": 8.5, "y": 1},
+                {"matrix": [1, 10], "x": 9.5, "y": 1},
+                {"matrix": [1, 11], "x": 10.5, "y": 1},
+                {"matrix": [1, 12], "x": 11.5, "y": 1},
+                {"matrix": [1, 13], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 1.75, "y": 2},
+                {"matrix": [2, 3], "x": 2.75, "y": 2},
+                {"matrix": [2, 4], "x": 3.75, "y": 2},
+                {"matrix": [2, 5], "x": 4.75, "y": 2},
+                {"matrix": [2, 6], "x": 5.75, "y": 2},
+                {"matrix": [2, 7], "x": 6.75, "y": 2},
+                {"matrix": [2, 8], "x": 7.75, "y": 2},
+                {"matrix": [2, 9], "x": 8.75, "y": 2},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
+                {"matrix": [2, 12], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 12], "x": 11.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 13, "y": 3},
+                {"matrix": [3, 14], "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},
+                {"matrix": [4, 11], "x": 11, "y": 4},
+                {"matrix": [4, 12], "x": 12, "y": 4},
+                {"matrix": [4, 13], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4}
+            ]
+        },
+        "LAYOUT_64_ansi": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 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, 14], "x": 13, "y": 0, "w": 2},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 1.5, "y": 1},
+                {"matrix": [1, 3], "x": 2.5, "y": 1},
+                {"matrix": [1, 4], "x": 3.5, "y": 1},
+                {"matrix": [1, 5], "x": 4.5, "y": 1},
+                {"matrix": [1, 6], "x": 5.5, "y": 1},
+                {"matrix": [1, 7], "x": 6.5, "y": 1},
+                {"matrix": [1, 8], "x": 7.5, "y": 1},
+                {"matrix": [1, 9], "x": 8.5, "y": 1},
+                {"matrix": [1, 10], "x": 9.5, "y": 1},
+                {"matrix": [1, 11], "x": 10.5, "y": 1},
+                {"matrix": [1, 12], "x": 11.5, "y": 1},
+                {"matrix": [1, 13], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 1.75, "y": 2},
+                {"matrix": [2, 3], "x": 2.75, "y": 2},
+                {"matrix": [2, 4], "x": 3.75, "y": 2},
+                {"matrix": [2, 5], "x": 4.75, "y": 2},
+                {"matrix": [2, 6], "x": 5.75, "y": 2},
+                {"matrix": [2, 7], "x": 6.75, "y": 2},
+                {"matrix": [2, 8], "x": 7.75, "y": 2},
+                {"matrix": [2, 9], "x": 8.75, "y": 2},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
+                {"matrix": [2, 12], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
+                {"matrix": [3, 6], "x": 6, "y": 3},
+                {"matrix": [3, 7], "x": 7, "y": 3},
+                {"matrix": [3, 8], "x": 8, "y": 3},
+                {"matrix": [3, 9], "x": 9, "y": 3},
+                {"matrix": [3, 10], "x": 10, "y": 3},
+                {"matrix": [3, 11], "x": 11, "y": 3},
+                {"matrix": [3, 12], "x": 12, "y": 3},
+                {"matrix": [3, 13], "x": 13, "y": 3},
+                {"matrix": [3, 14], "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},
+                {"matrix": [4, 11], "x": 11, "y": 4},
+                {"matrix": [4, 12], "x": 12, "y": 4},
+                {"matrix": [4, 13], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4}
+            ]
+        },
+        "LAYOUT_64_ansi_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, 14], "x": 14, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 1.5, "y": 1},
+                {"matrix": [1, 3], "x": 2.5, "y": 1},
+                {"matrix": [1, 4], "x": 3.5, "y": 1},
+                {"matrix": [1, 5], "x": 4.5, "y": 1},
+                {"matrix": [1, 6], "x": 5.5, "y": 1},
+                {"matrix": [1, 7], "x": 6.5, "y": 1},
+                {"matrix": [1, 8], "x": 7.5, "y": 1},
+                {"matrix": [1, 9], "x": 8.5, "y": 1},
+                {"matrix": [1, 10], "x": 9.5, "y": 1},
+                {"matrix": [1, 11], "x": 10.5, "y": 1},
+                {"matrix": [1, 12], "x": 11.5, "y": 1},
+                {"matrix": [1, 13], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 1.75, "y": 2},
+                {"matrix": [2, 3], "x": 2.75, "y": 2},
+                {"matrix": [2, 4], "x": 3.75, "y": 2},
+                {"matrix": [2, 5], "x": 4.75, "y": 2},
+                {"matrix": [2, 6], "x": 5.75, "y": 2},
+                {"matrix": [2, 7], "x": 6.75, "y": 2},
+                {"matrix": [2, 8], "x": 7.75, "y": 2},
+                {"matrix": [2, 9], "x": 8.75, "y": 2},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
+                {"matrix": [2, 12], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
+                {"matrix": [3, 6], "x": 6, "y": 3},
+                {"matrix": [3, 7], "x": 7, "y": 3},
+                {"matrix": [3, 8], "x": 8, "y": 3},
+                {"matrix": [3, 9], "x": 9, "y": 3},
+                {"matrix": [3, 10], "x": 10, "y": 3},
+                {"matrix": [3, 11], "x": 11, "y": 3},
+                {"matrix": [3, 12], "x": 12, "y": 3},
+                {"matrix": [3, 13], "x": 13, "y": 3},
+                {"matrix": [3, 14], "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},
+                {"matrix": [4, 11], "x": 11, "y": 4},
+                {"matrix": [4, 12], "x": 12, "y": 4},
+                {"matrix": [4, 13], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4}
+            ]
+        },
+        "LAYOUT_60_hhkb": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 1.5, "y": 1},
+                {"matrix": [1, 3], "x": 2.5, "y": 1},
+                {"matrix": [1, 4], "x": 3.5, "y": 1},
+                {"matrix": [1, 5], "x": 4.5, "y": 1},
+                {"matrix": [1, 6], "x": 5.5, "y": 1},
+                {"matrix": [1, 7], "x": 6.5, "y": 1},
+                {"matrix": [1, 8], "x": 7.5, "y": 1},
+                {"matrix": [1, 9], "x": 8.5, "y": 1},
+                {"matrix": [1, 10], "x": 9.5, "y": 1},
+                {"matrix": [1, 11], "x": 10.5, "y": 1},
+                {"matrix": [1, 12], "x": 11.5, "y": 1},
+                {"matrix": [1, 13], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 1.75, "y": 2},
+                {"matrix": [2, 3], "x": 2.75, "y": 2},
+                {"matrix": [2, 4], "x": 3.75, "y": 2},
+                {"matrix": [2, 5], "x": 4.75, "y": 2},
+                {"matrix": [2, 6], "x": 5.75, "y": 2},
+                {"matrix": [2, 7], "x": 6.75, "y": 2},
+                {"matrix": [2, 8], "x": 7.75, "y": 2},
+                {"matrix": [2, 9], "x": 8.75, "y": 2},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
+                {"matrix": [2, 12], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+
+                {"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, 13], "x": 12.5, "y": 4}
+            ]
+        },
+        "LAYOUT_60_true_hhkb": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 1.5, "y": 1},
+                {"matrix": [1, 3], "x": 2.5, "y": 1},
+                {"matrix": [1, 4], "x": 3.5, "y": 1},
+                {"matrix": [1, 5], "x": 4.5, "y": 1},
+                {"matrix": [1, 6], "x": 5.5, "y": 1},
+                {"matrix": [1, 7], "x": 6.5, "y": 1},
+                {"matrix": [1, 8], "x": 7.5, "y": 1},
+                {"matrix": [1, 9], "x": 8.5, "y": 1},
+                {"matrix": [1, 10], "x": 9.5, "y": 1},
+                {"matrix": [1, 11], "x": 10.5, "y": 1},
+                {"matrix": [1, 12], "x": 11.5, "y": 1},
+                {"matrix": [1, 13], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 1.75, "y": 2},
+                {"matrix": [2, 3], "x": 2.75, "y": 2},
+                {"matrix": [2, 4], "x": 3.75, "y": 2},
+                {"matrix": [2, 5], "x": 4.75, "y": 2},
+                {"matrix": [2, 6], "x": 5.75, "y": 2},
+                {"matrix": [2, 7], "x": 6.75, "y": 2},
+                {"matrix": [2, 8], "x": 7.75, "y": 2},
+                {"matrix": [2, 9], "x": 8.75, "y": 2},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
+                {"matrix": [2, 12], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+
+                {"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": 6},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.5},
+                {"matrix": [4, 11], "x": 11.5, "y": 4}
+            ]
+        },
+        "LAYOUT_60_iso": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 14], "x": 13, "y": 0, "w": 2},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 1.5, "y": 1},
+                {"matrix": [1, 3], "x": 2.5, "y": 1},
+                {"matrix": [1, 4], "x": 3.5, "y": 1},
+                {"matrix": [1, 5], "x": 4.5, "y": 1},
+                {"matrix": [1, 6], "x": 5.5, "y": 1},
+                {"matrix": [1, 7], "x": 6.5, "y": 1},
+                {"matrix": [1, 8], "x": 7.5, "y": 1},
+                {"matrix": [1, 9], "x": 8.5, "y": 1},
+                {"matrix": [1, 10], "x": 9.5, "y": 1},
+                {"matrix": [1, 11], "x": 10.5, "y": 1},
+                {"matrix": [1, 12], "x": 11.5, "y": 1},
+                {"matrix": [1, 13], "x": 12.5, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 1.75, "y": 2},
+                {"matrix": [2, 3], "x": 2.75, "y": 2},
+                {"matrix": [2, 4], "x": 3.75, "y": 2},
+                {"matrix": [2, 5], "x": 4.75, "y": 2},
+                {"matrix": [2, 6], "x": 5.75, "y": 2},
+                {"matrix": [2, 7], "x": 6.75, "y": 2},
+                {"matrix": [2, 8], "x": 7.75, "y": 2},
+                {"matrix": [2, 9], "x": 8.75, "y": 2},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
+                {"matrix": [2, 12], "x": 11.75, "y": 2},
+                {"matrix": [1, 14], "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, 13], "x": 12.25, "y": 3, "w": 2.75},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 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, 13], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 14], "x": 13.75, "y": 4, "w": 1.25}
+            ]
+        },
+        "LAYOUT_60_iso_split_bs_rshift": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 1.5, "y": 1},
+                {"matrix": [1, 3], "x": 2.5, "y": 1},
+                {"matrix": [1, 4], "x": 3.5, "y": 1},
+                {"matrix": [1, 5], "x": 4.5, "y": 1},
+                {"matrix": [1, 6], "x": 5.5, "y": 1},
+                {"matrix": [1, 7], "x": 6.5, "y": 1},
+                {"matrix": [1, 8], "x": 7.5, "y": 1},
+                {"matrix": [1, 9], "x": 8.5, "y": 1},
+                {"matrix": [1, 10], "x": 9.5, "y": 1},
+                {"matrix": [1, 11], "x": 10.5, "y": 1},
+                {"matrix": [1, 12], "x": 11.5, "y": 1},
+                {"matrix": [1, 13], "x": 12.5, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 1.75, "y": 2},
+                {"matrix": [2, 3], "x": 2.75, "y": 2},
+                {"matrix": [2, 4], "x": 3.75, "y": 2},
+                {"matrix": [2, 5], "x": 4.75, "y": 2},
+                {"matrix": [2, 6], "x": 5.75, "y": 2},
+                {"matrix": [2, 7], "x": 6.75, "y": 2},
+                {"matrix": [2, 8], "x": 7.75, "y": 2},
+                {"matrix": [2, 9], "x": 8.75, "y": 2},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
+                {"matrix": [2, 12], "x": 11.75, "y": 2},
+                {"matrix": [1, 14], "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, 13], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "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, 13], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 14], "x": 13.75, "y": 4, "w": 1.25}
+            ]
+        },
+        "LAYOUT_60_iso_tsangan": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 14], "x": 13, "y": 0, "w": 2},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 1.5, "y": 1},
+                {"matrix": [1, 3], "x": 2.5, "y": 1},
+                {"matrix": [1, 4], "x": 3.5, "y": 1},
+                {"matrix": [1, 5], "x": 4.5, "y": 1},
+                {"matrix": [1, 6], "x": 5.5, "y": 1},
+                {"matrix": [1, 7], "x": 6.5, "y": 1},
+                {"matrix": [1, 8], "x": 7.5, "y": 1},
+                {"matrix": [1, 9], "x": 8.5, "y": 1},
+                {"matrix": [1, 10], "x": 9.5, "y": 1},
+                {"matrix": [1, 11], "x": 10.5, "y": 1},
+                {"matrix": [1, 12], "x": 11.5, "y": 1},
+                {"matrix": [1, 13], "x": 12.5, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 1.75, "y": 2},
+                {"matrix": [2, 3], "x": 2.75, "y": 2},
+                {"matrix": [2, 4], "x": 3.75, "y": 2},
+                {"matrix": [2, 5], "x": 4.75, "y": 2},
+                {"matrix": [2, 6], "x": 5.75, "y": 2},
+                {"matrix": [2, 7], "x": 6.75, "y": 2},
+                {"matrix": [2, 8], "x": 7.75, "y": 2},
+                {"matrix": [2, 9], "x": 8.75, "y": 2},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
+                {"matrix": [2, 12], "x": 11.75, "y": 2},
+                {"matrix": [1, 14], "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, 13], "x": 12.25, "y": 3, "w": 2.75},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 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, 13], "x": 12.5, "y": 4},
+                {"matrix": [4, 14], "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": [0, 14], "x": 14, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 1.5, "y": 1},
+                {"matrix": [1, 3], "x": 2.5, "y": 1},
+                {"matrix": [1, 4], "x": 3.5, "y": 1},
+                {"matrix": [1, 5], "x": 4.5, "y": 1},
+                {"matrix": [1, 6], "x": 5.5, "y": 1},
+                {"matrix": [1, 7], "x": 6.5, "y": 1},
+                {"matrix": [1, 8], "x": 7.5, "y": 1},
+                {"matrix": [1, 9], "x": 8.5, "y": 1},
+                {"matrix": [1, 10], "x": 9.5, "y": 1},
+                {"matrix": [1, 11], "x": 10.5, "y": 1},
+                {"matrix": [1, 12], "x": 11.5, "y": 1},
+                {"matrix": [1, 13], "x": 12.5, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 1.75, "y": 2},
+                {"matrix": [2, 3], "x": 2.75, "y": 2},
+                {"matrix": [2, 4], "x": 3.75, "y": 2},
+                {"matrix": [2, 5], "x": 4.75, "y": 2},
+                {"matrix": [2, 6], "x": 5.75, "y": 2},
+                {"matrix": [2, 7], "x": 6.75, "y": 2},
+                {"matrix": [2, 8], "x": 7.75, "y": 2},
+                {"matrix": [2, 9], "x": 8.75, "y": 2},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
+                {"matrix": [2, 12], "x": 11.75, "y": 2},
+                {"matrix": [1, 14], "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, 13], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "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, 13], "x": 12.5, "y": 4},
+                {"matrix": [4, 14], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_60_iso_wkl": {
+            "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, 14], "x": 13, "y": 0, "w": 2},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 1.5, "y": 1},
+                {"matrix": [1, 3], "x": 2.5, "y": 1},
+                {"matrix": [1, 4], "x": 3.5, "y": 1},
+                {"matrix": [1, 5], "x": 4.5, "y": 1},
+                {"matrix": [1, 6], "x": 5.5, "y": 1},
+                {"matrix": [1, 7], "x": 6.5, "y": 1},
+                {"matrix": [1, 8], "x": 7.5, "y": 1},
+                {"matrix": [1, 9], "x": 8.5, "y": 1},
+                {"matrix": [1, 10], "x": 9.5, "y": 1},
+                {"matrix": [1, 11], "x": 10.5, "y": 1},
+                {"matrix": [1, 12], "x": 11.5, "y": 1},
+                {"matrix": [1, 13], "x": 12.5, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 1.75, "y": 2},
+                {"matrix": [2, 3], "x": 2.75, "y": 2},
+                {"matrix": [2, 4], "x": 3.75, "y": 2},
+                {"matrix": [2, 5], "x": 4.75, "y": 2},
+                {"matrix": [2, 6], "x": 5.75, "y": 2},
+                {"matrix": [2, 7], "x": 6.75, "y": 2},
+                {"matrix": [2, 8], "x": 7.75, "y": 2},
+                {"matrix": [2, 9], "x": 8.75, "y": 2},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
+                {"matrix": [2, 12], "x": 11.75, "y": 2},
+                {"matrix": [1, 14], "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, 13], "x": 12.25, "y": 3, "w": 2.75},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"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, 14], "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": [0, 14], "x": 14, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 1.5, "y": 1},
+                {"matrix": [1, 3], "x": 2.5, "y": 1},
+                {"matrix": [1, 4], "x": 3.5, "y": 1},
+                {"matrix": [1, 5], "x": 4.5, "y": 1},
+                {"matrix": [1, 6], "x": 5.5, "y": 1},
+                {"matrix": [1, 7], "x": 6.5, "y": 1},
+                {"matrix": [1, 8], "x": 7.5, "y": 1},
+                {"matrix": [1, 9], "x": 8.5, "y": 1},
+                {"matrix": [1, 10], "x": 9.5, "y": 1},
+                {"matrix": [1, 11], "x": 10.5, "y": 1},
+                {"matrix": [1, 12], "x": 11.5, "y": 1},
+                {"matrix": [1, 13], "x": 12.5, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 1.75, "y": 2},
+                {"matrix": [2, 3], "x": 2.75, "y": 2},
+                {"matrix": [2, 4], "x": 3.75, "y": 2},
+                {"matrix": [2, 5], "x": 4.75, "y": 2},
+                {"matrix": [2, 6], "x": 5.75, "y": 2},
+                {"matrix": [2, 7], "x": 6.75, "y": 2},
+                {"matrix": [2, 8], "x": 7.75, "y": 2},
+                {"matrix": [2, 9], "x": 8.75, "y": 2},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
+                {"matrix": [2, 12], "x": 11.75, "y": 2},
+                {"matrix": [1, 14], "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, 13], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"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, 14], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_60_iso_arrow": {
+            "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, 14], "x": 13, "y": 0, "w": 2},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 1.5, "y": 1},
+                {"matrix": [1, 3], "x": 2.5, "y": 1},
+                {"matrix": [1, 4], "x": 3.5, "y": 1},
+                {"matrix": [1, 5], "x": 4.5, "y": 1},
+                {"matrix": [1, 6], "x": 5.5, "y": 1},
+                {"matrix": [1, 7], "x": 6.5, "y": 1},
+                {"matrix": [1, 8], "x": 7.5, "y": 1},
+                {"matrix": [1, 9], "x": 8.5, "y": 1},
+                {"matrix": [1, 10], "x": 9.5, "y": 1},
+                {"matrix": [1, 11], "x": 10.5, "y": 1},
+                {"matrix": [1, 12], "x": 11.5, "y": 1},
+                {"matrix": [1, 13], "x": 12.5, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 1.75, "y": 2},
+                {"matrix": [2, 3], "x": 2.75, "y": 2},
+                {"matrix": [2, 4], "x": 3.75, "y": 2},
+                {"matrix": [2, 5], "x": 4.75, "y": 2},
+                {"matrix": [2, 6], "x": 5.75, "y": 2},
+                {"matrix": [2, 7], "x": 6.75, "y": 2},
+                {"matrix": [2, 8], "x": 7.75, "y": 2},
+                {"matrix": [2, 9], "x": 8.75, "y": 2},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
+                {"matrix": [2, 12], "x": 11.75, "y": 2},
+                {"matrix": [1, 14], "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, 12], "x": 11.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 13, "y": 3},
+                {"matrix": [3, 14], "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},
+                {"matrix": [4, 11], "x": 11, "y": 4},
+                {"matrix": [4, 12], "x": 12, "y": 4},
+                {"matrix": [4, 13], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4}
+            ]
+        },
+        "LAYOUT_60_iso_arrow_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, 14], "x": 14, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 1.5, "y": 1},
+                {"matrix": [1, 3], "x": 2.5, "y": 1},
+                {"matrix": [1, 4], "x": 3.5, "y": 1},
+                {"matrix": [1, 5], "x": 4.5, "y": 1},
+                {"matrix": [1, 6], "x": 5.5, "y": 1},
+                {"matrix": [1, 7], "x": 6.5, "y": 1},
+                {"matrix": [1, 8], "x": 7.5, "y": 1},
+                {"matrix": [1, 9], "x": 8.5, "y": 1},
+                {"matrix": [1, 10], "x": 9.5, "y": 1},
+                {"matrix": [1, 11], "x": 10.5, "y": 1},
+                {"matrix": [1, 12], "x": 11.5, "y": 1},
+                {"matrix": [1, 13], "x": 12.5, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 1.75, "y": 2},
+                {"matrix": [2, 3], "x": 2.75, "y": 2},
+                {"matrix": [2, 4], "x": 3.75, "y": 2},
+                {"matrix": [2, 5], "x": 4.75, "y": 2},
+                {"matrix": [2, 6], "x": 5.75, "y": 2},
+                {"matrix": [2, 7], "x": 6.75, "y": 2},
+                {"matrix": [2, 8], "x": 7.75, "y": 2},
+                {"matrix": [2, 9], "x": 8.75, "y": 2},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
+                {"matrix": [2, 12], "x": 11.75, "y": 2},
+                {"matrix": [1, 14], "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, 12], "x": 11.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 13, "y": 3},
+                {"matrix": [3, 14], "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},
+                {"matrix": [4, 11], "x": 11, "y": 4},
+                {"matrix": [4, 12], "x": 12, "y": 4},
+                {"matrix": [4, 13], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4}
+            ]
+        },
+        "LAYOUT_64_iso": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 14], "x": 13, "y": 0, "w": 2},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 1.5, "y": 1},
+                {"matrix": [1, 3], "x": 2.5, "y": 1},
+                {"matrix": [1, 4], "x": 3.5, "y": 1},
+                {"matrix": [1, 5], "x": 4.5, "y": 1},
+                {"matrix": [1, 6], "x": 5.5, "y": 1},
+                {"matrix": [1, 7], "x": 6.5, "y": 1},
+                {"matrix": [1, 8], "x": 7.5, "y": 1},
+                {"matrix": [1, 9], "x": 8.5, "y": 1},
+                {"matrix": [1, 10], "x": 9.5, "y": 1},
+                {"matrix": [1, 11], "x": 10.5, "y": 1},
+                {"matrix": [1, 12], "x": 11.5, "y": 1},
+                {"matrix": [1, 13], "x": 12.5, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 1.75, "y": 2},
+                {"matrix": [2, 3], "x": 2.75, "y": 2},
+                {"matrix": [2, 4], "x": 3.75, "y": 2},
+                {"matrix": [2, 5], "x": 4.75, "y": 2},
+                {"matrix": [2, 6], "x": 5.75, "y": 2},
+                {"matrix": [2, 7], "x": 6.75, "y": 2},
+                {"matrix": [2, 8], "x": 7.75, "y": 2},
+                {"matrix": [2, 9], "x": 8.75, "y": 2},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
+                {"matrix": [2, 12], "x": 11.75, "y": 2},
+                {"matrix": [1, 14], "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},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
+                {"matrix": [3, 6], "x": 6, "y": 3},
+                {"matrix": [3, 7], "x": 7, "y": 3},
+                {"matrix": [3, 8], "x": 8, "y": 3},
+                {"matrix": [3, 9], "x": 9, "y": 3},
+                {"matrix": [3, 10], "x": 10, "y": 3},
+                {"matrix": [3, 11], "x": 11, "y": 3},
+                {"matrix": [3, 12], "x": 12, "y": 3},
+                {"matrix": [3, 13], "x": 13, "y": 3},
+                {"matrix": [3, 14], "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},
+                {"matrix": [4, 11], "x": 11, "y": 4},
+                {"matrix": [4, 12], "x": 12, "y": 4},
+                {"matrix": [4, 13], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4}
+            ]
+        },
+        "LAYOUT_64_iso_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, 14], "x": 14, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 1.5, "y": 1},
+                {"matrix": [1, 3], "x": 2.5, "y": 1},
+                {"matrix": [1, 4], "x": 3.5, "y": 1},
+                {"matrix": [1, 5], "x": 4.5, "y": 1},
+                {"matrix": [1, 6], "x": 5.5, "y": 1},
+                {"matrix": [1, 7], "x": 6.5, "y": 1},
+                {"matrix": [1, 8], "x": 7.5, "y": 1},
+                {"matrix": [1, 9], "x": 8.5, "y": 1},
+                {"matrix": [1, 10], "x": 9.5, "y": 1},
+                {"matrix": [1, 11], "x": 10.5, "y": 1},
+                {"matrix": [1, 12], "x": 11.5, "y": 1},
+                {"matrix": [1, 13], "x": 12.5, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 1.75, "y": 2},
+                {"matrix": [2, 3], "x": 2.75, "y": 2},
+                {"matrix": [2, 4], "x": 3.75, "y": 2},
+                {"matrix": [2, 5], "x": 4.75, "y": 2},
+                {"matrix": [2, 6], "x": 5.75, "y": 2},
+                {"matrix": [2, 7], "x": 6.75, "y": 2},
+                {"matrix": [2, 8], "x": 7.75, "y": 2},
+                {"matrix": [2, 9], "x": 8.75, "y": 2},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
+                {"matrix": [2, 12], "x": 11.75, "y": 2},
+                {"matrix": [1, 14], "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},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
+                {"matrix": [3, 6], "x": 6, "y": 3},
+                {"matrix": [3, 7], "x": 7, "y": 3},
+                {"matrix": [3, 8], "x": 8, "y": 3},
+                {"matrix": [3, 9], "x": 9, "y": 3},
+                {"matrix": [3, 10], "x": 10, "y": 3},
+                {"matrix": [3, 11], "x": 11, "y": 3},
+                {"matrix": [3, 12], "x": 12, "y": 3},
+                {"matrix": [3, 13], "x": 13, "y": 3},
+                {"matrix": [3, 14], "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},
+                {"matrix": [4, 11], "x": 11, "y": 4},
+                {"matrix": [4, 12], "x": 12, "y": 4},
+                {"matrix": [4, 13], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4}
+            ]
+        },
+        "LAYOUT_abnt2": {
+            "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, 14], "x": 13, "y": 0, "w": 2},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 1.5, "y": 1},
+                {"matrix": [1, 3], "x": 2.5, "y": 1},
+                {"matrix": [1, 4], "x": 3.5, "y": 1},
+                {"matrix": [1, 5], "x": 4.5, "y": 1},
+                {"matrix": [1, 6], "x": 5.5, "y": 1},
+                {"matrix": [1, 7], "x": 6.5, "y": 1},
+                {"matrix": [1, 8], "x": 7.5, "y": 1},
+                {"matrix": [1, 9], "x": 8.5, "y": 1},
+                {"matrix": [1, 10], "x": 9.5, "y": 1},
+                {"matrix": [1, 11], "x": 10.5, "y": 1},
+                {"matrix": [1, 12], "x": 11.5, "y": 1},
+                {"matrix": [1, 13], "x": 12.5, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 1.75, "y": 2},
+                {"matrix": [2, 3], "x": 2.75, "y": 2},
+                {"matrix": [2, 4], "x": 3.75, "y": 2},
+                {"matrix": [2, 5], "x": 4.75, "y": 2},
+                {"matrix": [2, 6], "x": 5.75, "y": 2},
+                {"matrix": [2, 7], "x": 6.75, "y": 2},
+                {"matrix": [2, 8], "x": 7.75, "y": 2},
+                {"matrix": [2, 9], "x": 8.75, "y": 2},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
+                {"matrix": [2, 12], "x": 11.75, "y": 2},
+                {"matrix": [1, 14], "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},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
+                {"matrix": [3, 6], "x": 6, "y": 3},
+                {"matrix": [3, 7], "x": 7, "y": 3},
+                {"matrix": [3, 8], "x": 8, "y": 3},
+                {"matrix": [3, 9], "x": 9, "y": 3},
+                {"matrix": [3, 10], "x": 10, "y": 3},
+                {"matrix": [3, 11], "x": 11, "y": 3},
+                {"matrix": [3, 12], "x": 12, "y": 3},
+                {"matrix": [3, 13], "x": 13, "y": 3, "w": 2},
+
+                {"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, 13], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 14], "x": 13.75, "y": 4, "w": 1.25}
+            ]
+        },
         "LAYOUT": {
             "layout": [
                 {"matrix": [0, 0], "x": 0, "y": 0},
@@ -208,220 +1827,7 @@
                 {"matrix": [4, 14], "x": 14, "y": 4}
             ]
         },
-        "LAYOUT_hhkb": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"matrix": [0, 13], "x": 13, "y": 0},
-                {"matrix": [0, 14], "x": 14, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 2], "x": 1.5, "y": 1},
-                {"matrix": [1, 3], "x": 2.5, "y": 1},
-                {"matrix": [1, 4], "x": 3.5, "y": 1},
-                {"matrix": [1, 5], "x": 4.5, "y": 1},
-                {"matrix": [1, 6], "x": 5.5, "y": 1},
-                {"matrix": [1, 7], "x": 6.5, "y": 1},
-                {"matrix": [1, 8], "x": 7.5, "y": 1},
-                {"matrix": [1, 9], "x": 8.5, "y": 1},
-                {"matrix": [1, 10], "x": 9.5, "y": 1},
-                {"matrix": [1, 11], "x": 10.5, "y": 1},
-                {"matrix": [1, 12], "x": 11.5, "y": 1},
-                {"matrix": [1, 13], "x": 12.5, "y": 1},
-                {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 2], "x": 1.75, "y": 2},
-                {"matrix": [2, 3], "x": 2.75, "y": 2},
-                {"matrix": [2, 4], "x": 3.75, "y": 2},
-                {"matrix": [2, 5], "x": 4.75, "y": 2},
-                {"matrix": [2, 6], "x": 5.75, "y": 2},
-                {"matrix": [2, 7], "x": 6.75, "y": 2},
-                {"matrix": [2, 8], "x": 7.75, "y": 2},
-                {"matrix": [2, 9], "x": 8.75, "y": 2},
-                {"matrix": [2, 10], "x": 9.75, "y": 2},
-                {"matrix": [2, 11], "x": 10.75, "y": 2},
-                {"matrix": [2, 12], "x": 11.75, "y": 2},
-                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"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, 13], "x": 12.25, "y": 3, "w": 1.75},
-                {"matrix": [3, 14], "x": 14, "y": 3},
-
-                {"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, 13], "x": 12.5, "y": 4}
-            ]
-        },
-        "LAYOUT_true_hhkb": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"matrix": [0, 13], "x": 13, "y": 0},
-                {"matrix": [0, 14], "x": 14, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 2], "x": 1.5, "y": 1},
-                {"matrix": [1, 3], "x": 2.5, "y": 1},
-                {"matrix": [1, 4], "x": 3.5, "y": 1},
-                {"matrix": [1, 5], "x": 4.5, "y": 1},
-                {"matrix": [1, 6], "x": 5.5, "y": 1},
-                {"matrix": [1, 7], "x": 6.5, "y": 1},
-                {"matrix": [1, 8], "x": 7.5, "y": 1},
-                {"matrix": [1, 9], "x": 8.5, "y": 1},
-                {"matrix": [1, 10], "x": 9.5, "y": 1},
-                {"matrix": [1, 11], "x": 10.5, "y": 1},
-                {"matrix": [1, 12], "x": 11.5, "y": 1},
-                {"matrix": [1, 13], "x": 12.5, "y": 1},
-                {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 2], "x": 1.75, "y": 2},
-                {"matrix": [2, 3], "x": 2.75, "y": 2},
-                {"matrix": [2, 4], "x": 3.75, "y": 2},
-                {"matrix": [2, 5], "x": 4.75, "y": 2},
-                {"matrix": [2, 6], "x": 5.75, "y": 2},
-                {"matrix": [2, 7], "x": 6.75, "y": 2},
-                {"matrix": [2, 8], "x": 7.75, "y": 2},
-                {"matrix": [2, 9], "x": 8.75, "y": 2},
-                {"matrix": [2, 10], "x": 9.75, "y": 2},
-                {"matrix": [2, 11], "x": 10.75, "y": 2},
-                {"matrix": [2, 12], "x": 11.75, "y": 2},
-                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"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, 13], "x": 12.25, "y": 3, "w": 1.75},
-                {"matrix": [3, 14], "x": 14, "y": 3},
-
-                {"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": 6},
-                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.5},
-                {"matrix": [4, 11], "x": 11.5, "y": 4}
-            ]
-        },
-        "LAYOUT_directional": {
-            "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, 14], "x": 14, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 2], "x": 1.5, "y": 1},
-                {"matrix": [1, 3], "x": 2.5, "y": 1},
-                {"matrix": [1, 4], "x": 3.5, "y": 1},
-                {"matrix": [1, 5], "x": 4.5, "y": 1},
-                {"matrix": [1, 6], "x": 5.5, "y": 1},
-                {"matrix": [1, 7], "x": 6.5, "y": 1},
-                {"matrix": [1, 8], "x": 7.5, "y": 1},
-                {"matrix": [1, 9], "x": 8.5, "y": 1},
-                {"matrix": [1, 10], "x": 9.5, "y": 1},
-                {"matrix": [1, 11], "x": 10.5, "y": 1},
-                {"matrix": [1, 12], "x": 11.5, "y": 1},
-                {"matrix": [1, 13], "x": 12.5, "y": 1},
-                {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 2], "x": 1.75, "y": 2},
-                {"matrix": [2, 3], "x": 2.75, "y": 2},
-                {"matrix": [2, 4], "x": 3.75, "y": 2},
-                {"matrix": [2, 5], "x": 4.75, "y": 2},
-                {"matrix": [2, 6], "x": 5.75, "y": 2},
-                {"matrix": [2, 7], "x": 6.75, "y": 2},
-                {"matrix": [2, 8], "x": 7.75, "y": 2},
-                {"matrix": [2, 9], "x": 8.75, "y": 2},
-                {"matrix": [2, 10], "x": 9.75, "y": 2},
-                {"matrix": [2, 11], "x": 10.75, "y": 2},
-                {"matrix": [2, 12], "x": 11.75, "y": 2},
-                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"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, 12], "x": 11.25, "y": 3, "w": 1.75},
-                {"matrix": [3, 13], "x": 13, "y": 3},
-                {"matrix": [3, 14], "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, 4], "x": 3.75, "y": 4, "w": 2.25},
-                {"matrix": [4, 6], "x": 6, "y": 4, "w": 1.25},
-                {"matrix": [4, 8], "x": 7.25, "y": 4, "w": 2.75},
-                {"matrix": [4, 10], "x": 10, "y": 4},
-                {"matrix": [4, 11], "x": 11, "y": 4},
-                {"matrix": [4, 12], "x": 12, "y": 4},
-                {"matrix": [4, 13], "x": 13, "y": 4},
-                {"matrix": [4, 14], "x": 14, "y": 4}
-            ]
-        },
-        "LAYOUT_mitchsplit": {
+        "LAYOUT_60_ansi_split_space_split_rshift": {
             "layout": [
                 {"matrix": [0, 0], "x": 0, "y": 0},
                 {"matrix": [0, 1], "x": 1, "y": 0},
diff --git a/keyboards/mechkeys/acr60/matrix_diagram.md b/keyboards/mechkeys/acr60/matrix_diagram.md
new file mode 100644
index 00000000000..27a38030afb
--- /dev/null
+++ b/keyboards/mechkeys/acr60/matrix_diagram.md
@@ -0,0 +1,57 @@
+# Matrix Diagram for MechKeys ACR60
+
+```
+                                                    ┌───────┐
+                                       2u Backspace │0E     │
+                                                    └───────┘
+┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+│00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │0E │
+├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤      ┌─────┐
+│10   │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D │1E   │      │     │
+├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤   ┌──┴┐2D  │ ISO Enter
+│20    │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │2D      │   │1E │    │
+└──────┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴────────┘   └───┴────┘
+Shift Row Options:
+┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+│30 │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3C │3D │3E │
+└───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┘
+┌───────┐                                           ┌───────┐
+│30     │ 2u LShift                       2u RShift │3D     │
+└───────┘                                           └───────┘
+┌────┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬──────┬───┐
+│30  │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3D    │3E │ Standard with Split Shifts
+└────┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴──────┴───┘   1.25u/1u LShift + 1u/1.75u/1u RShift
+┌────────┐                                   ┌───┬──────────┐
+│30      │ 2.25u LShift                      │3B │3D        │ 2.75u RShift
+└────────┘                                   └───┴──────────┘
+                                             ┌──────┬───┬───┐
+                                             │3C    │3D │3E │ 1.75u/1u/1u RShift
+                                             └──────┴───┴───┘
+Bottom Row Options:
+┌────┬────┬────┬────────┬────┬──────────┬───┬───┬───┬───┬───┐
+│40  │41  │43  │44      │46  │48        │4A │4B │4C │4D │4E │ 5x 1u Mods
+└────┴────┴────┴────────┴────┴──────────┴───┴───┴───┴───┴───┘
+                Split Spacebar
+                [2.25/1.25/2.75] or [2.75/1.25/2.25]
+               ┌──────────┬────┬────────┐
+               │44        │46  │48      │
+               └──────────┴────┴────────┘
+┌────┬────┬────┬────────────────────────┬────┬────┬────┬────┐ ┐
+│40  │41  │43  │46                      │4A  │4B  │4D  │4E  │ ├─ Standard
+└────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ │    or
+┌─────┬───┬─────┬───────────────────────┬─────┬───┬───┬─────┐ │  Infinity/True HHKB
+│40   │41 │43   │46                     │4A   │4B │4D │4E   │ │    (same matrix)
+└─────┴───┴─────┴───────────────────────┴─────┴───┴───┴─────┘ ┘
+┌─────┬───┬────┬────────────────────────┬───┬───┬───┬───┬───┐
+│40   │41 │43  │46                      │4A │4B │4C │4D │4E │
+└─────┴───┴────┴────────────────────────┴───┴───┴───┴───┴───┘
+┌─────┬─────┬───────────────────────────┬───┬───┬───┬───┬───┐
+│40   │41   │46                         │4A │4B │4C │4D │4E │ LWKL
+└─────┴─────┴───────────────────────────┴───┴───┴───┴───┴───┘
+┌─────┬───┬─────┬───────────────────────────┬─────┬───┬─────┐
+│40   │41 │43   │46                         │4B   │4D │4E   │ Tsangan/WKL/HHKB
+└─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘
+┌─────┬───┬─────┬───────────────────────────┬───┬───┬───┬───┐
+│40   │41 │43   │46                         │4B │4C │4D │4E │ Tsangan Arrow
+└─────┴───┴─────┴───────────────────────────┴───┴───┴───┴───┘
+```
diff --git a/keyboards/mechkeys/mechmini/v1/info.json b/keyboards/mechkeys/mechmini/v1/info.json
deleted file mode 100644
index 7dda26af254..00000000000
--- a/keyboards/mechkeys/mechmini/v1/info.json
+++ /dev/null
@@ -1,137 +0,0 @@
-{
-    "keyboard_name": "MechMini",
-    "manufacturer": "MechKeys",
-    "url": "",
-    "maintainer": "qmk",
-    "usb": {
-        "vid": "0xFEED",
-        "pid": "0xCA40",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "C7", "C6", "C5", "C4"],
-        "rows": ["B0", "B1", "B2", "B3"]
-    },
-    "diode_direction": "COL2ROW",
-    "backlight": {
-        "pin": "D4"
-    },
-    "rgblight": {
-        "led_count": 16,
-        "animations": {
-            "breathing": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "snake": true,
-            "knight": true,
-            "christmas": true,
-            "static_gradient": true,
-            "rgb_test": true,
-            "alternating": true,
-            "twinkle": true
-        }
-    },
-    "ws2812": {
-        "driver": "i2c"
-    },
-    "processor": "atmega32a",
-    "bootloader": "bootloadhid",
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [3, 0], "x": 0, "y": 0},
-                {"matrix": [3, 1], "x": 1, "y": 0},
-                {"matrix": [3, 2], "x": 2, "y": 0},
-                {"matrix": [3, 3], "x": 3, "y": 0},
-                {"matrix": [3, 4], "x": 4, "y": 0},
-                {"matrix": [3, 5], "x": 5, "y": 0},
-                {"matrix": [3, 6], "x": 6, "y": 0},
-                {"matrix": [3, 7], "x": 7, "y": 0},
-                {"matrix": [3, 8], "x": 8, "y": 0},
-                {"matrix": [3, 9], "x": 9, "y": 0},
-                {"matrix": [3, 10], "x": 10, "y": 0},
-                {"matrix": [3, 11], "x": 11, "y": 0},
-
-                {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.25},
-                {"matrix": [2, 1], "x": 1.25, "y": 1},
-                {"matrix": [2, 2], "x": 2.25, "y": 1},
-                {"matrix": [2, 3], "x": 3.25, "y": 1},
-                {"matrix": [2, 4], "x": 4.25, "y": 1},
-                {"matrix": [2, 5], "x": 5.25, "y": 1},
-                {"matrix": [2, 6], "x": 6.25, "y": 1},
-                {"matrix": [2, 7], "x": 7.25, "y": 1},
-                {"matrix": [2, 8], "x": 8.25, "y": 1},
-                {"matrix": [2, 9], "x": 9.25, "y": 1},
-                {"matrix": [2, 10], "x": 10.25, "y": 1, "w": 1.75},
-
-                {"matrix": [1, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [1, 1], "x": 1.75, "y": 2},
-                {"matrix": [1, 2], "x": 2.75, "y": 2},
-                {"matrix": [1, 3], "x": 3.75, "y": 2},
-                {"matrix": [1, 4], "x": 4.75, "y": 2},
-                {"matrix": [1, 5], "x": 5.75, "y": 2},
-                {"matrix": [1, 6], "x": 6.75, "y": 2},
-                {"matrix": [1, 7], "x": 7.75, "y": 2},
-                {"matrix": [1, 8], "x": 8.75, "y": 2},
-                {"matrix": [1, 9], "x": 9.75, "y": 2, "w": 1.25},
-                {"matrix": [1, 10], "x": 11, "y": 2},
-
-                {"matrix": [0, 0], "x": 0, "y": 3, "w": 1.25},
-                {"matrix": [0, 1], "x": 1.25, "y": 3},
-                {"matrix": [0, 2], "x": 2.25, "y": 3},
-                {"matrix": [0, 5], "x": 3.25, "y": 3, "w": 6.25},
-                {"matrix": [0, 9], "x": 9.5, "y": 3, "w": 1.25},
-                {"matrix": [0, 10], "x": 10.75, "y": 3, "w": 1.25}
-            ]
-        },
-        "LAYOUT_split_space": {
-            "layout": [
-                {"matrix": [3, 0], "x": 0, "y": 0},
-                {"matrix": [3, 1], "x": 1, "y": 0},
-                {"matrix": [3, 2], "x": 2, "y": 0},
-                {"matrix": [3, 3], "x": 3, "y": 0},
-                {"matrix": [3, 4], "x": 4, "y": 0},
-                {"matrix": [3, 5], "x": 5, "y": 0},
-                {"matrix": [3, 6], "x": 6, "y": 0},
-                {"matrix": [3, 7], "x": 7, "y": 0},
-                {"matrix": [3, 8], "x": 8, "y": 0},
-                {"matrix": [3, 9], "x": 9, "y": 0},
-                {"matrix": [3, 10], "x": 10, "y": 0},
-                {"matrix": [3, 11], "x": 11, "y": 0},
-
-                {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.25},
-                {"matrix": [2, 1], "x": 1.25, "y": 1},
-                {"matrix": [2, 2], "x": 2.25, "y": 1},
-                {"matrix": [2, 3], "x": 3.25, "y": 1},
-                {"matrix": [2, 4], "x": 4.25, "y": 1},
-                {"matrix": [2, 5], "x": 5.25, "y": 1},
-                {"matrix": [2, 6], "x": 6.25, "y": 1},
-                {"matrix": [2, 7], "x": 7.25, "y": 1},
-                {"matrix": [2, 8], "x": 8.25, "y": 1},
-                {"matrix": [2, 9], "x": 9.25, "y": 1},
-                {"matrix": [2, 10], "x": 10.25, "y": 1, "w": 1.75},
-
-                {"matrix": [1, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [1, 1], "x": 1.75, "y": 2},
-                {"matrix": [1, 2], "x": 2.75, "y": 2},
-                {"matrix": [1, 3], "x": 3.75, "y": 2},
-                {"matrix": [1, 4], "x": 4.75, "y": 2},
-                {"matrix": [1, 5], "x": 5.75, "y": 2},
-                {"matrix": [1, 6], "x": 6.75, "y": 2},
-                {"matrix": [1, 7], "x": 7.75, "y": 2},
-                {"matrix": [1, 8], "x": 8.75, "y": 2},
-                {"matrix": [1, 9], "x": 9.75, "y": 2, "w": 1.25},
-                {"matrix": [1, 10], "x": 11, "y": 2},
-
-                {"matrix": [0, 0], "x": 0, "y": 3, "w": 1.25},
-                {"matrix": [0, 1], "x": 1.25, "y": 3},
-                {"matrix": [0, 2], "x": 2.25, "y": 3, "w": 1.25},
-                {"matrix": [0, 3], "x": 3.5, "y": 3, "w": 2.75},
-                {"matrix": [0, 6], "x": 6.25, "y": 3, "w": 2.25},
-                {"matrix": [0, 8], "x": 8.5, "y": 3, "w": 1.25},
-                {"matrix": [0, 9], "x": 9.75, "y": 3},
-                {"matrix": [0, 10], "x": 10.75, "y": 3, "w": 1.25}
-            ]
-        }
-    }
-}
diff --git a/keyboards/mechkeys/mechmini/v1/keyboard.json b/keyboards/mechkeys/mechmini/v1/keyboard.json
new file mode 100644
index 00000000000..8d3a4a9b84a
--- /dev/null
+++ b/keyboards/mechkeys/mechmini/v1/keyboard.json
@@ -0,0 +1,145 @@
+{
+    "keyboard_name": "MechMini",
+    "manufacturer": "MechKeys",
+    "url": "",
+    "maintainer": "qmk",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0xCA40",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "command": true,
+        "backlight": true,
+        "rgblight": true
+    },
+    "matrix_pins": {
+        "cols": ["A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "C7", "C6", "C5", "C4"],
+        "rows": ["B0", "B1", "B2", "B3"]
+    },
+    "diode_direction": "COL2ROW",
+    "backlight": {
+        "pin": "D4"
+    },
+    "rgblight": {
+        "led_count": 16,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": true,
+            "twinkle": true
+        }
+    },
+    "ws2812": {
+        "driver": "i2c"
+    },
+    "processor": "atmega32a",
+    "bootloader": "bootloadhid",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [3, 0], "x": 0, "y": 0},
+                {"matrix": [3, 1], "x": 1, "y": 0},
+                {"matrix": [3, 2], "x": 2, "y": 0},
+                {"matrix": [3, 3], "x": 3, "y": 0},
+                {"matrix": [3, 4], "x": 4, "y": 0},
+                {"matrix": [3, 5], "x": 5, "y": 0},
+                {"matrix": [3, 6], "x": 6, "y": 0},
+                {"matrix": [3, 7], "x": 7, "y": 0},
+                {"matrix": [3, 8], "x": 8, "y": 0},
+                {"matrix": [3, 9], "x": 9, "y": 0},
+                {"matrix": [3, 10], "x": 10, "y": 0},
+                {"matrix": [3, 11], "x": 11, "y": 0},
+
+                {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.25},
+                {"matrix": [2, 1], "x": 1.25, "y": 1},
+                {"matrix": [2, 2], "x": 2.25, "y": 1},
+                {"matrix": [2, 3], "x": 3.25, "y": 1},
+                {"matrix": [2, 4], "x": 4.25, "y": 1},
+                {"matrix": [2, 5], "x": 5.25, "y": 1},
+                {"matrix": [2, 6], "x": 6.25, "y": 1},
+                {"matrix": [2, 7], "x": 7.25, "y": 1},
+                {"matrix": [2, 8], "x": 8.25, "y": 1},
+                {"matrix": [2, 9], "x": 9.25, "y": 1},
+                {"matrix": [2, 10], "x": 10.25, "y": 1, "w": 1.75},
+
+                {"matrix": [1, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [1, 1], "x": 1.75, "y": 2},
+                {"matrix": [1, 2], "x": 2.75, "y": 2},
+                {"matrix": [1, 3], "x": 3.75, "y": 2},
+                {"matrix": [1, 4], "x": 4.75, "y": 2},
+                {"matrix": [1, 5], "x": 5.75, "y": 2},
+                {"matrix": [1, 6], "x": 6.75, "y": 2},
+                {"matrix": [1, 7], "x": 7.75, "y": 2},
+                {"matrix": [1, 8], "x": 8.75, "y": 2},
+                {"matrix": [1, 9], "x": 9.75, "y": 2, "w": 1.25},
+                {"matrix": [1, 10], "x": 11, "y": 2},
+
+                {"matrix": [0, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [0, 1], "x": 1.25, "y": 3},
+                {"matrix": [0, 2], "x": 2.25, "y": 3},
+                {"matrix": [0, 5], "x": 3.25, "y": 3, "w": 6.25},
+                {"matrix": [0, 9], "x": 9.5, "y": 3, "w": 1.25},
+                {"matrix": [0, 10], "x": 10.75, "y": 3, "w": 1.25}
+            ]
+        },
+        "LAYOUT_split_space": {
+            "layout": [
+                {"matrix": [3, 0], "x": 0, "y": 0},
+                {"matrix": [3, 1], "x": 1, "y": 0},
+                {"matrix": [3, 2], "x": 2, "y": 0},
+                {"matrix": [3, 3], "x": 3, "y": 0},
+                {"matrix": [3, 4], "x": 4, "y": 0},
+                {"matrix": [3, 5], "x": 5, "y": 0},
+                {"matrix": [3, 6], "x": 6, "y": 0},
+                {"matrix": [3, 7], "x": 7, "y": 0},
+                {"matrix": [3, 8], "x": 8, "y": 0},
+                {"matrix": [3, 9], "x": 9, "y": 0},
+                {"matrix": [3, 10], "x": 10, "y": 0},
+                {"matrix": [3, 11], "x": 11, "y": 0},
+
+                {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.25},
+                {"matrix": [2, 1], "x": 1.25, "y": 1},
+                {"matrix": [2, 2], "x": 2.25, "y": 1},
+                {"matrix": [2, 3], "x": 3.25, "y": 1},
+                {"matrix": [2, 4], "x": 4.25, "y": 1},
+                {"matrix": [2, 5], "x": 5.25, "y": 1},
+                {"matrix": [2, 6], "x": 6.25, "y": 1},
+                {"matrix": [2, 7], "x": 7.25, "y": 1},
+                {"matrix": [2, 8], "x": 8.25, "y": 1},
+                {"matrix": [2, 9], "x": 9.25, "y": 1},
+                {"matrix": [2, 10], "x": 10.25, "y": 1, "w": 1.75},
+
+                {"matrix": [1, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [1, 1], "x": 1.75, "y": 2},
+                {"matrix": [1, 2], "x": 2.75, "y": 2},
+                {"matrix": [1, 3], "x": 3.75, "y": 2},
+                {"matrix": [1, 4], "x": 4.75, "y": 2},
+                {"matrix": [1, 5], "x": 5.75, "y": 2},
+                {"matrix": [1, 6], "x": 6.75, "y": 2},
+                {"matrix": [1, 7], "x": 7.75, "y": 2},
+                {"matrix": [1, 8], "x": 8.75, "y": 2},
+                {"matrix": [1, 9], "x": 9.75, "y": 2, "w": 1.25},
+                {"matrix": [1, 10], "x": 11, "y": 2},
+
+                {"matrix": [0, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [0, 1], "x": 1.25, "y": 3},
+                {"matrix": [0, 2], "x": 2.25, "y": 3, "w": 1.25},
+                {"matrix": [0, 3], "x": 3.5, "y": 3, "w": 2.75},
+                {"matrix": [0, 6], "x": 6.25, "y": 3, "w": 2.25},
+                {"matrix": [0, 8], "x": 8.5, "y": 3, "w": 1.25},
+                {"matrix": [0, 9], "x": 9.75, "y": 3},
+                {"matrix": [0, 10], "x": 10.75, "y": 3, "w": 1.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/mechkeys/mechmini/v1/rules.mk b/keyboards/mechkeys/mechmini/v1/rules.mk
deleted file mode 100644
index e1dfc317217..00000000000
--- a/keyboards/mechkeys/mechmini/v1/rules.mk
+++ /dev/null
@@ -1,10 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes
-EXTRAKEY_ENABLE = yes
-CONSOLE_ENABLE = no
-COMMAND_ENABLE = yes
-BACKLIGHT_ENABLE = yes
-RGBLIGHT_ENABLE = yes
diff --git a/keyboards/mechkeys/mechmini/v2/info.json b/keyboards/mechkeys/mechmini/v2/info.json
deleted file mode 100644
index 26d0b930001..00000000000
--- a/keyboards/mechkeys/mechmini/v2/info.json
+++ /dev/null
@@ -1,248 +0,0 @@
-{
-  "keyboard_name": "MechMini 2",
-  "manufacturer": "MechKeys",
-  "url": "https://mechkeys.ca/pages/mechmini-2-guide",
-  "maintainer": "qmk",
-  "usb": {
-    "vid": "0xAF99",
-    "pid": "0xCA40",
-    "device_version": "0.0.2"
-  },
-  "matrix_pins": {
-    "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "B3", "B1", "B0", "D5", "B7", "C7"],
-    "rows": ["D0", "D1", "D2", "D3"]
-  },
-  "diode_direction": "COL2ROW",
-  "backlight": {
-    "pin": "B6"
-  },
-  "rgblight": {
-    "saturation_steps": 8,
-    "brightness_steps": 8,
-    "led_count": 14,
-    "animations": {
-      "breathing": true,
-      "rainbow_mood": true,
-      "rainbow_swirl": true,
-      "snake": true,
-      "knight": true,
-      "christmas": true,
-      "static_gradient": true,
-      "rgb_test": true,
-      "alternating": true,
-      "twinkle": true
-    }
-  },
-  "ws2812": {
-    "pin": "E2"
-  },
-  "processor": "atmega32u4",
-  "bootloader": "atmel-dfu",
-  "layouts": {
-    "LAYOUT_ortho": {
-      "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": [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": [1, 4], "x": 4, "y": 1},
-        {"matrix": [1, 5], "x": 5, "y": 1},
-        {"matrix": [1, 6], "x": 6, "y": 1},
-        {"matrix": [1, 7], "x": 7, "y": 1},
-        {"matrix": [1, 8], "x": 8, "y": 1},
-        {"matrix": [1, 9], "x": 9, "y": 1},
-        {"matrix": [1, 10], "x": 10, "y": 1},
-        {"matrix": [1, 11], "x": 11, "y": 1},
-
-        {"matrix": [2, 0], "x": 0, "y": 2},
-        {"matrix": [2, 1], "x": 1, "y": 2},
-        {"matrix": [2, 2], "x": 2, "y": 2},
-        {"matrix": [2, 3], "x": 3, "y": 2},
-        {"matrix": [2, 4], "x": 4, "y": 2},
-        {"matrix": [2, 5], "x": 5, "y": 2},
-        {"matrix": [2, 6], "x": 6, "y": 2},
-        {"matrix": [2, 7], "x": 7, "y": 2},
-        {"matrix": [2, 8], "x": 8, "y": 2},
-        {"matrix": [2, 9], "x": 9, "y": 2},
-        {"matrix": [2, 10], "x": 10, "y": 2},
-        {"matrix": [2, 11], "x": 11, "y": 2},
-
-        {"matrix": [3, 0], "x": 0, "y": 3},
-        {"matrix": [3, 1], "x": 1, "y": 3},
-        {"matrix": [3, 2], "x": 2, "y": 3},
-        {"matrix": [3, 3], "x": 3, "y": 3},
-        {"matrix": [3, 4], "x": 4, "y": 3},
-        {"matrix": [3, 5], "x": 5, "y": 3},
-        {"matrix": [3, 6], "x": 6, "y": 3},
-        {"matrix": [3, 7], "x": 7, "y": 3},
-        {"matrix": [3, 8], "x": 8, "y": 3},
-        {"matrix": [3, 9], "x": 9, "y": 3},
-        {"matrix": [3, 10], "x": 10, "y": 3},
-        {"matrix": [3, 11], "x": 11, "y": 3}
-      ]
-    },
-    "LAYOUT_2u_space_ortho": {
-      "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": [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": [1, 4], "x": 4, "y": 1},
-        {"matrix": [1, 5], "x": 5, "y": 1},
-        {"matrix": [1, 6], "x": 6, "y": 1},
-        {"matrix": [1, 7], "x": 7, "y": 1},
-        {"matrix": [1, 8], "x": 8, "y": 1},
-        {"matrix": [1, 9], "x": 9, "y": 1},
-        {"matrix": [1, 10], "x": 10, "y": 1},
-        {"matrix": [1, 11], "x": 11, "y": 1},
-
-        {"matrix": [2, 0], "x": 0, "y": 2},
-        {"matrix": [2, 1], "x": 1, "y": 2},
-        {"matrix": [2, 2], "x": 2, "y": 2},
-        {"matrix": [2, 3], "x": 3, "y": 2},
-        {"matrix": [2, 4], "x": 4, "y": 2},
-        {"matrix": [2, 5], "x": 5, "y": 2},
-        {"matrix": [2, 6], "x": 6, "y": 2},
-        {"matrix": [2, 7], "x": 7, "y": 2},
-        {"matrix": [2, 8], "x": 8, "y": 2},
-        {"matrix": [2, 9], "x": 9, "y": 2},
-        {"matrix": [2, 10], "x": 10, "y": 2},
-        {"matrix": [2, 11], "x": 11, "y": 2},
-
-        {"matrix": [3, 0], "x": 0, "y": 3},
-        {"matrix": [3, 1], "x": 1, "y": 3},
-        {"matrix": [3, 2], "x": 2, "y": 3},
-        {"matrix": [3, 3], "x": 3, "y": 3},
-        {"matrix": [3, 4], "x": 4, "y": 3},
-        {"matrix": [3, 5], "x": 5, "y": 3, "w": 2},
-        {"matrix": [3, 7], "x": 7, "y": 3},
-        {"matrix": [3, 8], "x": 8, "y": 3},
-        {"matrix": [3, 9], "x": 9, "y": 3},
-        {"matrix": [3, 10], "x": 10, "y": 3},
-        {"matrix": [3, 11], "x": 11, "y": 3}
-      ]
-    },
-    "LAYOUT_625_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": [1, 0], "x": 0, "y": 1, "w": 1.25},
-        {"matrix": [1, 1], "x": 1.25, "y": 1},
-        {"matrix": [1, 2], "x": 2.25, "y": 1},
-        {"matrix": [1, 3], "x": 3.25, "y": 1},
-        {"matrix": [1, 4], "x": 4.25, "y": 1},
-        {"matrix": [1, 5], "x": 5.25, "y": 1},
-        {"matrix": [1, 6], "x": 6.25, "y": 1},
-        {"matrix": [1, 7], "x": 7.25, "y": 1},
-        {"matrix": [1, 8], "x": 8.25, "y": 1},
-        {"matrix": [1, 9], "x": 9.25, "y": 1},
-        {"matrix": [1, 11], "x": 10.25, "y": 1, "w": 1.75},
-
-        {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-        {"matrix": [2, 2], "x": 1.75, "y": 2},
-        {"matrix": [2, 3], "x": 2.75, "y": 2},
-        {"matrix": [2, 4], "x": 3.75, "y": 2},
-        {"matrix": [2, 5], "x": 4.75, "y": 2},
-        {"matrix": [2, 6], "x": 5.75, "y": 2},
-        {"matrix": [2, 7], "x": 6.75, "y": 2},
-        {"matrix": [2, 8], "x": 7.75, "y": 2},
-        {"matrix": [2, 9], "x": 8.75, "y": 2},
-        {"matrix": [2, 10], "x": 9.75, "y": 2, "w": 1.25},
-        {"matrix": [2, 11], "x": 11, "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, 6], "x": 3.25, "y": 3, "w": 6.25},
-        {"matrix": [3, 10], "x": 9.5, "y": 3, "w": 1.25},
-        {"matrix": [3, 11], "x": 10.75, "y": 3, "w": 1.25}
-      ]
-    },
-    "LAYOUT_split_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": [1, 0], "x": 0, "y": 1, "w": 1.25},
-        {"matrix": [1, 1], "x": 1.25, "y": 1},
-        {"matrix": [1, 2], "x": 2.25, "y": 1},
-        {"matrix": [1, 3], "x": 3.25, "y": 1},
-        {"matrix": [1, 4], "x": 4.25, "y": 1},
-        {"matrix": [1, 5], "x": 5.25, "y": 1},
-        {"matrix": [1, 6], "x": 6.25, "y": 1},
-        {"matrix": [1, 7], "x": 7.25, "y": 1},
-        {"matrix": [1, 8], "x": 8.25, "y": 1},
-        {"matrix": [1, 9], "x": 9.25, "y": 1},
-        {"matrix": [1, 11], "x": 10.25, "y": 1, "w": 1.75},
-
-        {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-        {"matrix": [2, 2], "x": 1.75, "y": 2},
-        {"matrix": [2, 3], "x": 2.75, "y": 2},
-        {"matrix": [2, 4], "x": 3.75, "y": 2},
-        {"matrix": [2, 5], "x": 4.75, "y": 2},
-        {"matrix": [2, 6], "x": 5.75, "y": 2},
-        {"matrix": [2, 7], "x": 6.75, "y": 2},
-        {"matrix": [2, 8], "x": 7.75, "y": 2},
-        {"matrix": [2, 9], "x": 8.75, "y": 2},
-        {"matrix": [2, 10], "x": 9.75, "y": 2, "w": 1.25},
-        {"matrix": [2, 11], "x": 11, "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, "w": 1.25},
-        {"matrix": [3, 4], "x": 3.5, "y": 3, "w": 2.75},
-        {"matrix": [3, 7], "x": 6.25, "y": 3, "w": 2.25},
-        {"matrix": [3, 9], "x": 8.5, "y": 3, "w": 1.25},
-        {"matrix": [3, 10], "x": 9.75, "y": 3},
-        {"matrix": [3, 11], "x": 10.75, "y": 3, "w": 1.25}
-      ]
-    }
-  }
-}
diff --git a/keyboards/mechkeys/mechmini/v2/keyboard.json b/keyboards/mechkeys/mechmini/v2/keyboard.json
new file mode 100644
index 00000000000..da53e842038
--- /dev/null
+++ b/keyboards/mechkeys/mechmini/v2/keyboard.json
@@ -0,0 +1,256 @@
+{
+  "keyboard_name": "MechMini 2",
+  "manufacturer": "MechKeys",
+  "url": "https://mechkeys.ca/pages/mechmini-2-guide",
+  "maintainer": "qmk",
+  "usb": {
+    "vid": "0xAF99",
+    "pid": "0xCA40",
+    "device_version": "0.0.2"
+  },
+  "features": {
+    "bootmagic": true,
+    "mousekey": false,
+    "extrakey": true,
+    "nkro": true,
+    "backlight": true,
+    "rgblight": true
+  },
+  "matrix_pins": {
+    "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "B3", "B1", "B0", "D5", "B7", "C7"],
+    "rows": ["D0", "D1", "D2", "D3"]
+  },
+  "diode_direction": "COL2ROW",
+  "backlight": {
+    "pin": "B6"
+  },
+  "rgblight": {
+    "saturation_steps": 8,
+    "brightness_steps": 8,
+    "led_count": 14,
+    "animations": {
+      "breathing": true,
+      "rainbow_mood": true,
+      "rainbow_swirl": true,
+      "snake": true,
+      "knight": true,
+      "christmas": true,
+      "static_gradient": true,
+      "rgb_test": true,
+      "alternating": true,
+      "twinkle": true
+    }
+  },
+  "ws2812": {
+    "pin": "E2"
+  },
+  "processor": "atmega32u4",
+  "bootloader": "atmel-dfu",
+  "layouts": {
+    "LAYOUT_ortho": {
+      "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": [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": [1, 4], "x": 4, "y": 1},
+        {"matrix": [1, 5], "x": 5, "y": 1},
+        {"matrix": [1, 6], "x": 6, "y": 1},
+        {"matrix": [1, 7], "x": 7, "y": 1},
+        {"matrix": [1, 8], "x": 8, "y": 1},
+        {"matrix": [1, 9], "x": 9, "y": 1},
+        {"matrix": [1, 10], "x": 10, "y": 1},
+        {"matrix": [1, 11], "x": 11, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2},
+        {"matrix": [2, 1], "x": 1, "y": 2},
+        {"matrix": [2, 2], "x": 2, "y": 2},
+        {"matrix": [2, 3], "x": 3, "y": 2},
+        {"matrix": [2, 4], "x": 4, "y": 2},
+        {"matrix": [2, 5], "x": 5, "y": 2},
+        {"matrix": [2, 6], "x": 6, "y": 2},
+        {"matrix": [2, 7], "x": 7, "y": 2},
+        {"matrix": [2, 8], "x": 8, "y": 2},
+        {"matrix": [2, 9], "x": 9, "y": 2},
+        {"matrix": [2, 10], "x": 10, "y": 2},
+        {"matrix": [2, 11], "x": 11, "y": 2},
+
+        {"matrix": [3, 0], "x": 0, "y": 3},
+        {"matrix": [3, 1], "x": 1, "y": 3},
+        {"matrix": [3, 2], "x": 2, "y": 3},
+        {"matrix": [3, 3], "x": 3, "y": 3},
+        {"matrix": [3, 4], "x": 4, "y": 3},
+        {"matrix": [3, 5], "x": 5, "y": 3},
+        {"matrix": [3, 6], "x": 6, "y": 3},
+        {"matrix": [3, 7], "x": 7, "y": 3},
+        {"matrix": [3, 8], "x": 8, "y": 3},
+        {"matrix": [3, 9], "x": 9, "y": 3},
+        {"matrix": [3, 10], "x": 10, "y": 3},
+        {"matrix": [3, 11], "x": 11, "y": 3}
+      ]
+    },
+    "LAYOUT_2u_space_ortho": {
+      "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": [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": [1, 4], "x": 4, "y": 1},
+        {"matrix": [1, 5], "x": 5, "y": 1},
+        {"matrix": [1, 6], "x": 6, "y": 1},
+        {"matrix": [1, 7], "x": 7, "y": 1},
+        {"matrix": [1, 8], "x": 8, "y": 1},
+        {"matrix": [1, 9], "x": 9, "y": 1},
+        {"matrix": [1, 10], "x": 10, "y": 1},
+        {"matrix": [1, 11], "x": 11, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2},
+        {"matrix": [2, 1], "x": 1, "y": 2},
+        {"matrix": [2, 2], "x": 2, "y": 2},
+        {"matrix": [2, 3], "x": 3, "y": 2},
+        {"matrix": [2, 4], "x": 4, "y": 2},
+        {"matrix": [2, 5], "x": 5, "y": 2},
+        {"matrix": [2, 6], "x": 6, "y": 2},
+        {"matrix": [2, 7], "x": 7, "y": 2},
+        {"matrix": [2, 8], "x": 8, "y": 2},
+        {"matrix": [2, 9], "x": 9, "y": 2},
+        {"matrix": [2, 10], "x": 10, "y": 2},
+        {"matrix": [2, 11], "x": 11, "y": 2},
+
+        {"matrix": [3, 0], "x": 0, "y": 3},
+        {"matrix": [3, 1], "x": 1, "y": 3},
+        {"matrix": [3, 2], "x": 2, "y": 3},
+        {"matrix": [3, 3], "x": 3, "y": 3},
+        {"matrix": [3, 4], "x": 4, "y": 3},
+        {"matrix": [3, 5], "x": 5, "y": 3, "w": 2},
+        {"matrix": [3, 7], "x": 7, "y": 3},
+        {"matrix": [3, 8], "x": 8, "y": 3},
+        {"matrix": [3, 9], "x": 9, "y": 3},
+        {"matrix": [3, 10], "x": 10, "y": 3},
+        {"matrix": [3, 11], "x": 11, "y": 3}
+      ]
+    },
+    "LAYOUT_625_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": [1, 0], "x": 0, "y": 1, "w": 1.25},
+        {"matrix": [1, 1], "x": 1.25, "y": 1},
+        {"matrix": [1, 2], "x": 2.25, "y": 1},
+        {"matrix": [1, 3], "x": 3.25, "y": 1},
+        {"matrix": [1, 4], "x": 4.25, "y": 1},
+        {"matrix": [1, 5], "x": 5.25, "y": 1},
+        {"matrix": [1, 6], "x": 6.25, "y": 1},
+        {"matrix": [1, 7], "x": 7.25, "y": 1},
+        {"matrix": [1, 8], "x": 8.25, "y": 1},
+        {"matrix": [1, 9], "x": 9.25, "y": 1},
+        {"matrix": [1, 11], "x": 10.25, "y": 1, "w": 1.75},
+
+        {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+        {"matrix": [2, 2], "x": 1.75, "y": 2},
+        {"matrix": [2, 3], "x": 2.75, "y": 2},
+        {"matrix": [2, 4], "x": 3.75, "y": 2},
+        {"matrix": [2, 5], "x": 4.75, "y": 2},
+        {"matrix": [2, 6], "x": 5.75, "y": 2},
+        {"matrix": [2, 7], "x": 6.75, "y": 2},
+        {"matrix": [2, 8], "x": 7.75, "y": 2},
+        {"matrix": [2, 9], "x": 8.75, "y": 2},
+        {"matrix": [2, 10], "x": 9.75, "y": 2, "w": 1.25},
+        {"matrix": [2, 11], "x": 11, "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, 6], "x": 3.25, "y": 3, "w": 6.25},
+        {"matrix": [3, 10], "x": 9.5, "y": 3, "w": 1.25},
+        {"matrix": [3, 11], "x": 10.75, "y": 3, "w": 1.25}
+      ]
+    },
+    "LAYOUT_split_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": [1, 0], "x": 0, "y": 1, "w": 1.25},
+        {"matrix": [1, 1], "x": 1.25, "y": 1},
+        {"matrix": [1, 2], "x": 2.25, "y": 1},
+        {"matrix": [1, 3], "x": 3.25, "y": 1},
+        {"matrix": [1, 4], "x": 4.25, "y": 1},
+        {"matrix": [1, 5], "x": 5.25, "y": 1},
+        {"matrix": [1, 6], "x": 6.25, "y": 1},
+        {"matrix": [1, 7], "x": 7.25, "y": 1},
+        {"matrix": [1, 8], "x": 8.25, "y": 1},
+        {"matrix": [1, 9], "x": 9.25, "y": 1},
+        {"matrix": [1, 11], "x": 10.25, "y": 1, "w": 1.75},
+
+        {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+        {"matrix": [2, 2], "x": 1.75, "y": 2},
+        {"matrix": [2, 3], "x": 2.75, "y": 2},
+        {"matrix": [2, 4], "x": 3.75, "y": 2},
+        {"matrix": [2, 5], "x": 4.75, "y": 2},
+        {"matrix": [2, 6], "x": 5.75, "y": 2},
+        {"matrix": [2, 7], "x": 6.75, "y": 2},
+        {"matrix": [2, 8], "x": 7.75, "y": 2},
+        {"matrix": [2, 9], "x": 8.75, "y": 2},
+        {"matrix": [2, 10], "x": 9.75, "y": 2, "w": 1.25},
+        {"matrix": [2, 11], "x": 11, "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, "w": 1.25},
+        {"matrix": [3, 4], "x": 3.5, "y": 3, "w": 2.75},
+        {"matrix": [3, 7], "x": 6.25, "y": 3, "w": 2.25},
+        {"matrix": [3, 9], "x": 8.5, "y": 3, "w": 1.25},
+        {"matrix": [3, 10], "x": 9.75, "y": 3},
+        {"matrix": [3, 11], "x": 10.75, "y": 3, "w": 1.25}
+      ]
+    }
+  }
+}
diff --git a/keyboards/mechkeys/mechmini/v2/rules.mk b/keyboards/mechkeys/mechmini/v2/rules.mk
deleted file mode 100755
index 3a899c4650b..00000000000
--- a/keyboards/mechkeys/mechmini/v2/rules.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no	# Mouse keys
-EXTRAKEY_ENABLE = yes	# Audio control and System control
-CONSOLE_ENABLE = no	# Console for debug
-COMMAND_ENABLE = no    # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = yes  # Enable keyboard backlight functionality
-AUDIO_ENABLE = no
-RGBLIGHT_ENABLE = yes
diff --git a/keyboards/mechlovin/adelais/info.json b/keyboards/mechlovin/adelais/info.json
index d8aae5a8da7..42b16d63984 100644
--- a/keyboards/mechlovin/adelais/info.json
+++ b/keyboards/mechlovin/adelais/info.json
@@ -2,14 +2,6 @@
     "manufacturer": "Team.Mechlovin",
     "url": "",
     "maintainer": "mechlovin",
-    "features": {
-        "bootmagic": true,
-        "command": true,
-        "console": true,
-        "extrakey": true,
-        "mousekey": true,
-        "nkro": true
-    },
     "usb": {
         "vid": "0x4D4C",
         "device_version": "0.0.1"
diff --git a/keyboards/mechlovin/adelais/rgb_led/rev1/info.json b/keyboards/mechlovin/adelais/rgb_led/rev1/info.json
deleted file mode 100644
index af68bb84574..00000000000
--- a/keyboards/mechlovin/adelais/rgb_led/rev1/info.json
+++ /dev/null
@@ -1,401 +0,0 @@
-{
-    "keyboard_name": "Adelais En Ciel",
-    "usb": {
-        "pid": "0xAEC1"
-    },
-    "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,
-            "rainbow_moving_chevron": true,
-            "cycle_out_in": true,
-            "cycle_out_in_dual": 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_rain": true,
-            "pixel_flow": true,
-            "pixel_fractal": 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
-        },
-        "default": {
-            "animation": "cycle_pinwheel"
-        },
-        "driver": "ws2812",
-        "max_brightness": 220,
-        "react_on_keyup": true,
-        "sleep": true
-    },
-    "matrix_pins": {
-        "cols": ["A10", "A9", "A8", "B15", "B14", "B13", "B12", "B11", "B10", "B8", "B4", "B5", "B3", "C14", "A15"],
-        "rows": ["B1", "A0", "C13", "A1", "A2"]
-    },
-    "diode_direction": "COL2ROW",
-    "processor": "STM32F303",
-    "board": "QMK_PROTON_C",
-    "bootloader": "stm32-dfu",
-    "indicators": {
-        "caps_lock": "B2",
-        "num_lock": "C15",
-        "scroll_lock": "B9"
-    },
-    "ws2812": {
-        "pin": "A7"
-    },
-    "layout_aliases": {
-        "LAYOUT_all": "LAYOUT_alice_split_bs"
-    },
-    "layouts": {
-        "LAYOUT_alice": {
-            "layout": [
-                {"matrix": [1, 14], "x": 0, "y": 0},
-
-                {"matrix": [0, 0], "x": 1.5, "y": 0},
-                {"matrix": [0, 1], "x": 2.5, "y": 0},
-                {"matrix": [0, 2], "x": 3.5, "y": 0},
-                {"matrix": [0, 3], "x": 4.5, "y": 0},
-                {"matrix": [0, 4], "x": 5.5, "y": 0},
-                {"matrix": [0, 5], "x": 6.5, "y": 0},
-                {"matrix": [0, 6], "x": 7.5, "y": 0},
-
-                {"matrix": [0, 7], "x": 10.5, "y": 0},
-                {"matrix": [0, 8], "x": 11.5, "y": 0},
-                {"matrix": [0, 9], "x": 12.5, "y": 0},
-                {"matrix": [0, 10], "x": 13.5, "y": 0},
-                {"matrix": [0, 11], "x": 14.5, "y": 0},
-                {"matrix": [0, 12], "x": 15.5, "y": 0},
-                {"matrix": [0, 13], "x": 16.5, "y": 0, "w": 2},
-
-                {"matrix": [2, 14], "x": 0, "y": 1},
-
-                {"matrix": [1, 0], "x": 1.5, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 3, "y": 1},
-                {"matrix": [1, 2], "x": 4, "y": 1},
-                {"matrix": [1, 3], "x": 5, "y": 1},
-                {"matrix": [1, 4], "x": 6, "y": 1},
-                {"matrix": [1, 5], "x": 7, "y": 1},
-
-                {"matrix": [1, 6], "x": 10, "y": 1},
-                {"matrix": [1, 7], "x": 11, "y": 1},
-                {"matrix": [1, 8], "x": 12, "y": 1},
-                {"matrix": [1, 9], "x": 13, "y": 1},
-                {"matrix": [1, 10], "x": 14, "y": 1},
-                {"matrix": [1, 11], "x": 15, "y": 1},
-                {"matrix": [1, 12], "x": 16, "y": 1},
-                {"matrix": [1, 13], "x": 17, "y": 1, "w": 1.5},
-
-                {"matrix": [3, 14], "x": 0, "y": 2},
-
-                {"matrix": [2, 0], "x": 1.5, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 3.25, "y": 2},
-                {"matrix": [2, 2], "x": 4.25, "y": 2},
-                {"matrix": [2, 3], "x": 5.25, "y": 2},
-                {"matrix": [2, 4], "x": 6.25, "y": 2},
-                {"matrix": [2, 5], "x": 7.25, "y": 2},
-
-                {"matrix": [2, 6], "x": 10.25, "y": 2},
-                {"matrix": [2, 7], "x": 11.25, "y": 2},
-                {"matrix": [2, 8], "x": 12.25, "y": 2},
-                {"matrix": [2, 9], "x": 13.25, "y": 2},
-                {"matrix": [2, 10], "x": 14.25, "y": 2},
-                {"matrix": [2, 11], "x": 15.25, "y": 2},
-                {"matrix": [2, 13], "x": 16.25, "y": 2, "w": 2.25},
-
-                {"matrix": [3, 0], "x": 1.5, "y": 3, "w": 2.25},
-                {"matrix": [3, 2], "x": 3.75, "y": 3},
-                {"matrix": [3, 3], "x": 4.75, "y": 3},
-                {"matrix": [3, 4], "x": 5.75, "y": 3},
-                {"matrix": [3, 5], "x": 6.75, "y": 3},
-                {"matrix": [3, 6], "x": 7.75, "y": 3},
-
-                {"matrix": [3, 7], "x": 9.75, "y": 3},
-                {"matrix": [3, 8], "x": 10.75, "y": 3},
-                {"matrix": [3, 9], "x": 11.75, "y": 3},
-                {"matrix": [3, 10], "x": 12.75, "y": 3},
-                {"matrix": [3, 11], "x": 13.75, "y": 3},
-                {"matrix": [3, 13], "x": 14.75, "y": 3},
-                {"matrix": [3, 12], "x": 15.75, "y": 3, "w": 1.75},
-                {"matrix": [4, 13], "x": 17.5, "y": 3},
-
-                {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.5},
-                {"matrix": [4, 2], "x": 4.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 4], "x": 5.75, "y": 4, "w": 2.25},
-                {"matrix": [4, 6], "x": 8, "y": 4, "w": 1.25},
-                {"matrix": [4, 8], "x": 9.75, "y": 4, "w": 2.75},
-                {"matrix": [4, 10], "x": 12.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 14], "x": 17, "y": 4, "w": 1.5}
-            ]
-        },
-        "LAYOUT_alice_full_rshift": {
-            "layout": [
-                {"matrix": [1, 14], "x": 0, "y": 0},
-
-                {"matrix": [0, 0], "x": 1.5, "y": 0},
-                {"matrix": [0, 1], "x": 2.5, "y": 0},
-                {"matrix": [0, 2], "x": 3.5, "y": 0},
-                {"matrix": [0, 3], "x": 4.5, "y": 0},
-                {"matrix": [0, 4], "x": 5.5, "y": 0},
-                {"matrix": [0, 5], "x": 6.5, "y": 0},
-                {"matrix": [0, 6], "x": 7.5, "y": 0},
-
-                {"matrix": [0, 7], "x": 10.5, "y": 0},
-                {"matrix": [0, 8], "x": 11.5, "y": 0},
-                {"matrix": [0, 9], "x": 12.5, "y": 0},
-                {"matrix": [0, 10], "x": 13.5, "y": 0},
-                {"matrix": [0, 11], "x": 14.5, "y": 0},
-                {"matrix": [0, 12], "x": 15.5, "y": 0},
-                {"matrix": [0, 13], "x": 16.5, "y": 0, "w": 2},
-
-                {"matrix": [2, 14], "x": 0, "y": 1},
-
-                {"matrix": [1, 0], "x": 1.5, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 3, "y": 1},
-                {"matrix": [1, 2], "x": 4, "y": 1},
-                {"matrix": [1, 3], "x": 5, "y": 1},
-                {"matrix": [1, 4], "x": 6, "y": 1},
-                {"matrix": [1, 5], "x": 7, "y": 1},
-
-                {"matrix": [1, 6], "x": 10, "y": 1},
-                {"matrix": [1, 7], "x": 11, "y": 1},
-                {"matrix": [1, 8], "x": 12, "y": 1},
-                {"matrix": [1, 9], "x": 13, "y": 1},
-                {"matrix": [1, 10], "x": 14, "y": 1},
-                {"matrix": [1, 11], "x": 15, "y": 1},
-                {"matrix": [1, 12], "x": 16, "y": 1},
-                {"matrix": [1, 13], "x": 17, "y": 1, "w": 1.5},
-
-                {"matrix": [3, 14], "x": 0, "y": 2},
-
-                {"matrix": [2, 0], "x": 1.5, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 3.25, "y": 2},
-                {"matrix": [2, 2], "x": 4.25, "y": 2},
-                {"matrix": [2, 3], "x": 5.25, "y": 2},
-                {"matrix": [2, 4], "x": 6.25, "y": 2},
-                {"matrix": [2, 5], "x": 7.25, "y": 2},
-
-                {"matrix": [2, 6], "x": 10.25, "y": 2},
-                {"matrix": [2, 7], "x": 11.25, "y": 2},
-                {"matrix": [2, 8], "x": 12.25, "y": 2},
-                {"matrix": [2, 9], "x": 13.25, "y": 2},
-                {"matrix": [2, 10], "x": 14.25, "y": 2},
-                {"matrix": [2, 11], "x": 15.25, "y": 2},
-                {"matrix": [2, 13], "x": 16.25, "y": 2, "w": 2.25},
-
-                {"matrix": [3, 0], "x": 1.5, "y": 3, "w": 2.25},
-                {"matrix": [3, 2], "x": 3.75, "y": 3},
-                {"matrix": [3, 3], "x": 4.75, "y": 3},
-                {"matrix": [3, 4], "x": 5.75, "y": 3},
-                {"matrix": [3, 5], "x": 6.75, "y": 3},
-                {"matrix": [3, 6], "x": 7.75, "y": 3},
-
-                {"matrix": [3, 7], "x": 9.75, "y": 3},
-                {"matrix": [3, 8], "x": 10.75, "y": 3},
-                {"matrix": [3, 9], "x": 11.75, "y": 3},
-                {"matrix": [3, 10], "x": 12.75, "y": 3},
-                {"matrix": [3, 11], "x": 13.75, "y": 3},
-                {"matrix": [3, 13], "x": 14.75, "y": 3},
-                {"matrix": [3, 12], "x": 15.75, "y": 3, "w": 2.75},
-
-                {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.5},
-                {"matrix": [4, 2], "x": 4.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 4], "x": 5.75, "y": 4, "w": 2.25},
-                {"matrix": [4, 6], "x": 8, "y": 4, "w": 1.25},
-                {"matrix": [4, 8], "x": 9.75, "y": 4, "w": 2.75},
-                {"matrix": [4, 10], "x": 12.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 14], "x": 17, "y": 4, "w": 1.5}
-            ]
-        },
-        "LAYOUT_alice_split_bs": {
-            "layout": [
-                {"matrix": [1, 14], "x": 0, "y": 0},
-
-                {"matrix": [0, 0], "x": 1.5, "y": 0},
-                {"matrix": [0, 1], "x": 2.5, "y": 0},
-                {"matrix": [0, 2], "x": 3.5, "y": 0},
-                {"matrix": [0, 3], "x": 4.5, "y": 0},
-                {"matrix": [0, 4], "x": 5.5, "y": 0},
-                {"matrix": [0, 5], "x": 6.5, "y": 0},
-                {"matrix": [0, 6], "x": 7.5, "y": 0},
-
-                {"matrix": [0, 7], "x": 10.5, "y": 0},
-                {"matrix": [0, 8], "x": 11.5, "y": 0},
-                {"matrix": [0, 9], "x": 12.5, "y": 0},
-                {"matrix": [0, 10], "x": 13.5, "y": 0},
-                {"matrix": [0, 11], "x": 14.5, "y": 0},
-                {"matrix": [0, 12], "x": 15.5, "y": 0},
-                {"matrix": [0, 13], "x": 16.5, "y": 0},
-                {"matrix": [0, 14], "x": 17.5, "y": 0},
-
-                {"matrix": [2, 14], "x": 0, "y": 1},
-
-                {"matrix": [1, 0], "x": 1.5, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 3, "y": 1},
-                {"matrix": [1, 2], "x": 4, "y": 1},
-                {"matrix": [1, 3], "x": 5, "y": 1},
-                {"matrix": [1, 4], "x": 6, "y": 1},
-                {"matrix": [1, 5], "x": 7, "y": 1},
-
-                {"matrix": [1, 6], "x": 10, "y": 1},
-                {"matrix": [1, 7], "x": 11, "y": 1},
-                {"matrix": [1, 8], "x": 12, "y": 1},
-                {"matrix": [1, 9], "x": 13, "y": 1},
-                {"matrix": [1, 10], "x": 14, "y": 1},
-                {"matrix": [1, 11], "x": 15, "y": 1},
-                {"matrix": [1, 12], "x": 16, "y": 1},
-                {"matrix": [1, 13], "x": 17, "y": 1, "w": 1.5},
-
-                {"matrix": [3, 14], "x": 0, "y": 2},
-
-                {"matrix": [2, 0], "x": 1.5, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 3.25, "y": 2},
-                {"matrix": [2, 2], "x": 4.25, "y": 2},
-                {"matrix": [2, 3], "x": 5.25, "y": 2},
-                {"matrix": [2, 4], "x": 6.25, "y": 2},
-                {"matrix": [2, 5], "x": 7.25, "y": 2},
-
-                {"matrix": [2, 6], "x": 10.25, "y": 2},
-                {"matrix": [2, 7], "x": 11.25, "y": 2},
-                {"matrix": [2, 8], "x": 12.25, "y": 2},
-                {"matrix": [2, 9], "x": 13.25, "y": 2},
-                {"matrix": [2, 10], "x": 14.25, "y": 2},
-                {"matrix": [2, 11], "x": 15.25, "y": 2},
-                {"matrix": [2, 13], "x": 16.25, "y": 2, "w": 2.25},
-
-                {"matrix": [3, 0], "x": 1.5, "y": 3, "w": 2.25},
-                {"matrix": [3, 2], "x": 3.75, "y": 3},
-                {"matrix": [3, 3], "x": 4.75, "y": 3},
-                {"matrix": [3, 4], "x": 5.75, "y": 3},
-                {"matrix": [3, 5], "x": 6.75, "y": 3},
-                {"matrix": [3, 6], "x": 7.75, "y": 3},
-
-                {"matrix": [3, 7], "x": 9.75, "y": 3},
-                {"matrix": [3, 8], "x": 10.75, "y": 3},
-                {"matrix": [3, 9], "x": 11.75, "y": 3},
-                {"matrix": [3, 10], "x": 12.75, "y": 3},
-                {"matrix": [3, 11], "x": 13.75, "y": 3},
-                {"matrix": [3, 13], "x": 14.75, "y": 3},
-                {"matrix": [3, 12], "x": 15.75, "y": 3, "w": 1.75},
-                {"matrix": [4, 13], "x": 17.5, "y": 3},
-
-                {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.5},
-                {"matrix": [4, 2], "x": 4.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 4], "x": 5.75, "y": 4, "w": 2.25},
-                {"matrix": [4, 6], "x": 8, "y": 4, "w": 1.25},
-                {"matrix": [4, 8], "x": 9.75, "y": 4, "w": 2.75},
-                {"matrix": [4, 10], "x": 12.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 14], "x": 17, "y": 4, "w": 1.5}
-            ]
-        },
-        "LAYOUT_alice_split_bs_full_rshift": {
-            "layout": [
-                {"matrix": [1, 14], "x": 0, "y": 0},
-
-                {"matrix": [0, 0], "x": 1.5, "y": 0},
-                {"matrix": [0, 1], "x": 2.5, "y": 0},
-                {"matrix": [0, 2], "x": 3.5, "y": 0},
-                {"matrix": [0, 3], "x": 4.5, "y": 0},
-                {"matrix": [0, 4], "x": 5.5, "y": 0},
-                {"matrix": [0, 5], "x": 6.5, "y": 0},
-                {"matrix": [0, 6], "x": 7.5, "y": 0},
-
-                {"matrix": [0, 7], "x": 10.5, "y": 0},
-                {"matrix": [0, 8], "x": 11.5, "y": 0},
-                {"matrix": [0, 9], "x": 12.5, "y": 0},
-                {"matrix": [0, 10], "x": 13.5, "y": 0},
-                {"matrix": [0, 11], "x": 14.5, "y": 0},
-                {"matrix": [0, 12], "x": 15.5, "y": 0},
-                {"matrix": [0, 13], "x": 16.5, "y": 0},
-                {"matrix": [0, 14], "x": 17.5, "y": 0},
-
-                {"matrix": [2, 14], "x": 0, "y": 1},
-
-                {"matrix": [1, 0], "x": 1.5, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 3, "y": 1},
-                {"matrix": [1, 2], "x": 4, "y": 1},
-                {"matrix": [1, 3], "x": 5, "y": 1},
-                {"matrix": [1, 4], "x": 6, "y": 1},
-                {"matrix": [1, 5], "x": 7, "y": 1},
-
-                {"matrix": [1, 6], "x": 10, "y": 1},
-                {"matrix": [1, 7], "x": 11, "y": 1},
-                {"matrix": [1, 8], "x": 12, "y": 1},
-                {"matrix": [1, 9], "x": 13, "y": 1},
-                {"matrix": [1, 10], "x": 14, "y": 1},
-                {"matrix": [1, 11], "x": 15, "y": 1},
-                {"matrix": [1, 12], "x": 16, "y": 1},
-                {"matrix": [1, 13], "x": 17, "y": 1, "w": 1.5},
-
-                {"matrix": [3, 14], "x": 0, "y": 2},
-
-                {"matrix": [2, 0], "x": 1.5, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 3.25, "y": 2},
-                {"matrix": [2, 2], "x": 4.25, "y": 2},
-                {"matrix": [2, 3], "x": 5.25, "y": 2},
-                {"matrix": [2, 4], "x": 6.25, "y": 2},
-                {"matrix": [2, 5], "x": 7.25, "y": 2},
-
-                {"matrix": [2, 6], "x": 10.25, "y": 2},
-                {"matrix": [2, 7], "x": 11.25, "y": 2},
-                {"matrix": [2, 8], "x": 12.25, "y": 2},
-                {"matrix": [2, 9], "x": 13.25, "y": 2},
-                {"matrix": [2, 10], "x": 14.25, "y": 2},
-                {"matrix": [2, 11], "x": 15.25, "y": 2},
-                {"matrix": [2, 13], "x": 16.25, "y": 2, "w": 2.25},
-
-                {"matrix": [3, 0], "x": 1.5, "y": 3, "w": 2.25},
-                {"matrix": [3, 2], "x": 3.75, "y": 3},
-                {"matrix": [3, 3], "x": 4.75, "y": 3},
-                {"matrix": [3, 4], "x": 5.75, "y": 3},
-                {"matrix": [3, 5], "x": 6.75, "y": 3},
-                {"matrix": [3, 6], "x": 7.75, "y": 3},
-
-                {"matrix": [3, 7], "x": 9.75, "y": 3},
-                {"matrix": [3, 8], "x": 10.75, "y": 3},
-                {"matrix": [3, 9], "x": 11.75, "y": 3},
-                {"matrix": [3, 10], "x": 12.75, "y": 3},
-                {"matrix": [3, 11], "x": 13.75, "y": 3},
-                {"matrix": [3, 13], "x": 14.75, "y": 3},
-                {"matrix": [3, 12], "x": 15.75, "y": 3, "w": 2.75},
-
-                {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.5},
-                {"matrix": [4, 2], "x": 4.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 4], "x": 5.75, "y": 4, "w": 2.25},
-                {"matrix": [4, 6], "x": 8, "y": 4, "w": 1.25},
-                {"matrix": [4, 8], "x": 9.75, "y": 4, "w": 2.75},
-                {"matrix": [4, 10], "x": 12.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 14], "x": 17, "y": 4, "w": 1.5}
-            ]
-        }
-    }
-}
diff --git a/keyboards/mechlovin/adelais/rgb_led/rev1/keyboard.json b/keyboards/mechlovin/adelais/rgb_led/rev1/keyboard.json
new file mode 100644
index 00000000000..01232b07e80
--- /dev/null
+++ b/keyboards/mechlovin/adelais/rgb_led/rev1/keyboard.json
@@ -0,0 +1,410 @@
+{
+    "keyboard_name": "Adelais En Ciel",
+    "usb": {
+        "pid": "0xAEC1"
+    },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "console": true,
+        "command": true,
+        "nkro": true,
+        "rgb_matrix": true
+    },
+    "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,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": 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_rain": true,
+            "pixel_flow": true,
+            "pixel_fractal": 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
+        },
+        "default": {
+            "animation": "cycle_pinwheel"
+        },
+        "driver": "ws2812",
+        "max_brightness": 220,
+        "react_on_keyup": true,
+        "sleep": true
+    },
+    "matrix_pins": {
+        "cols": ["A10", "A9", "A8", "B15", "B14", "B13", "B12", "B11", "B10", "B8", "B4", "B5", "B3", "C14", "A15"],
+        "rows": ["B1", "A0", "C13", "A1", "A2"]
+    },
+    "diode_direction": "COL2ROW",
+    "processor": "STM32F303",
+    "board": "QMK_PROTON_C",
+    "bootloader": "stm32-dfu",
+    "indicators": {
+        "caps_lock": "B2",
+        "num_lock": "C15",
+        "scroll_lock": "B9"
+    },
+    "ws2812": {
+        "pin": "A7"
+    },
+    "layout_aliases": {
+        "LAYOUT_all": "LAYOUT_alice_split_bs"
+    },
+    "layouts": {
+        "LAYOUT_alice": {
+            "layout": [
+                {"matrix": [1, 14], "x": 0, "y": 0},
+
+                {"matrix": [0, 0], "x": 1.5, "y": 0},
+                {"matrix": [0, 1], "x": 2.5, "y": 0},
+                {"matrix": [0, 2], "x": 3.5, "y": 0},
+                {"matrix": [0, 3], "x": 4.5, "y": 0},
+                {"matrix": [0, 4], "x": 5.5, "y": 0},
+                {"matrix": [0, 5], "x": 6.5, "y": 0},
+                {"matrix": [0, 6], "x": 7.5, "y": 0},
+
+                {"matrix": [0, 7], "x": 10.5, "y": 0},
+                {"matrix": [0, 8], "x": 11.5, "y": 0},
+                {"matrix": [0, 9], "x": 12.5, "y": 0},
+                {"matrix": [0, 10], "x": 13.5, "y": 0},
+                {"matrix": [0, 11], "x": 14.5, "y": 0},
+                {"matrix": [0, 12], "x": 15.5, "y": 0},
+                {"matrix": [0, 13], "x": 16.5, "y": 0, "w": 2},
+
+                {"matrix": [2, 14], "x": 0, "y": 1},
+
+                {"matrix": [1, 0], "x": 1.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 3, "y": 1},
+                {"matrix": [1, 2], "x": 4, "y": 1},
+                {"matrix": [1, 3], "x": 5, "y": 1},
+                {"matrix": [1, 4], "x": 6, "y": 1},
+                {"matrix": [1, 5], "x": 7, "y": 1},
+
+                {"matrix": [1, 6], "x": 10, "y": 1},
+                {"matrix": [1, 7], "x": 11, "y": 1},
+                {"matrix": [1, 8], "x": 12, "y": 1},
+                {"matrix": [1, 9], "x": 13, "y": 1},
+                {"matrix": [1, 10], "x": 14, "y": 1},
+                {"matrix": [1, 11], "x": 15, "y": 1},
+                {"matrix": [1, 12], "x": 16, "y": 1},
+                {"matrix": [1, 13], "x": 17, "y": 1, "w": 1.5},
+
+                {"matrix": [3, 14], "x": 0, "y": 2},
+
+                {"matrix": [2, 0], "x": 1.5, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 3.25, "y": 2},
+                {"matrix": [2, 2], "x": 4.25, "y": 2},
+                {"matrix": [2, 3], "x": 5.25, "y": 2},
+                {"matrix": [2, 4], "x": 6.25, "y": 2},
+                {"matrix": [2, 5], "x": 7.25, "y": 2},
+
+                {"matrix": [2, 6], "x": 10.25, "y": 2},
+                {"matrix": [2, 7], "x": 11.25, "y": 2},
+                {"matrix": [2, 8], "x": 12.25, "y": 2},
+                {"matrix": [2, 9], "x": 13.25, "y": 2},
+                {"matrix": [2, 10], "x": 14.25, "y": 2},
+                {"matrix": [2, 11], "x": 15.25, "y": 2},
+                {"matrix": [2, 13], "x": 16.25, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 1.5, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 3.75, "y": 3},
+                {"matrix": [3, 3], "x": 4.75, "y": 3},
+                {"matrix": [3, 4], "x": 5.75, "y": 3},
+                {"matrix": [3, 5], "x": 6.75, "y": 3},
+                {"matrix": [3, 6], "x": 7.75, "y": 3},
+
+                {"matrix": [3, 7], "x": 9.75, "y": 3},
+                {"matrix": [3, 8], "x": 10.75, "y": 3},
+                {"matrix": [3, 9], "x": 11.75, "y": 3},
+                {"matrix": [3, 10], "x": 12.75, "y": 3},
+                {"matrix": [3, 11], "x": 13.75, "y": 3},
+                {"matrix": [3, 13], "x": 14.75, "y": 3},
+                {"matrix": [3, 12], "x": 15.75, "y": 3, "w": 1.75},
+                {"matrix": [4, 13], "x": 17.5, "y": 3},
+
+                {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 2], "x": 4.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 5.75, "y": 4, "w": 2.25},
+                {"matrix": [4, 6], "x": 8, "y": 4, "w": 1.25},
+                {"matrix": [4, 8], "x": 9.75, "y": 4, "w": 2.75},
+                {"matrix": [4, 10], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 14], "x": 17, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_alice_full_rshift": {
+            "layout": [
+                {"matrix": [1, 14], "x": 0, "y": 0},
+
+                {"matrix": [0, 0], "x": 1.5, "y": 0},
+                {"matrix": [0, 1], "x": 2.5, "y": 0},
+                {"matrix": [0, 2], "x": 3.5, "y": 0},
+                {"matrix": [0, 3], "x": 4.5, "y": 0},
+                {"matrix": [0, 4], "x": 5.5, "y": 0},
+                {"matrix": [0, 5], "x": 6.5, "y": 0},
+                {"matrix": [0, 6], "x": 7.5, "y": 0},
+
+                {"matrix": [0, 7], "x": 10.5, "y": 0},
+                {"matrix": [0, 8], "x": 11.5, "y": 0},
+                {"matrix": [0, 9], "x": 12.5, "y": 0},
+                {"matrix": [0, 10], "x": 13.5, "y": 0},
+                {"matrix": [0, 11], "x": 14.5, "y": 0},
+                {"matrix": [0, 12], "x": 15.5, "y": 0},
+                {"matrix": [0, 13], "x": 16.5, "y": 0, "w": 2},
+
+                {"matrix": [2, 14], "x": 0, "y": 1},
+
+                {"matrix": [1, 0], "x": 1.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 3, "y": 1},
+                {"matrix": [1, 2], "x": 4, "y": 1},
+                {"matrix": [1, 3], "x": 5, "y": 1},
+                {"matrix": [1, 4], "x": 6, "y": 1},
+                {"matrix": [1, 5], "x": 7, "y": 1},
+
+                {"matrix": [1, 6], "x": 10, "y": 1},
+                {"matrix": [1, 7], "x": 11, "y": 1},
+                {"matrix": [1, 8], "x": 12, "y": 1},
+                {"matrix": [1, 9], "x": 13, "y": 1},
+                {"matrix": [1, 10], "x": 14, "y": 1},
+                {"matrix": [1, 11], "x": 15, "y": 1},
+                {"matrix": [1, 12], "x": 16, "y": 1},
+                {"matrix": [1, 13], "x": 17, "y": 1, "w": 1.5},
+
+                {"matrix": [3, 14], "x": 0, "y": 2},
+
+                {"matrix": [2, 0], "x": 1.5, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 3.25, "y": 2},
+                {"matrix": [2, 2], "x": 4.25, "y": 2},
+                {"matrix": [2, 3], "x": 5.25, "y": 2},
+                {"matrix": [2, 4], "x": 6.25, "y": 2},
+                {"matrix": [2, 5], "x": 7.25, "y": 2},
+
+                {"matrix": [2, 6], "x": 10.25, "y": 2},
+                {"matrix": [2, 7], "x": 11.25, "y": 2},
+                {"matrix": [2, 8], "x": 12.25, "y": 2},
+                {"matrix": [2, 9], "x": 13.25, "y": 2},
+                {"matrix": [2, 10], "x": 14.25, "y": 2},
+                {"matrix": [2, 11], "x": 15.25, "y": 2},
+                {"matrix": [2, 13], "x": 16.25, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 1.5, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 3.75, "y": 3},
+                {"matrix": [3, 3], "x": 4.75, "y": 3},
+                {"matrix": [3, 4], "x": 5.75, "y": 3},
+                {"matrix": [3, 5], "x": 6.75, "y": 3},
+                {"matrix": [3, 6], "x": 7.75, "y": 3},
+
+                {"matrix": [3, 7], "x": 9.75, "y": 3},
+                {"matrix": [3, 8], "x": 10.75, "y": 3},
+                {"matrix": [3, 9], "x": 11.75, "y": 3},
+                {"matrix": [3, 10], "x": 12.75, "y": 3},
+                {"matrix": [3, 11], "x": 13.75, "y": 3},
+                {"matrix": [3, 13], "x": 14.75, "y": 3},
+                {"matrix": [3, 12], "x": 15.75, "y": 3, "w": 2.75},
+
+                {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 2], "x": 4.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 5.75, "y": 4, "w": 2.25},
+                {"matrix": [4, 6], "x": 8, "y": 4, "w": 1.25},
+                {"matrix": [4, 8], "x": 9.75, "y": 4, "w": 2.75},
+                {"matrix": [4, 10], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 14], "x": 17, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_alice_split_bs": {
+            "layout": [
+                {"matrix": [1, 14], "x": 0, "y": 0},
+
+                {"matrix": [0, 0], "x": 1.5, "y": 0},
+                {"matrix": [0, 1], "x": 2.5, "y": 0},
+                {"matrix": [0, 2], "x": 3.5, "y": 0},
+                {"matrix": [0, 3], "x": 4.5, "y": 0},
+                {"matrix": [0, 4], "x": 5.5, "y": 0},
+                {"matrix": [0, 5], "x": 6.5, "y": 0},
+                {"matrix": [0, 6], "x": 7.5, "y": 0},
+
+                {"matrix": [0, 7], "x": 10.5, "y": 0},
+                {"matrix": [0, 8], "x": 11.5, "y": 0},
+                {"matrix": [0, 9], "x": 12.5, "y": 0},
+                {"matrix": [0, 10], "x": 13.5, "y": 0},
+                {"matrix": [0, 11], "x": 14.5, "y": 0},
+                {"matrix": [0, 12], "x": 15.5, "y": 0},
+                {"matrix": [0, 13], "x": 16.5, "y": 0},
+                {"matrix": [0, 14], "x": 17.5, "y": 0},
+
+                {"matrix": [2, 14], "x": 0, "y": 1},
+
+                {"matrix": [1, 0], "x": 1.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 3, "y": 1},
+                {"matrix": [1, 2], "x": 4, "y": 1},
+                {"matrix": [1, 3], "x": 5, "y": 1},
+                {"matrix": [1, 4], "x": 6, "y": 1},
+                {"matrix": [1, 5], "x": 7, "y": 1},
+
+                {"matrix": [1, 6], "x": 10, "y": 1},
+                {"matrix": [1, 7], "x": 11, "y": 1},
+                {"matrix": [1, 8], "x": 12, "y": 1},
+                {"matrix": [1, 9], "x": 13, "y": 1},
+                {"matrix": [1, 10], "x": 14, "y": 1},
+                {"matrix": [1, 11], "x": 15, "y": 1},
+                {"matrix": [1, 12], "x": 16, "y": 1},
+                {"matrix": [1, 13], "x": 17, "y": 1, "w": 1.5},
+
+                {"matrix": [3, 14], "x": 0, "y": 2},
+
+                {"matrix": [2, 0], "x": 1.5, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 3.25, "y": 2},
+                {"matrix": [2, 2], "x": 4.25, "y": 2},
+                {"matrix": [2, 3], "x": 5.25, "y": 2},
+                {"matrix": [2, 4], "x": 6.25, "y": 2},
+                {"matrix": [2, 5], "x": 7.25, "y": 2},
+
+                {"matrix": [2, 6], "x": 10.25, "y": 2},
+                {"matrix": [2, 7], "x": 11.25, "y": 2},
+                {"matrix": [2, 8], "x": 12.25, "y": 2},
+                {"matrix": [2, 9], "x": 13.25, "y": 2},
+                {"matrix": [2, 10], "x": 14.25, "y": 2},
+                {"matrix": [2, 11], "x": 15.25, "y": 2},
+                {"matrix": [2, 13], "x": 16.25, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 1.5, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 3.75, "y": 3},
+                {"matrix": [3, 3], "x": 4.75, "y": 3},
+                {"matrix": [3, 4], "x": 5.75, "y": 3},
+                {"matrix": [3, 5], "x": 6.75, "y": 3},
+                {"matrix": [3, 6], "x": 7.75, "y": 3},
+
+                {"matrix": [3, 7], "x": 9.75, "y": 3},
+                {"matrix": [3, 8], "x": 10.75, "y": 3},
+                {"matrix": [3, 9], "x": 11.75, "y": 3},
+                {"matrix": [3, 10], "x": 12.75, "y": 3},
+                {"matrix": [3, 11], "x": 13.75, "y": 3},
+                {"matrix": [3, 13], "x": 14.75, "y": 3},
+                {"matrix": [3, 12], "x": 15.75, "y": 3, "w": 1.75},
+                {"matrix": [4, 13], "x": 17.5, "y": 3},
+
+                {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 2], "x": 4.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 5.75, "y": 4, "w": 2.25},
+                {"matrix": [4, 6], "x": 8, "y": 4, "w": 1.25},
+                {"matrix": [4, 8], "x": 9.75, "y": 4, "w": 2.75},
+                {"matrix": [4, 10], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 14], "x": 17, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_alice_split_bs_full_rshift": {
+            "layout": [
+                {"matrix": [1, 14], "x": 0, "y": 0},
+
+                {"matrix": [0, 0], "x": 1.5, "y": 0},
+                {"matrix": [0, 1], "x": 2.5, "y": 0},
+                {"matrix": [0, 2], "x": 3.5, "y": 0},
+                {"matrix": [0, 3], "x": 4.5, "y": 0},
+                {"matrix": [0, 4], "x": 5.5, "y": 0},
+                {"matrix": [0, 5], "x": 6.5, "y": 0},
+                {"matrix": [0, 6], "x": 7.5, "y": 0},
+
+                {"matrix": [0, 7], "x": 10.5, "y": 0},
+                {"matrix": [0, 8], "x": 11.5, "y": 0},
+                {"matrix": [0, 9], "x": 12.5, "y": 0},
+                {"matrix": [0, 10], "x": 13.5, "y": 0},
+                {"matrix": [0, 11], "x": 14.5, "y": 0},
+                {"matrix": [0, 12], "x": 15.5, "y": 0},
+                {"matrix": [0, 13], "x": 16.5, "y": 0},
+                {"matrix": [0, 14], "x": 17.5, "y": 0},
+
+                {"matrix": [2, 14], "x": 0, "y": 1},
+
+                {"matrix": [1, 0], "x": 1.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 3, "y": 1},
+                {"matrix": [1, 2], "x": 4, "y": 1},
+                {"matrix": [1, 3], "x": 5, "y": 1},
+                {"matrix": [1, 4], "x": 6, "y": 1},
+                {"matrix": [1, 5], "x": 7, "y": 1},
+
+                {"matrix": [1, 6], "x": 10, "y": 1},
+                {"matrix": [1, 7], "x": 11, "y": 1},
+                {"matrix": [1, 8], "x": 12, "y": 1},
+                {"matrix": [1, 9], "x": 13, "y": 1},
+                {"matrix": [1, 10], "x": 14, "y": 1},
+                {"matrix": [1, 11], "x": 15, "y": 1},
+                {"matrix": [1, 12], "x": 16, "y": 1},
+                {"matrix": [1, 13], "x": 17, "y": 1, "w": 1.5},
+
+                {"matrix": [3, 14], "x": 0, "y": 2},
+
+                {"matrix": [2, 0], "x": 1.5, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 3.25, "y": 2},
+                {"matrix": [2, 2], "x": 4.25, "y": 2},
+                {"matrix": [2, 3], "x": 5.25, "y": 2},
+                {"matrix": [2, 4], "x": 6.25, "y": 2},
+                {"matrix": [2, 5], "x": 7.25, "y": 2},
+
+                {"matrix": [2, 6], "x": 10.25, "y": 2},
+                {"matrix": [2, 7], "x": 11.25, "y": 2},
+                {"matrix": [2, 8], "x": 12.25, "y": 2},
+                {"matrix": [2, 9], "x": 13.25, "y": 2},
+                {"matrix": [2, 10], "x": 14.25, "y": 2},
+                {"matrix": [2, 11], "x": 15.25, "y": 2},
+                {"matrix": [2, 13], "x": 16.25, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 1.5, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 3.75, "y": 3},
+                {"matrix": [3, 3], "x": 4.75, "y": 3},
+                {"matrix": [3, 4], "x": 5.75, "y": 3},
+                {"matrix": [3, 5], "x": 6.75, "y": 3},
+                {"matrix": [3, 6], "x": 7.75, "y": 3},
+
+                {"matrix": [3, 7], "x": 9.75, "y": 3},
+                {"matrix": [3, 8], "x": 10.75, "y": 3},
+                {"matrix": [3, 9], "x": 11.75, "y": 3},
+                {"matrix": [3, 10], "x": 12.75, "y": 3},
+                {"matrix": [3, 11], "x": 13.75, "y": 3},
+                {"matrix": [3, 13], "x": 14.75, "y": 3},
+                {"matrix": [3, 12], "x": 15.75, "y": 3, "w": 2.75},
+
+                {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 2], "x": 4.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 5.75, "y": 4, "w": 2.25},
+                {"matrix": [4, 6], "x": 8, "y": 4, "w": 1.25},
+                {"matrix": [4, 8], "x": 9.75, "y": 4, "w": 2.75},
+                {"matrix": [4, 10], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 14], "x": 17, "y": 4, "w": 1.5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/mechlovin/adelais/rgb_led/rev1/rules.mk b/keyboards/mechlovin/adelais/rgb_led/rev1/rules.mk
deleted file mode 100644
index aad92997d0f..00000000000
--- a/keyboards/mechlovin/adelais/rgb_led/rev1/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-RGB_MATRIX_ENABLE = yes
diff --git a/keyboards/mechlovin/adelais/rgb_led/rev2/info.json b/keyboards/mechlovin/adelais/rgb_led/rev2/info.json
deleted file mode 100644
index fb88cb359db..00000000000
--- a/keyboards/mechlovin/adelais/rgb_led/rev2/info.json
+++ /dev/null
@@ -1,425 +0,0 @@
-{
-    "keyboard_name": "Adelais En Ciel Rev2",
-    "usb": {
-        "pid": "0xAEC2"
-    },
-    "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,
-            "rainbow_moving_chevron": true,
-            "cycle_out_in": true,
-            "cycle_out_in_dual": 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_rain": true,
-            "pixel_flow": true,
-            "pixel_fractal": 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
-        },
-        "default": {
-            "animation": "cycle_pinwheel"
-        },
-        "driver": "is31fl3731",
-        "react_on_keyup": true,
-        "sleep": true
-    },
-    "matrix_pins": {
-        "cols": ["A10", "A9", "A8", "B15", "B14", "B13", "B12", "B11", "B10", "B8", "B4", "B5", "B3", "C14", "A7"],
-        "rows": ["B1", "A0", "C13", "A1", "A2"]
-    },
-    "diode_direction": "COL2ROW",
-    "encoder": {
-        "rotary": [
-            {"pin_a": "A4", "pin_b": "A3"}
-        ]
-    },
-    "qmk": {
-        "tap_keycode_delay": 10
-    },
-    "rgblight": {
-        "saturation_steps": 8,
-        "brightness_steps": 8,
-        "led_count": 23,
-        "animations": {
-            "breathing": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "snake": true,
-            "knight": true,
-            "christmas": true,
-            "static_gradient": true,
-            "rgb_test": true,
-            "alternating": true,
-            "twinkle": true
-        }
-    },
-    "ws2812": {
-        "pin": "A15"
-    },
-    "processor": "STM32F303",
-    "board": "QMK_PROTON_C",
-    "bootloader": "stm32-dfu",
-    "indicators": {
-        "caps_lock": "B2",
-        "num_lock": "C15",
-        "scroll_lock": "B9"
-    },
-    "layout_aliases": {
-        "LAYOUT_all": "LAYOUT_alice_split_bs"
-    },
-    "layouts": {
-        "LAYOUT_alice": {
-            "layout": [
-                {"matrix": [1, 14], "x": 0, "y": 0},
-
-                {"matrix": [0, 0], "x": 1.5, "y": 0},
-                {"matrix": [0, 1], "x": 2.5, "y": 0},
-                {"matrix": [0, 2], "x": 3.5, "y": 0},
-                {"matrix": [0, 3], "x": 4.5, "y": 0},
-                {"matrix": [0, 4], "x": 5.5, "y": 0},
-                {"matrix": [0, 5], "x": 6.5, "y": 0},
-                {"matrix": [0, 6], "x": 7.5, "y": 0},
-
-                {"matrix": [0, 7], "x": 10.5, "y": 0},
-                {"matrix": [0, 8], "x": 11.5, "y": 0},
-                {"matrix": [0, 9], "x": 12.5, "y": 0},
-                {"matrix": [0, 10], "x": 13.5, "y": 0},
-                {"matrix": [0, 11], "x": 14.5, "y": 0},
-                {"matrix": [0, 12], "x": 15.5, "y": 0},
-                {"matrix": [0, 13], "x": 16.5, "y": 0, "w": 2},
-
-                {"matrix": [2, 14], "x": 0, "y": 1},
-
-                {"matrix": [1, 0], "x": 1.5, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 3, "y": 1},
-                {"matrix": [1, 2], "x": 4, "y": 1},
-                {"matrix": [1, 3], "x": 5, "y": 1},
-                {"matrix": [1, 4], "x": 6, "y": 1},
-                {"matrix": [1, 5], "x": 7, "y": 1},
-
-                {"matrix": [1, 6], "x": 10, "y": 1},
-                {"matrix": [1, 7], "x": 11, "y": 1},
-                {"matrix": [1, 8], "x": 12, "y": 1},
-                {"matrix": [1, 9], "x": 13, "y": 1},
-                {"matrix": [1, 10], "x": 14, "y": 1},
-                {"matrix": [1, 11], "x": 15, "y": 1},
-                {"matrix": [1, 12], "x": 16, "y": 1},
-                {"matrix": [1, 13], "x": 17, "y": 1, "w": 1.5},
-
-                {"matrix": [3, 14], "x": 0, "y": 2},
-
-                {"matrix": [2, 0], "x": 1.5, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 3.25, "y": 2},
-                {"matrix": [2, 2], "x": 4.25, "y": 2},
-                {"matrix": [2, 3], "x": 5.25, "y": 2},
-                {"matrix": [2, 4], "x": 6.25, "y": 2},
-                {"matrix": [2, 5], "x": 7.25, "y": 2},
-
-                {"matrix": [2, 6], "x": 10.25, "y": 2},
-                {"matrix": [2, 7], "x": 11.25, "y": 2},
-                {"matrix": [2, 8], "x": 12.25, "y": 2},
-                {"matrix": [2, 9], "x": 13.25, "y": 2},
-                {"matrix": [2, 10], "x": 14.25, "y": 2},
-                {"matrix": [2, 11], "x": 15.25, "y": 2},
-                {"matrix": [2, 13], "x": 16.25, "y": 2, "w": 2.25},
-
-                {"matrix": [3, 0], "x": 1.5, "y": 3, "w": 2.25},
-                {"matrix": [3, 2], "x": 3.75, "y": 3},
-                {"matrix": [3, 3], "x": 4.75, "y": 3},
-                {"matrix": [3, 4], "x": 5.75, "y": 3},
-                {"matrix": [3, 5], "x": 6.75, "y": 3},
-                {"matrix": [3, 6], "x": 7.75, "y": 3},
-
-                {"matrix": [3, 7], "x": 9.75, "y": 3},
-                {"matrix": [3, 8], "x": 10.75, "y": 3},
-                {"matrix": [3, 9], "x": 11.75, "y": 3},
-                {"matrix": [3, 10], "x": 12.75, "y": 3},
-                {"matrix": [3, 11], "x": 13.75, "y": 3},
-                {"matrix": [3, 13], "x": 14.75, "y": 3},
-                {"matrix": [3, 12], "x": 15.75, "y": 3, "w": 1.75},
-                {"matrix": [4, 13], "x": 17.5, "y": 3},
-
-                {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.5},
-                {"matrix": [4, 2], "x": 4.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 4], "x": 5.75, "y": 4, "w": 2.25},
-                {"matrix": [4, 6], "x": 8, "y": 4, "w": 1.25},
-                {"matrix": [4, 8], "x": 9.75, "y": 4, "w": 2.75},
-                {"matrix": [4, 10], "x": 12.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 14], "x": 17, "y": 4, "w": 1.5}
-            ]
-        },
-        "LAYOUT_alice_full_rshift": {
-            "layout": [
-                {"matrix": [1, 14], "x": 0, "y": 0},
-
-                {"matrix": [0, 0], "x": 1.5, "y": 0},
-                {"matrix": [0, 1], "x": 2.5, "y": 0},
-                {"matrix": [0, 2], "x": 3.5, "y": 0},
-                {"matrix": [0, 3], "x": 4.5, "y": 0},
-                {"matrix": [0, 4], "x": 5.5, "y": 0},
-                {"matrix": [0, 5], "x": 6.5, "y": 0},
-                {"matrix": [0, 6], "x": 7.5, "y": 0},
-
-                {"matrix": [0, 7], "x": 10.5, "y": 0},
-                {"matrix": [0, 8], "x": 11.5, "y": 0},
-                {"matrix": [0, 9], "x": 12.5, "y": 0},
-                {"matrix": [0, 10], "x": 13.5, "y": 0},
-                {"matrix": [0, 11], "x": 14.5, "y": 0},
-                {"matrix": [0, 12], "x": 15.5, "y": 0},
-                {"matrix": [0, 13], "x": 16.5, "y": 0, "w": 2},
-
-                {"matrix": [2, 14], "x": 0, "y": 1},
-
-                {"matrix": [1, 0], "x": 1.5, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 3, "y": 1},
-                {"matrix": [1, 2], "x": 4, "y": 1},
-                {"matrix": [1, 3], "x": 5, "y": 1},
-                {"matrix": [1, 4], "x": 6, "y": 1},
-                {"matrix": [1, 5], "x": 7, "y": 1},
-
-                {"matrix": [1, 6], "x": 10, "y": 1},
-                {"matrix": [1, 7], "x": 11, "y": 1},
-                {"matrix": [1, 8], "x": 12, "y": 1},
-                {"matrix": [1, 9], "x": 13, "y": 1},
-                {"matrix": [1, 10], "x": 14, "y": 1},
-                {"matrix": [1, 11], "x": 15, "y": 1},
-                {"matrix": [1, 12], "x": 16, "y": 1},
-                {"matrix": [1, 13], "x": 17, "y": 1, "w": 1.5},
-
-                {"matrix": [3, 14], "x": 0, "y": 2},
-
-                {"matrix": [2, 0], "x": 1.5, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 3.25, "y": 2},
-                {"matrix": [2, 2], "x": 4.25, "y": 2},
-                {"matrix": [2, 3], "x": 5.25, "y": 2},
-                {"matrix": [2, 4], "x": 6.25, "y": 2},
-                {"matrix": [2, 5], "x": 7.25, "y": 2},
-
-                {"matrix": [2, 6], "x": 10.25, "y": 2},
-                {"matrix": [2, 7], "x": 11.25, "y": 2},
-                {"matrix": [2, 8], "x": 12.25, "y": 2},
-                {"matrix": [2, 9], "x": 13.25, "y": 2},
-                {"matrix": [2, 10], "x": 14.25, "y": 2},
-                {"matrix": [2, 11], "x": 15.25, "y": 2},
-                {"matrix": [2, 13], "x": 16.25, "y": 2, "w": 2.25},
-
-                {"matrix": [3, 0], "x": 1.5, "y": 3, "w": 2.25},
-                {"matrix": [3, 2], "x": 3.75, "y": 3},
-                {"matrix": [3, 3], "x": 4.75, "y": 3},
-                {"matrix": [3, 4], "x": 5.75, "y": 3},
-                {"matrix": [3, 5], "x": 6.75, "y": 3},
-                {"matrix": [3, 6], "x": 7.75, "y": 3},
-
-                {"matrix": [3, 7], "x": 9.75, "y": 3},
-                {"matrix": [3, 8], "x": 10.75, "y": 3},
-                {"matrix": [3, 9], "x": 11.75, "y": 3},
-                {"matrix": [3, 10], "x": 12.75, "y": 3},
-                {"matrix": [3, 11], "x": 13.75, "y": 3},
-                {"matrix": [3, 13], "x": 14.75, "y": 3},
-                {"matrix": [3, 12], "x": 15.75, "y": 3, "w": 2.75},
-
-                {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.5},
-                {"matrix": [4, 2], "x": 4.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 4], "x": 5.75, "y": 4, "w": 2.25},
-                {"matrix": [4, 6], "x": 8, "y": 4, "w": 1.25},
-                {"matrix": [4, 8], "x": 9.75, "y": 4, "w": 2.75},
-                {"matrix": [4, 10], "x": 12.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 14], "x": 17, "y": 4, "w": 1.5}
-            ]
-        },
-        "LAYOUT_alice_split_bs": {
-            "layout": [
-                {"matrix": [1, 14], "x": 0, "y": 0},
-
-                {"matrix": [0, 0], "x": 1.5, "y": 0},
-                {"matrix": [0, 1], "x": 2.5, "y": 0},
-                {"matrix": [0, 2], "x": 3.5, "y": 0},
-                {"matrix": [0, 3], "x": 4.5, "y": 0},
-                {"matrix": [0, 4], "x": 5.5, "y": 0},
-                {"matrix": [0, 5], "x": 6.5, "y": 0},
-                {"matrix": [0, 6], "x": 7.5, "y": 0},
-
-                {"matrix": [0, 7], "x": 10.5, "y": 0},
-                {"matrix": [0, 8], "x": 11.5, "y": 0},
-                {"matrix": [0, 9], "x": 12.5, "y": 0},
-                {"matrix": [0, 10], "x": 13.5, "y": 0},
-                {"matrix": [0, 11], "x": 14.5, "y": 0},
-                {"matrix": [0, 12], "x": 15.5, "y": 0},
-                {"matrix": [0, 13], "x": 16.5, "y": 0},
-                {"matrix": [0, 14], "x": 17.5, "y": 0},
-
-                {"matrix": [2, 14], "x": 0, "y": 1},
-
-                {"matrix": [1, 0], "x": 1.5, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 3, "y": 1},
-                {"matrix": [1, 2], "x": 4, "y": 1},
-                {"matrix": [1, 3], "x": 5, "y": 1},
-                {"matrix": [1, 4], "x": 6, "y": 1},
-                {"matrix": [1, 5], "x": 7, "y": 1},
-
-                {"matrix": [1, 6], "x": 10, "y": 1},
-                {"matrix": [1, 7], "x": 11, "y": 1},
-                {"matrix": [1, 8], "x": 12, "y": 1},
-                {"matrix": [1, 9], "x": 13, "y": 1},
-                {"matrix": [1, 10], "x": 14, "y": 1},
-                {"matrix": [1, 11], "x": 15, "y": 1},
-                {"matrix": [1, 12], "x": 16, "y": 1},
-                {"matrix": [1, 13], "x": 17, "y": 1, "w": 1.5},
-
-                {"matrix": [3, 14], "x": 0, "y": 2},
-
-                {"matrix": [2, 0], "x": 1.5, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 3.25, "y": 2},
-                {"matrix": [2, 2], "x": 4.25, "y": 2},
-                {"matrix": [2, 3], "x": 5.25, "y": 2},
-                {"matrix": [2, 4], "x": 6.25, "y": 2},
-                {"matrix": [2, 5], "x": 7.25, "y": 2},
-
-                {"matrix": [2, 6], "x": 10.25, "y": 2},
-                {"matrix": [2, 7], "x": 11.25, "y": 2},
-                {"matrix": [2, 8], "x": 12.25, "y": 2},
-                {"matrix": [2, 9], "x": 13.25, "y": 2},
-                {"matrix": [2, 10], "x": 14.25, "y": 2},
-                {"matrix": [2, 11], "x": 15.25, "y": 2},
-                {"matrix": [2, 13], "x": 16.25, "y": 2, "w": 2.25},
-
-                {"matrix": [3, 0], "x": 1.5, "y": 3, "w": 2.25},
-                {"matrix": [3, 2], "x": 3.75, "y": 3},
-                {"matrix": [3, 3], "x": 4.75, "y": 3},
-                {"matrix": [3, 4], "x": 5.75, "y": 3},
-                {"matrix": [3, 5], "x": 6.75, "y": 3},
-                {"matrix": [3, 6], "x": 7.75, "y": 3},
-
-                {"matrix": [3, 7], "x": 9.75, "y": 3},
-                {"matrix": [3, 8], "x": 10.75, "y": 3},
-                {"matrix": [3, 9], "x": 11.75, "y": 3},
-                {"matrix": [3, 10], "x": 12.75, "y": 3},
-                {"matrix": [3, 11], "x": 13.75, "y": 3},
-                {"matrix": [3, 13], "x": 14.75, "y": 3},
-                {"matrix": [3, 12], "x": 15.75, "y": 3, "w": 1.75},
-                {"matrix": [4, 13], "x": 17.5, "y": 3},
-
-                {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.5},
-                {"matrix": [4, 2], "x": 4.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 4], "x": 5.75, "y": 4, "w": 2.25},
-                {"matrix": [4, 6], "x": 8, "y": 4, "w": 1.25},
-                {"matrix": [4, 8], "x": 9.75, "y": 4, "w": 2.75},
-                {"matrix": [4, 10], "x": 12.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 14], "x": 17, "y": 4, "w": 1.5}
-            ]
-        },
-        "LAYOUT_alice_split_bs_full_rshift": {
-            "layout": [
-                {"matrix": [1, 14], "x": 0, "y": 0},
-
-                {"matrix": [0, 0], "x": 1.5, "y": 0},
-                {"matrix": [0, 1], "x": 2.5, "y": 0},
-                {"matrix": [0, 2], "x": 3.5, "y": 0},
-                {"matrix": [0, 3], "x": 4.5, "y": 0},
-                {"matrix": [0, 4], "x": 5.5, "y": 0},
-                {"matrix": [0, 5], "x": 6.5, "y": 0},
-                {"matrix": [0, 6], "x": 7.5, "y": 0},
-
-                {"matrix": [0, 7], "x": 10.5, "y": 0},
-                {"matrix": [0, 8], "x": 11.5, "y": 0},
-                {"matrix": [0, 9], "x": 12.5, "y": 0},
-                {"matrix": [0, 10], "x": 13.5, "y": 0},
-                {"matrix": [0, 11], "x": 14.5, "y": 0},
-                {"matrix": [0, 12], "x": 15.5, "y": 0},
-                {"matrix": [0, 13], "x": 16.5, "y": 0},
-                {"matrix": [0, 14], "x": 17.5, "y": 0},
-
-                {"matrix": [2, 14], "x": 0, "y": 1},
-
-                {"matrix": [1, 0], "x": 1.5, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 3, "y": 1},
-                {"matrix": [1, 2], "x": 4, "y": 1},
-                {"matrix": [1, 3], "x": 5, "y": 1},
-                {"matrix": [1, 4], "x": 6, "y": 1},
-                {"matrix": [1, 5], "x": 7, "y": 1},
-
-                {"matrix": [1, 6], "x": 10, "y": 1},
-                {"matrix": [1, 7], "x": 11, "y": 1},
-                {"matrix": [1, 8], "x": 12, "y": 1},
-                {"matrix": [1, 9], "x": 13, "y": 1},
-                {"matrix": [1, 10], "x": 14, "y": 1},
-                {"matrix": [1, 11], "x": 15, "y": 1},
-                {"matrix": [1, 12], "x": 16, "y": 1},
-                {"matrix": [1, 13], "x": 17, "y": 1, "w": 1.5},
-
-                {"matrix": [3, 14], "x": 0, "y": 2},
-
-                {"matrix": [2, 0], "x": 1.5, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 3.25, "y": 2},
-                {"matrix": [2, 2], "x": 4.25, "y": 2},
-                {"matrix": [2, 3], "x": 5.25, "y": 2},
-                {"matrix": [2, 4], "x": 6.25, "y": 2},
-                {"matrix": [2, 5], "x": 7.25, "y": 2},
-
-                {"matrix": [2, 6], "x": 10.25, "y": 2},
-                {"matrix": [2, 7], "x": 11.25, "y": 2},
-                {"matrix": [2, 8], "x": 12.25, "y": 2},
-                {"matrix": [2, 9], "x": 13.25, "y": 2},
-                {"matrix": [2, 10], "x": 14.25, "y": 2},
-                {"matrix": [2, 11], "x": 15.25, "y": 2},
-                {"matrix": [2, 13], "x": 16.25, "y": 2, "w": 2.25},
-
-                {"matrix": [3, 0], "x": 1.5, "y": 3, "w": 2.25},
-                {"matrix": [3, 2], "x": 3.75, "y": 3},
-                {"matrix": [3, 3], "x": 4.75, "y": 3},
-                {"matrix": [3, 4], "x": 5.75, "y": 3},
-                {"matrix": [3, 5], "x": 6.75, "y": 3},
-                {"matrix": [3, 6], "x": 7.75, "y": 3},
-
-                {"matrix": [3, 7], "x": 9.75, "y": 3},
-                {"matrix": [3, 8], "x": 10.75, "y": 3},
-                {"matrix": [3, 9], "x": 11.75, "y": 3},
-                {"matrix": [3, 10], "x": 12.75, "y": 3},
-                {"matrix": [3, 11], "x": 13.75, "y": 3},
-                {"matrix": [3, 13], "x": 14.75, "y": 3},
-                {"matrix": [3, 12], "x": 15.75, "y": 3, "w": 2.75},
-
-                {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.5},
-                {"matrix": [4, 2], "x": 4.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 4], "x": 5.75, "y": 4, "w": 2.25},
-                {"matrix": [4, 6], "x": 8, "y": 4, "w": 1.25},
-                {"matrix": [4, 8], "x": 9.75, "y": 4, "w": 2.75},
-                {"matrix": [4, 10], "x": 12.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 14], "x": 17, "y": 4, "w": 1.5}
-            ]
-        }
-    }
-}
diff --git a/keyboards/mechlovin/adelais/rgb_led/rev2/keyboard.json b/keyboards/mechlovin/adelais/rgb_led/rev2/keyboard.json
new file mode 100644
index 00000000000..a8633af5da2
--- /dev/null
+++ b/keyboards/mechlovin/adelais/rgb_led/rev2/keyboard.json
@@ -0,0 +1,436 @@
+{
+    "keyboard_name": "Adelais En Ciel Rev2",
+    "usb": {
+        "pid": "0xAEC2"
+    },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "console": true,
+        "command": true,
+        "nkro": true,
+        "rgblight": true,
+        "rgb_matrix": true,
+        "encoder": true
+    },
+    "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,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": 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_rain": true,
+            "pixel_flow": true,
+            "pixel_fractal": 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
+        },
+        "default": {
+            "animation": "cycle_pinwheel"
+        },
+        "driver": "is31fl3731",
+        "react_on_keyup": true,
+        "sleep": true
+    },
+    "matrix_pins": {
+        "cols": ["A10", "A9", "A8", "B15", "B14", "B13", "B12", "B11", "B10", "B8", "B4", "B5", "B3", "C14", "A7"],
+        "rows": ["B1", "A0", "C13", "A1", "A2"]
+    },
+    "diode_direction": "COL2ROW",
+    "encoder": {
+        "rotary": [
+            {"pin_a": "A4", "pin_b": "A3"}
+        ]
+    },
+    "qmk": {
+        "tap_keycode_delay": 10
+    },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 23,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": true,
+            "twinkle": true
+        }
+    },
+    "ws2812": {
+        "pin": "A15"
+    },
+    "processor": "STM32F303",
+    "board": "QMK_PROTON_C",
+    "bootloader": "stm32-dfu",
+    "indicators": {
+        "caps_lock": "B2",
+        "num_lock": "C15",
+        "scroll_lock": "B9"
+    },
+    "layout_aliases": {
+        "LAYOUT_all": "LAYOUT_alice_split_bs"
+    },
+    "layouts": {
+        "LAYOUT_alice": {
+            "layout": [
+                {"matrix": [1, 14], "x": 0, "y": 0},
+
+                {"matrix": [0, 0], "x": 1.5, "y": 0},
+                {"matrix": [0, 1], "x": 2.5, "y": 0},
+                {"matrix": [0, 2], "x": 3.5, "y": 0},
+                {"matrix": [0, 3], "x": 4.5, "y": 0},
+                {"matrix": [0, 4], "x": 5.5, "y": 0},
+                {"matrix": [0, 5], "x": 6.5, "y": 0},
+                {"matrix": [0, 6], "x": 7.5, "y": 0},
+
+                {"matrix": [0, 7], "x": 10.5, "y": 0},
+                {"matrix": [0, 8], "x": 11.5, "y": 0},
+                {"matrix": [0, 9], "x": 12.5, "y": 0},
+                {"matrix": [0, 10], "x": 13.5, "y": 0},
+                {"matrix": [0, 11], "x": 14.5, "y": 0},
+                {"matrix": [0, 12], "x": 15.5, "y": 0},
+                {"matrix": [0, 13], "x": 16.5, "y": 0, "w": 2},
+
+                {"matrix": [2, 14], "x": 0, "y": 1},
+
+                {"matrix": [1, 0], "x": 1.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 3, "y": 1},
+                {"matrix": [1, 2], "x": 4, "y": 1},
+                {"matrix": [1, 3], "x": 5, "y": 1},
+                {"matrix": [1, 4], "x": 6, "y": 1},
+                {"matrix": [1, 5], "x": 7, "y": 1},
+
+                {"matrix": [1, 6], "x": 10, "y": 1},
+                {"matrix": [1, 7], "x": 11, "y": 1},
+                {"matrix": [1, 8], "x": 12, "y": 1},
+                {"matrix": [1, 9], "x": 13, "y": 1},
+                {"matrix": [1, 10], "x": 14, "y": 1},
+                {"matrix": [1, 11], "x": 15, "y": 1},
+                {"matrix": [1, 12], "x": 16, "y": 1},
+                {"matrix": [1, 13], "x": 17, "y": 1, "w": 1.5},
+
+                {"matrix": [3, 14], "x": 0, "y": 2},
+
+                {"matrix": [2, 0], "x": 1.5, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 3.25, "y": 2},
+                {"matrix": [2, 2], "x": 4.25, "y": 2},
+                {"matrix": [2, 3], "x": 5.25, "y": 2},
+                {"matrix": [2, 4], "x": 6.25, "y": 2},
+                {"matrix": [2, 5], "x": 7.25, "y": 2},
+
+                {"matrix": [2, 6], "x": 10.25, "y": 2},
+                {"matrix": [2, 7], "x": 11.25, "y": 2},
+                {"matrix": [2, 8], "x": 12.25, "y": 2},
+                {"matrix": [2, 9], "x": 13.25, "y": 2},
+                {"matrix": [2, 10], "x": 14.25, "y": 2},
+                {"matrix": [2, 11], "x": 15.25, "y": 2},
+                {"matrix": [2, 13], "x": 16.25, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 1.5, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 3.75, "y": 3},
+                {"matrix": [3, 3], "x": 4.75, "y": 3},
+                {"matrix": [3, 4], "x": 5.75, "y": 3},
+                {"matrix": [3, 5], "x": 6.75, "y": 3},
+                {"matrix": [3, 6], "x": 7.75, "y": 3},
+
+                {"matrix": [3, 7], "x": 9.75, "y": 3},
+                {"matrix": [3, 8], "x": 10.75, "y": 3},
+                {"matrix": [3, 9], "x": 11.75, "y": 3},
+                {"matrix": [3, 10], "x": 12.75, "y": 3},
+                {"matrix": [3, 11], "x": 13.75, "y": 3},
+                {"matrix": [3, 13], "x": 14.75, "y": 3},
+                {"matrix": [3, 12], "x": 15.75, "y": 3, "w": 1.75},
+                {"matrix": [4, 13], "x": 17.5, "y": 3},
+
+                {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 2], "x": 4.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 5.75, "y": 4, "w": 2.25},
+                {"matrix": [4, 6], "x": 8, "y": 4, "w": 1.25},
+                {"matrix": [4, 8], "x": 9.75, "y": 4, "w": 2.75},
+                {"matrix": [4, 10], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 14], "x": 17, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_alice_full_rshift": {
+            "layout": [
+                {"matrix": [1, 14], "x": 0, "y": 0},
+
+                {"matrix": [0, 0], "x": 1.5, "y": 0},
+                {"matrix": [0, 1], "x": 2.5, "y": 0},
+                {"matrix": [0, 2], "x": 3.5, "y": 0},
+                {"matrix": [0, 3], "x": 4.5, "y": 0},
+                {"matrix": [0, 4], "x": 5.5, "y": 0},
+                {"matrix": [0, 5], "x": 6.5, "y": 0},
+                {"matrix": [0, 6], "x": 7.5, "y": 0},
+
+                {"matrix": [0, 7], "x": 10.5, "y": 0},
+                {"matrix": [0, 8], "x": 11.5, "y": 0},
+                {"matrix": [0, 9], "x": 12.5, "y": 0},
+                {"matrix": [0, 10], "x": 13.5, "y": 0},
+                {"matrix": [0, 11], "x": 14.5, "y": 0},
+                {"matrix": [0, 12], "x": 15.5, "y": 0},
+                {"matrix": [0, 13], "x": 16.5, "y": 0, "w": 2},
+
+                {"matrix": [2, 14], "x": 0, "y": 1},
+
+                {"matrix": [1, 0], "x": 1.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 3, "y": 1},
+                {"matrix": [1, 2], "x": 4, "y": 1},
+                {"matrix": [1, 3], "x": 5, "y": 1},
+                {"matrix": [1, 4], "x": 6, "y": 1},
+                {"matrix": [1, 5], "x": 7, "y": 1},
+
+                {"matrix": [1, 6], "x": 10, "y": 1},
+                {"matrix": [1, 7], "x": 11, "y": 1},
+                {"matrix": [1, 8], "x": 12, "y": 1},
+                {"matrix": [1, 9], "x": 13, "y": 1},
+                {"matrix": [1, 10], "x": 14, "y": 1},
+                {"matrix": [1, 11], "x": 15, "y": 1},
+                {"matrix": [1, 12], "x": 16, "y": 1},
+                {"matrix": [1, 13], "x": 17, "y": 1, "w": 1.5},
+
+                {"matrix": [3, 14], "x": 0, "y": 2},
+
+                {"matrix": [2, 0], "x": 1.5, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 3.25, "y": 2},
+                {"matrix": [2, 2], "x": 4.25, "y": 2},
+                {"matrix": [2, 3], "x": 5.25, "y": 2},
+                {"matrix": [2, 4], "x": 6.25, "y": 2},
+                {"matrix": [2, 5], "x": 7.25, "y": 2},
+
+                {"matrix": [2, 6], "x": 10.25, "y": 2},
+                {"matrix": [2, 7], "x": 11.25, "y": 2},
+                {"matrix": [2, 8], "x": 12.25, "y": 2},
+                {"matrix": [2, 9], "x": 13.25, "y": 2},
+                {"matrix": [2, 10], "x": 14.25, "y": 2},
+                {"matrix": [2, 11], "x": 15.25, "y": 2},
+                {"matrix": [2, 13], "x": 16.25, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 1.5, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 3.75, "y": 3},
+                {"matrix": [3, 3], "x": 4.75, "y": 3},
+                {"matrix": [3, 4], "x": 5.75, "y": 3},
+                {"matrix": [3, 5], "x": 6.75, "y": 3},
+                {"matrix": [3, 6], "x": 7.75, "y": 3},
+
+                {"matrix": [3, 7], "x": 9.75, "y": 3},
+                {"matrix": [3, 8], "x": 10.75, "y": 3},
+                {"matrix": [3, 9], "x": 11.75, "y": 3},
+                {"matrix": [3, 10], "x": 12.75, "y": 3},
+                {"matrix": [3, 11], "x": 13.75, "y": 3},
+                {"matrix": [3, 13], "x": 14.75, "y": 3},
+                {"matrix": [3, 12], "x": 15.75, "y": 3, "w": 2.75},
+
+                {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 2], "x": 4.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 5.75, "y": 4, "w": 2.25},
+                {"matrix": [4, 6], "x": 8, "y": 4, "w": 1.25},
+                {"matrix": [4, 8], "x": 9.75, "y": 4, "w": 2.75},
+                {"matrix": [4, 10], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 14], "x": 17, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_alice_split_bs": {
+            "layout": [
+                {"matrix": [1, 14], "x": 0, "y": 0},
+
+                {"matrix": [0, 0], "x": 1.5, "y": 0},
+                {"matrix": [0, 1], "x": 2.5, "y": 0},
+                {"matrix": [0, 2], "x": 3.5, "y": 0},
+                {"matrix": [0, 3], "x": 4.5, "y": 0},
+                {"matrix": [0, 4], "x": 5.5, "y": 0},
+                {"matrix": [0, 5], "x": 6.5, "y": 0},
+                {"matrix": [0, 6], "x": 7.5, "y": 0},
+
+                {"matrix": [0, 7], "x": 10.5, "y": 0},
+                {"matrix": [0, 8], "x": 11.5, "y": 0},
+                {"matrix": [0, 9], "x": 12.5, "y": 0},
+                {"matrix": [0, 10], "x": 13.5, "y": 0},
+                {"matrix": [0, 11], "x": 14.5, "y": 0},
+                {"matrix": [0, 12], "x": 15.5, "y": 0},
+                {"matrix": [0, 13], "x": 16.5, "y": 0},
+                {"matrix": [0, 14], "x": 17.5, "y": 0},
+
+                {"matrix": [2, 14], "x": 0, "y": 1},
+
+                {"matrix": [1, 0], "x": 1.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 3, "y": 1},
+                {"matrix": [1, 2], "x": 4, "y": 1},
+                {"matrix": [1, 3], "x": 5, "y": 1},
+                {"matrix": [1, 4], "x": 6, "y": 1},
+                {"matrix": [1, 5], "x": 7, "y": 1},
+
+                {"matrix": [1, 6], "x": 10, "y": 1},
+                {"matrix": [1, 7], "x": 11, "y": 1},
+                {"matrix": [1, 8], "x": 12, "y": 1},
+                {"matrix": [1, 9], "x": 13, "y": 1},
+                {"matrix": [1, 10], "x": 14, "y": 1},
+                {"matrix": [1, 11], "x": 15, "y": 1},
+                {"matrix": [1, 12], "x": 16, "y": 1},
+                {"matrix": [1, 13], "x": 17, "y": 1, "w": 1.5},
+
+                {"matrix": [3, 14], "x": 0, "y": 2},
+
+                {"matrix": [2, 0], "x": 1.5, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 3.25, "y": 2},
+                {"matrix": [2, 2], "x": 4.25, "y": 2},
+                {"matrix": [2, 3], "x": 5.25, "y": 2},
+                {"matrix": [2, 4], "x": 6.25, "y": 2},
+                {"matrix": [2, 5], "x": 7.25, "y": 2},
+
+                {"matrix": [2, 6], "x": 10.25, "y": 2},
+                {"matrix": [2, 7], "x": 11.25, "y": 2},
+                {"matrix": [2, 8], "x": 12.25, "y": 2},
+                {"matrix": [2, 9], "x": 13.25, "y": 2},
+                {"matrix": [2, 10], "x": 14.25, "y": 2},
+                {"matrix": [2, 11], "x": 15.25, "y": 2},
+                {"matrix": [2, 13], "x": 16.25, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 1.5, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 3.75, "y": 3},
+                {"matrix": [3, 3], "x": 4.75, "y": 3},
+                {"matrix": [3, 4], "x": 5.75, "y": 3},
+                {"matrix": [3, 5], "x": 6.75, "y": 3},
+                {"matrix": [3, 6], "x": 7.75, "y": 3},
+
+                {"matrix": [3, 7], "x": 9.75, "y": 3},
+                {"matrix": [3, 8], "x": 10.75, "y": 3},
+                {"matrix": [3, 9], "x": 11.75, "y": 3},
+                {"matrix": [3, 10], "x": 12.75, "y": 3},
+                {"matrix": [3, 11], "x": 13.75, "y": 3},
+                {"matrix": [3, 13], "x": 14.75, "y": 3},
+                {"matrix": [3, 12], "x": 15.75, "y": 3, "w": 1.75},
+                {"matrix": [4, 13], "x": 17.5, "y": 3},
+
+                {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 2], "x": 4.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 5.75, "y": 4, "w": 2.25},
+                {"matrix": [4, 6], "x": 8, "y": 4, "w": 1.25},
+                {"matrix": [4, 8], "x": 9.75, "y": 4, "w": 2.75},
+                {"matrix": [4, 10], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 14], "x": 17, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_alice_split_bs_full_rshift": {
+            "layout": [
+                {"matrix": [1, 14], "x": 0, "y": 0},
+
+                {"matrix": [0, 0], "x": 1.5, "y": 0},
+                {"matrix": [0, 1], "x": 2.5, "y": 0},
+                {"matrix": [0, 2], "x": 3.5, "y": 0},
+                {"matrix": [0, 3], "x": 4.5, "y": 0},
+                {"matrix": [0, 4], "x": 5.5, "y": 0},
+                {"matrix": [0, 5], "x": 6.5, "y": 0},
+                {"matrix": [0, 6], "x": 7.5, "y": 0},
+
+                {"matrix": [0, 7], "x": 10.5, "y": 0},
+                {"matrix": [0, 8], "x": 11.5, "y": 0},
+                {"matrix": [0, 9], "x": 12.5, "y": 0},
+                {"matrix": [0, 10], "x": 13.5, "y": 0},
+                {"matrix": [0, 11], "x": 14.5, "y": 0},
+                {"matrix": [0, 12], "x": 15.5, "y": 0},
+                {"matrix": [0, 13], "x": 16.5, "y": 0},
+                {"matrix": [0, 14], "x": 17.5, "y": 0},
+
+                {"matrix": [2, 14], "x": 0, "y": 1},
+
+                {"matrix": [1, 0], "x": 1.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 3, "y": 1},
+                {"matrix": [1, 2], "x": 4, "y": 1},
+                {"matrix": [1, 3], "x": 5, "y": 1},
+                {"matrix": [1, 4], "x": 6, "y": 1},
+                {"matrix": [1, 5], "x": 7, "y": 1},
+
+                {"matrix": [1, 6], "x": 10, "y": 1},
+                {"matrix": [1, 7], "x": 11, "y": 1},
+                {"matrix": [1, 8], "x": 12, "y": 1},
+                {"matrix": [1, 9], "x": 13, "y": 1},
+                {"matrix": [1, 10], "x": 14, "y": 1},
+                {"matrix": [1, 11], "x": 15, "y": 1},
+                {"matrix": [1, 12], "x": 16, "y": 1},
+                {"matrix": [1, 13], "x": 17, "y": 1, "w": 1.5},
+
+                {"matrix": [3, 14], "x": 0, "y": 2},
+
+                {"matrix": [2, 0], "x": 1.5, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 3.25, "y": 2},
+                {"matrix": [2, 2], "x": 4.25, "y": 2},
+                {"matrix": [2, 3], "x": 5.25, "y": 2},
+                {"matrix": [2, 4], "x": 6.25, "y": 2},
+                {"matrix": [2, 5], "x": 7.25, "y": 2},
+
+                {"matrix": [2, 6], "x": 10.25, "y": 2},
+                {"matrix": [2, 7], "x": 11.25, "y": 2},
+                {"matrix": [2, 8], "x": 12.25, "y": 2},
+                {"matrix": [2, 9], "x": 13.25, "y": 2},
+                {"matrix": [2, 10], "x": 14.25, "y": 2},
+                {"matrix": [2, 11], "x": 15.25, "y": 2},
+                {"matrix": [2, 13], "x": 16.25, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 1.5, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 3.75, "y": 3},
+                {"matrix": [3, 3], "x": 4.75, "y": 3},
+                {"matrix": [3, 4], "x": 5.75, "y": 3},
+                {"matrix": [3, 5], "x": 6.75, "y": 3},
+                {"matrix": [3, 6], "x": 7.75, "y": 3},
+
+                {"matrix": [3, 7], "x": 9.75, "y": 3},
+                {"matrix": [3, 8], "x": 10.75, "y": 3},
+                {"matrix": [3, 9], "x": 11.75, "y": 3},
+                {"matrix": [3, 10], "x": 12.75, "y": 3},
+                {"matrix": [3, 11], "x": 13.75, "y": 3},
+                {"matrix": [3, 13], "x": 14.75, "y": 3},
+                {"matrix": [3, 12], "x": 15.75, "y": 3, "w": 2.75},
+
+                {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 2], "x": 4.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 5.75, "y": 4, "w": 2.25},
+                {"matrix": [4, 6], "x": 8, "y": 4, "w": 1.25},
+                {"matrix": [4, 8], "x": 9.75, "y": 4, "w": 2.75},
+                {"matrix": [4, 10], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 14], "x": 17, "y": 4, "w": 1.5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/mechlovin/adelais/rgb_led/rev2/rules.mk b/keyboards/mechlovin/adelais/rgb_led/rev2/rules.mk
deleted file mode 100644
index e79b2862e60..00000000000
--- a/keyboards/mechlovin/adelais/rgb_led/rev2/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-RGB_MATRIX_ENABLE = yes
-RGBLIGHT_ENABLE = yes
-ENCODER_ENABLE = yes
diff --git a/keyboards/mechlovin/adelais/rgb_led/rev3/info.json b/keyboards/mechlovin/adelais/rgb_led/rev3/info.json
deleted file mode 100644
index 62acf349c05..00000000000
--- a/keyboards/mechlovin/adelais/rgb_led/rev3/info.json
+++ /dev/null
@@ -1,408 +0,0 @@
-{
-    "keyboard_name": "Adelais En Ciel Rev3",
-    "usb": {
-        "pid": "0xAEC3"
-    },
-    "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,
-            "rainbow_moving_chevron": true,
-            "cycle_out_in": true,
-            "cycle_out_in_dual": 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_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
-        },
-        "default": {
-            "animation": "cycle_pinwheel"
-        },
-        "driver": "is31fl3741",
-        "react_on_keyup": true,
-        "sleep": true
-    },
-    "matrix_pins": {
-        "cols": ["B10", "B11", "B2", "B1", "B0", "A6", "A5", "A10", "A9", "A15", "B3", "B4", "B5", "B8", "B9"],
-        "rows": ["A4", "A3", "C13", "A1", "A2"]
-    },
-    "diode_direction": "COL2ROW",
-    "encoder": {
-        "rotary": [
-            {"pin_a": "B12", "pin_b": "B13"}
-        ]
-    },
-    "qmk": {
-        "tap_keycode_delay": 10
-    },
-    "processor": "STM32F103",
-    "bootloader": "stm32duino",
-    "indicators": {
-        "caps_lock": "C14",
-        "num_lock": "A0",
-        "scroll_lock": "C15"
-    },
-    "rgblight": {
-        "saturation_steps": 8,
-        "brightness_steps": 8,
-        "led_count": 23,
-        "animations": {
-            "breathing": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "snake": true,
-            "knight": true,
-            "christmas": true,
-            "static_gradient": true,
-            "rgb_test": true,
-            "alternating": true,
-            "twinkle": true
-        }
-    },
-    "ws2812": {
-        "pin": "A7",
-        "driver": "spi"
-    },
-    "layout_aliases": {
-        "LAYOUT_all": "LAYOUT_alice_split_bs"
-    },
-    "layouts": {
-        "LAYOUT_alice": {
-            "layout": [
-                {"matrix": [3, 1], "x": 0, "y": 0},
-
-                {"matrix": [0, 0], "x": 1.5, "y": 0},
-                {"matrix": [0, 1], "x": 2.5, "y": 0},
-                {"matrix": [0, 2], "x": 3.5, "y": 0},
-                {"matrix": [0, 3], "x": 4.5, "y": 0},
-                {"matrix": [0, 4], "x": 5.5, "y": 0},
-                {"matrix": [0, 5], "x": 6.5, "y": 0},
-                {"matrix": [0, 6], "x": 7.5, "y": 0},
-                {"matrix": [0, 7], "x": 10.5, "y": 0},
-                {"matrix": [0, 8], "x": 11.5, "y": 0},
-                {"matrix": [0, 9], "x": 12.5, "y": 0},
-                {"matrix": [0, 10], "x": 13.5, "y": 0},
-                {"matrix": [0, 11], "x": 14.5, "y": 0},
-                {"matrix": [0, 12], "x": 15.5, "y": 0},
-                {"matrix": [0, 13], "x": 16.5, "y": 0, "w": 2},
-
-                {"matrix": [4, 1], "x": 0, "y": 1},
-
-                {"matrix": [1, 0], "x": 1.5, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 3, "y": 1},
-                {"matrix": [1, 2], "x": 4, "y": 1},
-                {"matrix": [1, 3], "x": 5, "y": 1},
-                {"matrix": [1, 4], "x": 6, "y": 1},
-                {"matrix": [1, 5], "x": 7, "y": 1},
-                {"matrix": [1, 6], "x": 10, "y": 1},
-                {"matrix": [1, 7], "x": 11, "y": 1},
-                {"matrix": [1, 8], "x": 12, "y": 1},
-                {"matrix": [1, 9], "x": 13, "y": 1},
-                {"matrix": [1, 10], "x": 14, "y": 1},
-                {"matrix": [1, 11], "x": 15, "y": 1},
-                {"matrix": [1, 12], "x": 16, "y": 1},
-                {"matrix": [1, 13], "x": 17, "y": 1, "w": 1.5},
-
-                {"matrix": [4, 3], "x": 0, "y": 2},
-
-                {"matrix": [2, 0], "x": 1.5, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 3.25, "y": 2},
-                {"matrix": [2, 2], "x": 4.25, "y": 2},
-                {"matrix": [2, 3], "x": 5.25, "y": 2},
-                {"matrix": [2, 4], "x": 6.25, "y": 2},
-                {"matrix": [2, 5], "x": 7.25, "y": 2},
-                {"matrix": [2, 6], "x": 10.25, "y": 2},
-                {"matrix": [2, 7], "x": 11.25, "y": 2},
-                {"matrix": [2, 8], "x": 12.25, "y": 2},
-                {"matrix": [2, 9], "x": 13.25, "y": 2},
-                {"matrix": [2, 10], "x": 14.25, "y": 2},
-                {"matrix": [2, 11], "x": 15.25, "y": 2},
-                {"matrix": [2, 13], "x": 16.25, "y": 2, "w": 2.25},
-
-                {"matrix": [3, 0], "x": 1.5, "y": 3, "w": 2.25},
-                {"matrix": [3, 2], "x": 3.75, "y": 3},
-                {"matrix": [3, 3], "x": 4.75, "y": 3},
-                {"matrix": [3, 4], "x": 5.75, "y": 3},
-                {"matrix": [3, 5], "x": 6.75, "y": 3},
-                {"matrix": [3, 6], "x": 7.75, "y": 3},
-                {"matrix": [3, 7], "x": 9.75, "y": 3},
-                {"matrix": [3, 8], "x": 10.75, "y": 3},
-                {"matrix": [3, 9], "x": 11.75, "y": 3},
-                {"matrix": [3, 10], "x": 12.75, "y": 3},
-                {"matrix": [3, 11], "x": 13.75, "y": 3},
-                {"matrix": [3, 12], "x": 14.75, "y": 3},
-                {"matrix": [3, 13], "x": 15.75, "y": 3, "w": 1.75},
-                {"matrix": [3, 14], "x": 17.5, "y": 3},
-
-                {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.5},
-                {"matrix": [4, 2], "x": 4.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 4], "x": 5.75, "y": 4, "w": 2.25},
-                {"matrix": [4, 6], "x": 8, "y": 4, "w": 1.25},
-                {"matrix": [4, 8], "x": 9.75, "y": 4, "w": 2.75},
-                {"matrix": [4, 10], "x": 12.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 14], "x": 17, "y": 4, "w": 1.5}
-            ]
-        },
-        "LAYOUT_alice_full_rshift": {
-            "layout": [
-                {"matrix": [3, 1], "x": 0, "y": 0},
-
-                {"matrix": [0, 0], "x": 1.5, "y": 0},
-                {"matrix": [0, 1], "x": 2.5, "y": 0},
-                {"matrix": [0, 2], "x": 3.5, "y": 0},
-                {"matrix": [0, 3], "x": 4.5, "y": 0},
-                {"matrix": [0, 4], "x": 5.5, "y": 0},
-                {"matrix": [0, 5], "x": 6.5, "y": 0},
-                {"matrix": [0, 6], "x": 7.5, "y": 0},
-                {"matrix": [0, 7], "x": 10.5, "y": 0},
-                {"matrix": [0, 8], "x": 11.5, "y": 0},
-                {"matrix": [0, 9], "x": 12.5, "y": 0},
-                {"matrix": [0, 10], "x": 13.5, "y": 0},
-                {"matrix": [0, 11], "x": 14.5, "y": 0},
-                {"matrix": [0, 12], "x": 15.5, "y": 0},
-                {"matrix": [0, 13], "x": 16.5, "y": 0, "w": 2},
-
-                {"matrix": [4, 1], "x": 0, "y": 1},
-
-                {"matrix": [1, 0], "x": 1.5, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 3, "y": 1},
-                {"matrix": [1, 2], "x": 4, "y": 1},
-                {"matrix": [1, 3], "x": 5, "y": 1},
-                {"matrix": [1, 4], "x": 6, "y": 1},
-                {"matrix": [1, 5], "x": 7, "y": 1},
-                {"matrix": [1, 6], "x": 10, "y": 1},
-                {"matrix": [1, 7], "x": 11, "y": 1},
-                {"matrix": [1, 8], "x": 12, "y": 1},
-                {"matrix": [1, 9], "x": 13, "y": 1},
-                {"matrix": [1, 10], "x": 14, "y": 1},
-                {"matrix": [1, 11], "x": 15, "y": 1},
-                {"matrix": [1, 12], "x": 16, "y": 1},
-                {"matrix": [1, 13], "x": 17, "y": 1, "w": 1.5},
-
-                {"matrix": [4, 3], "x": 0, "y": 2},
-
-                {"matrix": [2, 0], "x": 1.5, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 3.25, "y": 2},
-                {"matrix": [2, 2], "x": 4.25, "y": 2},
-                {"matrix": [2, 3], "x": 5.25, "y": 2},
-                {"matrix": [2, 4], "x": 6.25, "y": 2},
-                {"matrix": [2, 5], "x": 7.25, "y": 2},
-                {"matrix": [2, 6], "x": 10.25, "y": 2},
-                {"matrix": [2, 7], "x": 11.25, "y": 2},
-                {"matrix": [2, 8], "x": 12.25, "y": 2},
-                {"matrix": [2, 9], "x": 13.25, "y": 2},
-                {"matrix": [2, 10], "x": 14.25, "y": 2},
-                {"matrix": [2, 11], "x": 15.25, "y": 2},
-                {"matrix": [2, 13], "x": 16.25, "y": 2, "w": 2.25},
-
-                {"matrix": [3, 0], "x": 1.5, "y": 3, "w": 2.25},
-                {"matrix": [3, 2], "x": 3.75, "y": 3},
-                {"matrix": [3, 3], "x": 4.75, "y": 3},
-                {"matrix": [3, 4], "x": 5.75, "y": 3},
-                {"matrix": [3, 5], "x": 6.75, "y": 3},
-                {"matrix": [3, 6], "x": 7.75, "y": 3},
-                {"matrix": [3, 7], "x": 9.75, "y": 3},
-                {"matrix": [3, 8], "x": 10.75, "y": 3},
-                {"matrix": [3, 9], "x": 11.75, "y": 3},
-                {"matrix": [3, 10], "x": 12.75, "y": 3},
-                {"matrix": [3, 11], "x": 13.75, "y": 3},
-                {"matrix": [3, 12], "x": 14.75, "y": 3},
-                {"matrix": [3, 13], "x": 15.75, "y": 3, "w": 2.75},
-
-                {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.5},
-                {"matrix": [4, 2], "x": 4.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 4], "x": 5.75, "y": 4, "w": 2.25},
-                {"matrix": [4, 6], "x": 8, "y": 4, "w": 1.25},
-                {"matrix": [4, 8], "x": 9.75, "y": 4, "w": 2.75},
-                {"matrix": [4, 10], "x": 12.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 14], "x": 17, "y": 4, "w": 1.5}
-            ]
-        },
-        "LAYOUT_alice_split_bs": {
-            "layout": [
-                {"matrix": [3, 1], "x": 0, "y": 0},
-
-                {"matrix": [0, 0], "x": 1.5, "y": 0},
-                {"matrix": [0, 1], "x": 2.5, "y": 0},
-                {"matrix": [0, 2], "x": 3.5, "y": 0},
-                {"matrix": [0, 3], "x": 4.5, "y": 0},
-                {"matrix": [0, 4], "x": 5.5, "y": 0},
-                {"matrix": [0, 5], "x": 6.5, "y": 0},
-                {"matrix": [0, 6], "x": 7.5, "y": 0},
-                {"matrix": [0, 7], "x": 10.5, "y": 0},
-                {"matrix": [0, 8], "x": 11.5, "y": 0},
-                {"matrix": [0, 9], "x": 12.5, "y": 0},
-                {"matrix": [0, 10], "x": 13.5, "y": 0},
-                {"matrix": [0, 11], "x": 14.5, "y": 0},
-                {"matrix": [0, 12], "x": 15.5, "y": 0},
-                {"matrix": [0, 13], "x": 16.5, "y": 0},
-                {"matrix": [0, 14], "x": 17.5, "y": 0},
-
-                {"matrix": [4, 1], "x": 0, "y": 1},
-
-                {"matrix": [1, 0], "x": 1.5, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 3, "y": 1},
-                {"matrix": [1, 2], "x": 4, "y": 1},
-                {"matrix": [1, 3], "x": 5, "y": 1},
-                {"matrix": [1, 4], "x": 6, "y": 1},
-                {"matrix": [1, 5], "x": 7, "y": 1},
-                {"matrix": [1, 6], "x": 10, "y": 1},
-                {"matrix": [1, 7], "x": 11, "y": 1},
-                {"matrix": [1, 8], "x": 12, "y": 1},
-                {"matrix": [1, 9], "x": 13, "y": 1},
-                {"matrix": [1, 10], "x": 14, "y": 1},
-                {"matrix": [1, 11], "x": 15, "y": 1},
-                {"matrix": [1, 12], "x": 16, "y": 1},
-                {"matrix": [1, 13], "x": 17, "y": 1, "w": 1.5},
-
-                {"matrix": [4, 3], "x": 0, "y": 2},
-
-                {"matrix": [2, 0], "x": 1.5, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 3.25, "y": 2},
-                {"matrix": [2, 2], "x": 4.25, "y": 2},
-                {"matrix": [2, 3], "x": 5.25, "y": 2},
-                {"matrix": [2, 4], "x": 6.25, "y": 2},
-                {"matrix": [2, 5], "x": 7.25, "y": 2},
-                {"matrix": [2, 6], "x": 10.25, "y": 2},
-                {"matrix": [2, 7], "x": 11.25, "y": 2},
-                {"matrix": [2, 8], "x": 12.25, "y": 2},
-                {"matrix": [2, 9], "x": 13.25, "y": 2},
-                {"matrix": [2, 10], "x": 14.25, "y": 2},
-                {"matrix": [2, 11], "x": 15.25, "y": 2},
-                {"matrix": [2, 13], "x": 16.25, "y": 2, "w": 2.25},
-
-                {"matrix": [3, 0], "x": 1.5, "y": 3, "w": 2.25},
-                {"matrix": [3, 2], "x": 3.75, "y": 3},
-                {"matrix": [3, 3], "x": 4.75, "y": 3},
-                {"matrix": [3, 4], "x": 5.75, "y": 3},
-                {"matrix": [3, 5], "x": 6.75, "y": 3},
-                {"matrix": [3, 6], "x": 7.75, "y": 3},
-                {"matrix": [3, 7], "x": 9.75, "y": 3},
-                {"matrix": [3, 8], "x": 10.75, "y": 3},
-                {"matrix": [3, 9], "x": 11.75, "y": 3},
-                {"matrix": [3, 10], "x": 12.75, "y": 3},
-                {"matrix": [3, 11], "x": 13.75, "y": 3},
-                {"matrix": [3, 12], "x": 14.75, "y": 3},
-                {"matrix": [3, 13], "x": 15.75, "y": 3, "w": 1.75},
-                {"matrix": [3, 14], "x": 17.5, "y": 3},
-
-                {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.5},
-                {"matrix": [4, 2], "x": 4.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 4], "x": 5.75, "y": 4, "w": 2.25},
-                {"matrix": [4, 6], "x": 8, "y": 4, "w": 1.25},
-                {"matrix": [4, 8], "x": 9.75, "y": 4, "w": 2.75},
-                {"matrix": [4, 10], "x": 12.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 14], "x": 17, "y": 4, "w": 1.5}
-            ]
-        },
-        "LAYOUT_alice_split_bs_full_rshift": {
-            "layout": [
-                {"matrix": [3, 1], "x": 0, "y": 0},
-
-                {"matrix": [0, 0], "x": 1.5, "y": 0},
-                {"matrix": [0, 1], "x": 2.5, "y": 0},
-                {"matrix": [0, 2], "x": 3.5, "y": 0},
-                {"matrix": [0, 3], "x": 4.5, "y": 0},
-                {"matrix": [0, 4], "x": 5.5, "y": 0},
-                {"matrix": [0, 5], "x": 6.5, "y": 0},
-                {"matrix": [0, 6], "x": 7.5, "y": 0},
-                {"matrix": [0, 7], "x": 10.5, "y": 0},
-                {"matrix": [0, 8], "x": 11.5, "y": 0},
-                {"matrix": [0, 9], "x": 12.5, "y": 0},
-                {"matrix": [0, 10], "x": 13.5, "y": 0},
-                {"matrix": [0, 11], "x": 14.5, "y": 0},
-                {"matrix": [0, 12], "x": 15.5, "y": 0},
-                {"matrix": [0, 13], "x": 16.5, "y": 0},
-                {"matrix": [0, 14], "x": 17.5, "y": 0},
-
-                {"matrix": [4, 1], "x": 0, "y": 1},
-
-                {"matrix": [1, 0], "x": 1.5, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 3, "y": 1},
-                {"matrix": [1, 2], "x": 4, "y": 1},
-                {"matrix": [1, 3], "x": 5, "y": 1},
-                {"matrix": [1, 4], "x": 6, "y": 1},
-                {"matrix": [1, 5], "x": 7, "y": 1},
-                {"matrix": [1, 6], "x": 10, "y": 1},
-                {"matrix": [1, 7], "x": 11, "y": 1},
-                {"matrix": [1, 8], "x": 12, "y": 1},
-                {"matrix": [1, 9], "x": 13, "y": 1},
-                {"matrix": [1, 10], "x": 14, "y": 1},
-                {"matrix": [1, 11], "x": 15, "y": 1},
-                {"matrix": [1, 12], "x": 16, "y": 1},
-                {"matrix": [1, 13], "x": 17, "y": 1, "w": 1.5},
-
-                {"matrix": [4, 3], "x": 0, "y": 2},
-
-                {"matrix": [2, 0], "x": 1.5, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 3.25, "y": 2},
-                {"matrix": [2, 2], "x": 4.25, "y": 2},
-                {"matrix": [2, 3], "x": 5.25, "y": 2},
-                {"matrix": [2, 4], "x": 6.25, "y": 2},
-                {"matrix": [2, 5], "x": 7.25, "y": 2},
-                {"matrix": [2, 6], "x": 10.25, "y": 2},
-                {"matrix": [2, 7], "x": 11.25, "y": 2},
-                {"matrix": [2, 8], "x": 12.25, "y": 2},
-                {"matrix": [2, 9], "x": 13.25, "y": 2},
-                {"matrix": [2, 10], "x": 14.25, "y": 2},
-                {"matrix": [2, 11], "x": 15.25, "y": 2},
-                {"matrix": [2, 13], "x": 16.25, "y": 2, "w": 2.25},
-
-                {"matrix": [3, 0], "x": 1.5, "y": 3, "w": 2.25},
-                {"matrix": [3, 2], "x": 3.75, "y": 3},
-                {"matrix": [3, 3], "x": 4.75, "y": 3},
-                {"matrix": [3, 4], "x": 5.75, "y": 3},
-                {"matrix": [3, 5], "x": 6.75, "y": 3},
-                {"matrix": [3, 6], "x": 7.75, "y": 3},
-                {"matrix": [3, 7], "x": 9.75, "y": 3},
-                {"matrix": [3, 8], "x": 10.75, "y": 3},
-                {"matrix": [3, 9], "x": 11.75, "y": 3},
-                {"matrix": [3, 10], "x": 12.75, "y": 3},
-                {"matrix": [3, 11], "x": 13.75, "y": 3},
-                {"matrix": [3, 12], "x": 14.75, "y": 3},
-                {"matrix": [3, 13], "x": 15.75, "y": 3, "w": 2.75},
-
-                {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.5},
-                {"matrix": [4, 2], "x": 4.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 4], "x": 5.75, "y": 4, "w": 2.25},
-                {"matrix": [4, 6], "x": 8, "y": 4, "w": 1.25},
-                {"matrix": [4, 8], "x": 9.75, "y": 4, "w": 2.75},
-                {"matrix": [4, 10], "x": 12.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 14], "x": 17, "y": 4, "w": 1.5}
-            ]
-        }
-    }
-}
diff --git a/keyboards/mechlovin/adelais/rgb_led/rev3/keyboard.json b/keyboards/mechlovin/adelais/rgb_led/rev3/keyboard.json
new file mode 100644
index 00000000000..628eb404a5b
--- /dev/null
+++ b/keyboards/mechlovin/adelais/rgb_led/rev3/keyboard.json
@@ -0,0 +1,419 @@
+{
+    "keyboard_name": "Adelais En Ciel Rev3",
+    "usb": {
+        "pid": "0xAEC3"
+    },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "console": false,
+        "command": false,
+        "nkro": true,
+        "rgblight": true,
+        "rgb_matrix": true,
+        "encoder": true
+    },
+    "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,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": 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_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
+        },
+        "default": {
+            "animation": "cycle_pinwheel"
+        },
+        "driver": "is31fl3741",
+        "react_on_keyup": true,
+        "sleep": true
+    },
+    "matrix_pins": {
+        "cols": ["B10", "B11", "B2", "B1", "B0", "A6", "A5", "A10", "A9", "A15", "B3", "B4", "B5", "B8", "B9"],
+        "rows": ["A4", "A3", "C13", "A1", "A2"]
+    },
+    "diode_direction": "COL2ROW",
+    "encoder": {
+        "rotary": [
+            {"pin_a": "B12", "pin_b": "B13"}
+        ]
+    },
+    "qmk": {
+        "tap_keycode_delay": 10
+    },
+    "processor": "STM32F103",
+    "bootloader": "stm32duino",
+    "indicators": {
+        "caps_lock": "C14",
+        "num_lock": "A0",
+        "scroll_lock": "C15"
+    },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 23,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": true,
+            "twinkle": true
+        }
+    },
+    "ws2812": {
+        "pin": "A7",
+        "driver": "spi"
+    },
+    "layout_aliases": {
+        "LAYOUT_all": "LAYOUT_alice_split_bs"
+    },
+    "layouts": {
+        "LAYOUT_alice": {
+            "layout": [
+                {"matrix": [3, 1], "x": 0, "y": 0},
+
+                {"matrix": [0, 0], "x": 1.5, "y": 0},
+                {"matrix": [0, 1], "x": 2.5, "y": 0},
+                {"matrix": [0, 2], "x": 3.5, "y": 0},
+                {"matrix": [0, 3], "x": 4.5, "y": 0},
+                {"matrix": [0, 4], "x": 5.5, "y": 0},
+                {"matrix": [0, 5], "x": 6.5, "y": 0},
+                {"matrix": [0, 6], "x": 7.5, "y": 0},
+                {"matrix": [0, 7], "x": 10.5, "y": 0},
+                {"matrix": [0, 8], "x": 11.5, "y": 0},
+                {"matrix": [0, 9], "x": 12.5, "y": 0},
+                {"matrix": [0, 10], "x": 13.5, "y": 0},
+                {"matrix": [0, 11], "x": 14.5, "y": 0},
+                {"matrix": [0, 12], "x": 15.5, "y": 0},
+                {"matrix": [0, 13], "x": 16.5, "y": 0, "w": 2},
+
+                {"matrix": [4, 1], "x": 0, "y": 1},
+
+                {"matrix": [1, 0], "x": 1.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 3, "y": 1},
+                {"matrix": [1, 2], "x": 4, "y": 1},
+                {"matrix": [1, 3], "x": 5, "y": 1},
+                {"matrix": [1, 4], "x": 6, "y": 1},
+                {"matrix": [1, 5], "x": 7, "y": 1},
+                {"matrix": [1, 6], "x": 10, "y": 1},
+                {"matrix": [1, 7], "x": 11, "y": 1},
+                {"matrix": [1, 8], "x": 12, "y": 1},
+                {"matrix": [1, 9], "x": 13, "y": 1},
+                {"matrix": [1, 10], "x": 14, "y": 1},
+                {"matrix": [1, 11], "x": 15, "y": 1},
+                {"matrix": [1, 12], "x": 16, "y": 1},
+                {"matrix": [1, 13], "x": 17, "y": 1, "w": 1.5},
+
+                {"matrix": [4, 3], "x": 0, "y": 2},
+
+                {"matrix": [2, 0], "x": 1.5, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 3.25, "y": 2},
+                {"matrix": [2, 2], "x": 4.25, "y": 2},
+                {"matrix": [2, 3], "x": 5.25, "y": 2},
+                {"matrix": [2, 4], "x": 6.25, "y": 2},
+                {"matrix": [2, 5], "x": 7.25, "y": 2},
+                {"matrix": [2, 6], "x": 10.25, "y": 2},
+                {"matrix": [2, 7], "x": 11.25, "y": 2},
+                {"matrix": [2, 8], "x": 12.25, "y": 2},
+                {"matrix": [2, 9], "x": 13.25, "y": 2},
+                {"matrix": [2, 10], "x": 14.25, "y": 2},
+                {"matrix": [2, 11], "x": 15.25, "y": 2},
+                {"matrix": [2, 13], "x": 16.25, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 1.5, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 3.75, "y": 3},
+                {"matrix": [3, 3], "x": 4.75, "y": 3},
+                {"matrix": [3, 4], "x": 5.75, "y": 3},
+                {"matrix": [3, 5], "x": 6.75, "y": 3},
+                {"matrix": [3, 6], "x": 7.75, "y": 3},
+                {"matrix": [3, 7], "x": 9.75, "y": 3},
+                {"matrix": [3, 8], "x": 10.75, "y": 3},
+                {"matrix": [3, 9], "x": 11.75, "y": 3},
+                {"matrix": [3, 10], "x": 12.75, "y": 3},
+                {"matrix": [3, 11], "x": 13.75, "y": 3},
+                {"matrix": [3, 12], "x": 14.75, "y": 3},
+                {"matrix": [3, 13], "x": 15.75, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 17.5, "y": 3},
+
+                {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 2], "x": 4.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 5.75, "y": 4, "w": 2.25},
+                {"matrix": [4, 6], "x": 8, "y": 4, "w": 1.25},
+                {"matrix": [4, 8], "x": 9.75, "y": 4, "w": 2.75},
+                {"matrix": [4, 10], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 14], "x": 17, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_alice_full_rshift": {
+            "layout": [
+                {"matrix": [3, 1], "x": 0, "y": 0},
+
+                {"matrix": [0, 0], "x": 1.5, "y": 0},
+                {"matrix": [0, 1], "x": 2.5, "y": 0},
+                {"matrix": [0, 2], "x": 3.5, "y": 0},
+                {"matrix": [0, 3], "x": 4.5, "y": 0},
+                {"matrix": [0, 4], "x": 5.5, "y": 0},
+                {"matrix": [0, 5], "x": 6.5, "y": 0},
+                {"matrix": [0, 6], "x": 7.5, "y": 0},
+                {"matrix": [0, 7], "x": 10.5, "y": 0},
+                {"matrix": [0, 8], "x": 11.5, "y": 0},
+                {"matrix": [0, 9], "x": 12.5, "y": 0},
+                {"matrix": [0, 10], "x": 13.5, "y": 0},
+                {"matrix": [0, 11], "x": 14.5, "y": 0},
+                {"matrix": [0, 12], "x": 15.5, "y": 0},
+                {"matrix": [0, 13], "x": 16.5, "y": 0, "w": 2},
+
+                {"matrix": [4, 1], "x": 0, "y": 1},
+
+                {"matrix": [1, 0], "x": 1.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 3, "y": 1},
+                {"matrix": [1, 2], "x": 4, "y": 1},
+                {"matrix": [1, 3], "x": 5, "y": 1},
+                {"matrix": [1, 4], "x": 6, "y": 1},
+                {"matrix": [1, 5], "x": 7, "y": 1},
+                {"matrix": [1, 6], "x": 10, "y": 1},
+                {"matrix": [1, 7], "x": 11, "y": 1},
+                {"matrix": [1, 8], "x": 12, "y": 1},
+                {"matrix": [1, 9], "x": 13, "y": 1},
+                {"matrix": [1, 10], "x": 14, "y": 1},
+                {"matrix": [1, 11], "x": 15, "y": 1},
+                {"matrix": [1, 12], "x": 16, "y": 1},
+                {"matrix": [1, 13], "x": 17, "y": 1, "w": 1.5},
+
+                {"matrix": [4, 3], "x": 0, "y": 2},
+
+                {"matrix": [2, 0], "x": 1.5, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 3.25, "y": 2},
+                {"matrix": [2, 2], "x": 4.25, "y": 2},
+                {"matrix": [2, 3], "x": 5.25, "y": 2},
+                {"matrix": [2, 4], "x": 6.25, "y": 2},
+                {"matrix": [2, 5], "x": 7.25, "y": 2},
+                {"matrix": [2, 6], "x": 10.25, "y": 2},
+                {"matrix": [2, 7], "x": 11.25, "y": 2},
+                {"matrix": [2, 8], "x": 12.25, "y": 2},
+                {"matrix": [2, 9], "x": 13.25, "y": 2},
+                {"matrix": [2, 10], "x": 14.25, "y": 2},
+                {"matrix": [2, 11], "x": 15.25, "y": 2},
+                {"matrix": [2, 13], "x": 16.25, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 1.5, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 3.75, "y": 3},
+                {"matrix": [3, 3], "x": 4.75, "y": 3},
+                {"matrix": [3, 4], "x": 5.75, "y": 3},
+                {"matrix": [3, 5], "x": 6.75, "y": 3},
+                {"matrix": [3, 6], "x": 7.75, "y": 3},
+                {"matrix": [3, 7], "x": 9.75, "y": 3},
+                {"matrix": [3, 8], "x": 10.75, "y": 3},
+                {"matrix": [3, 9], "x": 11.75, "y": 3},
+                {"matrix": [3, 10], "x": 12.75, "y": 3},
+                {"matrix": [3, 11], "x": 13.75, "y": 3},
+                {"matrix": [3, 12], "x": 14.75, "y": 3},
+                {"matrix": [3, 13], "x": 15.75, "y": 3, "w": 2.75},
+
+                {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 2], "x": 4.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 5.75, "y": 4, "w": 2.25},
+                {"matrix": [4, 6], "x": 8, "y": 4, "w": 1.25},
+                {"matrix": [4, 8], "x": 9.75, "y": 4, "w": 2.75},
+                {"matrix": [4, 10], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 14], "x": 17, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_alice_split_bs": {
+            "layout": [
+                {"matrix": [3, 1], "x": 0, "y": 0},
+
+                {"matrix": [0, 0], "x": 1.5, "y": 0},
+                {"matrix": [0, 1], "x": 2.5, "y": 0},
+                {"matrix": [0, 2], "x": 3.5, "y": 0},
+                {"matrix": [0, 3], "x": 4.5, "y": 0},
+                {"matrix": [0, 4], "x": 5.5, "y": 0},
+                {"matrix": [0, 5], "x": 6.5, "y": 0},
+                {"matrix": [0, 6], "x": 7.5, "y": 0},
+                {"matrix": [0, 7], "x": 10.5, "y": 0},
+                {"matrix": [0, 8], "x": 11.5, "y": 0},
+                {"matrix": [0, 9], "x": 12.5, "y": 0},
+                {"matrix": [0, 10], "x": 13.5, "y": 0},
+                {"matrix": [0, 11], "x": 14.5, "y": 0},
+                {"matrix": [0, 12], "x": 15.5, "y": 0},
+                {"matrix": [0, 13], "x": 16.5, "y": 0},
+                {"matrix": [0, 14], "x": 17.5, "y": 0},
+
+                {"matrix": [4, 1], "x": 0, "y": 1},
+
+                {"matrix": [1, 0], "x": 1.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 3, "y": 1},
+                {"matrix": [1, 2], "x": 4, "y": 1},
+                {"matrix": [1, 3], "x": 5, "y": 1},
+                {"matrix": [1, 4], "x": 6, "y": 1},
+                {"matrix": [1, 5], "x": 7, "y": 1},
+                {"matrix": [1, 6], "x": 10, "y": 1},
+                {"matrix": [1, 7], "x": 11, "y": 1},
+                {"matrix": [1, 8], "x": 12, "y": 1},
+                {"matrix": [1, 9], "x": 13, "y": 1},
+                {"matrix": [1, 10], "x": 14, "y": 1},
+                {"matrix": [1, 11], "x": 15, "y": 1},
+                {"matrix": [1, 12], "x": 16, "y": 1},
+                {"matrix": [1, 13], "x": 17, "y": 1, "w": 1.5},
+
+                {"matrix": [4, 3], "x": 0, "y": 2},
+
+                {"matrix": [2, 0], "x": 1.5, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 3.25, "y": 2},
+                {"matrix": [2, 2], "x": 4.25, "y": 2},
+                {"matrix": [2, 3], "x": 5.25, "y": 2},
+                {"matrix": [2, 4], "x": 6.25, "y": 2},
+                {"matrix": [2, 5], "x": 7.25, "y": 2},
+                {"matrix": [2, 6], "x": 10.25, "y": 2},
+                {"matrix": [2, 7], "x": 11.25, "y": 2},
+                {"matrix": [2, 8], "x": 12.25, "y": 2},
+                {"matrix": [2, 9], "x": 13.25, "y": 2},
+                {"matrix": [2, 10], "x": 14.25, "y": 2},
+                {"matrix": [2, 11], "x": 15.25, "y": 2},
+                {"matrix": [2, 13], "x": 16.25, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 1.5, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 3.75, "y": 3},
+                {"matrix": [3, 3], "x": 4.75, "y": 3},
+                {"matrix": [3, 4], "x": 5.75, "y": 3},
+                {"matrix": [3, 5], "x": 6.75, "y": 3},
+                {"matrix": [3, 6], "x": 7.75, "y": 3},
+                {"matrix": [3, 7], "x": 9.75, "y": 3},
+                {"matrix": [3, 8], "x": 10.75, "y": 3},
+                {"matrix": [3, 9], "x": 11.75, "y": 3},
+                {"matrix": [3, 10], "x": 12.75, "y": 3},
+                {"matrix": [3, 11], "x": 13.75, "y": 3},
+                {"matrix": [3, 12], "x": 14.75, "y": 3},
+                {"matrix": [3, 13], "x": 15.75, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 17.5, "y": 3},
+
+                {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 2], "x": 4.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 5.75, "y": 4, "w": 2.25},
+                {"matrix": [4, 6], "x": 8, "y": 4, "w": 1.25},
+                {"matrix": [4, 8], "x": 9.75, "y": 4, "w": 2.75},
+                {"matrix": [4, 10], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 14], "x": 17, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_alice_split_bs_full_rshift": {
+            "layout": [
+                {"matrix": [3, 1], "x": 0, "y": 0},
+
+                {"matrix": [0, 0], "x": 1.5, "y": 0},
+                {"matrix": [0, 1], "x": 2.5, "y": 0},
+                {"matrix": [0, 2], "x": 3.5, "y": 0},
+                {"matrix": [0, 3], "x": 4.5, "y": 0},
+                {"matrix": [0, 4], "x": 5.5, "y": 0},
+                {"matrix": [0, 5], "x": 6.5, "y": 0},
+                {"matrix": [0, 6], "x": 7.5, "y": 0},
+                {"matrix": [0, 7], "x": 10.5, "y": 0},
+                {"matrix": [0, 8], "x": 11.5, "y": 0},
+                {"matrix": [0, 9], "x": 12.5, "y": 0},
+                {"matrix": [0, 10], "x": 13.5, "y": 0},
+                {"matrix": [0, 11], "x": 14.5, "y": 0},
+                {"matrix": [0, 12], "x": 15.5, "y": 0},
+                {"matrix": [0, 13], "x": 16.5, "y": 0},
+                {"matrix": [0, 14], "x": 17.5, "y": 0},
+
+                {"matrix": [4, 1], "x": 0, "y": 1},
+
+                {"matrix": [1, 0], "x": 1.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 3, "y": 1},
+                {"matrix": [1, 2], "x": 4, "y": 1},
+                {"matrix": [1, 3], "x": 5, "y": 1},
+                {"matrix": [1, 4], "x": 6, "y": 1},
+                {"matrix": [1, 5], "x": 7, "y": 1},
+                {"matrix": [1, 6], "x": 10, "y": 1},
+                {"matrix": [1, 7], "x": 11, "y": 1},
+                {"matrix": [1, 8], "x": 12, "y": 1},
+                {"matrix": [1, 9], "x": 13, "y": 1},
+                {"matrix": [1, 10], "x": 14, "y": 1},
+                {"matrix": [1, 11], "x": 15, "y": 1},
+                {"matrix": [1, 12], "x": 16, "y": 1},
+                {"matrix": [1, 13], "x": 17, "y": 1, "w": 1.5},
+
+                {"matrix": [4, 3], "x": 0, "y": 2},
+
+                {"matrix": [2, 0], "x": 1.5, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 3.25, "y": 2},
+                {"matrix": [2, 2], "x": 4.25, "y": 2},
+                {"matrix": [2, 3], "x": 5.25, "y": 2},
+                {"matrix": [2, 4], "x": 6.25, "y": 2},
+                {"matrix": [2, 5], "x": 7.25, "y": 2},
+                {"matrix": [2, 6], "x": 10.25, "y": 2},
+                {"matrix": [2, 7], "x": 11.25, "y": 2},
+                {"matrix": [2, 8], "x": 12.25, "y": 2},
+                {"matrix": [2, 9], "x": 13.25, "y": 2},
+                {"matrix": [2, 10], "x": 14.25, "y": 2},
+                {"matrix": [2, 11], "x": 15.25, "y": 2},
+                {"matrix": [2, 13], "x": 16.25, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 1.5, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 3.75, "y": 3},
+                {"matrix": [3, 3], "x": 4.75, "y": 3},
+                {"matrix": [3, 4], "x": 5.75, "y": 3},
+                {"matrix": [3, 5], "x": 6.75, "y": 3},
+                {"matrix": [3, 6], "x": 7.75, "y": 3},
+                {"matrix": [3, 7], "x": 9.75, "y": 3},
+                {"matrix": [3, 8], "x": 10.75, "y": 3},
+                {"matrix": [3, 9], "x": 11.75, "y": 3},
+                {"matrix": [3, 10], "x": 12.75, "y": 3},
+                {"matrix": [3, 11], "x": 13.75, "y": 3},
+                {"matrix": [3, 12], "x": 14.75, "y": 3},
+                {"matrix": [3, 13], "x": 15.75, "y": 3, "w": 2.75},
+
+                {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 2], "x": 4.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 5.75, "y": 4, "w": 2.25},
+                {"matrix": [4, 6], "x": 8, "y": 4, "w": 1.25},
+                {"matrix": [4, 8], "x": 9.75, "y": 4, "w": 2.75},
+                {"matrix": [4, 10], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 14], "x": 17, "y": 4, "w": 1.5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/mechlovin/adelais/rgb_led/rev3/rules.mk b/keyboards/mechlovin/adelais/rgb_led/rev3/rules.mk
deleted file mode 100644
index e144301381d..00000000000
--- a/keyboards/mechlovin/adelais/rgb_led/rev3/rules.mk
+++ /dev/null
@@ -1,8 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-RGB_MATRIX_ENABLE = yes
-RGBLIGHT_ENABLE = yes
-ENCODER_ENABLE = yes
-CONSOLE_ENABLE = no        # Console for debug
-COMMAND_ENABLE = no        # Commands for debug and configuration
diff --git a/keyboards/mechlovin/adelais/rgb_led/rules.mk b/keyboards/mechlovin/adelais/rgb_led/rules.mk
index 8a9bdd433d6..18047f12c7e 100644
--- a/keyboards/mechlovin/adelais/rgb_led/rules.mk
+++ b/keyboards/mechlovin/adelais/rgb_led/rules.mk
@@ -1,3 +1 @@
-
-
-DEFAULT_FOLDER = mechlovin/adelais/rgb_led/rev1
\ No newline at end of file
+DEFAULT_FOLDER = mechlovin/adelais/rgb_led/rev1
diff --git a/keyboards/mechlovin/adelais/standard_led/arm/rev2/keyboard.json b/keyboards/mechlovin/adelais/standard_led/arm/rev2/keyboard.json
index 9a2a280c10b..53005dfa339 100644
--- a/keyboards/mechlovin/adelais/standard_led/arm/rev2/keyboard.json
+++ b/keyboards/mechlovin/adelais/standard_led/arm/rev2/keyboard.json
@@ -2,6 +2,16 @@
     "usb": {
         "pid": "0xAD01"
     },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "console": true,
+        "command": true,
+        "nkro": true,
+        "backlight": true,
+        "rgblight": true
+    },
     "processor": "STM32F303",
     "board": "QMK_PROTON_C",
     "bootloader": "stm32-dfu",
diff --git a/keyboards/mechlovin/adelais/standard_led/arm/rev3/info.json b/keyboards/mechlovin/adelais/standard_led/arm/rev3/info.json
deleted file mode 100644
index 46907dc7a9d..00000000000
--- a/keyboards/mechlovin/adelais/standard_led/arm/rev3/info.json
+++ /dev/null
@@ -1,343 +0,0 @@
-{
-    "usb": {
-        "pid": "0xAD02"
-    },
-    "encoder": {
-        "rotary": [
-            {"pin_a": "A6", "pin_b": "A5"},
-            {"pin_a": "A4", "pin_b": "A3"},
-            {"pin_a": "B7", "pin_b": "B6"}
-        ]
-    },
-    "qmk": {
-        "tap_keycode_delay": 10
-    },
-    "processor": "STM32F303",
-    "board": "QMK_PROTON_C",
-    "bootloader": "stm32-dfu",
-    "layout_aliases": {
-        "LAYOUT_all": "LAYOUT_alice_split_bs"
-    },
-    "layouts": {
-        "LAYOUT_alice": {
-            "layout": [
-                {"matrix": [1, 14], "x": 0, "y": 0},
-
-                {"matrix": [0, 0], "x": 1.5, "y": 0},
-                {"matrix": [0, 1], "x": 2.5, "y": 0},
-                {"matrix": [0, 2], "x": 3.5, "y": 0},
-                {"matrix": [0, 3], "x": 4.5, "y": 0},
-                {"matrix": [0, 4], "x": 5.5, "y": 0},
-                {"matrix": [0, 5], "x": 6.5, "y": 0},
-                {"matrix": [0, 6], "x": 7.5, "y": 0},
-
-                {"matrix": [0, 7], "x": 10.5, "y": 0},
-                {"matrix": [0, 8], "x": 11.5, "y": 0},
-                {"matrix": [0, 9], "x": 12.5, "y": 0},
-                {"matrix": [0, 10], "x": 13.5, "y": 0},
-                {"matrix": [0, 11], "x": 14.5, "y": 0},
-                {"matrix": [0, 12], "x": 15.5, "y": 0},
-                {"matrix": [0, 13], "x": 16.5, "y": 0, "w": 2},
-
-                {"matrix": [2, 14], "x": 0, "y": 1},
-
-                {"matrix": [1, 0], "x": 1.5, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 3, "y": 1},
-                {"matrix": [1, 2], "x": 4, "y": 1},
-                {"matrix": [1, 3], "x": 5, "y": 1},
-                {"matrix": [1, 4], "x": 6, "y": 1},
-                {"matrix": [1, 5], "x": 7, "y": 1},
-
-                {"matrix": [1, 6], "x": 10, "y": 1},
-                {"matrix": [1, 7], "x": 11, "y": 1},
-                {"matrix": [1, 8], "x": 12, "y": 1},
-                {"matrix": [1, 9], "x": 13, "y": 1},
-                {"matrix": [1, 10], "x": 14, "y": 1},
-                {"matrix": [1, 11], "x": 15, "y": 1},
-                {"matrix": [1, 12], "x": 16, "y": 1},
-                {"matrix": [1, 13], "x": 17, "y": 1, "w": 1.5},
-
-                {"matrix": [3, 14], "x": 0, "y": 2},
-
-                {"matrix": [2, 0], "x": 1.5, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 3.25, "y": 2},
-                {"matrix": [2, 2], "x": 4.25, "y": 2},
-                {"matrix": [2, 3], "x": 5.25, "y": 2},
-                {"matrix": [2, 4], "x": 6.25, "y": 2},
-                {"matrix": [2, 5], "x": 7.25, "y": 2},
-
-                {"matrix": [2, 6], "x": 10.25, "y": 2},
-                {"matrix": [2, 7], "x": 11.25, "y": 2},
-                {"matrix": [2, 8], "x": 12.25, "y": 2},
-                {"matrix": [2, 9], "x": 13.25, "y": 2},
-                {"matrix": [2, 10], "x": 14.25, "y": 2},
-                {"matrix": [2, 11], "x": 15.25, "y": 2},
-                {"matrix": [2, 13], "x": 16.25, "y": 2, "w": 2.25},
-
-                {"matrix": [3, 0], "x": 1.5, "y": 3, "w": 2.25},
-                {"matrix": [3, 2], "x": 3.75, "y": 3},
-                {"matrix": [3, 3], "x": 4.75, "y": 3},
-                {"matrix": [3, 4], "x": 5.75, "y": 3},
-                {"matrix": [3, 5], "x": 6.75, "y": 3},
-                {"matrix": [3, 6], "x": 7.75, "y": 3},
-
-                {"matrix": [3, 7], "x": 9.75, "y": 3},
-                {"matrix": [3, 8], "x": 10.75, "y": 3},
-                {"matrix": [3, 9], "x": 11.75, "y": 3},
-                {"matrix": [3, 10], "x": 12.75, "y": 3},
-                {"matrix": [3, 11], "x": 13.75, "y": 3},
-                {"matrix": [3, 13], "x": 14.75, "y": 3},
-                {"matrix": [3, 12], "x": 15.75, "y": 3, "w": 1.75},
-                {"matrix": [4, 13], "x": 17.5, "y": 3},
-
-                {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.5},
-                {"matrix": [4, 2], "x": 4.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 4], "x": 5.75, "y": 4, "w": 2.25},
-                {"matrix": [4, 6], "x": 8, "y": 4, "w": 1.25},
-                {"matrix": [4, 8], "x": 9.75, "y": 4, "w": 2.75},
-                {"matrix": [4, 10], "x": 12.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 14], "x": 17, "y": 4, "w": 1.5}
-            ]
-        },
-        "LAYOUT_alice_full_rshift": {
-            "layout": [
-                {"matrix": [1, 14], "x": 0, "y": 0},
-
-                {"matrix": [0, 0], "x": 1.5, "y": 0},
-                {"matrix": [0, 1], "x": 2.5, "y": 0},
-                {"matrix": [0, 2], "x": 3.5, "y": 0},
-                {"matrix": [0, 3], "x": 4.5, "y": 0},
-                {"matrix": [0, 4], "x": 5.5, "y": 0},
-                {"matrix": [0, 5], "x": 6.5, "y": 0},
-                {"matrix": [0, 6], "x": 7.5, "y": 0},
-
-                {"matrix": [0, 7], "x": 10.5, "y": 0},
-                {"matrix": [0, 8], "x": 11.5, "y": 0},
-                {"matrix": [0, 9], "x": 12.5, "y": 0},
-                {"matrix": [0, 10], "x": 13.5, "y": 0},
-                {"matrix": [0, 11], "x": 14.5, "y": 0},
-                {"matrix": [0, 12], "x": 15.5, "y": 0},
-                {"matrix": [0, 13], "x": 16.5, "y": 0, "w": 2},
-
-                {"matrix": [2, 14], "x": 0, "y": 1},
-
-                {"matrix": [1, 0], "x": 1.5, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 3, "y": 1},
-                {"matrix": [1, 2], "x": 4, "y": 1},
-                {"matrix": [1, 3], "x": 5, "y": 1},
-                {"matrix": [1, 4], "x": 6, "y": 1},
-                {"matrix": [1, 5], "x": 7, "y": 1},
-
-                {"matrix": [1, 6], "x": 10, "y": 1},
-                {"matrix": [1, 7], "x": 11, "y": 1},
-                {"matrix": [1, 8], "x": 12, "y": 1},
-                {"matrix": [1, 9], "x": 13, "y": 1},
-                {"matrix": [1, 10], "x": 14, "y": 1},
-                {"matrix": [1, 11], "x": 15, "y": 1},
-                {"matrix": [1, 12], "x": 16, "y": 1},
-                {"matrix": [1, 13], "x": 17, "y": 1, "w": 1.5},
-
-                {"matrix": [3, 14], "x": 0, "y": 2},
-
-                {"matrix": [2, 0], "x": 1.5, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 3.25, "y": 2},
-                {"matrix": [2, 2], "x": 4.25, "y": 2},
-                {"matrix": [2, 3], "x": 5.25, "y": 2},
-                {"matrix": [2, 4], "x": 6.25, "y": 2},
-                {"matrix": [2, 5], "x": 7.25, "y": 2},
-
-                {"matrix": [2, 6], "x": 10.25, "y": 2},
-                {"matrix": [2, 7], "x": 11.25, "y": 2},
-                {"matrix": [2, 8], "x": 12.25, "y": 2},
-                {"matrix": [2, 9], "x": 13.25, "y": 2},
-                {"matrix": [2, 10], "x": 14.25, "y": 2},
-                {"matrix": [2, 11], "x": 15.25, "y": 2},
-                {"matrix": [2, 13], "x": 16.25, "y": 2, "w": 2.25},
-
-                {"matrix": [3, 0], "x": 1.5, "y": 3, "w": 2.25},
-                {"matrix": [3, 2], "x": 3.75, "y": 3},
-                {"matrix": [3, 3], "x": 4.75, "y": 3},
-                {"matrix": [3, 4], "x": 5.75, "y": 3},
-                {"matrix": [3, 5], "x": 6.75, "y": 3},
-                {"matrix": [3, 6], "x": 7.75, "y": 3},
-
-                {"matrix": [3, 7], "x": 9.75, "y": 3},
-                {"matrix": [3, 8], "x": 10.75, "y": 3},
-                {"matrix": [3, 9], "x": 11.75, "y": 3},
-                {"matrix": [3, 10], "x": 12.75, "y": 3},
-                {"matrix": [3, 11], "x": 13.75, "y": 3},
-                {"matrix": [3, 13], "x": 14.75, "y": 3},
-                {"matrix": [3, 12], "x": 15.75, "y": 3, "w": 2.75},
-
-                {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.5},
-                {"matrix": [4, 2], "x": 4.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 4], "x": 5.75, "y": 4, "w": 2.25},
-                {"matrix": [4, 6], "x": 8, "y": 4, "w": 1.25},
-                {"matrix": [4, 8], "x": 9.75, "y": 4, "w": 2.75},
-                {"matrix": [4, 10], "x": 12.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 14], "x": 17, "y": 4, "w": 1.5}
-            ]
-        },
-        "LAYOUT_alice_split_bs": {
-            "layout": [
-                {"matrix": [1, 14], "x": 0, "y": 0},
-
-                {"matrix": [0, 0], "x": 1.5, "y": 0},
-                {"matrix": [0, 1], "x": 2.5, "y": 0},
-                {"matrix": [0, 2], "x": 3.5, "y": 0},
-                {"matrix": [0, 3], "x": 4.5, "y": 0},
-                {"matrix": [0, 4], "x": 5.5, "y": 0},
-                {"matrix": [0, 5], "x": 6.5, "y": 0},
-                {"matrix": [0, 6], "x": 7.5, "y": 0},
-
-                {"matrix": [0, 7], "x": 10.5, "y": 0},
-                {"matrix": [0, 8], "x": 11.5, "y": 0},
-                {"matrix": [0, 9], "x": 12.5, "y": 0},
-                {"matrix": [0, 10], "x": 13.5, "y": 0},
-                {"matrix": [0, 11], "x": 14.5, "y": 0},
-                {"matrix": [0, 12], "x": 15.5, "y": 0},
-                {"matrix": [0, 13], "x": 16.5, "y": 0},
-                {"matrix": [0, 14], "x": 17.5, "y": 0},
-
-                {"matrix": [2, 14], "x": 0, "y": 1},
-
-                {"matrix": [1, 0], "x": 1.5, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 3, "y": 1},
-                {"matrix": [1, 2], "x": 4, "y": 1},
-                {"matrix": [1, 3], "x": 5, "y": 1},
-                {"matrix": [1, 4], "x": 6, "y": 1},
-                {"matrix": [1, 5], "x": 7, "y": 1},
-
-                {"matrix": [1, 6], "x": 10, "y": 1},
-                {"matrix": [1, 7], "x": 11, "y": 1},
-                {"matrix": [1, 8], "x": 12, "y": 1},
-                {"matrix": [1, 9], "x": 13, "y": 1},
-                {"matrix": [1, 10], "x": 14, "y": 1},
-                {"matrix": [1, 11], "x": 15, "y": 1},
-                {"matrix": [1, 12], "x": 16, "y": 1},
-                {"matrix": [1, 13], "x": 17, "y": 1, "w": 1.5},
-
-                {"matrix": [3, 14], "x": 0, "y": 2},
-
-                {"matrix": [2, 0], "x": 1.5, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 3.25, "y": 2},
-                {"matrix": [2, 2], "x": 4.25, "y": 2},
-                {"matrix": [2, 3], "x": 5.25, "y": 2},
-                {"matrix": [2, 4], "x": 6.25, "y": 2},
-                {"matrix": [2, 5], "x": 7.25, "y": 2},
-
-                {"matrix": [2, 6], "x": 10.25, "y": 2},
-                {"matrix": [2, 7], "x": 11.25, "y": 2},
-                {"matrix": [2, 8], "x": 12.25, "y": 2},
-                {"matrix": [2, 9], "x": 13.25, "y": 2},
-                {"matrix": [2, 10], "x": 14.25, "y": 2},
-                {"matrix": [2, 11], "x": 15.25, "y": 2},
-                {"matrix": [2, 13], "x": 16.25, "y": 2, "w": 2.25},
-
-                {"matrix": [3, 0], "x": 1.5, "y": 3, "w": 2.25},
-                {"matrix": [3, 2], "x": 3.75, "y": 3},
-                {"matrix": [3, 3], "x": 4.75, "y": 3},
-                {"matrix": [3, 4], "x": 5.75, "y": 3},
-                {"matrix": [3, 5], "x": 6.75, "y": 3},
-                {"matrix": [3, 6], "x": 7.75, "y": 3},
-
-                {"matrix": [3, 7], "x": 9.75, "y": 3},
-                {"matrix": [3, 8], "x": 10.75, "y": 3},
-                {"matrix": [3, 9], "x": 11.75, "y": 3},
-                {"matrix": [3, 10], "x": 12.75, "y": 3},
-                {"matrix": [3, 11], "x": 13.75, "y": 3},
-                {"matrix": [3, 13], "x": 14.75, "y": 3},
-                {"matrix": [3, 12], "x": 15.75, "y": 3, "w": 1.75},
-                {"matrix": [4, 13], "x": 17.5, "y": 3},
-
-                {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.5},
-                {"matrix": [4, 2], "x": 4.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 4], "x": 5.75, "y": 4, "w": 2.25},
-                {"matrix": [4, 6], "x": 8, "y": 4, "w": 1.25},
-                {"matrix": [4, 8], "x": 9.75, "y": 4, "w": 2.75},
-                {"matrix": [4, 10], "x": 12.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 14], "x": 17, "y": 4, "w": 1.5}
-            ]
-        },
-        "LAYOUT_alice_split_bs_full_rshift": {
-            "layout": [
-                {"matrix": [1, 14], "x": 0, "y": 0},
-
-                {"matrix": [0, 0], "x": 1.5, "y": 0},
-                {"matrix": [0, 1], "x": 2.5, "y": 0},
-                {"matrix": [0, 2], "x": 3.5, "y": 0},
-                {"matrix": [0, 3], "x": 4.5, "y": 0},
-                {"matrix": [0, 4], "x": 5.5, "y": 0},
-                {"matrix": [0, 5], "x": 6.5, "y": 0},
-                {"matrix": [0, 6], "x": 7.5, "y": 0},
-
-                {"matrix": [0, 7], "x": 10.5, "y": 0},
-                {"matrix": [0, 8], "x": 11.5, "y": 0},
-                {"matrix": [0, 9], "x": 12.5, "y": 0},
-                {"matrix": [0, 10], "x": 13.5, "y": 0},
-                {"matrix": [0, 11], "x": 14.5, "y": 0},
-                {"matrix": [0, 12], "x": 15.5, "y": 0},
-                {"matrix": [0, 13], "x": 16.5, "y": 0},
-                {"matrix": [0, 14], "x": 17.5, "y": 0},
-
-                {"matrix": [2, 14], "x": 0, "y": 1},
-
-                {"matrix": [1, 0], "x": 1.5, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 3, "y": 1},
-                {"matrix": [1, 2], "x": 4, "y": 1},
-                {"matrix": [1, 3], "x": 5, "y": 1},
-                {"matrix": [1, 4], "x": 6, "y": 1},
-                {"matrix": [1, 5], "x": 7, "y": 1},
-
-                {"matrix": [1, 6], "x": 10, "y": 1},
-                {"matrix": [1, 7], "x": 11, "y": 1},
-                {"matrix": [1, 8], "x": 12, "y": 1},
-                {"matrix": [1, 9], "x": 13, "y": 1},
-                {"matrix": [1, 10], "x": 14, "y": 1},
-                {"matrix": [1, 11], "x": 15, "y": 1},
-                {"matrix": [1, 12], "x": 16, "y": 1},
-                {"matrix": [1, 13], "x": 17, "y": 1, "w": 1.5},
-
-                {"matrix": [3, 14], "x": 0, "y": 2},
-
-                {"matrix": [2, 0], "x": 1.5, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 3.25, "y": 2},
-                {"matrix": [2, 2], "x": 4.25, "y": 2},
-                {"matrix": [2, 3], "x": 5.25, "y": 2},
-                {"matrix": [2, 4], "x": 6.25, "y": 2},
-                {"matrix": [2, 5], "x": 7.25, "y": 2},
-
-                {"matrix": [2, 6], "x": 10.25, "y": 2},
-                {"matrix": [2, 7], "x": 11.25, "y": 2},
-                {"matrix": [2, 8], "x": 12.25, "y": 2},
-                {"matrix": [2, 9], "x": 13.25, "y": 2},
-                {"matrix": [2, 10], "x": 14.25, "y": 2},
-                {"matrix": [2, 11], "x": 15.25, "y": 2},
-                {"matrix": [2, 13], "x": 16.25, "y": 2, "w": 2.25},
-
-                {"matrix": [3, 0], "x": 1.5, "y": 3, "w": 2.25},
-                {"matrix": [3, 2], "x": 3.75, "y": 3},
-                {"matrix": [3, 3], "x": 4.75, "y": 3},
-                {"matrix": [3, 4], "x": 5.75, "y": 3},
-                {"matrix": [3, 5], "x": 6.75, "y": 3},
-                {"matrix": [3, 6], "x": 7.75, "y": 3},
-
-                {"matrix": [3, 7], "x": 9.75, "y": 3},
-                {"matrix": [3, 8], "x": 10.75, "y": 3},
-                {"matrix": [3, 9], "x": 11.75, "y": 3},
-                {"matrix": [3, 10], "x": 12.75, "y": 3},
-                {"matrix": [3, 11], "x": 13.75, "y": 3},
-                {"matrix": [3, 13], "x": 14.75, "y": 3},
-                {"matrix": [3, 12], "x": 15.75, "y": 3, "w": 2.75},
-
-                {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.5},
-                {"matrix": [4, 2], "x": 4.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 4], "x": 5.75, "y": 4, "w": 2.25},
-                {"matrix": [4, 6], "x": 8, "y": 4, "w": 1.25},
-                {"matrix": [4, 8], "x": 9.75, "y": 4, "w": 2.75},
-                {"matrix": [4, 10], "x": 12.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 14], "x": 17, "y": 4, "w": 1.5}
-            ]
-        }
-    }
-}
diff --git a/keyboards/mechlovin/adelais/standard_led/arm/rev3/keyboard.json b/keyboards/mechlovin/adelais/standard_led/arm/rev3/keyboard.json
new file mode 100644
index 00000000000..11295007902
--- /dev/null
+++ b/keyboards/mechlovin/adelais/standard_led/arm/rev3/keyboard.json
@@ -0,0 +1,354 @@
+{
+    "usb": {
+        "pid": "0xAD02"
+    },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "console": true,
+        "command": true,
+        "nkro": true,
+        "backlight": true,
+        "rgblight": true,
+        "encoder": true
+    },
+    "encoder": {
+        "rotary": [
+            {"pin_a": "A6", "pin_b": "A5"},
+            {"pin_a": "A4", "pin_b": "A3"},
+            {"pin_a": "B7", "pin_b": "B6"}
+        ]
+    },
+    "qmk": {
+        "tap_keycode_delay": 10
+    },
+    "processor": "STM32F303",
+    "board": "QMK_PROTON_C",
+    "bootloader": "stm32-dfu",
+    "layout_aliases": {
+        "LAYOUT_all": "LAYOUT_alice_split_bs"
+    },
+    "layouts": {
+        "LAYOUT_alice": {
+            "layout": [
+                {"matrix": [1, 14], "x": 0, "y": 0},
+
+                {"matrix": [0, 0], "x": 1.5, "y": 0},
+                {"matrix": [0, 1], "x": 2.5, "y": 0},
+                {"matrix": [0, 2], "x": 3.5, "y": 0},
+                {"matrix": [0, 3], "x": 4.5, "y": 0},
+                {"matrix": [0, 4], "x": 5.5, "y": 0},
+                {"matrix": [0, 5], "x": 6.5, "y": 0},
+                {"matrix": [0, 6], "x": 7.5, "y": 0},
+
+                {"matrix": [0, 7], "x": 10.5, "y": 0},
+                {"matrix": [0, 8], "x": 11.5, "y": 0},
+                {"matrix": [0, 9], "x": 12.5, "y": 0},
+                {"matrix": [0, 10], "x": 13.5, "y": 0},
+                {"matrix": [0, 11], "x": 14.5, "y": 0},
+                {"matrix": [0, 12], "x": 15.5, "y": 0},
+                {"matrix": [0, 13], "x": 16.5, "y": 0, "w": 2},
+
+                {"matrix": [2, 14], "x": 0, "y": 1},
+
+                {"matrix": [1, 0], "x": 1.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 3, "y": 1},
+                {"matrix": [1, 2], "x": 4, "y": 1},
+                {"matrix": [1, 3], "x": 5, "y": 1},
+                {"matrix": [1, 4], "x": 6, "y": 1},
+                {"matrix": [1, 5], "x": 7, "y": 1},
+
+                {"matrix": [1, 6], "x": 10, "y": 1},
+                {"matrix": [1, 7], "x": 11, "y": 1},
+                {"matrix": [1, 8], "x": 12, "y": 1},
+                {"matrix": [1, 9], "x": 13, "y": 1},
+                {"matrix": [1, 10], "x": 14, "y": 1},
+                {"matrix": [1, 11], "x": 15, "y": 1},
+                {"matrix": [1, 12], "x": 16, "y": 1},
+                {"matrix": [1, 13], "x": 17, "y": 1, "w": 1.5},
+
+                {"matrix": [3, 14], "x": 0, "y": 2},
+
+                {"matrix": [2, 0], "x": 1.5, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 3.25, "y": 2},
+                {"matrix": [2, 2], "x": 4.25, "y": 2},
+                {"matrix": [2, 3], "x": 5.25, "y": 2},
+                {"matrix": [2, 4], "x": 6.25, "y": 2},
+                {"matrix": [2, 5], "x": 7.25, "y": 2},
+
+                {"matrix": [2, 6], "x": 10.25, "y": 2},
+                {"matrix": [2, 7], "x": 11.25, "y": 2},
+                {"matrix": [2, 8], "x": 12.25, "y": 2},
+                {"matrix": [2, 9], "x": 13.25, "y": 2},
+                {"matrix": [2, 10], "x": 14.25, "y": 2},
+                {"matrix": [2, 11], "x": 15.25, "y": 2},
+                {"matrix": [2, 13], "x": 16.25, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 1.5, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 3.75, "y": 3},
+                {"matrix": [3, 3], "x": 4.75, "y": 3},
+                {"matrix": [3, 4], "x": 5.75, "y": 3},
+                {"matrix": [3, 5], "x": 6.75, "y": 3},
+                {"matrix": [3, 6], "x": 7.75, "y": 3},
+
+                {"matrix": [3, 7], "x": 9.75, "y": 3},
+                {"matrix": [3, 8], "x": 10.75, "y": 3},
+                {"matrix": [3, 9], "x": 11.75, "y": 3},
+                {"matrix": [3, 10], "x": 12.75, "y": 3},
+                {"matrix": [3, 11], "x": 13.75, "y": 3},
+                {"matrix": [3, 13], "x": 14.75, "y": 3},
+                {"matrix": [3, 12], "x": 15.75, "y": 3, "w": 1.75},
+                {"matrix": [4, 13], "x": 17.5, "y": 3},
+
+                {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 2], "x": 4.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 5.75, "y": 4, "w": 2.25},
+                {"matrix": [4, 6], "x": 8, "y": 4, "w": 1.25},
+                {"matrix": [4, 8], "x": 9.75, "y": 4, "w": 2.75},
+                {"matrix": [4, 10], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 14], "x": 17, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_alice_full_rshift": {
+            "layout": [
+                {"matrix": [1, 14], "x": 0, "y": 0},
+
+                {"matrix": [0, 0], "x": 1.5, "y": 0},
+                {"matrix": [0, 1], "x": 2.5, "y": 0},
+                {"matrix": [0, 2], "x": 3.5, "y": 0},
+                {"matrix": [0, 3], "x": 4.5, "y": 0},
+                {"matrix": [0, 4], "x": 5.5, "y": 0},
+                {"matrix": [0, 5], "x": 6.5, "y": 0},
+                {"matrix": [0, 6], "x": 7.5, "y": 0},
+
+                {"matrix": [0, 7], "x": 10.5, "y": 0},
+                {"matrix": [0, 8], "x": 11.5, "y": 0},
+                {"matrix": [0, 9], "x": 12.5, "y": 0},
+                {"matrix": [0, 10], "x": 13.5, "y": 0},
+                {"matrix": [0, 11], "x": 14.5, "y": 0},
+                {"matrix": [0, 12], "x": 15.5, "y": 0},
+                {"matrix": [0, 13], "x": 16.5, "y": 0, "w": 2},
+
+                {"matrix": [2, 14], "x": 0, "y": 1},
+
+                {"matrix": [1, 0], "x": 1.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 3, "y": 1},
+                {"matrix": [1, 2], "x": 4, "y": 1},
+                {"matrix": [1, 3], "x": 5, "y": 1},
+                {"matrix": [1, 4], "x": 6, "y": 1},
+                {"matrix": [1, 5], "x": 7, "y": 1},
+
+                {"matrix": [1, 6], "x": 10, "y": 1},
+                {"matrix": [1, 7], "x": 11, "y": 1},
+                {"matrix": [1, 8], "x": 12, "y": 1},
+                {"matrix": [1, 9], "x": 13, "y": 1},
+                {"matrix": [1, 10], "x": 14, "y": 1},
+                {"matrix": [1, 11], "x": 15, "y": 1},
+                {"matrix": [1, 12], "x": 16, "y": 1},
+                {"matrix": [1, 13], "x": 17, "y": 1, "w": 1.5},
+
+                {"matrix": [3, 14], "x": 0, "y": 2},
+
+                {"matrix": [2, 0], "x": 1.5, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 3.25, "y": 2},
+                {"matrix": [2, 2], "x": 4.25, "y": 2},
+                {"matrix": [2, 3], "x": 5.25, "y": 2},
+                {"matrix": [2, 4], "x": 6.25, "y": 2},
+                {"matrix": [2, 5], "x": 7.25, "y": 2},
+
+                {"matrix": [2, 6], "x": 10.25, "y": 2},
+                {"matrix": [2, 7], "x": 11.25, "y": 2},
+                {"matrix": [2, 8], "x": 12.25, "y": 2},
+                {"matrix": [2, 9], "x": 13.25, "y": 2},
+                {"matrix": [2, 10], "x": 14.25, "y": 2},
+                {"matrix": [2, 11], "x": 15.25, "y": 2},
+                {"matrix": [2, 13], "x": 16.25, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 1.5, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 3.75, "y": 3},
+                {"matrix": [3, 3], "x": 4.75, "y": 3},
+                {"matrix": [3, 4], "x": 5.75, "y": 3},
+                {"matrix": [3, 5], "x": 6.75, "y": 3},
+                {"matrix": [3, 6], "x": 7.75, "y": 3},
+
+                {"matrix": [3, 7], "x": 9.75, "y": 3},
+                {"matrix": [3, 8], "x": 10.75, "y": 3},
+                {"matrix": [3, 9], "x": 11.75, "y": 3},
+                {"matrix": [3, 10], "x": 12.75, "y": 3},
+                {"matrix": [3, 11], "x": 13.75, "y": 3},
+                {"matrix": [3, 13], "x": 14.75, "y": 3},
+                {"matrix": [3, 12], "x": 15.75, "y": 3, "w": 2.75},
+
+                {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 2], "x": 4.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 5.75, "y": 4, "w": 2.25},
+                {"matrix": [4, 6], "x": 8, "y": 4, "w": 1.25},
+                {"matrix": [4, 8], "x": 9.75, "y": 4, "w": 2.75},
+                {"matrix": [4, 10], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 14], "x": 17, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_alice_split_bs": {
+            "layout": [
+                {"matrix": [1, 14], "x": 0, "y": 0},
+
+                {"matrix": [0, 0], "x": 1.5, "y": 0},
+                {"matrix": [0, 1], "x": 2.5, "y": 0},
+                {"matrix": [0, 2], "x": 3.5, "y": 0},
+                {"matrix": [0, 3], "x": 4.5, "y": 0},
+                {"matrix": [0, 4], "x": 5.5, "y": 0},
+                {"matrix": [0, 5], "x": 6.5, "y": 0},
+                {"matrix": [0, 6], "x": 7.5, "y": 0},
+
+                {"matrix": [0, 7], "x": 10.5, "y": 0},
+                {"matrix": [0, 8], "x": 11.5, "y": 0},
+                {"matrix": [0, 9], "x": 12.5, "y": 0},
+                {"matrix": [0, 10], "x": 13.5, "y": 0},
+                {"matrix": [0, 11], "x": 14.5, "y": 0},
+                {"matrix": [0, 12], "x": 15.5, "y": 0},
+                {"matrix": [0, 13], "x": 16.5, "y": 0},
+                {"matrix": [0, 14], "x": 17.5, "y": 0},
+
+                {"matrix": [2, 14], "x": 0, "y": 1},
+
+                {"matrix": [1, 0], "x": 1.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 3, "y": 1},
+                {"matrix": [1, 2], "x": 4, "y": 1},
+                {"matrix": [1, 3], "x": 5, "y": 1},
+                {"matrix": [1, 4], "x": 6, "y": 1},
+                {"matrix": [1, 5], "x": 7, "y": 1},
+
+                {"matrix": [1, 6], "x": 10, "y": 1},
+                {"matrix": [1, 7], "x": 11, "y": 1},
+                {"matrix": [1, 8], "x": 12, "y": 1},
+                {"matrix": [1, 9], "x": 13, "y": 1},
+                {"matrix": [1, 10], "x": 14, "y": 1},
+                {"matrix": [1, 11], "x": 15, "y": 1},
+                {"matrix": [1, 12], "x": 16, "y": 1},
+                {"matrix": [1, 13], "x": 17, "y": 1, "w": 1.5},
+
+                {"matrix": [3, 14], "x": 0, "y": 2},
+
+                {"matrix": [2, 0], "x": 1.5, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 3.25, "y": 2},
+                {"matrix": [2, 2], "x": 4.25, "y": 2},
+                {"matrix": [2, 3], "x": 5.25, "y": 2},
+                {"matrix": [2, 4], "x": 6.25, "y": 2},
+                {"matrix": [2, 5], "x": 7.25, "y": 2},
+
+                {"matrix": [2, 6], "x": 10.25, "y": 2},
+                {"matrix": [2, 7], "x": 11.25, "y": 2},
+                {"matrix": [2, 8], "x": 12.25, "y": 2},
+                {"matrix": [2, 9], "x": 13.25, "y": 2},
+                {"matrix": [2, 10], "x": 14.25, "y": 2},
+                {"matrix": [2, 11], "x": 15.25, "y": 2},
+                {"matrix": [2, 13], "x": 16.25, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 1.5, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 3.75, "y": 3},
+                {"matrix": [3, 3], "x": 4.75, "y": 3},
+                {"matrix": [3, 4], "x": 5.75, "y": 3},
+                {"matrix": [3, 5], "x": 6.75, "y": 3},
+                {"matrix": [3, 6], "x": 7.75, "y": 3},
+
+                {"matrix": [3, 7], "x": 9.75, "y": 3},
+                {"matrix": [3, 8], "x": 10.75, "y": 3},
+                {"matrix": [3, 9], "x": 11.75, "y": 3},
+                {"matrix": [3, 10], "x": 12.75, "y": 3},
+                {"matrix": [3, 11], "x": 13.75, "y": 3},
+                {"matrix": [3, 13], "x": 14.75, "y": 3},
+                {"matrix": [3, 12], "x": 15.75, "y": 3, "w": 1.75},
+                {"matrix": [4, 13], "x": 17.5, "y": 3},
+
+                {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 2], "x": 4.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 5.75, "y": 4, "w": 2.25},
+                {"matrix": [4, 6], "x": 8, "y": 4, "w": 1.25},
+                {"matrix": [4, 8], "x": 9.75, "y": 4, "w": 2.75},
+                {"matrix": [4, 10], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 14], "x": 17, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_alice_split_bs_full_rshift": {
+            "layout": [
+                {"matrix": [1, 14], "x": 0, "y": 0},
+
+                {"matrix": [0, 0], "x": 1.5, "y": 0},
+                {"matrix": [0, 1], "x": 2.5, "y": 0},
+                {"matrix": [0, 2], "x": 3.5, "y": 0},
+                {"matrix": [0, 3], "x": 4.5, "y": 0},
+                {"matrix": [0, 4], "x": 5.5, "y": 0},
+                {"matrix": [0, 5], "x": 6.5, "y": 0},
+                {"matrix": [0, 6], "x": 7.5, "y": 0},
+
+                {"matrix": [0, 7], "x": 10.5, "y": 0},
+                {"matrix": [0, 8], "x": 11.5, "y": 0},
+                {"matrix": [0, 9], "x": 12.5, "y": 0},
+                {"matrix": [0, 10], "x": 13.5, "y": 0},
+                {"matrix": [0, 11], "x": 14.5, "y": 0},
+                {"matrix": [0, 12], "x": 15.5, "y": 0},
+                {"matrix": [0, 13], "x": 16.5, "y": 0},
+                {"matrix": [0, 14], "x": 17.5, "y": 0},
+
+                {"matrix": [2, 14], "x": 0, "y": 1},
+
+                {"matrix": [1, 0], "x": 1.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 3, "y": 1},
+                {"matrix": [1, 2], "x": 4, "y": 1},
+                {"matrix": [1, 3], "x": 5, "y": 1},
+                {"matrix": [1, 4], "x": 6, "y": 1},
+                {"matrix": [1, 5], "x": 7, "y": 1},
+
+                {"matrix": [1, 6], "x": 10, "y": 1},
+                {"matrix": [1, 7], "x": 11, "y": 1},
+                {"matrix": [1, 8], "x": 12, "y": 1},
+                {"matrix": [1, 9], "x": 13, "y": 1},
+                {"matrix": [1, 10], "x": 14, "y": 1},
+                {"matrix": [1, 11], "x": 15, "y": 1},
+                {"matrix": [1, 12], "x": 16, "y": 1},
+                {"matrix": [1, 13], "x": 17, "y": 1, "w": 1.5},
+
+                {"matrix": [3, 14], "x": 0, "y": 2},
+
+                {"matrix": [2, 0], "x": 1.5, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 3.25, "y": 2},
+                {"matrix": [2, 2], "x": 4.25, "y": 2},
+                {"matrix": [2, 3], "x": 5.25, "y": 2},
+                {"matrix": [2, 4], "x": 6.25, "y": 2},
+                {"matrix": [2, 5], "x": 7.25, "y": 2},
+
+                {"matrix": [2, 6], "x": 10.25, "y": 2},
+                {"matrix": [2, 7], "x": 11.25, "y": 2},
+                {"matrix": [2, 8], "x": 12.25, "y": 2},
+                {"matrix": [2, 9], "x": 13.25, "y": 2},
+                {"matrix": [2, 10], "x": 14.25, "y": 2},
+                {"matrix": [2, 11], "x": 15.25, "y": 2},
+                {"matrix": [2, 13], "x": 16.25, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 1.5, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 3.75, "y": 3},
+                {"matrix": [3, 3], "x": 4.75, "y": 3},
+                {"matrix": [3, 4], "x": 5.75, "y": 3},
+                {"matrix": [3, 5], "x": 6.75, "y": 3},
+                {"matrix": [3, 6], "x": 7.75, "y": 3},
+
+                {"matrix": [3, 7], "x": 9.75, "y": 3},
+                {"matrix": [3, 8], "x": 10.75, "y": 3},
+                {"matrix": [3, 9], "x": 11.75, "y": 3},
+                {"matrix": [3, 10], "x": 12.75, "y": 3},
+                {"matrix": [3, 11], "x": 13.75, "y": 3},
+                {"matrix": [3, 13], "x": 14.75, "y": 3},
+                {"matrix": [3, 12], "x": 15.75, "y": 3, "w": 2.75},
+
+                {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 2], "x": 4.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 5.75, "y": 4, "w": 2.25},
+                {"matrix": [4, 6], "x": 8, "y": 4, "w": 1.25},
+                {"matrix": [4, 8], "x": 9.75, "y": 4, "w": 2.75},
+                {"matrix": [4, 10], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 14], "x": 17, "y": 4, "w": 1.5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/mechlovin/adelais/standard_led/arm/rev3/rules.mk b/keyboards/mechlovin/adelais/standard_led/arm/rev3/rules.mk
deleted file mode 100644
index 5af1ba85367..00000000000
--- a/keyboards/mechlovin/adelais/standard_led/arm/rev3/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-ENCODER_ENABLE = yes
diff --git a/keyboards/mechlovin/adelais/standard_led/arm/rev4/apm32f103/keyboard.json b/keyboards/mechlovin/adelais/standard_led/arm/rev4/apm32f103/keyboard.json
index cf993be2471..f6b79e35d0d 100644
--- a/keyboards/mechlovin/adelais/standard_led/arm/rev4/apm32f103/keyboard.json
+++ b/keyboards/mechlovin/adelais/standard_led/arm/rev4/apm32f103/keyboard.json
@@ -1,4 +1,15 @@
 {
     "processor": "STM32F103",
-    "bootloader": "stm32duino"
+    "bootloader": "stm32duino",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "console": true,
+        "command": true,
+        "nkro": true,
+        "backlight": true,
+        "rgblight": true,
+        "encoder": true
+    }
 }
diff --git a/keyboards/mechlovin/adelais/standard_led/arm/rev4/info.json b/keyboards/mechlovin/adelais/standard_led/arm/rev4/info.json
index 17cf63fecf3..f0d10942adc 100644
--- a/keyboards/mechlovin/adelais/standard_led/arm/rev4/info.json
+++ b/keyboards/mechlovin/adelais/standard_led/arm/rev4/info.json
@@ -1,13 +1,4 @@
 {
-    "features": {
-        "bootmagic": false,
-        "command": false,
-        "console": false,
-        "encoder": true,
-        "extrakey": false,
-        "mousekey": false,
-        "nkro": false
-    },
     "usb": {
         "pid": "0xAD03"
     },
diff --git a/keyboards/mechlovin/adelais/standard_led/arm/rev4/stm32f303/keyboard.json b/keyboards/mechlovin/adelais/standard_led/arm/rev4/stm32f303/keyboard.json
index 774c3dcf317..9e9748fa93a 100644
--- a/keyboards/mechlovin/adelais/standard_led/arm/rev4/stm32f303/keyboard.json
+++ b/keyboards/mechlovin/adelais/standard_led/arm/rev4/stm32f303/keyboard.json
@@ -1,5 +1,16 @@
 {
     "processor": "STM32F303",
     "board": "QMK_PROTON_C",
-    "bootloader": "stm32-dfu"
+    "bootloader": "stm32-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "console": true,
+        "command": true,
+        "nkro": true,
+        "backlight": true,
+        "rgblight": true,
+        "encoder": true
+    }
 }
diff --git a/keyboards/mechlovin/adelais/standard_led/avr/rev1/info.json b/keyboards/mechlovin/adelais/standard_led/avr/rev1/info.json
deleted file mode 100644
index 95aac7b0d41..00000000000
--- a/keyboards/mechlovin/adelais/standard_led/avr/rev1/info.json
+++ /dev/null
@@ -1,370 +0,0 @@
-{
-    "keyboard_name": "Adelais AVR",
-    "usb": {
-        "pid": "0xAD04"
-    },
-    "encoder": {
-        "rotary": [
-            {"pin_a": "D3", "pin_b": "D2"},
-            {"pin_a": "D5", "pin_b": "B6"},
-            {"pin_a": "C7", "pin_b": "C6"}
-        ]
-    },
-    "qmk": {
-        "tap_keycode_delay": 10
-    },
-    "backlight": {
-        "pin": "B5",
-        "breathing": true
-    },
-    "rgblight": {
-        "led_count": 23,
-        "animations": {
-            "breathing": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "snake": true,
-            "knight": true,
-            "christmas": true,
-            "static_gradient": true,
-            "rgb_test": true,
-            "alternating": true,
-            "twinkle": true
-        }
-    },
-    "ws2812": {
-        "pin": "E2"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "indicators": {
-        "caps_lock": "E6",
-        "num_lock": "D7",
-        "scroll_lock": "F7"
-    },
-    "layout_aliases": {
-        "LAYOUT_all": "LAYOUT_alice_split_bs"
-    },
-    "layouts": {
-        "LAYOUT_alice": {
-            "layout": [
-                {"matrix": [1, 14], "x": 0, "y": 0},
-
-                {"matrix": [0, 0], "x": 1.5, "y": 0},
-                {"matrix": [0, 1], "x": 2.5, "y": 0},
-                {"matrix": [0, 2], "x": 3.5, "y": 0},
-                {"matrix": [0, 3], "x": 4.5, "y": 0},
-                {"matrix": [0, 4], "x": 5.5, "y": 0},
-                {"matrix": [0, 5], "x": 6.5, "y": 0},
-                {"matrix": [0, 6], "x": 7.5, "y": 0},
-
-                {"matrix": [0, 7], "x": 10.5, "y": 0},
-                {"matrix": [0, 8], "x": 11.5, "y": 0},
-                {"matrix": [0, 9], "x": 12.5, "y": 0},
-                {"matrix": [0, 10], "x": 13.5, "y": 0},
-                {"matrix": [0, 11], "x": 14.5, "y": 0},
-                {"matrix": [0, 12], "x": 15.5, "y": 0},
-                {"matrix": [0, 13], "x": 16.5, "y": 0, "w": 2},
-
-                {"matrix": [2, 14], "x": 0, "y": 1},
-
-                {"matrix": [1, 0], "x": 1.5, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 3, "y": 1},
-                {"matrix": [1, 2], "x": 4, "y": 1},
-                {"matrix": [1, 3], "x": 5, "y": 1},
-                {"matrix": [1, 4], "x": 6, "y": 1},
-                {"matrix": [1, 5], "x": 7, "y": 1},
-
-                {"matrix": [1, 6], "x": 10, "y": 1},
-                {"matrix": [1, 7], "x": 11, "y": 1},
-                {"matrix": [1, 8], "x": 12, "y": 1},
-                {"matrix": [1, 9], "x": 13, "y": 1},
-                {"matrix": [1, 10], "x": 14, "y": 1},
-                {"matrix": [1, 11], "x": 15, "y": 1},
-                {"matrix": [1, 12], "x": 16, "y": 1},
-                {"matrix": [1, 13], "x": 17, "y": 1, "w": 1.5},
-
-                {"matrix": [3, 14], "x": 0, "y": 2},
-
-                {"matrix": [2, 0], "x": 1.5, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 3.25, "y": 2},
-                {"matrix": [2, 2], "x": 4.25, "y": 2},
-                {"matrix": [2, 3], "x": 5.25, "y": 2},
-                {"matrix": [2, 4], "x": 6.25, "y": 2},
-                {"matrix": [2, 5], "x": 7.25, "y": 2},
-
-                {"matrix": [2, 6], "x": 10.25, "y": 2},
-                {"matrix": [2, 7], "x": 11.25, "y": 2},
-                {"matrix": [2, 8], "x": 12.25, "y": 2},
-                {"matrix": [2, 9], "x": 13.25, "y": 2},
-                {"matrix": [2, 10], "x": 14.25, "y": 2},
-                {"matrix": [2, 11], "x": 15.25, "y": 2},
-                {"matrix": [2, 13], "x": 16.25, "y": 2, "w": 2.25},
-
-                {"matrix": [3, 0], "x": 1.5, "y": 3, "w": 2.25},
-                {"matrix": [3, 2], "x": 3.75, "y": 3},
-                {"matrix": [3, 3], "x": 4.75, "y": 3},
-                {"matrix": [3, 4], "x": 5.75, "y": 3},
-                {"matrix": [3, 5], "x": 6.75, "y": 3},
-                {"matrix": [3, 6], "x": 7.75, "y": 3},
-
-                {"matrix": [3, 7], "x": 9.75, "y": 3},
-                {"matrix": [3, 8], "x": 10.75, "y": 3},
-                {"matrix": [3, 9], "x": 11.75, "y": 3},
-                {"matrix": [3, 10], "x": 12.75, "y": 3},
-                {"matrix": [3, 11], "x": 13.75, "y": 3},
-                {"matrix": [4, 12], "x": 14.75, "y": 3},
-                {"matrix": [3, 12], "x": 15.75, "y": 3, "w": 1.75},
-                {"matrix": [3, 13], "x": 17.5, "y": 3},
-
-                {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.5},
-                {"matrix": [4, 2], "x": 4.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 4], "x": 5.75, "y": 4, "w": 2.25},
-                {"matrix": [4, 6], "x": 8, "y": 4, "w": 1.25},
-                {"matrix": [4, 8], "x": 9.75, "y": 4, "w": 2.75},
-                {"matrix": [4, 10], "x": 12.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 13], "x": 17, "y": 4, "w": 1.5}
-            ]
-        },
-        "LAYOUT_alice_full_rshift": {
-            "layout": [
-                {"matrix": [1, 14], "x": 0, "y": 0},
-
-                {"matrix": [0, 0], "x": 1.5, "y": 0},
-                {"matrix": [0, 1], "x": 2.5, "y": 0},
-                {"matrix": [0, 2], "x": 3.5, "y": 0},
-                {"matrix": [0, 3], "x": 4.5, "y": 0},
-                {"matrix": [0, 4], "x": 5.5, "y": 0},
-                {"matrix": [0, 5], "x": 6.5, "y": 0},
-                {"matrix": [0, 6], "x": 7.5, "y": 0},
-
-                {"matrix": [0, 7], "x": 10.5, "y": 0},
-                {"matrix": [0, 8], "x": 11.5, "y": 0},
-                {"matrix": [0, 9], "x": 12.5, "y": 0},
-                {"matrix": [0, 10], "x": 13.5, "y": 0},
-                {"matrix": [0, 11], "x": 14.5, "y": 0},
-                {"matrix": [0, 12], "x": 15.5, "y": 0},
-                {"matrix": [0, 13], "x": 16.5, "y": 0, "w": 2},
-
-                {"matrix": [2, 14], "x": 0, "y": 1},
-
-                {"matrix": [1, 0], "x": 1.5, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 3, "y": 1},
-                {"matrix": [1, 2], "x": 4, "y": 1},
-                {"matrix": [1, 3], "x": 5, "y": 1},
-                {"matrix": [1, 4], "x": 6, "y": 1},
-                {"matrix": [1, 5], "x": 7, "y": 1},
-
-                {"matrix": [1, 6], "x": 10, "y": 1},
-                {"matrix": [1, 7], "x": 11, "y": 1},
-                {"matrix": [1, 8], "x": 12, "y": 1},
-                {"matrix": [1, 9], "x": 13, "y": 1},
-                {"matrix": [1, 10], "x": 14, "y": 1},
-                {"matrix": [1, 11], "x": 15, "y": 1},
-                {"matrix": [1, 12], "x": 16, "y": 1},
-                {"matrix": [1, 13], "x": 17, "y": 1, "w": 1.5},
-
-                {"matrix": [3, 14], "x": 0, "y": 2},
-
-                {"matrix": [2, 0], "x": 1.5, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 3.25, "y": 2},
-                {"matrix": [2, 2], "x": 4.25, "y": 2},
-                {"matrix": [2, 3], "x": 5.25, "y": 2},
-                {"matrix": [2, 4], "x": 6.25, "y": 2},
-                {"matrix": [2, 5], "x": 7.25, "y": 2},
-
-                {"matrix": [2, 6], "x": 10.25, "y": 2},
-                {"matrix": [2, 7], "x": 11.25, "y": 2},
-                {"matrix": [2, 8], "x": 12.25, "y": 2},
-                {"matrix": [2, 9], "x": 13.25, "y": 2},
-                {"matrix": [2, 10], "x": 14.25, "y": 2},
-                {"matrix": [2, 11], "x": 15.25, "y": 2},
-                {"matrix": [2, 13], "x": 16.25, "y": 2, "w": 2.25},
-
-                {"matrix": [3, 0], "x": 1.5, "y": 3, "w": 2.25},
-                {"matrix": [3, 2], "x": 3.75, "y": 3},
-                {"matrix": [3, 3], "x": 4.75, "y": 3},
-                {"matrix": [3, 4], "x": 5.75, "y": 3},
-                {"matrix": [3, 5], "x": 6.75, "y": 3},
-                {"matrix": [3, 6], "x": 7.75, "y": 3},
-
-                {"matrix": [3, 7], "x": 9.75, "y": 3},
-                {"matrix": [3, 8], "x": 10.75, "y": 3},
-                {"matrix": [3, 9], "x": 11.75, "y": 3},
-                {"matrix": [3, 10], "x": 12.75, "y": 3},
-                {"matrix": [3, 11], "x": 13.75, "y": 3},
-                {"matrix": [4, 12], "x": 14.75, "y": 3},
-                {"matrix": [3, 12], "x": 15.75, "y": 3, "w": 2.75},
-
-                {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.5},
-                {"matrix": [4, 2], "x": 4.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 4], "x": 5.75, "y": 4, "w": 2.25},
-                {"matrix": [4, 6], "x": 8, "y": 4, "w": 1.25},
-                {"matrix": [4, 8], "x": 9.75, "y": 4, "w": 2.75},
-                {"matrix": [4, 10], "x": 12.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 13], "x": 17, "y": 4, "w": 1.5}
-            ]
-        },
-        "LAYOUT_alice_split_bs": {
-            "layout": [
-                {"matrix": [1, 14], "x": 0, "y": 0},
-
-                {"matrix": [0, 0], "x": 1.5, "y": 0},
-                {"matrix": [0, 1], "x": 2.5, "y": 0},
-                {"matrix": [0, 2], "x": 3.5, "y": 0},
-                {"matrix": [0, 3], "x": 4.5, "y": 0},
-                {"matrix": [0, 4], "x": 5.5, "y": 0},
-                {"matrix": [0, 5], "x": 6.5, "y": 0},
-                {"matrix": [0, 6], "x": 7.5, "y": 0},
-
-                {"matrix": [0, 7], "x": 10.5, "y": 0},
-                {"matrix": [0, 8], "x": 11.5, "y": 0},
-                {"matrix": [0, 9], "x": 12.5, "y": 0},
-                {"matrix": [0, 10], "x": 13.5, "y": 0},
-                {"matrix": [0, 11], "x": 14.5, "y": 0},
-                {"matrix": [0, 12], "x": 15.5, "y": 0},
-                {"matrix": [0, 13], "x": 16.5, "y": 0},
-                {"matrix": [0, 14], "x": 17.5, "y": 0},
-
-                {"matrix": [2, 14], "x": 0, "y": 1},
-
-                {"matrix": [1, 0], "x": 1.5, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 3, "y": 1},
-                {"matrix": [1, 2], "x": 4, "y": 1},
-                {"matrix": [1, 3], "x": 5, "y": 1},
-                {"matrix": [1, 4], "x": 6, "y": 1},
-                {"matrix": [1, 5], "x": 7, "y": 1},
-
-                {"matrix": [1, 6], "x": 10, "y": 1},
-                {"matrix": [1, 7], "x": 11, "y": 1},
-                {"matrix": [1, 8], "x": 12, "y": 1},
-                {"matrix": [1, 9], "x": 13, "y": 1},
-                {"matrix": [1, 10], "x": 14, "y": 1},
-                {"matrix": [1, 11], "x": 15, "y": 1},
-                {"matrix": [1, 12], "x": 16, "y": 1},
-                {"matrix": [1, 13], "x": 17, "y": 1, "w": 1.5},
-
-                {"matrix": [3, 14], "x": 0, "y": 2},
-
-                {"matrix": [2, 0], "x": 1.5, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 3.25, "y": 2},
-                {"matrix": [2, 2], "x": 4.25, "y": 2},
-                {"matrix": [2, 3], "x": 5.25, "y": 2},
-                {"matrix": [2, 4], "x": 6.25, "y": 2},
-                {"matrix": [2, 5], "x": 7.25, "y": 2},
-
-                {"matrix": [2, 6], "x": 10.25, "y": 2},
-                {"matrix": [2, 7], "x": 11.25, "y": 2},
-                {"matrix": [2, 8], "x": 12.25, "y": 2},
-                {"matrix": [2, 9], "x": 13.25, "y": 2},
-                {"matrix": [2, 10], "x": 14.25, "y": 2},
-                {"matrix": [2, 11], "x": 15.25, "y": 2},
-                {"matrix": [2, 13], "x": 16.25, "y": 2, "w": 2.25},
-
-                {"matrix": [3, 0], "x": 1.5, "y": 3, "w": 2.25},
-                {"matrix": [3, 2], "x": 3.75, "y": 3},
-                {"matrix": [3, 3], "x": 4.75, "y": 3},
-                {"matrix": [3, 4], "x": 5.75, "y": 3},
-                {"matrix": [3, 5], "x": 6.75, "y": 3},
-                {"matrix": [3, 6], "x": 7.75, "y": 3},
-
-                {"matrix": [3, 7], "x": 9.75, "y": 3},
-                {"matrix": [3, 8], "x": 10.75, "y": 3},
-                {"matrix": [3, 9], "x": 11.75, "y": 3},
-                {"matrix": [3, 10], "x": 12.75, "y": 3},
-                {"matrix": [3, 11], "x": 13.75, "y": 3},
-                {"matrix": [4, 12], "x": 14.75, "y": 3},
-                {"matrix": [3, 12], "x": 15.75, "y": 3, "w": 1.75},
-                {"matrix": [3, 13], "x": 17.5, "y": 3},
-
-                {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.5},
-                {"matrix": [4, 2], "x": 4.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 4], "x": 5.75, "y": 4, "w": 2.25},
-                {"matrix": [4, 6], "x": 8, "y": 4, "w": 1.25},
-                {"matrix": [4, 8], "x": 9.75, "y": 4, "w": 2.75},
-                {"matrix": [4, 10], "x": 12.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 13], "x": 17, "y": 4, "w": 1.5}
-            ]
-        },
-        "LAYOUT_alice_split_bs_full_rshift": {
-            "layout": [
-                {"matrix": [1, 14], "x": 0, "y": 0},
-
-                {"matrix": [0, 0], "x": 1.5, "y": 0},
-                {"matrix": [0, 1], "x": 2.5, "y": 0},
-                {"matrix": [0, 2], "x": 3.5, "y": 0},
-                {"matrix": [0, 3], "x": 4.5, "y": 0},
-                {"matrix": [0, 4], "x": 5.5, "y": 0},
-                {"matrix": [0, 5], "x": 6.5, "y": 0},
-                {"matrix": [0, 6], "x": 7.5, "y": 0},
-
-                {"matrix": [0, 7], "x": 10.5, "y": 0},
-                {"matrix": [0, 8], "x": 11.5, "y": 0},
-                {"matrix": [0, 9], "x": 12.5, "y": 0},
-                {"matrix": [0, 10], "x": 13.5, "y": 0},
-                {"matrix": [0, 11], "x": 14.5, "y": 0},
-                {"matrix": [0, 12], "x": 15.5, "y": 0},
-                {"matrix": [0, 13], "x": 16.5, "y": 0},
-                {"matrix": [0, 14], "x": 17.5, "y": 0},
-
-                {"matrix": [2, 14], "x": 0, "y": 1},
-
-                {"matrix": [1, 0], "x": 1.5, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 3, "y": 1},
-                {"matrix": [1, 2], "x": 4, "y": 1},
-                {"matrix": [1, 3], "x": 5, "y": 1},
-                {"matrix": [1, 4], "x": 6, "y": 1},
-                {"matrix": [1, 5], "x": 7, "y": 1},
-
-                {"matrix": [1, 6], "x": 10, "y": 1},
-                {"matrix": [1, 7], "x": 11, "y": 1},
-                {"matrix": [1, 8], "x": 12, "y": 1},
-                {"matrix": [1, 9], "x": 13, "y": 1},
-                {"matrix": [1, 10], "x": 14, "y": 1},
-                {"matrix": [1, 11], "x": 15, "y": 1},
-                {"matrix": [1, 12], "x": 16, "y": 1},
-                {"matrix": [1, 13], "x": 17, "y": 1, "w": 1.5},
-
-                {"matrix": [3, 14], "x": 0, "y": 2},
-
-                {"matrix": [2, 0], "x": 1.5, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 3.25, "y": 2},
-                {"matrix": [2, 2], "x": 4.25, "y": 2},
-                {"matrix": [2, 3], "x": 5.25, "y": 2},
-                {"matrix": [2, 4], "x": 6.25, "y": 2},
-                {"matrix": [2, 5], "x": 7.25, "y": 2},
-
-                {"matrix": [2, 6], "x": 10.25, "y": 2},
-                {"matrix": [2, 7], "x": 11.25, "y": 2},
-                {"matrix": [2, 8], "x": 12.25, "y": 2},
-                {"matrix": [2, 9], "x": 13.25, "y": 2},
-                {"matrix": [2, 10], "x": 14.25, "y": 2},
-                {"matrix": [2, 11], "x": 15.25, "y": 2},
-                {"matrix": [2, 13], "x": 16.25, "y": 2, "w": 2.25},
-
-                {"matrix": [3, 0], "x": 1.5, "y": 3, "w": 2.25},
-                {"matrix": [3, 2], "x": 3.75, "y": 3},
-                {"matrix": [3, 3], "x": 4.75, "y": 3},
-                {"matrix": [3, 4], "x": 5.75, "y": 3},
-                {"matrix": [3, 5], "x": 6.75, "y": 3},
-                {"matrix": [3, 6], "x": 7.75, "y": 3},
-
-                {"matrix": [3, 7], "x": 9.75, "y": 3},
-                {"matrix": [3, 8], "x": 10.75, "y": 3},
-                {"matrix": [3, 9], "x": 11.75, "y": 3},
-                {"matrix": [3, 10], "x": 12.75, "y": 3},
-                {"matrix": [3, 11], "x": 13.75, "y": 3},
-                {"matrix": [4, 12], "x": 14.75, "y": 3},
-                {"matrix": [3, 12], "x": 15.75, "y": 3, "w": 2.75},
-
-                {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.5},
-                {"matrix": [4, 2], "x": 4.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 4], "x": 5.75, "y": 4, "w": 2.25},
-                {"matrix": [4, 6], "x": 8, "y": 4, "w": 1.25},
-                {"matrix": [4, 8], "x": 9.75, "y": 4, "w": 2.75},
-                {"matrix": [4, 10], "x": 12.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 13], "x": 17, "y": 4, "w": 1.5}
-            ]
-        }
-    }
-}
diff --git a/keyboards/mechlovin/adelais/standard_led/avr/rev1/keyboard.json b/keyboards/mechlovin/adelais/standard_led/avr/rev1/keyboard.json
new file mode 100644
index 00000000000..3758a8f085a
--- /dev/null
+++ b/keyboards/mechlovin/adelais/standard_led/avr/rev1/keyboard.json
@@ -0,0 +1,380 @@
+{
+    "keyboard_name": "Adelais AVR",
+    "usb": {
+        "pid": "0xAD04"
+    },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "console": false,
+        "command": false,
+        "nkro": true,
+        "backlight": true,
+        "rgblight": true
+    },
+    "encoder": {
+        "rotary": [
+            {"pin_a": "D3", "pin_b": "D2"},
+            {"pin_a": "D5", "pin_b": "B6"},
+            {"pin_a": "C7", "pin_b": "C6"}
+        ]
+    },
+    "qmk": {
+        "tap_keycode_delay": 10
+    },
+    "backlight": {
+        "pin": "B5",
+        "breathing": true
+    },
+    "rgblight": {
+        "led_count": 23,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": true,
+            "twinkle": true
+        }
+    },
+    "ws2812": {
+        "pin": "E2"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "indicators": {
+        "caps_lock": "E6",
+        "num_lock": "D7",
+        "scroll_lock": "F7"
+    },
+    "layout_aliases": {
+        "LAYOUT_all": "LAYOUT_alice_split_bs"
+    },
+    "layouts": {
+        "LAYOUT_alice": {
+            "layout": [
+                {"matrix": [1, 14], "x": 0, "y": 0},
+
+                {"matrix": [0, 0], "x": 1.5, "y": 0},
+                {"matrix": [0, 1], "x": 2.5, "y": 0},
+                {"matrix": [0, 2], "x": 3.5, "y": 0},
+                {"matrix": [0, 3], "x": 4.5, "y": 0},
+                {"matrix": [0, 4], "x": 5.5, "y": 0},
+                {"matrix": [0, 5], "x": 6.5, "y": 0},
+                {"matrix": [0, 6], "x": 7.5, "y": 0},
+
+                {"matrix": [0, 7], "x": 10.5, "y": 0},
+                {"matrix": [0, 8], "x": 11.5, "y": 0},
+                {"matrix": [0, 9], "x": 12.5, "y": 0},
+                {"matrix": [0, 10], "x": 13.5, "y": 0},
+                {"matrix": [0, 11], "x": 14.5, "y": 0},
+                {"matrix": [0, 12], "x": 15.5, "y": 0},
+                {"matrix": [0, 13], "x": 16.5, "y": 0, "w": 2},
+
+                {"matrix": [2, 14], "x": 0, "y": 1},
+
+                {"matrix": [1, 0], "x": 1.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 3, "y": 1},
+                {"matrix": [1, 2], "x": 4, "y": 1},
+                {"matrix": [1, 3], "x": 5, "y": 1},
+                {"matrix": [1, 4], "x": 6, "y": 1},
+                {"matrix": [1, 5], "x": 7, "y": 1},
+
+                {"matrix": [1, 6], "x": 10, "y": 1},
+                {"matrix": [1, 7], "x": 11, "y": 1},
+                {"matrix": [1, 8], "x": 12, "y": 1},
+                {"matrix": [1, 9], "x": 13, "y": 1},
+                {"matrix": [1, 10], "x": 14, "y": 1},
+                {"matrix": [1, 11], "x": 15, "y": 1},
+                {"matrix": [1, 12], "x": 16, "y": 1},
+                {"matrix": [1, 13], "x": 17, "y": 1, "w": 1.5},
+
+                {"matrix": [3, 14], "x": 0, "y": 2},
+
+                {"matrix": [2, 0], "x": 1.5, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 3.25, "y": 2},
+                {"matrix": [2, 2], "x": 4.25, "y": 2},
+                {"matrix": [2, 3], "x": 5.25, "y": 2},
+                {"matrix": [2, 4], "x": 6.25, "y": 2},
+                {"matrix": [2, 5], "x": 7.25, "y": 2},
+
+                {"matrix": [2, 6], "x": 10.25, "y": 2},
+                {"matrix": [2, 7], "x": 11.25, "y": 2},
+                {"matrix": [2, 8], "x": 12.25, "y": 2},
+                {"matrix": [2, 9], "x": 13.25, "y": 2},
+                {"matrix": [2, 10], "x": 14.25, "y": 2},
+                {"matrix": [2, 11], "x": 15.25, "y": 2},
+                {"matrix": [2, 13], "x": 16.25, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 1.5, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 3.75, "y": 3},
+                {"matrix": [3, 3], "x": 4.75, "y": 3},
+                {"matrix": [3, 4], "x": 5.75, "y": 3},
+                {"matrix": [3, 5], "x": 6.75, "y": 3},
+                {"matrix": [3, 6], "x": 7.75, "y": 3},
+
+                {"matrix": [3, 7], "x": 9.75, "y": 3},
+                {"matrix": [3, 8], "x": 10.75, "y": 3},
+                {"matrix": [3, 9], "x": 11.75, "y": 3},
+                {"matrix": [3, 10], "x": 12.75, "y": 3},
+                {"matrix": [3, 11], "x": 13.75, "y": 3},
+                {"matrix": [4, 12], "x": 14.75, "y": 3},
+                {"matrix": [3, 12], "x": 15.75, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 17.5, "y": 3},
+
+                {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 2], "x": 4.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 5.75, "y": 4, "w": 2.25},
+                {"matrix": [4, 6], "x": 8, "y": 4, "w": 1.25},
+                {"matrix": [4, 8], "x": 9.75, "y": 4, "w": 2.75},
+                {"matrix": [4, 10], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 17, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_alice_full_rshift": {
+            "layout": [
+                {"matrix": [1, 14], "x": 0, "y": 0},
+
+                {"matrix": [0, 0], "x": 1.5, "y": 0},
+                {"matrix": [0, 1], "x": 2.5, "y": 0},
+                {"matrix": [0, 2], "x": 3.5, "y": 0},
+                {"matrix": [0, 3], "x": 4.5, "y": 0},
+                {"matrix": [0, 4], "x": 5.5, "y": 0},
+                {"matrix": [0, 5], "x": 6.5, "y": 0},
+                {"matrix": [0, 6], "x": 7.5, "y": 0},
+
+                {"matrix": [0, 7], "x": 10.5, "y": 0},
+                {"matrix": [0, 8], "x": 11.5, "y": 0},
+                {"matrix": [0, 9], "x": 12.5, "y": 0},
+                {"matrix": [0, 10], "x": 13.5, "y": 0},
+                {"matrix": [0, 11], "x": 14.5, "y": 0},
+                {"matrix": [0, 12], "x": 15.5, "y": 0},
+                {"matrix": [0, 13], "x": 16.5, "y": 0, "w": 2},
+
+                {"matrix": [2, 14], "x": 0, "y": 1},
+
+                {"matrix": [1, 0], "x": 1.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 3, "y": 1},
+                {"matrix": [1, 2], "x": 4, "y": 1},
+                {"matrix": [1, 3], "x": 5, "y": 1},
+                {"matrix": [1, 4], "x": 6, "y": 1},
+                {"matrix": [1, 5], "x": 7, "y": 1},
+
+                {"matrix": [1, 6], "x": 10, "y": 1},
+                {"matrix": [1, 7], "x": 11, "y": 1},
+                {"matrix": [1, 8], "x": 12, "y": 1},
+                {"matrix": [1, 9], "x": 13, "y": 1},
+                {"matrix": [1, 10], "x": 14, "y": 1},
+                {"matrix": [1, 11], "x": 15, "y": 1},
+                {"matrix": [1, 12], "x": 16, "y": 1},
+                {"matrix": [1, 13], "x": 17, "y": 1, "w": 1.5},
+
+                {"matrix": [3, 14], "x": 0, "y": 2},
+
+                {"matrix": [2, 0], "x": 1.5, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 3.25, "y": 2},
+                {"matrix": [2, 2], "x": 4.25, "y": 2},
+                {"matrix": [2, 3], "x": 5.25, "y": 2},
+                {"matrix": [2, 4], "x": 6.25, "y": 2},
+                {"matrix": [2, 5], "x": 7.25, "y": 2},
+
+                {"matrix": [2, 6], "x": 10.25, "y": 2},
+                {"matrix": [2, 7], "x": 11.25, "y": 2},
+                {"matrix": [2, 8], "x": 12.25, "y": 2},
+                {"matrix": [2, 9], "x": 13.25, "y": 2},
+                {"matrix": [2, 10], "x": 14.25, "y": 2},
+                {"matrix": [2, 11], "x": 15.25, "y": 2},
+                {"matrix": [2, 13], "x": 16.25, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 1.5, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 3.75, "y": 3},
+                {"matrix": [3, 3], "x": 4.75, "y": 3},
+                {"matrix": [3, 4], "x": 5.75, "y": 3},
+                {"matrix": [3, 5], "x": 6.75, "y": 3},
+                {"matrix": [3, 6], "x": 7.75, "y": 3},
+
+                {"matrix": [3, 7], "x": 9.75, "y": 3},
+                {"matrix": [3, 8], "x": 10.75, "y": 3},
+                {"matrix": [3, 9], "x": 11.75, "y": 3},
+                {"matrix": [3, 10], "x": 12.75, "y": 3},
+                {"matrix": [3, 11], "x": 13.75, "y": 3},
+                {"matrix": [4, 12], "x": 14.75, "y": 3},
+                {"matrix": [3, 12], "x": 15.75, "y": 3, "w": 2.75},
+
+                {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 2], "x": 4.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 5.75, "y": 4, "w": 2.25},
+                {"matrix": [4, 6], "x": 8, "y": 4, "w": 1.25},
+                {"matrix": [4, 8], "x": 9.75, "y": 4, "w": 2.75},
+                {"matrix": [4, 10], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 17, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_alice_split_bs": {
+            "layout": [
+                {"matrix": [1, 14], "x": 0, "y": 0},
+
+                {"matrix": [0, 0], "x": 1.5, "y": 0},
+                {"matrix": [0, 1], "x": 2.5, "y": 0},
+                {"matrix": [0, 2], "x": 3.5, "y": 0},
+                {"matrix": [0, 3], "x": 4.5, "y": 0},
+                {"matrix": [0, 4], "x": 5.5, "y": 0},
+                {"matrix": [0, 5], "x": 6.5, "y": 0},
+                {"matrix": [0, 6], "x": 7.5, "y": 0},
+
+                {"matrix": [0, 7], "x": 10.5, "y": 0},
+                {"matrix": [0, 8], "x": 11.5, "y": 0},
+                {"matrix": [0, 9], "x": 12.5, "y": 0},
+                {"matrix": [0, 10], "x": 13.5, "y": 0},
+                {"matrix": [0, 11], "x": 14.5, "y": 0},
+                {"matrix": [0, 12], "x": 15.5, "y": 0},
+                {"matrix": [0, 13], "x": 16.5, "y": 0},
+                {"matrix": [0, 14], "x": 17.5, "y": 0},
+
+                {"matrix": [2, 14], "x": 0, "y": 1},
+
+                {"matrix": [1, 0], "x": 1.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 3, "y": 1},
+                {"matrix": [1, 2], "x": 4, "y": 1},
+                {"matrix": [1, 3], "x": 5, "y": 1},
+                {"matrix": [1, 4], "x": 6, "y": 1},
+                {"matrix": [1, 5], "x": 7, "y": 1},
+
+                {"matrix": [1, 6], "x": 10, "y": 1},
+                {"matrix": [1, 7], "x": 11, "y": 1},
+                {"matrix": [1, 8], "x": 12, "y": 1},
+                {"matrix": [1, 9], "x": 13, "y": 1},
+                {"matrix": [1, 10], "x": 14, "y": 1},
+                {"matrix": [1, 11], "x": 15, "y": 1},
+                {"matrix": [1, 12], "x": 16, "y": 1},
+                {"matrix": [1, 13], "x": 17, "y": 1, "w": 1.5},
+
+                {"matrix": [3, 14], "x": 0, "y": 2},
+
+                {"matrix": [2, 0], "x": 1.5, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 3.25, "y": 2},
+                {"matrix": [2, 2], "x": 4.25, "y": 2},
+                {"matrix": [2, 3], "x": 5.25, "y": 2},
+                {"matrix": [2, 4], "x": 6.25, "y": 2},
+                {"matrix": [2, 5], "x": 7.25, "y": 2},
+
+                {"matrix": [2, 6], "x": 10.25, "y": 2},
+                {"matrix": [2, 7], "x": 11.25, "y": 2},
+                {"matrix": [2, 8], "x": 12.25, "y": 2},
+                {"matrix": [2, 9], "x": 13.25, "y": 2},
+                {"matrix": [2, 10], "x": 14.25, "y": 2},
+                {"matrix": [2, 11], "x": 15.25, "y": 2},
+                {"matrix": [2, 13], "x": 16.25, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 1.5, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 3.75, "y": 3},
+                {"matrix": [3, 3], "x": 4.75, "y": 3},
+                {"matrix": [3, 4], "x": 5.75, "y": 3},
+                {"matrix": [3, 5], "x": 6.75, "y": 3},
+                {"matrix": [3, 6], "x": 7.75, "y": 3},
+
+                {"matrix": [3, 7], "x": 9.75, "y": 3},
+                {"matrix": [3, 8], "x": 10.75, "y": 3},
+                {"matrix": [3, 9], "x": 11.75, "y": 3},
+                {"matrix": [3, 10], "x": 12.75, "y": 3},
+                {"matrix": [3, 11], "x": 13.75, "y": 3},
+                {"matrix": [4, 12], "x": 14.75, "y": 3},
+                {"matrix": [3, 12], "x": 15.75, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 17.5, "y": 3},
+
+                {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 2], "x": 4.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 5.75, "y": 4, "w": 2.25},
+                {"matrix": [4, 6], "x": 8, "y": 4, "w": 1.25},
+                {"matrix": [4, 8], "x": 9.75, "y": 4, "w": 2.75},
+                {"matrix": [4, 10], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 17, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_alice_split_bs_full_rshift": {
+            "layout": [
+                {"matrix": [1, 14], "x": 0, "y": 0},
+
+                {"matrix": [0, 0], "x": 1.5, "y": 0},
+                {"matrix": [0, 1], "x": 2.5, "y": 0},
+                {"matrix": [0, 2], "x": 3.5, "y": 0},
+                {"matrix": [0, 3], "x": 4.5, "y": 0},
+                {"matrix": [0, 4], "x": 5.5, "y": 0},
+                {"matrix": [0, 5], "x": 6.5, "y": 0},
+                {"matrix": [0, 6], "x": 7.5, "y": 0},
+
+                {"matrix": [0, 7], "x": 10.5, "y": 0},
+                {"matrix": [0, 8], "x": 11.5, "y": 0},
+                {"matrix": [0, 9], "x": 12.5, "y": 0},
+                {"matrix": [0, 10], "x": 13.5, "y": 0},
+                {"matrix": [0, 11], "x": 14.5, "y": 0},
+                {"matrix": [0, 12], "x": 15.5, "y": 0},
+                {"matrix": [0, 13], "x": 16.5, "y": 0},
+                {"matrix": [0, 14], "x": 17.5, "y": 0},
+
+                {"matrix": [2, 14], "x": 0, "y": 1},
+
+                {"matrix": [1, 0], "x": 1.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 3, "y": 1},
+                {"matrix": [1, 2], "x": 4, "y": 1},
+                {"matrix": [1, 3], "x": 5, "y": 1},
+                {"matrix": [1, 4], "x": 6, "y": 1},
+                {"matrix": [1, 5], "x": 7, "y": 1},
+
+                {"matrix": [1, 6], "x": 10, "y": 1},
+                {"matrix": [1, 7], "x": 11, "y": 1},
+                {"matrix": [1, 8], "x": 12, "y": 1},
+                {"matrix": [1, 9], "x": 13, "y": 1},
+                {"matrix": [1, 10], "x": 14, "y": 1},
+                {"matrix": [1, 11], "x": 15, "y": 1},
+                {"matrix": [1, 12], "x": 16, "y": 1},
+                {"matrix": [1, 13], "x": 17, "y": 1, "w": 1.5},
+
+                {"matrix": [3, 14], "x": 0, "y": 2},
+
+                {"matrix": [2, 0], "x": 1.5, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 3.25, "y": 2},
+                {"matrix": [2, 2], "x": 4.25, "y": 2},
+                {"matrix": [2, 3], "x": 5.25, "y": 2},
+                {"matrix": [2, 4], "x": 6.25, "y": 2},
+                {"matrix": [2, 5], "x": 7.25, "y": 2},
+
+                {"matrix": [2, 6], "x": 10.25, "y": 2},
+                {"matrix": [2, 7], "x": 11.25, "y": 2},
+                {"matrix": [2, 8], "x": 12.25, "y": 2},
+                {"matrix": [2, 9], "x": 13.25, "y": 2},
+                {"matrix": [2, 10], "x": 14.25, "y": 2},
+                {"matrix": [2, 11], "x": 15.25, "y": 2},
+                {"matrix": [2, 13], "x": 16.25, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 1.5, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 3.75, "y": 3},
+                {"matrix": [3, 3], "x": 4.75, "y": 3},
+                {"matrix": [3, 4], "x": 5.75, "y": 3},
+                {"matrix": [3, 5], "x": 6.75, "y": 3},
+                {"matrix": [3, 6], "x": 7.75, "y": 3},
+
+                {"matrix": [3, 7], "x": 9.75, "y": 3},
+                {"matrix": [3, 8], "x": 10.75, "y": 3},
+                {"matrix": [3, 9], "x": 11.75, "y": 3},
+                {"matrix": [3, 10], "x": 12.75, "y": 3},
+                {"matrix": [3, 11], "x": 13.75, "y": 3},
+                {"matrix": [4, 12], "x": 14.75, "y": 3},
+                {"matrix": [3, 12], "x": 15.75, "y": 3, "w": 2.75},
+
+                {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 2], "x": 4.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 5.75, "y": 4, "w": 2.25},
+                {"matrix": [4, 6], "x": 8, "y": 4, "w": 1.25},
+                {"matrix": [4, 8], "x": 9.75, "y": 4, "w": 2.75},
+                {"matrix": [4, 10], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 17, "y": 4, "w": 1.5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/mechlovin/adelais/standard_led/avr/rev1/rules.mk b/keyboards/mechlovin/adelais/standard_led/avr/rev1/rules.mk
index c807f2ad095..179d02c3c68 100644
--- a/keyboards/mechlovin/adelais/standard_led/avr/rev1/rules.mk
+++ b/keyboards/mechlovin/adelais/standard_led/avr/rev1/rules.mk
@@ -1,7 +1,3 @@
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no        # Commands for debug and configuration
-BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 CUSTOM_MATRIX = lite
 
 SRC += matrix.c
diff --git a/keyboards/mechlovin/adelais/standard_led/rules.mk b/keyboards/mechlovin/adelais/standard_led/rules.mk
index 271c6a9179e..a1d2ba038de 100644
--- a/keyboards/mechlovin/adelais/standard_led/rules.mk
+++ b/keyboards/mechlovin/adelais/standard_led/rules.mk
@@ -1,5 +1 @@
-
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 DEFAULT_FOLDER = mechlovin/adelais/standard_led/arm/rev2
diff --git a/keyboards/mechlovin/delphine/info.json b/keyboards/mechlovin/delphine/info.json
index e8f39b8d6d1..baeeab6f186 100644
--- a/keyboards/mechlovin/delphine/info.json
+++ b/keyboards/mechlovin/delphine/info.json
@@ -6,14 +6,6 @@
     "usb": {
         "vid": "0x4D4C"
     },
-    "features": {
-        "bootmagic": true,
-        "command": false,
-        "console": false,
-        "extrakey": true,
-        "mousekey": true,
-        "nkro": true
-    },
     "matrix_pins": {
         "cols": ["F7", "D7", "D6", "D2"],
         "rows": ["F0", "F1", "F4", "F5", "F6", "D3"]
diff --git a/keyboards/mechlovin/delphine/mono_led/info.json b/keyboards/mechlovin/delphine/mono_led/info.json
deleted file mode 100644
index e1b90d1191b..00000000000
--- a/keyboards/mechlovin/delphine/mono_led/info.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-    "usb": {
-        "pid": "0xDEF1",
-        "device_version": "0.0.1"
-    },
-    "rgblight": {
-        "saturation_steps": 8,
-        "brightness_steps": 8,
-        "led_count": 13,
-        "sleep": true,
-        "animations": {
-            "breathing": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "snake": true,
-            "knight": true,
-            "christmas": true,
-            "static_gradient": true,
-            "rgb_test": true,
-            "alternating": true,
-            "twinkle": true
-        }
-    },
-    "ws2812": {
-        "pin": "E2"
-    },
-    "backlight": {
-        "pin": "B6"
-    }
-}
diff --git a/keyboards/mechlovin/delphine/mono_led/keyboard.json b/keyboards/mechlovin/delphine/mono_led/keyboard.json
new file mode 100644
index 00000000000..06fa071159e
--- /dev/null
+++ b/keyboards/mechlovin/delphine/mono_led/keyboard.json
@@ -0,0 +1,38 @@
+{
+    "usb": {
+        "pid": "0xDEF1",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "nkro": true,
+        "backlight": true,
+        "rgblight": true
+    },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 13,
+        "sleep": true,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": true,
+            "twinkle": true
+        }
+    },
+    "ws2812": {
+        "pin": "E2"
+    },
+    "backlight": {
+        "pin": "B6"
+    }
+}
diff --git a/keyboards/mechlovin/delphine/mono_led/rules.mk b/keyboards/mechlovin/delphine/mono_led/rules.mk
deleted file mode 100644
index ed572b0bbfc..00000000000
--- a/keyboards/mechlovin/delphine/mono_led/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-BACKLIGHT_ENABLE = yes       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes        # Enable keyboard RGB underglow
\ No newline at end of file
diff --git a/keyboards/mechlovin/delphine/rgb_led/info.json b/keyboards/mechlovin/delphine/rgb_led/info.json
deleted file mode 100644
index 6a0b8df2cf0..00000000000
--- a/keyboards/mechlovin/delphine/rgb_led/info.json
+++ /dev/null
@@ -1,79 +0,0 @@
-{
-    "usb": {
-        "pid": "0xDEF2",
-        "device_version": "0.0.1"
-    },
-    "rgblight": {
-        "saturation_steps": 8,
-        "brightness_steps": 8,
-        "led_count": 13,
-        "sleep": true,
-        "animations": {
-            "breathing": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "snake": true,
-            "knight": true,
-            "christmas": true,
-            "static_gradient": true,
-            "rgb_test": true,
-            "alternating": true,
-            "twinkle": true
-        }
-    },
-    "ws2812": {
-        "pin": "E2"
-    },
-    "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,
-            "rainbow_moving_chevron": true,
-            "cycle_out_in": true,
-            "cycle_out_in_dual": 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_rain": true,
-            "pixel_flow": true,
-            "pixel_fractal": 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
-        },
-        "default": {
-            "animation": "cycle_pinwheel"
-        },
-        "driver": "is31fl3731",
-        "react_on_keyup": true
-    }
-}
diff --git a/keyboards/mechlovin/delphine/rgb_led/keyboard.json b/keyboards/mechlovin/delphine/rgb_led/keyboard.json
new file mode 100644
index 00000000000..35a163c05f8
--- /dev/null
+++ b/keyboards/mechlovin/delphine/rgb_led/keyboard.json
@@ -0,0 +1,86 @@
+{
+    "usb": {
+        "pid": "0xDEF2",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "nkro": true,
+        "rgb_matrix": true
+    },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 13,
+        "sleep": true,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": true,
+            "twinkle": true
+        }
+    },
+    "ws2812": {
+        "pin": "E2"
+    },
+    "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,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": 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_rain": true,
+            "pixel_flow": true,
+            "pixel_fractal": 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
+        },
+        "default": {
+            "animation": "cycle_pinwheel"
+        },
+        "driver": "is31fl3731",
+        "react_on_keyup": true
+    }
+}
diff --git a/keyboards/mechlovin/delphine/rgb_led/rules.mk b/keyboards/mechlovin/delphine/rgb_led/rules.mk
deleted file mode 100644
index 5c624bc68f6..00000000000
--- a/keyboards/mechlovin/delphine/rgb_led/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-RGBLIGHT_ENABLE = no               # Enable keyboard RGB underglow
-RGB_MATRIX_ENABLE = yes            # Use RGB matrix
diff --git a/keyboards/mechlovin/hannah60rgb/rev1/info.json b/keyboards/mechlovin/hannah60rgb/rev1/info.json
deleted file mode 100644
index 6a3510c7dfc..00000000000
--- a/keyboards/mechlovin/hannah60rgb/rev1/info.json
+++ /dev/null
@@ -1,290 +0,0 @@
-{
-    "keyboard_name": "Hannah60 RGB",
-    "manufacturer": "Team.Mechlovin",
-    "url": "",
-    "maintainer": "mechlovin",
-    "usb": {
-        "vid": "0x4D4C",
-        "pid": "0x6001",
-        "device_version": "0.0.1"
-    },
-    "ws2812": {
-        "pin": "A15"
-    },
-    "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,
-            "rainbow_moving_chevron": true,
-            "cycle_out_in": true,
-            "cycle_out_in_dual": 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_rain": true,
-            "pixel_flow": true,
-            "pixel_fractal": 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
-        },
-        "default": {
-            "animation": "cycle_pinwheel"
-        },
-        "driver": "ws2812",
-        "react_on_keyup": true
-    },
-    "matrix_pins": {
-        "cols": ["B11", "B10", "B2", "B1", "B0", "A7", "A6", "A0", "C15", "B4", "B5", "B3", "C13", "C14"],
-        "rows": ["A4", "A5", "A3", "A2", "A1"]
-    },
-    "diode_direction": "COL2ROW",
-    "processor": "STM32F303",
-    "bootloader": "stm32-dfu",
-    "board": "QMK_PROTON_C",
-    "community_layouts": ["60_ansi", "60_iso"],
-    "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, 12], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
-                {"matrix": [3, 1], "x": 1.25, "y": 3},
-                {"matrix": [3, 2], "x": 2.25, "y": 3},
-                {"matrix": [3, 3], "x": 3.25, "y": 3},
-                {"matrix": [3, 4], "x": 4.25, "y": 3},
-                {"matrix": [3, 5], "x": 5.25, "y": 3},
-                {"matrix": [3, 6], "x": 6.25, "y": 3},
-                {"matrix": [3, 7], "x": 7.25, "y": 3},
-                {"matrix": [3, 8], "x": 8.25, "y": 3},
-                {"matrix": [3, 9], "x": 9.25, "y": 3},
-                {"matrix": [3, 10], "x": 10.25, "y": 3},
-                {"matrix": [3, 11], "x": 11.25, "y": 3},
-                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"matrix": [3, 13], "x": 14, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 4], "x": 3.75, "y": 4, "w": 2.75},
-                {"matrix": [4, 6], "x": 6.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 8], "x": 7.75, "y": 4, "w": 2.25},
-                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
-                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
-            ]
-        },
-        "LAYOUT_60_ansi": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [2, 12], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 2], "x": 2.25, "y": 3},
-                {"matrix": [3, 3], "x": 3.25, "y": 3},
-                {"matrix": [3, 4], "x": 4.25, "y": 3},
-                {"matrix": [3, 5], "x": 5.25, "y": 3},
-                {"matrix": [3, 6], "x": 6.25, "y": 3},
-                {"matrix": [3, 7], "x": 7.25, "y": 3},
-                {"matrix": [3, 8], "x": 8.25, "y": 3},
-                {"matrix": [3, 9], "x": 9.25, "y": 3},
-                {"matrix": [3, 10], "x": 10.25, "y": 3},
-                {"matrix": [3, 11], "x": 11.25, "y": 3},
-                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
-                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
-                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
-            ]
-        },
-        "LAYOUT_60_iso": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [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": 2.75},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
-                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
-                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
-            ]
-        }
-    }
-}
diff --git a/keyboards/mechlovin/hannah60rgb/rev1/keyboard.json b/keyboards/mechlovin/hannah60rgb/rev1/keyboard.json
new file mode 100644
index 00000000000..4fb4dc2eef5
--- /dev/null
+++ b/keyboards/mechlovin/hannah60rgb/rev1/keyboard.json
@@ -0,0 +1,299 @@
+{
+    "keyboard_name": "Hannah60 RGB",
+    "manufacturer": "Team.Mechlovin",
+    "url": "",
+    "maintainer": "mechlovin",
+    "usb": {
+        "vid": "0x4D4C",
+        "pid": "0x6001",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "console": true,
+        "command": true,
+        "nkro": true,
+        "rgb_matrix": true
+    },
+    "ws2812": {
+        "pin": "A15"
+    },
+    "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,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": 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_rain": true,
+            "pixel_flow": true,
+            "pixel_fractal": 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
+        },
+        "default": {
+            "animation": "cycle_pinwheel"
+        },
+        "driver": "ws2812",
+        "react_on_keyup": true
+    },
+    "matrix_pins": {
+        "cols": ["B11", "B10", "B2", "B1", "B0", "A7", "A6", "A0", "C15", "B4", "B5", "B3", "C13", "C14"],
+        "rows": ["A4", "A5", "A3", "A2", "A1"]
+    },
+    "diode_direction": "COL2ROW",
+    "processor": "STM32F303",
+    "bootloader": "stm32-dfu",
+    "board": "QMK_PROTON_C",
+    "community_layouts": ["60_ansi", "60_iso"],
+    "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, 12], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 3.75, "y": 4, "w": 2.75},
+                {"matrix": [4, 6], "x": 6.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 8], "x": 7.75, "y": 4, "w": 2.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
+            ]
+        },
+        "LAYOUT_60_ansi": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [2, 12], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
+            ]
+        },
+        "LAYOUT_60_iso": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [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": 2.75},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/mechlovin/hannah60rgb/rev1/rules.mk b/keyboards/mechlovin/hannah60rgb/rev1/rules.mk
deleted file mode 100644
index aad92997d0f..00000000000
--- a/keyboards/mechlovin/hannah60rgb/rev1/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-RGB_MATRIX_ENABLE = yes
diff --git a/keyboards/mechlovin/hannah60rgb/rev2/info.json b/keyboards/mechlovin/hannah60rgb/rev2/info.json
deleted file mode 100644
index e6be250311c..00000000000
--- a/keyboards/mechlovin/hannah60rgb/rev2/info.json
+++ /dev/null
@@ -1,305 +0,0 @@
-{
-    "keyboard_name": "Hannah60 RGB Rev.2",
-    "manufacturer": "Team.Mechlovin",
-    "url": "",
-    "maintainer": "mechlovin",
-    "usb": {
-        "vid": "0x4D4C",
-        "pid": "0x6002",
-        "device_version": "0.0.1"
-    },
-    "rgblight": {
-        "saturation_steps": 8,
-        "brightness_steps": 8,
-        "led_count": 18,
-        "animations": {
-            "breathing": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "snake": true,
-            "knight": true,
-            "christmas": true,
-            "static_gradient": true,
-            "rgb_test": true,
-            "alternating": true,
-            "twinkle": true
-        }
-    },
-    "ws2812": {
-        "pin": "A15"
-    },
-    "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,
-            "rainbow_moving_chevron": true,
-            "cycle_out_in": true,
-            "cycle_out_in_dual": 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_rain": true,
-            "pixel_flow": true,
-            "pixel_fractal": 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
-        },
-        "default": {
-            "animation": "cycle_pinwheel"
-        },
-        "driver": "is31fl3731",
-        "react_on_keyup": true
-    },
-    "matrix_pins": {
-        "cols": ["B11", "B10", "B2", "B1", "B0", "A7", "A6", "A0", "C15", "B4", "B5", "B3", "C13", "C14"],
-        "rows": ["A4", "A5", "A3", "A2", "A1"]
-    },
-    "diode_direction": "COL2ROW",
-    "processor": "STM32F303",
-    "bootloader": "stm32-dfu",
-    "board": "QMK_PROTON_C",
-    "community_layouts": ["60_ansi", "60_iso"],
-    "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, 12], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
-                {"matrix": [3, 1], "x": 1.25, "y": 3},
-                {"matrix": [3, 2], "x": 2.25, "y": 3},
-                {"matrix": [3, 3], "x": 3.25, "y": 3},
-                {"matrix": [3, 4], "x": 4.25, "y": 3},
-                {"matrix": [3, 5], "x": 5.25, "y": 3},
-                {"matrix": [3, 6], "x": 6.25, "y": 3},
-                {"matrix": [3, 7], "x": 7.25, "y": 3},
-                {"matrix": [3, 8], "x": 8.25, "y": 3},
-                {"matrix": [3, 9], "x": 9.25, "y": 3},
-                {"matrix": [3, 10], "x": 10.25, "y": 3},
-                {"matrix": [3, 11], "x": 11.25, "y": 3},
-                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"matrix": [3, 13], "x": 14, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
-                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
-                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
-            ]
-        },
-        "LAYOUT_60_ansi": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [2, 12], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 2], "x": 2.25, "y": 3},
-                {"matrix": [3, 3], "x": 3.25, "y": 3},
-                {"matrix": [3, 4], "x": 4.25, "y": 3},
-                {"matrix": [3, 5], "x": 5.25, "y": 3},
-                {"matrix": [3, 6], "x": 6.25, "y": 3},
-                {"matrix": [3, 7], "x": 7.25, "y": 3},
-                {"matrix": [3, 8], "x": 8.25, "y": 3},
-                {"matrix": [3, 9], "x": 9.25, "y": 3},
-                {"matrix": [3, 10], "x": 10.25, "y": 3},
-                {"matrix": [3, 11], "x": 11.25, "y": 3},
-                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
-                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
-                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
-            ]
-        },
-        "LAYOUT_60_iso": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [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": 2.75},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
-                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
-                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
-            ]
-        }
-    }
-}
diff --git a/keyboards/mechlovin/hannah60rgb/rev2/keyboard.json b/keyboards/mechlovin/hannah60rgb/rev2/keyboard.json
new file mode 100644
index 00000000000..06bb71a3482
--- /dev/null
+++ b/keyboards/mechlovin/hannah60rgb/rev2/keyboard.json
@@ -0,0 +1,315 @@
+{
+    "keyboard_name": "Hannah60 RGB Rev.2",
+    "manufacturer": "Team.Mechlovin",
+    "url": "",
+    "maintainer": "mechlovin",
+    "usb": {
+        "vid": "0x4D4C",
+        "pid": "0x6002",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "console": true,
+        "command": true,
+        "nkro": true,
+        "rgblight": true,
+        "rgb_matrix": true
+    },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 18,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": true,
+            "twinkle": true
+        }
+    },
+    "ws2812": {
+        "pin": "A15"
+    },
+    "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,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": 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_rain": true,
+            "pixel_flow": true,
+            "pixel_fractal": 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
+        },
+        "default": {
+            "animation": "cycle_pinwheel"
+        },
+        "driver": "is31fl3731",
+        "react_on_keyup": true
+    },
+    "matrix_pins": {
+        "cols": ["B11", "B10", "B2", "B1", "B0", "A7", "A6", "A0", "C15", "B4", "B5", "B3", "C13", "C14"],
+        "rows": ["A4", "A5", "A3", "A2", "A1"]
+    },
+    "diode_direction": "COL2ROW",
+    "processor": "STM32F303",
+    "bootloader": "stm32-dfu",
+    "board": "QMK_PROTON_C",
+    "community_layouts": ["60_ansi", "60_iso"],
+    "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, 12], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
+            ]
+        },
+        "LAYOUT_60_ansi": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [2, 12], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
+            ]
+        },
+        "LAYOUT_60_iso": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [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": 2.75},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/mechlovin/hannah60rgb/rev2/rules.mk b/keyboards/mechlovin/hannah60rgb/rev2/rules.mk
deleted file mode 100644
index e1f93c75251..00000000000
--- a/keyboards/mechlovin/hannah60rgb/rev2/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-RGBLIGHT_ENABLE = yes        # Enable keyboard RGB underglow
-RGB_MATRIX_ENABLE = yes
diff --git a/keyboards/mechlovin/hannah60rgb/rules.mk b/keyboards/mechlovin/hannah60rgb/rules.mk
index 65e5f070fb7..e876a56afb5 100644
--- a/keyboards/mechlovin/hannah60rgb/rules.mk
+++ b/keyboards/mechlovin/hannah60rgb/rules.mk
@@ -1,13 +1 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes        # Mouse keys
-EXTRAKEY_ENABLE = yes        # Audio control and System control
-CONSOLE_ENABLE = yes         # Console for debug
-COMMAND_ENABLE = yes         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no        # Enable keyboard backlight functionality
-AUDIO_ENABLE = no            # Audio output
-
 DEFAULT_FOLDER = mechlovin/hannah60rgb/rev1
diff --git a/keyboards/mechlovin/hannah65/info.json b/keyboards/mechlovin/hannah65/info.json
index f9adc729660..88a3f397192 100644
--- a/keyboards/mechlovin/hannah65/info.json
+++ b/keyboards/mechlovin/hannah65/info.json
@@ -3,15 +3,6 @@
         "pin": "B8",
         "breathing": true
     },
-    "features": {
-        "backlight": true,
-        "bootmagic": true,
-        "command": true,
-        "console": true,
-        "extrakey": true,
-        "mousekey": true,
-        "nkro": true
-    },
     "matrix_pins": {
         "cols": ["B11", "B10", "B2", "B1", "B0", "A7", "A6", "A0", "C15", "B4", "B5", "B3", "C13", "C14", "A13"],
         "rows": ["A4", "A5", "A3", "A2", "A1"]
diff --git a/keyboards/mechlovin/hannah65/rev1/haus/keyboard.json b/keyboards/mechlovin/hannah65/rev1/haus/keyboard.json
index ac97de5f180..7a935fc1a53 100644
--- a/keyboards/mechlovin/hannah65/rev1/haus/keyboard.json
+++ b/keyboards/mechlovin/hannah65/rev1/haus/keyboard.json
@@ -8,6 +8,15 @@
         "pid": "0x6500",
         "device_version": "0.0.1"
     },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "console": true,
+        "command": true,
+        "nkro": true,
+        "backlight": true
+    },
     "layouts": {
         "LAYOUT_all": {
             "layout": [
diff --git a/keyboards/mechlovin/hannah910/rev1/info.json b/keyboards/mechlovin/hannah910/rev1/info.json
deleted file mode 100644
index af20cffd4fb..00000000000
--- a/keyboards/mechlovin/hannah910/rev1/info.json
+++ /dev/null
@@ -1,274 +0,0 @@
-{
-    "keyboard_name": "Hannah910",
-    "manufacturer": "Mechlovin",
-    "url": "",
-    "maintainer": "Mechlovin'",
-    "usb": {
-        "vid": "0x4D4C",
-        "pid": "0x9101",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["E6", "B1", "B3", "F0", "F1", "F4", "F5", "F6", "F7", "D5", "D4", "B4", "D6", "D7", "B0"],
-        "rows": ["B5", "B6", "D3", "C6", "C7"]
-    },
-    "diode_direction": "COL2ROW",
-    "backlight": {
-        "pin": "B7",
-        "breathing": true
-    },
-    "rgblight": {
-        "led_count": 9,
-        "animations": {
-            "breathing": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "snake": true,
-            "knight": true,
-            "christmas": true,
-            "static_gradient": true,
-            "rgb_test": true,
-            "alternating": true,
-            "twinkle": true
-        }
-    },
-    "ws2812": {
-        "pin": "E2"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "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": [0, 14], "x": 14, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-                {"matrix": [1, 14], "x": 15, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 12], "x": 12.75, "y": 2},
-                {"matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.25},
-                {"matrix": [2, 14], "x": 15, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
-                {"matrix": [3, 1], "x": 1.25, "y": 3},
-                {"matrix": [3, 2], "x": 2.25, "y": 3},
-                {"matrix": [3, 3], "x": 3.25, "y": 3},
-                {"matrix": [3, 4], "x": 4.25, "y": 3},
-                {"matrix": [3, 5], "x": 5.25, "y": 3},
-                {"matrix": [3, 6], "x": 6.25, "y": 3},
-                {"matrix": [3, 7], "x": 7.25, "y": 3},
-                {"matrix": [3, 8], "x": 8.25, "y": 3},
-                {"matrix": [3, 9], "x": 9.25, "y": 3},
-                {"matrix": [3, 10], "x": 10.25, "y": 3},
-                {"matrix": [3, 11], "x": 11.25, "y": 3},
-                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"matrix": [3, 13], "x": 14, "y": 3},
-                {"matrix": [3, 14], "x": 15, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 4], "x": 3.75, "y": 4, "w": 2.75},
-                {"matrix": [4, 6], "x": 6.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 8], "x": 7.75, "y": 4, "w": 2.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": {
-            "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, 14], "x": 14, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 14], "x": 15, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 12], "x": 12.75, "y": 2},
-                {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
-                {"matrix": [2, 14], "x": 15, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
-                {"matrix": [3, 1], "x": 1.25, "y": 3},
-                {"matrix": [3, 2], "x": 2.25, "y": 3},
-                {"matrix": [3, 3], "x": 3.25, "y": 3},
-                {"matrix": [3, 4], "x": 4.25, "y": 3},
-                {"matrix": [3, 5], "x": 5.25, "y": 3},
-                {"matrix": [3, 6], "x": 6.25, "y": 3},
-                {"matrix": [3, 7], "x": 7.25, "y": 3},
-                {"matrix": [3, 8], "x": 8.25, "y": 3},
-                {"matrix": [3, 9], "x": 9.25, "y": 3},
-                {"matrix": [3, 10], "x": 10.25, "y": 3},
-                {"matrix": [3, 11], "x": 11.25, "y": 3},
-                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"matrix": [3, 13], "x": 14, "y": 3},
-                {"matrix": [3, 14], "x": 15, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
-                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
-                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
-
-                {"matrix": [4, 12], "x": 13, "y": 4},
-                {"matrix": [4, 13], "x": 14, "y": 4},
-                {"matrix": [4, 14], "x": 15, "y": 4}
-            ]
-        },
-        "LAYOUT_ansi": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-                {"matrix": [1, 14], "x": 15, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
-                {"matrix": [2, 14], "x": 15, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 2], "x": 2.25, "y": 3},
-                {"matrix": [3, 3], "x": 3.25, "y": 3},
-                {"matrix": [3, 4], "x": 4.25, "y": 3},
-                {"matrix": [3, 5], "x": 5.25, "y": 3},
-                {"matrix": [3, 6], "x": 6.25, "y": 3},
-                {"matrix": [3, 7], "x": 7.25, "y": 3},
-                {"matrix": [3, 8], "x": 8.25, "y": 3},
-                {"matrix": [3, 9], "x": 9.25, "y": 3},
-                {"matrix": [3, 10], "x": 10.25, "y": 3},
-                {"matrix": [3, 11], "x": 11.25, "y": 3},
-                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"matrix": [3, 13], "x": 14, "y": 3},
-                {"matrix": [3, 14], "x": 15, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
-                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
-                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
-
-                {"matrix": [4, 12], "x": 13, "y": 4},
-                {"matrix": [4, 13], "x": 14, "y": 4},
-                {"matrix": [4, 14], "x": 15, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/mechlovin/hannah910/rev1/keyboard.json b/keyboards/mechlovin/hannah910/rev1/keyboard.json
new file mode 100644
index 00000000000..8f01f6f39b1
--- /dev/null
+++ b/keyboards/mechlovin/hannah910/rev1/keyboard.json
@@ -0,0 +1,281 @@
+{
+    "keyboard_name": "Hannah910",
+    "manufacturer": "Mechlovin",
+    "url": "",
+    "maintainer": "Mechlovin'",
+    "usb": {
+        "vid": "0x4D4C",
+        "pid": "0x9101",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "mousekey": false,
+        "extrakey": true,
+        "backlight": true,
+        "rgblight": true
+    },
+    "matrix_pins": {
+        "cols": ["E6", "B1", "B3", "F0", "F1", "F4", "F5", "F6", "F7", "D5", "D4", "B4", "D6", "D7", "B0"],
+        "rows": ["B5", "B6", "D3", "C6", "C7"]
+    },
+    "diode_direction": "COL2ROW",
+    "backlight": {
+        "pin": "B7",
+        "breathing": true
+    },
+    "rgblight": {
+        "led_count": 9,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": true,
+            "twinkle": true
+        }
+    },
+    "ws2812": {
+        "pin": "E2"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "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": [0, 14], "x": 14, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 3.75, "y": 4, "w": 2.75},
+                {"matrix": [4, 6], "x": 6.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 8], "x": 7.75, "y": 4, "w": 2.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": {
+            "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, 14], "x": 14, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_ansi": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/mechlovin/hannah910/rev1/rules.mk b/keyboards/mechlovin/hannah910/rev1/rules.mk
deleted file mode 100644
index 8a6e2c7b715..00000000000
--- a/keyboards/mechlovin/hannah910/rev1/rules.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
diff --git a/keyboards/mechlovin/hannah910/rev2/info.json b/keyboards/mechlovin/hannah910/rev2/info.json
deleted file mode 100644
index a9cfe5f66be..00000000000
--- a/keyboards/mechlovin/hannah910/rev2/info.json
+++ /dev/null
@@ -1,280 +0,0 @@
-{
-    "keyboard_name": "Hannah910",
-    "manufacturer": "Mechlovin",
-    "url": "",
-    "maintainer": "Team Mechlovin'",
-    "usb": {
-        "vid": "0x4D4C",
-        "pid": "0x9102",
-        "device_version": "0.0.2"
-    },
-    "matrix_pins": {
-        "cols": ["E6", "B1", "B3", "F0", "F1", "F4", "F5", "F6", "F7", "D5", "D4", "B4", "D6", "D7", "B0"],
-        "rows": ["B5", "B6", "D3", "C6", "C7"]
-    },
-    "diode_direction": "COL2ROW",
-    "backlight": {
-        "pin": "B7",
-        "breathing": true
-    },
-    "rgblight": {
-        "led_count": 28,
-        "animations": {
-            "breathing": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "snake": true,
-            "knight": true,
-            "christmas": true,
-            "static_gradient": true,
-            "rgb_test": true,
-            "alternating": true,
-            "twinkle": true
-        }
-    },
-    "ws2812": {
-        "pin": "E2"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "community_layouts": ["65_ansi_blocker", "65_iso_blocker_split_bs"],
-    "layout_aliases": {
-        "LAYOUT_ansi": "LAYOUT_65_ansi_blocker",
-        "LAYOUT_iso": "LAYOUT_65_iso_blocker_split_bs"
-    },
-    "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": [0, 14], "x": 14, "y": 0},
-                {"matrix": [4, 9], "x": 15, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-                {"matrix": [1, 14], "x": 15, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 12], "x": 12.75, "y": 2},
-                {"matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.25},
-                {"matrix": [2, 14], "x": 15, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
-                {"matrix": [3, 1], "x": 1.25, "y": 3},
-                {"matrix": [3, 2], "x": 2.25, "y": 3},
-                {"matrix": [3, 3], "x": 3.25, "y": 3},
-                {"matrix": [3, 4], "x": 4.25, "y": 3},
-                {"matrix": [3, 5], "x": 5.25, "y": 3},
-                {"matrix": [3, 6], "x": 6.25, "y": 3},
-                {"matrix": [3, 7], "x": 7.25, "y": 3},
-                {"matrix": [3, 8], "x": 8.25, "y": 3},
-                {"matrix": [3, 9], "x": 9.25, "y": 3},
-                {"matrix": [3, 10], "x": 10.25, "y": 3},
-                {"matrix": [3, 11], "x": 11.25, "y": 3},
-                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"matrix": [3, 13], "x": 14, "y": 3},
-                {"matrix": [3, 14], "x": 15, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 4], "x": 3.75, "y": 4, "w": 2.75},
-                {"matrix": [4, 6], "x": 6.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 8], "x": 7.75, "y": 4, "w": 2.25},
-                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
-                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 12], "x": 13, "y": 4},
-                {"matrix": [4, 13], "x": 14, "y": 4},
-                {"matrix": [4, 14], "x": 15, "y": 4}
-            ]
-        },
-        "LAYOUT_65_iso_blocker_split_bs": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"matrix": [0, 13], "x": 13, "y": 0},
-                {"matrix": [0, 14], "x": 14, "y": 0},
-                {"matrix": [4, 9], "x": 15, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 14], "x": 15, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 12], "x": 12.75, "y": 2},
-                {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
-                {"matrix": [2, 14], "x": 15, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
-                {"matrix": [3, 1], "x": 1.25, "y": 3},
-                {"matrix": [3, 2], "x": 2.25, "y": 3},
-                {"matrix": [3, 3], "x": 3.25, "y": 3},
-                {"matrix": [3, 4], "x": 4.25, "y": 3},
-                {"matrix": [3, 5], "x": 5.25, "y": 3},
-                {"matrix": [3, 6], "x": 6.25, "y": 3},
-                {"matrix": [3, 7], "x": 7.25, "y": 3},
-                {"matrix": [3, 8], "x": 8.25, "y": 3},
-                {"matrix": [3, 9], "x": 9.25, "y": 3},
-                {"matrix": [3, 10], "x": 10.25, "y": 3},
-                {"matrix": [3, 11], "x": 11.25, "y": 3},
-                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"matrix": [3, 13], "x": 14, "y": 3},
-                {"matrix": [3, 14], "x": 15, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
-                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
-                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 12], "x": 13, "y": 4},
-                {"matrix": [4, 13], "x": 14, "y": 4},
-                {"matrix": [4, 14], "x": 15, "y": 4}
-            ]
-        },
-        "LAYOUT_65_ansi_blocker": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-                {"matrix": [4, 9], "x": 15, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-                {"matrix": [1, 14], "x": 15, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
-                {"matrix": [2, 14], "x": 15, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 2], "x": 2.25, "y": 3},
-                {"matrix": [3, 3], "x": 3.25, "y": 3},
-                {"matrix": [3, 4], "x": 4.25, "y": 3},
-                {"matrix": [3, 5], "x": 5.25, "y": 3},
-                {"matrix": [3, 6], "x": 6.25, "y": 3},
-                {"matrix": [3, 7], "x": 7.25, "y": 3},
-                {"matrix": [3, 8], "x": 8.25, "y": 3},
-                {"matrix": [3, 9], "x": 9.25, "y": 3},
-                {"matrix": [3, 10], "x": 10.25, "y": 3},
-                {"matrix": [3, 11], "x": 11.25, "y": 3},
-                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"matrix": [3, 13], "x": 14, "y": 3},
-                {"matrix": [3, 14], "x": 15, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
-                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
-                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 12], "x": 13, "y": 4},
-                {"matrix": [4, 13], "x": 14, "y": 4},
-                {"matrix": [4, 14], "x": 15, "y": 4}
-            ]
-        }
-    }
-    ,"meta": "https://noroadsleft.github.io/kbf_qmk_converter/"
-}
diff --git a/keyboards/mechlovin/hannah910/rev2/keyboard.json b/keyboards/mechlovin/hannah910/rev2/keyboard.json
new file mode 100644
index 00000000000..c6fe19c34d1
--- /dev/null
+++ b/keyboards/mechlovin/hannah910/rev2/keyboard.json
@@ -0,0 +1,287 @@
+{
+    "keyboard_name": "Hannah910",
+    "manufacturer": "Mechlovin",
+    "url": "",
+    "maintainer": "Team Mechlovin'",
+    "usb": {
+        "vid": "0x4D4C",
+        "pid": "0x9102",
+        "device_version": "0.0.2"
+    },
+    "features": {
+        "bootmagic": true,
+        "mousekey": false,
+        "extrakey": true,
+        "backlight": true,
+        "rgblight": true
+    },
+    "matrix_pins": {
+        "cols": ["E6", "B1", "B3", "F0", "F1", "F4", "F5", "F6", "F7", "D5", "D4", "B4", "D6", "D7", "B0"],
+        "rows": ["B5", "B6", "D3", "C6", "C7"]
+    },
+    "diode_direction": "COL2ROW",
+    "backlight": {
+        "pin": "B7",
+        "breathing": true
+    },
+    "rgblight": {
+        "led_count": 28,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": true,
+            "twinkle": true
+        }
+    },
+    "ws2812": {
+        "pin": "E2"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "community_layouts": ["65_ansi_blocker", "65_iso_blocker_split_bs"],
+    "layout_aliases": {
+        "LAYOUT_ansi": "LAYOUT_65_ansi_blocker",
+        "LAYOUT_iso": "LAYOUT_65_iso_blocker_split_bs"
+    },
+    "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": [0, 14], "x": 14, "y": 0},
+                {"matrix": [4, 9], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 3.75, "y": 4, "w": 2.75},
+                {"matrix": [4, 6], "x": 6.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 8], "x": 7.75, "y": 4, "w": 2.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_65_iso_blocker_split_bs": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [4, 9], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_65_ansi_blocker": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [4, 9], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        }
+    }
+    ,"meta": "https://noroadsleft.github.io/kbf_qmk_converter/"
+}
diff --git a/keyboards/mechlovin/hannah910/rev2/rules.mk b/keyboards/mechlovin/hannah910/rev2/rules.mk
deleted file mode 100644
index 8a6e2c7b715..00000000000
--- a/keyboards/mechlovin/hannah910/rev2/rules.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
diff --git a/keyboards/mechlovin/hannah910/rev3/info.json b/keyboards/mechlovin/hannah910/rev3/info.json
deleted file mode 100644
index abeaa1e1824..00000000000
--- a/keyboards/mechlovin/hannah910/rev3/info.json
+++ /dev/null
@@ -1,201 +0,0 @@
-{
-    "keyboard_name": "Hannah910",
-    "manufacturer": "Mechlovin",
-    "url": "",
-    "maintainer": "Team Mechlovin'",
-    "usb": {
-        "vid": "0x4D4C",
-        "pid": "0x9103",
-        "device_version": "0.0.2"
-    },
-    "matrix_pins": {
-        "cols": ["E6", "B1", "B3", "F0", "F1", "F4", "F5", "F6", "F7", "D5", "D4", "B4", "D6", "D7", "B0"],
-        "rows": ["B5", "B6", "D3", "C6", "C7"]
-    },
-    "diode_direction": "COL2ROW",
-    "backlight": {
-        "pin": "B7",
-        "breathing": true
-    },
-    "rgblight": {
-        "led_count": 28,
-        "animations": {
-            "breathing": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "snake": true,
-            "knight": true,
-            "christmas": true,
-            "static_gradient": true,
-            "rgb_test": true,
-            "alternating": true,
-            "twinkle": true
-        }
-    },
-    "ws2812": {
-        "pin": "E2"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "community_layouts": ["65_ansi"],
-    "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": [0, 14], "x": 14, "y": 0},
-                {"matrix": [4, 8], "x": 15, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-                {"matrix": [1, 14], "x": 15, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 12], "x": 12.75, "y": 2},
-                {"matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.25},
-                {"matrix": [2, 14], "x": 15, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
-                {"matrix": [3, 1], "x": 1.25, "y": 3},
-                {"matrix": [3, 2], "x": 2.25, "y": 3},
-                {"matrix": [3, 3], "x": 3.25, "y": 3},
-                {"matrix": [3, 4], "x": 4.25, "y": 3},
-                {"matrix": [3, 5], "x": 5.25, "y": 3},
-                {"matrix": [3, 6], "x": 6.25, "y": 3},
-                {"matrix": [3, 7], "x": 7.25, "y": 3},
-                {"matrix": [3, 8], "x": 8.25, "y": 3},
-                {"matrix": [3, 9], "x": 9.25, "y": 3},
-                {"matrix": [3, 10], "x": 10.25, "y": 3},
-                {"matrix": [3, 11], "x": 11.25, "y": 3},
-                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"matrix": [3, 13], "x": 14, "y": 3},
-                {"matrix": [3, 14], "x": 15, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 2.75},
-                {"matrix": [4, 6], "x": 6.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 7], "x": 7.75, "y": 4, "w": 2.25},
-                {"matrix": [4, 9], "x": 10, "y": 4},
-                {"matrix": [4, 10], "x": 11, "y": 4},
-                {"matrix": [4, 11], "x": 12, "y": 4},
-                {"matrix": [4, 12], "x": 13, "y": 4},
-                {"matrix": [4, 13], "x": 14, "y": 4},
-                {"matrix": [4, 14], "x": 15, "y": 4}
-            ]
-        },
-        "LAYOUT_65_ansi": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 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": [4, 8], "x": 15, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-                {"matrix": [1, 14], "x": 15, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
-                {"matrix": [2, 14], "x": 15, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 2], "x": 2.25, "y": 3},
-                {"matrix": [3, 3], "x": 3.25, "y": 3},
-                {"matrix": [3, 4], "x": 4.25, "y": 3},
-                {"matrix": [3, 5], "x": 5.25, "y": 3},
-                {"matrix": [3, 6], "x": 6.25, "y": 3},
-                {"matrix": [3, 7], "x": 7.25, "y": 3},
-                {"matrix": [3, 8], "x": 8.25, "y": 3},
-                {"matrix": [3, 9], "x": 9.25, "y": 3},
-                {"matrix": [3, 10], "x": 10.25, "y": 3},
-                {"matrix": [3, 11], "x": 11.25, "y": 3},
-                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"matrix": [3, 13], "x": 14, "y": 3},
-                {"matrix": [3, 14], "x": 15, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
-                {"matrix": [4, 9], "x": 10, "y": 4},
-                {"matrix": [4, 10], "x": 11, "y": 4},
-                {"matrix": [4, 11], "x": 12, "y": 4},
-                {"matrix": [4, 12], "x": 13, "y": 4},
-                {"matrix": [4, 13], "x": 14, "y": 4},
-                {"matrix": [4, 14], "x": 15, "y": 4}
-            ]
-        }
-    }
-    ,"meta": "https://noroadsleft.github.io/kbf_qmk_converter/"
-}
diff --git a/keyboards/mechlovin/hannah910/rev3/keyboard.json b/keyboards/mechlovin/hannah910/rev3/keyboard.json
new file mode 100644
index 00000000000..8a6ea4d1234
--- /dev/null
+++ b/keyboards/mechlovin/hannah910/rev3/keyboard.json
@@ -0,0 +1,208 @@
+{
+    "keyboard_name": "Hannah910",
+    "manufacturer": "Mechlovin",
+    "url": "",
+    "maintainer": "Team Mechlovin'",
+    "usb": {
+        "vid": "0x4D4C",
+        "pid": "0x9103",
+        "device_version": "0.0.2"
+    },
+    "features": {
+        "bootmagic": true,
+        "mousekey": false,
+        "extrakey": true,
+        "backlight": true,
+        "rgblight": true
+    },
+    "matrix_pins": {
+        "cols": ["E6", "B1", "B3", "F0", "F1", "F4", "F5", "F6", "F7", "D5", "D4", "B4", "D6", "D7", "B0"],
+        "rows": ["B5", "B6", "D3", "C6", "C7"]
+    },
+    "diode_direction": "COL2ROW",
+    "backlight": {
+        "pin": "B7",
+        "breathing": true
+    },
+    "rgblight": {
+        "led_count": 28,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": true,
+            "twinkle": true
+        }
+    },
+    "ws2812": {
+        "pin": "E2"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "community_layouts": ["65_ansi"],
+    "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": [0, 14], "x": 14, "y": 0},
+                {"matrix": [4, 8], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 2.75},
+                {"matrix": [4, 6], "x": 6.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 7], "x": 7.75, "y": 4, "w": 2.25},
+                {"matrix": [4, 9], "x": 10, "y": 4},
+                {"matrix": [4, 10], "x": 11, "y": 4},
+                {"matrix": [4, 11], "x": 12, "y": 4},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_65_ansi": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 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": [4, 8], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4},
+                {"matrix": [4, 10], "x": 11, "y": 4},
+                {"matrix": [4, 11], "x": 12, "y": 4},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        }
+    }
+    ,"meta": "https://noroadsleft.github.io/kbf_qmk_converter/"
+}
diff --git a/keyboards/mechlovin/hannah910/rev3/rules.mk b/keyboards/mechlovin/hannah910/rev3/rules.mk
deleted file mode 100644
index 8a6e2c7b715..00000000000
--- a/keyboards/mechlovin/hannah910/rev3/rules.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
diff --git a/keyboards/mechlovin/hex4b/rev1/info.json b/keyboards/mechlovin/hex4b/rev1/info.json
deleted file mode 100644
index 1e9a7d57762..00000000000
--- a/keyboards/mechlovin/hex4b/rev1/info.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-    "keyboard_name": "Hex-4B Rev.1",
-    "usb": {
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["B6", "B5", "B3", "B2", "B1", "B0", "A0", "A6", "A7", "C7", "C6", "C5", "C4", "D1", "D0"],
-        "rows": ["B7", "A2", "A1", "A3", "A4", "A5"]
-    },
-    "diode_direction": "COL2ROW",
-    "backlight": {
-        "pin": "D4",
-        "levels": 5,
-        "breathing": true
-    },
-    "indicators": {
-        "caps_lock": "D7",
-        "num_lock": "D6",
-        "scroll_lock": "D5",
-        "on_state": 0
-    },
-    "processor": "atmega32a",
-    "bootloader": "usbasploader"
-}
diff --git a/keyboards/mechlovin/hex4b/rev1/keyboard.json b/keyboards/mechlovin/hex4b/rev1/keyboard.json
new file mode 100644
index 00000000000..d3251f5808e
--- /dev/null
+++ b/keyboards/mechlovin/hex4b/rev1/keyboard.json
@@ -0,0 +1,30 @@
+{
+    "keyboard_name": "Hex-4B Rev.1",
+    "usb": {
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "backlight": true
+    },
+    "matrix_pins": {
+        "cols": ["B6", "B5", "B3", "B2", "B1", "B0", "A0", "A6", "A7", "C7", "C6", "C5", "C4", "D1", "D0"],
+        "rows": ["B7", "A2", "A1", "A3", "A4", "A5"]
+    },
+    "diode_direction": "COL2ROW",
+    "backlight": {
+        "pin": "D4",
+        "levels": 5,
+        "breathing": true
+    },
+    "indicators": {
+        "caps_lock": "D7",
+        "num_lock": "D6",
+        "scroll_lock": "D5",
+        "on_state": 0
+    },
+    "processor": "atmega32a",
+    "bootloader": "usbasploader"
+}
diff --git a/keyboards/mechlovin/hex4b/rev1/rules.mk b/keyboards/mechlovin/hex4b/rev1/rules.mk
index 15d473397d4..c2ee0bc86f9 100644
--- a/keyboards/mechlovin/hex4b/rev1/rules.mk
+++ b/keyboards/mechlovin/hex4b/rev1/rules.mk
@@ -1,15 +1,2 @@
 # Processor frequency
 F_CPU = 16000000
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
diff --git a/keyboards/mechlovin/hex4b/rev2/info.json b/keyboards/mechlovin/hex4b/rev2/info.json
deleted file mode 100644
index 8609be01c31..00000000000
--- a/keyboards/mechlovin/hex4b/rev2/info.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-    "keyboard_name": "Hex-4B Rev.2",
-    "usb": {
-        "device_version": "0.0.2"
-    },
-    "matrix_pins": {
-        "cols": ["B11", "B10", "B2", "B1", "B0", "A7", "A6", "A5", "A3", "C13", "B7", "B6", "B5", "B4", "B3"],
-        "rows": ["A4", "B12", "B13", "B14", "B15", "A1"]
-    },
-    "diode_direction": "COL2ROW",
-    "backlight": {
-        "pin": "B8",
-        "levels": 5,
-        "breathing": true
-    },
-    "indicators": {
-        "caps_lock": "B9",
-        "num_lock": "C15",
-        "scroll_lock": "A15",
-        "on_state": 0
-    },
-    "processor": "STM32F103",
-    "bootloader": "stm32duino"
-}
diff --git a/keyboards/mechlovin/hex4b/rev2/keyboard.json b/keyboards/mechlovin/hex4b/rev2/keyboard.json
new file mode 100644
index 00000000000..1bdda81c5ab
--- /dev/null
+++ b/keyboards/mechlovin/hex4b/rev2/keyboard.json
@@ -0,0 +1,33 @@
+{
+    "keyboard_name": "Hex-4B Rev.2",
+    "usb": {
+        "device_version": "0.0.2"
+    },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "console": true,
+        "command": true,
+        "nkro": true,
+        "backlight": true
+    },
+    "matrix_pins": {
+        "cols": ["B11", "B10", "B2", "B1", "B0", "A7", "A6", "A5", "A3", "C13", "B7", "B6", "B5", "B4", "B3"],
+        "rows": ["A4", "B12", "B13", "B14", "B15", "A1"]
+    },
+    "diode_direction": "COL2ROW",
+    "backlight": {
+        "pin": "B8",
+        "levels": 5,
+        "breathing": true
+    },
+    "indicators": {
+        "caps_lock": "B9",
+        "num_lock": "C15",
+        "scroll_lock": "A15",
+        "on_state": 0
+    },
+    "processor": "STM32F103",
+    "bootloader": "stm32duino"
+}
diff --git a/keyboards/mechlovin/hex4b/rev2/rules.mk b/keyboards/mechlovin/hex4b/rev2/rules.mk
deleted file mode 100644
index a5089d51a5b..00000000000
--- a/keyboards/mechlovin/hex4b/rev2/rules.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = yes        # Console for debug
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
diff --git a/keyboards/mechlovin/infinity87/rev1/info.json b/keyboards/mechlovin/infinity87/rev1/info.json
index 249bbd5cb47..dbe7cb83f99 100644
--- a/keyboards/mechlovin/infinity87/rev1/info.json
+++ b/keyboards/mechlovin/infinity87/rev1/info.json
@@ -1,13 +1,4 @@
 {
-    "features": {
-        "backlight": true,
-        "bootmagic": false,
-        "command": false,
-        "console": false,
-        "extrakey": false,
-        "mousekey": false,
-        "nkro": false
-    },
     "matrix_pins": {
         "cols": ["C13", "B9", "B4", "B7", "B8", "B5", "B6", "A9", "A5", "A6", "A7", "B1", "B2", "B10", "B3", "B14", "B15"],
         "rows": ["A10", "B13", "B12", "B11", "C14", "C15"]
diff --git a/keyboards/mechlovin/infinity87/rev1/rogue87/keyboard.json b/keyboards/mechlovin/infinity87/rev1/rogue87/keyboard.json
index 6fdc9d6e5d3..2ac0510dbf3 100644
--- a/keyboards/mechlovin/infinity87/rev1/rogue87/keyboard.json
+++ b/keyboards/mechlovin/infinity87/rev1/rogue87/keyboard.json
@@ -8,6 +8,12 @@
         "pid": "0x8704",
         "device_version": "0.0.1"
     },
+    "features": {
+        "bootmagic": false,
+        "mousekey": false,
+        "extrakey": false,
+        "backlight": true
+    },
     "layouts": {
         "LAYOUT_all": {
             "layout": [
diff --git a/keyboards/mechlovin/infinity87/rev1/rouge87/keyboard.json b/keyboards/mechlovin/infinity87/rev1/rouge87/keyboard.json
index 39a9f169258..6b947f0f1f1 100644
--- a/keyboards/mechlovin/infinity87/rev1/rouge87/keyboard.json
+++ b/keyboards/mechlovin/infinity87/rev1/rouge87/keyboard.json
@@ -8,6 +8,12 @@
         "pid": "0x8703",
         "device_version": "0.0.1"
     },
+    "features": {
+        "bootmagic": false,
+        "mousekey": false,
+        "extrakey": false,
+        "backlight": true
+    },
     "community_layouts": [
         "tkl_ansi_tsangan",
         "tkl_iso_tsangan"
diff --git a/keyboards/mechlovin/infinity87/rev1/standard/info.json b/keyboards/mechlovin/infinity87/rev1/standard/info.json
deleted file mode 100644
index 964a7a8cb9a..00000000000
--- a/keyboards/mechlovin/infinity87/rev1/standard/info.json
+++ /dev/null
@@ -1,1400 +0,0 @@
-{
-    "keyboard_name": "infinity87 Rev.1",
-    "manufacturer": "Mechlovin.Studio",
-    "url": "",
-    "maintainer": "Team Mechlovin'",
-    "usb": {
-        "vid": "0x4D4C",
-        "pid": "0x8701",
-        "device_version": "0.0.1"
-    },
-    "rgblight": {
-        "led_count": 26,
-        "sleep": true,
-        "animations": {
-            "breathing": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "snake": true,
-            "knight": true,
-            "christmas": true,
-            "static_gradient": true,
-            "rgb_test": true,
-            "alternating": true,
-            "twinkle": true
-        }
-    },
-    "ws2812": {
-        "pin": "A15"
-    },
-    "community_layouts": [
-        "tkl_ansi",
-        "tkl_ansi_split_bs_rshift",
-        "tkl_ansi_tsangan",
-        "tkl_ansi_tsangan_split_bs_rshift",
-        "tkl_iso",
-        "tkl_iso_split_bs_rshift",
-        "tkl_iso_tsangan",
-        "tkl_iso_tsangan_split_bs_rshift"
-    ],
-    "layouts": {
-        "LAYOUT_all": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-
-                {"label": "F1", "matrix": [0, 1], "x": 2, "y": 0},
-                {"label": "F2", "matrix": [0, 2], "x": 3, "y": 0},
-                {"label": "F3", "matrix": [0, 3], "x": 4, "y": 0},
-                {"label": "F4", "matrix": [0, 4], "x": 5, "y": 0},
-
-                {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 0},
-                {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 0},
-                {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 0},
-                {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 0},
-
-                {"label": "F9", "matrix": [0, 9], "x": 11, "y": 0},
-                {"label": "F10", "matrix": [0, 10], "x": 12, "y": 0},
-                {"label": "F11", "matrix": [0, 11], "x": 13, "y": 0},
-                {"label": "F12", "matrix": [0, 12], "x": 14, "y": 0},
-
-                {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
-                {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
-                {"label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0},
-
-                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
-                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
-                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
-                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
-                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
-                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
-                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
-                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
-                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
-                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
-                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
-                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
-                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
-                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25},
-                {"label": "Backspace", "matrix": [0, 13], "x": 14, "y": 1.25},
-
-                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
-                {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25},
-                {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "y": 1.25},
-
-                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
-                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
-                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
-                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
-                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
-                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
-                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
-                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
-                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
-                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
-                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
-                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
-                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
-                {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
-
-                {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
-                {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25},
-                {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2.25},
-
-                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
-                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
-                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
-                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
-                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
-                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
-                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
-                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
-                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
-                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
-                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
-                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
-                {"label": "#", "matrix": [3, 12], "x": 12.75, "y": 3.25},
-                {"label": "Enter", "matrix": [3, 13], "x": 13.75, "y": 3.25, "w": 1.25},
-
-                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
-                {"label": "\\", "matrix": [4, 1], "x": 1.25, "y": 4.25},
-                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
-                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
-                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
-                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
-                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
-                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
-                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
-                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
-                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
-                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
-                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
-                {"label": "Fn", "matrix": [4, 13], "x": 14, "y": 4.25},
-
-                {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25},
-
-                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
-                {"label": "GUI", "matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
-                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
-                {"label": "Space", "matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
-                {"label": "Alt", "matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
-                {"label": "GUI", "matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
-                {"label": "Menu", "matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
-                {"label": "Ctrl", "matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
-
-                {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
-                {"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25},
-                {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
-            ]
-        },
-        "LAYOUT_tkl_ansi": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-
-                {"label": "F1", "matrix": [0, 1], "x": 2, "y": 0},
-                {"label": "F2", "matrix": [0, 2], "x": 3, "y": 0},
-                {"label": "F3", "matrix": [0, 3], "x": 4, "y": 0},
-                {"label": "F4", "matrix": [0, 4], "x": 5, "y": 0},
-
-                {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 0},
-                {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 0},
-                {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 0},
-                {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 0},
-
-                {"label": "F9", "matrix": [0, 9], "x": 11, "y": 0},
-                {"label": "F10", "matrix": [0, 10], "x": 12, "y": 0},
-                {"label": "F11", "matrix": [0, 11], "x": 13, "y": 0},
-                {"label": "F12", "matrix": [0, 12], "x": 14, "y": 0},
-
-                {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
-                {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
-                {"label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0},
-
-                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
-                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
-                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
-                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
-                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
-                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
-                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
-                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
-                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
-                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
-                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
-                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
-                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
-                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
-
-                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
-                {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25},
-                {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "y": 1.25},
-
-                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
-                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
-                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
-                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
-                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
-                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
-                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
-                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
-                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
-                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
-                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
-                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
-                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
-                {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
-
-                {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
-                {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25},
-                {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2.25},
-
-                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
-                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
-                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
-                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
-                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
-                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
-                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
-                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
-                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
-                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
-                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
-                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
-                {"label": "Enter", "matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
-
-                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
-                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
-                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
-                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
-                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
-                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
-                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
-                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
-                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
-                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
-                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
-                {"label": "Shift", "matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 2.75},
-
-                {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25},
-
-                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
-                {"label": "GUI", "matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
-                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
-                {"label": "Space", "matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
-                {"label": "Alt", "matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
-                {"label": "GUI", "matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
-                {"label": "Menu", "matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
-                {"label": "Ctrl", "matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
-
-                {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
-                {"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25},
-                {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
-            ]
-        },
-        "LAYOUT_tkl_ansi_split_bs_rshift": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-
-                {"label": "F1", "matrix": [0, 1], "x": 2, "y": 0},
-                {"label": "F2", "matrix": [0, 2], "x": 3, "y": 0},
-                {"label": "F3", "matrix": [0, 3], "x": 4, "y": 0},
-                {"label": "F4", "matrix": [0, 4], "x": 5, "y": 0},
-
-                {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 0},
-                {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 0},
-                {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 0},
-                {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 0},
-
-                {"label": "F9", "matrix": [0, 9], "x": 11, "y": 0},
-                {"label": "F10", "matrix": [0, 10], "x": 12, "y": 0},
-                {"label": "F11", "matrix": [0, 11], "x": 13, "y": 0},
-                {"label": "F12", "matrix": [0, 12], "x": 14, "y": 0},
-
-                {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
-                {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
-                {"label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0},
-
-                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
-                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
-                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
-                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
-                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
-                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
-                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
-                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
-                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
-                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
-                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
-                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
-                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
-                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25},
-                {"label": "Backspace", "matrix": [0, 13], "x": 14, "y": 1.25},
-
-                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
-                {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25},
-                {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "y": 1.25},
-
-                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
-                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
-                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
-                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
-                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
-                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
-                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
-                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
-                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
-                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
-                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
-                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
-                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
-                {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
-
-                {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
-                {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25},
-                {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2.25},
-
-                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
-                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
-                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
-                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
-                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
-                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
-                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
-                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
-                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
-                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
-                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
-                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
-                {"label": "Enter", "matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
-
-                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
-                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
-                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
-                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
-                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
-                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
-                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
-                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
-                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
-                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
-                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
-                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
-                {"label": "Fn", "matrix": [4, 13], "x": 14, "y": 4.25},
-
-                {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25},
-
-                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
-                {"label": "GUI", "matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
-                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
-                {"label": "Space", "matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
-                {"label": "Alt", "matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
-                {"label": "GUI", "matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
-                {"label": "Menu", "matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
-                {"label": "Ctrl", "matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
-
-                {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
-                {"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25},
-                {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
-            ]
-        },
-        "LAYOUT_tkl_ansi_tsangan": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-
-                {"label": "F1", "matrix": [0, 1], "x": 2, "y": 0},
-                {"label": "F2", "matrix": [0, 2], "x": 3, "y": 0},
-                {"label": "F3", "matrix": [0, 3], "x": 4, "y": 0},
-                {"label": "F4", "matrix": [0, 4], "x": 5, "y": 0},
-
-                {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 0},
-                {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 0},
-                {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 0},
-                {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 0},
-
-                {"label": "F9", "matrix": [0, 9], "x": 11, "y": 0},
-                {"label": "F10", "matrix": [0, 10], "x": 12, "y": 0},
-                {"label": "F11", "matrix": [0, 11], "x": 13, "y": 0},
-                {"label": "F12", "matrix": [0, 12], "x": 14, "y": 0},
-
-                {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
-                {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
-                {"label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0},
-
-                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
-                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
-                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
-                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
-                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
-                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
-                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
-                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
-                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
-                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
-                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
-                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
-                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
-                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
-
-                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
-                {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25},
-                {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "y": 1.25},
-
-                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
-                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
-                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
-                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
-                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
-                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
-                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
-                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
-                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
-                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
-                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
-                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
-                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
-                {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
-
-                {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
-                {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25},
-                {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2.25},
-
-                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
-                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
-                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
-                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
-                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
-                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
-                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
-                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
-                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
-                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
-                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
-                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
-                {"label": "Enter", "matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
-
-                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
-                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
-                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
-                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
-                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
-                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
-                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
-                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
-                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
-                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
-                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
-                {"label": "Shift", "matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 2.75},
-
-                {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25},
-
-                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
-                {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 5.25},
-                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
-                {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
-                {"label": "Alt", "matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5},
-                {"label": "Menu", "matrix": [5, 12], "x": 12.5, "y": 5.25},
-                {"label": "Ctrl", "matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
-
-                {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
-                {"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25},
-                {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
-            ]
-        },
-        "LAYOUT_tkl_ansi_tsangan_split_bs_rshift": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-
-                {"label": "F1", "matrix": [0, 1], "x": 2, "y": 0},
-                {"label": "F2", "matrix": [0, 2], "x": 3, "y": 0},
-                {"label": "F3", "matrix": [0, 3], "x": 4, "y": 0},
-                {"label": "F4", "matrix": [0, 4], "x": 5, "y": 0},
-
-                {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 0},
-                {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 0},
-                {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 0},
-                {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 0},
-
-                {"label": "F9", "matrix": [0, 9], "x": 11, "y": 0},
-                {"label": "F10", "matrix": [0, 10], "x": 12, "y": 0},
-                {"label": "F11", "matrix": [0, 11], "x": 13, "y": 0},
-                {"label": "F12", "matrix": [0, 12], "x": 14, "y": 0},
-
-                {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
-                {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
-                {"label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0},
-
-                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
-                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
-                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
-                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
-                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
-                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
-                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
-                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
-                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
-                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
-                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
-                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
-                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
-                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25},
-                {"label": "Backspace", "matrix": [0, 13], "x": 14, "y": 1.25},
-
-                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
-                {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25},
-                {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "y": 1.25},
-
-                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
-                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
-                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
-                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
-                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
-                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
-                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
-                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
-                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
-                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
-                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
-                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
-                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
-                {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
-
-                {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
-                {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25},
-                {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2.25},
-
-                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
-                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
-                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
-                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
-                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
-                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
-                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
-                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
-                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
-                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
-                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
-                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
-                {"label": "Enter", "matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
-
-                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
-                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
-                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
-                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
-                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
-                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
-                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
-                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
-                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
-                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
-                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
-                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
-                {"label": "Fn", "matrix": [4, 13], "x": 14, "y": 4.25},
-
-                {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25},
-
-                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
-                {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 5.25},
-                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
-                {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
-                {"label": "Alt", "matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5},
-                {"label": "Menu", "matrix": [5, 12], "x": 12.5, "y": 5.25},
-                {"label": "Ctrl", "matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
-
-                {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
-                {"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25},
-                {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
-            ]
-        },
-        "LAYOUT_tkl_ansi_wkl": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-
-                {"label": "F1", "matrix": [0, 1], "x": 2, "y": 0},
-                {"label": "F2", "matrix": [0, 2], "x": 3, "y": 0},
-                {"label": "F3", "matrix": [0, 3], "x": 4, "y": 0},
-                {"label": "F4", "matrix": [0, 4], "x": 5, "y": 0},
-
-                {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 0},
-                {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 0},
-                {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 0},
-                {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 0},
-
-                {"label": "F9", "matrix": [0, 9], "x": 11, "y": 0},
-                {"label": "F10", "matrix": [0, 10], "x": 12, "y": 0},
-                {"label": "F11", "matrix": [0, 11], "x": 13, "y": 0},
-                {"label": "F12", "matrix": [0, 12], "x": 14, "y": 0},
-
-                {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
-                {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
-                {"label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0},
-
-                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
-                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
-                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
-                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
-                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
-                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
-                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
-                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
-                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
-                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
-                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
-                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
-                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
-                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
-
-                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
-                {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25},
-                {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "y": 1.25},
-
-                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
-                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
-                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
-                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
-                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
-                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
-                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
-                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
-                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
-                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
-                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
-                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
-                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
-                {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
-
-                {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
-                {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25},
-                {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2.25},
-
-                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
-                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
-                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
-                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
-                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
-                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
-                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
-                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
-                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
-                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
-                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
-                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
-                {"label": "Enter", "matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
-
-                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
-                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
-                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
-                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
-                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
-                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
-                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
-                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
-                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
-                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
-                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
-                {"label": "Shift", "matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 2.75},
-
-                {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25},
-
-                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
-                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
-                {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
-                {"label": "Alt", "matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5},
-                {"label": "Ctrl", "matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
-
-                {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
-                {"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25},
-                {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
-            ]
-        },
-        "LAYOUT_tkl_ansi_wkl_split_bs_rshift": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-
-                {"label": "F1", "matrix": [0, 1], "x": 2, "y": 0},
-                {"label": "F2", "matrix": [0, 2], "x": 3, "y": 0},
-                {"label": "F3", "matrix": [0, 3], "x": 4, "y": 0},
-                {"label": "F4", "matrix": [0, 4], "x": 5, "y": 0},
-
-                {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 0},
-                {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 0},
-                {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 0},
-                {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 0},
-
-                {"label": "F9", "matrix": [0, 9], "x": 11, "y": 0},
-                {"label": "F10", "matrix": [0, 10], "x": 12, "y": 0},
-                {"label": "F11", "matrix": [0, 11], "x": 13, "y": 0},
-                {"label": "F12", "matrix": [0, 12], "x": 14, "y": 0},
-
-                {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
-                {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
-                {"label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0},
-
-                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
-                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
-                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
-                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
-                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
-                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
-                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
-                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
-                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
-                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
-                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
-                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
-                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
-                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25},
-                {"label": "Backspace", "matrix": [0, 13], "x": 14, "y": 1.25},
-
-                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
-                {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25},
-                {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "y": 1.25},
-
-                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
-                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
-                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
-                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
-                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
-                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
-                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
-                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
-                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
-                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
-                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
-                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
-                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
-                {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
-
-                {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
-                {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25},
-                {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2.25},
-
-                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
-                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
-                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
-                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
-                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
-                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
-                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
-                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
-                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
-                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
-                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
-                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
-                {"label": "Enter", "matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
-
-                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
-                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
-                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
-                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
-                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
-                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
-                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
-                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
-                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
-                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
-                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
-                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
-                {"label": "Fn", "matrix": [4, 13], "x": 14, "y": 4.25},
-
-                {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25},
-
-                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
-                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
-                {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
-                {"label": "Alt", "matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5},
-                {"label": "Ctrl", "matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
-
-                {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
-                {"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25},
-                {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
-            ]
-        },
-        "LAYOUT_tkl_iso": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-
-                {"label": "F1", "matrix": [0, 1], "x": 2, "y": 0},
-                {"label": "F2", "matrix": [0, 2], "x": 3, "y": 0},
-                {"label": "F3", "matrix": [0, 3], "x": 4, "y": 0},
-                {"label": "F4", "matrix": [0, 4], "x": 5, "y": 0},
-
-                {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 0},
-                {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 0},
-                {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 0},
-                {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 0},
-
-                {"label": "F9", "matrix": [0, 9], "x": 11, "y": 0},
-                {"label": "F10", "matrix": [0, 10], "x": 12, "y": 0},
-                {"label": "F11", "matrix": [0, 11], "x": 13, "y": 0},
-                {"label": "F12", "matrix": [0, 12], "x": 14, "y": 0},
-
-                {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
-                {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
-                {"label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0},
-
-                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
-                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
-                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
-                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
-                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
-                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
-                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
-                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
-                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
-                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
-                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
-                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
-                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
-                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
-
-                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
-                {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25},
-                {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "y": 1.25},
-
-                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
-                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
-                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
-                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
-                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
-                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
-                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
-                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
-                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
-                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
-                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
-                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
-                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
-
-                {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
-                {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25},
-                {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2.25},
-
-                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
-                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
-                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
-                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
-                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
-                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
-                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
-                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
-                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
-                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
-                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
-                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
-                {"label": "#", "matrix": [3, 12], "x": 12.75, "y": 3.25},
-                {"label": "Enter", "matrix": [3, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
-
-                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
-                {"label": "\\", "matrix": [4, 1], "x": 1.25, "y": 4.25},
-                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
-                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
-                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
-                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
-                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
-                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
-                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
-                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
-                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
-                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
-                {"label": "Shift", "matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 2.75},
-
-                {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25},
-
-                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
-                {"label": "GUI", "matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
-                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
-                {"label": "Space", "matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
-                {"label": "Alt", "matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
-                {"label": "GUI", "matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
-                {"label": "Menu", "matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
-                {"label": "Ctrl", "matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
-
-                {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
-                {"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25},
-                {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
-            ]
-        },
-        "LAYOUT_tkl_iso_split_bs_rshift": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-
-                {"label": "F1", "matrix": [0, 1], "x": 2, "y": 0},
-                {"label": "F2", "matrix": [0, 2], "x": 3, "y": 0},
-                {"label": "F3", "matrix": [0, 3], "x": 4, "y": 0},
-                {"label": "F4", "matrix": [0, 4], "x": 5, "y": 0},
-
-                {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 0},
-                {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 0},
-                {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 0},
-                {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 0},
-
-                {"label": "F9", "matrix": [0, 9], "x": 11, "y": 0},
-                {"label": "F10", "matrix": [0, 10], "x": 12, "y": 0},
-                {"label": "F11", "matrix": [0, 11], "x": 13, "y": 0},
-                {"label": "F12", "matrix": [0, 12], "x": 14, "y": 0},
-
-                {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
-                {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
-                {"label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0},
-
-                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
-                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
-                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
-                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
-                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
-                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
-                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
-                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
-                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
-                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
-                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
-                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
-                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
-                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25},
-                {"label": "Backspace", "matrix": [0, 13], "x": 14, "y": 1.25},
-
-                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
-                {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25},
-                {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "y": 1.25},
-
-                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
-                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
-                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
-                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
-                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
-                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
-                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
-                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
-                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
-                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
-                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
-                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
-                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
-
-                {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
-                {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25},
-                {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2.25},
-
-                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
-                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
-                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
-                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
-                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
-                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
-                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
-                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
-                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
-                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
-                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
-                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
-                {"label": "#", "matrix": [3, 12], "x": 12.75, "y": 3.25},
-                {"label": "Enter", "matrix": [3, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
-
-                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
-                {"label": "\\", "matrix": [4, 1], "x": 1.25, "y": 4.25},
-                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
-                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
-                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
-                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
-                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
-                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
-                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
-                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
-                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
-                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
-                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
-                {"label": "Fn", "matrix": [4, 13], "x": 14, "y": 4.25},
-
-                {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25},
-
-                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
-                {"label": "GUI", "matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
-                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
-                {"label": "Space", "matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
-                {"label": "Alt", "matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
-                {"label": "GUI", "matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
-                {"label": "Menu", "matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
-                {"label": "Ctrl", "matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
-
-                {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
-                {"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25},
-                {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
-            ]
-        },
-        "LAYOUT_tkl_iso_tsangan": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-
-                {"label": "F1", "matrix": [0, 1], "x": 2, "y": 0},
-                {"label": "F2", "matrix": [0, 2], "x": 3, "y": 0},
-                {"label": "F3", "matrix": [0, 3], "x": 4, "y": 0},
-                {"label": "F4", "matrix": [0, 4], "x": 5, "y": 0},
-
-                {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 0},
-                {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 0},
-                {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 0},
-                {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 0},
-
-                {"label": "F9", "matrix": [0, 9], "x": 11, "y": 0},
-                {"label": "F10", "matrix": [0, 10], "x": 12, "y": 0},
-                {"label": "F11", "matrix": [0, 11], "x": 13, "y": 0},
-                {"label": "F12", "matrix": [0, 12], "x": 14, "y": 0},
-
-                {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
-                {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
-                {"label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0},
-
-                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
-                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
-                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
-                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
-                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
-                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
-                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
-                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
-                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
-                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
-                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
-                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
-                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
-                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
-
-                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
-                {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25},
-                {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "y": 1.25},
-
-                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
-                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
-                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
-                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
-                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
-                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
-                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
-                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
-                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
-                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
-                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
-                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
-                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
-
-                {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
-                {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25},
-                {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2.25},
-
-                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
-                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
-                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
-                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
-                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
-                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
-                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
-                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
-                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
-                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
-                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
-                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
-                {"label": "#", "matrix": [3, 12], "x": 12.75, "y": 3.25},
-                {"label": "Enter", "matrix": [3, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
-
-                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
-                {"label": "\\", "matrix": [4, 1], "x": 1.25, "y": 4.25},
-                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
-                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
-                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
-                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
-                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
-                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
-                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
-                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
-                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
-                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
-                {"label": "Shift", "matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 2.75},
-
-                {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25},
-
-                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
-                {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 5.25},
-                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
-                {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
-                {"label": "Alt", "matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5},
-                {"label": "Menu", "matrix": [5, 12], "x": 12.5, "y": 5.25},
-                {"label": "Ctrl", "matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
-
-                {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
-                {"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25},
-                {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
-            ]
-        },
-        "LAYOUT_tkl_iso_tsangan_split_bs_rshift": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-
-                {"label": "F1", "matrix": [0, 1], "x": 2, "y": 0},
-                {"label": "F2", "matrix": [0, 2], "x": 3, "y": 0},
-                {"label": "F3", "matrix": [0, 3], "x": 4, "y": 0},
-                {"label": "F4", "matrix": [0, 4], "x": 5, "y": 0},
-
-                {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 0},
-                {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 0},
-                {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 0},
-                {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 0},
-
-                {"label": "F9", "matrix": [0, 9], "x": 11, "y": 0},
-                {"label": "F10", "matrix": [0, 10], "x": 12, "y": 0},
-                {"label": "F11", "matrix": [0, 11], "x": 13, "y": 0},
-                {"label": "F12", "matrix": [0, 12], "x": 14, "y": 0},
-
-                {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
-                {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
-                {"label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0},
-
-                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
-                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
-                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
-                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
-                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
-                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
-                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
-                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
-                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
-                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
-                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
-                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
-                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
-                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25},
-                {"label": "Backspace", "matrix": [0, 13], "x": 14, "y": 1.25},
-
-                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
-                {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25},
-                {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "y": 1.25},
-
-                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
-                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
-                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
-                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
-                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
-                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
-                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
-                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
-                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
-                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
-                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
-                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
-                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
-
-                {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
-                {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25},
-                {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2.25},
-
-                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
-                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
-                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
-                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
-                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
-                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
-                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
-                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
-                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
-                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
-                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
-                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
-                {"label": "#", "matrix": [3, 12], "x": 12.75, "y": 3.25},
-                {"label": "Enter", "matrix": [3, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
-
-                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
-                {"label": "\\", "matrix": [4, 1], "x": 1.25, "y": 4.25},
-                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
-                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
-                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
-                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
-                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
-                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
-                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
-                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
-                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
-                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
-                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
-                {"label": "Fn", "matrix": [4, 13], "x": 14, "y": 4.25},
-
-                {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25},
-
-                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
-                {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 5.25},
-                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
-                {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
-                {"label": "Alt", "matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5},
-                {"label": "Menu", "matrix": [5, 12], "x": 12.5, "y": 5.25},
-                {"label": "Ctrl", "matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
-
-                {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
-                {"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25},
-                {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
-            ]
-        },
-        "LAYOUT_tkl_iso_wkl": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-
-                {"label": "F1", "matrix": [0, 1], "x": 2, "y": 0},
-                {"label": "F2", "matrix": [0, 2], "x": 3, "y": 0},
-                {"label": "F3", "matrix": [0, 3], "x": 4, "y": 0},
-                {"label": "F4", "matrix": [0, 4], "x": 5, "y": 0},
-
-                {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 0},
-                {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 0},
-                {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 0},
-                {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 0},
-
-                {"label": "F9", "matrix": [0, 9], "x": 11, "y": 0},
-                {"label": "F10", "matrix": [0, 10], "x": 12, "y": 0},
-                {"label": "F11", "matrix": [0, 11], "x": 13, "y": 0},
-                {"label": "F12", "matrix": [0, 12], "x": 14, "y": 0},
-
-                {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
-                {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
-                {"label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0},
-
-                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
-                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
-                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
-                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
-                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
-                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
-                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
-                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
-                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
-                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
-                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
-                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
-                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
-                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
-
-                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
-                {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25},
-                {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "y": 1.25},
-
-                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
-                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
-                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
-                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
-                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
-                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
-                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
-                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
-                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
-                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
-                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
-                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
-                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
-
-                {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
-                {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25},
-                {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2.25},
-
-                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
-                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
-                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
-                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
-                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
-                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
-                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
-                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
-                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
-                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
-                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
-                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
-                {"label": "#", "matrix": [3, 12], "x": 12.75, "y": 3.25},
-                {"label": "Enter", "matrix": [3, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
-
-                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
-                {"label": "\\", "matrix": [4, 1], "x": 1.25, "y": 4.25},
-                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
-                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
-                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
-                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
-                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
-                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
-                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
-                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
-                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
-                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
-                {"label": "Shift", "matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 2.75},
-
-                {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25},
-
-                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
-                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
-                {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
-                {"label": "Alt", "matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5},
-                {"label": "Ctrl", "matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
-
-                {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
-                {"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25},
-                {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
-            ]
-        },
-        "LAYOUT_tkl_iso_wkl_split_bs_rshift": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-
-                {"label": "F1", "matrix": [0, 1], "x": 2, "y": 0},
-                {"label": "F2", "matrix": [0, 2], "x": 3, "y": 0},
-                {"label": "F3", "matrix": [0, 3], "x": 4, "y": 0},
-                {"label": "F4", "matrix": [0, 4], "x": 5, "y": 0},
-
-                {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 0},
-                {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 0},
-                {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 0},
-                {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 0},
-
-                {"label": "F9", "matrix": [0, 9], "x": 11, "y": 0},
-                {"label": "F10", "matrix": [0, 10], "x": 12, "y": 0},
-                {"label": "F11", "matrix": [0, 11], "x": 13, "y": 0},
-                {"label": "F12", "matrix": [0, 12], "x": 14, "y": 0},
-
-                {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
-                {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
-                {"label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0},
-
-                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
-                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
-                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
-                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
-                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
-                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
-                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
-                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
-                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
-                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
-                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
-                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
-                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
-                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25},
-                {"label": "Backspace", "matrix": [0, 13], "x": 14, "y": 1.25},
-
-                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
-                {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25},
-                {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "y": 1.25},
-
-                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
-                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
-                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
-                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
-                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
-                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
-                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
-                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
-                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
-                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
-                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
-                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
-                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
-
-                {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
-                {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25},
-                {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2.25},
-
-                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
-                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
-                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
-                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
-                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
-                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
-                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
-                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
-                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
-                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
-                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
-                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
-                {"label": "#", "matrix": [3, 12], "x": 12.75, "y": 3.25},
-                {"label": "Enter", "matrix": [3, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
-
-                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
-                {"label": "\\", "matrix": [4, 1], "x": 1.25, "y": 4.25},
-                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
-                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
-                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
-                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
-                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
-                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
-                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
-                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
-                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
-                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
-                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
-                {"label": "Fn", "matrix": [4, 13], "x": 14, "y": 4.25},
-
-                {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25},
-
-                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
-                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
-                {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
-                {"label": "Alt", "matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5},
-                {"label": "Ctrl", "matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
-
-                {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
-                {"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25},
-                {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
-            ]
-        }
-    }
-}
diff --git a/keyboards/mechlovin/infinity87/rev1/standard/keyboard.json b/keyboards/mechlovin/infinity87/rev1/standard/keyboard.json
new file mode 100644
index 00000000000..a0cb10fac22
--- /dev/null
+++ b/keyboards/mechlovin/infinity87/rev1/standard/keyboard.json
@@ -0,0 +1,1410 @@
+{
+    "keyboard_name": "infinity87 Rev.1",
+    "manufacturer": "Mechlovin.Studio",
+    "url": "",
+    "maintainer": "Team Mechlovin'",
+    "usb": {
+        "vid": "0x4D4C",
+        "pid": "0x8701",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "console": true,
+        "command": true,
+        "nkro": true,
+        "backlight": true,
+        "rgblight": true
+    },
+    "rgblight": {
+        "led_count": 26,
+        "sleep": true,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": true,
+            "twinkle": true
+        }
+    },
+    "ws2812": {
+        "pin": "A15"
+    },
+    "community_layouts": [
+        "tkl_ansi",
+        "tkl_ansi_split_bs_rshift",
+        "tkl_ansi_tsangan",
+        "tkl_ansi_tsangan_split_bs_rshift",
+        "tkl_iso",
+        "tkl_iso_split_bs_rshift",
+        "tkl_iso_tsangan",
+        "tkl_iso_tsangan_split_bs_rshift"
+    ],
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "F1", "matrix": [0, 1], "x": 2, "y": 0},
+                {"label": "F2", "matrix": [0, 2], "x": 3, "y": 0},
+                {"label": "F3", "matrix": [0, 3], "x": 4, "y": 0},
+                {"label": "F4", "matrix": [0, 4], "x": 5, "y": 0},
+
+                {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 0},
+                {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 0},
+                {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 0},
+                {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 0},
+
+                {"label": "F9", "matrix": [0, 9], "x": 11, "y": 0},
+                {"label": "F10", "matrix": [0, 10], "x": 12, "y": 0},
+                {"label": "F11", "matrix": [0, 11], "x": 13, "y": 0},
+                {"label": "F12", "matrix": [0, 12], "x": 14, "y": 0},
+
+                {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
+                {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
+                {"label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
+                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
+                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
+                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
+                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
+                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
+                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
+                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
+                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
+                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
+                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
+                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
+                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
+                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25},
+                {"label": "Backspace", "matrix": [0, 13], "x": 14, "y": 1.25},
+
+                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"label": "#", "matrix": [3, 12], "x": 12.75, "y": 3.25},
+                {"label": "Enter", "matrix": [3, 13], "x": 13.75, "y": 3.25, "w": 1.25},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"label": "\\", "matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"label": "Fn", "matrix": [4, 13], "x": 14, "y": 4.25},
+
+                {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"label": "GUI", "matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"label": "Space", "matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"label": "Alt", "matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
+                {"label": "GUI", "matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"label": "Menu", "matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"label": "Ctrl", "matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_ansi": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "F1", "matrix": [0, 1], "x": 2, "y": 0},
+                {"label": "F2", "matrix": [0, 2], "x": 3, "y": 0},
+                {"label": "F3", "matrix": [0, 3], "x": 4, "y": 0},
+                {"label": "F4", "matrix": [0, 4], "x": 5, "y": 0},
+
+                {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 0},
+                {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 0},
+                {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 0},
+                {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 0},
+
+                {"label": "F9", "matrix": [0, 9], "x": 11, "y": 0},
+                {"label": "F10", "matrix": [0, 10], "x": 12, "y": 0},
+                {"label": "F11", "matrix": [0, 11], "x": 13, "y": 0},
+                {"label": "F12", "matrix": [0, 12], "x": 14, "y": 0},
+
+                {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
+                {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
+                {"label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
+                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
+                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
+                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
+                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
+                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
+                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
+                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
+                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
+                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
+                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
+                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
+                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
+                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+
+                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"label": "Enter", "matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"label": "Shift", "matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"label": "GUI", "matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"label": "Space", "matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"label": "Alt", "matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
+                {"label": "GUI", "matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"label": "Menu", "matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"label": "Ctrl", "matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_ansi_split_bs_rshift": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "F1", "matrix": [0, 1], "x": 2, "y": 0},
+                {"label": "F2", "matrix": [0, 2], "x": 3, "y": 0},
+                {"label": "F3", "matrix": [0, 3], "x": 4, "y": 0},
+                {"label": "F4", "matrix": [0, 4], "x": 5, "y": 0},
+
+                {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 0},
+                {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 0},
+                {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 0},
+                {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 0},
+
+                {"label": "F9", "matrix": [0, 9], "x": 11, "y": 0},
+                {"label": "F10", "matrix": [0, 10], "x": 12, "y": 0},
+                {"label": "F11", "matrix": [0, 11], "x": 13, "y": 0},
+                {"label": "F12", "matrix": [0, 12], "x": 14, "y": 0},
+
+                {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
+                {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
+                {"label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
+                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
+                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
+                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
+                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
+                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
+                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
+                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
+                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
+                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
+                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
+                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
+                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
+                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25},
+                {"label": "Backspace", "matrix": [0, 13], "x": 14, "y": 1.25},
+
+                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"label": "Enter", "matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"label": "Fn", "matrix": [4, 13], "x": 14, "y": 4.25},
+
+                {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"label": "GUI", "matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"label": "Space", "matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"label": "Alt", "matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
+                {"label": "GUI", "matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"label": "Menu", "matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"label": "Ctrl", "matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_ansi_tsangan": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "F1", "matrix": [0, 1], "x": 2, "y": 0},
+                {"label": "F2", "matrix": [0, 2], "x": 3, "y": 0},
+                {"label": "F3", "matrix": [0, 3], "x": 4, "y": 0},
+                {"label": "F4", "matrix": [0, 4], "x": 5, "y": 0},
+
+                {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 0},
+                {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 0},
+                {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 0},
+                {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 0},
+
+                {"label": "F9", "matrix": [0, 9], "x": 11, "y": 0},
+                {"label": "F10", "matrix": [0, 10], "x": 12, "y": 0},
+                {"label": "F11", "matrix": [0, 11], "x": 13, "y": 0},
+                {"label": "F12", "matrix": [0, 12], "x": 14, "y": 0},
+
+                {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
+                {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
+                {"label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
+                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
+                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
+                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
+                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
+                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
+                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
+                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
+                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
+                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
+                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
+                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
+                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
+                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+
+                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"label": "Enter", "matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"label": "Shift", "matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 5.25},
+                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
+                {"label": "Alt", "matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5},
+                {"label": "Menu", "matrix": [5, 12], "x": 12.5, "y": 5.25},
+                {"label": "Ctrl", "matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
+
+                {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_ansi_tsangan_split_bs_rshift": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "F1", "matrix": [0, 1], "x": 2, "y": 0},
+                {"label": "F2", "matrix": [0, 2], "x": 3, "y": 0},
+                {"label": "F3", "matrix": [0, 3], "x": 4, "y": 0},
+                {"label": "F4", "matrix": [0, 4], "x": 5, "y": 0},
+
+                {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 0},
+                {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 0},
+                {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 0},
+                {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 0},
+
+                {"label": "F9", "matrix": [0, 9], "x": 11, "y": 0},
+                {"label": "F10", "matrix": [0, 10], "x": 12, "y": 0},
+                {"label": "F11", "matrix": [0, 11], "x": 13, "y": 0},
+                {"label": "F12", "matrix": [0, 12], "x": 14, "y": 0},
+
+                {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
+                {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
+                {"label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
+                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
+                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
+                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
+                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
+                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
+                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
+                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
+                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
+                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
+                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
+                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
+                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
+                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25},
+                {"label": "Backspace", "matrix": [0, 13], "x": 14, "y": 1.25},
+
+                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"label": "Enter", "matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"label": "Fn", "matrix": [4, 13], "x": 14, "y": 4.25},
+
+                {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 5.25},
+                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
+                {"label": "Alt", "matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5},
+                {"label": "Menu", "matrix": [5, 12], "x": 12.5, "y": 5.25},
+                {"label": "Ctrl", "matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
+
+                {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_ansi_wkl": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "F1", "matrix": [0, 1], "x": 2, "y": 0},
+                {"label": "F2", "matrix": [0, 2], "x": 3, "y": 0},
+                {"label": "F3", "matrix": [0, 3], "x": 4, "y": 0},
+                {"label": "F4", "matrix": [0, 4], "x": 5, "y": 0},
+
+                {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 0},
+                {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 0},
+                {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 0},
+                {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 0},
+
+                {"label": "F9", "matrix": [0, 9], "x": 11, "y": 0},
+                {"label": "F10", "matrix": [0, 10], "x": 12, "y": 0},
+                {"label": "F11", "matrix": [0, 11], "x": 13, "y": 0},
+                {"label": "F12", "matrix": [0, 12], "x": 14, "y": 0},
+
+                {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
+                {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
+                {"label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
+                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
+                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
+                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
+                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
+                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
+                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
+                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
+                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
+                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
+                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
+                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
+                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
+                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+
+                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"label": "Enter", "matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"label": "Shift", "matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
+                {"label": "Alt", "matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5},
+                {"label": "Ctrl", "matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
+
+                {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_ansi_wkl_split_bs_rshift": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "F1", "matrix": [0, 1], "x": 2, "y": 0},
+                {"label": "F2", "matrix": [0, 2], "x": 3, "y": 0},
+                {"label": "F3", "matrix": [0, 3], "x": 4, "y": 0},
+                {"label": "F4", "matrix": [0, 4], "x": 5, "y": 0},
+
+                {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 0},
+                {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 0},
+                {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 0},
+                {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 0},
+
+                {"label": "F9", "matrix": [0, 9], "x": 11, "y": 0},
+                {"label": "F10", "matrix": [0, 10], "x": 12, "y": 0},
+                {"label": "F11", "matrix": [0, 11], "x": 13, "y": 0},
+                {"label": "F12", "matrix": [0, 12], "x": 14, "y": 0},
+
+                {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
+                {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
+                {"label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
+                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
+                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
+                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
+                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
+                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
+                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
+                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
+                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
+                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
+                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
+                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
+                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
+                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25},
+                {"label": "Backspace", "matrix": [0, 13], "x": 14, "y": 1.25},
+
+                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"label": "Enter", "matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"label": "Fn", "matrix": [4, 13], "x": 14, "y": 4.25},
+
+                {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
+                {"label": "Alt", "matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5},
+                {"label": "Ctrl", "matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
+
+                {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_iso": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "F1", "matrix": [0, 1], "x": 2, "y": 0},
+                {"label": "F2", "matrix": [0, 2], "x": 3, "y": 0},
+                {"label": "F3", "matrix": [0, 3], "x": 4, "y": 0},
+                {"label": "F4", "matrix": [0, 4], "x": 5, "y": 0},
+
+                {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 0},
+                {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 0},
+                {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 0},
+                {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 0},
+
+                {"label": "F9", "matrix": [0, 9], "x": 11, "y": 0},
+                {"label": "F10", "matrix": [0, 10], "x": 12, "y": 0},
+                {"label": "F11", "matrix": [0, 11], "x": 13, "y": 0},
+                {"label": "F12", "matrix": [0, 12], "x": 14, "y": 0},
+
+                {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
+                {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
+                {"label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
+                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
+                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
+                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
+                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
+                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
+                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
+                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
+                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
+                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
+                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
+                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
+                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
+                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+
+                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
+
+                {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"label": "#", "matrix": [3, 12], "x": 12.75, "y": 3.25},
+                {"label": "Enter", "matrix": [3, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"label": "\\", "matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"label": "Shift", "matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"label": "GUI", "matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"label": "Space", "matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"label": "Alt", "matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
+                {"label": "GUI", "matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"label": "Menu", "matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"label": "Ctrl", "matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_iso_split_bs_rshift": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "F1", "matrix": [0, 1], "x": 2, "y": 0},
+                {"label": "F2", "matrix": [0, 2], "x": 3, "y": 0},
+                {"label": "F3", "matrix": [0, 3], "x": 4, "y": 0},
+                {"label": "F4", "matrix": [0, 4], "x": 5, "y": 0},
+
+                {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 0},
+                {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 0},
+                {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 0},
+                {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 0},
+
+                {"label": "F9", "matrix": [0, 9], "x": 11, "y": 0},
+                {"label": "F10", "matrix": [0, 10], "x": 12, "y": 0},
+                {"label": "F11", "matrix": [0, 11], "x": 13, "y": 0},
+                {"label": "F12", "matrix": [0, 12], "x": 14, "y": 0},
+
+                {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
+                {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
+                {"label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
+                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
+                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
+                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
+                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
+                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
+                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
+                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
+                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
+                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
+                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
+                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
+                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
+                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25},
+                {"label": "Backspace", "matrix": [0, 13], "x": 14, "y": 1.25},
+
+                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
+
+                {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"label": "#", "matrix": [3, 12], "x": 12.75, "y": 3.25},
+                {"label": "Enter", "matrix": [3, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"label": "\\", "matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"label": "Fn", "matrix": [4, 13], "x": 14, "y": 4.25},
+
+                {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"label": "GUI", "matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"label": "Space", "matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"label": "Alt", "matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
+                {"label": "GUI", "matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"label": "Menu", "matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"label": "Ctrl", "matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_iso_tsangan": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "F1", "matrix": [0, 1], "x": 2, "y": 0},
+                {"label": "F2", "matrix": [0, 2], "x": 3, "y": 0},
+                {"label": "F3", "matrix": [0, 3], "x": 4, "y": 0},
+                {"label": "F4", "matrix": [0, 4], "x": 5, "y": 0},
+
+                {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 0},
+                {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 0},
+                {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 0},
+                {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 0},
+
+                {"label": "F9", "matrix": [0, 9], "x": 11, "y": 0},
+                {"label": "F10", "matrix": [0, 10], "x": 12, "y": 0},
+                {"label": "F11", "matrix": [0, 11], "x": 13, "y": 0},
+                {"label": "F12", "matrix": [0, 12], "x": 14, "y": 0},
+
+                {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
+                {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
+                {"label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
+                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
+                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
+                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
+                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
+                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
+                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
+                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
+                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
+                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
+                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
+                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
+                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
+                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+
+                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
+
+                {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"label": "#", "matrix": [3, 12], "x": 12.75, "y": 3.25},
+                {"label": "Enter", "matrix": [3, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"label": "\\", "matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"label": "Shift", "matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 5.25},
+                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
+                {"label": "Alt", "matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5},
+                {"label": "Menu", "matrix": [5, 12], "x": 12.5, "y": 5.25},
+                {"label": "Ctrl", "matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
+
+                {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_iso_tsangan_split_bs_rshift": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "F1", "matrix": [0, 1], "x": 2, "y": 0},
+                {"label": "F2", "matrix": [0, 2], "x": 3, "y": 0},
+                {"label": "F3", "matrix": [0, 3], "x": 4, "y": 0},
+                {"label": "F4", "matrix": [0, 4], "x": 5, "y": 0},
+
+                {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 0},
+                {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 0},
+                {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 0},
+                {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 0},
+
+                {"label": "F9", "matrix": [0, 9], "x": 11, "y": 0},
+                {"label": "F10", "matrix": [0, 10], "x": 12, "y": 0},
+                {"label": "F11", "matrix": [0, 11], "x": 13, "y": 0},
+                {"label": "F12", "matrix": [0, 12], "x": 14, "y": 0},
+
+                {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
+                {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
+                {"label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
+                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
+                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
+                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
+                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
+                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
+                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
+                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
+                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
+                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
+                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
+                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
+                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
+                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25},
+                {"label": "Backspace", "matrix": [0, 13], "x": 14, "y": 1.25},
+
+                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
+
+                {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"label": "#", "matrix": [3, 12], "x": 12.75, "y": 3.25},
+                {"label": "Enter", "matrix": [3, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"label": "\\", "matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"label": "Fn", "matrix": [4, 13], "x": 14, "y": 4.25},
+
+                {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 5.25},
+                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
+                {"label": "Alt", "matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5},
+                {"label": "Menu", "matrix": [5, 12], "x": 12.5, "y": 5.25},
+                {"label": "Ctrl", "matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
+
+                {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_iso_wkl": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "F1", "matrix": [0, 1], "x": 2, "y": 0},
+                {"label": "F2", "matrix": [0, 2], "x": 3, "y": 0},
+                {"label": "F3", "matrix": [0, 3], "x": 4, "y": 0},
+                {"label": "F4", "matrix": [0, 4], "x": 5, "y": 0},
+
+                {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 0},
+                {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 0},
+                {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 0},
+                {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 0},
+
+                {"label": "F9", "matrix": [0, 9], "x": 11, "y": 0},
+                {"label": "F10", "matrix": [0, 10], "x": 12, "y": 0},
+                {"label": "F11", "matrix": [0, 11], "x": 13, "y": 0},
+                {"label": "F12", "matrix": [0, 12], "x": 14, "y": 0},
+
+                {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
+                {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
+                {"label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
+                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
+                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
+                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
+                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
+                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
+                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
+                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
+                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
+                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
+                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
+                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
+                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
+                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+
+                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
+
+                {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"label": "#", "matrix": [3, 12], "x": 12.75, "y": 3.25},
+                {"label": "Enter", "matrix": [3, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"label": "\\", "matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"label": "Shift", "matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
+                {"label": "Alt", "matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5},
+                {"label": "Ctrl", "matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
+
+                {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_iso_wkl_split_bs_rshift": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "F1", "matrix": [0, 1], "x": 2, "y": 0},
+                {"label": "F2", "matrix": [0, 2], "x": 3, "y": 0},
+                {"label": "F3", "matrix": [0, 3], "x": 4, "y": 0},
+                {"label": "F4", "matrix": [0, 4], "x": 5, "y": 0},
+
+                {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 0},
+                {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 0},
+                {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 0},
+                {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 0},
+
+                {"label": "F9", "matrix": [0, 9], "x": 11, "y": 0},
+                {"label": "F10", "matrix": [0, 10], "x": 12, "y": 0},
+                {"label": "F11", "matrix": [0, 11], "x": 13, "y": 0},
+                {"label": "F12", "matrix": [0, 12], "x": 14, "y": 0},
+
+                {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
+                {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
+                {"label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
+                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
+                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
+                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
+                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
+                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
+                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
+                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
+                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
+                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
+                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
+                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
+                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
+                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25},
+                {"label": "Backspace", "matrix": [0, 13], "x": 14, "y": 1.25},
+
+                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
+
+                {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"label": "#", "matrix": [3, 12], "x": 12.75, "y": 3.25},
+                {"label": "Enter", "matrix": [3, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"label": "\\", "matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"label": "Fn", "matrix": [4, 13], "x": 14, "y": 4.25},
+
+                {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
+                {"label": "Alt", "matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5},
+                {"label": "Ctrl", "matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
+
+                {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/mechlovin/infinity87/rev1/standard/rules.mk b/keyboards/mechlovin/infinity87/rev1/standard/rules.mk
deleted file mode 100644
index 1e3cebb1451..00000000000
--- a/keyboards/mechlovin/infinity87/rev1/standard/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-RGBLIGHT_ENABLE = yes
diff --git a/keyboards/mechlovin/infinity87/rev2/info.json b/keyboards/mechlovin/infinity87/rev2/info.json
deleted file mode 100644
index 42db9894ca1..00000000000
--- a/keyboards/mechlovin/infinity87/rev2/info.json
+++ /dev/null
@@ -1,1417 +0,0 @@
-{
-    "keyboard_name": "Infinity87 Rev.2",
-    "manufacturer": "Mechlovin.Studio",
-    "url": "",
-    "maintainer": "Mechlovin' Studio",
-    "usb": {
-        "vid": "0x4D4C",
-        "pid": "0x8702",
-        "device_version": "0.0.1"
-    },
-    "backlight": {
-        "pin": "B6",
-        "breathing": true
-    },
-    "indicators": {
-        "caps_lock": "D6",
-        "num_lock": "D7",
-        "scroll_lock": "B4"
-    },
-    "rgblight": {
-        "saturation_steps": 8,
-        "brightness_steps": 8,
-        "led_count": 24,
-        "sleep": true,
-        "animations": {
-            "breathing": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "snake": true,
-            "knight": true,
-            "christmas": true,
-            "static_gradient": true,
-            "rgb_test": true,
-            "alternating": true,
-            "twinkle": true
-        }
-    },
-    "ws2812": {
-        "pin": "E2"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "community_layouts": [
-        "tkl_ansi",
-        "tkl_ansi_split_bs_rshift",
-        "tkl_ansi_tsangan",
-        "tkl_ansi_tsangan_split_bs_rshift",
-        "tkl_iso",
-        "tkl_iso_split_bs_rshift",
-        "tkl_iso_tsangan",
-        "tkl_iso_tsangan_split_bs_rshift"
-    ],
-    "layouts": {
-        "LAYOUT_all": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-
-                {"label": "F1", "matrix": [0, 1], "x": 2, "y": 0},
-                {"label": "F2", "matrix": [0, 2], "x": 3, "y": 0},
-                {"label": "F3", "matrix": [0, 3], "x": 4, "y": 0},
-                {"label": "F4", "matrix": [0, 4], "x": 5, "y": 0},
-
-                {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 0},
-                {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 0},
-                {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 0},
-                {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 0},
-
-                {"label": "F9", "matrix": [0, 9], "x": 11, "y": 0},
-                {"label": "F10", "matrix": [0, 10], "x": 12, "y": 0},
-                {"label": "F11", "matrix": [0, 11], "x": 13, "y": 0},
-                {"label": "F12", "matrix": [0, 12], "x": 14, "y": 0},
-
-                {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
-                {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
-                {"label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0},
-
-                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
-                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
-                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
-                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
-                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
-                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
-                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
-                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
-                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
-                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
-                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
-                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
-                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
-                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25},
-                {"label": "Delete", "matrix": [0, 13], "x": 14, "y": 1.25},
-
-                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
-                {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25},
-                {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "y": 1.25},
-
-                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
-                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
-                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
-                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
-                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
-                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
-                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
-                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
-                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
-                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
-                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
-                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
-                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
-                {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
-
-                {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
-                {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25},
-                {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2.25},
-
-                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
-                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
-                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
-                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
-                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
-                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
-                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
-                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
-                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
-                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
-                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
-                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
-                {"label": "#", "matrix": [3, 12], "x": 12.75, "y": 3.25},
-                {"label": "Enter", "matrix": [3, 13], "x": 13.75, "y": 3.25, "w": 1.25},
-
-                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
-                {"label": "\\", "matrix": [4, 1], "x": 1.25, "y": 4.25},
-                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
-                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
-                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
-                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
-                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
-                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
-                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
-                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
-                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
-                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
-                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
-                {"label": "Shift", "matrix": [4, 13], "x": 14, "y": 4.25},
-
-                {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25},
-
-                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
-                {"label": "GUI", "matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
-                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
-                {"label": "Space", "matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
-                {"label": "Alt", "matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
-                {"label": "GUI", "matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
-                {"label": "Fn", "matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
-                {"label": "Ctrl", "matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
-
-                {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
-                {"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25},
-                {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
-            ]
-        },
-        "LAYOUT_tkl_ansi": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-
-                {"label": "F1", "matrix": [0, 1], "x": 2, "y": 0},
-                {"label": "F2", "matrix": [0, 2], "x": 3, "y": 0},
-                {"label": "F3", "matrix": [0, 3], "x": 4, "y": 0},
-                {"label": "F4", "matrix": [0, 4], "x": 5, "y": 0},
-
-                {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 0},
-                {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 0},
-                {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 0},
-                {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 0},
-
-                {"label": "F9", "matrix": [0, 9], "x": 11, "y": 0},
-                {"label": "F10", "matrix": [0, 10], "x": 12, "y": 0},
-                {"label": "F11", "matrix": [0, 11], "x": 13, "y": 0},
-                {"label": "F12", "matrix": [0, 12], "x": 14, "y": 0},
-
-                {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
-                {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
-                {"label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0},
-
-                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
-                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
-                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
-                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
-                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
-                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
-                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
-                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
-                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
-                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
-                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
-                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
-                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
-                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
-
-                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
-                {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25},
-                {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "y": 1.25},
-
-                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
-                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
-                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
-                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
-                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
-                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
-                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
-                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
-                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
-                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
-                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
-                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
-                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
-                {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
-
-                {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
-                {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25},
-                {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2.25},
-
-                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
-                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
-                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
-                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
-                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
-                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
-                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
-                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
-                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
-                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
-                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
-                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
-                {"label": "Enter", "matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
-
-                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
-                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
-                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
-                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
-                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
-                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
-                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
-                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
-                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
-                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
-                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
-                {"label": "Shift", "matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 2.75},
-
-                {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25},
-
-                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
-                {"label": "GUI", "matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
-                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
-                {"label": "Space", "matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
-                {"label": "Alt", "matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
-                {"label": "GUI", "matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
-                {"label": "Fn", "matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
-                {"label": "Ctrl", "matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
-
-                {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
-                {"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25},
-                {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
-            ]
-        },
-        "LAYOUT_tkl_ansi_split_bs_rshift": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-
-                {"label": "F1", "matrix": [0, 1], "x": 2, "y": 0},
-                {"label": "F2", "matrix": [0, 2], "x": 3, "y": 0},
-                {"label": "F3", "matrix": [0, 3], "x": 4, "y": 0},
-                {"label": "F4", "matrix": [0, 4], "x": 5, "y": 0},
-
-                {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 0},
-                {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 0},
-                {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 0},
-                {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 0},
-
-                {"label": "F9", "matrix": [0, 9], "x": 11, "y": 0},
-                {"label": "F10", "matrix": [0, 10], "x": 12, "y": 0},
-                {"label": "F11", "matrix": [0, 11], "x": 13, "y": 0},
-                {"label": "F12", "matrix": [0, 12], "x": 14, "y": 0},
-
-                {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
-                {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
-                {"label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0},
-
-                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
-                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
-                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
-                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
-                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
-                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
-                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
-                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
-                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
-                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
-                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
-                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
-                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
-                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25},
-                {"label": "Delete", "matrix": [0, 13], "x": 14, "y": 1.25},
-
-                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
-                {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25},
-                {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "y": 1.25},
-
-                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
-                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
-                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
-                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
-                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
-                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
-                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
-                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
-                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
-                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
-                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
-                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
-                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
-                {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
-
-                {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
-                {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25},
-                {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2.25},
-
-                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
-                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
-                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
-                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
-                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
-                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
-                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
-                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
-                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
-                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
-                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
-                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
-                {"label": "Enter", "matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
-
-                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
-                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
-                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
-                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
-                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
-                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
-                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
-                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
-                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
-                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
-                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
-                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
-                {"label": "Shift", "matrix": [4, 13], "x": 14, "y": 4.25},
-
-                {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25},
-
-                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
-                {"label": "GUI", "matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
-                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
-                {"label": "Space", "matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
-                {"label": "Alt", "matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
-                {"label": "GUI", "matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
-                {"label": "Fn", "matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
-                {"label": "Ctrl", "matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
-
-                {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
-                {"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25},
-                {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
-            ]
-        },
-        "LAYOUT_tkl_ansi_tsangan": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-
-                {"label": "F1", "matrix": [0, 1], "x": 2, "y": 0},
-                {"label": "F2", "matrix": [0, 2], "x": 3, "y": 0},
-                {"label": "F3", "matrix": [0, 3], "x": 4, "y": 0},
-                {"label": "F4", "matrix": [0, 4], "x": 5, "y": 0},
-
-                {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 0},
-                {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 0},
-                {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 0},
-                {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 0},
-
-                {"label": "F9", "matrix": [0, 9], "x": 11, "y": 0},
-                {"label": "F10", "matrix": [0, 10], "x": 12, "y": 0},
-                {"label": "F11", "matrix": [0, 11], "x": 13, "y": 0},
-                {"label": "F12", "matrix": [0, 12], "x": 14, "y": 0},
-
-                {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
-                {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
-                {"label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0},
-
-                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
-                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
-                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
-                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
-                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
-                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
-                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
-                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
-                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
-                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
-                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
-                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
-                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
-                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
-
-                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
-                {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25},
-                {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "y": 1.25},
-
-                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
-                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
-                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
-                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
-                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
-                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
-                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
-                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
-                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
-                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
-                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
-                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
-                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
-                {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
-
-                {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
-                {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25},
-                {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2.25},
-
-                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
-                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
-                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
-                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
-                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
-                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
-                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
-                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
-                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
-                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
-                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
-                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
-                {"label": "Enter", "matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
-
-                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
-                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
-                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
-                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
-                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
-                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
-                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
-                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
-                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
-                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
-                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
-                {"label": "Shift", "matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 2.75},
-
-                {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25},
-
-                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
-                {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 5.25},
-                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
-                {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
-                {"label": "Alt", "matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5},
-                {"label": "Fn", "matrix": [5, 12], "x": 12.5, "y": 5.25},
-                {"label": "Ctrl", "matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
-
-                {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
-                {"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25},
-                {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
-            ]
-        },
-        "LAYOUT_tkl_ansi_tsangan_split_bs_rshift": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-
-                {"label": "F1", "matrix": [0, 1], "x": 2, "y": 0},
-                {"label": "F2", "matrix": [0, 2], "x": 3, "y": 0},
-                {"label": "F3", "matrix": [0, 3], "x": 4, "y": 0},
-                {"label": "F4", "matrix": [0, 4], "x": 5, "y": 0},
-
-                {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 0},
-                {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 0},
-                {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 0},
-                {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 0},
-
-                {"label": "F9", "matrix": [0, 9], "x": 11, "y": 0},
-                {"label": "F10", "matrix": [0, 10], "x": 12, "y": 0},
-                {"label": "F11", "matrix": [0, 11], "x": 13, "y": 0},
-                {"label": "F12", "matrix": [0, 12], "x": 14, "y": 0},
-
-                {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
-                {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
-                {"label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0},
-
-                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
-                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
-                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
-                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
-                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
-                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
-                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
-                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
-                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
-                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
-                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
-                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
-                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
-                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25},
-                {"label": "Delete", "matrix": [0, 13], "x": 14, "y": 1.25},
-
-                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
-                {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25},
-                {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "y": 1.25},
-
-                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
-                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
-                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
-                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
-                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
-                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
-                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
-                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
-                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
-                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
-                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
-                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
-                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
-                {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
-
-                {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
-                {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25},
-                {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2.25},
-
-                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
-                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
-                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
-                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
-                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
-                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
-                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
-                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
-                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
-                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
-                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
-                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
-                {"label": "Enter", "matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
-
-                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
-                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
-                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
-                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
-                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
-                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
-                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
-                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
-                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
-                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
-                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
-                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
-                {"label": "Shift", "matrix": [4, 13], "x": 14, "y": 4.25},
-
-                {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25},
-
-                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
-                {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 5.25},
-                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
-                {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
-                {"label": "Alt", "matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5},
-                {"label": "Fn", "matrix": [5, 12], "x": 12.5, "y": 5.25},
-                {"label": "Ctrl", "matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
-
-                {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
-                {"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25},
-                {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
-            ]
-        },
-        "LAYOUT_tkl_ansi_wkl": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-
-                {"label": "F1", "matrix": [0, 1], "x": 2, "y": 0},
-                {"label": "F2", "matrix": [0, 2], "x": 3, "y": 0},
-                {"label": "F3", "matrix": [0, 3], "x": 4, "y": 0},
-                {"label": "F4", "matrix": [0, 4], "x": 5, "y": 0},
-
-                {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 0},
-                {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 0},
-                {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 0},
-                {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 0},
-
-                {"label": "F9", "matrix": [0, 9], "x": 11, "y": 0},
-                {"label": "F10", "matrix": [0, 10], "x": 12, "y": 0},
-                {"label": "F11", "matrix": [0, 11], "x": 13, "y": 0},
-                {"label": "F12", "matrix": [0, 12], "x": 14, "y": 0},
-
-                {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
-                {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
-                {"label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0},
-
-                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
-                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
-                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
-                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
-                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
-                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
-                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
-                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
-                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
-                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
-                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
-                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
-                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
-                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
-
-                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
-                {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25},
-                {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "y": 1.25},
-
-                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
-                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
-                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
-                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
-                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
-                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
-                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
-                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
-                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
-                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
-                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
-                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
-                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
-                {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
-
-                {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
-                {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25},
-                {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2.25},
-
-                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
-                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
-                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
-                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
-                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
-                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
-                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
-                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
-                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
-                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
-                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
-                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
-                {"label": "Enter", "matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
-
-                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
-                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
-                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
-                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
-                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
-                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
-                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
-                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
-                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
-                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
-                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
-                {"label": "Shift", "matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 2.75},
-
-                {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25},
-
-                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
-                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
-                {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
-                {"label": "Alt", "matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5},
-                {"label": "Ctrl", "matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
-
-                {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
-                {"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25},
-                {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
-            ]
-        },
-        "LAYOUT_tkl_ansi_wkl_split_bs_rshift": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-
-                {"label": "F1", "matrix": [0, 1], "x": 2, "y": 0},
-                {"label": "F2", "matrix": [0, 2], "x": 3, "y": 0},
-                {"label": "F3", "matrix": [0, 3], "x": 4, "y": 0},
-                {"label": "F4", "matrix": [0, 4], "x": 5, "y": 0},
-
-                {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 0},
-                {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 0},
-                {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 0},
-                {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 0},
-
-                {"label": "F9", "matrix": [0, 9], "x": 11, "y": 0},
-                {"label": "F10", "matrix": [0, 10], "x": 12, "y": 0},
-                {"label": "F11", "matrix": [0, 11], "x": 13, "y": 0},
-                {"label": "F12", "matrix": [0, 12], "x": 14, "y": 0},
-
-                {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
-                {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
-                {"label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0},
-
-                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
-                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
-                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
-                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
-                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
-                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
-                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
-                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
-                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
-                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
-                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
-                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
-                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
-                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25},
-                {"label": "Delete", "matrix": [0, 13], "x": 14, "y": 1.25},
-
-                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
-                {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25},
-                {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "y": 1.25},
-
-                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
-                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
-                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
-                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
-                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
-                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
-                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
-                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
-                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
-                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
-                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
-                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
-                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
-                {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
-
-                {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
-                {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25},
-                {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2.25},
-
-                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
-                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
-                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
-                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
-                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
-                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
-                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
-                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
-                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
-                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
-                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
-                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
-                {"label": "Enter", "matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
-
-                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
-                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
-                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
-                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
-                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
-                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
-                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
-                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
-                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
-                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
-                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
-                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
-                {"label": "Shift", "matrix": [4, 13], "x": 14, "y": 4.25},
-
-                {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25},
-
-                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
-                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
-                {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
-                {"label": "Alt", "matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5},
-                {"label": "Ctrl", "matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
-
-                {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
-                {"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25},
-                {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
-            ]
-        },
-        "LAYOUT_tkl_iso": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-
-                {"label": "F1", "matrix": [0, 1], "x": 2, "y": 0},
-                {"label": "F2", "matrix": [0, 2], "x": 3, "y": 0},
-                {"label": "F3", "matrix": [0, 3], "x": 4, "y": 0},
-                {"label": "F4", "matrix": [0, 4], "x": 5, "y": 0},
-
-                {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 0},
-                {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 0},
-                {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 0},
-                {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 0},
-
-                {"label": "F9", "matrix": [0, 9], "x": 11, "y": 0},
-                {"label": "F10", "matrix": [0, 10], "x": 12, "y": 0},
-                {"label": "F11", "matrix": [0, 11], "x": 13, "y": 0},
-                {"label": "F12", "matrix": [0, 12], "x": 14, "y": 0},
-
-                {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
-                {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
-                {"label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0},
-
-                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
-                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
-                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
-                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
-                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
-                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
-                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
-                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
-                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
-                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
-                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
-                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
-                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
-                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
-
-                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
-                {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25},
-                {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "y": 1.25},
-
-                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
-                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
-                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
-                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
-                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
-                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
-                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
-                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
-                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
-                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
-                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
-                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
-                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
-
-                {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
-                {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25},
-                {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2.25},
-
-                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
-                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
-                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
-                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
-                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
-                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
-                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
-                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
-                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
-                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
-                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
-                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
-                {"label": "#", "matrix": [3, 12], "x": 12.75, "y": 3.25},
-                {"label": "Enter", "matrix": [3, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
-
-                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
-                {"label": "\\", "matrix": [4, 1], "x": 1.25, "y": 4.25},
-                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
-                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
-                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
-                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
-                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
-                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
-                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
-                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
-                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
-                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
-                {"label": "Shift", "matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 2.75},
-
-                {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25},
-
-                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
-                {"label": "GUI", "matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
-                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
-                {"label": "Space", "matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
-                {"label": "Alt", "matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
-                {"label": "GUI", "matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
-                {"label": "Fn", "matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
-                {"label": "Ctrl", "matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
-
-                {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
-                {"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25},
-                {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
-            ]
-        },
-        "LAYOUT_tkl_iso_split_bs_rshift": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-
-                {"label": "F1", "matrix": [0, 1], "x": 2, "y": 0},
-                {"label": "F2", "matrix": [0, 2], "x": 3, "y": 0},
-                {"label": "F3", "matrix": [0, 3], "x": 4, "y": 0},
-                {"label": "F4", "matrix": [0, 4], "x": 5, "y": 0},
-
-                {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 0},
-                {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 0},
-                {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 0},
-                {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 0},
-
-                {"label": "F9", "matrix": [0, 9], "x": 11, "y": 0},
-                {"label": "F10", "matrix": [0, 10], "x": 12, "y": 0},
-                {"label": "F11", "matrix": [0, 11], "x": 13, "y": 0},
-                {"label": "F12", "matrix": [0, 12], "x": 14, "y": 0},
-
-                {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
-                {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
-                {"label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0},
-
-                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
-                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
-                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
-                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
-                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
-                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
-                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
-                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
-                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
-                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
-                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
-                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
-                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
-                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25},
-                {"label": "Delete", "matrix": [0, 13], "x": 14, "y": 1.25},
-
-                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
-                {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25},
-                {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "y": 1.25},
-
-                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
-                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
-                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
-                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
-                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
-                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
-                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
-                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
-                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
-                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
-                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
-                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
-                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
-
-                {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
-                {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25},
-                {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2.25},
-
-                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
-                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
-                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
-                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
-                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
-                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
-                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
-                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
-                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
-                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
-                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
-                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
-                {"label": "#", "matrix": [3, 12], "x": 12.75, "y": 3.25},
-                {"label": "Enter", "matrix": [3, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
-
-                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
-                {"label": "\\", "matrix": [4, 1], "x": 1.25, "y": 4.25},
-                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
-                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
-                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
-                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
-                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
-                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
-                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
-                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
-                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
-                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
-                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
-                {"label": "Shift", "matrix": [4, 13], "x": 14, "y": 4.25},
-
-                {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25},
-
-                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
-                {"label": "GUI", "matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
-                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
-                {"label": "Space", "matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
-                {"label": "Alt", "matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
-                {"label": "GUI", "matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
-                {"label": "Fn", "matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
-                {"label": "Ctrl", "matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
-
-                {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
-                {"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25},
-                {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
-            ]
-        },
-        "LAYOUT_tkl_iso_tsangan": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-
-                {"label": "F1", "matrix": [0, 1], "x": 2, "y": 0},
-                {"label": "F2", "matrix": [0, 2], "x": 3, "y": 0},
-                {"label": "F3", "matrix": [0, 3], "x": 4, "y": 0},
-                {"label": "F4", "matrix": [0, 4], "x": 5, "y": 0},
-
-                {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 0},
-                {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 0},
-                {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 0},
-                {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 0},
-
-                {"label": "F9", "matrix": [0, 9], "x": 11, "y": 0},
-                {"label": "F10", "matrix": [0, 10], "x": 12, "y": 0},
-                {"label": "F11", "matrix": [0, 11], "x": 13, "y": 0},
-                {"label": "F12", "matrix": [0, 12], "x": 14, "y": 0},
-
-                {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
-                {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
-                {"label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0},
-
-                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
-                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
-                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
-                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
-                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
-                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
-                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
-                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
-                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
-                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
-                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
-                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
-                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
-                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
-
-                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
-                {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25},
-                {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "y": 1.25},
-
-                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
-                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
-                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
-                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
-                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
-                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
-                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
-                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
-                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
-                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
-                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
-                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
-                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
-
-                {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
-                {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25},
-                {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2.25},
-
-                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
-                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
-                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
-                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
-                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
-                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
-                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
-                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
-                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
-                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
-                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
-                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
-                {"label": "#", "matrix": [3, 12], "x": 12.75, "y": 3.25},
-                {"label": "Enter", "matrix": [3, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
-
-                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
-                {"label": "\\", "matrix": [4, 1], "x": 1.25, "y": 4.25},
-                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
-                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
-                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
-                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
-                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
-                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
-                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
-                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
-                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
-                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
-                {"label": "Shift", "matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 2.75},
-
-                {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25},
-
-                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
-                {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 5.25},
-                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
-                {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
-                {"label": "Alt", "matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5},
-                {"label": "Fn", "matrix": [5, 12], "x": 12.5, "y": 5.25},
-                {"label": "Ctrl", "matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
-
-                {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
-                {"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25},
-                {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
-            ]
-        },
-        "LAYOUT_tkl_iso_tsangan_split_bs_rshift": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-
-                {"label": "F1", "matrix": [0, 1], "x": 2, "y": 0},
-                {"label": "F2", "matrix": [0, 2], "x": 3, "y": 0},
-                {"label": "F3", "matrix": [0, 3], "x": 4, "y": 0},
-                {"label": "F4", "matrix": [0, 4], "x": 5, "y": 0},
-
-                {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 0},
-                {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 0},
-                {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 0},
-                {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 0},
-
-                {"label": "F9", "matrix": [0, 9], "x": 11, "y": 0},
-                {"label": "F10", "matrix": [0, 10], "x": 12, "y": 0},
-                {"label": "F11", "matrix": [0, 11], "x": 13, "y": 0},
-                {"label": "F12", "matrix": [0, 12], "x": 14, "y": 0},
-
-                {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
-                {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
-                {"label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0},
-
-                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
-                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
-                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
-                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
-                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
-                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
-                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
-                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
-                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
-                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
-                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
-                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
-                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
-                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25},
-                {"label": "Delete", "matrix": [0, 13], "x": 14, "y": 1.25},
-
-                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
-                {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25},
-                {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "y": 1.25},
-
-                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
-                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
-                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
-                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
-                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
-                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
-                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
-                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
-                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
-                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
-                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
-                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
-                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
-
-                {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
-                {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25},
-                {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2.25},
-
-                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
-                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
-                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
-                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
-                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
-                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
-                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
-                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
-                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
-                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
-                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
-                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
-                {"label": "#", "matrix": [3, 12], "x": 12.75, "y": 3.25},
-                {"label": "Enter", "matrix": [3, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
-
-                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
-                {"label": "\\", "matrix": [4, 1], "x": 1.25, "y": 4.25},
-                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
-                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
-                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
-                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
-                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
-                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
-                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
-                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
-                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
-                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
-                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
-                {"label": "Shift", "matrix": [4, 13], "x": 14, "y": 4.25},
-
-                {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25},
-
-                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
-                {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 5.25},
-                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
-                {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
-                {"label": "Alt", "matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5},
-                {"label": "Fn", "matrix": [5, 12], "x": 12.5, "y": 5.25},
-                {"label": "Ctrl", "matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
-
-                {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
-                {"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25},
-                {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
-            ]
-        },
-        "LAYOUT_tkl_iso_wkl": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-
-                {"label": "F1", "matrix": [0, 1], "x": 2, "y": 0},
-                {"label": "F2", "matrix": [0, 2], "x": 3, "y": 0},
-                {"label": "F3", "matrix": [0, 3], "x": 4, "y": 0},
-                {"label": "F4", "matrix": [0, 4], "x": 5, "y": 0},
-
-                {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 0},
-                {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 0},
-                {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 0},
-                {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 0},
-
-                {"label": "F9", "matrix": [0, 9], "x": 11, "y": 0},
-                {"label": "F10", "matrix": [0, 10], "x": 12, "y": 0},
-                {"label": "F11", "matrix": [0, 11], "x": 13, "y": 0},
-                {"label": "F12", "matrix": [0, 12], "x": 14, "y": 0},
-
-                {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
-                {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
-                {"label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0},
-
-                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
-                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
-                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
-                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
-                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
-                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
-                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
-                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
-                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
-                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
-                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
-                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
-                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
-                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
-
-                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
-                {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25},
-                {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "y": 1.25},
-
-                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
-                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
-                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
-                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
-                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
-                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
-                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
-                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
-                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
-                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
-                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
-                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
-                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
-
-                {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
-                {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25},
-                {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2.25},
-
-                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
-                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
-                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
-                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
-                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
-                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
-                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
-                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
-                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
-                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
-                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
-                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
-                {"label": "#", "matrix": [3, 12], "x": 12.75, "y": 3.25},
-                {"label": "Enter", "matrix": [3, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
-
-                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
-                {"label": "\\", "matrix": [4, 1], "x": 1.25, "y": 4.25},
-                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
-                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
-                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
-                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
-                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
-                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
-                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
-                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
-                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
-                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
-                {"label": "Shift", "matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 2.75},
-
-                {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25},
-
-                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
-                {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 5.25},
-                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
-                {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
-                {"label": "Alt", "matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5},
-                {"label": "Fn", "matrix": [5, 12], "x": 12.5, "y": 5.25},
-                {"label": "Ctrl", "matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
-
-                {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
-                {"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25},
-                {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
-            ]
-        },
-        "LAYOUT_tkl_iso_wkl_split_bs_rshift": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-
-                {"label": "F1", "matrix": [0, 1], "x": 2, "y": 0},
-                {"label": "F2", "matrix": [0, 2], "x": 3, "y": 0},
-                {"label": "F3", "matrix": [0, 3], "x": 4, "y": 0},
-                {"label": "F4", "matrix": [0, 4], "x": 5, "y": 0},
-
-                {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 0},
-                {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 0},
-                {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 0},
-                {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 0},
-
-                {"label": "F9", "matrix": [0, 9], "x": 11, "y": 0},
-                {"label": "F10", "matrix": [0, 10], "x": 12, "y": 0},
-                {"label": "F11", "matrix": [0, 11], "x": 13, "y": 0},
-                {"label": "F12", "matrix": [0, 12], "x": 14, "y": 0},
-
-                {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
-                {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
-                {"label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0},
-
-                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
-                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
-                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
-                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
-                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
-                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
-                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
-                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
-                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
-                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
-                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
-                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
-                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
-                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25},
-                {"label": "Delete", "matrix": [0, 13], "x": 14, "y": 1.25},
-
-                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
-                {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25},
-                {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "y": 1.25},
-
-                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
-                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
-                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
-                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
-                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
-                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
-                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
-                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
-                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
-                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
-                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
-                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
-                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
-
-                {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
-                {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25},
-                {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2.25},
-
-                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
-                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
-                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
-                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
-                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
-                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
-                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
-                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
-                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
-                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
-                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
-                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
-                {"label": "#", "matrix": [3, 12], "x": 12.75, "y": 3.25},
-                {"label": "Enter", "matrix": [3, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
-
-                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
-                {"label": "\\", "matrix": [4, 1], "x": 1.25, "y": 4.25},
-                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
-                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
-                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
-                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
-                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
-                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
-                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
-                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
-                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
-                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
-                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
-                {"label": "Shift", "matrix": [4, 13], "x": 14, "y": 4.25},
-
-                {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25},
-
-                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
-                {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 5.25},
-                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
-                {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
-                {"label": "Alt", "matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5},
-                {"label": "Fn", "matrix": [5, 12], "x": 12.5, "y": 5.25},
-                {"label": "Ctrl", "matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
-
-                {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
-                {"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25},
-                {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
-            ]
-        }
-    }
-}
diff --git a/keyboards/mechlovin/infinity87/rev2/keyboard.json b/keyboards/mechlovin/infinity87/rev2/keyboard.json
new file mode 100644
index 00000000000..fdc66869889
--- /dev/null
+++ b/keyboards/mechlovin/infinity87/rev2/keyboard.json
@@ -0,0 +1,1425 @@
+{
+    "keyboard_name": "Infinity87 Rev.2",
+    "manufacturer": "Mechlovin.Studio",
+    "url": "",
+    "maintainer": "Mechlovin' Studio",
+    "usb": {
+        "vid": "0x4D4C",
+        "pid": "0x8702",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "nkro": true,
+        "backlight": true,
+        "rgblight": true
+    },
+    "backlight": {
+        "pin": "B6",
+        "breathing": true
+    },
+    "indicators": {
+        "caps_lock": "D6",
+        "num_lock": "D7",
+        "scroll_lock": "B4"
+    },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 24,
+        "sleep": true,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": true,
+            "twinkle": true
+        }
+    },
+    "ws2812": {
+        "pin": "E2"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "community_layouts": [
+        "tkl_ansi",
+        "tkl_ansi_split_bs_rshift",
+        "tkl_ansi_tsangan",
+        "tkl_ansi_tsangan_split_bs_rshift",
+        "tkl_iso",
+        "tkl_iso_split_bs_rshift",
+        "tkl_iso_tsangan",
+        "tkl_iso_tsangan_split_bs_rshift"
+    ],
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "F1", "matrix": [0, 1], "x": 2, "y": 0},
+                {"label": "F2", "matrix": [0, 2], "x": 3, "y": 0},
+                {"label": "F3", "matrix": [0, 3], "x": 4, "y": 0},
+                {"label": "F4", "matrix": [0, 4], "x": 5, "y": 0},
+
+                {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 0},
+                {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 0},
+                {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 0},
+                {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 0},
+
+                {"label": "F9", "matrix": [0, 9], "x": 11, "y": 0},
+                {"label": "F10", "matrix": [0, 10], "x": 12, "y": 0},
+                {"label": "F11", "matrix": [0, 11], "x": 13, "y": 0},
+                {"label": "F12", "matrix": [0, 12], "x": 14, "y": 0},
+
+                {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
+                {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
+                {"label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
+                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
+                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
+                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
+                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
+                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
+                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
+                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
+                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
+                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
+                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
+                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
+                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
+                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25},
+                {"label": "Delete", "matrix": [0, 13], "x": 14, "y": 1.25},
+
+                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"label": "#", "matrix": [3, 12], "x": 12.75, "y": 3.25},
+                {"label": "Enter", "matrix": [3, 13], "x": 13.75, "y": 3.25, "w": 1.25},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"label": "\\", "matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"label": "Shift", "matrix": [4, 13], "x": 14, "y": 4.25},
+
+                {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"label": "GUI", "matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"label": "Space", "matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"label": "Alt", "matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
+                {"label": "GUI", "matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"label": "Fn", "matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"label": "Ctrl", "matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_ansi": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "F1", "matrix": [0, 1], "x": 2, "y": 0},
+                {"label": "F2", "matrix": [0, 2], "x": 3, "y": 0},
+                {"label": "F3", "matrix": [0, 3], "x": 4, "y": 0},
+                {"label": "F4", "matrix": [0, 4], "x": 5, "y": 0},
+
+                {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 0},
+                {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 0},
+                {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 0},
+                {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 0},
+
+                {"label": "F9", "matrix": [0, 9], "x": 11, "y": 0},
+                {"label": "F10", "matrix": [0, 10], "x": 12, "y": 0},
+                {"label": "F11", "matrix": [0, 11], "x": 13, "y": 0},
+                {"label": "F12", "matrix": [0, 12], "x": 14, "y": 0},
+
+                {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
+                {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
+                {"label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
+                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
+                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
+                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
+                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
+                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
+                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
+                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
+                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
+                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
+                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
+                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
+                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
+                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+
+                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"label": "Enter", "matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"label": "Shift", "matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"label": "GUI", "matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"label": "Space", "matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"label": "Alt", "matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
+                {"label": "GUI", "matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"label": "Fn", "matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"label": "Ctrl", "matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_ansi_split_bs_rshift": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "F1", "matrix": [0, 1], "x": 2, "y": 0},
+                {"label": "F2", "matrix": [0, 2], "x": 3, "y": 0},
+                {"label": "F3", "matrix": [0, 3], "x": 4, "y": 0},
+                {"label": "F4", "matrix": [0, 4], "x": 5, "y": 0},
+
+                {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 0},
+                {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 0},
+                {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 0},
+                {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 0},
+
+                {"label": "F9", "matrix": [0, 9], "x": 11, "y": 0},
+                {"label": "F10", "matrix": [0, 10], "x": 12, "y": 0},
+                {"label": "F11", "matrix": [0, 11], "x": 13, "y": 0},
+                {"label": "F12", "matrix": [0, 12], "x": 14, "y": 0},
+
+                {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
+                {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
+                {"label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
+                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
+                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
+                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
+                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
+                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
+                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
+                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
+                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
+                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
+                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
+                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
+                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
+                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25},
+                {"label": "Delete", "matrix": [0, 13], "x": 14, "y": 1.25},
+
+                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"label": "Enter", "matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"label": "Shift", "matrix": [4, 13], "x": 14, "y": 4.25},
+
+                {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"label": "GUI", "matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"label": "Space", "matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"label": "Alt", "matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
+                {"label": "GUI", "matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"label": "Fn", "matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"label": "Ctrl", "matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_ansi_tsangan": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "F1", "matrix": [0, 1], "x": 2, "y": 0},
+                {"label": "F2", "matrix": [0, 2], "x": 3, "y": 0},
+                {"label": "F3", "matrix": [0, 3], "x": 4, "y": 0},
+                {"label": "F4", "matrix": [0, 4], "x": 5, "y": 0},
+
+                {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 0},
+                {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 0},
+                {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 0},
+                {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 0},
+
+                {"label": "F9", "matrix": [0, 9], "x": 11, "y": 0},
+                {"label": "F10", "matrix": [0, 10], "x": 12, "y": 0},
+                {"label": "F11", "matrix": [0, 11], "x": 13, "y": 0},
+                {"label": "F12", "matrix": [0, 12], "x": 14, "y": 0},
+
+                {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
+                {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
+                {"label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
+                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
+                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
+                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
+                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
+                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
+                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
+                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
+                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
+                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
+                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
+                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
+                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
+                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+
+                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"label": "Enter", "matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"label": "Shift", "matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 5.25},
+                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
+                {"label": "Alt", "matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5},
+                {"label": "Fn", "matrix": [5, 12], "x": 12.5, "y": 5.25},
+                {"label": "Ctrl", "matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
+
+                {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_ansi_tsangan_split_bs_rshift": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "F1", "matrix": [0, 1], "x": 2, "y": 0},
+                {"label": "F2", "matrix": [0, 2], "x": 3, "y": 0},
+                {"label": "F3", "matrix": [0, 3], "x": 4, "y": 0},
+                {"label": "F4", "matrix": [0, 4], "x": 5, "y": 0},
+
+                {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 0},
+                {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 0},
+                {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 0},
+                {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 0},
+
+                {"label": "F9", "matrix": [0, 9], "x": 11, "y": 0},
+                {"label": "F10", "matrix": [0, 10], "x": 12, "y": 0},
+                {"label": "F11", "matrix": [0, 11], "x": 13, "y": 0},
+                {"label": "F12", "matrix": [0, 12], "x": 14, "y": 0},
+
+                {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
+                {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
+                {"label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
+                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
+                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
+                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
+                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
+                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
+                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
+                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
+                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
+                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
+                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
+                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
+                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
+                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25},
+                {"label": "Delete", "matrix": [0, 13], "x": 14, "y": 1.25},
+
+                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"label": "Enter", "matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"label": "Shift", "matrix": [4, 13], "x": 14, "y": 4.25},
+
+                {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 5.25},
+                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
+                {"label": "Alt", "matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5},
+                {"label": "Fn", "matrix": [5, 12], "x": 12.5, "y": 5.25},
+                {"label": "Ctrl", "matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
+
+                {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_ansi_wkl": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "F1", "matrix": [0, 1], "x": 2, "y": 0},
+                {"label": "F2", "matrix": [0, 2], "x": 3, "y": 0},
+                {"label": "F3", "matrix": [0, 3], "x": 4, "y": 0},
+                {"label": "F4", "matrix": [0, 4], "x": 5, "y": 0},
+
+                {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 0},
+                {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 0},
+                {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 0},
+                {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 0},
+
+                {"label": "F9", "matrix": [0, 9], "x": 11, "y": 0},
+                {"label": "F10", "matrix": [0, 10], "x": 12, "y": 0},
+                {"label": "F11", "matrix": [0, 11], "x": 13, "y": 0},
+                {"label": "F12", "matrix": [0, 12], "x": 14, "y": 0},
+
+                {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
+                {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
+                {"label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
+                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
+                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
+                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
+                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
+                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
+                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
+                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
+                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
+                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
+                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
+                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
+                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
+                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+
+                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"label": "Enter", "matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"label": "Shift", "matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
+                {"label": "Alt", "matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5},
+                {"label": "Ctrl", "matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
+
+                {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_ansi_wkl_split_bs_rshift": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "F1", "matrix": [0, 1], "x": 2, "y": 0},
+                {"label": "F2", "matrix": [0, 2], "x": 3, "y": 0},
+                {"label": "F3", "matrix": [0, 3], "x": 4, "y": 0},
+                {"label": "F4", "matrix": [0, 4], "x": 5, "y": 0},
+
+                {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 0},
+                {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 0},
+                {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 0},
+                {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 0},
+
+                {"label": "F9", "matrix": [0, 9], "x": 11, "y": 0},
+                {"label": "F10", "matrix": [0, 10], "x": 12, "y": 0},
+                {"label": "F11", "matrix": [0, 11], "x": 13, "y": 0},
+                {"label": "F12", "matrix": [0, 12], "x": 14, "y": 0},
+
+                {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
+                {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
+                {"label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
+                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
+                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
+                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
+                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
+                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
+                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
+                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
+                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
+                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
+                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
+                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
+                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
+                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25},
+                {"label": "Delete", "matrix": [0, 13], "x": 14, "y": 1.25},
+
+                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"label": "Enter", "matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"label": "Shift", "matrix": [4, 13], "x": 14, "y": 4.25},
+
+                {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
+                {"label": "Alt", "matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5},
+                {"label": "Ctrl", "matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
+
+                {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_iso": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "F1", "matrix": [0, 1], "x": 2, "y": 0},
+                {"label": "F2", "matrix": [0, 2], "x": 3, "y": 0},
+                {"label": "F3", "matrix": [0, 3], "x": 4, "y": 0},
+                {"label": "F4", "matrix": [0, 4], "x": 5, "y": 0},
+
+                {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 0},
+                {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 0},
+                {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 0},
+                {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 0},
+
+                {"label": "F9", "matrix": [0, 9], "x": 11, "y": 0},
+                {"label": "F10", "matrix": [0, 10], "x": 12, "y": 0},
+                {"label": "F11", "matrix": [0, 11], "x": 13, "y": 0},
+                {"label": "F12", "matrix": [0, 12], "x": 14, "y": 0},
+
+                {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
+                {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
+                {"label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
+                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
+                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
+                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
+                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
+                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
+                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
+                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
+                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
+                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
+                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
+                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
+                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
+                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+
+                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
+
+                {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"label": "#", "matrix": [3, 12], "x": 12.75, "y": 3.25},
+                {"label": "Enter", "matrix": [3, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"label": "\\", "matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"label": "Shift", "matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"label": "GUI", "matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"label": "Space", "matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"label": "Alt", "matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
+                {"label": "GUI", "matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"label": "Fn", "matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"label": "Ctrl", "matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_iso_split_bs_rshift": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "F1", "matrix": [0, 1], "x": 2, "y": 0},
+                {"label": "F2", "matrix": [0, 2], "x": 3, "y": 0},
+                {"label": "F3", "matrix": [0, 3], "x": 4, "y": 0},
+                {"label": "F4", "matrix": [0, 4], "x": 5, "y": 0},
+
+                {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 0},
+                {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 0},
+                {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 0},
+                {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 0},
+
+                {"label": "F9", "matrix": [0, 9], "x": 11, "y": 0},
+                {"label": "F10", "matrix": [0, 10], "x": 12, "y": 0},
+                {"label": "F11", "matrix": [0, 11], "x": 13, "y": 0},
+                {"label": "F12", "matrix": [0, 12], "x": 14, "y": 0},
+
+                {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
+                {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
+                {"label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
+                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
+                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
+                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
+                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
+                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
+                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
+                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
+                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
+                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
+                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
+                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
+                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
+                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25},
+                {"label": "Delete", "matrix": [0, 13], "x": 14, "y": 1.25},
+
+                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
+
+                {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"label": "#", "matrix": [3, 12], "x": 12.75, "y": 3.25},
+                {"label": "Enter", "matrix": [3, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"label": "\\", "matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"label": "Shift", "matrix": [4, 13], "x": 14, "y": 4.25},
+
+                {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"label": "GUI", "matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"label": "Space", "matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"label": "Alt", "matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
+                {"label": "GUI", "matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"label": "Fn", "matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"label": "Ctrl", "matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_iso_tsangan": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "F1", "matrix": [0, 1], "x": 2, "y": 0},
+                {"label": "F2", "matrix": [0, 2], "x": 3, "y": 0},
+                {"label": "F3", "matrix": [0, 3], "x": 4, "y": 0},
+                {"label": "F4", "matrix": [0, 4], "x": 5, "y": 0},
+
+                {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 0},
+                {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 0},
+                {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 0},
+                {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 0},
+
+                {"label": "F9", "matrix": [0, 9], "x": 11, "y": 0},
+                {"label": "F10", "matrix": [0, 10], "x": 12, "y": 0},
+                {"label": "F11", "matrix": [0, 11], "x": 13, "y": 0},
+                {"label": "F12", "matrix": [0, 12], "x": 14, "y": 0},
+
+                {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
+                {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
+                {"label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
+                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
+                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
+                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
+                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
+                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
+                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
+                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
+                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
+                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
+                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
+                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
+                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
+                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+
+                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
+
+                {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"label": "#", "matrix": [3, 12], "x": 12.75, "y": 3.25},
+                {"label": "Enter", "matrix": [3, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"label": "\\", "matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"label": "Shift", "matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 5.25},
+                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
+                {"label": "Alt", "matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5},
+                {"label": "Fn", "matrix": [5, 12], "x": 12.5, "y": 5.25},
+                {"label": "Ctrl", "matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
+
+                {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_iso_tsangan_split_bs_rshift": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "F1", "matrix": [0, 1], "x": 2, "y": 0},
+                {"label": "F2", "matrix": [0, 2], "x": 3, "y": 0},
+                {"label": "F3", "matrix": [0, 3], "x": 4, "y": 0},
+                {"label": "F4", "matrix": [0, 4], "x": 5, "y": 0},
+
+                {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 0},
+                {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 0},
+                {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 0},
+                {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 0},
+
+                {"label": "F9", "matrix": [0, 9], "x": 11, "y": 0},
+                {"label": "F10", "matrix": [0, 10], "x": 12, "y": 0},
+                {"label": "F11", "matrix": [0, 11], "x": 13, "y": 0},
+                {"label": "F12", "matrix": [0, 12], "x": 14, "y": 0},
+
+                {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
+                {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
+                {"label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
+                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
+                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
+                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
+                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
+                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
+                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
+                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
+                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
+                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
+                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
+                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
+                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
+                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25},
+                {"label": "Delete", "matrix": [0, 13], "x": 14, "y": 1.25},
+
+                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
+
+                {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"label": "#", "matrix": [3, 12], "x": 12.75, "y": 3.25},
+                {"label": "Enter", "matrix": [3, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"label": "\\", "matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"label": "Shift", "matrix": [4, 13], "x": 14, "y": 4.25},
+
+                {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 5.25},
+                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
+                {"label": "Alt", "matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5},
+                {"label": "Fn", "matrix": [5, 12], "x": 12.5, "y": 5.25},
+                {"label": "Ctrl", "matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
+
+                {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_iso_wkl": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "F1", "matrix": [0, 1], "x": 2, "y": 0},
+                {"label": "F2", "matrix": [0, 2], "x": 3, "y": 0},
+                {"label": "F3", "matrix": [0, 3], "x": 4, "y": 0},
+                {"label": "F4", "matrix": [0, 4], "x": 5, "y": 0},
+
+                {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 0},
+                {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 0},
+                {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 0},
+                {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 0},
+
+                {"label": "F9", "matrix": [0, 9], "x": 11, "y": 0},
+                {"label": "F10", "matrix": [0, 10], "x": 12, "y": 0},
+                {"label": "F11", "matrix": [0, 11], "x": 13, "y": 0},
+                {"label": "F12", "matrix": [0, 12], "x": 14, "y": 0},
+
+                {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
+                {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
+                {"label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
+                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
+                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
+                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
+                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
+                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
+                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
+                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
+                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
+                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
+                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
+                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
+                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
+                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+
+                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
+
+                {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"label": "#", "matrix": [3, 12], "x": 12.75, "y": 3.25},
+                {"label": "Enter", "matrix": [3, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"label": "\\", "matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"label": "Shift", "matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 5.25},
+                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
+                {"label": "Alt", "matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5},
+                {"label": "Fn", "matrix": [5, 12], "x": 12.5, "y": 5.25},
+                {"label": "Ctrl", "matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
+
+                {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_iso_wkl_split_bs_rshift": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "F1", "matrix": [0, 1], "x": 2, "y": 0},
+                {"label": "F2", "matrix": [0, 2], "x": 3, "y": 0},
+                {"label": "F3", "matrix": [0, 3], "x": 4, "y": 0},
+                {"label": "F4", "matrix": [0, 4], "x": 5, "y": 0},
+
+                {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 0},
+                {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 0},
+                {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 0},
+                {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 0},
+
+                {"label": "F9", "matrix": [0, 9], "x": 11, "y": 0},
+                {"label": "F10", "matrix": [0, 10], "x": 12, "y": 0},
+                {"label": "F11", "matrix": [0, 11], "x": 13, "y": 0},
+                {"label": "F12", "matrix": [0, 12], "x": 14, "y": 0},
+
+                {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
+                {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
+                {"label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
+                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
+                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
+                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
+                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
+                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
+                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
+                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
+                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
+                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
+                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
+                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
+                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
+                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25},
+                {"label": "Delete", "matrix": [0, 13], "x": 14, "y": 1.25},
+
+                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
+
+                {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"label": "#", "matrix": [3, 12], "x": 12.75, "y": 3.25},
+                {"label": "Enter", "matrix": [3, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"label": "\\", "matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"label": "Shift", "matrix": [4, 13], "x": 14, "y": 4.25},
+
+                {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 5.25},
+                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
+                {"label": "Alt", "matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5},
+                {"label": "Fn", "matrix": [5, 12], "x": 12.5, "y": 5.25},
+                {"label": "Ctrl", "matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
+
+                {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/mechlovin/infinity87/rev2/rules.mk b/keyboards/mechlovin/infinity87/rev2/rules.mk
index ea7804f1585..179d02c3c68 100644
--- a/keyboards/mechlovin/infinity87/rev2/rules.mk
+++ b/keyboards/mechlovin/infinity87/rev2/rules.mk
@@ -1,11 +1,3 @@
-# Build Options
-#   change yes to no to disable
-#
-CONSOLE_ENABLE = no
-COMMAND_ENABLE = no
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = yes
-RGBLIGHT_ENABLE = yes
 CUSTOM_MATRIX = lite
 
 SRC += matrix.c
diff --git a/keyboards/mechlovin/infinity87/rgb_rev1/info.json b/keyboards/mechlovin/infinity87/rgb_rev1/info.json
deleted file mode 100644
index 27a7b441e32..00000000000
--- a/keyboards/mechlovin/infinity87/rgb_rev1/info.json
+++ /dev/null
@@ -1,1441 +0,0 @@
-{
-    "keyboard_name": "Infinity87 RGB Rev1",
-    "manufacturer": "Mechlovin.Studio",
-    "url": "",
-    "maintainer": "Team Mechlovin'",
-    "usb": {
-        "vid": "0x4D4C",
-        "pid": "0x8710",
-        "device_version": "0.0.1"
-    },
-    "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,
-            "rainbow_moving_chevron": true,
-            "cycle_out_in": true,
-            "cycle_out_in_dual": 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_rain": true,
-            "pixel_flow": true,
-            "pixel_fractal": 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
-        },
-        "default": {
-            "animation": "cycle_all"
-        },
-        "driver": "is31fl3741",
-        "sleep": true
-    },
-    "matrix_pins": {
-        "cols": ["B12", "B13", "B14", "B15", "A8", "A9", "B11", "B10", "B2", "B1", "B0", "A7", "A6", "A5", "A2", "A1", "A0"],
-        "rows": ["A10", "A13", "A14", "C13", "A4", "A3"]
-    },
-    "diode_direction": "COL2ROW",
-    "processor": "STM32F303",
-    "bootloader": "stm32-dfu",
-    "board": "QMK_PROTON_C",
-    "community_layouts": [
-        "tkl_ansi",
-        "tkl_ansi_split_bs_rshift",
-        "tkl_ansi_tsangan",
-        "tkl_ansi_tsangan_split_bs_rshift",
-        "tkl_iso",
-        "tkl_iso_split_bs_rshift",
-        "tkl_iso_tsangan",
-        "tkl_iso_tsangan_split_bs_rshift"
-    ],
-    "layouts": {
-        "LAYOUT_all": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-
-                {"label": "F1", "matrix": [0, 1], "x": 2, "y": 0},
-                {"label": "F2", "matrix": [0, 2], "x": 3, "y": 0},
-                {"label": "F3", "matrix": [0, 3], "x": 4, "y": 0},
-                {"label": "F4", "matrix": [0, 4], "x": 5, "y": 0},
-
-                {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 0},
-                {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 0},
-                {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 0},
-                {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 0},
-
-                {"label": "F9", "matrix": [0, 9], "x": 11, "y": 0},
-                {"label": "F10", "matrix": [0, 10], "x": 12, "y": 0},
-                {"label": "F11", "matrix": [0, 11], "x": 13, "y": 0},
-                {"label": "F12", "matrix": [0, 12], "x": 14, "y": 0},
-
-                {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
-                {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
-                {"label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0},
-
-                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
-                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
-                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
-                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
-                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
-                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
-                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
-                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
-                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
-                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
-                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
-                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
-                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
-                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25},
-                {"label": "Delete", "matrix": [0, 13], "x": 14, "y": 1.25},
-
-                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
-                {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25},
-                {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "y": 1.25},
-
-                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
-                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
-                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
-                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
-                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
-                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
-                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
-                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
-                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
-                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
-                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
-                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
-                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
-                {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
-
-                {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
-                {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25},
-                {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2.25},
-
-                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
-                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
-                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
-                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
-                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
-                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
-                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
-                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
-                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
-                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
-                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
-                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
-                {"label": "#", "matrix": [3, 12], "x": 12.75, "y": 3.25},
-                {"label": "Enter", "matrix": [3, 13], "x": 13.75, "y": 3.25, "w": 1.25},
-
-                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
-                {"label": "\\", "matrix": [4, 1], "x": 1.25, "y": 4.25},
-                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
-                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
-                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
-                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
-                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
-                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
-                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
-                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
-                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
-                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
-                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
-                {"label": "Shift", "matrix": [4, 13], "x": 14, "y": 4.25},
-
-                {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25},
-
-                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
-                {"label": "GUI", "matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
-                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
-                {"label": "Space", "matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
-                {"label": "Alt", "matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
-                {"label": "GUI", "matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
-                {"label": "Fn", "matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
-                {"label": "Ctrl", "matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
-
-                {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
-                {"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25},
-                {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
-            ]
-        },
-        "LAYOUT_tkl_ansi": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-
-                {"label": "F1", "matrix": [0, 1], "x": 2, "y": 0},
-                {"label": "F2", "matrix": [0, 2], "x": 3, "y": 0},
-                {"label": "F3", "matrix": [0, 3], "x": 4, "y": 0},
-                {"label": "F4", "matrix": [0, 4], "x": 5, "y": 0},
-
-                {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 0},
-                {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 0},
-                {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 0},
-                {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 0},
-
-                {"label": "F9", "matrix": [0, 9], "x": 11, "y": 0},
-                {"label": "F10", "matrix": [0, 10], "x": 12, "y": 0},
-                {"label": "F11", "matrix": [0, 11], "x": 13, "y": 0},
-                {"label": "F12", "matrix": [0, 12], "x": 14, "y": 0},
-
-                {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
-                {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
-                {"label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0},
-
-                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
-                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
-                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
-                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
-                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
-                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
-                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
-                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
-                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
-                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
-                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
-                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
-                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
-                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
-
-                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
-                {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25},
-                {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "y": 1.25},
-
-                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
-                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
-                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
-                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
-                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
-                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
-                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
-                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
-                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
-                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
-                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
-                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
-                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
-                {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
-
-                {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
-                {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25},
-                {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2.25},
-
-                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
-                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
-                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
-                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
-                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
-                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
-                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
-                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
-                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
-                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
-                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
-                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
-                {"label": "Enter", "matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
-
-                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
-                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
-                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
-                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
-                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
-                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
-                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
-                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
-                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
-                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
-                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
-                {"label": "Shift", "matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 2.75},
-
-                {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25},
-
-                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
-                {"label": "GUI", "matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
-                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
-                {"label": "Space", "matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
-                {"label": "Alt", "matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
-                {"label": "GUI", "matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
-                {"label": "Fn", "matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
-                {"label": "Ctrl", "matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
-
-                {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
-                {"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25},
-                {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
-            ]
-        },
-        "LAYOUT_tkl_ansi_split_bs_rshift": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-
-                {"label": "F1", "matrix": [0, 1], "x": 2, "y": 0},
-                {"label": "F2", "matrix": [0, 2], "x": 3, "y": 0},
-                {"label": "F3", "matrix": [0, 3], "x": 4, "y": 0},
-                {"label": "F4", "matrix": [0, 4], "x": 5, "y": 0},
-
-                {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 0},
-                {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 0},
-                {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 0},
-                {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 0},
-
-                {"label": "F9", "matrix": [0, 9], "x": 11, "y": 0},
-                {"label": "F10", "matrix": [0, 10], "x": 12, "y": 0},
-                {"label": "F11", "matrix": [0, 11], "x": 13, "y": 0},
-                {"label": "F12", "matrix": [0, 12], "x": 14, "y": 0},
-
-                {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
-                {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
-                {"label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0},
-
-                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
-                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
-                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
-                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
-                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
-                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
-                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
-                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
-                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
-                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
-                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
-                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
-                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
-                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25},
-                {"label": "Delete", "matrix": [0, 13], "x": 14, "y": 1.25},
-
-                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
-                {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25},
-                {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "y": 1.25},
-
-                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
-                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
-                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
-                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
-                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
-                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
-                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
-                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
-                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
-                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
-                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
-                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
-                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
-                {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
-
-                {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
-                {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25},
-                {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2.25},
-
-                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
-                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
-                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
-                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
-                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
-                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
-                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
-                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
-                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
-                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
-                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
-                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
-                {"label": "Enter", "matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
-
-                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
-                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
-                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
-                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
-                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
-                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
-                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
-                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
-                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
-                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
-                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
-                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
-                {"label": "Shift", "matrix": [4, 13], "x": 14, "y": 4.25},
-
-                {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25},
-
-                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
-                {"label": "GUI", "matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
-                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
-                {"label": "Space", "matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
-                {"label": "Alt", "matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
-                {"label": "GUI", "matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
-                {"label": "Fn", "matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
-                {"label": "Ctrl", "matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
-
-                {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
-                {"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25},
-                {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
-            ]
-        },
-        "LAYOUT_tkl_ansi_tsangan": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-
-                {"label": "F1", "matrix": [0, 1], "x": 2, "y": 0},
-                {"label": "F2", "matrix": [0, 2], "x": 3, "y": 0},
-                {"label": "F3", "matrix": [0, 3], "x": 4, "y": 0},
-                {"label": "F4", "matrix": [0, 4], "x": 5, "y": 0},
-
-                {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 0},
-                {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 0},
-                {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 0},
-                {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 0},
-
-                {"label": "F9", "matrix": [0, 9], "x": 11, "y": 0},
-                {"label": "F10", "matrix": [0, 10], "x": 12, "y": 0},
-                {"label": "F11", "matrix": [0, 11], "x": 13, "y": 0},
-                {"label": "F12", "matrix": [0, 12], "x": 14, "y": 0},
-
-                {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
-                {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
-                {"label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0},
-
-                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
-                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
-                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
-                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
-                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
-                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
-                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
-                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
-                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
-                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
-                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
-                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
-                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
-                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
-
-                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
-                {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25},
-                {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "y": 1.25},
-
-                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
-                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
-                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
-                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
-                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
-                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
-                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
-                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
-                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
-                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
-                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
-                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
-                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
-                {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
-
-                {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
-                {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25},
-                {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2.25},
-
-                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
-                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
-                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
-                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
-                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
-                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
-                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
-                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
-                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
-                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
-                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
-                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
-                {"label": "Enter", "matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
-
-                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
-                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
-                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
-                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
-                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
-                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
-                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
-                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
-                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
-                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
-                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
-                {"label": "Shift", "matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 2.75},
-
-                {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25},
-
-                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
-                {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 5.25},
-                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
-                {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
-                {"label": "Alt", "matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5},
-                {"label": "Fn", "matrix": [5, 12], "x": 12.5, "y": 5.25},
-                {"label": "Ctrl", "matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
-
-                {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
-                {"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25},
-                {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
-            ]
-        },
-        "LAYOUT_tkl_ansi_tsangan_split_bs_rshift": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-
-                {"label": "F1", "matrix": [0, 1], "x": 2, "y": 0},
-                {"label": "F2", "matrix": [0, 2], "x": 3, "y": 0},
-                {"label": "F3", "matrix": [0, 3], "x": 4, "y": 0},
-                {"label": "F4", "matrix": [0, 4], "x": 5, "y": 0},
-
-                {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 0},
-                {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 0},
-                {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 0},
-                {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 0},
-
-                {"label": "F9", "matrix": [0, 9], "x": 11, "y": 0},
-                {"label": "F10", "matrix": [0, 10], "x": 12, "y": 0},
-                {"label": "F11", "matrix": [0, 11], "x": 13, "y": 0},
-                {"label": "F12", "matrix": [0, 12], "x": 14, "y": 0},
-
-                {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
-                {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
-                {"label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0},
-
-                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
-                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
-                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
-                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
-                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
-                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
-                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
-                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
-                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
-                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
-                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
-                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
-                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
-                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25},
-                {"label": "Delete", "matrix": [0, 13], "x": 14, "y": 1.25},
-
-                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
-                {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25},
-                {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "y": 1.25},
-
-                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
-                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
-                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
-                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
-                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
-                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
-                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
-                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
-                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
-                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
-                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
-                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
-                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
-                {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
-
-                {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
-                {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25},
-                {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2.25},
-
-                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
-                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
-                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
-                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
-                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
-                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
-                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
-                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
-                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
-                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
-                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
-                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
-                {"label": "Enter", "matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
-
-                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
-                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
-                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
-                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
-                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
-                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
-                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
-                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
-                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
-                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
-                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
-                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
-                {"label": "Shift", "matrix": [4, 13], "x": 14, "y": 4.25},
-
-                {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25},
-
-                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
-                {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 5.25},
-                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
-                {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
-                {"label": "Alt", "matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5},
-                {"label": "Fn", "matrix": [5, 12], "x": 12.5, "y": 5.25},
-                {"label": "Ctrl", "matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
-
-                {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
-                {"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25},
-                {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
-            ]
-        },
-        "LAYOUT_tkl_ansi_wkl": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-
-                {"label": "F1", "matrix": [0, 1], "x": 2, "y": 0},
-                {"label": "F2", "matrix": [0, 2], "x": 3, "y": 0},
-                {"label": "F3", "matrix": [0, 3], "x": 4, "y": 0},
-                {"label": "F4", "matrix": [0, 4], "x": 5, "y": 0},
-
-                {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 0},
-                {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 0},
-                {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 0},
-                {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 0},
-
-                {"label": "F9", "matrix": [0, 9], "x": 11, "y": 0},
-                {"label": "F10", "matrix": [0, 10], "x": 12, "y": 0},
-                {"label": "F11", "matrix": [0, 11], "x": 13, "y": 0},
-                {"label": "F12", "matrix": [0, 12], "x": 14, "y": 0},
-
-                {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
-                {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
-                {"label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0},
-
-                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
-                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
-                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
-                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
-                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
-                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
-                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
-                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
-                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
-                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
-                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
-                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
-                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
-                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
-
-                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
-                {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25},
-                {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "y": 1.25},
-
-                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
-                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
-                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
-                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
-                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
-                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
-                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
-                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
-                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
-                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
-                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
-                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
-                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
-                {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
-
-                {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
-                {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25},
-                {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2.25},
-
-                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
-                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
-                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
-                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
-                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
-                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
-                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
-                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
-                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
-                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
-                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
-                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
-                {"label": "Enter", "matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
-
-                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
-                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
-                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
-                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
-                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
-                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
-                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
-                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
-                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
-                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
-                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
-                {"label": "Shift", "matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 2.75},
-
-                {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25},
-
-                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
-                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
-                {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
-                {"label": "Alt", "matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5},
-                {"label": "Ctrl", "matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
-
-                {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
-                {"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25},
-                {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
-            ]
-        },
-        "LAYOUT_tkl_ansi_wkl_split_bs_rshift": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-
-                {"label": "F1", "matrix": [0, 1], "x": 2, "y": 0},
-                {"label": "F2", "matrix": [0, 2], "x": 3, "y": 0},
-                {"label": "F3", "matrix": [0, 3], "x": 4, "y": 0},
-                {"label": "F4", "matrix": [0, 4], "x": 5, "y": 0},
-
-                {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 0},
-                {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 0},
-                {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 0},
-                {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 0},
-
-                {"label": "F9", "matrix": [0, 9], "x": 11, "y": 0},
-                {"label": "F10", "matrix": [0, 10], "x": 12, "y": 0},
-                {"label": "F11", "matrix": [0, 11], "x": 13, "y": 0},
-                {"label": "F12", "matrix": [0, 12], "x": 14, "y": 0},
-
-                {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
-                {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
-                {"label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0},
-
-                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
-                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
-                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
-                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
-                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
-                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
-                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
-                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
-                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
-                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
-                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
-                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
-                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
-                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25},
-                {"label": "Delete", "matrix": [0, 13], "x": 14, "y": 1.25},
-
-                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
-                {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25},
-                {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "y": 1.25},
-
-                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
-                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
-                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
-                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
-                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
-                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
-                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
-                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
-                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
-                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
-                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
-                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
-                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
-                {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
-
-                {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
-                {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25},
-                {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2.25},
-
-                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
-                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
-                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
-                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
-                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
-                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
-                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
-                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
-                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
-                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
-                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
-                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
-                {"label": "Enter", "matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
-
-                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
-                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
-                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
-                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
-                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
-                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
-                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
-                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
-                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
-                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
-                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
-                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
-                {"label": "Shift", "matrix": [4, 13], "x": 14, "y": 4.25},
-
-                {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25},
-
-                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
-                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
-                {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
-                {"label": "Alt", "matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5},
-                {"label": "Ctrl", "matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
-
-                {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
-                {"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25},
-                {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
-            ]
-        },
-        "LAYOUT_tkl_iso": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-
-                {"label": "F1", "matrix": [0, 1], "x": 2, "y": 0},
-                {"label": "F2", "matrix": [0, 2], "x": 3, "y": 0},
-                {"label": "F3", "matrix": [0, 3], "x": 4, "y": 0},
-                {"label": "F4", "matrix": [0, 4], "x": 5, "y": 0},
-
-                {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 0},
-                {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 0},
-                {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 0},
-                {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 0},
-
-                {"label": "F9", "matrix": [0, 9], "x": 11, "y": 0},
-                {"label": "F10", "matrix": [0, 10], "x": 12, "y": 0},
-                {"label": "F11", "matrix": [0, 11], "x": 13, "y": 0},
-                {"label": "F12", "matrix": [0, 12], "x": 14, "y": 0},
-
-                {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
-                {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
-                {"label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0},
-
-                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
-                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
-                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
-                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
-                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
-                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
-                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
-                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
-                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
-                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
-                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
-                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
-                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
-                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
-
-                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
-                {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25},
-                {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "y": 1.25},
-
-                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
-                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
-                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
-                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
-                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
-                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
-                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
-                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
-                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
-                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
-                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
-                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
-                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
-
-                {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
-                {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25},
-                {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2.25},
-
-                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
-                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
-                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
-                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
-                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
-                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
-                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
-                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
-                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
-                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
-                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
-                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
-                {"label": "#", "matrix": [3, 12], "x": 12.75, "y": 3.25},
-                {"label": "Enter", "matrix": [3, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
-
-                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
-                {"label": "\\", "matrix": [4, 1], "x": 1.25, "y": 4.25},
-                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
-                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
-                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
-                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
-                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
-                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
-                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
-                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
-                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
-                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
-                {"label": "Shift", "matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 2.75},
-
-                {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25},
-
-                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
-                {"label": "GUI", "matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
-                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
-                {"label": "Space", "matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
-                {"label": "Alt", "matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
-                {"label": "GUI", "matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
-                {"label": "Fn", "matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
-                {"label": "Ctrl", "matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
-
-                {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
-                {"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25},
-                {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
-            ]
-        },
-        "LAYOUT_tkl_iso_split_bs_rshift": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-
-                {"label": "F1", "matrix": [0, 1], "x": 2, "y": 0},
-                {"label": "F2", "matrix": [0, 2], "x": 3, "y": 0},
-                {"label": "F3", "matrix": [0, 3], "x": 4, "y": 0},
-                {"label": "F4", "matrix": [0, 4], "x": 5, "y": 0},
-
-                {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 0},
-                {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 0},
-                {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 0},
-                {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 0},
-
-                {"label": "F9", "matrix": [0, 9], "x": 11, "y": 0},
-                {"label": "F10", "matrix": [0, 10], "x": 12, "y": 0},
-                {"label": "F11", "matrix": [0, 11], "x": 13, "y": 0},
-                {"label": "F12", "matrix": [0, 12], "x": 14, "y": 0},
-
-                {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
-                {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
-                {"label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0},
-
-                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
-                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
-                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
-                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
-                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
-                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
-                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
-                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
-                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
-                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
-                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
-                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
-                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
-                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25},
-                {"label": "Delete", "matrix": [0, 13], "x": 14, "y": 1.25},
-
-                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
-                {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25},
-                {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "y": 1.25},
-
-                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
-                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
-                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
-                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
-                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
-                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
-                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
-                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
-                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
-                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
-                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
-                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
-                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
-
-                {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
-                {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25},
-                {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2.25},
-
-                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
-                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
-                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
-                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
-                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
-                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
-                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
-                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
-                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
-                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
-                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
-                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
-                {"label": "#", "matrix": [3, 12], "x": 12.75, "y": 3.25},
-                {"label": "Enter", "matrix": [3, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
-
-                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
-                {"label": "\\", "matrix": [4, 1], "x": 1.25, "y": 4.25},
-                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
-                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
-                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
-                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
-                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
-                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
-                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
-                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
-                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
-                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
-                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
-                {"label": "Shift", "matrix": [4, 13], "x": 14, "y": 4.25},
-
-                {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25},
-
-                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
-                {"label": "GUI", "matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
-                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
-                {"label": "Space", "matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
-                {"label": "Alt", "matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
-                {"label": "GUI", "matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
-                {"label": "Fn", "matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
-                {"label": "Ctrl", "matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
-
-                {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
-                {"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25},
-                {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
-            ]
-        },
-        "LAYOUT_tkl_iso_tsangan": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-
-                {"label": "F1", "matrix": [0, 1], "x": 2, "y": 0},
-                {"label": "F2", "matrix": [0, 2], "x": 3, "y": 0},
-                {"label": "F3", "matrix": [0, 3], "x": 4, "y": 0},
-                {"label": "F4", "matrix": [0, 4], "x": 5, "y": 0},
-
-                {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 0},
-                {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 0},
-                {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 0},
-                {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 0},
-
-                {"label": "F9", "matrix": [0, 9], "x": 11, "y": 0},
-                {"label": "F10", "matrix": [0, 10], "x": 12, "y": 0},
-                {"label": "F11", "matrix": [0, 11], "x": 13, "y": 0},
-                {"label": "F12", "matrix": [0, 12], "x": 14, "y": 0},
-
-                {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
-                {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
-                {"label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0},
-
-                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
-                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
-                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
-                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
-                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
-                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
-                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
-                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
-                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
-                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
-                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
-                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
-                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
-                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
-
-                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
-                {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25},
-                {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "y": 1.25},
-
-                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
-                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
-                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
-                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
-                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
-                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
-                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
-                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
-                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
-                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
-                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
-                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
-                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
-
-                {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
-                {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25},
-                {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2.25},
-
-                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
-                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
-                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
-                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
-                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
-                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
-                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
-                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
-                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
-                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
-                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
-                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
-                {"label": "#", "matrix": [3, 12], "x": 12.75, "y": 3.25},
-                {"label": "Enter", "matrix": [3, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
-
-                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
-                {"label": "\\", "matrix": [4, 1], "x": 1.25, "y": 4.25},
-                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
-                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
-                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
-                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
-                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
-                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
-                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
-                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
-                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
-                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
-                {"label": "Shift", "matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 2.75},
-
-                {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25},
-
-                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
-                {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 5.25},
-                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
-                {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
-                {"label": "Alt", "matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5},
-                {"label": "Fn", "matrix": [5, 12], "x": 12.5, "y": 5.25},
-                {"label": "Ctrl", "matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
-
-                {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
-                {"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25},
-                {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
-            ]
-        },
-        "LAYOUT_tkl_iso_tsangan_split_bs_rshift": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-
-                {"label": "F1", "matrix": [0, 1], "x": 2, "y": 0},
-                {"label": "F2", "matrix": [0, 2], "x": 3, "y": 0},
-                {"label": "F3", "matrix": [0, 3], "x": 4, "y": 0},
-                {"label": "F4", "matrix": [0, 4], "x": 5, "y": 0},
-
-                {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 0},
-                {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 0},
-                {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 0},
-                {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 0},
-
-                {"label": "F9", "matrix": [0, 9], "x": 11, "y": 0},
-                {"label": "F10", "matrix": [0, 10], "x": 12, "y": 0},
-                {"label": "F11", "matrix": [0, 11], "x": 13, "y": 0},
-                {"label": "F12", "matrix": [0, 12], "x": 14, "y": 0},
-
-                {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
-                {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
-                {"label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0},
-
-                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
-                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
-                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
-                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
-                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
-                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
-                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
-                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
-                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
-                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
-                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
-                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
-                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
-                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25},
-                {"label": "Delete", "matrix": [0, 13], "x": 14, "y": 1.25},
-
-                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
-                {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25},
-                {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "y": 1.25},
-
-                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
-                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
-                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
-                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
-                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
-                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
-                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
-                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
-                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
-                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
-                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
-                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
-                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
-
-                {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
-                {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25},
-                {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2.25},
-
-                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
-                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
-                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
-                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
-                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
-                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
-                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
-                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
-                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
-                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
-                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
-                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
-                {"label": "#", "matrix": [3, 12], "x": 12.75, "y": 3.25},
-                {"label": "Enter", "matrix": [3, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
-
-                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
-                {"label": "\\", "matrix": [4, 1], "x": 1.25, "y": 4.25},
-                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
-                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
-                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
-                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
-                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
-                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
-                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
-                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
-                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
-                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
-                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
-                {"label": "Shift", "matrix": [4, 13], "x": 14, "y": 4.25},
-
-                {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25},
-
-                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
-                {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 5.25},
-                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
-                {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
-                {"label": "Alt", "matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5},
-                {"label": "Fn", "matrix": [5, 12], "x": 12.5, "y": 5.25},
-                {"label": "Ctrl", "matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
-
-                {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
-                {"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25},
-                {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
-            ]
-        },
-        "LAYOUT_tkl_iso_wkl": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-
-                {"label": "F1", "matrix": [0, 1], "x": 2, "y": 0},
-                {"label": "F2", "matrix": [0, 2], "x": 3, "y": 0},
-                {"label": "F3", "matrix": [0, 3], "x": 4, "y": 0},
-                {"label": "F4", "matrix": [0, 4], "x": 5, "y": 0},
-
-                {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 0},
-                {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 0},
-                {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 0},
-                {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 0},
-
-                {"label": "F9", "matrix": [0, 9], "x": 11, "y": 0},
-                {"label": "F10", "matrix": [0, 10], "x": 12, "y": 0},
-                {"label": "F11", "matrix": [0, 11], "x": 13, "y": 0},
-                {"label": "F12", "matrix": [0, 12], "x": 14, "y": 0},
-
-                {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
-                {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
-                {"label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0},
-
-                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
-                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
-                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
-                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
-                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
-                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
-                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
-                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
-                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
-                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
-                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
-                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
-                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
-                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
-
-                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
-                {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25},
-                {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "y": 1.25},
-
-                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
-                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
-                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
-                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
-                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
-                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
-                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
-                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
-                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
-                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
-                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
-                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
-                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
-
-                {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
-                {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25},
-                {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2.25},
-
-                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
-                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
-                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
-                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
-                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
-                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
-                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
-                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
-                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
-                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
-                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
-                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
-                {"label": "#", "matrix": [3, 12], "x": 12.75, "y": 3.25},
-                {"label": "Enter", "matrix": [3, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
-
-                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
-                {"label": "\\", "matrix": [4, 1], "x": 1.25, "y": 4.25},
-                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
-                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
-                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
-                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
-                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
-                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
-                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
-                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
-                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
-                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
-                {"label": "Shift", "matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 2.75},
-
-                {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25},
-
-                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
-                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
-                {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
-                {"label": "Alt", "matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5},
-                {"label": "Ctrl", "matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
-
-                {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
-                {"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25},
-                {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
-            ]
-        },
-        "LAYOUT_tkl_iso_wkl_split_bs_rshift": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-
-                {"label": "F1", "matrix": [0, 1], "x": 2, "y": 0},
-                {"label": "F2", "matrix": [0, 2], "x": 3, "y": 0},
-                {"label": "F3", "matrix": [0, 3], "x": 4, "y": 0},
-                {"label": "F4", "matrix": [0, 4], "x": 5, "y": 0},
-
-                {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 0},
-                {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 0},
-                {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 0},
-                {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 0},
-
-                {"label": "F9", "matrix": [0, 9], "x": 11, "y": 0},
-                {"label": "F10", "matrix": [0, 10], "x": 12, "y": 0},
-                {"label": "F11", "matrix": [0, 11], "x": 13, "y": 0},
-                {"label": "F12", "matrix": [0, 12], "x": 14, "y": 0},
-
-                {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
-                {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
-                {"label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0},
-
-                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
-                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
-                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
-                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
-                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
-                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
-                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
-                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
-                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
-                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
-                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
-                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
-                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
-                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25},
-                {"label": "Delete", "matrix": [0, 13], "x": 14, "y": 1.25},
-
-                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
-                {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25},
-                {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "y": 1.25},
-
-                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
-                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
-                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
-                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
-                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
-                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
-                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
-                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
-                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
-                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
-                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
-                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
-                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
-
-                {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
-                {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25},
-                {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2.25},
-
-                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
-                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
-                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
-                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
-                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
-                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
-                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
-                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
-                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
-                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
-                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
-                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
-                {"label": "#", "matrix": [3, 12], "x": 12.75, "y": 3.25},
-                {"label": "Enter", "matrix": [3, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
-
-                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
-                {"label": "\\", "matrix": [4, 1], "x": 1.25, "y": 4.25},
-                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
-                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
-                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
-                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
-                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
-                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
-                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
-                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
-                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
-                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
-                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
-                {"label": "Shift", "matrix": [4, 13], "x": 14, "y": 4.25},
-
-                {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25},
-
-                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
-                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
-                {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
-                {"label": "Alt", "matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5},
-                {"label": "Ctrl", "matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
-
-                {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
-                {"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25},
-                {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
-            ]
-        }
-    }
-}
diff --git a/keyboards/mechlovin/infinity87/rgb_rev1/keyboard.json b/keyboards/mechlovin/infinity87/rgb_rev1/keyboard.json
new file mode 100644
index 00000000000..2d177949dc1
--- /dev/null
+++ b/keyboards/mechlovin/infinity87/rgb_rev1/keyboard.json
@@ -0,0 +1,1450 @@
+{
+    "keyboard_name": "Infinity87 RGB Rev1",
+    "manufacturer": "Mechlovin.Studio",
+    "url": "",
+    "maintainer": "Team Mechlovin'",
+    "usb": {
+        "vid": "0x4D4C",
+        "pid": "0x8710",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "console": true,
+        "command": true,
+        "nkro": true,
+        "rgb_matrix": true
+    },
+    "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,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": 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_rain": true,
+            "pixel_flow": true,
+            "pixel_fractal": 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
+        },
+        "default": {
+            "animation": "cycle_all"
+        },
+        "driver": "is31fl3741",
+        "sleep": true
+    },
+    "matrix_pins": {
+        "cols": ["B12", "B13", "B14", "B15", "A8", "A9", "B11", "B10", "B2", "B1", "B0", "A7", "A6", "A5", "A2", "A1", "A0"],
+        "rows": ["A10", "A13", "A14", "C13", "A4", "A3"]
+    },
+    "diode_direction": "COL2ROW",
+    "processor": "STM32F303",
+    "bootloader": "stm32-dfu",
+    "board": "QMK_PROTON_C",
+    "community_layouts": [
+        "tkl_ansi",
+        "tkl_ansi_split_bs_rshift",
+        "tkl_ansi_tsangan",
+        "tkl_ansi_tsangan_split_bs_rshift",
+        "tkl_iso",
+        "tkl_iso_split_bs_rshift",
+        "tkl_iso_tsangan",
+        "tkl_iso_tsangan_split_bs_rshift"
+    ],
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "F1", "matrix": [0, 1], "x": 2, "y": 0},
+                {"label": "F2", "matrix": [0, 2], "x": 3, "y": 0},
+                {"label": "F3", "matrix": [0, 3], "x": 4, "y": 0},
+                {"label": "F4", "matrix": [0, 4], "x": 5, "y": 0},
+
+                {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 0},
+                {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 0},
+                {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 0},
+                {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 0},
+
+                {"label": "F9", "matrix": [0, 9], "x": 11, "y": 0},
+                {"label": "F10", "matrix": [0, 10], "x": 12, "y": 0},
+                {"label": "F11", "matrix": [0, 11], "x": 13, "y": 0},
+                {"label": "F12", "matrix": [0, 12], "x": 14, "y": 0},
+
+                {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
+                {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
+                {"label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
+                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
+                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
+                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
+                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
+                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
+                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
+                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
+                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
+                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
+                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
+                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
+                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
+                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25},
+                {"label": "Delete", "matrix": [0, 13], "x": 14, "y": 1.25},
+
+                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"label": "#", "matrix": [3, 12], "x": 12.75, "y": 3.25},
+                {"label": "Enter", "matrix": [3, 13], "x": 13.75, "y": 3.25, "w": 1.25},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"label": "\\", "matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"label": "Shift", "matrix": [4, 13], "x": 14, "y": 4.25},
+
+                {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"label": "GUI", "matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"label": "Space", "matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"label": "Alt", "matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
+                {"label": "GUI", "matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"label": "Fn", "matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"label": "Ctrl", "matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_ansi": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "F1", "matrix": [0, 1], "x": 2, "y": 0},
+                {"label": "F2", "matrix": [0, 2], "x": 3, "y": 0},
+                {"label": "F3", "matrix": [0, 3], "x": 4, "y": 0},
+                {"label": "F4", "matrix": [0, 4], "x": 5, "y": 0},
+
+                {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 0},
+                {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 0},
+                {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 0},
+                {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 0},
+
+                {"label": "F9", "matrix": [0, 9], "x": 11, "y": 0},
+                {"label": "F10", "matrix": [0, 10], "x": 12, "y": 0},
+                {"label": "F11", "matrix": [0, 11], "x": 13, "y": 0},
+                {"label": "F12", "matrix": [0, 12], "x": 14, "y": 0},
+
+                {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
+                {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
+                {"label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
+                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
+                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
+                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
+                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
+                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
+                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
+                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
+                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
+                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
+                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
+                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
+                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
+                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+
+                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"label": "Enter", "matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"label": "Shift", "matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"label": "GUI", "matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"label": "Space", "matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"label": "Alt", "matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
+                {"label": "GUI", "matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"label": "Fn", "matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"label": "Ctrl", "matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_ansi_split_bs_rshift": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "F1", "matrix": [0, 1], "x": 2, "y": 0},
+                {"label": "F2", "matrix": [0, 2], "x": 3, "y": 0},
+                {"label": "F3", "matrix": [0, 3], "x": 4, "y": 0},
+                {"label": "F4", "matrix": [0, 4], "x": 5, "y": 0},
+
+                {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 0},
+                {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 0},
+                {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 0},
+                {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 0},
+
+                {"label": "F9", "matrix": [0, 9], "x": 11, "y": 0},
+                {"label": "F10", "matrix": [0, 10], "x": 12, "y": 0},
+                {"label": "F11", "matrix": [0, 11], "x": 13, "y": 0},
+                {"label": "F12", "matrix": [0, 12], "x": 14, "y": 0},
+
+                {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
+                {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
+                {"label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
+                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
+                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
+                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
+                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
+                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
+                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
+                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
+                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
+                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
+                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
+                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
+                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
+                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25},
+                {"label": "Delete", "matrix": [0, 13], "x": 14, "y": 1.25},
+
+                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"label": "Enter", "matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"label": "Shift", "matrix": [4, 13], "x": 14, "y": 4.25},
+
+                {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"label": "GUI", "matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"label": "Space", "matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"label": "Alt", "matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
+                {"label": "GUI", "matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"label": "Fn", "matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"label": "Ctrl", "matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_ansi_tsangan": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "F1", "matrix": [0, 1], "x": 2, "y": 0},
+                {"label": "F2", "matrix": [0, 2], "x": 3, "y": 0},
+                {"label": "F3", "matrix": [0, 3], "x": 4, "y": 0},
+                {"label": "F4", "matrix": [0, 4], "x": 5, "y": 0},
+
+                {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 0},
+                {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 0},
+                {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 0},
+                {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 0},
+
+                {"label": "F9", "matrix": [0, 9], "x": 11, "y": 0},
+                {"label": "F10", "matrix": [0, 10], "x": 12, "y": 0},
+                {"label": "F11", "matrix": [0, 11], "x": 13, "y": 0},
+                {"label": "F12", "matrix": [0, 12], "x": 14, "y": 0},
+
+                {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
+                {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
+                {"label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
+                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
+                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
+                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
+                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
+                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
+                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
+                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
+                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
+                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
+                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
+                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
+                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
+                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+
+                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"label": "Enter", "matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"label": "Shift", "matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 5.25},
+                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
+                {"label": "Alt", "matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5},
+                {"label": "Fn", "matrix": [5, 12], "x": 12.5, "y": 5.25},
+                {"label": "Ctrl", "matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
+
+                {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_ansi_tsangan_split_bs_rshift": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "F1", "matrix": [0, 1], "x": 2, "y": 0},
+                {"label": "F2", "matrix": [0, 2], "x": 3, "y": 0},
+                {"label": "F3", "matrix": [0, 3], "x": 4, "y": 0},
+                {"label": "F4", "matrix": [0, 4], "x": 5, "y": 0},
+
+                {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 0},
+                {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 0},
+                {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 0},
+                {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 0},
+
+                {"label": "F9", "matrix": [0, 9], "x": 11, "y": 0},
+                {"label": "F10", "matrix": [0, 10], "x": 12, "y": 0},
+                {"label": "F11", "matrix": [0, 11], "x": 13, "y": 0},
+                {"label": "F12", "matrix": [0, 12], "x": 14, "y": 0},
+
+                {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
+                {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
+                {"label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
+                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
+                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
+                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
+                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
+                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
+                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
+                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
+                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
+                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
+                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
+                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
+                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
+                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25},
+                {"label": "Delete", "matrix": [0, 13], "x": 14, "y": 1.25},
+
+                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"label": "Enter", "matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"label": "Shift", "matrix": [4, 13], "x": 14, "y": 4.25},
+
+                {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 5.25},
+                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
+                {"label": "Alt", "matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5},
+                {"label": "Fn", "matrix": [5, 12], "x": 12.5, "y": 5.25},
+                {"label": "Ctrl", "matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
+
+                {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_ansi_wkl": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "F1", "matrix": [0, 1], "x": 2, "y": 0},
+                {"label": "F2", "matrix": [0, 2], "x": 3, "y": 0},
+                {"label": "F3", "matrix": [0, 3], "x": 4, "y": 0},
+                {"label": "F4", "matrix": [0, 4], "x": 5, "y": 0},
+
+                {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 0},
+                {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 0},
+                {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 0},
+                {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 0},
+
+                {"label": "F9", "matrix": [0, 9], "x": 11, "y": 0},
+                {"label": "F10", "matrix": [0, 10], "x": 12, "y": 0},
+                {"label": "F11", "matrix": [0, 11], "x": 13, "y": 0},
+                {"label": "F12", "matrix": [0, 12], "x": 14, "y": 0},
+
+                {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
+                {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
+                {"label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
+                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
+                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
+                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
+                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
+                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
+                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
+                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
+                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
+                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
+                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
+                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
+                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
+                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+
+                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"label": "Enter", "matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"label": "Shift", "matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
+                {"label": "Alt", "matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5},
+                {"label": "Ctrl", "matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
+
+                {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_ansi_wkl_split_bs_rshift": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "F1", "matrix": [0, 1], "x": 2, "y": 0},
+                {"label": "F2", "matrix": [0, 2], "x": 3, "y": 0},
+                {"label": "F3", "matrix": [0, 3], "x": 4, "y": 0},
+                {"label": "F4", "matrix": [0, 4], "x": 5, "y": 0},
+
+                {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 0},
+                {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 0},
+                {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 0},
+                {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 0},
+
+                {"label": "F9", "matrix": [0, 9], "x": 11, "y": 0},
+                {"label": "F10", "matrix": [0, 10], "x": 12, "y": 0},
+                {"label": "F11", "matrix": [0, 11], "x": 13, "y": 0},
+                {"label": "F12", "matrix": [0, 12], "x": 14, "y": 0},
+
+                {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
+                {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
+                {"label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
+                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
+                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
+                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
+                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
+                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
+                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
+                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
+                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
+                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
+                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
+                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
+                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
+                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25},
+                {"label": "Delete", "matrix": [0, 13], "x": 14, "y": 1.25},
+
+                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"label": "Enter", "matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"label": "Shift", "matrix": [4, 13], "x": 14, "y": 4.25},
+
+                {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
+                {"label": "Alt", "matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5},
+                {"label": "Ctrl", "matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
+
+                {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_iso": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "F1", "matrix": [0, 1], "x": 2, "y": 0},
+                {"label": "F2", "matrix": [0, 2], "x": 3, "y": 0},
+                {"label": "F3", "matrix": [0, 3], "x": 4, "y": 0},
+                {"label": "F4", "matrix": [0, 4], "x": 5, "y": 0},
+
+                {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 0},
+                {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 0},
+                {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 0},
+                {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 0},
+
+                {"label": "F9", "matrix": [0, 9], "x": 11, "y": 0},
+                {"label": "F10", "matrix": [0, 10], "x": 12, "y": 0},
+                {"label": "F11", "matrix": [0, 11], "x": 13, "y": 0},
+                {"label": "F12", "matrix": [0, 12], "x": 14, "y": 0},
+
+                {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
+                {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
+                {"label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
+                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
+                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
+                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
+                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
+                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
+                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
+                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
+                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
+                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
+                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
+                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
+                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
+                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+
+                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
+
+                {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"label": "#", "matrix": [3, 12], "x": 12.75, "y": 3.25},
+                {"label": "Enter", "matrix": [3, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"label": "\\", "matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"label": "Shift", "matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"label": "GUI", "matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"label": "Space", "matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"label": "Alt", "matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
+                {"label": "GUI", "matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"label": "Fn", "matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"label": "Ctrl", "matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_iso_split_bs_rshift": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "F1", "matrix": [0, 1], "x": 2, "y": 0},
+                {"label": "F2", "matrix": [0, 2], "x": 3, "y": 0},
+                {"label": "F3", "matrix": [0, 3], "x": 4, "y": 0},
+                {"label": "F4", "matrix": [0, 4], "x": 5, "y": 0},
+
+                {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 0},
+                {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 0},
+                {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 0},
+                {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 0},
+
+                {"label": "F9", "matrix": [0, 9], "x": 11, "y": 0},
+                {"label": "F10", "matrix": [0, 10], "x": 12, "y": 0},
+                {"label": "F11", "matrix": [0, 11], "x": 13, "y": 0},
+                {"label": "F12", "matrix": [0, 12], "x": 14, "y": 0},
+
+                {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
+                {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
+                {"label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
+                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
+                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
+                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
+                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
+                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
+                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
+                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
+                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
+                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
+                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
+                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
+                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
+                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25},
+                {"label": "Delete", "matrix": [0, 13], "x": 14, "y": 1.25},
+
+                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
+
+                {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"label": "#", "matrix": [3, 12], "x": 12.75, "y": 3.25},
+                {"label": "Enter", "matrix": [3, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"label": "\\", "matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"label": "Shift", "matrix": [4, 13], "x": 14, "y": 4.25},
+
+                {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"label": "GUI", "matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"label": "Space", "matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"label": "Alt", "matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
+                {"label": "GUI", "matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"label": "Fn", "matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"label": "Ctrl", "matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_iso_tsangan": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "F1", "matrix": [0, 1], "x": 2, "y": 0},
+                {"label": "F2", "matrix": [0, 2], "x": 3, "y": 0},
+                {"label": "F3", "matrix": [0, 3], "x": 4, "y": 0},
+                {"label": "F4", "matrix": [0, 4], "x": 5, "y": 0},
+
+                {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 0},
+                {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 0},
+                {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 0},
+                {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 0},
+
+                {"label": "F9", "matrix": [0, 9], "x": 11, "y": 0},
+                {"label": "F10", "matrix": [0, 10], "x": 12, "y": 0},
+                {"label": "F11", "matrix": [0, 11], "x": 13, "y": 0},
+                {"label": "F12", "matrix": [0, 12], "x": 14, "y": 0},
+
+                {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
+                {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
+                {"label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
+                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
+                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
+                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
+                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
+                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
+                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
+                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
+                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
+                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
+                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
+                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
+                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
+                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+
+                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
+
+                {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"label": "#", "matrix": [3, 12], "x": 12.75, "y": 3.25},
+                {"label": "Enter", "matrix": [3, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"label": "\\", "matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"label": "Shift", "matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 5.25},
+                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
+                {"label": "Alt", "matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5},
+                {"label": "Fn", "matrix": [5, 12], "x": 12.5, "y": 5.25},
+                {"label": "Ctrl", "matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
+
+                {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_iso_tsangan_split_bs_rshift": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "F1", "matrix": [0, 1], "x": 2, "y": 0},
+                {"label": "F2", "matrix": [0, 2], "x": 3, "y": 0},
+                {"label": "F3", "matrix": [0, 3], "x": 4, "y": 0},
+                {"label": "F4", "matrix": [0, 4], "x": 5, "y": 0},
+
+                {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 0},
+                {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 0},
+                {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 0},
+                {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 0},
+
+                {"label": "F9", "matrix": [0, 9], "x": 11, "y": 0},
+                {"label": "F10", "matrix": [0, 10], "x": 12, "y": 0},
+                {"label": "F11", "matrix": [0, 11], "x": 13, "y": 0},
+                {"label": "F12", "matrix": [0, 12], "x": 14, "y": 0},
+
+                {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
+                {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
+                {"label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
+                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
+                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
+                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
+                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
+                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
+                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
+                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
+                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
+                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
+                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
+                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
+                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
+                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25},
+                {"label": "Delete", "matrix": [0, 13], "x": 14, "y": 1.25},
+
+                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
+
+                {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"label": "#", "matrix": [3, 12], "x": 12.75, "y": 3.25},
+                {"label": "Enter", "matrix": [3, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"label": "\\", "matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"label": "Shift", "matrix": [4, 13], "x": 14, "y": 4.25},
+
+                {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 5.25},
+                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
+                {"label": "Alt", "matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5},
+                {"label": "Fn", "matrix": [5, 12], "x": 12.5, "y": 5.25},
+                {"label": "Ctrl", "matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
+
+                {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_iso_wkl": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "F1", "matrix": [0, 1], "x": 2, "y": 0},
+                {"label": "F2", "matrix": [0, 2], "x": 3, "y": 0},
+                {"label": "F3", "matrix": [0, 3], "x": 4, "y": 0},
+                {"label": "F4", "matrix": [0, 4], "x": 5, "y": 0},
+
+                {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 0},
+                {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 0},
+                {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 0},
+                {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 0},
+
+                {"label": "F9", "matrix": [0, 9], "x": 11, "y": 0},
+                {"label": "F10", "matrix": [0, 10], "x": 12, "y": 0},
+                {"label": "F11", "matrix": [0, 11], "x": 13, "y": 0},
+                {"label": "F12", "matrix": [0, 12], "x": 14, "y": 0},
+
+                {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
+                {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
+                {"label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
+                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
+                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
+                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
+                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
+                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
+                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
+                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
+                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
+                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
+                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
+                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
+                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
+                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+
+                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
+
+                {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"label": "#", "matrix": [3, 12], "x": 12.75, "y": 3.25},
+                {"label": "Enter", "matrix": [3, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"label": "\\", "matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"label": "Shift", "matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
+                {"label": "Alt", "matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5},
+                {"label": "Ctrl", "matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
+
+                {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_iso_wkl_split_bs_rshift": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "F1", "matrix": [0, 1], "x": 2, "y": 0},
+                {"label": "F2", "matrix": [0, 2], "x": 3, "y": 0},
+                {"label": "F3", "matrix": [0, 3], "x": 4, "y": 0},
+                {"label": "F4", "matrix": [0, 4], "x": 5, "y": 0},
+
+                {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 0},
+                {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 0},
+                {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 0},
+                {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 0},
+
+                {"label": "F9", "matrix": [0, 9], "x": 11, "y": 0},
+                {"label": "F10", "matrix": [0, 10], "x": 12, "y": 0},
+                {"label": "F11", "matrix": [0, 11], "x": 13, "y": 0},
+                {"label": "F12", "matrix": [0, 12], "x": 14, "y": 0},
+
+                {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
+                {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
+                {"label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
+                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
+                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
+                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
+                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
+                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
+                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
+                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
+                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
+                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
+                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
+                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
+                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
+                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25},
+                {"label": "Delete", "matrix": [0, 13], "x": 14, "y": 1.25},
+
+                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
+
+                {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"label": "#", "matrix": [3, 12], "x": 12.75, "y": 3.25},
+                {"label": "Enter", "matrix": [3, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"label": "\\", "matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"label": "Shift", "matrix": [4, 13], "x": 14, "y": 4.25},
+
+                {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
+                {"label": "Alt", "matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5},
+                {"label": "Ctrl", "matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
+
+                {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/mechlovin/infinity87/rgb_rev1/rules.mk b/keyboards/mechlovin/infinity87/rgb_rev1/rules.mk
deleted file mode 100644
index e408bde91c4..00000000000
--- a/keyboards/mechlovin/infinity87/rgb_rev1/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-RGB_MATRIX_ENABLE = yes        # Use RGB matrix
diff --git a/keyboards/mechlovin/infinity87/rules.mk b/keyboards/mechlovin/infinity87/rules.mk
index 251f8440aab..4aa072cae75 100644
--- a/keyboards/mechlovin/infinity87/rules.mk
+++ b/keyboards/mechlovin/infinity87/rules.mk
@@ -1,15 +1 @@
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = yes        # Console for debug
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE  = no      # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
 DEFAULT_FOLDER = mechlovin/infinity87/rgb_rev1
diff --git a/keyboards/mechlovin/infinity875/info.json b/keyboards/mechlovin/infinity875/info.json
deleted file mode 100644
index cb8154a713e..00000000000
--- a/keyboards/mechlovin/infinity875/info.json
+++ /dev/null
@@ -1,567 +0,0 @@
-{
-    "keyboard_name": "Infinity87.5",
-    "manufacturer": "Mechlovin.Studio",
-    "url": "",
-    "maintainer": "Mechlovin' Studio",
-    "usb": {
-        "vid": "0x4D4C",
-        "pid": "0x0875",
-        "device_version": "0.0.1"
-    },
-    "rgb_matrix": {
-        "driver": "ws2812",
-        "max_brightness": 200,
-        "sleep": true
-    },
-    "indicators": {
-        "caps_lock": "D6",
-        "scroll_lock": "B4"
-    },
-    "ws2812": {
-        "pin": "E2"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "layouts": {
-        "LAYOUT_tkl_ansi_split_bs_rshift": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "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.5, "y": 0},
-                {"matrix": [0, 7], "x": 7.5, "y": 0},
-                {"matrix": [0, 8], "x": 8.5, "y": 0},
-                {"matrix": [0, 9], "x": 9.5, "y": 0},
-
-                {"matrix": [0, 10], "x": 11, "y": 0},
-                {"matrix": [0, 11], "x": 12, "y": 0},
-                {"matrix": [0, 12], "x": 13, "y": 0},
-                {"matrix": [0, 13], "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},
-                {"matrix": [2, 13], "x": 14, "y": 1.25},
-
-                {"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},
-                {"matrix": [4, 13], "x": 13.25, "y": 4.25, "w": 1.75},
-
-                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
-
-                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
-                {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
-
-                {"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_iso_split_bs_rshift": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "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.5, "y": 0},
-                {"matrix": [0, 7], "x": 7.5, "y": 0},
-                {"matrix": [0, 8], "x": 8.5, "y": 0},
-                {"matrix": [0, 9], "x": 9.5, "y": 0},
-
-                {"matrix": [0, 10], "x": 11, "y": 0},
-                {"matrix": [0, 11], "x": 12, "y": 0},
-                {"matrix": [0, 12], "x": 13, "y": 0},
-                {"matrix": [0, 13], "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},
-                {"matrix": [2, 13], "x": 14, "y": 1.25},
-
-                {"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, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
-
-                {"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, 12], "x": 12.75, "y": 3.25},
-
-                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4.25},
-                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
-                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
-                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
-                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
-                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
-                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
-                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
-                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
-                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
-                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
-                {"matrix": [4, 12], "x": 12.25, "y": 4.25},
-                {"matrix": [4, 13], "x": 13.25, "y": 4.25, "w": 1.75},
-
-                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
-
-                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
-                {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
-
-                {"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_f13_ansi_split_bs_rshift": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-
-                {"matrix": [0, 1], "x": 1.25, "y": 0},
-                {"matrix": [0, 2], "x": 2.25, "y": 0},
-                {"matrix": [0, 3], "x": 3.25, "y": 0},
-                {"matrix": [0, 4], "x": 4.25, "y": 0},
-
-                {"matrix": [0, 5], "x": 5.5, "y": 0},
-                {"matrix": [0, 6], "x": 6.5, "y": 0},
-                {"matrix": [0, 7], "x": 7.5, "y": 0},
-                {"matrix": [0, 8], "x": 8.5, "y": 0},
-
-                {"matrix": [0, 9], "x": 9.75, "y": 0},
-                {"matrix": [0, 10], "x": 10.75, "y": 0},
-                {"matrix": [0, 11], "x": 11.75, "y": 0},
-                {"matrix": [0, 12], "x": 12.75, "y": 0},
-
-                {"matrix": [0, 13], "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},
-                {"matrix": [2, 13], "x": 14, "y": 1.25},
-
-                {"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},
-                {"matrix": [4, 13], "x": 13.25, "y": 4.25, "w": 1.75},
-
-                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
-
-                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
-                {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
-
-                {"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_f13_iso_split_bs_rshift": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-
-                {"matrix": [0, 1], "x": 1.25, "y": 0},
-                {"matrix": [0, 2], "x": 2.25, "y": 0},
-                {"matrix": [0, 3], "x": 3.25, "y": 0},
-                {"matrix": [0, 4], "x": 4.25, "y": 0},
-
-                {"matrix": [0, 5], "x": 5.5, "y": 0},
-                {"matrix": [0, 6], "x": 6.5, "y": 0},
-                {"matrix": [0, 7], "x": 7.5, "y": 0},
-                {"matrix": [0, 8], "x": 8.5, "y": 0},
-
-                {"matrix": [0, 9], "x": 9.75, "y": 0},
-                {"matrix": [0, 10], "x": 10.75, "y": 0},
-                {"matrix": [0, 11], "x": 11.75, "y": 0},
-                {"matrix": [0, 12], "x": 12.75, "y": 0},
-
-                {"matrix": [0, 13], "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},
-                {"matrix": [2, 13], "x": 14, "y": 1.25},
-
-                {"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, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
-
-                {"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, 12], "x": 12.75, "y": 3.25},
-
-                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4.25},
-                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
-                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
-                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
-                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
-                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
-                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
-                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
-                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
-                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
-                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
-                {"matrix": [4, 12], "x": 12.25, "y": 4.25},
-                {"matrix": [4, 13], "x": 13.25, "y": 4.25, "w": 1.75},
-
-                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
-
-                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
-                {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
-
-                {"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_all": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-
-                {"matrix": [0, 1], "x": 1.25, "y": 0},
-                {"matrix": [0, 2], "x": 2.25, "y": 0},
-                {"matrix": [0, 3], "x": 3.25, "y": 0},
-                {"matrix": [0, 4], "x": 4.25, "y": 0},
-
-                {"matrix": [0, 5], "x": 5.5, "y": 0},
-                {"matrix": [0, 6], "x": 6.5, "y": 0},
-                {"matrix": [0, 7], "x": 7.5, "y": 0},
-                {"matrix": [0, 8], "x": 8.5, "y": 0},
-
-                {"matrix": [0, 9], "x": 9.75, "y": 0},
-                {"matrix": [0, 10], "x": 10.75, "y": 0},
-                {"matrix": [0, 11], "x": 11.75, "y": 0},
-                {"matrix": [0, 12], "x": 12.75, "y": 0},
-
-                {"matrix": [0, 13], "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},
-                {"matrix": [2, 13], "x": 14, "y": 1.25},
-
-                {"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": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4.25},
-                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
-                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
-                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
-                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
-                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
-                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
-                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
-                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
-                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
-                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
-                {"matrix": [4, 12], "x": 12.25, "y": 4.25},
-                {"matrix": [4, 13], "x": 13.25, "y": 4.25, "w": 1.75},
-
-                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
-
-                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
-                {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
-
-                {"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}
-            ]
-        }
-    }
-    ,"meta": "https://noroadsleft.github.io/kbf_qmk_converter/"
-}
diff --git a/keyboards/mechlovin/infinity875/keyboard.json b/keyboards/mechlovin/infinity875/keyboard.json
new file mode 100644
index 00000000000..73bdb0af130
--- /dev/null
+++ b/keyboards/mechlovin/infinity875/keyboard.json
@@ -0,0 +1,573 @@
+{
+    "keyboard_name": "Infinity87.5",
+    "manufacturer": "Mechlovin.Studio",
+    "url": "",
+    "maintainer": "Mechlovin' Studio",
+    "usb": {
+        "vid": "0x4D4C",
+        "pid": "0x0875",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "mousekey": false,
+        "extrakey": true,
+        "rgb_matrix": true
+    },
+    "rgb_matrix": {
+        "driver": "ws2812",
+        "max_brightness": 200,
+        "sleep": true
+    },
+    "indicators": {
+        "caps_lock": "D6",
+        "scroll_lock": "B4"
+    },
+    "ws2812": {
+        "pin": "E2"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "layouts": {
+        "LAYOUT_tkl_ansi_split_bs_rshift": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "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.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 10], "x": 11, "y": 0},
+                {"matrix": [0, 11], "x": 12, "y": 0},
+                {"matrix": [0, 12], "x": 13, "y": 0},
+                {"matrix": [0, 13], "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},
+                {"matrix": [2, 13], "x": 14, "y": 1.25},
+
+                {"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},
+                {"matrix": [4, 13], "x": 13.25, "y": 4.25, "w": 1.75},
+
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"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_iso_split_bs_rshift": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "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.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 10], "x": 11, "y": 0},
+                {"matrix": [0, 11], "x": 12, "y": 0},
+                {"matrix": [0, 12], "x": 13, "y": 0},
+                {"matrix": [0, 13], "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},
+                {"matrix": [2, 13], "x": 14, "y": 1.25},
+
+                {"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, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+
+                {"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, 12], "x": 12.75, "y": 3.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25},
+                {"matrix": [4, 13], "x": 13.25, "y": 4.25, "w": 1.75},
+
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"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_f13_ansi_split_bs_rshift": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 9.75, "y": 0},
+                {"matrix": [0, 10], "x": 10.75, "y": 0},
+                {"matrix": [0, 11], "x": 11.75, "y": 0},
+                {"matrix": [0, 12], "x": 12.75, "y": 0},
+
+                {"matrix": [0, 13], "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},
+                {"matrix": [2, 13], "x": 14, "y": 1.25},
+
+                {"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},
+                {"matrix": [4, 13], "x": 13.25, "y": 4.25, "w": 1.75},
+
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"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_f13_iso_split_bs_rshift": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 9.75, "y": 0},
+                {"matrix": [0, 10], "x": 10.75, "y": 0},
+                {"matrix": [0, 11], "x": 11.75, "y": 0},
+                {"matrix": [0, 12], "x": 12.75, "y": 0},
+
+                {"matrix": [0, 13], "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},
+                {"matrix": [2, 13], "x": 14, "y": 1.25},
+
+                {"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, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+
+                {"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, 12], "x": 12.75, "y": 3.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25},
+                {"matrix": [4, 13], "x": 13.25, "y": 4.25, "w": 1.75},
+
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"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_all": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 9.75, "y": 0},
+                {"matrix": [0, 10], "x": 10.75, "y": 0},
+                {"matrix": [0, 11], "x": 11.75, "y": 0},
+                {"matrix": [0, 12], "x": 12.75, "y": 0},
+
+                {"matrix": [0, 13], "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},
+                {"matrix": [2, 13], "x": 14, "y": 1.25},
+
+                {"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": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25},
+                {"matrix": [4, 13], "x": 13.25, "y": 4.25, "w": 1.75},
+
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"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}
+            ]
+        }
+    }
+    ,"meta": "https://noroadsleft.github.io/kbf_qmk_converter/"
+}
diff --git a/keyboards/mechlovin/infinity875/rules.mk b/keyboards/mechlovin/infinity875/rules.mk
index 33f549f3aef..179d02c3c68 100644
--- a/keyboards/mechlovin/infinity875/rules.mk
+++ b/keyboards/mechlovin/infinity875/rules.mk
@@ -1,16 +1,3 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
 CUSTOM_MATRIX = lite
-RGB_MATRIX_ENABLE = yes
 
 SRC += matrix.c
diff --git a/keyboards/mechlovin/jay60/info.json b/keyboards/mechlovin/jay60/info.json
deleted file mode 100644
index 1f8d68a5411..00000000000
--- a/keyboards/mechlovin/jay60/info.json
+++ /dev/null
@@ -1,310 +0,0 @@
-{
-    "keyboard_name": "Jay60",
-    "manufacturer": "Mechlovin Studio",
-    "url": "",
-    "maintainer": "Mechlovin' Studio",
-    "usb": {
-        "vid": "0x4D4C",
-        "pid": "0x0600",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["B6", "B5", "B3", "B2", "B1", "B0", "A0", "A6", "A7", "C7", "C6", "C5", "C4", "C3"],
-        "rows": ["C2", "C1", "C0", "D7", "A1"]
-    },
-    "diode_direction": "COL2ROW",
-    "indicators": {
-        "caps_lock": "D4"
-    },
-    "processor": "atmega32a",
-    "bootloader": "usbasploader",
-    "layout_aliases": {
-        "LAYOUT_all": "LAYOUT_60_ansi_split_bs_rshift"
-    },
-    "community_layouts": [
-        "60_ansi",
-        "60_ansi_split_bs_rshift",
-        "60_ansi_tsangan",
-        "60_tsangan_hhkb"
-    ],
-    "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": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-
-                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
-                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
-                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
-                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
-                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
-                {"label": "Y", "matrix": [1, 6], "x": 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], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
-                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
-                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
-                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
-                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
-                {"label": "H", "matrix": [2, 6], "x": 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], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
-                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
-                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
-                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
-                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
-                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
-                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
-                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
-                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
-                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
-                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
-
-                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"label": "Space", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
-                {"label": "Alt", "matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
-                {"label": "GUI", "matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
-                {"label": "Menu", "matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
-                {"label": "Ctrl", "matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
-            ]
-        },
-        "LAYOUT_60_ansi_split_bs_rshift": {
-            "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": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
-                {"label": "Delete", "matrix": [2, 12], "x": 14, "y": 0},
-
-                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
-                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
-                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
-                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
-                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
-                {"label": "Y", "matrix": [1, 6], "x": 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], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
-                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
-                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
-                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
-                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
-                {"label": "H", "matrix": [2, 6], "x": 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], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
-                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
-                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
-                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
-                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
-                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
-                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
-                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
-                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
-                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
-                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"label": "TO(1)", "matrix": [3, 13], "x": 14, "y": 3},
-
-                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"label": "Space", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
-                {"label": "Alt", "matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
-                {"label": "GUI", "matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
-                {"label": "Menu", "matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
-                {"label": "Ctrl", "matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
-            ]
-        },
-        "LAYOUT_60_ansi_tsangan": {
-            "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": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-
-                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
-                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
-                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
-                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
-                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
-                {"label": "Y", "matrix": [1, 6], "x": 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], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
-                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
-                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
-                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
-                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
-                {"label": "H", "matrix": [2, 6], "x": 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], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
-                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
-                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
-                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
-                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
-                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
-                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
-                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
-                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
-                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
-                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
-
-                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
-                {"label": "GUI", "matrix": [4, 1], "x": 1.5, "y": 4},
-                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
-                {"label": "Space", "matrix": [4, 6], "x": 4, "y": 4, "w": 7},
-                {"label": "Alt", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
-                {"label": "Menu", "matrix": [4, 12], "x": 12.5, "y": 4},
-                {"label": "Ctrl", "matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
-            ]
-        },
-        "LAYOUT_60_tsangan_hhkb": {
-            "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": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
-                {"label": "Delete", "matrix": [2, 12], "x": 14, "y": 0},
-
-                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
-                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
-                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
-                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
-                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
-                {"label": "Y", "matrix": [1, 6], "x": 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], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
-                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
-                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
-                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
-                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
-                {"label": "H", "matrix": [2, 6], "x": 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], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
-                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
-                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
-                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
-                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
-                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
-                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
-                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
-                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
-                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
-                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"label": "TO(1)", "matrix": [3, 13], "x": 14, "y": 3},
-
-                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
-                {"label": "GUI", "matrix": [4, 1], "x": 1.5, "y": 4},
-                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
-                {"label": "Space", "matrix": [4, 6], "x": 4, "y": 4, "w": 7},
-                {"label": "Alt", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
-                {"label": "Menu", "matrix": [4, 12], "x": 12.5, "y": 4},
-                {"label": "Ctrl", "matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
-            ]
-        }
-    }
-}
diff --git a/keyboards/mechlovin/jay60/keyboard.json b/keyboards/mechlovin/jay60/keyboard.json
new file mode 100644
index 00000000000..37f25f36fe8
--- /dev/null
+++ b/keyboards/mechlovin/jay60/keyboard.json
@@ -0,0 +1,315 @@
+{
+    "keyboard_name": "Jay60",
+    "manufacturer": "Mechlovin Studio",
+    "url": "",
+    "maintainer": "Mechlovin' Studio",
+    "usb": {
+        "vid": "0x4D4C",
+        "pid": "0x0600",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true
+    },
+    "matrix_pins": {
+        "cols": ["B6", "B5", "B3", "B2", "B1", "B0", "A0", "A6", "A7", "C7", "C6", "C5", "C4", "C3"],
+        "rows": ["C2", "C1", "C0", "D7", "A1"]
+    },
+    "diode_direction": "COL2ROW",
+    "indicators": {
+        "caps_lock": "D4"
+    },
+    "processor": "atmega32a",
+    "bootloader": "usbasploader",
+    "layout_aliases": {
+        "LAYOUT_all": "LAYOUT_60_ansi_split_bs_rshift"
+    },
+    "community_layouts": [
+        "60_ansi",
+        "60_ansi_split_bs_rshift",
+        "60_ansi_tsangan",
+        "60_tsangan_hhkb"
+    ],
+    "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": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 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], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 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], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "Space", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "Alt", "matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"label": "GUI", "matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"label": "Menu", "matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+                {"label": "Ctrl", "matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
+            ]
+        },
+        "LAYOUT_60_ansi_split_bs_rshift": {
+            "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": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "Delete", "matrix": [2, 12], "x": 14, "y": 0},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 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], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 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], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "TO(1)", "matrix": [3, 13], "x": 14, "y": 3},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "Space", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "Alt", "matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"label": "GUI", "matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"label": "Menu", "matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+                {"label": "Ctrl", "matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
+            ]
+        },
+        "LAYOUT_60_ansi_tsangan": {
+            "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": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 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], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 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], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"label": "GUI", "matrix": [4, 1], "x": 1.5, "y": 4},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"label": "Space", "matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"label": "Alt", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+                {"label": "Menu", "matrix": [4, 12], "x": 12.5, "y": 4},
+                {"label": "Ctrl", "matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_60_tsangan_hhkb": {
+            "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": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "Delete", "matrix": [2, 12], "x": 14, "y": 0},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 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], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 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], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "TO(1)", "matrix": [3, 13], "x": 14, "y": 3},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"label": "GUI", "matrix": [4, 1], "x": 1.5, "y": 4},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"label": "Space", "matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"label": "Alt", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+                {"label": "Menu", "matrix": [4, 12], "x": 12.5, "y": 4},
+                {"label": "Ctrl", "matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/mechlovin/jay60/rules.mk b/keyboards/mechlovin/jay60/rules.mk
index 1e9f9255447..c2ee0bc86f9 100644
--- a/keyboards/mechlovin/jay60/rules.mk
+++ b/keyboards/mechlovin/jay60/rules.mk
@@ -1,15 +1,2 @@
 # Processor frequency
 F_CPU = 16000000
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
diff --git a/keyboards/mechlovin/mechlovin9/info.json b/keyboards/mechlovin/mechlovin9/info.json
index a5439f56a9d..41133813ef7 100644
--- a/keyboards/mechlovin/mechlovin9/info.json
+++ b/keyboards/mechlovin/mechlovin9/info.json
@@ -2,14 +2,6 @@
     "manufacturer": "Mechlovin Studio",
     "url": "",
     "maintainer": "Team Mechlovin",
-    "features": {
-        "bootmagic": true,
-        "command": false,
-        "console": false,
-        "extrakey": true,
-        "mousekey": true,
-        "nkro": false
-    },
     "usb": {
         "vid": "0x4D4C"
     },
diff --git a/keyboards/mechlovin/mechlovin9/rev1/info.json b/keyboards/mechlovin/mechlovin9/rev1/info.json
deleted file mode 100644
index 1ece8fc52d2..00000000000
--- a/keyboards/mechlovin/mechlovin9/rev1/info.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-    "keyboard_name": "Mechlovin9",
-    "usb": {
-        "pid": "0x6509",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["B11", "B10", "B2", "B1", "B0", "A7", "A6", "A0", "C15", "B4", "B5", "B3", "C13", "C14", "A13"],
-        "rows": ["A4", "A5", "A3", "A2", "A1"]
-    },
-    "diode_direction": "COL2ROW",
-    "features": {
-        "backlight": true
-    },
-    "backlight": {
-        "pin": "B8",
-        "breathing": true
-    },
-    "indicators": {
-        "caps_lock": "B9"
-    },
-    "processor": "STM32F303",
-    "bootloader": "stm32-dfu",
-    "board": "QMK_PROTON_C"
-}
diff --git a/keyboards/mechlovin/mechlovin9/rev1/keyboard.json b/keyboards/mechlovin/mechlovin9/rev1/keyboard.json
new file mode 100644
index 00000000000..2aebe566398
--- /dev/null
+++ b/keyboards/mechlovin/mechlovin9/rev1/keyboard.json
@@ -0,0 +1,31 @@
+{
+    "keyboard_name": "Mechlovin9",
+    "usb": {
+        "pid": "0x6509",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "console": true,
+        "command": true,
+        "nkro": true,
+        "backlight": true
+    },
+    "matrix_pins": {
+        "cols": ["B11", "B10", "B2", "B1", "B0", "A7", "A6", "A0", "C15", "B4", "B5", "B3", "C13", "C14", "A13"],
+        "rows": ["A4", "A5", "A3", "A2", "A1"]
+    },
+    "diode_direction": "COL2ROW",
+    "backlight": {
+        "pin": "B8",
+        "breathing": true
+    },
+    "indicators": {
+        "caps_lock": "B9"
+    },
+    "processor": "STM32F303",
+    "bootloader": "stm32-dfu",
+    "board": "QMK_PROTON_C"
+}
diff --git a/keyboards/mechlovin/mechlovin9/rev1/rules.mk b/keyboards/mechlovin/mechlovin9/rev1/rules.mk
deleted file mode 100644
index d6fa8455698..00000000000
--- a/keyboards/mechlovin/mechlovin9/rev1/rules.mk
+++ /dev/null
@@ -1,6 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-CONSOLE_ENABLE = yes        # Console for debug
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
diff --git a/keyboards/mechlovin/mechlovin9/rev2/info.json b/keyboards/mechlovin/mechlovin9/rev2/info.json
deleted file mode 100644
index 01e8d59579b..00000000000
--- a/keyboards/mechlovin/mechlovin9/rev2/info.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-    "keyboard_name": "Mechlovin9 Rev2",
-    "usb": {
-        "pid": "0x6509",
-        "device_version": "0.0.2"
-    },
-    "matrix_pins": {
-        "cols": ["B2", "B1", "B0", "B3", "B4", "B5", "D0", "D1", "D5", "D6", "D7", "C0", "C3", "C2", "C1"],
-        "rows": ["A0", "A1", "A2", "A3", "A4"]
-    },
-    "diode_direction": "COL2ROW",
-    "features": {
-        "backlight": true
-    },
-    "backlight": {
-        "pin": "D4",
-        "breathing": true
-    },
-    "indicators": {
-        "caps_lock": "A7"
-    },
-    "bootmagic": {
-        "matrix": [0, 13]
-    },
-    "processor": "atmega32a",
-    "bootloader": "bootloadhid"
-}
diff --git a/keyboards/mechlovin/mechlovin9/rev2/keyboard.json b/keyboards/mechlovin/mechlovin9/rev2/keyboard.json
new file mode 100644
index 00000000000..a9b45df59dd
--- /dev/null
+++ b/keyboards/mechlovin/mechlovin9/rev2/keyboard.json
@@ -0,0 +1,30 @@
+{
+    "keyboard_name": "Mechlovin9 Rev2",
+    "usb": {
+        "pid": "0x6509",
+        "device_version": "0.0.2"
+    },
+    "matrix_pins": {
+        "cols": ["B2", "B1", "B0", "B3", "B4", "B5", "D0", "D1", "D5", "D6", "D7", "C0", "C3", "C2", "C1"],
+        "rows": ["A0", "A1", "A2", "A3", "A4"]
+    },
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "backlight": true
+    },
+    "backlight": {
+        "pin": "D4",
+        "breathing": true
+    },
+    "indicators": {
+        "caps_lock": "A7"
+    },
+    "bootmagic": {
+        "matrix": [0, 13]
+    },
+    "processor": "atmega32a",
+    "bootloader": "bootloadhid"
+}
diff --git a/keyboards/mechlovin/mechlovin9/rev3/keyboard.json b/keyboards/mechlovin/mechlovin9/rev3/keyboard.json
index faa4cf0a877..aa2787c34c7 100644
--- a/keyboards/mechlovin/mechlovin9/rev3/keyboard.json
+++ b/keyboards/mechlovin/mechlovin9/rev3/keyboard.json
@@ -6,6 +6,11 @@
         "pid": "0x6509",
         "device_version": "0.0.3"
     },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true
+    },
     "bootmagic": {
         "matrix": [0, 13]
     },
diff --git a/keyboards/mechlovin/olly/bb/info.json b/keyboards/mechlovin/olly/bb/info.json
deleted file mode 100644
index fddb8931136..00000000000
--- a/keyboards/mechlovin/olly/bb/info.json
+++ /dev/null
@@ -1,358 +0,0 @@
-{
-    "keyboard_name": "Olly BB",
-    "manufacturer": "Mechlovin.Studio",
-    "url": "",
-    "maintainer": "Mechlovin' Studio",
-    "usb": {
-        "vid": "0x4D4C",
-        "pid": "0xD181",
-        "device_version": "0.0.1"
-    },
-    "backlight": {
-        "pin": "D4",
-        "breathing": true
-    },
-    "rgblight": {
-        "led_count": 24,
-        "sleep": true,
-        "animations": {
-            "breathing": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "snake": true,
-            "knight": true,
-            "christmas": true,
-            "static_gradient": true,
-            "rgb_test": true,
-            "alternating": true,
-            "twinkle": true
-        }
-    },
-    "ws2812": {
-        "pin": "B3"
-    },
-    "indicators": {
-        "caps_lock": "B0",
-        "num_lock": "B1",
-        "scroll_lock": "B2"
-    },
-    "processor": "atmega32a",
-    "bootloader": "usbasploader",
-    "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": [0, 14], "x": 15.25, "y": 0},
-
-                {"matrix": [0, 15], "x": 16.5, "y": 0},
-                {"matrix": [0, 16], "x": 17.5, "y": 0},
-                {"matrix": [0, 17], "x": 18.5, "y": 0},
-                {"matrix": [0, 18], "x": 19.5, "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, 14], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"matrix": [1, 14], "x": 15.25, "y": 1},
-
-                {"matrix": [1, 15], "x": 16.5, "y": 1},
-                {"matrix": [1, 16], "x": 17.5, "y": 1},
-                {"matrix": [1, 17], "x": 18.5, "y": 1},
-                {"matrix": [1, 18], "x": 19.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": 2, "w": 1.25},
-
-                {"matrix": [2, 15], "x": 16.5, "y": 2},
-                {"matrix": [2, 16], "x": 17.5, "y": 2},
-                {"matrix": [2, 17], "x": 18.5, "y": 2},
-                {"matrix": [2, 18], "x": 19.5, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
-                {"matrix": [3, 1], "x": 1.25, "y": 3},
-                {"matrix": [3, 2], "x": 2.25, "y": 3},
-                {"matrix": [3, 3], "x": 3.25, "y": 3},
-                {"matrix": [3, 4], "x": 4.25, "y": 3},
-                {"matrix": [3, 5], "x": 5.25, "y": 3},
-                {"matrix": [3, 6], "x": 6.25, "y": 3},
-                {"matrix": [3, 7], "x": 7.25, "y": 3},
-                {"matrix": [3, 8], "x": 8.25, "y": 3},
-                {"matrix": [3, 9], "x": 9.25, "y": 3},
-                {"matrix": [3, 10], "x": 10.25, "y": 3},
-                {"matrix": [3, 11], "x": 11.25, "y": 3},
-                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"matrix": [3, 13], "x": 14, "y": 3},
-
-                {"matrix": [3, 14], "x": 15.25, "y": 3.25},
-
-                {"matrix": [3, 15], "x": 16.5, "y": 3},
-                {"matrix": [3, 16], "x": 17.5, "y": 3},
-                {"matrix": [3, 17], "x": 18.5, "y": 3},
-                {"matrix": [3, 18], "x": 19.5, "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": 6.25},
-                {"matrix": [4, 10], "x": 10.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 11], "x": 11.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 12], "x": 12.75, "y": 4, "w": 1.25},
-
-                {"matrix": [4, 13], "x": 14.25, "y": 4.25},
-                {"matrix": [4, 14], "x": 15.25, "y": 4.25},
-                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
-
-                {"matrix": [4, 16], "x": 17.5, "y": 4},
-                {"matrix": [4, 17], "x": 18.5, "y": 4},
-                {"matrix": [4, 18], "x": 19.5, "y": 4}
-            ]
-        },
-        "LAYOUT_ansi_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": [1, 13], "x": 14, "y": 0},
-
-                {"matrix": [0, 14], "x": 15.25, "y": 0},
-
-                {"matrix": [0, 15], "x": 16.5, "y": 0},
-                {"matrix": [0, 16], "x": 17.5, "y": 0},
-                {"matrix": [0, 17], "x": 18.5, "y": 0},
-                {"matrix": [0, 18], "x": 19.5, "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, 14], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"matrix": [1, 14], "x": 15.25, "y": 1},
-
-                {"matrix": [1, 15], "x": 16.5, "y": 1},
-                {"matrix": [1, 16], "x": 17.5, "y": 1},
-                {"matrix": [1, 17], "x": 18.5, "y": 1},
-                {"matrix": [1, 18], "x": 19.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, 13], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"matrix": [2, 15], "x": 16.5, "y": 2},
-                {"matrix": [2, 16], "x": 17.5, "y": 2},
-                {"matrix": [2, 17], "x": 18.5, "y": 2},
-                {"matrix": [2, 18], "x": 19.5, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 2], "x": 2.25, "y": 3},
-                {"matrix": [3, 3], "x": 3.25, "y": 3},
-                {"matrix": [3, 4], "x": 4.25, "y": 3},
-                {"matrix": [3, 5], "x": 5.25, "y": 3},
-                {"matrix": [3, 6], "x": 6.25, "y": 3},
-                {"matrix": [3, 7], "x": 7.25, "y": 3},
-                {"matrix": [3, 8], "x": 8.25, "y": 3},
-                {"matrix": [3, 9], "x": 9.25, "y": 3},
-                {"matrix": [3, 10], "x": 10.25, "y": 3},
-                {"matrix": [3, 11], "x": 11.25, "y": 3},
-                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"matrix": [3, 13], "x": 14, "y": 3},
-
-                {"matrix": [3, 14], "x": 15.25, "y": 3.25},
-
-                {"matrix": [3, 15], "x": 16.5, "y": 3},
-                {"matrix": [3, 16], "x": 17.5, "y": 3},
-                {"matrix": [3, 17], "x": 18.5, "y": 3},
-                {"matrix": [3, 18], "x": 19.5, "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": 6.25},
-                {"matrix": [4, 10], "x": 10.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 11], "x": 11.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 12], "x": 12.75, "y": 4, "w": 1.25},
-
-                {"matrix": [4, 13], "x": 14.25, "y": 4.25},
-                {"matrix": [4, 14], "x": 15.25, "y": 4.25},
-                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
-
-                {"matrix": [4, 16], "x": 17.5, "y": 4},
-                {"matrix": [4, 17], "x": 18.5, "y": 4},
-                {"matrix": [4, 18], "x": 19.5, "y": 4}
-            ]
-        },
-        "LAYOUT_iso_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": [1, 13], "x": 14, "y": 0},
-
-                {"matrix": [0, 14], "x": 15.25, "y": 0},
-
-                {"matrix": [0, 15], "x": 16.5, "y": 0},
-                {"matrix": [0, 16], "x": 17.5, "y": 0},
-                {"matrix": [0, 17], "x": 18.5, "y": 0},
-                {"matrix": [0, 18], "x": 19.5, "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": [1, 15], "x": 16.5, "y": 1},
-                {"matrix": [1, 16], "x": 17.5, "y": 1},
-                {"matrix": [1, 17], "x": 18.5, "y": 1},
-                {"matrix": [1, 18], "x": 19.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": [2, 15], "x": 16.5, "y": 2},
-                {"matrix": [2, 16], "x": 17.5, "y": 2},
-                {"matrix": [2, 17], "x": 18.5, "y": 2},
-                {"matrix": [2, 18], "x": 19.5, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
-                {"matrix": [3, 1], "x": 1.25, "y": 3},
-                {"matrix": [3, 2], "x": 2.25, "y": 3},
-                {"matrix": [3, 3], "x": 3.25, "y": 3},
-                {"matrix": [3, 4], "x": 4.25, "y": 3},
-                {"matrix": [3, 5], "x": 5.25, "y": 3},
-                {"matrix": [3, 6], "x": 6.25, "y": 3},
-                {"matrix": [3, 7], "x": 7.25, "y": 3},
-                {"matrix": [3, 8], "x": 8.25, "y": 3},
-                {"matrix": [3, 9], "x": 9.25, "y": 3},
-                {"matrix": [3, 10], "x": 10.25, "y": 3},
-                {"matrix": [3, 11], "x": 11.25, "y": 3},
-                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"matrix": [3, 13], "x": 14, "y": 3},
-
-                {"matrix": [3, 14], "x": 15.25, "y": 3.25},
-
-                {"matrix": [3, 15], "x": 16.5, "y": 3},
-                {"matrix": [3, 16], "x": 17.5, "y": 3},
-                {"matrix": [3, 17], "x": 18.5, "y": 3},
-                {"matrix": [3, 18], "x": 19.5, "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": 6.25},
-                {"matrix": [4, 10], "x": 10.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 11], "x": 11.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 12], "x": 12.75, "y": 4, "w": 1.25},
-
-                {"matrix": [4, 13], "x": 14.25, "y": 4.25},
-                {"matrix": [4, 14], "x": 15.25, "y": 4.25},
-                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
-
-                {"matrix": [4, 16], "x": 17.5, "y": 4},
-                {"matrix": [4, 17], "x": 18.5, "y": 4},
-                {"matrix": [4, 18], "x": 19.5, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/mechlovin/olly/bb/keyboard.json b/keyboards/mechlovin/olly/bb/keyboard.json
new file mode 100644
index 00000000000..ac08e94c3ce
--- /dev/null
+++ b/keyboards/mechlovin/olly/bb/keyboard.json
@@ -0,0 +1,365 @@
+{
+    "keyboard_name": "Olly BB",
+    "manufacturer": "Mechlovin.Studio",
+    "url": "",
+    "maintainer": "Mechlovin' Studio",
+    "usb": {
+        "vid": "0x4D4C",
+        "pid": "0xD181",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "backlight": true,
+        "rgblight": true
+    },
+    "backlight": {
+        "pin": "D4",
+        "breathing": true
+    },
+    "rgblight": {
+        "led_count": 24,
+        "sleep": true,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": true,
+            "twinkle": true
+        }
+    },
+    "ws2812": {
+        "pin": "B3"
+    },
+    "indicators": {
+        "caps_lock": "B0",
+        "num_lock": "B1",
+        "scroll_lock": "B2"
+    },
+    "processor": "atmega32a",
+    "bootloader": "usbasploader",
+    "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": [0, 14], "x": 15.25, "y": 0},
+
+                {"matrix": [0, 15], "x": 16.5, "y": 0},
+                {"matrix": [0, 16], "x": 17.5, "y": 0},
+                {"matrix": [0, 17], "x": 18.5, "y": 0},
+                {"matrix": [0, 18], "x": 19.5, "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, 14], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1},
+
+                {"matrix": [1, 15], "x": 16.5, "y": 1},
+                {"matrix": [1, 16], "x": 17.5, "y": 1},
+                {"matrix": [1, 17], "x": 18.5, "y": 1},
+                {"matrix": [1, 18], "x": 19.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": 2, "w": 1.25},
+
+                {"matrix": [2, 15], "x": 16.5, "y": 2},
+                {"matrix": [2, 16], "x": 17.5, "y": 2},
+                {"matrix": [2, 17], "x": 18.5, "y": 2},
+                {"matrix": [2, 18], "x": 19.5, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+
+                {"matrix": [3, 14], "x": 15.25, "y": 3.25},
+
+                {"matrix": [3, 15], "x": 16.5, "y": 3},
+                {"matrix": [3, 16], "x": 17.5, "y": 3},
+                {"matrix": [3, 17], "x": 18.5, "y": 3},
+                {"matrix": [3, 18], "x": 19.5, "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": 6.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 12.75, "y": 4, "w": 1.25},
+
+                {"matrix": [4, 13], "x": 14.25, "y": 4.25},
+                {"matrix": [4, 14], "x": 15.25, "y": 4.25},
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"matrix": [4, 16], "x": 17.5, "y": 4},
+                {"matrix": [4, 17], "x": 18.5, "y": 4},
+                {"matrix": [4, 18], "x": 19.5, "y": 4}
+            ]
+        },
+        "LAYOUT_ansi_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": [1, 13], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+
+                {"matrix": [0, 15], "x": 16.5, "y": 0},
+                {"matrix": [0, 16], "x": 17.5, "y": 0},
+                {"matrix": [0, 17], "x": 18.5, "y": 0},
+                {"matrix": [0, 18], "x": 19.5, "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, 14], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1},
+
+                {"matrix": [1, 15], "x": 16.5, "y": 1},
+                {"matrix": [1, 16], "x": 17.5, "y": 1},
+                {"matrix": [1, 17], "x": 18.5, "y": 1},
+                {"matrix": [1, 18], "x": 19.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, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [2, 15], "x": 16.5, "y": 2},
+                {"matrix": [2, 16], "x": 17.5, "y": 2},
+                {"matrix": [2, 17], "x": 18.5, "y": 2},
+                {"matrix": [2, 18], "x": 19.5, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+
+                {"matrix": [3, 14], "x": 15.25, "y": 3.25},
+
+                {"matrix": [3, 15], "x": 16.5, "y": 3},
+                {"matrix": [3, 16], "x": 17.5, "y": 3},
+                {"matrix": [3, 17], "x": 18.5, "y": 3},
+                {"matrix": [3, 18], "x": 19.5, "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": 6.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 12.75, "y": 4, "w": 1.25},
+
+                {"matrix": [4, 13], "x": 14.25, "y": 4.25},
+                {"matrix": [4, 14], "x": 15.25, "y": 4.25},
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"matrix": [4, 16], "x": 17.5, "y": 4},
+                {"matrix": [4, 17], "x": 18.5, "y": 4},
+                {"matrix": [4, 18], "x": 19.5, "y": 4}
+            ]
+        },
+        "LAYOUT_iso_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": [1, 13], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+
+                {"matrix": [0, 15], "x": 16.5, "y": 0},
+                {"matrix": [0, 16], "x": 17.5, "y": 0},
+                {"matrix": [0, 17], "x": 18.5, "y": 0},
+                {"matrix": [0, 18], "x": 19.5, "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": [1, 15], "x": 16.5, "y": 1},
+                {"matrix": [1, 16], "x": 17.5, "y": 1},
+                {"matrix": [1, 17], "x": 18.5, "y": 1},
+                {"matrix": [1, 18], "x": 19.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": [2, 15], "x": 16.5, "y": 2},
+                {"matrix": [2, 16], "x": 17.5, "y": 2},
+                {"matrix": [2, 17], "x": 18.5, "y": 2},
+                {"matrix": [2, 18], "x": 19.5, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+
+                {"matrix": [3, 14], "x": 15.25, "y": 3.25},
+
+                {"matrix": [3, 15], "x": 16.5, "y": 3},
+                {"matrix": [3, 16], "x": 17.5, "y": 3},
+                {"matrix": [3, 17], "x": 18.5, "y": 3},
+                {"matrix": [3, 18], "x": 19.5, "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": 6.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 12.75, "y": 4, "w": 1.25},
+
+                {"matrix": [4, 13], "x": 14.25, "y": 4.25},
+                {"matrix": [4, 14], "x": 15.25, "y": 4.25},
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"matrix": [4, 16], "x": 17.5, "y": 4},
+                {"matrix": [4, 17], "x": 18.5, "y": 4},
+                {"matrix": [4, 18], "x": 19.5, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/mechlovin/olly/bb/rules.mk b/keyboards/mechlovin/olly/bb/rules.mk
index 1d15495eef5..73681d1f1e0 100644
--- a/keyboards/mechlovin/olly/bb/rules.mk
+++ b/keyboards/mechlovin/olly/bb/rules.mk
@@ -1,18 +1,5 @@
 # Processor frequency
 F_CPU = 16000000
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
 CUSTOM_MATRIX = lite
 
 SRC += matrix.c
diff --git a/keyboards/mechlovin/olly/jf/info.json b/keyboards/mechlovin/olly/jf/info.json
index b67551a111b..315191e8408 100644
--- a/keyboards/mechlovin/olly/jf/info.json
+++ b/keyboards/mechlovin/olly/jf/info.json
@@ -5,15 +5,6 @@
     "usb": {
         "vid": "0x4D4C"
     },
-    "features": {
-        "nkro": false,
-        "bootmagic": true,
-        "command": false,
-        "console": false,
-        "extrakey": true,
-        "mousekey": true,
-        "rgblight": true
-    },
     "diode_direction": "ROW2COL",
     "rgblight": {
         "led_count": 27,
diff --git a/keyboards/mechlovin/olly/jf/rev1/info.json b/keyboards/mechlovin/olly/jf/rev1/info.json
deleted file mode 100644
index 0b6aec094f8..00000000000
--- a/keyboards/mechlovin/olly/jf/rev1/info.json
+++ /dev/null
@@ -1,675 +0,0 @@
-{
-    "keyboard_name": "Olly JF Rev1",
-    "usb": {
-        "pid": "0xD180",
-        "device_version": "0.0.1"
-    },
-    "features": {
-        "backlight": true
-    },
-    "matrix_pins": {
-        "cols": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-        "rows": ["D5", "D6", "A5", "A4", "A3", "A6"],
-        "custom_lite": true
-    },
-    "matrix_size": {
-        "cols": 19,
-        "rows": 6
-    },
-    "backlight": {
-        "pin": "D4",
-        "breathing": true
-    },
-    "indicators": {
-        "caps_lock": "B0",
-        "num_lock": "B1",
-        "scroll_lock": "B2"
-    },
-    "ws2812": {
-        "pin": "B3"
-    },
-    "processor": "atmega32a",
-    "bootloader": "usbasploader",
-    "layouts": {
-        "LAYOUT_all": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-
-                {"label": "F1", "matrix": [0, 1], "x": 2, "y": 0},
-                {"label": "F2", "matrix": [0, 2], "x": 3, "y": 0},
-                {"label": "F3", "matrix": [0, 3], "x": 4, "y": 0},
-                {"label": "F4", "matrix": [0, 4], "x": 5, "y": 0},
-
-                {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 0},
-                {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 0},
-                {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 0},
-                {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 0},
-
-                {"label": "F9", "matrix": [0, 9], "x": 11, "y": 0},
-                {"label": "F10", "matrix": [0, 10], "x": 12, "y": 0},
-                {"label": "F11", "matrix": [0, 11], "x": 13, "y": 0},
-                {"label": "F12", "matrix": [0, 12], "x": 14, "y": 0},
-
-                {"label": "F13", "matrix": [0, 14], "x": 15.25, "y": 0},
-
-                {"label": "Insert", "matrix": [0, 15], "x": 16.5, "y": 0},
-                {"label": "Home", "matrix": [0, 16], "x": 17.5, "y": 0},
-                {"label": "Page Up", "matrix": [0, 17], "x": 18.5, "y": 0},
-                {"label": "Print Screen", "matrix": [0, 18], "x": 19.5, "y": 0},
-
-                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
-                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
-                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
-                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
-                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
-                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
-                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
-                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
-                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
-                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
-                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
-                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
-                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
-                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25},
-                {"label": "Delete", "matrix": [0, 13], "x": 14, "y": 1.25},
-
-                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
-
-                {"label": "Num Lock", "matrix": [1, 15], "x": 16.5, "y": 1.25},
-                {"label": "/", "matrix": [1, 16], "x": 17.5, "y": 1.25},
-                {"label": "*", "matrix": [1, 17], "x": 18.5, "y": 1.25},
-                {"label": "Pause", "matrix": [1, 18], "x": 19.5, "y": 1.25},
-
-                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
-                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
-                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
-                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
-                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
-                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
-                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
-                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
-                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
-                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
-                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
-                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
-                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
-                {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
-
-                {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
-
-                {"label": "7", "matrix": [2, 15], "x": 16.5, "y": 2.25},
-                {"label": "8", "matrix": [2, 16], "x": 17.5, "y": 2.25},
-                {"label": "9", "matrix": [2, 17], "x": 18.5, "y": 2.25},
-                {"label": "-", "matrix": [2, 18], "x": 19.5, "y": 2.25},
-
-                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
-                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
-                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
-                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
-                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
-                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
-                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
-                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
-                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
-                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
-                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
-                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
-                {"label": "Enter", "matrix": [3, 12], "x": 12.75, "y": 3.25},
-                {"label": "Enter", "matrix": [3, 13], "x": 13.75, "y": 3.25, "w": 1.25},
-
-                {"label": "4", "matrix": [3, 15], "x": 16.5, "y": 3.25},
-                {"label": "5", "matrix": [3, 16], "x": 17.5, "y": 3.25},
-                {"label": "6", "matrix": [3, 17], "x": 18.5, "y": 3.25},
-                {"label": "+", "matrix": [3, 18], "x": 19.5, "y": 3.25},
-
-                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
-                {"label": "\\", "matrix": [4, 1], "x": 1.25, "y": 4.25},
-                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
-                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
-                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
-                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
-                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
-                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
-                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
-                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
-                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
-                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
-                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
-                {"label": "Shift", "matrix": [4, 13], "x": 14, "y": 4.25},
-
-                {"label": "\u2191", "matrix": [4, 14], "x": 15.25, "y": 4.5},
-
-                {"label": "1", "matrix": [4, 15], "x": 16.5, "y": 4.25},
-                {"label": "2", "matrix": [4, 16], "x": 17.5, "y": 4.25},
-                {"label": "3", "matrix": [4, 17], "x": 18.5, "y": 4.25},
-                {"label": "Enter", "matrix": [4, 18], "x": 19.5, "y": 4.25},
-
-                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
-                {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 5.25},
-                {"label": "Alt", "matrix": [5, 3], "x": 2.5, "y": 5.25, "w": 1.5},
-                {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5.25, "w": 6.25},
-                {"label": "Alt", "matrix": [5, 10], "x": 10.25, "y": 5.25, "w": 1.25},
-                {"label": "GUI", "matrix": [5, 11], "x": 11.5, "y": 5.25, "w": 1.25},
-                {"label": "Ctrl", "matrix": [5, 12], "x": 12.75, "y": 5.25, "w": 1.25},
-
-                {"label": "\u2190", "matrix": [5, 13], "x": 14.25, "y": 5.5},
-                {"label": "\u2193", "matrix": [5, 14], "x": 15.25, "y": 5.5},
-                {"label": "\u2192", "matrix": [5, 15], "x": 16.25, "y": 5.5},
-
-                {"label": "0", "matrix": [5, 16], "x": 17.5, "y": 5.25},
-                {"label": ".", "matrix": [5, 17], "x": 18.5, "y": 5.25},
-                {"label": "Enter", "matrix": [5, 18], "x": 19.5, "y": 5.25}
-            ]
-        },
-        "LAYOUT_ansi": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-
-                {"label": "F1", "matrix": [0, 1], "x": 2, "y": 0},
-                {"label": "F2", "matrix": [0, 2], "x": 3, "y": 0},
-                {"label": "F3", "matrix": [0, 3], "x": 4, "y": 0},
-                {"label": "F4", "matrix": [0, 4], "x": 5, "y": 0},
-
-                {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 0},
-                {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 0},
-                {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 0},
-                {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 0},
-
-                {"label": "F9", "matrix": [0, 9], "x": 11, "y": 0},
-                {"label": "F10", "matrix": [0, 10], "x": 12, "y": 0},
-                {"label": "F11", "matrix": [0, 11], "x": 13, "y": 0},
-                {"label": "F12", "matrix": [0, 12], "x": 14, "y": 0},
-
-                {"label": "F13", "matrix": [0, 14], "x": 15.25, "y": 0},
-
-                {"label": "Insert", "matrix": [0, 15], "x": 16.5, "y": 0},
-                {"label": "Home", "matrix": [0, 16], "x": 17.5, "y": 0},
-                {"label": "Page Up", "matrix": [0, 17], "x": 18.5, "y": 0},
-                {"label": "Print Screen", "matrix": [0, 18], "x": 19.5, "y": 0},
-
-                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
-                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
-                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
-                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
-                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
-                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
-                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
-                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
-                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
-                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
-                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
-                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
-                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
-                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
-
-                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
-
-                {"label": "Num Lock", "matrix": [1, 15], "x": 16.5, "y": 1.25},
-                {"label": "/", "matrix": [1, 16], "x": 17.5, "y": 1.25},
-                {"label": "*", "matrix": [1, 17], "x": 18.5, "y": 1.25},
-                {"label": "Pause", "matrix": [1, 18], "x": 19.5, "y": 1.25},
-
-                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
-                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
-                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
-                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
-                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
-                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
-                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
-                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
-                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
-                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
-                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
-                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
-                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
-                {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
-
-                {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
-
-                {"label": "7", "matrix": [2, 15], "x": 16.5, "y": 2.25},
-                {"label": "8", "matrix": [2, 16], "x": 17.5, "y": 2.25},
-                {"label": "9", "matrix": [2, 17], "x": 18.5, "y": 2.25},
-                {"label": "-", "matrix": [2, 18], "x": 19.5, "y": 2.25},
-
-                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
-                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
-                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
-                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
-                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
-                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
-                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
-                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
-                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
-                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
-                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
-                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
-                {"label": "Enter", "matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
-
-                {"label": "4", "matrix": [3, 15], "x": 16.5, "y": 3.25},
-                {"label": "5", "matrix": [3, 16], "x": 17.5, "y": 3.25},
-                {"label": "6", "matrix": [3, 17], "x": 18.5, "y": 3.25},
-                {"label": "+", "matrix": [3, 18], "x": 19.5, "y": 3.25},
-
-                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
-                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
-                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
-                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
-                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
-                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
-                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
-                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
-                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
-                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
-                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
-                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75},
-
-                {"label": "\u2191", "matrix": [4, 14], "x": 15.25, "y": 4.5},
-
-                {"label": "1", "matrix": [4, 15], "x": 16.5, "y": 4.25},
-                {"label": "2", "matrix": [4, 16], "x": 17.5, "y": 4.25},
-                {"label": "3", "matrix": [4, 17], "x": 18.5, "y": 4.25},
-                {"label": "Enter", "matrix": [4, 18], "x": 19.5, "y": 4.25},
-
-                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
-                {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 5.25},
-                {"label": "Alt", "matrix": [5, 3], "x": 2.5, "y": 5.25, "w": 1.5},
-                {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5.25, "w": 6.25},
-                {"label": "Alt", "matrix": [5, 10], "x": 10.25, "y": 5.25, "w": 1.25},
-                {"label": "GUI", "matrix": [5, 11], "x": 11.5, "y": 5.25, "w": 1.25},
-                {"label": "Ctrl", "matrix": [5, 12], "x": 12.75, "y": 5.25, "w": 1.25},
-
-                {"label": "\u2190", "matrix": [5, 13], "x": 14.25, "y": 5.5},
-                {"label": "\u2193", "matrix": [5, 14], "x": 15.25, "y": 5.5},
-                {"label": "\u2192", "matrix": [5, 15], "x": 16.25, "y": 5.5},
-
-                {"label": "0", "matrix": [5, 16], "x": 17.5, "y": 5.25},
-                {"label": ".", "matrix": [5, 17], "x": 18.5, "y": 5.25},
-                {"label": "Enter", "matrix": [5, 18], "x": 19.5, "y": 5.25}
-            ]
-        },
-        "LAYOUT_ansi_split_bs_rshift": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-
-                {"label": "F1", "matrix": [0, 1], "x": 2, "y": 0},
-                {"label": "F2", "matrix": [0, 2], "x": 3, "y": 0},
-                {"label": "F3", "matrix": [0, 3], "x": 4, "y": 0},
-                {"label": "F4", "matrix": [0, 4], "x": 5, "y": 0},
-
-                {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 0},
-                {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 0},
-                {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 0},
-                {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 0},
-
-                {"label": "F9", "matrix": [0, 9], "x": 11, "y": 0},
-                {"label": "F10", "matrix": [0, 10], "x": 12, "y": 0},
-                {"label": "F11", "matrix": [0, 11], "x": 13, "y": 0},
-                {"label": "F12", "matrix": [0, 12], "x": 14, "y": 0},
-
-                {"label": "F13", "matrix": [0, 14], "x": 15.25, "y": 0},
-
-                {"label": "Insert", "matrix": [0, 15], "x": 16.5, "y": 0},
-                {"label": "Home", "matrix": [0, 16], "x": 17.5, "y": 0},
-                {"label": "Page Up", "matrix": [0, 17], "x": 18.5, "y": 0},
-                {"label": "Print Screen", "matrix": [0, 18], "x": 19.5, "y": 0},
-
-                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
-                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
-                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
-                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
-                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
-                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
-                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
-                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
-                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
-                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
-                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
-                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
-                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
-                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25},
-                {"label": "Delete", "matrix": [0, 13], "x": 14, "y": 1.25},
-
-                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
-
-                {"label": "Num Lock", "matrix": [1, 15], "x": 16.5, "y": 1.25},
-                {"label": "/", "matrix": [1, 16], "x": 17.5, "y": 1.25},
-                {"label": "*", "matrix": [1, 17], "x": 18.5, "y": 1.25},
-                {"label": "Pause", "matrix": [1, 18], "x": 19.5, "y": 1.25},
-
-                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
-                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
-                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
-                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
-                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
-                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
-                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
-                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
-                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
-                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
-                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
-                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
-                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
-                {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
-
-                {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
-
-                {"label": "7", "matrix": [2, 15], "x": 16.5, "y": 2.25},
-                {"label": "8", "matrix": [2, 16], "x": 17.5, "y": 2.25},
-                {"label": "9", "matrix": [2, 17], "x": 18.5, "y": 2.25},
-                {"label": "-", "matrix": [2, 18], "x": 19.5, "y": 2.25},
-
-                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
-                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
-                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
-                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
-                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
-                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
-                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
-                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
-                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
-                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
-                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
-                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
-                {"label": "Enter", "matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
-
-                {"label": "4", "matrix": [3, 15], "x": 16.5, "y": 3.25},
-                {"label": "5", "matrix": [3, 16], "x": 17.5, "y": 3.25},
-                {"label": "6", "matrix": [3, 17], "x": 18.5, "y": 3.25},
-                {"label": "+", "matrix": [3, 18], "x": 19.5, "y": 3.25},
-
-                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
-                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
-                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
-                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
-                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
-                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
-                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
-                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
-                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
-                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
-                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
-                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
-                {"label": "Shift", "matrix": [4, 13], "x": 14, "y": 4.25},
-
-                {"label": "\u2191", "matrix": [4, 14], "x": 15.25, "y": 4.5},
-
-                {"label": "1", "matrix": [4, 15], "x": 16.5, "y": 4.25},
-                {"label": "2", "matrix": [4, 16], "x": 17.5, "y": 4.25},
-                {"label": "3", "matrix": [4, 17], "x": 18.5, "y": 4.25},
-                {"label": "Enter", "matrix": [4, 18], "x": 19.5, "y": 4.25},
-
-                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
-                {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 5.25},
-                {"label": "Alt", "matrix": [5, 3], "x": 2.5, "y": 5.25, "w": 1.5},
-                {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5.25, "w": 6.25},
-                {"label": "Alt", "matrix": [5, 10], "x": 10.25, "y": 5.25, "w": 1.25},
-                {"label": "GUI", "matrix": [5, 11], "x": 11.5, "y": 5.25, "w": 1.25},
-                {"label": "Ctrl", "matrix": [5, 12], "x": 12.75, "y": 5.25, "w": 1.25},
-
-                {"label": "\u2190", "matrix": [5, 13], "x": 14.25, "y": 5.5},
-                {"label": "\u2193", "matrix": [5, 14], "x": 15.25, "y": 5.5},
-                {"label": "\u2192", "matrix": [5, 15], "x": 16.25, "y": 5.5},
-
-                {"label": "0", "matrix": [5, 16], "x": 17.5, "y": 5.25},
-                {"label": ".", "matrix": [5, 17], "x": 18.5, "y": 5.25},
-                {"label": "Enter", "matrix": [5, 18], "x": 19.5, "y": 5.25}
-            ]
-        },
-        "LAYOUT_iso": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-
-                {"label": "F1", "matrix": [0, 1], "x": 2, "y": 0},
-                {"label": "F2", "matrix": [0, 2], "x": 3, "y": 0},
-                {"label": "F3", "matrix": [0, 3], "x": 4, "y": 0},
-                {"label": "F4", "matrix": [0, 4], "x": 5, "y": 0},
-
-                {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 0},
-                {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 0},
-                {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 0},
-                {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 0},
-
-                {"label": "F9", "matrix": [0, 9], "x": 11, "y": 0},
-                {"label": "F10", "matrix": [0, 10], "x": 12, "y": 0},
-                {"label": "F11", "matrix": [0, 11], "x": 13, "y": 0},
-                {"label": "F12", "matrix": [0, 12], "x": 14, "y": 0},
-
-                {"label": "F13", "matrix": [0, 14], "x": 15.25, "y": 0},
-
-                {"label": "Insert", "matrix": [0, 15], "x": 16.5, "y": 0},
-                {"label": "Home", "matrix": [0, 16], "x": 17.5, "y": 0},
-                {"label": "Page Up", "matrix": [0, 17], "x": 18.5, "y": 0},
-                {"label": "Print Screen", "matrix": [0, 18], "x": 19.5, "y": 0},
-
-                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
-                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
-                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
-                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
-                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
-                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
-                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
-                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
-                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
-                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
-                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
-                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
-                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
-                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
-
-                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
-
-                {"label": "Num Lock", "matrix": [1, 15], "x": 16.5, "y": 1.25},
-                {"label": "/", "matrix": [1, 16], "x": 17.5, "y": 1.25},
-                {"label": "*", "matrix": [1, 17], "x": 18.5, "y": 1.25},
-                {"label": "Pause", "matrix": [1, 18], "x": 19.5, "y": 1.25},
-
-                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
-                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
-                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
-                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
-                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
-                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
-                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
-                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
-                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
-                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
-                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
-                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
-                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
-
-                {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
-
-                {"label": "7", "matrix": [2, 15], "x": 16.5, "y": 2.25},
-                {"label": "8", "matrix": [2, 16], "x": 17.5, "y": 2.25},
-                {"label": "9", "matrix": [2, 17], "x": 18.5, "y": 2.25},
-                {"label": "-", "matrix": [2, 18], "x": 19.5, "y": 2.25},
-
-                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
-                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
-                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
-                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
-                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
-                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
-                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
-                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
-                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
-                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
-                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
-                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
-                {"label": "#", "matrix": [3, 12], "x": 12.75, "y": 3.25},
-                {"label": "Enter", "matrix": [3, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
-
-                {"label": "4", "matrix": [3, 15], "x": 16.5, "y": 3.25},
-                {"label": "5", "matrix": [3, 16], "x": 17.5, "y": 3.25},
-                {"label": "6", "matrix": [3, 17], "x": 18.5, "y": 3.25},
-                {"label": "+", "matrix": [3, 18], "x": 19.5, "y": 3.25},
-
-                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
-                {"label": "\\", "matrix": [4, 1], "x": 1.25, "y": 4.25},
-                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
-                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
-                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
-                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
-                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
-                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
-                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
-                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
-                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
-                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
-                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75},
-
-                {"label": "\u2191", "matrix": [4, 14], "x": 15.25, "y": 4.5},
-
-                {"label": "1", "matrix": [4, 15], "x": 16.5, "y": 4.25},
-                {"label": "2", "matrix": [4, 16], "x": 17.5, "y": 4.25},
-                {"label": "3", "matrix": [4, 17], "x": 18.5, "y": 4.25},
-                {"label": "Enter", "matrix": [4, 18], "x": 19.5, "y": 4.25},
-
-                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
-                {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 5.25},
-                {"label": "Alt", "matrix": [5, 3], "x": 2.5, "y": 5.25, "w": 1.5},
-                {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5.25, "w": 6.25},
-                {"label": "Alt", "matrix": [5, 10], "x": 10.25, "y": 5.25, "w": 1.25},
-                {"label": "GUI", "matrix": [5, 11], "x": 11.5, "y": 5.25, "w": 1.25},
-                {"label": "Ctrl", "matrix": [5, 12], "x": 12.75, "y": 5.25, "w": 1.25},
-
-                {"label": "\u2190", "matrix": [5, 13], "x": 14.25, "y": 5.5},
-                {"label": "\u2193", "matrix": [5, 14], "x": 15.25, "y": 5.5},
-                {"label": "\u2192", "matrix": [5, 15], "x": 16.25, "y": 5.5},
-
-                {"label": "0", "matrix": [5, 16], "x": 17.5, "y": 5.25},
-                {"label": ".", "matrix": [5, 17], "x": 18.5, "y": 5.25},
-                {"label": "Enter", "matrix": [5, 18], "x": 19.5, "y": 5.25}
-            ]
-        },
-        "LAYOUT_iso_split_bs_rshift": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-
-                {"label": "F1", "matrix": [0, 1], "x": 2, "y": 0},
-                {"label": "F2", "matrix": [0, 2], "x": 3, "y": 0},
-                {"label": "F3", "matrix": [0, 3], "x": 4, "y": 0},
-                {"label": "F4", "matrix": [0, 4], "x": 5, "y": 0},
-
-                {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 0},
-                {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 0},
-                {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 0},
-                {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 0},
-
-                {"label": "F9", "matrix": [0, 9], "x": 11, "y": 0},
-                {"label": "F10", "matrix": [0, 10], "x": 12, "y": 0},
-                {"label": "F11", "matrix": [0, 11], "x": 13, "y": 0},
-                {"label": "F12", "matrix": [0, 12], "x": 14, "y": 0},
-
-                {"label": "F13", "matrix": [0, 14], "x": 15.25, "y": 0},
-
-                {"label": "Insert", "matrix": [0, 15], "x": 16.5, "y": 0},
-                {"label": "Home", "matrix": [0, 16], "x": 17.5, "y": 0},
-                {"label": "Page Up", "matrix": [0, 17], "x": 18.5, "y": 0},
-                {"label": "Print Screen", "matrix": [0, 18], "x": 19.5, "y": 0},
-
-                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
-                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
-                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
-                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
-                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
-                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
-                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
-                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
-                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
-                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
-                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
-                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
-                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
-                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25},
-                {"label": "Delete", "matrix": [0, 13], "x": 14, "y": 1.25},
-
-                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
-
-                {"label": "Num Lock", "matrix": [1, 15], "x": 16.5, "y": 1.25},
-                {"label": "/", "matrix": [1, 16], "x": 17.5, "y": 1.25},
-                {"label": "*", "matrix": [1, 17], "x": 18.5, "y": 1.25},
-                {"label": "Pause", "matrix": [1, 18], "x": 19.5, "y": 1.25},
-
-                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
-                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
-                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
-                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
-                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
-                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
-                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
-                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
-                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
-                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
-                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
-                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
-                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
-
-                {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
-
-                {"label": "7", "matrix": [2, 15], "x": 16.5, "y": 2.25},
-                {"label": "8", "matrix": [2, 16], "x": 17.5, "y": 2.25},
-                {"label": "9", "matrix": [2, 17], "x": 18.5, "y": 2.25},
-                {"label": "-", "matrix": [2, 18], "x": 19.5, "y": 2.25},
-
-                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
-                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
-                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
-                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
-                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
-                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
-                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
-                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
-                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
-                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
-                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
-                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
-                {"label": "#", "matrix": [3, 12], "x": 12.75, "y": 3.25},
-                {"label": "Enter", "matrix": [3, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
-
-                {"label": "4", "matrix": [3, 15], "x": 16.5, "y": 3.25},
-                {"label": "5", "matrix": [3, 16], "x": 17.5, "y": 3.25},
-                {"label": "6", "matrix": [3, 17], "x": 18.5, "y": 3.25},
-                {"label": "+", "matrix": [3, 18], "x": 19.5, "y": 3.25},
-
-                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
-                {"label": "\\", "matrix": [4, 1], "x": 1.25, "y": 4.25},
-                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
-                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
-                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
-                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
-                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
-                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
-                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
-                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
-                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
-                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
-                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
-                {"label": "Shift", "matrix": [4, 13], "x": 14, "y": 4.25},
-
-                {"label": "\u2191", "matrix": [4, 14], "x": 15.25, "y": 4.5},
-
-                {"label": "1", "matrix": [4, 15], "x": 16.5, "y": 4.25},
-                {"label": "2", "matrix": [4, 16], "x": 17.5, "y": 4.25},
-                {"label": "3", "matrix": [4, 17], "x": 18.5, "y": 4.25},
-                {"label": "Enter", "matrix": [4, 18], "x": 19.5, "y": 4.25},
-
-                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
-                {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 5.25},
-                {"label": "Alt", "matrix": [5, 3], "x": 2.5, "y": 5.25, "w": 1.5},
-                {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5.25, "w": 6.25},
-                {"label": "Alt", "matrix": [5, 10], "x": 10.25, "y": 5.25, "w": 1.25},
-                {"label": "GUI", "matrix": [5, 11], "x": 11.5, "y": 5.25, "w": 1.25},
-                {"label": "Ctrl", "matrix": [5, 12], "x": 12.75, "y": 5.25, "w": 1.25},
-
-                {"label": "\u2190", "matrix": [5, 13], "x": 14.25, "y": 5.5},
-                {"label": "\u2193", "matrix": [5, 14], "x": 15.25, "y": 5.5},
-                {"label": "\u2192", "matrix": [5, 15], "x": 16.25, "y": 5.5},
-
-                {"label": "0", "matrix": [5, 16], "x": 17.5, "y": 5.25},
-                {"label": ".", "matrix": [5, 17], "x": 18.5, "y": 5.25},
-                {"label": "Enter", "matrix": [5, 18], "x": 19.5, "y": 5.25}
-            ]
-        }
-    }
-}
diff --git a/keyboards/mechlovin/olly/jf/rev1/keyboard.json b/keyboards/mechlovin/olly/jf/rev1/keyboard.json
new file mode 100644
index 00000000000..69f092af07e
--- /dev/null
+++ b/keyboards/mechlovin/olly/jf/rev1/keyboard.json
@@ -0,0 +1,679 @@
+{
+    "keyboard_name": "Olly JF Rev1",
+    "usb": {
+        "pid": "0xD180",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "backlight": true,
+        "rgblight": true
+    },
+    "matrix_pins": {
+        "cols": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
+        "rows": ["D5", "D6", "A5", "A4", "A3", "A6"],
+        "custom_lite": true
+    },
+    "matrix_size": {
+        "cols": 19,
+        "rows": 6
+    },
+    "backlight": {
+        "pin": "D4",
+        "breathing": true
+    },
+    "indicators": {
+        "caps_lock": "B0",
+        "num_lock": "B1",
+        "scroll_lock": "B2"
+    },
+    "ws2812": {
+        "pin": "B3"
+    },
+    "processor": "atmega32a",
+    "bootloader": "usbasploader",
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "F1", "matrix": [0, 1], "x": 2, "y": 0},
+                {"label": "F2", "matrix": [0, 2], "x": 3, "y": 0},
+                {"label": "F3", "matrix": [0, 3], "x": 4, "y": 0},
+                {"label": "F4", "matrix": [0, 4], "x": 5, "y": 0},
+
+                {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 0},
+                {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 0},
+                {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 0},
+                {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 0},
+
+                {"label": "F9", "matrix": [0, 9], "x": 11, "y": 0},
+                {"label": "F10", "matrix": [0, 10], "x": 12, "y": 0},
+                {"label": "F11", "matrix": [0, 11], "x": 13, "y": 0},
+                {"label": "F12", "matrix": [0, 12], "x": 14, "y": 0},
+
+                {"label": "F13", "matrix": [0, 14], "x": 15.25, "y": 0},
+
+                {"label": "Insert", "matrix": [0, 15], "x": 16.5, "y": 0},
+                {"label": "Home", "matrix": [0, 16], "x": 17.5, "y": 0},
+                {"label": "Page Up", "matrix": [0, 17], "x": 18.5, "y": 0},
+                {"label": "Print Screen", "matrix": [0, 18], "x": 19.5, "y": 0},
+
+                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
+                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
+                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
+                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
+                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
+                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
+                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
+                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
+                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
+                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
+                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
+                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
+                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
+                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25},
+                {"label": "Delete", "matrix": [0, 13], "x": 14, "y": 1.25},
+
+                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
+
+                {"label": "Num Lock", "matrix": [1, 15], "x": 16.5, "y": 1.25},
+                {"label": "/", "matrix": [1, 16], "x": 17.5, "y": 1.25},
+                {"label": "*", "matrix": [1, 17], "x": 18.5, "y": 1.25},
+                {"label": "Pause", "matrix": [1, 18], "x": 19.5, "y": 1.25},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
+
+                {"label": "7", "matrix": [2, 15], "x": 16.5, "y": 2.25},
+                {"label": "8", "matrix": [2, 16], "x": 17.5, "y": 2.25},
+                {"label": "9", "matrix": [2, 17], "x": 18.5, "y": 2.25},
+                {"label": "-", "matrix": [2, 18], "x": 19.5, "y": 2.25},
+
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"label": "Enter", "matrix": [3, 12], "x": 12.75, "y": 3.25},
+                {"label": "Enter", "matrix": [3, 13], "x": 13.75, "y": 3.25, "w": 1.25},
+
+                {"label": "4", "matrix": [3, 15], "x": 16.5, "y": 3.25},
+                {"label": "5", "matrix": [3, 16], "x": 17.5, "y": 3.25},
+                {"label": "6", "matrix": [3, 17], "x": 18.5, "y": 3.25},
+                {"label": "+", "matrix": [3, 18], "x": 19.5, "y": 3.25},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"label": "\\", "matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"label": "Shift", "matrix": [4, 13], "x": 14, "y": 4.25},
+
+                {"label": "\u2191", "matrix": [4, 14], "x": 15.25, "y": 4.5},
+
+                {"label": "1", "matrix": [4, 15], "x": 16.5, "y": 4.25},
+                {"label": "2", "matrix": [4, 16], "x": 17.5, "y": 4.25},
+                {"label": "3", "matrix": [4, 17], "x": 18.5, "y": 4.25},
+                {"label": "Enter", "matrix": [4, 18], "x": 19.5, "y": 4.25},
+
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 5.25},
+                {"label": "Alt", "matrix": [5, 3], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5.25, "w": 6.25},
+                {"label": "Alt", "matrix": [5, 10], "x": 10.25, "y": 5.25, "w": 1.25},
+                {"label": "GUI", "matrix": [5, 11], "x": 11.5, "y": 5.25, "w": 1.25},
+                {"label": "Ctrl", "matrix": [5, 12], "x": 12.75, "y": 5.25, "w": 1.25},
+
+                {"label": "\u2190", "matrix": [5, 13], "x": 14.25, "y": 5.5},
+                {"label": "\u2193", "matrix": [5, 14], "x": 15.25, "y": 5.5},
+                {"label": "\u2192", "matrix": [5, 15], "x": 16.25, "y": 5.5},
+
+                {"label": "0", "matrix": [5, 16], "x": 17.5, "y": 5.25},
+                {"label": ".", "matrix": [5, 17], "x": 18.5, "y": 5.25},
+                {"label": "Enter", "matrix": [5, 18], "x": 19.5, "y": 5.25}
+            ]
+        },
+        "LAYOUT_ansi": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "F1", "matrix": [0, 1], "x": 2, "y": 0},
+                {"label": "F2", "matrix": [0, 2], "x": 3, "y": 0},
+                {"label": "F3", "matrix": [0, 3], "x": 4, "y": 0},
+                {"label": "F4", "matrix": [0, 4], "x": 5, "y": 0},
+
+                {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 0},
+                {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 0},
+                {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 0},
+                {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 0},
+
+                {"label": "F9", "matrix": [0, 9], "x": 11, "y": 0},
+                {"label": "F10", "matrix": [0, 10], "x": 12, "y": 0},
+                {"label": "F11", "matrix": [0, 11], "x": 13, "y": 0},
+                {"label": "F12", "matrix": [0, 12], "x": 14, "y": 0},
+
+                {"label": "F13", "matrix": [0, 14], "x": 15.25, "y": 0},
+
+                {"label": "Insert", "matrix": [0, 15], "x": 16.5, "y": 0},
+                {"label": "Home", "matrix": [0, 16], "x": 17.5, "y": 0},
+                {"label": "Page Up", "matrix": [0, 17], "x": 18.5, "y": 0},
+                {"label": "Print Screen", "matrix": [0, 18], "x": 19.5, "y": 0},
+
+                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
+                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
+                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
+                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
+                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
+                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
+                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
+                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
+                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
+                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
+                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
+                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
+                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
+                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+
+                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
+
+                {"label": "Num Lock", "matrix": [1, 15], "x": 16.5, "y": 1.25},
+                {"label": "/", "matrix": [1, 16], "x": 17.5, "y": 1.25},
+                {"label": "*", "matrix": [1, 17], "x": 18.5, "y": 1.25},
+                {"label": "Pause", "matrix": [1, 18], "x": 19.5, "y": 1.25},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
+
+                {"label": "7", "matrix": [2, 15], "x": 16.5, "y": 2.25},
+                {"label": "8", "matrix": [2, 16], "x": 17.5, "y": 2.25},
+                {"label": "9", "matrix": [2, 17], "x": 18.5, "y": 2.25},
+                {"label": "-", "matrix": [2, 18], "x": 19.5, "y": 2.25},
+
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"label": "Enter", "matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"label": "4", "matrix": [3, 15], "x": 16.5, "y": 3.25},
+                {"label": "5", "matrix": [3, 16], "x": 17.5, "y": 3.25},
+                {"label": "6", "matrix": [3, 17], "x": 18.5, "y": 3.25},
+                {"label": "+", "matrix": [3, 18], "x": 19.5, "y": 3.25},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"label": "\u2191", "matrix": [4, 14], "x": 15.25, "y": 4.5},
+
+                {"label": "1", "matrix": [4, 15], "x": 16.5, "y": 4.25},
+                {"label": "2", "matrix": [4, 16], "x": 17.5, "y": 4.25},
+                {"label": "3", "matrix": [4, 17], "x": 18.5, "y": 4.25},
+                {"label": "Enter", "matrix": [4, 18], "x": 19.5, "y": 4.25},
+
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 5.25},
+                {"label": "Alt", "matrix": [5, 3], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5.25, "w": 6.25},
+                {"label": "Alt", "matrix": [5, 10], "x": 10.25, "y": 5.25, "w": 1.25},
+                {"label": "GUI", "matrix": [5, 11], "x": 11.5, "y": 5.25, "w": 1.25},
+                {"label": "Ctrl", "matrix": [5, 12], "x": 12.75, "y": 5.25, "w": 1.25},
+
+                {"label": "\u2190", "matrix": [5, 13], "x": 14.25, "y": 5.5},
+                {"label": "\u2193", "matrix": [5, 14], "x": 15.25, "y": 5.5},
+                {"label": "\u2192", "matrix": [5, 15], "x": 16.25, "y": 5.5},
+
+                {"label": "0", "matrix": [5, 16], "x": 17.5, "y": 5.25},
+                {"label": ".", "matrix": [5, 17], "x": 18.5, "y": 5.25},
+                {"label": "Enter", "matrix": [5, 18], "x": 19.5, "y": 5.25}
+            ]
+        },
+        "LAYOUT_ansi_split_bs_rshift": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "F1", "matrix": [0, 1], "x": 2, "y": 0},
+                {"label": "F2", "matrix": [0, 2], "x": 3, "y": 0},
+                {"label": "F3", "matrix": [0, 3], "x": 4, "y": 0},
+                {"label": "F4", "matrix": [0, 4], "x": 5, "y": 0},
+
+                {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 0},
+                {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 0},
+                {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 0},
+                {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 0},
+
+                {"label": "F9", "matrix": [0, 9], "x": 11, "y": 0},
+                {"label": "F10", "matrix": [0, 10], "x": 12, "y": 0},
+                {"label": "F11", "matrix": [0, 11], "x": 13, "y": 0},
+                {"label": "F12", "matrix": [0, 12], "x": 14, "y": 0},
+
+                {"label": "F13", "matrix": [0, 14], "x": 15.25, "y": 0},
+
+                {"label": "Insert", "matrix": [0, 15], "x": 16.5, "y": 0},
+                {"label": "Home", "matrix": [0, 16], "x": 17.5, "y": 0},
+                {"label": "Page Up", "matrix": [0, 17], "x": 18.5, "y": 0},
+                {"label": "Print Screen", "matrix": [0, 18], "x": 19.5, "y": 0},
+
+                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
+                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
+                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
+                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
+                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
+                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
+                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
+                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
+                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
+                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
+                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
+                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
+                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
+                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25},
+                {"label": "Delete", "matrix": [0, 13], "x": 14, "y": 1.25},
+
+                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
+
+                {"label": "Num Lock", "matrix": [1, 15], "x": 16.5, "y": 1.25},
+                {"label": "/", "matrix": [1, 16], "x": 17.5, "y": 1.25},
+                {"label": "*", "matrix": [1, 17], "x": 18.5, "y": 1.25},
+                {"label": "Pause", "matrix": [1, 18], "x": 19.5, "y": 1.25},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
+
+                {"label": "7", "matrix": [2, 15], "x": 16.5, "y": 2.25},
+                {"label": "8", "matrix": [2, 16], "x": 17.5, "y": 2.25},
+                {"label": "9", "matrix": [2, 17], "x": 18.5, "y": 2.25},
+                {"label": "-", "matrix": [2, 18], "x": 19.5, "y": 2.25},
+
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"label": "Enter", "matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"label": "4", "matrix": [3, 15], "x": 16.5, "y": 3.25},
+                {"label": "5", "matrix": [3, 16], "x": 17.5, "y": 3.25},
+                {"label": "6", "matrix": [3, 17], "x": 18.5, "y": 3.25},
+                {"label": "+", "matrix": [3, 18], "x": 19.5, "y": 3.25},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"label": "Shift", "matrix": [4, 13], "x": 14, "y": 4.25},
+
+                {"label": "\u2191", "matrix": [4, 14], "x": 15.25, "y": 4.5},
+
+                {"label": "1", "matrix": [4, 15], "x": 16.5, "y": 4.25},
+                {"label": "2", "matrix": [4, 16], "x": 17.5, "y": 4.25},
+                {"label": "3", "matrix": [4, 17], "x": 18.5, "y": 4.25},
+                {"label": "Enter", "matrix": [4, 18], "x": 19.5, "y": 4.25},
+
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 5.25},
+                {"label": "Alt", "matrix": [5, 3], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5.25, "w": 6.25},
+                {"label": "Alt", "matrix": [5, 10], "x": 10.25, "y": 5.25, "w": 1.25},
+                {"label": "GUI", "matrix": [5, 11], "x": 11.5, "y": 5.25, "w": 1.25},
+                {"label": "Ctrl", "matrix": [5, 12], "x": 12.75, "y": 5.25, "w": 1.25},
+
+                {"label": "\u2190", "matrix": [5, 13], "x": 14.25, "y": 5.5},
+                {"label": "\u2193", "matrix": [5, 14], "x": 15.25, "y": 5.5},
+                {"label": "\u2192", "matrix": [5, 15], "x": 16.25, "y": 5.5},
+
+                {"label": "0", "matrix": [5, 16], "x": 17.5, "y": 5.25},
+                {"label": ".", "matrix": [5, 17], "x": 18.5, "y": 5.25},
+                {"label": "Enter", "matrix": [5, 18], "x": 19.5, "y": 5.25}
+            ]
+        },
+        "LAYOUT_iso": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "F1", "matrix": [0, 1], "x": 2, "y": 0},
+                {"label": "F2", "matrix": [0, 2], "x": 3, "y": 0},
+                {"label": "F3", "matrix": [0, 3], "x": 4, "y": 0},
+                {"label": "F4", "matrix": [0, 4], "x": 5, "y": 0},
+
+                {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 0},
+                {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 0},
+                {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 0},
+                {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 0},
+
+                {"label": "F9", "matrix": [0, 9], "x": 11, "y": 0},
+                {"label": "F10", "matrix": [0, 10], "x": 12, "y": 0},
+                {"label": "F11", "matrix": [0, 11], "x": 13, "y": 0},
+                {"label": "F12", "matrix": [0, 12], "x": 14, "y": 0},
+
+                {"label": "F13", "matrix": [0, 14], "x": 15.25, "y": 0},
+
+                {"label": "Insert", "matrix": [0, 15], "x": 16.5, "y": 0},
+                {"label": "Home", "matrix": [0, 16], "x": 17.5, "y": 0},
+                {"label": "Page Up", "matrix": [0, 17], "x": 18.5, "y": 0},
+                {"label": "Print Screen", "matrix": [0, 18], "x": 19.5, "y": 0},
+
+                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
+                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
+                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
+                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
+                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
+                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
+                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
+                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
+                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
+                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
+                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
+                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
+                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
+                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+
+                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
+
+                {"label": "Num Lock", "matrix": [1, 15], "x": 16.5, "y": 1.25},
+                {"label": "/", "matrix": [1, 16], "x": 17.5, "y": 1.25},
+                {"label": "*", "matrix": [1, 17], "x": 18.5, "y": 1.25},
+                {"label": "Pause", "matrix": [1, 18], "x": 19.5, "y": 1.25},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
+
+                {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
+
+                {"label": "7", "matrix": [2, 15], "x": 16.5, "y": 2.25},
+                {"label": "8", "matrix": [2, 16], "x": 17.5, "y": 2.25},
+                {"label": "9", "matrix": [2, 17], "x": 18.5, "y": 2.25},
+                {"label": "-", "matrix": [2, 18], "x": 19.5, "y": 2.25},
+
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"label": "#", "matrix": [3, 12], "x": 12.75, "y": 3.25},
+                {"label": "Enter", "matrix": [3, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+
+                {"label": "4", "matrix": [3, 15], "x": 16.5, "y": 3.25},
+                {"label": "5", "matrix": [3, 16], "x": 17.5, "y": 3.25},
+                {"label": "6", "matrix": [3, 17], "x": 18.5, "y": 3.25},
+                {"label": "+", "matrix": [3, 18], "x": 19.5, "y": 3.25},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"label": "\\", "matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"label": "\u2191", "matrix": [4, 14], "x": 15.25, "y": 4.5},
+
+                {"label": "1", "matrix": [4, 15], "x": 16.5, "y": 4.25},
+                {"label": "2", "matrix": [4, 16], "x": 17.5, "y": 4.25},
+                {"label": "3", "matrix": [4, 17], "x": 18.5, "y": 4.25},
+                {"label": "Enter", "matrix": [4, 18], "x": 19.5, "y": 4.25},
+
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 5.25},
+                {"label": "Alt", "matrix": [5, 3], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5.25, "w": 6.25},
+                {"label": "Alt", "matrix": [5, 10], "x": 10.25, "y": 5.25, "w": 1.25},
+                {"label": "GUI", "matrix": [5, 11], "x": 11.5, "y": 5.25, "w": 1.25},
+                {"label": "Ctrl", "matrix": [5, 12], "x": 12.75, "y": 5.25, "w": 1.25},
+
+                {"label": "\u2190", "matrix": [5, 13], "x": 14.25, "y": 5.5},
+                {"label": "\u2193", "matrix": [5, 14], "x": 15.25, "y": 5.5},
+                {"label": "\u2192", "matrix": [5, 15], "x": 16.25, "y": 5.5},
+
+                {"label": "0", "matrix": [5, 16], "x": 17.5, "y": 5.25},
+                {"label": ".", "matrix": [5, 17], "x": 18.5, "y": 5.25},
+                {"label": "Enter", "matrix": [5, 18], "x": 19.5, "y": 5.25}
+            ]
+        },
+        "LAYOUT_iso_split_bs_rshift": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "F1", "matrix": [0, 1], "x": 2, "y": 0},
+                {"label": "F2", "matrix": [0, 2], "x": 3, "y": 0},
+                {"label": "F3", "matrix": [0, 3], "x": 4, "y": 0},
+                {"label": "F4", "matrix": [0, 4], "x": 5, "y": 0},
+
+                {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 0},
+                {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 0},
+                {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 0},
+                {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 0},
+
+                {"label": "F9", "matrix": [0, 9], "x": 11, "y": 0},
+                {"label": "F10", "matrix": [0, 10], "x": 12, "y": 0},
+                {"label": "F11", "matrix": [0, 11], "x": 13, "y": 0},
+                {"label": "F12", "matrix": [0, 12], "x": 14, "y": 0},
+
+                {"label": "F13", "matrix": [0, 14], "x": 15.25, "y": 0},
+
+                {"label": "Insert", "matrix": [0, 15], "x": 16.5, "y": 0},
+                {"label": "Home", "matrix": [0, 16], "x": 17.5, "y": 0},
+                {"label": "Page Up", "matrix": [0, 17], "x": 18.5, "y": 0},
+                {"label": "Print Screen", "matrix": [0, 18], "x": 19.5, "y": 0},
+
+                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
+                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
+                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
+                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
+                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
+                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
+                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
+                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
+                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
+                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
+                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
+                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
+                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
+                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25},
+                {"label": "Delete", "matrix": [0, 13], "x": 14, "y": 1.25},
+
+                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
+
+                {"label": "Num Lock", "matrix": [1, 15], "x": 16.5, "y": 1.25},
+                {"label": "/", "matrix": [1, 16], "x": 17.5, "y": 1.25},
+                {"label": "*", "matrix": [1, 17], "x": 18.5, "y": 1.25},
+                {"label": "Pause", "matrix": [1, 18], "x": 19.5, "y": 1.25},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
+
+                {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
+
+                {"label": "7", "matrix": [2, 15], "x": 16.5, "y": 2.25},
+                {"label": "8", "matrix": [2, 16], "x": 17.5, "y": 2.25},
+                {"label": "9", "matrix": [2, 17], "x": 18.5, "y": 2.25},
+                {"label": "-", "matrix": [2, 18], "x": 19.5, "y": 2.25},
+
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"label": "#", "matrix": [3, 12], "x": 12.75, "y": 3.25},
+                {"label": "Enter", "matrix": [3, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+
+                {"label": "4", "matrix": [3, 15], "x": 16.5, "y": 3.25},
+                {"label": "5", "matrix": [3, 16], "x": 17.5, "y": 3.25},
+                {"label": "6", "matrix": [3, 17], "x": 18.5, "y": 3.25},
+                {"label": "+", "matrix": [3, 18], "x": 19.5, "y": 3.25},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"label": "\\", "matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"label": "Shift", "matrix": [4, 13], "x": 14, "y": 4.25},
+
+                {"label": "\u2191", "matrix": [4, 14], "x": 15.25, "y": 4.5},
+
+                {"label": "1", "matrix": [4, 15], "x": 16.5, "y": 4.25},
+                {"label": "2", "matrix": [4, 16], "x": 17.5, "y": 4.25},
+                {"label": "3", "matrix": [4, 17], "x": 18.5, "y": 4.25},
+                {"label": "Enter", "matrix": [4, 18], "x": 19.5, "y": 4.25},
+
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 5.25},
+                {"label": "Alt", "matrix": [5, 3], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5.25, "w": 6.25},
+                {"label": "Alt", "matrix": [5, 10], "x": 10.25, "y": 5.25, "w": 1.25},
+                {"label": "GUI", "matrix": [5, 11], "x": 11.5, "y": 5.25, "w": 1.25},
+                {"label": "Ctrl", "matrix": [5, 12], "x": 12.75, "y": 5.25, "w": 1.25},
+
+                {"label": "\u2190", "matrix": [5, 13], "x": 14.25, "y": 5.5},
+                {"label": "\u2193", "matrix": [5, 14], "x": 15.25, "y": 5.5},
+                {"label": "\u2192", "matrix": [5, 15], "x": 16.25, "y": 5.5},
+
+                {"label": "0", "matrix": [5, 16], "x": 17.5, "y": 5.25},
+                {"label": ".", "matrix": [5, 17], "x": 18.5, "y": 5.25},
+                {"label": "Enter", "matrix": [5, 18], "x": 19.5, "y": 5.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/mechlovin/olly/jf/rev2/keyboard.json b/keyboards/mechlovin/olly/jf/rev2/keyboard.json
index 600bf8a3af3..3771188638b 100644
--- a/keyboards/mechlovin/olly/jf/rev2/keyboard.json
+++ b/keyboards/mechlovin/olly/jf/rev2/keyboard.json
@@ -7,10 +7,14 @@
         }
     },
     "features": {
-        "command": true,
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
         "console": true,
+        "command": true,
+        "nkro": true,
         "led_matrix": true,
-        "nkro": true
+        "rgblight": true
     },
     "led_matrix": {
         "animations": {
@@ -704,4 +708,4 @@
             ]
         }
     }
-}
\ No newline at end of file
+}
diff --git a/keyboards/mechlovin/serratus/info.json b/keyboards/mechlovin/serratus/info.json
deleted file mode 100644
index 780a369cb81..00000000000
--- a/keyboards/mechlovin/serratus/info.json
+++ /dev/null
@@ -1,1003 +0,0 @@
-{
-    "keyboard_name": "Serratus Rev.1",
-    "manufacturer": "Mechlovin Studio",
-    "url": "",
-    "maintainer": "Mechlovin' Studio",
-    "usb": {
-        "vid": "0x4D4C",
-        "pid": "0x0870",
-        "device_version": "0.0.1"
-    },
-    "backlight": {
-        "pin": "B6",
-        "breathing": true
-    },
-    "indicators": {
-        "caps_lock": "D6",
-        "num_lock": "D7",
-        "scroll_lock": "B4"
-    },
-    "rgblight": {
-        "saturation_steps": 8,
-        "brightness_steps": 8,
-        "led_count": 24,
-        "sleep": true,
-        "animations": {
-            "breathing": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "snake": true,
-            "knight": true,
-            "christmas": true,
-            "static_gradient": true,
-            "rgb_test": true,
-            "alternating": true,
-            "twinkle": true
-        }
-    },
-    "ws2812": {
-        "pin": "E2"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "community_layouts": [
-        "tkl_ansi",
-        "tkl_ansi_split_bs_rshift",
-        "tkl_ansi_tsangan",
-        "tkl_ansi_tsangan_split_bs_rshift",
-        "tkl_iso",
-        "tkl_iso_split_bs_rshift",
-        "tkl_iso_tsangan",
-        "tkl_iso_tsangan_split_bs_rshift"
-    ],
-    "layouts": {
-        "LAYOUT_all": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-
-                {"label": "F1", "matrix": [0, 1], "x": 2, "y": 0},
-                {"label": "F2", "matrix": [0, 2], "x": 3, "y": 0},
-                {"label": "F3", "matrix": [0, 3], "x": 4, "y": 0},
-                {"label": "F4", "matrix": [0, 4], "x": 5, "y": 0},
-
-                {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 0},
-                {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 0},
-                {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 0},
-                {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 0},
-
-                {"label": "F9", "matrix": [0, 9], "x": 11, "y": 0},
-                {"label": "F10", "matrix": [0, 10], "x": 12, "y": 0},
-                {"label": "F11", "matrix": [0, 11], "x": 13, "y": 0},
-                {"label": "F12", "matrix": [0, 12], "x": 14, "y": 0},
-
-                {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
-                {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
-                {"label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0},
-
-                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
-                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
-                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
-                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
-                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
-                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
-                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
-                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
-                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
-                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
-                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
-                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
-                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
-                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25},
-                {"label": "Delete", "matrix": [0, 13], "x": 14, "y": 1.25},
-
-                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
-                {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25},
-                {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "y": 1.25},
-
-                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
-                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
-                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
-                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
-                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
-                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
-                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
-                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
-                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
-                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
-                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
-                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
-                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
-                {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
-
-                {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
-                {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25},
-                {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2.25},
-
-                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
-                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
-                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
-                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
-                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
-                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
-                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
-                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
-                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
-                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
-                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
-                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
-                {"label": "#", "matrix": [3, 12], "x": 12.75, "y": 3.25},
-                {"label": "Enter", "matrix": [3, 13], "x": 13.75, "y": 3.25, "w": 1.25},
-
-                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
-                {"label": "\\", "matrix": [4, 1], "x": 1.25, "y": 4.25},
-                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
-                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
-                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
-                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
-                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
-                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
-                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
-                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
-                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
-                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
-                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
-                {"label": "Shift", "matrix": [4, 13], "x": 14, "y": 4.25},
-
-                {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25},
-
-                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
-                {"label": "GUI", "matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
-                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
-                {"label": "Space", "matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
-                {"label": "Alt", "matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
-                {"label": "GUI", "matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
-                {"label": "Fn", "matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
-                {"label": "Ctrl", "matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
-
-                {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
-                {"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25},
-                {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
-            ]
-        },
-        "LAYOUT_tkl_ansi": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-
-                {"label": "F1", "matrix": [0, 1], "x": 2, "y": 0},
-                {"label": "F2", "matrix": [0, 2], "x": 3, "y": 0},
-                {"label": "F3", "matrix": [0, 3], "x": 4, "y": 0},
-                {"label": "F4", "matrix": [0, 4], "x": 5, "y": 0},
-
-                {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 0},
-                {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 0},
-                {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 0},
-                {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 0},
-
-                {"label": "F9", "matrix": [0, 9], "x": 11, "y": 0},
-                {"label": "F10", "matrix": [0, 10], "x": 12, "y": 0},
-                {"label": "F11", "matrix": [0, 11], "x": 13, "y": 0},
-                {"label": "F12", "matrix": [0, 12], "x": 14, "y": 0},
-
-                {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
-                {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
-                {"label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0},
-
-                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
-                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
-                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
-                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
-                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
-                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
-                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
-                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
-                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
-                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
-                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
-                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
-                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
-                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
-
-                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
-                {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25},
-                {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "y": 1.25},
-
-                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
-                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
-                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
-                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
-                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
-                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
-                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
-                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
-                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
-                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
-                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
-                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
-                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
-                {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
-
-                {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
-                {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25},
-                {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2.25},
-
-                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
-                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
-                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
-                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
-                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
-                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
-                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
-                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
-                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
-                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
-                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
-                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
-                {"label": "Enter", "matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
-
-                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
-                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
-                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
-                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
-                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
-                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
-                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
-                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
-                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
-                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
-                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
-                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75},
-
-                {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25},
-
-                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
-                {"label": "GUI", "matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
-                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
-                {"label": "Space", "matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
-                {"label": "Alt", "matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
-                {"label": "GUI", "matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
-                {"label": "Fn", "matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
-                {"label": "Ctrl", "matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
-
-                {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
-                {"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25},
-                {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
-            ]
-        },
-        "LAYOUT_tkl_ansi_split_bs_rshift": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-
-                {"label": "F1", "matrix": [0, 1], "x": 2, "y": 0},
-                {"label": "F2", "matrix": [0, 2], "x": 3, "y": 0},
-                {"label": "F3", "matrix": [0, 3], "x": 4, "y": 0},
-                {"label": "F4", "matrix": [0, 4], "x": 5, "y": 0},
-
-                {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 0},
-                {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 0},
-                {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 0},
-                {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 0},
-
-                {"label": "F9", "matrix": [0, 9], "x": 11, "y": 0},
-                {"label": "F10", "matrix": [0, 10], "x": 12, "y": 0},
-                {"label": "F11", "matrix": [0, 11], "x": 13, "y": 0},
-                {"label": "F12", "matrix": [0, 12], "x": 14, "y": 0},
-
-                {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
-                {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
-                {"label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0},
-
-                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
-                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
-                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
-                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
-                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
-                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
-                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
-                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
-                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
-                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
-                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
-                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
-                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
-                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25},
-                {"label": "Delete", "matrix": [0, 13], "x": 14, "y": 1.25},
-
-                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
-                {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25},
-                {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "y": 1.25},
-
-                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
-                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
-                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
-                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
-                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
-                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
-                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
-                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
-                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
-                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
-                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
-                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
-                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
-                {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
-
-                {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
-                {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25},
-                {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2.25},
-
-                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
-                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
-                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
-                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
-                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
-                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
-                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
-                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
-                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
-                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
-                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
-                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
-                {"label": "Enter", "matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
-
-                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
-                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
-                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
-                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
-                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
-                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
-                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
-                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
-                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
-                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
-                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
-                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
-                {"label": "Shift", "matrix": [4, 13], "x": 14, "y": 4.25},
-
-                {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25},
-
-                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
-                {"label": "GUI", "matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
-                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
-                {"label": "Space", "matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
-                {"label": "Alt", "matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
-                {"label": "GUI", "matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
-                {"label": "Fn", "matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
-                {"label": "Ctrl", "matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
-
-                {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
-                {"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25},
-                {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
-            ]
-        },
-        "LAYOUT_tkl_ansi_tsangan": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-
-                {"label": "F1", "matrix": [0, 1], "x": 2, "y": 0},
-                {"label": "F2", "matrix": [0, 2], "x": 3, "y": 0},
-                {"label": "F3", "matrix": [0, 3], "x": 4, "y": 0},
-                {"label": "F4", "matrix": [0, 4], "x": 5, "y": 0},
-
-                {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 0},
-                {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 0},
-                {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 0},
-                {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 0},
-
-                {"label": "F9", "matrix": [0, 9], "x": 11, "y": 0},
-                {"label": "F10", "matrix": [0, 10], "x": 12, "y": 0},
-                {"label": "F11", "matrix": [0, 11], "x": 13, "y": 0},
-                {"label": "F12", "matrix": [0, 12], "x": 14, "y": 0},
-
-                {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
-                {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
-                {"label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0},
-
-                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
-                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
-                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
-                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
-                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
-                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
-                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
-                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
-                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
-                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
-                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
-                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
-                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
-                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
-
-                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
-                {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25},
-                {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "y": 1.25},
-
-                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
-                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
-                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
-                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
-                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
-                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
-                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
-                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
-                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
-                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
-                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
-                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
-                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
-                {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
-
-                {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
-                {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25},
-                {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2.25},
-
-                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
-                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
-                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
-                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
-                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
-                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
-                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
-                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
-                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
-                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
-                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
-                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
-                {"label": "Enter", "matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
-
-                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
-                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
-                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
-                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
-                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
-                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
-                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
-                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
-                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
-                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
-                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
-                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75},
-
-                {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25},
-
-                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
-                {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 5.25},
-                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
-                {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
-                {"label": "Alt", "matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5},
-                {"label": "Fn", "matrix": [5, 12], "x": 12.5, "y": 5.25},
-                {"label": "Ctrl", "matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
-
-                {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
-                {"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25},
-                {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
-            ]
-        },
-        "LAYOUT_tkl_ansi_tsangan_split_bs_rshift": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-
-                {"label": "F1", "matrix": [0, 1], "x": 2, "y": 0},
-                {"label": "F2", "matrix": [0, 2], "x": 3, "y": 0},
-                {"label": "F3", "matrix": [0, 3], "x": 4, "y": 0},
-                {"label": "F4", "matrix": [0, 4], "x": 5, "y": 0},
-
-                {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 0},
-                {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 0},
-                {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 0},
-                {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 0},
-
-                {"label": "F9", "matrix": [0, 9], "x": 11, "y": 0},
-                {"label": "F10", "matrix": [0, 10], "x": 12, "y": 0},
-                {"label": "F11", "matrix": [0, 11], "x": 13, "y": 0},
-                {"label": "F12", "matrix": [0, 12], "x": 14, "y": 0},
-
-                {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
-                {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
-                {"label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0},
-
-                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
-                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
-                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
-                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
-                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
-                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
-                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
-                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
-                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
-                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
-                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
-                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
-                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
-                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25},
-                {"label": "Delete", "matrix": [0, 13], "x": 14, "y": 1.25},
-
-                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
-                {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25},
-                {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "y": 1.25},
-
-                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
-                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
-                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
-                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
-                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
-                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
-                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
-                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
-                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
-                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
-                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
-                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
-                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
-                {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
-
-                {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
-                {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25},
-                {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2.25},
-
-                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
-                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
-                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
-                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
-                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
-                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
-                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
-                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
-                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
-                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
-                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
-                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
-                {"label": "Enter", "matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
-
-                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
-                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
-                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
-                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
-                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
-                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
-                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
-                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
-                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
-                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
-                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
-                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
-                {"label": "Shift", "matrix": [4, 13], "x": 14, "y": 4.25},
-
-                {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25},
-
-                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
-                {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 5.25},
-                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
-                {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
-                {"label": "Alt", "matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5},
-                {"label": "Fn", "matrix": [5, 12], "x": 12.5, "y": 5.25},
-                {"label": "Ctrl", "matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
-
-                {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
-                {"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25},
-                {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
-            ]
-        },
-        "LAYOUT_tkl_iso": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-
-                {"label": "F1", "matrix": [0, 1], "x": 2, "y": 0},
-                {"label": "F2", "matrix": [0, 2], "x": 3, "y": 0},
-                {"label": "F3", "matrix": [0, 3], "x": 4, "y": 0},
-                {"label": "F4", "matrix": [0, 4], "x": 5, "y": 0},
-
-                {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 0},
-                {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 0},
-                {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 0},
-                {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 0},
-
-                {"label": "F9", "matrix": [0, 9], "x": 11, "y": 0},
-                {"label": "F10", "matrix": [0, 10], "x": 12, "y": 0},
-                {"label": "F11", "matrix": [0, 11], "x": 13, "y": 0},
-                {"label": "F12", "matrix": [0, 12], "x": 14, "y": 0},
-
-                {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
-                {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
-                {"label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0},
-
-                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
-                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
-                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
-                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
-                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
-                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
-                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
-                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
-                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
-                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
-                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
-                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
-                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
-                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
-
-                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
-                {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25},
-                {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "y": 1.25},
-
-                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
-                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
-                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
-                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
-                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
-                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
-                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
-                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
-                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
-                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
-                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
-                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
-                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
-
-                {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
-                {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25},
-                {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2.25},
-
-                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
-                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
-                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
-                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
-                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
-                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
-                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
-                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
-                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
-                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
-                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
-                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
-                {"label": "#", "matrix": [3, 12], "x": 12.75, "y": 3.25},
-                {"label": "Enter", "matrix": [3, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
-
-                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
-                {"label": "\\", "matrix": [4, 1], "x": 1.25, "y": 4.25},
-                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
-                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
-                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
-                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
-                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
-                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
-                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
-                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
-                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
-                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
-                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75},
-
-                {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25},
-
-                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
-                {"label": "GUI", "matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
-                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
-                {"label": "Space", "matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
-                {"label": "Alt", "matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
-                {"label": "GUI", "matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
-                {"label": "Fn", "matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
-                {"label": "Ctrl", "matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
-
-                {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
-                {"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25},
-                {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
-            ]
-        },
-        "LAYOUT_tkl_iso_split_bs_rshift": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-
-                {"label": "F1", "matrix": [0, 1], "x": 2, "y": 0},
-                {"label": "F2", "matrix": [0, 2], "x": 3, "y": 0},
-                {"label": "F3", "matrix": [0, 3], "x": 4, "y": 0},
-                {"label": "F4", "matrix": [0, 4], "x": 5, "y": 0},
-
-                {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 0},
-                {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 0},
-                {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 0},
-                {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 0},
-
-                {"label": "F9", "matrix": [0, 9], "x": 11, "y": 0},
-                {"label": "F10", "matrix": [0, 10], "x": 12, "y": 0},
-                {"label": "F11", "matrix": [0, 11], "x": 13, "y": 0},
-                {"label": "F12", "matrix": [0, 12], "x": 14, "y": 0},
-
-                {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
-                {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
-                {"label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0},
-
-                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
-                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
-                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
-                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
-                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
-                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
-                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
-                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
-                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
-                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
-                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
-                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
-                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
-                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25},
-                {"label": "Delete", "matrix": [0, 13], "x": 14, "y": 1.25},
-
-                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
-                {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25},
-                {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "y": 1.25},
-
-                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
-                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
-                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
-                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
-                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
-                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
-                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
-                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
-                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
-                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
-                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
-                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
-                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
-
-                {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
-                {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25},
-                {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2.25},
-
-                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
-                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
-                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
-                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
-                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
-                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
-                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
-                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
-                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
-                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
-                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
-                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
-                {"label": "#", "matrix": [3, 12], "x": 12.75, "y": 3.25},
-                {"label": "Enter", "matrix": [3, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
-
-                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
-                {"label": "\\", "matrix": [4, 1], "x": 1.25, "y": 4.25},
-                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
-                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
-                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
-                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
-                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
-                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
-                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
-                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
-                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
-                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
-                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
-                {"label": "Shift", "matrix": [4, 13], "x": 14, "y": 4.25},
-
-                {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25},
-
-                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
-                {"label": "GUI", "matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
-                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
-                {"label": "Space", "matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
-                {"label": "Alt", "matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
-                {"label": "GUI", "matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
-                {"label": "Fn", "matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
-                {"label": "Ctrl", "matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
-
-                {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
-                {"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25},
-                {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
-            ]
-        },
-        "LAYOUT_tkl_iso_tsangan": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-
-                {"label": "F1", "matrix": [0, 1], "x": 2, "y": 0},
-                {"label": "F2", "matrix": [0, 2], "x": 3, "y": 0},
-                {"label": "F3", "matrix": [0, 3], "x": 4, "y": 0},
-                {"label": "F4", "matrix": [0, 4], "x": 5, "y": 0},
-
-                {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 0},
-                {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 0},
-                {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 0},
-                {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 0},
-
-                {"label": "F9", "matrix": [0, 9], "x": 11, "y": 0},
-                {"label": "F10", "matrix": [0, 10], "x": 12, "y": 0},
-                {"label": "F11", "matrix": [0, 11], "x": 13, "y": 0},
-                {"label": "F12", "matrix": [0, 12], "x": 14, "y": 0},
-
-                {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
-                {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
-                {"label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0},
-
-                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
-                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
-                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
-                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
-                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
-                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
-                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
-                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
-                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
-                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
-                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
-                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
-                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
-                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
-
-                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
-                {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25},
-                {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "y": 1.25},
-
-                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
-                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
-                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
-                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
-                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
-                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
-                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
-                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
-                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
-                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
-                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
-                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
-                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
-
-                {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
-                {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25},
-                {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2.25},
-
-                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
-                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
-                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
-                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
-                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
-                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
-                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
-                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
-                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
-                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
-                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
-                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
-                {"label": "#", "matrix": [3, 12], "x": 12.75, "y": 3.25},
-                {"label": "Enter", "matrix": [3, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
-
-                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
-                {"label": "\\", "matrix": [4, 1], "x": 1.25, "y": 4.25},
-                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
-                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
-                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
-                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
-                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
-                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
-                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
-                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
-                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
-                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
-                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75},
-
-                {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25},
-
-                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
-                {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 5.25},
-                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
-                {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
-                {"label": "Alt", "matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5},
-                {"label": "Fn", "matrix": [5, 12], "x": 12.5, "y": 5.25},
-                {"label": "Ctrl", "matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
-
-                {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
-                {"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25},
-                {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
-            ]
-        },
-        "LAYOUT_tkl_iso_tsangan_split_bs_rshift": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-
-                {"label": "F1", "matrix": [0, 1], "x": 2, "y": 0},
-                {"label": "F2", "matrix": [0, 2], "x": 3, "y": 0},
-                {"label": "F3", "matrix": [0, 3], "x": 4, "y": 0},
-                {"label": "F4", "matrix": [0, 4], "x": 5, "y": 0},
-
-                {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 0},
-                {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 0},
-                {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 0},
-                {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 0},
-
-                {"label": "F9", "matrix": [0, 9], "x": 11, "y": 0},
-                {"label": "F10", "matrix": [0, 10], "x": 12, "y": 0},
-                {"label": "F11", "matrix": [0, 11], "x": 13, "y": 0},
-                {"label": "F12", "matrix": [0, 12], "x": 14, "y": 0},
-
-                {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
-                {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
-                {"label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0},
-
-                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
-                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
-                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
-                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
-                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
-                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
-                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
-                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
-                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
-                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
-                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
-                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
-                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
-                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25},
-                {"label": "Delete", "matrix": [0, 13], "x": 14, "y": 1.25},
-
-                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
-                {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25},
-                {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "y": 1.25},
-
-                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
-                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
-                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
-                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
-                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
-                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
-                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
-                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
-                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
-                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
-                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
-                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
-                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
-
-                {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
-                {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25},
-                {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2.25},
-
-                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
-                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
-                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
-                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
-                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
-                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
-                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
-                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
-                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
-                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
-                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
-                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
-                {"label": "#", "matrix": [3, 12], "x": 12.75, "y": 3.25},
-                {"label": "Enter", "matrix": [3, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
-
-                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
-                {"label": "\\", "matrix": [4, 1], "x": 1.25, "y": 4.25},
-                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
-                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
-                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
-                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
-                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
-                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
-                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
-                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
-                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
-                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
-                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
-                {"label": "Shift", "matrix": [4, 13], "x": 14, "y": 4.25},
-
-                {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25},
-
-                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
-                {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 5.25},
-                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
-                {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
-                {"label": "Alt", "matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5},
-                {"label": "Fn", "matrix": [5, 12], "x": 12.5, "y": 5.25},
-                {"label": "Ctrl", "matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
-
-                {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
-                {"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25},
-                {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
-            ]
-        }
-    }
-}
diff --git a/keyboards/mechlovin/serratus/keyboard.json b/keyboards/mechlovin/serratus/keyboard.json
new file mode 100644
index 00000000000..c283c48a350
--- /dev/null
+++ b/keyboards/mechlovin/serratus/keyboard.json
@@ -0,0 +1,1011 @@
+{
+    "keyboard_name": "Serratus Rev.1",
+    "manufacturer": "Mechlovin Studio",
+    "url": "",
+    "maintainer": "Mechlovin' Studio",
+    "usb": {
+        "vid": "0x4D4C",
+        "pid": "0x0870",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "nkro": true,
+        "backlight": true,
+        "rgblight": true
+    },
+    "backlight": {
+        "pin": "B6",
+        "breathing": true
+    },
+    "indicators": {
+        "caps_lock": "D6",
+        "num_lock": "D7",
+        "scroll_lock": "B4"
+    },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 24,
+        "sleep": true,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": true,
+            "twinkle": true
+        }
+    },
+    "ws2812": {
+        "pin": "E2"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "community_layouts": [
+        "tkl_ansi",
+        "tkl_ansi_split_bs_rshift",
+        "tkl_ansi_tsangan",
+        "tkl_ansi_tsangan_split_bs_rshift",
+        "tkl_iso",
+        "tkl_iso_split_bs_rshift",
+        "tkl_iso_tsangan",
+        "tkl_iso_tsangan_split_bs_rshift"
+    ],
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "F1", "matrix": [0, 1], "x": 2, "y": 0},
+                {"label": "F2", "matrix": [0, 2], "x": 3, "y": 0},
+                {"label": "F3", "matrix": [0, 3], "x": 4, "y": 0},
+                {"label": "F4", "matrix": [0, 4], "x": 5, "y": 0},
+
+                {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 0},
+                {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 0},
+                {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 0},
+                {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 0},
+
+                {"label": "F9", "matrix": [0, 9], "x": 11, "y": 0},
+                {"label": "F10", "matrix": [0, 10], "x": 12, "y": 0},
+                {"label": "F11", "matrix": [0, 11], "x": 13, "y": 0},
+                {"label": "F12", "matrix": [0, 12], "x": 14, "y": 0},
+
+                {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
+                {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
+                {"label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
+                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
+                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
+                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
+                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
+                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
+                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
+                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
+                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
+                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
+                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
+                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
+                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
+                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25},
+                {"label": "Delete", "matrix": [0, 13], "x": 14, "y": 1.25},
+
+                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"label": "#", "matrix": [3, 12], "x": 12.75, "y": 3.25},
+                {"label": "Enter", "matrix": [3, 13], "x": 13.75, "y": 3.25, "w": 1.25},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"label": "\\", "matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"label": "Shift", "matrix": [4, 13], "x": 14, "y": 4.25},
+
+                {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"label": "GUI", "matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"label": "Space", "matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"label": "Alt", "matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
+                {"label": "GUI", "matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"label": "Fn", "matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"label": "Ctrl", "matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_ansi": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "F1", "matrix": [0, 1], "x": 2, "y": 0},
+                {"label": "F2", "matrix": [0, 2], "x": 3, "y": 0},
+                {"label": "F3", "matrix": [0, 3], "x": 4, "y": 0},
+                {"label": "F4", "matrix": [0, 4], "x": 5, "y": 0},
+
+                {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 0},
+                {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 0},
+                {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 0},
+                {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 0},
+
+                {"label": "F9", "matrix": [0, 9], "x": 11, "y": 0},
+                {"label": "F10", "matrix": [0, 10], "x": 12, "y": 0},
+                {"label": "F11", "matrix": [0, 11], "x": 13, "y": 0},
+                {"label": "F12", "matrix": [0, 12], "x": 14, "y": 0},
+
+                {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
+                {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
+                {"label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
+                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
+                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
+                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
+                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
+                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
+                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
+                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
+                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
+                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
+                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
+                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
+                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
+                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+
+                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"label": "Enter", "matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"label": "GUI", "matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"label": "Space", "matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"label": "Alt", "matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
+                {"label": "GUI", "matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"label": "Fn", "matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"label": "Ctrl", "matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_ansi_split_bs_rshift": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "F1", "matrix": [0, 1], "x": 2, "y": 0},
+                {"label": "F2", "matrix": [0, 2], "x": 3, "y": 0},
+                {"label": "F3", "matrix": [0, 3], "x": 4, "y": 0},
+                {"label": "F4", "matrix": [0, 4], "x": 5, "y": 0},
+
+                {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 0},
+                {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 0},
+                {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 0},
+                {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 0},
+
+                {"label": "F9", "matrix": [0, 9], "x": 11, "y": 0},
+                {"label": "F10", "matrix": [0, 10], "x": 12, "y": 0},
+                {"label": "F11", "matrix": [0, 11], "x": 13, "y": 0},
+                {"label": "F12", "matrix": [0, 12], "x": 14, "y": 0},
+
+                {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
+                {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
+                {"label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
+                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
+                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
+                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
+                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
+                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
+                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
+                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
+                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
+                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
+                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
+                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
+                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
+                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25},
+                {"label": "Delete", "matrix": [0, 13], "x": 14, "y": 1.25},
+
+                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"label": "Enter", "matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"label": "Shift", "matrix": [4, 13], "x": 14, "y": 4.25},
+
+                {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"label": "GUI", "matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"label": "Space", "matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"label": "Alt", "matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
+                {"label": "GUI", "matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"label": "Fn", "matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"label": "Ctrl", "matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_ansi_tsangan": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "F1", "matrix": [0, 1], "x": 2, "y": 0},
+                {"label": "F2", "matrix": [0, 2], "x": 3, "y": 0},
+                {"label": "F3", "matrix": [0, 3], "x": 4, "y": 0},
+                {"label": "F4", "matrix": [0, 4], "x": 5, "y": 0},
+
+                {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 0},
+                {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 0},
+                {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 0},
+                {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 0},
+
+                {"label": "F9", "matrix": [0, 9], "x": 11, "y": 0},
+                {"label": "F10", "matrix": [0, 10], "x": 12, "y": 0},
+                {"label": "F11", "matrix": [0, 11], "x": 13, "y": 0},
+                {"label": "F12", "matrix": [0, 12], "x": 14, "y": 0},
+
+                {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
+                {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
+                {"label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
+                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
+                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
+                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
+                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
+                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
+                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
+                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
+                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
+                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
+                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
+                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
+                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
+                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+
+                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"label": "Enter", "matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 5.25},
+                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
+                {"label": "Alt", "matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5},
+                {"label": "Fn", "matrix": [5, 12], "x": 12.5, "y": 5.25},
+                {"label": "Ctrl", "matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
+
+                {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_ansi_tsangan_split_bs_rshift": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "F1", "matrix": [0, 1], "x": 2, "y": 0},
+                {"label": "F2", "matrix": [0, 2], "x": 3, "y": 0},
+                {"label": "F3", "matrix": [0, 3], "x": 4, "y": 0},
+                {"label": "F4", "matrix": [0, 4], "x": 5, "y": 0},
+
+                {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 0},
+                {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 0},
+                {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 0},
+                {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 0},
+
+                {"label": "F9", "matrix": [0, 9], "x": 11, "y": 0},
+                {"label": "F10", "matrix": [0, 10], "x": 12, "y": 0},
+                {"label": "F11", "matrix": [0, 11], "x": 13, "y": 0},
+                {"label": "F12", "matrix": [0, 12], "x": 14, "y": 0},
+
+                {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
+                {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
+                {"label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
+                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
+                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
+                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
+                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
+                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
+                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
+                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
+                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
+                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
+                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
+                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
+                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
+                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25},
+                {"label": "Delete", "matrix": [0, 13], "x": 14, "y": 1.25},
+
+                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"label": "Enter", "matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"label": "Shift", "matrix": [4, 13], "x": 14, "y": 4.25},
+
+                {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 5.25},
+                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
+                {"label": "Alt", "matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5},
+                {"label": "Fn", "matrix": [5, 12], "x": 12.5, "y": 5.25},
+                {"label": "Ctrl", "matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
+
+                {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_iso": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "F1", "matrix": [0, 1], "x": 2, "y": 0},
+                {"label": "F2", "matrix": [0, 2], "x": 3, "y": 0},
+                {"label": "F3", "matrix": [0, 3], "x": 4, "y": 0},
+                {"label": "F4", "matrix": [0, 4], "x": 5, "y": 0},
+
+                {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 0},
+                {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 0},
+                {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 0},
+                {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 0},
+
+                {"label": "F9", "matrix": [0, 9], "x": 11, "y": 0},
+                {"label": "F10", "matrix": [0, 10], "x": 12, "y": 0},
+                {"label": "F11", "matrix": [0, 11], "x": 13, "y": 0},
+                {"label": "F12", "matrix": [0, 12], "x": 14, "y": 0},
+
+                {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
+                {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
+                {"label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
+                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
+                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
+                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
+                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
+                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
+                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
+                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
+                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
+                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
+                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
+                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
+                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
+                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+
+                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
+
+                {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"label": "#", "matrix": [3, 12], "x": 12.75, "y": 3.25},
+                {"label": "Enter", "matrix": [3, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"label": "\\", "matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"label": "GUI", "matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"label": "Space", "matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"label": "Alt", "matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
+                {"label": "GUI", "matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"label": "Fn", "matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"label": "Ctrl", "matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_iso_split_bs_rshift": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "F1", "matrix": [0, 1], "x": 2, "y": 0},
+                {"label": "F2", "matrix": [0, 2], "x": 3, "y": 0},
+                {"label": "F3", "matrix": [0, 3], "x": 4, "y": 0},
+                {"label": "F4", "matrix": [0, 4], "x": 5, "y": 0},
+
+                {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 0},
+                {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 0},
+                {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 0},
+                {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 0},
+
+                {"label": "F9", "matrix": [0, 9], "x": 11, "y": 0},
+                {"label": "F10", "matrix": [0, 10], "x": 12, "y": 0},
+                {"label": "F11", "matrix": [0, 11], "x": 13, "y": 0},
+                {"label": "F12", "matrix": [0, 12], "x": 14, "y": 0},
+
+                {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
+                {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
+                {"label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
+                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
+                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
+                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
+                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
+                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
+                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
+                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
+                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
+                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
+                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
+                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
+                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
+                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25},
+                {"label": "Delete", "matrix": [0, 13], "x": 14, "y": 1.25},
+
+                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
+
+                {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"label": "#", "matrix": [3, 12], "x": 12.75, "y": 3.25},
+                {"label": "Enter", "matrix": [3, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"label": "\\", "matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"label": "Shift", "matrix": [4, 13], "x": 14, "y": 4.25},
+
+                {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"label": "GUI", "matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"label": "Space", "matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"label": "Alt", "matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
+                {"label": "GUI", "matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"label": "Fn", "matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"label": "Ctrl", "matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_iso_tsangan": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "F1", "matrix": [0, 1], "x": 2, "y": 0},
+                {"label": "F2", "matrix": [0, 2], "x": 3, "y": 0},
+                {"label": "F3", "matrix": [0, 3], "x": 4, "y": 0},
+                {"label": "F4", "matrix": [0, 4], "x": 5, "y": 0},
+
+                {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 0},
+                {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 0},
+                {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 0},
+                {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 0},
+
+                {"label": "F9", "matrix": [0, 9], "x": 11, "y": 0},
+                {"label": "F10", "matrix": [0, 10], "x": 12, "y": 0},
+                {"label": "F11", "matrix": [0, 11], "x": 13, "y": 0},
+                {"label": "F12", "matrix": [0, 12], "x": 14, "y": 0},
+
+                {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
+                {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
+                {"label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
+                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
+                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
+                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
+                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
+                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
+                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
+                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
+                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
+                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
+                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
+                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
+                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
+                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+
+                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
+
+                {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"label": "#", "matrix": [3, 12], "x": 12.75, "y": 3.25},
+                {"label": "Enter", "matrix": [3, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"label": "\\", "matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 5.25},
+                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
+                {"label": "Alt", "matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5},
+                {"label": "Fn", "matrix": [5, 12], "x": 12.5, "y": 5.25},
+                {"label": "Ctrl", "matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
+
+                {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_iso_tsangan_split_bs_rshift": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "F1", "matrix": [0, 1], "x": 2, "y": 0},
+                {"label": "F2", "matrix": [0, 2], "x": 3, "y": 0},
+                {"label": "F3", "matrix": [0, 3], "x": 4, "y": 0},
+                {"label": "F4", "matrix": [0, 4], "x": 5, "y": 0},
+
+                {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 0},
+                {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 0},
+                {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 0},
+                {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 0},
+
+                {"label": "F9", "matrix": [0, 9], "x": 11, "y": 0},
+                {"label": "F10", "matrix": [0, 10], "x": 12, "y": 0},
+                {"label": "F11", "matrix": [0, 11], "x": 13, "y": 0},
+                {"label": "F12", "matrix": [0, 12], "x": 14, "y": 0},
+
+                {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
+                {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
+                {"label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
+                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
+                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
+                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
+                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
+                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
+                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
+                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
+                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
+                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
+                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
+                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
+                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
+                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25},
+                {"label": "Delete", "matrix": [0, 13], "x": 14, "y": 1.25},
+
+                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
+
+                {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"label": "#", "matrix": [3, 12], "x": 12.75, "y": 3.25},
+                {"label": "Enter", "matrix": [3, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"label": "\\", "matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"label": "Shift", "matrix": [4, 13], "x": 14, "y": 4.25},
+
+                {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 5.25},
+                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
+                {"label": "Alt", "matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5},
+                {"label": "Fn", "matrix": [5, 12], "x": 12.5, "y": 5.25},
+                {"label": "Ctrl", "matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
+
+                {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/mechlovin/serratus/rules.mk b/keyboards/mechlovin/serratus/rules.mk
index 03ea2f1bda0..179d02c3c68 100644
--- a/keyboards/mechlovin/serratus/rules.mk
+++ b/keyboards/mechlovin/serratus/rules.mk
@@ -1,15 +1,3 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
 CUSTOM_MATRIX = lite
 
 SRC += matrix.c
diff --git a/keyboards/mechlovin/th1800/info.json b/keyboards/mechlovin/th1800/info.json
deleted file mode 100644
index 001c73f6839..00000000000
--- a/keyboards/mechlovin/th1800/info.json
+++ /dev/null
@@ -1,153 +0,0 @@
-{
-    "keyboard_name": "th-1800",
-    "manufacturer": "Team Mechlovin",
-    "url": "",
-    "maintainer": "qmk",
-    "usb": {
-        "vid": "0x4D4C",
-        "pid": "0x1800",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["A3", "D7", "C0", "C1", "C2", "C3", "C4", "C5", "C6", "C7", "A7", "A6", "A5", "A4", "B3", "B2", "B0", "B1"],
-        "rows": ["B6", "B7", "D0", "D1", "D5", "D6"]
-    },
-    "diode_direction": "COL2ROW",
-    "indicators": {
-        "caps_lock": "A0",
-        "num_lock": "A2",
-        "scroll_lock": "A1",
-        "on_state": 0
-    },
-    "processor": "atmega32a",
-    "bootloader": "usbasploader",
-     "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-
-                {"matrix": [0, 1], "x": 1.25, "y": 0},
-                {"matrix": [0, 2], "x": 2.25, "y": 0},
-                {"matrix": [0, 3], "x": 3.25, "y": 0},
-                {"matrix": [0, 4], "x": 4.25, "y": 0},
-
-                {"matrix": [0, 5], "x": 5.5, "y": 0},
-                {"matrix": [0, 6], "x": 6.5, "y": 0},
-                {"matrix": [0, 7], "x": 7.5, "y": 0},
-                {"matrix": [0, 8], "x": 8.5, "y": 0},
-
-                {"matrix": [0, 9], "x": 9.75, "y": 0},
-                {"matrix": [0, 10], "x": 10.75, "y": 0},
-                {"matrix": [0, 11], "x": 11.75, "y": 0},
-                {"matrix": [0, 12], "x": 12.75, "y": 0},
-
-                {"matrix": [0, 14], "x": 15.5, "y": 0},
-                {"matrix": [0, 15], "x": 16.5, "y": 0},
-                {"matrix": [0, 16], "x": 17.5, "y": 0},
-                {"matrix": [0, 17], "x": 18.5, "y": 0},
-
-                {"matrix": [5, 14], "x": 15.5, "y": 1},
-                {"matrix": [5, 15], "x": 16.5, "y": 1},
-                {"matrix": [5, 16], "x": 17.5, "y": 1},
-                {"matrix": [5, 17], "x": 18.5, "y": 1},
-
-                {"matrix": [1, 0], "x": 0, "y": 2},
-                {"matrix": [1, 1], "x": 1, "y": 2},
-                {"matrix": [1, 2], "x": 2, "y": 2},
-                {"matrix": [1, 3], "x": 3, "y": 2},
-                {"matrix": [1, 4], "x": 4, "y": 2},
-                {"matrix": [1, 5], "x": 5, "y": 2},
-                {"matrix": [1, 6], "x": 6, "y": 2},
-                {"matrix": [1, 7], "x": 7, "y": 2},
-                {"matrix": [1, 8], "x": 8, "y": 2},
-                {"matrix": [1, 9], "x": 9, "y": 2},
-                {"matrix": [1, 10], "x": 10, "y": 2},
-                {"matrix": [1, 11], "x": 11, "y": 2},
-                {"matrix": [1, 12], "x": 12, "y": 2},
-                {"matrix": [1, 13], "x": 13, "y": 2},
-                {"matrix": [0, 13], "x": 14, "y": 2},
-
-                {"matrix": [1, 14], "x": 15.5, "y": 2},
-                {"matrix": [1, 15], "x": 16.5, "y": 2},
-                {"matrix": [1, 16], "x": 17.5, "y": 2},
-                {"matrix": [1, 17], "x": 18.5, "y": 2},
-
-                {"matrix": [2, 0], "x": 0, "y": 3, "w": 1.5},
-                {"matrix": [2, 1], "x": 1.5, "y": 3},
-                {"matrix": [2, 2], "x": 2.5, "y": 3},
-                {"matrix": [2, 3], "x": 3.5, "y": 3},
-                {"matrix": [2, 4], "x": 4.5, "y": 3},
-                {"matrix": [2, 5], "x": 5.5, "y": 3},
-                {"matrix": [2, 6], "x": 6.5, "y": 3},
-                {"matrix": [2, 7], "x": 7.5, "y": 3},
-                {"matrix": [2, 8], "x": 8.5, "y": 3},
-                {"matrix": [2, 9], "x": 9.5, "y": 3},
-                {"matrix": [2, 10], "x": 10.5, "y": 3},
-                {"matrix": [2, 11], "x": 11.5, "y": 3},
-                {"matrix": [2, 12], "x": 12.5, "y": 3},
-                {"matrix": [2, 13], "x": 13.5, "y": 3, "w": 1.5},
-
-                {"matrix": [2, 14], "x": 15.5, "y": 3},
-                {"matrix": [2, 15], "x": 16.5, "y": 3},
-                {"matrix": [2, 16], "x": 17.5, "y": 3},
-                {"matrix": [2, 17], "x": 18.5, "y": 3},
-
-                {"matrix": [3, 0], "x": 0, "y": 4, "w": 1.75},
-                {"matrix": [3, 1], "x": 1.75, "y": 4},
-                {"matrix": [3, 2], "x": 2.75, "y": 4},
-                {"matrix": [3, 3], "x": 3.75, "y": 4},
-                {"matrix": [3, 4], "x": 4.75, "y": 4},
-                {"matrix": [3, 5], "x": 5.75, "y": 4},
-                {"matrix": [3, 6], "x": 6.75, "y": 4},
-                {"matrix": [3, 7], "x": 7.75, "y": 4},
-                {"matrix": [3, 8], "x": 8.75, "y": 4},
-                {"matrix": [3, 9], "x": 9.75, "y": 4},
-                {"matrix": [3, 10], "x": 10.75, "y": 4},
-                {"matrix": [3, 11], "x": 11.75, "y": 4},
-                {"matrix": [3, 12], "x": 12.75, "y": 4},
-                {"matrix": [3, 13], "x": 13.75, "y": 4, "w": 1.25},
-
-                {"matrix": [3, 14], "x": 15.5, "y": 4},
-                {"matrix": [3, 15], "x": 16.5, "y": 4},
-                {"matrix": [3, 16], "x": 17.5, "y": 4},
-                {"matrix": [3, 17], "x": 18.5, "y": 4},
-
-                {"matrix": [4, 0], "x": 0, "y": 5, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 5},
-                {"matrix": [4, 2], "x": 2.25, "y": 5},
-                {"matrix": [4, 3], "x": 3.25, "y": 5},
-                {"matrix": [4, 4], "x": 4.25, "y": 5},
-                {"matrix": [4, 5], "x": 5.25, "y": 5},
-                {"matrix": [4, 6], "x": 6.25, "y": 5},
-                {"matrix": [4, 7], "x": 7.25, "y": 5},
-                {"matrix": [4, 8], "x": 8.25, "y": 5},
-                {"matrix": [4, 9], "x": 9.25, "y": 5},
-                {"matrix": [4, 10], "x": 10.25, "y": 5},
-                {"matrix": [4, 11], "x": 11.25, "y": 5},
-                {"matrix": [4, 12], "x": 12.25, "y": 5, "w": 1.75},
-
-                {"matrix": [4, 13], "x": 14.25, "y": 5.25},
-
-                {"matrix": [4, 14], "x": 15.5, "y": 5},
-                {"matrix": [4, 15], "x": 16.5, "y": 5},
-                {"matrix": [4, 16], "x": 17.5, "y": 5},
-                {"matrix": [4, 17], "x": 18.5, "y": 5, "h": 2},
-
-                {"matrix": [5, 0], "x": 0, "y": 6, "w": 1.5},
-                {"matrix": [5, 1], "x": 1.5, "y": 6},
-                {"matrix": [5, 2], "x": 2.5, "y": 6, "w": 1.5},
-                {"matrix": [5, 5], "x": 4, "y": 6, "w": 6.25},
-                {"matrix": [5, 7], "x": 10.25, "y": 6, "w": 1.25},
-                {"matrix": [5, 8], "x": 11.5, "y": 6, "w": 1.5},
-
-                {"matrix": [5, 9], "x": 13.25, "y": 6.25},
-                {"matrix": [5, 10], "x": 14.25, "y": 6.25},
-                {"matrix": [5, 11], "x": 15.25, "y": 6.25},
-
-                {"matrix": [5, 12], "x": 16.5, "y": 6},
-                {"matrix": [5, 13], "x": 17.5, "y": 6}
-            ]
-        }
-    }
-    ,"meta": "https://noroadsleft.github.io/kbf_qmk_converter/"
-}
diff --git a/keyboards/mechlovin/th1800/keyboard.json b/keyboards/mechlovin/th1800/keyboard.json
new file mode 100644
index 00000000000..66b74875454
--- /dev/null
+++ b/keyboards/mechlovin/th1800/keyboard.json
@@ -0,0 +1,158 @@
+{
+    "keyboard_name": "th-1800",
+    "manufacturer": "Team Mechlovin",
+    "url": "",
+    "maintainer": "qmk",
+    "usb": {
+        "vid": "0x4D4C",
+        "pid": "0x1800",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true
+    },
+    "matrix_pins": {
+        "cols": ["A3", "D7", "C0", "C1", "C2", "C3", "C4", "C5", "C6", "C7", "A7", "A6", "A5", "A4", "B3", "B2", "B0", "B1"],
+        "rows": ["B6", "B7", "D0", "D1", "D5", "D6"]
+    },
+    "diode_direction": "COL2ROW",
+    "indicators": {
+        "caps_lock": "A0",
+        "num_lock": "A2",
+        "scroll_lock": "A1",
+        "on_state": 0
+    },
+    "processor": "atmega32a",
+    "bootloader": "usbasploader",
+     "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 9.75, "y": 0},
+                {"matrix": [0, 10], "x": 10.75, "y": 0},
+                {"matrix": [0, 11], "x": 11.75, "y": 0},
+                {"matrix": [0, 12], "x": 12.75, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.5, "y": 0},
+                {"matrix": [0, 15], "x": 16.5, "y": 0},
+                {"matrix": [0, 16], "x": 17.5, "y": 0},
+                {"matrix": [0, 17], "x": 18.5, "y": 0},
+
+                {"matrix": [5, 14], "x": 15.5, "y": 1},
+                {"matrix": [5, 15], "x": 16.5, "y": 1},
+                {"matrix": [5, 16], "x": 17.5, "y": 1},
+                {"matrix": [5, 17], "x": 18.5, "y": 1},
+
+                {"matrix": [1, 0], "x": 0, "y": 2},
+                {"matrix": [1, 1], "x": 1, "y": 2},
+                {"matrix": [1, 2], "x": 2, "y": 2},
+                {"matrix": [1, 3], "x": 3, "y": 2},
+                {"matrix": [1, 4], "x": 4, "y": 2},
+                {"matrix": [1, 5], "x": 5, "y": 2},
+                {"matrix": [1, 6], "x": 6, "y": 2},
+                {"matrix": [1, 7], "x": 7, "y": 2},
+                {"matrix": [1, 8], "x": 8, "y": 2},
+                {"matrix": [1, 9], "x": 9, "y": 2},
+                {"matrix": [1, 10], "x": 10, "y": 2},
+                {"matrix": [1, 11], "x": 11, "y": 2},
+                {"matrix": [1, 12], "x": 12, "y": 2},
+                {"matrix": [1, 13], "x": 13, "y": 2},
+                {"matrix": [0, 13], "x": 14, "y": 2},
+
+                {"matrix": [1, 14], "x": 15.5, "y": 2},
+                {"matrix": [1, 15], "x": 16.5, "y": 2},
+                {"matrix": [1, 16], "x": 17.5, "y": 2},
+                {"matrix": [1, 17], "x": 18.5, "y": 2},
+
+                {"matrix": [2, 0], "x": 0, "y": 3, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 3},
+                {"matrix": [2, 2], "x": 2.5, "y": 3},
+                {"matrix": [2, 3], "x": 3.5, "y": 3},
+                {"matrix": [2, 4], "x": 4.5, "y": 3},
+                {"matrix": [2, 5], "x": 5.5, "y": 3},
+                {"matrix": [2, 6], "x": 6.5, "y": 3},
+                {"matrix": [2, 7], "x": 7.5, "y": 3},
+                {"matrix": [2, 8], "x": 8.5, "y": 3},
+                {"matrix": [2, 9], "x": 9.5, "y": 3},
+                {"matrix": [2, 10], "x": 10.5, "y": 3},
+                {"matrix": [2, 11], "x": 11.5, "y": 3},
+                {"matrix": [2, 12], "x": 12.5, "y": 3},
+                {"matrix": [2, 13], "x": 13.5, "y": 3, "w": 1.5},
+
+                {"matrix": [2, 14], "x": 15.5, "y": 3},
+                {"matrix": [2, 15], "x": 16.5, "y": 3},
+                {"matrix": [2, 16], "x": 17.5, "y": 3},
+                {"matrix": [2, 17], "x": 18.5, "y": 3},
+
+                {"matrix": [3, 0], "x": 0, "y": 4, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 4},
+                {"matrix": [3, 2], "x": 2.75, "y": 4},
+                {"matrix": [3, 3], "x": 3.75, "y": 4},
+                {"matrix": [3, 4], "x": 4.75, "y": 4},
+                {"matrix": [3, 5], "x": 5.75, "y": 4},
+                {"matrix": [3, 6], "x": 6.75, "y": 4},
+                {"matrix": [3, 7], "x": 7.75, "y": 4},
+                {"matrix": [3, 8], "x": 8.75, "y": 4},
+                {"matrix": [3, 9], "x": 9.75, "y": 4},
+                {"matrix": [3, 10], "x": 10.75, "y": 4},
+                {"matrix": [3, 11], "x": 11.75, "y": 4},
+                {"matrix": [3, 12], "x": 12.75, "y": 4},
+                {"matrix": [3, 13], "x": 13.75, "y": 4, "w": 1.25},
+
+                {"matrix": [3, 14], "x": 15.5, "y": 4},
+                {"matrix": [3, 15], "x": 16.5, "y": 4},
+                {"matrix": [3, 16], "x": 17.5, "y": 4},
+                {"matrix": [3, 17], "x": 18.5, "y": 4},
+
+                {"matrix": [4, 0], "x": 0, "y": 5, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 5},
+                {"matrix": [4, 2], "x": 2.25, "y": 5},
+                {"matrix": [4, 3], "x": 3.25, "y": 5},
+                {"matrix": [4, 4], "x": 4.25, "y": 5},
+                {"matrix": [4, 5], "x": 5.25, "y": 5},
+                {"matrix": [4, 6], "x": 6.25, "y": 5},
+                {"matrix": [4, 7], "x": 7.25, "y": 5},
+                {"matrix": [4, 8], "x": 8.25, "y": 5},
+                {"matrix": [4, 9], "x": 9.25, "y": 5},
+                {"matrix": [4, 10], "x": 10.25, "y": 5},
+                {"matrix": [4, 11], "x": 11.25, "y": 5},
+                {"matrix": [4, 12], "x": 12.25, "y": 5, "w": 1.75},
+
+                {"matrix": [4, 13], "x": 14.25, "y": 5.25},
+
+                {"matrix": [4, 14], "x": 15.5, "y": 5},
+                {"matrix": [4, 15], "x": 16.5, "y": 5},
+                {"matrix": [4, 16], "x": 17.5, "y": 5},
+                {"matrix": [4, 17], "x": 18.5, "y": 5, "h": 2},
+
+                {"matrix": [5, 0], "x": 0, "y": 6, "w": 1.5},
+                {"matrix": [5, 1], "x": 1.5, "y": 6},
+                {"matrix": [5, 2], "x": 2.5, "y": 6, "w": 1.5},
+                {"matrix": [5, 5], "x": 4, "y": 6, "w": 6.25},
+                {"matrix": [5, 7], "x": 10.25, "y": 6, "w": 1.25},
+                {"matrix": [5, 8], "x": 11.5, "y": 6, "w": 1.5},
+
+                {"matrix": [5, 9], "x": 13.25, "y": 6.25},
+                {"matrix": [5, 10], "x": 14.25, "y": 6.25},
+                {"matrix": [5, 11], "x": 15.25, "y": 6.25},
+
+                {"matrix": [5, 12], "x": 16.5, "y": 6},
+                {"matrix": [5, 13], "x": 17.5, "y": 6}
+            ]
+        }
+    }
+    ,"meta": "https://noroadsleft.github.io/kbf_qmk_converter/"
+}
diff --git a/keyboards/mechlovin/th1800/rules.mk b/keyboards/mechlovin/th1800/rules.mk
index 1e9f9255447..c2ee0bc86f9 100644
--- a/keyboards/mechlovin/th1800/rules.mk
+++ b/keyboards/mechlovin/th1800/rules.mk
@@ -1,15 +1,2 @@
 # Processor frequency
 F_CPU = 16000000
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
diff --git a/keyboards/mechlovin/zed1800/info.json b/keyboards/mechlovin/zed1800/info.json
index 41179a6ef14..9de42c24424 100644
--- a/keyboards/mechlovin/zed1800/info.json
+++ b/keyboards/mechlovin/zed1800/info.json
@@ -17,15 +17,6 @@
             "backing_size": 4096
         }
     },
-    "features": {
-        "bootmagic": true,
-        "command": true,
-        "console": true,
-        "extrakey": true,
-        "mousekey": true,
-        "rgblight": true,
-        "audio": false
-    },
     "rgblight": {
         "sleep": true,
         "animations": {
diff --git a/keyboards/mechlovin/zed1800/oreum/keyboard.json b/keyboards/mechlovin/zed1800/oreum/keyboard.json
index 4a15f61ce49..c5652213d62 100644
--- a/keyboards/mechlovin/zed1800/oreum/keyboard.json
+++ b/keyboards/mechlovin/zed1800/oreum/keyboard.json
@@ -3,6 +3,14 @@
     "usb": {
         "pid": "0x1802"
     },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "console": true,
+        "command": true,
+        "rgblight": true
+    },
     "matrix_pins": {
         "cols": ["A8", "B15", "B14", "B13", "B12", "B11", "B10", "B2", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "A2", "A1", "A0", "C13"],
         "rows": ["B8", "B7", "B6", "B5", "B4", "B3"]
diff --git a/keyboards/mechlovin/zed1800/rules.mk b/keyboards/mechlovin/zed1800/rules.mk
index d007da3fa20..e0088c95c39 100644
--- a/keyboards/mechlovin/zed1800/rules.mk
+++ b/keyboards/mechlovin/zed1800/rules.mk
@@ -1 +1 @@
-DEFAULT_FOLDER = mechlovin/zed1800/saber
\ No newline at end of file
+DEFAULT_FOLDER = mechlovin/zed1800/saber
diff --git a/keyboards/mechlovin/zed1800/saber/keyboard.json b/keyboards/mechlovin/zed1800/saber/keyboard.json
index d921d95a950..a3d236e5112 100644
--- a/keyboards/mechlovin/zed1800/saber/keyboard.json
+++ b/keyboards/mechlovin/zed1800/saber/keyboard.json
@@ -3,6 +3,14 @@
     "usb": {
         "pid": "0x1803"
     },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "console": true,
+        "command": true,
+        "rgblight": true
+    },
     "matrix_pins": {
         "cols": ["A8", "A15", "B14", "B13", "B12", "B11", "B10", "B2", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "A2", "A1", "A0", "C13"],
         "rows": ["B8", "B7", "B6", "B5", "B4", "B3"]
diff --git a/keyboards/mechlovin/zed1800/zepsody/keyboard.json b/keyboards/mechlovin/zed1800/zepsody/keyboard.json
index dab92b26d7e..8a973d181fa 100644
--- a/keyboards/mechlovin/zed1800/zepsody/keyboard.json
+++ b/keyboards/mechlovin/zed1800/zepsody/keyboard.json
@@ -3,6 +3,14 @@
     "usb": {
         "pid": "0x1801"
     },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "console": true,
+        "command": true,
+        "rgblight": true
+    },
     "matrix_pins": {
         "cols": ["A10", "A9", "A8", "A15", "B14", "B13", "B12", "B11", "B10", "B2", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "A2", "A1", "A0"],
         "rows": ["B8", "B7", "B6", "B5", "B4", "B3"]
diff --git a/keyboards/mechlovin/zed65/910/keyboard.json b/keyboards/mechlovin/zed65/910/keyboard.json
index 3b1472014d7..36f1a1ed3bc 100644
--- a/keyboards/mechlovin/zed65/910/keyboard.json
+++ b/keyboards/mechlovin/zed65/910/keyboard.json
@@ -9,6 +9,11 @@
         "device_version": "0.0.1"
     },
     "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "console": true,
+        "command": true,
         "nkro": true,
         "rgblight": true
     },
diff --git a/keyboards/mechlovin/zed65/info.json b/keyboards/mechlovin/zed65/info.json
index c255dd23c6e..cf993be2471 100644
--- a/keyboards/mechlovin/zed65/info.json
+++ b/keyboards/mechlovin/zed65/info.json
@@ -1,11 +1,4 @@
 {
     "processor": "STM32F103",
-    "bootloader": "stm32duino",
-    "features": {
-        "bootmagic": true,
-        "command": true,
-        "console": true,
-        "extrakey": true,
-        "mousekey": true
-    },
+    "bootloader": "stm32duino"
 }
diff --git a/keyboards/mechlovin/zed65/mono_led/info.json b/keyboards/mechlovin/zed65/mono_led/info.json
deleted file mode 100644
index aa46b1bd8bc..00000000000
--- a/keyboards/mechlovin/zed65/mono_led/info.json
+++ /dev/null
@@ -1,294 +0,0 @@
-{
-    "keyboard_name": "Zed65-MonoLED",
-    "manufacturer": "Mechlovin Studio",
-    "url": "",
-    "maintainer": "Mechlovin' Studio",
-    "usb": {
-        "vid": "0x4D4C",
-        "pid": "0x6503",
-        "device_version": "0.0.1"
-    },
-    "rgblight": {
-        "saturation_steps": 8,
-        "brightness_steps": 8,
-        "led_count": 24,
-        "sleep": true,
-        "animations": {
-            "breathing": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "snake": true,
-            "knight": true,
-            "christmas": true,
-            "static_gradient": true,
-            "rgb_test": true,
-            "alternating": true,
-            "twinkle": true
-        }
-    },
-    "ws2812": {
-        "pin": "A7"
-    },
-    "led_matrix": {
-        "animations":{
-            "alphas_mods": true,
-            "breathing": true,
-            "band": true,
-            "band_pinwheel": true,
-            "band_spiral": true,
-            "cycle_left_right": true,
-            "cycle_up_down": true,
-            "cycle_out_in": true,
-            "dual_beacon": true,
-            "solid_reactive_simple": 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,
-            "wave_left_right": true,
-            "wave_up_down": true
-        },
-        "driver": "is31fl3731",
-        "react_on_keyup": true
-    },
-    "matrix_pins": {
-        "cols": ["A10", "A9", "A8", "B15", "B14", "B13", "B2", "B1", "A15", "B3", "B9", "B8", "B7", "B6", "B5", "B4"],
-        "rows": ["B12", "A6", "A5", "A4", "A3"]
-    },
-    "diode_direction": "COL2ROW",
-    "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": [0, 14], "x": 14, "y": 0},
-                {"matrix": [0, 15], "x": 15, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
-                {"matrix": [1, 15], "x": 15, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 12], "x": 12.75, "y": 2},
-                {"matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.25},
-                {"matrix": [2, 15], "x": 15, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
-                {"matrix": [3, 1], "x": 1.25, "y": 3},
-                {"matrix": [3, 2], "x": 2.25, "y": 3},
-                {"matrix": [3, 3], "x": 3.25, "y": 3},
-                {"matrix": [3, 4], "x": 4.25, "y": 3},
-                {"matrix": [3, 5], "x": 5.25, "y": 3},
-                {"matrix": [3, 6], "x": 6.25, "y": 3},
-                {"matrix": [3, 7], "x": 7.25, "y": 3},
-                {"matrix": [3, 8], "x": 8.25, "y": 3},
-                {"matrix": [3, 9], "x": 9.25, "y": 3},
-                {"matrix": [3, 10], "x": 10.25, "y": 3},
-                {"matrix": [3, 11], "x": 11.25, "y": 3},
-                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"matrix": [3, 14], "x": 14, "y": 3},
-                {"matrix": [3, 15], "x": 15, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
-                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
-                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 13], "x": 13, "y": 4},
-                {"matrix": [4, 14], "x": 14, "y": 4},
-                {"matrix": [4, 15], "x": 15, "y": 4}
-            ]
-        },
-        "LAYOUT_65_ansi_blocker": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-                {"matrix": [0, 15], "x": 15, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
-                {"matrix": [1, 15], "x": 15, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
-                {"matrix": [2, 15], "x": 15, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 2], "x": 2.25, "y": 3},
-                {"matrix": [3, 3], "x": 3.25, "y": 3},
-                {"matrix": [3, 4], "x": 4.25, "y": 3},
-                {"matrix": [3, 5], "x": 5.25, "y": 3},
-                {"matrix": [3, 6], "x": 6.25, "y": 3},
-                {"matrix": [3, 7], "x": 7.25, "y": 3},
-                {"matrix": [3, 8], "x": 8.25, "y": 3},
-                {"matrix": [3, 9], "x": 9.25, "y": 3},
-                {"matrix": [3, 10], "x": 10.25, "y": 3},
-                {"matrix": [3, 11], "x": 11.25, "y": 3},
-                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"matrix": [3, 14], "x": 14, "y": 3},
-                {"matrix": [3, 15], "x": 15, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
-                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
-                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 13], "x": 13, "y": 4},
-                {"matrix": [4, 14], "x": 14, "y": 4},
-                {"matrix": [4, 15], "x": 15, "y": 4}
-            ]
-        },
-        "LAYOUT_65_iso_blocker": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-                {"matrix": [0, 15], "x": 15, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 14], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
-                {"matrix": [1, 15], "x": 15, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 12], "x": 12.75, "y": 2},
-                {"matrix": [2, 15], "x": 15, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
-                {"matrix": [3, 1], "x": 1.25, "y": 3},
-                {"matrix": [3, 2], "x": 2.25, "y": 3},
-                {"matrix": [3, 3], "x": 3.25, "y": 3},
-                {"matrix": [3, 4], "x": 4.25, "y": 3},
-                {"matrix": [3, 5], "x": 5.25, "y": 3},
-                {"matrix": [3, 6], "x": 6.25, "y": 3},
-                {"matrix": [3, 7], "x": 7.25, "y": 3},
-                {"matrix": [3, 8], "x": 8.25, "y": 3},
-                {"matrix": [3, 9], "x": 9.25, "y": 3},
-                {"matrix": [3, 10], "x": 10.25, "y": 3},
-                {"matrix": [3, 11], "x": 11.25, "y": 3},
-                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"matrix": [3, 14], "x": 14, "y": 3},
-                {"matrix": [3, 15], "x": 15, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
-                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
-                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 13], "x": 13, "y": 4},
-                {"matrix": [4, 14], "x": 14, "y": 4},
-                {"matrix": [4, 15], "x": 15, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/mechlovin/zed65/mono_led/keyboard.json b/keyboards/mechlovin/zed65/mono_led/keyboard.json
new file mode 100644
index 00000000000..0cf13002d9a
--- /dev/null
+++ b/keyboards/mechlovin/zed65/mono_led/keyboard.json
@@ -0,0 +1,304 @@
+{
+    "keyboard_name": "Zed65-MonoLED",
+    "manufacturer": "Mechlovin Studio",
+    "url": "",
+    "maintainer": "Mechlovin' Studio",
+    "usb": {
+        "vid": "0x4D4C",
+        "pid": "0x6503",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "console": true,
+        "command": true,
+        "nkro": true,
+        "led_matrix": true,
+        "rgblight": true
+    },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 24,
+        "sleep": true,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": true,
+            "twinkle": true
+        }
+    },
+    "ws2812": {
+        "pin": "A7"
+    },
+    "led_matrix": {
+        "animations":{
+            "alphas_mods": true,
+            "breathing": true,
+            "band": true,
+            "band_pinwheel": true,
+            "band_spiral": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "cycle_out_in": true,
+            "dual_beacon": true,
+            "solid_reactive_simple": 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,
+            "wave_left_right": true,
+            "wave_up_down": true
+        },
+        "driver": "is31fl3731",
+        "react_on_keyup": true
+    },
+    "matrix_pins": {
+        "cols": ["A10", "A9", "A8", "B15", "B14", "B13", "B2", "B1", "A15", "B3", "B9", "B8", "B7", "B6", "B5", "B4"],
+        "rows": ["B12", "A6", "A5", "A4", "A3"]
+    },
+    "diode_direction": "COL2ROW",
+    "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": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.25},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_65_ansi_blocker": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_65_iso_blocker": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/mechlovin/zed65/mono_led/rules.mk b/keyboards/mechlovin/zed65/mono_led/rules.mk
deleted file mode 100644
index 55d38a7b91d..00000000000
--- a/keyboards/mechlovin/zed65/mono_led/rules.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-
-NKRO_ENABLE = yes            # Enable N-Key Rollover
-LED_MATRIX_ENABLE = yes
-RGBLIGHT_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/mechlovin/zed65/no_backlight/retro66/info.json b/keyboards/mechlovin/zed65/no_backlight/retro66/info.json
deleted file mode 100644
index 0709014f76b..00000000000
--- a/keyboards/mechlovin/zed65/no_backlight/retro66/info.json
+++ /dev/null
@@ -1,183 +0,0 @@
-{
-    "keyboard_name": "Retro66",
-    "manufacturer": "Mechlovin Studio",
-    "url": "",
-    "maintainer": "Mechlovin' Studio",
-    "usb": {
-        "vid": "0x4D4C",
-        "pid": "0x6601",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["B11", "B12", "B10", "B2", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "A2", "B3", "A15", "B5"],
-        "rows": ["B13", "B14", "A8", "A1", "A0"]
-    },
-    "diode_direction": "COL2ROW",
-    "encoder": {
-        "rotary": [
-            {"pin_a": "B4", "pin_b": "B8"},
-            {"pin_a": "B6", "pin_b": "B9"}
-        ]
-    },
-    "qmk": {
-        "tap_keycode_delay": 10
-    },
-    "indicators": {
-        "caps_lock": "C14"
-    },
-    "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, "w": 2},
-
-                {"matrix": [0, 14], "x": 15.75, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"matrix": [1, 14], "x": 15.75, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.25},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 2], "x": 2.25, "y": 3},
-                {"matrix": [3, 3], "x": 3.25, "y": 3},
-                {"matrix": [3, 4], "x": 4.25, "y": 3},
-                {"matrix": [3, 5], "x": 5.25, "y": 3},
-                {"matrix": [3, 6], "x": 6.25, "y": 3},
-                {"matrix": [3, 7], "x": 7.25, "y": 3},
-                {"matrix": [3, 8], "x": 8.25, "y": 3},
-                {"matrix": [3, 9], "x": 9.25, "y": 3},
-                {"matrix": [3, 10], "x": 10.25, "y": 3},
-                {"matrix": [3, 11], "x": 11.25, "y": 3},
-                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.25},
-
-                {"matrix": [3, 13], "x": 14.75, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
-                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.5},
-                {"matrix": [4, 11], "x": 11.5, "y": 4, "w": 1.25},
-
-                {"matrix": [4, 12], "x": 13.75, "y": 4},
-                {"matrix": [4, 13], "x": 14.75, "y": 4},
-                {"matrix": [4, 14], "x": 15.75, "y": 4}
-            ]
-        },
-        "LAYOUT_blocker": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-
-                {"matrix": [0, 14], "x": 15.75, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"matrix": [1, 14], "x": 15.75, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.25},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 2], "x": 2.25, "y": 3},
-                {"matrix": [3, 3], "x": 3.25, "y": 3},
-                {"matrix": [3, 4], "x": 4.25, "y": 3},
-                {"matrix": [3, 5], "x": 5.25, "y": 3},
-                {"matrix": [3, 6], "x": 6.25, "y": 3},
-                {"matrix": [3, 7], "x": 7.25, "y": 3},
-                {"matrix": [3, 8], "x": 8.25, "y": 3},
-                {"matrix": [3, 9], "x": 9.25, "y": 3},
-                {"matrix": [3, 10], "x": 10.25, "y": 3},
-                {"matrix": [3, 11], "x": 11.25, "y": 3},
-                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.25},
-
-                {"matrix": [3, 13], "x": 14.75, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
-                {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.5},
-                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
-                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.5},
-                {"matrix": [4, 11], "x": 11.5, "y": 4, "w": 1.25},
-
-                {"matrix": [4, 12], "x": 13.75, "y": 4},
-                {"matrix": [4, 13], "x": 14.75, "y": 4},
-                {"matrix": [4, 14], "x": 15.75, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/mechlovin/zed65/no_backlight/retro66/keyboard.json b/keyboards/mechlovin/zed65/no_backlight/retro66/keyboard.json
new file mode 100644
index 00000000000..49ed44f0a1f
--- /dev/null
+++ b/keyboards/mechlovin/zed65/no_backlight/retro66/keyboard.json
@@ -0,0 +1,191 @@
+{
+    "keyboard_name": "Retro66",
+    "manufacturer": "Mechlovin Studio",
+    "url": "",
+    "maintainer": "Mechlovin' Studio",
+    "usb": {
+        "vid": "0x4D4C",
+        "pid": "0x6601",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "console": true,
+        "command": true,
+        "encoder": true
+    },
+    "matrix_pins": {
+        "cols": ["B11", "B12", "B10", "B2", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "A2", "B3", "A15", "B5"],
+        "rows": ["B13", "B14", "A8", "A1", "A0"]
+    },
+    "diode_direction": "COL2ROW",
+    "encoder": {
+        "rotary": [
+            {"pin_a": "B4", "pin_b": "B8"},
+            {"pin_a": "B6", "pin_b": "B9"}
+        ]
+    },
+    "qmk": {
+        "tap_keycode_delay": 10
+    },
+    "indicators": {
+        "caps_lock": "C14"
+    },
+    "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, "w": 2},
+
+                {"matrix": [0, 14], "x": 15.75, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [1, 14], "x": 15.75, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.25},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.25},
+
+                {"matrix": [3, 13], "x": 14.75, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.5},
+                {"matrix": [4, 11], "x": 11.5, "y": 4, "w": 1.25},
+
+                {"matrix": [4, 12], "x": 13.75, "y": 4},
+                {"matrix": [4, 13], "x": 14.75, "y": 4},
+                {"matrix": [4, 14], "x": 15.75, "y": 4}
+            ]
+        },
+        "LAYOUT_blocker": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+                {"matrix": [0, 14], "x": 15.75, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [1, 14], "x": 15.75, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.25},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.25},
+
+                {"matrix": [3, 13], "x": 14.75, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.5},
+                {"matrix": [4, 11], "x": 11.5, "y": 4, "w": 1.25},
+
+                {"matrix": [4, 12], "x": 13.75, "y": 4},
+                {"matrix": [4, 13], "x": 14.75, "y": 4},
+                {"matrix": [4, 14], "x": 15.75, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/mechlovin/zed65/no_backlight/retro66/rules.mk b/keyboards/mechlovin/zed65/no_backlight/retro66/rules.mk
deleted file mode 100644
index 5af1ba85367..00000000000
--- a/keyboards/mechlovin/zed65/no_backlight/retro66/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-ENCODER_ENABLE = yes
diff --git a/keyboards/mechlovin/zed65/no_backlight/rules.mk b/keyboards/mechlovin/zed65/no_backlight/rules.mk
index b0b388db500..a699765498b 100644
--- a/keyboards/mechlovin/zed65/no_backlight/rules.mk
+++ b/keyboards/mechlovin/zed65/no_backlight/rules.mk
@@ -1,3 +1 @@
-BACKLIGHT_ENABLE = no      # Enable keyboard backlight functionality
-
 DEFAULT_FOLDER = mechlovin/zed65/no_backlight/wearhaus66
diff --git a/keyboards/mechlovin/zed65/no_backlight/wearhaus66/info.json b/keyboards/mechlovin/zed65/no_backlight/wearhaus66/info.json
deleted file mode 100644
index 5b0df671dfc..00000000000
--- a/keyboards/mechlovin/zed65/no_backlight/wearhaus66/info.json
+++ /dev/null
@@ -1,283 +0,0 @@
-{
-    "keyboard_name": "Wearhaus66",
-    "manufacturer": "Mechlovin Studio",
-    "url": "",
-    "maintainer": "mechlovin",
-    "usb": {
-        "vid": "0x4D4C",
-        "pid": "0x6602",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["B11", "B12", "B10", "B2", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "A2", "B3", "A15", "B5"],
-        "rows": ["B13", "B14", "A8", "A1", "A0"]
-    },
-    "diode_direction": "COL2ROW",
-    "indicators": {
-        "caps_lock": "C14"
-    },
-    "rgblight": {
-        "saturation_steps": 8,
-        "brightness_steps": 8,
-        "led_count": 24,
-        "sleep": true,
-        "animations": {
-            "breathing": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "snake": true,
-            "knight": true,
-            "christmas": true,
-            "static_gradient": true,
-            "rgb_test": true,
-            "alternating": true
-        }
-    },
-    "ws2812": {
-        "pin": "B15",
-        "driver": "spi"
-    },
-    "layout_aliases": {
-        "LAYOUT_65_ansi_blocker": "LAYOUT_ansi_blocker",
-        "LAYOUT_65_iso_blocker": "LAYOUT_iso_blocker"
-    },
-    "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, 12], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"matrix": [1, 14], "x": 15.25, "y": 0.75},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"matrix": [2, 14], "x": 15.25, "y": 1.75},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
-                {"matrix": [3, 1], "x": 1.25, "y": 3},
-                {"matrix": [3, 2], "x": 2.25, "y": 3},
-                {"matrix": [3, 3], "x": 3.25, "y": 3},
-                {"matrix": [3, 4], "x": 4.25, "y": 3},
-                {"matrix": [3, 5], "x": 5.25, "y": 3},
-                {"matrix": [3, 6], "x": 6.25, "y": 3},
-                {"matrix": [3, 7], "x": 7.25, "y": 3},
-                {"matrix": [3, 8], "x": 8.25, "y": 3},
-                {"matrix": [3, 9], "x": 9.25, "y": 3},
-                {"matrix": [3, 10], "x": 10.25, "y": 3},
-                {"matrix": [3, 11], "x": 11.25, "y": 3},
-                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"matrix": [3, 13], "x": 14, "y": 3},
-
-                {"matrix": [3, 14], "x": 15.25, "y": 2.75},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
-                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
-                {"matrix": [4, 10], "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_ansi_blocker": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-
-                {"matrix": [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, 12], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"matrix": [1, 14], "x": 15.25, "y": 0.75},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"matrix": [2, 14], "x": 15.25, "y": 1.75},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 2], "x": 2.25, "y": 3},
-                {"matrix": [3, 3], "x": 3.25, "y": 3},
-                {"matrix": [3, 4], "x": 4.25, "y": 3},
-                {"matrix": [3, 5], "x": 5.25, "y": 3},
-                {"matrix": [3, 6], "x": 6.25, "y": 3},
-                {"matrix": [3, 7], "x": 7.25, "y": 3},
-                {"matrix": [3, 8], "x": 8.25, "y": 3},
-                {"matrix": [3, 9], "x": 9.25, "y": 3},
-                {"matrix": [3, 10], "x": 10.25, "y": 3},
-                {"matrix": [3, 11], "x": 11.25, "y": 3},
-                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"matrix": [3, 13], "x": 14, "y": 3},
-
-                {"matrix": [3, 14], "x": 15.25, "y": 2.75},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
-                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
-                {"matrix": [4, 10], "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_blocker": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-
-                {"matrix": [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": 0.75},
-
-                {"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": [2, 14], "x": 15.25, "y": 1.75},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
-                {"matrix": [3, 1], "x": 1.25, "y": 3},
-                {"matrix": [3, 2], "x": 2.25, "y": 3},
-                {"matrix": [3, 3], "x": 3.25, "y": 3},
-                {"matrix": [3, 4], "x": 4.25, "y": 3},
-                {"matrix": [3, 5], "x": 5.25, "y": 3},
-                {"matrix": [3, 6], "x": 6.25, "y": 3},
-                {"matrix": [3, 7], "x": 7.25, "y": 3},
-                {"matrix": [3, 8], "x": 8.25, "y": 3},
-                {"matrix": [3, 9], "x": 9.25, "y": 3},
-                {"matrix": [3, 10], "x": 10.25, "y": 3},
-                {"matrix": [3, 11], "x": 11.25, "y": 3},
-                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"matrix": [3, 13], "x": 14, "y": 3},
-
-                {"matrix": [3, 14], "x": 15.25, "y": 2.75},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
-                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
-                {"matrix": [4, 10], "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}
-            ]
-        }
-    }
-}
diff --git a/keyboards/mechlovin/zed65/no_backlight/wearhaus66/keyboard.json b/keyboards/mechlovin/zed65/no_backlight/wearhaus66/keyboard.json
new file mode 100644
index 00000000000..c9c9e0ddb1e
--- /dev/null
+++ b/keyboards/mechlovin/zed65/no_backlight/wearhaus66/keyboard.json
@@ -0,0 +1,291 @@
+{
+    "keyboard_name": "Wearhaus66",
+    "manufacturer": "Mechlovin Studio",
+    "url": "",
+    "maintainer": "mechlovin",
+    "usb": {
+        "vid": "0x4D4C",
+        "pid": "0x6602",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "console": true,
+        "command": true,
+        "rgblight": true
+    },
+    "matrix_pins": {
+        "cols": ["B11", "B12", "B10", "B2", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "A2", "B3", "A15", "B5"],
+        "rows": ["B13", "B14", "A8", "A1", "A0"]
+    },
+    "diode_direction": "COL2ROW",
+    "indicators": {
+        "caps_lock": "C14"
+    },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 24,
+        "sleep": true,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": true
+        }
+    },
+    "ws2812": {
+        "pin": "B15",
+        "driver": "spi"
+    },
+    "layout_aliases": {
+        "LAYOUT_65_ansi_blocker": "LAYOUT_ansi_blocker",
+        "LAYOUT_65_iso_blocker": "LAYOUT_iso_blocker"
+    },
+    "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, 12], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 0.75},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 1.75},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+
+                {"matrix": [3, 14], "x": 15.25, "y": 2.75},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "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_ansi_blocker": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+                {"matrix": [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, 12], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 0.75},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 1.75},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+
+                {"matrix": [3, 14], "x": 15.25, "y": 2.75},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "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_blocker": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+                {"matrix": [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": 0.75},
+
+                {"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": [2, 14], "x": 15.25, "y": 1.75},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+
+                {"matrix": [3, 14], "x": 15.25, "y": 2.75},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "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}
+            ]
+        }
+    }
+}
diff --git a/keyboards/mechlovin/zed65/no_backlight/wearhaus66/rules.mk b/keyboards/mechlovin/zed65/no_backlight/wearhaus66/rules.mk
deleted file mode 100644
index 84ef473c02e..00000000000
--- a/keyboards/mechlovin/zed65/no_backlight/wearhaus66/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-RGBLIGHT_ENABLE = yes        # Enable keyboard RGB underglow
diff --git a/keyboards/mechlovin/zed65/rev1/keyboard.json b/keyboards/mechlovin/zed65/rev1/keyboard.json
index 20f04dbe655..99de5d53f2a 100644
--- a/keyboards/mechlovin/zed65/rev1/keyboard.json
+++ b/keyboards/mechlovin/zed65/rev1/keyboard.json
@@ -9,6 +9,11 @@
         "device_version": "0.0.1"
     },
     "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "console": true,
+        "command": true,
         "nkro": true,
         "rgblight": true
     },
diff --git a/keyboards/mechstudio/chapter1/info.json b/keyboards/mechstudio/chapter1/keyboard.json
similarity index 100%
rename from keyboards/mechstudio/chapter1/info.json
rename to keyboards/mechstudio/chapter1/keyboard.json
diff --git a/keyboards/mechstudio/ud_40_ortho/info.json b/keyboards/mechstudio/ud_40_ortho/info.json
deleted file mode 100644
index 6b301e69e40..00000000000
--- a/keyboards/mechstudio/ud_40_ortho/info.json
+++ /dev/null
@@ -1,101 +0,0 @@
-{
-  "keyboard_name": "UD_40 Ortholinear",
-  "manufacturer": "Mech Studio",
-  "url": "https://mech.studio/projects/ud_40/",
-  "maintainer": "dejaeghered",
-  "usb": {
-    "vid": "0x4D53",
-    "pid": "0x0002",
-    "device_version": "0.0.2"
-  },
-  "matrix_pins": {
-    "cols": ["C5", "D0", "B3", "B2", "B1", "B0", "D6", "D5", "D4", "D3", "D2", "D1"],
-    "rows": ["C2", "B4", "B5", "B6"]
-  },
-  "diode_direction": "COL2ROW",
-  "qmk_lufa_bootloader": {
-    "esc_input": "B7",
-    "esc_output": "F0"
-  },
-  "rgblight": {
-    "saturation_steps": 8,
-    "brightness_steps": 8,
-    "led_count": 10,
-    "sleep": true,
-    "animations": {
-      "breathing": true,
-      "rainbow_mood": true,
-      "rainbow_swirl": true,
-      "snake": true,
-      "knight": true,
-      "christmas": true,
-      "static_gradient": true,
-      "rgb_test": true,
-      "alternating": true,
-      "twinkle": true
-    }
-  },
-  "ws2812": {
-    "pin": "B7"
-  },
-  "processor": "atmega32u2",
-  "bootloader": "qmk-dfu",
-  "community_layouts": ["ortho_4x12"],
-  "layouts": {
-    "LAYOUT_ortho_4x12": {
-      "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": [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": [1, 4], "x": 4, "y": 1},
-        {"matrix": [1, 5], "x": 5, "y": 1},
-        {"matrix": [1, 6], "x": 6, "y": 1},
-        {"matrix": [1, 7], "x": 7, "y": 1},
-        {"matrix": [1, 8], "x": 8, "y": 1},
-        {"matrix": [1, 9], "x": 9, "y": 1},
-        {"matrix": [1, 10], "x": 10, "y": 1},
-        {"matrix": [1, 11], "x": 11, "y": 1},
-
-        {"matrix": [2, 0], "x": 0, "y": 2},
-        {"matrix": [2, 1], "x": 1, "y": 2},
-        {"matrix": [2, 2], "x": 2, "y": 2},
-        {"matrix": [2, 3], "x": 3, "y": 2},
-        {"matrix": [2, 4], "x": 4, "y": 2},
-        {"matrix": [2, 5], "x": 5, "y": 2},
-        {"matrix": [2, 6], "x": 6, "y": 2},
-        {"matrix": [2, 7], "x": 7, "y": 2},
-        {"matrix": [2, 8], "x": 8, "y": 2},
-        {"matrix": [2, 9], "x": 9, "y": 2},
-        {"matrix": [2, 10], "x": 10, "y": 2},
-        {"matrix": [2, 11], "x": 11, "y": 2},
-
-        {"matrix": [3, 0], "x": 0, "y": 3},
-        {"matrix": [3, 1], "x": 1, "y": 3},
-        {"matrix": [3, 2], "x": 2, "y": 3},
-        {"matrix": [3, 3], "x": 3, "y": 3},
-        {"matrix": [3, 4], "x": 4, "y": 3},
-        {"matrix": [3, 5], "x": 5, "y": 3},
-        {"matrix": [3, 6], "x": 6, "y": 3},
-        {"matrix": [3, 7], "x": 7, "y": 3},
-        {"matrix": [3, 8], "x": 8, "y": 3},
-        {"matrix": [3, 9], "x": 9, "y": 3},
-        {"matrix": [3, 10], "x": 10, "y": 3},
-        {"matrix": [3, 11], "x": 11, "y": 3}
-      ]
-    }
-  }
-}
diff --git a/keyboards/mechstudio/ud_40_ortho/keyboard.json b/keyboards/mechstudio/ud_40_ortho/keyboard.json
new file mode 100644
index 00000000000..31955239f5f
--- /dev/null
+++ b/keyboards/mechstudio/ud_40_ortho/keyboard.json
@@ -0,0 +1,107 @@
+{
+  "keyboard_name": "UD_40 Ortholinear",
+  "manufacturer": "Mech Studio",
+  "url": "https://mech.studio/projects/ud_40/",
+  "maintainer": "dejaeghered",
+  "usb": {
+    "vid": "0x4D53",
+    "pid": "0x0002",
+    "device_version": "0.0.2"
+  },
+  "features": {
+    "bootmagic": true,
+    "mousekey": true,
+    "extrakey": true,
+    "rgblight": true
+  },
+  "matrix_pins": {
+    "cols": ["C5", "D0", "B3", "B2", "B1", "B0", "D6", "D5", "D4", "D3", "D2", "D1"],
+    "rows": ["C2", "B4", "B5", "B6"]
+  },
+  "diode_direction": "COL2ROW",
+  "qmk_lufa_bootloader": {
+    "esc_input": "B7",
+    "esc_output": "F0"
+  },
+  "rgblight": {
+    "saturation_steps": 8,
+    "brightness_steps": 8,
+    "led_count": 10,
+    "sleep": true,
+    "animations": {
+      "breathing": true,
+      "rainbow_mood": true,
+      "rainbow_swirl": true,
+      "snake": true,
+      "knight": true,
+      "christmas": true,
+      "static_gradient": true,
+      "rgb_test": true,
+      "alternating": true,
+      "twinkle": true
+    }
+  },
+  "ws2812": {
+    "pin": "B7"
+  },
+  "processor": "atmega32u2",
+  "bootloader": "qmk-dfu",
+  "community_layouts": ["ortho_4x12"],
+  "layouts": {
+    "LAYOUT_ortho_4x12": {
+      "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": [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": [1, 4], "x": 4, "y": 1},
+        {"matrix": [1, 5], "x": 5, "y": 1},
+        {"matrix": [1, 6], "x": 6, "y": 1},
+        {"matrix": [1, 7], "x": 7, "y": 1},
+        {"matrix": [1, 8], "x": 8, "y": 1},
+        {"matrix": [1, 9], "x": 9, "y": 1},
+        {"matrix": [1, 10], "x": 10, "y": 1},
+        {"matrix": [1, 11], "x": 11, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2},
+        {"matrix": [2, 1], "x": 1, "y": 2},
+        {"matrix": [2, 2], "x": 2, "y": 2},
+        {"matrix": [2, 3], "x": 3, "y": 2},
+        {"matrix": [2, 4], "x": 4, "y": 2},
+        {"matrix": [2, 5], "x": 5, "y": 2},
+        {"matrix": [2, 6], "x": 6, "y": 2},
+        {"matrix": [2, 7], "x": 7, "y": 2},
+        {"matrix": [2, 8], "x": 8, "y": 2},
+        {"matrix": [2, 9], "x": 9, "y": 2},
+        {"matrix": [2, 10], "x": 10, "y": 2},
+        {"matrix": [2, 11], "x": 11, "y": 2},
+
+        {"matrix": [3, 0], "x": 0, "y": 3},
+        {"matrix": [3, 1], "x": 1, "y": 3},
+        {"matrix": [3, 2], "x": 2, "y": 3},
+        {"matrix": [3, 3], "x": 3, "y": 3},
+        {"matrix": [3, 4], "x": 4, "y": 3},
+        {"matrix": [3, 5], "x": 5, "y": 3},
+        {"matrix": [3, 6], "x": 6, "y": 3},
+        {"matrix": [3, 7], "x": 7, "y": 3},
+        {"matrix": [3, 8], "x": 8, "y": 3},
+        {"matrix": [3, 9], "x": 9, "y": 3},
+        {"matrix": [3, 10], "x": 10, "y": 3},
+        {"matrix": [3, 11], "x": 11, "y": 3}
+      ]
+    }
+  }
+}
diff --git a/keyboards/mechstudio/ud_40_ortho/rules.mk b/keyboards/mechstudio/ud_40_ortho/rules.mk
index 585ce414dcd..4df55cd2206 100644
--- a/keyboards/mechstudio/ud_40_ortho/rules.mk
+++ b/keyboards/mechstudio/ud_40_ortho/rules.mk
@@ -1,16 +1,3 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
 # Disable unsupported hardware
 AUDIO_SUPPORTED = no
 BACKLIGHT_SUPPORTED = no
diff --git a/keyboards/mechwild/bb65/config.h b/keyboards/mechwild/bb65/config.h
new file mode 100644
index 00000000000..0792ca7f590
--- /dev/null
+++ b/keyboards/mechwild/bb65/config.h
@@ -0,0 +1,10 @@
+// Copyright 2023 Kyle McCreery (@kylemccreery)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#define WS2812_PWM_DRIVER PWMD5
+#define WS2812_PWM_CHANNEL 2
+#define WS2812_PWM_PAL_MODE 2
+#define WS2812_DMA_STREAM STM32_DMA1_STREAM6
+#define WS2812_DMA_CHANNEL 6
diff --git a/keyboards/mechwild/bb65/f401/info.json b/keyboards/mechwild/bb65/f401/info.json
new file mode 100644
index 00000000000..797e9900595
--- /dev/null
+++ b/keyboards/mechwild/bb65/f401/info.json
@@ -0,0 +1,3 @@
+{
+    "development_board": "blackpill_f401"
+}
diff --git a/keyboards/mechwild/bb65/f401/rules.mk b/keyboards/mechwild/bb65/f401/rules.mk
new file mode 100644
index 00000000000..6e7633bfe01
--- /dev/null
+++ b/keyboards/mechwild/bb65/f401/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
diff --git a/keyboards/mechwild/bb65/f411/info.json b/keyboards/mechwild/bb65/f411/info.json
new file mode 100644
index 00000000000..a41c5f4dd14
--- /dev/null
+++ b/keyboards/mechwild/bb65/f411/info.json
@@ -0,0 +1,3 @@
+{
+    "development_board": "blackpill_f411"
+}
diff --git a/keyboards/mechwild/bb65/f411/rules.mk b/keyboards/mechwild/bb65/f411/rules.mk
new file mode 100644
index 00000000000..6e7633bfe01
--- /dev/null
+++ b/keyboards/mechwild/bb65/f411/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
diff --git a/keyboards/mechwild/bb65/halconf.h b/keyboards/mechwild/bb65/halconf.h
new file mode 100644
index 00000000000..d9ca9492565
--- /dev/null
+++ b/keyboards/mechwild/bb65/halconf.h
@@ -0,0 +1,8 @@
+// Copyright 2023 Kyle McCreery (@kylemccreery)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#define HAL_USE_PWM     TRUE
+
+#include_next <halconf.h>
diff --git a/keyboards/mechwild/bb65/info.json b/keyboards/mechwild/bb65/info.json
new file mode 100644
index 00000000000..a9d812d827f
--- /dev/null
+++ b/keyboards/mechwild/bb65/info.json
@@ -0,0 +1,192 @@
+{
+    "manufacturer": "MechWild",
+    "keyboard_name": "BB65",
+    "bootloader_instructions": "Hold down the BOOT button, then tap the NRST button on the BlackPill. Avoid touching the A11 and A12 pins.",
+    "diode_direction": "COL2ROW",
+    "encoder": {
+        "rotary": [
+            {"pin_a": "A3", "pin_b": "A2"}
+        ]
+    },
+    "features": {
+        "bootmagic": true,
+        "encoder": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgblight": true
+    },
+    "matrix_pins": {
+        "cols": ["B14", "B15", "A8", "A15", "B4", "B5", "B8", "B9", "B0"],
+        "rows": ["B13", "B3", "B10", "A7", "A6", "B12", "B1", "A5"]
+    },
+    "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
+        },
+        "brightness_steps": 8,
+        "led_count": 10,
+        "saturation_steps": 8
+    },
+    "url": "https://mechwild.com/product/bb65/",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x1712",
+        "vid": "0x6D77"
+    },
+    "ws2812": {
+        "driver": "pwm",
+        "pin": "A1"
+    },
+    "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": [5, 8], "x": 9, "y": 0},
+                {"matrix": [5, 7], "x": 10, "y": 0},
+                {"matrix": [5, 6], "x": 11, "y": 0},
+                {"matrix": [5, 5], "x": 12, "y": 0},
+                {"matrix": [5, 4], "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": [6, 8], "x": 9.5, "y": 1},
+                {"matrix": [6, 7], "x": 10.5, "y": 1},
+                {"matrix": [6, 6], "x": 11.5, "y": 1},
+                {"matrix": [6, 5], "x": 12.5, "y": 1},
+                {"matrix": [6, 4], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [7, 0], "x": 9.75, "y": 2},
+                {"matrix": [6, 0], "x": 10.75, "y": 2},
+                {"matrix": [6, 1], "x": 11.75, "y": 2},
+                {"matrix": [6, 2], "x": 12.75, "y": 2},
+                {"matrix": [6, 3], "x": 13.75, "y": 2, "w": 1.25},
+                {"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": [7, 8], "x": 9.25, "y": 3},
+                {"matrix": [7, 7], "x": 10.25, "y": 3},
+                {"matrix": [7, 6], "x": 11.25, "y": 3},
+                {"matrix": [7, 5], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [7, 4], "x": 15.5, "y": 3},
+                {"matrix": [7, 3], "x": 14.25, "y": 3.25},
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 3], "x": 10, "y": 4},
+                {"matrix": [4, 4], "x": 11, "y": 4},
+                {"matrix": [4, 6], "x": 12, "y": 4},
+                {"matrix": [4, 7], "x": 13.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 14.25, "y": 4.25},
+                {"matrix": [7, 2], "x": 15.25, "y": 4.25}
+            ]
+        },
+        "LAYOUT_ansi": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [5, 8], "x": 9, "y": 0},
+                {"matrix": [5, 7], "x": 10, "y": 0},
+                {"matrix": [5, 6], "x": 11, "y": 0},
+                {"matrix": [5, 5], "x": 12, "y": 0},
+                {"matrix": [5, 4], "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": [6, 8], "x": 9.5, "y": 1},
+                {"matrix": [6, 7], "x": 10.5, "y": 1},
+                {"matrix": [6, 6], "x": 11.5, "y": 1},
+                {"matrix": [6, 5], "x": 12.5, "y": 1},
+                {"matrix": [6, 4], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [7, 0], "x": 9.75, "y": 2},
+                {"matrix": [6, 0], "x": 10.75, "y": 2},
+                {"matrix": [6, 1], "x": 11.75, "y": 2},
+                {"matrix": [6, 3], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [7, 8], "x": 9.25, "y": 3},
+                {"matrix": [7, 7], "x": 10.25, "y": 3},
+                {"matrix": [7, 6], "x": 11.25, "y": 3},
+                {"matrix": [7, 5], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [7, 4], "x": 15.5, "y": 3},
+                {"matrix": [7, 3], "x": 14.25, "y": 3.25},
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 3], "x": 10, "y": 4},
+                {"matrix": [4, 4], "x": 11, "y": 4},
+                {"matrix": [4, 6], "x": 12, "y": 4},
+                {"matrix": [4, 7], "x": 13.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 14.25, "y": 4.25},
+                {"matrix": [7, 2], "x": 15.25, "y": 4.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/mechwild/bb65/keymaps/default/keymap.json b/keyboards/mechwild/bb65/keymaps/default/keymap.json
new file mode 100644
index 00000000000..31d55e5f95a
--- /dev/null
+++ b/keyboards/mechwild/bb65/keymaps/default/keymap.json
@@ -0,0 +1,31 @@
+{
+   "keyboard": "mechwild/bb65/f401",
+   "keymap": "default",
+   "version": 1,
+   "layout": "LAYOUT_all",
+   "layers": [
+      [
+         "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",
+         "MO(1)",               "KC_A",    "KC_S",    "KC_D",    "KC_F",    "KC_G",    "KC_H",    "KC_J",    "KC_K",    "KC_L",    "KC_SCLN", "KC_QUOT", "KC_TRNS", "KC_ENT",
+         "KC_LSFT",  "KC_TRNS", "KC_Z",    "KC_X",    "KC_C",    "KC_V",    "KC_B",    "KC_N",    "KC_M",    "KC_COMM", "KC_DOT",  "KC_SLSH", "KC_RSFT",            "KC_UP",   "RGB_TOG",
+         "RGB_RMOD", "KC_LGUI", "RGB_MOD",                                  "KC_SPC",             "KC_RALT", "KC_RGUI", "KC_RCTL",                       "KC_LEFT", "KC_DOWN", "KC_RGHT"
+      ],
+      [
+         "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_DEL",
+         "KC_TRNS",            "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS",
+         "KC_TRNS",            "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS",
+         "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS",            "KC_PGUP", "KC_TRNS",
+         "KC_TRNS", "KC_TRNS", "KC_TRNS",                                  "KC_TRNS",            "KC_TRNS", "KC_TRNS", "KC_TRNS",                       "KC_HOME", "KC_PGDN", "KC_END"
+      ]
+   ],
+   "config": {
+      "features": {
+         "encoder_map": true
+      }
+   },
+   "encoders": [
+      [{"ccw": "KC_VOLD", "cw": "KC_VOLU"}],
+      [{"ccw": "KC_TRNS", "cw": "KC_TRNS"}]
+   ]
+}
diff --git a/keyboards/mechwild/bb65/keymaps/via/keymap.json b/keyboards/mechwild/bb65/keymaps/via/keymap.json
new file mode 100644
index 00000000000..1e6ebcb717c
--- /dev/null
+++ b/keyboards/mechwild/bb65/keymaps/via/keymap.json
@@ -0,0 +1,32 @@
+{
+   "keyboard": "mechwild/bb65/f401",
+   "keymap": "via",
+   "version": 1,
+   "layout": "LAYOUT_all",
+   "layers": [
+      [
+         "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",
+         "MO(1)",               "KC_A",    "KC_S",    "KC_D",    "KC_F",    "KC_G",    "KC_H",    "KC_J",    "KC_K",    "KC_L",    "KC_SCLN", "KC_QUOT", "KC_TRNS", "KC_ENT",
+         "KC_LSFT",  "KC_TRNS", "KC_Z",    "KC_X",    "KC_C",    "KC_V",    "KC_B",    "KC_N",    "KC_M",    "KC_COMM", "KC_DOT",  "KC_SLSH", "KC_RSFT",            "KC_UP",   "RGB_TOG",
+         "RGB_RMOD", "KC_LGUI", "RGB_MOD",                                  "KC_SPC",             "KC_RALT", "KC_RGUI", "KC_RCTL",                       "KC_LEFT", "KC_DOWN", "KC_RGHT"
+      ],
+      [
+         "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_DEL",
+         "KC_TRNS",            "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS",
+         "KC_TRNS",            "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS",
+         "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS",            "KC_PGUP", "KC_TRNS",
+         "KC_TRNS", "KC_TRNS", "KC_TRNS",                                  "KC_TRNS",            "KC_TRNS", "KC_TRNS", "KC_TRNS",                       "KC_HOME", "KC_PGDN", "KC_END"
+      ]
+   ],
+   "config": {
+      "features": {
+         "encoder_map": true,
+         "via": true
+      }
+   },
+   "encoders": [
+      [{"ccw": "KC_VOLD", "cw": "KC_VOLU"}],
+      [{"ccw": "KC_TRNS", "cw": "KC_TRNS"}]
+   ]
+}
diff --git a/keyboards/mechwild/bb65/mcuconf.h b/keyboards/mechwild/bb65/mcuconf.h
new file mode 100644
index 00000000000..f9e61e737de
--- /dev/null
+++ b/keyboards/mechwild/bb65/mcuconf.h
@@ -0,0 +1,9 @@
+// Copyright 2023 Kyle McCreery (@kylemccreery)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include_next <mcuconf.h>
+
+#undef STM32_PWM_USE_TIM5
+#define STM32_PWM_USE_TIM5 TRUE
diff --git a/keyboards/mechwild/bb65/readme.md b/keyboards/mechwild/bb65/readme.md
new file mode 100644
index 00000000000..43416f90c1b
--- /dev/null
+++ b/keyboards/mechwild/bb65/readme.md
@@ -0,0 +1,23 @@
+# BB65
+
+![bb65](https://i.imgur.com/0PrDjuS.png)
+
+BB65 is a completely normal BlackPill-powered 65% DIY kit. It’s got all the letters, a number row, and arrow keys. Basic as it can be.
+
+The `f401` version is the standard for this kit, using an STM32F401 BlackPill. The `f411` version will not run on an STM32F401 BlackPill; if in doubt, use `f401`.
+
+* Keyboard Maintainer: [Kyle McCreery](https://github.com/kylemccreery)
+* Hardware Supported: BB65 v1.0
+* Hardware Availability: [BB65 on MechWild](https://mechwild.com/product/bb65/)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make mechwild/bb65/f401:default
+    make mechwild/bb65/f411:default
+
+Flashing example for this keyboard:
+
+    make mechwild/bb65/f401:default:flash
+    make mechwild/bb65/f411: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).
diff --git a/keyboards/mechwild/bbs/info.json b/keyboards/mechwild/bbs/keyboard.json
similarity index 100%
rename from keyboards/mechwild/bbs/info.json
rename to keyboards/mechwild/bbs/keyboard.json
diff --git a/keyboards/mechwild/bde/info.json b/keyboards/mechwild/bde/info.json
index e2389455633..918c792aa70 100644
--- a/keyboards/mechwild/bde/info.json
+++ b/keyboards/mechwild/bde/info.json
@@ -8,16 +8,6 @@
     "build": {
         "lto": true
     },
-    "features": {
-        "bootmagic": true,
-        "command": false,
-        "console": false,
-        "debug": false,
-        "extrakey": true,
-        "mousekey": true,
-        "rgblight": true,
-        "nkro": true
-    },
     "development_board": "promicro",
     "rgblight": {
         "sleep": true,
diff --git a/keyboards/mechwild/bde/lefty/keyboard.json b/keyboards/mechwild/bde/lefty/keyboard.json
index c9bcd051954..751a65b1a45 100644
--- a/keyboards/mechwild/bde/lefty/keyboard.json
+++ b/keyboards/mechwild/bde/lefty/keyboard.json
@@ -4,6 +4,13 @@
         "pid": "0x1701",
         "device_version": "2.0.3"
     },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "nkro": true,
+        "rgblight": true
+    },
     "matrix_pins": {
         "rows": ["D1", "D7", "D3"],
         "cols": ["F7", "B1", "B6", "B2", "B3", "F6", "F5", "F4", "D0", "D4", "C6", "E6", "B5", "B4"]
diff --git a/keyboards/mechwild/bde/rev2/info.json b/keyboards/mechwild/bde/rev2/info.json
deleted file mode 100644
index b8b7fc39d06..00000000000
--- a/keyboards/mechwild/bde/rev2/info.json
+++ /dev/null
@@ -1,79 +0,0 @@
-{
-    "keyboard_name": "BDE Rev2",
-    "usb": {
-        "pid": "0x170A",
-        "device_version": "1.0.1"
-    },
-    "encoder": {
-        "rotary": [
-            {"pin_a": "D2", "pin_b": "D3"}
-        ]
-    },
-    "matrix_pins": {
-        "rows": ["C6", "D7", "B4", "D4", "E6", "B2"],
-        "cols": ["B3", "B1", "F7", "F6", "F5", "F4", "B5"]
-    },
-    "diode_direction": "COL2ROW",
-    "rgblight": {
-        "led_count": 8,
-        "animations": {
-            "rainbow_swirl": true
-        },
-        "hue_steps": 8,
-        "saturation_steps": 8,
-        "brightness_steps": 8
-    },
-    "ws2812": {
-        "pin": "B6"
-    },
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 0], "label": "Q", "x": 0, "y": 0},
-                {"matrix": [0, 1], "label": "W", "x": 1, "y": 0},
-                {"matrix": [0, 2], "label": "E", "x": 2, "y": 0},
-                {"matrix": [0, 3], "label": "R", "x": 3, "y": 0},
-                {"matrix": [0, 4], "label": "T", "x": 4, "y": 0},
-                {"matrix": [0, 5], "label": "Y", "x": 5, "y": 0},
-                {"matrix": [0, 6], "label": "U", "x": 6, "y": 0},
-                {"matrix": [3, 6], "label": "I", "x": 7, "y": 0},
-                {"matrix": [3, 5], "label": "O", "x": 8, "y": 0},
-                {"matrix": [3, 4], "label": "P", "x": 9, "y": 0},
-                {"matrix": [3, 3], "label": "7", "x": 10, "y": 0},
-                {"matrix": [3, 2], "label": "8", "x": 11, "y": 0},
-                {"matrix": [3, 1], "label": "9", "x": 12, "y": 0},
-                {"matrix": [3, 0], "label": "Mute", "x": 13, "y": 0},
-
-                {"matrix": [1, 0], "label": "A", "x": 0, "y": 1},
-                {"matrix": [1, 1], "label": "S", "x": 1, "y": 1},
-                {"matrix": [1, 2], "label": "D", "x": 2, "y": 1},
-                {"matrix": [1, 3], "label": "F", "x": 3, "y": 1},
-                {"matrix": [1, 4], "label": "G", "x": 4, "y": 1},
-                {"matrix": [1, 5], "label": "H", "x": 5, "y": 1},
-                {"matrix": [1, 6], "label": "J", "x": 6, "y": 1},
-                {"matrix": [4, 6], "label": "K", "x": 7, "y": 1},
-                {"matrix": [4, 5], "label": "L", "x": 8, "y": 1},
-                {"matrix": [4, 4], "label": "Esc", "x": 9, "y": 1},
-                {"matrix": [4, 3], "label": "4", "x": 10, "y": 1},
-                {"matrix": [4, 2], "label": "5", "x": 11, "y": 1},
-                {"matrix": [4, 1], "label": "6", "x": 12, "y": 1},
-                {"matrix": [4, 0], "label": "0", "x": 13, "y": 1},
-
-                {"matrix": [2, 0], "label": "Z", "x": 0, "y": 2},
-                {"matrix": [2, 1], "label": "X", "x": 1, "y": 2},
-                {"matrix": [2, 2], "label": "C", "x": 2, "y": 2},
-                {"matrix": [2, 3], "label": "V", "x": 3, "y": 2},
-                {"matrix": [2, 4], "label": "Back", "x": 4, "y": 2},
-                {"matrix": [2, 5], "label": "Space", "x": 5, "y": 2},
-                {"matrix": [2, 6], "label": "B", "x": 6, "y": 2},
-                {"matrix": [5, 6], "label": "N", "x": 7, "y": 2},
-                {"matrix": [5, 5], "label": "M", "x": 8, "y": 2},
-                {"matrix": [5, 4], "label": "Enter", "x": 9, "y": 2},
-                {"matrix": [5, 3], "label": "1", "x": 10, "y": 2},
-                {"matrix": [5, 2], "label": "2", "x": 11, "y": 2},
-                {"matrix": [5, 1], "label": "3", "x": 12, "y": 2},
-                {"matrix": [5, 0], "label": "EQL", "x": 13, "y": 2}
-            ]
-        }
-    }
-}
diff --git a/keyboards/mechwild/bde/rev2/keyboard.json b/keyboards/mechwild/bde/rev2/keyboard.json
new file mode 100644
index 00000000000..beb2624f3e3
--- /dev/null
+++ b/keyboards/mechwild/bde/rev2/keyboard.json
@@ -0,0 +1,88 @@
+{
+    "keyboard_name": "BDE Rev2",
+    "usb": {
+        "pid": "0x170A",
+        "device_version": "1.0.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "nkro": true,
+        "rgblight": true,
+        "encoder": true,
+        "oled": true
+    },
+    "encoder": {
+        "rotary": [
+            {"pin_a": "D2", "pin_b": "D3"}
+        ]
+    },
+    "matrix_pins": {
+        "rows": ["C6", "D7", "B4", "D4", "E6", "B2"],
+        "cols": ["B3", "B1", "F7", "F6", "F5", "F4", "B5"]
+    },
+    "diode_direction": "COL2ROW",
+    "rgblight": {
+        "led_count": 8,
+        "animations": {
+            "rainbow_swirl": true
+        },
+        "hue_steps": 8,
+        "saturation_steps": 8,
+        "brightness_steps": 8
+    },
+    "ws2812": {
+        "pin": "B6"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "label": "Q", "x": 0, "y": 0},
+                {"matrix": [0, 1], "label": "W", "x": 1, "y": 0},
+                {"matrix": [0, 2], "label": "E", "x": 2, "y": 0},
+                {"matrix": [0, 3], "label": "R", "x": 3, "y": 0},
+                {"matrix": [0, 4], "label": "T", "x": 4, "y": 0},
+                {"matrix": [0, 5], "label": "Y", "x": 5, "y": 0},
+                {"matrix": [0, 6], "label": "U", "x": 6, "y": 0},
+                {"matrix": [3, 6], "label": "I", "x": 7, "y": 0},
+                {"matrix": [3, 5], "label": "O", "x": 8, "y": 0},
+                {"matrix": [3, 4], "label": "P", "x": 9, "y": 0},
+                {"matrix": [3, 3], "label": "7", "x": 10, "y": 0},
+                {"matrix": [3, 2], "label": "8", "x": 11, "y": 0},
+                {"matrix": [3, 1], "label": "9", "x": 12, "y": 0},
+                {"matrix": [3, 0], "label": "Mute", "x": 13, "y": 0},
+
+                {"matrix": [1, 0], "label": "A", "x": 0, "y": 1},
+                {"matrix": [1, 1], "label": "S", "x": 1, "y": 1},
+                {"matrix": [1, 2], "label": "D", "x": 2, "y": 1},
+                {"matrix": [1, 3], "label": "F", "x": 3, "y": 1},
+                {"matrix": [1, 4], "label": "G", "x": 4, "y": 1},
+                {"matrix": [1, 5], "label": "H", "x": 5, "y": 1},
+                {"matrix": [1, 6], "label": "J", "x": 6, "y": 1},
+                {"matrix": [4, 6], "label": "K", "x": 7, "y": 1},
+                {"matrix": [4, 5], "label": "L", "x": 8, "y": 1},
+                {"matrix": [4, 4], "label": "Esc", "x": 9, "y": 1},
+                {"matrix": [4, 3], "label": "4", "x": 10, "y": 1},
+                {"matrix": [4, 2], "label": "5", "x": 11, "y": 1},
+                {"matrix": [4, 1], "label": "6", "x": 12, "y": 1},
+                {"matrix": [4, 0], "label": "0", "x": 13, "y": 1},
+
+                {"matrix": [2, 0], "label": "Z", "x": 0, "y": 2},
+                {"matrix": [2, 1], "label": "X", "x": 1, "y": 2},
+                {"matrix": [2, 2], "label": "C", "x": 2, "y": 2},
+                {"matrix": [2, 3], "label": "V", "x": 3, "y": 2},
+                {"matrix": [2, 4], "label": "Back", "x": 4, "y": 2},
+                {"matrix": [2, 5], "label": "Space", "x": 5, "y": 2},
+                {"matrix": [2, 6], "label": "B", "x": 6, "y": 2},
+                {"matrix": [5, 6], "label": "N", "x": 7, "y": 2},
+                {"matrix": [5, 5], "label": "M", "x": 8, "y": 2},
+                {"matrix": [5, 4], "label": "Enter", "x": 9, "y": 2},
+                {"matrix": [5, 3], "label": "1", "x": 10, "y": 2},
+                {"matrix": [5, 2], "label": "2", "x": 11, "y": 2},
+                {"matrix": [5, 1], "label": "3", "x": 12, "y": 2},
+                {"matrix": [5, 0], "label": "EQL", "x": 13, "y": 2}
+            ]
+        }
+    }
+}
diff --git a/keyboards/mechwild/bde/rev2/rules.mk b/keyboards/mechwild/bde/rev2/rules.mk
deleted file mode 100644
index bade0749fc9..00000000000
--- a/keyboards/mechwild/bde/rev2/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-ENCODER_ENABLE = yes        # Enable encoder
-OLED_ENABLE = yes           # Enable OLED Screen
diff --git a/keyboards/mechwild/bde/righty/keyboard.json b/keyboards/mechwild/bde/righty/keyboard.json
index 3f254da2861..54a7a4459f0 100644
--- a/keyboards/mechwild/bde/righty/keyboard.json
+++ b/keyboards/mechwild/bde/righty/keyboard.json
@@ -4,6 +4,13 @@
         "pid": "0x1702",
         "device_version": "2.0.3"
     },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "nkro": true,
+        "rgblight": true
+    },
     "matrix_pins": {
         "rows": ["D1", "D7", "D3"],
         "cols": ["B4", "B5", "E6", "C6", "D4", "D0", "F4", "F5", "F6", "B3", "B2", "B6", "B1", "F7"]
diff --git a/keyboards/mechwild/clunker/info.json b/keyboards/mechwild/clunker/info.json
deleted file mode 100644
index 1a4114f8f29..00000000000
--- a/keyboards/mechwild/clunker/info.json
+++ /dev/null
@@ -1,614 +0,0 @@
-{
-    "manufacturer": "MechWild",
-    "keyboard_name": "Clunker",
-    "maintainer": "kylemccreery",
-    "development_board": "promicro",
-    "diode_direction": "COL2ROW",
-    "encoder": {
-        "rotary": [
-            {"pin_a": "D2", "pin_b": "D3"}
-        ]
-    },
-    "features": {
-        "bootmagic": true,
-        "encoder": true,
-        "extrakey": true,
-        "haptic": true,
-        "mousekey": true,
-        "nkro": true
-    },
-    "matrix_pins": {
-        "cols": ["D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5"],
-        "rows": ["F5", "F6", "B3", "F7", "B2", "B1", "B6"]
-    },
-    "url": "https://mechwild.com/product/clunker/",
-    "usb": {
-        "device_version": "1.3.0",
-        "pid": "0x1711",
-        "vid": "0x6D77"
-    },
-    "layout_aliases": {
-        "LAYOUT": "LAYOUT_all"
-    },
-    "layouts": {
-        "LAYOUT_625u": {
-            "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": [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": [5, 7], "x": 8.5, "y": 1},
-                {"matrix": [5, 6], "x": 9.5, "y": 1},
-                {"matrix": [5, 5], "x": 10.5, "y": 1},
-                {"matrix": [5, 4], "x": 11.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": [5, 1], "x": 8.75, "y": 2},
-                {"matrix": [5, 2], "x": 9.75, "y": 2},
-                {"matrix": [5, 3], "x": 10.75, "y": 2, "w": 1.75},
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 2], "x": 2.25, "y": 3},
-                {"matrix": [3, 3], "x": 3.25, "y": 3},
-                {"matrix": [3, 4], "x": 4.25, "y": 3},
-                {"matrix": [3, 5], "x": 5.25, "y": 3},
-                {"matrix": [3, 6], "x": 6.25, "y": 3},
-                {"matrix": [3, 7], "x": 7.25, "y": 3},
-                {"matrix": [6, 7], "x": 8.25, "y": 3},
-                {"matrix": [6, 6], "x": 9.25, "y": 3},
-                {"matrix": [6, 5], "x": 10.25, "y": 3, "w": 2.25},
-                {"matrix": [4, 0], "x": 0, "y": 4},
-                {"matrix": [4, 1], "x": 1, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.25, "y": 4},
-                {"matrix": [4, 3], "x": 3.25, "y": 4, "w": 6.25},
-                {"matrix": [4, 5], "x": 9.5, "y": 4},
-                {"matrix": [4, 6], "x": 10.5, "y": 4},
-                {"matrix": [4, 7], "x": 11.5, "y": 4}
-            ]
-        },
-        "LAYOUT_7u": {
-            "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": [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": [5, 7], "x": 8.5, "y": 1},
-                {"matrix": [5, 6], "x": 9.5, "y": 1},
-                {"matrix": [5, 5], "x": 10.5, "y": 1},
-                {"matrix": [5, 4], "x": 11.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": [5, 1], "x": 8.75, "y": 2},
-                {"matrix": [5, 2], "x": 9.75, "y": 2},
-                {"matrix": [5, 3], "x": 10.75, "y": 2, "w": 1.75},
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 2], "x": 2.25, "y": 3},
-                {"matrix": [3, 3], "x": 3.25, "y": 3},
-                {"matrix": [3, 4], "x": 4.25, "y": 3},
-                {"matrix": [3, 5], "x": 5.25, "y": 3},
-                {"matrix": [3, 6], "x": 6.25, "y": 3},
-                {"matrix": [3, 7], "x": 7.25, "y": 3},
-                {"matrix": [6, 7], "x": 8.25, "y": 3},
-                {"matrix": [6, 6], "x": 9.25, "y": 3},
-                {"matrix": [6, 5], "x": 10.25, "y": 3, "w": 2.25},
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.5},
-                {"matrix": [4, 3], "x": 2.75, "y": 4, "w": 7},
-                {"matrix": [4, 6], "x": 9.75, "y": 4, "w": 1.5},
-                {"matrix": [4, 7], "x": 11.25, "y": 4, "w": 1.25}
-            ]
-        },
-        "LAYOUT_split_lshift_625u": {
-            "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": [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": [5, 7], "x": 8.5, "y": 1},
-                {"matrix": [5, 6], "x": 9.5, "y": 1},
-                {"matrix": [5, 5], "x": 10.5, "y": 1},
-                {"matrix": [5, 4], "x": 11.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": [5, 1], "x": 8.75, "y": 2},
-                {"matrix": [5, 2], "x": 9.75, "y": 2},
-                {"matrix": [5, 3], "x": 10.75, "y": 2, "w": 1.75},
-                {"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": [6, 7], "x": 8.25, "y": 3},
-                {"matrix": [6, 6], "x": 9.25, "y": 3},
-                {"matrix": [6, 5], "x": 10.25, "y": 3, "w": 2.25},
-                {"matrix": [4, 0], "x": 0, "y": 4},
-                {"matrix": [4, 1], "x": 1, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.25, "y": 4},
-                {"matrix": [4, 3], "x": 3.25, "y": 4, "w": 6.25},
-                {"matrix": [4, 5], "x": 9.5, "y": 4},
-                {"matrix": [4, 6], "x": 10.5, "y": 4},
-                {"matrix": [4, 7], "x": 11.5, "y": 4}
-            ]
-        },
-        "LAYOUT_split_lshift_7u": {
-            "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": [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": [5, 7], "x": 8.5, "y": 1},
-                {"matrix": [5, 6], "x": 9.5, "y": 1},
-                {"matrix": [5, 5], "x": 10.5, "y": 1},
-                {"matrix": [5, 4], "x": 11.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": [5, 1], "x": 8.75, "y": 2},
-                {"matrix": [5, 2], "x": 9.75, "y": 2},
-                {"matrix": [5, 3], "x": 10.75, "y": 2, "w": 1.75},
-                {"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": [6, 7], "x": 8.25, "y": 3},
-                {"matrix": [6, 6], "x": 9.25, "y": 3},
-                {"matrix": [6, 5], "x": 10.25, "y": 3, "w": 2.25},
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.5},
-                {"matrix": [4, 3], "x": 2.75, "y": 4, "w": 7},
-                {"matrix": [4, 6], "x": 9.75, "y": 4, "w": 1.5},
-                {"matrix": [4, 7], "x": 11.25, "y": 4, "w": 1.25}
-            ]
-        },
-        "LAYOUT_split_lshift_split_rshift_625u": {
-            "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": [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": [5, 7], "x": 8.5, "y": 1},
-                {"matrix": [5, 6], "x": 9.5, "y": 1},
-                {"matrix": [5, 5], "x": 10.5, "y": 1},
-                {"matrix": [5, 4], "x": 11.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": [5, 1], "x": 8.75, "y": 2},
-                {"matrix": [5, 2], "x": 9.75, "y": 2},
-                {"matrix": [5, 3], "x": 10.75, "y": 2, "w": 1.75},
-                {"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": [6, 7], "x": 8.25, "y": 3},
-                {"matrix": [6, 6], "x": 9.25, "y": 3},
-                {"matrix": [6, 5], "x": 10.25, "y": 3},
-                {"matrix": [6, 4], "x": 11.25, "y": 3, "w": 1.25},
-                {"matrix": [4, 0], "x": 0, "y": 4},
-                {"matrix": [4, 1], "x": 1, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.25, "y": 4},
-                {"matrix": [4, 3], "x": 3.25, "y": 4, "w": 6.25},
-                {"matrix": [4, 5], "x": 9.5, "y": 4},
-                {"matrix": [4, 6], "x": 10.5, "y": 4},
-                {"matrix": [4, 7], "x": 11.5, "y": 4}
-            ]
-        },
-        "LAYOUT_split_lshift_split_rshift_7u": {
-            "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": [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": [5, 7], "x": 8.5, "y": 1},
-                {"matrix": [5, 6], "x": 9.5, "y": 1},
-                {"matrix": [5, 5], "x": 10.5, "y": 1},
-                {"matrix": [5, 4], "x": 11.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": [5, 1], "x": 8.75, "y": 2},
-                {"matrix": [5, 2], "x": 9.75, "y": 2},
-                {"matrix": [5, 3], "x": 10.75, "y": 2, "w": 1.75},
-                {"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": [6, 7], "x": 8.25, "y": 3},
-                {"matrix": [6, 6], "x": 9.25, "y": 3},
-                {"matrix": [6, 5], "x": 10.25, "y": 3},
-                {"matrix": [6, 4], "x": 11.25, "y": 3, "w": 1.25},
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.5},
-                {"matrix": [4, 3], "x": 2.75, "y": 4, "w": 7},
-                {"matrix": [4, 6], "x": 9.75, "y": 4, "w": 1.5},
-                {"matrix": [4, 7], "x": 11.25, "y": 4, "w": 1.25}
-            ]
-        },
-        "LAYOUT_split_rshift_625u": {
-            "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": [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": [5, 7], "x": 8.5, "y": 1},
-                {"matrix": [5, 6], "x": 9.5, "y": 1},
-                {"matrix": [5, 5], "x": 10.5, "y": 1},
-                {"matrix": [5, 4], "x": 11.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": [5, 1], "x": 8.75, "y": 2},
-                {"matrix": [5, 2], "x": 9.75, "y": 2},
-                {"matrix": [5, 3], "x": 10.75, "y": 2, "w": 1.75},
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 2], "x": 2.25, "y": 3},
-                {"matrix": [3, 3], "x": 3.25, "y": 3},
-                {"matrix": [3, 4], "x": 4.25, "y": 3},
-                {"matrix": [3, 5], "x": 5.25, "y": 3},
-                {"matrix": [3, 6], "x": 6.25, "y": 3},
-                {"matrix": [3, 7], "x": 7.25, "y": 3},
-                {"matrix": [6, 7], "x": 8.25, "y": 3},
-                {"matrix": [6, 6], "x": 9.25, "y": 3},
-                {"matrix": [6, 5], "x": 10.25, "y": 3},
-                {"matrix": [6, 4], "x": 11.25, "y": 3, "w": 1.25},
-                {"matrix": [4, 0], "x": 0, "y": 4},
-                {"matrix": [4, 1], "x": 1, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.25, "y": 4},
-                {"matrix": [4, 3], "x": 3.25, "y": 4, "w": 6.25},
-                {"matrix": [4, 5], "x": 9.5, "y": 4},
-                {"matrix": [4, 6], "x": 10.5, "y": 4},
-                {"matrix": [4, 7], "x": 11.5, "y": 4}
-            ]
-        },
-        "LAYOUT_split_rshift_7u": {
-            "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": [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": [5, 7], "x": 8.5, "y": 1},
-                {"matrix": [5, 6], "x": 9.5, "y": 1},
-                {"matrix": [5, 5], "x": 10.5, "y": 1},
-                {"matrix": [5, 4], "x": 11.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": [5, 1], "x": 8.75, "y": 2},
-                {"matrix": [5, 2], "x": 9.75, "y": 2},
-                {"matrix": [5, 3], "x": 10.75, "y": 2, "w": 1.75},
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 2], "x": 2.25, "y": 3},
-                {"matrix": [3, 3], "x": 3.25, "y": 3},
-                {"matrix": [3, 4], "x": 4.25, "y": 3},
-                {"matrix": [3, 5], "x": 5.25, "y": 3},
-                {"matrix": [3, 6], "x": 6.25, "y": 3},
-                {"matrix": [3, 7], "x": 7.25, "y": 3},
-                {"matrix": [6, 7], "x": 8.25, "y": 3},
-                {"matrix": [6, 6], "x": 9.25, "y": 3},
-                {"matrix": [6, 5], "x": 10.25, "y": 3},
-                {"matrix": [6, 4], "x": 11.25, "y": 3, "w": 1.25},
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.5},
-                {"matrix": [4, 3], "x": 2.75, "y": 4, "w": 7},
-                {"matrix": [4, 6], "x": 9.75, "y": 4, "w": 1.5},
-                {"matrix": [4, 7], "x": 11.25, "y": 4, "w": 1.25}
-            ]
-        },
-        "LAYOUT_split_lshift_split_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": [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": [5, 7], "x": 8.5, "y": 1},
-                {"matrix": [5, 6], "x": 9.5, "y": 1},
-                {"matrix": [5, 5], "x": 10.5, "y": 1},
-                {"matrix": [5, 4], "x": 11.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": [5, 1], "x": 8.75, "y": 2},
-                {"matrix": [5, 2], "x": 9.75, "y": 2},
-                {"matrix": [5, 3], "x": 10.75, "y": 2, "w": 1.75},
-                {"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": [6, 7], "x": 8.25, "y": 3},
-                {"matrix": [6, 6], "x": 9.25, "y": 3},
-                {"matrix": [6, 5], "x": 10.25, "y": 3, "w": 2.25},
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 2.75},
-                {"matrix": [4, 4], "x": 6.5, "y": 4, "w": 2.25},
-                {"matrix": [4, 5], "x": 8.75, "y": 4, "w": 1.25},
-                {"matrix": [4, 6], "x": 10, "y": 4, "w": 1.25},
-                {"matrix": [4, 7], "x": 11.25, "y": 4, "w": 1.25}
-            ]
-        },
-        "LAYOUT_split_rshift_split_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": [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": [5, 7], "x": 8.5, "y": 1},
-                {"matrix": [5, 6], "x": 9.5, "y": 1},
-                {"matrix": [5, 5], "x": 10.5, "y": 1},
-                {"matrix": [5, 4], "x": 11.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": [5, 1], "x": 8.75, "y": 2},
-                {"matrix": [5, 2], "x": 9.75, "y": 2},
-                {"matrix": [5, 3], "x": 10.75, "y": 2, "w": 1.75},
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 2], "x": 2.25, "y": 3},
-                {"matrix": [3, 3], "x": 3.25, "y": 3},
-                {"matrix": [3, 4], "x": 4.25, "y": 3},
-                {"matrix": [3, 5], "x": 5.25, "y": 3},
-                {"matrix": [3, 6], "x": 6.25, "y": 3},
-                {"matrix": [3, 7], "x": 7.25, "y": 3},
-                {"matrix": [6, 7], "x": 8.25, "y": 3},
-                {"matrix": [6, 6], "x": 9.25, "y": 3},
-                {"matrix": [6, 5], "x": 10.25, "y": 3},
-                {"matrix": [6, 4], "x": 11.25, "y": 3, "w": 1.25},
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 2.75},
-                {"matrix": [4, 4], "x": 6.5, "y": 4, "w": 2.25},
-                {"matrix": [4, 5], "x": 8.75, "y": 4, "w": 1.25},
-                {"matrix": [4, 6], "x": 10, "y": 4, "w": 1.25},
-                {"matrix": [4, 7], "x": 11.25, "y": 4, "w": 1.25}
-            ]
-        },
-        "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": [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": [5, 7], "x": 8.5, "y": 1},
-                {"matrix": [5, 6], "x": 9.5, "y": 1},
-                {"matrix": [5, 5], "x": 10.5, "y": 1},
-                {"matrix": [5, 4], "x": 11.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": [5, 1], "x": 8.75, "y": 2},
-                {"matrix": [5, 2], "x": 9.75, "y": 2},
-                {"matrix": [5, 3], "x": 10.75, "y": 2, "w": 1.75},
-                {"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": [6, 7], "x": 8.25, "y": 3},
-                {"matrix": [6, 6], "x": 9.25, "y": 3},
-                {"matrix": [6, 5], "x": 10.25, "y": 3},
-                {"matrix": [6, 4], "x": 11.25, "y": 3, "w": 1.25},
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 2.75},
-                {"matrix": [4, 4], "x": 6.5, "y": 4, "w": 2.25},
-                {"matrix": [4, 5], "x": 8.75, "y": 4, "w": 1.25},
-                {"matrix": [4, 6], "x": 10, "y": 4, "w": 1.25},
-                {"matrix": [4, 7], "x": 11.25, "y": 4, "w": 1.25}
-            ]
-        }
-    }
-}
diff --git a/keyboards/mechwild/clunker/keyboard.json b/keyboards/mechwild/clunker/keyboard.json
new file mode 100644
index 00000000000..acf9628f8e1
--- /dev/null
+++ b/keyboards/mechwild/clunker/keyboard.json
@@ -0,0 +1,617 @@
+{
+    "manufacturer": "MechWild",
+    "keyboard_name": "Clunker",
+    "maintainer": "kylemccreery",
+    "development_board": "promicro",
+    "diode_direction": "COL2ROW",
+    "encoder": {
+        "rotary": [
+            {"pin_a": "D2", "pin_b": "D3"}
+        ]
+    },
+    "features": {
+        "bootmagic": true,
+        "encoder": true,
+        "extrakey": true,
+        "haptic": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "haptic": {
+        "driver": "solenoid"
+    },
+    "matrix_pins": {
+        "cols": ["D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5"],
+        "rows": ["F5", "F6", "B3", "F7", "B2", "B1", "B6"]
+    },
+    "url": "https://mechwild.com/product/clunker/",
+    "usb": {
+        "device_version": "1.3.0",
+        "pid": "0x1711",
+        "vid": "0x6D77"
+    },
+    "layout_aliases": {
+        "LAYOUT": "LAYOUT_all"
+    },
+    "layouts": {
+        "LAYOUT_625u": {
+            "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": [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": [5, 7], "x": 8.5, "y": 1},
+                {"matrix": [5, 6], "x": 9.5, "y": 1},
+                {"matrix": [5, 5], "x": 10.5, "y": 1},
+                {"matrix": [5, 4], "x": 11.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": [5, 1], "x": 8.75, "y": 2},
+                {"matrix": [5, 2], "x": 9.75, "y": 2},
+                {"matrix": [5, 3], "x": 10.75, "y": 2, "w": 1.75},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [6, 7], "x": 8.25, "y": 3},
+                {"matrix": [6, 6], "x": 9.25, "y": 3},
+                {"matrix": [6, 5], "x": 10.25, "y": 3, "w": 2.25},
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4},
+                {"matrix": [4, 3], "x": 3.25, "y": 4, "w": 6.25},
+                {"matrix": [4, 5], "x": 9.5, "y": 4},
+                {"matrix": [4, 6], "x": 10.5, "y": 4},
+                {"matrix": [4, 7], "x": 11.5, "y": 4}
+            ]
+        },
+        "LAYOUT_7u": {
+            "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": [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": [5, 7], "x": 8.5, "y": 1},
+                {"matrix": [5, 6], "x": 9.5, "y": 1},
+                {"matrix": [5, 5], "x": 10.5, "y": 1},
+                {"matrix": [5, 4], "x": 11.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": [5, 1], "x": 8.75, "y": 2},
+                {"matrix": [5, 2], "x": 9.75, "y": 2},
+                {"matrix": [5, 3], "x": 10.75, "y": 2, "w": 1.75},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [6, 7], "x": 8.25, "y": 3},
+                {"matrix": [6, 6], "x": 9.25, "y": 3},
+                {"matrix": [6, 5], "x": 10.25, "y": 3, "w": 2.25},
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 3], "x": 2.75, "y": 4, "w": 7},
+                {"matrix": [4, 6], "x": 9.75, "y": 4, "w": 1.5},
+                {"matrix": [4, 7], "x": 11.25, "y": 4, "w": 1.25}
+            ]
+        },
+        "LAYOUT_split_lshift_625u": {
+            "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": [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": [5, 7], "x": 8.5, "y": 1},
+                {"matrix": [5, 6], "x": 9.5, "y": 1},
+                {"matrix": [5, 5], "x": 10.5, "y": 1},
+                {"matrix": [5, 4], "x": 11.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": [5, 1], "x": 8.75, "y": 2},
+                {"matrix": [5, 2], "x": 9.75, "y": 2},
+                {"matrix": [5, 3], "x": 10.75, "y": 2, "w": 1.75},
+                {"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": [6, 7], "x": 8.25, "y": 3},
+                {"matrix": [6, 6], "x": 9.25, "y": 3},
+                {"matrix": [6, 5], "x": 10.25, "y": 3, "w": 2.25},
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4},
+                {"matrix": [4, 3], "x": 3.25, "y": 4, "w": 6.25},
+                {"matrix": [4, 5], "x": 9.5, "y": 4},
+                {"matrix": [4, 6], "x": 10.5, "y": 4},
+                {"matrix": [4, 7], "x": 11.5, "y": 4}
+            ]
+        },
+        "LAYOUT_split_lshift_7u": {
+            "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": [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": [5, 7], "x": 8.5, "y": 1},
+                {"matrix": [5, 6], "x": 9.5, "y": 1},
+                {"matrix": [5, 5], "x": 10.5, "y": 1},
+                {"matrix": [5, 4], "x": 11.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": [5, 1], "x": 8.75, "y": 2},
+                {"matrix": [5, 2], "x": 9.75, "y": 2},
+                {"matrix": [5, 3], "x": 10.75, "y": 2, "w": 1.75},
+                {"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": [6, 7], "x": 8.25, "y": 3},
+                {"matrix": [6, 6], "x": 9.25, "y": 3},
+                {"matrix": [6, 5], "x": 10.25, "y": 3, "w": 2.25},
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 3], "x": 2.75, "y": 4, "w": 7},
+                {"matrix": [4, 6], "x": 9.75, "y": 4, "w": 1.5},
+                {"matrix": [4, 7], "x": 11.25, "y": 4, "w": 1.25}
+            ]
+        },
+        "LAYOUT_split_lshift_split_rshift_625u": {
+            "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": [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": [5, 7], "x": 8.5, "y": 1},
+                {"matrix": [5, 6], "x": 9.5, "y": 1},
+                {"matrix": [5, 5], "x": 10.5, "y": 1},
+                {"matrix": [5, 4], "x": 11.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": [5, 1], "x": 8.75, "y": 2},
+                {"matrix": [5, 2], "x": 9.75, "y": 2},
+                {"matrix": [5, 3], "x": 10.75, "y": 2, "w": 1.75},
+                {"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": [6, 7], "x": 8.25, "y": 3},
+                {"matrix": [6, 6], "x": 9.25, "y": 3},
+                {"matrix": [6, 5], "x": 10.25, "y": 3},
+                {"matrix": [6, 4], "x": 11.25, "y": 3, "w": 1.25},
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4},
+                {"matrix": [4, 3], "x": 3.25, "y": 4, "w": 6.25},
+                {"matrix": [4, 5], "x": 9.5, "y": 4},
+                {"matrix": [4, 6], "x": 10.5, "y": 4},
+                {"matrix": [4, 7], "x": 11.5, "y": 4}
+            ]
+        },
+        "LAYOUT_split_lshift_split_rshift_7u": {
+            "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": [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": [5, 7], "x": 8.5, "y": 1},
+                {"matrix": [5, 6], "x": 9.5, "y": 1},
+                {"matrix": [5, 5], "x": 10.5, "y": 1},
+                {"matrix": [5, 4], "x": 11.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": [5, 1], "x": 8.75, "y": 2},
+                {"matrix": [5, 2], "x": 9.75, "y": 2},
+                {"matrix": [5, 3], "x": 10.75, "y": 2, "w": 1.75},
+                {"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": [6, 7], "x": 8.25, "y": 3},
+                {"matrix": [6, 6], "x": 9.25, "y": 3},
+                {"matrix": [6, 5], "x": 10.25, "y": 3},
+                {"matrix": [6, 4], "x": 11.25, "y": 3, "w": 1.25},
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 3], "x": 2.75, "y": 4, "w": 7},
+                {"matrix": [4, 6], "x": 9.75, "y": 4, "w": 1.5},
+                {"matrix": [4, 7], "x": 11.25, "y": 4, "w": 1.25}
+            ]
+        },
+        "LAYOUT_split_rshift_625u": {
+            "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": [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": [5, 7], "x": 8.5, "y": 1},
+                {"matrix": [5, 6], "x": 9.5, "y": 1},
+                {"matrix": [5, 5], "x": 10.5, "y": 1},
+                {"matrix": [5, 4], "x": 11.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": [5, 1], "x": 8.75, "y": 2},
+                {"matrix": [5, 2], "x": 9.75, "y": 2},
+                {"matrix": [5, 3], "x": 10.75, "y": 2, "w": 1.75},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [6, 7], "x": 8.25, "y": 3},
+                {"matrix": [6, 6], "x": 9.25, "y": 3},
+                {"matrix": [6, 5], "x": 10.25, "y": 3},
+                {"matrix": [6, 4], "x": 11.25, "y": 3, "w": 1.25},
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4},
+                {"matrix": [4, 3], "x": 3.25, "y": 4, "w": 6.25},
+                {"matrix": [4, 5], "x": 9.5, "y": 4},
+                {"matrix": [4, 6], "x": 10.5, "y": 4},
+                {"matrix": [4, 7], "x": 11.5, "y": 4}
+            ]
+        },
+        "LAYOUT_split_rshift_7u": {
+            "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": [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": [5, 7], "x": 8.5, "y": 1},
+                {"matrix": [5, 6], "x": 9.5, "y": 1},
+                {"matrix": [5, 5], "x": 10.5, "y": 1},
+                {"matrix": [5, 4], "x": 11.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": [5, 1], "x": 8.75, "y": 2},
+                {"matrix": [5, 2], "x": 9.75, "y": 2},
+                {"matrix": [5, 3], "x": 10.75, "y": 2, "w": 1.75},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [6, 7], "x": 8.25, "y": 3},
+                {"matrix": [6, 6], "x": 9.25, "y": 3},
+                {"matrix": [6, 5], "x": 10.25, "y": 3},
+                {"matrix": [6, 4], "x": 11.25, "y": 3, "w": 1.25},
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 3], "x": 2.75, "y": 4, "w": 7},
+                {"matrix": [4, 6], "x": 9.75, "y": 4, "w": 1.5},
+                {"matrix": [4, 7], "x": 11.25, "y": 4, "w": 1.25}
+            ]
+        },
+        "LAYOUT_split_lshift_split_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": [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": [5, 7], "x": 8.5, "y": 1},
+                {"matrix": [5, 6], "x": 9.5, "y": 1},
+                {"matrix": [5, 5], "x": 10.5, "y": 1},
+                {"matrix": [5, 4], "x": 11.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": [5, 1], "x": 8.75, "y": 2},
+                {"matrix": [5, 2], "x": 9.75, "y": 2},
+                {"matrix": [5, 3], "x": 10.75, "y": 2, "w": 1.75},
+                {"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": [6, 7], "x": 8.25, "y": 3},
+                {"matrix": [6, 6], "x": 9.25, "y": 3},
+                {"matrix": [6, 5], "x": 10.25, "y": 3, "w": 2.25},
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 2.75},
+                {"matrix": [4, 4], "x": 6.5, "y": 4, "w": 2.25},
+                {"matrix": [4, 5], "x": 8.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 7], "x": 11.25, "y": 4, "w": 1.25}
+            ]
+        },
+        "LAYOUT_split_rshift_split_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": [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": [5, 7], "x": 8.5, "y": 1},
+                {"matrix": [5, 6], "x": 9.5, "y": 1},
+                {"matrix": [5, 5], "x": 10.5, "y": 1},
+                {"matrix": [5, 4], "x": 11.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": [5, 1], "x": 8.75, "y": 2},
+                {"matrix": [5, 2], "x": 9.75, "y": 2},
+                {"matrix": [5, 3], "x": 10.75, "y": 2, "w": 1.75},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [6, 7], "x": 8.25, "y": 3},
+                {"matrix": [6, 6], "x": 9.25, "y": 3},
+                {"matrix": [6, 5], "x": 10.25, "y": 3},
+                {"matrix": [6, 4], "x": 11.25, "y": 3, "w": 1.25},
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 2.75},
+                {"matrix": [4, 4], "x": 6.5, "y": 4, "w": 2.25},
+                {"matrix": [4, 5], "x": 8.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 7], "x": 11.25, "y": 4, "w": 1.25}
+            ]
+        },
+        "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": [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": [5, 7], "x": 8.5, "y": 1},
+                {"matrix": [5, 6], "x": 9.5, "y": 1},
+                {"matrix": [5, 5], "x": 10.5, "y": 1},
+                {"matrix": [5, 4], "x": 11.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": [5, 1], "x": 8.75, "y": 2},
+                {"matrix": [5, 2], "x": 9.75, "y": 2},
+                {"matrix": [5, 3], "x": 10.75, "y": 2, "w": 1.75},
+                {"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": [6, 7], "x": 8.25, "y": 3},
+                {"matrix": [6, 6], "x": 9.25, "y": 3},
+                {"matrix": [6, 5], "x": 10.25, "y": 3},
+                {"matrix": [6, 4], "x": 11.25, "y": 3, "w": 1.25},
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 2.75},
+                {"matrix": [4, 4], "x": 6.5, "y": 4, "w": 2.25},
+                {"matrix": [4, 5], "x": 8.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 7], "x": 11.25, "y": 4, "w": 1.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/mechwild/clunker/rules.mk b/keyboards/mechwild/clunker/rules.mk
deleted file mode 100644
index a521203b326..00000000000
--- a/keyboards/mechwild/clunker/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-HAPTIC_DRIVER = solenoid
diff --git a/keyboards/mechwild/mokulua/mirrored/info.json b/keyboards/mechwild/mokulua/mirrored/info.json
deleted file mode 100644
index ccc2d02b637..00000000000
--- a/keyboards/mechwild/mokulua/mirrored/info.json
+++ /dev/null
@@ -1,142 +0,0 @@
-{
-    "keyboard_name": "Mokulua Mirrored",
-    "manufacturer": "MechWild",
-    "url": "https://mechwild.com",
-    "maintainer": "kylemccreery",
-    "usb": {
-        "vid": "0x6D77",
-        "pid": "0x170C",
-        "device_version": "1.0.3"
-    },
-    "matrix_pins": {
-        "cols": ["D4", "C6", "D7", "E6", "B4", "B5"],
-        "rows": ["F4", "F5", "F6", "F7", "B1", "B3"]
-    },
-    "diode_direction": "COL2ROW",
-    "encoder": {
-        "rotary": [
-            {"pin_a": "D2", "pin_b": "B2"}
-        ]
-    },
-    "qmk": {
-        "tap_keycode_delay": 10
-    },
-    "split": {
-        "enabled": true,
-        "soft_serial_pin": "D3",
-        "transport": {
-            "sync": {
-                "indicators": true,
-                "layer_state": true,
-                "modifiers": true,
-                "oled": true
-            }
-        }
-    },
-    "rgblight": {
-        "saturation_steps": 8,
-        "brightness_steps": 8,
-        "led_count": 16,
-        "sleep": true,
-        "split_count": [8, 8],
-        "animations": {
-            "rainbow_mood": true,
-            "rainbow_swirl": true
-        }
-    },
-    "ws2812": {
-        "pin": "B6"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
-    "layout_aliases": {
-        "LAYOUT_mirrored": "LAYOUT"
-    },
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0.62, "y": 0},
-                {"matrix": [0, 1], "x": 1.62, "y": 0},
-                {"matrix": [0, 2], "x": 2.62, "y": 0},
-                {"matrix": [0, 3], "x": 3.62, "y": 0},
-                {"matrix": [0, 4], "x": 4.62, "y": 0},
-                {"matrix": [0, 5], "x": 5.62, "y": 0},
-                {"matrix": [5, 5], "x": 6.62, "y": 0},
-
-                {"matrix": [11, 5], "x": 10.12, "y": 0},
-                {"matrix": [6, 5], "x": 11.12, "y": 0},
-                {"matrix": [6, 4], "x": 12.12, "y": 0},
-                {"matrix": [6, 3], "x": 13.12, "y": 0},
-                {"matrix": [6, 2], "x": 14.12, "y": 0},
-                {"matrix": [6, 1], "x": 15.12, "y": 0},
-                {"matrix": [6, 0], "x": 16.12, "y": 0},
-
-                {"matrix": [1, 0], "x": 0.37, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.87, "y": 1},
-                {"matrix": [1, 2], "x": 2.87, "y": 1},
-                {"matrix": [1, 3], "x": 3.87, "y": 1},
-                {"matrix": [1, 4], "x": 4.87, "y": 1},
-                {"matrix": [1, 5], "x": 5.87, "y": 1},
-                {"matrix": [5, 4], "x": 6.87, "y": 1},
-
-                {"matrix": [11, 4], "x": 9.87, "y": 1},
-                {"matrix": [7, 5], "x": 10.87, "y": 1},
-                {"matrix": [7, 4], "x": 11.87, "y": 1},
-                {"matrix": [7, 3], "x": 12.87, "y": 1},
-                {"matrix": [7, 2], "x": 13.87, "y": 1},
-                {"matrix": [7, 1], "x": 14.87, "y": 1},
-                {"matrix": [7, 0], "x": 15.87, "y": 1, "w": 1.5},
-
-                {"matrix": [2, 0], "x": 0.25, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 2, "y": 2},
-                {"matrix": [2, 2], "x": 3, "y": 2},
-                {"matrix": [2, 3], "x": 4, "y": 2},
-                {"matrix": [2, 4], "x": 5, "y": 2},
-                {"matrix": [2, 5], "x": 6, "y": 2},
-                {"matrix": [5, 3], "x": 7, "y": 2},
-
-                {"matrix": [11, 3], "x": 9.75, "y": 2},
-                {"matrix": [8, 5], "x": 10.75, "y": 2},
-                {"matrix": [8, 4], "x": 11.75, "y": 2},
-                {"matrix": [8, 3], "x": 12.75, "y": 2},
-                {"matrix": [8, 2], "x": 13.75, "y": 2},
-                {"matrix": [8, 1], "x": 14.75, "y": 2},
-                {"matrix": [8, 0], "x": 15.75, "y": 2, "w": 1.75},
-
-                {"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": [5, 1], "x": 6.25, "y": 3},
-                {"matrix": [5, 2], "x": 7.37, "y": 3},
-
-                {"matrix": [11, 2], "x": 9.37, "y": 3},
-                {"matrix": [11, 1], "x": 10.5, "y": 3},
-                {"matrix": [9, 5], "x": 11.5, "y": 3},
-                {"matrix": [9, 4], "x": 12.5, "y": 3},
-                {"matrix": [9, 3], "x": 13.5, "y": 3},
-                {"matrix": [9, 2], "x": 14.5, "y": 3},
-                {"matrix": [9, 1], "x": 15.5, "y": 3},
-                {"matrix": [9, 0], "x": 16.5, "y": 3, "w": 1.25},
-
-                {"matrix": [4, 0], "x": 0.25, "y": 4},
-                {"matrix": [4, 1], "x": 1.25, "y": 4},
-                {"matrix": [4, 2], "x": 2.25, "y": 4},
-                {"matrix": [4, 3], "x": 3.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 4], "x": 4.94, "y": 4, "h": 1.5},
-                {"matrix": [4, 5], "x": 5.94, "y": 4, "h": 1.5},
-                {"matrix": [5, 0], "x": 7.13, "y": 4},
-
-                {"matrix": [11, 0], "x": 9.62, "y": 4},
-                {"matrix": [10, 5], "x": 10.81, "y": 4, "h": 1.5},
-                {"matrix": [10, 4], "x": 11.81, "y": 4, "h": 1.5},
-                {"matrix": [10, 3], "x": 13, "y": 4, "w": 1.25},
-                {"matrix": [10, 2], "x": 14.5, "y": 4},
-                {"matrix": [10, 1], "x": 15.5, "y": 4},
-                {"matrix": [10, 0], "x": 16.5, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/mechwild/mokulua/mirrored/keyboard.json b/keyboards/mechwild/mokulua/mirrored/keyboard.json
new file mode 100644
index 00000000000..be74fabbd32
--- /dev/null
+++ b/keyboards/mechwild/mokulua/mirrored/keyboard.json
@@ -0,0 +1,150 @@
+{
+    "keyboard_name": "Mokulua Mirrored",
+    "manufacturer": "MechWild",
+    "url": "https://mechwild.com",
+    "maintainer": "kylemccreery",
+    "usb": {
+        "vid": "0x6D77",
+        "pid": "0x170C",
+        "device_version": "1.0.3"
+    },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "rgblight": true,
+        "encoder": true,
+        "oled": true
+    },
+    "matrix_pins": {
+        "cols": ["D4", "C6", "D7", "E6", "B4", "B5"],
+        "rows": ["F4", "F5", "F6", "F7", "B1", "B3"]
+    },
+    "diode_direction": "COL2ROW",
+    "encoder": {
+        "rotary": [
+            {"pin_a": "D2", "pin_b": "B2"}
+        ]
+    },
+    "qmk": {
+        "tap_keycode_delay": 10
+    },
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "D3",
+        "transport": {
+            "sync": {
+                "indicators": true,
+                "layer_state": true,
+                "modifiers": true,
+                "oled": true
+            }
+        }
+    },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 16,
+        "sleep": true,
+        "split_count": [8, 8],
+        "animations": {
+            "rainbow_mood": true,
+            "rainbow_swirl": true
+        }
+    },
+    "ws2812": {
+        "pin": "B6"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
+    "layout_aliases": {
+        "LAYOUT_mirrored": "LAYOUT"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0.62, "y": 0},
+                {"matrix": [0, 1], "x": 1.62, "y": 0},
+                {"matrix": [0, 2], "x": 2.62, "y": 0},
+                {"matrix": [0, 3], "x": 3.62, "y": 0},
+                {"matrix": [0, 4], "x": 4.62, "y": 0},
+                {"matrix": [0, 5], "x": 5.62, "y": 0},
+                {"matrix": [5, 5], "x": 6.62, "y": 0},
+
+                {"matrix": [11, 5], "x": 10.12, "y": 0},
+                {"matrix": [6, 5], "x": 11.12, "y": 0},
+                {"matrix": [6, 4], "x": 12.12, "y": 0},
+                {"matrix": [6, 3], "x": 13.12, "y": 0},
+                {"matrix": [6, 2], "x": 14.12, "y": 0},
+                {"matrix": [6, 1], "x": 15.12, "y": 0},
+                {"matrix": [6, 0], "x": 16.12, "y": 0},
+
+                {"matrix": [1, 0], "x": 0.37, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.87, "y": 1},
+                {"matrix": [1, 2], "x": 2.87, "y": 1},
+                {"matrix": [1, 3], "x": 3.87, "y": 1},
+                {"matrix": [1, 4], "x": 4.87, "y": 1},
+                {"matrix": [1, 5], "x": 5.87, "y": 1},
+                {"matrix": [5, 4], "x": 6.87, "y": 1},
+
+                {"matrix": [11, 4], "x": 9.87, "y": 1},
+                {"matrix": [7, 5], "x": 10.87, "y": 1},
+                {"matrix": [7, 4], "x": 11.87, "y": 1},
+                {"matrix": [7, 3], "x": 12.87, "y": 1},
+                {"matrix": [7, 2], "x": 13.87, "y": 1},
+                {"matrix": [7, 1], "x": 14.87, "y": 1},
+                {"matrix": [7, 0], "x": 15.87, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0.25, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 2, "y": 2},
+                {"matrix": [2, 2], "x": 3, "y": 2},
+                {"matrix": [2, 3], "x": 4, "y": 2},
+                {"matrix": [2, 4], "x": 5, "y": 2},
+                {"matrix": [2, 5], "x": 6, "y": 2},
+                {"matrix": [5, 3], "x": 7, "y": 2},
+
+                {"matrix": [11, 3], "x": 9.75, "y": 2},
+                {"matrix": [8, 5], "x": 10.75, "y": 2},
+                {"matrix": [8, 4], "x": 11.75, "y": 2},
+                {"matrix": [8, 3], "x": 12.75, "y": 2},
+                {"matrix": [8, 2], "x": 13.75, "y": 2},
+                {"matrix": [8, 1], "x": 14.75, "y": 2},
+                {"matrix": [8, 0], "x": 15.75, "y": 2, "w": 1.75},
+
+                {"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": [5, 1], "x": 6.25, "y": 3},
+                {"matrix": [5, 2], "x": 7.37, "y": 3},
+
+                {"matrix": [11, 2], "x": 9.37, "y": 3},
+                {"matrix": [11, 1], "x": 10.5, "y": 3},
+                {"matrix": [9, 5], "x": 11.5, "y": 3},
+                {"matrix": [9, 4], "x": 12.5, "y": 3},
+                {"matrix": [9, 3], "x": 13.5, "y": 3},
+                {"matrix": [9, 2], "x": 14.5, "y": 3},
+                {"matrix": [9, 1], "x": 15.5, "y": 3},
+                {"matrix": [9, 0], "x": 16.5, "y": 3, "w": 1.25},
+
+                {"matrix": [4, 0], "x": 0.25, "y": 4},
+                {"matrix": [4, 1], "x": 1.25, "y": 4},
+                {"matrix": [4, 2], "x": 2.25, "y": 4},
+                {"matrix": [4, 3], "x": 3.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 4.94, "y": 4, "h": 1.5},
+                {"matrix": [4, 5], "x": 5.94, "y": 4, "h": 1.5},
+                {"matrix": [5, 0], "x": 7.13, "y": 4},
+
+                {"matrix": [11, 0], "x": 9.62, "y": 4},
+                {"matrix": [10, 5], "x": 10.81, "y": 4, "h": 1.5},
+                {"matrix": [10, 4], "x": 11.81, "y": 4, "h": 1.5},
+                {"matrix": [10, 3], "x": 13, "y": 4, "w": 1.25},
+                {"matrix": [10, 2], "x": 14.5, "y": 4},
+                {"matrix": [10, 1], "x": 15.5, "y": 4},
+                {"matrix": [10, 0], "x": 16.5, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/mechwild/mokulua/mirrored/rules.mk b/keyboards/mechwild/mokulua/mirrored/rules.mk
deleted file mode 100644
index 1a9045155ba..00000000000
--- a/keyboards/mechwild/mokulua/mirrored/rules.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-ENCODER_ENABLE = yes        # Enable encoder
-OLED_ENABLE = yes           # Enable OLED Screen
diff --git a/keyboards/mechwild/mokulua/standard/info.json b/keyboards/mechwild/mokulua/standard/info.json
deleted file mode 100644
index 5b22023cce3..00000000000
--- a/keyboards/mechwild/mokulua/standard/info.json
+++ /dev/null
@@ -1,141 +0,0 @@
-{
-    "keyboard_name": "Mokulua Standard",
-    "manufacturer": "MechWild",
-    "url": "https://mechwild.com",
-    "maintainer": "kylemccreery",
-    "usb": {
-        "vid": "0x6D77",
-        "pid": "0x170B",
-        "device_version": "1.0.3"
-    },
-    "matrix_pins": {
-        "cols": ["D4", "C6", "D7", "E6", "B4", "B5"],
-        "rows": ["F4", "F5", "F6", "F7", "B1", "B3"]
-    },
-    "diode_direction": "COL2ROW",
-    "encoder": {
-        "rotary": [
-            {"pin_a": "D2", "pin_b": "B2"}
-        ]
-    },
-    "qmk": {
-        "tap_keycode_delay": 10
-    },
-    "split": {
-        "enabled": true
-        "soft_serial_pin": "D3",
-        "transport": {
-            "sync": {
-                "indicators": true,
-                "layer_state": true,
-                "modifiers": true,
-                "oled": true
-            }
-        }
-    },
-    "rgblight": {
-        "saturation_steps": 8,
-        "brightness_steps": 8,
-        "led_count": 16,
-        "sleep": true,
-        "split_count": [8, 8],
-        "animations": {
-            "rainbow_mood": true,
-            "rainbow_swirl": true
-        }
-    },
-    "ws2812": {
-        "pin": "B6"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
-    "layout_aliases": {
-        "LAYOUT_standard": "LAYOUT"
-    },
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0.62, "y": 0},
-                {"matrix": [0, 1], "x": 1.62, "y": 0},
-                {"matrix": [0, 2], "x": 2.62, "y": 0},
-                {"matrix": [0, 3], "x": 3.62, "y": 0},
-                {"matrix": [0, 4], "x": 4.62, "y": 0},
-                {"matrix": [0, 5], "x": 5.62, "y": 0},
-                {"matrix": [5, 5], "x": 6.62, "y": 0},
-
-                {"matrix": [11, 0], "x": 9.62, "y": 0},
-                {"matrix": [6, 0], "x": 10.62, "y": 0},
-                {"matrix": [6, 1], "x": 11.62, "y": 0},
-                {"matrix": [6, 2], "x": 12.62, "y": 0},
-                {"matrix": [6, 3], "x": 13.62, "y": 0},
-                {"matrix": [6, 4], "x": 14.62, "y": 0},
-                {"matrix": [6, 5], "x": 15.62, "y": 0},
-
-                {"matrix": [1, 0], "x": 0.37, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.87, "y": 1},
-                {"matrix": [1, 2], "x": 2.87, "y": 1},
-                {"matrix": [1, 3], "x": 3.87, "y": 1},
-                {"matrix": [1, 4], "x": 4.87, "y": 1},
-                {"matrix": [1, 5], "x": 5.87, "y": 1},
-                {"matrix": [5, 4], "x": 6.87, "y": 1},
-
-                {"matrix": [7, 0], "x": 10.37, "y": 1},
-                {"matrix": [7, 1], "x": 11.37, "y": 1},
-                {"matrix": [7, 2], "x": 12.37, "y": 1},
-                {"matrix": [7, 3], "x": 13.37, "y": 1},
-                {"matrix": [7, 4], "x": 14.37, "y": 1},
-                {"matrix": [7, 5], "x": 15.37, "y": 1, "w": 1.5},
-
-                {"matrix": [2, 0], "x": 0.25, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 2, "y": 2},
-                {"matrix": [2, 2], "x": 3, "y": 2},
-                {"matrix": [2, 3], "x": 4, "y": 2},
-                {"matrix": [2, 4], "x": 5, "y": 2},
-                {"matrix": [2, 5], "x": 6, "y": 2},
-                {"matrix": [5, 3], "x": 7, "y": 2},
-
-                {"matrix": [11, 1], "x": 9.75, "y": 2},
-                {"matrix": [8, 0], "x": 10.75, "y": 2},
-                {"matrix": [8, 1], "x": 11.75, "y": 2},
-                {"matrix": [8, 2], "x": 12.75, "y": 2},
-                {"matrix": [8, 3], "x": 13.75, "y": 2},
-                {"matrix": [8, 4], "x": 14.75, "y": 2},
-                {"matrix": [8, 5], "x": 15.75, "y": 2, "w": 1.75},
-
-                {"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": [5, 1], "x": 6.25, "y": 3},
-                {"matrix": [5, 2], "x": 7.37, "y": 3},
-
-                {"matrix": [11, 3], "x": 9.37, "y": 3},
-                {"matrix": [11, 2], "x": 10.5, "y": 3},
-                {"matrix": [9, 0], "x": 11.5, "y": 3},
-                {"matrix": [9, 1], "x": 12.5, "y": 3},
-                {"matrix": [9, 2], "x": 13.5, "y": 3},
-                {"matrix": [9, 3], "x": 14.5, "y": 3},
-                {"matrix": [9, 4], "x": 15.5, "y": 3},
-                {"matrix": [9, 5], "x": 16.5, "y": 3, "w": 1.25},
-
-                {"matrix": [4, 0], "x": 0.25, "y": 4},
-                {"matrix": [4, 1], "x": 1.25, "y": 4},
-                {"matrix": [4, 2], "x": 2.25, "y": 4},
-                {"matrix": [4, 3], "x": 3.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 4], "x": 4.94, "y": 4, "h": 1.5},
-                {"matrix": [4, 5], "x": 5.94, "y": 4, "h": 1.5},
-                {"matrix": [5, 0], "x": 7.13, "y": 4},
-
-                {"matrix": [11, 4], "x": 9.62, "y": 4},
-                {"matrix": [10, 0], "x": 10.81, "y": 4, "h": 1.5},
-                {"matrix": [10, 1], "x": 11.81, "y": 4, "h": 1.5},
-                {"matrix": [10, 2], "x": 13, "y": 4, "w": 1.25},
-                {"matrix": [10, 3], "x": 14.5, "y": 4},
-                {"matrix": [10, 4], "x": 15.5, "y": 4},
-                {"matrix": [10, 5], "x": 16.5, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/mechwild/mokulua/standard/keyboard.json b/keyboards/mechwild/mokulua/standard/keyboard.json
new file mode 100644
index 00000000000..044573d82c5
--- /dev/null
+++ b/keyboards/mechwild/mokulua/standard/keyboard.json
@@ -0,0 +1,149 @@
+{
+    "keyboard_name": "Mokulua Standard",
+    "manufacturer": "MechWild",
+    "url": "https://mechwild.com",
+    "maintainer": "kylemccreery",
+    "usb": {
+        "vid": "0x6D77",
+        "pid": "0x170B",
+        "device_version": "1.0.3"
+    },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "rgblight": true,
+        "encoder": true,
+        "oled": true
+    },
+    "matrix_pins": {
+        "cols": ["D4", "C6", "D7", "E6", "B4", "B5"],
+        "rows": ["F4", "F5", "F6", "F7", "B1", "B3"]
+    },
+    "diode_direction": "COL2ROW",
+    "encoder": {
+        "rotary": [
+            {"pin_a": "D2", "pin_b": "B2"}
+        ]
+    },
+    "qmk": {
+        "tap_keycode_delay": 10
+    },
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "D3",
+        "transport": {
+            "sync": {
+                "indicators": true,
+                "layer_state": true,
+                "modifiers": true,
+                "oled": true
+            }
+        }
+    },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 16,
+        "sleep": true,
+        "split_count": [8, 8],
+        "animations": {
+            "rainbow_mood": true,
+            "rainbow_swirl": true
+        }
+    },
+    "ws2812": {
+        "pin": "B6"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
+    "layout_aliases": {
+        "LAYOUT_standard": "LAYOUT"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0.62, "y": 0},
+                {"matrix": [0, 1], "x": 1.62, "y": 0},
+                {"matrix": [0, 2], "x": 2.62, "y": 0},
+                {"matrix": [0, 3], "x": 3.62, "y": 0},
+                {"matrix": [0, 4], "x": 4.62, "y": 0},
+                {"matrix": [0, 5], "x": 5.62, "y": 0},
+                {"matrix": [5, 5], "x": 6.62, "y": 0},
+
+                {"matrix": [11, 0], "x": 9.62, "y": 0},
+                {"matrix": [6, 0], "x": 10.62, "y": 0},
+                {"matrix": [6, 1], "x": 11.62, "y": 0},
+                {"matrix": [6, 2], "x": 12.62, "y": 0},
+                {"matrix": [6, 3], "x": 13.62, "y": 0},
+                {"matrix": [6, 4], "x": 14.62, "y": 0},
+                {"matrix": [6, 5], "x": 15.62, "y": 0},
+
+                {"matrix": [1, 0], "x": 0.37, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.87, "y": 1},
+                {"matrix": [1, 2], "x": 2.87, "y": 1},
+                {"matrix": [1, 3], "x": 3.87, "y": 1},
+                {"matrix": [1, 4], "x": 4.87, "y": 1},
+                {"matrix": [1, 5], "x": 5.87, "y": 1},
+                {"matrix": [5, 4], "x": 6.87, "y": 1},
+
+                {"matrix": [7, 0], "x": 10.37, "y": 1},
+                {"matrix": [7, 1], "x": 11.37, "y": 1},
+                {"matrix": [7, 2], "x": 12.37, "y": 1},
+                {"matrix": [7, 3], "x": 13.37, "y": 1},
+                {"matrix": [7, 4], "x": 14.37, "y": 1},
+                {"matrix": [7, 5], "x": 15.37, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0.25, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 2, "y": 2},
+                {"matrix": [2, 2], "x": 3, "y": 2},
+                {"matrix": [2, 3], "x": 4, "y": 2},
+                {"matrix": [2, 4], "x": 5, "y": 2},
+                {"matrix": [2, 5], "x": 6, "y": 2},
+                {"matrix": [5, 3], "x": 7, "y": 2},
+
+                {"matrix": [11, 1], "x": 9.75, "y": 2},
+                {"matrix": [8, 0], "x": 10.75, "y": 2},
+                {"matrix": [8, 1], "x": 11.75, "y": 2},
+                {"matrix": [8, 2], "x": 12.75, "y": 2},
+                {"matrix": [8, 3], "x": 13.75, "y": 2},
+                {"matrix": [8, 4], "x": 14.75, "y": 2},
+                {"matrix": [8, 5], "x": 15.75, "y": 2, "w": 1.75},
+
+                {"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": [5, 1], "x": 6.25, "y": 3},
+                {"matrix": [5, 2], "x": 7.37, "y": 3},
+
+                {"matrix": [11, 3], "x": 9.37, "y": 3},
+                {"matrix": [11, 2], "x": 10.5, "y": 3},
+                {"matrix": [9, 0], "x": 11.5, "y": 3},
+                {"matrix": [9, 1], "x": 12.5, "y": 3},
+                {"matrix": [9, 2], "x": 13.5, "y": 3},
+                {"matrix": [9, 3], "x": 14.5, "y": 3},
+                {"matrix": [9, 4], "x": 15.5, "y": 3},
+                {"matrix": [9, 5], "x": 16.5, "y": 3, "w": 1.25},
+
+                {"matrix": [4, 0], "x": 0.25, "y": 4},
+                {"matrix": [4, 1], "x": 1.25, "y": 4},
+                {"matrix": [4, 2], "x": 2.25, "y": 4},
+                {"matrix": [4, 3], "x": 3.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 4.94, "y": 4, "h": 1.5},
+                {"matrix": [4, 5], "x": 5.94, "y": 4, "h": 1.5},
+                {"matrix": [5, 0], "x": 7.13, "y": 4},
+
+                {"matrix": [11, 4], "x": 9.62, "y": 4},
+                {"matrix": [10, 0], "x": 10.81, "y": 4, "h": 1.5},
+                {"matrix": [10, 1], "x": 11.81, "y": 4, "h": 1.5},
+                {"matrix": [10, 2], "x": 13, "y": 4, "w": 1.25},
+                {"matrix": [10, 3], "x": 14.5, "y": 4},
+                {"matrix": [10, 4], "x": 15.5, "y": 4},
+                {"matrix": [10, 5], "x": 16.5, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/mechwild/mokulua/standard/rules.mk b/keyboards/mechwild/mokulua/standard/rules.mk
deleted file mode 100644
index 1a9045155ba..00000000000
--- a/keyboards/mechwild/mokulua/standard/rules.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-ENCODER_ENABLE = yes        # Enable encoder
-OLED_ENABLE = yes           # Enable OLED Screen
diff --git a/keyboards/mechwild/obe/f401/keyboard.json b/keyboards/mechwild/obe/f401/keyboard.json
index acd7e83f77d..797e9900595 100644
--- a/keyboards/mechwild/obe/f401/keyboard.json
+++ b/keyboards/mechwild/obe/f401/keyboard.json
@@ -1,5 +1,3 @@
 {
-    "processor": "STM32F401",
-    "bootloader": "stm32-dfu",
-    "board": "BLACKPILL_STM32_F401"
+    "development_board": "blackpill_f401"
 }
diff --git a/keyboards/mechwild/obe/f411/keyboard.json b/keyboards/mechwild/obe/f411/keyboard.json
index 2517a82403f..a41c5f4dd14 100644
--- a/keyboards/mechwild/obe/f411/keyboard.json
+++ b/keyboards/mechwild/obe/f411/keyboard.json
@@ -1,5 +1,3 @@
 {
-    "processor": "STM32F411",
-    "bootloader": "stm32-dfu",
-    "board": "BLACKPILL_STM32_F411"
+    "development_board": "blackpill_f411"
 }
diff --git a/keyboards/mechwild/puckbuddy/info.json b/keyboards/mechwild/puckbuddy/info.json
deleted file mode 100644
index 56bac432b80..00000000000
--- a/keyboards/mechwild/puckbuddy/info.json
+++ /dev/null
@@ -1,83 +0,0 @@
-{
-    "keyboard_name": "PuckBuddy",
-    "manufacturer": "MechWild",
-    "url": "mechwild.com",
-    "maintainer": "kylemccreery",
-    "usb": {
-        "vid": "0x6D77",
-        "pid": "0x170F",
-        "device_version": "1.0.0"
-    },
-    "matrix_pins": {
-        "cols": ["B10", "A8", "B4", "B5"],
-        "rows": ["B12", "B13", "B14", "B15"]
-    },
-    "diode_direction": "COL2ROW",
-    "dip_switch": {
-        "pins": ["A0"]
-    },
-    "encoder": {
-        "rotary": [
-            {"pin_a": "B1", "pin_b": "B0"},
-            {"pin_a": "B3", "pin_b": "A15"}
-        ]
-    },
-    "qmk": {
-        "tap_keycode_delay": 10
-    },
-    "indicators": {
-        "caps_lock": "C13",
-        "on_state": 0
-    },
-    "rgblight": {
-        "saturation_steps": 8,
-        "brightness_steps": 8,
-        "led_count": 3,
-        "sleep": true,
-        "animations": {
-            "breathing": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "snake": true,
-            "knight": true,
-            "christmas": true,
-            "static_gradient": true,
-            "rgb_test": true,
-            "alternating": true
-        }
-    },
-    "tapping": {
-        "term": 0
-    },
-    "ws2812": {
-        "pin": "A3"
-    },
-    "processor": "STM32F401",
-    "bootloader": "stm32-dfu",
-    "board": "BLACKPILL_STM32_F401",
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1.5, "y": 0},
-                {"matrix": [1, 1], "x": 2.5, "y": 0},
-                {"matrix": [2, 1], "x": 3.5, "y": 0},
-                {"matrix": [0, 2], "x": 5, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1.25},
-                {"matrix": [1, 2], "x": 5, "y": 1.25},
-
-                {"matrix": [2, 0], "x": 0, "y": 2.25},
-                {"matrix": [2, 2], "x": 5, "y": 2.25},
-
-                {"matrix": [3, 0], "x": 0, "y": 3.25},
-                {"matrix": [3, 2], "x": 5, "y": 3.25},
-
-                {"matrix": [0, 3], "x": 1, "y": 4.5},
-                {"matrix": [1, 3], "x": 2, "y": 4.5},
-                {"matrix": [2, 3], "x": 3, "y": 4.5},
-                {"matrix": [3, 3], "x": 4, "y": 4.5}
-            ]
-        }
-    }
-}
diff --git a/keyboards/mechwild/puckbuddy/keyboard.json b/keyboards/mechwild/puckbuddy/keyboard.json
new file mode 100644
index 00000000000..4e827d1ba87
--- /dev/null
+++ b/keyboards/mechwild/puckbuddy/keyboard.json
@@ -0,0 +1,92 @@
+{
+    "keyboard_name": "PuckBuddy",
+    "manufacturer": "MechWild",
+    "url": "mechwild.com",
+    "maintainer": "kylemccreery",
+    "usb": {
+        "vid": "0x6D77",
+        "pid": "0x170F",
+        "device_version": "1.0.0"
+    },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "rgblight": true,
+        "encoder": true,
+        "oled": true,
+        "dip_switch": true,
+        "pointing_device": true,
+        "dynamic_tapping_term": true
+    },
+    "matrix_pins": {
+        "cols": ["B10", "A8", "B4", "B5"],
+        "rows": ["B12", "B13", "B14", "B15"]
+    },
+    "diode_direction": "COL2ROW",
+    "dip_switch": {
+        "pins": ["A0"]
+    },
+    "encoder": {
+        "rotary": [
+            {"pin_a": "B1", "pin_b": "B0"},
+            {"pin_a": "B3", "pin_b": "A15"}
+        ]
+    },
+    "qmk": {
+        "tap_keycode_delay": 10
+    },
+    "indicators": {
+        "caps_lock": "C13",
+        "on_state": 0
+    },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 3,
+        "sleep": true,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": true
+        }
+    },
+    "tapping": {
+        "term": 0
+    },
+    "ws2812": {
+        "pin": "A3"
+    },
+    "development_board": "blackpill_f401",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1.5, "y": 0},
+                {"matrix": [1, 1], "x": 2.5, "y": 0},
+                {"matrix": [2, 1], "x": 3.5, "y": 0},
+                {"matrix": [0, 2], "x": 5, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 2], "x": 5, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25},
+                {"matrix": [2, 2], "x": 5, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25},
+                {"matrix": [3, 2], "x": 5, "y": 3.25},
+
+                {"matrix": [0, 3], "x": 1, "y": 4.5},
+                {"matrix": [1, 3], "x": 2, "y": 4.5},
+                {"matrix": [2, 3], "x": 3, "y": 4.5},
+                {"matrix": [3, 3], "x": 4, "y": 4.5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/mechwild/puckbuddy/rules.mk b/keyboards/mechwild/puckbuddy/rules.mk
index 980fe281cff..fb5d6497359 100644
--- a/keyboards/mechwild/puckbuddy/rules.mk
+++ b/keyboards/mechwild/puckbuddy/rules.mk
@@ -1,20 +1 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-ENCODER_ENABLE = yes        # Encoder Enabled
-OLED_ENABLE = yes           # OLED Enabled
-DIP_SWITCH_ENABLE = yes     # Dip Switch Enabled
-
-POINTING_DEVICE_ENABLE = yes                    # Pointing Device Enabled
-POINTING_DEVICE_DRIVER = cirque_pinnacle_spi    # Pointing Device Driver
-
-DYNAMIC_TAPPING_TERM_ENABLE = yes               # Enable Dynamic Tapping Term to control the Tap term for the Cirque Pad easily
+POINTING_DEVICE_DRIVER = cirque_pinnacle_spi
diff --git a/keyboards/mechwild/sugarglider/f401/keyboard.json b/keyboards/mechwild/sugarglider/f401/keyboard.json
index 797e9900595..7bf58c1b45e 100644
--- a/keyboards/mechwild/sugarglider/f401/keyboard.json
+++ b/keyboards/mechwild/sugarglider/f401/keyboard.json
@@ -1,3 +1,18 @@
 {
-    "development_board": "blackpill_f401"
+    "development_board": "blackpill_f401",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "console": false,
+        "command": false,
+        "nkro": true,
+        "rgblight": true,
+        "encoder": true,
+        "dip_switch": true,
+        "steno": true,
+        "oled": true,
+        "pointing_device": true,
+        "dynamic_tapping_term": true
+    }
 }
diff --git a/keyboards/mechwild/sugarglider/f411/keyboard.json b/keyboards/mechwild/sugarglider/f411/keyboard.json
index a41c5f4dd14..dd76af1f10e 100644
--- a/keyboards/mechwild/sugarglider/f411/keyboard.json
+++ b/keyboards/mechwild/sugarglider/f411/keyboard.json
@@ -1,3 +1,18 @@
 {
-    "development_board": "blackpill_f411"
+    "development_board": "blackpill_f411",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "console": false,
+        "command": false,
+        "nkro": true,
+        "rgblight": true,
+        "encoder": true,
+        "dip_switch": true,
+        "steno": true,
+        "oled": true,
+        "pointing_device": true,
+        "dynamic_tapping_term": true
+    }
 }
diff --git a/keyboards/mechwild/sugarglider/info.json b/keyboards/mechwild/sugarglider/info.json
index 749b0952cbd..80004f35d14 100644
--- a/keyboards/mechwild/sugarglider/info.json
+++ b/keyboards/mechwild/sugarglider/info.json
@@ -3,23 +3,14 @@
     "keyboard_name": "Sugar Glider",
     "maintainer": "kylemccreery",
     "url": "https://mechwild.com/product/sugar-glider/",
-    "features": {
-        "bootmagic": true,
-        "command": false,
-        "console": false,
-        "extrakey": true,
-        "mousekey": true,
-        "nkro": true,
-        "encoder": true,
-        "rgblight": true,
-        "dip_switch": true,
-        "steno": true
-    },
     "usb": {
         "vid": "0x6D77",
         "pid": "0x1710",
         "device_version": "0.2.0",
-        "force_nkro": true
+        "force_nkro": true,
+        "shared_endpoint": {
+            "keyboard": true
+        }
     },
     "diode_direction": "COL2ROW",
     "dynamic_keymap": {
diff --git a/keyboards/mechwild/sugarglider/rules.mk b/keyboards/mechwild/sugarglider/rules.mk
index 6fd0836a733..a01a95a8685 100644
--- a/keyboards/mechwild/sugarglider/rules.mk
+++ b/keyboards/mechwild/sugarglider/rules.mk
@@ -1,12 +1,5 @@
-# Build Options
-#   change yes to no to disable
-#
-OLED_ENABLE = yes                   # OLED Enabled
-
 # Cirque touchpad settings
-POINTING_DEVICE_ENABLE = yes                    # Pointing Device Enabled
 POINTING_DEVICE_DRIVER = cirque_pinnacle_spi    # Pointing Device Driver
-DYNAMIC_TAPPING_TERM_ENABLE = yes               # Enable Dynamic Tapping Term to control the Tap term for the Cirque Pad easily
 
 # Custom matrix setup
 CUSTOM_MATRIX = lite
@@ -16,6 +9,3 @@ SRC += mcp23018.c matrix.c
 I2C_DRIVER_REQUIRED = yes
 
 DEFAULT_FOLDER = mechwild/sugarglider/wide_oled
-
-# Necessary for stenography functionality
-KEYBOARD_SHARED_EP = yes    # Needed to free up an endpoint in blackpill
diff --git a/keyboards/mechwild/sugarglider/wide_oled/f401/keyboard.json b/keyboards/mechwild/sugarglider/wide_oled/f401/keyboard.json
index 797e9900595..7bf58c1b45e 100644
--- a/keyboards/mechwild/sugarglider/wide_oled/f401/keyboard.json
+++ b/keyboards/mechwild/sugarglider/wide_oled/f401/keyboard.json
@@ -1,3 +1,18 @@
 {
-    "development_board": "blackpill_f401"
+    "development_board": "blackpill_f401",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "console": false,
+        "command": false,
+        "nkro": true,
+        "rgblight": true,
+        "encoder": true,
+        "dip_switch": true,
+        "steno": true,
+        "oled": true,
+        "pointing_device": true,
+        "dynamic_tapping_term": true
+    }
 }
diff --git a/keyboards/mechwild/sugarglider/wide_oled/f411/keyboard.json b/keyboards/mechwild/sugarglider/wide_oled/f411/keyboard.json
index a41c5f4dd14..dd76af1f10e 100644
--- a/keyboards/mechwild/sugarglider/wide_oled/f411/keyboard.json
+++ b/keyboards/mechwild/sugarglider/wide_oled/f411/keyboard.json
@@ -1,3 +1,18 @@
 {
-    "development_board": "blackpill_f411"
+    "development_board": "blackpill_f411",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "console": false,
+        "command": false,
+        "nkro": true,
+        "rgblight": true,
+        "encoder": true,
+        "dip_switch": true,
+        "steno": true,
+        "oled": true,
+        "pointing_device": true,
+        "dynamic_tapping_term": true
+    }
 }
diff --git a/keyboards/mechwild/sugarglider/wide_oled/rules.mk b/keyboards/mechwild/sugarglider/wide_oled/rules.mk
index 193169239b2..23e6cab873a 100644
--- a/keyboards/mechwild/sugarglider/wide_oled/rules.mk
+++ b/keyboards/mechwild/sugarglider/wide_oled/rules.mk
@@ -3,4 +3,4 @@
 #
 WIDE_OLED_ENABLE = yes
 
-DEFAULT_FOLDER = mechwild/sugarglider/wide_oled/f401
\ No newline at end of file
+DEFAULT_FOLDER = mechwild/sugarglider/wide_oled/f401
diff --git a/keyboards/mechwild/waka60/config.h b/keyboards/mechwild/waka60/config.h
index d9eed88676a..db91eb667e6 100644
--- a/keyboards/mechwild/waka60/config.h
+++ b/keyboards/mechwild/waka60/config.h
@@ -17,23 +17,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
+#define AUDIO_PIN B5
+#define AUDIO_PWM_DRIVER PWMD1
+#define AUDIO_PWM_CHANNEL 1
+#define AUDIO_STATE_TIMER GPTD4
 
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
+#define AUDIO_CLICKY
+#define AUDIO_INIT_DELAY
diff --git a/keyboards/mechwild/waka60/f401/keyboard.json b/keyboards/mechwild/waka60/f401/keyboard.json
index acd7e83f77d..797e9900595 100644
--- a/keyboards/mechwild/waka60/f401/keyboard.json
+++ b/keyboards/mechwild/waka60/f401/keyboard.json
@@ -1,5 +1,3 @@
 {
-    "processor": "STM32F401",
-    "bootloader": "stm32-dfu",
-    "board": "BLACKPILL_STM32_F401"
+    "development_board": "blackpill_f401"
 }
diff --git a/keyboards/mechwild/waka60/f411/keyboard.json b/keyboards/mechwild/waka60/f411/keyboard.json
index 2517a82403f..a41c5f4dd14 100644
--- a/keyboards/mechwild/waka60/f411/keyboard.json
+++ b/keyboards/mechwild/waka60/f411/keyboard.json
@@ -1,5 +1,3 @@
 {
-    "processor": "STM32F411",
-    "bootloader": "stm32-dfu",
-    "board": "BLACKPILL_STM32_F411"
+    "development_board": "blackpill_f411"
 }
diff --git a/keyboards/mechwild/waka60/info.json b/keyboards/mechwild/waka60/info.json
index f7a0300a6a9..f8b8cad5100 100644
--- a/keyboards/mechwild/waka60/info.json
+++ b/keyboards/mechwild/waka60/info.json
@@ -1,47 +1,12 @@
 {
-    "keyboard_name": "Waka60",
     "manufacturer": "MechWild",
-    "url": "mechwild.com",
+    "keyboard_name": "Waka60",
     "maintainer": "Kyle McCreery",
-    "usb": {
-        "vid": "0x6D77",
-        "pid": "0x1709",
-        "device_version": "1.0.1"
-    },
-    "rgblight": {
-        "saturation_steps": 8,
-        "brightness_steps": 8,
-        "led_count": 3,
-        "sleep": true,
-        "animations": {
-            "breathing": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "snake": true,
-            "knight": true,
-            "christmas": true,
-            "static_gradient": true,
-            "rgb_test": true,
-            "alternating": true,
-            "twinkle": true
-        }
-    },
-    "ws2812": {
-        "pin": "A1"
-    },
-    "features": {
-        "bootmagic": true,
-        "command": false,
-        "console": false,
-        "encoder": true,
-        "extrakey": true,
-        "mousekey": true,
-        "nkro": false,
-        "rgblight": true
-    },
-    "matrix_pins": {
-        "cols": ["B10", "B1", "B0", "A7", "A6", "A5", "A4"],
-        "rows": ["B8", "B4", "B3", "B9", "A15", "B12", "B13", "B14", "B15", "A8"]
+    "audio": {
+        "default": {
+            "clicky": false
+        },
+        "driver": "pwm_software"
     },
     "diode_direction": "COL2ROW",
     "encoder": {
@@ -49,11 +14,84 @@
             {"pin_a": "A3", "pin_b": "A2"}
         ]
     },
+    "features": {
+        "audio": true,
+        "bootmagic": true,
+        "encoder": true,
+        "extrakey": true,
+        "mousekey": true,
+        "rgblight": true
+    },
+    "matrix_pins": {
+        "cols": ["B10", "B1", "B0", "A7", "A6", "A5", "A4"],
+        "rows": ["B8", "B4", "B3", "B9", "A15", "B12", "B13", "B14", "B15", "A8"]
+    },
     "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        },
         "tap_keycode_delay": 10
     },
+    "rgb_matrix": {
+        "animations": {
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "breathing": true,
+            "cycle_all": true,
+            "cycle_out_in": true,
+            "cycle_up_down": true,
+            "gradient_up_down": true,
+            "hue_breathing": true,
+            "jellybean_raindrops": true,
+            "pixel_flow": true,
+            "pixel_rain": true,
+            "rainbow_beacon": true,
+            "raindrops": true
+        },
+        "center_point": [112, 40],
+        "driver": "ws2812",
+        "layout": [
+            {"x": 112, "y": 12, "flags": 8},
+            {"x": 112, "y": 27, "flags": 8},
+            {"x": 112, "y": 40, "flags": 8}
+        ],
+        "sat_steps": 8,
+        "sleep": true,
+        "val_steps": 8
+    },
+    "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
+        },
+        "brightness_steps": 8,
+        "led_count": 3,
+        "saturation_steps": 8,
+        "sleep": true
+    },
+    "url": "mechwild.com",
+    "usb": {
+        "device_version": "1.0.1",
+        "pid": "0x1709",
+        "vid": "0x6D77"
+    },
+    "ws2812": {
+        "pin": "A1"
+    },
+    "layout_aliases": {
+        "LAYOUT": "LAYOUT_all"
+    },
     "layouts": {
-        "LAYOUT": {
+        "LAYOUT_1u_1u_1u_1u_1u_2u": {
             "layout": [
                 {"matrix": [0, 0], "x": 0, "y": 0},
                 {"matrix": [0, 1], "x": 1, "y": 0},
@@ -61,56 +99,1191 @@
                 {"matrix": [0, 3], "x": 3, "y": 0},
                 {"matrix": [0, 4], "x": 4, "y": 0},
                 {"matrix": [0, 5], "x": 5, "y": 0},
-
                 {"matrix": [5, 0], "x": 7, "y": 0},
                 {"matrix": [5, 1], "x": 8, "y": 0},
                 {"matrix": [5, 2], "x": 9, "y": 0},
                 {"matrix": [5, 3], "x": 10, "y": 0},
                 {"matrix": [5, 4], "x": 11, "y": 0},
                 {"matrix": [5, 5], "x": 12, "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": [1, 4], "x": 4, "y": 1},
                 {"matrix": [1, 5], "x": 5, "y": 1},
-
                 {"matrix": [6, 0], "x": 7, "y": 1},
                 {"matrix": [6, 1], "x": 8, "y": 1},
                 {"matrix": [6, 2], "x": 9, "y": 1},
                 {"matrix": [6, 3], "x": 10, "y": 1},
                 {"matrix": [6, 4], "x": 11, "y": 1},
                 {"matrix": [6, 5], "x": 12, "y": 1},
-
                 {"matrix": [2, 0], "x": 0, "y": 2},
                 {"matrix": [2, 1], "x": 1, "y": 2},
                 {"matrix": [2, 2], "x": 2, "y": 2},
                 {"matrix": [2, 3], "x": 3, "y": 2},
                 {"matrix": [2, 4], "x": 4, "y": 2},
                 {"matrix": [2, 5], "x": 5, "y": 2},
-
                 {"matrix": [7, 0], "x": 7, "y": 2},
                 {"matrix": [7, 1], "x": 8, "y": 2},
                 {"matrix": [7, 2], "x": 9, "y": 2},
                 {"matrix": [7, 3], "x": 10, "y": 2},
                 {"matrix": [7, 4], "x": 11, "y": 2},
                 {"matrix": [7, 5], "x": 12, "y": 2},
-
                 {"matrix": [3, 0], "x": 0, "y": 3},
                 {"matrix": [3, 1], "x": 1, "y": 3},
                 {"matrix": [3, 2], "x": 2, "y": 3},
                 {"matrix": [3, 3], "x": 3, "y": 3},
                 {"matrix": [3, 4], "x": 4, "y": 3},
                 {"matrix": [3, 5], "x": 5, "y": 3},
-                {"matrix": [3, 6], "x": 6, "y": 3},
+                {"matrix": [3, 6], "x": 6, "y": 3, "encoder": 0},
+                {"matrix": [8, 0], "x": 7, "y": 3},
+                {"matrix": [8, 1], "x": 8, "y": 3},
+                {"matrix": [8, 2], "x": 9, "y": 3},
+                {"matrix": [8, 3], "x": 10, "y": 3},
+                {"matrix": [8, 4], "x": 11, "y": 3},
+                {"matrix": [8, 5], "x": 12, "y": 3},
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+                {"matrix": [4, 2], "x": 2, "y": 4},
+                {"matrix": [4, 3], "x": 3, "y": 4},
+                {"matrix": [4, 4], "x": 4, "y": 4},
+                {"matrix": [4, 5], "x": 5, "y": 4},
+                {"matrix": [4, 6], "x": 6, "y": 4},
+                {"matrix": [9, 0], "x": 7, "y": 4},
+                {"matrix": [9, 2], "x": 8, "y": 4, "w": 2},
+                {"matrix": [9, 3], "x": 10, "y": 4},
+                {"matrix": [9, 4], "x": 11, "y": 4},
+                {"matrix": [9, 5], "x": 12, "y": 4}
+            ]
+        },
+        "LAYOUT_1u_1u_1u_1u_2u_1u": {
+            "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": [5, 0], "x": 7, "y": 0},
+                {"matrix": [5, 1], "x": 8, "y": 0},
+                {"matrix": [5, 2], "x": 9, "y": 0},
+                {"matrix": [5, 3], "x": 10, "y": 0},
+                {"matrix": [5, 4], "x": 11, "y": 0},
+                {"matrix": [5, 5], "x": 12, "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": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [6, 0], "x": 7, "y": 1},
+                {"matrix": [6, 1], "x": 8, "y": 1},
+                {"matrix": [6, 2], "x": 9, "y": 1},
+                {"matrix": [6, 3], "x": 10, "y": 1},
+                {"matrix": [6, 4], "x": 11, "y": 1},
+                {"matrix": [6, 5], "x": 12, "y": 1},
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [7, 0], "x": 7, "y": 2},
+                {"matrix": [7, 1], "x": 8, "y": 2},
+                {"matrix": [7, 2], "x": 9, "y": 2},
+                {"matrix": [7, 3], "x": 10, "y": 2},
+                {"matrix": [7, 4], "x": 11, "y": 2},
+                {"matrix": [7, 5], "x": 12, "y": 2},
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
+                {"matrix": [3, 6], "x": 6, "y": 3, "encoder": 0},
+                {"matrix": [8, 0], "x": 7, "y": 3},
+                {"matrix": [8, 1], "x": 8, "y": 3},
+                {"matrix": [8, 2], "x": 9, "y": 3},
+                {"matrix": [8, 3], "x": 10, "y": 3},
+                {"matrix": [8, 4], "x": 11, "y": 3},
+                {"matrix": [8, 5], "x": 12, "y": 3},
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+                {"matrix": [4, 2], "x": 2, "y": 4},
+                {"matrix": [4, 3], "x": 3, "y": 4},
+                {"matrix": [4, 4], "x": 4, "y": 4},
+                {"matrix": [4, 5], "x": 5, "y": 4},
+                {"matrix": [4, 6], "x": 6, "y": 4},
+                {"matrix": [9, 1], "x": 7, "y": 4, "w": 2},
+                {"matrix": [9, 2], "x": 9, "y": 4},
+                {"matrix": [9, 3], "x": 10, "y": 4},
+                {"matrix": [9, 4], "x": 11, "y": 4},
+                {"matrix": [9, 5], "x": 12, "y": 4}
+            ]
+        },
+        "LAYOUT_1u_1u_1u_1u_3u": {
+            "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": [5, 0], "x": 7, "y": 0},
+                {"matrix": [5, 1], "x": 8, "y": 0},
+                {"matrix": [5, 2], "x": 9, "y": 0},
+                {"matrix": [5, 3], "x": 10, "y": 0},
+                {"matrix": [5, 4], "x": 11, "y": 0},
+                {"matrix": [5, 5], "x": 12, "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": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [6, 0], "x": 7, "y": 1},
+                {"matrix": [6, 1], "x": 8, "y": 1},
+                {"matrix": [6, 2], "x": 9, "y": 1},
+                {"matrix": [6, 3], "x": 10, "y": 1},
+                {"matrix": [6, 4], "x": 11, "y": 1},
+                {"matrix": [6, 5], "x": 12, "y": 1},
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [7, 0], "x": 7, "y": 2},
+                {"matrix": [7, 1], "x": 8, "y": 2},
+                {"matrix": [7, 2], "x": 9, "y": 2},
+                {"matrix": [7, 3], "x": 10, "y": 2},
+                {"matrix": [7, 4], "x": 11, "y": 2},
+                {"matrix": [7, 5], "x": 12, "y": 2},
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
+                {"matrix": [3, 6], "x": 6, "y": 3, "encoder": 0},
+                {"matrix": [8, 0], "x": 7, "y": 3},
+                {"matrix": [8, 1], "x": 8, "y": 3},
+                {"matrix": [8, 2], "x": 9, "y": 3},
+                {"matrix": [8, 3], "x": 10, "y": 3},
+                {"matrix": [8, 4], "x": 11, "y": 3},
+                {"matrix": [8, 5], "x": 12, "y": 3},
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+                {"matrix": [4, 2], "x": 2, "y": 4},
+                {"matrix": [4, 3], "x": 3, "y": 4},
+                {"matrix": [4, 4], "x": 4, "y": 4},
+                {"matrix": [4, 5], "x": 5, "y": 4},
+                {"matrix": [4, 6], "x": 6, "y": 4},
+                {"matrix": [9, 1], "x": 7, "y": 4, "w": 3},
+                {"matrix": [9, 3], "x": 10, "y": 4},
+                {"matrix": [9, 4], "x": 11, "y": 4},
+                {"matrix": [9, 5], "x": 12, "y": 4}
+            ]
+        },
+        "LAYOUT_1u_1u_3u_1u_1u": {
+            "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": [5, 0], "x": 7, "y": 0},
+                {"matrix": [5, 1], "x": 8, "y": 0},
+                {"matrix": [5, 2], "x": 9, "y": 0},
+                {"matrix": [5, 3], "x": 10, "y": 0},
+                {"matrix": [5, 4], "x": 11, "y": 0},
+                {"matrix": [5, 5], "x": 12, "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": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [6, 0], "x": 7, "y": 1},
+                {"matrix": [6, 1], "x": 8, "y": 1},
+                {"matrix": [6, 2], "x": 9, "y": 1},
+                {"matrix": [6, 3], "x": 10, "y": 1},
+                {"matrix": [6, 4], "x": 11, "y": 1},
+                {"matrix": [6, 5], "x": 12, "y": 1},
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [7, 0], "x": 7, "y": 2},
+                {"matrix": [7, 1], "x": 8, "y": 2},
+                {"matrix": [7, 2], "x": 9, "y": 2},
+                {"matrix": [7, 3], "x": 10, "y": 2},
+                {"matrix": [7, 4], "x": 11, "y": 2},
+                {"matrix": [7, 5], "x": 12, "y": 2},
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
+                {"matrix": [3, 6], "x": 6, "y": 3, "encoder": 0},
+                {"matrix": [8, 0], "x": 7, "y": 3},
+                {"matrix": [8, 1], "x": 8, "y": 3},
+                {"matrix": [8, 2], "x": 9, "y": 3},
+                {"matrix": [8, 3], "x": 10, "y": 3},
+                {"matrix": [8, 4], "x": 11, "y": 3},
+                {"matrix": [8, 5], "x": 12, "y": 3},
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+                {"matrix": [4, 2], "x": 2, "y": 4},
+                {"matrix": [4, 3], "x": 3, "y": 4},
+                {"matrix": [4, 4], "x": 4, "y": 4},
+                {"matrix": [4, 6], "x": 5, "y": 4, "w": 3},
+                {"matrix": [9, 1], "x": 8, "y": 4},
+                {"matrix": [9, 2], "x": 9, "y": 4},
+                {"matrix": [9, 3], "x": 10, "y": 4},
+                {"matrix": [9, 4], "x": 11, "y": 4},
+                {"matrix": [9, 5], "x": 12, "y": 4}
+            ]
+        },
+        "LAYOUT_1u_1u_3u_2u": {
+            "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": [5, 0], "x": 7, "y": 0},
+                {"matrix": [5, 1], "x": 8, "y": 0},
+                {"matrix": [5, 2], "x": 9, "y": 0},
+                {"matrix": [5, 3], "x": 10, "y": 0},
+                {"matrix": [5, 4], "x": 11, "y": 0},
+                {"matrix": [5, 5], "x": 12, "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": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [6, 0], "x": 7, "y": 1},
+                {"matrix": [6, 1], "x": 8, "y": 1},
+                {"matrix": [6, 2], "x": 9, "y": 1},
+                {"matrix": [6, 3], "x": 10, "y": 1},
+                {"matrix": [6, 4], "x": 11, "y": 1},
+                {"matrix": [6, 5], "x": 12, "y": 1},
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [7, 0], "x": 7, "y": 2},
+                {"matrix": [7, 1], "x": 8, "y": 2},
+                {"matrix": [7, 2], "x": 9, "y": 2},
+                {"matrix": [7, 3], "x": 10, "y": 2},
+                {"matrix": [7, 4], "x": 11, "y": 2},
+                {"matrix": [7, 5], "x": 12, "y": 2},
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
+                {"matrix": [3, 6], "x": 6, "y": 3, "encoder": 0},
+                {"matrix": [8, 0], "x": 7, "y": 3},
+                {"matrix": [8, 1], "x": 8, "y": 3},
+                {"matrix": [8, 2], "x": 9, "y": 3},
+                {"matrix": [8, 3], "x": 10, "y": 3},
+                {"matrix": [8, 4], "x": 11, "y": 3},
+                {"matrix": [8, 5], "x": 12, "y": 3},
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+                {"matrix": [4, 2], "x": 2, "y": 4},
+                {"matrix": [4, 3], "x": 3, "y": 4},
+                {"matrix": [4, 4], "x": 4, "y": 4},
+                {"matrix": [4, 6], "x": 5, "y": 4, "w": 3},
+                {"matrix": [9, 2], "x": 8, "y": 4, "w": 2},
+                {"matrix": [9, 3], "x": 10, "y": 4},
+                {"matrix": [9, 4], "x": 11, "y": 4},
+                {"matrix": [9, 5], "x": 12, "y": 4}
+            ]
+        },
+        "LAYOUT_1u_2u_1u_1u_1u_1u": {
+            "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": [5, 0], "x": 7, "y": 0},
+                {"matrix": [5, 1], "x": 8, "y": 0},
+                {"matrix": [5, 2], "x": 9, "y": 0},
+                {"matrix": [5, 3], "x": 10, "y": 0},
+                {"matrix": [5, 4], "x": 11, "y": 0},
+                {"matrix": [5, 5], "x": 12, "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": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [6, 0], "x": 7, "y": 1},
+                {"matrix": [6, 1], "x": 8, "y": 1},
+                {"matrix": [6, 2], "x": 9, "y": 1},
+                {"matrix": [6, 3], "x": 10, "y": 1},
+                {"matrix": [6, 4], "x": 11, "y": 1},
+                {"matrix": [6, 5], "x": 12, "y": 1},
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [7, 0], "x": 7, "y": 2},
+                {"matrix": [7, 1], "x": 8, "y": 2},
+                {"matrix": [7, 2], "x": 9, "y": 2},
+                {"matrix": [7, 3], "x": 10, "y": 2},
+                {"matrix": [7, 4], "x": 11, "y": 2},
+                {"matrix": [7, 5], "x": 12, "y": 2},
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
+                {"matrix": [3, 6], "x": 6, "y": 3, "encoder": 0},
+                {"matrix": [8, 0], "x": 7, "y": 3},
+                {"matrix": [8, 1], "x": 8, "y": 3},
+                {"matrix": [8, 2], "x": 9, "y": 3},
+                {"matrix": [8, 3], "x": 10, "y": 3},
+                {"matrix": [8, 4], "x": 11, "y": 3},
+                {"matrix": [8, 5], "x": 12, "y": 3},
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+                {"matrix": [4, 2], "x": 2, "y": 4},
+                {"matrix": [4, 3], "x": 3, "y": 4},
+                {"matrix": [4, 5], "x": 4, "y": 4, "w": 2},
+                {"matrix": [4, 6], "x": 6, "y": 4},
+                {"matrix": [9, 0], "x": 7, "y": 4},
+                {"matrix": [9, 1], "x": 8, "y": 4},
+                {"matrix": [9, 2], "x": 9, "y": 4},
+                {"matrix": [9, 3], "x": 10, "y": 4},
+                {"matrix": [9, 4], "x": 11, "y": 4},
+                {"matrix": [9, 5], "x": 12, "y": 4}
+            ]
+        },
+        "LAYOUT_1u_2u_1u_2u_1u": {
+            "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": [5, 0], "x": 7, "y": 0},
+                {"matrix": [5, 1], "x": 8, "y": 0},
+                {"matrix": [5, 2], "x": 9, "y": 0},
+                {"matrix": [5, 3], "x": 10, "y": 0},
+                {"matrix": [5, 4], "x": 11, "y": 0},
+                {"matrix": [5, 5], "x": 12, "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": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [6, 0], "x": 7, "y": 1},
+                {"matrix": [6, 1], "x": 8, "y": 1},
+                {"matrix": [6, 2], "x": 9, "y": 1},
+                {"matrix": [6, 3], "x": 10, "y": 1},
+                {"matrix": [6, 4], "x": 11, "y": 1},
+                {"matrix": [6, 5], "x": 12, "y": 1},
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [7, 0], "x": 7, "y": 2},
+                {"matrix": [7, 1], "x": 8, "y": 2},
+                {"matrix": [7, 2], "x": 9, "y": 2},
+                {"matrix": [7, 3], "x": 10, "y": 2},
+                {"matrix": [7, 4], "x": 11, "y": 2},
+                {"matrix": [7, 5], "x": 12, "y": 2},
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
+                {"matrix": [3, 6], "x": 6, "y": 3, "encoder": 0},
+                {"matrix": [8, 0], "x": 7, "y": 3},
+                {"matrix": [8, 1], "x": 8, "y": 3},
+                {"matrix": [8, 2], "x": 9, "y": 3},
+                {"matrix": [8, 3], "x": 10, "y": 3},
+                {"matrix": [8, 4], "x": 11, "y": 3},
+                {"matrix": [8, 5], "x": 12, "y": 3},
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+                {"matrix": [4, 2], "x": 2, "y": 4},
+                {"matrix": [4, 3], "x": 3, "y": 4},
+                {"matrix": [4, 5], "x": 4, "y": 4, "w": 2},
+                {"matrix": [4, 6], "x": 6, "y": 4},
+                {"matrix": [9, 1], "x": 7, "y": 4, "w": 2},
+                {"matrix": [9, 2], "x": 9, "y": 4},
+                {"matrix": [9, 3], "x": 10, "y": 4},
+                {"matrix": [9, 4], "x": 11, "y": 4},
+                {"matrix": [9, 5], "x": 12, "y": 4}
+            ]
+        },
+        "LAYOUT_1u_2u_1u_3u": {
+            "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": [5, 0], "x": 7, "y": 0},
+                {"matrix": [5, 1], "x": 8, "y": 0},
+                {"matrix": [5, 2], "x": 9, "y": 0},
+                {"matrix": [5, 3], "x": 10, "y": 0},
+                {"matrix": [5, 4], "x": 11, "y": 0},
+                {"matrix": [5, 5], "x": 12, "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": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [6, 0], "x": 7, "y": 1},
+                {"matrix": [6, 1], "x": 8, "y": 1},
+                {"matrix": [6, 2], "x": 9, "y": 1},
+                {"matrix": [6, 3], "x": 10, "y": 1},
+                {"matrix": [6, 4], "x": 11, "y": 1},
+                {"matrix": [6, 5], "x": 12, "y": 1},
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [7, 0], "x": 7, "y": 2},
+                {"matrix": [7, 1], "x": 8, "y": 2},
+                {"matrix": [7, 2], "x": 9, "y": 2},
+                {"matrix": [7, 3], "x": 10, "y": 2},
+                {"matrix": [7, 4], "x": 11, "y": 2},
+                {"matrix": [7, 5], "x": 12, "y": 2},
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
+                {"matrix": [3, 6], "x": 6, "y": 3, "encoder": 0},
+                {"matrix": [8, 0], "x": 7, "y": 3},
+                {"matrix": [8, 1], "x": 8, "y": 3},
+                {"matrix": [8, 2], "x": 9, "y": 3},
+                {"matrix": [8, 3], "x": 10, "y": 3},
+                {"matrix": [8, 4], "x": 11, "y": 3},
+                {"matrix": [8, 5], "x": 12, "y": 3},
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+                {"matrix": [4, 2], "x": 2, "y": 4},
+                {"matrix": [4, 3], "x": 3, "y": 4},
+                {"matrix": [4, 5], "x": 4, "y": 4, "w": 2},
+                {"matrix": [4, 6], "x": 6, "y": 4},
+                {"matrix": [9, 1], "x": 7, "y": 4, "w": 3},
+                {"matrix": [9, 3], "x": 10, "y": 4},
+                {"matrix": [9, 4], "x": 11, "y": 4},
+                {"matrix": [9, 5], "x": 12, "y": 4}
+            ]
+        },
+        "LAYOUT_2u_1u_1u_1u_1u_1u": {
+            "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": [5, 0], "x": 7, "y": 0},
+                {"matrix": [5, 1], "x": 8, "y": 0},
+                {"matrix": [5, 2], "x": 9, "y": 0},
+                {"matrix": [5, 3], "x": 10, "y": 0},
+                {"matrix": [5, 4], "x": 11, "y": 0},
+                {"matrix": [5, 5], "x": 12, "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": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [6, 0], "x": 7, "y": 1},
+                {"matrix": [6, 1], "x": 8, "y": 1},
+                {"matrix": [6, 2], "x": 9, "y": 1},
+                {"matrix": [6, 3], "x": 10, "y": 1},
+                {"matrix": [6, 4], "x": 11, "y": 1},
+                {"matrix": [6, 5], "x": 12, "y": 1},
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [7, 0], "x": 7, "y": 2},
+                {"matrix": [7, 1], "x": 8, "y": 2},
+                {"matrix": [7, 2], "x": 9, "y": 2},
+                {"matrix": [7, 3], "x": 10, "y": 2},
+                {"matrix": [7, 4], "x": 11, "y": 2},
+                {"matrix": [7, 5], "x": 12, "y": 2},
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
+                {"matrix": [3, 6], "x": 6, "y": 3, "encoder": 0},
+                {"matrix": [8, 0], "x": 7, "y": 3},
+                {"matrix": [8, 1], "x": 8, "y": 3},
+                {"matrix": [8, 2], "x": 9, "y": 3},
+                {"matrix": [8, 3], "x": 10, "y": 3},
+                {"matrix": [8, 4], "x": 11, "y": 3},
+                {"matrix": [8, 5], "x": 12, "y": 3},
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+                {"matrix": [4, 2], "x": 2, "y": 4},
+                {"matrix": [4, 3], "x": 3, "y": 4, "w": 2},
+                {"matrix": [4, 5], "x": 5, "y": 4},
+                {"matrix": [4, 6], "x": 6, "y": 4},
+                {"matrix": [9, 0], "x": 7, "y": 4},
+                {"matrix": [9, 1], "x": 8, "y": 4},
+                {"matrix": [9, 2], "x": 9, "y": 4},
+                {"matrix": [9, 3], "x": 10, "y": 4},
+                {"matrix": [9, 4], "x": 11, "y": 4},
+                {"matrix": [9, 5], "x": 12, "y": 4}
+            ]
+        },
+        "LAYOUT_2u_1u_1u_1u_2u": {
+            "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": [5, 0], "x": 7, "y": 0},
+                {"matrix": [5, 1], "x": 8, "y": 0},
+                {"matrix": [5, 2], "x": 9, "y": 0},
+                {"matrix": [5, 3], "x": 10, "y": 0},
+                {"matrix": [5, 4], "x": 11, "y": 0},
+                {"matrix": [5, 5], "x": 12, "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": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [6, 0], "x": 7, "y": 1},
+                {"matrix": [6, 1], "x": 8, "y": 1},
+                {"matrix": [6, 2], "x": 9, "y": 1},
+                {"matrix": [6, 3], "x": 10, "y": 1},
+                {"matrix": [6, 4], "x": 11, "y": 1},
+                {"matrix": [6, 5], "x": 12, "y": 1},
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [7, 0], "x": 7, "y": 2},
+                {"matrix": [7, 1], "x": 8, "y": 2},
+                {"matrix": [7, 2], "x": 9, "y": 2},
+                {"matrix": [7, 3], "x": 10, "y": 2},
+                {"matrix": [7, 4], "x": 11, "y": 2},
+                {"matrix": [7, 5], "x": 12, "y": 2},
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
+                {"matrix": [3, 6], "x": 6, "y": 3, "encoder": 0},
+                {"matrix": [8, 0], "x": 7, "y": 3},
+                {"matrix": [8, 1], "x": 8, "y": 3},
+                {"matrix": [8, 2], "x": 9, "y": 3},
+                {"matrix": [8, 3], "x": 10, "y": 3},
+                {"matrix": [8, 4], "x": 11, "y": 3},
+                {"matrix": [8, 5], "x": 12, "y": 3},
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+                {"matrix": [4, 2], "x": 2, "y": 4},
+                {"matrix": [4, 3], "x": 3, "y": 4, "w": 2},
+                {"matrix": [4, 5], "x": 5, "y": 4},
+                {"matrix": [4, 6], "x": 6, "y": 4},
+                {"matrix": [9, 0], "x": 7, "y": 4},
+                {"matrix": [9, 2], "x": 8, "y": 4, "w": 2},
+                {"matrix": [9, 3], "x": 10, "y": 4},
+                {"matrix": [9, 4], "x": 11, "y": 4},
+                {"matrix": [9, 5], "x": 12, "y": 4}
+            ]
+        },
+        "LAYOUT_2u_1u_1u_3u": {
+            "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": [5, 0], "x": 7, "y": 0},
+                {"matrix": [5, 1], "x": 8, "y": 0},
+                {"matrix": [5, 2], "x": 9, "y": 0},
+                {"matrix": [5, 3], "x": 10, "y": 0},
+                {"matrix": [5, 4], "x": 11, "y": 0},
+                {"matrix": [5, 5], "x": 12, "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": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [6, 0], "x": 7, "y": 1},
+                {"matrix": [6, 1], "x": 8, "y": 1},
+                {"matrix": [6, 2], "x": 9, "y": 1},
+                {"matrix": [6, 3], "x": 10, "y": 1},
+                {"matrix": [6, 4], "x": 11, "y": 1},
+                {"matrix": [6, 5], "x": 12, "y": 1},
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [7, 0], "x": 7, "y": 2},
+                {"matrix": [7, 1], "x": 8, "y": 2},
+                {"matrix": [7, 2], "x": 9, "y": 2},
+                {"matrix": [7, 3], "x": 10, "y": 2},
+                {"matrix": [7, 4], "x": 11, "y": 2},
+                {"matrix": [7, 5], "x": 12, "y": 2},
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
+                {"matrix": [3, 6], "x": 6, "y": 3, "encoder": 0},
+                {"matrix": [8, 0], "x": 7, "y": 3},
+                {"matrix": [8, 1], "x": 8, "y": 3},
+                {"matrix": [8, 2], "x": 9, "y": 3},
+                {"matrix": [8, 3], "x": 10, "y": 3},
+                {"matrix": [8, 4], "x": 11, "y": 3},
+                {"matrix": [8, 5], "x": 12, "y": 3},
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+                {"matrix": [4, 2], "x": 2, "y": 4},
+                {"matrix": [4, 3], "x": 3, "y": 4, "w": 2},
+                {"matrix": [4, 5], "x": 5, "y": 4},
+                {"matrix": [4, 6], "x": 6, "y": 4},
+                {"matrix": [9, 1], "x": 7, "y": 4, "w": 3},
+                {"matrix": [9, 3], "x": 10, "y": 4},
+                {"matrix": [9, 4], "x": 11, "y": 4},
+                {"matrix": [9, 5], "x": 12, "y": 4}
+            ]
+        },
+        "LAYOUT_2u_3u_1u_1u": {
+            "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": [5, 0], "x": 7, "y": 0},
+                {"matrix": [5, 1], "x": 8, "y": 0},
+                {"matrix": [5, 2], "x": 9, "y": 0},
+                {"matrix": [5, 3], "x": 10, "y": 0},
+                {"matrix": [5, 4], "x": 11, "y": 0},
+                {"matrix": [5, 5], "x": 12, "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": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [6, 0], "x": 7, "y": 1},
+                {"matrix": [6, 1], "x": 8, "y": 1},
+                {"matrix": [6, 2], "x": 9, "y": 1},
+                {"matrix": [6, 3], "x": 10, "y": 1},
+                {"matrix": [6, 4], "x": 11, "y": 1},
+                {"matrix": [6, 5], "x": 12, "y": 1},
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [7, 0], "x": 7, "y": 2},
+                {"matrix": [7, 1], "x": 8, "y": 2},
+                {"matrix": [7, 2], "x": 9, "y": 2},
+                {"matrix": [7, 3], "x": 10, "y": 2},
+                {"matrix": [7, 4], "x": 11, "y": 2},
+                {"matrix": [7, 5], "x": 12, "y": 2},
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
+                {"matrix": [3, 6], "x": 6, "y": 3, "encoder": 0},
+                {"matrix": [8, 0], "x": 7, "y": 3},
+                {"matrix": [8, 1], "x": 8, "y": 3},
+                {"matrix": [8, 2], "x": 9, "y": 3},
+                {"matrix": [8, 3], "x": 10, "y": 3},
+                {"matrix": [8, 4], "x": 11, "y": 3},
+                {"matrix": [8, 5], "x": 12, "y": 3},
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+                {"matrix": [4, 2], "x": 2, "y": 4},
+                {"matrix": [4, 3], "x": 3, "y": 4, "w": 2},
+                {"matrix": [4, 6], "x": 5, "y": 4, "w": 3},
+                {"matrix": [9, 1], "x": 8, "y": 4},
+                {"matrix": [9, 2], "x": 9, "y": 4},
+                {"matrix": [9, 3], "x": 10, "y": 4},
+                {"matrix": [9, 4], "x": 11, "y": 4},
+                {"matrix": [9, 5], "x": 12, "y": 4}
+            ]
+        },
+        "LAYOUT_2u_3u_2u": {
+            "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": [5, 0], "x": 7, "y": 0},
+                {"matrix": [5, 1], "x": 8, "y": 0},
+                {"matrix": [5, 2], "x": 9, "y": 0},
+                {"matrix": [5, 3], "x": 10, "y": 0},
+                {"matrix": [5, 4], "x": 11, "y": 0},
+                {"matrix": [5, 5], "x": 12, "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": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [6, 0], "x": 7, "y": 1},
+                {"matrix": [6, 1], "x": 8, "y": 1},
+                {"matrix": [6, 2], "x": 9, "y": 1},
+                {"matrix": [6, 3], "x": 10, "y": 1},
+                {"matrix": [6, 4], "x": 11, "y": 1},
+                {"matrix": [6, 5], "x": 12, "y": 1},
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [7, 0], "x": 7, "y": 2},
+                {"matrix": [7, 1], "x": 8, "y": 2},
+                {"matrix": [7, 2], "x": 9, "y": 2},
+                {"matrix": [7, 3], "x": 10, "y": 2},
+                {"matrix": [7, 4], "x": 11, "y": 2},
+                {"matrix": [7, 5], "x": 12, "y": 2},
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
+                {"matrix": [3, 6], "x": 6, "y": 3, "encoder": 0},
+                {"matrix": [8, 0], "x": 7, "y": 3},
+                {"matrix": [8, 1], "x": 8, "y": 3},
+                {"matrix": [8, 2], "x": 9, "y": 3},
+                {"matrix": [8, 3], "x": 10, "y": 3},
+                {"matrix": [8, 4], "x": 11, "y": 3},
+                {"matrix": [8, 5], "x": 12, "y": 3},
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+                {"matrix": [4, 2], "x": 2, "y": 4},
+                {"matrix": [4, 3], "x": 3, "y": 4, "w": 2},
+                {"matrix": [4, 6], "x": 5, "y": 4, "w": 3},
+                {"matrix": [9, 2], "x": 8, "y": 4, "w": 2},
+                {"matrix": [9, 3], "x": 10, "y": 4},
+                {"matrix": [9, 4], "x": 11, "y": 4},
+                {"matrix": [9, 5], "x": 12, "y": 4}
+            ]
+        },
+        "LAYOUT_3u_1u_1u_1u_1u": {
+            "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": [5, 0], "x": 7, "y": 0},
+                {"matrix": [5, 1], "x": 8, "y": 0},
+                {"matrix": [5, 2], "x": 9, "y": 0},
+                {"matrix": [5, 3], "x": 10, "y": 0},
+                {"matrix": [5, 4], "x": 11, "y": 0},
+                {"matrix": [5, 5], "x": 12, "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": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [6, 0], "x": 7, "y": 1},
+                {"matrix": [6, 1], "x": 8, "y": 1},
+                {"matrix": [6, 2], "x": 9, "y": 1},
+                {"matrix": [6, 3], "x": 10, "y": 1},
+                {"matrix": [6, 4], "x": 11, "y": 1},
+                {"matrix": [6, 5], "x": 12, "y": 1},
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [7, 0], "x": 7, "y": 2},
+                {"matrix": [7, 1], "x": 8, "y": 2},
+                {"matrix": [7, 2], "x": 9, "y": 2},
+                {"matrix": [7, 3], "x": 10, "y": 2},
+                {"matrix": [7, 4], "x": 11, "y": 2},
+                {"matrix": [7, 5], "x": 12, "y": 2},
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
+                {"matrix": [3, 6], "x": 6, "y": 3, "encoder": 0},
+                {"matrix": [8, 0], "x": 7, "y": 3},
+                {"matrix": [8, 1], "x": 8, "y": 3},
+                {"matrix": [8, 2], "x": 9, "y": 3},
+                {"matrix": [8, 3], "x": 10, "y": 3},
+                {"matrix": [8, 4], "x": 11, "y": 3},
+                {"matrix": [8, 5], "x": 12, "y": 3},
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+                {"matrix": [4, 2], "x": 2, "y": 4},
+                {"matrix": [4, 4], "x": 3, "y": 4, "w": 3},
+                {"matrix": [4, 6], "x": 6, "y": 4},
+                {"matrix": [9, 0], "x": 7, "y": 4},
+                {"matrix": [9, 1], "x": 8, "y": 4},
+                {"matrix": [9, 2], "x": 9, "y": 4},
+                {"matrix": [9, 3], "x": 10, "y": 4},
+                {"matrix": [9, 4], "x": 11, "y": 4},
+                {"matrix": [9, 5], "x": 12, "y": 4}
+            ]
+        },
+        "LAYOUT_3u_1u_1u_2u": {
+            "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": [5, 0], "x": 7, "y": 0},
+                {"matrix": [5, 1], "x": 8, "y": 0},
+                {"matrix": [5, 2], "x": 9, "y": 0},
+                {"matrix": [5, 3], "x": 10, "y": 0},
+                {"matrix": [5, 4], "x": 11, "y": 0},
+                {"matrix": [5, 5], "x": 12, "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": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [6, 0], "x": 7, "y": 1},
+                {"matrix": [6, 1], "x": 8, "y": 1},
+                {"matrix": [6, 2], "x": 9, "y": 1},
+                {"matrix": [6, 3], "x": 10, "y": 1},
+                {"matrix": [6, 4], "x": 11, "y": 1},
+                {"matrix": [6, 5], "x": 12, "y": 1},
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [7, 0], "x": 7, "y": 2},
+                {"matrix": [7, 1], "x": 8, "y": 2},
+                {"matrix": [7, 2], "x": 9, "y": 2},
+                {"matrix": [7, 3], "x": 10, "y": 2},
+                {"matrix": [7, 4], "x": 11, "y": 2},
+                {"matrix": [7, 5], "x": 12, "y": 2},
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
+                {"matrix": [3, 6], "x": 6, "y": 3, "encoder": 0},
+                {"matrix": [8, 0], "x": 7, "y": 3},
+                {"matrix": [8, 1], "x": 8, "y": 3},
+                {"matrix": [8, 2], "x": 9, "y": 3},
+                {"matrix": [8, 3], "x": 10, "y": 3},
+                {"matrix": [8, 4], "x": 11, "y": 3},
+                {"matrix": [8, 5], "x": 12, "y": 3},
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+                {"matrix": [4, 2], "x": 2, "y": 4},
+                {"matrix": [4, 4], "x": 3, "y": 4, "w": 3},
+                {"matrix": [4, 6], "x": 6, "y": 4},
+                {"matrix": [9, 0], "x": 7, "y": 4},
+                {"matrix": [9, 2], "x": 8, "y": 4, "w": 2},
+                {"matrix": [9, 3], "x": 10, "y": 4},
+                {"matrix": [9, 4], "x": 11, "y": 4},
+                {"matrix": [9, 5], "x": 12, "y": 4}
+            ]
+        },
+        "LAYOUT_3u_1u_2u_1u": {
+            "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": [5, 0], "x": 7, "y": 0},
+                {"matrix": [5, 1], "x": 8, "y": 0},
+                {"matrix": [5, 2], "x": 9, "y": 0},
+                {"matrix": [5, 3], "x": 10, "y": 0},
+                {"matrix": [5, 4], "x": 11, "y": 0},
+                {"matrix": [5, 5], "x": 12, "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": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [6, 0], "x": 7, "y": 1},
+                {"matrix": [6, 1], "x": 8, "y": 1},
+                {"matrix": [6, 2], "x": 9, "y": 1},
+                {"matrix": [6, 3], "x": 10, "y": 1},
+                {"matrix": [6, 4], "x": 11, "y": 1},
+                {"matrix": [6, 5], "x": 12, "y": 1},
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [7, 0], "x": 7, "y": 2},
+                {"matrix": [7, 1], "x": 8, "y": 2},
+                {"matrix": [7, 2], "x": 9, "y": 2},
+                {"matrix": [7, 3], "x": 10, "y": 2},
+                {"matrix": [7, 4], "x": 11, "y": 2},
+                {"matrix": [7, 5], "x": 12, "y": 2},
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
+                {"matrix": [3, 6], "x": 6, "y": 3, "encoder": 0},
+                {"matrix": [8, 0], "x": 7, "y": 3},
+                {"matrix": [8, 1], "x": 8, "y": 3},
+                {"matrix": [8, 2], "x": 9, "y": 3},
+                {"matrix": [8, 3], "x": 10, "y": 3},
+                {"matrix": [8, 4], "x": 11, "y": 3},
+                {"matrix": [8, 5], "x": 12, "y": 3},
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+                {"matrix": [4, 2], "x": 2, "y": 4},
+                {"matrix": [4, 4], "x": 3, "y": 4, "w": 3},
+                {"matrix": [4, 6], "x": 6, "y": 4},
+                {"matrix": [9, 1], "x": 7, "y": 4, "w": 2},
+                {"matrix": [9, 2], "x": 9, "y": 4},
+                {"matrix": [9, 3], "x": 10, "y": 4},
+                {"matrix": [9, 4], "x": 11, "y": 4},
+                {"matrix": [9, 5], "x": 12, "y": 4}
+            ]
+        },
+        "LAYOUT_3u_1u_3u": {
+            "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": [5, 0], "x": 7, "y": 0},
+                {"matrix": [5, 1], "x": 8, "y": 0},
+                {"matrix": [5, 2], "x": 9, "y": 0},
+                {"matrix": [5, 3], "x": 10, "y": 0},
+                {"matrix": [5, 4], "x": 11, "y": 0},
+                {"matrix": [5, 5], "x": 12, "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": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [6, 0], "x": 7, "y": 1},
+                {"matrix": [6, 1], "x": 8, "y": 1},
+                {"matrix": [6, 2], "x": 9, "y": 1},
+                {"matrix": [6, 3], "x": 10, "y": 1},
+                {"matrix": [6, 4], "x": 11, "y": 1},
+                {"matrix": [6, 5], "x": 12, "y": 1},
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [7, 0], "x": 7, "y": 2},
+                {"matrix": [7, 1], "x": 8, "y": 2},
+                {"matrix": [7, 2], "x": 9, "y": 2},
+                {"matrix": [7, 3], "x": 10, "y": 2},
+                {"matrix": [7, 4], "x": 11, "y": 2},
+                {"matrix": [7, 5], "x": 12, "y": 2},
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
+                {"matrix": [3, 6], "x": 6, "y": 3, "encoder": 0},
+                {"matrix": [8, 0], "x": 7, "y": 3},
+                {"matrix": [8, 1], "x": 8, "y": 3},
+                {"matrix": [8, 2], "x": 9, "y": 3},
+                {"matrix": [8, 3], "x": 10, "y": 3},
+                {"matrix": [8, 4], "x": 11, "y": 3},
+                {"matrix": [8, 5], "x": 12, "y": 3},
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+                {"matrix": [4, 2], "x": 2, "y": 4},
+                {"matrix": [4, 4], "x": 3, "y": 4, "w": 3},
+                {"matrix": [4, 6], "x": 6, "y": 4},
+                {"matrix": [9, 1], "x": 7, "y": 4, "w": 3},
+                {"matrix": [9, 3], "x": 10, "y": 4},
+                {"matrix": [9, 4], "x": 11, "y": 4},
+                {"matrix": [9, 5], "x": 12, "y": 4}
+            ]
+        },
+        "LAYOUT_7u": {
+            "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": [5, 0], "x": 7, "y": 0},
+                {"matrix": [5, 1], "x": 8, "y": 0},
+                {"matrix": [5, 2], "x": 9, "y": 0},
+                {"matrix": [5, 3], "x": 10, "y": 0},
+                {"matrix": [5, 4], "x": 11, "y": 0},
+                {"matrix": [5, 5], "x": 12, "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": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [6, 0], "x": 7, "y": 1},
+                {"matrix": [6, 1], "x": 8, "y": 1},
+                {"matrix": [6, 2], "x": 9, "y": 1},
+                {"matrix": [6, 3], "x": 10, "y": 1},
+                {"matrix": [6, 4], "x": 11, "y": 1},
+                {"matrix": [6, 5], "x": 12, "y": 1},
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [7, 0], "x": 7, "y": 2},
+                {"matrix": [7, 1], "x": 8, "y": 2},
+                {"matrix": [7, 2], "x": 9, "y": 2},
+                {"matrix": [7, 3], "x": 10, "y": 2},
+                {"matrix": [7, 4], "x": 11, "y": 2},
+                {"matrix": [7, 5], "x": 12, "y": 2},
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
+                {"matrix": [3, 6], "x": 6, "y": 3, "encoder": 0},
+                {"matrix": [8, 0], "x": 7, "y": 3},
+                {"matrix": [8, 1], "x": 8, "y": 3},
+                {"matrix": [8, 2], "x": 9, "y": 3},
+                {"matrix": [8, 3], "x": 10, "y": 3},
+                {"matrix": [8, 4], "x": 11, "y": 3},
+                {"matrix": [8, 5], "x": 12, "y": 3},
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+                {"matrix": [4, 2], "x": 2, "y": 4},
+                {"matrix": [4, 6], "x": 3, "y": 4, "w": 7},
+                {"matrix": [9, 3], "x": 10, "y": 4},
+                {"matrix": [9, 4], "x": 11, "y": 4},
+                {"matrix": [9, 5], "x": 12, "y": 4}
+            ]
+        },
+        "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": [5, 0], "x": 7, "y": 0},
+                {"matrix": [5, 1], "x": 8, "y": 0},
+                {"matrix": [5, 2], "x": 9, "y": 0},
+                {"matrix": [5, 3], "x": 10, "y": 0},
+                {"matrix": [5, 4], "x": 11, "y": 0},
+                {"matrix": [5, 5], "x": 12, "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": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [6, 0], "x": 7, "y": 1},
+                {"matrix": [6, 1], "x": 8, "y": 1},
+                {"matrix": [6, 2], "x": 9, "y": 1},
+                {"matrix": [6, 3], "x": 10, "y": 1},
+                {"matrix": [6, 4], "x": 11, "y": 1},
+                {"matrix": [6, 5], "x": 12, "y": 1},
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [7, 0], "x": 7, "y": 2},
+                {"matrix": [7, 1], "x": 8, "y": 2},
+                {"matrix": [7, 2], "x": 9, "y": 2},
+                {"matrix": [7, 3], "x": 10, "y": 2},
+                {"matrix": [7, 4], "x": 11, "y": 2},
+                {"matrix": [7, 5], "x": 12, "y": 2},
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
+                {"matrix": [3, 6], "x": 6, "y": 3, "encoder": 0},
                 {"matrix": [8, 0], "x": 7, "y": 3},
                 {"matrix": [8, 1], "x": 8, "y": 3},
                 {"matrix": [8, 2], "x": 9, "y": 3},
                 {"matrix": [8, 3], "x": 10, "y": 3},
                 {"matrix": [8, 4], "x": 11, "y": 3},
                 {"matrix": [8, 5], "x": 12, "y": 3},
-
                 {"matrix": [4, 0], "x": 0, "y": 4},
                 {"matrix": [4, 1], "x": 1, "y": 4},
                 {"matrix": [4, 2], "x": 2, "y": 4},
diff --git a/keyboards/mechwild/waka60/keymaps/default/keymap.c b/keyboards/mechwild/waka60/keymaps/default/keymap.c
index beb2d9e9e2f..3a7df5d3280 100644
--- a/keyboards/mechwild/waka60/keymaps/default/keymap.c
+++ b/keyboards/mechwild/waka60/keymaps/default/keymap.c
@@ -19,48 +19,30 @@
 // Defines names for use in layer keycodes and the keymap
 enum layer_names {
     _BASE,
-    _FN1,
-    _FN2,
-    _FN3
+    _FN1
 };
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /* Base */
-    [_BASE] = LAYOUT(
+    [_BASE] = LAYOUT_all(
     QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,             KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC,
     KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,             KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSLS,
     MO(1),   KC_A,    KC_S,    KC_D,    KC_F,    KC_G,             KC_H,    KC_J,    KC_K,    KC_L,    KC_QUOT, KC_ENT,
     KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,   KC_MUTE,  KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,
     KC_LCTL, KC_LGUI, KC_LALT, MO(1),   KC_SPC,  KC_SPC, KC_SPC,   KC_SPC,  KC_SPC,  MO(1),   KC_RALT, KC_RGUI, KC_RCTL
     ),
-    [_FN1] = LAYOUT(
-    KC_TRNS, KC_F1,   KC_F2,    KC_F3,   KC_F4,   KC_F5,             KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_DEL,
-    KC_TRNS, KC_TRNS, RGB_TOG,  KC_TRNS, KC_TRNS, KC_TRNS,           KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS, RGB_MOD,  KC_TRNS, KC_TRNS, KC_TRNS,           KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS, RGB_RMOD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
-    ),
-    [_FN2] = LAYOUT(
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
-    ),
-    [_FN3] = LAYOUT(
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+    [_FN1] = 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_DEL,
+    KC_TRNS, AU_TOGG, CK_UP,   RGB_TOG,  KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, MU_TOGG, MU_NEXT, RGB_MOD,  KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, CK_TOGG, CK_DOWN, RGB_RMOD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
     )
 };
 
 #ifdef ENCODER_MAP_ENABLE
     const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
         [_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
-        [_FN1]  = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
-        [_FN2]  = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
-        [_FN3]  = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
+        [_FN1]  = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }
     };
 #endif
diff --git a/keyboards/mechwild/waka60/keymaps/via/keymap.c b/keyboards/mechwild/waka60/keymaps/via/keymap.c
index 4d29baea78a..3a7df5d3280 100644
--- a/keyboards/mechwild/waka60/keymaps/via/keymap.c
+++ b/keyboards/mechwild/waka60/keymaps/via/keymap.c
@@ -19,48 +19,30 @@
 // Defines names for use in layer keycodes and the keymap
 enum layer_names {
     _BASE,
-    _FN1,
-    _FN2,
-    _FN3
+    _FN1
 };
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /* Base */
-    [_BASE] = LAYOUT(
+    [_BASE] = LAYOUT_all(
     QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,             KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC,
     KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,             KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSLS,
     MO(1),   KC_A,    KC_S,    KC_D,    KC_F,    KC_G,             KC_H,    KC_J,    KC_K,    KC_L,    KC_QUOT, KC_ENT,
     KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,   KC_MUTE,  KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,
     KC_LCTL, KC_LGUI, KC_LALT, MO(1),   KC_SPC,  KC_SPC, KC_SPC,   KC_SPC,  KC_SPC,  MO(1),   KC_RALT, KC_RGUI, KC_RCTL
     ),
-    [_FN1] = LAYOUT(
-    KC_TRNS, KC_F1,   KC_F2,    KC_F3,   KC_F4,   KC_F5,            KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_DEL,
-    KC_TRNS, AU_TOGG, RGB_TOG,  KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, MU_TOGG, RGB_MOD,  KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, MU_NEXT, RGB_RMOD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
-    ),
-    [_FN2] = LAYOUT(
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
-    ),
-    [_FN3] = LAYOUT(
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+    [_FN1] = 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_DEL,
+    KC_TRNS, AU_TOGG, CK_UP,   RGB_TOG,  KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, MU_TOGG, MU_NEXT, RGB_MOD,  KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, CK_TOGG, CK_DOWN, RGB_RMOD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
     )
 };
 
 #ifdef ENCODER_MAP_ENABLE
     const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
         [_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
-        [_FN1]  = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
-        [_FN2]  = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
-        [_FN3]  = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
+        [_FN1]  = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }
     };
 #endif
diff --git a/keyboards/mecxlabs/mp1/info.json b/keyboards/mecxlabs/mp1/keyboard.json
similarity index 100%
rename from keyboards/mecxlabs/mp1/info.json
rename to keyboards/mecxlabs/mp1/keyboard.json
diff --git a/keyboards/meetlab/kafkasplit/info.json b/keyboards/meetlab/kafkasplit/keyboard.json
similarity index 100%
rename from keyboards/meetlab/kafkasplit/info.json
rename to keyboards/meetlab/kafkasplit/keyboard.json
diff --git a/keyboards/melgeek/mj65/rev3/rules.mk b/keyboards/melgeek/mj65/rev3/rules.mk
index 8b7f40c50b5..d3f22ef58ac 100644
--- a/keyboards/melgeek/mj65/rev3/rules.mk
+++ b/keyboards/melgeek/mj65/rev3/rules.mk
@@ -1,3 +1,2 @@
-RGB_MATRIX_SUPPORTED = yes
 RGBLIGHT_SUPPORTED   = no
 BACKLIGHT_SUPPORTED  = no
diff --git a/keyboards/merge/uma/info.json b/keyboards/merge/uma/info.json
deleted file mode 100644
index 6413480391e..00000000000
--- a/keyboards/merge/uma/info.json
+++ /dev/null
@@ -1,867 +0,0 @@
-{
-    "keyboard_name": "UM-A",
-    "manufacturer": "Merge",
-    "url": "https://mergedesign.store/products/um-a",
-    "maintainer": "duoshock",
-    "usb": {
-        "vid": "0x4D65",
-        "pid": "0x3232",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "D6", "D4"],
-        "rows": ["B0", "B1", "B2", "B3", "B7"]
-    },
-    "diode_direction": "COL2ROW",
-    "backlight": {
-        "pin": "C6"
-    },
-    "encoder": {
-        "rotary": [
-            {"pin_a": "B4", "pin_b": "B5"}
-        ]
-    },
-    "split": {
-        "enabled": true,
-        "soft_serial_pin": "D2"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "layouts": {
-        "LAYOUT_all": {
-            "layout": [
-                {"matrix": [0, 0], "x": 1.5, "y": 0},
-                {"matrix": [0, 1], "x": 2.5, "y": 0},
-                {"matrix": [0, 2], "x": 3.5, "y": 0},
-                {"matrix": [0, 3], "x": 4.5, "y": 0},
-                {"matrix": [0, 4], "x": 5.5, "y": 0},
-                {"matrix": [0, 5], "x": 6.5, "y": 0},
-                {"matrix": [0, 6], "x": 7.5, "y": 0},
-
-                {"matrix": [5, 0], "x": 10.5, "y": 0},
-                {"matrix": [5, 1], "x": 11.5, "y": 0},
-                {"matrix": [5, 2], "x": 12.5, "y": 0},
-                {"matrix": [5, 3], "x": 13.5, "y": 0},
-                {"matrix": [5, 4], "x": 14.5, "y": 0},
-                {"matrix": [5, 5], "x": 15.5, "y": 0},
-                {"matrix": [5, 6], "x": 16.5, "y": 0},
-                {"matrix": [5, 7], "x": 17.5, "y": 0},
-
-                {"matrix": [7, 7], "x": 19, "y": 0},
-
-                {"matrix": [1, 0], "x": 1.5, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 3, "y": 1},
-                {"matrix": [1, 2], "x": 4, "y": 1},
-                {"matrix": [1, 3], "x": 5, "y": 1},
-                {"matrix": [1, 4], "x": 6, "y": 1},
-                {"matrix": [1, 5], "x": 7, "y": 1},
-
-                {"matrix": [6, 0], "x": 10, "y": 1},
-                {"matrix": [6, 1], "x": 11, "y": 1},
-                {"matrix": [6, 2], "x": 12, "y": 1},
-                {"matrix": [6, 3], "x": 13, "y": 1},
-                {"matrix": [6, 4], "x": 14, "y": 1},
-                {"matrix": [6, 5], "x": 15, "y": 1},
-                {"matrix": [6, 6], "x": 16, "y": 1},
-                {"matrix": [6, 7], "x": 17, "y": 1, "w": 1.5},
-
-                {"matrix": [8, 7], "x": 19, "y": 1},
-
-                {"matrix": [4, 5], "x": 0, "y": 2},
-
-                {"matrix": [2, 0], "x": 1.5, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 3.25, "y": 2},
-                {"matrix": [2, 2], "x": 4.25, "y": 2},
-                {"matrix": [2, 3], "x": 5.25, "y": 2},
-                {"matrix": [2, 4], "x": 6.25, "y": 2},
-                {"matrix": [2, 5], "x": 7.25, "y": 2},
-
-                {"matrix": [7, 0], "x": 10.25, "y": 2},
-                {"matrix": [7, 1], "x": 11.25, "y": 2},
-                {"matrix": [7, 2], "x": 12.25, "y": 2},
-                {"matrix": [7, 3], "x": 13.25, "y": 2},
-                {"matrix": [7, 4], "x": 14.25, "y": 2},
-                {"matrix": [7, 5], "x": 15.25, "y": 2},
-                {"matrix": [7, 6], "x": 16.25, "y": 2, "w": 2.25},
-
-                {"matrix": [9, 7], "x": 19, "y": 2},
-
-                {"matrix": [4, 6], "x": 0, "y": 3},
-
-                {"matrix": [3, 0], "x": 1.5, "y": 3, "w": 1.25},
-                {"matrix": [4, 1], "x": 2.75, "y": 3},
-                {"matrix": [3, 1], "x": 3.75, "y": 3},
-                {"matrix": [3, 2], "x": 4.75, "y": 3},
-                {"matrix": [3, 3], "x": 5.75, "y": 3},
-                {"matrix": [3, 4], "x": 6.75, "y": 3},
-                {"matrix": [3, 5], "x": 7.75, "y": 3},
-
-                {"matrix": [9, 6], "x": 9.75, "y": 3},
-                {"matrix": [8, 0], "x": 10.75, "y": 3},
-                {"matrix": [8, 1], "x": 11.75, "y": 3},
-                {"matrix": [8, 2], "x": 12.75, "y": 3},
-                {"matrix": [8, 3], "x": 13.75, "y": 3},
-                {"matrix": [8, 4], "x": 14.75, "y": 3},
-                {"matrix": [8, 5], "x": 15.75, "y": 3, "w": 1.75},
-
-                {"matrix": [8, 6], "x": 17.75, "y": 3.25},
-
-                {"matrix": [4, 7], "x": 0, "y": 4},
-
-                {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.75, "y": 4, "w": 1.25},
-                {"matrix": [4, 3], "x": 5.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 4], "x": 6.5, "y": 4, "w": 2.25},
-
-                {"matrix": [9, 0], "x": 9.75, "y": 4, "w": 2.75},
-                {"matrix": [9, 1], "x": 13.5, "y": 4, "w": 1.5},
-                {"matrix": [9, 2], "x": 15, "y": 4, "w": 1.5},
-
-                {"matrix": [9, 3], "x": 16.75, "y": 4.25},
-                {"matrix": [9, 4], "x": 17.75, "y": 4.25},
-                {"matrix": [9, 5], "x": 18.75, "y": 4.25}
-            ]
-        },
-        "LAYOUT_ansi_lspace_2u_bksp": {
-            "layout": [
-                {"matrix": [0, 0], "x": 1.5, "y": 0},
-                {"matrix": [0, 1], "x": 2.5, "y": 0},
-                {"matrix": [0, 2], "x": 3.5, "y": 0},
-                {"matrix": [0, 3], "x": 4.5, "y": 0},
-                {"matrix": [0, 4], "x": 5.5, "y": 0},
-                {"matrix": [0, 5], "x": 6.5, "y": 0},
-                {"matrix": [0, 6], "x": 7.5, "y": 0},
-
-                {"matrix": [5, 0], "x": 10.5, "y": 0},
-                {"matrix": [5, 1], "x": 11.5, "y": 0},
-                {"matrix": [5, 2], "x": 12.5, "y": 0},
-                {"matrix": [5, 3], "x": 13.5, "y": 0},
-                {"matrix": [5, 4], "x": 14.5, "y": 0},
-                {"matrix": [5, 5], "x": 15.5, "y": 0},
-                {"matrix": [5, 7], "x": 16.5, "y": 0, "w": 2},
-
-                {"matrix": [7, 7], "x": 19, "y": 0},
-
-                {"matrix": [1, 0], "x": 1.5, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 3, "y": 1},
-                {"matrix": [1, 2], "x": 4, "y": 1},
-                {"matrix": [1, 3], "x": 5, "y": 1},
-                {"matrix": [1, 4], "x": 6, "y": 1},
-                {"matrix": [1, 5], "x": 7, "y": 1},
-
-                {"matrix": [6, 0], "x": 10, "y": 1},
-                {"matrix": [6, 1], "x": 11, "y": 1},
-                {"matrix": [6, 2], "x": 12, "y": 1},
-                {"matrix": [6, 3], "x": 13, "y": 1},
-                {"matrix": [6, 4], "x": 14, "y": 1},
-                {"matrix": [6, 5], "x": 15, "y": 1},
-                {"matrix": [6, 6], "x": 16, "y": 1},
-                {"matrix": [6, 7], "x": 17, "y": 1, "w": 1.5},
-
-                {"matrix": [8, 7], "x": 19, "y": 1},
-
-                {"matrix": [4, 5], "x": 0, "y": 2},
-
-                {"matrix": [2, 0], "x": 1.5, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 3.25, "y": 2},
-                {"matrix": [2, 2], "x": 4.25, "y": 2},
-                {"matrix": [2, 3], "x": 5.25, "y": 2},
-                {"matrix": [2, 4], "x": 6.25, "y": 2},
-                {"matrix": [2, 5], "x": 7.25, "y": 2},
-
-                {"matrix": [7, 0], "x": 10.25, "y": 2},
-                {"matrix": [7, 1], "x": 11.25, "y": 2},
-                {"matrix": [7, 2], "x": 12.25, "y": 2},
-                {"matrix": [7, 3], "x": 13.25, "y": 2},
-                {"matrix": [7, 4], "x": 14.25, "y": 2},
-                {"matrix": [7, 5], "x": 15.25, "y": 2},
-                {"matrix": [7, 6], "x": 16.25, "y": 2, "w": 2.25},
-
-                {"matrix": [9, 7], "x": 19, "y": 2},
-
-                {"matrix": [4, 6], "x": 0, "y": 3},
-
-                {"matrix": [3, 0], "x": 1.5, "y": 3, "w": 2.25},
-                {"matrix": [3, 1], "x": 3.75, "y": 3},
-                {"matrix": [3, 2], "x": 4.75, "y": 3},
-                {"matrix": [3, 3], "x": 5.75, "y": 3},
-                {"matrix": [3, 4], "x": 6.75, "y": 3},
-                {"matrix": [3, 5], "x": 7.75, "y": 3},
-
-                {"matrix": [9, 6], "x": 9.75, "y": 3},
-                {"matrix": [8, 0], "x": 10.75, "y": 3},
-                {"matrix": [8, 1], "x": 11.75, "y": 3},
-                {"matrix": [8, 2], "x": 12.75, "y": 3},
-                {"matrix": [8, 3], "x": 13.75, "y": 3},
-                {"matrix": [8, 4], "x": 14.75, "y": 3},
-                {"matrix": [8, 5], "x": 15.75, "y": 3, "w": 1.75},
-                {"matrix": [8, 6], "x": 17.75, "y": 3.25},
-
-                {"matrix": [4, 7], "x": 0, "y": 4},
-
-                {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.75, "y": 4, "w": 1.25},
-                {"matrix": [4, 4], "x": 5.25, "y": 4, "w": 2.25},
-                {"matrix": [4, 3], "x": 7.5, "y": 4, "w": 1.25},
-
-                {"matrix": [9, 0], "x": 9.75, "y": 4, "w": 2.75},
-                {"matrix": [9, 1], "x": 13.5, "y": 4, "w": 1.5},
-                {"matrix": [9, 2], "x": 15, "y": 4, "w": 1.5},
-
-                {"matrix": [9, 3], "x": 16.75, "y": 4.25},
-                {"matrix": [9, 4], "x": 17.75, "y": 4.25},
-                {"matrix": [9, 5], "x": 18.75, "y": 4.25}
-            ]
-        },
-        "LAYOUT_ansi_lspace_split_bksp": {
-            "layout": [
-                {"matrix": [0, 0], "x": 1.5, "y": 0},
-                {"matrix": [0, 1], "x": 2.5, "y": 0},
-                {"matrix": [0, 2], "x": 3.5, "y": 0},
-                {"matrix": [0, 3], "x": 4.5, "y": 0},
-                {"matrix": [0, 4], "x": 5.5, "y": 0},
-                {"matrix": [0, 5], "x": 6.5, "y": 0},
-                {"matrix": [0, 6], "x": 7.5, "y": 0},
-
-                {"matrix": [5, 0], "x": 10.5, "y": 0},
-                {"matrix": [5, 1], "x": 11.5, "y": 0},
-                {"matrix": [5, 2], "x": 12.5, "y": 0},
-                {"matrix": [5, 3], "x": 13.5, "y": 0},
-                {"matrix": [5, 4], "x": 14.5, "y": 0},
-                {"matrix": [5, 5], "x": 15.5, "y": 0},
-                {"matrix": [5, 6], "x": 16.5, "y": 0},
-                {"matrix": [5, 7], "x": 17.5, "y": 0},
-
-                {"matrix": [7, 7], "x": 19, "y": 0},
-
-                {"matrix": [1, 0], "x": 1.5, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 3, "y": 1},
-                {"matrix": [1, 2], "x": 4, "y": 1},
-                {"matrix": [1, 3], "x": 5, "y": 1},
-                {"matrix": [1, 4], "x": 6, "y": 1},
-                {"matrix": [1, 5], "x": 7, "y": 1},
-
-                {"matrix": [6, 0], "x": 10, "y": 1},
-                {"matrix": [6, 1], "x": 11, "y": 1},
-                {"matrix": [6, 2], "x": 12, "y": 1},
-                {"matrix": [6, 3], "x": 13, "y": 1},
-                {"matrix": [6, 4], "x": 14, "y": 1},
-                {"matrix": [6, 5], "x": 15, "y": 1},
-                {"matrix": [6, 6], "x": 16, "y": 1},
-                {"matrix": [6, 7], "x": 17, "y": 1, "w": 1.5},
-
-                {"matrix": [8, 7], "x": 19, "y": 1},
-
-                {"matrix": [4, 5], "x": 0, "y": 2},
-
-                {"matrix": [2, 0], "x": 1.5, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 3.25, "y": 2},
-                {"matrix": [2, 2], "x": 4.25, "y": 2},
-                {"matrix": [2, 3], "x": 5.25, "y": 2},
-                {"matrix": [2, 4], "x": 6.25, "y": 2},
-                {"matrix": [2, 5], "x": 7.25, "y": 2},
-
-                {"matrix": [7, 0], "x": 10.25, "y": 2},
-                {"matrix": [7, 1], "x": 11.25, "y": 2},
-                {"matrix": [7, 2], "x": 12.25, "y": 2},
-                {"matrix": [7, 3], "x": 13.25, "y": 2},
-                {"matrix": [7, 4], "x": 14.25, "y": 2},
-                {"matrix": [7, 5], "x": 15.25, "y": 2},
-                {"matrix": [7, 6], "x": 16.25, "y": 2, "w": 2.25},
-
-                {"matrix": [9, 7], "x": 19, "y": 2},
-
-                {"matrix": [4, 6], "x": 0, "y": 3},
-
-                {"matrix": [3, 0], "x": 1.5, "y": 3, "w": 2.25},
-                {"matrix": [3, 1], "x": 3.75, "y": 3},
-                {"matrix": [3, 2], "x": 4.75, "y": 3},
-                {"matrix": [3, 3], "x": 5.75, "y": 3},
-                {"matrix": [3, 4], "x": 6.75, "y": 3},
-                {"matrix": [3, 5], "x": 7.75, "y": 3},
-
-                {"matrix": [9, 6], "x": 9.75, "y": 3},
-                {"matrix": [8, 0], "x": 10.75, "y": 3},
-                {"matrix": [8, 1], "x": 11.75, "y": 3},
-                {"matrix": [8, 2], "x": 12.75, "y": 3},
-                {"matrix": [8, 3], "x": 13.75, "y": 3},
-                {"matrix": [8, 4], "x": 14.75, "y": 3},
-                {"matrix": [8, 5], "x": 15.75, "y": 3, "w": 1.75},
-                {"matrix": [8, 6], "x": 17.75, "y": 3.25},
-
-                {"matrix": [4, 7], "x": 0, "y": 4},
-
-                {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.75, "y": 4, "w": 1.25},
-                {"matrix": [4, 4], "x": 5.25, "y": 4, "w": 2.25},
-                {"matrix": [4, 3], "x": 7.5, "y": 4, "w": 1.25},
-
-                {"matrix": [9, 0], "x": 9.75, "y": 4, "w": 2.75},
-                {"matrix": [9, 1], "x": 13.5, "y": 4, "w": 1.5},
-                {"matrix": [9, 2], "x": 15, "y": 4, "w": 1.5},
-
-                {"matrix": [9, 3], "x": 16.75, "y": 4.25},
-                {"matrix": [9, 4], "x": 17.75, "y": 4.25},
-                {"matrix": [9, 5], "x": 18.75, "y": 4.25}
-            ]
-        },
-        "LAYOUT_ansi_rspace_2u_bksp": {
-            "layout": [
-                {"matrix": [0, 0], "x": 1.5, "y": 0},
-                {"matrix": [0, 1], "x": 2.5, "y": 0},
-                {"matrix": [0, 2], "x": 3.5, "y": 0},
-                {"matrix": [0, 3], "x": 4.5, "y": 0},
-                {"matrix": [0, 4], "x": 5.5, "y": 0},
-                {"matrix": [0, 5], "x": 6.5, "y": 0},
-                {"matrix": [0, 6], "x": 7.5, "y": 0},
-
-                {"matrix": [5, 0], "x": 10.5, "y": 0},
-                {"matrix": [5, 1], "x": 11.5, "y": 0},
-                {"matrix": [5, 2], "x": 12.5, "y": 0},
-                {"matrix": [5, 3], "x": 13.5, "y": 0},
-                {"matrix": [5, 4], "x": 14.5, "y": 0},
-                {"matrix": [5, 5], "x": 15.5, "y": 0},
-                {"matrix": [5, 7], "x": 16.5, "y": 0, "w": 2},
-
-                {"matrix": [7, 7], "x": 19, "y": 0},
-
-                {"matrix": [1, 0], "x": 1.5, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 3, "y": 1},
-                {"matrix": [1, 2], "x": 4, "y": 1},
-                {"matrix": [1, 3], "x": 5, "y": 1},
-                {"matrix": [1, 4], "x": 6, "y": 1},
-                {"matrix": [1, 5], "x": 7, "y": 1},
-
-                {"matrix": [6, 0], "x": 10, "y": 1},
-                {"matrix": [6, 1], "x": 11, "y": 1},
-                {"matrix": [6, 2], "x": 12, "y": 1},
-                {"matrix": [6, 3], "x": 13, "y": 1},
-                {"matrix": [6, 4], "x": 14, "y": 1},
-                {"matrix": [6, 5], "x": 15, "y": 1},
-                {"matrix": [6, 6], "x": 16, "y": 1},
-                {"matrix": [6, 7], "x": 17, "y": 1, "w": 1.5},
-
-                {"matrix": [8, 7], "x": 19, "y": 1},
-
-                {"matrix": [4, 5], "x": 0, "y": 2},
-
-                {"matrix": [2, 0], "x": 1.5, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 3.25, "y": 2},
-                {"matrix": [2, 2], "x": 4.25, "y": 2},
-                {"matrix": [2, 3], "x": 5.25, "y": 2},
-                {"matrix": [2, 4], "x": 6.25, "y": 2},
-                {"matrix": [2, 5], "x": 7.25, "y": 2},
-
-                {"matrix": [7, 0], "x": 10.25, "y": 2},
-                {"matrix": [7, 1], "x": 11.25, "y": 2},
-                {"matrix": [7, 2], "x": 12.25, "y": 2},
-                {"matrix": [7, 3], "x": 13.25, "y": 2},
-                {"matrix": [7, 4], "x": 14.25, "y": 2},
-                {"matrix": [7, 5], "x": 15.25, "y": 2},
-                {"matrix": [7, 6], "x": 16.25, "y": 2, "w": 2.25},
-
-                {"matrix": [9, 7], "x": 19, "y": 2},
-
-                {"matrix": [4, 6], "x": 0, "y": 3},
-
-                {"matrix": [3, 0], "x": 1.5, "y": 3, "w": 2.25},
-                {"matrix": [3, 1], "x": 3.75, "y": 3},
-                {"matrix": [3, 2], "x": 4.75, "y": 3},
-                {"matrix": [3, 3], "x": 5.75, "y": 3},
-                {"matrix": [3, 4], "x": 6.75, "y": 3},
-                {"matrix": [3, 5], "x": 7.75, "y": 3},
-
-                {"matrix": [9, 6], "x": 9.75, "y": 3},
-                {"matrix": [8, 0], "x": 10.75, "y": 3},
-                {"matrix": [8, 1], "x": 11.75, "y": 3},
-                {"matrix": [8, 2], "x": 12.75, "y": 3},
-                {"matrix": [8, 3], "x": 13.75, "y": 3},
-                {"matrix": [8, 4], "x": 14.75, "y": 3},
-                {"matrix": [8, 5], "x": 15.75, "y": 3, "w": 1.75},
-                {"matrix": [8, 6], "x": 17.75, "y": 3.25},
-
-                {"matrix": [4, 7], "x": 0, "y": 4},
-
-                {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.75, "y": 4, "w": 1.25},
-                {"matrix": [4, 3], "x": 5.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 4], "x": 6.5, "y": 4, "w": 2.25},
-
-                {"matrix": [9, 0], "x": 9.75, "y": 4, "w": 2.75},
-                {"matrix": [9, 1], "x": 13.5, "y": 4, "w": 1.5},
-                {"matrix": [9, 2], "x": 15, "y": 4, "w": 1.5},
-
-                {"matrix": [9, 3], "x": 16.75, "y": 4.25},
-                {"matrix": [9, 4], "x": 17.75, "y": 4.25},
-                {"matrix": [9, 5], "x": 18.75, "y": 4.25}
-            ]
-        },
-        "LAYOUT_ansi_rspace_split_bksp": {
-            "layout": [
-                {"matrix": [0, 0], "x": 1.5, "y": 0},
-                {"matrix": [0, 1], "x": 2.5, "y": 0},
-                {"matrix": [0, 2], "x": 3.5, "y": 0},
-                {"matrix": [0, 3], "x": 4.5, "y": 0},
-                {"matrix": [0, 4], "x": 5.5, "y": 0},
-                {"matrix": [0, 5], "x": 6.5, "y": 0},
-                {"matrix": [0, 6], "x": 7.5, "y": 0},
-
-                {"matrix": [5, 0], "x": 10.5, "y": 0},
-                {"matrix": [5, 1], "x": 11.5, "y": 0},
-                {"matrix": [5, 2], "x": 12.5, "y": 0},
-                {"matrix": [5, 3], "x": 13.5, "y": 0},
-                {"matrix": [5, 4], "x": 14.5, "y": 0},
-                {"matrix": [5, 5], "x": 15.5, "y": 0},
-                {"matrix": [5, 6], "x": 16.5, "y": 0},
-                {"matrix": [5, 7], "x": 17.5, "y": 0},
-
-                {"matrix": [7, 7], "x": 19, "y": 0},
-
-                {"matrix": [1, 0], "x": 1.5, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 3, "y": 1},
-                {"matrix": [1, 2], "x": 4, "y": 1},
-                {"matrix": [1, 3], "x": 5, "y": 1},
-                {"matrix": [1, 4], "x": 6, "y": 1},
-                {"matrix": [1, 5], "x": 7, "y": 1},
-
-                {"matrix": [6, 0], "x": 10, "y": 1},
-                {"matrix": [6, 1], "x": 11, "y": 1},
-                {"matrix": [6, 2], "x": 12, "y": 1},
-                {"matrix": [6, 3], "x": 13, "y": 1},
-                {"matrix": [6, 4], "x": 14, "y": 1},
-                {"matrix": [6, 5], "x": 15, "y": 1},
-                {"matrix": [6, 6], "x": 16, "y": 1},
-                {"matrix": [6, 7], "x": 17, "y": 1, "w": 1.5},
-
-                {"matrix": [8, 7], "x": 19, "y": 1},
-
-                {"matrix": [4, 5], "x": 0, "y": 2},
-
-                {"matrix": [2, 0], "x": 1.5, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 3.25, "y": 2},
-                {"matrix": [2, 2], "x": 4.25, "y": 2},
-                {"matrix": [2, 3], "x": 5.25, "y": 2},
-                {"matrix": [2, 4], "x": 6.25, "y": 2},
-                {"matrix": [2, 5], "x": 7.25, "y": 2},
-
-                {"matrix": [7, 0], "x": 10.25, "y": 2},
-                {"matrix": [7, 1], "x": 11.25, "y": 2},
-                {"matrix": [7, 2], "x": 12.25, "y": 2},
-                {"matrix": [7, 3], "x": 13.25, "y": 2},
-                {"matrix": [7, 4], "x": 14.25, "y": 2},
-                {"matrix": [7, 5], "x": 15.25, "y": 2},
-                {"matrix": [7, 6], "x": 16.25, "y": 2, "w": 2.25},
-
-                {"matrix": [9, 7], "x": 19, "y": 2},
-
-                {"matrix": [4, 6], "x": 0, "y": 3},
-
-                {"matrix": [3, 0], "x": 1.5, "y": 3, "w": 2.25},
-                {"matrix": [3, 1], "x": 3.75, "y": 3},
-                {"matrix": [3, 2], "x": 4.75, "y": 3},
-                {"matrix": [3, 3], "x": 5.75, "y": 3},
-                {"matrix": [3, 4], "x": 6.75, "y": 3},
-                {"matrix": [3, 5], "x": 7.75, "y": 3},
-
-                {"matrix": [9, 6], "x": 9.75, "y": 3},
-                {"matrix": [8, 0], "x": 10.75, "y": 3},
-                {"matrix": [8, 1], "x": 11.75, "y": 3},
-                {"matrix": [8, 2], "x": 12.75, "y": 3},
-                {"matrix": [8, 3], "x": 13.75, "y": 3},
-                {"matrix": [8, 4], "x": 14.75, "y": 3},
-                {"matrix": [8, 5], "x": 15.75, "y": 3, "w": 1.75},
-
-                {"matrix": [8, 6], "x": 17.75, "y": 3.25},
-
-                {"matrix": [4, 7], "x": 0, "y": 4},
-
-                {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.75, "y": 4, "w": 1.25},
-                {"matrix": [4, 3], "x": 5.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 4], "x": 6.5, "y": 4, "w": 2.25},
-
-                {"matrix": [9, 0], "x": 9.75, "y": 4, "w": 2.75},
-                {"matrix": [9, 1], "x": 13.5, "y": 4, "w": 1.5},
-                {"matrix": [9, 2], "x": 15, "y": 4, "w": 1.5},
-
-                {"matrix": [9, 3], "x": 16.75, "y": 4.25},
-                {"matrix": [9, 4], "x": 17.75, "y": 4.25},
-                {"matrix": [9, 5], "x": 18.75, "y": 4.25}
-            ]
-        },
-        "LAYOUT_iso_lspace_2u_bksp": {
-            "layout": [
-                {"matrix": [0, 0], "x": 1.5, "y": 0},
-                {"matrix": [0, 1], "x": 2.5, "y": 0},
-                {"matrix": [0, 2], "x": 3.5, "y": 0},
-                {"matrix": [0, 3], "x": 4.5, "y": 0},
-                {"matrix": [0, 4], "x": 5.5, "y": 0},
-                {"matrix": [0, 5], "x": 6.5, "y": 0},
-                {"matrix": [0, 6], "x": 7.5, "y": 0},
-
-                {"matrix": [5, 0], "x": 10.5, "y": 0},
-                {"matrix": [5, 1], "x": 11.5, "y": 0},
-                {"matrix": [5, 2], "x": 12.5, "y": 0},
-                {"matrix": [5, 3], "x": 13.5, "y": 0},
-                {"matrix": [5, 4], "x": 14.5, "y": 0},
-                {"matrix": [5, 5], "x": 15.5, "y": 0},
-                {"matrix": [5, 7], "x": 16.5, "y": 0, "w": 2},
-
-                {"matrix": [7, 7], "x": 19, "y": 0},
-
-                {"matrix": [1, 0], "x": 1.5, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 3, "y": 1},
-                {"matrix": [1, 2], "x": 4, "y": 1},
-                {"matrix": [1, 3], "x": 5, "y": 1},
-                {"matrix": [1, 4], "x": 6, "y": 1},
-                {"matrix": [1, 5], "x": 7, "y": 1},
-
-                {"matrix": [6, 0], "x": 10, "y": 1},
-                {"matrix": [6, 1], "x": 11, "y": 1},
-                {"matrix": [6, 2], "x": 12, "y": 1},
-                {"matrix": [6, 3], "x": 13, "y": 1},
-                {"matrix": [6, 4], "x": 14, "y": 1},
-                {"matrix": [6, 5], "x": 15, "y": 1},
-                {"matrix": [6, 6], "x": 16, "y": 1},
-
-                {"matrix": [8, 7], "x": 19, "y": 1},
-
-                {"matrix": [4, 5], "x": 0, "y": 2},
-
-                {"matrix": [2, 0], "x": 1.5, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 3.25, "y": 2},
-                {"matrix": [2, 2], "x": 4.25, "y": 2},
-                {"matrix": [2, 3], "x": 5.25, "y": 2},
-                {"matrix": [2, 4], "x": 6.25, "y": 2},
-                {"matrix": [2, 5], "x": 7.25, "y": 2},
-
-                {"matrix": [7, 0], "x": 10.25, "y": 2},
-                {"matrix": [7, 1], "x": 11.25, "y": 2},
-                {"matrix": [7, 2], "x": 12.25, "y": 2},
-                {"matrix": [7, 3], "x": 13.25, "y": 2},
-                {"matrix": [7, 4], "x": 14.25, "y": 2},
-                {"matrix": [7, 5], "x": 15.25, "y": 2},
-                {"matrix": [6, 7], "x": 16.25, "y": 2},
-                {"matrix": [7, 6], "x": 17.25, "y": 1, "w": 1.25, "h": 2},
-
-                {"matrix": [9, 7], "x": 19, "y": 2},
-
-                {"matrix": [4, 6], "x": 0, "y": 3},
-
-                {"matrix": [3, 0], "x": 1.5, "y": 3, "w": 1.25},
-                {"matrix": [4, 1], "x": 2.75, "y": 3},
-                {"matrix": [3, 1], "x": 3.75, "y": 3},
-                {"matrix": [3, 2], "x": 4.75, "y": 3},
-                {"matrix": [3, 3], "x": 5.75, "y": 3},
-                {"matrix": [3, 4], "x": 6.75, "y": 3},
-                {"matrix": [3, 5], "x": 7.75, "y": 3},
-
-                {"matrix": [9, 6], "x": 9.75, "y": 3},
-                {"matrix": [8, 0], "x": 10.75, "y": 3},
-                {"matrix": [8, 1], "x": 11.75, "y": 3},
-                {"matrix": [8, 2], "x": 12.75, "y": 3},
-                {"matrix": [8, 3], "x": 13.75, "y": 3},
-                {"matrix": [8, 4], "x": 14.75, "y": 3},
-                {"matrix": [8, 5], "x": 15.75, "y": 3, "w": 1.75},
-
-                {"matrix": [8, 6], "x": 17.75, "y": 3.25},
-
-                {"matrix": [4, 7], "x": 0, "y": 4},
-
-                {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.75, "y": 4, "w": 1.25},
-                {"matrix": [4, 4], "x": 5.25, "y": 4, "w": 2.25},
-                {"matrix": [4, 3], "x": 7.5, "y": 4, "w": 1.25},
-
-                {"matrix": [9, 0], "x": 9.75, "y": 4, "w": 2.75},
-                {"matrix": [9, 1], "x": 13.5, "y": 4, "w": 1.5},
-                {"matrix": [9, 2], "x": 15, "y": 4, "w": 1.5},
-
-                {"matrix": [9, 3], "x": 16.75, "y": 4.25},
-                {"matrix": [9, 4], "x": 17.75, "y": 4.25},
-                {"matrix": [9, 5], "x": 18.75, "y": 4.25}
-            ]
-        },
-        "LAYOUT_iso_lspace_split_bksp": {
-            "layout": [
-                {"matrix": [0, 0], "x": 1.5, "y": 0},
-                {"matrix": [0, 1], "x": 2.5, "y": 0},
-                {"matrix": [0, 2], "x": 3.5, "y": 0},
-                {"matrix": [0, 3], "x": 4.5, "y": 0},
-                {"matrix": [0, 4], "x": 5.5, "y": 0},
-                {"matrix": [0, 5], "x": 6.5, "y": 0},
-                {"matrix": [0, 6], "x": 7.5, "y": 0},
-
-                {"matrix": [5, 0], "x": 10.5, "y": 0},
-                {"matrix": [5, 1], "x": 11.5, "y": 0},
-                {"matrix": [5, 2], "x": 12.5, "y": 0},
-                {"matrix": [5, 3], "x": 13.5, "y": 0},
-                {"matrix": [5, 4], "x": 14.5, "y": 0},
-                {"matrix": [5, 5], "x": 15.5, "y": 0},
-                {"matrix": [5, 6], "x": 16.5, "y": 0},
-                {"matrix": [5, 7], "x": 17.5, "y": 0},
-
-                {"matrix": [7, 7], "x": 19, "y": 0},
-
-                {"matrix": [1, 0], "x": 1.5, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 3, "y": 1},
-                {"matrix": [1, 2], "x": 4, "y": 1},
-                {"matrix": [1, 3], "x": 5, "y": 1},
-                {"matrix": [1, 4], "x": 6, "y": 1},
-                {"matrix": [1, 5], "x": 7, "y": 1},
-
-                {"matrix": [6, 0], "x": 10, "y": 1},
-                {"matrix": [6, 1], "x": 11, "y": 1},
-                {"matrix": [6, 2], "x": 12, "y": 1},
-                {"matrix": [6, 3], "x": 13, "y": 1},
-                {"matrix": [6, 4], "x": 14, "y": 1},
-                {"matrix": [6, 5], "x": 15, "y": 1},
-                {"matrix": [6, 6], "x": 16, "y": 1},
-
-                {"matrix": [8, 7], "x": 19, "y": 1},
-
-                {"matrix": [4, 5], "x": 0, "y": 2},
-
-                {"matrix": [2, 0], "x": 1.5, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 3.25, "y": 2},
-                {"matrix": [2, 2], "x": 4.25, "y": 2},
-                {"matrix": [2, 3], "x": 5.25, "y": 2},
-                {"matrix": [2, 4], "x": 6.25, "y": 2},
-                {"matrix": [2, 5], "x": 7.25, "y": 2},
-
-                {"matrix": [7, 0], "x": 10.25, "y": 2},
-                {"matrix": [7, 1], "x": 11.25, "y": 2},
-                {"matrix": [7, 2], "x": 12.25, "y": 2},
-                {"matrix": [7, 3], "x": 13.25, "y": 2},
-                {"matrix": [7, 4], "x": 14.25, "y": 2},
-                {"matrix": [7, 5], "x": 15.25, "y": 2},
-                {"matrix": [6, 7], "x": 16.25, "y": 2},
-                {"matrix": [7, 6], "x": 17.25, "y": 1, "w": 1.25, "h": 2},
-
-                {"matrix": [9, 7], "x": 19, "y": 2},
-
-                {"matrix": [4, 6], "x": 0, "y": 3},
-
-                {"matrix": [3, 0], "x": 1.5, "y": 3, "w": 1.25},
-                {"matrix": [4, 1], "x": 2.75, "y": 3},
-                {"matrix": [3, 1], "x": 3.75, "y": 3},
-                {"matrix": [3, 2], "x": 4.75, "y": 3},
-                {"matrix": [3, 3], "x": 5.75, "y": 3},
-                {"matrix": [3, 4], "x": 6.75, "y": 3},
-                {"matrix": [3, 5], "x": 7.75, "y": 3},
-
-                {"matrix": [9, 6], "x": 9.75, "y": 3},
-                {"matrix": [8, 0], "x": 10.75, "y": 3},
-                {"matrix": [8, 1], "x": 11.75, "y": 3},
-                {"matrix": [8, 2], "x": 12.75, "y": 3},
-                {"matrix": [8, 3], "x": 13.75, "y": 3},
-                {"matrix": [8, 4], "x": 14.75, "y": 3},
-                {"matrix": [8, 5], "x": 15.75, "y": 3, "w": 1.75},
-
-                {"matrix": [8, 6], "x": 17.75, "y": 3.25},
-
-                {"matrix": [4, 7], "x": 0, "y": 4},
-
-                {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.75, "y": 4, "w": 1.25},
-                {"matrix": [4, 4], "x": 5.25, "y": 4, "w": 2.25},
-                {"matrix": [4, 3], "x": 7.5, "y": 4, "w": 1.25},
-
-                {"matrix": [9, 0], "x": 9.75, "y": 4, "w": 2.75},
-                {"matrix": [9, 1], "x": 13.5, "y": 4, "w": 1.5},
-                {"matrix": [9, 2], "x": 15, "y": 4, "w": 1.5},
-
-                {"matrix": [9, 3], "x": 16.75, "y": 4.25},
-                {"matrix": [9, 4], "x": 17.75, "y": 4.25},
-                {"matrix": [9, 5], "x": 18.75, "y": 4.25}
-            ]
-        },
-        "LAYOUT_iso_rspace_2u_bksp": {
-            "layout": [
-                {"matrix": [0, 0], "x": 1.5, "y": 0},
-                {"matrix": [0, 1], "x": 2.5, "y": 0},
-                {"matrix": [0, 2], "x": 3.5, "y": 0},
-                {"matrix": [0, 3], "x": 4.5, "y": 0},
-                {"matrix": [0, 4], "x": 5.5, "y": 0},
-                {"matrix": [0, 5], "x": 6.5, "y": 0},
-                {"matrix": [0, 6], "x": 7.5, "y": 0},
-
-                {"matrix": [5, 0], "x": 10.5, "y": 0},
-                {"matrix": [5, 1], "x": 11.5, "y": 0},
-                {"matrix": [5, 2], "x": 12.5, "y": 0},
-                {"matrix": [5, 3], "x": 13.5, "y": 0},
-                {"matrix": [5, 4], "x": 14.5, "y": 0},
-                {"matrix": [5, 5], "x": 15.5, "y": 0},
-                {"matrix": [5, 7], "x": 16.5, "y": 0, "w": 2},
-
-                {"matrix": [7, 7], "x": 19, "y": 0},
-
-                {"matrix": [1, 0], "x": 1.5, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 3, "y": 1},
-                {"matrix": [1, 2], "x": 4, "y": 1},
-                {"matrix": [1, 3], "x": 5, "y": 1},
-                {"matrix": [1, 4], "x": 6, "y": 1},
-                {"matrix": [1, 5], "x": 7, "y": 1},
-
-                {"matrix": [6, 0], "x": 10, "y": 1},
-                {"matrix": [6, 1], "x": 11, "y": 1},
-                {"matrix": [6, 2], "x": 12, "y": 1},
-                {"matrix": [6, 3], "x": 13, "y": 1},
-                {"matrix": [6, 4], "x": 14, "y": 1},
-                {"matrix": [6, 5], "x": 15, "y": 1},
-                {"matrix": [6, 6], "x": 16, "y": 1},
-
-                {"matrix": [8, 7], "x": 19, "y": 1},
-
-                {"matrix": [4, 5], "x": 0, "y": 2},
-
-                {"matrix": [2, 0], "x": 1.5, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 3.25, "y": 2},
-                {"matrix": [2, 2], "x": 4.25, "y": 2},
-                {"matrix": [2, 3], "x": 5.25, "y": 2},
-                {"matrix": [2, 4], "x": 6.25, "y": 2},
-                {"matrix": [2, 5], "x": 7.25, "y": 2},
-
-                {"matrix": [7, 0], "x": 10.25, "y": 2},
-                {"matrix": [7, 1], "x": 11.25, "y": 2},
-                {"matrix": [7, 2], "x": 12.25, "y": 2},
-                {"matrix": [7, 3], "x": 13.25, "y": 2},
-                {"matrix": [7, 4], "x": 14.25, "y": 2},
-                {"matrix": [7, 5], "x": 15.25, "y": 2},
-                {"matrix": [6, 7], "x": 16.25, "y": 2},
-                {"matrix": [7, 6], "x": 17.25, "y": 1, "w": 1.25, "h": 2},
-
-                {"matrix": [9, 7], "x": 19, "y": 2},
-
-                {"matrix": [4, 6], "x": 0, "y": 3},
-
-                {"matrix": [3, 0], "x": 1.5, "y": 3, "w": 1.25},
-                {"matrix": [4, 1], "x": 2.75, "y": 3},
-                {"matrix": [3, 1], "x": 3.75, "y": 3},
-                {"matrix": [3, 2], "x": 4.75, "y": 3},
-                {"matrix": [3, 3], "x": 5.75, "y": 3},
-                {"matrix": [3, 4], "x": 6.75, "y": 3},
-                {"matrix": [3, 5], "x": 7.75, "y": 3},
-
-                {"matrix": [9, 6], "x": 9.75, "y": 3},
-                {"matrix": [8, 0], "x": 10.75, "y": 3},
-                {"matrix": [8, 1], "x": 11.75, "y": 3},
-                {"matrix": [8, 2], "x": 12.75, "y": 3},
-                {"matrix": [8, 3], "x": 13.75, "y": 3},
-                {"matrix": [8, 4], "x": 14.75, "y": 3},
-                {"matrix": [8, 5], "x": 15.75, "y": 3, "w": 1.75},
-
-                {"matrix": [8, 6], "x": 17.75, "y": 3.25},
-
-                {"matrix": [4, 7], "x": 0, "y": 4},
-
-                {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.75, "y": 4, "w": 1.25},
-                {"matrix": [4, 3], "x": 5.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 4], "x": 6.5, "y": 4, "w": 2.25},
-
-                {"matrix": [9, 0], "x": 9.75, "y": 4, "w": 2.75},
-                {"matrix": [9, 1], "x": 13.5, "y": 4, "w": 1.5},
-                {"matrix": [9, 2], "x": 15, "y": 4, "w": 1.5},
-
-                {"matrix": [9, 3], "x": 16.75, "y": 4.25},
-                {"matrix": [9, 4], "x": 17.75, "y": 4.25},
-                {"matrix": [9, 5], "x": 18.75, "y": 4.25}
-            ]
-        },
-        "LAYOUT_iso_rspace_split_bksp": {
-            "layout": [
-                {"matrix": [0, 0], "x": 1.5, "y": 0},
-                {"matrix": [0, 1], "x": 2.5, "y": 0},
-                {"matrix": [0, 2], "x": 3.5, "y": 0},
-                {"matrix": [0, 3], "x": 4.5, "y": 0},
-                {"matrix": [0, 4], "x": 5.5, "y": 0},
-                {"matrix": [0, 5], "x": 6.5, "y": 0},
-                {"matrix": [0, 6], "x": 7.5, "y": 0},
-
-                {"matrix": [5, 0], "x": 10.5, "y": 0},
-                {"matrix": [5, 1], "x": 11.5, "y": 0},
-                {"matrix": [5, 2], "x": 12.5, "y": 0},
-                {"matrix": [5, 3], "x": 13.5, "y": 0},
-                {"matrix": [5, 4], "x": 14.5, "y": 0},
-                {"matrix": [5, 5], "x": 15.5, "y": 0},
-                {"matrix": [5, 6], "x": 16.5, "y": 0},
-                {"matrix": [5, 7], "x": 17.5, "y": 0},
-
-                {"matrix": [7, 7], "x": 19, "y": 0},
-
-                {"matrix": [1, 0], "x": 1.5, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 3, "y": 1},
-                {"matrix": [1, 2], "x": 4, "y": 1},
-                {"matrix": [1, 3], "x": 5, "y": 1},
-                {"matrix": [1, 4], "x": 6, "y": 1},
-                {"matrix": [1, 5], "x": 7, "y": 1},
-
-                {"matrix": [6, 0], "x": 10, "y": 1},
-                {"matrix": [6, 1], "x": 11, "y": 1},
-                {"matrix": [6, 2], "x": 12, "y": 1},
-                {"matrix": [6, 3], "x": 13, "y": 1},
-                {"matrix": [6, 4], "x": 14, "y": 1},
-                {"matrix": [6, 5], "x": 15, "y": 1},
-                {"matrix": [6, 6], "x": 16, "y": 1},
-
-                {"matrix": [8, 7], "x": 19, "y": 1},
-
-                {"matrix": [4, 5], "x": 0, "y": 2},
-
-                {"matrix": [2, 0], "x": 1.5, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 3.25, "y": 2},
-                {"matrix": [2, 2], "x": 4.25, "y": 2},
-                {"matrix": [2, 3], "x": 5.25, "y": 2},
-                {"matrix": [2, 4], "x": 6.25, "y": 2},
-                {"matrix": [2, 5], "x": 7.25, "y": 2},
-
-                {"matrix": [7, 0], "x": 10.25, "y": 2},
-                {"matrix": [7, 1], "x": 11.25, "y": 2},
-                {"matrix": [7, 2], "x": 12.25, "y": 2},
-                {"matrix": [7, 3], "x": 13.25, "y": 2},
-                {"matrix": [7, 4], "x": 14.25, "y": 2},
-                {"matrix": [7, 5], "x": 15.25, "y": 2},
-                {"matrix": [6, 7], "x": 16.25, "y": 2},
-                {"matrix": [7, 6], "x": 17.25, "y": 1, "w": 1.25, "h": 2},
-
-                {"matrix": [9, 7], "x": 19, "y": 2},
-
-                {"matrix": [4, 6], "x": 0, "y": 3},
-
-                {"matrix": [3, 0], "x": 1.5, "y": 3, "w": 1.25},
-                {"matrix": [4, 1], "x": 2.75, "y": 3},
-                {"matrix": [3, 1], "x": 3.75, "y": 3},
-                {"matrix": [3, 2], "x": 4.75, "y": 3},
-                {"matrix": [3, 3], "x": 5.75, "y": 3},
-                {"matrix": [3, 4], "x": 6.75, "y": 3},
-                {"matrix": [3, 5], "x": 7.75, "y": 3},
-
-                {"matrix": [9, 6], "x": 9.75, "y": 3},
-                {"matrix": [8, 0], "x": 10.75, "y": 3},
-                {"matrix": [8, 1], "x": 11.75, "y": 3},
-                {"matrix": [8, 2], "x": 12.75, "y": 3},
-                {"matrix": [8, 3], "x": 13.75, "y": 3},
-                {"matrix": [8, 4], "x": 14.75, "y": 3},
-                {"matrix": [8, 5], "x": 15.75, "y": 3, "w": 1.75},
-
-                {"matrix": [8, 6], "x": 17.75, "y": 3.25},
-
-                {"matrix": [4, 7], "x": 0, "y": 4},
-
-                {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.75, "y": 4, "w": 1.25},
-                {"matrix": [4, 3], "x": 5.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 4], "x": 6.5, "y": 4, "w": 2.25},
-
-                {"matrix": [9, 0], "x": 9.75, "y": 4, "w": 2.75},
-                {"matrix": [9, 1], "x": 13.5, "y": 4, "w": 1.5},
-                {"matrix": [9, 2], "x": 15, "y": 4, "w": 1.5},
-
-                {"matrix": [9, 3], "x": 16.75, "y": 4.25},
-                {"matrix": [9, 4], "x": 17.75, "y": 4.25},
-                {"matrix": [9, 5], "x": 18.75, "y": 4.25}
-            ]
-        }
-    }
-}
diff --git a/keyboards/merge/uma/keyboard.json b/keyboards/merge/uma/keyboard.json
new file mode 100644
index 00000000000..d5fea75fb49
--- /dev/null
+++ b/keyboards/merge/uma/keyboard.json
@@ -0,0 +1,879 @@
+{
+    "keyboard_name": "UM-A",
+    "manufacturer": "Merge",
+    "url": "https://mergedesign.store/products/um-a",
+    "maintainer": "duoshock",
+    "usb": {
+        "vid": "0x4D65",
+        "pid": "0x3232",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "nkro": true,
+        "backlight": true,
+        "encoder": true,
+        "oled": true
+    },
+    "build": {
+        "lto": true
+    },
+    "matrix_pins": {
+        "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "D6", "D4"],
+        "rows": ["B0", "B1", "B2", "B3", "B7"]
+    },
+    "diode_direction": "COL2ROW",
+    "backlight": {
+        "pin": "C6"
+    },
+    "encoder": {
+        "rotary": [
+            {"pin_a": "B4", "pin_b": "B5"}
+        ]
+    },
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "D2"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                {"matrix": [0, 0], "x": 1.5, "y": 0},
+                {"matrix": [0, 1], "x": 2.5, "y": 0},
+                {"matrix": [0, 2], "x": 3.5, "y": 0},
+                {"matrix": [0, 3], "x": 4.5, "y": 0},
+                {"matrix": [0, 4], "x": 5.5, "y": 0},
+                {"matrix": [0, 5], "x": 6.5, "y": 0},
+                {"matrix": [0, 6], "x": 7.5, "y": 0},
+
+                {"matrix": [5, 0], "x": 10.5, "y": 0},
+                {"matrix": [5, 1], "x": 11.5, "y": 0},
+                {"matrix": [5, 2], "x": 12.5, "y": 0},
+                {"matrix": [5, 3], "x": 13.5, "y": 0},
+                {"matrix": [5, 4], "x": 14.5, "y": 0},
+                {"matrix": [5, 5], "x": 15.5, "y": 0},
+                {"matrix": [5, 6], "x": 16.5, "y": 0},
+                {"matrix": [5, 7], "x": 17.5, "y": 0},
+
+                {"matrix": [7, 7], "x": 19, "y": 0},
+
+                {"matrix": [1, 0], "x": 1.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 3, "y": 1},
+                {"matrix": [1, 2], "x": 4, "y": 1},
+                {"matrix": [1, 3], "x": 5, "y": 1},
+                {"matrix": [1, 4], "x": 6, "y": 1},
+                {"matrix": [1, 5], "x": 7, "y": 1},
+
+                {"matrix": [6, 0], "x": 10, "y": 1},
+                {"matrix": [6, 1], "x": 11, "y": 1},
+                {"matrix": [6, 2], "x": 12, "y": 1},
+                {"matrix": [6, 3], "x": 13, "y": 1},
+                {"matrix": [6, 4], "x": 14, "y": 1},
+                {"matrix": [6, 5], "x": 15, "y": 1},
+                {"matrix": [6, 6], "x": 16, "y": 1},
+                {"matrix": [6, 7], "x": 17, "y": 1, "w": 1.5},
+
+                {"matrix": [8, 7], "x": 19, "y": 1},
+
+                {"matrix": [4, 5], "x": 0, "y": 2},
+
+                {"matrix": [2, 0], "x": 1.5, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 3.25, "y": 2},
+                {"matrix": [2, 2], "x": 4.25, "y": 2},
+                {"matrix": [2, 3], "x": 5.25, "y": 2},
+                {"matrix": [2, 4], "x": 6.25, "y": 2},
+                {"matrix": [2, 5], "x": 7.25, "y": 2},
+
+                {"matrix": [7, 0], "x": 10.25, "y": 2},
+                {"matrix": [7, 1], "x": 11.25, "y": 2},
+                {"matrix": [7, 2], "x": 12.25, "y": 2},
+                {"matrix": [7, 3], "x": 13.25, "y": 2},
+                {"matrix": [7, 4], "x": 14.25, "y": 2},
+                {"matrix": [7, 5], "x": 15.25, "y": 2},
+                {"matrix": [7, 6], "x": 16.25, "y": 2, "w": 2.25},
+
+                {"matrix": [9, 7], "x": 19, "y": 2},
+
+                {"matrix": [4, 6], "x": 0, "y": 3},
+
+                {"matrix": [3, 0], "x": 1.5, "y": 3, "w": 1.25},
+                {"matrix": [4, 1], "x": 2.75, "y": 3},
+                {"matrix": [3, 1], "x": 3.75, "y": 3},
+                {"matrix": [3, 2], "x": 4.75, "y": 3},
+                {"matrix": [3, 3], "x": 5.75, "y": 3},
+                {"matrix": [3, 4], "x": 6.75, "y": 3},
+                {"matrix": [3, 5], "x": 7.75, "y": 3},
+
+                {"matrix": [9, 6], "x": 9.75, "y": 3},
+                {"matrix": [8, 0], "x": 10.75, "y": 3},
+                {"matrix": [8, 1], "x": 11.75, "y": 3},
+                {"matrix": [8, 2], "x": 12.75, "y": 3},
+                {"matrix": [8, 3], "x": 13.75, "y": 3},
+                {"matrix": [8, 4], "x": 14.75, "y": 3},
+                {"matrix": [8, 5], "x": 15.75, "y": 3, "w": 1.75},
+
+                {"matrix": [8, 6], "x": 17.75, "y": 3.25},
+
+                {"matrix": [4, 7], "x": 0, "y": 4},
+
+                {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 5.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 6.5, "y": 4, "w": 2.25},
+
+                {"matrix": [9, 0], "x": 9.75, "y": 4, "w": 2.75},
+                {"matrix": [9, 1], "x": 13.5, "y": 4, "w": 1.5},
+                {"matrix": [9, 2], "x": 15, "y": 4, "w": 1.5},
+
+                {"matrix": [9, 3], "x": 16.75, "y": 4.25},
+                {"matrix": [9, 4], "x": 17.75, "y": 4.25},
+                {"matrix": [9, 5], "x": 18.75, "y": 4.25}
+            ]
+        },
+        "LAYOUT_ansi_lspace_2u_bksp": {
+            "layout": [
+                {"matrix": [0, 0], "x": 1.5, "y": 0},
+                {"matrix": [0, 1], "x": 2.5, "y": 0},
+                {"matrix": [0, 2], "x": 3.5, "y": 0},
+                {"matrix": [0, 3], "x": 4.5, "y": 0},
+                {"matrix": [0, 4], "x": 5.5, "y": 0},
+                {"matrix": [0, 5], "x": 6.5, "y": 0},
+                {"matrix": [0, 6], "x": 7.5, "y": 0},
+
+                {"matrix": [5, 0], "x": 10.5, "y": 0},
+                {"matrix": [5, 1], "x": 11.5, "y": 0},
+                {"matrix": [5, 2], "x": 12.5, "y": 0},
+                {"matrix": [5, 3], "x": 13.5, "y": 0},
+                {"matrix": [5, 4], "x": 14.5, "y": 0},
+                {"matrix": [5, 5], "x": 15.5, "y": 0},
+                {"matrix": [5, 7], "x": 16.5, "y": 0, "w": 2},
+
+                {"matrix": [7, 7], "x": 19, "y": 0},
+
+                {"matrix": [1, 0], "x": 1.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 3, "y": 1},
+                {"matrix": [1, 2], "x": 4, "y": 1},
+                {"matrix": [1, 3], "x": 5, "y": 1},
+                {"matrix": [1, 4], "x": 6, "y": 1},
+                {"matrix": [1, 5], "x": 7, "y": 1},
+
+                {"matrix": [6, 0], "x": 10, "y": 1},
+                {"matrix": [6, 1], "x": 11, "y": 1},
+                {"matrix": [6, 2], "x": 12, "y": 1},
+                {"matrix": [6, 3], "x": 13, "y": 1},
+                {"matrix": [6, 4], "x": 14, "y": 1},
+                {"matrix": [6, 5], "x": 15, "y": 1},
+                {"matrix": [6, 6], "x": 16, "y": 1},
+                {"matrix": [6, 7], "x": 17, "y": 1, "w": 1.5},
+
+                {"matrix": [8, 7], "x": 19, "y": 1},
+
+                {"matrix": [4, 5], "x": 0, "y": 2},
+
+                {"matrix": [2, 0], "x": 1.5, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 3.25, "y": 2},
+                {"matrix": [2, 2], "x": 4.25, "y": 2},
+                {"matrix": [2, 3], "x": 5.25, "y": 2},
+                {"matrix": [2, 4], "x": 6.25, "y": 2},
+                {"matrix": [2, 5], "x": 7.25, "y": 2},
+
+                {"matrix": [7, 0], "x": 10.25, "y": 2},
+                {"matrix": [7, 1], "x": 11.25, "y": 2},
+                {"matrix": [7, 2], "x": 12.25, "y": 2},
+                {"matrix": [7, 3], "x": 13.25, "y": 2},
+                {"matrix": [7, 4], "x": 14.25, "y": 2},
+                {"matrix": [7, 5], "x": 15.25, "y": 2},
+                {"matrix": [7, 6], "x": 16.25, "y": 2, "w": 2.25},
+
+                {"matrix": [9, 7], "x": 19, "y": 2},
+
+                {"matrix": [4, 6], "x": 0, "y": 3},
+
+                {"matrix": [3, 0], "x": 1.5, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 3.75, "y": 3},
+                {"matrix": [3, 2], "x": 4.75, "y": 3},
+                {"matrix": [3, 3], "x": 5.75, "y": 3},
+                {"matrix": [3, 4], "x": 6.75, "y": 3},
+                {"matrix": [3, 5], "x": 7.75, "y": 3},
+
+                {"matrix": [9, 6], "x": 9.75, "y": 3},
+                {"matrix": [8, 0], "x": 10.75, "y": 3},
+                {"matrix": [8, 1], "x": 11.75, "y": 3},
+                {"matrix": [8, 2], "x": 12.75, "y": 3},
+                {"matrix": [8, 3], "x": 13.75, "y": 3},
+                {"matrix": [8, 4], "x": 14.75, "y": 3},
+                {"matrix": [8, 5], "x": 15.75, "y": 3, "w": 1.75},
+                {"matrix": [8, 6], "x": 17.75, "y": 3.25},
+
+                {"matrix": [4, 7], "x": 0, "y": 4},
+
+                {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 5.25, "y": 4, "w": 2.25},
+                {"matrix": [4, 3], "x": 7.5, "y": 4, "w": 1.25},
+
+                {"matrix": [9, 0], "x": 9.75, "y": 4, "w": 2.75},
+                {"matrix": [9, 1], "x": 13.5, "y": 4, "w": 1.5},
+                {"matrix": [9, 2], "x": 15, "y": 4, "w": 1.5},
+
+                {"matrix": [9, 3], "x": 16.75, "y": 4.25},
+                {"matrix": [9, 4], "x": 17.75, "y": 4.25},
+                {"matrix": [9, 5], "x": 18.75, "y": 4.25}
+            ]
+        },
+        "LAYOUT_ansi_lspace_split_bksp": {
+            "layout": [
+                {"matrix": [0, 0], "x": 1.5, "y": 0},
+                {"matrix": [0, 1], "x": 2.5, "y": 0},
+                {"matrix": [0, 2], "x": 3.5, "y": 0},
+                {"matrix": [0, 3], "x": 4.5, "y": 0},
+                {"matrix": [0, 4], "x": 5.5, "y": 0},
+                {"matrix": [0, 5], "x": 6.5, "y": 0},
+                {"matrix": [0, 6], "x": 7.5, "y": 0},
+
+                {"matrix": [5, 0], "x": 10.5, "y": 0},
+                {"matrix": [5, 1], "x": 11.5, "y": 0},
+                {"matrix": [5, 2], "x": 12.5, "y": 0},
+                {"matrix": [5, 3], "x": 13.5, "y": 0},
+                {"matrix": [5, 4], "x": 14.5, "y": 0},
+                {"matrix": [5, 5], "x": 15.5, "y": 0},
+                {"matrix": [5, 6], "x": 16.5, "y": 0},
+                {"matrix": [5, 7], "x": 17.5, "y": 0},
+
+                {"matrix": [7, 7], "x": 19, "y": 0},
+
+                {"matrix": [1, 0], "x": 1.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 3, "y": 1},
+                {"matrix": [1, 2], "x": 4, "y": 1},
+                {"matrix": [1, 3], "x": 5, "y": 1},
+                {"matrix": [1, 4], "x": 6, "y": 1},
+                {"matrix": [1, 5], "x": 7, "y": 1},
+
+                {"matrix": [6, 0], "x": 10, "y": 1},
+                {"matrix": [6, 1], "x": 11, "y": 1},
+                {"matrix": [6, 2], "x": 12, "y": 1},
+                {"matrix": [6, 3], "x": 13, "y": 1},
+                {"matrix": [6, 4], "x": 14, "y": 1},
+                {"matrix": [6, 5], "x": 15, "y": 1},
+                {"matrix": [6, 6], "x": 16, "y": 1},
+                {"matrix": [6, 7], "x": 17, "y": 1, "w": 1.5},
+
+                {"matrix": [8, 7], "x": 19, "y": 1},
+
+                {"matrix": [4, 5], "x": 0, "y": 2},
+
+                {"matrix": [2, 0], "x": 1.5, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 3.25, "y": 2},
+                {"matrix": [2, 2], "x": 4.25, "y": 2},
+                {"matrix": [2, 3], "x": 5.25, "y": 2},
+                {"matrix": [2, 4], "x": 6.25, "y": 2},
+                {"matrix": [2, 5], "x": 7.25, "y": 2},
+
+                {"matrix": [7, 0], "x": 10.25, "y": 2},
+                {"matrix": [7, 1], "x": 11.25, "y": 2},
+                {"matrix": [7, 2], "x": 12.25, "y": 2},
+                {"matrix": [7, 3], "x": 13.25, "y": 2},
+                {"matrix": [7, 4], "x": 14.25, "y": 2},
+                {"matrix": [7, 5], "x": 15.25, "y": 2},
+                {"matrix": [7, 6], "x": 16.25, "y": 2, "w": 2.25},
+
+                {"matrix": [9, 7], "x": 19, "y": 2},
+
+                {"matrix": [4, 6], "x": 0, "y": 3},
+
+                {"matrix": [3, 0], "x": 1.5, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 3.75, "y": 3},
+                {"matrix": [3, 2], "x": 4.75, "y": 3},
+                {"matrix": [3, 3], "x": 5.75, "y": 3},
+                {"matrix": [3, 4], "x": 6.75, "y": 3},
+                {"matrix": [3, 5], "x": 7.75, "y": 3},
+
+                {"matrix": [9, 6], "x": 9.75, "y": 3},
+                {"matrix": [8, 0], "x": 10.75, "y": 3},
+                {"matrix": [8, 1], "x": 11.75, "y": 3},
+                {"matrix": [8, 2], "x": 12.75, "y": 3},
+                {"matrix": [8, 3], "x": 13.75, "y": 3},
+                {"matrix": [8, 4], "x": 14.75, "y": 3},
+                {"matrix": [8, 5], "x": 15.75, "y": 3, "w": 1.75},
+                {"matrix": [8, 6], "x": 17.75, "y": 3.25},
+
+                {"matrix": [4, 7], "x": 0, "y": 4},
+
+                {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 5.25, "y": 4, "w": 2.25},
+                {"matrix": [4, 3], "x": 7.5, "y": 4, "w": 1.25},
+
+                {"matrix": [9, 0], "x": 9.75, "y": 4, "w": 2.75},
+                {"matrix": [9, 1], "x": 13.5, "y": 4, "w": 1.5},
+                {"matrix": [9, 2], "x": 15, "y": 4, "w": 1.5},
+
+                {"matrix": [9, 3], "x": 16.75, "y": 4.25},
+                {"matrix": [9, 4], "x": 17.75, "y": 4.25},
+                {"matrix": [9, 5], "x": 18.75, "y": 4.25}
+            ]
+        },
+        "LAYOUT_ansi_rspace_2u_bksp": {
+            "layout": [
+                {"matrix": [0, 0], "x": 1.5, "y": 0},
+                {"matrix": [0, 1], "x": 2.5, "y": 0},
+                {"matrix": [0, 2], "x": 3.5, "y": 0},
+                {"matrix": [0, 3], "x": 4.5, "y": 0},
+                {"matrix": [0, 4], "x": 5.5, "y": 0},
+                {"matrix": [0, 5], "x": 6.5, "y": 0},
+                {"matrix": [0, 6], "x": 7.5, "y": 0},
+
+                {"matrix": [5, 0], "x": 10.5, "y": 0},
+                {"matrix": [5, 1], "x": 11.5, "y": 0},
+                {"matrix": [5, 2], "x": 12.5, "y": 0},
+                {"matrix": [5, 3], "x": 13.5, "y": 0},
+                {"matrix": [5, 4], "x": 14.5, "y": 0},
+                {"matrix": [5, 5], "x": 15.5, "y": 0},
+                {"matrix": [5, 7], "x": 16.5, "y": 0, "w": 2},
+
+                {"matrix": [7, 7], "x": 19, "y": 0},
+
+                {"matrix": [1, 0], "x": 1.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 3, "y": 1},
+                {"matrix": [1, 2], "x": 4, "y": 1},
+                {"matrix": [1, 3], "x": 5, "y": 1},
+                {"matrix": [1, 4], "x": 6, "y": 1},
+                {"matrix": [1, 5], "x": 7, "y": 1},
+
+                {"matrix": [6, 0], "x": 10, "y": 1},
+                {"matrix": [6, 1], "x": 11, "y": 1},
+                {"matrix": [6, 2], "x": 12, "y": 1},
+                {"matrix": [6, 3], "x": 13, "y": 1},
+                {"matrix": [6, 4], "x": 14, "y": 1},
+                {"matrix": [6, 5], "x": 15, "y": 1},
+                {"matrix": [6, 6], "x": 16, "y": 1},
+                {"matrix": [6, 7], "x": 17, "y": 1, "w": 1.5},
+
+                {"matrix": [8, 7], "x": 19, "y": 1},
+
+                {"matrix": [4, 5], "x": 0, "y": 2},
+
+                {"matrix": [2, 0], "x": 1.5, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 3.25, "y": 2},
+                {"matrix": [2, 2], "x": 4.25, "y": 2},
+                {"matrix": [2, 3], "x": 5.25, "y": 2},
+                {"matrix": [2, 4], "x": 6.25, "y": 2},
+                {"matrix": [2, 5], "x": 7.25, "y": 2},
+
+                {"matrix": [7, 0], "x": 10.25, "y": 2},
+                {"matrix": [7, 1], "x": 11.25, "y": 2},
+                {"matrix": [7, 2], "x": 12.25, "y": 2},
+                {"matrix": [7, 3], "x": 13.25, "y": 2},
+                {"matrix": [7, 4], "x": 14.25, "y": 2},
+                {"matrix": [7, 5], "x": 15.25, "y": 2},
+                {"matrix": [7, 6], "x": 16.25, "y": 2, "w": 2.25},
+
+                {"matrix": [9, 7], "x": 19, "y": 2},
+
+                {"matrix": [4, 6], "x": 0, "y": 3},
+
+                {"matrix": [3, 0], "x": 1.5, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 3.75, "y": 3},
+                {"matrix": [3, 2], "x": 4.75, "y": 3},
+                {"matrix": [3, 3], "x": 5.75, "y": 3},
+                {"matrix": [3, 4], "x": 6.75, "y": 3},
+                {"matrix": [3, 5], "x": 7.75, "y": 3},
+
+                {"matrix": [9, 6], "x": 9.75, "y": 3},
+                {"matrix": [8, 0], "x": 10.75, "y": 3},
+                {"matrix": [8, 1], "x": 11.75, "y": 3},
+                {"matrix": [8, 2], "x": 12.75, "y": 3},
+                {"matrix": [8, 3], "x": 13.75, "y": 3},
+                {"matrix": [8, 4], "x": 14.75, "y": 3},
+                {"matrix": [8, 5], "x": 15.75, "y": 3, "w": 1.75},
+                {"matrix": [8, 6], "x": 17.75, "y": 3.25},
+
+                {"matrix": [4, 7], "x": 0, "y": 4},
+
+                {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 5.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 6.5, "y": 4, "w": 2.25},
+
+                {"matrix": [9, 0], "x": 9.75, "y": 4, "w": 2.75},
+                {"matrix": [9, 1], "x": 13.5, "y": 4, "w": 1.5},
+                {"matrix": [9, 2], "x": 15, "y": 4, "w": 1.5},
+
+                {"matrix": [9, 3], "x": 16.75, "y": 4.25},
+                {"matrix": [9, 4], "x": 17.75, "y": 4.25},
+                {"matrix": [9, 5], "x": 18.75, "y": 4.25}
+            ]
+        },
+        "LAYOUT_ansi_rspace_split_bksp": {
+            "layout": [
+                {"matrix": [0, 0], "x": 1.5, "y": 0},
+                {"matrix": [0, 1], "x": 2.5, "y": 0},
+                {"matrix": [0, 2], "x": 3.5, "y": 0},
+                {"matrix": [0, 3], "x": 4.5, "y": 0},
+                {"matrix": [0, 4], "x": 5.5, "y": 0},
+                {"matrix": [0, 5], "x": 6.5, "y": 0},
+                {"matrix": [0, 6], "x": 7.5, "y": 0},
+
+                {"matrix": [5, 0], "x": 10.5, "y": 0},
+                {"matrix": [5, 1], "x": 11.5, "y": 0},
+                {"matrix": [5, 2], "x": 12.5, "y": 0},
+                {"matrix": [5, 3], "x": 13.5, "y": 0},
+                {"matrix": [5, 4], "x": 14.5, "y": 0},
+                {"matrix": [5, 5], "x": 15.5, "y": 0},
+                {"matrix": [5, 6], "x": 16.5, "y": 0},
+                {"matrix": [5, 7], "x": 17.5, "y": 0},
+
+                {"matrix": [7, 7], "x": 19, "y": 0},
+
+                {"matrix": [1, 0], "x": 1.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 3, "y": 1},
+                {"matrix": [1, 2], "x": 4, "y": 1},
+                {"matrix": [1, 3], "x": 5, "y": 1},
+                {"matrix": [1, 4], "x": 6, "y": 1},
+                {"matrix": [1, 5], "x": 7, "y": 1},
+
+                {"matrix": [6, 0], "x": 10, "y": 1},
+                {"matrix": [6, 1], "x": 11, "y": 1},
+                {"matrix": [6, 2], "x": 12, "y": 1},
+                {"matrix": [6, 3], "x": 13, "y": 1},
+                {"matrix": [6, 4], "x": 14, "y": 1},
+                {"matrix": [6, 5], "x": 15, "y": 1},
+                {"matrix": [6, 6], "x": 16, "y": 1},
+                {"matrix": [6, 7], "x": 17, "y": 1, "w": 1.5},
+
+                {"matrix": [8, 7], "x": 19, "y": 1},
+
+                {"matrix": [4, 5], "x": 0, "y": 2},
+
+                {"matrix": [2, 0], "x": 1.5, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 3.25, "y": 2},
+                {"matrix": [2, 2], "x": 4.25, "y": 2},
+                {"matrix": [2, 3], "x": 5.25, "y": 2},
+                {"matrix": [2, 4], "x": 6.25, "y": 2},
+                {"matrix": [2, 5], "x": 7.25, "y": 2},
+
+                {"matrix": [7, 0], "x": 10.25, "y": 2},
+                {"matrix": [7, 1], "x": 11.25, "y": 2},
+                {"matrix": [7, 2], "x": 12.25, "y": 2},
+                {"matrix": [7, 3], "x": 13.25, "y": 2},
+                {"matrix": [7, 4], "x": 14.25, "y": 2},
+                {"matrix": [7, 5], "x": 15.25, "y": 2},
+                {"matrix": [7, 6], "x": 16.25, "y": 2, "w": 2.25},
+
+                {"matrix": [9, 7], "x": 19, "y": 2},
+
+                {"matrix": [4, 6], "x": 0, "y": 3},
+
+                {"matrix": [3, 0], "x": 1.5, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 3.75, "y": 3},
+                {"matrix": [3, 2], "x": 4.75, "y": 3},
+                {"matrix": [3, 3], "x": 5.75, "y": 3},
+                {"matrix": [3, 4], "x": 6.75, "y": 3},
+                {"matrix": [3, 5], "x": 7.75, "y": 3},
+
+                {"matrix": [9, 6], "x": 9.75, "y": 3},
+                {"matrix": [8, 0], "x": 10.75, "y": 3},
+                {"matrix": [8, 1], "x": 11.75, "y": 3},
+                {"matrix": [8, 2], "x": 12.75, "y": 3},
+                {"matrix": [8, 3], "x": 13.75, "y": 3},
+                {"matrix": [8, 4], "x": 14.75, "y": 3},
+                {"matrix": [8, 5], "x": 15.75, "y": 3, "w": 1.75},
+
+                {"matrix": [8, 6], "x": 17.75, "y": 3.25},
+
+                {"matrix": [4, 7], "x": 0, "y": 4},
+
+                {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 5.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 6.5, "y": 4, "w": 2.25},
+
+                {"matrix": [9, 0], "x": 9.75, "y": 4, "w": 2.75},
+                {"matrix": [9, 1], "x": 13.5, "y": 4, "w": 1.5},
+                {"matrix": [9, 2], "x": 15, "y": 4, "w": 1.5},
+
+                {"matrix": [9, 3], "x": 16.75, "y": 4.25},
+                {"matrix": [9, 4], "x": 17.75, "y": 4.25},
+                {"matrix": [9, 5], "x": 18.75, "y": 4.25}
+            ]
+        },
+        "LAYOUT_iso_lspace_2u_bksp": {
+            "layout": [
+                {"matrix": [0, 0], "x": 1.5, "y": 0},
+                {"matrix": [0, 1], "x": 2.5, "y": 0},
+                {"matrix": [0, 2], "x": 3.5, "y": 0},
+                {"matrix": [0, 3], "x": 4.5, "y": 0},
+                {"matrix": [0, 4], "x": 5.5, "y": 0},
+                {"matrix": [0, 5], "x": 6.5, "y": 0},
+                {"matrix": [0, 6], "x": 7.5, "y": 0},
+
+                {"matrix": [5, 0], "x": 10.5, "y": 0},
+                {"matrix": [5, 1], "x": 11.5, "y": 0},
+                {"matrix": [5, 2], "x": 12.5, "y": 0},
+                {"matrix": [5, 3], "x": 13.5, "y": 0},
+                {"matrix": [5, 4], "x": 14.5, "y": 0},
+                {"matrix": [5, 5], "x": 15.5, "y": 0},
+                {"matrix": [5, 7], "x": 16.5, "y": 0, "w": 2},
+
+                {"matrix": [7, 7], "x": 19, "y": 0},
+
+                {"matrix": [1, 0], "x": 1.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 3, "y": 1},
+                {"matrix": [1, 2], "x": 4, "y": 1},
+                {"matrix": [1, 3], "x": 5, "y": 1},
+                {"matrix": [1, 4], "x": 6, "y": 1},
+                {"matrix": [1, 5], "x": 7, "y": 1},
+
+                {"matrix": [6, 0], "x": 10, "y": 1},
+                {"matrix": [6, 1], "x": 11, "y": 1},
+                {"matrix": [6, 2], "x": 12, "y": 1},
+                {"matrix": [6, 3], "x": 13, "y": 1},
+                {"matrix": [6, 4], "x": 14, "y": 1},
+                {"matrix": [6, 5], "x": 15, "y": 1},
+                {"matrix": [6, 6], "x": 16, "y": 1},
+
+                {"matrix": [8, 7], "x": 19, "y": 1},
+
+                {"matrix": [4, 5], "x": 0, "y": 2},
+
+                {"matrix": [2, 0], "x": 1.5, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 3.25, "y": 2},
+                {"matrix": [2, 2], "x": 4.25, "y": 2},
+                {"matrix": [2, 3], "x": 5.25, "y": 2},
+                {"matrix": [2, 4], "x": 6.25, "y": 2},
+                {"matrix": [2, 5], "x": 7.25, "y": 2},
+
+                {"matrix": [7, 0], "x": 10.25, "y": 2},
+                {"matrix": [7, 1], "x": 11.25, "y": 2},
+                {"matrix": [7, 2], "x": 12.25, "y": 2},
+                {"matrix": [7, 3], "x": 13.25, "y": 2},
+                {"matrix": [7, 4], "x": 14.25, "y": 2},
+                {"matrix": [7, 5], "x": 15.25, "y": 2},
+                {"matrix": [6, 7], "x": 16.25, "y": 2},
+                {"matrix": [7, 6], "x": 17.25, "y": 1, "w": 1.25, "h": 2},
+
+                {"matrix": [9, 7], "x": 19, "y": 2},
+
+                {"matrix": [4, 6], "x": 0, "y": 3},
+
+                {"matrix": [3, 0], "x": 1.5, "y": 3, "w": 1.25},
+                {"matrix": [4, 1], "x": 2.75, "y": 3},
+                {"matrix": [3, 1], "x": 3.75, "y": 3},
+                {"matrix": [3, 2], "x": 4.75, "y": 3},
+                {"matrix": [3, 3], "x": 5.75, "y": 3},
+                {"matrix": [3, 4], "x": 6.75, "y": 3},
+                {"matrix": [3, 5], "x": 7.75, "y": 3},
+
+                {"matrix": [9, 6], "x": 9.75, "y": 3},
+                {"matrix": [8, 0], "x": 10.75, "y": 3},
+                {"matrix": [8, 1], "x": 11.75, "y": 3},
+                {"matrix": [8, 2], "x": 12.75, "y": 3},
+                {"matrix": [8, 3], "x": 13.75, "y": 3},
+                {"matrix": [8, 4], "x": 14.75, "y": 3},
+                {"matrix": [8, 5], "x": 15.75, "y": 3, "w": 1.75},
+
+                {"matrix": [8, 6], "x": 17.75, "y": 3.25},
+
+                {"matrix": [4, 7], "x": 0, "y": 4},
+
+                {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 5.25, "y": 4, "w": 2.25},
+                {"matrix": [4, 3], "x": 7.5, "y": 4, "w": 1.25},
+
+                {"matrix": [9, 0], "x": 9.75, "y": 4, "w": 2.75},
+                {"matrix": [9, 1], "x": 13.5, "y": 4, "w": 1.5},
+                {"matrix": [9, 2], "x": 15, "y": 4, "w": 1.5},
+
+                {"matrix": [9, 3], "x": 16.75, "y": 4.25},
+                {"matrix": [9, 4], "x": 17.75, "y": 4.25},
+                {"matrix": [9, 5], "x": 18.75, "y": 4.25}
+            ]
+        },
+        "LAYOUT_iso_lspace_split_bksp": {
+            "layout": [
+                {"matrix": [0, 0], "x": 1.5, "y": 0},
+                {"matrix": [0, 1], "x": 2.5, "y": 0},
+                {"matrix": [0, 2], "x": 3.5, "y": 0},
+                {"matrix": [0, 3], "x": 4.5, "y": 0},
+                {"matrix": [0, 4], "x": 5.5, "y": 0},
+                {"matrix": [0, 5], "x": 6.5, "y": 0},
+                {"matrix": [0, 6], "x": 7.5, "y": 0},
+
+                {"matrix": [5, 0], "x": 10.5, "y": 0},
+                {"matrix": [5, 1], "x": 11.5, "y": 0},
+                {"matrix": [5, 2], "x": 12.5, "y": 0},
+                {"matrix": [5, 3], "x": 13.5, "y": 0},
+                {"matrix": [5, 4], "x": 14.5, "y": 0},
+                {"matrix": [5, 5], "x": 15.5, "y": 0},
+                {"matrix": [5, 6], "x": 16.5, "y": 0},
+                {"matrix": [5, 7], "x": 17.5, "y": 0},
+
+                {"matrix": [7, 7], "x": 19, "y": 0},
+
+                {"matrix": [1, 0], "x": 1.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 3, "y": 1},
+                {"matrix": [1, 2], "x": 4, "y": 1},
+                {"matrix": [1, 3], "x": 5, "y": 1},
+                {"matrix": [1, 4], "x": 6, "y": 1},
+                {"matrix": [1, 5], "x": 7, "y": 1},
+
+                {"matrix": [6, 0], "x": 10, "y": 1},
+                {"matrix": [6, 1], "x": 11, "y": 1},
+                {"matrix": [6, 2], "x": 12, "y": 1},
+                {"matrix": [6, 3], "x": 13, "y": 1},
+                {"matrix": [6, 4], "x": 14, "y": 1},
+                {"matrix": [6, 5], "x": 15, "y": 1},
+                {"matrix": [6, 6], "x": 16, "y": 1},
+
+                {"matrix": [8, 7], "x": 19, "y": 1},
+
+                {"matrix": [4, 5], "x": 0, "y": 2},
+
+                {"matrix": [2, 0], "x": 1.5, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 3.25, "y": 2},
+                {"matrix": [2, 2], "x": 4.25, "y": 2},
+                {"matrix": [2, 3], "x": 5.25, "y": 2},
+                {"matrix": [2, 4], "x": 6.25, "y": 2},
+                {"matrix": [2, 5], "x": 7.25, "y": 2},
+
+                {"matrix": [7, 0], "x": 10.25, "y": 2},
+                {"matrix": [7, 1], "x": 11.25, "y": 2},
+                {"matrix": [7, 2], "x": 12.25, "y": 2},
+                {"matrix": [7, 3], "x": 13.25, "y": 2},
+                {"matrix": [7, 4], "x": 14.25, "y": 2},
+                {"matrix": [7, 5], "x": 15.25, "y": 2},
+                {"matrix": [6, 7], "x": 16.25, "y": 2},
+                {"matrix": [7, 6], "x": 17.25, "y": 1, "w": 1.25, "h": 2},
+
+                {"matrix": [9, 7], "x": 19, "y": 2},
+
+                {"matrix": [4, 6], "x": 0, "y": 3},
+
+                {"matrix": [3, 0], "x": 1.5, "y": 3, "w": 1.25},
+                {"matrix": [4, 1], "x": 2.75, "y": 3},
+                {"matrix": [3, 1], "x": 3.75, "y": 3},
+                {"matrix": [3, 2], "x": 4.75, "y": 3},
+                {"matrix": [3, 3], "x": 5.75, "y": 3},
+                {"matrix": [3, 4], "x": 6.75, "y": 3},
+                {"matrix": [3, 5], "x": 7.75, "y": 3},
+
+                {"matrix": [9, 6], "x": 9.75, "y": 3},
+                {"matrix": [8, 0], "x": 10.75, "y": 3},
+                {"matrix": [8, 1], "x": 11.75, "y": 3},
+                {"matrix": [8, 2], "x": 12.75, "y": 3},
+                {"matrix": [8, 3], "x": 13.75, "y": 3},
+                {"matrix": [8, 4], "x": 14.75, "y": 3},
+                {"matrix": [8, 5], "x": 15.75, "y": 3, "w": 1.75},
+
+                {"matrix": [8, 6], "x": 17.75, "y": 3.25},
+
+                {"matrix": [4, 7], "x": 0, "y": 4},
+
+                {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 5.25, "y": 4, "w": 2.25},
+                {"matrix": [4, 3], "x": 7.5, "y": 4, "w": 1.25},
+
+                {"matrix": [9, 0], "x": 9.75, "y": 4, "w": 2.75},
+                {"matrix": [9, 1], "x": 13.5, "y": 4, "w": 1.5},
+                {"matrix": [9, 2], "x": 15, "y": 4, "w": 1.5},
+
+                {"matrix": [9, 3], "x": 16.75, "y": 4.25},
+                {"matrix": [9, 4], "x": 17.75, "y": 4.25},
+                {"matrix": [9, 5], "x": 18.75, "y": 4.25}
+            ]
+        },
+        "LAYOUT_iso_rspace_2u_bksp": {
+            "layout": [
+                {"matrix": [0, 0], "x": 1.5, "y": 0},
+                {"matrix": [0, 1], "x": 2.5, "y": 0},
+                {"matrix": [0, 2], "x": 3.5, "y": 0},
+                {"matrix": [0, 3], "x": 4.5, "y": 0},
+                {"matrix": [0, 4], "x": 5.5, "y": 0},
+                {"matrix": [0, 5], "x": 6.5, "y": 0},
+                {"matrix": [0, 6], "x": 7.5, "y": 0},
+
+                {"matrix": [5, 0], "x": 10.5, "y": 0},
+                {"matrix": [5, 1], "x": 11.5, "y": 0},
+                {"matrix": [5, 2], "x": 12.5, "y": 0},
+                {"matrix": [5, 3], "x": 13.5, "y": 0},
+                {"matrix": [5, 4], "x": 14.5, "y": 0},
+                {"matrix": [5, 5], "x": 15.5, "y": 0},
+                {"matrix": [5, 7], "x": 16.5, "y": 0, "w": 2},
+
+                {"matrix": [7, 7], "x": 19, "y": 0},
+
+                {"matrix": [1, 0], "x": 1.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 3, "y": 1},
+                {"matrix": [1, 2], "x": 4, "y": 1},
+                {"matrix": [1, 3], "x": 5, "y": 1},
+                {"matrix": [1, 4], "x": 6, "y": 1},
+                {"matrix": [1, 5], "x": 7, "y": 1},
+
+                {"matrix": [6, 0], "x": 10, "y": 1},
+                {"matrix": [6, 1], "x": 11, "y": 1},
+                {"matrix": [6, 2], "x": 12, "y": 1},
+                {"matrix": [6, 3], "x": 13, "y": 1},
+                {"matrix": [6, 4], "x": 14, "y": 1},
+                {"matrix": [6, 5], "x": 15, "y": 1},
+                {"matrix": [6, 6], "x": 16, "y": 1},
+
+                {"matrix": [8, 7], "x": 19, "y": 1},
+
+                {"matrix": [4, 5], "x": 0, "y": 2},
+
+                {"matrix": [2, 0], "x": 1.5, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 3.25, "y": 2},
+                {"matrix": [2, 2], "x": 4.25, "y": 2},
+                {"matrix": [2, 3], "x": 5.25, "y": 2},
+                {"matrix": [2, 4], "x": 6.25, "y": 2},
+                {"matrix": [2, 5], "x": 7.25, "y": 2},
+
+                {"matrix": [7, 0], "x": 10.25, "y": 2},
+                {"matrix": [7, 1], "x": 11.25, "y": 2},
+                {"matrix": [7, 2], "x": 12.25, "y": 2},
+                {"matrix": [7, 3], "x": 13.25, "y": 2},
+                {"matrix": [7, 4], "x": 14.25, "y": 2},
+                {"matrix": [7, 5], "x": 15.25, "y": 2},
+                {"matrix": [6, 7], "x": 16.25, "y": 2},
+                {"matrix": [7, 6], "x": 17.25, "y": 1, "w": 1.25, "h": 2},
+
+                {"matrix": [9, 7], "x": 19, "y": 2},
+
+                {"matrix": [4, 6], "x": 0, "y": 3},
+
+                {"matrix": [3, 0], "x": 1.5, "y": 3, "w": 1.25},
+                {"matrix": [4, 1], "x": 2.75, "y": 3},
+                {"matrix": [3, 1], "x": 3.75, "y": 3},
+                {"matrix": [3, 2], "x": 4.75, "y": 3},
+                {"matrix": [3, 3], "x": 5.75, "y": 3},
+                {"matrix": [3, 4], "x": 6.75, "y": 3},
+                {"matrix": [3, 5], "x": 7.75, "y": 3},
+
+                {"matrix": [9, 6], "x": 9.75, "y": 3},
+                {"matrix": [8, 0], "x": 10.75, "y": 3},
+                {"matrix": [8, 1], "x": 11.75, "y": 3},
+                {"matrix": [8, 2], "x": 12.75, "y": 3},
+                {"matrix": [8, 3], "x": 13.75, "y": 3},
+                {"matrix": [8, 4], "x": 14.75, "y": 3},
+                {"matrix": [8, 5], "x": 15.75, "y": 3, "w": 1.75},
+
+                {"matrix": [8, 6], "x": 17.75, "y": 3.25},
+
+                {"matrix": [4, 7], "x": 0, "y": 4},
+
+                {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 5.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 6.5, "y": 4, "w": 2.25},
+
+                {"matrix": [9, 0], "x": 9.75, "y": 4, "w": 2.75},
+                {"matrix": [9, 1], "x": 13.5, "y": 4, "w": 1.5},
+                {"matrix": [9, 2], "x": 15, "y": 4, "w": 1.5},
+
+                {"matrix": [9, 3], "x": 16.75, "y": 4.25},
+                {"matrix": [9, 4], "x": 17.75, "y": 4.25},
+                {"matrix": [9, 5], "x": 18.75, "y": 4.25}
+            ]
+        },
+        "LAYOUT_iso_rspace_split_bksp": {
+            "layout": [
+                {"matrix": [0, 0], "x": 1.5, "y": 0},
+                {"matrix": [0, 1], "x": 2.5, "y": 0},
+                {"matrix": [0, 2], "x": 3.5, "y": 0},
+                {"matrix": [0, 3], "x": 4.5, "y": 0},
+                {"matrix": [0, 4], "x": 5.5, "y": 0},
+                {"matrix": [0, 5], "x": 6.5, "y": 0},
+                {"matrix": [0, 6], "x": 7.5, "y": 0},
+
+                {"matrix": [5, 0], "x": 10.5, "y": 0},
+                {"matrix": [5, 1], "x": 11.5, "y": 0},
+                {"matrix": [5, 2], "x": 12.5, "y": 0},
+                {"matrix": [5, 3], "x": 13.5, "y": 0},
+                {"matrix": [5, 4], "x": 14.5, "y": 0},
+                {"matrix": [5, 5], "x": 15.5, "y": 0},
+                {"matrix": [5, 6], "x": 16.5, "y": 0},
+                {"matrix": [5, 7], "x": 17.5, "y": 0},
+
+                {"matrix": [7, 7], "x": 19, "y": 0},
+
+                {"matrix": [1, 0], "x": 1.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 3, "y": 1},
+                {"matrix": [1, 2], "x": 4, "y": 1},
+                {"matrix": [1, 3], "x": 5, "y": 1},
+                {"matrix": [1, 4], "x": 6, "y": 1},
+                {"matrix": [1, 5], "x": 7, "y": 1},
+
+                {"matrix": [6, 0], "x": 10, "y": 1},
+                {"matrix": [6, 1], "x": 11, "y": 1},
+                {"matrix": [6, 2], "x": 12, "y": 1},
+                {"matrix": [6, 3], "x": 13, "y": 1},
+                {"matrix": [6, 4], "x": 14, "y": 1},
+                {"matrix": [6, 5], "x": 15, "y": 1},
+                {"matrix": [6, 6], "x": 16, "y": 1},
+
+                {"matrix": [8, 7], "x": 19, "y": 1},
+
+                {"matrix": [4, 5], "x": 0, "y": 2},
+
+                {"matrix": [2, 0], "x": 1.5, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 3.25, "y": 2},
+                {"matrix": [2, 2], "x": 4.25, "y": 2},
+                {"matrix": [2, 3], "x": 5.25, "y": 2},
+                {"matrix": [2, 4], "x": 6.25, "y": 2},
+                {"matrix": [2, 5], "x": 7.25, "y": 2},
+
+                {"matrix": [7, 0], "x": 10.25, "y": 2},
+                {"matrix": [7, 1], "x": 11.25, "y": 2},
+                {"matrix": [7, 2], "x": 12.25, "y": 2},
+                {"matrix": [7, 3], "x": 13.25, "y": 2},
+                {"matrix": [7, 4], "x": 14.25, "y": 2},
+                {"matrix": [7, 5], "x": 15.25, "y": 2},
+                {"matrix": [6, 7], "x": 16.25, "y": 2},
+                {"matrix": [7, 6], "x": 17.25, "y": 1, "w": 1.25, "h": 2},
+
+                {"matrix": [9, 7], "x": 19, "y": 2},
+
+                {"matrix": [4, 6], "x": 0, "y": 3},
+
+                {"matrix": [3, 0], "x": 1.5, "y": 3, "w": 1.25},
+                {"matrix": [4, 1], "x": 2.75, "y": 3},
+                {"matrix": [3, 1], "x": 3.75, "y": 3},
+                {"matrix": [3, 2], "x": 4.75, "y": 3},
+                {"matrix": [3, 3], "x": 5.75, "y": 3},
+                {"matrix": [3, 4], "x": 6.75, "y": 3},
+                {"matrix": [3, 5], "x": 7.75, "y": 3},
+
+                {"matrix": [9, 6], "x": 9.75, "y": 3},
+                {"matrix": [8, 0], "x": 10.75, "y": 3},
+                {"matrix": [8, 1], "x": 11.75, "y": 3},
+                {"matrix": [8, 2], "x": 12.75, "y": 3},
+                {"matrix": [8, 3], "x": 13.75, "y": 3},
+                {"matrix": [8, 4], "x": 14.75, "y": 3},
+                {"matrix": [8, 5], "x": 15.75, "y": 3, "w": 1.75},
+
+                {"matrix": [8, 6], "x": 17.75, "y": 3.25},
+
+                {"matrix": [4, 7], "x": 0, "y": 4},
+
+                {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 5.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 6.5, "y": 4, "w": 2.25},
+
+                {"matrix": [9, 0], "x": 9.75, "y": 4, "w": 2.75},
+                {"matrix": [9, 1], "x": 13.5, "y": 4, "w": 1.5},
+                {"matrix": [9, 2], "x": 15, "y": 4, "w": 1.5},
+
+                {"matrix": [9, 3], "x": 16.75, "y": 4.25},
+                {"matrix": [9, 4], "x": 17.75, "y": 4.25},
+                {"matrix": [9, 5], "x": 18.75, "y": 4.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/merge/uma/rules.mk b/keyboards/merge/uma/rules.mk
deleted file mode 100644
index e146f96ce6f..00000000000
--- a/keyboards/merge/uma/rules.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes     # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = yes       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no       # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-ENCODER_ENABLE = yes
-LTO_ENABLE = yes
-OLED_ENABLE = yes
diff --git a/keyboards/mexsistor/ludmila/info.json b/keyboards/mexsistor/ludmila/info.json
deleted file mode 100644
index 6e44d33913c..00000000000
--- a/keyboards/mexsistor/ludmila/info.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-    "keyboard_name": "Ludmila Macropad",
-    "manufacturer": "Kevin M.",
-    "url": "",
-    "maintainer": "Kevin M.",
-    "usb": {
-        "vid": "0x69CC",
-        "pid": "0x6BF6",
-        "device_version": "0.0.1"
-    },
-    "encoder": {
-        "rotary": [
-            {"pin_a": "F6", "pin_b": "F5"}
-        ]
-    },
-    "rgblight": {
-        "led_count": 4,
-        "sleep": true,
-        "animations": {
-            "breathing": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "snake": true,
-            "knight": true,
-            "christmas": true,
-            "static_gradient": true,
-            "rgb_test": true,
-            "alternating": true,
-            "twinkle": true
-        }
-    },
-    "ws2812": {
-        "pin": "D1"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-
-                {"matrix": [2, 0], "x": 3, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1},
-                {"matrix": [1, 1], "x": 1, "y": 1}
-            ]
-        }
-    }
-}
diff --git a/keyboards/mexsistor/ludmila/keyboard.json b/keyboards/mexsistor/ludmila/keyboard.json
new file mode 100644
index 00000000000..71202208c5f
--- /dev/null
+++ b/keyboards/mexsistor/ludmila/keyboard.json
@@ -0,0 +1,57 @@
+{
+    "keyboard_name": "Ludmila Macropad",
+    "manufacturer": "Kevin M.",
+    "url": "",
+    "maintainer": "Kevin M.",
+    "usb": {
+        "vid": "0x69CC",
+        "pid": "0x6BF6",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "rgblight": true,
+        "encoder": true
+    },
+    "encoder": {
+        "rotary": [
+            {"pin_a": "F6", "pin_b": "F5"}
+        ]
+    },
+    "rgblight": {
+        "led_count": 4,
+        "sleep": true,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": true,
+            "twinkle": true
+        }
+    },
+    "ws2812": {
+        "pin": "D1"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+
+                {"matrix": [2, 0], "x": 3, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1}
+            ]
+        }
+    }
+}
diff --git a/keyboards/mexsistor/ludmila/rules.mk b/keyboards/mexsistor/ludmila/rules.mk
index 547c4ad49c9..73766740561 100644
--- a/keyboards/mexsistor/ludmila/rules.mk
+++ b/keyboards/mexsistor/ludmila/rules.mk
@@ -1,15 +1,2 @@
-# Build Options
-#   change yes to no to disable
-#
 CUSTOM_MATRIX = lite
 SRC = matrix.c
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-ENCODER_ENABLE = yes
diff --git a/keyboards/minimon/bartlesplit/info.json b/keyboards/minimon/bartlesplit/keyboard.json
similarity index 100%
rename from keyboards/minimon/bartlesplit/info.json
rename to keyboards/minimon/bartlesplit/keyboard.json
diff --git a/keyboards/mitosis/info.json b/keyboards/mitosis/info.json
deleted file mode 100644
index feab60b7fb8..00000000000
--- a/keyboards/mitosis/info.json
+++ /dev/null
@@ -1,74 +0,0 @@
-{
-  "keyboard_name": "Mitosis",
-  "manufacturer": "Unknown",
-  "url": "",
-  "maintainer": "qmk",
-  "usb": {
-    "vid": "0xFEED",
-    "pid": "0x6060",
-    "device_version": "0.0.1"
-  },
-  "processor": "atmega32u4",
-  "bootloader": "caterina",
-  "layouts": {
-    "LAYOUT": {
-      "layout": [
-        {"matrix": [0, 0], "x": 0, "y": 0.75},
-        {"matrix": [0, 1], "x": 1, "y": 0.25},
-        {"matrix": [0, 2], "x": 2, "y": 0},
-        {"matrix": [0, 3], "x": 3, "y": 0.25},
-        {"matrix": [0, 4], "x": 4, "y": 0.125},
-
-        {"matrix": [0, 5], "x": 7, "y": 0.125},
-        {"matrix": [0, 6], "x": 8, "y": 0.25},
-        {"matrix": [0, 7], "x": 9, "y": 0},
-        {"matrix": [0, 8], "x": 10, "y": 0.25},
-        {"matrix": [0, 9], "x": 11, "y": 0.75},
-
-        {"matrix": [1, 0], "x": 0, "y": 1.75},
-        {"matrix": [1, 1], "x": 1, "y": 1.25},
-        {"matrix": [1, 2], "x": 2, "y": 1},
-        {"matrix": [1, 3], "x": 3, "y": 1.25},
-        {"matrix": [1, 4], "x": 4, "y": 1.125},
-
-        {"matrix": [1, 5], "x": 7, "y": 1.125},
-        {"matrix": [1, 6], "x": 8, "y": 1.25},
-        {"matrix": [1, 7], "x": 9, "y": 1},
-        {"matrix": [1, 8], "x": 10, "y": 1.25},
-        {"matrix": [1, 9], "x": 11, "y": 1.75},
-
-        {"matrix": [2, 0], "x": 0, "y": 2.75},
-        {"matrix": [2, 1], "x": 1, "y": 2.25},
-        {"matrix": [2, 2], "x": 2, "y": 2},
-        {"matrix": [2, 3], "x": 3, "y": 2.25},
-        {"matrix": [2, 4], "x": 4, "y": 2.125},
-
-        {"matrix": [2, 5], "x": 7, "y": 2.125},
-        {"matrix": [2, 6], "x": 8, "y": 2.25},
-        {"matrix": [2, 7], "x": 9, "y": 2},
-        {"matrix": [2, 8], "x": 10, "y": 2.25},
-        {"matrix": [2, 9], "x": 11, "y": 2.75},
-
-        {"matrix": [3, 1], "x": 1.5, "y": 3.75},
-        {"matrix": [3, 2], "x": 2.5, "y": 3.75},
-        {"matrix": [3, 3], "x": 3.5, "y": 3.75},
-        {"matrix": [3, 4], "x": 4.5, "y": 3.75},
-
-        {"matrix": [3, 5], "x": 6.5, "y": 3.75},
-        {"matrix": [3, 6], "x": 7.5, "y": 3.75},
-        {"matrix": [3, 7], "x": 8.5, "y": 3.75},
-        {"matrix": [3, 8], "x": 9.5, "y": 3.75},
-
-        {"matrix": [4, 1], "x": 1.5, "y": 4.75},
-        {"matrix": [4, 2], "x": 2.5, "y": 4.75},
-        {"matrix": [4, 3], "x": 3.5, "y": 4.75},
-        {"matrix": [4, 4], "x": 4.5, "y": 4.75},
-
-        {"matrix": [4, 5], "x": 6.5, "y": 4.75},
-        {"matrix": [4, 6], "x": 7.5, "y": 4.75},
-        {"matrix": [4, 7], "x": 8.5, "y": 4.75},
-        {"matrix": [4, 8], "x": 9.5, "y": 4.75}
-      ]
-    }
-  }
-}
diff --git a/keyboards/mitosis/keyboard.json b/keyboards/mitosis/keyboard.json
new file mode 100644
index 00000000000..c69d1d30cd4
--- /dev/null
+++ b/keyboards/mitosis/keyboard.json
@@ -0,0 +1,83 @@
+{
+  "keyboard_name": "Mitosis",
+  "manufacturer": "Unknown",
+  "url": "",
+  "maintainer": "qmk",
+  "usb": {
+    "vid": "0xFEED",
+    "pid": "0x6060",
+    "device_version": "0.0.1"
+  },
+  "features": {
+    "bootmagic": false,
+    "mousekey": true,
+    "extrakey": true,
+    "console": true,
+    "command": true,
+    "nkro": true,
+    "unicode": true
+  },
+  "processor": "atmega32u4",
+  "bootloader": "caterina",
+  "layouts": {
+    "LAYOUT": {
+      "layout": [
+        {"matrix": [0, 0], "x": 0, "y": 0.75},
+        {"matrix": [0, 1], "x": 1, "y": 0.25},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0.25},
+        {"matrix": [0, 4], "x": 4, "y": 0.125},
+
+        {"matrix": [0, 5], "x": 7, "y": 0.125},
+        {"matrix": [0, 6], "x": 8, "y": 0.25},
+        {"matrix": [0, 7], "x": 9, "y": 0},
+        {"matrix": [0, 8], "x": 10, "y": 0.25},
+        {"matrix": [0, 9], "x": 11, "y": 0.75},
+
+        {"matrix": [1, 0], "x": 0, "y": 1.75},
+        {"matrix": [1, 1], "x": 1, "y": 1.25},
+        {"matrix": [1, 2], "x": 2, "y": 1},
+        {"matrix": [1, 3], "x": 3, "y": 1.25},
+        {"matrix": [1, 4], "x": 4, "y": 1.125},
+
+        {"matrix": [1, 5], "x": 7, "y": 1.125},
+        {"matrix": [1, 6], "x": 8, "y": 1.25},
+        {"matrix": [1, 7], "x": 9, "y": 1},
+        {"matrix": [1, 8], "x": 10, "y": 1.25},
+        {"matrix": [1, 9], "x": 11, "y": 1.75},
+
+        {"matrix": [2, 0], "x": 0, "y": 2.75},
+        {"matrix": [2, 1], "x": 1, "y": 2.25},
+        {"matrix": [2, 2], "x": 2, "y": 2},
+        {"matrix": [2, 3], "x": 3, "y": 2.25},
+        {"matrix": [2, 4], "x": 4, "y": 2.125},
+
+        {"matrix": [2, 5], "x": 7, "y": 2.125},
+        {"matrix": [2, 6], "x": 8, "y": 2.25},
+        {"matrix": [2, 7], "x": 9, "y": 2},
+        {"matrix": [2, 8], "x": 10, "y": 2.25},
+        {"matrix": [2, 9], "x": 11, "y": 2.75},
+
+        {"matrix": [3, 1], "x": 1.5, "y": 3.75},
+        {"matrix": [3, 2], "x": 2.5, "y": 3.75},
+        {"matrix": [3, 3], "x": 3.5, "y": 3.75},
+        {"matrix": [3, 4], "x": 4.5, "y": 3.75},
+
+        {"matrix": [3, 5], "x": 6.5, "y": 3.75},
+        {"matrix": [3, 6], "x": 7.5, "y": 3.75},
+        {"matrix": [3, 7], "x": 8.5, "y": 3.75},
+        {"matrix": [3, 8], "x": 9.5, "y": 3.75},
+
+        {"matrix": [4, 1], "x": 1.5, "y": 4.75},
+        {"matrix": [4, 2], "x": 2.5, "y": 4.75},
+        {"matrix": [4, 3], "x": 3.5, "y": 4.75},
+        {"matrix": [4, 4], "x": 4.5, "y": 4.75},
+
+        {"matrix": [4, 5], "x": 6.5, "y": 4.75},
+        {"matrix": [4, 6], "x": 7.5, "y": 4.75},
+        {"matrix": [4, 7], "x": 8.5, "y": 4.75},
+        {"matrix": [4, 8], "x": 9.5, "y": 4.75}
+      ]
+    }
+  }
+}
diff --git a/keyboards/mitosis/rules.mk b/keyboards/mitosis/rules.mk
index 539a2d1004b..18d234d62a0 100644
--- a/keyboards/mitosis/rules.mk
+++ b/keyboards/mitosis/rules.mk
@@ -1,16 +1,3 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = yes        # Console for debug
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-UNICODE_ENABLE = yes
 CUSTOM_MATRIX = lite
 
 # project specific files
diff --git a/keyboards/mkh_studio/bully/info.json b/keyboards/mkh_studio/bully/keyboard.json
similarity index 100%
rename from keyboards/mkh_studio/bully/info.json
rename to keyboards/mkh_studio/bully/keyboard.json
diff --git a/keyboards/mlego/m60_split/rev1/info.json b/keyboards/mlego/m60_split/rev1/info.json
deleted file mode 100644
index 83e66ce2ccf..00000000000
--- a/keyboards/mlego/m60_split/rev1/info.json
+++ /dev/null
@@ -1,68 +0,0 @@
-{
-    "usb": {
-        "pid": "0x6361",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["B14", "A10", "A15", "B3", "B4", "B5"],
-        "rows": ["B0", "A6", "A7", "B1", "A5"]
-    },
-    "diode_direction": "COL2ROW",
-    "encoder": {
-        "rotary": [
-            {"pin_a": "A0", "pin_b": "B8"}
-        ]
-    },
-    "indicators": {
-        "caps_lock": "C13",
-        "num_lock": "B12",
-        "scroll_lock": "B13"
-    },
-    "ws2812": {
-        "pin": "B15"
-    },
-    "rgblight": {
-        "led_count": 16,
-        "max_brightness": 128,
-        "split_count": [8, 8],
-        "animations": {
-            "breathing": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "snake": true,
-            "knight": true,
-            "christmas": true,
-            "static_gradient": true,
-            "rgb_test": true,
-            "alternating": true,
-            "twinkle": true
-        },
-        "default": {
-            "hue": 213
-        },
-        "layers": {
-            "enabled": true
-        }
-    },
-    "split": {
-        "enabled": true,
-        "bootmagic": {
-            "matrix": [5, 0]
-        },
-        "matrix_pins": {
-            "right": {
-                "cols": ["B0", "A3", "A2", "A1", "B7", "B5"],
-                "rows": ["B1", "A4", "A5", "A6", "A7"]
-            }
-        },
-        "transport": {
-            "sync": {
-                "indicators": true,
-                "layer_state": true
-            }
-        }
-    },
-    "processor": "STM32F401",
-    "bootloader": "tinyuf2",
-    "board": "BLACKPILL_STM32_F401"
-}
diff --git a/keyboards/mlego/m60_split/rev1/keyboard.json b/keyboards/mlego/m60_split/rev1/keyboard.json
new file mode 100644
index 00000000000..9be9708081e
--- /dev/null
+++ b/keyboards/mlego/m60_split/rev1/keyboard.json
@@ -0,0 +1,76 @@
+{
+    "usb": {
+        "pid": "0x6361",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "nkro": true,
+        "rgblight": true,
+        "encoder": true
+    },
+    "matrix_pins": {
+        "cols": ["B14", "A10", "A15", "B3", "B4", "B5"],
+        "rows": ["B0", "A6", "A7", "B1", "A5"]
+    },
+    "diode_direction": "COL2ROW",
+    "encoder": {
+        "rotary": [
+            {"pin_a": "A0", "pin_b": "B8"}
+        ]
+    },
+    "indicators": {
+        "caps_lock": "C13",
+        "num_lock": "B12",
+        "scroll_lock": "B13"
+    },
+    "ws2812": {
+        "pin": "B15"
+    },
+    "rgblight": {
+        "led_count": 16,
+        "max_brightness": 128,
+        "split_count": [8, 8],
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": true,
+            "twinkle": true
+        },
+        "default": {
+            "hue": 213
+        },
+        "layers": {
+            "enabled": true
+        }
+    },
+    "split": {
+        "enabled": true,
+        "bootmagic": {
+            "matrix": [5, 0]
+        },
+        "matrix_pins": {
+            "right": {
+                "cols": ["B0", "A3", "A2", "A1", "B7", "B5"],
+                "rows": ["B1", "A4", "A5", "A6", "A7"]
+            }
+        },
+        "transport": {
+            "sync": {
+                "indicators": true,
+                "layer_state": true
+            }
+        }
+    },
+    "processor": "STM32F401",
+    "bootloader": "tinyuf2",
+    "board": "BLACKPILL_STM32_F401"
+}
diff --git a/keyboards/mlego/m60_split/rev1/rules.mk b/keyboards/mlego/m60_split/rev1/rules.mk
index c38e4335e89..c6e29883213 100644
--- a/keyboards/mlego/m60_split/rev1/rules.mk
+++ b/keyboards/mlego/m60_split/rev1/rules.mk
@@ -1,15 +1 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
 SERIAL_DRIVER = usart
-ENCODER_ENABLE = yes        # Enable encoder
-
diff --git a/keyboards/mlego/m60_split/rev2/info.json b/keyboards/mlego/m60_split/rev2/info.json
deleted file mode 100644
index e13ce195b42..00000000000
--- a/keyboards/mlego/m60_split/rev2/info.json
+++ /dev/null
@@ -1,61 +0,0 @@
-{
-    "usb": {
-        "pid": "0x6362",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["B14", "A10", "A15", "B3", "B4", "B5"],
-        "rows": ["B0", "A6", "A7", "B1", "A5"]
-    },
-    "diode_direction": "COL2ROW",
-    "encoder": {
-        "rotary": [
-            {"pin_a": "A0", "pin_b": "B8"}
-        ]
-    },
-    "indicators": {
-        "caps_lock": "C13",
-        "num_lock": "B12",
-        "scroll_lock": "B13"
-    },
-    "rgblight": {
-        "led_count": 16,
-        "split_count": [8, 8],
-        "animations": {
-            "breathing": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "snake": true,
-            "knight": true,
-            "christmas": true,
-            "static_gradient": true,
-            "rgb_test": true,
-            "alternating": true,
-            "twinkle": true
-        }
-    },
-    "ws2812": {
-        "pin": "B15"
-    },
-    "split": {
-        "enabled": true,
-        "bootmagic": {
-            "matrix": [5, 0]
-        },
-        "matrix_pins": {
-            "right": {
-                "cols": ["B0", "A3", "A2", "A1", "B7", "B5"],
-                "rows": ["B1", "A4", "A5", "A6", "A7"]
-            }
-        },
-        "transport": {
-            "sync": {
-                "indicators": true,
-                "layer_state": true
-            }
-        }
-    },
-    "processor": "STM32F411",
-    "bootloader": "stm32-dfu",
-    "board": "BLACKPILL_STM32_F411"
-}
diff --git a/keyboards/mlego/m60_split/rev2/keyboard.json b/keyboards/mlego/m60_split/rev2/keyboard.json
new file mode 100644
index 00000000000..5185a2e6456
--- /dev/null
+++ b/keyboards/mlego/m60_split/rev2/keyboard.json
@@ -0,0 +1,67 @@
+{
+    "usb": {
+        "pid": "0x6362",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "nkro": true,
+        "rgblight": true,
+        "encoder": true
+    },
+    "matrix_pins": {
+        "cols": ["B14", "A10", "A15", "B3", "B4", "B5"],
+        "rows": ["B0", "A6", "A7", "B1", "A5"]
+    },
+    "diode_direction": "COL2ROW",
+    "encoder": {
+        "rotary": [
+            {"pin_a": "A0", "pin_b": "B8"}
+        ]
+    },
+    "indicators": {
+        "caps_lock": "C13",
+        "num_lock": "B12",
+        "scroll_lock": "B13"
+    },
+    "rgblight": {
+        "led_count": 16,
+        "split_count": [8, 8],
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": true,
+            "twinkle": true
+        }
+    },
+    "ws2812": {
+        "pin": "B15"
+    },
+    "split": {
+        "enabled": true,
+        "bootmagic": {
+            "matrix": [5, 0]
+        },
+        "matrix_pins": {
+            "right": {
+                "cols": ["B0", "A3", "A2", "A1", "B7", "B5"],
+                "rows": ["B1", "A4", "A5", "A6", "A7"]
+            }
+        },
+        "transport": {
+            "sync": {
+                "indicators": true,
+                "layer_state": true
+            }
+        }
+    },
+    "development_board": "blackpill_f411"
+}
diff --git a/keyboards/mlego/m60_split/rev2/rules.mk b/keyboards/mlego/m60_split/rev2/rules.mk
index f3ecf1b52cb..c6e29883213 100644
--- a/keyboards/mlego/m60_split/rev2/rules.mk
+++ b/keyboards/mlego/m60_split/rev2/rules.mk
@@ -1,14 +1 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
 SERIAL_DRIVER = usart
-ENCODER_ENABLE = yes        # Enable encoder
diff --git a/keyboards/molecule/info.json b/keyboards/molecule/info.json
deleted file mode 100755
index 51ca67c2820..00000000000
--- a/keyboards/molecule/info.json
+++ /dev/null
@@ -1,73 +0,0 @@
-{
-    "keyboard_name": "molecule",
-    "manufacturer": "bbrfkr",
-    "url": "https://github.com/bbrfkr/keyboards/tree/master/molecule",
-    "maintainer": "bbrfkr",
-    "usb": {
-        "vid": "0xFEED",
-        "pid": "0x0000",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["D3", "D2", "D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5"],
-        "rows": ["F4", "F5", "F6", "B6"]
-    },
-    "diode_direction": "ROW2COL",
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 1},
-                {"matrix": [0, 1], "x": 1, "y": 0.25},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0.5},
-                {"matrix": [0, 4], "x": 4, "y": 0.75},
-
-                {"matrix": [0, 5], "x": 9.75, "y": 0.75},
-                {"matrix": [0, 6], "x": 10.75, "y": 0.5},
-                {"matrix": [0, 7], "x": 11.75, "y": 0},
-                {"matrix": [0, 8], "x": 12.75, "y": 0.25},
-                {"matrix": [0, 9], "x": 13.75, "y": 1},
-
-                {"matrix": [1, 0], "x": 0, "y": 2},
-                {"matrix": [1, 1], "x": 1, "y": 1.25},
-                {"matrix": [1, 2], "x": 2, "y": 1},
-                {"matrix": [1, 3], "x": 3, "y": 1.5},
-                {"matrix": [1, 4], "x": 4, "y": 1.75},
-
-                {"matrix": [1, 5], "x": 9.75, "y": 1.75},
-                {"matrix": [1, 6], "x": 10.75, "y": 1.5},
-                {"matrix": [1, 7], "x": 11.75, "y": 1},
-                {"matrix": [1, 8], "x": 12.75, "y": 1.25},
-                {"matrix": [1, 9], "x": 13.75, "y": 2},
-
-                {"matrix": [2, 0], "x": 0, "y": 3},
-                {"matrix": [2, 1], "x": 1, "y": 2.25},
-                {"matrix": [2, 2], "x": 2, "y": 2},
-                {"matrix": [2, 3], "x": 3, "y": 2.5},
-                {"matrix": [2, 4], "x": 4, "y": 2.75},
-
-                {"matrix": [2, 5], "x": 9.75, "y": 2.75},
-                {"matrix": [2, 6], "x": 10.75, "y": 2.5},
-                {"matrix": [2, 7], "x": 11.75, "y": 2},
-                {"matrix": [2, 8], "x": 12.75, "y": 2.25},
-                {"matrix": [2, 9], "x": 13.75, "y": 3},
-
-                {"matrix": [3, 0], "x": 1, "y": 3.25},
-                {"matrix": [3, 1], "x": 2, "y": 3},
-                {"matrix": [3, 3], "x": 5.25, "y": 3},
-                {"matrix": [3, 4], "x": 6.25, "y": 3.25, "h": 1.5},
-
-                {"matrix": [3, 5], "x": 7.5, "y": 3.25, "h": 1.5},
-                {"matrix": [3, 6], "x": 8.5, "y": 3},
-                {"matrix": [3, 8], "x": 11.75, "y": 3},
-                {"matrix": [3, 9], "x": 12.75, "y": 3.25},
-
-                {"matrix": [3, 2], "x": 5.25, "y": 4},
-
-                {"matrix": [3, 7], "x": 8.5, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/molecule/keyboard.json b/keyboards/molecule/keyboard.json
new file mode 100755
index 00000000000..f3bd818122c
--- /dev/null
+++ b/keyboards/molecule/keyboard.json
@@ -0,0 +1,79 @@
+{
+    "keyboard_name": "molecule",
+    "manufacturer": "bbrfkr",
+    "url": "https://github.com/bbrfkr/keyboards/tree/master/molecule",
+    "maintainer": "bbrfkr",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0x0000",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "pointing_device": true
+    },
+    "matrix_pins": {
+        "cols": ["D3", "D2", "D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5"],
+        "rows": ["F4", "F5", "F6", "B6"]
+    },
+    "diode_direction": "ROW2COL",
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 1},
+                {"matrix": [0, 1], "x": 1, "y": 0.25},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0.5},
+                {"matrix": [0, 4], "x": 4, "y": 0.75},
+
+                {"matrix": [0, 5], "x": 9.75, "y": 0.75},
+                {"matrix": [0, 6], "x": 10.75, "y": 0.5},
+                {"matrix": [0, 7], "x": 11.75, "y": 0},
+                {"matrix": [0, 8], "x": 12.75, "y": 0.25},
+                {"matrix": [0, 9], "x": 13.75, "y": 1},
+
+                {"matrix": [1, 0], "x": 0, "y": 2},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1.5},
+                {"matrix": [1, 4], "x": 4, "y": 1.75},
+
+                {"matrix": [1, 5], "x": 9.75, "y": 1.75},
+                {"matrix": [1, 6], "x": 10.75, "y": 1.5},
+                {"matrix": [1, 7], "x": 11.75, "y": 1},
+                {"matrix": [1, 8], "x": 12.75, "y": 1.25},
+                {"matrix": [1, 9], "x": 13.75, "y": 2},
+
+                {"matrix": [2, 0], "x": 0, "y": 3},
+                {"matrix": [2, 1], "x": 1, "y": 2.25},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2.5},
+                {"matrix": [2, 4], "x": 4, "y": 2.75},
+
+                {"matrix": [2, 5], "x": 9.75, "y": 2.75},
+                {"matrix": [2, 6], "x": 10.75, "y": 2.5},
+                {"matrix": [2, 7], "x": 11.75, "y": 2},
+                {"matrix": [2, 8], "x": 12.75, "y": 2.25},
+                {"matrix": [2, 9], "x": 13.75, "y": 3},
+
+                {"matrix": [3, 0], "x": 1, "y": 3.25},
+                {"matrix": [3, 1], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 5.25, "y": 3},
+                {"matrix": [3, 4], "x": 6.25, "y": 3.25, "h": 1.5},
+
+                {"matrix": [3, 5], "x": 7.5, "y": 3.25, "h": 1.5},
+                {"matrix": [3, 6], "x": 8.5, "y": 3},
+                {"matrix": [3, 8], "x": 11.75, "y": 3},
+                {"matrix": [3, 9], "x": 12.75, "y": 3.25},
+
+                {"matrix": [3, 2], "x": 5.25, "y": 4},
+
+                {"matrix": [3, 7], "x": 8.5, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/molecule/rules.mk b/keyboards/molecule/rules.mk
index 06a8f490ee7..3272be5a9b3 100755
--- a/keyboards/molecule/rules.mk
+++ b/keyboards/molecule/rules.mk
@@ -1,18 +1,4 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no     # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
 # Add trackball support
-POINTING_DEVICE_ENABLE = yes
 POINTING_DEVICE_DRIVER = custom
 SRC += adns.c
 SPI_DRIVER_REQUIRED = yes
diff --git a/keyboards/monokei/mnk1800s/info.json b/keyboards/monokei/mnk1800s/info.json
deleted file mode 100755
index 9cf4f0f122c..00000000000
--- a/keyboards/monokei/mnk1800s/info.json
+++ /dev/null
@@ -1,215 +0,0 @@
-{
-    "keyboard_name": "MNK1800s",
-    "manufacturer": "Yiancar-Designs",
-    "url": "https://yiancar-designs.com",
-    "maintainer": "Yiancar-Designs",
-    "usb": {
-        "vid": "0x8968",
-        "pid": "0x3138",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["B10", "B2", "B1", "B0", "B14", "B15", "A8", "A9", "A10", "B9", "B8", "B7", "B6", "B5", "B4", "B3", "A15", "A14"],
-        "rows": ["B13", "B12", "A7", "A6", "A5"]
-    },
-    "diode_direction": "COL2ROW",
-    "processor": "STM32F072",
-    "bootloader": "stm32-dfu",
-    "layouts": {
-        "LAYOUT_all": {
-            "layout": [
-                {"label": "Num Lock", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "/", "matrix": [0, 1], "x": 1, "y": 0},
-                {"label": "*", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "-", "matrix": [0, 3], "x": 3, "y": 0},
-
-                {"label": "Esc", "matrix": [0, 4], "x": 4.5, "y": 0},
-                {"label": "1", "matrix": [0, 5], "x": 5.5, "y": 0},
-                {"label": "2", "matrix": [0, 6], "x": 6.5, "y": 0},
-                {"label": "3", "matrix": [0, 7], "x": 7.5, "y": 0},
-                {"label": "4", "matrix": [0, 8], "x": 8.5, "y": 0},
-                {"label": "5", "matrix": [0, 9], "x": 9.5, "y": 0},
-                {"label": "6", "matrix": [0, 10], "x": 10.5, "y": 0},
-                {"label": "7", "matrix": [0, 11], "x": 11.5, "y": 0},
-                {"label": "8", "matrix": [0, 12], "x": 12.5, "y": 0},
-                {"label": "9", "matrix": [0, 13], "x": 13.5, "y": 0},
-                {"label": "0", "matrix": [0, 14], "x": 14.5, "y": 0},
-                {"label": "-", "matrix": [0, 15], "x": 15.5, "y": 0},
-                {"label": "=", "matrix": [0, 16], "x": 16.5, "y": 0},
-                {"label": "Backspace", "matrix": [0, 17], "x": 17.5, "y": 0},
-                {"label": "Delete", "matrix": [2, 17], "x": 18.5, "y": 0},
-
-                {"label": "7", "matrix": [1, 0], "x": 0, "y": 1},
-                {"label": "8", "matrix": [1, 1], "x": 1, "y": 1},
-                {"label": "9", "matrix": [1, 2], "x": 2, "y": 1},
-                {"label": "+", "matrix": [1, 3], "x": 3, "y": 1},
-
-                {"label": "Tab", "matrix": [1, 4], "x": 4.5, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 5], "x": 6, "y": 1},
-                {"label": "W", "matrix": [1, 6], "x": 7, "y": 1},
-                {"label": "E", "matrix": [1, 7], "x": 8, "y": 1},
-                {"label": "R", "matrix": [1, 8], "x": 9, "y": 1},
-                {"label": "T", "matrix": [1, 9], "x": 10, "y": 1},
-                {"label": "Y", "matrix": [1, 10], "x": 11, "y": 1},
-                {"label": "U", "matrix": [1, 11], "x": 12, "y": 1},
-                {"label": "I", "matrix": [1, 12], "x": 13, "y": 1},
-                {"label": "O", "matrix": [1, 13], "x": 14, "y": 1},
-                {"label": "P", "matrix": [1, 14], "x": 15, "y": 1},
-                {"label": "[", "matrix": [1, 15], "x": 16, "y": 1},
-                {"label": "]", "matrix": [1, 16], "x": 17, "y": 1},
-                {"label": "\\", "matrix": [1, 17], "x": 18, "y": 1, "w": 1.5},
-
-                {"label": "4", "matrix": [2, 0], "x": 0, "y": 2},
-                {"label": "5", "matrix": [2, 1], "x": 1, "y": 2},
-                {"label": "6", "matrix": [2, 2], "x": 2, "y": 2},
-                {"label": "Enter", "matrix": [2, 3], "x": 3, "y": 2},
-
-                {"label": "Ctrl", "matrix": [2, 4], "x": 4.5, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 5], "x": 6.25, "y": 2},
-                {"label": "S", "matrix": [2, 6], "x": 7.25, "y": 2},
-                {"label": "D", "matrix": [2, 7], "x": 8.25, "y": 2},
-                {"label": "F", "matrix": [2, 8], "x": 9.25, "y": 2},
-                {"label": "G", "matrix": [2, 9], "x": 10.25, "y": 2},
-                {"label": "H", "matrix": [2, 10], "x": 11.25, "y": 2},
-                {"label": "J", "matrix": [2, 11], "x": 12.25, "y": 2},
-                {"label": "K", "matrix": [2, 12], "x": 13.25, "y": 2},
-                {"label": "L", "matrix": [2, 13], "x": 14.25, "y": 2},
-                {"label": ";", "matrix": [2, 14], "x": 15.25, "y": 2},
-                {"label": "'", "matrix": [2, 15], "x": 16.25, "y": 2},
-                {"label": "Enter", "matrix": [2, 16], "x": 17.25, "y": 2, "w": 2.25},
-
-                {"label": "1", "matrix": [3, 0], "x": 0, "y": 3},
-                {"label": "2", "matrix": [3, 1], "x": 1, "y": 3},
-                {"label": "3", "matrix": [3, 2], "x": 2, "y": 3},
-                {"label": "Enter", "matrix": [4, 8], "x": 3, "y": 3},
-
-                {"label": "\u2191", "matrix": [3, 3], "x": 4.25, "y": 3.25},
-
-                {"label": "Shift", "matrix": [3, 4], "x": 5.5, "y": 3, "w": 1.25},
-                {"label": "Z", "matrix": [3, 5], "x": 6.75, "y": 3},
-                {"label": "X", "matrix": [3, 6], "x": 7.75, "y": 3},
-                {"label": "C", "matrix": [3, 7], "x": 8.75, "y": 3},
-                {"label": "V", "matrix": [3, 8], "x": 9.75, "y": 3},
-                {"label": "B", "matrix": [3, 9], "x": 10.75, "y": 3},
-                {"label": "N", "matrix": [3, 10], "x": 11.75, "y": 3},
-                {"label": "M", "matrix": [3, 11], "x": 12.75, "y": 3},
-                {"label": ",", "matrix": [3, 12], "x": 13.75, "y": 3},
-                {"label": ".", "matrix": [3, 13], "x": 14.75, "y": 3},
-                {"label": "/", "matrix": [3, 14], "x": 15.75, "y": 3},
-                {"label": "Shift", "matrix": [3, 15], "x": 16.75, "y": 3, "w": 1.75},
-                {"label": "Fn", "matrix": [3, 16], "x": 18.5, "y": 3},
-
-                {"label": "0", "matrix": [4, 0], "x": 0, "y": 4},
-                {"label": "0", "matrix": [4, 1], "x": 1, "y": 4},
-                {"label": ".", "matrix": [4, 2], "x": 2, "y": 4},
-
-                {"label": "\u2190", "matrix": [4, 3], "x": 3.25, "y": 4.25},
-                {"label": "\u2193", "matrix": [4, 4], "x": 4.25, "y": 4.25},
-                {"label": "\u2192", "matrix": [4, 5], "x": 5.25, "y": 4.25},
-
-                {"label": "GUI", "matrix": [4, 6], "x": 6.5, "y": 4, "w": 1.5},
-                {"label": "Alt", "matrix": [4, 7], "x": 8, "y": 4, "w": 1.5},
-                {"label": "Space", "matrix": [4, 10], "x": 9.5, "y": 4, "w": 7},
-                {"label": "Alt", "matrix": [4, 15], "x": 16.5, "y": 4, "w": 1.5},
-                {"label": "Menu (Legacy)", "matrix": [4, 16], "x": 18, "y": 4, "w": 1.5}
-            ]
-        },
-        "LAYOUT_2u_bs": {
-            "layout": [
-                {"label": "Num Lock", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "/", "matrix": [0, 1], "x": 1, "y": 0},
-                {"label": "*", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "-", "matrix": [0, 3], "x": 3, "y": 0},
-
-                {"label": "Esc", "matrix": [0, 4], "x": 4.5, "y": 0},
-                {"label": "1", "matrix": [0, 5], "x": 5.5, "y": 0},
-                {"label": "2", "matrix": [0, 6], "x": 6.5, "y": 0},
-                {"label": "3", "matrix": [0, 7], "x": 7.5, "y": 0},
-                {"label": "4", "matrix": [0, 8], "x": 8.5, "y": 0},
-                {"label": "5", "matrix": [0, 9], "x": 9.5, "y": 0},
-                {"label": "6", "matrix": [0, 10], "x": 10.5, "y": 0},
-                {"label": "7", "matrix": [0, 11], "x": 11.5, "y": 0},
-                {"label": "8", "matrix": [0, 12], "x": 12.5, "y": 0},
-                {"label": "9", "matrix": [0, 13], "x": 13.5, "y": 0},
-                {"label": "0", "matrix": [0, 14], "x": 14.5, "y": 0},
-                {"label": "-", "matrix": [0, 15], "x": 15.5, "y": 0},
-                {"label": "=", "matrix": [0, 16], "x": 16.5, "y": 0},
-                {"label": "Backspace", "matrix": [0, 17], "x": 17.5, "y": 0, "w": 2},
-
-                {"label": "7", "matrix": [1, 0], "x": 0, "y": 1},
-                {"label": "8", "matrix": [1, 1], "x": 1, "y": 1},
-                {"label": "9", "matrix": [1, 2], "x": 2, "y": 1},
-                {"label": "+", "matrix": [1, 3], "x": 3, "y": 1},
-
-                {"label": "Tab", "matrix": [1, 4], "x": 4.5, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 5], "x": 6, "y": 1},
-                {"label": "W", "matrix": [1, 6], "x": 7, "y": 1},
-                {"label": "E", "matrix": [1, 7], "x": 8, "y": 1},
-                {"label": "R", "matrix": [1, 8], "x": 9, "y": 1},
-                {"label": "T", "matrix": [1, 9], "x": 10, "y": 1},
-                {"label": "Y", "matrix": [1, 10], "x": 11, "y": 1},
-                {"label": "U", "matrix": [1, 11], "x": 12, "y": 1},
-                {"label": "I", "matrix": [1, 12], "x": 13, "y": 1},
-                {"label": "O", "matrix": [1, 13], "x": 14, "y": 1},
-                {"label": "P", "matrix": [1, 14], "x": 15, "y": 1},
-                {"label": "[", "matrix": [1, 15], "x": 16, "y": 1},
-                {"label": "]", "matrix": [1, 16], "x": 17, "y": 1},
-                {"label": "\\", "matrix": [1, 17], "x": 18, "y": 1, "w": 1.5},
-
-                {"label": "4", "matrix": [2, 0], "x": 0, "y": 2},
-                {"label": "5", "matrix": [2, 1], "x": 1, "y": 2},
-                {"label": "6", "matrix": [2, 2], "x": 2, "y": 2},
-                {"label": "Enter", "matrix": [2, 3], "x": 3, "y": 2},
-
-                {"label": "Ctrl", "matrix": [2, 4], "x": 4.5, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 5], "x": 6.25, "y": 2},
-                {"label": "S", "matrix": [2, 6], "x": 7.25, "y": 2},
-                {"label": "D", "matrix": [2, 7], "x": 8.25, "y": 2},
-                {"label": "F", "matrix": [2, 8], "x": 9.25, "y": 2},
-                {"label": "G", "matrix": [2, 9], "x": 10.25, "y": 2},
-                {"label": "H", "matrix": [2, 10], "x": 11.25, "y": 2},
-                {"label": "J", "matrix": [2, 11], "x": 12.25, "y": 2},
-                {"label": "K", "matrix": [2, 12], "x": 13.25, "y": 2},
-                {"label": "L", "matrix": [2, 13], "x": 14.25, "y": 2},
-                {"label": ";", "matrix": [2, 14], "x": 15.25, "y": 2},
-                {"label": "'", "matrix": [2, 15], "x": 16.25, "y": 2},
-                {"label": "Enter", "matrix": [2, 16], "x": 17.25, "y": 2, "w": 2.25},
-
-                {"label": "1", "matrix": [3, 0], "x": 0, "y": 3},
-                {"label": "2", "matrix": [3, 1], "x": 1, "y": 3},
-                {"label": "3", "matrix": [3, 2], "x": 2, "y": 3},
-                {"label": "Enter", "matrix": [4, 8], "x": 3, "y": 3},
-
-                {"label": "\u2191", "matrix": [3, 3], "x": 4.25, "y": 3.25},
-
-                {"label": "Shift", "matrix": [3, 4], "x": 5.5, "y": 3, "w": 1.25},
-                {"label": "Z", "matrix": [3, 5], "x": 6.75, "y": 3},
-                {"label": "X", "matrix": [3, 6], "x": 7.75, "y": 3},
-                {"label": "C", "matrix": [3, 7], "x": 8.75, "y": 3},
-                {"label": "V", "matrix": [3, 8], "x": 9.75, "y": 3},
-                {"label": "B", "matrix": [3, 9], "x": 10.75, "y": 3},
-                {"label": "N", "matrix": [3, 10], "x": 11.75, "y": 3},
-                {"label": "M", "matrix": [3, 11], "x": 12.75, "y": 3},
-                {"label": ",", "matrix": [3, 12], "x": 13.75, "y": 3},
-                {"label": ".", "matrix": [3, 13], "x": 14.75, "y": 3},
-                {"label": "/", "matrix": [3, 14], "x": 15.75, "y": 3},
-                {"label": "Shift", "matrix": [3, 15], "x": 16.75, "y": 3, "w": 1.75},
-                {"label": "Fn", "matrix": [3, 16], "x": 18.5, "y": 3},
-
-                {"label": "0", "matrix": [4, 0], "x": 0, "y": 4},
-                {"label": "0", "matrix": [4, 1], "x": 1, "y": 4},
-                {"label": ".", "matrix": [4, 2], "x": 2, "y": 4},
-
-                {"label": "\u2190", "matrix": [4, 3], "x": 3.25, "y": 4.25},
-                {"label": "\u2193", "matrix": [4, 4], "x": 4.25, "y": 4.25},
-                {"label": "\u2192", "matrix": [4, 5], "x": 5.25, "y": 4.25},
-
-                {"label": "GUI", "matrix": [4, 6], "x": 6.5, "y": 4, "w": 1.5},
-                {"label": "Alt", "matrix": [4, 7], "x": 8, "y": 4, "w": 1.5},
-                {"label": "Space", "matrix": [4, 10], "x": 9.5, "y": 4, "w": 7},
-                {"label": "Alt", "matrix": [4, 15], "x": 16.5, "y": 4, "w": 1.5},
-                {"label": "Menu (Legacy)", "matrix": [4, 16], "x": 18, "y": 4, "w": 1.5}
-            ]
-        }
-    }
-}
diff --git a/keyboards/monokei/mnk1800s/keyboard.json b/keyboards/monokei/mnk1800s/keyboard.json
new file mode 100755
index 00000000000..b11038fcd3e
--- /dev/null
+++ b/keyboards/monokei/mnk1800s/keyboard.json
@@ -0,0 +1,221 @@
+{
+    "keyboard_name": "MNK1800s",
+    "manufacturer": "Yiancar-Designs",
+    "url": "https://yiancar-designs.com",
+    "maintainer": "Yiancar-Designs",
+    "usb": {
+        "vid": "0x8968",
+        "pid": "0x3138",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "nkro": true
+    },
+    "matrix_pins": {
+        "cols": ["B10", "B2", "B1", "B0", "B14", "B15", "A8", "A9", "A10", "B9", "B8", "B7", "B6", "B5", "B4", "B3", "A15", "A14"],
+        "rows": ["B13", "B12", "A7", "A6", "A5"]
+    },
+    "diode_direction": "COL2ROW",
+    "processor": "STM32F072",
+    "bootloader": "stm32-dfu",
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                {"label": "Num Lock", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "/", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "*", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "-", "matrix": [0, 3], "x": 3, "y": 0},
+
+                {"label": "Esc", "matrix": [0, 4], "x": 4.5, "y": 0},
+                {"label": "1", "matrix": [0, 5], "x": 5.5, "y": 0},
+                {"label": "2", "matrix": [0, 6], "x": 6.5, "y": 0},
+                {"label": "3", "matrix": [0, 7], "x": 7.5, "y": 0},
+                {"label": "4", "matrix": [0, 8], "x": 8.5, "y": 0},
+                {"label": "5", "matrix": [0, 9], "x": 9.5, "y": 0},
+                {"label": "6", "matrix": [0, 10], "x": 10.5, "y": 0},
+                {"label": "7", "matrix": [0, 11], "x": 11.5, "y": 0},
+                {"label": "8", "matrix": [0, 12], "x": 12.5, "y": 0},
+                {"label": "9", "matrix": [0, 13], "x": 13.5, "y": 0},
+                {"label": "0", "matrix": [0, 14], "x": 14.5, "y": 0},
+                {"label": "-", "matrix": [0, 15], "x": 15.5, "y": 0},
+                {"label": "=", "matrix": [0, 16], "x": 16.5, "y": 0},
+                {"label": "Backspace", "matrix": [0, 17], "x": 17.5, "y": 0},
+                {"label": "Delete", "matrix": [2, 17], "x": 18.5, "y": 0},
+
+                {"label": "7", "matrix": [1, 0], "x": 0, "y": 1},
+                {"label": "8", "matrix": [1, 1], "x": 1, "y": 1},
+                {"label": "9", "matrix": [1, 2], "x": 2, "y": 1},
+                {"label": "+", "matrix": [1, 3], "x": 3, "y": 1},
+
+                {"label": "Tab", "matrix": [1, 4], "x": 4.5, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 5], "x": 6, "y": 1},
+                {"label": "W", "matrix": [1, 6], "x": 7, "y": 1},
+                {"label": "E", "matrix": [1, 7], "x": 8, "y": 1},
+                {"label": "R", "matrix": [1, 8], "x": 9, "y": 1},
+                {"label": "T", "matrix": [1, 9], "x": 10, "y": 1},
+                {"label": "Y", "matrix": [1, 10], "x": 11, "y": 1},
+                {"label": "U", "matrix": [1, 11], "x": 12, "y": 1},
+                {"label": "I", "matrix": [1, 12], "x": 13, "y": 1},
+                {"label": "O", "matrix": [1, 13], "x": 14, "y": 1},
+                {"label": "P", "matrix": [1, 14], "x": 15, "y": 1},
+                {"label": "[", "matrix": [1, 15], "x": 16, "y": 1},
+                {"label": "]", "matrix": [1, 16], "x": 17, "y": 1},
+                {"label": "\\", "matrix": [1, 17], "x": 18, "y": 1, "w": 1.5},
+
+                {"label": "4", "matrix": [2, 0], "x": 0, "y": 2},
+                {"label": "5", "matrix": [2, 1], "x": 1, "y": 2},
+                {"label": "6", "matrix": [2, 2], "x": 2, "y": 2},
+                {"label": "Enter", "matrix": [2, 3], "x": 3, "y": 2},
+
+                {"label": "Ctrl", "matrix": [2, 4], "x": 4.5, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 5], "x": 6.25, "y": 2},
+                {"label": "S", "matrix": [2, 6], "x": 7.25, "y": 2},
+                {"label": "D", "matrix": [2, 7], "x": 8.25, "y": 2},
+                {"label": "F", "matrix": [2, 8], "x": 9.25, "y": 2},
+                {"label": "G", "matrix": [2, 9], "x": 10.25, "y": 2},
+                {"label": "H", "matrix": [2, 10], "x": 11.25, "y": 2},
+                {"label": "J", "matrix": [2, 11], "x": 12.25, "y": 2},
+                {"label": "K", "matrix": [2, 12], "x": 13.25, "y": 2},
+                {"label": "L", "matrix": [2, 13], "x": 14.25, "y": 2},
+                {"label": ";", "matrix": [2, 14], "x": 15.25, "y": 2},
+                {"label": "'", "matrix": [2, 15], "x": 16.25, "y": 2},
+                {"label": "Enter", "matrix": [2, 16], "x": 17.25, "y": 2, "w": 2.25},
+
+                {"label": "1", "matrix": [3, 0], "x": 0, "y": 3},
+                {"label": "2", "matrix": [3, 1], "x": 1, "y": 3},
+                {"label": "3", "matrix": [3, 2], "x": 2, "y": 3},
+                {"label": "Enter", "matrix": [4, 8], "x": 3, "y": 3},
+
+                {"label": "\u2191", "matrix": [3, 3], "x": 4.25, "y": 3.25},
+
+                {"label": "Shift", "matrix": [3, 4], "x": 5.5, "y": 3, "w": 1.25},
+                {"label": "Z", "matrix": [3, 5], "x": 6.75, "y": 3},
+                {"label": "X", "matrix": [3, 6], "x": 7.75, "y": 3},
+                {"label": "C", "matrix": [3, 7], "x": 8.75, "y": 3},
+                {"label": "V", "matrix": [3, 8], "x": 9.75, "y": 3},
+                {"label": "B", "matrix": [3, 9], "x": 10.75, "y": 3},
+                {"label": "N", "matrix": [3, 10], "x": 11.75, "y": 3},
+                {"label": "M", "matrix": [3, 11], "x": 12.75, "y": 3},
+                {"label": ",", "matrix": [3, 12], "x": 13.75, "y": 3},
+                {"label": ".", "matrix": [3, 13], "x": 14.75, "y": 3},
+                {"label": "/", "matrix": [3, 14], "x": 15.75, "y": 3},
+                {"label": "Shift", "matrix": [3, 15], "x": 16.75, "y": 3, "w": 1.75},
+                {"label": "Fn", "matrix": [3, 16], "x": 18.5, "y": 3},
+
+                {"label": "0", "matrix": [4, 0], "x": 0, "y": 4},
+                {"label": "0", "matrix": [4, 1], "x": 1, "y": 4},
+                {"label": ".", "matrix": [4, 2], "x": 2, "y": 4},
+
+                {"label": "\u2190", "matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"label": "\u2193", "matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"label": "\u2192", "matrix": [4, 5], "x": 5.25, "y": 4.25},
+
+                {"label": "GUI", "matrix": [4, 6], "x": 6.5, "y": 4, "w": 1.5},
+                {"label": "Alt", "matrix": [4, 7], "x": 8, "y": 4, "w": 1.5},
+                {"label": "Space", "matrix": [4, 10], "x": 9.5, "y": 4, "w": 7},
+                {"label": "Alt", "matrix": [4, 15], "x": 16.5, "y": 4, "w": 1.5},
+                {"label": "Menu (Legacy)", "matrix": [4, 16], "x": 18, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_2u_bs": {
+            "layout": [
+                {"label": "Num Lock", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "/", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "*", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "-", "matrix": [0, 3], "x": 3, "y": 0},
+
+                {"label": "Esc", "matrix": [0, 4], "x": 4.5, "y": 0},
+                {"label": "1", "matrix": [0, 5], "x": 5.5, "y": 0},
+                {"label": "2", "matrix": [0, 6], "x": 6.5, "y": 0},
+                {"label": "3", "matrix": [0, 7], "x": 7.5, "y": 0},
+                {"label": "4", "matrix": [0, 8], "x": 8.5, "y": 0},
+                {"label": "5", "matrix": [0, 9], "x": 9.5, "y": 0},
+                {"label": "6", "matrix": [0, 10], "x": 10.5, "y": 0},
+                {"label": "7", "matrix": [0, 11], "x": 11.5, "y": 0},
+                {"label": "8", "matrix": [0, 12], "x": 12.5, "y": 0},
+                {"label": "9", "matrix": [0, 13], "x": 13.5, "y": 0},
+                {"label": "0", "matrix": [0, 14], "x": 14.5, "y": 0},
+                {"label": "-", "matrix": [0, 15], "x": 15.5, "y": 0},
+                {"label": "=", "matrix": [0, 16], "x": 16.5, "y": 0},
+                {"label": "Backspace", "matrix": [0, 17], "x": 17.5, "y": 0, "w": 2},
+
+                {"label": "7", "matrix": [1, 0], "x": 0, "y": 1},
+                {"label": "8", "matrix": [1, 1], "x": 1, "y": 1},
+                {"label": "9", "matrix": [1, 2], "x": 2, "y": 1},
+                {"label": "+", "matrix": [1, 3], "x": 3, "y": 1},
+
+                {"label": "Tab", "matrix": [1, 4], "x": 4.5, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 5], "x": 6, "y": 1},
+                {"label": "W", "matrix": [1, 6], "x": 7, "y": 1},
+                {"label": "E", "matrix": [1, 7], "x": 8, "y": 1},
+                {"label": "R", "matrix": [1, 8], "x": 9, "y": 1},
+                {"label": "T", "matrix": [1, 9], "x": 10, "y": 1},
+                {"label": "Y", "matrix": [1, 10], "x": 11, "y": 1},
+                {"label": "U", "matrix": [1, 11], "x": 12, "y": 1},
+                {"label": "I", "matrix": [1, 12], "x": 13, "y": 1},
+                {"label": "O", "matrix": [1, 13], "x": 14, "y": 1},
+                {"label": "P", "matrix": [1, 14], "x": 15, "y": 1},
+                {"label": "[", "matrix": [1, 15], "x": 16, "y": 1},
+                {"label": "]", "matrix": [1, 16], "x": 17, "y": 1},
+                {"label": "\\", "matrix": [1, 17], "x": 18, "y": 1, "w": 1.5},
+
+                {"label": "4", "matrix": [2, 0], "x": 0, "y": 2},
+                {"label": "5", "matrix": [2, 1], "x": 1, "y": 2},
+                {"label": "6", "matrix": [2, 2], "x": 2, "y": 2},
+                {"label": "Enter", "matrix": [2, 3], "x": 3, "y": 2},
+
+                {"label": "Ctrl", "matrix": [2, 4], "x": 4.5, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 5], "x": 6.25, "y": 2},
+                {"label": "S", "matrix": [2, 6], "x": 7.25, "y": 2},
+                {"label": "D", "matrix": [2, 7], "x": 8.25, "y": 2},
+                {"label": "F", "matrix": [2, 8], "x": 9.25, "y": 2},
+                {"label": "G", "matrix": [2, 9], "x": 10.25, "y": 2},
+                {"label": "H", "matrix": [2, 10], "x": 11.25, "y": 2},
+                {"label": "J", "matrix": [2, 11], "x": 12.25, "y": 2},
+                {"label": "K", "matrix": [2, 12], "x": 13.25, "y": 2},
+                {"label": "L", "matrix": [2, 13], "x": 14.25, "y": 2},
+                {"label": ";", "matrix": [2, 14], "x": 15.25, "y": 2},
+                {"label": "'", "matrix": [2, 15], "x": 16.25, "y": 2},
+                {"label": "Enter", "matrix": [2, 16], "x": 17.25, "y": 2, "w": 2.25},
+
+                {"label": "1", "matrix": [3, 0], "x": 0, "y": 3},
+                {"label": "2", "matrix": [3, 1], "x": 1, "y": 3},
+                {"label": "3", "matrix": [3, 2], "x": 2, "y": 3},
+                {"label": "Enter", "matrix": [4, 8], "x": 3, "y": 3},
+
+                {"label": "\u2191", "matrix": [3, 3], "x": 4.25, "y": 3.25},
+
+                {"label": "Shift", "matrix": [3, 4], "x": 5.5, "y": 3, "w": 1.25},
+                {"label": "Z", "matrix": [3, 5], "x": 6.75, "y": 3},
+                {"label": "X", "matrix": [3, 6], "x": 7.75, "y": 3},
+                {"label": "C", "matrix": [3, 7], "x": 8.75, "y": 3},
+                {"label": "V", "matrix": [3, 8], "x": 9.75, "y": 3},
+                {"label": "B", "matrix": [3, 9], "x": 10.75, "y": 3},
+                {"label": "N", "matrix": [3, 10], "x": 11.75, "y": 3},
+                {"label": "M", "matrix": [3, 11], "x": 12.75, "y": 3},
+                {"label": ",", "matrix": [3, 12], "x": 13.75, "y": 3},
+                {"label": ".", "matrix": [3, 13], "x": 14.75, "y": 3},
+                {"label": "/", "matrix": [3, 14], "x": 15.75, "y": 3},
+                {"label": "Shift", "matrix": [3, 15], "x": 16.75, "y": 3, "w": 1.75},
+                {"label": "Fn", "matrix": [3, 16], "x": 18.5, "y": 3},
+
+                {"label": "0", "matrix": [4, 0], "x": 0, "y": 4},
+                {"label": "0", "matrix": [4, 1], "x": 1, "y": 4},
+                {"label": ".", "matrix": [4, 2], "x": 2, "y": 4},
+
+                {"label": "\u2190", "matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"label": "\u2193", "matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"label": "\u2192", "matrix": [4, 5], "x": 5.25, "y": 4.25},
+
+                {"label": "GUI", "matrix": [4, 6], "x": 6.5, "y": 4, "w": 1.5},
+                {"label": "Alt", "matrix": [4, 7], "x": 8, "y": 4, "w": 1.5},
+                {"label": "Space", "matrix": [4, 10], "x": 9.5, "y": 4, "w": 7},
+                {"label": "Alt", "matrix": [4, 15], "x": 16.5, "y": 4, "w": 1.5},
+                {"label": "Menu (Legacy)", "matrix": [4, 16], "x": 18, "y": 4, "w": 1.5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/monokei/mnk1800s/rules.mk b/keyboards/monokei/mnk1800s/rules.mk
index 7c0709f41e6..0ab54aaaf71 100644
--- a/keyboards/monokei/mnk1800s/rules.mk
+++ b/keyboards/monokei/mnk1800s/rules.mk
@@ -1,15 +1,2 @@
 # Wildcard to allow APM32 MCU
 DFU_SUFFIX_ARGS = -v FFFF -p FFFF
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
diff --git a/keyboards/monokei/mnk50/info.json b/keyboards/monokei/mnk50/info.json
deleted file mode 100755
index 3d4c98edc7f..00000000000
--- a/keyboards/monokei/mnk50/info.json
+++ /dev/null
@@ -1,183 +0,0 @@
-{
-    "keyboard_name": "MNK50",
-    "manufacturer": "Yiancar-Designs",
-    "url": "https://yiancar-designs.com",
-    "maintainer": "Yiancar-Designs",
-    "usb": {
-        "vid": "0x8968",
-        "pid": "0x4D35",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["B14", "B15", "A8", "A9", "A13", "A14", "A15", "B3", "B4", "B5", "B6", "B7", "B8", "B9"],
-        "rows": ["B12", "B13", "A10", "A6"]
-    },
-    "diode_direction": "COL2ROW",
-    "processor": "STM32F072",
-    "bootloader": "stm32-dfu",
-    "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, 0], "x": 0, "y": 1, "w": 1.25},
-                {"matrix": [1, 1], "x": 1.25, "y": 1},
-                {"matrix": [1, 2], "x": 2.25, "y": 1},
-                {"matrix": [1, 3], "x": 3.25, "y": 1},
-                {"matrix": [1, 4], "x": 4.25, "y": 1},
-                {"matrix": [1, 5], "x": 5.25, "y": 1},
-                {"matrix": [1, 6], "x": 6.25, "y": 1},
-                {"matrix": [1, 7], "x": 7.25, "y": 1},
-                {"matrix": [1, 8], "x": 8.25, "y": 1},
-                {"matrix": [1, 9], "x": 9.25, "y": 1},
-                {"matrix": [1, 10], "x": 10.25, "y": 1},
-                {"matrix": [1, 11], "x": 11.25, "y": 1},
-                {"matrix": [1, 13], "x": 12.25, "y": 1, "w": 1.75},
-
-                {"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, "w": 1.25},
-                {"matrix": [2, 13], "x": 13, "y": 2},
-
-                {"matrix": [3, 1], "x": 1.25, "y": 3},
-                {"matrix": [3, 2], "x": 2.25, "y": 3, "w": 1.25},
-                {"matrix": [3, 3], "x": 3.5, "y": 3},
-                {"matrix": [3, 5], "x": 4.5, "y": 3, "w": 2},
-                {"matrix": [3, 6], "x": 6.5, "y": 3},
-                {"matrix": [3, 7], "x": 7.5, "y": 3, "w": 2},
-                {"matrix": [3, 9], "x": 9.5, "y": 3},
-                {"matrix": [3, 10], "x": 10.5, "y": 3, "w": 1.25},
-                {"matrix": [3, 11], "x": 11.75, "y": 3}
-            ]
-        },
-        "LAYOUT_split_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},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
-                {"matrix": [1, 1], "x": 1.25, "y": 1},
-                {"matrix": [1, 2], "x": 2.25, "y": 1},
-                {"matrix": [1, 3], "x": 3.25, "y": 1},
-                {"matrix": [1, 4], "x": 4.25, "y": 1},
-                {"matrix": [1, 5], "x": 5.25, "y": 1},
-                {"matrix": [1, 6], "x": 6.25, "y": 1},
-                {"matrix": [1, 7], "x": 7.25, "y": 1},
-                {"matrix": [1, 8], "x": 8.25, "y": 1},
-                {"matrix": [1, 9], "x": 9.25, "y": 1},
-                {"matrix": [1, 10], "x": 10.25, "y": 1},
-                {"matrix": [1, 11], "x": 11.25, "y": 1},
-                {"matrix": [1, 13], "x": 12.25, "y": 1, "w": 1.75},
-
-                {"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, "w": 1.25},
-                {"matrix": [2, 13], "x": 13, "y": 2},
-
-                {"matrix": [3, 1], "x": 1.25, "y": 3},
-                {"matrix": [3, 2], "x": 2.25, "y": 3, "w": 1.25},
-                {"matrix": [3, 3], "x": 3.5, "y": 3},
-                {"matrix": [3, 5], "x": 4.5, "y": 3, "w": 2.25},
-                {"matrix": [3, 7], "x": 6.75, "y": 3, "w": 2.75},
-                {"matrix": [3, 9], "x": 9.5, "y": 3},
-                {"matrix": [3, 10], "x": 10.5, "y": 3, "w": 1.25},
-                {"matrix": [3, 11], "x": 11.75, "y": 3}
-            ]
-        },
-        "LAYOUT_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},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
-                {"matrix": [1, 1], "x": 1.25, "y": 1},
-                {"matrix": [1, 2], "x": 2.25, "y": 1},
-                {"matrix": [1, 3], "x": 3.25, "y": 1},
-                {"matrix": [1, 4], "x": 4.25, "y": 1},
-                {"matrix": [1, 5], "x": 5.25, "y": 1},
-                {"matrix": [1, 6], "x": 6.25, "y": 1},
-                {"matrix": [1, 7], "x": 7.25, "y": 1},
-                {"matrix": [1, 8], "x": 8.25, "y": 1},
-                {"matrix": [1, 9], "x": 9.25, "y": 1},
-                {"matrix": [1, 10], "x": 10.25, "y": 1},
-                {"matrix": [1, 11], "x": 11.25, "y": 1},
-                {"matrix": [1, 13], "x": 12.25, "y": 1, "w": 1.75},
-
-                {"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, "w": 1.25},
-                {"matrix": [2, 13], "x": 13, "y": 2},
-
-                {"matrix": [3, 1], "x": 1.25, "y": 3},
-                {"matrix": [3, 2], "x": 2.25, "y": 3, "w": 1.25},
-                {"matrix": [3, 6], "x": 3.5, "y": 3, "w": 7},
-                {"matrix": [3, 10], "x": 10.5, "y": 3, "w": 1.25},
-                {"matrix": [3, 11], "x": 11.75, "y": 3}
-            ]
-        }
-    }
-}
diff --git a/keyboards/monokei/mnk50/keyboard.json b/keyboards/monokei/mnk50/keyboard.json
new file mode 100755
index 00000000000..e5d72096dca
--- /dev/null
+++ b/keyboards/monokei/mnk50/keyboard.json
@@ -0,0 +1,189 @@
+{
+    "keyboard_name": "MNK50",
+    "manufacturer": "Yiancar-Designs",
+    "url": "https://yiancar-designs.com",
+    "maintainer": "Yiancar-Designs",
+    "usb": {
+        "vid": "0x8968",
+        "pid": "0x4D35",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "nkro": true
+    },
+    "matrix_pins": {
+        "cols": ["B14", "B15", "A8", "A9", "A13", "A14", "A15", "B3", "B4", "B5", "B6", "B7", "B8", "B9"],
+        "rows": ["B12", "B13", "A10", "A6"]
+    },
+    "diode_direction": "COL2ROW",
+    "processor": "STM32F072",
+    "bootloader": "stm32-dfu",
+    "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, 0], "x": 0, "y": 1, "w": 1.25},
+                {"matrix": [1, 1], "x": 1.25, "y": 1},
+                {"matrix": [1, 2], "x": 2.25, "y": 1},
+                {"matrix": [1, 3], "x": 3.25, "y": 1},
+                {"matrix": [1, 4], "x": 4.25, "y": 1},
+                {"matrix": [1, 5], "x": 5.25, "y": 1},
+                {"matrix": [1, 6], "x": 6.25, "y": 1},
+                {"matrix": [1, 7], "x": 7.25, "y": 1},
+                {"matrix": [1, 8], "x": 8.25, "y": 1},
+                {"matrix": [1, 9], "x": 9.25, "y": 1},
+                {"matrix": [1, 10], "x": 10.25, "y": 1},
+                {"matrix": [1, 11], "x": 11.25, "y": 1},
+                {"matrix": [1, 13], "x": 12.25, "y": 1, "w": 1.75},
+
+                {"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, "w": 1.25},
+                {"matrix": [2, 13], "x": 13, "y": 2},
+
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3, "w": 1.25},
+                {"matrix": [3, 3], "x": 3.5, "y": 3},
+                {"matrix": [3, 5], "x": 4.5, "y": 3, "w": 2},
+                {"matrix": [3, 6], "x": 6.5, "y": 3},
+                {"matrix": [3, 7], "x": 7.5, "y": 3, "w": 2},
+                {"matrix": [3, 9], "x": 9.5, "y": 3},
+                {"matrix": [3, 10], "x": 10.5, "y": 3, "w": 1.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3}
+            ]
+        },
+        "LAYOUT_split_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},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
+                {"matrix": [1, 1], "x": 1.25, "y": 1},
+                {"matrix": [1, 2], "x": 2.25, "y": 1},
+                {"matrix": [1, 3], "x": 3.25, "y": 1},
+                {"matrix": [1, 4], "x": 4.25, "y": 1},
+                {"matrix": [1, 5], "x": 5.25, "y": 1},
+                {"matrix": [1, 6], "x": 6.25, "y": 1},
+                {"matrix": [1, 7], "x": 7.25, "y": 1},
+                {"matrix": [1, 8], "x": 8.25, "y": 1},
+                {"matrix": [1, 9], "x": 9.25, "y": 1},
+                {"matrix": [1, 10], "x": 10.25, "y": 1},
+                {"matrix": [1, 11], "x": 11.25, "y": 1},
+                {"matrix": [1, 13], "x": 12.25, "y": 1, "w": 1.75},
+
+                {"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, "w": 1.25},
+                {"matrix": [2, 13], "x": 13, "y": 2},
+
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3, "w": 1.25},
+                {"matrix": [3, 3], "x": 3.5, "y": 3},
+                {"matrix": [3, 5], "x": 4.5, "y": 3, "w": 2.25},
+                {"matrix": [3, 7], "x": 6.75, "y": 3, "w": 2.75},
+                {"matrix": [3, 9], "x": 9.5, "y": 3},
+                {"matrix": [3, 10], "x": 10.5, "y": 3, "w": 1.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3}
+            ]
+        },
+        "LAYOUT_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},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
+                {"matrix": [1, 1], "x": 1.25, "y": 1},
+                {"matrix": [1, 2], "x": 2.25, "y": 1},
+                {"matrix": [1, 3], "x": 3.25, "y": 1},
+                {"matrix": [1, 4], "x": 4.25, "y": 1},
+                {"matrix": [1, 5], "x": 5.25, "y": 1},
+                {"matrix": [1, 6], "x": 6.25, "y": 1},
+                {"matrix": [1, 7], "x": 7.25, "y": 1},
+                {"matrix": [1, 8], "x": 8.25, "y": 1},
+                {"matrix": [1, 9], "x": 9.25, "y": 1},
+                {"matrix": [1, 10], "x": 10.25, "y": 1},
+                {"matrix": [1, 11], "x": 11.25, "y": 1},
+                {"matrix": [1, 13], "x": 12.25, "y": 1, "w": 1.75},
+
+                {"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, "w": 1.25},
+                {"matrix": [2, 13], "x": 13, "y": 2},
+
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3, "w": 1.25},
+                {"matrix": [3, 6], "x": 3.5, "y": 3, "w": 7},
+                {"matrix": [3, 10], "x": 10.5, "y": 3, "w": 1.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3}
+            ]
+        }
+    }
+}
diff --git a/keyboards/monokei/mnk50/rules.mk b/keyboards/monokei/mnk50/rules.mk
index 7c0709f41e6..0ab54aaaf71 100644
--- a/keyboards/monokei/mnk50/rules.mk
+++ b/keyboards/monokei/mnk50/rules.mk
@@ -1,15 +1,2 @@
 # Wildcard to allow APM32 MCU
 DFU_SUFFIX_ARGS = -v FFFF -p FFFF
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
diff --git a/keyboards/monokei/mnk75/info.json b/keyboards/monokei/mnk75/info.json
deleted file mode 100755
index 421e830a1bd..00000000000
--- a/keyboards/monokei/mnk75/info.json
+++ /dev/null
@@ -1,883 +0,0 @@
-{
-    "keyboard_name": "MNK75",
-    "manufacturer": "Yiancar-Designs",
-    "url": "https://yiancar-designs.com",
-    "maintainer": "Yiancar-Designs",
-    "usb": {
-        "vid": "0x8968",
-        "pid": "0x4D37",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["A1", "B9", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "B2", "B10", "B11", "B12", "B13", "B14"],
-        "rows": ["A2", "A14", "A15", "B3", "B4", "B5"]
-    },
-    "diode_direction": "COL2ROW",
-    "processor": "STM32F072",
-    "bootloader": "stm32-dfu",
-    "layouts": {
-        "LAYOUT_all": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-
-                {"label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0},
-                {"label": "F2", "matrix": [0, 2], "x": 2.25, "y": 0},
-                {"label": "F3", "matrix": [0, 3], "x": 3.25, "y": 0},
-                {"label": "F4", "matrix": [0, 4], "x": 4.25, "y": 0},
-
-                {"label": "F5", "matrix": [0, 5], "x": 5.5, "y": 0},
-                {"label": "F6", "matrix": [0, 6], "x": 6.5, "y": 0},
-                {"label": "F7", "matrix": [0, 7], "x": 7.5, "y": 0},
-                {"label": "F8", "matrix": [0, 8], "x": 8.5, "y": 0},
-
-                {"label": "F9", "matrix": [0, 9], "x": 9.75, "y": 0},
-                {"label": "F10", "matrix": [0, 10], "x": 10.75, "y": 0},
-                {"label": "F11", "matrix": [0, 11], "x": 11.75, "y": 0},
-                {"label": "F12", "matrix": [0, 12], "x": 12.75, "y": 0},
-
-                {"label": "F13", "matrix": [0, 13], "x": 14, "y": 0},
-
-                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.5},
-                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.5},
-                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.5},
-                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.5},
-                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.5},
-                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.5},
-                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.5},
-                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.5},
-                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.5},
-                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.5},
-                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.5},
-                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.5},
-                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.5},
-                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.5},
-                {"label": "Delete", "matrix": [2, 13], "x": 14, "y": 1.5},
-                {"label": "Home", "matrix": [1, 14], "x": 15, "y": 1.5},
-
-                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
-                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.5},
-                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.5},
-                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.5},
-                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.5},
-                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.5},
-                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.5},
-                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.5},
-                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.5},
-                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.5},
-                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.5},
-                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.5},
-                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.5},
-                {"label": "\\", "matrix": [3, 12], "x": 13.5, "y": 2.5, "w": 1.5},
-                {"label": "Page Up", "matrix": [2, 14], "x": 15, "y": 2.5},
-
-                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
-                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.5},
-                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.5},
-                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.5},
-                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.5},
-                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.5},
-                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.5},
-                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.5},
-                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.5},
-                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.5},
-                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.5},
-                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.5},
-                {"label": "Enter", "matrix": [3, 13], "x": 12.75, "y": 3.5, "w": 2.25},
-                {"label": "Page Down", "matrix": [3, 14], "x": 15, "y": 3.5},
-
-                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.5, "w": 1.25},
-                {"label": "\\", "matrix": [4, 1], "x": 1.25, "y": 4.5},
-                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.5},
-                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.5},
-                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.5},
-                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.5},
-                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.5},
-                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.5},
-                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.5},
-                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.5},
-                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.5},
-                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.5},
-                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 1.75},
-                {"label": "\u2191", "matrix": [4, 13], "x": 14, "y": 4.5},
-                {"label": "End", "matrix": [4, 14], "x": 15, "y": 4.5},
-
-                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25},
-                {"label": "GUI", "matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25},
-                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25},
-                {"label": "Space", "matrix": [5, 4], "x": 3.75, "y": 5.5, "w": 2.75},
-                {"label": "Space", "matrix": [5, 6], "x": 6.5, "y": 5.5, "w": 1.25},
-                {"label": "Space", "matrix": [5, 8], "x": 7.75, "y": 5.5, "w": 2.25},
-                {"label": "Alt", "matrix": [5, 10], "x": 10, "y": 5.5, "w": 1.25},
-                {"label": "Menu", "matrix": [5, 11], "x": 11.25, "y": 5.5, "w": 1.25},
-
-                {"label": "\u2190", "matrix": [5, 12], "x": 13, "y": 5.5},
-                {"label": "\u2193", "matrix": [5, 13], "x": 14, "y": 5.5},
-                {"label": "\u2192", "matrix": [5, 14], "x": 15, "y": 5.5}
-            ]
-        },
-        "LAYOUT_ansi": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-
-                {"label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0},
-                {"label": "F2", "matrix": [0, 2], "x": 2.25, "y": 0},
-                {"label": "F3", "matrix": [0, 3], "x": 3.25, "y": 0},
-                {"label": "F4", "matrix": [0, 4], "x": 4.25, "y": 0},
-
-                {"label": "F5", "matrix": [0, 5], "x": 5.5, "y": 0},
-                {"label": "F6", "matrix": [0, 6], "x": 6.5, "y": 0},
-                {"label": "F7", "matrix": [0, 7], "x": 7.5, "y": 0},
-                {"label": "F8", "matrix": [0, 8], "x": 8.5, "y": 0},
-
-                {"label": "F9", "matrix": [0, 9], "x": 9.75, "y": 0},
-                {"label": "F10", "matrix": [0, 10], "x": 10.75, "y": 0},
-                {"label": "F11", "matrix": [0, 11], "x": 11.75, "y": 0},
-                {"label": "F12", "matrix": [0, 12], "x": 12.75, "y": 0},
-
-                {"label": "F13", "matrix": [0, 13], "x": 14, "y": 0},
-
-                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.5},
-                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.5},
-                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.5},
-                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.5},
-                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.5},
-                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.5},
-                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.5},
-                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.5},
-                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.5},
-                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.5},
-                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.5},
-                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.5},
-                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.5},
-                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.5, "w": 2},
-                {"label": "Home", "matrix": [1, 14], "x": 15, "y": 1.5},
-
-                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
-                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.5},
-                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.5},
-                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.5},
-                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.5},
-                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.5},
-                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.5},
-                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.5},
-                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.5},
-                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.5},
-                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.5},
-                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.5},
-                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.5},
-                {"label": "\\", "matrix": [3, 12], "x": 13.5, "y": 2.5, "w": 1.5},
-                {"label": "Page Up", "matrix": [2, 14], "x": 15, "y": 2.5},
-
-                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
-                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.5},
-                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.5},
-                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.5},
-                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.5},
-                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.5},
-                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.5},
-                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.5},
-                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.5},
-                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.5},
-                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.5},
-                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.5},
-                {"label": "Enter", "matrix": [3, 13], "x": 12.75, "y": 3.5, "w": 2.25},
-                {"label": "Page Down", "matrix": [3, 14], "x": 15, "y": 3.5},
-
-                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
-                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.5},
-                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.5},
-                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.5},
-                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.5},
-                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.5},
-                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.5},
-                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.5},
-                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.5},
-                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.5},
-                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.5},
-                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 1.75},
-                {"label": "\u2191", "matrix": [4, 13], "x": 14, "y": 4.5},
-                {"label": "End", "matrix": [4, 14], "x": 15, "y": 4.5},
-
-                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25},
-                {"label": "GUI", "matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25},
-                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25},
-                {"label": "Space", "matrix": [5, 6], "x": 3.75, "y": 5.5, "w": 6.25},
-                {"label": "Alt", "matrix": [5, 10], "x": 10, "y": 5.5, "w": 1.25},
-                {"label": "Menu", "matrix": [5, 11], "x": 11.25, "y": 5.5, "w": 1.25},
-
-                {"label": "\u2190", "matrix": [5, 12], "x": 13, "y": 5.5},
-                {"label": "\u2193", "matrix": [5, 13], "x": 14, "y": 5.5},
-                {"label": "\u2192", "matrix": [5, 14], "x": 15, "y": 5.5}
-            ]
-        },
-        "LAYOUT_ansi_split_bs": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-
-                {"label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0},
-                {"label": "F2", "matrix": [0, 2], "x": 2.25, "y": 0},
-                {"label": "F3", "matrix": [0, 3], "x": 3.25, "y": 0},
-                {"label": "F4", "matrix": [0, 4], "x": 4.25, "y": 0},
-
-                {"label": "F5", "matrix": [0, 5], "x": 5.5, "y": 0},
-                {"label": "F6", "matrix": [0, 6], "x": 6.5, "y": 0},
-                {"label": "F7", "matrix": [0, 7], "x": 7.5, "y": 0},
-                {"label": "F8", "matrix": [0, 8], "x": 8.5, "y": 0},
-
-                {"label": "F9", "matrix": [0, 9], "x": 9.75, "y": 0},
-                {"label": "F10", "matrix": [0, 10], "x": 10.75, "y": 0},
-                {"label": "F11", "matrix": [0, 11], "x": 11.75, "y": 0},
-                {"label": "F12", "matrix": [0, 12], "x": 12.75, "y": 0},
-
-                {"label": "F13", "matrix": [0, 13], "x": 14, "y": 0},
-
-                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.5},
-                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.5},
-                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.5},
-                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.5},
-                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.5},
-                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.5},
-                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.5},
-                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.5},
-                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.5},
-                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.5},
-                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.5},
-                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.5},
-                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.5},
-                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.5},
-                {"label": "Delete", "matrix": [2, 13], "x": 14, "y": 1.5},
-                {"label": "Home", "matrix": [1, 14], "x": 15, "y": 1.5},
-
-                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
-                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.5},
-                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.5},
-                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.5},
-                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.5},
-                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.5},
-                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.5},
-                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.5},
-                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.5},
-                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.5},
-                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.5},
-                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.5},
-                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.5},
-                {"label": "\\", "matrix": [3, 12], "x": 13.5, "y": 2.5, "w": 1.5},
-                {"label": "Page Up", "matrix": [2, 14], "x": 15, "y": 2.5},
-
-                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
-                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.5},
-                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.5},
-                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.5},
-                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.5},
-                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.5},
-                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.5},
-                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.5},
-                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.5},
-                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.5},
-                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.5},
-                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.5},
-                {"label": "Enter", "matrix": [3, 13], "x": 12.75, "y": 3.5, "w": 2.25},
-                {"label": "Page Down", "matrix": [3, 14], "x": 15, "y": 3.5},
-
-                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
-                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.5},
-                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.5},
-                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.5},
-                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.5},
-                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.5},
-                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.5},
-                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.5},
-                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.5},
-                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.5},
-                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.5},
-                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 1.75},
-                {"label": "\u2191", "matrix": [4, 13], "x": 14, "y": 4.5},
-                {"label": "End", "matrix": [4, 14], "x": 15, "y": 4.5},
-
-                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25},
-                {"label": "GUI", "matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25},
-                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25},
-                {"label": "Space", "matrix": [5, 6], "x": 3.75, "y": 5.5, "w": 6.25},
-                {"label": "Alt", "matrix": [5, 10], "x": 10, "y": 5.5, "w": 1.25},
-                {"label": "Menu", "matrix": [5, 11], "x": 11.25, "y": 5.5, "w": 1.25},
-
-                {"label": "\u2190", "matrix": [5, 12], "x": 13, "y": 5.5},
-                {"label": "\u2193", "matrix": [5, 13], "x": 14, "y": 5.5},
-                {"label": "\u2192", "matrix": [5, 14], "x": 15, "y": 5.5}
-            ]
-        },
-        "LAYOUT_ansi_tsangan": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-
-                {"label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0},
-                {"label": "F2", "matrix": [0, 2], "x": 2.25, "y": 0},
-                {"label": "F3", "matrix": [0, 3], "x": 3.25, "y": 0},
-                {"label": "F4", "matrix": [0, 4], "x": 4.25, "y": 0},
-
-                {"label": "F5", "matrix": [0, 5], "x": 5.5, "y": 0},
-                {"label": "F6", "matrix": [0, 6], "x": 6.5, "y": 0},
-                {"label": "F7", "matrix": [0, 7], "x": 7.5, "y": 0},
-                {"label": "F8", "matrix": [0, 8], "x": 8.5, "y": 0},
-
-                {"label": "F9", "matrix": [0, 9], "x": 9.75, "y": 0},
-                {"label": "F10", "matrix": [0, 10], "x": 10.75, "y": 0},
-                {"label": "F11", "matrix": [0, 11], "x": 11.75, "y": 0},
-                {"label": "F12", "matrix": [0, 12], "x": 12.75, "y": 0},
-
-                {"label": "F13", "matrix": [0, 13], "x": 14, "y": 0},
-
-                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.5},
-                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.5},
-                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.5},
-                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.5},
-                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.5},
-                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.5},
-                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.5},
-                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.5},
-                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.5},
-                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.5},
-                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.5},
-                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.5},
-                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.5},
-                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.5, "w": 2},
-                {"label": "Home", "matrix": [1, 14], "x": 15, "y": 1.5},
-
-                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
-                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.5},
-                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.5},
-                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.5},
-                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.5},
-                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.5},
-                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.5},
-                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.5},
-                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.5},
-                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.5},
-                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.5},
-                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.5},
-                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.5},
-                {"label": "\\", "matrix": [3, 12], "x": 13.5, "y": 2.5, "w": 1.5},
-                {"label": "Page Up", "matrix": [2, 14], "x": 15, "y": 2.5},
-
-                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
-                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.5},
-                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.5},
-                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.5},
-                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.5},
-                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.5},
-                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.5},
-                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.5},
-                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.5},
-                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.5},
-                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.5},
-                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.5},
-                {"label": "Enter", "matrix": [3, 13], "x": 12.75, "y": 3.5, "w": 2.25},
-                {"label": "Page Down", "matrix": [3, 14], "x": 15, "y": 3.5},
-
-                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
-                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.5},
-                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.5},
-                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.5},
-                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.5},
-                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.5},
-                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.5},
-                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.5},
-                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.5},
-                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.5},
-                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.5},
-                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 1.75},
-                {"label": "\u2191", "matrix": [4, 13], "x": 14, "y": 4.5},
-                {"label": "End", "matrix": [4, 14], "x": 15, "y": 4.5},
-
-                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.5},
-                {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 5.5},
-                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.5},
-                {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5.5, "w": 7},
-                {"label": "Menu", "matrix": [5, 11], "x": 11, "y": 5.5, "w": 1.5},
-
-                {"label": "\u2190", "matrix": [5, 12], "x": 13, "y": 5.5},
-                {"label": "\u2193", "matrix": [5, 13], "x": 14, "y": 5.5},
-                {"label": "\u2192", "matrix": [5, 14], "x": 15, "y": 5.5}
-            ]
-        },
-        "LAYOUT_ansi_tsangan_split_bs": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-
-                {"label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0},
-                {"label": "F2", "matrix": [0, 2], "x": 2.25, "y": 0},
-                {"label": "F3", "matrix": [0, 3], "x": 3.25, "y": 0},
-                {"label": "F4", "matrix": [0, 4], "x": 4.25, "y": 0},
-
-                {"label": "F5", "matrix": [0, 5], "x": 5.5, "y": 0},
-                {"label": "F6", "matrix": [0, 6], "x": 6.5, "y": 0},
-                {"label": "F7", "matrix": [0, 7], "x": 7.5, "y": 0},
-                {"label": "F8", "matrix": [0, 8], "x": 8.5, "y": 0},
-
-                {"label": "F9", "matrix": [0, 9], "x": 9.75, "y": 0},
-                {"label": "F10", "matrix": [0, 10], "x": 10.75, "y": 0},
-                {"label": "F11", "matrix": [0, 11], "x": 11.75, "y": 0},
-                {"label": "F12", "matrix": [0, 12], "x": 12.75, "y": 0},
-
-                {"label": "F13", "matrix": [0, 13], "x": 14, "y": 0},
-
-                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.5},
-                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.5},
-                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.5},
-                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.5},
-                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.5},
-                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.5},
-                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.5},
-                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.5},
-                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.5},
-                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.5},
-                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.5},
-                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.5},
-                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.5},
-                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.5},
-                {"label": "Delete", "matrix": [2, 13], "x": 14, "y": 1.5},
-                {"label": "Home", "matrix": [1, 14], "x": 15, "y": 1.5},
-
-                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
-                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.5},
-                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.5},
-                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.5},
-                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.5},
-                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.5},
-                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.5},
-                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.5},
-                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.5},
-                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.5},
-                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.5},
-                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.5},
-                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.5},
-                {"label": "\\", "matrix": [3, 12], "x": 13.5, "y": 2.5, "w": 1.5},
-                {"label": "Page Up", "matrix": [2, 14], "x": 15, "y": 2.5},
-
-                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
-                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.5},
-                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.5},
-                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.5},
-                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.5},
-                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.5},
-                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.5},
-                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.5},
-                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.5},
-                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.5},
-                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.5},
-                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.5},
-                {"label": "Enter", "matrix": [3, 13], "x": 12.75, "y": 3.5, "w": 2.25},
-                {"label": "Page Down", "matrix": [3, 14], "x": 15, "y": 3.5},
-
-                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
-                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.5},
-                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.5},
-                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.5},
-                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.5},
-                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.5},
-                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.5},
-                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.5},
-                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.5},
-                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.5},
-                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.5},
-                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 1.75},
-                {"label": "\u2191", "matrix": [4, 13], "x": 14, "y": 4.5},
-                {"label": "End", "matrix": [4, 14], "x": 15, "y": 4.5},
-
-                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.5},
-                {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 5.5},
-                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.5},
-                {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5.5, "w": 7},
-                {"label": "Menu", "matrix": [5, 11], "x": 11, "y": 5.5, "w": 1.5},
-
-                {"label": "\u2190", "matrix": [5, 12], "x": 13, "y": 5.5},
-                {"label": "\u2193", "matrix": [5, 13], "x": 14, "y": 5.5},
-                {"label": "\u2192", "matrix": [5, 14], "x": 15, "y": 5.5}
-            ]
-        },
-        "LAYOUT_iso": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-
-                {"label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0},
-                {"label": "F2", "matrix": [0, 2], "x": 2.25, "y": 0},
-                {"label": "F3", "matrix": [0, 3], "x": 3.25, "y": 0},
-                {"label": "F4", "matrix": [0, 4], "x": 4.25, "y": 0},
-
-                {"label": "F5", "matrix": [0, 5], "x": 5.5, "y": 0},
-                {"label": "F6", "matrix": [0, 6], "x": 6.5, "y": 0},
-                {"label": "F7", "matrix": [0, 7], "x": 7.5, "y": 0},
-                {"label": "F8", "matrix": [0, 8], "x": 8.5, "y": 0},
-
-                {"label": "F9", "matrix": [0, 9], "x": 9.75, "y": 0},
-                {"label": "F10", "matrix": [0, 10], "x": 10.75, "y": 0},
-                {"label": "F11", "matrix": [0, 11], "x": 11.75, "y": 0},
-                {"label": "F12", "matrix": [0, 12], "x": 12.75, "y": 0},
-
-                {"label": "F13", "matrix": [0, 13], "x": 14, "y": 0},
-
-                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.5},
-                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.5},
-                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.5},
-                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.5},
-                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.5},
-                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.5},
-                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.5},
-                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.5},
-                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.5},
-                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.5},
-                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.5},
-                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.5},
-                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.5},
-                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.5, "w": 2},
-                {"label": "Home", "matrix": [1, 14], "x": 15, "y": 1.5},
-
-                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
-                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.5},
-                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.5},
-                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.5},
-                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.5},
-                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.5},
-                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.5},
-                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.5},
-                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.5},
-                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.5},
-                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.5},
-                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.5},
-                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.5},
-                {"label": "Page Up", "matrix": [2, 14], "x": 15, "y": 2.5},
-
-                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
-                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.5},
-                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.5},
-                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.5},
-                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.5},
-                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.5},
-                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.5},
-                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.5},
-                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.5},
-                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.5},
-                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.5},
-                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.5},
-                {"label": "#", "matrix": [3, 12], "x": 12.75, "y": 3.5},
-                {"label": "Enter", "matrix": [3, 13], "x": 13.75, "y": 2.5, "w": 1.25, "h": 2},
-                {"label": "Page Down", "matrix": [3, 14], "x": 15, "y": 3.5},
-
-                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.5, "w": 1.25},
-                {"label": "\\", "matrix": [4, 1], "x": 1.25, "y": 4.5},
-                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.5},
-                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.5},
-                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.5},
-                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.5},
-                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.5},
-                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.5},
-                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.5},
-                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.5},
-                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.5},
-                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.5},
-                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 1.75},
-                {"label": "\u2191", "matrix": [4, 13], "x": 14, "y": 4.5},
-                {"label": "End", "matrix": [4, 14], "x": 15, "y": 4.5},
-
-                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25},
-                {"label": "GUI", "matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25},
-                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25},
-                {"label": "Space", "matrix": [5, 6], "x": 3.75, "y": 5.5, "w": 6.25},
-                {"label": "Alt", "matrix": [5, 10], "x": 10, "y": 5.5, "w": 1.25},
-                {"label": "Menu", "matrix": [5, 11], "x": 11.25, "y": 5.5, "w": 1.25},
-
-                {"label": "\u2190", "matrix": [5, 12], "x": 13, "y": 5.5},
-                {"label": "\u2193", "matrix": [5, 13], "x": 14, "y": 5.5},
-                {"label": "\u2192", "matrix": [5, 14], "x": 15, "y": 5.5}
-            ]
-        },
-        "LAYOUT_iso_split_bs": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-
-                {"label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0},
-                {"label": "F2", "matrix": [0, 2], "x": 2.25, "y": 0},
-                {"label": "F3", "matrix": [0, 3], "x": 3.25, "y": 0},
-                {"label": "F4", "matrix": [0, 4], "x": 4.25, "y": 0},
-
-                {"label": "F5", "matrix": [0, 5], "x": 5.5, "y": 0},
-                {"label": "F6", "matrix": [0, 6], "x": 6.5, "y": 0},
-                {"label": "F7", "matrix": [0, 7], "x": 7.5, "y": 0},
-                {"label": "F8", "matrix": [0, 8], "x": 8.5, "y": 0},
-
-                {"label": "F9", "matrix": [0, 9], "x": 9.75, "y": 0},
-                {"label": "F10", "matrix": [0, 10], "x": 10.75, "y": 0},
-                {"label": "F11", "matrix": [0, 11], "x": 11.75, "y": 0},
-                {"label": "F12", "matrix": [0, 12], "x": 12.75, "y": 0},
-
-                {"label": "F13", "matrix": [0, 13], "x": 14, "y": 0},
-
-                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.5},
-                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.5},
-                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.5},
-                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.5},
-                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.5},
-                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.5},
-                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.5},
-                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.5},
-                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.5},
-                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.5},
-                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.5},
-                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.5},
-                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.5},
-                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.5},
-                {"label": "Delete", "matrix": [2, 13], "x": 14, "y": 1.5},
-                {"label": "Home", "matrix": [1, 14], "x": 15, "y": 1.5},
-
-                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
-                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.5},
-                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.5},
-                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.5},
-                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.5},
-                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.5},
-                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.5},
-                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.5},
-                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.5},
-                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.5},
-                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.5},
-                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.5},
-                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.5},
-                {"label": "Page Up", "matrix": [2, 14], "x": 15, "y": 2.5},
-
-                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
-                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.5},
-                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.5},
-                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.5},
-                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.5},
-                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.5},
-                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.5},
-                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.5},
-                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.5},
-                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.5},
-                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.5},
-                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.5},
-                {"label": "#", "matrix": [3, 12], "x": 12.75, "y": 3.5},
-                {"label": "Enter", "matrix": [3, 13], "x": 13.75, "y": 2.5, "w": 1.25, "h": 2},
-                {"label": "Page Down", "matrix": [3, 14], "x": 15, "y": 3.5},
-
-                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.5, "w": 1.25},
-                {"label": "\\", "matrix": [4, 1], "x": 1.25, "y": 4.5},
-                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.5},
-                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.5},
-                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.5},
-                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.5},
-                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.5},
-                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.5},
-                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.5},
-                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.5},
-                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.5},
-                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.5},
-                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 1.75},
-                {"label": "\u2191", "matrix": [4, 13], "x": 14, "y": 4.5},
-                {"label": "End", "matrix": [4, 14], "x": 15, "y": 4.5},
-
-                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25},
-                {"label": "GUI", "matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25},
-                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25},
-                {"label": "Space", "matrix": [5, 6], "x": 3.75, "y": 5.5, "w": 6.25},
-                {"label": "Alt", "matrix": [5, 10], "x": 10, "y": 5.5, "w": 1.25},
-                {"label": "Menu", "matrix": [5, 11], "x": 11.25, "y": 5.5, "w": 1.25},
-
-                {"label": "\u2190", "matrix": [5, 12], "x": 13, "y": 5.5},
-                {"label": "\u2193", "matrix": [5, 13], "x": 14, "y": 5.5},
-                {"label": "\u2192", "matrix": [5, 14], "x": 15, "y": 5.5}
-            ]
-        },
-        "LAYOUT_iso_tsangan": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-
-                {"label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0},
-                {"label": "F2", "matrix": [0, 2], "x": 2.25, "y": 0},
-                {"label": "F3", "matrix": [0, 3], "x": 3.25, "y": 0},
-                {"label": "F4", "matrix": [0, 4], "x": 4.25, "y": 0},
-
-                {"label": "F5", "matrix": [0, 5], "x": 5.5, "y": 0},
-                {"label": "F6", "matrix": [0, 6], "x": 6.5, "y": 0},
-                {"label": "F7", "matrix": [0, 7], "x": 7.5, "y": 0},
-                {"label": "F8", "matrix": [0, 8], "x": 8.5, "y": 0},
-
-                {"label": "F9", "matrix": [0, 9], "x": 9.75, "y": 0},
-                {"label": "F10", "matrix": [0, 10], "x": 10.75, "y": 0},
-                {"label": "F11", "matrix": [0, 11], "x": 11.75, "y": 0},
-                {"label": "F12", "matrix": [0, 12], "x": 12.75, "y": 0},
-
-                {"label": "F13", "matrix": [0, 13], "x": 14, "y": 0},
-
-                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.5},
-                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.5},
-                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.5},
-                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.5},
-                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.5},
-                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.5},
-                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.5},
-                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.5},
-                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.5},
-                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.5},
-                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.5},
-                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.5},
-                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.5},
-                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.5, "w": 2},
-                {"label": "Home", "matrix": [1, 14], "x": 15, "y": 1.5},
-
-                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
-                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.5},
-                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.5},
-                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.5},
-                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.5},
-                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.5},
-                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.5},
-                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.5},
-                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.5},
-                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.5},
-                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.5},
-                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.5},
-                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.5},
-                {"label": "Page Up", "matrix": [2, 14], "x": 15, "y": 2.5},
-
-                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
-                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.5},
-                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.5},
-                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.5},
-                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.5},
-                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.5},
-                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.5},
-                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.5},
-                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.5},
-                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.5},
-                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.5},
-                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.5},
-                {"label": "#", "matrix": [3, 12], "x": 12.75, "y": 3.5},
-                {"label": "Enter", "matrix": [3, 13], "x": 13.75, "y": 2.5, "w": 1.25, "h": 2},
-                {"label": "Page Down", "matrix": [3, 14], "x": 15, "y": 3.5},
-
-                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.5, "w": 1.25},
-                {"label": "\\", "matrix": [4, 1], "x": 1.25, "y": 4.5},
-                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.5},
-                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.5},
-                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.5},
-                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.5},
-                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.5},
-                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.5},
-                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.5},
-                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.5},
-                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.5},
-                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.5},
-                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 1.75},
-                {"label": "\u2191", "matrix": [4, 13], "x": 14, "y": 4.5},
-                {"label": "End", "matrix": [4, 14], "x": 15, "y": 4.5},
-
-                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.5},
-                {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 5.5},
-                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.5},
-                {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5.5, "w": 7},
-                {"label": "Menu", "matrix": [5, 11], "x": 11, "y": 5.5, "w": 1.5},
-
-                {"label": "\u2190", "matrix": [5, 12], "x": 13, "y": 5.5},
-                {"label": "\u2193", "matrix": [5, 13], "x": 14, "y": 5.5},
-                {"label": "\u2192", "matrix": [5, 14], "x": 15, "y": 5.5}
-            ]
-        },
-        "LAYOUT_iso_tsangan_split_bs": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-
-                {"label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0},
-                {"label": "F2", "matrix": [0, 2], "x": 2.25, "y": 0},
-                {"label": "F3", "matrix": [0, 3], "x": 3.25, "y": 0},
-                {"label": "F4", "matrix": [0, 4], "x": 4.25, "y": 0},
-
-                {"label": "F5", "matrix": [0, 5], "x": 5.5, "y": 0},
-                {"label": "F6", "matrix": [0, 6], "x": 6.5, "y": 0},
-                {"label": "F7", "matrix": [0, 7], "x": 7.5, "y": 0},
-                {"label": "F8", "matrix": [0, 8], "x": 8.5, "y": 0},
-
-                {"label": "F9", "matrix": [0, 9], "x": 9.75, "y": 0},
-                {"label": "F10", "matrix": [0, 10], "x": 10.75, "y": 0},
-                {"label": "F11", "matrix": [0, 11], "x": 11.75, "y": 0},
-                {"label": "F12", "matrix": [0, 12], "x": 12.75, "y": 0},
-
-                {"label": "F13", "matrix": [0, 13], "x": 14, "y": 0},
-
-                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.5},
-                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.5},
-                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.5},
-                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.5},
-                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.5},
-                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.5},
-                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.5},
-                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.5},
-                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.5},
-                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.5},
-                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.5},
-                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.5},
-                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.5},
-                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.5},
-                {"label": "Delete", "matrix": [2, 13], "x": 14, "y": 1.5},
-                {"label": "Home", "matrix": [1, 14], "x": 15, "y": 1.5},
-
-                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
-                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.5},
-                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.5},
-                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.5},
-                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.5},
-                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.5},
-                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.5},
-                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.5},
-                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.5},
-                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.5},
-                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.5},
-                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.5},
-                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.5},
-                {"label": "Page Up", "matrix": [2, 14], "x": 15, "y": 2.5},
-
-                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
-                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.5},
-                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.5},
-                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.5},
-                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.5},
-                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.5},
-                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.5},
-                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.5},
-                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.5},
-                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.5},
-                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.5},
-                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.5},
-                {"label": "#", "matrix": [3, 12], "x": 12.75, "y": 3.5},
-                {"label": "Enter", "matrix": [3, 13], "x": 13.75, "y": 2.5, "w": 1.25, "h": 2},
-                {"label": "Page Down", "matrix": [3, 14], "x": 15, "y": 3.5},
-
-                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.5, "w": 1.25},
-                {"label": "\\", "matrix": [4, 1], "x": 1.25, "y": 4.5},
-                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.5},
-                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.5},
-                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.5},
-                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.5},
-                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.5},
-                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.5},
-                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.5},
-                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.5},
-                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.5},
-                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.5},
-                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 1.75},
-                {"label": "\u2191", "matrix": [4, 13], "x": 14, "y": 4.5},
-                {"label": "End", "matrix": [4, 14], "x": 15, "y": 4.5},
-
-                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.5},
-                {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 5.5},
-                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.5},
-                {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5.5, "w": 7},
-                {"label": "Menu", "matrix": [5, 11], "x": 11, "y": 5.5, "w": 1.5},
-
-                {"label": "\u2190", "matrix": [5, 12], "x": 13, "y": 5.5},
-                {"label": "\u2193", "matrix": [5, 13], "x": 14, "y": 5.5},
-                {"label": "\u2192", "matrix": [5, 14], "x": 15, "y": 5.5}
-            ]
-        }
-    }
-}
diff --git a/keyboards/monokei/mnk75/keyboard.json b/keyboards/monokei/mnk75/keyboard.json
new file mode 100755
index 00000000000..d9d7d6a8c8b
--- /dev/null
+++ b/keyboards/monokei/mnk75/keyboard.json
@@ -0,0 +1,889 @@
+{
+    "keyboard_name": "MNK75",
+    "manufacturer": "Yiancar-Designs",
+    "url": "https://yiancar-designs.com",
+    "maintainer": "Yiancar-Designs",
+    "usb": {
+        "vid": "0x8968",
+        "pid": "0x4D37",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "nkro": true
+    },
+    "matrix_pins": {
+        "cols": ["A1", "B9", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "B2", "B10", "B11", "B12", "B13", "B14"],
+        "rows": ["A2", "A14", "A15", "B3", "B4", "B5"]
+    },
+    "diode_direction": "COL2ROW",
+    "processor": "STM32F072",
+    "bootloader": "stm32-dfu",
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0},
+                {"label": "F2", "matrix": [0, 2], "x": 2.25, "y": 0},
+                {"label": "F3", "matrix": [0, 3], "x": 3.25, "y": 0},
+                {"label": "F4", "matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"label": "F5", "matrix": [0, 5], "x": 5.5, "y": 0},
+                {"label": "F6", "matrix": [0, 6], "x": 6.5, "y": 0},
+                {"label": "F7", "matrix": [0, 7], "x": 7.5, "y": 0},
+                {"label": "F8", "matrix": [0, 8], "x": 8.5, "y": 0},
+
+                {"label": "F9", "matrix": [0, 9], "x": 9.75, "y": 0},
+                {"label": "F10", "matrix": [0, 10], "x": 10.75, "y": 0},
+                {"label": "F11", "matrix": [0, 11], "x": 11.75, "y": 0},
+                {"label": "F12", "matrix": [0, 12], "x": 12.75, "y": 0},
+
+                {"label": "F13", "matrix": [0, 13], "x": 14, "y": 0},
+
+                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.5},
+                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.5},
+                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.5},
+                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.5},
+                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.5},
+                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.5},
+                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.5},
+                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.5},
+                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.5},
+                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.5},
+                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.5},
+                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.5},
+                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.5},
+                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.5},
+                {"label": "Delete", "matrix": [2, 13], "x": 14, "y": 1.5},
+                {"label": "Home", "matrix": [1, 14], "x": 15, "y": 1.5},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.5},
+                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.5},
+                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.5},
+                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.5},
+                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.5},
+                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.5},
+                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.5},
+                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.5},
+                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.5},
+                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.5},
+                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.5},
+                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.5},
+                {"label": "\\", "matrix": [3, 12], "x": 13.5, "y": 2.5, "w": 1.5},
+                {"label": "Page Up", "matrix": [2, 14], "x": 15, "y": 2.5},
+
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.5},
+                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.5},
+                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.5},
+                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.5},
+                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.5},
+                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.5},
+                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.5},
+                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.5},
+                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.5},
+                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.5},
+                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.5},
+                {"label": "Enter", "matrix": [3, 13], "x": 12.75, "y": 3.5, "w": 2.25},
+                {"label": "Page Down", "matrix": [3, 14], "x": 15, "y": 3.5},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.5, "w": 1.25},
+                {"label": "\\", "matrix": [4, 1], "x": 1.25, "y": 4.5},
+                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.5},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.5},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.5},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.5},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.5},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.5},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.5},
+                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.5},
+                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.5},
+                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.5},
+                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 1.75},
+                {"label": "\u2191", "matrix": [4, 13], "x": 14, "y": 4.5},
+                {"label": "End", "matrix": [4, 14], "x": 15, "y": 4.5},
+
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25},
+                {"label": "GUI", "matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25},
+                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25},
+                {"label": "Space", "matrix": [5, 4], "x": 3.75, "y": 5.5, "w": 2.75},
+                {"label": "Space", "matrix": [5, 6], "x": 6.5, "y": 5.5, "w": 1.25},
+                {"label": "Space", "matrix": [5, 8], "x": 7.75, "y": 5.5, "w": 2.25},
+                {"label": "Alt", "matrix": [5, 10], "x": 10, "y": 5.5, "w": 1.25},
+                {"label": "Menu", "matrix": [5, 11], "x": 11.25, "y": 5.5, "w": 1.25},
+
+                {"label": "\u2190", "matrix": [5, 12], "x": 13, "y": 5.5},
+                {"label": "\u2193", "matrix": [5, 13], "x": 14, "y": 5.5},
+                {"label": "\u2192", "matrix": [5, 14], "x": 15, "y": 5.5}
+            ]
+        },
+        "LAYOUT_ansi": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0},
+                {"label": "F2", "matrix": [0, 2], "x": 2.25, "y": 0},
+                {"label": "F3", "matrix": [0, 3], "x": 3.25, "y": 0},
+                {"label": "F4", "matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"label": "F5", "matrix": [0, 5], "x": 5.5, "y": 0},
+                {"label": "F6", "matrix": [0, 6], "x": 6.5, "y": 0},
+                {"label": "F7", "matrix": [0, 7], "x": 7.5, "y": 0},
+                {"label": "F8", "matrix": [0, 8], "x": 8.5, "y": 0},
+
+                {"label": "F9", "matrix": [0, 9], "x": 9.75, "y": 0},
+                {"label": "F10", "matrix": [0, 10], "x": 10.75, "y": 0},
+                {"label": "F11", "matrix": [0, 11], "x": 11.75, "y": 0},
+                {"label": "F12", "matrix": [0, 12], "x": 12.75, "y": 0},
+
+                {"label": "F13", "matrix": [0, 13], "x": 14, "y": 0},
+
+                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.5},
+                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.5},
+                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.5},
+                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.5},
+                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.5},
+                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.5},
+                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.5},
+                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.5},
+                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.5},
+                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.5},
+                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.5},
+                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.5},
+                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.5},
+                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.5, "w": 2},
+                {"label": "Home", "matrix": [1, 14], "x": 15, "y": 1.5},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.5},
+                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.5},
+                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.5},
+                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.5},
+                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.5},
+                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.5},
+                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.5},
+                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.5},
+                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.5},
+                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.5},
+                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.5},
+                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.5},
+                {"label": "\\", "matrix": [3, 12], "x": 13.5, "y": 2.5, "w": 1.5},
+                {"label": "Page Up", "matrix": [2, 14], "x": 15, "y": 2.5},
+
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.5},
+                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.5},
+                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.5},
+                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.5},
+                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.5},
+                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.5},
+                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.5},
+                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.5},
+                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.5},
+                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.5},
+                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.5},
+                {"label": "Enter", "matrix": [3, 13], "x": 12.75, "y": 3.5, "w": 2.25},
+                {"label": "Page Down", "matrix": [3, 14], "x": 15, "y": 3.5},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
+                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.5},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.5},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.5},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.5},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.5},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.5},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.5},
+                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.5},
+                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.5},
+                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.5},
+                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 1.75},
+                {"label": "\u2191", "matrix": [4, 13], "x": 14, "y": 4.5},
+                {"label": "End", "matrix": [4, 14], "x": 15, "y": 4.5},
+
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25},
+                {"label": "GUI", "matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25},
+                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25},
+                {"label": "Space", "matrix": [5, 6], "x": 3.75, "y": 5.5, "w": 6.25},
+                {"label": "Alt", "matrix": [5, 10], "x": 10, "y": 5.5, "w": 1.25},
+                {"label": "Menu", "matrix": [5, 11], "x": 11.25, "y": 5.5, "w": 1.25},
+
+                {"label": "\u2190", "matrix": [5, 12], "x": 13, "y": 5.5},
+                {"label": "\u2193", "matrix": [5, 13], "x": 14, "y": 5.5},
+                {"label": "\u2192", "matrix": [5, 14], "x": 15, "y": 5.5}
+            ]
+        },
+        "LAYOUT_ansi_split_bs": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0},
+                {"label": "F2", "matrix": [0, 2], "x": 2.25, "y": 0},
+                {"label": "F3", "matrix": [0, 3], "x": 3.25, "y": 0},
+                {"label": "F4", "matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"label": "F5", "matrix": [0, 5], "x": 5.5, "y": 0},
+                {"label": "F6", "matrix": [0, 6], "x": 6.5, "y": 0},
+                {"label": "F7", "matrix": [0, 7], "x": 7.5, "y": 0},
+                {"label": "F8", "matrix": [0, 8], "x": 8.5, "y": 0},
+
+                {"label": "F9", "matrix": [0, 9], "x": 9.75, "y": 0},
+                {"label": "F10", "matrix": [0, 10], "x": 10.75, "y": 0},
+                {"label": "F11", "matrix": [0, 11], "x": 11.75, "y": 0},
+                {"label": "F12", "matrix": [0, 12], "x": 12.75, "y": 0},
+
+                {"label": "F13", "matrix": [0, 13], "x": 14, "y": 0},
+
+                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.5},
+                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.5},
+                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.5},
+                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.5},
+                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.5},
+                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.5},
+                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.5},
+                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.5},
+                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.5},
+                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.5},
+                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.5},
+                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.5},
+                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.5},
+                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.5},
+                {"label": "Delete", "matrix": [2, 13], "x": 14, "y": 1.5},
+                {"label": "Home", "matrix": [1, 14], "x": 15, "y": 1.5},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.5},
+                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.5},
+                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.5},
+                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.5},
+                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.5},
+                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.5},
+                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.5},
+                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.5},
+                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.5},
+                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.5},
+                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.5},
+                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.5},
+                {"label": "\\", "matrix": [3, 12], "x": 13.5, "y": 2.5, "w": 1.5},
+                {"label": "Page Up", "matrix": [2, 14], "x": 15, "y": 2.5},
+
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.5},
+                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.5},
+                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.5},
+                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.5},
+                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.5},
+                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.5},
+                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.5},
+                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.5},
+                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.5},
+                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.5},
+                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.5},
+                {"label": "Enter", "matrix": [3, 13], "x": 12.75, "y": 3.5, "w": 2.25},
+                {"label": "Page Down", "matrix": [3, 14], "x": 15, "y": 3.5},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
+                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.5},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.5},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.5},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.5},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.5},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.5},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.5},
+                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.5},
+                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.5},
+                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.5},
+                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 1.75},
+                {"label": "\u2191", "matrix": [4, 13], "x": 14, "y": 4.5},
+                {"label": "End", "matrix": [4, 14], "x": 15, "y": 4.5},
+
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25},
+                {"label": "GUI", "matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25},
+                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25},
+                {"label": "Space", "matrix": [5, 6], "x": 3.75, "y": 5.5, "w": 6.25},
+                {"label": "Alt", "matrix": [5, 10], "x": 10, "y": 5.5, "w": 1.25},
+                {"label": "Menu", "matrix": [5, 11], "x": 11.25, "y": 5.5, "w": 1.25},
+
+                {"label": "\u2190", "matrix": [5, 12], "x": 13, "y": 5.5},
+                {"label": "\u2193", "matrix": [5, 13], "x": 14, "y": 5.5},
+                {"label": "\u2192", "matrix": [5, 14], "x": 15, "y": 5.5}
+            ]
+        },
+        "LAYOUT_ansi_tsangan": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0},
+                {"label": "F2", "matrix": [0, 2], "x": 2.25, "y": 0},
+                {"label": "F3", "matrix": [0, 3], "x": 3.25, "y": 0},
+                {"label": "F4", "matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"label": "F5", "matrix": [0, 5], "x": 5.5, "y": 0},
+                {"label": "F6", "matrix": [0, 6], "x": 6.5, "y": 0},
+                {"label": "F7", "matrix": [0, 7], "x": 7.5, "y": 0},
+                {"label": "F8", "matrix": [0, 8], "x": 8.5, "y": 0},
+
+                {"label": "F9", "matrix": [0, 9], "x": 9.75, "y": 0},
+                {"label": "F10", "matrix": [0, 10], "x": 10.75, "y": 0},
+                {"label": "F11", "matrix": [0, 11], "x": 11.75, "y": 0},
+                {"label": "F12", "matrix": [0, 12], "x": 12.75, "y": 0},
+
+                {"label": "F13", "matrix": [0, 13], "x": 14, "y": 0},
+
+                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.5},
+                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.5},
+                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.5},
+                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.5},
+                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.5},
+                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.5},
+                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.5},
+                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.5},
+                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.5},
+                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.5},
+                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.5},
+                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.5},
+                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.5},
+                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.5, "w": 2},
+                {"label": "Home", "matrix": [1, 14], "x": 15, "y": 1.5},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.5},
+                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.5},
+                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.5},
+                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.5},
+                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.5},
+                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.5},
+                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.5},
+                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.5},
+                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.5},
+                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.5},
+                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.5},
+                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.5},
+                {"label": "\\", "matrix": [3, 12], "x": 13.5, "y": 2.5, "w": 1.5},
+                {"label": "Page Up", "matrix": [2, 14], "x": 15, "y": 2.5},
+
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.5},
+                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.5},
+                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.5},
+                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.5},
+                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.5},
+                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.5},
+                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.5},
+                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.5},
+                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.5},
+                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.5},
+                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.5},
+                {"label": "Enter", "matrix": [3, 13], "x": 12.75, "y": 3.5, "w": 2.25},
+                {"label": "Page Down", "matrix": [3, 14], "x": 15, "y": 3.5},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
+                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.5},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.5},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.5},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.5},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.5},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.5},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.5},
+                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.5},
+                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.5},
+                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.5},
+                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 1.75},
+                {"label": "\u2191", "matrix": [4, 13], "x": 14, "y": 4.5},
+                {"label": "End", "matrix": [4, 14], "x": 15, "y": 4.5},
+
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.5},
+                {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 5.5},
+                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.5},
+                {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5.5, "w": 7},
+                {"label": "Menu", "matrix": [5, 11], "x": 11, "y": 5.5, "w": 1.5},
+
+                {"label": "\u2190", "matrix": [5, 12], "x": 13, "y": 5.5},
+                {"label": "\u2193", "matrix": [5, 13], "x": 14, "y": 5.5},
+                {"label": "\u2192", "matrix": [5, 14], "x": 15, "y": 5.5}
+            ]
+        },
+        "LAYOUT_ansi_tsangan_split_bs": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0},
+                {"label": "F2", "matrix": [0, 2], "x": 2.25, "y": 0},
+                {"label": "F3", "matrix": [0, 3], "x": 3.25, "y": 0},
+                {"label": "F4", "matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"label": "F5", "matrix": [0, 5], "x": 5.5, "y": 0},
+                {"label": "F6", "matrix": [0, 6], "x": 6.5, "y": 0},
+                {"label": "F7", "matrix": [0, 7], "x": 7.5, "y": 0},
+                {"label": "F8", "matrix": [0, 8], "x": 8.5, "y": 0},
+
+                {"label": "F9", "matrix": [0, 9], "x": 9.75, "y": 0},
+                {"label": "F10", "matrix": [0, 10], "x": 10.75, "y": 0},
+                {"label": "F11", "matrix": [0, 11], "x": 11.75, "y": 0},
+                {"label": "F12", "matrix": [0, 12], "x": 12.75, "y": 0},
+
+                {"label": "F13", "matrix": [0, 13], "x": 14, "y": 0},
+
+                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.5},
+                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.5},
+                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.5},
+                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.5},
+                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.5},
+                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.5},
+                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.5},
+                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.5},
+                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.5},
+                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.5},
+                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.5},
+                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.5},
+                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.5},
+                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.5},
+                {"label": "Delete", "matrix": [2, 13], "x": 14, "y": 1.5},
+                {"label": "Home", "matrix": [1, 14], "x": 15, "y": 1.5},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.5},
+                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.5},
+                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.5},
+                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.5},
+                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.5},
+                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.5},
+                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.5},
+                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.5},
+                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.5},
+                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.5},
+                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.5},
+                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.5},
+                {"label": "\\", "matrix": [3, 12], "x": 13.5, "y": 2.5, "w": 1.5},
+                {"label": "Page Up", "matrix": [2, 14], "x": 15, "y": 2.5},
+
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.5},
+                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.5},
+                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.5},
+                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.5},
+                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.5},
+                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.5},
+                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.5},
+                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.5},
+                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.5},
+                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.5},
+                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.5},
+                {"label": "Enter", "matrix": [3, 13], "x": 12.75, "y": 3.5, "w": 2.25},
+                {"label": "Page Down", "matrix": [3, 14], "x": 15, "y": 3.5},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
+                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.5},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.5},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.5},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.5},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.5},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.5},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.5},
+                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.5},
+                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.5},
+                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.5},
+                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 1.75},
+                {"label": "\u2191", "matrix": [4, 13], "x": 14, "y": 4.5},
+                {"label": "End", "matrix": [4, 14], "x": 15, "y": 4.5},
+
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.5},
+                {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 5.5},
+                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.5},
+                {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5.5, "w": 7},
+                {"label": "Menu", "matrix": [5, 11], "x": 11, "y": 5.5, "w": 1.5},
+
+                {"label": "\u2190", "matrix": [5, 12], "x": 13, "y": 5.5},
+                {"label": "\u2193", "matrix": [5, 13], "x": 14, "y": 5.5},
+                {"label": "\u2192", "matrix": [5, 14], "x": 15, "y": 5.5}
+            ]
+        },
+        "LAYOUT_iso": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0},
+                {"label": "F2", "matrix": [0, 2], "x": 2.25, "y": 0},
+                {"label": "F3", "matrix": [0, 3], "x": 3.25, "y": 0},
+                {"label": "F4", "matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"label": "F5", "matrix": [0, 5], "x": 5.5, "y": 0},
+                {"label": "F6", "matrix": [0, 6], "x": 6.5, "y": 0},
+                {"label": "F7", "matrix": [0, 7], "x": 7.5, "y": 0},
+                {"label": "F8", "matrix": [0, 8], "x": 8.5, "y": 0},
+
+                {"label": "F9", "matrix": [0, 9], "x": 9.75, "y": 0},
+                {"label": "F10", "matrix": [0, 10], "x": 10.75, "y": 0},
+                {"label": "F11", "matrix": [0, 11], "x": 11.75, "y": 0},
+                {"label": "F12", "matrix": [0, 12], "x": 12.75, "y": 0},
+
+                {"label": "F13", "matrix": [0, 13], "x": 14, "y": 0},
+
+                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.5},
+                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.5},
+                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.5},
+                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.5},
+                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.5},
+                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.5},
+                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.5},
+                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.5},
+                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.5},
+                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.5},
+                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.5},
+                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.5},
+                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.5},
+                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.5, "w": 2},
+                {"label": "Home", "matrix": [1, 14], "x": 15, "y": 1.5},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.5},
+                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.5},
+                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.5},
+                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.5},
+                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.5},
+                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.5},
+                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.5},
+                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.5},
+                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.5},
+                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.5},
+                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.5},
+                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.5},
+                {"label": "Page Up", "matrix": [2, 14], "x": 15, "y": 2.5},
+
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.5},
+                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.5},
+                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.5},
+                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.5},
+                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.5},
+                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.5},
+                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.5},
+                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.5},
+                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.5},
+                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.5},
+                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.5},
+                {"label": "#", "matrix": [3, 12], "x": 12.75, "y": 3.5},
+                {"label": "Enter", "matrix": [3, 13], "x": 13.75, "y": 2.5, "w": 1.25, "h": 2},
+                {"label": "Page Down", "matrix": [3, 14], "x": 15, "y": 3.5},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.5, "w": 1.25},
+                {"label": "\\", "matrix": [4, 1], "x": 1.25, "y": 4.5},
+                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.5},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.5},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.5},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.5},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.5},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.5},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.5},
+                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.5},
+                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.5},
+                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.5},
+                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 1.75},
+                {"label": "\u2191", "matrix": [4, 13], "x": 14, "y": 4.5},
+                {"label": "End", "matrix": [4, 14], "x": 15, "y": 4.5},
+
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25},
+                {"label": "GUI", "matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25},
+                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25},
+                {"label": "Space", "matrix": [5, 6], "x": 3.75, "y": 5.5, "w": 6.25},
+                {"label": "Alt", "matrix": [5, 10], "x": 10, "y": 5.5, "w": 1.25},
+                {"label": "Menu", "matrix": [5, 11], "x": 11.25, "y": 5.5, "w": 1.25},
+
+                {"label": "\u2190", "matrix": [5, 12], "x": 13, "y": 5.5},
+                {"label": "\u2193", "matrix": [5, 13], "x": 14, "y": 5.5},
+                {"label": "\u2192", "matrix": [5, 14], "x": 15, "y": 5.5}
+            ]
+        },
+        "LAYOUT_iso_split_bs": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0},
+                {"label": "F2", "matrix": [0, 2], "x": 2.25, "y": 0},
+                {"label": "F3", "matrix": [0, 3], "x": 3.25, "y": 0},
+                {"label": "F4", "matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"label": "F5", "matrix": [0, 5], "x": 5.5, "y": 0},
+                {"label": "F6", "matrix": [0, 6], "x": 6.5, "y": 0},
+                {"label": "F7", "matrix": [0, 7], "x": 7.5, "y": 0},
+                {"label": "F8", "matrix": [0, 8], "x": 8.5, "y": 0},
+
+                {"label": "F9", "matrix": [0, 9], "x": 9.75, "y": 0},
+                {"label": "F10", "matrix": [0, 10], "x": 10.75, "y": 0},
+                {"label": "F11", "matrix": [0, 11], "x": 11.75, "y": 0},
+                {"label": "F12", "matrix": [0, 12], "x": 12.75, "y": 0},
+
+                {"label": "F13", "matrix": [0, 13], "x": 14, "y": 0},
+
+                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.5},
+                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.5},
+                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.5},
+                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.5},
+                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.5},
+                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.5},
+                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.5},
+                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.5},
+                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.5},
+                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.5},
+                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.5},
+                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.5},
+                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.5},
+                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.5},
+                {"label": "Delete", "matrix": [2, 13], "x": 14, "y": 1.5},
+                {"label": "Home", "matrix": [1, 14], "x": 15, "y": 1.5},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.5},
+                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.5},
+                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.5},
+                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.5},
+                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.5},
+                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.5},
+                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.5},
+                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.5},
+                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.5},
+                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.5},
+                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.5},
+                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.5},
+                {"label": "Page Up", "matrix": [2, 14], "x": 15, "y": 2.5},
+
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.5},
+                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.5},
+                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.5},
+                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.5},
+                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.5},
+                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.5},
+                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.5},
+                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.5},
+                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.5},
+                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.5},
+                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.5},
+                {"label": "#", "matrix": [3, 12], "x": 12.75, "y": 3.5},
+                {"label": "Enter", "matrix": [3, 13], "x": 13.75, "y": 2.5, "w": 1.25, "h": 2},
+                {"label": "Page Down", "matrix": [3, 14], "x": 15, "y": 3.5},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.5, "w": 1.25},
+                {"label": "\\", "matrix": [4, 1], "x": 1.25, "y": 4.5},
+                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.5},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.5},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.5},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.5},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.5},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.5},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.5},
+                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.5},
+                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.5},
+                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.5},
+                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 1.75},
+                {"label": "\u2191", "matrix": [4, 13], "x": 14, "y": 4.5},
+                {"label": "End", "matrix": [4, 14], "x": 15, "y": 4.5},
+
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25},
+                {"label": "GUI", "matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25},
+                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25},
+                {"label": "Space", "matrix": [5, 6], "x": 3.75, "y": 5.5, "w": 6.25},
+                {"label": "Alt", "matrix": [5, 10], "x": 10, "y": 5.5, "w": 1.25},
+                {"label": "Menu", "matrix": [5, 11], "x": 11.25, "y": 5.5, "w": 1.25},
+
+                {"label": "\u2190", "matrix": [5, 12], "x": 13, "y": 5.5},
+                {"label": "\u2193", "matrix": [5, 13], "x": 14, "y": 5.5},
+                {"label": "\u2192", "matrix": [5, 14], "x": 15, "y": 5.5}
+            ]
+        },
+        "LAYOUT_iso_tsangan": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0},
+                {"label": "F2", "matrix": [0, 2], "x": 2.25, "y": 0},
+                {"label": "F3", "matrix": [0, 3], "x": 3.25, "y": 0},
+                {"label": "F4", "matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"label": "F5", "matrix": [0, 5], "x": 5.5, "y": 0},
+                {"label": "F6", "matrix": [0, 6], "x": 6.5, "y": 0},
+                {"label": "F7", "matrix": [0, 7], "x": 7.5, "y": 0},
+                {"label": "F8", "matrix": [0, 8], "x": 8.5, "y": 0},
+
+                {"label": "F9", "matrix": [0, 9], "x": 9.75, "y": 0},
+                {"label": "F10", "matrix": [0, 10], "x": 10.75, "y": 0},
+                {"label": "F11", "matrix": [0, 11], "x": 11.75, "y": 0},
+                {"label": "F12", "matrix": [0, 12], "x": 12.75, "y": 0},
+
+                {"label": "F13", "matrix": [0, 13], "x": 14, "y": 0},
+
+                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.5},
+                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.5},
+                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.5},
+                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.5},
+                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.5},
+                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.5},
+                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.5},
+                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.5},
+                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.5},
+                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.5},
+                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.5},
+                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.5},
+                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.5},
+                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.5, "w": 2},
+                {"label": "Home", "matrix": [1, 14], "x": 15, "y": 1.5},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.5},
+                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.5},
+                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.5},
+                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.5},
+                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.5},
+                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.5},
+                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.5},
+                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.5},
+                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.5},
+                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.5},
+                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.5},
+                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.5},
+                {"label": "Page Up", "matrix": [2, 14], "x": 15, "y": 2.5},
+
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.5},
+                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.5},
+                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.5},
+                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.5},
+                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.5},
+                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.5},
+                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.5},
+                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.5},
+                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.5},
+                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.5},
+                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.5},
+                {"label": "#", "matrix": [3, 12], "x": 12.75, "y": 3.5},
+                {"label": "Enter", "matrix": [3, 13], "x": 13.75, "y": 2.5, "w": 1.25, "h": 2},
+                {"label": "Page Down", "matrix": [3, 14], "x": 15, "y": 3.5},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.5, "w": 1.25},
+                {"label": "\\", "matrix": [4, 1], "x": 1.25, "y": 4.5},
+                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.5},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.5},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.5},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.5},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.5},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.5},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.5},
+                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.5},
+                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.5},
+                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.5},
+                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 1.75},
+                {"label": "\u2191", "matrix": [4, 13], "x": 14, "y": 4.5},
+                {"label": "End", "matrix": [4, 14], "x": 15, "y": 4.5},
+
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.5},
+                {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 5.5},
+                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.5},
+                {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5.5, "w": 7},
+                {"label": "Menu", "matrix": [5, 11], "x": 11, "y": 5.5, "w": 1.5},
+
+                {"label": "\u2190", "matrix": [5, 12], "x": 13, "y": 5.5},
+                {"label": "\u2193", "matrix": [5, 13], "x": 14, "y": 5.5},
+                {"label": "\u2192", "matrix": [5, 14], "x": 15, "y": 5.5}
+            ]
+        },
+        "LAYOUT_iso_tsangan_split_bs": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0},
+                {"label": "F2", "matrix": [0, 2], "x": 2.25, "y": 0},
+                {"label": "F3", "matrix": [0, 3], "x": 3.25, "y": 0},
+                {"label": "F4", "matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"label": "F5", "matrix": [0, 5], "x": 5.5, "y": 0},
+                {"label": "F6", "matrix": [0, 6], "x": 6.5, "y": 0},
+                {"label": "F7", "matrix": [0, 7], "x": 7.5, "y": 0},
+                {"label": "F8", "matrix": [0, 8], "x": 8.5, "y": 0},
+
+                {"label": "F9", "matrix": [0, 9], "x": 9.75, "y": 0},
+                {"label": "F10", "matrix": [0, 10], "x": 10.75, "y": 0},
+                {"label": "F11", "matrix": [0, 11], "x": 11.75, "y": 0},
+                {"label": "F12", "matrix": [0, 12], "x": 12.75, "y": 0},
+
+                {"label": "F13", "matrix": [0, 13], "x": 14, "y": 0},
+
+                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.5},
+                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.5},
+                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.5},
+                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.5},
+                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.5},
+                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.5},
+                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.5},
+                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.5},
+                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.5},
+                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.5},
+                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.5},
+                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.5},
+                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.5},
+                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.5},
+                {"label": "Delete", "matrix": [2, 13], "x": 14, "y": 1.5},
+                {"label": "Home", "matrix": [1, 14], "x": 15, "y": 1.5},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.5},
+                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.5},
+                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.5},
+                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.5},
+                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.5},
+                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.5},
+                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.5},
+                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.5},
+                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.5},
+                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.5},
+                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.5},
+                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.5},
+                {"label": "Page Up", "matrix": [2, 14], "x": 15, "y": 2.5},
+
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.5},
+                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.5},
+                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.5},
+                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.5},
+                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.5},
+                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.5},
+                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.5},
+                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.5},
+                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.5},
+                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.5},
+                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.5},
+                {"label": "#", "matrix": [3, 12], "x": 12.75, "y": 3.5},
+                {"label": "Enter", "matrix": [3, 13], "x": 13.75, "y": 2.5, "w": 1.25, "h": 2},
+                {"label": "Page Down", "matrix": [3, 14], "x": 15, "y": 3.5},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.5, "w": 1.25},
+                {"label": "\\", "matrix": [4, 1], "x": 1.25, "y": 4.5},
+                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.5},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.5},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.5},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.5},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.5},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.5},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.5},
+                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.5},
+                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.5},
+                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.5},
+                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 1.75},
+                {"label": "\u2191", "matrix": [4, 13], "x": 14, "y": 4.5},
+                {"label": "End", "matrix": [4, 14], "x": 15, "y": 4.5},
+
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.5},
+                {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 5.5},
+                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.5},
+                {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5.5, "w": 7},
+                {"label": "Menu", "matrix": [5, 11], "x": 11, "y": 5.5, "w": 1.5},
+
+                {"label": "\u2190", "matrix": [5, 12], "x": 13, "y": 5.5},
+                {"label": "\u2193", "matrix": [5, 13], "x": 14, "y": 5.5},
+                {"label": "\u2192", "matrix": [5, 14], "x": 15, "y": 5.5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/monokei/mnk75/rules.mk b/keyboards/monokei/mnk75/rules.mk
index 50f3a3d1511..0ab54aaaf71 100644
--- a/keyboards/monokei/mnk75/rules.mk
+++ b/keyboards/monokei/mnk75/rules.mk
@@ -1,15 +1,2 @@
 # Wildcard to allow APM32 MCU
 DFU_SUFFIX_ARGS = -v FFFF -p FFFF
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
diff --git a/keyboards/montsinger/rebound/rev1/info.json b/keyboards/montsinger/rebound/rev1/info.json
deleted file mode 100644
index be323b6f65c..00000000000
--- a/keyboards/montsinger/rebound/rev1/info.json
+++ /dev/null
@@ -1,76 +0,0 @@
-{
-    "keyboard": "Rebound Rev1",
-    "manufacturer": "Montsinger",
-    "url": "https://montsinger.net",
-    "maintainer": "rossman360",
-    "usb": {
-        "vid": "0xFEED",
-        "pid": "0x552F",
-        "device_version": "0.0.2"
-    },
-    "matrix_pins": {
-        "cols": ["D0", "D4", "C6", "D7", "E6", "B4", "B3", "B1", "F7", "F6", "F5", "F4"],
-        "rows": ["D1", "B5", "B2", "B6"]
-    },
-    "diode_direction": "ROW2COL",
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "community_layouts": ["ortho_4x12"],
-    "layouts": {
-        "LAYOUT_ortho_4x12": {
-            "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": 7, "y": 0},
-                {"matrix": [0, 7], "x": 8, "y": 0},
-                {"matrix": [0, 8], "x": 9, "y": 0},
-                {"matrix": [0, 9], "x": 10, "y": 0},
-                {"matrix": [0, 10], "x": 11, "y": 0},
-                {"matrix": [0, 11], "x": 12, "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": [1, 4], "x": 4, "y": 1},
-                {"matrix": [1, 5], "x": 5, "y": 1},
-                {"matrix": [1, 6], "x": 7, "y": 1},
-                {"matrix": [1, 7], "x": 8, "y": 1},
-                {"matrix": [1, 8], "x": 9, "y": 1},
-                {"matrix": [1, 9], "x": 10, "y": 1},
-                {"matrix": [1, 10], "x": 11, "y": 1},
-                {"matrix": [1, 11], "x": 12, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2},
-                {"matrix": [2, 1], "x": 1, "y": 2},
-                {"matrix": [2, 2], "x": 2, "y": 2},
-                {"matrix": [2, 3], "x": 3, "y": 2},
-                {"matrix": [2, 4], "x": 4, "y": 2},
-                {"matrix": [2, 5], "x": 5, "y": 2},
-                {"matrix": [2, 6], "x": 7, "y": 2},
-                {"matrix": [2, 7], "x": 8, "y": 2},
-                {"matrix": [2, 8], "x": 9, "y": 2},
-                {"matrix": [2, 9], "x": 10, "y": 2},
-                {"matrix": [2, 10], "x": 11, "y": 2},
-                {"matrix": [2, 11], "x": 12, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3},
-                {"matrix": [3, 1], "x": 1, "y": 3},
-                {"matrix": [3, 2], "x": 2, "y": 3},
-                {"matrix": [3, 3], "x": 3, "y": 3},
-                {"matrix": [3, 4], "x": 4, "y": 3},
-                {"matrix": [3, 5], "x": 5, "y": 3},
-                {"matrix": [3, 6], "x": 7, "y": 3},
-                {"matrix": [3, 7], "x": 8, "y": 3},
-                {"matrix": [3, 8], "x": 9, "y": 3},
-                {"matrix": [3, 9], "x": 10, "y": 3},
-                {"matrix": [3, 10], "x": 11, "y": 3},
-                {"matrix": [3, 11], "x": 12, "y": 3}
-            ]
-        }
-    }
-}
diff --git a/keyboards/montsinger/rebound/rev1/keyboard.json b/keyboards/montsinger/rebound/rev1/keyboard.json
new file mode 100644
index 00000000000..66ed41a6740
--- /dev/null
+++ b/keyboards/montsinger/rebound/rev1/keyboard.json
@@ -0,0 +1,83 @@
+{
+    "keyboard": "Rebound Rev1",
+    "manufacturer": "Montsinger",
+    "url": "https://montsinger.net",
+    "maintainer": "rossman360",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0x552F",
+        "device_version": "0.0.2"
+    },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "console": true,
+        "command": true
+    },
+    "matrix_pins": {
+        "cols": ["D0", "D4", "C6", "D7", "E6", "B4", "B3", "B1", "F7", "F6", "F5", "F4"],
+        "rows": ["D1", "B5", "B2", "B6"]
+    },
+    "diode_direction": "ROW2COL",
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "community_layouts": ["ortho_4x12"],
+    "layouts": {
+        "LAYOUT_ortho_4x12": {
+            "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": 7, "y": 0},
+                {"matrix": [0, 7], "x": 8, "y": 0},
+                {"matrix": [0, 8], "x": 9, "y": 0},
+                {"matrix": [0, 9], "x": 10, "y": 0},
+                {"matrix": [0, 10], "x": 11, "y": 0},
+                {"matrix": [0, 11], "x": 12, "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": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 7, "y": 1},
+                {"matrix": [1, 7], "x": 8, "y": 1},
+                {"matrix": [1, 8], "x": 9, "y": 1},
+                {"matrix": [1, 9], "x": 10, "y": 1},
+                {"matrix": [1, 10], "x": 11, "y": 1},
+                {"matrix": [1, 11], "x": 12, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [2, 6], "x": 7, "y": 2},
+                {"matrix": [2, 7], "x": 8, "y": 2},
+                {"matrix": [2, 8], "x": 9, "y": 2},
+                {"matrix": [2, 9], "x": 10, "y": 2},
+                {"matrix": [2, 10], "x": 11, "y": 2},
+                {"matrix": [2, 11], "x": 12, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
+                {"matrix": [3, 6], "x": 7, "y": 3},
+                {"matrix": [3, 7], "x": 8, "y": 3},
+                {"matrix": [3, 8], "x": 9, "y": 3},
+                {"matrix": [3, 9], "x": 10, "y": 3},
+                {"matrix": [3, 10], "x": 11, "y": 3},
+                {"matrix": [3, 11], "x": 12, "y": 3}
+            ]
+        }
+    }
+}
diff --git a/keyboards/montsinger/rebound/rev1/rules.mk b/keyboards/montsinger/rebound/rev1/rules.mk
deleted file mode 100644
index 309e55c9f4c..00000000000
--- a/keyboards/montsinger/rebound/rev1/rules.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = yes        # Console for debug
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
diff --git a/keyboards/montsinger/rebound/rev2/info.json b/keyboards/montsinger/rebound/rev2/info.json
deleted file mode 100644
index f09cb7f75f0..00000000000
--- a/keyboards/montsinger/rebound/rev2/info.json
+++ /dev/null
@@ -1,144 +0,0 @@
-{
-    "keyboard": "Rebound Rev2",
-    "manufacturer": "Montsinger",
-    "url": "https://montsinger.net",
-    "maintainer": "rossman360",
-    "usb": {
-        "vid": "0xFEED",
-        "pid": "0x552F",
-        "device_version": "0.0.2"
-    },
-    "matrix_pins": {
-        "cols": ["D0", "D4", "C6", "D7", "E6", "B4", "B3", "B1", "F7", "F6", "F5", "F4"],
-        "rows": ["D1", "B5", "B2", "B6", "B0"]
-    },
-    "diode_direction": "ROW2COL",
-    "encoder": {
-        "rotary": [
-            {"pin_a": "D2", "pin_b": "D3"}
-        ]
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "community_layouts": ["ortho_4x12"],
-    "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": 7, "y": 0},
-                {"matrix": [0, 7], "x": 8, "y": 0},
-                {"matrix": [0, 8], "x": 9, "y": 0},
-                {"matrix": [0, 9], "x": 10, "y": 0},
-                {"matrix": [0, 10], "x": 11, "y": 0},
-                {"matrix": [0, 11], "x": 12, "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": [1, 4], "x": 4, "y": 1},
-                {"matrix": [1, 5], "x": 5, "y": 1},
-
-                {"matrix": [1, 6], "x": 7, "y": 1},
-                {"matrix": [1, 7], "x": 8, "y": 1},
-                {"matrix": [1, 8], "x": 9, "y": 1},
-                {"matrix": [1, 9], "x": 10, "y": 1},
-                {"matrix": [1, 10], "x": 11, "y": 1},
-                {"matrix": [1, 11], "x": 12, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2},
-                {"matrix": [2, 1], "x": 1, "y": 2},
-                {"matrix": [2, 2], "x": 2, "y": 2},
-                {"matrix": [2, 3], "x": 3, "y": 2},
-                {"matrix": [2, 4], "x": 4, "y": 2},
-                {"matrix": [2, 5], "x": 5, "y": 2},
-
-                {"matrix": [2, 6], "x": 7, "y": 2},
-                {"matrix": [2, 7], "x": 8, "y": 2},
-                {"matrix": [2, 8], "x": 9, "y": 2},
-                {"matrix": [2, 9], "x": 10, "y": 2},
-                {"matrix": [2, 10], "x": 11, "y": 2},
-                {"matrix": [2, 11], "x": 12, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3},
-                {"matrix": [3, 1], "x": 1, "y": 3},
-                {"matrix": [3, 2], "x": 2, "y": 3},
-                {"matrix": [3, 3], "x": 3, "y": 3},
-                {"matrix": [3, 4], "x": 4, "y": 3},
-                {"matrix": [3, 5], "x": 5, "y": 3},
-                {"matrix": [4, 0], "x": 6, "y": 3},
-                {"matrix": [3, 6], "x": 7, "y": 3},
-                {"matrix": [3, 7], "x": 8, "y": 3},
-                {"matrix": [3, 8], "x": 9, "y": 3},
-                {"matrix": [3, 9], "x": 10, "y": 3},
-                {"matrix": [3, 10], "x": 11, "y": 3},
-                {"matrix": [3, 11], "x": 12, "y": 3}
-            ]
-        },
-        "LAYOUT_ortho_4x12": {
-            "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": 7, "y": 0},
-                {"matrix": [0, 7], "x": 8, "y": 0},
-                {"matrix": [0, 8], "x": 9, "y": 0},
-                {"matrix": [0, 9], "x": 10, "y": 0},
-                {"matrix": [0, 10], "x": 11, "y": 0},
-                {"matrix": [0, 11], "x": 12, "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": [1, 4], "x": 4, "y": 1},
-                {"matrix": [1, 5], "x": 5, "y": 1},
-
-                {"matrix": [1, 6], "x": 7, "y": 1},
-                {"matrix": [1, 7], "x": 8, "y": 1},
-                {"matrix": [1, 8], "x": 9, "y": 1},
-                {"matrix": [1, 9], "x": 10, "y": 1},
-                {"matrix": [1, 10], "x": 11, "y": 1},
-                {"matrix": [1, 11], "x": 12, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2},
-                {"matrix": [2, 1], "x": 1, "y": 2},
-                {"matrix": [2, 2], "x": 2, "y": 2},
-                {"matrix": [2, 3], "x": 3, "y": 2},
-                {"matrix": [2, 4], "x": 4, "y": 2},
-                {"matrix": [2, 5], "x": 5, "y": 2},
-
-                {"matrix": [2, 6], "x": 7, "y": 2},
-                {"matrix": [2, 7], "x": 8, "y": 2},
-                {"matrix": [2, 8], "x": 9, "y": 2},
-                {"matrix": [2, 9], "x": 10, "y": 2},
-                {"matrix": [2, 10], "x": 11, "y": 2},
-                {"matrix": [2, 11], "x": 12, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3},
-                {"matrix": [3, 1], "x": 1, "y": 3},
-                {"matrix": [3, 2], "x": 2, "y": 3},
-                {"matrix": [3, 3], "x": 3, "y": 3},
-                {"matrix": [3, 4], "x": 4, "y": 3},
-                {"matrix": [3, 5], "x": 5, "y": 3},
-
-                {"matrix": [3, 6], "x": 7, "y": 3},
-                {"matrix": [3, 7], "x": 8, "y": 3},
-                {"matrix": [3, 8], "x": 9, "y": 3},
-                {"matrix": [3, 9], "x": 10, "y": 3},
-                {"matrix": [3, 10], "x": 11, "y": 3},
-                {"matrix": [3, 11], "x": 12, "y": 3}
-            ]
-        }
-    }
-}
diff --git a/keyboards/montsinger/rebound/rev2/keyboard.json b/keyboards/montsinger/rebound/rev2/keyboard.json
new file mode 100644
index 00000000000..a3a99247ab3
--- /dev/null
+++ b/keyboards/montsinger/rebound/rev2/keyboard.json
@@ -0,0 +1,152 @@
+{
+    "keyboard": "Rebound Rev2",
+    "manufacturer": "Montsinger",
+    "url": "https://montsinger.net",
+    "maintainer": "rossman360",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0x552F",
+        "device_version": "0.0.2"
+    },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "console": true,
+        "command": true,
+        "encoder": true
+    },
+    "matrix_pins": {
+        "cols": ["D0", "D4", "C6", "D7", "E6", "B4", "B3", "B1", "F7", "F6", "F5", "F4"],
+        "rows": ["D1", "B5", "B2", "B6", "B0"]
+    },
+    "diode_direction": "ROW2COL",
+    "encoder": {
+        "rotary": [
+            {"pin_a": "D2", "pin_b": "D3"}
+        ]
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "community_layouts": ["ortho_4x12"],
+    "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": 7, "y": 0},
+                {"matrix": [0, 7], "x": 8, "y": 0},
+                {"matrix": [0, 8], "x": 9, "y": 0},
+                {"matrix": [0, 9], "x": 10, "y": 0},
+                {"matrix": [0, 10], "x": 11, "y": 0},
+                {"matrix": [0, 11], "x": 12, "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": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+
+                {"matrix": [1, 6], "x": 7, "y": 1},
+                {"matrix": [1, 7], "x": 8, "y": 1},
+                {"matrix": [1, 8], "x": 9, "y": 1},
+                {"matrix": [1, 9], "x": 10, "y": 1},
+                {"matrix": [1, 10], "x": 11, "y": 1},
+                {"matrix": [1, 11], "x": 12, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+
+                {"matrix": [2, 6], "x": 7, "y": 2},
+                {"matrix": [2, 7], "x": 8, "y": 2},
+                {"matrix": [2, 8], "x": 9, "y": 2},
+                {"matrix": [2, 9], "x": 10, "y": 2},
+                {"matrix": [2, 10], "x": 11, "y": 2},
+                {"matrix": [2, 11], "x": 12, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
+                {"matrix": [4, 0], "x": 6, "y": 3},
+                {"matrix": [3, 6], "x": 7, "y": 3},
+                {"matrix": [3, 7], "x": 8, "y": 3},
+                {"matrix": [3, 8], "x": 9, "y": 3},
+                {"matrix": [3, 9], "x": 10, "y": 3},
+                {"matrix": [3, 10], "x": 11, "y": 3},
+                {"matrix": [3, 11], "x": 12, "y": 3}
+            ]
+        },
+        "LAYOUT_ortho_4x12": {
+            "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": 7, "y": 0},
+                {"matrix": [0, 7], "x": 8, "y": 0},
+                {"matrix": [0, 8], "x": 9, "y": 0},
+                {"matrix": [0, 9], "x": 10, "y": 0},
+                {"matrix": [0, 10], "x": 11, "y": 0},
+                {"matrix": [0, 11], "x": 12, "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": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+
+                {"matrix": [1, 6], "x": 7, "y": 1},
+                {"matrix": [1, 7], "x": 8, "y": 1},
+                {"matrix": [1, 8], "x": 9, "y": 1},
+                {"matrix": [1, 9], "x": 10, "y": 1},
+                {"matrix": [1, 10], "x": 11, "y": 1},
+                {"matrix": [1, 11], "x": 12, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+
+                {"matrix": [2, 6], "x": 7, "y": 2},
+                {"matrix": [2, 7], "x": 8, "y": 2},
+                {"matrix": [2, 8], "x": 9, "y": 2},
+                {"matrix": [2, 9], "x": 10, "y": 2},
+                {"matrix": [2, 10], "x": 11, "y": 2},
+                {"matrix": [2, 11], "x": 12, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
+
+                {"matrix": [3, 6], "x": 7, "y": 3},
+                {"matrix": [3, 7], "x": 8, "y": 3},
+                {"matrix": [3, 8], "x": 9, "y": 3},
+                {"matrix": [3, 9], "x": 10, "y": 3},
+                {"matrix": [3, 10], "x": 11, "y": 3},
+                {"matrix": [3, 11], "x": 12, "y": 3}
+            ]
+        }
+    }
+}
diff --git a/keyboards/montsinger/rebound/rev2/rules.mk b/keyboards/montsinger/rebound/rev2/rules.mk
deleted file mode 100644
index f957b56f253..00000000000
--- a/keyboards/montsinger/rebound/rev2/rules.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = yes        # Console for debug
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-ENCODER_ENABLE = yes
diff --git a/keyboards/montsinger/rebound/rev3/info.json b/keyboards/montsinger/rebound/rev3/info.json
deleted file mode 100644
index b898407f828..00000000000
--- a/keyboards/montsinger/rebound/rev3/info.json
+++ /dev/null
@@ -1,144 +0,0 @@
-{
-    "keyboard": "Rebound Rev3",
-    "manufacturer": "Montsinger",
-    "url": "https://montsinger.net",
-    "maintainer": "rossman360",
-    "usb": {
-        "vid": "0xFEED",
-        "pid": "0x552F",
-        "device_version": "0.0.2"
-    },
-    "matrix_pins": {
-        "cols": ["D4", "C6", "D7", "E6", "B4", "B5", "B6", "B2", "B3", "B1", "F7", "F6"],
-        "rows": ["F4", "F5", "D1", "D0", "B0"]
-    },
-    "diode_direction": "ROW2COL",
-    "encoder": {
-        "rotary": [
-            {"pin_a": "D3", "pin_b": "D2"}
-        ]
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "community_layouts": ["ortho_4x12"],
-    "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": 7, "y": 0},
-                {"matrix": [0, 7], "x": 8, "y": 0},
-                {"matrix": [0, 8], "x": 9, "y": 0},
-                {"matrix": [0, 9], "x": 10, "y": 0},
-                {"matrix": [0, 10], "x": 11, "y": 0},
-                {"matrix": [0, 11], "x": 12, "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": [1, 4], "x": 4, "y": 1},
-                {"matrix": [1, 5], "x": 5, "y": 1},
-                {"matrix": [4, 2], "x": 6, "y": 1},
-                {"matrix": [1, 6], "x": 7, "y": 1},
-                {"matrix": [1, 7], "x": 8, "y": 1},
-                {"matrix": [1, 8], "x": 9, "y": 1},
-                {"matrix": [1, 9], "x": 10, "y": 1},
-                {"matrix": [1, 10], "x": 11, "y": 1},
-                {"matrix": [1, 11], "x": 12, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2},
-                {"matrix": [2, 1], "x": 1, "y": 2},
-                {"matrix": [2, 2], "x": 2, "y": 2},
-                {"matrix": [2, 3], "x": 3, "y": 2},
-                {"matrix": [2, 4], "x": 4, "y": 2},
-                {"matrix": [2, 5], "x": 5, "y": 2},
-                {"matrix": [4, 3], "x": 6, "y": 2},
-                {"matrix": [2, 6], "x": 7, "y": 2},
-                {"matrix": [2, 7], "x": 8, "y": 2},
-                {"matrix": [2, 8], "x": 9, "y": 2},
-                {"matrix": [2, 9], "x": 10, "y": 2},
-                {"matrix": [2, 10], "x": 11, "y": 2},
-                {"matrix": [2, 11], "x": 12, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3},
-                {"matrix": [3, 1], "x": 1, "y": 3},
-                {"matrix": [3, 2], "x": 2, "y": 3},
-                {"matrix": [3, 3], "x": 3, "y": 3},
-                {"matrix": [3, 4], "x": 4, "y": 3},
-                {"matrix": [3, 5], "x": 5, "y": 3},
-                {"matrix": [4, 4], "x": 6, "y": 3},
-                {"matrix": [3, 6], "x": 7, "y": 3},
-                {"matrix": [3, 7], "x": 8, "y": 3},
-                {"matrix": [3, 8], "x": 9, "y": 3},
-                {"matrix": [3, 9], "x": 10, "y": 3},
-                {"matrix": [3, 10], "x": 11, "y": 3},
-                {"matrix": [3, 11], "x": 12, "y": 3}
-            ]
-        },
-        "LAYOUT_ortho_4x12": {
-            "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": 7, "y": 0},
-                {"matrix": [0, 7], "x": 8, "y": 0},
-                {"matrix": [0, 8], "x": 9, "y": 0},
-                {"matrix": [0, 9], "x": 10, "y": 0},
-                {"matrix": [0, 10], "x": 11, "y": 0},
-                {"matrix": [0, 11], "x": 12, "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": [1, 4], "x": 4, "y": 1},
-                {"matrix": [1, 5], "x": 5, "y": 1},
-
-                {"matrix": [1, 6], "x": 7, "y": 1},
-                {"matrix": [1, 7], "x": 8, "y": 1},
-                {"matrix": [1, 8], "x": 9, "y": 1},
-                {"matrix": [1, 9], "x": 10, "y": 1},
-                {"matrix": [1, 10], "x": 11, "y": 1},
-                {"matrix": [1, 11], "x": 12, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2},
-                {"matrix": [2, 1], "x": 1, "y": 2},
-                {"matrix": [2, 2], "x": 2, "y": 2},
-                {"matrix": [2, 3], "x": 3, "y": 2},
-                {"matrix": [2, 4], "x": 4, "y": 2},
-                {"matrix": [2, 5], "x": 5, "y": 2},
-
-                {"matrix": [2, 6], "x": 7, "y": 2},
-                {"matrix": [2, 7], "x": 8, "y": 2},
-                {"matrix": [2, 8], "x": 9, "y": 2},
-                {"matrix": [2, 9], "x": 10, "y": 2},
-                {"matrix": [2, 10], "x": 11, "y": 2},
-                {"matrix": [2, 11], "x": 12, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3},
-                {"matrix": [3, 1], "x": 1, "y": 3},
-                {"matrix": [3, 2], "x": 2, "y": 3},
-                {"matrix": [3, 3], "x": 3, "y": 3},
-                {"matrix": [3, 4], "x": 4, "y": 3},
-                {"matrix": [3, 5], "x": 5, "y": 3},
-
-                {"matrix": [3, 6], "x": 7, "y": 3},
-                {"matrix": [3, 7], "x": 8, "y": 3},
-                {"matrix": [3, 8], "x": 9, "y": 3},
-                {"matrix": [3, 9], "x": 10, "y": 3},
-                {"matrix": [3, 10], "x": 11, "y": 3},
-                {"matrix": [3, 11], "x": 12, "y": 3}
-            ]
-        }
-    }
-}
diff --git a/keyboards/montsinger/rebound/rev3/keyboard.json b/keyboards/montsinger/rebound/rev3/keyboard.json
new file mode 100644
index 00000000000..630761b4013
--- /dev/null
+++ b/keyboards/montsinger/rebound/rev3/keyboard.json
@@ -0,0 +1,152 @@
+{
+    "keyboard": "Rebound Rev3",
+    "manufacturer": "Montsinger",
+    "url": "https://montsinger.net",
+    "maintainer": "rossman360",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0x552F",
+        "device_version": "0.0.2"
+    },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "console": true,
+        "command": true,
+        "encoder": true
+    },
+    "matrix_pins": {
+        "cols": ["D4", "C6", "D7", "E6", "B4", "B5", "B6", "B2", "B3", "B1", "F7", "F6"],
+        "rows": ["F4", "F5", "D1", "D0", "B0"]
+    },
+    "diode_direction": "ROW2COL",
+    "encoder": {
+        "rotary": [
+            {"pin_a": "D3", "pin_b": "D2"}
+        ]
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "community_layouts": ["ortho_4x12"],
+    "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": 7, "y": 0},
+                {"matrix": [0, 7], "x": 8, "y": 0},
+                {"matrix": [0, 8], "x": 9, "y": 0},
+                {"matrix": [0, 9], "x": 10, "y": 0},
+                {"matrix": [0, 10], "x": 11, "y": 0},
+                {"matrix": [0, 11], "x": 12, "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": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [4, 2], "x": 6, "y": 1},
+                {"matrix": [1, 6], "x": 7, "y": 1},
+                {"matrix": [1, 7], "x": 8, "y": 1},
+                {"matrix": [1, 8], "x": 9, "y": 1},
+                {"matrix": [1, 9], "x": 10, "y": 1},
+                {"matrix": [1, 10], "x": 11, "y": 1},
+                {"matrix": [1, 11], "x": 12, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [4, 3], "x": 6, "y": 2},
+                {"matrix": [2, 6], "x": 7, "y": 2},
+                {"matrix": [2, 7], "x": 8, "y": 2},
+                {"matrix": [2, 8], "x": 9, "y": 2},
+                {"matrix": [2, 9], "x": 10, "y": 2},
+                {"matrix": [2, 10], "x": 11, "y": 2},
+                {"matrix": [2, 11], "x": 12, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
+                {"matrix": [4, 4], "x": 6, "y": 3},
+                {"matrix": [3, 6], "x": 7, "y": 3},
+                {"matrix": [3, 7], "x": 8, "y": 3},
+                {"matrix": [3, 8], "x": 9, "y": 3},
+                {"matrix": [3, 9], "x": 10, "y": 3},
+                {"matrix": [3, 10], "x": 11, "y": 3},
+                {"matrix": [3, 11], "x": 12, "y": 3}
+            ]
+        },
+        "LAYOUT_ortho_4x12": {
+            "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": 7, "y": 0},
+                {"matrix": [0, 7], "x": 8, "y": 0},
+                {"matrix": [0, 8], "x": 9, "y": 0},
+                {"matrix": [0, 9], "x": 10, "y": 0},
+                {"matrix": [0, 10], "x": 11, "y": 0},
+                {"matrix": [0, 11], "x": 12, "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": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+
+                {"matrix": [1, 6], "x": 7, "y": 1},
+                {"matrix": [1, 7], "x": 8, "y": 1},
+                {"matrix": [1, 8], "x": 9, "y": 1},
+                {"matrix": [1, 9], "x": 10, "y": 1},
+                {"matrix": [1, 10], "x": 11, "y": 1},
+                {"matrix": [1, 11], "x": 12, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+
+                {"matrix": [2, 6], "x": 7, "y": 2},
+                {"matrix": [2, 7], "x": 8, "y": 2},
+                {"matrix": [2, 8], "x": 9, "y": 2},
+                {"matrix": [2, 9], "x": 10, "y": 2},
+                {"matrix": [2, 10], "x": 11, "y": 2},
+                {"matrix": [2, 11], "x": 12, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
+
+                {"matrix": [3, 6], "x": 7, "y": 3},
+                {"matrix": [3, 7], "x": 8, "y": 3},
+                {"matrix": [3, 8], "x": 9, "y": 3},
+                {"matrix": [3, 9], "x": 10, "y": 3},
+                {"matrix": [3, 10], "x": 11, "y": 3},
+                {"matrix": [3, 11], "x": 12, "y": 3}
+            ]
+        }
+    }
+}
diff --git a/keyboards/montsinger/rebound/rev3/rules.mk b/keyboards/montsinger/rebound/rev3/rules.mk
deleted file mode 100644
index f957b56f253..00000000000
--- a/keyboards/montsinger/rebound/rev3/rules.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = yes        # Console for debug
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-ENCODER_ENABLE = yes
diff --git a/keyboards/montsinger/rebound/rev4/info.json b/keyboards/montsinger/rebound/rev4/info.json
deleted file mode 100644
index 565e56701f9..00000000000
--- a/keyboards/montsinger/rebound/rev4/info.json
+++ /dev/null
@@ -1,150 +0,0 @@
-{
-    "keyboard": "Rebound Rev4",
-    "manufacturer": "Montsinger",
-    "url": "https://montsinger.net",
-    "maintainer": "rossman360",
-    "usb": {
-        "vid": "0x524D",
-        "pid": "0x0001",
-        "device_version": "0.0.2"
-    },
-    "matrix_pins": {
-        "cols": ["D7", "E6", "B4", "B5", "B2", "B3", "B1"],
-        "rows": ["D1", "D0", "D4", "C6", "F7", "F6", "F5", "F4"]
-    },
-    "diode_direction": "ROW2COL",
-    "encoder": {
-        "rotary": [
-            {"pin_a": "D2", "pin_b": "D3"}
-        ]
-    },
-    "rgblight": {
-        "led_count": 17
-    },
-    "ws2812": {
-        "pin": "B6"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "community_layouts": ["ortho_4x12"],
-    "layouts": {
-        "LAYOUT_all": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [7, 0], "x": 1, "y": 0},
-                {"matrix": [0, 1], "x": 2, "y": 0},
-                {"matrix": [7, 1], "x": 3, "y": 0},
-                {"matrix": [0, 2], "x": 4, "y": 0},
-                {"matrix": [7, 2], "x": 5, "y": 0},
-
-                {"matrix": [0, 4], "x": 7, "y": 0},
-                {"matrix": [7, 4], "x": 8, "y": 0},
-                {"matrix": [0, 5], "x": 9, "y": 0},
-                {"matrix": [7, 5], "x": 10, "y": 0},
-                {"matrix": [0, 6], "x": 11, "y": 0},
-                {"matrix": [7, 6], "x": 12, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1},
-                {"matrix": [6, 0], "x": 1, "y": 1},
-                {"matrix": [1, 1], "x": 2, "y": 1},
-                {"matrix": [6, 1], "x": 3, "y": 1},
-                {"matrix": [1, 2], "x": 4, "y": 1},
-                {"matrix": [6, 2], "x": 5, "y": 1},
-                {"matrix": [1, 3], "x": 6, "y": 1},
-                {"matrix": [1, 4], "x": 7, "y": 1},
-                {"matrix": [6, 4], "x": 8, "y": 1},
-                {"matrix": [1, 5], "x": 9, "y": 1},
-                {"matrix": [6, 5], "x": 10, "y": 1},
-                {"matrix": [1, 6], "x": 11, "y": 1},
-                {"matrix": [6, 6], "x": 12, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2},
-                {"matrix": [5, 0], "x": 1, "y": 2},
-                {"matrix": [2, 1], "x": 2, "y": 2},
-                {"matrix": [5, 1], "x": 3, "y": 2},
-                {"matrix": [2, 2], "x": 4, "y": 2},
-                {"matrix": [5, 2], "x": 5, "y": 2},
-                {"matrix": [2, 3], "x": 6, "y": 2},
-                {"matrix": [2, 4], "x": 7, "y": 2},
-                {"matrix": [5, 4], "x": 8, "y": 2},
-                {"matrix": [2, 5], "x": 9, "y": 2},
-                {"matrix": [5, 5], "x": 10, "y": 2},
-                {"matrix": [2, 6], "x": 11, "y": 2},
-                {"matrix": [5, 6], "x": 12, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3},
-                {"matrix": [4, 0], "x": 1, "y": 3},
-                {"matrix": [3, 1], "x": 2, "y": 3},
-                {"matrix": [4, 1], "x": 3, "y": 3},
-                {"matrix": [3, 2], "x": 4, "y": 3},
-                {"matrix": [4, 2], "x": 5, "y": 3},
-                {"matrix": [3, 3], "x": 6, "y": 3},
-                {"matrix": [3, 4], "x": 7, "y": 3},
-                {"matrix": [4, 4], "x": 8, "y": 3},
-                {"matrix": [3, 5], "x": 9, "y": 3},
-                {"matrix": [4, 5], "x": 10, "y": 3},
-                {"matrix": [3, 6], "x": 11, "y": 3},
-                {"matrix": [4, 6], "x": 12, "y": 3}
-            ]
-        },
-        "LAYOUT_ortho_4x12": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [7, 0], "x": 1, "y": 0},
-                {"matrix": [0, 1], "x": 2, "y": 0},
-                {"matrix": [7, 1], "x": 3, "y": 0},
-                {"matrix": [0, 2], "x": 4, "y": 0},
-                {"matrix": [7, 2], "x": 5, "y": 0},
-
-                {"matrix": [0, 4], "x": 7, "y": 0},
-                {"matrix": [7, 4], "x": 8, "y": 0},
-                {"matrix": [0, 5], "x": 9, "y": 0},
-                {"matrix": [7, 5], "x": 10, "y": 0},
-                {"matrix": [0, 6], "x": 11, "y": 0},
-                {"matrix": [7, 6], "x": 12, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1},
-                {"matrix": [6, 0], "x": 1, "y": 1},
-                {"matrix": [1, 1], "x": 2, "y": 1},
-                {"matrix": [6, 1], "x": 3, "y": 1},
-                {"matrix": [1, 2], "x": 4, "y": 1},
-                {"matrix": [6, 2], "x": 5, "y": 1},
-
-                {"matrix": [1, 4], "x": 7, "y": 1},
-                {"matrix": [6, 4], "x": 8, "y": 1},
-                {"matrix": [1, 5], "x": 9, "y": 1},
-                {"matrix": [6, 5], "x": 10, "y": 1},
-                {"matrix": [1, 6], "x": 11, "y": 1},
-                {"matrix": [6, 6], "x": 12, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2},
-                {"matrix": [5, 0], "x": 1, "y": 2},
-                {"matrix": [2, 1], "x": 2, "y": 2},
-                {"matrix": [5, 1], "x": 3, "y": 2},
-                {"matrix": [2, 2], "x": 4, "y": 2},
-                {"matrix": [5, 2], "x": 5, "y": 2},
-
-                {"matrix": [2, 4], "x": 7, "y": 2},
-                {"matrix": [5, 4], "x": 8, "y": 2},
-                {"matrix": [2, 5], "x": 9, "y": 2},
-                {"matrix": [5, 5], "x": 10, "y": 2},
-                {"matrix": [2, 6], "x": 11, "y": 2},
-                {"matrix": [5, 6], "x": 12, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3},
-                {"matrix": [4, 0], "x": 1, "y": 3},
-                {"matrix": [3, 1], "x": 2, "y": 3},
-                {"matrix": [4, 1], "x": 3, "y": 3},
-                {"matrix": [3, 2], "x": 4, "y": 3},
-                {"matrix": [4, 2], "x": 5, "y": 3},
-
-                {"matrix": [3, 4], "x": 7, "y": 3},
-                {"matrix": [4, 4], "x": 8, "y": 3},
-                {"matrix": [3, 5], "x": 9, "y": 3},
-                {"matrix": [4, 5], "x": 10, "y": 3},
-                {"matrix": [3, 6], "x": 11, "y": 3},
-                {"matrix": [4, 6], "x": 12, "y": 3}
-            ]
-        }
-    }
-}
diff --git a/keyboards/montsinger/rebound/rev4/keyboard.json b/keyboards/montsinger/rebound/rev4/keyboard.json
new file mode 100644
index 00000000000..ad17ca423ea
--- /dev/null
+++ b/keyboards/montsinger/rebound/rev4/keyboard.json
@@ -0,0 +1,158 @@
+{
+    "keyboard": "Rebound Rev4",
+    "manufacturer": "Montsinger",
+    "url": "https://montsinger.net",
+    "maintainer": "rossman360",
+    "usb": {
+        "vid": "0x524D",
+        "pid": "0x0001",
+        "device_version": "0.0.2"
+    },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "console": true,
+        "command": true,
+        "encoder": true
+    },
+    "matrix_pins": {
+        "cols": ["D7", "E6", "B4", "B5", "B2", "B3", "B1"],
+        "rows": ["D1", "D0", "D4", "C6", "F7", "F6", "F5", "F4"]
+    },
+    "diode_direction": "ROW2COL",
+    "encoder": {
+        "rotary": [
+            {"pin_a": "D2", "pin_b": "D3"}
+        ]
+    },
+    "rgblight": {
+        "led_count": 17
+    },
+    "ws2812": {
+        "pin": "B6"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "community_layouts": ["ortho_4x12"],
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [7, 0], "x": 1, "y": 0},
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [7, 1], "x": 3, "y": 0},
+                {"matrix": [0, 2], "x": 4, "y": 0},
+                {"matrix": [7, 2], "x": 5, "y": 0},
+
+                {"matrix": [0, 4], "x": 7, "y": 0},
+                {"matrix": [7, 4], "x": 8, "y": 0},
+                {"matrix": [0, 5], "x": 9, "y": 0},
+                {"matrix": [7, 5], "x": 10, "y": 0},
+                {"matrix": [0, 6], "x": 11, "y": 0},
+                {"matrix": [7, 6], "x": 12, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [6, 0], "x": 1, "y": 1},
+                {"matrix": [1, 1], "x": 2, "y": 1},
+                {"matrix": [6, 1], "x": 3, "y": 1},
+                {"matrix": [1, 2], "x": 4, "y": 1},
+                {"matrix": [6, 2], "x": 5, "y": 1},
+                {"matrix": [1, 3], "x": 6, "y": 1},
+                {"matrix": [1, 4], "x": 7, "y": 1},
+                {"matrix": [6, 4], "x": 8, "y": 1},
+                {"matrix": [1, 5], "x": 9, "y": 1},
+                {"matrix": [6, 5], "x": 10, "y": 1},
+                {"matrix": [1, 6], "x": 11, "y": 1},
+                {"matrix": [6, 6], "x": 12, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [5, 0], "x": 1, "y": 2},
+                {"matrix": [2, 1], "x": 2, "y": 2},
+                {"matrix": [5, 1], "x": 3, "y": 2},
+                {"matrix": [2, 2], "x": 4, "y": 2},
+                {"matrix": [5, 2], "x": 5, "y": 2},
+                {"matrix": [2, 3], "x": 6, "y": 2},
+                {"matrix": [2, 4], "x": 7, "y": 2},
+                {"matrix": [5, 4], "x": 8, "y": 2},
+                {"matrix": [2, 5], "x": 9, "y": 2},
+                {"matrix": [5, 5], "x": 10, "y": 2},
+                {"matrix": [2, 6], "x": 11, "y": 2},
+                {"matrix": [5, 6], "x": 12, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [4, 0], "x": 1, "y": 3},
+                {"matrix": [3, 1], "x": 2, "y": 3},
+                {"matrix": [4, 1], "x": 3, "y": 3},
+                {"matrix": [3, 2], "x": 4, "y": 3},
+                {"matrix": [4, 2], "x": 5, "y": 3},
+                {"matrix": [3, 3], "x": 6, "y": 3},
+                {"matrix": [3, 4], "x": 7, "y": 3},
+                {"matrix": [4, 4], "x": 8, "y": 3},
+                {"matrix": [3, 5], "x": 9, "y": 3},
+                {"matrix": [4, 5], "x": 10, "y": 3},
+                {"matrix": [3, 6], "x": 11, "y": 3},
+                {"matrix": [4, 6], "x": 12, "y": 3}
+            ]
+        },
+        "LAYOUT_ortho_4x12": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [7, 0], "x": 1, "y": 0},
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [7, 1], "x": 3, "y": 0},
+                {"matrix": [0, 2], "x": 4, "y": 0},
+                {"matrix": [7, 2], "x": 5, "y": 0},
+
+                {"matrix": [0, 4], "x": 7, "y": 0},
+                {"matrix": [7, 4], "x": 8, "y": 0},
+                {"matrix": [0, 5], "x": 9, "y": 0},
+                {"matrix": [7, 5], "x": 10, "y": 0},
+                {"matrix": [0, 6], "x": 11, "y": 0},
+                {"matrix": [7, 6], "x": 12, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [6, 0], "x": 1, "y": 1},
+                {"matrix": [1, 1], "x": 2, "y": 1},
+                {"matrix": [6, 1], "x": 3, "y": 1},
+                {"matrix": [1, 2], "x": 4, "y": 1},
+                {"matrix": [6, 2], "x": 5, "y": 1},
+
+                {"matrix": [1, 4], "x": 7, "y": 1},
+                {"matrix": [6, 4], "x": 8, "y": 1},
+                {"matrix": [1, 5], "x": 9, "y": 1},
+                {"matrix": [6, 5], "x": 10, "y": 1},
+                {"matrix": [1, 6], "x": 11, "y": 1},
+                {"matrix": [6, 6], "x": 12, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [5, 0], "x": 1, "y": 2},
+                {"matrix": [2, 1], "x": 2, "y": 2},
+                {"matrix": [5, 1], "x": 3, "y": 2},
+                {"matrix": [2, 2], "x": 4, "y": 2},
+                {"matrix": [5, 2], "x": 5, "y": 2},
+
+                {"matrix": [2, 4], "x": 7, "y": 2},
+                {"matrix": [5, 4], "x": 8, "y": 2},
+                {"matrix": [2, 5], "x": 9, "y": 2},
+                {"matrix": [5, 5], "x": 10, "y": 2},
+                {"matrix": [2, 6], "x": 11, "y": 2},
+                {"matrix": [5, 6], "x": 12, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [4, 0], "x": 1, "y": 3},
+                {"matrix": [3, 1], "x": 2, "y": 3},
+                {"matrix": [4, 1], "x": 3, "y": 3},
+                {"matrix": [3, 2], "x": 4, "y": 3},
+                {"matrix": [4, 2], "x": 5, "y": 3},
+
+                {"matrix": [3, 4], "x": 7, "y": 3},
+                {"matrix": [4, 4], "x": 8, "y": 3},
+                {"matrix": [3, 5], "x": 9, "y": 3},
+                {"matrix": [4, 5], "x": 10, "y": 3},
+                {"matrix": [3, 6], "x": 11, "y": 3},
+                {"matrix": [4, 6], "x": 12, "y": 3}
+            ]
+        }
+    }
+}
diff --git a/keyboards/montsinger/rebound/rev4/rules.mk b/keyboards/montsinger/rebound/rev4/rules.mk
index 0fc2e835d76..4df55cd2206 100644
--- a/keyboards/montsinger/rebound/rev4/rules.mk
+++ b/keyboards/montsinger/rebound/rev4/rules.mk
@@ -1,18 +1,3 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = yes        # Console for debug
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-ENCODER_ENABLE = yes
-
 # Disable unsupported hardware
-RGBLIGHT_SUPPORTED = yes
 AUDIO_SUPPORTED = no
 BACKLIGHT_SUPPORTED = no
diff --git a/keyboards/moon/info.json b/keyboards/moon/info.json
deleted file mode 100644
index a89caf86d2d..00000000000
--- a/keyboards/moon/info.json
+++ /dev/null
@@ -1,540 +0,0 @@
-{
-    "keyboard_name": "Moon",
-    "manufacturer": "EVE",
-    "url": "https://geekhack.org/index.php?topic=90379.0",
-    "maintainer": "qmk",
-    "usb": {
-        "vid": "0xFEED",
-        "pid": "0xFCB8",
-        "device_version": "0.0.1"
-    },
-    "backlight": {
-        "pin": "C6"
-    },
-    "indicators": {
-        "caps_lock": "B5",
-        "scroll_lock": "B6"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "community_layouts": ["tkl_ansi", "tkl_iso"],
-    "layouts": {
-        "LAYOUT_all": {
-            "layout": [
-                {"matrix": [0, 6], "x": 0, "y": 0},
-
-                {"matrix": [0, 7], "x": 2, "y": 0},
-                {"matrix": [0, 8], "x": 3, "y": 0},
-                {"matrix": [0, 9], "x": 4, "y": 0},
-                {"matrix": [0, 10], "x": 5, "y": 0},
-
-                {"matrix": [0, 0], "x": 6.5, "y": 0},
-                {"matrix": [0, 1], "x": 7.5, "y": 0},
-                {"matrix": [0, 2], "x": 8.5, "y": 0},
-                {"matrix": [0, 3], "x": 9.5, "y": 0},
-
-                {"matrix": [0, 4], "x": 11, "y": 0},
-                {"matrix": [0, 5], "x": 12, "y": 0},
-                {"matrix": [6, 6], "x": 13, "y": 0},
-                {"matrix": [6, 7], "x": 14, "y": 0},
-
-                {"matrix": [6, 8], "x": 15.25, "y": 0},
-                {"matrix": [6, 9], "x": 16.25, "y": 0},
-                {"matrix": [6, 10], "x": 17.25, "y": 0},
-
-                {"matrix": [1, 6], "x": 0, "y": 1.5},
-                {"matrix": [1, 7], "x": 1, "y": 1.5},
-                {"matrix": [1, 8], "x": 2, "y": 1.5},
-                {"matrix": [1, 9], "x": 3, "y": 1.5},
-                {"matrix": [1, 10], "x": 4, "y": 1.5},
-                {"matrix": [1, 0], "x": 5, "y": 1.5},
-                {"matrix": [1, 1], "x": 6, "y": 1.5},
-                {"matrix": [1, 2], "x": 7, "y": 1.5},
-                {"matrix": [1, 3], "x": 8, "y": 1.5},
-                {"matrix": [1, 4], "x": 9, "y": 1.5},
-                {"matrix": [1, 5], "x": 10, "y": 1.5},
-                {"matrix": [6, 0], "x": 11, "y": 1.5},
-                {"matrix": [6, 1], "x": 12, "y": 1.5},
-                {"matrix": [6, 2], "x": 13, "y": 1.5, "w": 2},
-
-                {"matrix": [6, 3], "x": 15.25, "y": 1.5},
-                {"matrix": [6, 4], "x": 16.25, "y": 1.5},
-                {"matrix": [6, 5], "x": 17.25, "y": 1.5},
-
-                {"matrix": [2, 6], "x": 0, "y": 2.5, "w": 1.5},
-                {"matrix": [2, 7], "x": 1.5, "y": 2.5},
-                {"matrix": [2, 8], "x": 2.5, "y": 2.5},
-                {"matrix": [2, 9], "x": 3.5, "y": 2.5},
-                {"matrix": [2, 10], "x": 4.5, "y": 2.5},
-                {"matrix": [2, 0], "x": 5.5, "y": 2.5},
-                {"matrix": [2, 1], "x": 6.5, "y": 2.5},
-                {"matrix": [2, 2], "x": 7.5, "y": 2.5},
-                {"matrix": [2, 3], "x": 8.5, "y": 2.5},
-                {"matrix": [2, 4], "x": 9.5, "y": 2.5},
-                {"matrix": [2, 5], "x": 10.5, "y": 2.5},
-                {"matrix": [7, 6], "x": 11.5, "y": 2.5},
-                {"matrix": [7, 7], "x": 12.5, "y": 2.5},
-                {"matrix": [7, 8], "x": 13.5, "y": 2.5, "w": 1.5},
-
-                {"matrix": [7, 9], "x": 15.25, "y": 2.5},
-                {"matrix": [7, 10], "x": 16.25, "y": 2.5},
-                {"matrix": [7, 0], "x": 17.25, "y": 2.5},
-
-                {"matrix": [3, 6], "x": 0, "y": 3.5, "w": 1.75},
-                {"matrix": [3, 7], "x": 1.75, "y": 3.5},
-                {"matrix": [3, 8], "x": 2.75, "y": 3.5},
-                {"matrix": [3, 9], "x": 3.75, "y": 3.5},
-                {"matrix": [3, 10], "x": 4.75, "y": 3.5},
-                {"matrix": [3, 0], "x": 5.75, "y": 3.5},
-                {"matrix": [3, 1], "x": 6.75, "y": 3.5},
-                {"matrix": [3, 2], "x": 7.75, "y": 3.5},
-                {"matrix": [3, 3], "x": 8.75, "y": 3.5},
-                {"matrix": [3, 4], "x": 9.75, "y": 3.5},
-                {"matrix": [3, 5], "x": 10.75, "y": 3.5},
-                {"matrix": [7, 1], "x": 11.75, "y": 3.5},
-                {"matrix": [7, 2], "x": 12.75, "y": 3.5, "w": 2.25},
-
-                {"matrix": [4, 6], "x": 0, "y": 4.5, "w": 1.25},
-                {"matrix": [4, 7], "x": 1.25, "y": 4.5},
-                {"matrix": [4, 8], "x": 2.25, "y": 4.5},
-                {"matrix": [4, 9], "x": 3.25, "y": 4.5},
-                {"matrix": [4, 10], "x": 4.25, "y": 4.5},
-                {"matrix": [4, 0], "x": 5.25, "y": 4.5},
-                {"matrix": [4, 1], "x": 6.25, "y": 4.5},
-                {"matrix": [4, 2], "x": 7.25, "y": 4.5},
-                {"matrix": [4, 3], "x": 8.25, "y": 4.5},
-                {"matrix": [4, 4], "x": 9.25, "y": 4.5},
-                {"matrix": [4, 5], "x": 10.25, "y": 4.5},
-                {"matrix": [7, 3], "x": 11.25, "y": 4.5},
-                {"matrix": [7, 5], "x": 12.25, "y": 4.5, "w": 2.75},
-
-                {"matrix": [7, 4], "x": 16.25, "y": 4.5},
-
-                {"matrix": [5, 6], "x": 0, "y": 5.5, "w": 1.25},
-                {"matrix": [5, 7], "x": 1.25, "y": 5.5, "w": 1.25},
-                {"matrix": [5, 8], "x": 2.5, "y": 5.5, "w": 1.25},
-                {"matrix": [5, 9], "x": 3.75, "y": 5.5, "w": 6.25},
-                {"matrix": [5, 10], "x": 10, "y": 5.5, "w": 1.25},
-                {"matrix": [5, 0], "x": 11.25, "y": 5.5, "w": 1.25},
-                {"matrix": [5, 1], "x": 12.5, "y": 5.5, "w": 1.25},
-                {"matrix": [5, 2], "x": 13.75, "y": 5.5, "w": 1.25},
-
-                {"matrix": [5, 3], "x": 15.25, "y": 5.5},
-                {"matrix": [5, 4], "x": 16.25, "y": 5.5},
-                {"matrix": [5, 5], "x": 17.25, "y": 5.5}
-            ]
-        },
-        "LAYOUT_tkl_ansi": {
-            "layout": [
-                {"matrix": [0, 6], "x": 0, "y": 0},
-
-                {"matrix": [0, 7], "x": 2, "y": 0},
-                {"matrix": [0, 8], "x": 3, "y": 0},
-                {"matrix": [0, 9], "x": 4, "y": 0},
-                {"matrix": [0, 10], "x": 5, "y": 0},
-
-                {"matrix": [0, 0], "x": 6.5, "y": 0},
-                {"matrix": [0, 1], "x": 7.5, "y": 0},
-                {"matrix": [0, 2], "x": 8.5, "y": 0},
-                {"matrix": [0, 3], "x": 9.5, "y": 0},
-
-                {"matrix": [0, 4], "x": 11, "y": 0},
-                {"matrix": [0, 5], "x": 12, "y": 0},
-                {"matrix": [6, 6], "x": 13, "y": 0},
-                {"matrix": [6, 7], "x": 14, "y": 0},
-
-                {"matrix": [6, 8], "x": 15.25, "y": 0},
-                {"matrix": [6, 9], "x": 16.25, "y": 0},
-                {"matrix": [6, 10], "x": 17.25, "y": 0},
-
-                {"matrix": [1, 6], "x": 0, "y": 1.5},
-                {"matrix": [1, 7], "x": 1, "y": 1.5},
-                {"matrix": [1, 8], "x": 2, "y": 1.5},
-                {"matrix": [1, 9], "x": 3, "y": 1.5},
-                {"matrix": [1, 10], "x": 4, "y": 1.5},
-                {"matrix": [1, 0], "x": 5, "y": 1.5},
-                {"matrix": [1, 1], "x": 6, "y": 1.5},
-                {"matrix": [1, 2], "x": 7, "y": 1.5},
-                {"matrix": [1, 3], "x": 8, "y": 1.5},
-                {"matrix": [1, 4], "x": 9, "y": 1.5},
-                {"matrix": [1, 5], "x": 10, "y": 1.5},
-                {"matrix": [6, 0], "x": 11, "y": 1.5},
-                {"matrix": [6, 1], "x": 12, "y": 1.5},
-                {"matrix": [6, 2], "x": 13, "y": 1.5, "w": 2},
-
-                {"matrix": [6, 3], "x": 15.25, "y": 1.5},
-                {"matrix": [6, 4], "x": 16.25, "y": 1.5},
-                {"matrix": [6, 5], "x": 17.25, "y": 1.5},
-
-                {"matrix": [2, 6], "x": 0, "y": 2.5, "w": 1.5},
-                {"matrix": [2, 7], "x": 1.5, "y": 2.5},
-                {"matrix": [2, 8], "x": 2.5, "y": 2.5},
-                {"matrix": [2, 9], "x": 3.5, "y": 2.5},
-                {"matrix": [2, 10], "x": 4.5, "y": 2.5},
-                {"matrix": [2, 0], "x": 5.5, "y": 2.5},
-                {"matrix": [2, 1], "x": 6.5, "y": 2.5},
-                {"matrix": [2, 2], "x": 7.5, "y": 2.5},
-                {"matrix": [2, 3], "x": 8.5, "y": 2.5},
-                {"matrix": [2, 4], "x": 9.5, "y": 2.5},
-                {"matrix": [2, 5], "x": 10.5, "y": 2.5},
-                {"matrix": [7, 6], "x": 11.5, "y": 2.5},
-                {"matrix": [7, 7], "x": 12.5, "y": 2.5},
-                {"matrix": [7, 8], "x": 13.5, "y": 2.5, "w": 1.5},
-
-                {"matrix": [7, 9], "x": 15.25, "y": 2.5},
-                {"matrix": [7, 10], "x": 16.25, "y": 2.5},
-                {"matrix": [7, 0], "x": 17.25, "y": 2.5},
-
-                {"matrix": [3, 6], "x": 0, "y": 3.5, "w": 1.75},
-                {"matrix": [3, 7], "x": 1.75, "y": 3.5},
-                {"matrix": [3, 8], "x": 2.75, "y": 3.5},
-                {"matrix": [3, 9], "x": 3.75, "y": 3.5},
-                {"matrix": [3, 10], "x": 4.75, "y": 3.5},
-                {"matrix": [3, 0], "x": 5.75, "y": 3.5},
-                {"matrix": [3, 1], "x": 6.75, "y": 3.5},
-                {"matrix": [3, 2], "x": 7.75, "y": 3.5},
-                {"matrix": [3, 3], "x": 8.75, "y": 3.5},
-                {"matrix": [3, 4], "x": 9.75, "y": 3.5},
-                {"matrix": [3, 5], "x": 10.75, "y": 3.5},
-                {"matrix": [7, 1], "x": 11.75, "y": 3.5},
-                {"matrix": [7, 2], "x": 12.75, "y": 3.5, "w": 2.25},
-
-                {"matrix": [4, 6], "x": 0, "y": 4.5, "w": 2.25},
-                {"matrix": [4, 8], "x": 2.25, "y": 4.5},
-                {"matrix": [4, 9], "x": 3.25, "y": 4.5},
-                {"matrix": [4, 10], "x": 4.25, "y": 4.5},
-                {"matrix": [4, 0], "x": 5.25, "y": 4.5},
-                {"matrix": [4, 1], "x": 6.25, "y": 4.5},
-                {"matrix": [4, 2], "x": 7.25, "y": 4.5},
-                {"matrix": [4, 3], "x": 8.25, "y": 4.5},
-                {"matrix": [4, 4], "x": 9.25, "y": 4.5},
-                {"matrix": [4, 5], "x": 10.25, "y": 4.5},
-                {"matrix": [7, 3], "x": 11.25, "y": 4.5},
-                {"matrix": [7, 5], "x": 12.25, "y": 4.5, "w": 2.75},
-
-                {"matrix": [7, 4], "x": 16.25, "y": 4.5},
-
-                {"matrix": [5, 6], "x": 0, "y": 5.5, "w": 1.25},
-                {"matrix": [5, 7], "x": 1.25, "y": 5.5, "w": 1.25},
-                {"matrix": [5, 8], "x": 2.5, "y": 5.5, "w": 1.25},
-                {"matrix": [5, 9], "x": 3.75, "y": 5.5, "w": 6.25},
-                {"matrix": [5, 10], "x": 10, "y": 5.5, "w": 1.25},
-                {"matrix": [5, 0], "x": 11.25, "y": 5.5, "w": 1.25},
-                {"matrix": [5, 1], "x": 12.5, "y": 5.5, "w": 1.25},
-                {"matrix": [5, 2], "x": 13.75, "y": 5.5, "w": 1.25},
-
-                {"matrix": [5, 3], "x": 15.25, "y": 5.5},
-                {"matrix": [5, 4], "x": 16.25, "y": 5.5},
-                {"matrix": [5, 5], "x": 17.25, "y": 5.5}
-            ]
-        },
-        "LAYOUT_tkl_ansi_wkl": {
-            "layout": [
-                {"matrix": [0, 6], "x": 0, "y": 0},
-
-                {"matrix": [0, 7], "x": 2, "y": 0},
-                {"matrix": [0, 8], "x": 3, "y": 0},
-                {"matrix": [0, 9], "x": 4, "y": 0},
-                {"matrix": [0, 10], "x": 5, "y": 0},
-
-                {"matrix": [0, 0], "x": 6.5, "y": 0},
-                {"matrix": [0, 1], "x": 7.5, "y": 0},
-                {"matrix": [0, 2], "x": 8.5, "y": 0},
-                {"matrix": [0, 3], "x": 9.5, "y": 0},
-
-                {"matrix": [0, 4], "x": 11, "y": 0},
-                {"matrix": [0, 5], "x": 12, "y": 0},
-                {"matrix": [6, 6], "x": 13, "y": 0},
-                {"matrix": [6, 7], "x": 14, "y": 0},
-
-                {"matrix": [6, 8], "x": 15.25, "y": 0},
-                {"matrix": [6, 9], "x": 16.25, "y": 0},
-                {"matrix": [6, 10], "x": 17.25, "y": 0},
-
-                {"matrix": [1, 6], "x": 0, "y": 1.5},
-                {"matrix": [1, 7], "x": 1, "y": 1.5},
-                {"matrix": [1, 8], "x": 2, "y": 1.5},
-                {"matrix": [1, 9], "x": 3, "y": 1.5},
-                {"matrix": [1, 10], "x": 4, "y": 1.5},
-                {"matrix": [1, 0], "x": 5, "y": 1.5},
-                {"matrix": [1, 1], "x": 6, "y": 1.5},
-                {"matrix": [1, 2], "x": 7, "y": 1.5},
-                {"matrix": [1, 3], "x": 8, "y": 1.5},
-                {"matrix": [1, 4], "x": 9, "y": 1.5},
-                {"matrix": [1, 5], "x": 10, "y": 1.5},
-                {"matrix": [6, 0], "x": 11, "y": 1.5},
-                {"matrix": [6, 1], "x": 12, "y": 1.5},
-                {"matrix": [6, 2], "x": 13, "y": 1.5, "w": 2},
-
-                {"matrix": [6, 3], "x": 15.25, "y": 1.5},
-                {"matrix": [6, 4], "x": 16.25, "y": 1.5},
-                {"matrix": [6, 5], "x": 17.25, "y": 1.5},
-
-                {"matrix": [2, 6], "x": 0, "y": 2.5, "w": 1.5},
-                {"matrix": [2, 7], "x": 1.5, "y": 2.5},
-                {"matrix": [2, 8], "x": 2.5, "y": 2.5},
-                {"matrix": [2, 9], "x": 3.5, "y": 2.5},
-                {"matrix": [2, 10], "x": 4.5, "y": 2.5},
-                {"matrix": [2, 0], "x": 5.5, "y": 2.5},
-                {"matrix": [2, 1], "x": 6.5, "y": 2.5},
-                {"matrix": [2, 2], "x": 7.5, "y": 2.5},
-                {"matrix": [2, 3], "x": 8.5, "y": 2.5},
-                {"matrix": [2, 4], "x": 9.5, "y": 2.5},
-                {"matrix": [2, 5], "x": 10.5, "y": 2.5},
-                {"matrix": [7, 6], "x": 11.5, "y": 2.5},
-                {"matrix": [7, 7], "x": 12.5, "y": 2.5},
-                {"matrix": [7, 8], "x": 13.5, "y": 2.5, "w": 1.5},
-
-                {"matrix": [7, 9], "x": 15.25, "y": 2.5},
-                {"matrix": [7, 10], "x": 16.25, "y": 2.5},
-                {"matrix": [7, 0], "x": 17.25, "y": 2.5},
-
-                {"matrix": [3, 6], "x": 0, "y": 3.5, "w": 1.75},
-                {"matrix": [3, 7], "x": 1.75, "y": 3.5},
-                {"matrix": [3, 8], "x": 2.75, "y": 3.5},
-                {"matrix": [3, 9], "x": 3.75, "y": 3.5},
-                {"matrix": [3, 10], "x": 4.75, "y": 3.5},
-                {"matrix": [3, 0], "x": 5.75, "y": 3.5},
-                {"matrix": [3, 1], "x": 6.75, "y": 3.5},
-                {"matrix": [3, 2], "x": 7.75, "y": 3.5},
-                {"matrix": [3, 3], "x": 8.75, "y": 3.5},
-                {"matrix": [3, 4], "x": 9.75, "y": 3.5},
-                {"matrix": [3, 5], "x": 10.75, "y": 3.5},
-                {"matrix": [7, 1], "x": 11.75, "y": 3.5},
-                {"matrix": [7, 2], "x": 12.75, "y": 3.5, "w": 2.25},
-
-                {"matrix": [4, 6], "x": 0, "y": 4.5, "w": 2.25},
-                {"matrix": [4, 8], "x": 2.25, "y": 4.5},
-                {"matrix": [4, 9], "x": 3.25, "y": 4.5},
-                {"matrix": [4, 10], "x": 4.25, "y": 4.5},
-                {"matrix": [4, 0], "x": 5.25, "y": 4.5},
-                {"matrix": [4, 1], "x": 6.25, "y": 4.5},
-                {"matrix": [4, 2], "x": 7.25, "y": 4.5},
-                {"matrix": [4, 3], "x": 8.25, "y": 4.5},
-                {"matrix": [4, 4], "x": 9.25, "y": 4.5},
-                {"matrix": [4, 5], "x": 10.25, "y": 4.5},
-                {"matrix": [7, 3], "x": 11.25, "y": 4.5},
-                {"matrix": [7, 5], "x": 12.25, "y": 4.5, "w": 2.75},
-
-                {"matrix": [7, 4], "x": 16.25, "y": 4.5},
-
-                {"matrix": [5, 6], "x": 0, "y": 5.5, "w": 1.5},
-                {"matrix": [5, 8], "x": 2.5, "y": 5.5, "w": 1.5},
-                {"matrix": [5, 9], "x": 4, "y": 5.5, "w": 7},
-                {"matrix": [5, 0], "x": 11, "y": 5.5, "w": 1.5},
-                {"matrix": [5, 2], "x": 13.5, "y": 5.5, "w": 1.5},
-
-                {"matrix": [5, 3], "x": 15.25, "y": 5.5},
-                {"matrix": [5, 4], "x": 16.25, "y": 5.5},
-                {"matrix": [5, 5], "x": 17.25, "y": 5.5}
-            ]
-        },
-        "LAYOUT_tkl_iso": {
-            "layout": [
-                {"matrix": [0, 6], "x": 0, "y": 0},
-
-                {"matrix": [0, 7], "x": 2, "y": 0},
-                {"matrix": [0, 8], "x": 3, "y": 0},
-                {"matrix": [0, 9], "x": 4, "y": 0},
-                {"matrix": [0, 10], "x": 5, "y": 0},
-
-                {"matrix": [0, 0], "x": 6.5, "y": 0},
-                {"matrix": [0, 1], "x": 7.5, "y": 0},
-                {"matrix": [0, 2], "x": 8.5, "y": 0},
-                {"matrix": [0, 3], "x": 9.5, "y": 0},
-
-                {"matrix": [0, 4], "x": 11, "y": 0},
-                {"matrix": [0, 5], "x": 12, "y": 0},
-                {"matrix": [6, 6], "x": 13, "y": 0},
-                {"matrix": [6, 7], "x": 14, "y": 0},
-
-                {"matrix": [6, 8], "x": 15.25, "y": 0},
-                {"matrix": [6, 9], "x": 16.25, "y": 0},
-                {"matrix": [6, 10], "x": 17.25, "y": 0},
-
-                {"matrix": [1, 6], "x": 0, "y": 1.5},
-                {"matrix": [1, 7], "x": 1, "y": 1.5},
-                {"matrix": [1, 8], "x": 2, "y": 1.5},
-                {"matrix": [1, 9], "x": 3, "y": 1.5},
-                {"matrix": [1, 10], "x": 4, "y": 1.5},
-                {"matrix": [1, 0], "x": 5, "y": 1.5},
-                {"matrix": [1, 1], "x": 6, "y": 1.5},
-                {"matrix": [1, 2], "x": 7, "y": 1.5},
-                {"matrix": [1, 3], "x": 8, "y": 1.5},
-                {"matrix": [1, 4], "x": 9, "y": 1.5},
-                {"matrix": [1, 5], "x": 10, "y": 1.5},
-                {"matrix": [6, 0], "x": 11, "y": 1.5},
-                {"matrix": [6, 1], "x": 12, "y": 1.5},
-                {"matrix": [6, 2], "x": 13, "y": 1.5, "w": 2},
-
-                {"matrix": [6, 3], "x": 15.25, "y": 1.5},
-                {"matrix": [6, 4], "x": 16.25, "y": 1.5},
-                {"matrix": [6, 5], "x": 17.25, "y": 1.5},
-
-                {"matrix": [2, 6], "x": 0, "y": 2.5, "w": 1.5},
-                {"matrix": [2, 7], "x": 1.5, "y": 2.5},
-                {"matrix": [2, 8], "x": 2.5, "y": 2.5},
-                {"matrix": [2, 9], "x": 3.5, "y": 2.5},
-                {"matrix": [2, 10], "x": 4.5, "y": 2.5},
-                {"matrix": [2, 0], "x": 5.5, "y": 2.5},
-                {"matrix": [2, 1], "x": 6.5, "y": 2.5},
-                {"matrix": [2, 2], "x": 7.5, "y": 2.5},
-                {"matrix": [2, 3], "x": 8.5, "y": 2.5},
-                {"matrix": [2, 4], "x": 9.5, "y": 2.5},
-                {"matrix": [2, 5], "x": 10.5, "y": 2.5},
-                {"matrix": [7, 6], "x": 11.5, "y": 2.5},
-                {"matrix": [7, 7], "x": 12.5, "y": 2.5},
-
-                {"matrix": [7, 9], "x": 15.25, "y": 2.5},
-                {"matrix": [7, 10], "x": 16.25, "y": 2.5},
-                {"matrix": [7, 0], "x": 17.25, "y": 2.5},
-
-                {"matrix": [3, 6], "x": 0, "y": 3.5, "w": 1.75},
-                {"matrix": [3, 7], "x": 1.75, "y": 3.5},
-                {"matrix": [3, 8], "x": 2.75, "y": 3.5},
-                {"matrix": [3, 9], "x": 3.75, "y": 3.5},
-                {"matrix": [3, 10], "x": 4.75, "y": 3.5},
-                {"matrix": [3, 0], "x": 5.75, "y": 3.5},
-                {"matrix": [3, 1], "x": 6.75, "y": 3.5},
-                {"matrix": [3, 2], "x": 7.75, "y": 3.5},
-                {"matrix": [3, 3], "x": 8.75, "y": 3.5},
-                {"matrix": [3, 4], "x": 9.75, "y": 3.5},
-                {"matrix": [3, 5], "x": 10.75, "y": 3.5},
-                {"matrix": [7, 1], "x": 11.75, "y": 3.5},
-                {"matrix": [7, 8], "x": 12.75, "y": 3.5},
-                {"matrix": [7, 2], "x": 13.75, "y": 2.5, "w": 1.25, "h": 2},
-
-                {"matrix": [4, 6], "x": 0, "y": 4.5, "w": 1.25},
-                {"matrix": [4, 7], "x": 1.25, "y": 4.5},
-                {"matrix": [4, 8], "x": 2.25, "y": 4.5},
-                {"matrix": [4, 9], "x": 3.25, "y": 4.5},
-                {"matrix": [4, 10], "x": 4.25, "y": 4.5},
-                {"matrix": [4, 0], "x": 5.25, "y": 4.5},
-                {"matrix": [4, 1], "x": 6.25, "y": 4.5},
-                {"matrix": [4, 2], "x": 7.25, "y": 4.5},
-                {"matrix": [4, 3], "x": 8.25, "y": 4.5},
-                {"matrix": [4, 4], "x": 9.25, "y": 4.5},
-                {"matrix": [4, 5], "x": 10.25, "y": 4.5},
-                {"matrix": [7, 3], "x": 11.25, "y": 4.5},
-                {"matrix": [7, 5], "x": 12.25, "y": 4.5, "w": 2.75},
-
-                {"matrix": [7, 4], "x": 16.25, "y": 4.5},
-
-                {"matrix": [5, 6], "x": 0, "y": 5.5, "w": 1.25},
-                {"matrix": [5, 7], "x": 1.25, "y": 5.5, "w": 1.25},
-                {"matrix": [5, 8], "x": 2.5, "y": 5.5, "w": 1.25},
-                {"matrix": [5, 9], "x": 3.75, "y": 5.5, "w": 6.25},
-                {"matrix": [5, 10], "x": 10, "y": 5.5, "w": 1.25},
-                {"matrix": [5, 0], "x": 11.25, "y": 5.5, "w": 1.25},
-                {"matrix": [5, 1], "x": 12.5, "y": 5.5, "w": 1.25},
-                {"matrix": [5, 2], "x": 13.75, "y": 5.5, "w": 1.25},
-
-                {"matrix": [5, 3], "x": 15.25, "y": 5.5},
-                {"matrix": [5, 4], "x": 16.25, "y": 5.5},
-                {"matrix": [5, 5], "x": 17.25, "y": 5.5}
-            ]
-        },
-        "LAYOUT_tkl_iso_wkl": {
-            "layout": [
-                {"matrix": [0, 6], "x": 0, "y": 0},
-
-                {"matrix": [0, 7], "x": 2, "y": 0},
-                {"matrix": [0, 8], "x": 3, "y": 0},
-                {"matrix": [0, 9], "x": 4, "y": 0},
-                {"matrix": [0, 10], "x": 5, "y": 0},
-
-                {"matrix": [0, 0], "x": 6.5, "y": 0},
-                {"matrix": [0, 1], "x": 7.5, "y": 0},
-                {"matrix": [0, 2], "x": 8.5, "y": 0},
-                {"matrix": [0, 3], "x": 9.5, "y": 0},
-
-                {"matrix": [0, 4], "x": 11, "y": 0},
-                {"matrix": [0, 5], "x": 12, "y": 0},
-                {"matrix": [6, 6], "x": 13, "y": 0},
-                {"matrix": [6, 7], "x": 14, "y": 0},
-
-                {"matrix": [6, 8], "x": 15.25, "y": 0},
-                {"matrix": [6, 9], "x": 16.25, "y": 0},
-                {"matrix": [6, 10], "x": 17.25, "y": 0},
-
-                {"matrix": [1, 6], "x": 0, "y": 1.5},
-                {"matrix": [1, 7], "x": 1, "y": 1.5},
-                {"matrix": [1, 8], "x": 2, "y": 1.5},
-                {"matrix": [1, 9], "x": 3, "y": 1.5},
-                {"matrix": [1, 10], "x": 4, "y": 1.5},
-                {"matrix": [1, 0], "x": 5, "y": 1.5},
-                {"matrix": [1, 1], "x": 6, "y": 1.5},
-                {"matrix": [1, 2], "x": 7, "y": 1.5},
-                {"matrix": [1, 3], "x": 8, "y": 1.5},
-                {"matrix": [1, 4], "x": 9, "y": 1.5},
-                {"matrix": [1, 5], "x": 10, "y": 1.5},
-                {"matrix": [6, 0], "x": 11, "y": 1.5},
-                {"matrix": [6, 1], "x": 12, "y": 1.5},
-                {"matrix": [6, 2], "x": 13, "y": 1.5, "w": 2},
-
-                {"matrix": [6, 3], "x": 15.25, "y": 1.5},
-                {"matrix": [6, 4], "x": 16.25, "y": 1.5},
-                {"matrix": [6, 5], "x": 17.25, "y": 1.5},
-
-                {"matrix": [2, 6], "x": 0, "y": 2.5, "w": 1.5},
-                {"matrix": [2, 7], "x": 1.5, "y": 2.5},
-                {"matrix": [2, 8], "x": 2.5, "y": 2.5},
-                {"matrix": [2, 9], "x": 3.5, "y": 2.5},
-                {"matrix": [2, 10], "x": 4.5, "y": 2.5},
-                {"matrix": [2, 0], "x": 5.5, "y": 2.5},
-                {"matrix": [2, 1], "x": 6.5, "y": 2.5},
-                {"matrix": [2, 2], "x": 7.5, "y": 2.5},
-                {"matrix": [2, 3], "x": 8.5, "y": 2.5},
-                {"matrix": [2, 4], "x": 9.5, "y": 2.5},
-                {"matrix": [2, 5], "x": 10.5, "y": 2.5},
-                {"matrix": [7, 6], "x": 11.5, "y": 2.5},
-                {"matrix": [7, 7], "x": 12.5, "y": 2.5},
-
-                {"matrix": [7, 9], "x": 15.25, "y": 2.5},
-                {"matrix": [7, 10], "x": 16.25, "y": 2.5},
-                {"matrix": [7, 0], "x": 17.25, "y": 2.5},
-
-                {"matrix": [3, 6], "x": 0, "y": 3.5, "w": 1.75},
-                {"matrix": [3, 7], "x": 1.75, "y": 3.5},
-                {"matrix": [3, 8], "x": 2.75, "y": 3.5},
-                {"matrix": [3, 9], "x": 3.75, "y": 3.5},
-                {"matrix": [3, 10], "x": 4.75, "y": 3.5},
-                {"matrix": [3, 0], "x": 5.75, "y": 3.5},
-                {"matrix": [3, 1], "x": 6.75, "y": 3.5},
-                {"matrix": [3, 2], "x": 7.75, "y": 3.5},
-                {"matrix": [3, 3], "x": 8.75, "y": 3.5},
-                {"matrix": [3, 4], "x": 9.75, "y": 3.5},
-                {"matrix": [3, 5], "x": 10.75, "y": 3.5},
-                {"matrix": [7, 1], "x": 11.75, "y": 3.5},
-                {"matrix": [7, 8], "x": 12.75, "y": 3.5},
-                {"matrix": [7, 2], "x": 13.75, "y": 2.5, "w": 1.25, "h": 2},
-
-                {"matrix": [4, 6], "x": 0, "y": 4.5, "w": 1.25},
-                {"matrix": [4, 7], "x": 1.25, "y": 4.5},
-                {"matrix": [4, 8], "x": 2.25, "y": 4.5},
-                {"matrix": [4, 9], "x": 3.25, "y": 4.5},
-                {"matrix": [4, 10], "x": 4.25, "y": 4.5},
-                {"matrix": [4, 0], "x": 5.25, "y": 4.5},
-                {"matrix": [4, 1], "x": 6.25, "y": 4.5},
-                {"matrix": [4, 2], "x": 7.25, "y": 4.5},
-                {"matrix": [4, 3], "x": 8.25, "y": 4.5},
-                {"matrix": [4, 4], "x": 9.25, "y": 4.5},
-                {"matrix": [4, 5], "x": 10.25, "y": 4.5},
-                {"matrix": [7, 3], "x": 11.25, "y": 4.5},
-                {"matrix": [7, 5], "x": 12.25, "y": 4.5, "w": 2.75},
-
-                {"matrix": [7, 4], "x": 16.25, "y": 4.5},
-
-                {"matrix": [5, 6], "x": 0, "y": 5.5, "w": 1.5},
-                {"matrix": [5, 8], "x": 2.5, "y": 5.5, "w": 1.5},
-                {"matrix": [5, 9], "x": 4, "y": 5.5, "w": 7},
-                {"matrix": [5, 0], "x": 11, "y": 5.5, "w": 1.5},
-                {"matrix": [5, 2], "x": 13.5, "y": 5.5, "w": 1.5},
-
-                {"matrix": [5, 3], "x": 15.25, "y": 5.5},
-                {"matrix": [5, 4], "x": 16.25, "y": 5.5},
-                {"matrix": [5, 5], "x": 17.25, "y": 5.5}
-            ]
-        }
-    }
-}
diff --git a/keyboards/moon/keyboard.json b/keyboards/moon/keyboard.json
new file mode 100644
index 00000000000..4c66cb51a9b
--- /dev/null
+++ b/keyboards/moon/keyboard.json
@@ -0,0 +1,549 @@
+{
+    "keyboard_name": "Moon",
+    "manufacturer": "EVE",
+    "url": "https://geekhack.org/index.php?topic=90379.0",
+    "maintainer": "qmk",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0xFCB8",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": false,
+        "mousekey": true,
+        "extrakey": true,
+        "console": true,
+        "command": true,
+        "nkro": true,
+        "backlight": true
+    },
+    "backlight": {
+        "pin": "C6"
+    },
+    "indicators": {
+        "caps_lock": "B5",
+        "scroll_lock": "B6"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "community_layouts": ["tkl_ansi", "tkl_iso"],
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                {"matrix": [0, 6], "x": 0, "y": 0},
+
+                {"matrix": [0, 7], "x": 2, "y": 0},
+                {"matrix": [0, 8], "x": 3, "y": 0},
+                {"matrix": [0, 9], "x": 4, "y": 0},
+                {"matrix": [0, 10], "x": 5, "y": 0},
+
+                {"matrix": [0, 0], "x": 6.5, "y": 0},
+                {"matrix": [0, 1], "x": 7.5, "y": 0},
+                {"matrix": [0, 2], "x": 8.5, "y": 0},
+                {"matrix": [0, 3], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 4], "x": 11, "y": 0},
+                {"matrix": [0, 5], "x": 12, "y": 0},
+                {"matrix": [6, 6], "x": 13, "y": 0},
+                {"matrix": [6, 7], "x": 14, "y": 0},
+
+                {"matrix": [6, 8], "x": 15.25, "y": 0},
+                {"matrix": [6, 9], "x": 16.25, "y": 0},
+                {"matrix": [6, 10], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 6], "x": 0, "y": 1.5},
+                {"matrix": [1, 7], "x": 1, "y": 1.5},
+                {"matrix": [1, 8], "x": 2, "y": 1.5},
+                {"matrix": [1, 9], "x": 3, "y": 1.5},
+                {"matrix": [1, 10], "x": 4, "y": 1.5},
+                {"matrix": [1, 0], "x": 5, "y": 1.5},
+                {"matrix": [1, 1], "x": 6, "y": 1.5},
+                {"matrix": [1, 2], "x": 7, "y": 1.5},
+                {"matrix": [1, 3], "x": 8, "y": 1.5},
+                {"matrix": [1, 4], "x": 9, "y": 1.5},
+                {"matrix": [1, 5], "x": 10, "y": 1.5},
+                {"matrix": [6, 0], "x": 11, "y": 1.5},
+                {"matrix": [6, 1], "x": 12, "y": 1.5},
+                {"matrix": [6, 2], "x": 13, "y": 1.5, "w": 2},
+
+                {"matrix": [6, 3], "x": 15.25, "y": 1.5},
+                {"matrix": [6, 4], "x": 16.25, "y": 1.5},
+                {"matrix": [6, 5], "x": 17.25, "y": 1.5},
+
+                {"matrix": [2, 6], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 7], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 8], "x": 2.5, "y": 2.5},
+                {"matrix": [2, 9], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 10], "x": 4.5, "y": 2.5},
+                {"matrix": [2, 0], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 1], "x": 6.5, "y": 2.5},
+                {"matrix": [2, 2], "x": 7.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 8.5, "y": 2.5},
+                {"matrix": [2, 4], "x": 9.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 10.5, "y": 2.5},
+                {"matrix": [7, 6], "x": 11.5, "y": 2.5},
+                {"matrix": [7, 7], "x": 12.5, "y": 2.5},
+                {"matrix": [7, 8], "x": 13.5, "y": 2.5, "w": 1.5},
+
+                {"matrix": [7, 9], "x": 15.25, "y": 2.5},
+                {"matrix": [7, 10], "x": 16.25, "y": 2.5},
+                {"matrix": [7, 0], "x": 17.25, "y": 2.5},
+
+                {"matrix": [3, 6], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 7], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 8], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 9], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 10], "x": 4.75, "y": 3.5},
+                {"matrix": [3, 0], "x": 5.75, "y": 3.5},
+                {"matrix": [3, 1], "x": 6.75, "y": 3.5},
+                {"matrix": [3, 2], "x": 7.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 8.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 10.75, "y": 3.5},
+                {"matrix": [7, 1], "x": 11.75, "y": 3.5},
+                {"matrix": [7, 2], "x": 12.75, "y": 3.5, "w": 2.25},
+
+                {"matrix": [4, 6], "x": 0, "y": 4.5, "w": 1.25},
+                {"matrix": [4, 7], "x": 1.25, "y": 4.5},
+                {"matrix": [4, 8], "x": 2.25, "y": 4.5},
+                {"matrix": [4, 9], "x": 3.25, "y": 4.5},
+                {"matrix": [4, 10], "x": 4.25, "y": 4.5},
+                {"matrix": [4, 0], "x": 5.25, "y": 4.5},
+                {"matrix": [4, 1], "x": 6.25, "y": 4.5},
+                {"matrix": [4, 2], "x": 7.25, "y": 4.5},
+                {"matrix": [4, 3], "x": 8.25, "y": 4.5},
+                {"matrix": [4, 4], "x": 9.25, "y": 4.5},
+                {"matrix": [4, 5], "x": 10.25, "y": 4.5},
+                {"matrix": [7, 3], "x": 11.25, "y": 4.5},
+                {"matrix": [7, 5], "x": 12.25, "y": 4.5, "w": 2.75},
+
+                {"matrix": [7, 4], "x": 16.25, "y": 4.5},
+
+                {"matrix": [5, 6], "x": 0, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 7], "x": 1.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 8], "x": 2.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 9], "x": 3.75, "y": 5.5, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 0], "x": 11.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 1], "x": 12.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 2], "x": 13.75, "y": 5.5, "w": 1.25},
+
+                {"matrix": [5, 3], "x": 15.25, "y": 5.5},
+                {"matrix": [5, 4], "x": 16.25, "y": 5.5},
+                {"matrix": [5, 5], "x": 17.25, "y": 5.5}
+            ]
+        },
+        "LAYOUT_tkl_ansi": {
+            "layout": [
+                {"matrix": [0, 6], "x": 0, "y": 0},
+
+                {"matrix": [0, 7], "x": 2, "y": 0},
+                {"matrix": [0, 8], "x": 3, "y": 0},
+                {"matrix": [0, 9], "x": 4, "y": 0},
+                {"matrix": [0, 10], "x": 5, "y": 0},
+
+                {"matrix": [0, 0], "x": 6.5, "y": 0},
+                {"matrix": [0, 1], "x": 7.5, "y": 0},
+                {"matrix": [0, 2], "x": 8.5, "y": 0},
+                {"matrix": [0, 3], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 4], "x": 11, "y": 0},
+                {"matrix": [0, 5], "x": 12, "y": 0},
+                {"matrix": [6, 6], "x": 13, "y": 0},
+                {"matrix": [6, 7], "x": 14, "y": 0},
+
+                {"matrix": [6, 8], "x": 15.25, "y": 0},
+                {"matrix": [6, 9], "x": 16.25, "y": 0},
+                {"matrix": [6, 10], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 6], "x": 0, "y": 1.5},
+                {"matrix": [1, 7], "x": 1, "y": 1.5},
+                {"matrix": [1, 8], "x": 2, "y": 1.5},
+                {"matrix": [1, 9], "x": 3, "y": 1.5},
+                {"matrix": [1, 10], "x": 4, "y": 1.5},
+                {"matrix": [1, 0], "x": 5, "y": 1.5},
+                {"matrix": [1, 1], "x": 6, "y": 1.5},
+                {"matrix": [1, 2], "x": 7, "y": 1.5},
+                {"matrix": [1, 3], "x": 8, "y": 1.5},
+                {"matrix": [1, 4], "x": 9, "y": 1.5},
+                {"matrix": [1, 5], "x": 10, "y": 1.5},
+                {"matrix": [6, 0], "x": 11, "y": 1.5},
+                {"matrix": [6, 1], "x": 12, "y": 1.5},
+                {"matrix": [6, 2], "x": 13, "y": 1.5, "w": 2},
+
+                {"matrix": [6, 3], "x": 15.25, "y": 1.5},
+                {"matrix": [6, 4], "x": 16.25, "y": 1.5},
+                {"matrix": [6, 5], "x": 17.25, "y": 1.5},
+
+                {"matrix": [2, 6], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 7], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 8], "x": 2.5, "y": 2.5},
+                {"matrix": [2, 9], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 10], "x": 4.5, "y": 2.5},
+                {"matrix": [2, 0], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 1], "x": 6.5, "y": 2.5},
+                {"matrix": [2, 2], "x": 7.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 8.5, "y": 2.5},
+                {"matrix": [2, 4], "x": 9.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 10.5, "y": 2.5},
+                {"matrix": [7, 6], "x": 11.5, "y": 2.5},
+                {"matrix": [7, 7], "x": 12.5, "y": 2.5},
+                {"matrix": [7, 8], "x": 13.5, "y": 2.5, "w": 1.5},
+
+                {"matrix": [7, 9], "x": 15.25, "y": 2.5},
+                {"matrix": [7, 10], "x": 16.25, "y": 2.5},
+                {"matrix": [7, 0], "x": 17.25, "y": 2.5},
+
+                {"matrix": [3, 6], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 7], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 8], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 9], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 10], "x": 4.75, "y": 3.5},
+                {"matrix": [3, 0], "x": 5.75, "y": 3.5},
+                {"matrix": [3, 1], "x": 6.75, "y": 3.5},
+                {"matrix": [3, 2], "x": 7.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 8.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 10.75, "y": 3.5},
+                {"matrix": [7, 1], "x": 11.75, "y": 3.5},
+                {"matrix": [7, 2], "x": 12.75, "y": 3.5, "w": 2.25},
+
+                {"matrix": [4, 6], "x": 0, "y": 4.5, "w": 2.25},
+                {"matrix": [4, 8], "x": 2.25, "y": 4.5},
+                {"matrix": [4, 9], "x": 3.25, "y": 4.5},
+                {"matrix": [4, 10], "x": 4.25, "y": 4.5},
+                {"matrix": [4, 0], "x": 5.25, "y": 4.5},
+                {"matrix": [4, 1], "x": 6.25, "y": 4.5},
+                {"matrix": [4, 2], "x": 7.25, "y": 4.5},
+                {"matrix": [4, 3], "x": 8.25, "y": 4.5},
+                {"matrix": [4, 4], "x": 9.25, "y": 4.5},
+                {"matrix": [4, 5], "x": 10.25, "y": 4.5},
+                {"matrix": [7, 3], "x": 11.25, "y": 4.5},
+                {"matrix": [7, 5], "x": 12.25, "y": 4.5, "w": 2.75},
+
+                {"matrix": [7, 4], "x": 16.25, "y": 4.5},
+
+                {"matrix": [5, 6], "x": 0, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 7], "x": 1.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 8], "x": 2.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 9], "x": 3.75, "y": 5.5, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 0], "x": 11.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 1], "x": 12.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 2], "x": 13.75, "y": 5.5, "w": 1.25},
+
+                {"matrix": [5, 3], "x": 15.25, "y": 5.5},
+                {"matrix": [5, 4], "x": 16.25, "y": 5.5},
+                {"matrix": [5, 5], "x": 17.25, "y": 5.5}
+            ]
+        },
+        "LAYOUT_tkl_ansi_wkl": {
+            "layout": [
+                {"matrix": [0, 6], "x": 0, "y": 0},
+
+                {"matrix": [0, 7], "x": 2, "y": 0},
+                {"matrix": [0, 8], "x": 3, "y": 0},
+                {"matrix": [0, 9], "x": 4, "y": 0},
+                {"matrix": [0, 10], "x": 5, "y": 0},
+
+                {"matrix": [0, 0], "x": 6.5, "y": 0},
+                {"matrix": [0, 1], "x": 7.5, "y": 0},
+                {"matrix": [0, 2], "x": 8.5, "y": 0},
+                {"matrix": [0, 3], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 4], "x": 11, "y": 0},
+                {"matrix": [0, 5], "x": 12, "y": 0},
+                {"matrix": [6, 6], "x": 13, "y": 0},
+                {"matrix": [6, 7], "x": 14, "y": 0},
+
+                {"matrix": [6, 8], "x": 15.25, "y": 0},
+                {"matrix": [6, 9], "x": 16.25, "y": 0},
+                {"matrix": [6, 10], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 6], "x": 0, "y": 1.5},
+                {"matrix": [1, 7], "x": 1, "y": 1.5},
+                {"matrix": [1, 8], "x": 2, "y": 1.5},
+                {"matrix": [1, 9], "x": 3, "y": 1.5},
+                {"matrix": [1, 10], "x": 4, "y": 1.5},
+                {"matrix": [1, 0], "x": 5, "y": 1.5},
+                {"matrix": [1, 1], "x": 6, "y": 1.5},
+                {"matrix": [1, 2], "x": 7, "y": 1.5},
+                {"matrix": [1, 3], "x": 8, "y": 1.5},
+                {"matrix": [1, 4], "x": 9, "y": 1.5},
+                {"matrix": [1, 5], "x": 10, "y": 1.5},
+                {"matrix": [6, 0], "x": 11, "y": 1.5},
+                {"matrix": [6, 1], "x": 12, "y": 1.5},
+                {"matrix": [6, 2], "x": 13, "y": 1.5, "w": 2},
+
+                {"matrix": [6, 3], "x": 15.25, "y": 1.5},
+                {"matrix": [6, 4], "x": 16.25, "y": 1.5},
+                {"matrix": [6, 5], "x": 17.25, "y": 1.5},
+
+                {"matrix": [2, 6], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 7], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 8], "x": 2.5, "y": 2.5},
+                {"matrix": [2, 9], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 10], "x": 4.5, "y": 2.5},
+                {"matrix": [2, 0], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 1], "x": 6.5, "y": 2.5},
+                {"matrix": [2, 2], "x": 7.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 8.5, "y": 2.5},
+                {"matrix": [2, 4], "x": 9.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 10.5, "y": 2.5},
+                {"matrix": [7, 6], "x": 11.5, "y": 2.5},
+                {"matrix": [7, 7], "x": 12.5, "y": 2.5},
+                {"matrix": [7, 8], "x": 13.5, "y": 2.5, "w": 1.5},
+
+                {"matrix": [7, 9], "x": 15.25, "y": 2.5},
+                {"matrix": [7, 10], "x": 16.25, "y": 2.5},
+                {"matrix": [7, 0], "x": 17.25, "y": 2.5},
+
+                {"matrix": [3, 6], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 7], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 8], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 9], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 10], "x": 4.75, "y": 3.5},
+                {"matrix": [3, 0], "x": 5.75, "y": 3.5},
+                {"matrix": [3, 1], "x": 6.75, "y": 3.5},
+                {"matrix": [3, 2], "x": 7.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 8.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 10.75, "y": 3.5},
+                {"matrix": [7, 1], "x": 11.75, "y": 3.5},
+                {"matrix": [7, 2], "x": 12.75, "y": 3.5, "w": 2.25},
+
+                {"matrix": [4, 6], "x": 0, "y": 4.5, "w": 2.25},
+                {"matrix": [4, 8], "x": 2.25, "y": 4.5},
+                {"matrix": [4, 9], "x": 3.25, "y": 4.5},
+                {"matrix": [4, 10], "x": 4.25, "y": 4.5},
+                {"matrix": [4, 0], "x": 5.25, "y": 4.5},
+                {"matrix": [4, 1], "x": 6.25, "y": 4.5},
+                {"matrix": [4, 2], "x": 7.25, "y": 4.5},
+                {"matrix": [4, 3], "x": 8.25, "y": 4.5},
+                {"matrix": [4, 4], "x": 9.25, "y": 4.5},
+                {"matrix": [4, 5], "x": 10.25, "y": 4.5},
+                {"matrix": [7, 3], "x": 11.25, "y": 4.5},
+                {"matrix": [7, 5], "x": 12.25, "y": 4.5, "w": 2.75},
+
+                {"matrix": [7, 4], "x": 16.25, "y": 4.5},
+
+                {"matrix": [5, 6], "x": 0, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 8], "x": 2.5, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 9], "x": 4, "y": 5.5, "w": 7},
+                {"matrix": [5, 0], "x": 11, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 2], "x": 13.5, "y": 5.5, "w": 1.5},
+
+                {"matrix": [5, 3], "x": 15.25, "y": 5.5},
+                {"matrix": [5, 4], "x": 16.25, "y": 5.5},
+                {"matrix": [5, 5], "x": 17.25, "y": 5.5}
+            ]
+        },
+        "LAYOUT_tkl_iso": {
+            "layout": [
+                {"matrix": [0, 6], "x": 0, "y": 0},
+
+                {"matrix": [0, 7], "x": 2, "y": 0},
+                {"matrix": [0, 8], "x": 3, "y": 0},
+                {"matrix": [0, 9], "x": 4, "y": 0},
+                {"matrix": [0, 10], "x": 5, "y": 0},
+
+                {"matrix": [0, 0], "x": 6.5, "y": 0},
+                {"matrix": [0, 1], "x": 7.5, "y": 0},
+                {"matrix": [0, 2], "x": 8.5, "y": 0},
+                {"matrix": [0, 3], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 4], "x": 11, "y": 0},
+                {"matrix": [0, 5], "x": 12, "y": 0},
+                {"matrix": [6, 6], "x": 13, "y": 0},
+                {"matrix": [6, 7], "x": 14, "y": 0},
+
+                {"matrix": [6, 8], "x": 15.25, "y": 0},
+                {"matrix": [6, 9], "x": 16.25, "y": 0},
+                {"matrix": [6, 10], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 6], "x": 0, "y": 1.5},
+                {"matrix": [1, 7], "x": 1, "y": 1.5},
+                {"matrix": [1, 8], "x": 2, "y": 1.5},
+                {"matrix": [1, 9], "x": 3, "y": 1.5},
+                {"matrix": [1, 10], "x": 4, "y": 1.5},
+                {"matrix": [1, 0], "x": 5, "y": 1.5},
+                {"matrix": [1, 1], "x": 6, "y": 1.5},
+                {"matrix": [1, 2], "x": 7, "y": 1.5},
+                {"matrix": [1, 3], "x": 8, "y": 1.5},
+                {"matrix": [1, 4], "x": 9, "y": 1.5},
+                {"matrix": [1, 5], "x": 10, "y": 1.5},
+                {"matrix": [6, 0], "x": 11, "y": 1.5},
+                {"matrix": [6, 1], "x": 12, "y": 1.5},
+                {"matrix": [6, 2], "x": 13, "y": 1.5, "w": 2},
+
+                {"matrix": [6, 3], "x": 15.25, "y": 1.5},
+                {"matrix": [6, 4], "x": 16.25, "y": 1.5},
+                {"matrix": [6, 5], "x": 17.25, "y": 1.5},
+
+                {"matrix": [2, 6], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 7], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 8], "x": 2.5, "y": 2.5},
+                {"matrix": [2, 9], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 10], "x": 4.5, "y": 2.5},
+                {"matrix": [2, 0], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 1], "x": 6.5, "y": 2.5},
+                {"matrix": [2, 2], "x": 7.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 8.5, "y": 2.5},
+                {"matrix": [2, 4], "x": 9.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 10.5, "y": 2.5},
+                {"matrix": [7, 6], "x": 11.5, "y": 2.5},
+                {"matrix": [7, 7], "x": 12.5, "y": 2.5},
+
+                {"matrix": [7, 9], "x": 15.25, "y": 2.5},
+                {"matrix": [7, 10], "x": 16.25, "y": 2.5},
+                {"matrix": [7, 0], "x": 17.25, "y": 2.5},
+
+                {"matrix": [3, 6], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 7], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 8], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 9], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 10], "x": 4.75, "y": 3.5},
+                {"matrix": [3, 0], "x": 5.75, "y": 3.5},
+                {"matrix": [3, 1], "x": 6.75, "y": 3.5},
+                {"matrix": [3, 2], "x": 7.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 8.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 10.75, "y": 3.5},
+                {"matrix": [7, 1], "x": 11.75, "y": 3.5},
+                {"matrix": [7, 8], "x": 12.75, "y": 3.5},
+                {"matrix": [7, 2], "x": 13.75, "y": 2.5, "w": 1.25, "h": 2},
+
+                {"matrix": [4, 6], "x": 0, "y": 4.5, "w": 1.25},
+                {"matrix": [4, 7], "x": 1.25, "y": 4.5},
+                {"matrix": [4, 8], "x": 2.25, "y": 4.5},
+                {"matrix": [4, 9], "x": 3.25, "y": 4.5},
+                {"matrix": [4, 10], "x": 4.25, "y": 4.5},
+                {"matrix": [4, 0], "x": 5.25, "y": 4.5},
+                {"matrix": [4, 1], "x": 6.25, "y": 4.5},
+                {"matrix": [4, 2], "x": 7.25, "y": 4.5},
+                {"matrix": [4, 3], "x": 8.25, "y": 4.5},
+                {"matrix": [4, 4], "x": 9.25, "y": 4.5},
+                {"matrix": [4, 5], "x": 10.25, "y": 4.5},
+                {"matrix": [7, 3], "x": 11.25, "y": 4.5},
+                {"matrix": [7, 5], "x": 12.25, "y": 4.5, "w": 2.75},
+
+                {"matrix": [7, 4], "x": 16.25, "y": 4.5},
+
+                {"matrix": [5, 6], "x": 0, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 7], "x": 1.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 8], "x": 2.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 9], "x": 3.75, "y": 5.5, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 0], "x": 11.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 1], "x": 12.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 2], "x": 13.75, "y": 5.5, "w": 1.25},
+
+                {"matrix": [5, 3], "x": 15.25, "y": 5.5},
+                {"matrix": [5, 4], "x": 16.25, "y": 5.5},
+                {"matrix": [5, 5], "x": 17.25, "y": 5.5}
+            ]
+        },
+        "LAYOUT_tkl_iso_wkl": {
+            "layout": [
+                {"matrix": [0, 6], "x": 0, "y": 0},
+
+                {"matrix": [0, 7], "x": 2, "y": 0},
+                {"matrix": [0, 8], "x": 3, "y": 0},
+                {"matrix": [0, 9], "x": 4, "y": 0},
+                {"matrix": [0, 10], "x": 5, "y": 0},
+
+                {"matrix": [0, 0], "x": 6.5, "y": 0},
+                {"matrix": [0, 1], "x": 7.5, "y": 0},
+                {"matrix": [0, 2], "x": 8.5, "y": 0},
+                {"matrix": [0, 3], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 4], "x": 11, "y": 0},
+                {"matrix": [0, 5], "x": 12, "y": 0},
+                {"matrix": [6, 6], "x": 13, "y": 0},
+                {"matrix": [6, 7], "x": 14, "y": 0},
+
+                {"matrix": [6, 8], "x": 15.25, "y": 0},
+                {"matrix": [6, 9], "x": 16.25, "y": 0},
+                {"matrix": [6, 10], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 6], "x": 0, "y": 1.5},
+                {"matrix": [1, 7], "x": 1, "y": 1.5},
+                {"matrix": [1, 8], "x": 2, "y": 1.5},
+                {"matrix": [1, 9], "x": 3, "y": 1.5},
+                {"matrix": [1, 10], "x": 4, "y": 1.5},
+                {"matrix": [1, 0], "x": 5, "y": 1.5},
+                {"matrix": [1, 1], "x": 6, "y": 1.5},
+                {"matrix": [1, 2], "x": 7, "y": 1.5},
+                {"matrix": [1, 3], "x": 8, "y": 1.5},
+                {"matrix": [1, 4], "x": 9, "y": 1.5},
+                {"matrix": [1, 5], "x": 10, "y": 1.5},
+                {"matrix": [6, 0], "x": 11, "y": 1.5},
+                {"matrix": [6, 1], "x": 12, "y": 1.5},
+                {"matrix": [6, 2], "x": 13, "y": 1.5, "w": 2},
+
+                {"matrix": [6, 3], "x": 15.25, "y": 1.5},
+                {"matrix": [6, 4], "x": 16.25, "y": 1.5},
+                {"matrix": [6, 5], "x": 17.25, "y": 1.5},
+
+                {"matrix": [2, 6], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 7], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 8], "x": 2.5, "y": 2.5},
+                {"matrix": [2, 9], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 10], "x": 4.5, "y": 2.5},
+                {"matrix": [2, 0], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 1], "x": 6.5, "y": 2.5},
+                {"matrix": [2, 2], "x": 7.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 8.5, "y": 2.5},
+                {"matrix": [2, 4], "x": 9.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 10.5, "y": 2.5},
+                {"matrix": [7, 6], "x": 11.5, "y": 2.5},
+                {"matrix": [7, 7], "x": 12.5, "y": 2.5},
+
+                {"matrix": [7, 9], "x": 15.25, "y": 2.5},
+                {"matrix": [7, 10], "x": 16.25, "y": 2.5},
+                {"matrix": [7, 0], "x": 17.25, "y": 2.5},
+
+                {"matrix": [3, 6], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 7], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 8], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 9], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 10], "x": 4.75, "y": 3.5},
+                {"matrix": [3, 0], "x": 5.75, "y": 3.5},
+                {"matrix": [3, 1], "x": 6.75, "y": 3.5},
+                {"matrix": [3, 2], "x": 7.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 8.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 10.75, "y": 3.5},
+                {"matrix": [7, 1], "x": 11.75, "y": 3.5},
+                {"matrix": [7, 8], "x": 12.75, "y": 3.5},
+                {"matrix": [7, 2], "x": 13.75, "y": 2.5, "w": 1.25, "h": 2},
+
+                {"matrix": [4, 6], "x": 0, "y": 4.5, "w": 1.25},
+                {"matrix": [4, 7], "x": 1.25, "y": 4.5},
+                {"matrix": [4, 8], "x": 2.25, "y": 4.5},
+                {"matrix": [4, 9], "x": 3.25, "y": 4.5},
+                {"matrix": [4, 10], "x": 4.25, "y": 4.5},
+                {"matrix": [4, 0], "x": 5.25, "y": 4.5},
+                {"matrix": [4, 1], "x": 6.25, "y": 4.5},
+                {"matrix": [4, 2], "x": 7.25, "y": 4.5},
+                {"matrix": [4, 3], "x": 8.25, "y": 4.5},
+                {"matrix": [4, 4], "x": 9.25, "y": 4.5},
+                {"matrix": [4, 5], "x": 10.25, "y": 4.5},
+                {"matrix": [7, 3], "x": 11.25, "y": 4.5},
+                {"matrix": [7, 5], "x": 12.25, "y": 4.5, "w": 2.75},
+
+                {"matrix": [7, 4], "x": 16.25, "y": 4.5},
+
+                {"matrix": [5, 6], "x": 0, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 8], "x": 2.5, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 9], "x": 4, "y": 5.5, "w": 7},
+                {"matrix": [5, 0], "x": 11, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 2], "x": 13.5, "y": 5.5, "w": 1.5},
+
+                {"matrix": [5, 3], "x": 15.25, "y": 5.5},
+                {"matrix": [5, 4], "x": 16.25, "y": 5.5},
+                {"matrix": [5, 5], "x": 17.25, "y": 5.5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/moon/rules.mk b/keyboards/moon/rules.mk
index 676f0971a2e..aee52dfee13 100644
--- a/keyboards/moon/rules.mk
+++ b/keyboards/moon/rules.mk
@@ -1,16 +1,3 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = yes        # Console for debug
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
 # custom matrix setup
 CUSTOM_MATRIX = yes
 
diff --git a/keyboards/ms_sculpt/keyboard.json b/keyboards/ms_sculpt/keyboard.json
index 3536d4501f1..5353a0df7e7 100644
--- a/keyboards/ms_sculpt/keyboard.json
+++ b/keyboards/ms_sculpt/keyboard.json
@@ -2,7 +2,7 @@
     "manufacturer": "Jean Bernard",
     "keyboard_name": "ms_sculpt",
     "maintainer": "jn-bernard",
-    "bootloader": "stm32-dfu",
+    "development_board": "blackpill_f401",
     "diode_direction": "COL2ROW",
     "features": {
         "bootmagic": true,
@@ -22,7 +22,6 @@
         "io_delay": 5
     },
     "debounce": 3,
-    "processor": "STM32F401",
     "url": "",
     "usb": {
         "polling_interval": 1,
diff --git a/keyboards/mt/ncr80/hotswap/info.json b/keyboards/mt/ncr80/hotswap/info.json
deleted file mode 100644
index b79a30709f3..00000000000
--- a/keyboards/mt/ncr80/hotswap/info.json
+++ /dev/null
@@ -1,144 +0,0 @@
-{
-    "keyboard_name": "NCR-80 Hotswap",
-    "manufacturer": "NCR",
-    "url": "https://www.aliexpress.com/item/1005003345941543.html",
-    "maintainer": "qmk",
-    "usb": {
-        "vid": "0x4D54",
-        "pid": "0x2002",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4"],
-        "rows": ["E6", "B0", "B1", "B2", "B3", "B7", "F7", "F6", "F5", "F4", "F1"]
-    },
-    "diode_direction": "ROW2COL",
-    "indicators": {
-        "caps_lock": "C6",
-        "num_lock": "B5",
-        "scroll_lock": "C7",
-        "on_state": 0
-    },
-    "ws2812": {
-        "pin": "E2"
-    },
-    "rgblight": {
-        "saturation_steps": 8,
-        "brightness_steps": 8,
-        "led_count": 81,
-        "max_brightness": 180,
-        "animations": {
-            "breathing": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "snake": true,
-            "knight": true,
-            "christmas": true,
-            "static_gradient": true,
-            "rgb_test": true,
-            "alternating": true,
-            "twinkle": true
-        }
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "layouts": {
-          "LAYOUT": {
-            "layout": [
-                {"x": 0, "y": 0, "matrix": [0, 0]},
-
-                {"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": [6, 8]},
-
-                {"x": 11, "y": 0, "matrix": [6, 7]},
-                {"x": 12, "y": 0, "matrix": [6, 5]},
-                {"x": 13, "y": 0, "matrix": [6, 4]},
-                {"x": 14, "y": 0, "matrix": [6, 3]},
-
-                {"x": 0, "y": 1.5, "matrix": [1, 0]},
-                {"x": 1, "y": 1.5, "matrix": [1, 1]},
-                {"x": 2, "y": 1.5, "matrix": [1, 2]},
-                {"x": 3, "y": 1.5, "matrix": [1, 3]},
-                {"x": 4, "y": 1.5, "matrix": [1, 4]},
-                {"x": 5, "y": 1.5, "matrix": [1, 5]},
-                {"x": 6, "y": 1.5, "matrix": [1, 6]},
-                {"x": 7, "y": 1.5, "matrix": [1, 7]},
-                {"x": 8, "y": 1.5, "matrix": [1, 8]},
-                {"x": 9, "y": 1.5, "matrix": [7, 8]},
-                {"x": 10, "y": 1.5, "matrix": [7, 0]},
-                {"x": 11, "y": 1.5, "matrix": [7, 7]},
-                {"x": 12, "y": 1.5, "matrix": [7, 5]},
-                {"x": 13, "y": 1.5, "w": 2, "matrix": [7, 3]},
-
-                {"x": 15.25, "y": 1.5, "matrix": [7, 6]},
-                {"x": 16.25, "y": 1.5, "matrix": [7, 2]},
-                {"x": 17.25, "y": 1.5, "matrix": [7, 1]},
-
-                {"x": 0, "y": 2.5, "w": 1.5, "matrix": [2, 0]},
-                {"x": 1.5, "y": 2.5, "matrix": [2, 1]},
-                {"x": 2.5, "y": 2.5, "matrix": [2, 2]},
-                {"x": 3.5, "y": 2.5, "matrix": [2, 3]},
-                {"x": 4.5, "y": 2.5, "matrix": [2, 4]},
-                {"x": 5.5, "y": 2.5, "matrix": [2, 5]},
-                {"x": 6.5, "y": 2.5, "matrix": [2, 6]},
-                {"x": 7.5, "y": 2.5, "matrix": [2, 7]},
-                {"x": 8.5, "y": 2.5, "matrix": [2, 8]},
-                {"x": 9.5, "y": 2.5, "matrix": [8, 8]},
-                {"x": 10.5, "y": 2.5, "matrix": [8, 7]},
-                {"x": 11.5, "y": 2.5, "matrix": [8, 5]},
-                {"x": 12.5, "y": 2.5, "matrix": [8, 4]},
-                {"x": 13.5, "y": 2.5, "w": 1.5, "matrix": [8, 3]},
-
-                {"x": 15.25, "y": 2.5, "matrix": [8, 6]},
-                {"x": 16.25, "y": 2.5, "matrix": [8, 2]},
-                {"x": 17.25, "y": 2.5, "matrix": [8, 1]},
-
-                {"x": 0, "y": 3.5, "w": 1.75, "matrix": [3, 0]},
-                {"x": 1.75, "y": 3.5, "matrix": [3, 1]},
-                {"x": 2.75, "y": 3.5, "matrix": [3, 2]},
-                {"x": 3.75, "y": 3.5, "matrix": [3, 3]},
-                {"x": 4.75, "y": 3.5, "matrix": [3, 4]},
-                {"x": 5.75, "y": 3.5, "matrix": [3, 5]},
-                {"x": 6.75, "y": 3.5, "matrix": [3, 6]},
-                {"x": 7.75, "y": 3.5, "matrix": [3, 7]},
-                {"x": 8.75, "y": 3.5, "matrix": [3, 8]},
-                {"x": 9.75, "y": 3.5, "matrix": [9, 8]},
-                {"x": 10.75, "y": 3.5, "matrix": [9, 7]},
-                {"x": 11.75, "y": 3.5, "matrix": [9, 5]},
-                {"x": 12.75, "y": 3.5, "w": 2.25, "matrix": [9, 3]},
-
-                {"x": 0, "y": 4.5, "w": 2.25, "matrix": [4, 0]},
-                {"x": 2.25, "y": 4.5, "matrix": [4, 2]},
-                {"x": 3.25, "y": 4.5, "matrix": [4, 3]},
-                {"x": 4.25, "y": 4.5, "matrix": [4, 4]},
-                {"x": 5.25, "y": 4.5, "matrix": [4, 5]},
-                {"x": 6.25, "y": 4.5, "matrix": [4, 6]},
-                {"x": 7.25, "y": 4.5, "matrix": [4, 7]},
-                {"x": 8.25, "y": 4.5, "matrix": [4, 8]},
-                {"x": 9.25, "y": 4.5, "matrix": [10, 8]},
-                {"x": 10.25, "y": 4.5, "matrix": [10, 7]},
-                {"x": 11.25, "y": 4.5, "matrix": [10, 5]},
-                {"x": 12.25, "y": 4.5, "w": 2.75, "matrix": [10, 4]},
-
-                {"x": 16.25, "y": 4.5, "matrix": [9, 2]},
-
-                {"x": 0, "y": 5.5, "w": 1.5, "matrix": [5, 0]},
-                {"x": 2.5, "y": 5.5, "w": 1.5, "matrix": [5, 2]},
-                {"x": 4, "y": 5.5, "w": 7, "matrix": [5, 6]},
-                {"x": 11, "y": 5.5, "w": 1.5, "matrix": [5, 7]},
-                {"x": 13.5, "y": 5.5, "w": 1.5, "matrix": [5, 3]},
-
-                {"x": 15.25, "y": 5.5, "matrix": [10, 6]},
-                {"x": 16.25, "y": 5.5, "matrix": [10, 2]},
-                {"x": 17.25, "y": 5.5, "matrix": [10, 1]}
-            ]
-        }
-    }
-}
diff --git a/keyboards/mt/ncr80/hotswap/keyboard.json b/keyboards/mt/ncr80/hotswap/keyboard.json
new file mode 100644
index 00000000000..6f82bb0e786
--- /dev/null
+++ b/keyboards/mt/ncr80/hotswap/keyboard.json
@@ -0,0 +1,150 @@
+{
+    "keyboard_name": "NCR-80 Hotswap",
+    "manufacturer": "NCR",
+    "url": "https://www.aliexpress.com/item/1005003345941543.html",
+    "maintainer": "qmk",
+    "usb": {
+        "vid": "0x4D54",
+        "pid": "0x2002",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "mousekey": false,
+        "extrakey": true,
+        "nkro": true
+    },
+    "matrix_pins": {
+        "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4"],
+        "rows": ["E6", "B0", "B1", "B2", "B3", "B7", "F7", "F6", "F5", "F4", "F1"]
+    },
+    "diode_direction": "ROW2COL",
+    "indicators": {
+        "caps_lock": "C6",
+        "num_lock": "B5",
+        "scroll_lock": "C7",
+        "on_state": 0
+    },
+    "ws2812": {
+        "pin": "E2"
+    },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 81,
+        "max_brightness": 180,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": true,
+            "twinkle": true
+        }
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "layouts": {
+          "LAYOUT": {
+            "layout": [
+                {"x": 0, "y": 0, "matrix": [0, 0]},
+
+                {"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": [6, 8]},
+
+                {"x": 11, "y": 0, "matrix": [6, 7]},
+                {"x": 12, "y": 0, "matrix": [6, 5]},
+                {"x": 13, "y": 0, "matrix": [6, 4]},
+                {"x": 14, "y": 0, "matrix": [6, 3]},
+
+                {"x": 0, "y": 1.5, "matrix": [1, 0]},
+                {"x": 1, "y": 1.5, "matrix": [1, 1]},
+                {"x": 2, "y": 1.5, "matrix": [1, 2]},
+                {"x": 3, "y": 1.5, "matrix": [1, 3]},
+                {"x": 4, "y": 1.5, "matrix": [1, 4]},
+                {"x": 5, "y": 1.5, "matrix": [1, 5]},
+                {"x": 6, "y": 1.5, "matrix": [1, 6]},
+                {"x": 7, "y": 1.5, "matrix": [1, 7]},
+                {"x": 8, "y": 1.5, "matrix": [1, 8]},
+                {"x": 9, "y": 1.5, "matrix": [7, 8]},
+                {"x": 10, "y": 1.5, "matrix": [7, 0]},
+                {"x": 11, "y": 1.5, "matrix": [7, 7]},
+                {"x": 12, "y": 1.5, "matrix": [7, 5]},
+                {"x": 13, "y": 1.5, "w": 2, "matrix": [7, 3]},
+
+                {"x": 15.25, "y": 1.5, "matrix": [7, 6]},
+                {"x": 16.25, "y": 1.5, "matrix": [7, 2]},
+                {"x": 17.25, "y": 1.5, "matrix": [7, 1]},
+
+                {"x": 0, "y": 2.5, "w": 1.5, "matrix": [2, 0]},
+                {"x": 1.5, "y": 2.5, "matrix": [2, 1]},
+                {"x": 2.5, "y": 2.5, "matrix": [2, 2]},
+                {"x": 3.5, "y": 2.5, "matrix": [2, 3]},
+                {"x": 4.5, "y": 2.5, "matrix": [2, 4]},
+                {"x": 5.5, "y": 2.5, "matrix": [2, 5]},
+                {"x": 6.5, "y": 2.5, "matrix": [2, 6]},
+                {"x": 7.5, "y": 2.5, "matrix": [2, 7]},
+                {"x": 8.5, "y": 2.5, "matrix": [2, 8]},
+                {"x": 9.5, "y": 2.5, "matrix": [8, 8]},
+                {"x": 10.5, "y": 2.5, "matrix": [8, 7]},
+                {"x": 11.5, "y": 2.5, "matrix": [8, 5]},
+                {"x": 12.5, "y": 2.5, "matrix": [8, 4]},
+                {"x": 13.5, "y": 2.5, "w": 1.5, "matrix": [8, 3]},
+
+                {"x": 15.25, "y": 2.5, "matrix": [8, 6]},
+                {"x": 16.25, "y": 2.5, "matrix": [8, 2]},
+                {"x": 17.25, "y": 2.5, "matrix": [8, 1]},
+
+                {"x": 0, "y": 3.5, "w": 1.75, "matrix": [3, 0]},
+                {"x": 1.75, "y": 3.5, "matrix": [3, 1]},
+                {"x": 2.75, "y": 3.5, "matrix": [3, 2]},
+                {"x": 3.75, "y": 3.5, "matrix": [3, 3]},
+                {"x": 4.75, "y": 3.5, "matrix": [3, 4]},
+                {"x": 5.75, "y": 3.5, "matrix": [3, 5]},
+                {"x": 6.75, "y": 3.5, "matrix": [3, 6]},
+                {"x": 7.75, "y": 3.5, "matrix": [3, 7]},
+                {"x": 8.75, "y": 3.5, "matrix": [3, 8]},
+                {"x": 9.75, "y": 3.5, "matrix": [9, 8]},
+                {"x": 10.75, "y": 3.5, "matrix": [9, 7]},
+                {"x": 11.75, "y": 3.5, "matrix": [9, 5]},
+                {"x": 12.75, "y": 3.5, "w": 2.25, "matrix": [9, 3]},
+
+                {"x": 0, "y": 4.5, "w": 2.25, "matrix": [4, 0]},
+                {"x": 2.25, "y": 4.5, "matrix": [4, 2]},
+                {"x": 3.25, "y": 4.5, "matrix": [4, 3]},
+                {"x": 4.25, "y": 4.5, "matrix": [4, 4]},
+                {"x": 5.25, "y": 4.5, "matrix": [4, 5]},
+                {"x": 6.25, "y": 4.5, "matrix": [4, 6]},
+                {"x": 7.25, "y": 4.5, "matrix": [4, 7]},
+                {"x": 8.25, "y": 4.5, "matrix": [4, 8]},
+                {"x": 9.25, "y": 4.5, "matrix": [10, 8]},
+                {"x": 10.25, "y": 4.5, "matrix": [10, 7]},
+                {"x": 11.25, "y": 4.5, "matrix": [10, 5]},
+                {"x": 12.25, "y": 4.5, "w": 2.75, "matrix": [10, 4]},
+
+                {"x": 16.25, "y": 4.5, "matrix": [9, 2]},
+
+                {"x": 0, "y": 5.5, "w": 1.5, "matrix": [5, 0]},
+                {"x": 2.5, "y": 5.5, "w": 1.5, "matrix": [5, 2]},
+                {"x": 4, "y": 5.5, "w": 7, "matrix": [5, 6]},
+                {"x": 11, "y": 5.5, "w": 1.5, "matrix": [5, 7]},
+                {"x": 13.5, "y": 5.5, "w": 1.5, "matrix": [5, 3]},
+
+                {"x": 15.25, "y": 5.5, "matrix": [10, 6]},
+                {"x": 16.25, "y": 5.5, "matrix": [10, 2]},
+                {"x": 17.25, "y": 5.5, "matrix": [10, 1]}
+            ]
+        }
+    }
+}
diff --git a/keyboards/mt/ncr80/hotswap/rules.mk b/keyboards/mt/ncr80/hotswap/rules.mk
deleted file mode 100644
index e82e95f7843..00000000000
--- a/keyboards/mt/ncr80/hotswap/rules.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes     # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no       # Mouse keys
-EXTRAKEY_ENABLE = yes      # Audio control and System control
-CONSOLE_ENABLE = no        # Console for debug
-COMMAND_ENABLE = no        # Commands for debug and configuration
-NKRO_ENABLE = yes          # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no      # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no       # Enable keyboard RGB underglow
-AUDIO_ENABLE = no          # Audio output
diff --git a/keyboards/mt/ncr80/solder/info.json b/keyboards/mt/ncr80/solder/info.json
deleted file mode 100644
index ead9ed409d1..00000000000
--- a/keyboards/mt/ncr80/solder/info.json
+++ /dev/null
@@ -1,345 +0,0 @@
-{
-    "keyboard_name": "NCR-80",
-    "manufacturer": "NCR",
-    "url": "https://www.aliexpress.com/item/1005003364462523.html",
-    "maintainer": "qmk",
-    "usb": {
-        "vid": "0x4D54",
-        "pid": "0x2001",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4"],
-        "rows": ["E6", "B0", "B1", "B2", "B3", "B7", "F7", "F6", "F5", "F4", "F1"]
-    },
-    "diode_direction": "ROW2COL",
-    "backlight": {
-        "pin": "B6",
-        "levels": 5
-    },
-    "indicators": {
-        "caps_lock": "C6",
-        "num_lock": "B5",
-        "scroll_lock": "C7",
-        "on_state": 0
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "layouts": {
-        "LAYOUT_all": {
-            "layout": [
-                {"x": 0, "y": 0, "matrix": [0, 0]},
-
-                {"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": [6, 8]},
-
-                {"x": 11, "y": 0, "matrix": [6, 7]},
-                {"x": 12, "y": 0, "matrix": [6, 5]},
-                {"x": 13, "y": 0, "matrix": [6, 4]},
-                {"x": 14, "y": 0, "matrix": [6, 3]},
-
-                {"x": 15.25, "y": 0, "matrix": [6, 6]},
-                {"x": 16.25, "y": 0, "matrix": [6, 2]},
-                {"x": 17.25, "y": 0, "matrix": [6, 1]},
-
-                {"x": 0, "y": 1.5, "matrix": [1, 0]},
-                {"x": 1, "y": 1.5, "matrix": [1, 1]},
-                {"x": 2, "y": 1.5, "matrix": [1, 2]},
-                {"x": 3, "y": 1.5, "matrix": [1, 3]},
-                {"x": 4, "y": 1.5, "matrix": [1, 4]},
-                {"x": 5, "y": 1.5, "matrix": [1, 5]},
-                {"x": 6, "y": 1.5, "matrix": [1, 6]},
-                {"x": 7, "y": 1.5, "matrix": [1, 7]},
-                {"x": 8, "y": 1.5, "matrix": [1, 8]},
-                {"x": 9, "y": 1.5, "matrix": [7, 8]},
-                {"x": 10, "y": 1.5, "matrix": [7, 0]},
-                {"x": 11, "y": 1.5, "matrix": [7, 7]},
-                {"x": 12, "y": 1.5, "matrix": [7, 5]},
-                {"x": 13, "y": 1.5, "matrix": [7, 4]},
-                {"x": 14, "y": 1.5, "matrix": [7, 3]},
-
-                {"x": 15.25, "y": 1.5, "matrix": [7, 6]},
-                {"x": 16.25, "y": 1.5, "matrix": [7, 2]},
-                {"x": 17.25, "y": 1.5, "matrix": [7, 1]},
-
-                {"x": 0, "y": 2.5, "w": 1.5, "matrix": [2, 0]},
-                {"x": 1.5, "y": 2.5, "matrix": [2, 1]},
-                {"x": 2.5, "y": 2.5, "matrix": [2, 2]},
-                {"x": 3.5, "y": 2.5, "matrix": [2, 3]},
-                {"x": 4.5, "y": 2.5, "matrix": [2, 4]},
-                {"x": 5.5, "y": 2.5, "matrix": [2, 5]},
-                {"x": 6.5, "y": 2.5, "matrix": [2, 6]},
-                {"x": 7.5, "y": 2.5, "matrix": [2, 7]},
-                {"x": 8.5, "y": 2.5, "matrix": [2, 8]},
-                {"x": 9.5, "y": 2.5, "matrix": [8, 8]},
-                {"x": 10.5, "y": 2.5, "matrix": [8, 7]},
-                {"x": 11.5, "y": 2.5, "matrix": [8, 5]},
-                {"x": 12.5, "y": 2.5, "matrix": [8, 4]},
-                {"x": 13.5, "y": 2.5, "w": 1.5, "matrix": [9, 4]},
-
-                {"x": 15.25, "y": 2.5, "matrix": [8, 6]},
-                {"x": 16.25, "y": 2.5, "matrix": [8, 2]},
-                {"x": 17.25, "y": 2.5, "matrix": [8, 1]},
-
-                {"x": 0, "y": 3.5, "w": 1.75, "matrix": [3, 0]},
-                {"x": 1.75, "y": 3.5, "matrix": [3, 1]},
-                {"x": 2.75, "y": 3.5, "matrix": [3, 2]},
-                {"x": 3.75, "y": 3.5, "matrix": [3, 3]},
-                {"x": 4.75, "y": 3.5, "matrix": [3, 4]},
-                {"x": 5.75, "y": 3.5, "matrix": [3, 5]},
-                {"x": 6.75, "y": 3.5, "matrix": [3, 6]},
-                {"x": 7.75, "y": 3.5, "matrix": [3, 7]},
-                {"x": 8.75, "y": 3.5, "matrix": [3, 8]},
-                {"x": 9.75, "y": 3.5, "matrix": [9, 8]},
-                {"x": 10.75, "y": 3.5, "matrix": [9, 7]},
-                {"x": 11.75, "y": 3.5, "matrix": [9, 5]},
-                {"x": 12.75, "y": 3.5, "w": 2.25, "matrix": [8, 3]},
-
-                {"x": 0, "y": 4.5, "w": 1.25, "matrix": [4, 0]},
-                {"x": 1.25, "y": 4.5, "matrix": [4, 1]},
-                {"x": 2.25, "y": 4.5, "matrix": [4, 2]},
-                {"x": 3.25, "y": 4.5, "matrix": [4, 3]},
-                {"x": 4.25, "y": 4.5, "matrix": [4, 4]},
-                {"x": 5.25, "y": 4.5, "matrix": [4, 5]},
-                {"x": 6.25, "y": 4.5, "matrix": [4, 6]},
-                {"x": 7.25, "y": 4.5, "matrix": [4, 7]},
-                {"x": 8.25, "y": 4.5, "matrix": [4, 8]},
-                {"x": 9.25, "y": 4.5, "matrix": [10, 8]},
-                {"x": 10.25, "y": 4.5, "matrix": [10, 7]},
-                {"x": 11.25, "y": 4.5, "matrix": [10, 5]},
-                {"x": 12.25, "y": 4.5, "w": 1.75, "matrix": [10, 4]},
-                {"x": 14, "y": 4.5, "matrix": [10, 3]},
-
-                {"x": 16.25, "y": 4.5, "matrix": [9, 2]},
-
-                {"x": 0, "y": 5.5, "w": 1.25, "matrix": [5, 0]},
-                {"x": 1.25, "y": 5.5, "w": 1.25, "matrix": [5, 1]},
-                {"x": 2.5, "y": 5.5, "w": 1.25, "matrix": [5, 2]},
-                {"x": 3.75, "y": 5.5, "w": 6.25, "matrix": [5, 6]},
-                {"x": 10, "y": 5.5, "w": 1.25, "matrix": [5, 8]},
-                {"x": 11.25, "y": 5.5, "w": 1.25, "matrix": [5, 7]},
-                {"x": 12.5, "y": 5.5, "w": 1.25, "matrix": [5, 4]},
-                {"x": 13.75, "y": 5.5, "w": 1.25, "matrix": [5, 3]},
-
-                {"x": 15.25, "y": 5.5, "matrix": [10, 6]},
-                {"x": 16.25, "y": 5.5, "matrix": [10, 2]},
-                {"x": 17.25, "y": 5.5, "matrix": [10, 1]}
-            ]
-        },
-        "LAYOUT_tkl_ansi": {
-            "layout": [
-                {"x": 0, "y": 0, "matrix": [0, 0]},
-
-                {"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": [6, 8]},
-
-                {"x": 11, "y": 0, "matrix": [6, 7]},
-                {"x": 12, "y": 0, "matrix": [6, 5]},
-                {"x": 13, "y": 0, "matrix": [6, 4]},
-                {"x": 14, "y": 0, "matrix": [6, 3]},
-
-                {"x": 15.25, "y": 0, "matrix": [6, 6]},
-                {"x": 16.25, "y": 0, "matrix": [6, 2]},
-                {"x": 17.25, "y": 0, "matrix": [6, 1]},
-
-                {"x": 0, "y": 1.25, "matrix": [1, 0]},
-                {"x": 1, "y": 1.25, "matrix": [1, 1]},
-                {"x": 2, "y": 1.25, "matrix": [1, 2]},
-                {"x": 3, "y": 1.25, "matrix": [1, 3]},
-                {"x": 4, "y": 1.25, "matrix": [1, 4]},
-                {"x": 5, "y": 1.25, "matrix": [1, 5]},
-                {"x": 6, "y": 1.25, "matrix": [1, 6]},
-                {"x": 7, "y": 1.25, "matrix": [1, 7]},
-                {"x": 8, "y": 1.25, "matrix": [1, 8]},
-                {"x": 9, "y": 1.25, "matrix": [7, 8]},
-                {"x": 10, "y": 1.25, "matrix": [7, 0]},
-                {"x": 11, "y": 1.25, "matrix": [7, 7]},
-                {"x": 12, "y": 1.25, "matrix": [7, 5]},
-                {"x": 13, "y": 1.25, "w": 2, "matrix": [7, 3]},
-
-                {"x": 15.25, "y": 1.25, "matrix": [7, 6]},
-                {"x": 16.25, "y": 1.25, "matrix": [7, 2]},
-                {"x": 17.25, "y": 1.25, "matrix": [7, 1]},
-
-                {"x": 0, "y": 2.25, "w": 1.5, "matrix": [2, 0]},
-                {"x": 1.5, "y": 2.25, "matrix": [2, 1]},
-                {"x": 2.5, "y": 2.25, "matrix": [2, 2]},
-                {"x": 3.5, "y": 2.25, "matrix": [2, 3]},
-                {"x": 4.5, "y": 2.25, "matrix": [2, 4]},
-                {"x": 5.5, "y": 2.25, "matrix": [2, 5]},
-                {"x": 6.5, "y": 2.25, "matrix": [2, 6]},
-                {"x": 7.5, "y": 2.25, "matrix": [2, 7]},
-                {"x": 8.5, "y": 2.25, "matrix": [2, 8]},
-                {"x": 9.5, "y": 2.25, "matrix": [8, 8]},
-                {"x": 10.5, "y": 2.25, "matrix": [8, 7]},
-                {"x": 11.5, "y": 2.25, "matrix": [8, 5]},
-                {"x": 12.5, "y": 2.25, "matrix": [8, 4]},
-                {"x": 13.5, "y": 2.25, "w": 1.5, "matrix": [9, 4]},
-
-                {"x": 15.25, "y": 2.25, "matrix": [8, 6]},
-                {"x": 16.25, "y": 2.25, "matrix": [8, 2]},
-                {"x": 17.25, "y": 2.25, "matrix": [8, 1]},
-
-                {"x": 0, "y": 3.25, "w": 1.75, "matrix": [3, 0]},
-                {"x": 1.75, "y": 3.25, "matrix": [3, 1]},
-                {"x": 2.75, "y": 3.25, "matrix": [3, 2]},
-                {"x": 3.75, "y": 3.25, "matrix": [3, 3]},
-                {"x": 4.75, "y": 3.25, "matrix": [3, 4]},
-                {"x": 5.75, "y": 3.25, "matrix": [3, 5]},
-                {"x": 6.75, "y": 3.25, "matrix": [3, 6]},
-                {"x": 7.75, "y": 3.25, "matrix": [3, 7]},
-                {"x": 8.75, "y": 3.25, "matrix": [3, 8]},
-                {"x": 9.75, "y": 3.25, "matrix": [9, 8]},
-                {"x": 10.75, "y": 3.25, "matrix": [9, 7]},
-                {"x": 11.75, "y": 3.25, "matrix": [9, 5]},
-                {"x": 12.75, "y": 3.25, "w": 2.25, "matrix": [8, 3]},
-
-                {"x": 0, "y": 4.25, "w": 2.25, "matrix": [4, 0]},
-                {"x": 2.25, "y": 4.25, "matrix": [4, 2]},
-                {"x": 3.25, "y": 4.25, "matrix": [4, 3]},
-                {"x": 4.25, "y": 4.25, "matrix": [4, 4]},
-                {"x": 5.25, "y": 4.25, "matrix": [4, 5]},
-                {"x": 6.25, "y": 4.25, "matrix": [4, 6]},
-                {"x": 7.25, "y": 4.25, "matrix": [4, 7]},
-                {"x": 8.25, "y": 4.25, "matrix": [4, 8]},
-                {"x": 9.25, "y": 4.25, "matrix": [10, 8]},
-                {"x": 10.25, "y": 4.25, "matrix": [10, 7]},
-                {"x": 11.25, "y": 4.25, "matrix": [10, 5]},
-                {"x": 12.25, "y": 4.25, "w": 2.75, "matrix": [10, 4]},
-
-                {"x": 16.25, "y": 4.25, "matrix": [9, 2]},
-
-                {"x": 0, "y": 5.25, "w": 1.25, "matrix": [5, 0]},
-                {"x": 1.25, "y": 5.25, "w": 1.25, "matrix": [5, 1]},
-                {"x": 2.5, "y": 5.25, "w": 1.25, "matrix": [5, 2]},
-                {"x": 3.75, "y": 5.25, "w": 6.25, "matrix": [5, 6]},
-                {"x": 10, "y": 5.25, "w": 1.25, "matrix": [5, 8]},
-                {"x": 11.25, "y": 5.25, "w": 1.25, "matrix": [5, 7]},
-                {"x": 12.5, "y": 5.25, "w": 1.25, "matrix": [5, 4]},
-                {"x": 13.75, "y": 5.25, "w": 1.25, "matrix": [5, 3]},
-                {"x": 15.25, "y": 5.25, "matrix": [10, 6]},
-                {"x": 16.25, "y": 5.25, "matrix": [10, 2]},
-                {"x": 17.25, "y": 5.25, "matrix": [10, 1]}
-            ]
-        },
-        "LAYOUT_tkl_iso": {
-            "layout": [
-                {"x": 0, "y": 0, "matrix": [0, 0]},
-
-                {"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": [6, 8]},
-
-                {"x": 11, "y": 0, "matrix": [6, 7]},
-                {"x": 12, "y": 0, "matrix": [6, 5]},
-                {"x": 13, "y": 0, "matrix": [6, 4]},
-                {"x": 14, "y": 0, "matrix": [6, 3]},
-
-                {"x": 15.25, "y": 0, "matrix": [6, 6]},
-                {"x": 16.25, "y": 0, "matrix": [6, 2]},
-                {"x": 17.25, "y": 0, "matrix": [6, 1]},
-
-                {"x": 0, "y": 1.25, "matrix": [1, 0]},
-                {"x": 1, "y": 1.25, "matrix": [1, 1]},
-                {"x": 2, "y": 1.25, "matrix": [1, 2]},
-                {"x": 3, "y": 1.25, "matrix": [1, 3]},
-                {"x": 4, "y": 1.25, "matrix": [1, 4]},
-                {"x": 5, "y": 1.25, "matrix": [1, 5]},
-                {"x": 6, "y": 1.25, "matrix": [1, 6]},
-                {"x": 7, "y": 1.25, "matrix": [1, 7]},
-                {"x": 8, "y": 1.25, "matrix": [1, 8]},
-                {"x": 9, "y": 1.25, "matrix": [7, 8]},
-                {"x": 10, "y": 1.25, "matrix": [7, 0]},
-                {"x": 11, "y": 1.25, "matrix": [7, 7]},
-                {"x": 12, "y": 1.25, "matrix": [7, 5]},
-                {"x": 13, "y": 1.25, "w": 2, "matrix": [7, 3]},
-
-                {"x": 15.25, "y": 1.25, "matrix": [7, 6]},
-                {"x": 16.25, "y": 1.25, "matrix": [7, 2]},
-                {"x": 17.25, "y": 1.25, "matrix": [7, 1]},
-
-                {"x": 0, "y": 2.25, "w": 1.5, "matrix": [2, 0]},
-                {"x": 1.5, "y": 2.25, "matrix": [2, 1]},
-                {"x": 2.5, "y": 2.25, "matrix": [2, 2]},
-                {"x": 3.5, "y": 2.25, "matrix": [2, 3]},
-                {"x": 4.5, "y": 2.25, "matrix": [2, 4]},
-                {"x": 5.5, "y": 2.25, "matrix": [2, 5]},
-                {"x": 6.5, "y": 2.25, "matrix": [2, 6]},
-                {"x": 7.5, "y": 2.25, "matrix": [2, 7]},
-                {"x": 8.5, "y": 2.25, "matrix": [2, 8]},
-                {"x": 9.5, "y": 2.25, "matrix": [8, 8]},
-                {"x": 10.5, "y": 2.25, "matrix": [8, 7]},
-                {"x": 11.5, "y": 2.25, "matrix": [8, 5]},
-                {"x": 12.5, "y": 2.25, "matrix": [8, 4]},
-
-                {"x": 15.25, "y": 2.25, "matrix": [8, 6]},
-                {"x": 16.25, "y": 2.25, "matrix": [8, 2]},
-                {"x": 17.25, "y": 2.25, "matrix": [8, 1]},
-
-                {"x": 0, "y": 3.25, "w": 1.75, "matrix": [3, 0]},
-                {"x": 1.75, "y": 3.25, "matrix": [3, 1]},
-                {"x": 2.75, "y": 3.25, "matrix": [3, 2]},
-                {"x": 3.75, "y": 3.25, "matrix": [3, 3]},
-                {"x": 4.75, "y": 3.25, "matrix": [3, 4]},
-                {"x": 5.75, "y": 3.25, "matrix": [3, 5]},
-                {"x": 6.75, "y": 3.25, "matrix": [3, 6]},
-                {"x": 7.75, "y": 3.25, "matrix": [3, 7]},
-                {"x": 8.75, "y": 3.25, "matrix": [3, 8]},
-                {"x": 9.75, "y": 3.25, "matrix": [9, 8]},
-                {"x": 10.75, "y": 3.25, "matrix": [9, 7]},
-                {"x": 11.75, "y": 3.25, "matrix": [9, 5]},
-                {"x": 12.75, "y": 3.25, "matrix": [9, 4]},
-                {"x": 13.75, "y": 2.25, "w": 1.25, "h": 2, "matrix": [8, 3]},
-
-                {"x": 0, "y": 4.25, "w": 1.25, "matrix": [4, 0]},
-                {"x": 1.25, "y": 4.25, "matrix": [4, 1]},
-                {"x": 2.25, "y": 4.25, "matrix": [4, 2]},
-                {"x": 3.25, "y": 4.25, "matrix": [4, 3]},
-                {"x": 4.25, "y": 4.25, "matrix": [4, 4]},
-                {"x": 5.25, "y": 4.25, "matrix": [4, 5]},
-                {"x": 6.25, "y": 4.25, "matrix": [4, 6]},
-                {"x": 7.25, "y": 4.25, "matrix": [4, 7]},
-                {"x": 8.25, "y": 4.25, "matrix": [4, 8]},
-                {"x": 9.25, "y": 4.25, "matrix": [10, 8]},
-                {"x": 10.25, "y": 4.25, "matrix": [10, 7]},
-                {"x": 11.25, "y": 4.25, "matrix": [10, 5]},
-                {"x": 12.25, "y": 4.25, "w": 2.75, "matrix": [10, 4]},
-
-                {"x": 16.25, "y": 4.25, "matrix": [9, 2]},
-
-                {"x": 0, "y": 5.25, "w": 1.25, "matrix": [5, 0]},
-                {"x": 1.25, "y": 5.25, "w": 1.25, "matrix": [5, 1]},
-                {"x": 2.5, "y": 5.25, "w": 1.25, "matrix": [5, 2]},
-                {"x": 3.75, "y": 5.25, "w": 6.25, "matrix": [5, 6]},
-                {"x": 10, "y": 5.25, "w": 1.25, "matrix": [5, 8]},
-                {"x": 11.25, "y": 5.25, "w": 1.25, "matrix": [5, 7]},
-                {"x": 12.5, "y": 5.25, "w": 1.25, "matrix": [5, 4]},
-                {"x": 13.75, "y": 5.25, "w": 1.25, "matrix": [5, 3]},
-
-                {"x": 15.25, "y": 5.25, "matrix": [10, 6]},
-                {"x": 16.25, "y": 5.25, "matrix": [10, 2]},
-                {"x": 17.25, "y": 5.25, "matrix": [10, 1]}
-            ]
-        }
-    }
-}
diff --git a/keyboards/mt/ncr80/solder/keyboard.json b/keyboards/mt/ncr80/solder/keyboard.json
new file mode 100644
index 00000000000..fac59abadd0
--- /dev/null
+++ b/keyboards/mt/ncr80/solder/keyboard.json
@@ -0,0 +1,352 @@
+{
+    "keyboard_name": "NCR-80",
+    "manufacturer": "NCR",
+    "url": "https://www.aliexpress.com/item/1005003364462523.html",
+    "maintainer": "qmk",
+    "usb": {
+        "vid": "0x4D54",
+        "pid": "0x2001",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "mousekey": false,
+        "extrakey": true,
+        "nkro": true,
+        "backlight": true
+    },
+    "matrix_pins": {
+        "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4"],
+        "rows": ["E6", "B0", "B1", "B2", "B3", "B7", "F7", "F6", "F5", "F4", "F1"]
+    },
+    "diode_direction": "ROW2COL",
+    "backlight": {
+        "pin": "B6",
+        "levels": 5
+    },
+    "indicators": {
+        "caps_lock": "C6",
+        "num_lock": "B5",
+        "scroll_lock": "C7",
+        "on_state": 0
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                {"x": 0, "y": 0, "matrix": [0, 0]},
+
+                {"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": [6, 8]},
+
+                {"x": 11, "y": 0, "matrix": [6, 7]},
+                {"x": 12, "y": 0, "matrix": [6, 5]},
+                {"x": 13, "y": 0, "matrix": [6, 4]},
+                {"x": 14, "y": 0, "matrix": [6, 3]},
+
+                {"x": 15.25, "y": 0, "matrix": [6, 6]},
+                {"x": 16.25, "y": 0, "matrix": [6, 2]},
+                {"x": 17.25, "y": 0, "matrix": [6, 1]},
+
+                {"x": 0, "y": 1.5, "matrix": [1, 0]},
+                {"x": 1, "y": 1.5, "matrix": [1, 1]},
+                {"x": 2, "y": 1.5, "matrix": [1, 2]},
+                {"x": 3, "y": 1.5, "matrix": [1, 3]},
+                {"x": 4, "y": 1.5, "matrix": [1, 4]},
+                {"x": 5, "y": 1.5, "matrix": [1, 5]},
+                {"x": 6, "y": 1.5, "matrix": [1, 6]},
+                {"x": 7, "y": 1.5, "matrix": [1, 7]},
+                {"x": 8, "y": 1.5, "matrix": [1, 8]},
+                {"x": 9, "y": 1.5, "matrix": [7, 8]},
+                {"x": 10, "y": 1.5, "matrix": [7, 0]},
+                {"x": 11, "y": 1.5, "matrix": [7, 7]},
+                {"x": 12, "y": 1.5, "matrix": [7, 5]},
+                {"x": 13, "y": 1.5, "matrix": [7, 4]},
+                {"x": 14, "y": 1.5, "matrix": [7, 3]},
+
+                {"x": 15.25, "y": 1.5, "matrix": [7, 6]},
+                {"x": 16.25, "y": 1.5, "matrix": [7, 2]},
+                {"x": 17.25, "y": 1.5, "matrix": [7, 1]},
+
+                {"x": 0, "y": 2.5, "w": 1.5, "matrix": [2, 0]},
+                {"x": 1.5, "y": 2.5, "matrix": [2, 1]},
+                {"x": 2.5, "y": 2.5, "matrix": [2, 2]},
+                {"x": 3.5, "y": 2.5, "matrix": [2, 3]},
+                {"x": 4.5, "y": 2.5, "matrix": [2, 4]},
+                {"x": 5.5, "y": 2.5, "matrix": [2, 5]},
+                {"x": 6.5, "y": 2.5, "matrix": [2, 6]},
+                {"x": 7.5, "y": 2.5, "matrix": [2, 7]},
+                {"x": 8.5, "y": 2.5, "matrix": [2, 8]},
+                {"x": 9.5, "y": 2.5, "matrix": [8, 8]},
+                {"x": 10.5, "y": 2.5, "matrix": [8, 7]},
+                {"x": 11.5, "y": 2.5, "matrix": [8, 5]},
+                {"x": 12.5, "y": 2.5, "matrix": [8, 4]},
+                {"x": 13.5, "y": 2.5, "w": 1.5, "matrix": [9, 4]},
+
+                {"x": 15.25, "y": 2.5, "matrix": [8, 6]},
+                {"x": 16.25, "y": 2.5, "matrix": [8, 2]},
+                {"x": 17.25, "y": 2.5, "matrix": [8, 1]},
+
+                {"x": 0, "y": 3.5, "w": 1.75, "matrix": [3, 0]},
+                {"x": 1.75, "y": 3.5, "matrix": [3, 1]},
+                {"x": 2.75, "y": 3.5, "matrix": [3, 2]},
+                {"x": 3.75, "y": 3.5, "matrix": [3, 3]},
+                {"x": 4.75, "y": 3.5, "matrix": [3, 4]},
+                {"x": 5.75, "y": 3.5, "matrix": [3, 5]},
+                {"x": 6.75, "y": 3.5, "matrix": [3, 6]},
+                {"x": 7.75, "y": 3.5, "matrix": [3, 7]},
+                {"x": 8.75, "y": 3.5, "matrix": [3, 8]},
+                {"x": 9.75, "y": 3.5, "matrix": [9, 8]},
+                {"x": 10.75, "y": 3.5, "matrix": [9, 7]},
+                {"x": 11.75, "y": 3.5, "matrix": [9, 5]},
+                {"x": 12.75, "y": 3.5, "w": 2.25, "matrix": [8, 3]},
+
+                {"x": 0, "y": 4.5, "w": 1.25, "matrix": [4, 0]},
+                {"x": 1.25, "y": 4.5, "matrix": [4, 1]},
+                {"x": 2.25, "y": 4.5, "matrix": [4, 2]},
+                {"x": 3.25, "y": 4.5, "matrix": [4, 3]},
+                {"x": 4.25, "y": 4.5, "matrix": [4, 4]},
+                {"x": 5.25, "y": 4.5, "matrix": [4, 5]},
+                {"x": 6.25, "y": 4.5, "matrix": [4, 6]},
+                {"x": 7.25, "y": 4.5, "matrix": [4, 7]},
+                {"x": 8.25, "y": 4.5, "matrix": [4, 8]},
+                {"x": 9.25, "y": 4.5, "matrix": [10, 8]},
+                {"x": 10.25, "y": 4.5, "matrix": [10, 7]},
+                {"x": 11.25, "y": 4.5, "matrix": [10, 5]},
+                {"x": 12.25, "y": 4.5, "w": 1.75, "matrix": [10, 4]},
+                {"x": 14, "y": 4.5, "matrix": [10, 3]},
+
+                {"x": 16.25, "y": 4.5, "matrix": [9, 2]},
+
+                {"x": 0, "y": 5.5, "w": 1.25, "matrix": [5, 0]},
+                {"x": 1.25, "y": 5.5, "w": 1.25, "matrix": [5, 1]},
+                {"x": 2.5, "y": 5.5, "w": 1.25, "matrix": [5, 2]},
+                {"x": 3.75, "y": 5.5, "w": 6.25, "matrix": [5, 6]},
+                {"x": 10, "y": 5.5, "w": 1.25, "matrix": [5, 8]},
+                {"x": 11.25, "y": 5.5, "w": 1.25, "matrix": [5, 7]},
+                {"x": 12.5, "y": 5.5, "w": 1.25, "matrix": [5, 4]},
+                {"x": 13.75, "y": 5.5, "w": 1.25, "matrix": [5, 3]},
+
+                {"x": 15.25, "y": 5.5, "matrix": [10, 6]},
+                {"x": 16.25, "y": 5.5, "matrix": [10, 2]},
+                {"x": 17.25, "y": 5.5, "matrix": [10, 1]}
+            ]
+        },
+        "LAYOUT_tkl_ansi": {
+            "layout": [
+                {"x": 0, "y": 0, "matrix": [0, 0]},
+
+                {"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": [6, 8]},
+
+                {"x": 11, "y": 0, "matrix": [6, 7]},
+                {"x": 12, "y": 0, "matrix": [6, 5]},
+                {"x": 13, "y": 0, "matrix": [6, 4]},
+                {"x": 14, "y": 0, "matrix": [6, 3]},
+
+                {"x": 15.25, "y": 0, "matrix": [6, 6]},
+                {"x": 16.25, "y": 0, "matrix": [6, 2]},
+                {"x": 17.25, "y": 0, "matrix": [6, 1]},
+
+                {"x": 0, "y": 1.25, "matrix": [1, 0]},
+                {"x": 1, "y": 1.25, "matrix": [1, 1]},
+                {"x": 2, "y": 1.25, "matrix": [1, 2]},
+                {"x": 3, "y": 1.25, "matrix": [1, 3]},
+                {"x": 4, "y": 1.25, "matrix": [1, 4]},
+                {"x": 5, "y": 1.25, "matrix": [1, 5]},
+                {"x": 6, "y": 1.25, "matrix": [1, 6]},
+                {"x": 7, "y": 1.25, "matrix": [1, 7]},
+                {"x": 8, "y": 1.25, "matrix": [1, 8]},
+                {"x": 9, "y": 1.25, "matrix": [7, 8]},
+                {"x": 10, "y": 1.25, "matrix": [7, 0]},
+                {"x": 11, "y": 1.25, "matrix": [7, 7]},
+                {"x": 12, "y": 1.25, "matrix": [7, 5]},
+                {"x": 13, "y": 1.25, "w": 2, "matrix": [7, 3]},
+
+                {"x": 15.25, "y": 1.25, "matrix": [7, 6]},
+                {"x": 16.25, "y": 1.25, "matrix": [7, 2]},
+                {"x": 17.25, "y": 1.25, "matrix": [7, 1]},
+
+                {"x": 0, "y": 2.25, "w": 1.5, "matrix": [2, 0]},
+                {"x": 1.5, "y": 2.25, "matrix": [2, 1]},
+                {"x": 2.5, "y": 2.25, "matrix": [2, 2]},
+                {"x": 3.5, "y": 2.25, "matrix": [2, 3]},
+                {"x": 4.5, "y": 2.25, "matrix": [2, 4]},
+                {"x": 5.5, "y": 2.25, "matrix": [2, 5]},
+                {"x": 6.5, "y": 2.25, "matrix": [2, 6]},
+                {"x": 7.5, "y": 2.25, "matrix": [2, 7]},
+                {"x": 8.5, "y": 2.25, "matrix": [2, 8]},
+                {"x": 9.5, "y": 2.25, "matrix": [8, 8]},
+                {"x": 10.5, "y": 2.25, "matrix": [8, 7]},
+                {"x": 11.5, "y": 2.25, "matrix": [8, 5]},
+                {"x": 12.5, "y": 2.25, "matrix": [8, 4]},
+                {"x": 13.5, "y": 2.25, "w": 1.5, "matrix": [9, 4]},
+
+                {"x": 15.25, "y": 2.25, "matrix": [8, 6]},
+                {"x": 16.25, "y": 2.25, "matrix": [8, 2]},
+                {"x": 17.25, "y": 2.25, "matrix": [8, 1]},
+
+                {"x": 0, "y": 3.25, "w": 1.75, "matrix": [3, 0]},
+                {"x": 1.75, "y": 3.25, "matrix": [3, 1]},
+                {"x": 2.75, "y": 3.25, "matrix": [3, 2]},
+                {"x": 3.75, "y": 3.25, "matrix": [3, 3]},
+                {"x": 4.75, "y": 3.25, "matrix": [3, 4]},
+                {"x": 5.75, "y": 3.25, "matrix": [3, 5]},
+                {"x": 6.75, "y": 3.25, "matrix": [3, 6]},
+                {"x": 7.75, "y": 3.25, "matrix": [3, 7]},
+                {"x": 8.75, "y": 3.25, "matrix": [3, 8]},
+                {"x": 9.75, "y": 3.25, "matrix": [9, 8]},
+                {"x": 10.75, "y": 3.25, "matrix": [9, 7]},
+                {"x": 11.75, "y": 3.25, "matrix": [9, 5]},
+                {"x": 12.75, "y": 3.25, "w": 2.25, "matrix": [8, 3]},
+
+                {"x": 0, "y": 4.25, "w": 2.25, "matrix": [4, 0]},
+                {"x": 2.25, "y": 4.25, "matrix": [4, 2]},
+                {"x": 3.25, "y": 4.25, "matrix": [4, 3]},
+                {"x": 4.25, "y": 4.25, "matrix": [4, 4]},
+                {"x": 5.25, "y": 4.25, "matrix": [4, 5]},
+                {"x": 6.25, "y": 4.25, "matrix": [4, 6]},
+                {"x": 7.25, "y": 4.25, "matrix": [4, 7]},
+                {"x": 8.25, "y": 4.25, "matrix": [4, 8]},
+                {"x": 9.25, "y": 4.25, "matrix": [10, 8]},
+                {"x": 10.25, "y": 4.25, "matrix": [10, 7]},
+                {"x": 11.25, "y": 4.25, "matrix": [10, 5]},
+                {"x": 12.25, "y": 4.25, "w": 2.75, "matrix": [10, 4]},
+
+                {"x": 16.25, "y": 4.25, "matrix": [9, 2]},
+
+                {"x": 0, "y": 5.25, "w": 1.25, "matrix": [5, 0]},
+                {"x": 1.25, "y": 5.25, "w": 1.25, "matrix": [5, 1]},
+                {"x": 2.5, "y": 5.25, "w": 1.25, "matrix": [5, 2]},
+                {"x": 3.75, "y": 5.25, "w": 6.25, "matrix": [5, 6]},
+                {"x": 10, "y": 5.25, "w": 1.25, "matrix": [5, 8]},
+                {"x": 11.25, "y": 5.25, "w": 1.25, "matrix": [5, 7]},
+                {"x": 12.5, "y": 5.25, "w": 1.25, "matrix": [5, 4]},
+                {"x": 13.75, "y": 5.25, "w": 1.25, "matrix": [5, 3]},
+                {"x": 15.25, "y": 5.25, "matrix": [10, 6]},
+                {"x": 16.25, "y": 5.25, "matrix": [10, 2]},
+                {"x": 17.25, "y": 5.25, "matrix": [10, 1]}
+            ]
+        },
+        "LAYOUT_tkl_iso": {
+            "layout": [
+                {"x": 0, "y": 0, "matrix": [0, 0]},
+
+                {"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": [6, 8]},
+
+                {"x": 11, "y": 0, "matrix": [6, 7]},
+                {"x": 12, "y": 0, "matrix": [6, 5]},
+                {"x": 13, "y": 0, "matrix": [6, 4]},
+                {"x": 14, "y": 0, "matrix": [6, 3]},
+
+                {"x": 15.25, "y": 0, "matrix": [6, 6]},
+                {"x": 16.25, "y": 0, "matrix": [6, 2]},
+                {"x": 17.25, "y": 0, "matrix": [6, 1]},
+
+                {"x": 0, "y": 1.25, "matrix": [1, 0]},
+                {"x": 1, "y": 1.25, "matrix": [1, 1]},
+                {"x": 2, "y": 1.25, "matrix": [1, 2]},
+                {"x": 3, "y": 1.25, "matrix": [1, 3]},
+                {"x": 4, "y": 1.25, "matrix": [1, 4]},
+                {"x": 5, "y": 1.25, "matrix": [1, 5]},
+                {"x": 6, "y": 1.25, "matrix": [1, 6]},
+                {"x": 7, "y": 1.25, "matrix": [1, 7]},
+                {"x": 8, "y": 1.25, "matrix": [1, 8]},
+                {"x": 9, "y": 1.25, "matrix": [7, 8]},
+                {"x": 10, "y": 1.25, "matrix": [7, 0]},
+                {"x": 11, "y": 1.25, "matrix": [7, 7]},
+                {"x": 12, "y": 1.25, "matrix": [7, 5]},
+                {"x": 13, "y": 1.25, "w": 2, "matrix": [7, 3]},
+
+                {"x": 15.25, "y": 1.25, "matrix": [7, 6]},
+                {"x": 16.25, "y": 1.25, "matrix": [7, 2]},
+                {"x": 17.25, "y": 1.25, "matrix": [7, 1]},
+
+                {"x": 0, "y": 2.25, "w": 1.5, "matrix": [2, 0]},
+                {"x": 1.5, "y": 2.25, "matrix": [2, 1]},
+                {"x": 2.5, "y": 2.25, "matrix": [2, 2]},
+                {"x": 3.5, "y": 2.25, "matrix": [2, 3]},
+                {"x": 4.5, "y": 2.25, "matrix": [2, 4]},
+                {"x": 5.5, "y": 2.25, "matrix": [2, 5]},
+                {"x": 6.5, "y": 2.25, "matrix": [2, 6]},
+                {"x": 7.5, "y": 2.25, "matrix": [2, 7]},
+                {"x": 8.5, "y": 2.25, "matrix": [2, 8]},
+                {"x": 9.5, "y": 2.25, "matrix": [8, 8]},
+                {"x": 10.5, "y": 2.25, "matrix": [8, 7]},
+                {"x": 11.5, "y": 2.25, "matrix": [8, 5]},
+                {"x": 12.5, "y": 2.25, "matrix": [8, 4]},
+
+                {"x": 15.25, "y": 2.25, "matrix": [8, 6]},
+                {"x": 16.25, "y": 2.25, "matrix": [8, 2]},
+                {"x": 17.25, "y": 2.25, "matrix": [8, 1]},
+
+                {"x": 0, "y": 3.25, "w": 1.75, "matrix": [3, 0]},
+                {"x": 1.75, "y": 3.25, "matrix": [3, 1]},
+                {"x": 2.75, "y": 3.25, "matrix": [3, 2]},
+                {"x": 3.75, "y": 3.25, "matrix": [3, 3]},
+                {"x": 4.75, "y": 3.25, "matrix": [3, 4]},
+                {"x": 5.75, "y": 3.25, "matrix": [3, 5]},
+                {"x": 6.75, "y": 3.25, "matrix": [3, 6]},
+                {"x": 7.75, "y": 3.25, "matrix": [3, 7]},
+                {"x": 8.75, "y": 3.25, "matrix": [3, 8]},
+                {"x": 9.75, "y": 3.25, "matrix": [9, 8]},
+                {"x": 10.75, "y": 3.25, "matrix": [9, 7]},
+                {"x": 11.75, "y": 3.25, "matrix": [9, 5]},
+                {"x": 12.75, "y": 3.25, "matrix": [9, 4]},
+                {"x": 13.75, "y": 2.25, "w": 1.25, "h": 2, "matrix": [8, 3]},
+
+                {"x": 0, "y": 4.25, "w": 1.25, "matrix": [4, 0]},
+                {"x": 1.25, "y": 4.25, "matrix": [4, 1]},
+                {"x": 2.25, "y": 4.25, "matrix": [4, 2]},
+                {"x": 3.25, "y": 4.25, "matrix": [4, 3]},
+                {"x": 4.25, "y": 4.25, "matrix": [4, 4]},
+                {"x": 5.25, "y": 4.25, "matrix": [4, 5]},
+                {"x": 6.25, "y": 4.25, "matrix": [4, 6]},
+                {"x": 7.25, "y": 4.25, "matrix": [4, 7]},
+                {"x": 8.25, "y": 4.25, "matrix": [4, 8]},
+                {"x": 9.25, "y": 4.25, "matrix": [10, 8]},
+                {"x": 10.25, "y": 4.25, "matrix": [10, 7]},
+                {"x": 11.25, "y": 4.25, "matrix": [10, 5]},
+                {"x": 12.25, "y": 4.25, "w": 2.75, "matrix": [10, 4]},
+
+                {"x": 16.25, "y": 4.25, "matrix": [9, 2]},
+
+                {"x": 0, "y": 5.25, "w": 1.25, "matrix": [5, 0]},
+                {"x": 1.25, "y": 5.25, "w": 1.25, "matrix": [5, 1]},
+                {"x": 2.5, "y": 5.25, "w": 1.25, "matrix": [5, 2]},
+                {"x": 3.75, "y": 5.25, "w": 6.25, "matrix": [5, 6]},
+                {"x": 10, "y": 5.25, "w": 1.25, "matrix": [5, 8]},
+                {"x": 11.25, "y": 5.25, "w": 1.25, "matrix": [5, 7]},
+                {"x": 12.5, "y": 5.25, "w": 1.25, "matrix": [5, 4]},
+                {"x": 13.75, "y": 5.25, "w": 1.25, "matrix": [5, 3]},
+
+                {"x": 15.25, "y": 5.25, "matrix": [10, 6]},
+                {"x": 16.25, "y": 5.25, "matrix": [10, 2]},
+                {"x": 17.25, "y": 5.25, "matrix": [10, 1]}
+            ]
+        }
+    }
+}
diff --git a/keyboards/mt/ncr80/solder/rules.mk b/keyboards/mt/ncr80/solder/rules.mk
deleted file mode 100644
index 9032f3e4b8f..00000000000
--- a/keyboards/mt/ncr80/solder/rules.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes     # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no       # Mouse keys
-EXTRAKEY_ENABLE = yes      # Audio control and System control
-CONSOLE_ENABLE = no        # Console for debug
-COMMAND_ENABLE = no        # Commands for debug and configuration
-NKRO_ENABLE = yes          # Enable N-Key Rollover
-BACKLIGHT_ENABLE = yes     # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no       # Enable keyboard RGB underglow
-AUDIO_ENABLE = no          # Audio output
diff --git a/keyboards/mt/split75/info.json b/keyboards/mt/split75/info.json
deleted file mode 100644
index e03d528a2a4..00000000000
--- a/keyboards/mt/split75/info.json
+++ /dev/null
@@ -1,275 +0,0 @@
-{
-    "keyboard_name": "Split75",
-    "manufacturer": "YMDK",
-    "url": "",
-    "maintainer": "Michael L. Walker",
-    "usb": {
-        "vid": "0x594D",
-        "pid": "0x0001",
-        "device_version": "0.0.1"
-    },
-    "backlight": {
-        "pin": "D4"
-    },
-    "rgblight": {
-        "led_count": 8,
-        "sleep": true,
-        "animations": {
-            "breathing": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "snake": true,
-            "knight": true,
-            "christmas": true,
-            "static_gradient": true,
-            "rgb_test": true,
-            "alternating": true,
-            "twinkle": true
-        }
-    },
-    "ws2812": {
-        "driver": "i2c"
-    },
-    "indicators": {
-        "caps_lock": "D1",
-        "num_lock": "D0",
-        "scroll_lock": "D6"
-    },
-    "processor": "atmega32a",
-    "bootloader": "bootloadhid",
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [5, 0], "x": 2.25, "y": 0},
-                {"matrix": [5, 1], "x": 3.25, "y": 0},
-                {"matrix": [5, 2], "x": 4.25, "y": 0},
-                {"matrix": [5, 3], "x": 5.25, "y": 0},
-                {"matrix": [5, 4], "x": 6.25, "y": 0},
-                {"matrix": [5, 5], "x": 7.25, "y": 0},
-                {"matrix": [5, 6], "x": 8.25, "y": 0},
-
-                {"matrix": [5, 7], "x": 10.25, "y": 0},
-                {"matrix": [5, 8], "x": 11.25, "y": 0},
-                {"matrix": [5, 9], "x": 12.25, "y": 0},
-                {"matrix": [5, 10], "x": 13.25, "y": 0},
-                {"matrix": [5, 11], "x": 14.25, "y": 0},
-                {"matrix": [5, 12], "x": 15.25, "y": 0},
-                {"matrix": [5, 13], "x": 16.25, "y": 0},
-                {"matrix": [6, 8], "x": 17.25, "y": 0},
-                {"matrix": [7, 8], "x": 18.25, "y": 0},
-
-                {"matrix": [7, 4], "x": 0, "y": 1},
-                {"matrix": [6, 4], "x": 1, "y": 1},
-
-                {"matrix": [4, 0], "x": 2.25, "y": 1},
-                {"matrix": [4, 1], "x": 3.25, "y": 1},
-                {"matrix": [4, 2], "x": 4.25, "y": 1},
-                {"matrix": [4, 3], "x": 5.25, "y": 1},
-                {"matrix": [4, 4], "x": 6.25, "y": 1},
-                {"matrix": [4, 5], "x": 7.25, "y": 1},
-                {"matrix": [4, 6], "x": 8.25, "y": 1},
-
-                {"matrix": [4, 7], "x": 10.25, "y": 1},
-                {"matrix": [4, 8], "x": 11.25, "y": 1},
-                {"matrix": [4, 9], "x": 12.25, "y": 1},
-                {"matrix": [4, 10], "x": 13.25, "y": 1},
-                {"matrix": [4, 11], "x": 14.25, "y": 1},
-                {"matrix": [4, 12], "x": 15.25, "y": 1},
-                {"matrix": [6, 9], "x": 16.25, "y": 1, "w": 2},
-                {"matrix": [7, 9], "x": 18.25, "y": 1},
-
-                {"matrix": [7, 3], "x": 0, "y": 2},
-                {"matrix": [6, 3], "x": 1, "y": 2},
-
-                {"matrix": [3, 0], "x": 2.25, "y": 2, "w": 1.5},
-                {"matrix": [3, 1], "x": 3.75, "y": 2},
-                {"matrix": [3, 2], "x": 4.75, "y": 2},
-                {"matrix": [3, 3], "x": 5.75, "y": 2},
-                {"matrix": [3, 4], "x": 6.75, "y": 2},
-                {"matrix": [3, 5], "x": 7.75, "y": 2},
-
-                {"matrix": [3, 7], "x": 9.75, "y": 2},
-                {"matrix": [3, 8], "x": 10.75, "y": 2},
-                {"matrix": [3, 9], "x": 11.75, "y": 2},
-                {"matrix": [3, 10], "x": 12.75, "y": 2},
-                {"matrix": [3, 11], "x": 13.75, "y": 2},
-                {"matrix": [3, 12], "x": 14.75, "y": 2},
-                {"matrix": [3, 13], "x": 15.75, "y": 2},
-                {"matrix": [6, 10], "x": 16.75, "y": 2, "w": 1.5},
-                {"matrix": [7, 10], "x": 18.25, "y": 2},
-
-                {"matrix": [7, 2], "x": 0, "y": 3},
-                {"matrix": [6, 2], "x": 1, "y": 3},
-
-                {"matrix": [2, 0], "x": 2.25, "y": 3, "w": 1.75},
-                {"matrix": [2, 1], "x": 4, "y": 3},
-                {"matrix": [2, 2], "x": 5, "y": 3},
-                {"matrix": [2, 3], "x": 6, "y": 3},
-                {"matrix": [2, 4], "x": 7, "y": 3},
-                {"matrix": [2, 5], "x": 8, "y": 3},
-
-                {"matrix": [2, 7], "x": 10, "y": 3},
-                {"matrix": [2, 8], "x": 11, "y": 3},
-                {"matrix": [2, 9], "x": 12, "y": 3},
-                {"matrix": [2, 10], "x": 13, "y": 3},
-                {"matrix": [2, 11], "x": 14, "y": 3},
-                {"matrix": [2, 12], "x": 15, "y": 3},
-                {"matrix": [6, 11], "x": 16, "y": 3, "w": 2.25},
-                {"matrix": [7, 11], "x": 18.25, "y": 3},
-
-                {"matrix": [7, 1], "x": 0, "y": 4},
-                {"matrix": [6, 1], "x": 1, "y": 4},
-
-                {"matrix": [1, 0], "x": 2.25, "y": 4, "w": 2.25},
-                {"matrix": [1, 2], "x": 4.5, "y": 4},
-                {"matrix": [1, 3], "x": 5.5, "y": 4},
-                {"matrix": [1, 4], "x": 6.5, "y": 4},
-                {"matrix": [1, 5], "x": 7.5, "y": 4},
-                {"matrix": [1, 6], "x": 8.5, "y": 4},
-
-                {"matrix": [1, 7], "x": 10.5, "y": 4},
-                {"matrix": [1, 8], "x": 11.5, "y": 4},
-                {"matrix": [1, 9], "x": 12.5, "y": 4},
-                {"matrix": [1, 10], "x": 13.5, "y": 4},
-                {"matrix": [1, 11], "x": 14.5, "y": 4},
-                {"matrix": [1, 13], "x": 15.5, "y": 4, "w": 1.75},
-                {"matrix": [6, 12], "x": 17.25, "y": 4},
-                {"matrix": [7, 12], "x": 18.25, "y": 4},
-
-                {"matrix": [7, 0], "x": 0, "y": 5},
-                {"matrix": [6, 0], "x": 1, "y": 5},
-
-                {"matrix": [0, 0], "x": 2.25, "y": 5, "w": 1.25},
-                {"matrix": [0, 1], "x": 3.5, "y": 5, "w": 1.25},
-                {"matrix": [0, 2], "x": 4.75, "y": 5, "w": 1.25},
-                {"matrix": [0, 3], "x": 6, "y": 5, "w": 2},
-                {"matrix": [0, 4], "x": 8, "y": 5},
-
-                {"matrix": [0, 7], "x": 10, "y": 5, "w": 2.75},
-                {"matrix": [0, 10], "x": 12.75, "y": 5, "w": 1.25},
-                {"matrix": [0, 11], "x": 14, "y": 5},
-                {"matrix": [0, 12], "x": 15, "y": 5, "w": 1.25},
-                {"matrix": [0, 13], "x": 16.25, "y": 5},
-                {"matrix": [6, 13], "x": 17.25, "y": 5},
-                {"matrix": [7, 13], "x": 18.25, "y": 5}
-            ]
-        },
-        "LAYOUT_iso": {
-            "layout": [
-                {"matrix": [5, 0], "x": 2.25, "y": 0},
-                {"matrix": [5, 1], "x": 3.25, "y": 0},
-                {"matrix": [5, 2], "x": 4.25, "y": 0},
-                {"matrix": [5, 3], "x": 5.25, "y": 0},
-                {"matrix": [5, 4], "x": 6.25, "y": 0},
-                {"matrix": [5, 5], "x": 7.25, "y": 0},
-                {"matrix": [5, 6], "x": 8.25, "y": 0},
-
-                {"matrix": [5, 7], "x": 10.25, "y": 0},
-                {"matrix": [5, 8], "x": 11.25, "y": 0},
-                {"matrix": [5, 9], "x": 12.25, "y": 0},
-                {"matrix": [5, 10], "x": 13.25, "y": 0},
-                {"matrix": [5, 11], "x": 14.25, "y": 0},
-                {"matrix": [5, 12], "x": 15.25, "y": 0},
-                {"matrix": [5, 13], "x": 16.25, "y": 0},
-                {"matrix": [6, 8], "x": 17.25, "y": 0},
-                {"matrix": [7, 8], "x": 18.25, "y": 0},
-
-                {"matrix": [7, 4], "x": 0, "y": 1},
-                {"matrix": [6, 4], "x": 1, "y": 1},
-
-                {"matrix": [4, 0], "x": 2.25, "y": 1},
-                {"matrix": [4, 1], "x": 3.25, "y": 1},
-                {"matrix": [4, 2], "x": 4.25, "y": 1},
-                {"matrix": [4, 3], "x": 5.25, "y": 1},
-                {"matrix": [4, 4], "x": 6.25, "y": 1},
-                {"matrix": [4, 5], "x": 7.25, "y": 1},
-                {"matrix": [4, 6], "x": 8.25, "y": 1},
-
-                {"matrix": [4, 7], "x": 10.25, "y": 1},
-                {"matrix": [4, 8], "x": 11.25, "y": 1},
-                {"matrix": [4, 9], "x": 12.25, "y": 1},
-                {"matrix": [4, 10], "x": 13.25, "y": 1},
-                {"matrix": [4, 11], "x": 14.25, "y": 1},
-                {"matrix": [4, 12], "x": 15.25, "y": 1},
-                {"matrix": [6, 9], "x": 16.25, "y": 1, "w": 2},
-                {"matrix": [7, 9], "x": 18.25, "y": 1},
-
-                {"matrix": [7, 3], "x": 0, "y": 2},
-                {"matrix": [6, 3], "x": 1, "y": 2},
-
-                {"matrix": [3, 0], "x": 2.25, "y": 2, "w": 1.5},
-                {"matrix": [3, 1], "x": 3.75, "y": 2},
-                {"matrix": [3, 2], "x": 4.75, "y": 2},
-                {"matrix": [3, 3], "x": 5.75, "y": 2},
-                {"matrix": [3, 4], "x": 6.75, "y": 2},
-                {"matrix": [3, 5], "x": 7.75, "y": 2},
-
-                {"matrix": [3, 7], "x": 9.75, "y": 2},
-                {"matrix": [3, 8], "x": 10.75, "y": 2},
-                {"matrix": [3, 9], "x": 11.75, "y": 2},
-                {"matrix": [3, 10], "x": 12.75, "y": 2},
-                {"matrix": [3, 11], "x": 13.75, "y": 2},
-                {"matrix": [3, 12], "x": 14.75, "y": 2},
-                {"matrix": [3, 13], "x": 15.75, "y": 2},
-                {"matrix": [7, 10], "x": 18.25, "y": 2},
-
-                {"matrix": [7, 2], "x": 0, "y": 3},
-                {"matrix": [6, 2], "x": 1, "y": 3},
-
-                {"matrix": [2, 0], "x": 2.25, "y": 3, "w": 1.75},
-                {"matrix": [2, 1], "x": 4, "y": 3},
-                {"matrix": [2, 2], "x": 5, "y": 3},
-                {"matrix": [2, 3], "x": 6, "y": 3},
-                {"matrix": [2, 4], "x": 7, "y": 3},
-                {"matrix": [2, 5], "x": 8, "y": 3},
-
-                {"matrix": [2, 7], "x": 10, "y": 3},
-                {"matrix": [2, 8], "x": 11, "y": 3},
-                {"matrix": [2, 9], "x": 12, "y": 3},
-                {"matrix": [2, 10], "x": 13, "y": 3},
-                {"matrix": [2, 11], "x": 14, "y": 3},
-                {"matrix": [2, 12], "x": 15, "y": 3},
-                {"matrix": [2, 13], "x": 16, "y": 3},
-                {"matrix": [6, 11], "x": 17, "y": 2, "w": 1.25, "h": 2},
-                {"matrix": [7, 11], "x": 18.25, "y": 3},
-
-                {"matrix": [7, 1], "x": 0, "y": 4},
-                {"matrix": [6, 1], "x": 1, "y": 4},
-
-                {"matrix": [1, 0], "x": 2.25, "y": 4, "w": 1.25},
-                {"matrix": [1, 1], "x": 3.5, "y": 4},
-                {"matrix": [1, 2], "x": 4.5, "y": 4},
-                {"matrix": [1, 3], "x": 5.5, "y": 4},
-                {"matrix": [1, 4], "x": 6.5, "y": 4},
-                {"matrix": [1, 5], "x": 7.5, "y": 4},
-                {"matrix": [1, 6], "x": 8.5, "y": 4},
-
-                {"matrix": [1, 7], "x": 10.5, "y": 4},
-                {"matrix": [1, 8], "x": 11.5, "y": 4},
-                {"matrix": [1, 9], "x": 12.5, "y": 4},
-                {"matrix": [1, 10], "x": 13.5, "y": 4},
-                {"matrix": [1, 11], "x": 14.5, "y": 4},
-                {"matrix": [1, 13], "x": 15.5, "y": 4, "w": 1.75},
-                {"matrix": [6, 12], "x": 17.25, "y": 4},
-                {"matrix": [7, 12], "x": 18.25, "y": 4},
-
-                {"matrix": [7, 0], "x": 0, "y": 5},
-                {"matrix": [6, 0], "x": 1, "y": 5},
-
-                {"matrix": [0, 0], "x": 2.25, "y": 5, "w": 1.25},
-                {"matrix": [0, 1], "x": 3.5, "y": 5, "w": 1.25},
-                {"matrix": [0, 2], "x": 4.75, "y": 5, "w": 1.25},
-                {"matrix": [0, 3], "x": 6, "y": 5, "w": 2},
-                {"matrix": [0, 4], "x": 8, "y": 5},
-
-                {"matrix": [0, 7], "x": 10, "y": 5, "w": 2.75},
-                {"matrix": [0, 10], "x": 12.75, "y": 5, "w": 1.25},
-                {"matrix": [0, 11], "x": 14, "y": 5},
-                {"matrix": [0, 12], "x": 15, "y": 5, "w": 1.25},
-                {"matrix": [0, 13], "x": 16.25, "y": 5},
-                {"matrix": [6, 13], "x": 17.25, "y": 5},
-                {"matrix": [7, 13], "x": 18.25, "y": 5}
-            ]
-        }
-    }
-}
diff --git a/keyboards/mt/split75/keyboard.json b/keyboards/mt/split75/keyboard.json
new file mode 100644
index 00000000000..c13fa28b800
--- /dev/null
+++ b/keyboards/mt/split75/keyboard.json
@@ -0,0 +1,282 @@
+{
+    "keyboard_name": "Split75",
+    "manufacturer": "YMDK",
+    "url": "",
+    "maintainer": "Michael L. Walker",
+    "usb": {
+        "vid": "0x594D",
+        "pid": "0x0001",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": false,
+        "mousekey": false,
+        "extrakey": true,
+        "backlight": true,
+        "rgblight": true
+    },
+    "backlight": {
+        "pin": "D4"
+    },
+    "rgblight": {
+        "led_count": 8,
+        "sleep": true,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": true,
+            "twinkle": true
+        }
+    },
+    "ws2812": {
+        "driver": "i2c"
+    },
+    "indicators": {
+        "caps_lock": "D1",
+        "num_lock": "D0",
+        "scroll_lock": "D6"
+    },
+    "processor": "atmega32a",
+    "bootloader": "bootloadhid",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [5, 0], "x": 2.25, "y": 0},
+                {"matrix": [5, 1], "x": 3.25, "y": 0},
+                {"matrix": [5, 2], "x": 4.25, "y": 0},
+                {"matrix": [5, 3], "x": 5.25, "y": 0},
+                {"matrix": [5, 4], "x": 6.25, "y": 0},
+                {"matrix": [5, 5], "x": 7.25, "y": 0},
+                {"matrix": [5, 6], "x": 8.25, "y": 0},
+
+                {"matrix": [5, 7], "x": 10.25, "y": 0},
+                {"matrix": [5, 8], "x": 11.25, "y": 0},
+                {"matrix": [5, 9], "x": 12.25, "y": 0},
+                {"matrix": [5, 10], "x": 13.25, "y": 0},
+                {"matrix": [5, 11], "x": 14.25, "y": 0},
+                {"matrix": [5, 12], "x": 15.25, "y": 0},
+                {"matrix": [5, 13], "x": 16.25, "y": 0},
+                {"matrix": [6, 8], "x": 17.25, "y": 0},
+                {"matrix": [7, 8], "x": 18.25, "y": 0},
+
+                {"matrix": [7, 4], "x": 0, "y": 1},
+                {"matrix": [6, 4], "x": 1, "y": 1},
+
+                {"matrix": [4, 0], "x": 2.25, "y": 1},
+                {"matrix": [4, 1], "x": 3.25, "y": 1},
+                {"matrix": [4, 2], "x": 4.25, "y": 1},
+                {"matrix": [4, 3], "x": 5.25, "y": 1},
+                {"matrix": [4, 4], "x": 6.25, "y": 1},
+                {"matrix": [4, 5], "x": 7.25, "y": 1},
+                {"matrix": [4, 6], "x": 8.25, "y": 1},
+
+                {"matrix": [4, 7], "x": 10.25, "y": 1},
+                {"matrix": [4, 8], "x": 11.25, "y": 1},
+                {"matrix": [4, 9], "x": 12.25, "y": 1},
+                {"matrix": [4, 10], "x": 13.25, "y": 1},
+                {"matrix": [4, 11], "x": 14.25, "y": 1},
+                {"matrix": [4, 12], "x": 15.25, "y": 1},
+                {"matrix": [6, 9], "x": 16.25, "y": 1, "w": 2},
+                {"matrix": [7, 9], "x": 18.25, "y": 1},
+
+                {"matrix": [7, 3], "x": 0, "y": 2},
+                {"matrix": [6, 3], "x": 1, "y": 2},
+
+                {"matrix": [3, 0], "x": 2.25, "y": 2, "w": 1.5},
+                {"matrix": [3, 1], "x": 3.75, "y": 2},
+                {"matrix": [3, 2], "x": 4.75, "y": 2},
+                {"matrix": [3, 3], "x": 5.75, "y": 2},
+                {"matrix": [3, 4], "x": 6.75, "y": 2},
+                {"matrix": [3, 5], "x": 7.75, "y": 2},
+
+                {"matrix": [3, 7], "x": 9.75, "y": 2},
+                {"matrix": [3, 8], "x": 10.75, "y": 2},
+                {"matrix": [3, 9], "x": 11.75, "y": 2},
+                {"matrix": [3, 10], "x": 12.75, "y": 2},
+                {"matrix": [3, 11], "x": 13.75, "y": 2},
+                {"matrix": [3, 12], "x": 14.75, "y": 2},
+                {"matrix": [3, 13], "x": 15.75, "y": 2},
+                {"matrix": [6, 10], "x": 16.75, "y": 2, "w": 1.5},
+                {"matrix": [7, 10], "x": 18.25, "y": 2},
+
+                {"matrix": [7, 2], "x": 0, "y": 3},
+                {"matrix": [6, 2], "x": 1, "y": 3},
+
+                {"matrix": [2, 0], "x": 2.25, "y": 3, "w": 1.75},
+                {"matrix": [2, 1], "x": 4, "y": 3},
+                {"matrix": [2, 2], "x": 5, "y": 3},
+                {"matrix": [2, 3], "x": 6, "y": 3},
+                {"matrix": [2, 4], "x": 7, "y": 3},
+                {"matrix": [2, 5], "x": 8, "y": 3},
+
+                {"matrix": [2, 7], "x": 10, "y": 3},
+                {"matrix": [2, 8], "x": 11, "y": 3},
+                {"matrix": [2, 9], "x": 12, "y": 3},
+                {"matrix": [2, 10], "x": 13, "y": 3},
+                {"matrix": [2, 11], "x": 14, "y": 3},
+                {"matrix": [2, 12], "x": 15, "y": 3},
+                {"matrix": [6, 11], "x": 16, "y": 3, "w": 2.25},
+                {"matrix": [7, 11], "x": 18.25, "y": 3},
+
+                {"matrix": [7, 1], "x": 0, "y": 4},
+                {"matrix": [6, 1], "x": 1, "y": 4},
+
+                {"matrix": [1, 0], "x": 2.25, "y": 4, "w": 2.25},
+                {"matrix": [1, 2], "x": 4.5, "y": 4},
+                {"matrix": [1, 3], "x": 5.5, "y": 4},
+                {"matrix": [1, 4], "x": 6.5, "y": 4},
+                {"matrix": [1, 5], "x": 7.5, "y": 4},
+                {"matrix": [1, 6], "x": 8.5, "y": 4},
+
+                {"matrix": [1, 7], "x": 10.5, "y": 4},
+                {"matrix": [1, 8], "x": 11.5, "y": 4},
+                {"matrix": [1, 9], "x": 12.5, "y": 4},
+                {"matrix": [1, 10], "x": 13.5, "y": 4},
+                {"matrix": [1, 11], "x": 14.5, "y": 4},
+                {"matrix": [1, 13], "x": 15.5, "y": 4, "w": 1.75},
+                {"matrix": [6, 12], "x": 17.25, "y": 4},
+                {"matrix": [7, 12], "x": 18.25, "y": 4},
+
+                {"matrix": [7, 0], "x": 0, "y": 5},
+                {"matrix": [6, 0], "x": 1, "y": 5},
+
+                {"matrix": [0, 0], "x": 2.25, "y": 5, "w": 1.25},
+                {"matrix": [0, 1], "x": 3.5, "y": 5, "w": 1.25},
+                {"matrix": [0, 2], "x": 4.75, "y": 5, "w": 1.25},
+                {"matrix": [0, 3], "x": 6, "y": 5, "w": 2},
+                {"matrix": [0, 4], "x": 8, "y": 5},
+
+                {"matrix": [0, 7], "x": 10, "y": 5, "w": 2.75},
+                {"matrix": [0, 10], "x": 12.75, "y": 5, "w": 1.25},
+                {"matrix": [0, 11], "x": 14, "y": 5},
+                {"matrix": [0, 12], "x": 15, "y": 5, "w": 1.25},
+                {"matrix": [0, 13], "x": 16.25, "y": 5},
+                {"matrix": [6, 13], "x": 17.25, "y": 5},
+                {"matrix": [7, 13], "x": 18.25, "y": 5}
+            ]
+        },
+        "LAYOUT_iso": {
+            "layout": [
+                {"matrix": [5, 0], "x": 2.25, "y": 0},
+                {"matrix": [5, 1], "x": 3.25, "y": 0},
+                {"matrix": [5, 2], "x": 4.25, "y": 0},
+                {"matrix": [5, 3], "x": 5.25, "y": 0},
+                {"matrix": [5, 4], "x": 6.25, "y": 0},
+                {"matrix": [5, 5], "x": 7.25, "y": 0},
+                {"matrix": [5, 6], "x": 8.25, "y": 0},
+
+                {"matrix": [5, 7], "x": 10.25, "y": 0},
+                {"matrix": [5, 8], "x": 11.25, "y": 0},
+                {"matrix": [5, 9], "x": 12.25, "y": 0},
+                {"matrix": [5, 10], "x": 13.25, "y": 0},
+                {"matrix": [5, 11], "x": 14.25, "y": 0},
+                {"matrix": [5, 12], "x": 15.25, "y": 0},
+                {"matrix": [5, 13], "x": 16.25, "y": 0},
+                {"matrix": [6, 8], "x": 17.25, "y": 0},
+                {"matrix": [7, 8], "x": 18.25, "y": 0},
+
+                {"matrix": [7, 4], "x": 0, "y": 1},
+                {"matrix": [6, 4], "x": 1, "y": 1},
+
+                {"matrix": [4, 0], "x": 2.25, "y": 1},
+                {"matrix": [4, 1], "x": 3.25, "y": 1},
+                {"matrix": [4, 2], "x": 4.25, "y": 1},
+                {"matrix": [4, 3], "x": 5.25, "y": 1},
+                {"matrix": [4, 4], "x": 6.25, "y": 1},
+                {"matrix": [4, 5], "x": 7.25, "y": 1},
+                {"matrix": [4, 6], "x": 8.25, "y": 1},
+
+                {"matrix": [4, 7], "x": 10.25, "y": 1},
+                {"matrix": [4, 8], "x": 11.25, "y": 1},
+                {"matrix": [4, 9], "x": 12.25, "y": 1},
+                {"matrix": [4, 10], "x": 13.25, "y": 1},
+                {"matrix": [4, 11], "x": 14.25, "y": 1},
+                {"matrix": [4, 12], "x": 15.25, "y": 1},
+                {"matrix": [6, 9], "x": 16.25, "y": 1, "w": 2},
+                {"matrix": [7, 9], "x": 18.25, "y": 1},
+
+                {"matrix": [7, 3], "x": 0, "y": 2},
+                {"matrix": [6, 3], "x": 1, "y": 2},
+
+                {"matrix": [3, 0], "x": 2.25, "y": 2, "w": 1.5},
+                {"matrix": [3, 1], "x": 3.75, "y": 2},
+                {"matrix": [3, 2], "x": 4.75, "y": 2},
+                {"matrix": [3, 3], "x": 5.75, "y": 2},
+                {"matrix": [3, 4], "x": 6.75, "y": 2},
+                {"matrix": [3, 5], "x": 7.75, "y": 2},
+
+                {"matrix": [3, 7], "x": 9.75, "y": 2},
+                {"matrix": [3, 8], "x": 10.75, "y": 2},
+                {"matrix": [3, 9], "x": 11.75, "y": 2},
+                {"matrix": [3, 10], "x": 12.75, "y": 2},
+                {"matrix": [3, 11], "x": 13.75, "y": 2},
+                {"matrix": [3, 12], "x": 14.75, "y": 2},
+                {"matrix": [3, 13], "x": 15.75, "y": 2},
+                {"matrix": [7, 10], "x": 18.25, "y": 2},
+
+                {"matrix": [7, 2], "x": 0, "y": 3},
+                {"matrix": [6, 2], "x": 1, "y": 3},
+
+                {"matrix": [2, 0], "x": 2.25, "y": 3, "w": 1.75},
+                {"matrix": [2, 1], "x": 4, "y": 3},
+                {"matrix": [2, 2], "x": 5, "y": 3},
+                {"matrix": [2, 3], "x": 6, "y": 3},
+                {"matrix": [2, 4], "x": 7, "y": 3},
+                {"matrix": [2, 5], "x": 8, "y": 3},
+
+                {"matrix": [2, 7], "x": 10, "y": 3},
+                {"matrix": [2, 8], "x": 11, "y": 3},
+                {"matrix": [2, 9], "x": 12, "y": 3},
+                {"matrix": [2, 10], "x": 13, "y": 3},
+                {"matrix": [2, 11], "x": 14, "y": 3},
+                {"matrix": [2, 12], "x": 15, "y": 3},
+                {"matrix": [2, 13], "x": 16, "y": 3},
+                {"matrix": [6, 11], "x": 17, "y": 2, "w": 1.25, "h": 2},
+                {"matrix": [7, 11], "x": 18.25, "y": 3},
+
+                {"matrix": [7, 1], "x": 0, "y": 4},
+                {"matrix": [6, 1], "x": 1, "y": 4},
+
+                {"matrix": [1, 0], "x": 2.25, "y": 4, "w": 1.25},
+                {"matrix": [1, 1], "x": 3.5, "y": 4},
+                {"matrix": [1, 2], "x": 4.5, "y": 4},
+                {"matrix": [1, 3], "x": 5.5, "y": 4},
+                {"matrix": [1, 4], "x": 6.5, "y": 4},
+                {"matrix": [1, 5], "x": 7.5, "y": 4},
+                {"matrix": [1, 6], "x": 8.5, "y": 4},
+
+                {"matrix": [1, 7], "x": 10.5, "y": 4},
+                {"matrix": [1, 8], "x": 11.5, "y": 4},
+                {"matrix": [1, 9], "x": 12.5, "y": 4},
+                {"matrix": [1, 10], "x": 13.5, "y": 4},
+                {"matrix": [1, 11], "x": 14.5, "y": 4},
+                {"matrix": [1, 13], "x": 15.5, "y": 4, "w": 1.75},
+                {"matrix": [6, 12], "x": 17.25, "y": 4},
+                {"matrix": [7, 12], "x": 18.25, "y": 4},
+
+                {"matrix": [7, 0], "x": 0, "y": 5},
+                {"matrix": [6, 0], "x": 1, "y": 5},
+
+                {"matrix": [0, 0], "x": 2.25, "y": 5, "w": 1.25},
+                {"matrix": [0, 1], "x": 3.5, "y": 5, "w": 1.25},
+                {"matrix": [0, 2], "x": 4.75, "y": 5, "w": 1.25},
+                {"matrix": [0, 3], "x": 6, "y": 5, "w": 2},
+                {"matrix": [0, 4], "x": 8, "y": 5},
+
+                {"matrix": [0, 7], "x": 10, "y": 5, "w": 2.75},
+                {"matrix": [0, 10], "x": 12.75, "y": 5, "w": 1.25},
+                {"matrix": [0, 11], "x": 14, "y": 5},
+                {"matrix": [0, 12], "x": 15, "y": 5, "w": 1.25},
+                {"matrix": [0, 13], "x": 16.25, "y": 5},
+                {"matrix": [6, 13], "x": 17.25, "y": 5},
+                {"matrix": [7, 13], "x": 18.25, "y": 5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/mt/split75/rules.mk b/keyboards/mt/split75/rules.mk
index b0c02543b19..bbfc7cbbf72 100644
--- a/keyboards/mt/split75/rules.mk
+++ b/keyboards/mt/split75/rules.mk
@@ -1,14 +1,3 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-
 # custom matrix setup
 CUSTOM_MATRIX = lite
 SRC = matrix.c
diff --git a/keyboards/nack/info.json b/keyboards/nack/info.json
deleted file mode 100644
index 4af3f641261..00000000000
--- a/keyboards/nack/info.json
+++ /dev/null
@@ -1,144 +0,0 @@
-{
-    "keyboard_name": "nack",
-    "manufacturer": "farfalleflickan",
-    "url": "https://github.com/farfalleflickan/nack",
-    "maintainer": "farfalleflickan",
-    "usb": {
-        "vid": "0xDA12",
-        "pid": "0x6060",
-        "device_version": "0.0.1"
-    },
-    "ws2812": {
-        "pin": "B5",
-        "driver": "spi"
-    },
-    "rgb_matrix": {
-        "animations": {
-            "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,
-            "rainbow_moving_chevron": true,
-            "cycle_out_in": true,
-            "cycle_out_in_dual": 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_rain": true,
-            "pixel_flow": true,
-            "pixel_fractal": 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
-        },
-        "default": {
-            "val": 64
-        },
-        "driver": "ws2812",
-        "hue_steps": 10,
-        "sat_steps": 10,
-        "val_steps": 10,
-        "max_brightness": 128
-    },
-    "matrix_pins": {
-        "cols": ["A6", "A7", "A8", "A9", "A10", "B0", "B1", "B2", "B6", "B7", "C13", "C14", "C15"],
-        "rows": ["A0", "A1", "A2", "A3"]
-    },
-    "diode_direction": "ROW2COL",
-    "processor": "STM32F303",
-    "bootloader": "stm32-dfu",
-    "board": "QMK_PROTON_C",
-    "tapping": {
-        "toggle": 2
-    },
-    "layout_aliases": {
-        "LAYOUT": "LAYOUT_ortho_4x13"
-    },
-    "layouts": {
-        "LAYOUT_ortho_4x13": {
-            "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, 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": [1, 4], "x": 4, "y": 1},
-                {"matrix": [1, 5], "x": 5, "y": 1},
-                {"matrix": [1, 6], "x": 6, "y": 1},
-                {"matrix": [1, 7], "x": 7, "y": 1},
-                {"matrix": [1, 8], "x": 8, "y": 1},
-                {"matrix": [1, 9], "x": 9, "y": 1},
-                {"matrix": [1, 10], "x": 10, "y": 1},
-                {"matrix": [1, 11], "x": 11, "y": 1},
-                {"matrix": [1, 12], "x": 12, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2},
-                {"matrix": [2, 1], "x": 1, "y": 2},
-                {"matrix": [2, 2], "x": 2, "y": 2},
-                {"matrix": [2, 3], "x": 3, "y": 2},
-                {"matrix": [2, 4], "x": 4, "y": 2},
-                {"matrix": [2, 5], "x": 5, "y": 2},
-                {"matrix": [2, 6], "x": 6, "y": 2},
-                {"matrix": [2, 7], "x": 7, "y": 2},
-                {"matrix": [2, 8], "x": 8, "y": 2},
-                {"matrix": [2, 9], "x": 9, "y": 2},
-                {"matrix": [2, 10], "x": 10, "y": 2},
-                {"matrix": [2, 11], "x": 11, "y": 2},
-                {"matrix": [2, 12], "x": 12, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3},
-                {"matrix": [3, 1], "x": 1, "y": 3},
-                {"matrix": [3, 2], "x": 2, "y": 3},
-                {"matrix": [3, 3], "x": 3, "y": 3},
-                {"matrix": [3, 4], "x": 4, "y": 3},
-                {"matrix": [3, 5], "x": 5, "y": 3},
-                {"matrix": [3, 6], "x": 6, "y": 3},
-                {"matrix": [3, 7], "x": 7, "y": 3},
-                {"matrix": [3, 8], "x": 8, "y": 3},
-                {"matrix": [3, 9], "x": 9, "y": 3},
-                {"matrix": [3, 10], "x": 10, "y": 3},
-                {"matrix": [3, 11], "x": 11, "y": 3},
-                {"matrix": [3, 12], "x": 12, "y": 3}
-            ]
-        }
-    }
-}
diff --git a/keyboards/nack/keyboard.json b/keyboards/nack/keyboard.json
new file mode 100644
index 00000000000..cd08aac0af4
--- /dev/null
+++ b/keyboards/nack/keyboard.json
@@ -0,0 +1,156 @@
+{
+    "keyboard_name": "nack",
+    "manufacturer": "farfalleflickan",
+    "url": "https://github.com/farfalleflickan/nack",
+    "maintainer": "farfalleflickan",
+    "usb": {
+        "vid": "0xDA12",
+        "pid": "0x6060",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "audio": true,
+        "bootmagic": false,
+        "extrakey": false,
+        "mousekey": false,
+        "nkro": true,
+        "rgb_matrix": true,
+        "unicode": true
+    },
+    "audio": {
+        "driver": "dac_basic"
+    },
+    "ws2812": {
+        "pin": "B5",
+        "driver": "spi"
+    },
+    "rgb_matrix": {
+        "animations": {
+            "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,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": 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_rain": true,
+            "pixel_flow": true,
+            "pixel_fractal": 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
+        },
+        "default": {
+            "val": 64
+        },
+        "driver": "ws2812",
+        "hue_steps": 10,
+        "sat_steps": 10,
+        "val_steps": 10,
+        "max_brightness": 128
+    },
+    "matrix_pins": {
+        "cols": ["A6", "A7", "A8", "A9", "A10", "B0", "B1", "B2", "B6", "B7", "C13", "C14", "C15"],
+        "rows": ["A0", "A1", "A2", "A3"]
+    },
+    "diode_direction": "ROW2COL",
+    "processor": "STM32F303",
+    "bootloader": "stm32-dfu",
+    "board": "QMK_PROTON_C",
+    "tapping": {
+        "toggle": 2
+    },
+    "layout_aliases": {
+        "LAYOUT": "LAYOUT_ortho_4x13"
+    },
+    "layouts": {
+        "LAYOUT_ortho_4x13": {
+            "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, 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": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+                {"matrix": [1, 12], "x": 12, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [2, 6], "x": 6, "y": 2},
+                {"matrix": [2, 7], "x": 7, "y": 2},
+                {"matrix": [2, 8], "x": 8, "y": 2},
+                {"matrix": [2, 9], "x": 9, "y": 2},
+                {"matrix": [2, 10], "x": 10, "y": 2},
+                {"matrix": [2, 11], "x": 11, "y": 2},
+                {"matrix": [2, 12], "x": 12, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
+                {"matrix": [3, 6], "x": 6, "y": 3},
+                {"matrix": [3, 7], "x": 7, "y": 3},
+                {"matrix": [3, 8], "x": 8, "y": 3},
+                {"matrix": [3, 9], "x": 9, "y": 3},
+                {"matrix": [3, 10], "x": 10, "y": 3},
+                {"matrix": [3, 11], "x": 11, "y": 3},
+                {"matrix": [3, 12], "x": 12, "y": 3}
+            ]
+        }
+    }
+}
diff --git a/keyboards/nack/rules.mk b/keyboards/nack/rules.mk
deleted file mode 100644
index d2558648ddc..00000000000
--- a/keyboards/nack/rules.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = no        # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = yes          # Audio output
-RGB_MATRIX_ENABLE = yes
-AUDIO_DRIVER = dac_basic 	# How to drive the 2 speakers
-UNICODE_ENABLE = yes        # Unicode support
diff --git a/keyboards/nasu/info.json b/keyboards/nasu/info.json
deleted file mode 100644
index c92da94c502..00000000000
--- a/keyboards/nasu/info.json
+++ /dev/null
@@ -1,190 +0,0 @@
-{
-    "keyboard_name": "Nasu",
-    "manufacturer": "Yiancar-Designs",
-    "url": "https://yiancar-designs.com",
-    "maintainer": "Yiancar-Designs",
-    "usb": {
-        "vid": "0x8968",
-        "pid": "0x4E53",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["A9", "A8", "B15", "B14", "B13", "B12", "B11", "B8", "B7", "B6", "B5", "B4", "B3", "A15", "A14"],
-        "rows": ["A13", "A10", "B10", "B2", "A6"]
-    },
-    "diode_direction": "COL2ROW",
-    "indicators": {
-        "caps_lock": "B1",
-        "num_lock": "B0",
-        "scroll_lock": "A7"
-    },
-    "bootmagic": {
-        "matrix": [1, 0]
-    },
-    "processor": "STM32F072",
-    "bootloader": "stm32-dfu",
-    "community_layouts": ["alice", "alice_split_bs"],
-    "layouts": {
-        "LAYOUT_alice": {
-            "layout": [
-                {"matrix": [1, 0], "x": 0, "y": 0},
-
-                {"matrix": [0, 0], "x": 1.25, "y": 0},
-                {"matrix": [0, 1], "x": 2.25, "y": 0},
-                {"matrix": [0, 2], "x": 3.25, "y": 0},
-                {"matrix": [0, 3], "x": 4.25, "y": 0},
-                {"matrix": [0, 4], "x": 5.25, "y": 0},
-                {"matrix": [0, 5], "x": 6.25, "y": 0},
-                {"matrix": [0, 6], "x": 7.25, "y": 0},
-
-                {"matrix": [0, 7], "x": 10.25, "y": 0},
-                {"matrix": [0, 8], "x": 11.25, "y": 0},
-                {"matrix": [0, 9], "x": 12.25, "y": 0},
-                {"matrix": [0, 10], "x": 13.25, "y": 0},
-                {"matrix": [0, 11], "x": 14.25, "y": 0},
-                {"matrix": [0, 12], "x": 15.25, "y": 0},
-                {"matrix": [0, 14], "x": 16.25, "y": 0, "w": 2},
-
-                {"matrix": [2, 0], "x": 0, "y": 1},
-
-                {"matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
-                {"matrix": [1, 2], "x": 2.75, "y": 1},
-                {"matrix": [1, 3], "x": 3.75, "y": 1},
-                {"matrix": [1, 4], "x": 4.75, "y": 1},
-                {"matrix": [1, 5], "x": 5.75, "y": 1},
-                {"matrix": [1, 6], "x": 6.75, "y": 1},
-
-                {"matrix": [1, 7], "x": 9.75, "y": 1},
-                {"matrix": [1, 8], "x": 10.75, "y": 1},
-                {"matrix": [1, 9], "x": 11.75, "y": 1},
-                {"matrix": [1, 10], "x": 12.75, "y": 1},
-                {"matrix": [1, 11], "x": 13.75, "y": 1},
-                {"matrix": [1, 12], "x": 14.75, "y": 1},
-                {"matrix": [1, 13], "x": 15.75, "y": 1},
-                {"matrix": [1, 14], "x": 16.75, "y": 1, "w": 1.5},
-
-                {"matrix": [3, 0], "x": 0, "y": 2},
-
-                {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
-                {"matrix": [2, 2], "x": 3, "y": 2},
-                {"matrix": [2, 3], "x": 4, "y": 2},
-                {"matrix": [2, 4], "x": 5, "y": 2},
-                {"matrix": [2, 5], "x": 6, "y": 2},
-                {"matrix": [2, 6], "x": 7, "y": 2},
-
-                {"matrix": [2, 7], "x": 10, "y": 2},
-                {"matrix": [2, 8], "x": 11, "y": 2},
-                {"matrix": [2, 9], "x": 12, "y": 2},
-                {"matrix": [2, 10], "x": 13, "y": 2},
-                {"matrix": [2, 11], "x": 14, "y": 2},
-                {"matrix": [2, 12], "x": 15, "y": 2},
-                {"matrix": [2, 14], "x": 16, "y": 2, "w": 2.25},
-
-                {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
-                {"matrix": [3, 2], "x": 3.5, "y": 3},
-                {"matrix": [3, 3], "x": 4.5, "y": 3},
-                {"matrix": [3, 4], "x": 5.5, "y": 3},
-                {"matrix": [3, 5], "x": 6.5, "y": 3},
-                {"matrix": [3, 6], "x": 7.5, "y": 3},
-
-                {"matrix": [3, 7], "x": 9.5, "y": 3},
-                {"matrix": [3, 8], "x": 10.5, "y": 3},
-                {"matrix": [3, 9], "x": 11.5, "y": 3},
-                {"matrix": [3, 10], "x": 12.5, "y": 3},
-                {"matrix": [3, 11], "x": 13.5, "y": 3},
-                {"matrix": [3, 12], "x": 14.5, "y": 3},
-                {"matrix": [3, 13], "x": 15.5, "y": 3, "w": 1.75},
-                {"matrix": [3, 14], "x": 17.25, "y": 3},
-
-                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.5},
-                {"matrix": [4, 3], "x": 4.25, "y": 4, "w": 1.5},
-                {"matrix": [4, 5], "x": 5.75, "y": 4, "w": 2},
-                {"matrix": [4, 6], "x": 7.75, "y": 4, "w": 1.25},
-                {"matrix": [4, 8], "x": 9.5, "y": 4, "w": 2.75},
-                {"matrix": [4, 10], "x": 12.25, "y": 4, "w": 1.5},
-                {"matrix": [4, 14], "x": 16.75, "y": 4, "w": 1.5}
-            ]
-        },
-        "LAYOUT_alice_split_bs": {
-            "layout": [
-                {"matrix": [1, 0], "x": 0, "y": 0},
-
-                {"matrix": [0, 0], "x": 1.25, "y": 0},
-                {"matrix": [0, 1], "x": 2.25, "y": 0},
-                {"matrix": [0, 2], "x": 3.25, "y": 0},
-                {"matrix": [0, 3], "x": 4.25, "y": 0},
-                {"matrix": [0, 4], "x": 5.25, "y": 0},
-                {"matrix": [0, 5], "x": 6.25, "y": 0},
-                {"matrix": [0, 6], "x": 7.25, "y": 0},
-
-                {"matrix": [0, 7], "x": 10.25, "y": 0},
-                {"matrix": [0, 8], "x": 11.25, "y": 0},
-                {"matrix": [0, 9], "x": 12.25, "y": 0},
-                {"matrix": [0, 10], "x": 13.25, "y": 0},
-                {"matrix": [0, 11], "x": 14.25, "y": 0},
-                {"matrix": [0, 12], "x": 15.25, "y": 0},
-                {"matrix": [0, 13], "x": 16.25, "y": 0},
-                {"matrix": [0, 14], "x": 17.25, "y": 0},
-
-                {"matrix": [2, 0], "x": 0, "y": 1},
-
-                {"matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
-                {"matrix": [1, 2], "x": 2.75, "y": 1},
-                {"matrix": [1, 3], "x": 3.75, "y": 1},
-                {"matrix": [1, 4], "x": 4.75, "y": 1},
-                {"matrix": [1, 5], "x": 5.75, "y": 1},
-                {"matrix": [1, 6], "x": 6.75, "y": 1},
-
-                {"matrix": [1, 7], "x": 9.75, "y": 1},
-                {"matrix": [1, 8], "x": 10.75, "y": 1},
-                {"matrix": [1, 9], "x": 11.75, "y": 1},
-                {"matrix": [1, 10], "x": 12.75, "y": 1},
-                {"matrix": [1, 11], "x": 13.75, "y": 1},
-                {"matrix": [1, 12], "x": 14.75, "y": 1},
-                {"matrix": [1, 13], "x": 15.75, "y": 1},
-                {"matrix": [1, 14], "x": 16.75, "y": 1, "w": 1.5},
-
-                {"matrix": [3, 0], "x": 0, "y": 2},
-
-                {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
-                {"matrix": [2, 2], "x": 3, "y": 2},
-                {"matrix": [2, 3], "x": 4, "y": 2},
-                {"matrix": [2, 4], "x": 5, "y": 2},
-                {"matrix": [2, 5], "x": 6, "y": 2},
-                {"matrix": [2, 6], "x": 7, "y": 2},
-
-                {"matrix": [2, 7], "x": 10, "y": 2},
-                {"matrix": [2, 8], "x": 11, "y": 2},
-                {"matrix": [2, 9], "x": 12, "y": 2},
-                {"matrix": [2, 10], "x": 13, "y": 2},
-                {"matrix": [2, 11], "x": 14, "y": 2},
-                {"matrix": [2, 12], "x": 15, "y": 2},
-                {"matrix": [2, 14], "x": 16, "y": 2, "w": 2.25},
-
-                {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
-                {"matrix": [3, 2], "x": 3.5, "y": 3},
-                {"matrix": [3, 3], "x": 4.5, "y": 3},
-                {"matrix": [3, 4], "x": 5.5, "y": 3},
-                {"matrix": [3, 5], "x": 6.5, "y": 3},
-                {"matrix": [3, 6], "x": 7.5, "y": 3},
-
-                {"matrix": [3, 7], "x": 9.5, "y": 3},
-                {"matrix": [3, 8], "x": 10.5, "y": 3},
-                {"matrix": [3, 9], "x": 11.5, "y": 3},
-                {"matrix": [3, 10], "x": 12.5, "y": 3},
-                {"matrix": [3, 11], "x": 13.5, "y": 3},
-                {"matrix": [3, 12], "x": 14.5, "y": 3},
-                {"matrix": [3, 13], "x": 15.5, "y": 3, "w": 1.75},
-                {"matrix": [3, 14], "x": 17.25, "y": 3},
-
-                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.5},
-                {"matrix": [4, 3], "x": 4.25, "y": 4, "w": 1.5},
-                {"matrix": [4, 5], "x": 5.75, "y": 4, "w": 2},
-                {"matrix": [4, 6], "x": 7.75, "y": 4, "w": 1.25},
-                {"matrix": [4, 8], "x": 9.5, "y": 4, "w": 2.75},
-                {"matrix": [4, 10], "x": 12.25, "y": 4, "w": 1.5},
-                {"matrix": [4, 14], "x": 16.75, "y": 4, "w": 1.5}
-            ]
-        }
-    }
-}
diff --git a/keyboards/nasu/keyboard.json b/keyboards/nasu/keyboard.json
new file mode 100644
index 00000000000..54905f4d097
--- /dev/null
+++ b/keyboards/nasu/keyboard.json
@@ -0,0 +1,196 @@
+{
+    "keyboard_name": "Nasu",
+    "manufacturer": "Yiancar-Designs",
+    "url": "https://yiancar-designs.com",
+    "maintainer": "Yiancar-Designs",
+    "usb": {
+        "vid": "0x8968",
+        "pid": "0x4E53",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "matrix_pins": {
+        "cols": ["A9", "A8", "B15", "B14", "B13", "B12", "B11", "B8", "B7", "B6", "B5", "B4", "B3", "A15", "A14"],
+        "rows": ["A13", "A10", "B10", "B2", "A6"]
+    },
+    "diode_direction": "COL2ROW",
+    "indicators": {
+        "caps_lock": "B1",
+        "num_lock": "B0",
+        "scroll_lock": "A7"
+    },
+    "bootmagic": {
+        "matrix": [1, 0]
+    },
+    "processor": "STM32F072",
+    "bootloader": "stm32-dfu",
+    "community_layouts": ["alice", "alice_split_bs"],
+    "layouts": {
+        "LAYOUT_alice": {
+            "layout": [
+                {"matrix": [1, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 0], "x": 1.25, "y": 0},
+                {"matrix": [0, 1], "x": 2.25, "y": 0},
+                {"matrix": [0, 2], "x": 3.25, "y": 0},
+                {"matrix": [0, 3], "x": 4.25, "y": 0},
+                {"matrix": [0, 4], "x": 5.25, "y": 0},
+                {"matrix": [0, 5], "x": 6.25, "y": 0},
+                {"matrix": [0, 6], "x": 7.25, "y": 0},
+
+                {"matrix": [0, 7], "x": 10.25, "y": 0},
+                {"matrix": [0, 8], "x": 11.25, "y": 0},
+                {"matrix": [0, 9], "x": 12.25, "y": 0},
+                {"matrix": [0, 10], "x": 13.25, "y": 0},
+                {"matrix": [0, 11], "x": 14.25, "y": 0},
+                {"matrix": [0, 12], "x": 15.25, "y": 0},
+                {"matrix": [0, 14], "x": 16.25, "y": 0, "w": 2},
+
+                {"matrix": [2, 0], "x": 0, "y": 1},
+
+                {"matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 2.75, "y": 1},
+                {"matrix": [1, 3], "x": 3.75, "y": 1},
+                {"matrix": [1, 4], "x": 4.75, "y": 1},
+                {"matrix": [1, 5], "x": 5.75, "y": 1},
+                {"matrix": [1, 6], "x": 6.75, "y": 1},
+
+                {"matrix": [1, 7], "x": 9.75, "y": 1},
+                {"matrix": [1, 8], "x": 10.75, "y": 1},
+                {"matrix": [1, 9], "x": 11.75, "y": 1},
+                {"matrix": [1, 10], "x": 12.75, "y": 1},
+                {"matrix": [1, 11], "x": 13.75, "y": 1},
+                {"matrix": [1, 12], "x": 14.75, "y": 1},
+                {"matrix": [1, 13], "x": 15.75, "y": 1},
+                {"matrix": [1, 14], "x": 16.75, "y": 1, "w": 1.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 2},
+
+                {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 3, "y": 2},
+                {"matrix": [2, 3], "x": 4, "y": 2},
+                {"matrix": [2, 4], "x": 5, "y": 2},
+                {"matrix": [2, 5], "x": 6, "y": 2},
+                {"matrix": [2, 6], "x": 7, "y": 2},
+
+                {"matrix": [2, 7], "x": 10, "y": 2},
+                {"matrix": [2, 8], "x": 11, "y": 2},
+                {"matrix": [2, 9], "x": 12, "y": 2},
+                {"matrix": [2, 10], "x": 13, "y": 2},
+                {"matrix": [2, 11], "x": 14, "y": 2},
+                {"matrix": [2, 12], "x": 15, "y": 2},
+                {"matrix": [2, 14], "x": 16, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 3.5, "y": 3},
+                {"matrix": [3, 3], "x": 4.5, "y": 3},
+                {"matrix": [3, 4], "x": 5.5, "y": 3},
+                {"matrix": [3, 5], "x": 6.5, "y": 3},
+                {"matrix": [3, 6], "x": 7.5, "y": 3},
+
+                {"matrix": [3, 7], "x": 9.5, "y": 3},
+                {"matrix": [3, 8], "x": 10.5, "y": 3},
+                {"matrix": [3, 9], "x": 11.5, "y": 3},
+                {"matrix": [3, 10], "x": 12.5, "y": 3},
+                {"matrix": [3, 11], "x": 13.5, "y": 3},
+                {"matrix": [3, 12], "x": 14.5, "y": 3},
+                {"matrix": [3, 13], "x": 15.5, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 17.25, "y": 3},
+
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 3], "x": 4.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 5], "x": 5.75, "y": 4, "w": 2},
+                {"matrix": [4, 6], "x": 7.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 8], "x": 9.5, "y": 4, "w": 2.75},
+                {"matrix": [4, 10], "x": 12.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 14], "x": 16.75, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_alice_split_bs": {
+            "layout": [
+                {"matrix": [1, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 0], "x": 1.25, "y": 0},
+                {"matrix": [0, 1], "x": 2.25, "y": 0},
+                {"matrix": [0, 2], "x": 3.25, "y": 0},
+                {"matrix": [0, 3], "x": 4.25, "y": 0},
+                {"matrix": [0, 4], "x": 5.25, "y": 0},
+                {"matrix": [0, 5], "x": 6.25, "y": 0},
+                {"matrix": [0, 6], "x": 7.25, "y": 0},
+
+                {"matrix": [0, 7], "x": 10.25, "y": 0},
+                {"matrix": [0, 8], "x": 11.25, "y": 0},
+                {"matrix": [0, 9], "x": 12.25, "y": 0},
+                {"matrix": [0, 10], "x": 13.25, "y": 0},
+                {"matrix": [0, 11], "x": 14.25, "y": 0},
+                {"matrix": [0, 12], "x": 15.25, "y": 0},
+                {"matrix": [0, 13], "x": 16.25, "y": 0},
+                {"matrix": [0, 14], "x": 17.25, "y": 0},
+
+                {"matrix": [2, 0], "x": 0, "y": 1},
+
+                {"matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 2.75, "y": 1},
+                {"matrix": [1, 3], "x": 3.75, "y": 1},
+                {"matrix": [1, 4], "x": 4.75, "y": 1},
+                {"matrix": [1, 5], "x": 5.75, "y": 1},
+                {"matrix": [1, 6], "x": 6.75, "y": 1},
+
+                {"matrix": [1, 7], "x": 9.75, "y": 1},
+                {"matrix": [1, 8], "x": 10.75, "y": 1},
+                {"matrix": [1, 9], "x": 11.75, "y": 1},
+                {"matrix": [1, 10], "x": 12.75, "y": 1},
+                {"matrix": [1, 11], "x": 13.75, "y": 1},
+                {"matrix": [1, 12], "x": 14.75, "y": 1},
+                {"matrix": [1, 13], "x": 15.75, "y": 1},
+                {"matrix": [1, 14], "x": 16.75, "y": 1, "w": 1.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 2},
+
+                {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 3, "y": 2},
+                {"matrix": [2, 3], "x": 4, "y": 2},
+                {"matrix": [2, 4], "x": 5, "y": 2},
+                {"matrix": [2, 5], "x": 6, "y": 2},
+                {"matrix": [2, 6], "x": 7, "y": 2},
+
+                {"matrix": [2, 7], "x": 10, "y": 2},
+                {"matrix": [2, 8], "x": 11, "y": 2},
+                {"matrix": [2, 9], "x": 12, "y": 2},
+                {"matrix": [2, 10], "x": 13, "y": 2},
+                {"matrix": [2, 11], "x": 14, "y": 2},
+                {"matrix": [2, 12], "x": 15, "y": 2},
+                {"matrix": [2, 14], "x": 16, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 3.5, "y": 3},
+                {"matrix": [3, 3], "x": 4.5, "y": 3},
+                {"matrix": [3, 4], "x": 5.5, "y": 3},
+                {"matrix": [3, 5], "x": 6.5, "y": 3},
+                {"matrix": [3, 6], "x": 7.5, "y": 3},
+
+                {"matrix": [3, 7], "x": 9.5, "y": 3},
+                {"matrix": [3, 8], "x": 10.5, "y": 3},
+                {"matrix": [3, 9], "x": 11.5, "y": 3},
+                {"matrix": [3, 10], "x": 12.5, "y": 3},
+                {"matrix": [3, 11], "x": 13.5, "y": 3},
+                {"matrix": [3, 12], "x": 14.5, "y": 3},
+                {"matrix": [3, 13], "x": 15.5, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 17.25, "y": 3},
+
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 3], "x": 4.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 5], "x": 5.75, "y": 4, "w": 2},
+                {"matrix": [4, 6], "x": 7.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 8], "x": 9.5, "y": 4, "w": 2.75},
+                {"matrix": [4, 10], "x": 12.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 14], "x": 16.75, "y": 4, "w": 1.5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/nasu/rules.mk b/keyboards/nasu/rules.mk
index 7c0709f41e6..0ab54aaaf71 100644
--- a/keyboards/nasu/rules.mk
+++ b/keyboards/nasu/rules.mk
@@ -1,15 +1,2 @@
 # Wildcard to allow APM32 MCU
 DFU_SUFFIX_ARGS = -v FFFF -p FFFF
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
diff --git a/keyboards/nek_type_a/info.json b/keyboards/nek_type_a/info.json
deleted file mode 100644
index 6cb972b17f6..00000000000
--- a/keyboards/nek_type_a/info.json
+++ /dev/null
@@ -1,128 +0,0 @@
-{
-    "keyboard_name": "NEK Type A",
-    "manufacturer": "miker",
-    "url": "",
-    "maintainer": "ecopoesis",
-    "usb": {
-        "vid": "0xFEED",
-        "pid": "0x0000",
-        "device_version": "0.0.1"
-    },
-    "bluetooth": {
-        "driver": "bluefruit_le"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 1], "x": 0.5, "y": 0, "w": 1.75},
-
-                {"matrix": [0, 3], "x": 2.75, "y": 0},
-                {"matrix": [0, 4], "x": 3.75, "y": 0},
-                {"matrix": [0, 5], "x": 4.75, "y": 0},
-                {"matrix": [0, 6], "x": 5.75, "y": 0},
-
-                {"matrix": [0, 7], "x": 8.25, "y": 0},
-                {"matrix": [0, 8], "x": 9.25, "y": 0},
-                {"matrix": [0, 9], "x": 10.25, "y": 0},
-                {"matrix": [0, 10], "x": 11.25, "y": 0},
-
-                {"matrix": [0, 11], "x": 12.5, "y": 0},
-                {"matrix": [0, 12], "x": 13.5, "y": 0},
-                {"matrix": [0, 13], "x": 14.5, "y": 0},
-                {"matrix": [0, 14], "x": 15.5, "y": 0},
-
-                {"matrix": [0, 15], "x": 16.75, "y": 0},
-                {"matrix": [0, 16], "x": 17.75, "y": 0},
-                {"matrix": [0, 17], "x": 18.75, "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": 8, "y": 1.25, "w": 1.5},
-                {"matrix": [1, 8], "x": 9.5, "y": 1.25},
-                {"matrix": [1, 9], "x": 10.5, "y": 1.25},
-                {"matrix": [1, 10], "x": 11.5, "y": 1.25},
-                {"matrix": [1, 11], "x": 12.5, "y": 1.25},
-                {"matrix": [1, 12], "x": 13.5, "y": 1.25},
-                {"matrix": [1, 14], "x": 14.5, "y": 1.25, "w": 2},
-
-                {"matrix": [1, 15], "x": 16.75, "y": 1.25},
-                {"matrix": [1, 16], "x": 17.75, "y": 1.25},
-                {"matrix": [1, 17], "x": 18.75, "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, "w": 1.5},
-
-                {"matrix": [2, 7], "x": 8, "y": 2.25},
-                {"matrix": [2, 8], "x": 9, "y": 2.25},
-                {"matrix": [2, 9], "x": 10, "y": 2.25},
-                {"matrix": [2, 10], "x": 11, "y": 2.25},
-                {"matrix": [2, 11], "x": 12, "y": 2.25},
-                {"matrix": [2, 12], "x": 13, "y": 2.25},
-                {"matrix": [2, 13], "x": 14, "y": 2.25},
-                {"matrix": [2, 14], "x": 15, "y": 2.25, "w": 1.5},
-
-                {"matrix": [2, 15], "x": 16.75, "y": 2.25},
-                {"matrix": [2, 16], "x": 17.75, "y": 2.25},
-                {"matrix": [2, 17], "x": 18.75, "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, "w": 1.25},
-
-                {"matrix": [3, 7], "x": 8, "y": 3.25, "w": 1.25},
-                {"matrix": [3, 8], "x": 9.25, "y": 3.25},
-                {"matrix": [3, 9], "x": 10.25, "y": 3.25},
-                {"matrix": [3, 10], "x": 11.25, "y": 3.25},
-                {"matrix": [3, 11], "x": 12.25, "y": 3.25},
-                {"matrix": [3, 12], "x": 13.25, "y": 3.25},
-                {"matrix": [3, 14], "x": 14.25, "y": 3.25, "w": 2.25},
-
-                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2},
-                {"matrix": [4, 1], "x": 2, "y": 4.25},
-                {"matrix": [4, 2], "x": 3, "y": 4.25},
-                {"matrix": [4, 3], "x": 4, "y": 4.25},
-                {"matrix": [4, 4], "x": 5, "y": 4.25},
-                {"matrix": [4, 5], "x": 6, "y": 4.25},
-
-                {"matrix": [4, 7], "x": 8, "y": 4.25, "w": 1.5},
-                {"matrix": [4, 8], "x": 9.5, "y": 4.25},
-                {"matrix": [4, 9], "x": 10.5, "y": 4.25},
-                {"matrix": [4, 10], "x": 11.5, "y": 4.25},
-                {"matrix": [4, 11], "x": 12.5, "y": 4.25},
-                {"matrix": [4, 14], "x": 13.5, "y": 4.25, "w": 2.75},
-
-                {"matrix": [4, 16], "x": 17.75, "y": 3.75},
-
-                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
-                {"matrix": [5, 1], "x": 1.5, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 2], "x": 2.75, "y": 5.25, "w": 1.5},
-                {"matrix": [5, 4], "x": 4.25, "y": 5.25, "w": 2.75},
-
-                {"matrix": [5, 7], "x": 8, "y": 5.25, "w": 2.75},
-                {"matrix": [5, 9], "x": 10.75, "y": 5.25, "w": 1.5},
-                {"matrix": [5, 11], "x": 12.25, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 12], "x": 13.5, "y": 5.25, "w": 1.5},
-                {"matrix": [5, 14], "x": 15, "y": 5.25, "w": 1.25},
-
-                {"matrix": [5, 15], "x": 16.75, "y": 4.75},
-                {"matrix": [5, 16], "x": 17.75, "y": 4.75},
-                {"matrix": [5, 17], "x": 18.75, "y": 4.75}
-            ]
-        }
-    }
-}
diff --git a/keyboards/nek_type_a/keyboard.json b/keyboards/nek_type_a/keyboard.json
new file mode 100644
index 00000000000..632eafee44c
--- /dev/null
+++ b/keyboards/nek_type_a/keyboard.json
@@ -0,0 +1,137 @@
+{
+    "keyboard_name": "NEK Type A",
+    "manufacturer": "miker",
+    "url": "",
+    "maintainer": "ecopoesis",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0x0000",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bluetooth": true,
+        "bootmagic": false,
+        "command": true,
+        "console": true,
+        "extrakey": true,
+        "mousekey": false,
+        "nkro": false
+    },
+    "bluetooth": {
+        "driver": "bluefruit_le"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 1], "x": 0.5, "y": 0, "w": 1.75},
+
+                {"matrix": [0, 3], "x": 2.75, "y": 0},
+                {"matrix": [0, 4], "x": 3.75, "y": 0},
+                {"matrix": [0, 5], "x": 4.75, "y": 0},
+                {"matrix": [0, 6], "x": 5.75, "y": 0},
+
+                {"matrix": [0, 7], "x": 8.25, "y": 0},
+                {"matrix": [0, 8], "x": 9.25, "y": 0},
+                {"matrix": [0, 9], "x": 10.25, "y": 0},
+                {"matrix": [0, 10], "x": 11.25, "y": 0},
+
+                {"matrix": [0, 11], "x": 12.5, "y": 0},
+                {"matrix": [0, 12], "x": 13.5, "y": 0},
+                {"matrix": [0, 13], "x": 14.5, "y": 0},
+                {"matrix": [0, 14], "x": 15.5, "y": 0},
+
+                {"matrix": [0, 15], "x": 16.75, "y": 0},
+                {"matrix": [0, 16], "x": 17.75, "y": 0},
+                {"matrix": [0, 17], "x": 18.75, "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": 8, "y": 1.25, "w": 1.5},
+                {"matrix": [1, 8], "x": 9.5, "y": 1.25},
+                {"matrix": [1, 9], "x": 10.5, "y": 1.25},
+                {"matrix": [1, 10], "x": 11.5, "y": 1.25},
+                {"matrix": [1, 11], "x": 12.5, "y": 1.25},
+                {"matrix": [1, 12], "x": 13.5, "y": 1.25},
+                {"matrix": [1, 14], "x": 14.5, "y": 1.25, "w": 2},
+
+                {"matrix": [1, 15], "x": 16.75, "y": 1.25},
+                {"matrix": [1, 16], "x": 17.75, "y": 1.25},
+                {"matrix": [1, 17], "x": 18.75, "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, "w": 1.5},
+
+                {"matrix": [2, 7], "x": 8, "y": 2.25},
+                {"matrix": [2, 8], "x": 9, "y": 2.25},
+                {"matrix": [2, 9], "x": 10, "y": 2.25},
+                {"matrix": [2, 10], "x": 11, "y": 2.25},
+                {"matrix": [2, 11], "x": 12, "y": 2.25},
+                {"matrix": [2, 12], "x": 13, "y": 2.25},
+                {"matrix": [2, 13], "x": 14, "y": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2.25, "w": 1.5},
+
+                {"matrix": [2, 15], "x": 16.75, "y": 2.25},
+                {"matrix": [2, 16], "x": 17.75, "y": 2.25},
+                {"matrix": [2, 17], "x": 18.75, "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, "w": 1.25},
+
+                {"matrix": [3, 7], "x": 8, "y": 3.25, "w": 1.25},
+                {"matrix": [3, 8], "x": 9.25, "y": 3.25},
+                {"matrix": [3, 9], "x": 10.25, "y": 3.25},
+                {"matrix": [3, 10], "x": 11.25, "y": 3.25},
+                {"matrix": [3, 11], "x": 12.25, "y": 3.25},
+                {"matrix": [3, 12], "x": 13.25, "y": 3.25},
+                {"matrix": [3, 14], "x": 14.25, "y": 3.25, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2},
+                {"matrix": [4, 1], "x": 2, "y": 4.25},
+                {"matrix": [4, 2], "x": 3, "y": 4.25},
+                {"matrix": [4, 3], "x": 4, "y": 4.25},
+                {"matrix": [4, 4], "x": 5, "y": 4.25},
+                {"matrix": [4, 5], "x": 6, "y": 4.25},
+
+                {"matrix": [4, 7], "x": 8, "y": 4.25, "w": 1.5},
+                {"matrix": [4, 8], "x": 9.5, "y": 4.25},
+                {"matrix": [4, 9], "x": 10.5, "y": 4.25},
+                {"matrix": [4, 10], "x": 11.5, "y": 4.25},
+                {"matrix": [4, 11], "x": 12.5, "y": 4.25},
+                {"matrix": [4, 14], "x": 13.5, "y": 4.25, "w": 2.75},
+
+                {"matrix": [4, 16], "x": 17.75, "y": 3.75},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 1], "x": 1.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.75, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 4], "x": 4.25, "y": 5.25, "w": 2.75},
+
+                {"matrix": [5, 7], "x": 8, "y": 5.25, "w": 2.75},
+                {"matrix": [5, 9], "x": 10.75, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 11], "x": 12.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 12], "x": 13.5, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 14], "x": 15, "y": 5.25, "w": 1.25},
+
+                {"matrix": [5, 15], "x": 16.75, "y": 4.75},
+                {"matrix": [5, 16], "x": 17.75, "y": 4.75},
+                {"matrix": [5, 17], "x": 18.75, "y": 4.75}
+            ]
+        }
+    }
+}
diff --git a/keyboards/nek_type_a/rules.mk b/keyboards/nek_type_a/rules.mk
index f79051ebceb..e753d6afbe3 100644
--- a/keyboards/nek_type_a/rules.mk
+++ b/keyboards/nek_type_a/rules.mk
@@ -1,20 +1,5 @@
 # Processor frequency
 F_CPU = 8000000
 
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = yes        # Console for debug
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
 CUSTOM_MATRIX = yes
-DEBUG_ENABLE = yes
-BLUETOOTH_ENABLE = yes
-
 SRC += matrix.c mcp23017.c
diff --git a/keyboards/neson_design/700e/info.json b/keyboards/neson_design/700e/info.json
deleted file mode 100644
index 3b74e9609a9..00000000000
--- a/keyboards/neson_design/700e/info.json
+++ /dev/null
@@ -1,294 +0,0 @@
-{
-    "keyboard_name": "700E",
-    "manufacturer": "Neson Design",
-    "url": "",
-    "maintainer": "yulei",
-    "usb": {
-        "vid": "0x4E65",
-        "pid": "0x700E",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["F7", "B0", "B3", "B1", "B2", "F4", "C7", "C6", "B6", "B5", "B4", "D7", "D3", "D2", "D6", "D4"],
-        "rows": ["E6", "B7", "F6", "F1", "F0"]
-    },
-    "diode_direction": "COL2ROW",
-    "indicators": {
-        "caps_lock": "F5"
-    },
-    "rgblight": {
-        "saturation_steps": 8,
-        "brightness_steps": 8,
-        "led_count": 68,
-        "driver": "custom",
-        "animations": {
-            "breathing": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "snake": true,
-            "knight": true,
-            "christmas": true,
-            "static_gradient": true,
-            "rgb_test": true,
-            "alternating": true
-        }
-    },
-    "ws2812": {
-        "pin": "D5"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "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": [4, 13], "x": 14, "y": 0},
-
-                {"matrix": [0, 14], "x": 15.5, "y": 0},
-                {"matrix": [0, 15], "x": 16.5, "y": 0},
-                {"matrix": [1, 15], "x": 17.5, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"matrix": [1, 14], "x": 15.5, "y": 1},
-                {"matrix": [2, 14], "x": 16.5, "y": 1},
-                {"matrix": [2, 15], "x": 17.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": 2, "w": 1.25},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
-                {"matrix": [3, 1], "x": 1.25, "y": 3},
-                {"matrix": [3, 2], "x": 2.25, "y": 3},
-                {"matrix": [3, 3], "x": 3.25, "y": 3},
-                {"matrix": [3, 4], "x": 4.25, "y": 3},
-                {"matrix": [3, 5], "x": 5.25, "y": 3},
-                {"matrix": [3, 6], "x": 6.25, "y": 3},
-                {"matrix": [3, 7], "x": 7.25, "y": 3},
-                {"matrix": [3, 8], "x": 8.25, "y": 3},
-                {"matrix": [3, 9], "x": 9.25, "y": 3},
-                {"matrix": [3, 10], "x": 10.25, "y": 3},
-                {"matrix": [3, 11], "x": 11.25, "y": 3},
-                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"matrix": [3, 13], "x": 14, "y": 3},
-
-                {"matrix": [3, 14], "x": 16.5, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 10], "x": 4, "y": 4.25, "w": 7},
-                {"matrix": [4, 9], "x": 11.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 11], "x": 12.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 12], "x": 13.75, "y": 4, "w": 1.25},
-
-                {"matrix": [3, 15], "x": 15.5, "y": 4},
-                {"matrix": [4, 14], "x": 16.5, "y": 4},
-                {"matrix": [4, 15], "x": 17.5, "y": 4}
-            ]
-        },
-        "LAYOUT_ansi_tsangan": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"matrix": [4, 13], "x": 13, "y": 0, "w": 2},
-
-                {"matrix": [0, 14], "x": 15.5, "y": 0},
-                {"matrix": [0, 15], "x": 16.5, "y": 0},
-                {"matrix": [1, 15], "x": 17.5, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"matrix": [1, 14], "x": 15.5, "y": 1},
-                {"matrix": [2, 14], "x": 16.5, "y": 1},
-                {"matrix": [2, 15], "x": 17.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, 13], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 2], "x": 2.25, "y": 3},
-                {"matrix": [3, 3], "x": 3.25, "y": 3},
-                {"matrix": [3, 4], "x": 4.25, "y": 3},
-                {"matrix": [3, 5], "x": 5.25, "y": 3},
-                {"matrix": [3, 6], "x": 6.25, "y": 3},
-                {"matrix": [3, 7], "x": 7.25, "y": 3},
-                {"matrix": [3, 8], "x": 8.25, "y": 3},
-                {"matrix": [3, 9], "x": 9.25, "y": 3},
-                {"matrix": [3, 10], "x": 10.25, "y": 3},
-                {"matrix": [3, 11], "x": 11.25, "y": 3},
-                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
-
-                {"matrix": [3, 14], "x": 16.5, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 10], "x": 4, "y": 4.25, "w": 7},
-                {"matrix": [4, 9], "x": 11.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 11], "x": 12.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 12], "x": 13.75, "y": 4, "w": 1.25},
-
-                {"matrix": [3, 15], "x": 15.5, "y": 4},
-                {"matrix": [4, 14], "x": 16.5, "y": 4},
-                {"matrix": [4, 15], "x": 17.5, "y": 4}
-            ]
-        },
-        "LAYOUT_iso_tsangan": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"matrix": [4, 13], "x": 13, "y": 0, "w": 2},
-
-                {"matrix": [0, 14], "x": 15.5, "y": 0},
-                {"matrix": [0, 15], "x": 16.5, "y": 0},
-                {"matrix": [1, 15], "x": 17.5, "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.5, "y": 1},
-                {"matrix": [2, 14], "x": 16.5, "y": 1},
-                {"matrix": [2, 15], "x": 17.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": 2.75},
-
-                {"matrix": [3, 14], "x": 16.5, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 10], "x": 4, "y": 4.25, "w": 7},
-                {"matrix": [4, 9], "x": 11.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 11], "x": 12.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 12], "x": 13.75, "y": 4, "w": 1.25},
-
-                {"matrix": [3, 15], "x": 15.5, "y": 4},
-                {"matrix": [4, 14], "x": 16.5, "y": 4},
-                {"matrix": [4, 15], "x": 17.5, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/neson_design/700e/keyboard.json b/keyboards/neson_design/700e/keyboard.json
new file mode 100644
index 00000000000..64a18f436bc
--- /dev/null
+++ b/keyboards/neson_design/700e/keyboard.json
@@ -0,0 +1,302 @@
+{
+    "keyboard_name": "700E",
+    "manufacturer": "Neson Design",
+    "url": "",
+    "maintainer": "yulei",
+    "usb": {
+        "vid": "0x4E65",
+        "pid": "0x700E",
+        "device_version": "0.0.1",
+        "no_startup_check": true
+    },
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgblight": true
+    },
+    "matrix_pins": {
+        "cols": ["F7", "B0", "B3", "B1", "B2", "F4", "C7", "C6", "B6", "B5", "B4", "D7", "D3", "D2", "D6", "D4"],
+        "rows": ["E6", "B7", "F6", "F1", "F0"]
+    },
+    "diode_direction": "COL2ROW",
+    "indicators": {
+        "caps_lock": "F5"
+    },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 68,
+        "driver": "custom",
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": true
+        }
+    },
+    "ws2812": {
+        "pin": "D5"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "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": [4, 13], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.5, "y": 0},
+                {"matrix": [0, 15], "x": 16.5, "y": 0},
+                {"matrix": [1, 15], "x": 17.5, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [1, 14], "x": 15.5, "y": 1},
+                {"matrix": [2, 14], "x": 16.5, "y": 1},
+                {"matrix": [2, 15], "x": 17.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": 2, "w": 1.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+
+                {"matrix": [3, 14], "x": 16.5, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "x": 4, "y": 4.25, "w": 7},
+                {"matrix": [4, 9], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 13.75, "y": 4, "w": 1.25},
+
+                {"matrix": [3, 15], "x": 15.5, "y": 4},
+                {"matrix": [4, 14], "x": 16.5, "y": 4},
+                {"matrix": [4, 15], "x": 17.5, "y": 4}
+            ]
+        },
+        "LAYOUT_ansi_tsangan": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [4, 13], "x": 13, "y": 0, "w": 2},
+
+                {"matrix": [0, 14], "x": 15.5, "y": 0},
+                {"matrix": [0, 15], "x": 16.5, "y": 0},
+                {"matrix": [1, 15], "x": 17.5, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [1, 14], "x": 15.5, "y": 1},
+                {"matrix": [2, 14], "x": 16.5, "y": 1},
+                {"matrix": [2, 15], "x": 17.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, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
+
+                {"matrix": [3, 14], "x": 16.5, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "x": 4, "y": 4.25, "w": 7},
+                {"matrix": [4, 9], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 13.75, "y": 4, "w": 1.25},
+
+                {"matrix": [3, 15], "x": 15.5, "y": 4},
+                {"matrix": [4, 14], "x": 16.5, "y": 4},
+                {"matrix": [4, 15], "x": 17.5, "y": 4}
+            ]
+        },
+        "LAYOUT_iso_tsangan": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [4, 13], "x": 13, "y": 0, "w": 2},
+
+                {"matrix": [0, 14], "x": 15.5, "y": 0},
+                {"matrix": [0, 15], "x": 16.5, "y": 0},
+                {"matrix": [1, 15], "x": 17.5, "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.5, "y": 1},
+                {"matrix": [2, 14], "x": 16.5, "y": 1},
+                {"matrix": [2, 15], "x": 17.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": 2.75},
+
+                {"matrix": [3, 14], "x": 16.5, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "x": 4, "y": 4.25, "w": 7},
+                {"matrix": [4, 9], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 13.75, "y": 4, "w": 1.25},
+
+                {"matrix": [3, 15], "x": 15.5, "y": 4},
+                {"matrix": [4, 14], "x": 16.5, "y": 4},
+                {"matrix": [4, 15], "x": 17.5, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/neson_design/700e/rules.mk b/keyboards/neson_design/700e/rules.mk
index dd1db38babf..6fab966c731 100644
--- a/keyboards/neson_design/700e/rules.mk
+++ b/keyboards/neson_design/700e/rules.mk
@@ -1,16 +1,3 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes		# Enable keyboard RGB underglow
-NO_USB_STARTUP_CHECK = yes
-
 QUANTUM_LIB_SRC += drivers/led/issi/is31fl3731.c
 WS2812_DRIVER_REQUIRED = yes
 I2C_DRIVER_REQUIRED = yes
diff --git a/keyboards/neson_design/n6/info.json b/keyboards/neson_design/n6/info.json
deleted file mode 100644
index c48824d80f3..00000000000
--- a/keyboards/neson_design/n6/info.json
+++ /dev/null
@@ -1,200 +0,0 @@
-{
-    "keyboard_name": "N6",
-    "manufacturer": "Neson Design",
-    "url": "",
-    "maintainer": "qmk",
-    "usb": {
-        "vid": "0x4E65",
-        "pid": "0x4E36",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["F7", "B0", "E6", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "B2", "D3", "D2"],
-        "rows": ["F0", "B1", "F6", "F4", "F1"]
-    },
-    "diode_direction": "COL2ROW",
-    "indicators": {
-        "caps_lock": "F5"
-    },
-    "ws2812": {
-        "pin": "B3"
-    },
-    "rgblight": {
-        "saturation_steps": 8,
-        "brightness_steps": 8,
-        "led_count": 65,
-        "driver": "custom",
-        "max_brightness": 192,
-        "animations": {
-            "breathing": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "snake": true,
-            "knight": true,
-            "christmas": true,
-            "static_gradient": true,
-            "rgb_test": true,
-            "alternating": true,
-            "twinkle": true
-        }
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "layout_aliases": {
-        "LAYOUT_65_ansi_blocker_splitbs": "LAYOUT_65_ansi_blocker_split_bs"
-    },
-    "community_layouts": ["65_ansi_blocker", "65_ansi_blocker_split_bs"],
-    "layouts": {
-        "LAYOUT_65_ansi_blocker": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"matrix": [0, 14], "x": 13, "y": 0, "w": 2},
-                {"matrix": [4, 14], "x": 15, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-                {"matrix": [1, 14], "x": 15, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
-                {"matrix": [2, 14], "x": 15, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 2], "x": 2.25, "y": 3},
-                {"matrix": [3, 3], "x": 3.25, "y": 3},
-                {"matrix": [3, 4], "x": 4.25, "y": 3},
-                {"matrix": [3, 5], "x": 5.25, "y": 3},
-                {"matrix": [3, 6], "x": 6.25, "y": 3},
-                {"matrix": [3, 7], "x": 7.25, "y": 3},
-                {"matrix": [3, 8], "x": 8.25, "y": 3},
-                {"matrix": [3, 9], "x": 9.25, "y": 3},
-                {"matrix": [3, 10], "x": 10.25, "y": 3},
-                {"matrix": [3, 11], "x": 11.25, "y": 3},
-                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"matrix": [3, 13], "x": 14, "y": 3},
-                {"matrix": [3, 14], "x": 15, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 8], "x": 3.75, "y": 4, "w": 6.25},
-                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
-                {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 11], "x": 13, "y": 4},
-                {"matrix": [4, 12], "x": 14, "y": 4},
-                {"matrix": [4, 13], "x": 15, "y": 4}
-            ]
-        },
-        "LAYOUT_65_ansi_blocker_split_bs": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"matrix": [0, 13], "x": 13, "y": 0},
-                {"matrix": [0, 14], "x": 14, "y": 0},
-                {"matrix": [4, 14], "x": 15, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-                {"matrix": [1, 14], "x": 15, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
-                {"matrix": [2, 14], "x": 15, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 2], "x": 2.25, "y": 3},
-                {"matrix": [3, 3], "x": 3.25, "y": 3},
-                {"matrix": [3, 4], "x": 4.25, "y": 3},
-                {"matrix": [3, 5], "x": 5.25, "y": 3},
-                {"matrix": [3, 6], "x": 6.25, "y": 3},
-                {"matrix": [3, 7], "x": 7.25, "y": 3},
-                {"matrix": [3, 8], "x": 8.25, "y": 3},
-                {"matrix": [3, 9], "x": 9.25, "y": 3},
-                {"matrix": [3, 10], "x": 10.25, "y": 3},
-                {"matrix": [3, 11], "x": 11.25, "y": 3},
-                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"matrix": [3, 13], "x": 14, "y": 3},
-                {"matrix": [3, 14], "x": 15, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 8], "x": 3.75, "y": 4, "w": 6.25},
-                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
-                {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 11], "x": 13, "y": 4},
-                {"matrix": [4, 12], "x": 14, "y": 4},
-                {"matrix": [4, 13], "x": 15, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/neson_design/n6/keyboard.json b/keyboards/neson_design/n6/keyboard.json
new file mode 100644
index 00000000000..66e6fb740c8
--- /dev/null
+++ b/keyboards/neson_design/n6/keyboard.json
@@ -0,0 +1,207 @@
+{
+    "keyboard_name": "N6",
+    "manufacturer": "Neson Design",
+    "url": "",
+    "maintainer": "qmk",
+    "usb": {
+        "vid": "0x4E65",
+        "pid": "0x4E36",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": false,
+        "nkro": true,
+        "rgblight": true
+    },
+    "matrix_pins": {
+        "cols": ["F7", "B0", "E6", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "B2", "D3", "D2"],
+        "rows": ["F0", "B1", "F6", "F4", "F1"]
+    },
+    "diode_direction": "COL2ROW",
+    "indicators": {
+        "caps_lock": "F5"
+    },
+    "ws2812": {
+        "pin": "B3"
+    },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 65,
+        "driver": "custom",
+        "max_brightness": 192,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": true,
+            "twinkle": true
+        }
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "layout_aliases": {
+        "LAYOUT_65_ansi_blocker_splitbs": "LAYOUT_65_ansi_blocker_split_bs"
+    },
+    "community_layouts": ["65_ansi_blocker", "65_ansi_blocker_split_bs"],
+    "layouts": {
+        "LAYOUT_65_ansi_blocker": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 14], "x": 13, "y": 0, "w": 2},
+                {"matrix": [4, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 8], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 13, "y": 4},
+                {"matrix": [4, 12], "x": 14, "y": 4},
+                {"matrix": [4, 13], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_65_ansi_blocker_split_bs": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [4, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 8], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 13, "y": 4},
+                {"matrix": [4, 12], "x": 14, "y": 4},
+                {"matrix": [4, 13], "x": 15, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/neson_design/n6/rules.mk b/keyboards/neson_design/n6/rules.mk
index 4c9ce453526..6fab966c731 100644
--- a/keyboards/neson_design/n6/rules.mk
+++ b/keyboards/neson_design/n6/rules.mk
@@ -1,15 +1,3 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes		# Enable keyboard RGB underglow
-
 QUANTUM_LIB_SRC += drivers/led/issi/is31fl3731.c
 WS2812_DRIVER_REQUIRED = yes
 I2C_DRIVER_REQUIRED = yes
diff --git a/keyboards/novelkeys/nk20/info.json b/keyboards/novelkeys/nk20/info.json
deleted file mode 100644
index 6d25ca4c21e..00000000000
--- a/keyboards/novelkeys/nk20/info.json
+++ /dev/null
@@ -1,106 +0,0 @@
-{
-    "keyboard_name": "NK20",
-    "manufacturer": "Yiancar-Designs",
-    "url": "www.yiancar-designs.com",
-    "maintainer": "Yiancar",
-    "usb": {
-        "vid": "0x8968",
-        "pid": "0x4E4E",
-        "device_version": "0.0.1"
-    },
-    "ws2812": {
-        "pin": "A7",
-        "driver": "pwm"
-    },
-    "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,
-            "rainbow_moving_chevron": true,
-            "cycle_out_in": true,
-            "cycle_out_in_dual": 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_rain": true,
-            "pixel_flow": true,
-            "pixel_fractal": 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",
-        "max_brightness": 210,
-        "sleep": true
-    },
-    "matrix_pins": {
-        "cols": ["B13", "B14", "B15", "A4"],
-        "rows": ["B12", "A5", "A3", "A2", "A1", "A0"]
-    },
-    "diode_direction": "COL2ROW",
-    "processor": "STM32F072",
-    "bootloader": "stm32-dfu",
-    "layout_aliases": {
-        "LAYOUT_all": "LAYOUT"
-    },
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-
-                {"matrix": [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": [2, 3], "x": 3, "y": 2, "h": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3},
-                {"matrix": [3, 1], "x": 1, "y": 3},
-                {"matrix": [3, 2], "x": 2, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4},
-                {"matrix": [4, 1], "x": 1, "y": 4},
-                {"matrix": [4, 2], "x": 2, "y": 4},
-                {"matrix": [4, 3], "x": 3, "y": 4, "h": 2},
-
-                {"matrix": [5, 0], "x": 0, "y": 5, "w": 2},
-                {"matrix": [5, 2], "x": 2, "y": 5}
-            ]
-        }
-    }
-}
diff --git a/keyboards/novelkeys/nk20/keyboard.json b/keyboards/novelkeys/nk20/keyboard.json
new file mode 100644
index 00000000000..f2728967b44
--- /dev/null
+++ b/keyboards/novelkeys/nk20/keyboard.json
@@ -0,0 +1,113 @@
+{
+    "keyboard_name": "NK20",
+    "manufacturer": "Yiancar-Designs",
+    "url": "www.yiancar-designs.com",
+    "maintainer": "Yiancar",
+    "usb": {
+        "vid": "0x8968",
+        "pid": "0x4E4E",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgb_matrix": true
+    },
+    "ws2812": {
+        "pin": "A7",
+        "driver": "pwm"
+    },
+    "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,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": 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_rain": true,
+            "pixel_flow": true,
+            "pixel_fractal": 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",
+        "max_brightness": 210,
+        "sleep": true
+    },
+    "matrix_pins": {
+        "cols": ["B13", "B14", "B15", "A4"],
+        "rows": ["B12", "A5", "A3", "A2", "A1", "A0"]
+    },
+    "diode_direction": "COL2ROW",
+    "processor": "STM32F072",
+    "bootloader": "stm32-dfu",
+    "layout_aliases": {
+        "LAYOUT_all": "LAYOUT"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+
+                {"matrix": [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": [2, 3], "x": 3, "y": 2, "h": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+                {"matrix": [4, 2], "x": 2, "y": 4},
+                {"matrix": [4, 3], "x": 3, "y": 4, "h": 2},
+
+                {"matrix": [5, 0], "x": 0, "y": 5, "w": 2},
+                {"matrix": [5, 2], "x": 2, "y": 5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/novelkeys/nk20/rules.mk b/keyboards/novelkeys/nk20/rules.mk
index 9470fce1ba2..0ab54aaaf71 100644
--- a/keyboards/novelkeys/nk20/rules.mk
+++ b/keyboards/novelkeys/nk20/rules.mk
@@ -1,16 +1,2 @@
 # Wildcard to allow APM32 MCU
 DFU_SUFFIX_ARGS = -v FFFF -p FFFF
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-RGB_MATRIX_ENABLE = yes     # Enable Per-key RGB
diff --git a/keyboards/novelkeys/nk65/info.json b/keyboards/novelkeys/nk65/info.json
index 59187f9ef87..e3bff193466 100755
--- a/keyboards/novelkeys/nk65/info.json
+++ b/keyboards/novelkeys/nk65/info.json
@@ -8,6 +8,12 @@
         "pid": "0x4E4B",
         "device_version": "0.0.1"
     },
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
     "processor": "STM32F303",
     "bootloader": "stm32-dfu",
     "board": "QMK_PROTON_C",
diff --git a/keyboards/novelkeys/nk65/rules.mk b/keyboards/novelkeys/nk65/rules.mk
index 5827e557b95..c0d789a5a6c 100755
--- a/keyboards/novelkeys/nk65/rules.mk
+++ b/keyboards/novelkeys/nk65/rules.mk
@@ -1,27 +1,15 @@
 # Do not put the microcontroller into power saving mode
 # when we get USB suspend event. We want it to keep updating
 # backlight effects.
-OPT_DEFS += -DNO_SUSPEND_POWER_DOWN
-
-# Build Options
-#   change yes to no to disable
-#
-BACKLIGHT_ENABLE = no              # Enable keyboard backlight functionality
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes              # Mouse keys
-EXTRAKEY_ENABLE = yes              # Audio control and System control
-CONSOLE_ENABLE = no                # Console for debug
-COMMAND_ENABLE = no                # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-AUDIO_ENABLE = no                  # Audio output
+NO_SUSPEND_POWER_DOWN = yes
 
 CIE1931_CURVE = yes
+I2C_DRIVER_REQUIRED = yes
 
 # project specific files
 SRC =	keyboards/wilba_tech/wt_main.c \
 		keyboards/wilba_tech/wt_rgb_backlight.c \
 		drivers/led/issi/is31fl3733.c \
 		quantum/color.c
-I2C_DRIVER_REQUIRED = yes
 
 DEFAULT_FOLDER = novelkeys/nk65/base
diff --git a/keyboards/novelkeys/nk65b/info.json b/keyboards/novelkeys/nk65b/info.json
deleted file mode 100755
index 8e6e01fe46e..00000000000
--- a/keyboards/novelkeys/nk65b/info.json
+++ /dev/null
@@ -1,154 +0,0 @@
-{
-    "keyboard_name": "NK65B",
-    "manufacturer": "Yiancar-Designs",
-    "url": "www.yiancar-designs.com",
-    "maintainer": "Yiancar",
-    "usb": {
-        "vid": "0x8968",
-        "pid": "0x4E4F",
-        "device_version": "0.0.1"
-    },
-    "ws2812": {
-        "pin": "B4",
-        "driver": "pwm"
-    },
-    "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,
-            "rainbow_moving_chevron": true,
-            "cycle_out_in": true,
-            "cycle_out_in_dual": 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_rain": true,
-            "pixel_flow": true,
-            "pixel_fractal": 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",
-        "max_brightness": 130,
-        "sleep": true
-    },
-    "matrix_pins": {
-        "cols": ["A3", "A4", "A5", "A6", "A7", "B0", "B1", "B2", "B10", "B12", "B13", "B14", "B15", "A8", "A9"],
-        "rows": ["A0", "A1", "A2", "B11", "B6"]
-    },
-    "diode_direction": "COL2ROW",
-    "indicators": {
-        "caps_lock": "A14",
-        "on_state": 0
-    },
-    "processor": "STM32F072",
-    "bootloader": "stm32-dfu",
-    "layouts": {
-        "LAYOUT_65_ansi": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-                {"matrix": [0, 14], "x": 15, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [2, 12], "x": 13.5, "y": 1, "w": 1.5},
-                {"matrix": [1, 14], "x": 15, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
-                {"matrix": [2, 14], "x": 15, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 2], "x": 2.25, "y": 3},
-                {"matrix": [3, 3], "x": 3.25, "y": 3},
-                {"matrix": [3, 4], "x": 4.25, "y": 3},
-                {"matrix": [3, 5], "x": 5.25, "y": 3},
-                {"matrix": [3, 6], "x": 6.25, "y": 3},
-                {"matrix": [3, 7], "x": 7.25, "y": 3},
-                {"matrix": [3, 8], "x": 8.25, "y": 3},
-                {"matrix": [3, 9], "x": 9.25, "y": 3},
-                {"matrix": [3, 10], "x": 10.25, "y": 3},
-                {"matrix": [3, 11], "x": 11.25, "y": 3},
-                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"matrix": [3, 13], "x": 14, "y": 3},
-                {"matrix": [3, 14], "x": 15, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
-                {"matrix": [4, 9], "x": 10, "y": 4},
-                {"matrix": [4, 10], "x": 11, "y": 4},
-                {"matrix": [4, 11], "x": 12, "y": 4},
-                {"matrix": [4, 12], "x": 13, "y": 4},
-                {"matrix": [4, 13], "x": 14, "y": 4},
-                {"matrix": [4, 14], "x": 15, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/novelkeys/nk65b/keyboard.json b/keyboards/novelkeys/nk65b/keyboard.json
new file mode 100755
index 00000000000..0c2794c1202
--- /dev/null
+++ b/keyboards/novelkeys/nk65b/keyboard.json
@@ -0,0 +1,161 @@
+{
+    "keyboard_name": "NK65B",
+    "manufacturer": "Yiancar-Designs",
+    "url": "www.yiancar-designs.com",
+    "maintainer": "Yiancar",
+    "usb": {
+        "vid": "0x8968",
+        "pid": "0x4E4F",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgb_matrix": true
+    },
+    "ws2812": {
+        "pin": "B4",
+        "driver": "pwm"
+    },
+    "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,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": 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_rain": true,
+            "pixel_flow": true,
+            "pixel_fractal": 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",
+        "max_brightness": 130,
+        "sleep": true
+    },
+    "matrix_pins": {
+        "cols": ["A3", "A4", "A5", "A6", "A7", "B0", "B1", "B2", "B10", "B12", "B13", "B14", "B15", "A8", "A9"],
+        "rows": ["A0", "A1", "A2", "B11", "B6"]
+    },
+    "diode_direction": "COL2ROW",
+    "indicators": {
+        "caps_lock": "A14",
+        "on_state": 0
+    },
+    "processor": "STM32F072",
+    "bootloader": "stm32-dfu",
+    "layouts": {
+        "LAYOUT_65_ansi": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [2, 12], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4},
+                {"matrix": [4, 10], "x": 11, "y": 4},
+                {"matrix": [4, 11], "x": 12, "y": 4},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/novelkeys/nk65b/rules.mk b/keyboards/novelkeys/nk65b/rules.mk
index 9470fce1ba2..0ab54aaaf71 100644
--- a/keyboards/novelkeys/nk65b/rules.mk
+++ b/keyboards/novelkeys/nk65b/rules.mk
@@ -1,16 +1,2 @@
 # Wildcard to allow APM32 MCU
 DFU_SUFFIX_ARGS = -v FFFF -p FFFF
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-RGB_MATRIX_ENABLE = yes     # Enable Per-key RGB
diff --git a/keyboards/novelkeys/nk87/info.json b/keyboards/novelkeys/nk87/info.json
deleted file mode 100755
index 6170895405d..00000000000
--- a/keyboards/novelkeys/nk87/info.json
+++ /dev/null
@@ -1,129 +0,0 @@
-{
-    "keyboard_name": "NK87",
-    "manufacturer": "Yiancar-Designs",
-    "url": "www.yiancar-designs.com",
-    "maintainer": "Yiancar",
-    "usb": {
-        "vid": "0x8968",
-        "pid": "0x4E4C",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["A13", "A10", "A9", "A14", "A15", "B8", "B9", "B2", "B0", "A6", "A0", "A1", "A2", "A3", "A5", "B1", "B10"],
-        "rows": ["A7", "B3", "B4", "B5", "A8", "A4"]
-    },
-    "diode_direction": "COL2ROW",
-    "processor": "STM32F303",
-    "bootloader": "stm32-dfu",
-    "board": "QMK_PROTON_C",
-    "layout_aliases": {
-        "LAYOUT_all": "LAYOUT_tkl_f13_ansi_tsangan"
-    },
-    "layouts": {
-        "LAYOUT_tkl_f13_ansi_tsangan": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-
-                {"label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0},
-                {"label": "F2", "matrix": [0, 2], "x": 2.25, "y": 0},
-                {"label": "F3", "matrix": [0, 3], "x": 3.25, "y": 0},
-                {"label": "F4", "matrix": [0, 4], "x": 4.25, "y": 0},
-
-                {"label": "F5", "matrix": [0, 5], "x": 5.5, "y": 0},
-                {"label": "F6", "matrix": [0, 6], "x": 6.5, "y": 0},
-                {"label": "F7", "matrix": [0, 7], "x": 7.5, "y": 0},
-                {"label": "F8", "matrix": [0, 8], "x": 8.5, "y": 0},
-
-                {"label": "F9", "matrix": [0, 9], "x": 9.75, "y": 0},
-                {"label": "F10", "matrix": [0, 10], "x": 10.75, "y": 0},
-                {"label": "F11", "matrix": [0, 11], "x": 11.75, "y": 0},
-                {"label": "F12", "matrix": [0, 12], "x": 12.75, "y": 0},
-
-                {"label": "F13", "matrix": [0, 13], "x": 14, "y": 0},
-
-                {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
-                {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
-                {"label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0},
-
-                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
-                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
-                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
-                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
-                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
-                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
-                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
-                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
-                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
-                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
-                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
-                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
-                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
-                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
-
-                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
-                {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25},
-                {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "y": 1.25},
-
-                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
-                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
-                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
-                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
-                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
-                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
-                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
-                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
-                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
-                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
-                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
-                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
-                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
-                {"label": "\\", "matrix": [3, 12], "x": 13.5, "y": 2.25, "w": 1.5},
-
-                {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
-                {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25},
-                {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2.25},
-
-                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
-                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
-                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
-                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
-                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
-                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
-                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
-                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
-                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
-                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
-                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
-                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
-                {"label": "Enter", "matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
-
-                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
-                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
-                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
-                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
-                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
-                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
-                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
-                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
-                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
-                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
-                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
-                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75},
-
-                {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25},
-
-                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
-                {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 5.25},
-                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
-                {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
-                {"label": "Alt", "matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5},
-                {"label": "Fn", "matrix": [5, 12], "x": 12.5, "y": 5.25},
-                {"label": "Ctrl", "matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
-
-                {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
-                {"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25},
-                {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
-            ]
-        }
-    }
-}
diff --git a/keyboards/novelkeys/nk87/keyboard.json b/keyboards/novelkeys/nk87/keyboard.json
new file mode 100755
index 00000000000..9573ff4c9ce
--- /dev/null
+++ b/keyboards/novelkeys/nk87/keyboard.json
@@ -0,0 +1,135 @@
+{
+    "keyboard_name": "NK87",
+    "manufacturer": "Yiancar-Designs",
+    "url": "www.yiancar-designs.com",
+    "maintainer": "Yiancar",
+    "usb": {
+        "vid": "0x8968",
+        "pid": "0x4E4C",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "matrix_pins": {
+        "cols": ["A13", "A10", "A9", "A14", "A15", "B8", "B9", "B2", "B0", "A6", "A0", "A1", "A2", "A3", "A5", "B1", "B10"],
+        "rows": ["A7", "B3", "B4", "B5", "A8", "A4"]
+    },
+    "diode_direction": "COL2ROW",
+    "processor": "STM32F303",
+    "bootloader": "stm32-dfu",
+    "board": "QMK_PROTON_C",
+    "layout_aliases": {
+        "LAYOUT_all": "LAYOUT_tkl_f13_ansi_tsangan"
+    },
+    "layouts": {
+        "LAYOUT_tkl_f13_ansi_tsangan": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0},
+                {"label": "F2", "matrix": [0, 2], "x": 2.25, "y": 0},
+                {"label": "F3", "matrix": [0, 3], "x": 3.25, "y": 0},
+                {"label": "F4", "matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"label": "F5", "matrix": [0, 5], "x": 5.5, "y": 0},
+                {"label": "F6", "matrix": [0, 6], "x": 6.5, "y": 0},
+                {"label": "F7", "matrix": [0, 7], "x": 7.5, "y": 0},
+                {"label": "F8", "matrix": [0, 8], "x": 8.5, "y": 0},
+
+                {"label": "F9", "matrix": [0, 9], "x": 9.75, "y": 0},
+                {"label": "F10", "matrix": [0, 10], "x": 10.75, "y": 0},
+                {"label": "F11", "matrix": [0, 11], "x": 11.75, "y": 0},
+                {"label": "F12", "matrix": [0, 12], "x": 12.75, "y": 0},
+
+                {"label": "F13", "matrix": [0, 13], "x": 14, "y": 0},
+
+                {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
+                {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
+                {"label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
+                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
+                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
+                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
+                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
+                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
+                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
+                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
+                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
+                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
+                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
+                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
+                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
+                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+
+                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"label": "\\", "matrix": [3, 12], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"label": "Enter", "matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 5.25},
+                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
+                {"label": "Alt", "matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5},
+                {"label": "Fn", "matrix": [5, 12], "x": 12.5, "y": 5.25},
+                {"label": "Ctrl", "matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
+
+                {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/novelkeys/nk87/rules.mk b/keyboards/novelkeys/nk87/rules.mk
index a0a09c1dabb..3b7a32713c3 100755
--- a/keyboards/novelkeys/nk87/rules.mk
+++ b/keyboards/novelkeys/nk87/rules.mk
@@ -1,26 +1,13 @@
 # Do not put the microcontroller into power saving mode
 # when we get USB suspend event. We want it to keep updating
 # backlight effects.
-OPT_DEFS += -DNO_SUSPEND_POWER_DOWN
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
+NO_SUSPEND_POWER_DOWN = yes
 
 CIE1931_CURVE = yes
+I2C_DRIVER_REQUIRED = yes
 
 # project specific files
 SRC =	keyboards/wilba_tech/wt_main.c \
 		keyboards/wilba_tech/wt_rgb_backlight.c \
 		drivers/led/issi/is31fl3733.c \
 		quantum/color.c
-I2C_DRIVER_REQUIRED = yes
diff --git a/keyboards/novelkeys/nk87b/info.json b/keyboards/novelkeys/nk87b/info.json
deleted file mode 100755
index cbcc8e2e18f..00000000000
--- a/keyboards/novelkeys/nk87b/info.json
+++ /dev/null
@@ -1,186 +0,0 @@
-{
-    "keyboard_name": "NK87B",
-    "manufacturer": "Yiancar-Designs",
-    "url": "www.yiancar-designs.com",
-    "maintainer": "Yiancar",
-    "usb": {
-        "vid": "0x8968",
-        "pid": "0x4E50",
-        "device_version": "0.0.1"
-    },
-    "ws2812": {
-        "pin": "B0",
-        "driver": "pwm"
-    },
-    "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,
-            "rainbow_moving_chevron": true,
-            "cycle_out_in": true,
-            "cycle_out_in_dual": 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_rain": true,
-            "pixel_flow": true,
-            "pixel_fractal": 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",
-        "max_brightness": 114,
-        "sleep": true
-    },
-    "matrix_pins": {
-        "cols": ["B12", "B13", "B14", "B15", "A8", "A10", "A14", "A15", "B3", "B4", "B5", "B6", "B7", "B8", "B9", "A0", "A1"],
-        "rows": ["B11", "B10", "B2", "B1", "A9", "A5"]
-    },
-    "diode_direction": "COL2ROW",
-    "indicators": {
-        "caps_lock": "A2",
-        "on_state": 0
-    },
-    "processor": "STM32F072",
-    "bootloader": "stm32-dfu",
-    "layout_aliases": {
-        "LAYOUT_all": "LAYOUT_tkl_f13_ansi_tsangan"
-    },
-    "layouts": {
-        "LAYOUT_tkl_f13_ansi_tsangan": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-
-                {"label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0},
-                {"label": "F2", "matrix": [0, 2], "x": 2.25, "y": 0},
-                {"label": "F3", "matrix": [0, 3], "x": 3.25, "y": 0},
-                {"label": "F4", "matrix": [0, 4], "x": 4.25, "y": 0},
-
-                {"label": "F5", "matrix": [0, 5], "x": 5.5, "y": 0},
-                {"label": "F6", "matrix": [0, 6], "x": 6.5, "y": 0},
-                {"label": "F7", "matrix": [0, 7], "x": 7.5, "y": 0},
-                {"label": "F8", "matrix": [0, 8], "x": 8.5, "y": 0},
-
-                {"label": "F9", "matrix": [0, 9], "x": 9.75, "y": 0},
-                {"label": "F10", "matrix": [0, 10], "x": 10.75, "y": 0},
-                {"label": "F11", "matrix": [0, 11], "x": 11.75, "y": 0},
-                {"label": "F12", "matrix": [0, 12], "x": 12.75, "y": 0},
-
-                {"label": "F13", "matrix": [0, 13], "x": 14, "y": 0},
-
-                {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
-                {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
-                {"label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0},
-
-                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
-                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
-                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
-                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
-                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
-                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
-                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
-                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
-                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
-                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
-                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
-                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
-                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
-                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
-
-                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
-                {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25},
-                {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "y": 1.25},
-
-                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
-                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
-                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
-                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
-                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
-                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
-                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
-                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
-                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
-                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
-                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
-                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
-                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
-                {"label": "\\", "matrix": [3, 12], "x": 13.5, "y": 2.25, "w": 1.5},
-
-                {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
-                {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25},
-                {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2.25},
-
-                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
-                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
-                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
-                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
-                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
-                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
-                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
-                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
-                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
-                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
-                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
-                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
-                {"label": "Enter", "matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
-
-                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
-                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
-                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
-                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
-                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
-                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
-                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
-                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
-                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
-                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
-                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
-                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75},
-
-                {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25},
-
-                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
-                {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 5.25},
-                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
-                {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
-                {"label": "Alt", "matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5},
-                {"label": "Fn", "matrix": [5, 12], "x": 12.5, "y": 5.25},
-                {"label": "Ctrl", "matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
-
-                {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
-                {"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25},
-                {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
-            ]
-        }
-    }
-}
diff --git a/keyboards/novelkeys/nk87b/keyboard.json b/keyboards/novelkeys/nk87b/keyboard.json
new file mode 100755
index 00000000000..f81793aceed
--- /dev/null
+++ b/keyboards/novelkeys/nk87b/keyboard.json
@@ -0,0 +1,193 @@
+{
+    "keyboard_name": "NK87B",
+    "manufacturer": "Yiancar-Designs",
+    "url": "www.yiancar-designs.com",
+    "maintainer": "Yiancar",
+    "usb": {
+        "vid": "0x8968",
+        "pid": "0x4E50",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgb_matrix": true
+    },
+    "ws2812": {
+        "pin": "B0",
+        "driver": "pwm"
+    },
+    "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,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": 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_rain": true,
+            "pixel_flow": true,
+            "pixel_fractal": 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",
+        "max_brightness": 114,
+        "sleep": true
+    },
+    "matrix_pins": {
+        "cols": ["B12", "B13", "B14", "B15", "A8", "A10", "A14", "A15", "B3", "B4", "B5", "B6", "B7", "B8", "B9", "A0", "A1"],
+        "rows": ["B11", "B10", "B2", "B1", "A9", "A5"]
+    },
+    "diode_direction": "COL2ROW",
+    "indicators": {
+        "caps_lock": "A2",
+        "on_state": 0
+    },
+    "processor": "STM32F072",
+    "bootloader": "stm32-dfu",
+    "layout_aliases": {
+        "LAYOUT_all": "LAYOUT_tkl_f13_ansi_tsangan"
+    },
+    "layouts": {
+        "LAYOUT_tkl_f13_ansi_tsangan": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0},
+                {"label": "F2", "matrix": [0, 2], "x": 2.25, "y": 0},
+                {"label": "F3", "matrix": [0, 3], "x": 3.25, "y": 0},
+                {"label": "F4", "matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"label": "F5", "matrix": [0, 5], "x": 5.5, "y": 0},
+                {"label": "F6", "matrix": [0, 6], "x": 6.5, "y": 0},
+                {"label": "F7", "matrix": [0, 7], "x": 7.5, "y": 0},
+                {"label": "F8", "matrix": [0, 8], "x": 8.5, "y": 0},
+
+                {"label": "F9", "matrix": [0, 9], "x": 9.75, "y": 0},
+                {"label": "F10", "matrix": [0, 10], "x": 10.75, "y": 0},
+                {"label": "F11", "matrix": [0, 11], "x": 11.75, "y": 0},
+                {"label": "F12", "matrix": [0, 12], "x": 12.75, "y": 0},
+
+                {"label": "F13", "matrix": [0, 13], "x": 14, "y": 0},
+
+                {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
+                {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
+                {"label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
+                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
+                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
+                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
+                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
+                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
+                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
+                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
+                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
+                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
+                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
+                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
+                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
+                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+
+                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"label": "\\", "matrix": [3, 12], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"label": "Enter", "matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 5.25},
+                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
+                {"label": "Alt", "matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5},
+                {"label": "Fn", "matrix": [5, 12], "x": 12.5, "y": 5.25},
+                {"label": "Ctrl", "matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
+
+                {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/novelkeys/nk87b/rules.mk b/keyboards/novelkeys/nk87b/rules.mk
index 9470fce1ba2..0ab54aaaf71 100644
--- a/keyboards/novelkeys/nk87b/rules.mk
+++ b/keyboards/novelkeys/nk87b/rules.mk
@@ -1,16 +1,2 @@
 # Wildcard to allow APM32 MCU
 DFU_SUFFIX_ARGS = -v FFFF -p FFFF
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-RGB_MATRIX_ENABLE = yes     # Enable Per-key RGB
diff --git a/keyboards/novelkeys/nk_plus/info.json b/keyboards/novelkeys/nk_plus/keyboard.json
similarity index 100%
rename from keyboards/novelkeys/nk_plus/info.json
rename to keyboards/novelkeys/nk_plus/keyboard.json
diff --git a/keyboards/novelkeys/skelett60/info.json b/keyboards/novelkeys/skelett60/keyboard.json
similarity index 100%
rename from keyboards/novelkeys/skelett60/info.json
rename to keyboards/novelkeys/skelett60/keyboard.json
diff --git a/keyboards/novelkeys/skelett60/rules.mk b/keyboards/novelkeys/skelett60/rules.mk
index 6dd24d8e068..0ab54aaaf71 100644
--- a/keyboards/novelkeys/skelett60/rules.mk
+++ b/keyboards/novelkeys/skelett60/rules.mk
@@ -1,3 +1,2 @@
 # Wildcard to allow APM32 MCU
 DFU_SUFFIX_ARGS = -v FFFF -p FFFF
-
diff --git a/keyboards/nullbitsco/nibble/info.json b/keyboards/nullbitsco/nibble/info.json
deleted file mode 100644
index 159e5012185..00000000000
--- a/keyboards/nullbitsco/nibble/info.json
+++ /dev/null
@@ -1,281 +0,0 @@
-{
-    "keyboard_name": "NIBBLE",
-    "manufacturer": "nullbits",
-    "url": "https://nullbits.co/nibble/",
-    "usb": {
-        "vid": "0x6E61",
-        "pid": "0x6060",
-        "device_version": "0.0.1"
-    },
-    "encoder": {
-        "rotary": [
-            {"pin_a": "B5", "pin_b": "B4"}
-        ]
-    },
-    "rgblight": {
-        "led_count": 10,
-        "sleep": true,
-        "animations": {
-            "breathing": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "snake": true,
-            "knight": true,
-            "christmas": true,
-            "static_gradient": true,
-            "rgb_test": true,
-            "alternating": true,
-            "twinkle": true
-        }
-    },
-    "ws2812": {
-        "pin": "E6"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "debounce": 10,
-    "layouts": {
-        "LAYOUT_all": {
-            "layout": [
-                {"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, 14], "x": 14, "y": 0, "w": 2},
-                {"matrix": [0, 15], "x": 16, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1},
-                {"matrix": [1, 1], "x": 1, "y": 1, "w": 1.5},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 13], "x": 13.5, "y": 1},
-                {"matrix": [1, 14], "x": 14.5, "y": 1, "w": 1.5},
-                {"matrix": [1, 15], "x": 16, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2},
-                {"matrix": [2, 1], "x": 1, "y": 2, "w": 1.25},
-                {"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, 14], "x": 13.75, "y": 2, "w": 2.25},
-                {"matrix": [2, 15], "x": 16, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3},
-                {"matrix": [3, 1], "x": 1, "y": 3, "w": 1.25},
-                {"matrix": [0, 0], "x": 2.25, "y": 3},
-                {"matrix": [3, 2], "x": 3.25, "y": 3},
-                {"matrix": [3, 3], "x": 4.25, "y": 3},
-                {"matrix": [3, 4], "x": 5.25, "y": 3},
-                {"matrix": [3, 5], "x": 6.25, "y": 3},
-                {"matrix": [3, 6], "x": 7.25, "y": 3},
-                {"matrix": [3, 7], "x": 8.25, "y": 3},
-                {"matrix": [3, 8], "x": 9.25, "y": 3},
-                {"matrix": [3, 9], "x": 10.25, "y": 3},
-                {"matrix": [3, 10], "x": 11.25, "y": 3},
-                {"matrix": [3, 11], "x": 12.25, "y": 3},
-                {"matrix": [3, 12], "x": 13.25, "y": 3, "w": 1.75},
-                {"matrix": [3, 14], "x": 15, "y": 3},
-                {"matrix": [3, 15], "x": 16, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4},
-                {"matrix": [4, 1], "x": 1, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 3], "x": 3.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 6], "x": 4.75, "y": 4, "w": 6.25},
-                {"matrix": [4, 9], "x": 11, "y": 4},
-                {"matrix": [4, 10], "x": 12, "y": 4},
-                {"matrix": [4, 11], "x": 13, "y": 4},
-                {"matrix": [4, 12], "x": 14, "y": 4},
-                {"matrix": [4, 14], "x": 15, "y": 4},
-                {"matrix": [4, 15], "x": 16, "y": 4}
-            ]
-        },
-        "LAYOUT_ansi": {
-            "layout": [
-                {"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, 14], "x": 14, "y": 0, "w": 2},
-                {"matrix": [0, 15], "x": 16, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1},
-                {"matrix": [1, 1], "x": 1, "y": 1, "w": 1.5},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 13], "x": 13.5, "y": 1},
-                {"matrix": [1, 14], "x": 14.5, "y": 1, "w": 1.5},
-                {"matrix": [1, 15], "x": 16, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2},
-                {"matrix": [2, 1], "x": 1, "y": 2, "w": 1.25},
-                {"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, 14], "x": 13.75, "y": 2, "w": 2.25},
-                {"matrix": [2, 15], "x": 16, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3},
-                {"matrix": [3, 1], "x": 1, "y": 3, "w": 2.25},
-                {"matrix": [3, 2], "x": 3.25, "y": 3},
-                {"matrix": [3, 3], "x": 4.25, "y": 3},
-                {"matrix": [3, 4], "x": 5.25, "y": 3},
-                {"matrix": [3, 5], "x": 6.25, "y": 3},
-                {"matrix": [3, 6], "x": 7.25, "y": 3},
-                {"matrix": [3, 7], "x": 8.25, "y": 3},
-                {"matrix": [3, 8], "x": 9.25, "y": 3},
-                {"matrix": [3, 9], "x": 10.25, "y": 3},
-                {"matrix": [3, 10], "x": 11.25, "y": 3},
-                {"matrix": [3, 11], "x": 12.25, "y": 3},
-                {"matrix": [3, 12], "x": 13.25, "y": 3, "w": 1.75},
-                {"matrix": [3, 14], "x": 15, "y": 3},
-                {"matrix": [3, 15], "x": 16, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4},
-                {"matrix": [4, 1], "x": 1, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 3], "x": 3.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 6], "x": 4.75, "y": 4, "w": 6.25},
-                {"matrix": [4, 9], "x": 11, "y": 4},
-                {"matrix": [4, 10], "x": 12, "y": 4},
-                {"matrix": [4, 11], "x": 13, "y": 4},
-                {"matrix": [4, 12], "x": 14, "y": 4},
-                {"matrix": [4, 14], "x": 15, "y": 4},
-                {"matrix": [4, 15], "x": 16, "y": 4}
-            ]
-        },
-        "LAYOUT_iso": {
-            "layout": [
-                {"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, 14], "x": 14, "y": 0, "w": 2},
-                {"matrix": [0, 15], "x": 16, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1},
-                {"matrix": [1, 1], "x": 1, "y": 1, "w": 1.5},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 13], "x": 13.5, "y": 1},
-                {"matrix": [1, 15], "x": 16, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2},
-                {"matrix": [2, 1], "x": 1, "y": 2, "w": 1.25},
-                {"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, 14], "x": 13.75, "y": 2},
-                {"matrix": [1, 14], "x": 14.75, "y": 1, "w": 1.25, "h": 2},
-                {"matrix": [2, 15], "x": 16, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3},
-                {"matrix": [3, 1], "x": 1, "y": 3, "w": 1.25},
-                {"matrix": [0, 0], "x": 2.25, "y": 3},
-                {"matrix": [3, 2], "x": 3.25, "y": 3},
-                {"matrix": [3, 3], "x": 4.25, "y": 3},
-                {"matrix": [3, 4], "x": 5.25, "y": 3},
-                {"matrix": [3, 5], "x": 6.25, "y": 3},
-                {"matrix": [3, 6], "x": 7.25, "y": 3},
-                {"matrix": [3, 7], "x": 8.25, "y": 3},
-                {"matrix": [3, 8], "x": 9.25, "y": 3},
-                {"matrix": [3, 9], "x": 10.25, "y": 3},
-                {"matrix": [3, 10], "x": 11.25, "y": 3},
-                {"matrix": [3, 11], "x": 12.25, "y": 3},
-                {"matrix": [3, 12], "x": 13.25, "y": 3, "w": 1.75},
-                {"matrix": [3, 14], "x": 15, "y": 3},
-                {"matrix": [3, 15], "x": 16, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4},
-                {"matrix": [4, 1], "x": 1, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 3], "x": 3.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 6], "x": 4.75, "y": 4, "w": 6.25},
-                {"matrix": [4, 9], "x": 11, "y": 4},
-                {"matrix": [4, 10], "x": 12, "y": 4},
-                {"matrix": [4, 11], "x": 13, "y": 4},
-                {"matrix": [4, 12], "x": 14, "y": 4},
-                {"matrix": [4, 14], "x": 15, "y": 4},
-                {"matrix": [4, 15], "x": 16, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/nullbitsco/nibble/keyboard.json b/keyboards/nullbitsco/nibble/keyboard.json
new file mode 100644
index 00000000000..fb1c8098a0a
--- /dev/null
+++ b/keyboards/nullbitsco/nibble/keyboard.json
@@ -0,0 +1,292 @@
+{
+    "keyboard_name": "NIBBLE",
+    "manufacturer": "nullbits",
+    "url": "https://nullbits.co/nibble/",
+    "usb": {
+        "vid": "0x6E61",
+        "pid": "0x6060",
+        "device_version": "0.0.1"
+    },
+    "build": {
+        "lto": true
+    },
+    "features": {
+        "bootmagic": false,
+        "encoder": true,
+        "extrakey": true,
+        "mousekey": false,
+        "nkro": true,
+        "rgblight": true
+    },
+    "encoder": {
+        "rotary": [
+            {"pin_a": "B5", "pin_b": "B4"}
+        ]
+    },
+    "rgblight": {
+        "led_count": 10,
+        "sleep": true,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": true,
+            "twinkle": true
+        }
+    },
+    "ws2812": {
+        "pin": "E6"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "debounce": 10,
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                {"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, 14], "x": 14, "y": 0, "w": 2},
+                {"matrix": [0, 15], "x": 16, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1},
+                {"matrix": [1, 14], "x": 14.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 15], "x": 16, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2, "w": 1.25},
+                {"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, 14], "x": 13.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 15], "x": 16, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3, "w": 1.25},
+                {"matrix": [0, 0], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 10], "x": 11.25, "y": 3},
+                {"matrix": [3, 11], "x": 12.25, "y": 3},
+                {"matrix": [3, 12], "x": 13.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+                {"matrix": [3, 15], "x": 16, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 3.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 4.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 11, "y": 4},
+                {"matrix": [4, 10], "x": 12, "y": 4},
+                {"matrix": [4, 11], "x": 13, "y": 4},
+                {"matrix": [4, 12], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4},
+                {"matrix": [4, 15], "x": 16, "y": 4}
+            ]
+        },
+        "LAYOUT_ansi": {
+            "layout": [
+                {"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, 14], "x": 14, "y": 0, "w": 2},
+                {"matrix": [0, 15], "x": 16, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1},
+                {"matrix": [1, 14], "x": 14.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 15], "x": 16, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2, "w": 1.25},
+                {"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, 14], "x": 13.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 15], "x": 16, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 10], "x": 11.25, "y": 3},
+                {"matrix": [3, 11], "x": 12.25, "y": 3},
+                {"matrix": [3, 12], "x": 13.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+                {"matrix": [3, 15], "x": 16, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 3.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 4.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 11, "y": 4},
+                {"matrix": [4, 10], "x": 12, "y": 4},
+                {"matrix": [4, 11], "x": 13, "y": 4},
+                {"matrix": [4, 12], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4},
+                {"matrix": [4, 15], "x": 16, "y": 4}
+            ]
+        },
+        "LAYOUT_iso": {
+            "layout": [
+                {"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, 14], "x": 14, "y": 0, "w": 2},
+                {"matrix": [0, 15], "x": 16, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1},
+                {"matrix": [1, 15], "x": 16, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2, "w": 1.25},
+                {"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, 14], "x": 13.75, "y": 2},
+                {"matrix": [1, 14], "x": 14.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [2, 15], "x": 16, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3, "w": 1.25},
+                {"matrix": [0, 0], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 10], "x": 11.25, "y": 3},
+                {"matrix": [3, 11], "x": 12.25, "y": 3},
+                {"matrix": [3, 12], "x": 13.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+                {"matrix": [3, 15], "x": 16, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 3.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 4.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 11, "y": 4},
+                {"matrix": [4, 10], "x": 12, "y": 4},
+                {"matrix": [4, 11], "x": 13, "y": 4},
+                {"matrix": [4, 12], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4},
+                {"matrix": [4, 15], "x": 16, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/nullbitsco/nibble/rules.mk b/keyboards/nullbitsco/nibble/rules.mk
index 5a1714cc9dd..ad36b7fcc97 100644
--- a/keyboards/nullbitsco/nibble/rules.mk
+++ b/keyboards/nullbitsco/nibble/rules.mk
@@ -1,22 +1,9 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-ENCODER_ENABLE = yes        # Use rotary encoder
-LTO_ENABLE = yes            # Link-time optimization
-CUSTOM_MATRIX = lite        # Lite custom matrix
+CUSTOM_MATRIX = lite
+
+UART_DRIVER_REQUIRED = yes
 
 # Project specific files
 SRC += matrix.c \
        common/bitc_led.c \
        big_led.c \
        common/remote_kb.c
-UART_DRIVER_REQUIRED = yes
diff --git a/keyboards/nullbitsco/scramble/rules.mk b/keyboards/nullbitsco/scramble/rules.mk
index 6f83796e9f4..5753f7786db 100644
--- a/keyboards/nullbitsco/scramble/rules.mk
+++ b/keyboards/nullbitsco/scramble/rules.mk
@@ -1,4 +1 @@
-# NOTE: This file is shared and only exists to set the default build
-# The real build rules are set in the v1/v2 directories
-
 DEFAULT_FOLDER = nullbitsco/scramble/v2
diff --git a/keyboards/nullbitsco/scramble/v1/info.json b/keyboards/nullbitsco/scramble/v1/info.json
deleted file mode 100644
index 5a9aeef64be..00000000000
--- a/keyboards/nullbitsco/scramble/v1/info.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "encoder": {
-        "rotary": [
-            {"pin_a": "D6", "pin_b": "D7"}
-        ]
-    },
-    "qmk": {
-        "tap_keycode_delay": 10
-    },
-    "processor": "atmega328p",
-    "bootloader": "usbasploader",
-    "matrix_pins": {
-        "direct": [
-            ["D4", "D5", "B1"],
-            ["C3", "C2", "C1"]
-        ]
-    }
-}
diff --git a/keyboards/nullbitsco/scramble/v1/keyboard.json b/keyboards/nullbitsco/scramble/v1/keyboard.json
new file mode 100644
index 00000000000..145f4f389cc
--- /dev/null
+++ b/keyboards/nullbitsco/scramble/v1/keyboard.json
@@ -0,0 +1,25 @@
+{
+    "features": {
+        "bootmagic": false,
+        "encoder": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": false
+    },
+    "encoder": {
+        "rotary": [
+            {"pin_a": "D6", "pin_b": "D7"}
+        ]
+    },
+    "qmk": {
+        "tap_keycode_delay": 10
+    },
+    "processor": "atmega328p",
+    "bootloader": "usbasploader",
+    "matrix_pins": {
+        "direct": [
+            ["D4", "D5", "B1"],
+            ["C3", "C2", "C1"]
+        ]
+    }
+}
diff --git a/keyboards/nullbitsco/scramble/v1/rules.mk b/keyboards/nullbitsco/scramble/v1/rules.mk
deleted file mode 100644
index f917d68f4e2..00000000000
--- a/keyboards/nullbitsco/scramble/v1/rules.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-ENCODER_ENABLE = yes        # Use rotary encoder
diff --git a/keyboards/nullbitsco/scramble/v2/info.json b/keyboards/nullbitsco/scramble/v2/info.json
deleted file mode 100644
index 2a89a1063b2..00000000000
--- a/keyboards/nullbitsco/scramble/v2/info.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "encoder": {
-        "rotary": [
-            {"pin_a": "GP24", "pin_b": "GP25"}
-        ]
-    },
-    "qmk": {
-        "tap_keycode_delay": 10
-    },
-    "processor": "RP2040",
-    "bootloader": "rp2040",
-    "matrix_pins": {
-        "direct": [
-            ["GP6", "GP8", "GP10"],
-            ["GP29", "GP28", "GP22"]
-        ]
-    }
-}
diff --git a/keyboards/nullbitsco/scramble/v2/keyboard.json b/keyboards/nullbitsco/scramble/v2/keyboard.json
new file mode 100644
index 00000000000..a55e878741e
--- /dev/null
+++ b/keyboards/nullbitsco/scramble/v2/keyboard.json
@@ -0,0 +1,25 @@
+{
+    "features": {
+        "bootmagic": false,
+        "encoder": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": false
+    },
+    "encoder": {
+        "rotary": [
+            {"pin_a": "GP24", "pin_b": "GP25"}
+        ]
+    },
+    "qmk": {
+        "tap_keycode_delay": 10
+    },
+    "processor": "RP2040",
+    "bootloader": "rp2040",
+    "matrix_pins": {
+        "direct": [
+            ["GP6", "GP8", "GP10"],
+            ["GP29", "GP28", "GP22"]
+        ]
+    }
+}
diff --git a/keyboards/nullbitsco/scramble/v2/rules.mk b/keyboards/nullbitsco/scramble/v2/rules.mk
deleted file mode 100644
index f917d68f4e2..00000000000
--- a/keyboards/nullbitsco/scramble/v2/rules.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-ENCODER_ENABLE = yes        # Use rotary encoder
diff --git a/keyboards/nullbitsco/snap/info.json b/keyboards/nullbitsco/snap/info.json
deleted file mode 100644
index 909e45d1625..00000000000
--- a/keyboards/nullbitsco/snap/info.json
+++ /dev/null
@@ -1,356 +0,0 @@
-{
-    "keyboard_name": "SNAP",
-    "manufacturer": "nullbits",
-    "url": "https://nullbits.co/snap/",
-    "usb": {
-        "vid": "0x6E61",
-        "pid": "0x6063",
-        "device_version": "0.0.1"
-    },
-    "encoder": {
-        "rotary": [
-            {"pin_a": "B3", "pin_b": "B1"}
-        ]
-    },
-    "rgblight": {
-        "led_count": 10,
-        "sleep": true,
-        "led_map": [8, 9, 0, 1, 2, 6, 7, 3, 4, 5],
-        "split_count": [5, 5],
-        "animations": {
-            "breathing": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "snake": true,
-            "knight": true,
-            "christmas": true,
-            "static_gradient": true,
-            "rgb_test": true,
-            "alternating": true,
-            "twinkle": true
-        }
-    },
-    "split": {
-        "enabled": true,
-        "encoder": {
-            "right": {
-                "rotary": [
-                    {"pin_a": "B4", "pin_b": "B5"}
-                ]
-            }
-        },
-        "transport": {
-            "sync": {
-                "oled": true
-            }
-        }
-    },
-    "ws2812": {
-        "pin": "B2"
-    },
-    "debounce": 10,
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "layouts": {
-        "LAYOUT_all": {
-            "layout": [
-                {"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": [6, 0], "x": 8, "y": 0},
-                {"matrix": [6, 1], "x": 9, "y": 0},
-                {"matrix": [6, 2], "x": 10, "y": 0},
-                {"matrix": [6, 3], "x": 11, "y": 0},
-                {"matrix": [6, 4], "x": 12, "y": 0},
-                {"matrix": [6, 5], "x": 13, "y": 0},
-                {"matrix": [6, 6], "x": 14, "y": 0},
-                {"matrix": [6, 7], "x": 15, "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": [1, 4], "x": 4, "y": 1},
-                {"matrix": [1, 5], "x": 5, "y": 1},
-                {"matrix": [1, 6], "x": 6, "y": 1},
-                {"matrix": [1, 7], "x": 7, "y": 1},
-                {"matrix": [7, 0], "x": 8, "y": 1},
-                {"matrix": [7, 1], "x": 9, "y": 1},
-                {"matrix": [7, 2], "x": 10, "y": 1},
-                {"matrix": [7, 3], "x": 11, "y": 1},
-                {"matrix": [7, 4], "x": 12, "y": 1},
-                {"matrix": [7, 5], "x": 13, "y": 1},
-                {"matrix": [7, 6], "x": 14, "y": 1},
-                {"matrix": [7, 7], "x": 15, "y": 1},
-                {"matrix": [8, 8], "x": 16, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2},
-                {"matrix": [2, 1], "x": 1, "y": 2, "w": 1.5},
-                {"matrix": [2, 2], "x": 2.5, "y": 2},
-                {"matrix": [2, 3], "x": 3.5, "y": 2},
-                {"matrix": [2, 4], "x": 4.5, "y": 2},
-                {"matrix": [2, 5], "x": 5.5, "y": 2},
-                {"matrix": [2, 7], "x": 6.5, "y": 2},
-                {"matrix": [8, 0], "x": 7.5, "y": 2},
-                {"matrix": [8, 1], "x": 8.5, "y": 2},
-                {"matrix": [8, 2], "x": 9.5, "y": 2},
-                {"matrix": [8, 3], "x": 10.5, "y": 2},
-                {"matrix": [8, 4], "x": 11.5, "y": 2},
-                {"matrix": [8, 5], "x": 12.5, "y": 2},
-                {"matrix": [8, 6], "x": 13.5, "y": 2},
-                {"matrix": [9, 7], "x": 14.5, "y": 2, "w": 1.5},
-                {"matrix": [8, 7], "x": 16, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3},
-                {"matrix": [3, 1], "x": 1, "y": 3, "w": 1.75},
-                {"matrix": [3, 2], "x": 2.75, "y": 3},
-                {"matrix": [3, 3], "x": 3.75, "y": 3},
-                {"matrix": [3, 4], "x": 4.75, "y": 3},
-                {"matrix": [3, 5], "x": 5.75, "y": 3},
-                {"matrix": [3, 7], "x": 6.75, "y": 3},
-                {"matrix": [9, 0], "x": 7.75, "y": 3},
-                {"matrix": [9, 1], "x": 8.75, "y": 3},
-                {"matrix": [9, 2], "x": 9.75, "y": 3},
-                {"matrix": [9, 3], "x": 10.75, "y": 3},
-                {"matrix": [9, 4], "x": 11.75, "y": 3},
-                {"matrix": [9, 5], "x": 12.75, "y": 3},
-                {"matrix": [9, 6], "x": 13.75, "y": 3, "w": 2.25},
-                {"matrix": [10, 7], "x": 16, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4},
-                {"matrix": [4, 1], "x": 1, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.25, "y": 4},
-                {"matrix": [4, 3], "x": 3.25, "y": 4},
-                {"matrix": [4, 4], "x": 4.25, "y": 4},
-                {"matrix": [4, 5], "x": 5.25, "y": 4},
-                {"matrix": [4, 6], "x": 6.25, "y": 4},
-                {"matrix": [4, 7], "x": 7.25, "y": 4},
-                {"matrix": [10, 0], "x": 8.25, "y": 4},
-                {"matrix": [10, 1], "x": 9.25, "y": 4},
-                {"matrix": [10, 2], "x": 10.25, "y": 4},
-                {"matrix": [10, 3], "x": 11.25, "y": 4},
-                {"matrix": [10, 4], "x": 12.25, "y": 4},
-                {"matrix": [10, 5], "x": 13.25, "y": 4, "w": 1.75},
-                {"matrix": [10, 6], "x": 15, "y": 4},
-                {"matrix": [11, 7], "x": 16, "y": 4},
-
-                {"matrix": [5, 0], "x": 0, "y": 5},
-                {"matrix": [5, 1], "x": 1, "y": 5, "w": 1.25},
-                {"matrix": [5, 2], "x": 2.25, "y": 5, "w": 1.25},
-                {"matrix": [5, 3], "x": 3.5, "y": 5, "w": 1.25},
-                {"matrix": [5, 5], "x": 4.75, "y": 5, "w": 1.25},
-                {"matrix": [5, 7], "x": 6, "y": 5, "w": 2.25},
-                {"matrix": [11, 0], "x": 8.25, "y": 5, "w": 2.75},
-                {"matrix": [11, 1], "x": 11, "y": 5},
-                {"matrix": [11, 2], "x": 12, "y": 5},
-                {"matrix": [11, 3], "x": 13, "y": 5},
-                {"matrix": [11, 4], "x": 14, "y": 5},
-                {"matrix": [11, 5], "x": 15, "y": 5},
-                {"matrix": [11, 6], "x": 16, "y": 5}
-            ]
-        },
-        "LAYOUT_ansi": {
-            "layout": [
-                {"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": [6, 0], "x": 8, "y": 0},
-                {"matrix": [6, 1], "x": 9, "y": 0},
-                {"matrix": [6, 2], "x": 10, "y": 0},
-                {"matrix": [6, 3], "x": 11, "y": 0},
-                {"matrix": [6, 4], "x": 12, "y": 0},
-                {"matrix": [6, 5], "x": 13, "y": 0},
-                {"matrix": [6, 6], "x": 14, "y": 0},
-                {"matrix": [6, 7], "x": 15, "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": [1, 4], "x": 4, "y": 1},
-                {"matrix": [1, 5], "x": 5, "y": 1},
-                {"matrix": [1, 6], "x": 6, "y": 1},
-                {"matrix": [1, 7], "x": 7, "y": 1},
-                {"matrix": [7, 0], "x": 8, "y": 1},
-                {"matrix": [7, 1], "x": 9, "y": 1},
-                {"matrix": [7, 2], "x": 10, "y": 1},
-                {"matrix": [7, 3], "x": 11, "y": 1},
-                {"matrix": [7, 4], "x": 12, "y": 1},
-                {"matrix": [7, 5], "x": 13, "y": 1},
-                {"matrix": [7, 6], "x": 14, "y": 1, "w": 2},
-                {"matrix": [8, 8], "x": 16, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2},
-                {"matrix": [2, 1], "x": 1, "y": 2, "w": 1.5},
-                {"matrix": [2, 2], "x": 2.5, "y": 2},
-                {"matrix": [2, 3], "x": 3.5, "y": 2},
-                {"matrix": [2, 4], "x": 4.5, "y": 2},
-                {"matrix": [2, 5], "x": 5.5, "y": 2},
-                {"matrix": [2, 7], "x": 6.5, "y": 2},
-                {"matrix": [8, 0], "x": 7.5, "y": 2},
-                {"matrix": [8, 1], "x": 8.5, "y": 2},
-                {"matrix": [8, 2], "x": 9.5, "y": 2},
-                {"matrix": [8, 3], "x": 10.5, "y": 2},
-                {"matrix": [8, 4], "x": 11.5, "y": 2},
-                {"matrix": [8, 5], "x": 12.5, "y": 2},
-                {"matrix": [8, 6], "x": 13.5, "y": 2},
-                {"matrix": [9, 7], "x": 14.5, "y": 2, "w": 1.5},
-                {"matrix": [8, 7], "x": 16, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3},
-                {"matrix": [3, 1], "x": 1, "y": 3, "w": 1.75},
-                {"matrix": [3, 2], "x": 2.75, "y": 3},
-                {"matrix": [3, 3], "x": 3.75, "y": 3},
-                {"matrix": [3, 4], "x": 4.75, "y": 3},
-                {"matrix": [3, 5], "x": 5.75, "y": 3},
-                {"matrix": [3, 7], "x": 6.75, "y": 3},
-                {"matrix": [9, 0], "x": 7.75, "y": 3},
-                {"matrix": [9, 1], "x": 8.75, "y": 3},
-                {"matrix": [9, 2], "x": 9.75, "y": 3},
-                {"matrix": [9, 3], "x": 10.75, "y": 3},
-                {"matrix": [9, 4], "x": 11.75, "y": 3},
-                {"matrix": [9, 5], "x": 12.75, "y": 3},
-                {"matrix": [9, 6], "x": 13.75, "y": 3, "w": 2.25},
-                {"matrix": [10, 7], "x": 16, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4},
-                {"matrix": [4, 1], "x": 1, "y": 4, "w": 2.25},
-                {"matrix": [4, 3], "x": 3.25, "y": 4},
-                {"matrix": [4, 4], "x": 4.25, "y": 4},
-                {"matrix": [4, 5], "x": 5.25, "y": 4},
-                {"matrix": [4, 6], "x": 6.25, "y": 4},
-                {"matrix": [4, 7], "x": 7.25, "y": 4},
-                {"matrix": [10, 0], "x": 8.25, "y": 4},
-                {"matrix": [10, 1], "x": 9.25, "y": 4},
-                {"matrix": [10, 2], "x": 10.25, "y": 4},
-                {"matrix": [10, 3], "x": 11.25, "y": 4},
-                {"matrix": [10, 4], "x": 12.25, "y": 4},
-                {"matrix": [10, 5], "x": 13.25, "y": 4, "w": 1.75},
-                {"matrix": [10, 6], "x": 15, "y": 4},
-                {"matrix": [11, 7], "x": 16, "y": 4},
-
-                {"matrix": [5, 0], "x": 0, "y": 5},
-                {"matrix": [5, 1], "x": 1, "y": 5, "w": 1.25},
-                {"matrix": [5, 2], "x": 2.25, "y": 5, "w": 1.25},
-                {"matrix": [5, 3], "x": 3.5, "y": 5, "w": 1.25},
-                {"matrix": [5, 5], "x": 4.75, "y": 5, "w": 1.25},
-                {"matrix": [5, 7], "x": 6, "y": 5, "w": 2.25},
-                {"matrix": [11, 0], "x": 8.25, "y": 5, "w": 2.75},
-                {"matrix": [11, 1], "x": 11, "y": 5},
-                {"matrix": [11, 2], "x": 12, "y": 5},
-                {"matrix": [11, 3], "x": 13, "y": 5},
-                {"matrix": [11, 4], "x": 14, "y": 5},
-                {"matrix": [11, 5], "x": 15, "y": 5},
-                {"matrix": [11, 6], "x": 16, "y": 5}
-            ]
-        },
-        "LAYOUT_iso": {
-            "layout": [
-                {"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": [6, 0], "x": 8, "y": 0},
-                {"matrix": [6, 1], "x": 9, "y": 0},
-                {"matrix": [6, 2], "x": 10, "y": 0},
-                {"matrix": [6, 3], "x": 11, "y": 0},
-                {"matrix": [6, 4], "x": 12, "y": 0},
-                {"matrix": [6, 5], "x": 13, "y": 0},
-                {"matrix": [6, 6], "x": 14, "y": 0},
-                {"matrix": [6, 7], "x": 15, "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": [1, 4], "x": 4, "y": 1},
-                {"matrix": [1, 5], "x": 5, "y": 1},
-                {"matrix": [1, 6], "x": 6, "y": 1},
-                {"matrix": [1, 7], "x": 7, "y": 1},
-                {"matrix": [7, 0], "x": 8, "y": 1},
-                {"matrix": [7, 1], "x": 9, "y": 1},
-                {"matrix": [7, 2], "x": 10, "y": 1},
-                {"matrix": [7, 3], "x": 11, "y": 1},
-                {"matrix": [7, 4], "x": 12, "y": 1},
-                {"matrix": [7, 5], "x": 13, "y": 1},
-                {"matrix": [7, 6], "x": 14, "y": 1, "w": 2},
-                {"matrix": [8, 8], "x": 16, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2},
-                {"matrix": [2, 1], "x": 1, "y": 2, "w": 1.5},
-                {"matrix": [2, 2], "x": 2.5, "y": 2},
-                {"matrix": [2, 3], "x": 3.5, "y": 2},
-                {"matrix": [2, 4], "x": 4.5, "y": 2},
-                {"matrix": [2, 5], "x": 5.5, "y": 2},
-                {"matrix": [2, 7], "x": 6.5, "y": 2},
-                {"matrix": [8, 0], "x": 7.5, "y": 2},
-                {"matrix": [8, 1], "x": 8.5, "y": 2},
-                {"matrix": [8, 2], "x": 9.5, "y": 2},
-                {"matrix": [8, 3], "x": 10.5, "y": 2},
-                {"matrix": [8, 4], "x": 11.5, "y": 2},
-                {"matrix": [8, 5], "x": 12.5, "y": 2},
-                {"matrix": [8, 6], "x": 13.5, "y": 2},
-                {"matrix": [9, 7], "x": 14.75, "y": 2, "w": 1.25, "h": 2},
-                {"matrix": [8, 7], "x": 16, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3},
-                {"matrix": [3, 1], "x": 1, "y": 3, "w": 1.75},
-                {"matrix": [3, 2], "x": 2.75, "y": 3},
-                {"matrix": [3, 3], "x": 3.75, "y": 3},
-                {"matrix": [3, 4], "x": 4.75, "y": 3},
-                {"matrix": [3, 5], "x": 5.75, "y": 3},
-                {"matrix": [3, 7], "x": 6.75, "y": 3},
-                {"matrix": [9, 0], "x": 7.75, "y": 3},
-                {"matrix": [9, 1], "x": 8.75, "y": 3},
-                {"matrix": [9, 2], "x": 9.75, "y": 3},
-                {"matrix": [9, 3], "x": 10.75, "y": 3},
-                {"matrix": [9, 4], "x": 11.75, "y": 3},
-                {"matrix": [9, 5], "x": 12.75, "y": 3},
-                {"matrix": [9, 6], "x": 13.75, "y": 3},
-                {"matrix": [10, 7], "x": 16, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4},
-                {"matrix": [4, 1], "x": 1, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.25, "y": 4},
-                {"matrix": [4, 3], "x": 3.25, "y": 4},
-                {"matrix": [4, 4], "x": 4.25, "y": 4},
-                {"matrix": [4, 5], "x": 5.25, "y": 4},
-                {"matrix": [4, 6], "x": 6.25, "y": 4},
-                {"matrix": [4, 7], "x": 7.25, "y": 4},
-                {"matrix": [10, 0], "x": 8.25, "y": 4},
-                {"matrix": [10, 1], "x": 9.25, "y": 4},
-                {"matrix": [10, 2], "x": 10.25, "y": 4},
-                {"matrix": [10, 3], "x": 11.25, "y": 4},
-                {"matrix": [10, 4], "x": 12.25, "y": 4},
-                {"matrix": [10, 5], "x": 13.25, "y": 4, "w": 1.75},
-                {"matrix": [10, 6], "x": 15, "y": 4},
-                {"matrix": [11, 7], "x": 16, "y": 4},
-
-                {"matrix": [5, 0], "x": 0, "y": 5},
-                {"matrix": [5, 1], "x": 1, "y": 5, "w": 1.25},
-                {"matrix": [5, 2], "x": 2.25, "y": 5, "w": 1.25},
-                {"matrix": [5, 3], "x": 3.5, "y": 5, "w": 1.25},
-                {"matrix": [5, 5], "x": 4.75, "y": 5, "w": 1.25},
-                {"matrix": [5, 7], "x": 6, "y": 5, "w": 2.25},
-                {"matrix": [11, 0], "x": 8.25, "y": 5, "w": 2.75},
-                {"matrix": [11, 1], "x": 11, "y": 5},
-                {"matrix": [11, 2], "x": 12, "y": 5},
-                {"matrix": [11, 3], "x": 13, "y": 5},
-                {"matrix": [11, 4], "x": 14, "y": 5},
-                {"matrix": [11, 5], "x": 15, "y": 5},
-                {"matrix": [11, 6], "x": 16, "y": 5}
-            ]
-        }
-    }
-}
diff --git a/keyboards/nullbitsco/snap/keyboard.json b/keyboards/nullbitsco/snap/keyboard.json
new file mode 100644
index 00000000000..139bbf5b450
--- /dev/null
+++ b/keyboards/nullbitsco/snap/keyboard.json
@@ -0,0 +1,368 @@
+{
+    "keyboard_name": "SNAP",
+    "manufacturer": "nullbits",
+    "url": "https://nullbits.co/snap/",
+    "usb": {
+        "vid": "0x6E61",
+        "pid": "0x6063",
+        "device_version": "0.0.1"
+    },
+    "build": {
+        "lto": true
+    },
+    "features": {
+        "bootmagic": false,
+        "encoder": true,
+        "extrakey": true,
+        "mousekey": false,
+        "nkro": false,
+        "rgblight": true,
+        "space_cadet": false
+    },
+    "encoder": {
+        "rotary": [
+            {"pin_a": "B3", "pin_b": "B1"}
+        ]
+    },
+    "rgblight": {
+        "led_count": 10,
+        "sleep": true,
+        "led_map": [8, 9, 0, 1, 2, 6, 7, 3, 4, 5],
+        "split_count": [5, 5],
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": true,
+            "twinkle": true
+        }
+    },
+    "split": {
+        "enabled": true,
+        "encoder": {
+            "right": {
+                "rotary": [
+                    {"pin_a": "B4", "pin_b": "B5"}
+                ]
+            }
+        },
+        "transport": {
+            "sync": {
+                "oled": true
+            }
+        }
+    },
+    "ws2812": {
+        "pin": "B2"
+    },
+    "debounce": 10,
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                {"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": [6, 0], "x": 8, "y": 0},
+                {"matrix": [6, 1], "x": 9, "y": 0},
+                {"matrix": [6, 2], "x": 10, "y": 0},
+                {"matrix": [6, 3], "x": 11, "y": 0},
+                {"matrix": [6, 4], "x": 12, "y": 0},
+                {"matrix": [6, 5], "x": 13, "y": 0},
+                {"matrix": [6, 6], "x": 14, "y": 0},
+                {"matrix": [6, 7], "x": 15, "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": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [7, 0], "x": 8, "y": 1},
+                {"matrix": [7, 1], "x": 9, "y": 1},
+                {"matrix": [7, 2], "x": 10, "y": 1},
+                {"matrix": [7, 3], "x": 11, "y": 1},
+                {"matrix": [7, 4], "x": 12, "y": 1},
+                {"matrix": [7, 5], "x": 13, "y": 1},
+                {"matrix": [7, 6], "x": 14, "y": 1},
+                {"matrix": [7, 7], "x": 15, "y": 1},
+                {"matrix": [8, 8], "x": 16, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2, "w": 1.5},
+                {"matrix": [2, 2], "x": 2.5, "y": 2},
+                {"matrix": [2, 3], "x": 3.5, "y": 2},
+                {"matrix": [2, 4], "x": 4.5, "y": 2},
+                {"matrix": [2, 5], "x": 5.5, "y": 2},
+                {"matrix": [2, 7], "x": 6.5, "y": 2},
+                {"matrix": [8, 0], "x": 7.5, "y": 2},
+                {"matrix": [8, 1], "x": 8.5, "y": 2},
+                {"matrix": [8, 2], "x": 9.5, "y": 2},
+                {"matrix": [8, 3], "x": 10.5, "y": 2},
+                {"matrix": [8, 4], "x": 11.5, "y": 2},
+                {"matrix": [8, 5], "x": 12.5, "y": 2},
+                {"matrix": [8, 6], "x": 13.5, "y": 2},
+                {"matrix": [9, 7], "x": 14.5, "y": 2, "w": 1.5},
+                {"matrix": [8, 7], "x": 16, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3, "w": 1.75},
+                {"matrix": [3, 2], "x": 2.75, "y": 3},
+                {"matrix": [3, 3], "x": 3.75, "y": 3},
+                {"matrix": [3, 4], "x": 4.75, "y": 3},
+                {"matrix": [3, 5], "x": 5.75, "y": 3},
+                {"matrix": [3, 7], "x": 6.75, "y": 3},
+                {"matrix": [9, 0], "x": 7.75, "y": 3},
+                {"matrix": [9, 1], "x": 8.75, "y": 3},
+                {"matrix": [9, 2], "x": 9.75, "y": 3},
+                {"matrix": [9, 3], "x": 10.75, "y": 3},
+                {"matrix": [9, 4], "x": 11.75, "y": 3},
+                {"matrix": [9, 5], "x": 12.75, "y": 3},
+                {"matrix": [9, 6], "x": 13.75, "y": 3, "w": 2.25},
+                {"matrix": [10, 7], "x": 16, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4},
+                {"matrix": [4, 3], "x": 3.25, "y": 4},
+                {"matrix": [4, 4], "x": 4.25, "y": 4},
+                {"matrix": [4, 5], "x": 5.25, "y": 4},
+                {"matrix": [4, 6], "x": 6.25, "y": 4},
+                {"matrix": [4, 7], "x": 7.25, "y": 4},
+                {"matrix": [10, 0], "x": 8.25, "y": 4},
+                {"matrix": [10, 1], "x": 9.25, "y": 4},
+                {"matrix": [10, 2], "x": 10.25, "y": 4},
+                {"matrix": [10, 3], "x": 11.25, "y": 4},
+                {"matrix": [10, 4], "x": 12.25, "y": 4},
+                {"matrix": [10, 5], "x": 13.25, "y": 4, "w": 1.75},
+                {"matrix": [10, 6], "x": 15, "y": 4},
+                {"matrix": [11, 7], "x": 16, "y": 4},
+
+                {"matrix": [5, 0], "x": 0, "y": 5},
+                {"matrix": [5, 1], "x": 1, "y": 5, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.25, "y": 5, "w": 1.25},
+                {"matrix": [5, 3], "x": 3.5, "y": 5, "w": 1.25},
+                {"matrix": [5, 5], "x": 4.75, "y": 5, "w": 1.25},
+                {"matrix": [5, 7], "x": 6, "y": 5, "w": 2.25},
+                {"matrix": [11, 0], "x": 8.25, "y": 5, "w": 2.75},
+                {"matrix": [11, 1], "x": 11, "y": 5},
+                {"matrix": [11, 2], "x": 12, "y": 5},
+                {"matrix": [11, 3], "x": 13, "y": 5},
+                {"matrix": [11, 4], "x": 14, "y": 5},
+                {"matrix": [11, 5], "x": 15, "y": 5},
+                {"matrix": [11, 6], "x": 16, "y": 5}
+            ]
+        },
+        "LAYOUT_ansi": {
+            "layout": [
+                {"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": [6, 0], "x": 8, "y": 0},
+                {"matrix": [6, 1], "x": 9, "y": 0},
+                {"matrix": [6, 2], "x": 10, "y": 0},
+                {"matrix": [6, 3], "x": 11, "y": 0},
+                {"matrix": [6, 4], "x": 12, "y": 0},
+                {"matrix": [6, 5], "x": 13, "y": 0},
+                {"matrix": [6, 6], "x": 14, "y": 0},
+                {"matrix": [6, 7], "x": 15, "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": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [7, 0], "x": 8, "y": 1},
+                {"matrix": [7, 1], "x": 9, "y": 1},
+                {"matrix": [7, 2], "x": 10, "y": 1},
+                {"matrix": [7, 3], "x": 11, "y": 1},
+                {"matrix": [7, 4], "x": 12, "y": 1},
+                {"matrix": [7, 5], "x": 13, "y": 1},
+                {"matrix": [7, 6], "x": 14, "y": 1, "w": 2},
+                {"matrix": [8, 8], "x": 16, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2, "w": 1.5},
+                {"matrix": [2, 2], "x": 2.5, "y": 2},
+                {"matrix": [2, 3], "x": 3.5, "y": 2},
+                {"matrix": [2, 4], "x": 4.5, "y": 2},
+                {"matrix": [2, 5], "x": 5.5, "y": 2},
+                {"matrix": [2, 7], "x": 6.5, "y": 2},
+                {"matrix": [8, 0], "x": 7.5, "y": 2},
+                {"matrix": [8, 1], "x": 8.5, "y": 2},
+                {"matrix": [8, 2], "x": 9.5, "y": 2},
+                {"matrix": [8, 3], "x": 10.5, "y": 2},
+                {"matrix": [8, 4], "x": 11.5, "y": 2},
+                {"matrix": [8, 5], "x": 12.5, "y": 2},
+                {"matrix": [8, 6], "x": 13.5, "y": 2},
+                {"matrix": [9, 7], "x": 14.5, "y": 2, "w": 1.5},
+                {"matrix": [8, 7], "x": 16, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3, "w": 1.75},
+                {"matrix": [3, 2], "x": 2.75, "y": 3},
+                {"matrix": [3, 3], "x": 3.75, "y": 3},
+                {"matrix": [3, 4], "x": 4.75, "y": 3},
+                {"matrix": [3, 5], "x": 5.75, "y": 3},
+                {"matrix": [3, 7], "x": 6.75, "y": 3},
+                {"matrix": [9, 0], "x": 7.75, "y": 3},
+                {"matrix": [9, 1], "x": 8.75, "y": 3},
+                {"matrix": [9, 2], "x": 9.75, "y": 3},
+                {"matrix": [9, 3], "x": 10.75, "y": 3},
+                {"matrix": [9, 4], "x": 11.75, "y": 3},
+                {"matrix": [9, 5], "x": 12.75, "y": 3},
+                {"matrix": [9, 6], "x": 13.75, "y": 3, "w": 2.25},
+                {"matrix": [10, 7], "x": 16, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4, "w": 2.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4},
+                {"matrix": [4, 4], "x": 4.25, "y": 4},
+                {"matrix": [4, 5], "x": 5.25, "y": 4},
+                {"matrix": [4, 6], "x": 6.25, "y": 4},
+                {"matrix": [4, 7], "x": 7.25, "y": 4},
+                {"matrix": [10, 0], "x": 8.25, "y": 4},
+                {"matrix": [10, 1], "x": 9.25, "y": 4},
+                {"matrix": [10, 2], "x": 10.25, "y": 4},
+                {"matrix": [10, 3], "x": 11.25, "y": 4},
+                {"matrix": [10, 4], "x": 12.25, "y": 4},
+                {"matrix": [10, 5], "x": 13.25, "y": 4, "w": 1.75},
+                {"matrix": [10, 6], "x": 15, "y": 4},
+                {"matrix": [11, 7], "x": 16, "y": 4},
+
+                {"matrix": [5, 0], "x": 0, "y": 5},
+                {"matrix": [5, 1], "x": 1, "y": 5, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.25, "y": 5, "w": 1.25},
+                {"matrix": [5, 3], "x": 3.5, "y": 5, "w": 1.25},
+                {"matrix": [5, 5], "x": 4.75, "y": 5, "w": 1.25},
+                {"matrix": [5, 7], "x": 6, "y": 5, "w": 2.25},
+                {"matrix": [11, 0], "x": 8.25, "y": 5, "w": 2.75},
+                {"matrix": [11, 1], "x": 11, "y": 5},
+                {"matrix": [11, 2], "x": 12, "y": 5},
+                {"matrix": [11, 3], "x": 13, "y": 5},
+                {"matrix": [11, 4], "x": 14, "y": 5},
+                {"matrix": [11, 5], "x": 15, "y": 5},
+                {"matrix": [11, 6], "x": 16, "y": 5}
+            ]
+        },
+        "LAYOUT_iso": {
+            "layout": [
+                {"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": [6, 0], "x": 8, "y": 0},
+                {"matrix": [6, 1], "x": 9, "y": 0},
+                {"matrix": [6, 2], "x": 10, "y": 0},
+                {"matrix": [6, 3], "x": 11, "y": 0},
+                {"matrix": [6, 4], "x": 12, "y": 0},
+                {"matrix": [6, 5], "x": 13, "y": 0},
+                {"matrix": [6, 6], "x": 14, "y": 0},
+                {"matrix": [6, 7], "x": 15, "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": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [7, 0], "x": 8, "y": 1},
+                {"matrix": [7, 1], "x": 9, "y": 1},
+                {"matrix": [7, 2], "x": 10, "y": 1},
+                {"matrix": [7, 3], "x": 11, "y": 1},
+                {"matrix": [7, 4], "x": 12, "y": 1},
+                {"matrix": [7, 5], "x": 13, "y": 1},
+                {"matrix": [7, 6], "x": 14, "y": 1, "w": 2},
+                {"matrix": [8, 8], "x": 16, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2, "w": 1.5},
+                {"matrix": [2, 2], "x": 2.5, "y": 2},
+                {"matrix": [2, 3], "x": 3.5, "y": 2},
+                {"matrix": [2, 4], "x": 4.5, "y": 2},
+                {"matrix": [2, 5], "x": 5.5, "y": 2},
+                {"matrix": [2, 7], "x": 6.5, "y": 2},
+                {"matrix": [8, 0], "x": 7.5, "y": 2},
+                {"matrix": [8, 1], "x": 8.5, "y": 2},
+                {"matrix": [8, 2], "x": 9.5, "y": 2},
+                {"matrix": [8, 3], "x": 10.5, "y": 2},
+                {"matrix": [8, 4], "x": 11.5, "y": 2},
+                {"matrix": [8, 5], "x": 12.5, "y": 2},
+                {"matrix": [8, 6], "x": 13.5, "y": 2},
+                {"matrix": [9, 7], "x": 14.75, "y": 2, "w": 1.25, "h": 2},
+                {"matrix": [8, 7], "x": 16, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3, "w": 1.75},
+                {"matrix": [3, 2], "x": 2.75, "y": 3},
+                {"matrix": [3, 3], "x": 3.75, "y": 3},
+                {"matrix": [3, 4], "x": 4.75, "y": 3},
+                {"matrix": [3, 5], "x": 5.75, "y": 3},
+                {"matrix": [3, 7], "x": 6.75, "y": 3},
+                {"matrix": [9, 0], "x": 7.75, "y": 3},
+                {"matrix": [9, 1], "x": 8.75, "y": 3},
+                {"matrix": [9, 2], "x": 9.75, "y": 3},
+                {"matrix": [9, 3], "x": 10.75, "y": 3},
+                {"matrix": [9, 4], "x": 11.75, "y": 3},
+                {"matrix": [9, 5], "x": 12.75, "y": 3},
+                {"matrix": [9, 6], "x": 13.75, "y": 3},
+                {"matrix": [10, 7], "x": 16, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4},
+                {"matrix": [4, 3], "x": 3.25, "y": 4},
+                {"matrix": [4, 4], "x": 4.25, "y": 4},
+                {"matrix": [4, 5], "x": 5.25, "y": 4},
+                {"matrix": [4, 6], "x": 6.25, "y": 4},
+                {"matrix": [4, 7], "x": 7.25, "y": 4},
+                {"matrix": [10, 0], "x": 8.25, "y": 4},
+                {"matrix": [10, 1], "x": 9.25, "y": 4},
+                {"matrix": [10, 2], "x": 10.25, "y": 4},
+                {"matrix": [10, 3], "x": 11.25, "y": 4},
+                {"matrix": [10, 4], "x": 12.25, "y": 4},
+                {"matrix": [10, 5], "x": 13.25, "y": 4, "w": 1.75},
+                {"matrix": [10, 6], "x": 15, "y": 4},
+                {"matrix": [11, 7], "x": 16, "y": 4},
+
+                {"matrix": [5, 0], "x": 0, "y": 5},
+                {"matrix": [5, 1], "x": 1, "y": 5, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.25, "y": 5, "w": 1.25},
+                {"matrix": [5, 3], "x": 3.5, "y": 5, "w": 1.25},
+                {"matrix": [5, 5], "x": 4.75, "y": 5, "w": 1.25},
+                {"matrix": [5, 7], "x": 6, "y": 5, "w": 2.25},
+                {"matrix": [11, 0], "x": 8.25, "y": 5, "w": 2.75},
+                {"matrix": [11, 1], "x": 11, "y": 5},
+                {"matrix": [11, 2], "x": 12, "y": 5},
+                {"matrix": [11, 3], "x": 13, "y": 5},
+                {"matrix": [11, 4], "x": 14, "y": 5},
+                {"matrix": [11, 5], "x": 15, "y": 5},
+                {"matrix": [11, 6], "x": 16, "y": 5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/nullbitsco/snap/keymaps/bongo_reactive/config.h b/keyboards/nullbitsco/snap/keymaps/bongo_reactive/config.h
index d4f07051e5c..b2c161d40ac 100644
--- a/keyboards/nullbitsco/snap/keymaps/bongo_reactive/config.h
+++ b/keyboards/nullbitsco/snap/keymaps/bongo_reactive/config.h
@@ -28,8 +28,11 @@
 // Selectively undefine to save space
 // VIA support won't fit otherwise
 #ifdef RGBLIGHT_ENABLE
-#undef RGBLIGHT_EFFECT_TWINKLE
+#undef RGBLIGHT_EFFECT_ALTERNATING
+#undef RGBLIGHT_EFFECT_CHRISTMAS
 #undef RGBLIGHT_EFFECT_RGB_TEST
+#undef RGBLIGHT_EFFECT_SNAKE
+#undef RGBLIGHT_EFFECT_TWINKLE
 #endif //RGB LIGHT_ENABLE
 
 // Split Options
diff --git a/keyboards/nullbitsco/snap/rules.mk b/keyboards/nullbitsco/snap/rules.mk
index 087be867f3e..1603cb408ce 100644
--- a/keyboards/nullbitsco/snap/rules.mk
+++ b/keyboards/nullbitsco/snap/rules.mk
@@ -1,22 +1,8 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no       # Mouse keys
-EXTRAKEY_ENABLE = yes      # Audio control and System control
-CONSOLE_ENABLE = no        # Console for debug
-COMMAND_ENABLE = no        # Commands for debug and configuration
-NKRO_ENABLE = no           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no      # Enable keyboard backlight functionality
-AUDIO_ENABLE = no          # Audio output
-LTO_ENABLE = yes           # Use Link Time Optimization
-ENCODER_ENABLE = yes       # Enables the use of one or more encoders
-SPACE_CADET_ENABLE = no    # Enables the use of Space Cadet
-RGBLIGHT_ENABLE = yes      # Enable keyboard RGB underglow
-CUSTOM_MATRIX = lite       # Split custom matrix
+CUSTOM_MATRIX = lite
+
+UART_DRIVER_REQUIRED = yes
 
 # Project specific files
 SRC +=  common/bitc_led.c \
         common/remote_kb.c \
         matrix.c
-UART_DRIVER_REQUIRED = yes
diff --git a/keyboards/nullbitsco/tidbit/info.json b/keyboards/nullbitsco/tidbit/info.json
deleted file mode 100644
index b8eaf60d89e..00000000000
--- a/keyboards/nullbitsco/tidbit/info.json
+++ /dev/null
@@ -1,72 +0,0 @@
-{
-    "keyboard_name": "TIDBIT",
-    "manufacturer": "nullbits",
-    "url": "https://nullbits.co/tidbit/",
-    "usb": {
-        "vid": "0x6E61",
-        "pid": "0x6064",
-        "device_version": "0.0.1"
-    },
-    "rgblight": {
-        "led_count": 8,
-        "animations": {
-            "breathing": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "snake": true,
-            "knight": true,
-            "christmas": true,
-            "static_gradient": true,
-            "rgb_test": true,
-            "alternating": true,
-            "twinkle": true
-        }
-    },
-    "ws2812": {
-        "pin": "B6"
-    },
-    "matrix_pins": {
-        "cols": [null, null, "F4", "F5", "F6", "F7"],
-        "rows": ["B1", "E6", "D7", "C6", "D4"]
-    },
-    "diode_direction": "ROW2COL",
-    "encoder": {
-        "rotary": [
-            {"pin_a": "B2", "pin_b": "B3"},
-            {"pin_a": "B4", "pin_b": "B5"},
-            {"pin_a": "D0", "pin_b": "D1"},
-            {"pin_a": "D3", "pin_b": "D2"}
-        ]
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 3], "x": 1, "y": 0},
-                {"matrix": [0, 4], "x": 2, "y": 0},
-                {"matrix": [0, 5], "x": 3, "y": 0},
-
-                {"matrix": [1, 2], "x": 0, "y": 1},
-                {"matrix": [1, 3], "x": 1, "y": 1},
-                {"matrix": [1, 4], "x": 2, "y": 1},
-                {"matrix": [1, 5], "x": 3, "y": 1},
-
-                {"matrix": [2, 2], "x": 0, "y": 2},
-                {"matrix": [2, 3], "x": 1, "y": 2},
-                {"matrix": [2, 4], "x": 2, "y": 2},
-                {"matrix": [2, 5], "x": 3, "y": 2},
-
-                {"matrix": [3, 2], "x": 0, "y": 3},
-                {"matrix": [3, 3], "x": 1, "y": 3},
-                {"matrix": [3, 4], "x": 2, "y": 3},
-                {"matrix": [3, 5], "x": 3, "y": 3},
-
-                {"matrix": [4, 2], "x": 0, "y": 4},
-                {"matrix": [4, 3], "x": 1, "y": 4},
-                {"matrix": [4, 4], "x": 2, "y": 4},
-                {"matrix": [4, 5], "x": 3, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/nullbitsco/tidbit/keyboard.json b/keyboards/nullbitsco/tidbit/keyboard.json
new file mode 100644
index 00000000000..83593ad5236
--- /dev/null
+++ b/keyboards/nullbitsco/tidbit/keyboard.json
@@ -0,0 +1,83 @@
+{
+    "keyboard_name": "TIDBIT",
+    "manufacturer": "nullbits",
+    "url": "https://nullbits.co/tidbit/",
+    "usb": {
+        "vid": "0x6E61",
+        "pid": "0x6064",
+        "device_version": "0.0.1"
+    },
+    "build": {
+        "lto": true
+    },
+    "features": {
+        "bootmagic": false,
+        "encoder": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": false,
+        "rgblight": true
+    },
+    "rgblight": {
+        "led_count": 8,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": true,
+            "twinkle": true
+        }
+    },
+    "ws2812": {
+        "pin": "B6"
+    },
+    "matrix_pins": {
+        "cols": [null, null, "F4", "F5", "F6", "F7"],
+        "rows": ["B1", "E6", "D7", "C6", "D4"]
+    },
+    "diode_direction": "ROW2COL",
+    "encoder": {
+        "rotary": [
+            {"pin_a": "B2", "pin_b": "B3"},
+            {"pin_a": "B4", "pin_b": "B5"},
+            {"pin_a": "D0", "pin_b": "D1"},
+            {"pin_a": "D3", "pin_b": "D2"}
+        ]
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 3], "x": 1, "y": 0},
+                {"matrix": [0, 4], "x": 2, "y": 0},
+                {"matrix": [0, 5], "x": 3, "y": 0},
+
+                {"matrix": [1, 2], "x": 0, "y": 1},
+                {"matrix": [1, 3], "x": 1, "y": 1},
+                {"matrix": [1, 4], "x": 2, "y": 1},
+                {"matrix": [1, 5], "x": 3, "y": 1},
+
+                {"matrix": [2, 2], "x": 0, "y": 2},
+                {"matrix": [2, 3], "x": 1, "y": 2},
+                {"matrix": [2, 4], "x": 2, "y": 2},
+                {"matrix": [2, 5], "x": 3, "y": 2},
+
+                {"matrix": [3, 2], "x": 0, "y": 3},
+                {"matrix": [3, 3], "x": 1, "y": 3},
+                {"matrix": [3, 4], "x": 2, "y": 3},
+                {"matrix": [3, 5], "x": 3, "y": 3},
+
+                {"matrix": [4, 2], "x": 0, "y": 4},
+                {"matrix": [4, 3], "x": 1, "y": 4},
+                {"matrix": [4, 4], "x": 2, "y": 4},
+                {"matrix": [4, 5], "x": 3, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/nullbitsco/tidbit/rules.mk b/keyboards/nullbitsco/tidbit/rules.mk
index b4a06216bb6..9cc22114aec 100644
--- a/keyboards/nullbitsco/tidbit/rules.mk
+++ b/keyboards/nullbitsco/tidbit/rules.mk
@@ -1,18 +1,3 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-ENCODER_ENABLE = yes
-LTO_ENABLE = yes
-
 # Project specific files
 SRC += common/bitc_led.c \
     common/remote_kb.c
diff --git a/keyboards/numatreus/info.json b/keyboards/numatreus/info.json
deleted file mode 100644
index bdf4a574c68..00000000000
--- a/keyboards/numatreus/info.json
+++ /dev/null
@@ -1,81 +0,0 @@
-{
-  "keyboard_name": "NumAtreus",
-  "manufacturer": "yohewi",
-  "url": "",
-  "maintainer": "qmk",
-  "usb": {
-    "vid": "0xFEED",
-    "pid": "0xE80A",
-    "device_version": "0.0.1"
-  },
-  "matrix_pins": {
-    "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "D2", "D1", "D0", "D4"],
-    "rows": ["C6", "D7", "E6", "B4"]
-  },
-  "diode_direction": "ROW2COL",
-  "ws2812": {
-    "pin": "D3"
-  },
-  "rgblight": {
-    "hue_steps": 10,
-    "led_count": 6,
-    "max_brightness": 200
-  },
-  "processor": "atmega32u4",
-  "bootloader": "caterina",
-  "layouts": {
-    "LAYOUT": {
-      "layout": [
-        {"matrix": [0, 0], "x": 0, "y": 0.6},
-        {"matrix": [0, 1], "x": 1, "y": 0.35},
-        {"matrix": [0, 2], "x": 2, "y": 0},
-        {"matrix": [0, 3], "x": 3, "y": 0.35},
-        {"matrix": [0, 4], "x": 4, "y": 0.7},
-
-        {"matrix": [0, 6], "x": 8, "y": 0.7},
-        {"matrix": [0, 7], "x": 9, "y": 0.35},
-        {"matrix": [0, 8], "x": 10, "y": 0},
-        {"matrix": [0, 9], "x": 11, "y": 0.35},
-        {"matrix": [0, 10], "x": 12, "y": 0.6},
-
-        {"matrix": [1, 0], "x": 0, "y": 1.6},
-        {"matrix": [1, 1], "x": 1, "y": 1.35},
-        {"matrix": [1, 2], "x": 2, "y": 1},
-        {"matrix": [1, 3], "x": 3, "y": 1.35},
-        {"matrix": [1, 4], "x": 4, "y": 1.7},
-
-        {"matrix": [1, 6], "x": 8, "y": 1.7},
-        {"matrix": [1, 7], "x": 9, "y": 1.35},
-        {"matrix": [1, 8], "x": 10, "y": 1},
-        {"matrix": [1, 9], "x": 11, "y": 1.35},
-        {"matrix": [1, 10], "x": 12, "y": 1.6},
-
-        {"matrix": [2, 0], "x": 0, "y": 2.6},
-        {"matrix": [2, 1], "x": 1, "y": 2.35},
-        {"matrix": [2, 2], "x": 2, "y": 2},
-        {"matrix": [2, 3], "x": 3, "y": 2.35},
-        {"matrix": [2, 4], "x": 4, "y": 2.7},
-
-        {"matrix": [2, 6], "x": 8, "y": 2.7},
-        {"matrix": [2, 7], "x": 9, "y": 2.35},
-        {"matrix": [2, 8], "x": 10, "y": 2},
-        {"matrix": [2, 9], "x": 11, "y": 2.35},
-        {"matrix": [2, 10], "x": 12, "y": 2.6},
-
-        {"matrix": [3, 0], "x": 0, "y": 3.6},
-        {"matrix": [3, 1], "x": 1, "y": 3.35},
-        {"matrix": [3, 2], "x": 2, "y": 3},
-        {"matrix": [3, 3], "x": 3, "y": 3.35},
-        {"matrix": [3, 4], "x": 4, "y": 3.7},
-        {"matrix": [2, 5], "x": 5, "y": 2.95, "h": 1.5},
-
-        {"matrix": [3, 5], "x": 7, "y": 2.95, "h": 1.5},
-        {"matrix": [3, 6], "x": 8, "y": 3.7},
-        {"matrix": [3, 7], "x": 9, "y": 3.35},
-        {"matrix": [3, 8], "x": 10, "y": 3},
-        {"matrix": [3, 9], "x": 11, "y": 3.35},
-        {"matrix": [3, 10], "x": 12, "y": 3.6}
-      ]
-    }
-  }
-}
diff --git a/keyboards/numatreus/keyboard.json b/keyboards/numatreus/keyboard.json
new file mode 100644
index 00000000000..cfb612a5416
--- /dev/null
+++ b/keyboards/numatreus/keyboard.json
@@ -0,0 +1,88 @@
+{
+  "keyboard_name": "NumAtreus",
+  "manufacturer": "yohewi",
+  "url": "",
+  "maintainer": "qmk",
+  "usb": {
+    "vid": "0xFEED",
+    "pid": "0xE80A",
+    "device_version": "0.0.1"
+  },
+  "features": {
+    "bootmagic": false,
+    "extrakey": false,
+    "mousekey": true,
+    "nkro": true,
+    "unicode": true
+  },
+  "matrix_pins": {
+    "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "D2", "D1", "D0", "D4"],
+    "rows": ["C6", "D7", "E6", "B4"]
+  },
+  "diode_direction": "ROW2COL",
+  "ws2812": {
+    "pin": "D3"
+  },
+  "rgblight": {
+    "hue_steps": 10,
+    "led_count": 6,
+    "max_brightness": 200
+  },
+  "processor": "atmega32u4",
+  "bootloader": "caterina",
+  "layouts": {
+    "LAYOUT": {
+      "layout": [
+        {"matrix": [0, 0], "x": 0, "y": 0.6},
+        {"matrix": [0, 1], "x": 1, "y": 0.35},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0.35},
+        {"matrix": [0, 4], "x": 4, "y": 0.7},
+
+        {"matrix": [0, 6], "x": 8, "y": 0.7},
+        {"matrix": [0, 7], "x": 9, "y": 0.35},
+        {"matrix": [0, 8], "x": 10, "y": 0},
+        {"matrix": [0, 9], "x": 11, "y": 0.35},
+        {"matrix": [0, 10], "x": 12, "y": 0.6},
+
+        {"matrix": [1, 0], "x": 0, "y": 1.6},
+        {"matrix": [1, 1], "x": 1, "y": 1.35},
+        {"matrix": [1, 2], "x": 2, "y": 1},
+        {"matrix": [1, 3], "x": 3, "y": 1.35},
+        {"matrix": [1, 4], "x": 4, "y": 1.7},
+
+        {"matrix": [1, 6], "x": 8, "y": 1.7},
+        {"matrix": [1, 7], "x": 9, "y": 1.35},
+        {"matrix": [1, 8], "x": 10, "y": 1},
+        {"matrix": [1, 9], "x": 11, "y": 1.35},
+        {"matrix": [1, 10], "x": 12, "y": 1.6},
+
+        {"matrix": [2, 0], "x": 0, "y": 2.6},
+        {"matrix": [2, 1], "x": 1, "y": 2.35},
+        {"matrix": [2, 2], "x": 2, "y": 2},
+        {"matrix": [2, 3], "x": 3, "y": 2.35},
+        {"matrix": [2, 4], "x": 4, "y": 2.7},
+
+        {"matrix": [2, 6], "x": 8, "y": 2.7},
+        {"matrix": [2, 7], "x": 9, "y": 2.35},
+        {"matrix": [2, 8], "x": 10, "y": 2},
+        {"matrix": [2, 9], "x": 11, "y": 2.35},
+        {"matrix": [2, 10], "x": 12, "y": 2.6},
+
+        {"matrix": [3, 0], "x": 0, "y": 3.6},
+        {"matrix": [3, 1], "x": 1, "y": 3.35},
+        {"matrix": [3, 2], "x": 2, "y": 3},
+        {"matrix": [3, 3], "x": 3, "y": 3.35},
+        {"matrix": [3, 4], "x": 4, "y": 3.7},
+        {"matrix": [2, 5], "x": 5, "y": 2.95, "h": 1.5},
+
+        {"matrix": [3, 5], "x": 7, "y": 2.95, "h": 1.5},
+        {"matrix": [3, 6], "x": 8, "y": 3.7},
+        {"matrix": [3, 7], "x": 9, "y": 3.35},
+        {"matrix": [3, 8], "x": 10, "y": 3},
+        {"matrix": [3, 9], "x": 11, "y": 3.35},
+        {"matrix": [3, 10], "x": 12, "y": 3.6}
+      ]
+    }
+  }
+}
diff --git a/keyboards/numatreus/keymaps/like_jis/config.h b/keyboards/numatreus/keymaps/like_jis/config.h
index 70faffdf37a..52675f5ec50 100644
--- a/keyboards/numatreus/keymaps/like_jis/config.h
+++ b/keyboards/numatreus/keymaps/like_jis/config.h
@@ -22,9 +22,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 // place overrides here
 
-#ifdef TAPPING_TERM
 #undef TAPPING_TERM
-#endif
 #define TAPPING_TERM 225
 
 #ifdef MOUSEKEY_ENABLE
@@ -45,14 +43,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #endif
 
 // Selection of RGBLIGHT MODE to use.
-#if defined(LED_ANIMATIONS)
-   //#define RGBLIGHT_EFFECT_BREATHING
-   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-   //#define RGBLIGHT_EFFECT_SNAKE
-   #define RGBLIGHT_EFFECT_KNIGHT
-   //#define RGBLIGHT_EFFECT_CHRISTMAS
-   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-   //#define RGBLIGHT_EFFECT_RGB_TEST
-   //#define RGBLIGHT_EFFECT_ALTERNATING
-#endif
+//#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+//#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+//#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+//#define RGBLIGHT_EFFECT_RGB_TEST
+//#define RGBLIGHT_EFFECT_ALTERNATING
diff --git a/keyboards/numatreus/keymaps/like_jis/rules.mk b/keyboards/numatreus/keymaps/like_jis/rules.mk
index 959653f3f81..995178768cc 100644
--- a/keyboards/numatreus/keymaps/like_jis/rules.mk
+++ b/keyboards/numatreus/keymaps/like_jis/rules.mk
@@ -1,8 +1,3 @@
 MOUSEKEY_ENABLE = yes
 TAP_DANCE_ENABLE = yes
 RGBLIGHT_ENABLE = yes
-LED_ANIMATIONS = yes
-
-ifeq ($(strip $(LED_ANIMATIONS)), yes)
-    OPT_DEFS += -DLED_ANIMATIONS
-endif
diff --git a/keyboards/numatreus/post_rules.mk b/keyboards/numatreus/post_rules.mk
deleted file mode 100644
index 1f49875d0fe..00000000000
--- a/keyboards/numatreus/post_rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-ifeq ($(strip $(LED_ANIMATIONS)), yes)
-    OPT_DEFS += -DLED_ANIMATIONS
-endif
diff --git a/keyboards/numatreus/rules.mk b/keyboards/numatreus/rules.mk
deleted file mode 100644
index 2a92a7e48b8..00000000000
--- a/keyboards/numatreus/rules.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = no       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no        # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-#BACKLIGHT_ENABLE = no      # Enable keyboard backlight functionality
-UNICODE_ENABLE = yes         # Unicode
-RGBLIGHT_ENABLE = no
-LED_ANIMATIONS = no
diff --git a/keyboards/oddball/info.json b/keyboards/oddball/info.json
index 8ec0cb69b21..fdbb8b2b1db 100644
--- a/keyboards/oddball/info.json
+++ b/keyboards/oddball/info.json
@@ -8,6 +8,13 @@
         "pid": "0xCA49",
         "device_version": "0.0.1"
     },
+    "features": {
+        "bootmagic": false,
+        "extrakey": true,
+        "mousekey": false,
+        "nkro": false,
+        "pointing_device": true
+    },
     "split": {
         "enabled": true
     },
diff --git a/keyboards/oddball/rules.mk b/keyboards/oddball/rules.mk
index 5a3becd82a6..2fc8995acbe 100644
--- a/keyboards/oddball/rules.mk
+++ b/keyboards/oddball/rules.mk
@@ -1,17 +1,3 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
-POINTING_DEVICE_ENABLE = yes
 POINTING_DEVICE_DRIVER = adns9800
 
 DEFAULT_FOLDER = oddball/v1
diff --git a/keyboards/oddforge/vea/info.json b/keyboards/oddforge/vea/info.json
deleted file mode 100644
index 9b55d0f2b56..00000000000
--- a/keyboards/oddforge/vea/info.json
+++ /dev/null
@@ -1,161 +0,0 @@
-{
-    "keyboard_name": "VE.A",
-    "manufacturer": "OddForge",
-    "url": "https://drop.com/buy/ve-a",
-    "maintainer": "MajorKoos",
-    "usb": {
-        "vid": "0xFFFE",
-        "pid": "0x4155",
-        "device_version": "1.0.0"
-    },
-    "backlight": {
-        "pin": "D4"
-    },
-    "dynamic_keymap": {
-        "layer_count": 3
-    },
-    "rgblight": {
-        "led_count": 18,
-        "sleep": true,
-        "animations": {
-            "breathing": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "snake": true,
-            "knight": true,
-            "christmas": true,
-            "static_gradient": true,
-            "rgb_test": true,
-            "alternating": true,
-            "twinkle": true
-        }
-    },
-    "ws2812": {
-        "driver": "custom"
-    },
-    "indicators": {
-        "caps_lock": "D1",
-        "num_lock": "D0",
-        "scroll_lock": "D6"
-    },
-    "processor": "atmega32a",
-    "bootloader": "bootloadhid",
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [5, 0], "x": 2.25, "y": 0},
-                {"matrix": [5, 1], "x": 3.25, "y": 0},
-                {"matrix": [5, 2], "x": 4.25, "y": 0},
-                {"matrix": [5, 3], "x": 5.25, "y": 0},
-                {"matrix": [5, 4], "x": 6.25, "y": 0},
-                {"matrix": [5, 5], "x": 7.25, "y": 0},
-                {"matrix": [5, 6], "x": 8.25, "y": 0},
-
-                {"matrix": [5, 8], "x": 10.75, "y": 0},
-                {"matrix": [5, 9], "x": 11.75, "y": 0},
-                {"matrix": [5, 10], "x": 12.75, "y": 0},
-                {"matrix": [5, 11], "x": 13.75, "y": 0},
-                {"matrix": [5, 12], "x": 14.75, "y": 0},
-                {"matrix": [5, 13], "x": 15.75, "y": 0},
-                {"matrix": [6, 11], "x": 16.75, "y": 0},
-                {"matrix": [7, 11], "x": 17.75, "y": 0},
-                {"matrix": [6, 13], "x": 18.75, "y": 0},
-
-                {"matrix": [6, 1], "x": 0, "y": 1},
-                {"matrix": [7, 1], "x": 1, "y": 1},
-
-                {"matrix": [4, 0], "x": 2.25, "y": 1},
-                {"matrix": [4, 1], "x": 3.25, "y": 1},
-                {"matrix": [4, 2], "x": 4.25, "y": 1},
-                {"matrix": [4, 3], "x": 5.25, "y": 1},
-                {"matrix": [4, 4], "x": 6.25, "y": 1},
-                {"matrix": [4, 5], "x": 7.25, "y": 1},
-                {"matrix": [4, 6], "x": 8.25, "y": 1},
-
-                {"matrix": [4, 8], "x": 10.75, "y": 1},
-                {"matrix": [4, 9], "x": 11.75, "y": 1},
-                {"matrix": [4, 10], "x": 12.75, "y": 1},
-                {"matrix": [4, 11], "x": 13.75, "y": 1},
-                {"matrix": [4, 12], "x": 14.75, "y": 1},
-                {"matrix": [4, 13], "x": 15.75, "y": 1},
-                {"matrix": [4, 14], "x": 16.75, "y": 1, "w": 2},
-                {"matrix": [6, 10], "x": 18.75, "y": 1},
-
-                {"matrix": [6, 2], "x": 0, "y": 2},
-                {"matrix": [7, 2], "x": 1, "y": 2},
-
-                {"matrix": [3, 0], "x": 2.25, "y": 2, "w": 1.5},
-                {"matrix": [3, 1], "x": 3.75, "y": 2},
-                {"matrix": [3, 2], "x": 4.75, "y": 2},
-                {"matrix": [3, 3], "x": 5.75, "y": 2},
-                {"matrix": [3, 4], "x": 6.75, "y": 2},
-                {"matrix": [3, 5], "x": 7.75, "y": 2},
-
-                {"matrix": [1, 8], "x": 10.25, "y": 2},
-                {"matrix": [1, 9], "x": 11.25, "y": 2},
-                {"matrix": [1, 10], "x": 12.25, "y": 2},
-                {"matrix": [1, 11], "x": 13.25, "y": 2},
-                {"matrix": [1, 12], "x": 14.25, "y": 2},
-                {"matrix": [1, 13], "x": 15.25, "y": 2},
-                {"matrix": [1, 14], "x": 16.25, "y": 2},
-                {"matrix": [2, 14], "x": 17.25, "y": 2, "w": 1.5},
-                {"matrix": [7, 10], "x": 18.75, "y": 2},
-
-                {"matrix": [6, 3], "x": 0, "y": 3},
-                {"matrix": [7, 3], "x": 1, "y": 3},
-
-                {"matrix": [2, 0], "x": 2.25, "y": 3, "w": 1.75},
-                {"matrix": [2, 1], "x": 4, "y": 3},
-                {"matrix": [2, 2], "x": 5, "y": 3},
-                {"matrix": [2, 3], "x": 6, "y": 3},
-                {"matrix": [2, 4], "x": 7, "y": 3},
-                {"matrix": [2, 5], "x": 8, "y": 3},
-
-                {"matrix": [2, 8], "x": 10.5, "y": 3},
-                {"matrix": [2, 9], "x": 11.5, "y": 3},
-                {"matrix": [2, 10], "x": 12.5, "y": 3},
-                {"matrix": [2, 11], "x": 13.5, "y": 3},
-                {"matrix": [2, 12], "x": 14.5, "y": 3},
-                {"matrix": [2, 13], "x": 15.5, "y": 3},
-                {"matrix": [3, 13], "x": 16.5, "y": 3, "w": 2.25},
-                {"matrix": [6, 12], "x": 18.75, "y": 3},
-
-                {"matrix": [6, 4], "x": 0, "y": 4},
-                {"matrix": [7, 4], "x": 1, "y": 4},
-
-                {"matrix": [1, 0], "x": 2.25, "y": 4, "w": 2.25},
-                {"matrix": [1, 1], "x": 4.5, "y": 4},
-                {"matrix": [1, 2], "x": 5.5, "y": 4},
-                {"matrix": [1, 3], "x": 6.5, "y": 4},
-                {"matrix": [1, 4], "x": 7.5, "y": 4},
-                {"matrix": [1, 5], "x": 8.5, "y": 4},
-
-                {"matrix": [3, 8], "x": 11, "y": 4},
-                {"matrix": [3, 9], "x": 12, "y": 4},
-                {"matrix": [3, 10], "x": 13, "y": 4},
-                {"matrix": [3, 11], "x": 14, "y": 4},
-                {"matrix": [3, 12], "x": 15, "y": 4},
-                {"matrix": [3, 14], "x": 16, "y": 4, "w": 1.75},
-                {"matrix": [6, 8], "x": 17.75, "y": 4},
-                {"matrix": [7, 12], "x": 18.75, "y": 4},
-
-                {"matrix": [6, 5], "x": 0, "y": 5},
-                {"matrix": [7, 5], "x": 1, "y": 5},
-
-                {"matrix": [0, 0], "x": 2.25, "y": 5, "w": 1.25},
-                {"matrix": [0, 1], "x": 3.5, "y": 5, "w": 1.25},
-                {"matrix": [0, 2], "x": 4.75, "y": 5, "w": 1.25},
-                {"matrix": [7, 7], "x": 6, "y": 5, "w": 2},
-                {"matrix": [6, 6], "x": 8, "y": 5},
-
-                {"matrix": [6, 14], "x": 10.5, "y": 5, "w": 2.75},
-                {"matrix": [0, 10], "x": 13.25, "y": 5, "w": 1.25},
-                {"matrix": [0, 9], "x": 14.5, "y": 5},
-                {"matrix": [0, 8], "x": 15.5, "y": 5, "w": 1.25},
-                {"matrix": [7, 8], "x": 16.75, "y": 5},
-                {"matrix": [6, 9], "x": 17.75, "y": 5},
-                {"matrix": [7, 9], "x": 18.75, "y": 5}
-            ]
-        }
-    }
-}
diff --git a/keyboards/oddforge/vea/keyboard.json b/keyboards/oddforge/vea/keyboard.json
new file mode 100644
index 00000000000..6a6780ea53c
--- /dev/null
+++ b/keyboards/oddforge/vea/keyboard.json
@@ -0,0 +1,168 @@
+{
+    "keyboard_name": "VE.A",
+    "manufacturer": "OddForge",
+    "url": "https://drop.com/buy/ve-a",
+    "maintainer": "MajorKoos",
+    "usb": {
+        "vid": "0xFFFE",
+        "pid": "0x4155",
+        "device_version": "1.0.0"
+    },
+    "features": {
+        "backlight": true,
+        "bootmagic": false,
+        "extrakey": true,
+        "mousekey": false,
+        "rgblight": true
+    },
+    "backlight": {
+        "pin": "D4"
+    },
+    "dynamic_keymap": {
+        "layer_count": 3
+    },
+    "rgblight": {
+        "led_count": 18,
+        "sleep": true,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": true,
+            "twinkle": true
+        }
+    },
+    "ws2812": {
+        "driver": "custom"
+    },
+    "indicators": {
+        "caps_lock": "D1",
+        "num_lock": "D0",
+        "scroll_lock": "D6"
+    },
+    "processor": "atmega32a",
+    "bootloader": "bootloadhid",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [5, 0], "x": 2.25, "y": 0},
+                {"matrix": [5, 1], "x": 3.25, "y": 0},
+                {"matrix": [5, 2], "x": 4.25, "y": 0},
+                {"matrix": [5, 3], "x": 5.25, "y": 0},
+                {"matrix": [5, 4], "x": 6.25, "y": 0},
+                {"matrix": [5, 5], "x": 7.25, "y": 0},
+                {"matrix": [5, 6], "x": 8.25, "y": 0},
+
+                {"matrix": [5, 8], "x": 10.75, "y": 0},
+                {"matrix": [5, 9], "x": 11.75, "y": 0},
+                {"matrix": [5, 10], "x": 12.75, "y": 0},
+                {"matrix": [5, 11], "x": 13.75, "y": 0},
+                {"matrix": [5, 12], "x": 14.75, "y": 0},
+                {"matrix": [5, 13], "x": 15.75, "y": 0},
+                {"matrix": [6, 11], "x": 16.75, "y": 0},
+                {"matrix": [7, 11], "x": 17.75, "y": 0},
+                {"matrix": [6, 13], "x": 18.75, "y": 0},
+
+                {"matrix": [6, 1], "x": 0, "y": 1},
+                {"matrix": [7, 1], "x": 1, "y": 1},
+
+                {"matrix": [4, 0], "x": 2.25, "y": 1},
+                {"matrix": [4, 1], "x": 3.25, "y": 1},
+                {"matrix": [4, 2], "x": 4.25, "y": 1},
+                {"matrix": [4, 3], "x": 5.25, "y": 1},
+                {"matrix": [4, 4], "x": 6.25, "y": 1},
+                {"matrix": [4, 5], "x": 7.25, "y": 1},
+                {"matrix": [4, 6], "x": 8.25, "y": 1},
+
+                {"matrix": [4, 8], "x": 10.75, "y": 1},
+                {"matrix": [4, 9], "x": 11.75, "y": 1},
+                {"matrix": [4, 10], "x": 12.75, "y": 1},
+                {"matrix": [4, 11], "x": 13.75, "y": 1},
+                {"matrix": [4, 12], "x": 14.75, "y": 1},
+                {"matrix": [4, 13], "x": 15.75, "y": 1},
+                {"matrix": [4, 14], "x": 16.75, "y": 1, "w": 2},
+                {"matrix": [6, 10], "x": 18.75, "y": 1},
+
+                {"matrix": [6, 2], "x": 0, "y": 2},
+                {"matrix": [7, 2], "x": 1, "y": 2},
+
+                {"matrix": [3, 0], "x": 2.25, "y": 2, "w": 1.5},
+                {"matrix": [3, 1], "x": 3.75, "y": 2},
+                {"matrix": [3, 2], "x": 4.75, "y": 2},
+                {"matrix": [3, 3], "x": 5.75, "y": 2},
+                {"matrix": [3, 4], "x": 6.75, "y": 2},
+                {"matrix": [3, 5], "x": 7.75, "y": 2},
+
+                {"matrix": [1, 8], "x": 10.25, "y": 2},
+                {"matrix": [1, 9], "x": 11.25, "y": 2},
+                {"matrix": [1, 10], "x": 12.25, "y": 2},
+                {"matrix": [1, 11], "x": 13.25, "y": 2},
+                {"matrix": [1, 12], "x": 14.25, "y": 2},
+                {"matrix": [1, 13], "x": 15.25, "y": 2},
+                {"matrix": [1, 14], "x": 16.25, "y": 2},
+                {"matrix": [2, 14], "x": 17.25, "y": 2, "w": 1.5},
+                {"matrix": [7, 10], "x": 18.75, "y": 2},
+
+                {"matrix": [6, 3], "x": 0, "y": 3},
+                {"matrix": [7, 3], "x": 1, "y": 3},
+
+                {"matrix": [2, 0], "x": 2.25, "y": 3, "w": 1.75},
+                {"matrix": [2, 1], "x": 4, "y": 3},
+                {"matrix": [2, 2], "x": 5, "y": 3},
+                {"matrix": [2, 3], "x": 6, "y": 3},
+                {"matrix": [2, 4], "x": 7, "y": 3},
+                {"matrix": [2, 5], "x": 8, "y": 3},
+
+                {"matrix": [2, 8], "x": 10.5, "y": 3},
+                {"matrix": [2, 9], "x": 11.5, "y": 3},
+                {"matrix": [2, 10], "x": 12.5, "y": 3},
+                {"matrix": [2, 11], "x": 13.5, "y": 3},
+                {"matrix": [2, 12], "x": 14.5, "y": 3},
+                {"matrix": [2, 13], "x": 15.5, "y": 3},
+                {"matrix": [3, 13], "x": 16.5, "y": 3, "w": 2.25},
+                {"matrix": [6, 12], "x": 18.75, "y": 3},
+
+                {"matrix": [6, 4], "x": 0, "y": 4},
+                {"matrix": [7, 4], "x": 1, "y": 4},
+
+                {"matrix": [1, 0], "x": 2.25, "y": 4, "w": 2.25},
+                {"matrix": [1, 1], "x": 4.5, "y": 4},
+                {"matrix": [1, 2], "x": 5.5, "y": 4},
+                {"matrix": [1, 3], "x": 6.5, "y": 4},
+                {"matrix": [1, 4], "x": 7.5, "y": 4},
+                {"matrix": [1, 5], "x": 8.5, "y": 4},
+
+                {"matrix": [3, 8], "x": 11, "y": 4},
+                {"matrix": [3, 9], "x": 12, "y": 4},
+                {"matrix": [3, 10], "x": 13, "y": 4},
+                {"matrix": [3, 11], "x": 14, "y": 4},
+                {"matrix": [3, 12], "x": 15, "y": 4},
+                {"matrix": [3, 14], "x": 16, "y": 4, "w": 1.75},
+                {"matrix": [6, 8], "x": 17.75, "y": 4},
+                {"matrix": [7, 12], "x": 18.75, "y": 4},
+
+                {"matrix": [6, 5], "x": 0, "y": 5},
+                {"matrix": [7, 5], "x": 1, "y": 5},
+
+                {"matrix": [0, 0], "x": 2.25, "y": 5, "w": 1.25},
+                {"matrix": [0, 1], "x": 3.5, "y": 5, "w": 1.25},
+                {"matrix": [0, 2], "x": 4.75, "y": 5, "w": 1.25},
+                {"matrix": [7, 7], "x": 6, "y": 5, "w": 2},
+                {"matrix": [6, 6], "x": 8, "y": 5},
+
+                {"matrix": [6, 14], "x": 10.5, "y": 5, "w": 2.75},
+                {"matrix": [0, 10], "x": 13.25, "y": 5, "w": 1.25},
+                {"matrix": [0, 9], "x": 14.5, "y": 5},
+                {"matrix": [0, 8], "x": 15.5, "y": 5, "w": 1.25},
+                {"matrix": [7, 8], "x": 16.75, "y": 5},
+                {"matrix": [6, 9], "x": 17.75, "y": 5},
+                {"matrix": [7, 9], "x": 18.75, "y": 5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/oddforge/vea/rules.mk b/keyboards/oddforge/vea/rules.mk
index b0c02543b19..bbfc7cbbf72 100644
--- a/keyboards/oddforge/vea/rules.mk
+++ b/keyboards/oddforge/vea/rules.mk
@@ -1,14 +1,3 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-
 # custom matrix setup
 CUSTOM_MATRIX = lite
 SRC = matrix.c
diff --git a/keyboards/oddforge/vea/ws2812_custom.c b/keyboards/oddforge/vea/ws2812_custom.c
index a037b88b3e6..317f98130b1 100644
--- a/keyboards/oddforge/vea/ws2812_custom.c
+++ b/keyboards/oddforge/vea/ws2812_custom.c
@@ -1,7 +1,7 @@
 #include "ws2812.h"
 #include "i2c_master.h"
 
-#ifdef RGBW
+#ifdef WS2812_RGBW
 #    error "RGBW not supported"
 #endif
 
diff --git a/keyboards/om60/info.json b/keyboards/om60/info.json
deleted file mode 100644
index df718e7fa02..00000000000
--- a/keyboards/om60/info.json
+++ /dev/null
@@ -1,125 +0,0 @@
-{
-  "keyboard_name": "OM60",
-  "manufacturer": "jun10000",
-  "url": "https://github.com/jun10000",
-  "maintainer": "jun10000",
-  "usb": {
-      "vid": "0x6A6E",
-      "pid": "0x0001",
-      "device_version": "1.0.0"
-  },
-  "encoder": {
-    "rotary": [
-      {"pin_a": "B4", "pin_b": "B5"}
-    ]
-  },
-  "qmk": {
-    "tap_keycode_delay": 10
-  },
-  "rgblight": {
-    "hue_steps": 10,
-    "led_count": 69,
-    "sleep": true,
-    "led_map": [0, 1, 2, 3, 8, 7, 6, 5, 4, 9, 10, 11, 12, 13, 18, 17, 16, 15, 14, 19, 20, 21, 22, 23, 28, 27, 26, 25, 24, 29, 30, 31, 32, 33, 38, 37, 36, 35, 34, 39, 40, 41, 42, 43, 48, 47, 46, 45, 44, 49, 50, 51, 52, 53, 58, 57, 56, 55, 54, 59, 60, 61, 62, 63, 68, 67, 66, 65, 64],
-    "animations": {
-      "breathing": true,
-      "rainbow_mood": true,
-      "rainbow_swirl": true,
-      "snake": true,
-      "knight": true,
-      "christmas": true,
-      "static_gradient": true,
-      "rgb_test": true,
-      "alternating": true,
-      "twinkle": true
-    }
-  },
-  "ws2812": {
-    "pin": "D3"
-  },
-  "processor": "atmega32u4",
-  "bootloader": "caterina",
-  "layouts": {
-    "LAYOUT": {
-      "layout": [
-        {"matrix": [0, 0], "x": 0, "y": 0},
-
-        {"matrix": [4, 0], "x": 1.5, "y": 0},
-        {"matrix": [4, 1], "x": 2.5, "y": 0},
-        {"matrix": [4, 2], "x": 3.5, "y": 0},
-        {"matrix": [4, 3], "x": 4.5, "y": 0},
-        {"matrix": [4, 4], "x": 5.5, "y": 0},
-        {"matrix": [4, 5], "x": 6.5, "y": 0},
-        {"matrix": [4, 6], "x": 7.5, "y": 0},
-        {"matrix": [4, 7], "x": 8.5, "y": 0},
-        {"matrix": [9, 0], "x": 9.5, "y": 0},
-        {"matrix": [9, 1], "x": 10.5, "y": 0},
-        {"matrix": [9, 2], "x": 11.5, "y": 0},
-        {"matrix": [9, 3], "x": 12.5, "y": 0},
-        {"matrix": [9, 4], "x": 13.5, "y": 0},
-
-        {"matrix": [0, 1], "x": 1.5, "y": 1},
-        {"matrix": [0, 2], "x": 2.5, "y": 1},
-        {"matrix": [0, 3], "x": 3.5, "y": 1},
-        {"matrix": [0, 4], "x": 4.5, "y": 1},
-        {"matrix": [0, 5], "x": 5.5, "y": 1},
-        {"matrix": [0, 6], "x": 6.5, "y": 1},
-        {"matrix": [0, 7], "x": 7.5, "y": 1},
-        {"matrix": [5, 0], "x": 8.5, "y": 1},
-        {"matrix": [5, 1], "x": 9.5, "y": 1},
-        {"matrix": [5, 2], "x": 10.5, "y": 1},
-        {"matrix": [5, 3], "x": 11.5, "y": 1},
-        {"matrix": [5, 4], "x": 12.5, "y": 1},
-        {"matrix": [5, 5], "x": 13.5, "y": 1},
-
-        {"matrix": [1, 0], "x": 0, "y": 2},
-
-        {"matrix": [1, 1], "x": 1.5, "y": 2},
-        {"matrix": [1, 2], "x": 2.5, "y": 2},
-        {"matrix": [1, 3], "x": 3.5, "y": 2},
-        {"matrix": [1, 4], "x": 4.5, "y": 2},
-        {"matrix": [1, 5], "x": 5.5, "y": 2},
-        {"matrix": [1, 6], "x": 6.5, "y": 2},
-        {"matrix": [1, 7], "x": 7.5, "y": 2},
-        {"matrix": [6, 0], "x": 8.5, "y": 2},
-        {"matrix": [6, 1], "x": 9.5, "y": 2},
-        {"matrix": [6, 2], "x": 10.5, "y": 2},
-        {"matrix": [6, 3], "x": 11.5, "y": 2},
-        {"matrix": [6, 4], "x": 12.5, "y": 2},
-        {"matrix": [6, 5], "x": 13.5, "y": 2},
-
-        {"matrix": [2, 0], "x": 0, "y": 3},
-
-        {"matrix": [2, 1], "x": 1.5, "y": 3},
-        {"matrix": [2, 2], "x": 2.5, "y": 3},
-        {"matrix": [2, 3], "x": 3.5, "y": 3},
-        {"matrix": [2, 4], "x": 4.5, "y": 3},
-        {"matrix": [2, 5], "x": 5.5, "y": 3},
-        {"matrix": [2, 6], "x": 6.5, "y": 3},
-        {"matrix": [2, 7], "x": 7.5, "y": 3},
-        {"matrix": [7, 0], "x": 8.5, "y": 3},
-        {"matrix": [7, 1], "x": 9.5, "y": 3},
-        {"matrix": [7, 2], "x": 10.5, "y": 3},
-        {"matrix": [7, 3], "x": 11.5, "y": 3},
-        {"matrix": [7, 4], "x": 12.5, "y": 3},
-        {"matrix": [7, 5], "x": 13.5, "y": 3},
-
-        {"matrix": [3, 0], "x": 0, "y": 4},
-
-        {"matrix": [3, 1], "x": 1.5, "y": 4},
-        {"matrix": [3, 2], "x": 2.5, "y": 4},
-        {"matrix": [3, 3], "x": 3.5, "y": 4},
-        {"matrix": [3, 4], "x": 4.5, "y": 4},
-        {"matrix": [3, 5], "x": 5.5, "y": 4},
-        {"matrix": [3, 6], "x": 6.5, "y": 4},
-        {"matrix": [3, 7], "x": 7.5, "y": 4},
-        {"matrix": [8, 0], "x": 8.5, "y": 4},
-        {"matrix": [8, 1], "x": 9.5, "y": 4},
-        {"matrix": [8, 2], "x": 10.5, "y": 4},
-        {"matrix": [8, 3], "x": 11.5, "y": 4},
-        {"matrix": [8, 4], "x": 12.5, "y": 4},
-        {"matrix": [8, 5], "x": 13.5, "y": 4}
-      ]
-    }
-  }
-}
diff --git a/keyboards/om60/keyboard.json b/keyboards/om60/keyboard.json
new file mode 100644
index 00000000000..22386db039a
--- /dev/null
+++ b/keyboards/om60/keyboard.json
@@ -0,0 +1,133 @@
+{
+  "keyboard_name": "OM60",
+  "manufacturer": "jun10000",
+  "url": "https://github.com/jun10000",
+  "maintainer": "jun10000",
+  "usb": {
+      "vid": "0x6A6E",
+      "pid": "0x0001",
+      "device_version": "1.0.0"
+  },
+  "features": {
+    "bootmagic": true,
+    "encoder": true,
+    "extrakey": true,
+    "mousekey": true,
+    "nkro": false,
+    "rgblight": true
+  },
+  "encoder": {
+    "rotary": [
+      {"pin_a": "B4", "pin_b": "B5"}
+    ]
+  },
+  "qmk": {
+    "tap_keycode_delay": 10
+  },
+  "rgblight": {
+    "hue_steps": 10,
+    "led_count": 69,
+    "sleep": true,
+    "led_map": [0, 1, 2, 3, 8, 7, 6, 5, 4, 9, 10, 11, 12, 13, 18, 17, 16, 15, 14, 19, 20, 21, 22, 23, 28, 27, 26, 25, 24, 29, 30, 31, 32, 33, 38, 37, 36, 35, 34, 39, 40, 41, 42, 43, 48, 47, 46, 45, 44, 49, 50, 51, 52, 53, 58, 57, 56, 55, 54, 59, 60, 61, 62, 63, 68, 67, 66, 65, 64],
+    "animations": {
+      "breathing": true,
+      "rainbow_mood": true,
+      "rainbow_swirl": true,
+      "snake": true,
+      "knight": true,
+      "christmas": true,
+      "static_gradient": true,
+      "rgb_test": true,
+      "alternating": true,
+      "twinkle": true
+    }
+  },
+  "ws2812": {
+    "pin": "D3"
+  },
+  "processor": "atmega32u4",
+  "bootloader": "caterina",
+  "layouts": {
+    "LAYOUT": {
+      "layout": [
+        {"matrix": [0, 0], "x": 0, "y": 0},
+
+        {"matrix": [4, 0], "x": 1.5, "y": 0},
+        {"matrix": [4, 1], "x": 2.5, "y": 0},
+        {"matrix": [4, 2], "x": 3.5, "y": 0},
+        {"matrix": [4, 3], "x": 4.5, "y": 0},
+        {"matrix": [4, 4], "x": 5.5, "y": 0},
+        {"matrix": [4, 5], "x": 6.5, "y": 0},
+        {"matrix": [4, 6], "x": 7.5, "y": 0},
+        {"matrix": [4, 7], "x": 8.5, "y": 0},
+        {"matrix": [9, 0], "x": 9.5, "y": 0},
+        {"matrix": [9, 1], "x": 10.5, "y": 0},
+        {"matrix": [9, 2], "x": 11.5, "y": 0},
+        {"matrix": [9, 3], "x": 12.5, "y": 0},
+        {"matrix": [9, 4], "x": 13.5, "y": 0},
+
+        {"matrix": [0, 1], "x": 1.5, "y": 1},
+        {"matrix": [0, 2], "x": 2.5, "y": 1},
+        {"matrix": [0, 3], "x": 3.5, "y": 1},
+        {"matrix": [0, 4], "x": 4.5, "y": 1},
+        {"matrix": [0, 5], "x": 5.5, "y": 1},
+        {"matrix": [0, 6], "x": 6.5, "y": 1},
+        {"matrix": [0, 7], "x": 7.5, "y": 1},
+        {"matrix": [5, 0], "x": 8.5, "y": 1},
+        {"matrix": [5, 1], "x": 9.5, "y": 1},
+        {"matrix": [5, 2], "x": 10.5, "y": 1},
+        {"matrix": [5, 3], "x": 11.5, "y": 1},
+        {"matrix": [5, 4], "x": 12.5, "y": 1},
+        {"matrix": [5, 5], "x": 13.5, "y": 1},
+
+        {"matrix": [1, 0], "x": 0, "y": 2},
+
+        {"matrix": [1, 1], "x": 1.5, "y": 2},
+        {"matrix": [1, 2], "x": 2.5, "y": 2},
+        {"matrix": [1, 3], "x": 3.5, "y": 2},
+        {"matrix": [1, 4], "x": 4.5, "y": 2},
+        {"matrix": [1, 5], "x": 5.5, "y": 2},
+        {"matrix": [1, 6], "x": 6.5, "y": 2},
+        {"matrix": [1, 7], "x": 7.5, "y": 2},
+        {"matrix": [6, 0], "x": 8.5, "y": 2},
+        {"matrix": [6, 1], "x": 9.5, "y": 2},
+        {"matrix": [6, 2], "x": 10.5, "y": 2},
+        {"matrix": [6, 3], "x": 11.5, "y": 2},
+        {"matrix": [6, 4], "x": 12.5, "y": 2},
+        {"matrix": [6, 5], "x": 13.5, "y": 2},
+
+        {"matrix": [2, 0], "x": 0, "y": 3},
+
+        {"matrix": [2, 1], "x": 1.5, "y": 3},
+        {"matrix": [2, 2], "x": 2.5, "y": 3},
+        {"matrix": [2, 3], "x": 3.5, "y": 3},
+        {"matrix": [2, 4], "x": 4.5, "y": 3},
+        {"matrix": [2, 5], "x": 5.5, "y": 3},
+        {"matrix": [2, 6], "x": 6.5, "y": 3},
+        {"matrix": [2, 7], "x": 7.5, "y": 3},
+        {"matrix": [7, 0], "x": 8.5, "y": 3},
+        {"matrix": [7, 1], "x": 9.5, "y": 3},
+        {"matrix": [7, 2], "x": 10.5, "y": 3},
+        {"matrix": [7, 3], "x": 11.5, "y": 3},
+        {"matrix": [7, 4], "x": 12.5, "y": 3},
+        {"matrix": [7, 5], "x": 13.5, "y": 3},
+
+        {"matrix": [3, 0], "x": 0, "y": 4},
+
+        {"matrix": [3, 1], "x": 1.5, "y": 4},
+        {"matrix": [3, 2], "x": 2.5, "y": 4},
+        {"matrix": [3, 3], "x": 3.5, "y": 4},
+        {"matrix": [3, 4], "x": 4.5, "y": 4},
+        {"matrix": [3, 5], "x": 5.5, "y": 4},
+        {"matrix": [3, 6], "x": 6.5, "y": 4},
+        {"matrix": [3, 7], "x": 7.5, "y": 4},
+        {"matrix": [8, 0], "x": 8.5, "y": 4},
+        {"matrix": [8, 1], "x": 9.5, "y": 4},
+        {"matrix": [8, 2], "x": 10.5, "y": 4},
+        {"matrix": [8, 3], "x": 11.5, "y": 4},
+        {"matrix": [8, 4], "x": 12.5, "y": 4},
+        {"matrix": [8, 5], "x": 13.5, "y": 4}
+      ]
+    }
+  }
+}
diff --git a/keyboards/om60/rules.mk b/keyboards/om60/rules.mk
index e3e0047771f..179d02c3c68 100644
--- a/keyboards/om60/rules.mk
+++ b/keyboards/om60/rules.mk
@@ -1,18 +1,3 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
-ENCODER_ENABLE = yes
-
 CUSTOM_MATRIX = lite
 
 SRC += matrix.c
diff --git a/keyboards/omkbd/ergodash/mini/info.json b/keyboards/omkbd/ergodash/mini/info.json
deleted file mode 100644
index 4e4a13e93a4..00000000000
--- a/keyboards/omkbd/ergodash/mini/info.json
+++ /dev/null
@@ -1,114 +0,0 @@
-{
-    "keyboard_name": "ErgoDash Mini",
-    "manufacturer": "Omkbd",
-    "url": "",
-    "maintainer": "qmk",
-    "usb": {
-        "vid": "0xFEED",
-        "pid": "0x6060",
-        "device_version": "1.0.0"
-    },
-    "matrix_pins": {
-        "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"],
-        "rows": ["D7", "E6", "B4", "B5"]
-    },
-    "diode_direction": "COL2ROW",
-    "backlight": {
-        "pin": "B6",
-        "levels": 7
-    },
-    "split": {
-        "soft_serial_pin": "D0"
-    },
-    "tapping": {
-        "term": 120
-    },
-    "rgblight": {
-        "led_count": 20,
-        "split_count": [10, 10],
-        "animations": {
-            "breathing": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "snake": true,
-            "knight": true,
-            "christmas": true,
-            "static_gradient": true,
-            "rgb_test": true,
-            "alternating": true,
-            "twinkle": true
-        }
-    },
-    "ws2812": {
-        "pin": "D3"
-    },
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0.375},
-                {"matrix": [0, 1], "x": 1, "y": 0.375},
-                {"matrix": [0, 2], "x": 2, "y": 0.125},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0.125},
-                {"matrix": [0, 5], "x": 5, "y": 0.25},
-                {"matrix": [0, 6], "x": 6, "y": 0.75},
-
-                {"matrix": [4, 6], "x": 11, "y": 0.75},
-                {"matrix": [4, 5], "x": 12, "y": 0.25},
-                {"matrix": [4, 4], "x": 13, "y": 0.125},
-                {"matrix": [4, 3], "x": 14, "y": 0},
-                {"matrix": [4, 2], "x": 15, "y": 0.125},
-                {"matrix": [4, 1], "x": 16, "y": 0.375},
-                {"matrix": [4, 0], "x": 17, "y": 0.375},
-
-                {"matrix": [1, 0], "x": 0, "y": 1.375},
-                {"matrix": [1, 1], "x": 1, "y": 1.375},
-                {"matrix": [1, 2], "x": 2, "y": 1.125},
-                {"matrix": [1, 3], "x": 3, "y": 1},
-                {"matrix": [1, 4], "x": 4, "y": 1.125},
-                {"matrix": [1, 5], "x": 5, "y": 1.25},
-                {"matrix": [1, 6], "x": 6, "y": 1.75},
-
-                {"matrix": [5, 6], "x": 11, "y": 1.75},
-                {"matrix": [5, 5], "x": 12, "y": 1.25},
-                {"matrix": [5, 4], "x": 13, "y": 1.125},
-                {"matrix": [5, 3], "x": 14, "y": 1},
-                {"matrix": [5, 2], "x": 15, "y": 1.125},
-                {"matrix": [5, 1], "x": 16, "y": 1.375},
-                {"matrix": [5, 0], "x": 17, "y": 1.375},
-
-                {"matrix": [2, 0], "x": 0, "y": 2.375},
-                {"matrix": [2, 1], "x": 1, "y": 2.375},
-                {"matrix": [2, 2], "x": 2, "y": 2.125},
-                {"matrix": [2, 3], "x": 3, "y": 2},
-                {"matrix": [2, 4], "x": 4, "y": 2.125},
-                {"matrix": [2, 5], "x": 5, "y": 2.25},
-                {"matrix": [2, 6], "x": 6.5, "y": 3.25},
-
-                {"matrix": [6, 6], "x": 10.5, "y": 3.25},
-                {"matrix": [6, 5], "x": 12, "y": 2.25},
-                {"matrix": [6, 4], "x": 13, "y": 2.125},
-                {"matrix": [6, 3], "x": 14, "y": 2},
-                {"matrix": [6, 2], "x": 15, "y": 2.125},
-                {"matrix": [6, 1], "x": 16, "y": 2.375},
-                {"matrix": [6, 0], "x": 17, "y": 2.375},
-
-                {"matrix": [3, 0], "x": 0, "y": 3.375},
-                {"matrix": [3, 1], "x": 1, "y": 3.375},
-                {"matrix": [3, 2], "x": 2, "y": 3.125},
-                {"matrix": [3, 3], "x": 3, "y": 3},
-                {"matrix": [3, 4], "x": 5.5, "y": 4.25},
-                {"matrix": [3, 5], "x": 6.5, "y": 4.25},
-                {"matrix": [3, 6], "x": 7.5, "y": 3.25, "h": 2},
-
-                {"matrix": [7, 6], "x": 9.5, "y": 3.25, "h": 2},
-                {"matrix": [7, 5], "x": 10.5, "y": 4.25},
-                {"matrix": [7, 4], "x": 11.5, "y": 4.25},
-                {"matrix": [7, 3], "x": 14, "y": 3},
-                {"matrix": [7, 2], "x": 15, "y": 3.125},
-                {"matrix": [7, 1], "x": 16, "y": 3.375},
-                {"matrix": [7, 0], "x": 17, "y": 3.375}
-            ]
-        }
-    }
-}
diff --git a/keyboards/omkbd/ergodash/mini/keyboard.json b/keyboards/omkbd/ergodash/mini/keyboard.json
new file mode 100644
index 00000000000..04233261779
--- /dev/null
+++ b/keyboards/omkbd/ergodash/mini/keyboard.json
@@ -0,0 +1,120 @@
+{
+    "keyboard_name": "ErgoDash Mini",
+    "manufacturer": "Omkbd",
+    "url": "",
+    "maintainer": "qmk",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0x6060",
+        "device_version": "1.0.0"
+    },
+    "features": {
+        "bootmagic": false,
+        "extrakey": true,
+        "mousekey": false,
+        "nkro": false
+    },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"],
+        "rows": ["D7", "E6", "B4", "B5"]
+    },
+    "diode_direction": "COL2ROW",
+    "backlight": {
+        "pin": "B6",
+        "levels": 7
+    },
+    "split": {
+        "soft_serial_pin": "D0"
+    },
+    "tapping": {
+        "term": 120
+    },
+    "rgblight": {
+        "led_count": 20,
+        "split_count": [10, 10],
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": true,
+            "twinkle": true
+        }
+    },
+    "ws2812": {
+        "pin": "D3"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0.375},
+                {"matrix": [0, 1], "x": 1, "y": 0.375},
+                {"matrix": [0, 2], "x": 2, "y": 0.125},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0.125},
+                {"matrix": [0, 5], "x": 5, "y": 0.25},
+                {"matrix": [0, 6], "x": 6, "y": 0.75},
+
+                {"matrix": [4, 6], "x": 11, "y": 0.75},
+                {"matrix": [4, 5], "x": 12, "y": 0.25},
+                {"matrix": [4, 4], "x": 13, "y": 0.125},
+                {"matrix": [4, 3], "x": 14, "y": 0},
+                {"matrix": [4, 2], "x": 15, "y": 0.125},
+                {"matrix": [4, 1], "x": 16, "y": 0.375},
+                {"matrix": [4, 0], "x": 17, "y": 0.375},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.375},
+                {"matrix": [1, 1], "x": 1, "y": 1.375},
+                {"matrix": [1, 2], "x": 2, "y": 1.125},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1.125},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.75},
+
+                {"matrix": [5, 6], "x": 11, "y": 1.75},
+                {"matrix": [5, 5], "x": 12, "y": 1.25},
+                {"matrix": [5, 4], "x": 13, "y": 1.125},
+                {"matrix": [5, 3], "x": 14, "y": 1},
+                {"matrix": [5, 2], "x": 15, "y": 1.125},
+                {"matrix": [5, 1], "x": 16, "y": 1.375},
+                {"matrix": [5, 0], "x": 17, "y": 1.375},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.375},
+                {"matrix": [2, 1], "x": 1, "y": 2.375},
+                {"matrix": [2, 2], "x": 2, "y": 2.125},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2.125},
+                {"matrix": [2, 5], "x": 5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 3.25},
+
+                {"matrix": [6, 6], "x": 10.5, "y": 3.25},
+                {"matrix": [6, 5], "x": 12, "y": 2.25},
+                {"matrix": [6, 4], "x": 13, "y": 2.125},
+                {"matrix": [6, 3], "x": 14, "y": 2},
+                {"matrix": [6, 2], "x": 15, "y": 2.125},
+                {"matrix": [6, 1], "x": 16, "y": 2.375},
+                {"matrix": [6, 0], "x": 17, "y": 2.375},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.375},
+                {"matrix": [3, 1], "x": 1, "y": 3.375},
+                {"matrix": [3, 2], "x": 2, "y": 3.125},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 5.5, "y": 4.25},
+                {"matrix": [3, 5], "x": 6.5, "y": 4.25},
+                {"matrix": [3, 6], "x": 7.5, "y": 3.25, "h": 2},
+
+                {"matrix": [7, 6], "x": 9.5, "y": 3.25, "h": 2},
+                {"matrix": [7, 5], "x": 10.5, "y": 4.25},
+                {"matrix": [7, 4], "x": 11.5, "y": 4.25},
+                {"matrix": [7, 3], "x": 14, "y": 3},
+                {"matrix": [7, 2], "x": 15, "y": 3.125},
+                {"matrix": [7, 1], "x": 16, "y": 3.375},
+                {"matrix": [7, 0], "x": 17, "y": 3.375}
+            ]
+        }
+    }
+}
diff --git a/keyboards/omkbd/ergodash/mini/rules.mk b/keyboards/omkbd/ergodash/mini/rules.mk
deleted file mode 100644
index bb9e33b0829..00000000000
--- a/keyboards/omkbd/ergodash/mini/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-BACKLIGHT_ENABLE = no
-RGBLIGHT_ENABLE = no
-AUDIO_ENABLE = no
diff --git a/keyboards/omkbd/ergodash/rev1/info.json b/keyboards/omkbd/ergodash/rev1/info.json
deleted file mode 100644
index b3ebe4648e0..00000000000
--- a/keyboards/omkbd/ergodash/rev1/info.json
+++ /dev/null
@@ -1,458 +0,0 @@
-{
-    "keyboard_name": "ErgoDash rev1.2",
-    "manufacturer": "Omkbd",
-    "url": "",
-    "maintainer": "qmk",
-    "usb": {
-        "vid": "0xFEED",
-        "pid": "0x6060",
-        "device_version": "1.0.0"
-    },
-    "matrix_pins": {
-        "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"],
-        "rows": ["D4", "D7", "E6", "B4", "B5"]
-    },
-    "diode_direction": "COL2ROW",
-    "backlight": {
-        "pin": "B6",
-        "levels": 7
-    },
-    "split": {
-        "soft_serial_pin": "D0"
-    },
-    "tapping": {
-        "term": 120
-    },
-    "rgblight": {
-        "led_count": 24,
-        "led_map": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 23, 22, 21, 20, 19, 18, 17, 16, 15, 14, 13, 12],
-        "split_count": [12, 12],
-        "animations": {
-            "breathing": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "snake": true,
-            "knight": true,
-            "christmas": true,
-            "static_gradient": true,
-            "rgb_test": true,
-            "alternating": true,
-            "twinkle": true
-        }
-    },
-    "ws2812": {
-        "pin": "D3"
-    },
-    "layout_aliases": {
-        "LAYOUT": "LAYOUT_4key"
-    },
-    "layouts": {
-        "LAYOUT_4key": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0.375},
-                {"matrix": [0, 1], "x": 1, "y": 0.375},
-                {"matrix": [0, 2], "x": 2, "y": 0.125},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0.125},
-                {"matrix": [0, 5], "x": 5, "y": 0.25},
-                {"matrix": [0, 6], "x": 6, "y": 0.75},
-
-                {"matrix": [5, 6], "x": 11.5, "y": 0.75},
-                {"matrix": [5, 5], "x": 12.5, "y": 0.25},
-                {"matrix": [5, 4], "x": 13.5, "y": 0.125},
-                {"matrix": [5, 3], "x": 14.5, "y": 0},
-                {"matrix": [5, 2], "x": 15.5, "y": 0.125},
-                {"matrix": [5, 1], "x": 16.5, "y": 0.375},
-                {"matrix": [5, 0], "x": 17.5, "y": 0.375},
-
-                {"matrix": [1, 0], "x": 0, "y": 1.375},
-                {"matrix": [1, 1], "x": 1, "y": 1.375},
-                {"matrix": [1, 2], "x": 2, "y": 1.125},
-                {"matrix": [1, 3], "x": 3, "y": 1},
-                {"matrix": [1, 4], "x": 4, "y": 1.125},
-                {"matrix": [1, 5], "x": 5, "y": 1.25},
-                {"matrix": [1, 6], "x": 6, "y": 1.75},
-
-                {"matrix": [6, 6], "x": 11.5, "y": 1.75},
-                {"matrix": [6, 5], "x": 12.5, "y": 1.25},
-                {"matrix": [6, 4], "x": 13.5, "y": 1.125},
-                {"matrix": [6, 3], "x": 14.5, "y": 1},
-                {"matrix": [6, 2], "x": 15.5, "y": 1.125},
-                {"matrix": [6, 1], "x": 16.5, "y": 1.375},
-                {"matrix": [6, 0], "x": 17.5, "y": 1.375},
-
-                {"matrix": [2, 0], "x": 0, "y": 2.375},
-                {"matrix": [2, 1], "x": 1, "y": 2.375},
-                {"matrix": [2, 2], "x": 2, "y": 2.125},
-                {"matrix": [2, 3], "x": 3, "y": 2},
-                {"matrix": [2, 4], "x": 4, "y": 2.125},
-                {"matrix": [2, 5], "x": 5, "y": 2.25},
-                {"matrix": [2, 6], "x": 6, "y": 2.75},
-
-                {"matrix": [7, 6], "x": 11.5, "y": 2.75},
-                {"matrix": [7, 5], "x": 12.5, "y": 2.25},
-                {"matrix": [7, 4], "x": 13.5, "y": 2.125},
-                {"matrix": [7, 3], "x": 14.5, "y": 2},
-                {"matrix": [7, 2], "x": 15.5, "y": 2.125},
-                {"matrix": [7, 1], "x": 16.5, "y": 2.375},
-                {"matrix": [7, 0], "x": 17.5, "y": 2.375},
-
-                {"matrix": [3, 0], "x": 0, "y": 3.375},
-                {"matrix": [3, 1], "x": 1, "y": 3.375},
-                {"matrix": [3, 2], "x": 2, "y": 3.125},
-                {"matrix": [3, 3], "x": 3, "y": 3},
-                {"matrix": [3, 4], "x": 4, "y": 3.125},
-                {"matrix": [3, 5], "x": 5, "y": 3.25},
-                {"matrix": [3, 6], "x": 6, "y": 4},
-
-                {"matrix": [8, 6], "x": 11.5, "y": 4},
-                {"matrix": [8, 5], "x": 12.5, "y": 3.25},
-                {"matrix": [8, 4], "x": 13.5, "y": 3.125},
-                {"matrix": [8, 3], "x": 14.5, "y": 3},
-                {"matrix": [8, 2], "x": 15.5, "y": 3.125},
-                {"matrix": [8, 1], "x": 16.5, "y": 3.375},
-                {"matrix": [8, 0], "x": 17.5, "y": 3.375},
-
-                {"matrix": [4, 0], "x": 0, "y": 4.375},
-                {"matrix": [4, 1], "x": 1, "y": 4.375},
-                {"matrix": [4, 2], "x": 2, "y": 4.125},
-                {"matrix": [4, 3], "x": 3, "y": 4},
-                {"matrix": [4, 4], "x": 5, "y": 5},
-                {"matrix": [4, 5], "x": 6, "y": 5},
-                {"matrix": [4, 6], "x": 7, "y": 4, "h": 2},
-
-                {"matrix": [9, 6], "x": 10.5, "y": 4, "h": 2},
-                {"matrix": [9, 5], "x": 11.5, "y": 5},
-                {"matrix": [9, 4], "x": 12.5, "y": 5},
-                {"matrix": [9, 3], "x": 14.5, "y": 4},
-                {"matrix": [9, 2], "x": 15.5, "y": 4.125},
-                {"matrix": [9, 1], "x": 16.5, "y": 4.375},
-                {"matrix": [9, 0], "x": 17.5, "y": 4.375}
-            ]
-        },
-        "LAYOUT_4key_2u_inner": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0.375},
-                {"matrix": [0, 1], "x": 1, "y": 0.375},
-                {"matrix": [0, 2], "x": 2, "y": 0.125},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0.125},
-                {"matrix": [0, 5], "x": 5, "y": 0.25},
-                {"matrix": [0, 6], "x": 6, "y": 0.75},
-
-                {"matrix": [5, 6], "x": 11.5, "y": 0.75},
-                {"matrix": [5, 5], "x": 12.5, "y": 0.25},
-                {"matrix": [5, 4], "x": 13.5, "y": 0.125},
-                {"matrix": [5, 3], "x": 14.5, "y": 0},
-                {"matrix": [5, 2], "x": 15.5, "y": 0.125},
-                {"matrix": [5, 1], "x": 16.5, "y": 0.375},
-                {"matrix": [5, 0], "x": 17.5, "y": 0.375},
-
-                {"matrix": [1, 0], "x": 0, "y": 1.375},
-                {"matrix": [1, 1], "x": 1, "y": 1.375},
-                {"matrix": [1, 2], "x": 2, "y": 1.125},
-                {"matrix": [1, 3], "x": 3, "y": 1},
-                {"matrix": [1, 4], "x": 4, "y": 1.125},
-                {"matrix": [1, 5], "x": 5, "y": 1.25},
-                {"matrix": [1, 6], "x": 6, "y": 1.75},
-
-                {"matrix": [6, 6], "x": 11.5, "y": 1.75},
-                {"matrix": [6, 5], "x": 12.5, "y": 1.25},
-                {"matrix": [6, 4], "x": 13.5, "y": 1.125},
-                {"matrix": [6, 3], "x": 14.5, "y": 1},
-                {"matrix": [6, 2], "x": 15.5, "y": 1.125},
-                {"matrix": [6, 1], "x": 16.5, "y": 1.375},
-                {"matrix": [6, 0], "x": 17.5, "y": 1.375},
-
-                {"matrix": [2, 0], "x": 0, "y": 2.375},
-                {"matrix": [2, 1], "x": 1, "y": 2.375},
-                {"matrix": [2, 2], "x": 2, "y": 2.125},
-                {"matrix": [2, 3], "x": 3, "y": 2},
-                {"matrix": [2, 4], "x": 4, "y": 2.125},
-                {"matrix": [2, 5], "x": 5, "y": 2.25},
-                {"matrix": [2, 6], "x": 6, "y": 2.75},
-
-                {"matrix": [7, 6], "x": 11.5, "y": 2.75},
-                {"matrix": [7, 5], "x": 12.5, "y": 2.25},
-                {"matrix": [7, 4], "x": 13.5, "y": 2.125},
-                {"matrix": [7, 3], "x": 14.5, "y": 2},
-                {"matrix": [7, 2], "x": 15.5, "y": 2.125},
-                {"matrix": [7, 1], "x": 16.5, "y": 2.375},
-                {"matrix": [7, 0], "x": 17.5, "y": 2.375},
-
-                {"matrix": [3, 0], "x": 0, "y": 3.375},
-                {"matrix": [3, 1], "x": 1, "y": 3.375},
-                {"matrix": [3, 2], "x": 2, "y": 3.125},
-                {"matrix": [3, 3], "x": 3, "y": 3},
-                {"matrix": [3, 4], "x": 4, "y": 3.125},
-                {"matrix": [3, 5], "x": 5, "y": 3.25},
-                {"matrix": [3, 6], "x": 7, "y": 4},
-
-                {"matrix": [8, 6], "x": 10.5, "y": 4},
-                {"matrix": [8, 5], "x": 12.5, "y": 3.25},
-                {"matrix": [8, 4], "x": 13.5, "y": 3.125},
-                {"matrix": [8, 3], "x": 14.5, "y": 3},
-                {"matrix": [8, 2], "x": 15.5, "y": 3.125},
-                {"matrix": [8, 1], "x": 16.5, "y": 3.375},
-                {"matrix": [8, 0], "x": 17.5, "y": 3.375},
-
-                {"matrix": [4, 0], "x": 0, "y": 4.375},
-                {"matrix": [4, 1], "x": 1, "y": 4.375},
-                {"matrix": [4, 2], "x": 2, "y": 4.125},
-                {"matrix": [4, 3], "x": 3, "y": 4},
-                {"matrix": [4, 4], "x": 5, "y": 5},
-                {"matrix": [4, 5], "x": 6, "y": 4, "h": 2},
-                {"matrix": [4, 6], "x": 7, "y": 5},
-
-                {"matrix": [9, 6], "x": 10.5, "y": 5},
-                {"matrix": [9, 5], "x": 11.5, "y": 4, "h": 2},
-                {"matrix": [9, 4], "x": 12.5, "y": 5},
-                {"matrix": [9, 3], "x": 14.5, "y": 4},
-                {"matrix": [9, 2], "x": 15.5, "y": 4.125},
-                {"matrix": [9, 1], "x": 16.5, "y": 4.375},
-                {"matrix": [9, 0], "x": 17.5, "y": 4.375}
-            ]
-        },
-        "LAYOUT_3key_2us": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0.375},
-                {"matrix": [0, 1], "x": 1, "y": 0.375},
-                {"matrix": [0, 2], "x": 2, "y": 0.125},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0.125},
-                {"matrix": [0, 5], "x": 5, "y": 0.25},
-                {"matrix": [0, 6], "x": 6, "y": 0.75},
-
-                {"matrix": [5, 6], "x": 11.5, "y": 0.75},
-                {"matrix": [5, 5], "x": 12.5, "y": 0.25},
-                {"matrix": [5, 4], "x": 13.5, "y": 0.125},
-                {"matrix": [5, 3], "x": 14.5, "y": 0},
-                {"matrix": [5, 2], "x": 15.5, "y": 0.125},
-                {"matrix": [5, 1], "x": 16.5, "y": 0.375},
-                {"matrix": [5, 0], "x": 17.5, "y": 0.375},
-
-                {"matrix": [1, 0], "x": 0, "y": 1.375},
-                {"matrix": [1, 1], "x": 1, "y": 1.375},
-                {"matrix": [1, 2], "x": 2, "y": 1.125},
-                {"matrix": [1, 3], "x": 3, "y": 1},
-                {"matrix": [1, 4], "x": 4, "y": 1.125},
-                {"matrix": [1, 5], "x": 5, "y": 1.25},
-                {"matrix": [1, 6], "x": 6, "y": 1.75},
-
-                {"matrix": [6, 6], "x": 11.5, "y": 1.75},
-                {"matrix": [6, 5], "x": 12.5, "y": 1.25},
-                {"matrix": [6, 4], "x": 13.5, "y": 1.125},
-                {"matrix": [6, 3], "x": 14.5, "y": 1},
-                {"matrix": [6, 2], "x": 15.5, "y": 1.125},
-                {"matrix": [6, 1], "x": 16.5, "y": 1.375},
-                {"matrix": [6, 0], "x": 17.5, "y": 1.375},
-
-                {"matrix": [2, 0], "x": 0, "y": 2.375},
-                {"matrix": [2, 1], "x": 1, "y": 2.375},
-                {"matrix": [2, 2], "x": 2, "y": 2.125},
-                {"matrix": [2, 3], "x": 3, "y": 2},
-                {"matrix": [2, 4], "x": 4, "y": 2.125},
-                {"matrix": [2, 5], "x": 5, "y": 2.25},
-                {"matrix": [2, 6], "x": 6, "y": 2.75},
-
-                {"matrix": [7, 6], "x": 11.5, "y": 2.75},
-                {"matrix": [7, 5], "x": 12.5, "y": 2.25},
-                {"matrix": [7, 4], "x": 13.5, "y": 2.125},
-                {"matrix": [7, 3], "x": 14.5, "y": 2},
-                {"matrix": [7, 2], "x": 15.5, "y": 2.125},
-                {"matrix": [7, 1], "x": 16.5, "y": 2.375},
-                {"matrix": [7, 0], "x": 17.5, "y": 2.375},
-
-                {"matrix": [3, 0], "x": 0, "y": 3.375},
-                {"matrix": [3, 1], "x": 1, "y": 3.375},
-                {"matrix": [3, 2], "x": 2, "y": 3.125},
-                {"matrix": [3, 3], "x": 3, "y": 3},
-                {"matrix": [3, 4], "x": 4, "y": 3.125},
-                {"matrix": [3, 5], "x": 5, "y": 3.25},
-
-                {"matrix": [8, 5], "x": 12.5, "y": 3.25},
-                {"matrix": [8, 4], "x": 13.5, "y": 3.125},
-                {"matrix": [8, 3], "x": 14.5, "y": 3},
-                {"matrix": [8, 2], "x": 15.5, "y": 3.125},
-                {"matrix": [8, 1], "x": 16.5, "y": 3.375},
-                {"matrix": [8, 0], "x": 17.5, "y": 3.375},
-
-                {"matrix": [4, 0], "x": 0, "y": 4.375},
-                {"matrix": [4, 1], "x": 1, "y": 4.375},
-                {"matrix": [4, 2], "x": 2, "y": 4.125},
-                {"matrix": [4, 3], "x": 3, "y": 4},
-                {"matrix": [4, 4], "x": 5, "y": 5},
-                {"matrix": [4, 5], "x": 6, "y": 4, "h": 2},
-                {"matrix": [4, 6], "x": 7, "y": 4, "h": 2},
-
-                {"matrix": [9, 6], "x": 10.5, "y": 4, "h": 2},
-                {"matrix": [9, 5], "x": 11.5, "y": 4, "h": 2},
-                {"matrix": [9, 4], "x": 12.5, "y": 5},
-                {"matrix": [9, 3], "x": 14.5, "y": 4},
-                {"matrix": [9, 2], "x": 15.5, "y": 4.125},
-                {"matrix": [9, 1], "x": 16.5, "y": 4.375},
-                {"matrix": [9, 0], "x": 17.5, "y": 4.375}
-            ]
-        },
-        "LAYOUT_3key_1us": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0.375},
-                {"matrix": [0, 1], "x": 1, "y": 0.375},
-                {"matrix": [0, 2], "x": 2, "y": 0.125},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0.125},
-                {"matrix": [0, 5], "x": 5, "y": 0.25},
-                {"matrix": [0, 6], "x": 6, "y": 0.75},
-
-                {"matrix": [5, 6], "x": 11.5, "y": 0.75},
-                {"matrix": [5, 5], "x": 12.5, "y": 0.25},
-                {"matrix": [5, 4], "x": 13.5, "y": 0.125},
-                {"matrix": [5, 3], "x": 14.5, "y": 0},
-                {"matrix": [5, 2], "x": 15.5, "y": 0.125},
-                {"matrix": [5, 1], "x": 16.5, "y": 0.375},
-                {"matrix": [5, 0], "x": 17.5, "y": 0.375},
-
-                {"matrix": [1, 0], "x": 0, "y": 1.375},
-                {"matrix": [1, 1], "x": 1, "y": 1.375},
-                {"matrix": [1, 2], "x": 2, "y": 1.125},
-                {"matrix": [1, 3], "x": 3, "y": 1},
-                {"matrix": [1, 4], "x": 4, "y": 1.125},
-                {"matrix": [1, 5], "x": 5, "y": 1.25},
-                {"matrix": [1, 6], "x": 6, "y": 1.75},
-
-                {"matrix": [6, 6], "x": 11.5, "y": 1.75},
-                {"matrix": [6, 5], "x": 12.5, "y": 1.25},
-                {"matrix": [6, 4], "x": 13.5, "y": 1.125},
-                {"matrix": [6, 3], "x": 14.5, "y": 1},
-                {"matrix": [6, 2], "x": 15.5, "y": 1.125},
-                {"matrix": [6, 1], "x": 16.5, "y": 1.375},
-                {"matrix": [6, 0], "x": 17.5, "y": 1.375},
-
-                {"matrix": [2, 0], "x": 0, "y": 2.375},
-                {"matrix": [2, 1], "x": 1, "y": 2.375},
-                {"matrix": [2, 2], "x": 2, "y": 2.125},
-                {"matrix": [2, 3], "x": 3, "y": 2},
-                {"matrix": [2, 4], "x": 4, "y": 2.125},
-                {"matrix": [2, 5], "x": 5, "y": 2.25},
-                {"matrix": [2, 6], "x": 6, "y": 2.75},
-
-                {"matrix": [7, 6], "x": 11.5, "y": 2.75},
-                {"matrix": [7, 5], "x": 12.5, "y": 2.25},
-                {"matrix": [7, 4], "x": 13.5, "y": 2.125},
-                {"matrix": [7, 3], "x": 14.5, "y": 2},
-                {"matrix": [7, 2], "x": 15.5, "y": 2.125},
-                {"matrix": [7, 1], "x": 16.5, "y": 2.375},
-                {"matrix": [7, 0], "x": 17.5, "y": 2.375},
-
-                {"matrix": [3, 0], "x": 0, "y": 3.375},
-                {"matrix": [3, 1], "x": 1, "y": 3.375},
-                {"matrix": [3, 2], "x": 2, "y": 3.125},
-                {"matrix": [3, 3], "x": 3, "y": 3},
-                {"matrix": [3, 4], "x": 4, "y": 3.125},
-                {"matrix": [3, 5], "x": 5, "y": 3.25},
-                {"matrix": [3, 6], "x": 6, "y": 4},
-
-                {"matrix": [8, 6], "x": 11.5, "y": 4},
-                {"matrix": [8, 5], "x": 12.5, "y": 3.25},
-                {"matrix": [8, 4], "x": 13.5, "y": 3.125},
-                {"matrix": [8, 3], "x": 14.5, "y": 3},
-                {"matrix": [8, 2], "x": 15.5, "y": 3.125},
-                {"matrix": [8, 1], "x": 16.5, "y": 3.375},
-                {"matrix": [8, 0], "x": 17.5, "y": 3.375},
-
-                {"matrix": [4, 0], "x": 0, "y": 4.375},
-                {"matrix": [4, 1], "x": 1, "y": 4.375},
-                {"matrix": [4, 2], "x": 2, "y": 4.125},
-                {"matrix": [4, 3], "x": 3, "y": 4},
-                {"matrix": [4, 4], "x": 5, "y": 5},
-                {"matrix": [4, 5], "x": 6, "y": 5},
-
-                {"matrix": [9, 5], "x": 11.5, "y": 5},
-                {"matrix": [9, 4], "x": 12.5, "y": 5},
-                {"matrix": [9, 3], "x": 14.5, "y": 4},
-                {"matrix": [9, 2], "x": 15.5, "y": 4.125},
-                {"matrix": [9, 1], "x": 16.5, "y": 4.375},
-                {"matrix": [9, 0], "x": 17.5, "y": 4.375}
-            ]
-        },
-        "LAYOUT_2key": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0.375},
-                {"matrix": [0, 1], "x": 1, "y": 0.375},
-                {"matrix": [0, 2], "x": 2, "y": 0.125},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0.125},
-                {"matrix": [0, 5], "x": 5, "y": 0.25},
-                {"matrix": [0, 6], "x": 6, "y": 0.75},
-
-                {"matrix": [5, 6], "x": 11.5, "y": 0.75},
-                {"matrix": [5, 5], "x": 12.5, "y": 0.25},
-                {"matrix": [5, 4], "x": 13.5, "y": 0.125},
-                {"matrix": [5, 3], "x": 14.5, "y": 0},
-                {"matrix": [5, 2], "x": 15.5, "y": 0.125},
-                {"matrix": [5, 1], "x": 16.5, "y": 0.375},
-                {"matrix": [5, 0], "x": 17.5, "y": 0.375},
-
-                {"matrix": [1, 0], "x": 0, "y": 1.375},
-                {"matrix": [1, 1], "x": 1, "y": 1.375},
-                {"matrix": [1, 2], "x": 2, "y": 1.125},
-                {"matrix": [1, 3], "x": 3, "y": 1},
-                {"matrix": [1, 4], "x": 4, "y": 1.125},
-                {"matrix": [1, 5], "x": 5, "y": 1.25},
-                {"matrix": [1, 6], "x": 6, "y": 1.75},
-
-                {"matrix": [6, 6], "x": 11.5, "y": 1.75},
-                {"matrix": [6, 5], "x": 12.5, "y": 1.25},
-                {"matrix": [6, 4], "x": 13.5, "y": 1.125},
-                {"matrix": [6, 3], "x": 14.5, "y": 1},
-                {"matrix": [6, 2], "x": 15.5, "y": 1.125},
-                {"matrix": [6, 1], "x": 16.5, "y": 1.375},
-                {"matrix": [6, 0], "x": 17.5, "y": 1.375},
-
-                {"matrix": [2, 0], "x": 0, "y": 2.375},
-                {"matrix": [2, 1], "x": 1, "y": 2.375},
-                {"matrix": [2, 2], "x": 2, "y": 2.125},
-                {"matrix": [2, 3], "x": 3, "y": 2},
-                {"matrix": [2, 4], "x": 4, "y": 2.125},
-                {"matrix": [2, 5], "x": 5, "y": 2.25},
-                {"matrix": [2, 6], "x": 6, "y": 2.75},
-
-                {"matrix": [7, 6], "x": 11.5, "y": 2.75},
-                {"matrix": [7, 5], "x": 12.5, "y": 2.25},
-                {"matrix": [7, 4], "x": 13.5, "y": 2.125},
-                {"matrix": [7, 3], "x": 14.5, "y": 2},
-                {"matrix": [7, 2], "x": 15.5, "y": 2.125},
-                {"matrix": [7, 1], "x": 16.5, "y": 2.375},
-                {"matrix": [7, 0], "x": 17.5, "y": 2.375},
-
-                {"matrix": [3, 0], "x": 0, "y": 3.375},
-                {"matrix": [3, 1], "x": 1, "y": 3.375},
-                {"matrix": [3, 2], "x": 2, "y": 3.125},
-                {"matrix": [3, 3], "x": 3, "y": 3},
-                {"matrix": [3, 4], "x": 4, "y": 3.125},
-                {"matrix": [3, 5], "x": 5, "y": 3.25},
-
-                {"matrix": [8, 5], "x": 12.5, "y": 3.25},
-                {"matrix": [8, 4], "x": 13.5, "y": 3.125},
-                {"matrix": [8, 3], "x": 14.5, "y": 3},
-                {"matrix": [8, 2], "x": 15.5, "y": 3.125},
-                {"matrix": [8, 1], "x": 16.5, "y": 3.375},
-                {"matrix": [8, 0], "x": 17.5, "y": 3.375},
-
-                {"matrix": [4, 0], "x": 0, "y": 4.375},
-                {"matrix": [4, 1], "x": 1, "y": 4.375},
-                {"matrix": [4, 2], "x": 2, "y": 4.125},
-                {"matrix": [4, 3], "x": 3, "y": 4},
-                {"matrix": [4, 4], "x": 5, "y": 5},
-                {"matrix": [4, 5], "x": 6, "y": 4, "h": 2},
-
-                {"matrix": [9, 5], "x": 11.5, "y": 4, "h": 2},
-                {"matrix": [9, 4], "x": 12.5, "y": 5},
-                {"matrix": [9, 3], "x": 14.5, "y": 4},
-                {"matrix": [9, 2], "x": 15.5, "y": 4.125},
-                {"matrix": [9, 1], "x": 16.5, "y": 4.375},
-                {"matrix": [9, 0], "x": 17.5, "y": 4.375}
-            ]
-        }
-    }
-}
diff --git a/keyboards/omkbd/ergodash/rev1/keyboard.json b/keyboards/omkbd/ergodash/rev1/keyboard.json
new file mode 100644
index 00000000000..07405e22f72
--- /dev/null
+++ b/keyboards/omkbd/ergodash/rev1/keyboard.json
@@ -0,0 +1,464 @@
+{
+    "keyboard_name": "ErgoDash rev1.2",
+    "manufacturer": "Omkbd",
+    "url": "",
+    "maintainer": "qmk",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0x6060",
+        "device_version": "1.0.0"
+    },
+    "features": {
+        "bootmagic": false,
+        "extrakey": true,
+        "mousekey": false,
+        "nkro": false
+    },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"],
+        "rows": ["D4", "D7", "E6", "B4", "B5"]
+    },
+    "diode_direction": "COL2ROW",
+    "backlight": {
+        "pin": "B6",
+        "levels": 7
+    },
+    "split": {
+        "soft_serial_pin": "D0"
+    },
+    "tapping": {
+        "term": 120
+    },
+    "rgblight": {
+        "led_count": 24,
+        "led_map": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 23, 22, 21, 20, 19, 18, 17, 16, 15, 14, 13, 12],
+        "split_count": [12, 12],
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": true,
+            "twinkle": true
+        }
+    },
+    "ws2812": {
+        "pin": "D3"
+    },
+    "layout_aliases": {
+        "LAYOUT": "LAYOUT_4key"
+    },
+    "layouts": {
+        "LAYOUT_4key": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0.375},
+                {"matrix": [0, 1], "x": 1, "y": 0.375},
+                {"matrix": [0, 2], "x": 2, "y": 0.125},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0.125},
+                {"matrix": [0, 5], "x": 5, "y": 0.25},
+                {"matrix": [0, 6], "x": 6, "y": 0.75},
+
+                {"matrix": [5, 6], "x": 11.5, "y": 0.75},
+                {"matrix": [5, 5], "x": 12.5, "y": 0.25},
+                {"matrix": [5, 4], "x": 13.5, "y": 0.125},
+                {"matrix": [5, 3], "x": 14.5, "y": 0},
+                {"matrix": [5, 2], "x": 15.5, "y": 0.125},
+                {"matrix": [5, 1], "x": 16.5, "y": 0.375},
+                {"matrix": [5, 0], "x": 17.5, "y": 0.375},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.375},
+                {"matrix": [1, 1], "x": 1, "y": 1.375},
+                {"matrix": [1, 2], "x": 2, "y": 1.125},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1.125},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.75},
+
+                {"matrix": [6, 6], "x": 11.5, "y": 1.75},
+                {"matrix": [6, 5], "x": 12.5, "y": 1.25},
+                {"matrix": [6, 4], "x": 13.5, "y": 1.125},
+                {"matrix": [6, 3], "x": 14.5, "y": 1},
+                {"matrix": [6, 2], "x": 15.5, "y": 1.125},
+                {"matrix": [6, 1], "x": 16.5, "y": 1.375},
+                {"matrix": [6, 0], "x": 17.5, "y": 1.375},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.375},
+                {"matrix": [2, 1], "x": 1, "y": 2.375},
+                {"matrix": [2, 2], "x": 2, "y": 2.125},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2.125},
+                {"matrix": [2, 5], "x": 5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6, "y": 2.75},
+
+                {"matrix": [7, 6], "x": 11.5, "y": 2.75},
+                {"matrix": [7, 5], "x": 12.5, "y": 2.25},
+                {"matrix": [7, 4], "x": 13.5, "y": 2.125},
+                {"matrix": [7, 3], "x": 14.5, "y": 2},
+                {"matrix": [7, 2], "x": 15.5, "y": 2.125},
+                {"matrix": [7, 1], "x": 16.5, "y": 2.375},
+                {"matrix": [7, 0], "x": 17.5, "y": 2.375},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.375},
+                {"matrix": [3, 1], "x": 1, "y": 3.375},
+                {"matrix": [3, 2], "x": 2, "y": 3.125},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3.125},
+                {"matrix": [3, 5], "x": 5, "y": 3.25},
+                {"matrix": [3, 6], "x": 6, "y": 4},
+
+                {"matrix": [8, 6], "x": 11.5, "y": 4},
+                {"matrix": [8, 5], "x": 12.5, "y": 3.25},
+                {"matrix": [8, 4], "x": 13.5, "y": 3.125},
+                {"matrix": [8, 3], "x": 14.5, "y": 3},
+                {"matrix": [8, 2], "x": 15.5, "y": 3.125},
+                {"matrix": [8, 1], "x": 16.5, "y": 3.375},
+                {"matrix": [8, 0], "x": 17.5, "y": 3.375},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.375},
+                {"matrix": [4, 1], "x": 1, "y": 4.375},
+                {"matrix": [4, 2], "x": 2, "y": 4.125},
+                {"matrix": [4, 3], "x": 3, "y": 4},
+                {"matrix": [4, 4], "x": 5, "y": 5},
+                {"matrix": [4, 5], "x": 6, "y": 5},
+                {"matrix": [4, 6], "x": 7, "y": 4, "h": 2},
+
+                {"matrix": [9, 6], "x": 10.5, "y": 4, "h": 2},
+                {"matrix": [9, 5], "x": 11.5, "y": 5},
+                {"matrix": [9, 4], "x": 12.5, "y": 5},
+                {"matrix": [9, 3], "x": 14.5, "y": 4},
+                {"matrix": [9, 2], "x": 15.5, "y": 4.125},
+                {"matrix": [9, 1], "x": 16.5, "y": 4.375},
+                {"matrix": [9, 0], "x": 17.5, "y": 4.375}
+            ]
+        },
+        "LAYOUT_4key_2u_inner": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0.375},
+                {"matrix": [0, 1], "x": 1, "y": 0.375},
+                {"matrix": [0, 2], "x": 2, "y": 0.125},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0.125},
+                {"matrix": [0, 5], "x": 5, "y": 0.25},
+                {"matrix": [0, 6], "x": 6, "y": 0.75},
+
+                {"matrix": [5, 6], "x": 11.5, "y": 0.75},
+                {"matrix": [5, 5], "x": 12.5, "y": 0.25},
+                {"matrix": [5, 4], "x": 13.5, "y": 0.125},
+                {"matrix": [5, 3], "x": 14.5, "y": 0},
+                {"matrix": [5, 2], "x": 15.5, "y": 0.125},
+                {"matrix": [5, 1], "x": 16.5, "y": 0.375},
+                {"matrix": [5, 0], "x": 17.5, "y": 0.375},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.375},
+                {"matrix": [1, 1], "x": 1, "y": 1.375},
+                {"matrix": [1, 2], "x": 2, "y": 1.125},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1.125},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.75},
+
+                {"matrix": [6, 6], "x": 11.5, "y": 1.75},
+                {"matrix": [6, 5], "x": 12.5, "y": 1.25},
+                {"matrix": [6, 4], "x": 13.5, "y": 1.125},
+                {"matrix": [6, 3], "x": 14.5, "y": 1},
+                {"matrix": [6, 2], "x": 15.5, "y": 1.125},
+                {"matrix": [6, 1], "x": 16.5, "y": 1.375},
+                {"matrix": [6, 0], "x": 17.5, "y": 1.375},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.375},
+                {"matrix": [2, 1], "x": 1, "y": 2.375},
+                {"matrix": [2, 2], "x": 2, "y": 2.125},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2.125},
+                {"matrix": [2, 5], "x": 5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6, "y": 2.75},
+
+                {"matrix": [7, 6], "x": 11.5, "y": 2.75},
+                {"matrix": [7, 5], "x": 12.5, "y": 2.25},
+                {"matrix": [7, 4], "x": 13.5, "y": 2.125},
+                {"matrix": [7, 3], "x": 14.5, "y": 2},
+                {"matrix": [7, 2], "x": 15.5, "y": 2.125},
+                {"matrix": [7, 1], "x": 16.5, "y": 2.375},
+                {"matrix": [7, 0], "x": 17.5, "y": 2.375},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.375},
+                {"matrix": [3, 1], "x": 1, "y": 3.375},
+                {"matrix": [3, 2], "x": 2, "y": 3.125},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3.125},
+                {"matrix": [3, 5], "x": 5, "y": 3.25},
+                {"matrix": [3, 6], "x": 7, "y": 4},
+
+                {"matrix": [8, 6], "x": 10.5, "y": 4},
+                {"matrix": [8, 5], "x": 12.5, "y": 3.25},
+                {"matrix": [8, 4], "x": 13.5, "y": 3.125},
+                {"matrix": [8, 3], "x": 14.5, "y": 3},
+                {"matrix": [8, 2], "x": 15.5, "y": 3.125},
+                {"matrix": [8, 1], "x": 16.5, "y": 3.375},
+                {"matrix": [8, 0], "x": 17.5, "y": 3.375},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.375},
+                {"matrix": [4, 1], "x": 1, "y": 4.375},
+                {"matrix": [4, 2], "x": 2, "y": 4.125},
+                {"matrix": [4, 3], "x": 3, "y": 4},
+                {"matrix": [4, 4], "x": 5, "y": 5},
+                {"matrix": [4, 5], "x": 6, "y": 4, "h": 2},
+                {"matrix": [4, 6], "x": 7, "y": 5},
+
+                {"matrix": [9, 6], "x": 10.5, "y": 5},
+                {"matrix": [9, 5], "x": 11.5, "y": 4, "h": 2},
+                {"matrix": [9, 4], "x": 12.5, "y": 5},
+                {"matrix": [9, 3], "x": 14.5, "y": 4},
+                {"matrix": [9, 2], "x": 15.5, "y": 4.125},
+                {"matrix": [9, 1], "x": 16.5, "y": 4.375},
+                {"matrix": [9, 0], "x": 17.5, "y": 4.375}
+            ]
+        },
+        "LAYOUT_3key_2us": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0.375},
+                {"matrix": [0, 1], "x": 1, "y": 0.375},
+                {"matrix": [0, 2], "x": 2, "y": 0.125},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0.125},
+                {"matrix": [0, 5], "x": 5, "y": 0.25},
+                {"matrix": [0, 6], "x": 6, "y": 0.75},
+
+                {"matrix": [5, 6], "x": 11.5, "y": 0.75},
+                {"matrix": [5, 5], "x": 12.5, "y": 0.25},
+                {"matrix": [5, 4], "x": 13.5, "y": 0.125},
+                {"matrix": [5, 3], "x": 14.5, "y": 0},
+                {"matrix": [5, 2], "x": 15.5, "y": 0.125},
+                {"matrix": [5, 1], "x": 16.5, "y": 0.375},
+                {"matrix": [5, 0], "x": 17.5, "y": 0.375},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.375},
+                {"matrix": [1, 1], "x": 1, "y": 1.375},
+                {"matrix": [1, 2], "x": 2, "y": 1.125},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1.125},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.75},
+
+                {"matrix": [6, 6], "x": 11.5, "y": 1.75},
+                {"matrix": [6, 5], "x": 12.5, "y": 1.25},
+                {"matrix": [6, 4], "x": 13.5, "y": 1.125},
+                {"matrix": [6, 3], "x": 14.5, "y": 1},
+                {"matrix": [6, 2], "x": 15.5, "y": 1.125},
+                {"matrix": [6, 1], "x": 16.5, "y": 1.375},
+                {"matrix": [6, 0], "x": 17.5, "y": 1.375},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.375},
+                {"matrix": [2, 1], "x": 1, "y": 2.375},
+                {"matrix": [2, 2], "x": 2, "y": 2.125},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2.125},
+                {"matrix": [2, 5], "x": 5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6, "y": 2.75},
+
+                {"matrix": [7, 6], "x": 11.5, "y": 2.75},
+                {"matrix": [7, 5], "x": 12.5, "y": 2.25},
+                {"matrix": [7, 4], "x": 13.5, "y": 2.125},
+                {"matrix": [7, 3], "x": 14.5, "y": 2},
+                {"matrix": [7, 2], "x": 15.5, "y": 2.125},
+                {"matrix": [7, 1], "x": 16.5, "y": 2.375},
+                {"matrix": [7, 0], "x": 17.5, "y": 2.375},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.375},
+                {"matrix": [3, 1], "x": 1, "y": 3.375},
+                {"matrix": [3, 2], "x": 2, "y": 3.125},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3.125},
+                {"matrix": [3, 5], "x": 5, "y": 3.25},
+
+                {"matrix": [8, 5], "x": 12.5, "y": 3.25},
+                {"matrix": [8, 4], "x": 13.5, "y": 3.125},
+                {"matrix": [8, 3], "x": 14.5, "y": 3},
+                {"matrix": [8, 2], "x": 15.5, "y": 3.125},
+                {"matrix": [8, 1], "x": 16.5, "y": 3.375},
+                {"matrix": [8, 0], "x": 17.5, "y": 3.375},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.375},
+                {"matrix": [4, 1], "x": 1, "y": 4.375},
+                {"matrix": [4, 2], "x": 2, "y": 4.125},
+                {"matrix": [4, 3], "x": 3, "y": 4},
+                {"matrix": [4, 4], "x": 5, "y": 5},
+                {"matrix": [4, 5], "x": 6, "y": 4, "h": 2},
+                {"matrix": [4, 6], "x": 7, "y": 4, "h": 2},
+
+                {"matrix": [9, 6], "x": 10.5, "y": 4, "h": 2},
+                {"matrix": [9, 5], "x": 11.5, "y": 4, "h": 2},
+                {"matrix": [9, 4], "x": 12.5, "y": 5},
+                {"matrix": [9, 3], "x": 14.5, "y": 4},
+                {"matrix": [9, 2], "x": 15.5, "y": 4.125},
+                {"matrix": [9, 1], "x": 16.5, "y": 4.375},
+                {"matrix": [9, 0], "x": 17.5, "y": 4.375}
+            ]
+        },
+        "LAYOUT_3key_1us": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0.375},
+                {"matrix": [0, 1], "x": 1, "y": 0.375},
+                {"matrix": [0, 2], "x": 2, "y": 0.125},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0.125},
+                {"matrix": [0, 5], "x": 5, "y": 0.25},
+                {"matrix": [0, 6], "x": 6, "y": 0.75},
+
+                {"matrix": [5, 6], "x": 11.5, "y": 0.75},
+                {"matrix": [5, 5], "x": 12.5, "y": 0.25},
+                {"matrix": [5, 4], "x": 13.5, "y": 0.125},
+                {"matrix": [5, 3], "x": 14.5, "y": 0},
+                {"matrix": [5, 2], "x": 15.5, "y": 0.125},
+                {"matrix": [5, 1], "x": 16.5, "y": 0.375},
+                {"matrix": [5, 0], "x": 17.5, "y": 0.375},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.375},
+                {"matrix": [1, 1], "x": 1, "y": 1.375},
+                {"matrix": [1, 2], "x": 2, "y": 1.125},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1.125},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.75},
+
+                {"matrix": [6, 6], "x": 11.5, "y": 1.75},
+                {"matrix": [6, 5], "x": 12.5, "y": 1.25},
+                {"matrix": [6, 4], "x": 13.5, "y": 1.125},
+                {"matrix": [6, 3], "x": 14.5, "y": 1},
+                {"matrix": [6, 2], "x": 15.5, "y": 1.125},
+                {"matrix": [6, 1], "x": 16.5, "y": 1.375},
+                {"matrix": [6, 0], "x": 17.5, "y": 1.375},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.375},
+                {"matrix": [2, 1], "x": 1, "y": 2.375},
+                {"matrix": [2, 2], "x": 2, "y": 2.125},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2.125},
+                {"matrix": [2, 5], "x": 5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6, "y": 2.75},
+
+                {"matrix": [7, 6], "x": 11.5, "y": 2.75},
+                {"matrix": [7, 5], "x": 12.5, "y": 2.25},
+                {"matrix": [7, 4], "x": 13.5, "y": 2.125},
+                {"matrix": [7, 3], "x": 14.5, "y": 2},
+                {"matrix": [7, 2], "x": 15.5, "y": 2.125},
+                {"matrix": [7, 1], "x": 16.5, "y": 2.375},
+                {"matrix": [7, 0], "x": 17.5, "y": 2.375},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.375},
+                {"matrix": [3, 1], "x": 1, "y": 3.375},
+                {"matrix": [3, 2], "x": 2, "y": 3.125},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3.125},
+                {"matrix": [3, 5], "x": 5, "y": 3.25},
+                {"matrix": [3, 6], "x": 6, "y": 4},
+
+                {"matrix": [8, 6], "x": 11.5, "y": 4},
+                {"matrix": [8, 5], "x": 12.5, "y": 3.25},
+                {"matrix": [8, 4], "x": 13.5, "y": 3.125},
+                {"matrix": [8, 3], "x": 14.5, "y": 3},
+                {"matrix": [8, 2], "x": 15.5, "y": 3.125},
+                {"matrix": [8, 1], "x": 16.5, "y": 3.375},
+                {"matrix": [8, 0], "x": 17.5, "y": 3.375},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.375},
+                {"matrix": [4, 1], "x": 1, "y": 4.375},
+                {"matrix": [4, 2], "x": 2, "y": 4.125},
+                {"matrix": [4, 3], "x": 3, "y": 4},
+                {"matrix": [4, 4], "x": 5, "y": 5},
+                {"matrix": [4, 5], "x": 6, "y": 5},
+
+                {"matrix": [9, 5], "x": 11.5, "y": 5},
+                {"matrix": [9, 4], "x": 12.5, "y": 5},
+                {"matrix": [9, 3], "x": 14.5, "y": 4},
+                {"matrix": [9, 2], "x": 15.5, "y": 4.125},
+                {"matrix": [9, 1], "x": 16.5, "y": 4.375},
+                {"matrix": [9, 0], "x": 17.5, "y": 4.375}
+            ]
+        },
+        "LAYOUT_2key": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0.375},
+                {"matrix": [0, 1], "x": 1, "y": 0.375},
+                {"matrix": [0, 2], "x": 2, "y": 0.125},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0.125},
+                {"matrix": [0, 5], "x": 5, "y": 0.25},
+                {"matrix": [0, 6], "x": 6, "y": 0.75},
+
+                {"matrix": [5, 6], "x": 11.5, "y": 0.75},
+                {"matrix": [5, 5], "x": 12.5, "y": 0.25},
+                {"matrix": [5, 4], "x": 13.5, "y": 0.125},
+                {"matrix": [5, 3], "x": 14.5, "y": 0},
+                {"matrix": [5, 2], "x": 15.5, "y": 0.125},
+                {"matrix": [5, 1], "x": 16.5, "y": 0.375},
+                {"matrix": [5, 0], "x": 17.5, "y": 0.375},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.375},
+                {"matrix": [1, 1], "x": 1, "y": 1.375},
+                {"matrix": [1, 2], "x": 2, "y": 1.125},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1.125},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.75},
+
+                {"matrix": [6, 6], "x": 11.5, "y": 1.75},
+                {"matrix": [6, 5], "x": 12.5, "y": 1.25},
+                {"matrix": [6, 4], "x": 13.5, "y": 1.125},
+                {"matrix": [6, 3], "x": 14.5, "y": 1},
+                {"matrix": [6, 2], "x": 15.5, "y": 1.125},
+                {"matrix": [6, 1], "x": 16.5, "y": 1.375},
+                {"matrix": [6, 0], "x": 17.5, "y": 1.375},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.375},
+                {"matrix": [2, 1], "x": 1, "y": 2.375},
+                {"matrix": [2, 2], "x": 2, "y": 2.125},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2.125},
+                {"matrix": [2, 5], "x": 5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6, "y": 2.75},
+
+                {"matrix": [7, 6], "x": 11.5, "y": 2.75},
+                {"matrix": [7, 5], "x": 12.5, "y": 2.25},
+                {"matrix": [7, 4], "x": 13.5, "y": 2.125},
+                {"matrix": [7, 3], "x": 14.5, "y": 2},
+                {"matrix": [7, 2], "x": 15.5, "y": 2.125},
+                {"matrix": [7, 1], "x": 16.5, "y": 2.375},
+                {"matrix": [7, 0], "x": 17.5, "y": 2.375},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.375},
+                {"matrix": [3, 1], "x": 1, "y": 3.375},
+                {"matrix": [3, 2], "x": 2, "y": 3.125},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3.125},
+                {"matrix": [3, 5], "x": 5, "y": 3.25},
+
+                {"matrix": [8, 5], "x": 12.5, "y": 3.25},
+                {"matrix": [8, 4], "x": 13.5, "y": 3.125},
+                {"matrix": [8, 3], "x": 14.5, "y": 3},
+                {"matrix": [8, 2], "x": 15.5, "y": 3.125},
+                {"matrix": [8, 1], "x": 16.5, "y": 3.375},
+                {"matrix": [8, 0], "x": 17.5, "y": 3.375},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.375},
+                {"matrix": [4, 1], "x": 1, "y": 4.375},
+                {"matrix": [4, 2], "x": 2, "y": 4.125},
+                {"matrix": [4, 3], "x": 3, "y": 4},
+                {"matrix": [4, 4], "x": 5, "y": 5},
+                {"matrix": [4, 5], "x": 6, "y": 4, "h": 2},
+
+                {"matrix": [9, 5], "x": 11.5, "y": 4, "h": 2},
+                {"matrix": [9, 4], "x": 12.5, "y": 5},
+                {"matrix": [9, 3], "x": 14.5, "y": 4},
+                {"matrix": [9, 2], "x": 15.5, "y": 4.125},
+                {"matrix": [9, 1], "x": 16.5, "y": 4.375},
+                {"matrix": [9, 0], "x": 17.5, "y": 4.375}
+            ]
+        }
+    }
+}
diff --git a/keyboards/omkbd/ergodash/rev1/rules.mk b/keyboards/omkbd/ergodash/rev1/rules.mk
deleted file mode 100644
index bb9e33b0829..00000000000
--- a/keyboards/omkbd/ergodash/rev1/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-BACKLIGHT_ENABLE = no
-RGBLIGHT_ENABLE = no
-AUDIO_ENABLE = no
diff --git a/keyboards/omkbd/ergodash/rules.mk b/keyboards/omkbd/ergodash/rules.mk
index 015ffcd8fb7..492cdde65d7 100644
--- a/keyboards/omkbd/ergodash/rules.mk
+++ b/keyboards/omkbd/ergodash/rules.mk
@@ -1,14 +1 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no        # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no      # Enable keyboard backlight functionality
-AUDIO_ENABLE = no           # Audio output
-RGBLIGHT_ENABLE = no       # Enable WS2812 RGB underlight.
-
 DEFAULT_FOLDER = omkbd/ergodash/rev1
diff --git a/keyboards/omkbd/runner3680/info.json b/keyboards/omkbd/runner3680/info.json
index 306a3970bb8..c626b2e3b45 100644
--- a/keyboards/omkbd/runner3680/info.json
+++ b/keyboards/omkbd/runner3680/info.json
@@ -1,6 +1,12 @@
 {
     "processor": "atmega32u4",
     "bootloader": "caterina",
+    "features": {
+        "bootmagic": false,
+        "extrakey": false,
+        "mousekey": false,
+        "nkro": false
+    },
     "split": {
         "enabled": true
     }
diff --git a/keyboards/omkbd/runner3680/rules.mk b/keyboards/omkbd/runner3680/rules.mk
index d90dd4adda3..3460ad89640 100644
--- a/keyboards/omkbd/runner3680/rules.mk
+++ b/keyboards/omkbd/runner3680/rules.mk
@@ -1,14 +1 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no       # Mouse keys
-EXTRAKEY_ENABLE = no       # Audio control and System control
-CONSOLE_ENABLE = no        # Console for debug
-COMMAND_ENABLE = no        # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
 DEFAULT_FOLDER = omkbd/runner3680/5x8
diff --git a/keyboards/omnikeyish/info.json b/keyboards/omnikeyish/info.json
deleted file mode 100644
index 2b91c1447ef..00000000000
--- a/keyboards/omnikeyish/info.json
+++ /dev/null
@@ -1,1266 +0,0 @@
-{
-    "keyboard_name": "Omnikey-(ish)",
-    "manufacturer": "Henrik O. S\u00f8rensen",
-    "url": "https://github.com/henrikosorensen/keyboard_pcbs/tree/master/omnikeyish_pcb",
-    "maintainer": "qmk",
-    "usb": {
-        "vid": "0xFEED",
-        "pid": "0x0666",
-        "device_version": "13.3.7",
-        "force_nkro": true
-    },
-    "indicators": {
-        "caps_lock": "E1",
-        "num_lock": "E0",
-        "scroll_lock": "B7"
-    },
-    "processor": "at90usb1286",
-    "bootloader": "halfkay",
-    "layouts": {
-        "LAYOUT_all": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-
-                {"matrix": [0, 2], "x": 2.6667, "y": 0},
-
-                {"matrix": [0, 4], "x": 4.6667, "y": 0},
-                {"matrix": [0, 5], "x": 5.6667, "y": 0},
-                {"matrix": [0, 6], "x": 6.6667, "y": 0},
-                {"matrix": [0, 7], "x": 7.6667, "y": 0},
-
-                {"matrix": [0, 8], "x": 9.1667, "y": 0},
-                {"matrix": [0, 9], "x": 10.1667, "y": 0},
-                {"matrix": [0, 10], "x": 11.1667, "y": 0},
-                {"matrix": [0, 11], "x": 12.1667, "y": 0},
-
-                {"matrix": [0, 12], "x": 13.6667, "y": 0},
-                {"matrix": [0, 13], "x": 14.6667, "y": 0},
-                {"matrix": [0, 14], "x": 15.6667, "y": 0},
-                {"matrix": [0, 15], "x": 16.6667, "y": 0},
-
-                {"matrix": [0, 16], "x": 18.1667, "y": 0},
-                {"matrix": [0, 17], "x": 19.1667, "y": 0},
-                {"matrix": [0, 18], "x": 20.1667, "y": 0},
-
-                {"matrix": [0, 19], "x": 21.6667, "y": 0},
-                {"matrix": [0, 20], "x": 22.6667, "y": 0},
-                {"matrix": [0, 21], "x": 23.6667, "y": 0},
-                {"matrix": [0, 22], "x": 24.6667, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 2},
-                {"matrix": [1, 1], "x": 1, "y": 2},
-
-                {"matrix": [1, 2], "x": 2.6667, "y": 2},
-                {"matrix": [1, 3], "x": 3.6667, "y": 2},
-                {"matrix": [1, 4], "x": 4.6667, "y": 2},
-                {"matrix": [1, 5], "x": 5.6667, "y": 2},
-                {"matrix": [1, 6], "x": 6.6667, "y": 2},
-                {"matrix": [1, 7], "x": 7.6667, "y": 2},
-                {"matrix": [1, 8], "x": 8.6667, "y": 2},
-                {"matrix": [1, 9], "x": 9.6667, "y": 2},
-                {"matrix": [1, 10], "x": 10.6667, "y": 2},
-                {"matrix": [1, 11], "x": 11.6667, "y": 2},
-                {"matrix": [1, 12], "x": 12.6667, "y": 2},
-                {"matrix": [1, 13], "x": 13.6667, "y": 2},
-                {"matrix": [1, 14], "x": 14.6667, "y": 2},
-                {"matrix": [1, 15], "x": 15.6667, "y": 2, "w": 2},
-
-                {"matrix": [1, 16], "x": 18.1667, "y": 2},
-                {"matrix": [1, 17], "x": 19.1667, "y": 2},
-                {"matrix": [1, 18], "x": 20.1667, "y": 2},
-
-                {"matrix": [1, 19], "x": 21.6667, "y": 2},
-                {"matrix": [1, 20], "x": 22.6667, "y": 2},
-                {"matrix": [1, 21], "x": 23.6667, "y": 2},
-                {"matrix": [1, 22], "x": 24.6667, "y": 2},
-
-                {"matrix": [2, 0], "x": 0, "y": 3},
-                {"matrix": [2, 1], "x": 1, "y": 3},
-
-                {"matrix": [2, 2], "x": 2.6667, "y": 3, "w": 1.5},
-                {"matrix": [2, 3], "x": 4.1667, "y": 3},
-                {"matrix": [2, 4], "x": 5.1667, "y": 3},
-                {"matrix": [2, 5], "x": 6.1667, "y": 3},
-                {"matrix": [2, 6], "x": 7.1667, "y": 3},
-                {"matrix": [2, 7], "x": 8.1667, "y": 3},
-                {"matrix": [2, 8], "x": 9.1667, "y": 3},
-                {"matrix": [2, 9], "x": 10.1667, "y": 3},
-                {"matrix": [2, 10], "x": 11.1667, "y": 3},
-                {"matrix": [2, 11], "x": 12.1667, "y": 3},
-                {"matrix": [2, 12], "x": 13.1667, "y": 3},
-                {"matrix": [2, 13], "x": 14.1667, "y": 3},
-                {"matrix": [2, 14], "x": 15.1667, "y": 3},
-                {"matrix": [2, 15], "x": 16.1667, "y": 3, "w": 1.5},
-
-                {"matrix": [2, 16], "x": 18.1667, "y": 3},
-                {"matrix": [2, 17], "x": 19.1667, "y": 3},
-                {"matrix": [2, 18], "x": 20.1667, "y": 3},
-
-                {"matrix": [2, 19], "x": 21.6667, "y": 3},
-                {"matrix": [2, 20], "x": 22.6667, "y": 3},
-                {"matrix": [2, 21], "x": 23.6667, "y": 3},
-                {"matrix": [2, 22], "x": 24.6667, "y": 3},
-
-                {"matrix": [3, 0], "x": 0, "y": 4},
-                {"matrix": [3, 1], "x": 1, "y": 4},
-
-                {"matrix": [3, 2], "x": 2.6667, "y": 4, "w": 1.75},
-                {"matrix": [3, 3], "x": 4.4167, "y": 4},
-                {"matrix": [3, 4], "x": 5.4167, "y": 4},
-                {"matrix": [3, 5], "x": 6.4167, "y": 4},
-                {"matrix": [3, 6], "x": 7.4167, "y": 4},
-                {"matrix": [3, 7], "x": 8.4167, "y": 4},
-                {"matrix": [3, 8], "x": 9.4167, "y": 4},
-                {"matrix": [3, 9], "x": 10.4167, "y": 4},
-                {"matrix": [3, 10], "x": 11.4167, "y": 4},
-                {"matrix": [3, 11], "x": 12.4167, "y": 4},
-                {"matrix": [3, 12], "x": 13.4167, "y": 4},
-                {"matrix": [3, 13], "x": 14.4167, "y": 4},
-                {"matrix": [3, 14], "x": 15.4167, "y": 4},
-                {"matrix": [3, 15], "x": 16.4167, "y": 4, "w": 1.25},
-
-                {"matrix": [3, 16], "x": 18.1667, "y": 4},
-                {"matrix": [3, 17], "x": 19.1667, "y": 4},
-                {"matrix": [3, 18], "x": 20.1667, "y": 4},
-
-                {"matrix": [3, 19], "x": 21.6667, "y": 4},
-                {"matrix": [3, 20], "x": 22.6667, "y": 4},
-                {"matrix": [3, 21], "x": 23.6667, "y": 4},
-                {"matrix": [3, 22], "x": 24.6667, "y": 4},
-
-                {"matrix": [4, 0], "x": 0, "y": 5},
-                {"matrix": [4, 1], "x": 1, "y": 5},
-
-                {"matrix": [4, 2], "x": 2.6667, "y": 5, "w": 1.25},
-                {"matrix": [4, 3], "x": 3.9167, "y": 5},
-                {"matrix": [4, 4], "x": 4.9167, "y": 5},
-                {"matrix": [4, 5], "x": 5.9167, "y": 5},
-                {"matrix": [4, 6], "x": 6.9167, "y": 5},
-                {"matrix": [4, 7], "x": 7.9167, "y": 5},
-                {"matrix": [4, 8], "x": 8.9167, "y": 5},
-                {"matrix": [4, 9], "x": 9.9167, "y": 5},
-                {"matrix": [4, 10], "x": 10.9167, "y": 5},
-                {"matrix": [4, 11], "x": 11.9167, "y": 5},
-                {"matrix": [4, 12], "x": 12.9167, "y": 5},
-                {"matrix": [4, 13], "x": 13.9167, "y": 5},
-                {"matrix": [4, 14], "x": 14.9167, "y": 5, "w": 1.75},
-
-                {"matrix": [4, 15], "x": 16.6667, "y": 5},
-
-                {"matrix": [4, 16], "x": 18.1667, "y": 5},
-                {"matrix": [4, 17], "x": 19.1667, "y": 5},
-                {"matrix": [4, 18], "x": 20.1667, "y": 5},
-
-                {"matrix": [4, 19], "x": 21.6667, "y": 5},
-                {"matrix": [4, 20], "x": 22.6667, "y": 5},
-                {"matrix": [4, 21], "x": 23.6667, "y": 5},
-                {"matrix": [4, 22], "x": 24.6667, "y": 5, "h": 2},
-
-                {"matrix": [5, 0], "x": 0, "y": 6},
-                {"matrix": [5, 1], "x": 1, "y": 6},
-
-                {"matrix": [5, 2], "x": 2.6667, "y": 6, "w": 1.25},
-                {"matrix": [5, 3], "x": 3.9167, "y": 6, "w": 1.25},
-                {"matrix": [5, 4], "x": 5.1667, "y": 6, "w": 1.25},
-                {"matrix": [5, 9], "x": 6.4167, "y": 6, "w": 6.25},
-                {"matrix": [5, 12], "x": 12.6667, "y": 6, "w": 1.25},
-                {"matrix": [5, 13], "x": 13.9167, "y": 6, "w": 1.25},
-                {"matrix": [5, 14], "x": 15.1667, "y": 6, "w": 1.25},
-                {"matrix": [5, 15], "x": 16.4167, "y": 6, "w": 1.25},
-
-                {"matrix": [5, 16], "x": 18.1667, "y": 6},
-                {"matrix": [5, 17], "x": 19.1667, "y": 6},
-                {"matrix": [5, 18], "x": 20.1667, "y": 6},
-
-                {"matrix": [5, 19], "x": 21.6667, "y": 6, "w": 2},
-                {"matrix": [5, 21], "x": 23.6667, "y": 6}
-            ]
-        },
-        "LAYOUT_101": {
-            "layout": [
-                {"matrix": [0, 2], "x": 0, "y": 0},
-
-                {"matrix": [0, 4], "x": 2, "y": 0},
-                {"matrix": [0, 5], "x": 3, "y": 0},
-                {"matrix": [0, 6], "x": 4, "y": 0},
-                {"matrix": [0, 7], "x": 5, "y": 0},
-
-                {"matrix": [0, 8], "x": 6.5, "y": 0},
-                {"matrix": [0, 9], "x": 7.5, "y": 0},
-                {"matrix": [0, 10], "x": 8.5, "y": 0},
-                {"matrix": [0, 11], "x": 9.5, "y": 0},
-
-                {"matrix": [0, 12], "x": 11, "y": 0},
-                {"matrix": [0, 13], "x": 12, "y": 0},
-                {"matrix": [0, 14], "x": 13, "y": 0},
-                {"matrix": [0, 15], "x": 14, "y": 0},
-
-                {"matrix": [0, 16], "x": 15.25, "y": 0},
-                {"matrix": [0, 17], "x": 16.25, "y": 0},
-                {"matrix": [0, 18], "x": 17.25, "y": 0},
-
-                {"matrix": [1, 2], "x": 0, "y": 1.5},
-                {"matrix": [1, 3], "x": 1, "y": 1.5},
-                {"matrix": [1, 4], "x": 2, "y": 1.5},
-                {"matrix": [1, 5], "x": 3, "y": 1.5},
-                {"matrix": [1, 6], "x": 4, "y": 1.5},
-                {"matrix": [1, 7], "x": 5, "y": 1.5},
-                {"matrix": [1, 8], "x": 6, "y": 1.5},
-                {"matrix": [1, 9], "x": 7, "y": 1.5},
-                {"matrix": [1, 10], "x": 8, "y": 1.5},
-                {"matrix": [1, 11], "x": 9, "y": 1.5},
-                {"matrix": [1, 12], "x": 10, "y": 1.5},
-                {"matrix": [1, 13], "x": 11, "y": 1.5},
-                {"matrix": [1, 14], "x": 12, "y": 1.5},
-                {"matrix": [1, 15], "x": 13, "y": 1.5, "w": 2},
-
-                {"matrix": [1, 16], "x": 15.25, "y": 1.5},
-                {"matrix": [1, 17], "x": 16.25, "y": 1.5},
-                {"matrix": [1, 18], "x": 17.25, "y": 1.5},
-
-                {"matrix": [1, 19], "x": 18.5, "y": 1.5},
-                {"matrix": [1, 20], "x": 19.5, "y": 1.5},
-                {"matrix": [1, 21], "x": 20.5, "y": 1.5},
-                {"matrix": [1, 22], "x": 21.5, "y": 1.5},
-
-                {"matrix": [2, 2], "x": 0, "y": 2.5, "w": 1.5},
-                {"matrix": [2, 3], "x": 1.5, "y": 2.5},
-                {"matrix": [2, 4], "x": 2.5, "y": 2.5},
-                {"matrix": [2, 5], "x": 3.5, "y": 2.5},
-                {"matrix": [2, 6], "x": 4.5, "y": 2.5},
-                {"matrix": [2, 7], "x": 5.5, "y": 2.5},
-                {"matrix": [2, 8], "x": 6.5, "y": 2.5},
-                {"matrix": [2, 9], "x": 7.5, "y": 2.5},
-                {"matrix": [2, 10], "x": 8.5, "y": 2.5},
-                {"matrix": [2, 11], "x": 9.5, "y": 2.5},
-                {"matrix": [2, 12], "x": 10.5, "y": 2.5},
-                {"matrix": [2, 13], "x": 11.5, "y": 2.5},
-                {"matrix": [2, 14], "x": 12.5, "y": 2.5},
-                {"matrix": [2, 15], "x": 13.5, "y": 2.5, "w": 1.5},
-
-                {"matrix": [2, 16], "x": 15.25, "y": 2.5},
-                {"matrix": [2, 17], "x": 16.25, "y": 2.5},
-                {"matrix": [2, 18], "x": 17.25, "y": 2.5},
-
-                {"matrix": [2, 19], "x": 18.5, "y": 2.5},
-                {"matrix": [2, 20], "x": 19.5, "y": 2.5},
-                {"matrix": [2, 21], "x": 20.5, "y": 2.5},
-                {"matrix": [2, 22], "x": 21.5, "y": 2.5, "h": 2},
-
-                {"matrix": [3, 2], "x": 0, "y": 3.5, "w": 1.75},
-                {"matrix": [3, 3], "x": 1.75, "y": 3.5},
-                {"matrix": [3, 4], "x": 2.75, "y": 3.5},
-                {"matrix": [3, 5], "x": 3.75, "y": 3.5},
-                {"matrix": [3, 6], "x": 4.75, "y": 3.5},
-                {"matrix": [3, 7], "x": 5.75, "y": 3.5},
-                {"matrix": [3, 8], "x": 6.75, "y": 3.5},
-                {"matrix": [3, 9], "x": 7.75, "y": 3.5},
-                {"matrix": [3, 10], "x": 8.75, "y": 3.5},
-                {"matrix": [3, 11], "x": 9.75, "y": 3.5},
-                {"matrix": [3, 12], "x": 10.75, "y": 3.5},
-                {"matrix": [3, 13], "x": 11.75, "y": 3.5},
-                {"matrix": [3, 15], "x": 12.75, "y": 3.5, "w": 2.25},
-
-                {"matrix": [3, 19], "x": 18.5, "y": 3.5},
-                {"matrix": [3, 20], "x": 19.5, "y": 3.5},
-                {"matrix": [3, 21], "x": 20.5, "y": 3.5},
-
-                {"matrix": [4, 2], "x": 0, "y": 4.5, "w": 2.25},
-                {"matrix": [4, 4], "x": 2.25, "y": 4.5},
-                {"matrix": [4, 5], "x": 3.25, "y": 4.5},
-                {"matrix": [4, 6], "x": 4.25, "y": 4.5},
-                {"matrix": [4, 7], "x": 5.25, "y": 4.5},
-                {"matrix": [4, 8], "x": 6.25, "y": 4.5},
-                {"matrix": [4, 9], "x": 7.25, "y": 4.5},
-                {"matrix": [4, 10], "x": 8.25, "y": 4.5},
-                {"matrix": [4, 11], "x": 9.25, "y": 4.5},
-                {"matrix": [4, 12], "x": 10.25, "y": 4.5},
-                {"matrix": [4, 13], "x": 11.25, "y": 4.5},
-                {"matrix": [4, 14], "x": 12.25, "y": 4.5, "w": 2.75},
-
-                {"matrix": [4, 17], "x": 16.25, "y": 4.5},
-
-                {"matrix": [4, 19], "x": 18.5, "y": 4.5},
-                {"matrix": [4, 20], "x": 19.5, "y": 4.5},
-                {"matrix": [4, 21], "x": 20.5, "y": 4.5},
-                {"matrix": [4, 22], "x": 21.5, "y": 4.5, "h": 2},
-
-                {"matrix": [5, 2], "x": 0, "y": 5.5, "w": 1.5},
-                {"matrix": [5, 4], "x": 2.5, "y": 5.5, "w": 1.5},
-                {"matrix": [5, 9], "x": 4, "y": 5.5, "w": 7},
-                {"matrix": [5, 12], "x": 11, "y": 5.5, "w": 1.5},
-                {"matrix": [5, 15], "x": 13.5, "y": 5.5, "w": 1.5},
-
-                {"matrix": [5, 16], "x": 15.25, "y": 5.5},
-                {"matrix": [5, 17], "x": 16.25, "y": 5.5},
-                {"matrix": [5, 18], "x": 17.25, "y": 5.5},
-
-                {"matrix": [5, 19], "x": 18.5, "y": 5.5, "w": 2},
-                {"matrix": [5, 21], "x": 20.5, "y": 5.5}
-            ]
-        },
-        "LAYOUT_ultra_t": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-
-                {"matrix": [0, 2], "x": 2.6667, "y": 0},
-
-                {"matrix": [0, 4], "x": 4.6667, "y": 0},
-                {"matrix": [0, 5], "x": 5.6667, "y": 0},
-                {"matrix": [0, 6], "x": 6.6667, "y": 0},
-                {"matrix": [0, 7], "x": 7.6667, "y": 0},
-
-                {"matrix": [0, 8], "x": 9.1667, "y": 0},
-                {"matrix": [0, 9], "x": 10.1667, "y": 0},
-                {"matrix": [0, 10], "x": 11.1667, "y": 0},
-                {"matrix": [0, 11], "x": 12.1667, "y": 0},
-
-                {"matrix": [0, 12], "x": 13.6667, "y": 0},
-                {"matrix": [0, 13], "x": 14.6667, "y": 0},
-                {"matrix": [0, 14], "x": 15.6667, "y": 0},
-                {"matrix": [0, 15], "x": 16.6667, "y": 0},
-
-                {"matrix": [0, 16], "x": 18.1667, "y": 0},
-                {"matrix": [0, 17], "x": 19.1667, "y": 0},
-                {"matrix": [0, 18], "x": 20.1667, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 2},
-                {"matrix": [1, 1], "x": 1, "y": 2},
-
-                {"matrix": [1, 2], "x": 2.6667, "y": 2},
-                {"matrix": [1, 3], "x": 3.6667, "y": 2},
-                {"matrix": [1, 4], "x": 4.6667, "y": 2},
-                {"matrix": [1, 5], "x": 5.6667, "y": 2},
-                {"matrix": [1, 6], "x": 6.6667, "y": 2},
-                {"matrix": [1, 7], "x": 7.6667, "y": 2},
-                {"matrix": [1, 8], "x": 8.6667, "y": 2},
-                {"matrix": [1, 9], "x": 9.6667, "y": 2},
-                {"matrix": [1, 10], "x": 10.6667, "y": 2},
-                {"matrix": [1, 11], "x": 11.6667, "y": 2},
-                {"matrix": [1, 12], "x": 12.6667, "y": 2},
-                {"matrix": [1, 13], "x": 13.6667, "y": 2},
-                {"matrix": [1, 14], "x": 14.6667, "y": 2},
-                {"matrix": [1, 15], "x": 15.6667, "y": 2, "w": 2},
-
-                {"matrix": [1, 16], "x": 18.1667, "y": 2},
-                {"matrix": [1, 17], "x": 19.1667, "y": 2},
-                {"matrix": [1, 18], "x": 20.1667, "y": 2},
-
-                {"matrix": [1, 19], "x": 21.6667, "y": 2},
-                {"matrix": [1, 20], "x": 22.6667, "y": 2},
-                {"matrix": [1, 21], "x": 23.6667, "y": 2},
-                {"matrix": [1, 22], "x": 24.6667, "y": 2},
-
-                {"matrix": [2, 0], "x": 0, "y": 3},
-                {"matrix": [2, 1], "x": 1, "y": 3},
-
-                {"matrix": [2, 2], "x": 2.6667, "y": 3, "w": 1.5},
-                {"matrix": [2, 3], "x": 4.1667, "y": 3},
-                {"matrix": [2, 4], "x": 5.1667, "y": 3},
-                {"matrix": [2, 5], "x": 6.1667, "y": 3},
-                {"matrix": [2, 6], "x": 7.1667, "y": 3},
-                {"matrix": [2, 7], "x": 8.1667, "y": 3},
-                {"matrix": [2, 8], "x": 9.1667, "y": 3},
-                {"matrix": [2, 9], "x": 10.1667, "y": 3},
-                {"matrix": [2, 10], "x": 11.1667, "y": 3},
-                {"matrix": [2, 11], "x": 12.1667, "y": 3},
-                {"matrix": [2, 12], "x": 13.1667, "y": 3},
-                {"matrix": [2, 13], "x": 14.1667, "y": 3},
-                {"matrix": [2, 14], "x": 15.1667, "y": 3},
-                {"matrix": [2, 16], "x": 16.1667, "y": 3, "w": 1.5, "h": 2},
-
-                {"matrix": [2, 17], "x": 18.1667, "y": 3},
-                {"matrix": [2, 18], "x": 19.1667, "y": 3},
-                {"matrix": [2, 19], "x": 20.1667, "y": 3},
-
-                {"matrix": [2, 20], "x": 21.6667, "y": 3},
-                {"matrix": [2, 21], "x": 22.6667, "y": 3},
-                {"matrix": [2, 22], "x": 23.6667, "y": 3},
-                {"matrix": [3, 0], "x": 24.6667, "y": 3},
-
-                {"matrix": [3, 1], "x": 0, "y": 4},
-                {"matrix": [3, 2], "x": 1, "y": 4},
-
-                {"matrix": [3, 3], "x": 2.6667, "y": 4, "w": 1.75},
-                {"matrix": [3, 4], "x": 4.4167, "y": 4},
-                {"matrix": [3, 5], "x": 5.4167, "y": 4},
-                {"matrix": [3, 6], "x": 6.4167, "y": 4},
-                {"matrix": [3, 7], "x": 7.4167, "y": 4},
-                {"matrix": [3, 8], "x": 8.4167, "y": 4},
-                {"matrix": [3, 9], "x": 9.4167, "y": 4},
-                {"matrix": [3, 10], "x": 10.4167, "y": 4},
-                {"matrix": [3, 11], "x": 11.4167, "y": 4},
-                {"matrix": [3, 12], "x": 12.4167, "y": 4},
-                {"matrix": [3, 13], "x": 13.4167, "y": 4},
-                {"matrix": [3, 15], "x": 14.4167, "y": 4},
-
-                {"matrix": [3, 19], "x": 21.6667, "y": 4},
-                {"matrix": [3, 20], "x": 22.6667, "y": 4},
-                {"matrix": [3, 21], "x": 23.6667, "y": 4},
-                {"matrix": [3, 22], "x": 24.6667, "y": 4},
-
-                {"matrix": [4, 0], "x": 0, "y": 5},
-                {"matrix": [4, 1], "x": 1, "y": 5},
-
-                {"matrix": [4, 2], "x": 2.6667, "y": 5, "w": 2.25},
-                {"matrix": [4, 4], "x": 4.9167, "y": 5},
-                {"matrix": [4, 5], "x": 5.9167, "y": 5},
-                {"matrix": [4, 6], "x": 6.9167, "y": 5},
-                {"matrix": [4, 7], "x": 7.9167, "y": 5},
-                {"matrix": [4, 8], "x": 8.9167, "y": 5},
-                {"matrix": [4, 9], "x": 9.9167, "y": 5},
-                {"matrix": [4, 10], "x": 10.9167, "y": 5},
-                {"matrix": [4, 11], "x": 11.9167, "y": 5},
-                {"matrix": [4, 12], "x": 12.9167, "y": 5},
-                {"matrix": [4, 13], "x": 13.9167, "y": 5},
-                {"matrix": [4, 14], "x": 14.9167, "y": 5, "w": 1.75},
-                {"matrix": [4, 15], "x": 16.6667, "y": 5},
-
-                {"matrix": [4, 17], "x": 19.1667, "y": 5},
-
-                {"matrix": [4, 19], "x": 21.6667, "y": 5},
-                {"matrix": [4, 20], "x": 22.6667, "y": 5},
-                {"matrix": [4, 21], "x": 23.6667, "y": 5},
-                {"matrix": [4, 22], "x": 24.6667, "y": 5, "h": 2},
-
-                {"matrix": [5, 0], "x": 0, "y": 6},
-                {"matrix": [5, 1], "x": 1, "y": 6},
-
-                {"matrix": [5, 2], "x": 2.6667, "y": 6, "w": 1.5},
-                {"matrix": [5, 3], "x": 4.1667, "y": 6},
-                {"matrix": [5, 4], "x": 5.1667, "y": 6, "w": 1.5},
-                {"matrix": [5, 9], "x": 6.6667, "y": 6, "w": 7},
-                {"matrix": [5, 12], "x": 13.6667, "y": 6, "w": 1.5},
-                {"matrix": [5, 13], "x": 15.1667, "y": 6},
-                {"matrix": [5, 15], "x": 16.1667, "y": 6, "w": 1.5},
-
-                {"matrix": [5, 16], "x": 18.1667, "y": 6},
-                {"matrix": [5, 17], "x": 19.1667, "y": 6},
-                {"matrix": [5, 18], "x": 20.1667, "y": 6},
-
-                {"matrix": [5, 19], "x": 21.6667, "y": 6, "w": 2},
-                {"matrix": [5, 21], "x": 23.6667, "y": 6}
-            ]
-        },
-        "LAYOUT_ultra_rev1": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-
-                {"matrix": [0, 4], "x": 2.6667, "y": 0},
-                {"matrix": [0, 5], "x": 3.6667, "y": 0},
-                {"matrix": [0, 6], "x": 4.6667, "y": 0},
-                {"matrix": [0, 7], "x": 5.6667, "y": 0},
-
-                {"matrix": [0, 8], "x": 8.1667, "y": 0},
-                {"matrix": [0, 9], "x": 9.1667, "y": 0},
-                {"matrix": [0, 10], "x": 10.1667, "y": 0},
-                {"matrix": [0, 11], "x": 11.1667, "y": 0},
-
-                {"matrix": [0, 12], "x": 13.6667, "y": 0},
-                {"matrix": [0, 13], "x": 14.6667, "y": 0},
-                {"matrix": [0, 14], "x": 15.6667, "y": 0},
-                {"matrix": [0, 15], "x": 16.6667, "y": 0},
-
-                {"matrix": [0, 16], "x": 18.1667, "y": 0},
-                {"matrix": [0, 17], "x": 19.1667, "y": 0},
-                {"matrix": [0, 18], "x": 20.1667, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 2},
-                {"matrix": [1, 1], "x": 1, "y": 2},
-
-                {"matrix": [1, 2], "x": 2.6667, "y": 2},
-                {"matrix": [1, 3], "x": 3.6667, "y": 2},
-                {"matrix": [1, 4], "x": 4.6667, "y": 2},
-                {"matrix": [1, 5], "x": 5.6667, "y": 2},
-                {"matrix": [1, 6], "x": 6.6667, "y": 2},
-                {"matrix": [1, 7], "x": 7.6667, "y": 2},
-                {"matrix": [1, 8], "x": 8.6667, "y": 2},
-                {"matrix": [1, 9], "x": 9.6667, "y": 2},
-                {"matrix": [1, 10], "x": 10.6667, "y": 2},
-                {"matrix": [1, 11], "x": 11.6667, "y": 2},
-                {"matrix": [1, 12], "x": 12.6667, "y": 2},
-                {"matrix": [1, 13], "x": 13.6667, "y": 2},
-                {"matrix": [1, 14], "x": 14.6667, "y": 2},
-                {"matrix": [1, 15], "x": 15.6667, "y": 2, "w": 2},
-
-                {"matrix": [1, 16], "x": 18.1667, "y": 2},
-                {"matrix": [1, 17], "x": 19.1667, "y": 2},
-                {"matrix": [1, 18], "x": 20.1667, "y": 2},
-
-                {"matrix": [1, 19], "x": 21.6667, "y": 2},
-                {"matrix": [1, 20], "x": 22.6667, "y": 2},
-                {"matrix": [1, 21], "x": 23.6667, "y": 2},
-                {"matrix": [1, 22], "x": 24.6667, "y": 2},
-
-                {"matrix": [2, 0], "x": 0, "y": 3},
-                {"matrix": [2, 1], "x": 1, "y": 3},
-
-                {"matrix": [2, 2], "x": 2.6667, "y": 3, "w": 1.5},
-                {"matrix": [2, 3], "x": 4.1667, "y": 3},
-                {"matrix": [2, 4], "x": 5.1667, "y": 3},
-                {"matrix": [2, 5], "x": 6.1667, "y": 3},
-                {"matrix": [2, 6], "x": 7.1667, "y": 3},
-                {"matrix": [2, 7], "x": 8.1667, "y": 3},
-                {"matrix": [2, 8], "x": 9.1667, "y": 3},
-                {"matrix": [2, 9], "x": 10.1667, "y": 3},
-                {"matrix": [2, 10], "x": 11.1667, "y": 3},
-                {"matrix": [2, 11], "x": 12.1667, "y": 3},
-                {"matrix": [2, 12], "x": 13.1667, "y": 3},
-                {"matrix": [2, 13], "x": 14.1667, "y": 3},
-                {"matrix": [2, 14], "x": 15.1667, "y": 3},
-                {"matrix": [2, 16], "x": 16.1667, "y": 3, "w": 1.5, "h": 2},
-
-                {"matrix": [2, 17], "x": 18.1667, "y": 3},
-                {"matrix": [2, 18], "x": 19.1667, "y": 3},
-                {"matrix": [2, 19], "x": 20.1667, "y": 3},
-
-                {"matrix": [2, 20], "x": 21.6667, "y": 3},
-                {"matrix": [2, 21], "x": 22.6667, "y": 3},
-                {"matrix": [2, 22], "x": 23.6667, "y": 3},
-                {"matrix": [3, 0], "x": 24.6667, "y": 3},
-
-                {"matrix": [3, 1], "x": 0, "y": 4},
-                {"matrix": [3, 2], "x": 1, "y": 4},
-
-                {"matrix": [3, 3], "x": 2.6667, "y": 4, "w": 1.75},
-                {"matrix": [3, 4], "x": 4.4167, "y": 4},
-                {"matrix": [3, 5], "x": 5.4167, "y": 4},
-                {"matrix": [3, 6], "x": 6.4167, "y": 4},
-                {"matrix": [3, 7], "x": 7.4167, "y": 4},
-                {"matrix": [3, 8], "x": 8.4167, "y": 4},
-                {"matrix": [3, 9], "x": 9.4167, "y": 4},
-                {"matrix": [3, 10], "x": 10.4167, "y": 4},
-                {"matrix": [3, 11], "x": 11.4167, "y": 4},
-                {"matrix": [3, 12], "x": 12.4167, "y": 4},
-                {"matrix": [3, 13], "x": 13.4167, "y": 4},
-                {"matrix": [3, 15], "x": 14.4167, "y": 4},
-
-                {"matrix": [3, 16], "x": 18.1667, "y": 4},
-                {"matrix": [3, 17], "x": 19.1667, "y": 4},
-                {"matrix": [3, 18], "x": 20.1667, "y": 4},
-
-                {"matrix": [3, 19], "x": 21.6667, "y": 4},
-                {"matrix": [3, 20], "x": 22.6667, "y": 4},
-                {"matrix": [3, 21], "x": 23.6667, "y": 4},
-                {"matrix": [3, 22], "x": 24.6667, "y": 4},
-
-                {"matrix": [4, 0], "x": 0, "y": 5},
-                {"matrix": [4, 1], "x": 1, "y": 5},
-
-                {"matrix": [4, 2], "x": 2.6667, "y": 5, "w": 2.25},
-                {"matrix": [4, 4], "x": 4.9167, "y": 5},
-                {"matrix": [4, 5], "x": 5.9167, "y": 5},
-                {"matrix": [4, 6], "x": 6.9167, "y": 5},
-                {"matrix": [4, 7], "x": 7.9167, "y": 5},
-                {"matrix": [4, 8], "x": 8.9167, "y": 5},
-                {"matrix": [4, 9], "x": 9.9167, "y": 5},
-                {"matrix": [4, 10], "x": 10.9167, "y": 5},
-                {"matrix": [4, 11], "x": 11.9167, "y": 5},
-                {"matrix": [4, 12], "x": 12.9167, "y": 5},
-                {"matrix": [4, 13], "x": 13.9167, "y": 5},
-                {"matrix": [4, 14], "x": 14.9167, "y": 5, "w": 1.75},
-                {"matrix": [4, 15], "x": 16.6667, "y": 5},
-
-                {"matrix": [4, 16], "x": 18.1667, "y": 5},
-                {"matrix": [4, 17], "x": 19.1667, "y": 5},
-                {"matrix": [4, 18], "x": 20.1667, "y": 5},
-
-                {"matrix": [4, 19], "x": 21.6667, "y": 5},
-                {"matrix": [4, 20], "x": 22.6667, "y": 5},
-                {"matrix": [4, 21], "x": 23.6667, "y": 5},
-                {"matrix": [4, 22], "x": 24.6667, "y": 5, "h": 2},
-
-                {"matrix": [5, 0], "x": 0, "y": 6},
-                {"matrix": [5, 1], "x": 1, "y": 6},
-
-                {"matrix": [5, 2], "x": 2.6667, "y": 6, "w": 1.5},
-                {"matrix": [5, 3], "x": 4.1667, "y": 6},
-                {"matrix": [5, 4], "x": 5.1667, "y": 6, "w": 1.5},
-                {"matrix": [5, 9], "x": 6.6667, "y": 6, "w": 7},
-                {"matrix": [5, 12], "x": 13.6667, "y": 6, "w": 1.5},
-                {"matrix": [5, 13], "x": 15.1667, "y": 6},
-                {"matrix": [5, 15], "x": 16.1667, "y": 6, "w": 1.5},
-
-                {"matrix": [5, 16], "x": 18.1667, "y": 6, "w": 1.5},
-                {"matrix": [5, 18], "x": 19.6667, "y": 6, "w": 1.5},
-
-                {"matrix": [5, 19], "x": 21.6667, "y": 6, "w": 2},
-                {"matrix": [5, 21], "x": 23.6667, "y": 6}
-            ]
-        },
-        "LAYOUT_ultra_rev3": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-
-                {"matrix": [0, 2], "x": 2.6667, "y": 0},
-
-                {"matrix": [0, 4], "x": 4.6667, "y": 0},
-                {"matrix": [0, 5], "x": 5.6667, "y": 0},
-                {"matrix": [0, 6], "x": 6.6667, "y": 0},
-                {"matrix": [0, 7], "x": 7.6667, "y": 0},
-
-                {"matrix": [0, 8], "x": 9.1667, "y": 0},
-                {"matrix": [0, 9], "x": 10.1667, "y": 0},
-                {"matrix": [0, 10], "x": 11.1667, "y": 0},
-                {"matrix": [0, 11], "x": 12.1667, "y": 0},
-
-                {"matrix": [0, 12], "x": 13.6667, "y": 0},
-                {"matrix": [0, 13], "x": 14.6667, "y": 0},
-                {"matrix": [0, 14], "x": 15.6667, "y": 0},
-                {"matrix": [0, 15], "x": 16.6667, "y": 0},
-
-                {"matrix": [0, 16], "x": 18.1667, "y": 0},
-                {"matrix": [0, 17], "x": 19.1667, "y": 0},
-                {"matrix": [0, 18], "x": 20.1667, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 2},
-                {"matrix": [1, 1], "x": 1, "y": 2},
-
-                {"matrix": [1, 2], "x": 2.6667, "y": 2},
-                {"matrix": [1, 3], "x": 3.6667, "y": 2},
-                {"matrix": [1, 4], "x": 4.6667, "y": 2},
-                {"matrix": [1, 5], "x": 5.6667, "y": 2},
-                {"matrix": [1, 6], "x": 6.6667, "y": 2},
-                {"matrix": [1, 7], "x": 7.6667, "y": 2},
-                {"matrix": [1, 8], "x": 8.6667, "y": 2},
-                {"matrix": [1, 9], "x": 9.6667, "y": 2},
-                {"matrix": [1, 10], "x": 10.6667, "y": 2},
-                {"matrix": [1, 11], "x": 11.6667, "y": 2},
-                {"matrix": [1, 12], "x": 12.6667, "y": 2},
-                {"matrix": [1, 13], "x": 13.6667, "y": 2},
-                {"matrix": [1, 14], "x": 14.6667, "y": 2},
-                {"matrix": [1, 15], "x": 15.6667, "y": 2, "w": 2},
-
-                {"matrix": [1, 16], "x": 18.1667, "y": 2},
-                {"matrix": [1, 17], "x": 19.1667, "y": 2},
-                {"matrix": [1, 18], "x": 20.1667, "y": 2},
-
-                {"matrix": [1, 19], "x": 21.6667, "y": 2},
-                {"matrix": [1, 20], "x": 22.6667, "y": 2},
-                {"matrix": [1, 21], "x": 23.6667, "y": 2},
-                {"matrix": [1, 22], "x": 24.6667, "y": 2},
-
-                {"matrix": [2, 0], "x": 0, "y": 3},
-                {"matrix": [2, 1], "x": 1, "y": 3},
-
-                {"matrix": [2, 2], "x": 2.6667, "y": 3, "w": 1.5},
-                {"matrix": [2, 3], "x": 4.1667, "y": 3},
-                {"matrix": [2, 4], "x": 5.1667, "y": 3},
-                {"matrix": [2, 5], "x": 6.1667, "y": 3},
-                {"matrix": [2, 6], "x": 7.1667, "y": 3},
-                {"matrix": [2, 7], "x": 8.1667, "y": 3},
-                {"matrix": [2, 8], "x": 9.1667, "y": 3},
-                {"matrix": [2, 9], "x": 10.1667, "y": 3},
-                {"matrix": [2, 10], "x": 11.1667, "y": 3},
-                {"matrix": [2, 11], "x": 12.1667, "y": 3},
-                {"matrix": [2, 12], "x": 13.1667, "y": 3},
-                {"matrix": [2, 13], "x": 14.1667, "y": 3},
-                {"matrix": [2, 14], "x": 15.1667, "y": 3},
-                {"matrix": [2, 16], "x": 16.1667, "y": 3, "w": 1.5, "h": 2},
-
-                {"matrix": [2, 17], "x": 18.1667, "y": 3},
-                {"matrix": [2, 18], "x": 19.1667, "y": 3},
-                {"matrix": [2, 19], "x": 20.1667, "y": 3},
-
-                {"matrix": [2, 20], "x": 21.6667, "y": 3},
-                {"matrix": [2, 21], "x": 22.6667, "y": 3},
-                {"matrix": [2, 22], "x": 23.6667, "y": 3},
-                {"matrix": [3, 0], "x": 24.6667, "y": 3},
-
-                {"matrix": [3, 1], "x": 0, "y": 4},
-                {"matrix": [3, 2], "x": 1, "y": 4},
-
-                {"matrix": [3, 3], "x": 2.6667, "y": 4, "w": 1.75},
-                {"matrix": [3, 4], "x": 4.4167, "y": 4},
-                {"matrix": [3, 5], "x": 5.4167, "y": 4},
-                {"matrix": [3, 6], "x": 6.4167, "y": 4},
-                {"matrix": [3, 7], "x": 7.4167, "y": 4},
-                {"matrix": [3, 8], "x": 8.4167, "y": 4},
-                {"matrix": [3, 9], "x": 9.4167, "y": 4},
-                {"matrix": [3, 10], "x": 10.4167, "y": 4},
-                {"matrix": [3, 11], "x": 11.4167, "y": 4},
-                {"matrix": [3, 12], "x": 12.4167, "y": 4},
-                {"matrix": [3, 13], "x": 13.4167, "y": 4},
-                {"matrix": [3, 15], "x": 14.4167, "y": 4},
-
-                {"matrix": [3, 16], "x": 18.1667, "y": 4},
-                {"matrix": [3, 17], "x": 19.1667, "y": 4},
-                {"matrix": [3, 18], "x": 20.1667, "y": 4},
-
-                {"matrix": [3, 19], "x": 21.6667, "y": 4},
-                {"matrix": [3, 20], "x": 22.6667, "y": 4},
-                {"matrix": [3, 21], "x": 23.6667, "y": 4},
-                {"matrix": [3, 22], "x": 24.6667, "y": 4},
-
-                {"matrix": [4, 0], "x": 0, "y": 5},
-                {"matrix": [4, 1], "x": 1, "y": 5},
-
-                {"matrix": [4, 2], "x": 2.6667, "y": 5, "w": 2.25},
-                {"matrix": [4, 4], "x": 4.9167, "y": 5},
-                {"matrix": [4, 5], "x": 5.9167, "y": 5},
-                {"matrix": [4, 6], "x": 6.9167, "y": 5},
-                {"matrix": [4, 7], "x": 7.9167, "y": 5},
-                {"matrix": [4, 8], "x": 8.9167, "y": 5},
-                {"matrix": [4, 9], "x": 9.9167, "y": 5},
-                {"matrix": [4, 10], "x": 10.9167, "y": 5},
-                {"matrix": [4, 11], "x": 11.9167, "y": 5},
-                {"matrix": [4, 12], "x": 12.9167, "y": 5},
-                {"matrix": [4, 13], "x": 13.9167, "y": 5},
-                {"matrix": [4, 14], "x": 14.9167, "y": 5, "w": 1.75},
-                {"matrix": [4, 15], "x": 16.6667, "y": 5},
-
-                {"matrix": [4, 16], "x": 18.1667, "y": 5},
-                {"matrix": [4, 17], "x": 19.1667, "y": 5},
-                {"matrix": [4, 18], "x": 20.1667, "y": 5},
-
-                {"matrix": [4, 19], "x": 21.6667, "y": 5},
-                {"matrix": [4, 20], "x": 22.6667, "y": 5},
-                {"matrix": [4, 21], "x": 23.6667, "y": 5},
-                {"matrix": [4, 22], "x": 24.6667, "y": 5, "h": 2},
-
-                {"matrix": [5, 0], "x": 0, "y": 6},
-                {"matrix": [5, 1], "x": 1, "y": 6},
-
-                {"matrix": [5, 2], "x": 2.6667, "y": 6, "w": 1.5},
-                {"matrix": [5, 3], "x": 4.1667, "y": 6},
-                {"matrix": [5, 4], "x": 5.1667, "y": 6, "w": 1.5},
-                {"matrix": [5, 9], "x": 6.6667, "y": 6, "w": 7},
-                {"matrix": [5, 12], "x": 13.6667, "y": 6, "w": 1.5},
-                {"matrix": [5, 13], "x": 15.1667, "y": 6},
-                {"matrix": [5, 15], "x": 16.1667, "y": 6, "w": 1.5},
-
-                {"matrix": [5, 16], "x": 18.1667, "y": 6, "w": 1.5},
-                {"matrix": [5, 18], "x": 19.6667, "y": 6, "w": 1.5},
-
-                {"matrix": [5, 19], "x": 21.6667, "y": 6, "w": 2},
-                {"matrix": [5, 21], "x": 23.6667, "y": 6}
-            ]
-        },
-        "LAYOUT_plus_rev3": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-
-                {"matrix": [0, 2], "x": 2.6667, "y": 0},
-
-                {"matrix": [0, 16], "x": 18.1667, "y": 0},
-                {"matrix": [0, 17], "x": 19.1667, "y": 0},
-                {"matrix": [0, 18], "x": 20.1667, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 2},
-                {"matrix": [1, 1], "x": 1, "y": 2},
-
-                {"matrix": [1, 2], "x": 2.6667, "y": 2},
-                {"matrix": [1, 3], "x": 3.6667, "y": 2},
-                {"matrix": [1, 4], "x": 4.6667, "y": 2},
-                {"matrix": [1, 5], "x": 5.6667, "y": 2},
-                {"matrix": [1, 6], "x": 6.6667, "y": 2},
-                {"matrix": [1, 7], "x": 7.6667, "y": 2},
-                {"matrix": [1, 8], "x": 8.6667, "y": 2},
-                {"matrix": [1, 9], "x": 9.6667, "y": 2},
-                {"matrix": [1, 10], "x": 10.6667, "y": 2},
-                {"matrix": [1, 11], "x": 11.6667, "y": 2},
-                {"matrix": [1, 12], "x": 12.6667, "y": 2},
-                {"matrix": [1, 13], "x": 13.6667, "y": 2},
-                {"matrix": [1, 14], "x": 14.6667, "y": 2},
-                {"matrix": [1, 15], "x": 15.6667, "y": 2, "w": 2},
-
-                {"matrix": [1, 16], "x": 18.1667, "y": 2},
-                {"matrix": [1, 17], "x": 19.1667, "y": 2},
-                {"matrix": [1, 18], "x": 20.1667, "y": 2},
-
-                {"matrix": [1, 19], "x": 21.6667, "y": 2},
-                {"matrix": [1, 20], "x": 22.6667, "y": 2},
-                {"matrix": [1, 21], "x": 23.6667, "y": 2},
-                {"matrix": [1, 22], "x": 24.6667, "y": 2},
-
-                {"matrix": [2, 0], "x": 0, "y": 3},
-                {"matrix": [2, 1], "x": 1, "y": 3},
-
-                {"matrix": [2, 2], "x": 2.6667, "y": 3, "w": 1.5},
-                {"matrix": [2, 3], "x": 4.1667, "y": 3},
-                {"matrix": [2, 4], "x": 5.1667, "y": 3},
-                {"matrix": [2, 5], "x": 6.1667, "y": 3},
-                {"matrix": [2, 6], "x": 7.1667, "y": 3},
-                {"matrix": [2, 7], "x": 8.1667, "y": 3},
-                {"matrix": [2, 8], "x": 9.1667, "y": 3},
-                {"matrix": [2, 9], "x": 10.1667, "y": 3},
-                {"matrix": [2, 10], "x": 11.1667, "y": 3},
-                {"matrix": [2, 11], "x": 12.1667, "y": 3},
-                {"matrix": [2, 12], "x": 13.1667, "y": 3},
-                {"matrix": [2, 13], "x": 14.1667, "y": 3},
-                {"matrix": [2, 14], "x": 15.1667, "y": 3},
-                {"matrix": [2, 16], "x": 16.1667, "y": 3, "w": 1.5, "h": 2},
-
-                {"matrix": [2, 17], "x": 18.1667, "y": 3},
-                {"matrix": [2, 18], "x": 19.1667, "y": 3},
-                {"matrix": [2, 19], "x": 20.1667, "y": 3},
-
-                {"matrix": [2, 20], "x": 21.6667, "y": 3},
-                {"matrix": [2, 21], "x": 22.6667, "y": 3},
-                {"matrix": [2, 22], "x": 23.6667, "y": 3},
-                {"matrix": [3, 0], "x": 24.6667, "y": 3},
-
-                {"matrix": [3, 1], "x": 0, "y": 4},
-                {"matrix": [3, 2], "x": 1, "y": 4},
-
-                {"matrix": [3, 3], "x": 2.6667, "y": 4, "w": 1.75},
-                {"matrix": [3, 4], "x": 4.4167, "y": 4},
-                {"matrix": [3, 5], "x": 5.4167, "y": 4},
-                {"matrix": [3, 6], "x": 6.4167, "y": 4},
-                {"matrix": [3, 7], "x": 7.4167, "y": 4},
-                {"matrix": [3, 8], "x": 8.4167, "y": 4},
-                {"matrix": [3, 9], "x": 9.4167, "y": 4},
-                {"matrix": [3, 10], "x": 10.4167, "y": 4},
-                {"matrix": [3, 11], "x": 11.4167, "y": 4},
-                {"matrix": [3, 12], "x": 12.4167, "y": 4},
-                {"matrix": [3, 13], "x": 13.4167, "y": 4},
-                {"matrix": [3, 15], "x": 14.4167, "y": 4},
-
-                {"matrix": [3, 16], "x": 18.1667, "y": 4},
-                {"matrix": [3, 17], "x": 19.1667, "y": 4},
-                {"matrix": [3, 18], "x": 20.1667, "y": 4},
-
-                {"matrix": [3, 19], "x": 21.6667, "y": 4},
-                {"matrix": [3, 20], "x": 22.6667, "y": 4},
-                {"matrix": [3, 21], "x": 23.6667, "y": 4},
-                {"matrix": [3, 22], "x": 24.6667, "y": 4},
-
-                {"matrix": [4, 0], "x": 0, "y": 5},
-                {"matrix": [4, 1], "x": 1, "y": 5},
-
-                {"matrix": [4, 2], "x": 2.6667, "y": 5, "w": 2.25},
-                {"matrix": [4, 4], "x": 4.9167, "y": 5},
-                {"matrix": [4, 5], "x": 5.9167, "y": 5},
-                {"matrix": [4, 6], "x": 6.9167, "y": 5},
-                {"matrix": [4, 7], "x": 7.9167, "y": 5},
-                {"matrix": [4, 8], "x": 8.9167, "y": 5},
-                {"matrix": [4, 9], "x": 9.9167, "y": 5},
-                {"matrix": [4, 10], "x": 10.9167, "y": 5},
-                {"matrix": [4, 11], "x": 11.9167, "y": 5},
-                {"matrix": [4, 12], "x": 12.9167, "y": 5},
-                {"matrix": [4, 13], "x": 13.9167, "y": 5},
-                {"matrix": [4, 14], "x": 14.9167, "y": 5, "w": 1.75},
-                {"matrix": [4, 15], "x": 16.6667, "y": 5},
-
-                {"matrix": [4, 16], "x": 18.1667, "y": 5},
-                {"matrix": [4, 17], "x": 19.1667, "y": 5},
-                {"matrix": [4, 18], "x": 20.1667, "y": 5},
-
-                {"matrix": [4, 19], "x": 21.6667, "y": 5},
-                {"matrix": [4, 20], "x": 22.6667, "y": 5},
-                {"matrix": [4, 21], "x": 23.6667, "y": 5},
-                {"matrix": [4, 22], "x": 24.6667, "y": 5, "h": 2},
-
-                {"matrix": [5, 0], "x": 0, "y": 6},
-                {"matrix": [5, 1], "x": 1, "y": 6},
-
-                {"matrix": [5, 2], "x": 2.6667, "y": 6, "w": 1.5},
-                {"matrix": [5, 3], "x": 4.1667, "y": 6},
-                {"matrix": [5, 4], "x": 5.1667, "y": 6, "w": 1.5},
-                {"matrix": [5, 9], "x": 6.6667, "y": 6, "w": 7},
-                {"matrix": [5, 12], "x": 13.6667, "y": 6, "w": 1.5},
-                {"matrix": [5, 13], "x": 15.1667, "y": 6},
-                {"matrix": [5, 15], "x": 16.1667, "y": 6, "w": 1.5},
-
-                {"matrix": [5, 16], "x": 18.1667, "y": 6, "w": 1.5},
-                {"matrix": [5, 18], "x": 19.6667, "y": 6, "w": 1.5},
-
-                {"matrix": [5, 19], "x": 21.6667, "y": 6, "w": 2},
-                {"matrix": [5, 21], "x": 23.6667, "y": 6}
-            ]
-        },
-        "LAYOUT_plus_rev1": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-
-                {"matrix": [0, 16], "x": 18.1667, "y": 0},
-                {"matrix": [0, 17], "x": 19.1667, "y": 0},
-                {"matrix": [0, 18], "x": 20.1667, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 2},
-                {"matrix": [1, 1], "x": 1, "y": 2},
-
-                {"matrix": [1, 2], "x": 2.6667, "y": 2},
-                {"matrix": [1, 3], "x": 3.6667, "y": 2},
-                {"matrix": [1, 4], "x": 4.6667, "y": 2},
-                {"matrix": [1, 5], "x": 5.6667, "y": 2},
-                {"matrix": [1, 6], "x": 6.6667, "y": 2},
-                {"matrix": [1, 7], "x": 7.6667, "y": 2},
-                {"matrix": [1, 8], "x": 8.6667, "y": 2},
-                {"matrix": [1, 9], "x": 9.6667, "y": 2},
-                {"matrix": [1, 10], "x": 10.6667, "y": 2},
-                {"matrix": [1, 11], "x": 11.6667, "y": 2},
-                {"matrix": [1, 12], "x": 12.6667, "y": 2},
-                {"matrix": [1, 13], "x": 13.6667, "y": 2},
-                {"matrix": [1, 14], "x": 14.6667, "y": 2},
-                {"matrix": [1, 15], "x": 15.6667, "y": 2, "w": 2},
-
-                {"matrix": [1, 16], "x": 18.1667, "y": 2},
-                {"matrix": [1, 17], "x": 19.1667, "y": 2},
-                {"matrix": [1, 18], "x": 20.1667, "y": 2},
-
-                {"matrix": [1, 19], "x": 21.6667, "y": 2},
-                {"matrix": [1, 20], "x": 22.6667, "y": 2},
-                {"matrix": [1, 21], "x": 23.6667, "y": 2},
-                {"matrix": [1, 22], "x": 24.6667, "y": 2},
-
-                {"matrix": [2, 0], "x": 0, "y": 3},
-                {"matrix": [2, 1], "x": 1, "y": 3},
-
-                {"matrix": [2, 2], "x": 2.6667, "y": 3, "w": 1.5},
-                {"matrix": [2, 3], "x": 4.1667, "y": 3},
-                {"matrix": [2, 4], "x": 5.1667, "y": 3},
-                {"matrix": [2, 5], "x": 6.1667, "y": 3},
-                {"matrix": [2, 6], "x": 7.1667, "y": 3},
-                {"matrix": [2, 7], "x": 8.1667, "y": 3},
-                {"matrix": [2, 8], "x": 9.1667, "y": 3},
-                {"matrix": [2, 9], "x": 10.1667, "y": 3},
-                {"matrix": [2, 10], "x": 11.1667, "y": 3},
-                {"matrix": [2, 11], "x": 12.1667, "y": 3},
-                {"matrix": [2, 12], "x": 13.1667, "y": 3},
-                {"matrix": [2, 13], "x": 14.1667, "y": 3},
-                {"matrix": [2, 14], "x": 15.1667, "y": 3},
-                {"matrix": [2, 16], "x": 16.1667, "y": 3, "w": 1.5, "h": 2},
-
-                {"matrix": [2, 17], "x": 18.1667, "y": 3},
-                {"matrix": [2, 18], "x": 19.1667, "y": 3},
-                {"matrix": [2, 19], "x": 20.1667, "y": 3},
-
-                {"matrix": [2, 20], "x": 21.6667, "y": 3},
-                {"matrix": [2, 21], "x": 22.6667, "y": 3},
-                {"matrix": [2, 22], "x": 23.6667, "y": 3},
-                {"matrix": [3, 0], "x": 24.6667, "y": 3},
-
-                {"matrix": [3, 1], "x": 0, "y": 4},
-                {"matrix": [3, 2], "x": 1, "y": 4},
-
-                {"matrix": [3, 3], "x": 2.6667, "y": 4, "w": 1.75},
-                {"matrix": [3, 4], "x": 4.4167, "y": 4},
-                {"matrix": [3, 5], "x": 5.4167, "y": 4},
-                {"matrix": [3, 6], "x": 6.4167, "y": 4},
-                {"matrix": [3, 7], "x": 7.4167, "y": 4},
-                {"matrix": [3, 8], "x": 8.4167, "y": 4},
-                {"matrix": [3, 9], "x": 9.4167, "y": 4},
-                {"matrix": [3, 10], "x": 10.4167, "y": 4},
-                {"matrix": [3, 11], "x": 11.4167, "y": 4},
-                {"matrix": [3, 12], "x": 12.4167, "y": 4},
-                {"matrix": [3, 13], "x": 13.4167, "y": 4},
-                {"matrix": [3, 15], "x": 14.4167, "y": 4},
-
-                {"matrix": [3, 16], "x": 18.1667, "y": 4},
-                {"matrix": [3, 17], "x": 19.1667, "y": 4},
-                {"matrix": [3, 18], "x": 20.1667, "y": 4},
-
-                {"matrix": [3, 19], "x": 21.6667, "y": 4},
-                {"matrix": [3, 20], "x": 22.6667, "y": 4},
-                {"matrix": [3, 21], "x": 23.6667, "y": 4},
-                {"matrix": [3, 22], "x": 24.6667, "y": 4},
-
-                {"matrix": [4, 0], "x": 0, "y": 5},
-                {"matrix": [4, 1], "x": 1, "y": 5},
-
-                {"matrix": [4, 2], "x": 2.6667, "y": 5, "w": 2.25},
-                {"matrix": [4, 4], "x": 4.9167, "y": 5},
-                {"matrix": [4, 5], "x": 5.9167, "y": 5},
-                {"matrix": [4, 6], "x": 6.9167, "y": 5},
-                {"matrix": [4, 7], "x": 7.9167, "y": 5},
-                {"matrix": [4, 8], "x": 8.9167, "y": 5},
-                {"matrix": [4, 9], "x": 9.9167, "y": 5},
-                {"matrix": [4, 10], "x": 10.9167, "y": 5},
-                {"matrix": [4, 11], "x": 11.9167, "y": 5},
-                {"matrix": [4, 12], "x": 12.9167, "y": 5},
-                {"matrix": [4, 13], "x": 13.9167, "y": 5},
-                {"matrix": [4, 14], "x": 14.9167, "y": 5, "w": 1.75},
-                {"matrix": [4, 15], "x": 16.6667, "y": 5},
-
-                {"matrix": [4, 16], "x": 18.1667, "y": 5},
-                {"matrix": [4, 17], "x": 19.1667, "y": 5},
-                {"matrix": [4, 18], "x": 20.1667, "y": 5},
-
-                {"matrix": [4, 19], "x": 21.6667, "y": 5},
-                {"matrix": [4, 20], "x": 22.6667, "y": 5},
-                {"matrix": [4, 21], "x": 23.6667, "y": 5},
-                {"matrix": [4, 22], "x": 24.6667, "y": 5, "h": 2},
-
-                {"matrix": [5, 0], "x": 0, "y": 6},
-                {"matrix": [5, 1], "x": 1, "y": 6},
-
-                {"matrix": [5, 2], "x": 2.6667, "y": 6, "w": 1.5},
-                {"matrix": [5, 3], "x": 4.1667, "y": 6},
-                {"matrix": [5, 4], "x": 5.1667, "y": 6, "w": 1.5},
-                {"matrix": [5, 9], "x": 6.6667, "y": 6, "w": 7},
-                {"matrix": [5, 12], "x": 13.6667, "y": 6, "w": 1.5},
-                {"matrix": [5, 13], "x": 15.1667, "y": 6},
-                {"matrix": [5, 15], "x": 16.1667, "y": 6, "w": 1.5},
-
-                {"matrix": [5, 16], "x": 18.1667, "y": 6, "w": 1.5},
-                {"matrix": [5, 18], "x": 19.6667, "y": 6, "w": 1.5},
-
-                {"matrix": [5, 19], "x": 21.6667, "y": 6, "w": 2},
-                {"matrix": [5, 21], "x": 23.6667, "y": 6}
-            ]
-        },
-        "LAYOUT_102_rev1": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-
-                {"matrix": [0, 16], "x": 18.1667, "y": 0},
-                {"matrix": [0, 17], "x": 19.1667, "y": 0},
-                {"matrix": [0, 18], "x": 20.1667, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 2},
-                {"matrix": [1, 1], "x": 1, "y": 2},
-
-                {"matrix": [1, 2], "x": 2.6667, "y": 2},
-                {"matrix": [1, 3], "x": 3.6667, "y": 2},
-                {"matrix": [1, 4], "x": 4.6667, "y": 2},
-                {"matrix": [1, 5], "x": 5.6667, "y": 2},
-                {"matrix": [1, 6], "x": 6.6667, "y": 2},
-                {"matrix": [1, 7], "x": 7.6667, "y": 2},
-                {"matrix": [1, 8], "x": 8.6667, "y": 2},
-                {"matrix": [1, 9], "x": 9.6667, "y": 2},
-                {"matrix": [1, 10], "x": 10.6667, "y": 2},
-                {"matrix": [1, 11], "x": 11.6667, "y": 2},
-                {"matrix": [1, 12], "x": 12.6667, "y": 2},
-                {"matrix": [1, 13], "x": 13.6667, "y": 2},
-                {"matrix": [1, 14], "x": 14.6667, "y": 2},
-                {"matrix": [1, 15], "x": 15.6667, "y": 2, "w": 2},
-
-                {"matrix": [1, 16], "x": 18.1667, "y": 2},
-                {"matrix": [1, 17], "x": 19.1667, "y": 2},
-                {"matrix": [1, 18], "x": 20.1667, "y": 2},
-
-                {"matrix": [1, 19], "x": 21.6667, "y": 2},
-                {"matrix": [1, 20], "x": 22.6667, "y": 2},
-                {"matrix": [1, 21], "x": 23.6667, "y": 2},
-                {"matrix": [1, 22], "x": 24.6667, "y": 2},
-
-                {"matrix": [2, 0], "x": 0, "y": 3},
-                {"matrix": [2, 1], "x": 1, "y": 3},
-
-                {"matrix": [2, 2], "x": 2.6667, "y": 3, "w": 1.5},
-                {"matrix": [2, 3], "x": 4.1667, "y": 3},
-                {"matrix": [2, 4], "x": 5.1667, "y": 3},
-                {"matrix": [2, 5], "x": 6.1667, "y": 3},
-                {"matrix": [2, 6], "x": 7.1667, "y": 3},
-                {"matrix": [2, 7], "x": 8.1667, "y": 3},
-                {"matrix": [2, 8], "x": 9.1667, "y": 3},
-                {"matrix": [2, 9], "x": 10.1667, "y": 3},
-                {"matrix": [2, 10], "x": 11.1667, "y": 3},
-                {"matrix": [2, 11], "x": 12.1667, "y": 3},
-                {"matrix": [2, 12], "x": 13.1667, "y": 3},
-                {"matrix": [2, 13], "x": 14.1667, "y": 3},
-                {"matrix": [2, 14], "x": 15.1667, "y": 3},
-                {"matrix": [2, 16], "x": 16.1667, "y": 3, "w": 1.5, "h": 2},
-
-                {"matrix": [2, 17], "x": 18.1667, "y": 3},
-                {"matrix": [2, 18], "x": 19.1667, "y": 3},
-                {"matrix": [2, 19], "x": 20.1667, "y": 3},
-
-                {"matrix": [2, 20], "x": 21.6667, "y": 3},
-                {"matrix": [2, 21], "x": 22.6667, "y": 3},
-                {"matrix": [2, 22], "x": 23.6667, "y": 3},
-                {"matrix": [3, 0], "x": 24.6667, "y": 3},
-
-                {"matrix": [3, 1], "x": 0, "y": 4},
-                {"matrix": [3, 2], "x": 1, "y": 4},
-
-                {"matrix": [3, 3], "x": 2.6667, "y": 4, "w": 1.75},
-                {"matrix": [3, 4], "x": 4.4167, "y": 4},
-                {"matrix": [3, 5], "x": 5.4167, "y": 4},
-                {"matrix": [3, 6], "x": 6.4167, "y": 4},
-                {"matrix": [3, 7], "x": 7.4167, "y": 4},
-                {"matrix": [3, 8], "x": 8.4167, "y": 4},
-                {"matrix": [3, 9], "x": 9.4167, "y": 4},
-                {"matrix": [3, 10], "x": 10.4167, "y": 4},
-                {"matrix": [3, 11], "x": 11.4167, "y": 4},
-                {"matrix": [3, 12], "x": 12.4167, "y": 4},
-                {"matrix": [3, 13], "x": 13.4167, "y": 4},
-                {"matrix": [3, 15], "x": 14.4167, "y": 4},
-
-                {"matrix": [3, 19], "x": 21.6667, "y": 4},
-                {"matrix": [3, 20], "x": 22.6667, "y": 4},
-                {"matrix": [3, 21], "x": 23.6667, "y": 4},
-                {"matrix": [3, 22], "x": 24.6667, "y": 4},
-
-                {"matrix": [4, 0], "x": 0, "y": 5},
-                {"matrix": [4, 1], "x": 1, "y": 5},
-
-                {"matrix": [4, 2], "x": 2.6667, "y": 5, "w": 2.25},
-                {"matrix": [4, 4], "x": 4.9167, "y": 5},
-                {"matrix": [4, 5], "x": 5.9167, "y": 5},
-                {"matrix": [4, 6], "x": 6.9167, "y": 5},
-                {"matrix": [4, 7], "x": 7.9167, "y": 5},
-                {"matrix": [4, 8], "x": 8.9167, "y": 5},
-                {"matrix": [4, 9], "x": 9.9167, "y": 5},
-                {"matrix": [4, 10], "x": 10.9167, "y": 5},
-                {"matrix": [4, 11], "x": 11.9167, "y": 5},
-                {"matrix": [4, 12], "x": 12.9167, "y": 5},
-                {"matrix": [4, 13], "x": 13.9167, "y": 5},
-                {"matrix": [4, 14], "x": 14.9167, "y": 5, "w": 1.75},
-                {"matrix": [4, 15], "x": 16.6667, "y": 5},
-
-                {"matrix": [4, 17], "x": 19.1667, "y": 5},
-
-                {"matrix": [4, 19], "x": 21.6667, "y": 5},
-                {"matrix": [4, 20], "x": 22.6667, "y": 5},
-                {"matrix": [4, 21], "x": 23.6667, "y": 5},
-                {"matrix": [4, 22], "x": 24.6667, "y": 5, "h": 2},
-
-                {"matrix": [5, 0], "x": 0, "y": 6},
-                {"matrix": [5, 1], "x": 1, "y": 6},
-
-                {"matrix": [5, 2], "x": 2.6667, "y": 6, "w": 1.5},
-                {"matrix": [5, 3], "x": 4.1667, "y": 6},
-                {"matrix": [5, 4], "x": 5.1667, "y": 6, "w": 1.5},
-                {"matrix": [5, 9], "x": 6.6667, "y": 6, "w": 7},
-                {"matrix": [5, 12], "x": 13.6667, "y": 6, "w": 1.5},
-                {"matrix": [5, 13], "x": 15.1667, "y": 6},
-                {"matrix": [5, 15], "x": 16.1667, "y": 6, "w": 1.5},
-
-                {"matrix": [5, 16], "x": 18.1667, "y": 6},
-                {"matrix": [5, 17], "x": 19.1667, "y": 6},
-                {"matrix": [5, 18], "x": 20.1667, "y": 6},
-
-                {"matrix": [5, 19], "x": 21.6667, "y": 6, "w": 2},
-                {"matrix": [5, 21], "x": 23.6667, "y": 6}
-            ]
-        },
-        "LAYOUT_102_rev3": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-
-                {"matrix": [0, 2], "x": 2.6667, "y": 0},
-
-                {"matrix": [0, 16], "x": 18.1667, "y": 0},
-                {"matrix": [0, 17], "x": 19.1667, "y": 0},
-                {"matrix": [0, 18], "x": 20.1667, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 2},
-                {"matrix": [1, 1], "x": 1, "y": 2},
-
-                {"matrix": [1, 2], "x": 2.6667, "y": 2},
-                {"matrix": [1, 3], "x": 3.6667, "y": 2},
-                {"matrix": [1, 4], "x": 4.6667, "y": 2},
-                {"matrix": [1, 5], "x": 5.6667, "y": 2},
-                {"matrix": [1, 6], "x": 6.6667, "y": 2},
-                {"matrix": [1, 7], "x": 7.6667, "y": 2},
-                {"matrix": [1, 8], "x": 8.6667, "y": 2},
-                {"matrix": [1, 9], "x": 9.6667, "y": 2},
-                {"matrix": [1, 10], "x": 10.6667, "y": 2},
-                {"matrix": [1, 11], "x": 11.6667, "y": 2},
-                {"matrix": [1, 12], "x": 12.6667, "y": 2},
-                {"matrix": [1, 13], "x": 13.6667, "y": 2},
-                {"matrix": [1, 14], "x": 14.6667, "y": 2},
-                {"matrix": [1, 15], "x": 15.6667, "y": 2, "w": 2},
-
-                {"matrix": [1, 16], "x": 18.1667, "y": 2},
-                {"matrix": [1, 17], "x": 19.1667, "y": 2},
-                {"matrix": [1, 18], "x": 20.1667, "y": 2},
-
-                {"matrix": [1, 19], "x": 21.6667, "y": 2},
-                {"matrix": [1, 20], "x": 22.6667, "y": 2},
-                {"matrix": [1, 21], "x": 23.6667, "y": 2},
-                {"matrix": [1, 22], "x": 24.6667, "y": 2},
-
-                {"matrix": [2, 0], "x": 0, "y": 3},
-                {"matrix": [2, 1], "x": 1, "y": 3},
-
-                {"matrix": [2, 2], "x": 2.6667, "y": 3, "w": 1.5},
-                {"matrix": [2, 3], "x": 4.1667, "y": 3},
-                {"matrix": [2, 4], "x": 5.1667, "y": 3},
-                {"matrix": [2, 5], "x": 6.1667, "y": 3},
-                {"matrix": [2, 6], "x": 7.1667, "y": 3},
-                {"matrix": [2, 7], "x": 8.1667, "y": 3},
-                {"matrix": [2, 8], "x": 9.1667, "y": 3},
-                {"matrix": [2, 9], "x": 10.1667, "y": 3},
-                {"matrix": [2, 10], "x": 11.1667, "y": 3},
-                {"matrix": [2, 11], "x": 12.1667, "y": 3},
-                {"matrix": [2, 12], "x": 13.1667, "y": 3},
-                {"matrix": [2, 13], "x": 14.1667, "y": 3},
-                {"matrix": [2, 14], "x": 15.1667, "y": 3},
-                {"matrix": [2, 16], "x": 16.1667, "y": 3, "w": 1.5, "h": 2},
-
-                {"matrix": [2, 17], "x": 18.1667, "y": 3},
-                {"matrix": [2, 18], "x": 19.1667, "y": 3},
-                {"matrix": [2, 19], "x": 20.1667, "y": 3},
-
-                {"matrix": [2, 20], "x": 21.6667, "y": 3},
-                {"matrix": [2, 21], "x": 22.6667, "y": 3},
-                {"matrix": [2, 22], "x": 23.6667, "y": 3},
-                {"matrix": [3, 0], "x": 24.6667, "y": 3},
-
-                {"matrix": [3, 1], "x": 0, "y": 4},
-                {"matrix": [3, 2], "x": 1, "y": 4},
-
-                {"matrix": [3, 3], "x": 2.6667, "y": 4, "w": 1.75},
-                {"matrix": [3, 4], "x": 4.4167, "y": 4},
-                {"matrix": [3, 5], "x": 5.4167, "y": 4},
-                {"matrix": [3, 6], "x": 6.4167, "y": 4},
-                {"matrix": [3, 7], "x": 7.4167, "y": 4},
-                {"matrix": [3, 8], "x": 8.4167, "y": 4},
-                {"matrix": [3, 9], "x": 9.4167, "y": 4},
-                {"matrix": [3, 10], "x": 10.4167, "y": 4},
-                {"matrix": [3, 11], "x": 11.4167, "y": 4},
-                {"matrix": [3, 12], "x": 12.4167, "y": 4},
-                {"matrix": [3, 13], "x": 13.4167, "y": 4},
-                {"matrix": [3, 15], "x": 14.4167, "y": 4},
-
-                {"matrix": [3, 19], "x": 21.6667, "y": 4},
-                {"matrix": [3, 20], "x": 22.6667, "y": 4},
-                {"matrix": [3, 21], "x": 23.6667, "y": 4},
-                {"matrix": [3, 22], "x": 24.6667, "y": 4},
-
-                {"matrix": [4, 0], "x": 0, "y": 5},
-                {"matrix": [4, 1], "x": 1, "y": 5},
-
-                {"matrix": [4, 2], "x": 2.6667, "y": 5, "w": 2.25},
-                {"matrix": [4, 4], "x": 4.9167, "y": 5},
-                {"matrix": [4, 5], "x": 5.9167, "y": 5},
-                {"matrix": [4, 6], "x": 6.9167, "y": 5},
-                {"matrix": [4, 7], "x": 7.9167, "y": 5},
-                {"matrix": [4, 8], "x": 8.9167, "y": 5},
-                {"matrix": [4, 9], "x": 9.9167, "y": 5},
-                {"matrix": [4, 10], "x": 10.9167, "y": 5},
-                {"matrix": [4, 11], "x": 11.9167, "y": 5},
-                {"matrix": [4, 12], "x": 12.9167, "y": 5},
-                {"matrix": [4, 13], "x": 13.9167, "y": 5},
-                {"matrix": [4, 14], "x": 14.9167, "y": 5, "w": 1.75},
-                {"matrix": [4, 15], "x": 16.6667, "y": 5},
-
-                {"matrix": [4, 17], "x": 19.1667, "y": 5},
-
-                {"matrix": [4, 19], "x": 21.6667, "y": 5},
-                {"matrix": [4, 20], "x": 22.6667, "y": 5},
-                {"matrix": [4, 21], "x": 23.6667, "y": 5},
-                {"matrix": [4, 22], "x": 24.6667, "y": 5, "h": 2},
-
-                {"matrix": [5, 0], "x": 0, "y": 6},
-                {"matrix": [5, 1], "x": 1, "y": 6},
-
-                {"matrix": [5, 2], "x": 2.6667, "y": 6, "w": 1.5},
-                {"matrix": [5, 3], "x": 4.1667, "y": 6},
-                {"matrix": [5, 4], "x": 5.1667, "y": 6, "w": 1.5},
-                {"matrix": [5, 9], "x": 6.6667, "y": 6, "w": 7},
-                {"matrix": [5, 12], "x": 13.6667, "y": 6, "w": 1.5},
-                {"matrix": [5, 13], "x": 15.1667, "y": 6},
-                {"matrix": [5, 15], "x": 16.1667, "y": 6, "w": 1.5},
-
-                {"matrix": [5, 16], "x": 18.1667, "y": 6},
-                {"matrix": [5, 17], "x": 19.1667, "y": 6},
-                {"matrix": [5, 18], "x": 20.1667, "y": 6},
-
-                {"matrix": [5, 19], "x": 21.6667, "y": 6, "w": 2},
-                {"matrix": [5, 21], "x": 23.6667, "y": 6}
-            ]
-        }
-    }
-}
diff --git a/keyboards/omnikeyish/keyboard.json b/keyboards/omnikeyish/keyboard.json
new file mode 100644
index 00000000000..cd61f2954bb
--- /dev/null
+++ b/keyboards/omnikeyish/keyboard.json
@@ -0,0 +1,1274 @@
+{
+    "keyboard_name": "Omnikey-(ish)",
+    "manufacturer": "Henrik O. S\u00f8rensen",
+    "url": "https://github.com/henrikosorensen/keyboard_pcbs/tree/master/omnikeyish_pcb",
+    "maintainer": "qmk",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0x0666",
+        "device_version": "13.3.7",
+        "force_nkro": true
+    },
+    "features": {
+        "bootmagic": true,
+        "command": true,
+        "console": true,
+        "extrakey": true,
+        "mousekey": false,
+        "nkro": true
+    },
+    "indicators": {
+        "caps_lock": "E1",
+        "num_lock": "E0",
+        "scroll_lock": "B7"
+    },
+    "processor": "at90usb1286",
+    "bootloader": "halfkay",
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+
+                {"matrix": [0, 2], "x": 2.6667, "y": 0},
+
+                {"matrix": [0, 4], "x": 4.6667, "y": 0},
+                {"matrix": [0, 5], "x": 5.6667, "y": 0},
+                {"matrix": [0, 6], "x": 6.6667, "y": 0},
+                {"matrix": [0, 7], "x": 7.6667, "y": 0},
+
+                {"matrix": [0, 8], "x": 9.1667, "y": 0},
+                {"matrix": [0, 9], "x": 10.1667, "y": 0},
+                {"matrix": [0, 10], "x": 11.1667, "y": 0},
+                {"matrix": [0, 11], "x": 12.1667, "y": 0},
+
+                {"matrix": [0, 12], "x": 13.6667, "y": 0},
+                {"matrix": [0, 13], "x": 14.6667, "y": 0},
+                {"matrix": [0, 14], "x": 15.6667, "y": 0},
+                {"matrix": [0, 15], "x": 16.6667, "y": 0},
+
+                {"matrix": [0, 16], "x": 18.1667, "y": 0},
+                {"matrix": [0, 17], "x": 19.1667, "y": 0},
+                {"matrix": [0, 18], "x": 20.1667, "y": 0},
+
+                {"matrix": [0, 19], "x": 21.6667, "y": 0},
+                {"matrix": [0, 20], "x": 22.6667, "y": 0},
+                {"matrix": [0, 21], "x": 23.6667, "y": 0},
+                {"matrix": [0, 22], "x": 24.6667, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 2},
+                {"matrix": [1, 1], "x": 1, "y": 2},
+
+                {"matrix": [1, 2], "x": 2.6667, "y": 2},
+                {"matrix": [1, 3], "x": 3.6667, "y": 2},
+                {"matrix": [1, 4], "x": 4.6667, "y": 2},
+                {"matrix": [1, 5], "x": 5.6667, "y": 2},
+                {"matrix": [1, 6], "x": 6.6667, "y": 2},
+                {"matrix": [1, 7], "x": 7.6667, "y": 2},
+                {"matrix": [1, 8], "x": 8.6667, "y": 2},
+                {"matrix": [1, 9], "x": 9.6667, "y": 2},
+                {"matrix": [1, 10], "x": 10.6667, "y": 2},
+                {"matrix": [1, 11], "x": 11.6667, "y": 2},
+                {"matrix": [1, 12], "x": 12.6667, "y": 2},
+                {"matrix": [1, 13], "x": 13.6667, "y": 2},
+                {"matrix": [1, 14], "x": 14.6667, "y": 2},
+                {"matrix": [1, 15], "x": 15.6667, "y": 2, "w": 2},
+
+                {"matrix": [1, 16], "x": 18.1667, "y": 2},
+                {"matrix": [1, 17], "x": 19.1667, "y": 2},
+                {"matrix": [1, 18], "x": 20.1667, "y": 2},
+
+                {"matrix": [1, 19], "x": 21.6667, "y": 2},
+                {"matrix": [1, 20], "x": 22.6667, "y": 2},
+                {"matrix": [1, 21], "x": 23.6667, "y": 2},
+                {"matrix": [1, 22], "x": 24.6667, "y": 2},
+
+                {"matrix": [2, 0], "x": 0, "y": 3},
+                {"matrix": [2, 1], "x": 1, "y": 3},
+
+                {"matrix": [2, 2], "x": 2.6667, "y": 3, "w": 1.5},
+                {"matrix": [2, 3], "x": 4.1667, "y": 3},
+                {"matrix": [2, 4], "x": 5.1667, "y": 3},
+                {"matrix": [2, 5], "x": 6.1667, "y": 3},
+                {"matrix": [2, 6], "x": 7.1667, "y": 3},
+                {"matrix": [2, 7], "x": 8.1667, "y": 3},
+                {"matrix": [2, 8], "x": 9.1667, "y": 3},
+                {"matrix": [2, 9], "x": 10.1667, "y": 3},
+                {"matrix": [2, 10], "x": 11.1667, "y": 3},
+                {"matrix": [2, 11], "x": 12.1667, "y": 3},
+                {"matrix": [2, 12], "x": 13.1667, "y": 3},
+                {"matrix": [2, 13], "x": 14.1667, "y": 3},
+                {"matrix": [2, 14], "x": 15.1667, "y": 3},
+                {"matrix": [2, 15], "x": 16.1667, "y": 3, "w": 1.5},
+
+                {"matrix": [2, 16], "x": 18.1667, "y": 3},
+                {"matrix": [2, 17], "x": 19.1667, "y": 3},
+                {"matrix": [2, 18], "x": 20.1667, "y": 3},
+
+                {"matrix": [2, 19], "x": 21.6667, "y": 3},
+                {"matrix": [2, 20], "x": 22.6667, "y": 3},
+                {"matrix": [2, 21], "x": 23.6667, "y": 3},
+                {"matrix": [2, 22], "x": 24.6667, "y": 3},
+
+                {"matrix": [3, 0], "x": 0, "y": 4},
+                {"matrix": [3, 1], "x": 1, "y": 4},
+
+                {"matrix": [3, 2], "x": 2.6667, "y": 4, "w": 1.75},
+                {"matrix": [3, 3], "x": 4.4167, "y": 4},
+                {"matrix": [3, 4], "x": 5.4167, "y": 4},
+                {"matrix": [3, 5], "x": 6.4167, "y": 4},
+                {"matrix": [3, 6], "x": 7.4167, "y": 4},
+                {"matrix": [3, 7], "x": 8.4167, "y": 4},
+                {"matrix": [3, 8], "x": 9.4167, "y": 4},
+                {"matrix": [3, 9], "x": 10.4167, "y": 4},
+                {"matrix": [3, 10], "x": 11.4167, "y": 4},
+                {"matrix": [3, 11], "x": 12.4167, "y": 4},
+                {"matrix": [3, 12], "x": 13.4167, "y": 4},
+                {"matrix": [3, 13], "x": 14.4167, "y": 4},
+                {"matrix": [3, 14], "x": 15.4167, "y": 4},
+                {"matrix": [3, 15], "x": 16.4167, "y": 4, "w": 1.25},
+
+                {"matrix": [3, 16], "x": 18.1667, "y": 4},
+                {"matrix": [3, 17], "x": 19.1667, "y": 4},
+                {"matrix": [3, 18], "x": 20.1667, "y": 4},
+
+                {"matrix": [3, 19], "x": 21.6667, "y": 4},
+                {"matrix": [3, 20], "x": 22.6667, "y": 4},
+                {"matrix": [3, 21], "x": 23.6667, "y": 4},
+                {"matrix": [3, 22], "x": 24.6667, "y": 4},
+
+                {"matrix": [4, 0], "x": 0, "y": 5},
+                {"matrix": [4, 1], "x": 1, "y": 5},
+
+                {"matrix": [4, 2], "x": 2.6667, "y": 5, "w": 1.25},
+                {"matrix": [4, 3], "x": 3.9167, "y": 5},
+                {"matrix": [4, 4], "x": 4.9167, "y": 5},
+                {"matrix": [4, 5], "x": 5.9167, "y": 5},
+                {"matrix": [4, 6], "x": 6.9167, "y": 5},
+                {"matrix": [4, 7], "x": 7.9167, "y": 5},
+                {"matrix": [4, 8], "x": 8.9167, "y": 5},
+                {"matrix": [4, 9], "x": 9.9167, "y": 5},
+                {"matrix": [4, 10], "x": 10.9167, "y": 5},
+                {"matrix": [4, 11], "x": 11.9167, "y": 5},
+                {"matrix": [4, 12], "x": 12.9167, "y": 5},
+                {"matrix": [4, 13], "x": 13.9167, "y": 5},
+                {"matrix": [4, 14], "x": 14.9167, "y": 5, "w": 1.75},
+
+                {"matrix": [4, 15], "x": 16.6667, "y": 5},
+
+                {"matrix": [4, 16], "x": 18.1667, "y": 5},
+                {"matrix": [4, 17], "x": 19.1667, "y": 5},
+                {"matrix": [4, 18], "x": 20.1667, "y": 5},
+
+                {"matrix": [4, 19], "x": 21.6667, "y": 5},
+                {"matrix": [4, 20], "x": 22.6667, "y": 5},
+                {"matrix": [4, 21], "x": 23.6667, "y": 5},
+                {"matrix": [4, 22], "x": 24.6667, "y": 5, "h": 2},
+
+                {"matrix": [5, 0], "x": 0, "y": 6},
+                {"matrix": [5, 1], "x": 1, "y": 6},
+
+                {"matrix": [5, 2], "x": 2.6667, "y": 6, "w": 1.25},
+                {"matrix": [5, 3], "x": 3.9167, "y": 6, "w": 1.25},
+                {"matrix": [5, 4], "x": 5.1667, "y": 6, "w": 1.25},
+                {"matrix": [5, 9], "x": 6.4167, "y": 6, "w": 6.25},
+                {"matrix": [5, 12], "x": 12.6667, "y": 6, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.9167, "y": 6, "w": 1.25},
+                {"matrix": [5, 14], "x": 15.1667, "y": 6, "w": 1.25},
+                {"matrix": [5, 15], "x": 16.4167, "y": 6, "w": 1.25},
+
+                {"matrix": [5, 16], "x": 18.1667, "y": 6},
+                {"matrix": [5, 17], "x": 19.1667, "y": 6},
+                {"matrix": [5, 18], "x": 20.1667, "y": 6},
+
+                {"matrix": [5, 19], "x": 21.6667, "y": 6, "w": 2},
+                {"matrix": [5, 21], "x": 23.6667, "y": 6}
+            ]
+        },
+        "LAYOUT_101": {
+            "layout": [
+                {"matrix": [0, 2], "x": 0, "y": 0},
+
+                {"matrix": [0, 4], "x": 2, "y": 0},
+                {"matrix": [0, 5], "x": 3, "y": 0},
+                {"matrix": [0, 6], "x": 4, "y": 0},
+                {"matrix": [0, 7], "x": 5, "y": 0},
+
+                {"matrix": [0, 8], "x": 6.5, "y": 0},
+                {"matrix": [0, 9], "x": 7.5, "y": 0},
+                {"matrix": [0, 10], "x": 8.5, "y": 0},
+                {"matrix": [0, 11], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 12], "x": 11, "y": 0},
+                {"matrix": [0, 13], "x": 12, "y": 0},
+                {"matrix": [0, 14], "x": 13, "y": 0},
+                {"matrix": [0, 15], "x": 14, "y": 0},
+
+                {"matrix": [0, 16], "x": 15.25, "y": 0},
+                {"matrix": [0, 17], "x": 16.25, "y": 0},
+                {"matrix": [0, 18], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 2], "x": 0, "y": 1.5},
+                {"matrix": [1, 3], "x": 1, "y": 1.5},
+                {"matrix": [1, 4], "x": 2, "y": 1.5},
+                {"matrix": [1, 5], "x": 3, "y": 1.5},
+                {"matrix": [1, 6], "x": 4, "y": 1.5},
+                {"matrix": [1, 7], "x": 5, "y": 1.5},
+                {"matrix": [1, 8], "x": 6, "y": 1.5},
+                {"matrix": [1, 9], "x": 7, "y": 1.5},
+                {"matrix": [1, 10], "x": 8, "y": 1.5},
+                {"matrix": [1, 11], "x": 9, "y": 1.5},
+                {"matrix": [1, 12], "x": 10, "y": 1.5},
+                {"matrix": [1, 13], "x": 11, "y": 1.5},
+                {"matrix": [1, 14], "x": 12, "y": 1.5},
+                {"matrix": [1, 15], "x": 13, "y": 1.5, "w": 2},
+
+                {"matrix": [1, 16], "x": 15.25, "y": 1.5},
+                {"matrix": [1, 17], "x": 16.25, "y": 1.5},
+                {"matrix": [1, 18], "x": 17.25, "y": 1.5},
+
+                {"matrix": [1, 19], "x": 18.5, "y": 1.5},
+                {"matrix": [1, 20], "x": 19.5, "y": 1.5},
+                {"matrix": [1, 21], "x": 20.5, "y": 1.5},
+                {"matrix": [1, 22], "x": 21.5, "y": 1.5},
+
+                {"matrix": [2, 2], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 3], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 4], "x": 2.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 4.5, "y": 2.5},
+                {"matrix": [2, 7], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 8], "x": 6.5, "y": 2.5},
+                {"matrix": [2, 9], "x": 7.5, "y": 2.5},
+                {"matrix": [2, 10], "x": 8.5, "y": 2.5},
+                {"matrix": [2, 11], "x": 9.5, "y": 2.5},
+                {"matrix": [2, 12], "x": 10.5, "y": 2.5},
+                {"matrix": [2, 13], "x": 11.5, "y": 2.5},
+                {"matrix": [2, 14], "x": 12.5, "y": 2.5},
+                {"matrix": [2, 15], "x": 13.5, "y": 2.5, "w": 1.5},
+
+                {"matrix": [2, 16], "x": 15.25, "y": 2.5},
+                {"matrix": [2, 17], "x": 16.25, "y": 2.5},
+                {"matrix": [2, 18], "x": 17.25, "y": 2.5},
+
+                {"matrix": [2, 19], "x": 18.5, "y": 2.5},
+                {"matrix": [2, 20], "x": 19.5, "y": 2.5},
+                {"matrix": [2, 21], "x": 20.5, "y": 2.5},
+                {"matrix": [2, 22], "x": 21.5, "y": 2.5, "h": 2},
+
+                {"matrix": [3, 2], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 3], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 6], "x": 4.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 5.75, "y": 3.5},
+                {"matrix": [3, 8], "x": 6.75, "y": 3.5},
+                {"matrix": [3, 9], "x": 7.75, "y": 3.5},
+                {"matrix": [3, 10], "x": 8.75, "y": 3.5},
+                {"matrix": [3, 11], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 12], "x": 10.75, "y": 3.5},
+                {"matrix": [3, 13], "x": 11.75, "y": 3.5},
+                {"matrix": [3, 15], "x": 12.75, "y": 3.5, "w": 2.25},
+
+                {"matrix": [3, 19], "x": 18.5, "y": 3.5},
+                {"matrix": [3, 20], "x": 19.5, "y": 3.5},
+                {"matrix": [3, 21], "x": 20.5, "y": 3.5},
+
+                {"matrix": [4, 2], "x": 0, "y": 4.5, "w": 2.25},
+                {"matrix": [4, 4], "x": 2.25, "y": 4.5},
+                {"matrix": [4, 5], "x": 3.25, "y": 4.5},
+                {"matrix": [4, 6], "x": 4.25, "y": 4.5},
+                {"matrix": [4, 7], "x": 5.25, "y": 4.5},
+                {"matrix": [4, 8], "x": 6.25, "y": 4.5},
+                {"matrix": [4, 9], "x": 7.25, "y": 4.5},
+                {"matrix": [4, 10], "x": 8.25, "y": 4.5},
+                {"matrix": [4, 11], "x": 9.25, "y": 4.5},
+                {"matrix": [4, 12], "x": 10.25, "y": 4.5},
+                {"matrix": [4, 13], "x": 11.25, "y": 4.5},
+                {"matrix": [4, 14], "x": 12.25, "y": 4.5, "w": 2.75},
+
+                {"matrix": [4, 17], "x": 16.25, "y": 4.5},
+
+                {"matrix": [4, 19], "x": 18.5, "y": 4.5},
+                {"matrix": [4, 20], "x": 19.5, "y": 4.5},
+                {"matrix": [4, 21], "x": 20.5, "y": 4.5},
+                {"matrix": [4, 22], "x": 21.5, "y": 4.5, "h": 2},
+
+                {"matrix": [5, 2], "x": 0, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 4], "x": 2.5, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 9], "x": 4, "y": 5.5, "w": 7},
+                {"matrix": [5, 12], "x": 11, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 15], "x": 13.5, "y": 5.5, "w": 1.5},
+
+                {"matrix": [5, 16], "x": 15.25, "y": 5.5},
+                {"matrix": [5, 17], "x": 16.25, "y": 5.5},
+                {"matrix": [5, 18], "x": 17.25, "y": 5.5},
+
+                {"matrix": [5, 19], "x": 18.5, "y": 5.5, "w": 2},
+                {"matrix": [5, 21], "x": 20.5, "y": 5.5}
+            ]
+        },
+        "LAYOUT_ultra_t": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+
+                {"matrix": [0, 2], "x": 2.6667, "y": 0},
+
+                {"matrix": [0, 4], "x": 4.6667, "y": 0},
+                {"matrix": [0, 5], "x": 5.6667, "y": 0},
+                {"matrix": [0, 6], "x": 6.6667, "y": 0},
+                {"matrix": [0, 7], "x": 7.6667, "y": 0},
+
+                {"matrix": [0, 8], "x": 9.1667, "y": 0},
+                {"matrix": [0, 9], "x": 10.1667, "y": 0},
+                {"matrix": [0, 10], "x": 11.1667, "y": 0},
+                {"matrix": [0, 11], "x": 12.1667, "y": 0},
+
+                {"matrix": [0, 12], "x": 13.6667, "y": 0},
+                {"matrix": [0, 13], "x": 14.6667, "y": 0},
+                {"matrix": [0, 14], "x": 15.6667, "y": 0},
+                {"matrix": [0, 15], "x": 16.6667, "y": 0},
+
+                {"matrix": [0, 16], "x": 18.1667, "y": 0},
+                {"matrix": [0, 17], "x": 19.1667, "y": 0},
+                {"matrix": [0, 18], "x": 20.1667, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 2},
+                {"matrix": [1, 1], "x": 1, "y": 2},
+
+                {"matrix": [1, 2], "x": 2.6667, "y": 2},
+                {"matrix": [1, 3], "x": 3.6667, "y": 2},
+                {"matrix": [1, 4], "x": 4.6667, "y": 2},
+                {"matrix": [1, 5], "x": 5.6667, "y": 2},
+                {"matrix": [1, 6], "x": 6.6667, "y": 2},
+                {"matrix": [1, 7], "x": 7.6667, "y": 2},
+                {"matrix": [1, 8], "x": 8.6667, "y": 2},
+                {"matrix": [1, 9], "x": 9.6667, "y": 2},
+                {"matrix": [1, 10], "x": 10.6667, "y": 2},
+                {"matrix": [1, 11], "x": 11.6667, "y": 2},
+                {"matrix": [1, 12], "x": 12.6667, "y": 2},
+                {"matrix": [1, 13], "x": 13.6667, "y": 2},
+                {"matrix": [1, 14], "x": 14.6667, "y": 2},
+                {"matrix": [1, 15], "x": 15.6667, "y": 2, "w": 2},
+
+                {"matrix": [1, 16], "x": 18.1667, "y": 2},
+                {"matrix": [1, 17], "x": 19.1667, "y": 2},
+                {"matrix": [1, 18], "x": 20.1667, "y": 2},
+
+                {"matrix": [1, 19], "x": 21.6667, "y": 2},
+                {"matrix": [1, 20], "x": 22.6667, "y": 2},
+                {"matrix": [1, 21], "x": 23.6667, "y": 2},
+                {"matrix": [1, 22], "x": 24.6667, "y": 2},
+
+                {"matrix": [2, 0], "x": 0, "y": 3},
+                {"matrix": [2, 1], "x": 1, "y": 3},
+
+                {"matrix": [2, 2], "x": 2.6667, "y": 3, "w": 1.5},
+                {"matrix": [2, 3], "x": 4.1667, "y": 3},
+                {"matrix": [2, 4], "x": 5.1667, "y": 3},
+                {"matrix": [2, 5], "x": 6.1667, "y": 3},
+                {"matrix": [2, 6], "x": 7.1667, "y": 3},
+                {"matrix": [2, 7], "x": 8.1667, "y": 3},
+                {"matrix": [2, 8], "x": 9.1667, "y": 3},
+                {"matrix": [2, 9], "x": 10.1667, "y": 3},
+                {"matrix": [2, 10], "x": 11.1667, "y": 3},
+                {"matrix": [2, 11], "x": 12.1667, "y": 3},
+                {"matrix": [2, 12], "x": 13.1667, "y": 3},
+                {"matrix": [2, 13], "x": 14.1667, "y": 3},
+                {"matrix": [2, 14], "x": 15.1667, "y": 3},
+                {"matrix": [2, 16], "x": 16.1667, "y": 3, "w": 1.5, "h": 2},
+
+                {"matrix": [2, 17], "x": 18.1667, "y": 3},
+                {"matrix": [2, 18], "x": 19.1667, "y": 3},
+                {"matrix": [2, 19], "x": 20.1667, "y": 3},
+
+                {"matrix": [2, 20], "x": 21.6667, "y": 3},
+                {"matrix": [2, 21], "x": 22.6667, "y": 3},
+                {"matrix": [2, 22], "x": 23.6667, "y": 3},
+                {"matrix": [3, 0], "x": 24.6667, "y": 3},
+
+                {"matrix": [3, 1], "x": 0, "y": 4},
+                {"matrix": [3, 2], "x": 1, "y": 4},
+
+                {"matrix": [3, 3], "x": 2.6667, "y": 4, "w": 1.75},
+                {"matrix": [3, 4], "x": 4.4167, "y": 4},
+                {"matrix": [3, 5], "x": 5.4167, "y": 4},
+                {"matrix": [3, 6], "x": 6.4167, "y": 4},
+                {"matrix": [3, 7], "x": 7.4167, "y": 4},
+                {"matrix": [3, 8], "x": 8.4167, "y": 4},
+                {"matrix": [3, 9], "x": 9.4167, "y": 4},
+                {"matrix": [3, 10], "x": 10.4167, "y": 4},
+                {"matrix": [3, 11], "x": 11.4167, "y": 4},
+                {"matrix": [3, 12], "x": 12.4167, "y": 4},
+                {"matrix": [3, 13], "x": 13.4167, "y": 4},
+                {"matrix": [3, 15], "x": 14.4167, "y": 4},
+
+                {"matrix": [3, 19], "x": 21.6667, "y": 4},
+                {"matrix": [3, 20], "x": 22.6667, "y": 4},
+                {"matrix": [3, 21], "x": 23.6667, "y": 4},
+                {"matrix": [3, 22], "x": 24.6667, "y": 4},
+
+                {"matrix": [4, 0], "x": 0, "y": 5},
+                {"matrix": [4, 1], "x": 1, "y": 5},
+
+                {"matrix": [4, 2], "x": 2.6667, "y": 5, "w": 2.25},
+                {"matrix": [4, 4], "x": 4.9167, "y": 5},
+                {"matrix": [4, 5], "x": 5.9167, "y": 5},
+                {"matrix": [4, 6], "x": 6.9167, "y": 5},
+                {"matrix": [4, 7], "x": 7.9167, "y": 5},
+                {"matrix": [4, 8], "x": 8.9167, "y": 5},
+                {"matrix": [4, 9], "x": 9.9167, "y": 5},
+                {"matrix": [4, 10], "x": 10.9167, "y": 5},
+                {"matrix": [4, 11], "x": 11.9167, "y": 5},
+                {"matrix": [4, 12], "x": 12.9167, "y": 5},
+                {"matrix": [4, 13], "x": 13.9167, "y": 5},
+                {"matrix": [4, 14], "x": 14.9167, "y": 5, "w": 1.75},
+                {"matrix": [4, 15], "x": 16.6667, "y": 5},
+
+                {"matrix": [4, 17], "x": 19.1667, "y": 5},
+
+                {"matrix": [4, 19], "x": 21.6667, "y": 5},
+                {"matrix": [4, 20], "x": 22.6667, "y": 5},
+                {"matrix": [4, 21], "x": 23.6667, "y": 5},
+                {"matrix": [4, 22], "x": 24.6667, "y": 5, "h": 2},
+
+                {"matrix": [5, 0], "x": 0, "y": 6},
+                {"matrix": [5, 1], "x": 1, "y": 6},
+
+                {"matrix": [5, 2], "x": 2.6667, "y": 6, "w": 1.5},
+                {"matrix": [5, 3], "x": 4.1667, "y": 6},
+                {"matrix": [5, 4], "x": 5.1667, "y": 6, "w": 1.5},
+                {"matrix": [5, 9], "x": 6.6667, "y": 6, "w": 7},
+                {"matrix": [5, 12], "x": 13.6667, "y": 6, "w": 1.5},
+                {"matrix": [5, 13], "x": 15.1667, "y": 6},
+                {"matrix": [5, 15], "x": 16.1667, "y": 6, "w": 1.5},
+
+                {"matrix": [5, 16], "x": 18.1667, "y": 6},
+                {"matrix": [5, 17], "x": 19.1667, "y": 6},
+                {"matrix": [5, 18], "x": 20.1667, "y": 6},
+
+                {"matrix": [5, 19], "x": 21.6667, "y": 6, "w": 2},
+                {"matrix": [5, 21], "x": 23.6667, "y": 6}
+            ]
+        },
+        "LAYOUT_ultra_rev1": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+
+                {"matrix": [0, 4], "x": 2.6667, "y": 0},
+                {"matrix": [0, 5], "x": 3.6667, "y": 0},
+                {"matrix": [0, 6], "x": 4.6667, "y": 0},
+                {"matrix": [0, 7], "x": 5.6667, "y": 0},
+
+                {"matrix": [0, 8], "x": 8.1667, "y": 0},
+                {"matrix": [0, 9], "x": 9.1667, "y": 0},
+                {"matrix": [0, 10], "x": 10.1667, "y": 0},
+                {"matrix": [0, 11], "x": 11.1667, "y": 0},
+
+                {"matrix": [0, 12], "x": 13.6667, "y": 0},
+                {"matrix": [0, 13], "x": 14.6667, "y": 0},
+                {"matrix": [0, 14], "x": 15.6667, "y": 0},
+                {"matrix": [0, 15], "x": 16.6667, "y": 0},
+
+                {"matrix": [0, 16], "x": 18.1667, "y": 0},
+                {"matrix": [0, 17], "x": 19.1667, "y": 0},
+                {"matrix": [0, 18], "x": 20.1667, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 2},
+                {"matrix": [1, 1], "x": 1, "y": 2},
+
+                {"matrix": [1, 2], "x": 2.6667, "y": 2},
+                {"matrix": [1, 3], "x": 3.6667, "y": 2},
+                {"matrix": [1, 4], "x": 4.6667, "y": 2},
+                {"matrix": [1, 5], "x": 5.6667, "y": 2},
+                {"matrix": [1, 6], "x": 6.6667, "y": 2},
+                {"matrix": [1, 7], "x": 7.6667, "y": 2},
+                {"matrix": [1, 8], "x": 8.6667, "y": 2},
+                {"matrix": [1, 9], "x": 9.6667, "y": 2},
+                {"matrix": [1, 10], "x": 10.6667, "y": 2},
+                {"matrix": [1, 11], "x": 11.6667, "y": 2},
+                {"matrix": [1, 12], "x": 12.6667, "y": 2},
+                {"matrix": [1, 13], "x": 13.6667, "y": 2},
+                {"matrix": [1, 14], "x": 14.6667, "y": 2},
+                {"matrix": [1, 15], "x": 15.6667, "y": 2, "w": 2},
+
+                {"matrix": [1, 16], "x": 18.1667, "y": 2},
+                {"matrix": [1, 17], "x": 19.1667, "y": 2},
+                {"matrix": [1, 18], "x": 20.1667, "y": 2},
+
+                {"matrix": [1, 19], "x": 21.6667, "y": 2},
+                {"matrix": [1, 20], "x": 22.6667, "y": 2},
+                {"matrix": [1, 21], "x": 23.6667, "y": 2},
+                {"matrix": [1, 22], "x": 24.6667, "y": 2},
+
+                {"matrix": [2, 0], "x": 0, "y": 3},
+                {"matrix": [2, 1], "x": 1, "y": 3},
+
+                {"matrix": [2, 2], "x": 2.6667, "y": 3, "w": 1.5},
+                {"matrix": [2, 3], "x": 4.1667, "y": 3},
+                {"matrix": [2, 4], "x": 5.1667, "y": 3},
+                {"matrix": [2, 5], "x": 6.1667, "y": 3},
+                {"matrix": [2, 6], "x": 7.1667, "y": 3},
+                {"matrix": [2, 7], "x": 8.1667, "y": 3},
+                {"matrix": [2, 8], "x": 9.1667, "y": 3},
+                {"matrix": [2, 9], "x": 10.1667, "y": 3},
+                {"matrix": [2, 10], "x": 11.1667, "y": 3},
+                {"matrix": [2, 11], "x": 12.1667, "y": 3},
+                {"matrix": [2, 12], "x": 13.1667, "y": 3},
+                {"matrix": [2, 13], "x": 14.1667, "y": 3},
+                {"matrix": [2, 14], "x": 15.1667, "y": 3},
+                {"matrix": [2, 16], "x": 16.1667, "y": 3, "w": 1.5, "h": 2},
+
+                {"matrix": [2, 17], "x": 18.1667, "y": 3},
+                {"matrix": [2, 18], "x": 19.1667, "y": 3},
+                {"matrix": [2, 19], "x": 20.1667, "y": 3},
+
+                {"matrix": [2, 20], "x": 21.6667, "y": 3},
+                {"matrix": [2, 21], "x": 22.6667, "y": 3},
+                {"matrix": [2, 22], "x": 23.6667, "y": 3},
+                {"matrix": [3, 0], "x": 24.6667, "y": 3},
+
+                {"matrix": [3, 1], "x": 0, "y": 4},
+                {"matrix": [3, 2], "x": 1, "y": 4},
+
+                {"matrix": [3, 3], "x": 2.6667, "y": 4, "w": 1.75},
+                {"matrix": [3, 4], "x": 4.4167, "y": 4},
+                {"matrix": [3, 5], "x": 5.4167, "y": 4},
+                {"matrix": [3, 6], "x": 6.4167, "y": 4},
+                {"matrix": [3, 7], "x": 7.4167, "y": 4},
+                {"matrix": [3, 8], "x": 8.4167, "y": 4},
+                {"matrix": [3, 9], "x": 9.4167, "y": 4},
+                {"matrix": [3, 10], "x": 10.4167, "y": 4},
+                {"matrix": [3, 11], "x": 11.4167, "y": 4},
+                {"matrix": [3, 12], "x": 12.4167, "y": 4},
+                {"matrix": [3, 13], "x": 13.4167, "y": 4},
+                {"matrix": [3, 15], "x": 14.4167, "y": 4},
+
+                {"matrix": [3, 16], "x": 18.1667, "y": 4},
+                {"matrix": [3, 17], "x": 19.1667, "y": 4},
+                {"matrix": [3, 18], "x": 20.1667, "y": 4},
+
+                {"matrix": [3, 19], "x": 21.6667, "y": 4},
+                {"matrix": [3, 20], "x": 22.6667, "y": 4},
+                {"matrix": [3, 21], "x": 23.6667, "y": 4},
+                {"matrix": [3, 22], "x": 24.6667, "y": 4},
+
+                {"matrix": [4, 0], "x": 0, "y": 5},
+                {"matrix": [4, 1], "x": 1, "y": 5},
+
+                {"matrix": [4, 2], "x": 2.6667, "y": 5, "w": 2.25},
+                {"matrix": [4, 4], "x": 4.9167, "y": 5},
+                {"matrix": [4, 5], "x": 5.9167, "y": 5},
+                {"matrix": [4, 6], "x": 6.9167, "y": 5},
+                {"matrix": [4, 7], "x": 7.9167, "y": 5},
+                {"matrix": [4, 8], "x": 8.9167, "y": 5},
+                {"matrix": [4, 9], "x": 9.9167, "y": 5},
+                {"matrix": [4, 10], "x": 10.9167, "y": 5},
+                {"matrix": [4, 11], "x": 11.9167, "y": 5},
+                {"matrix": [4, 12], "x": 12.9167, "y": 5},
+                {"matrix": [4, 13], "x": 13.9167, "y": 5},
+                {"matrix": [4, 14], "x": 14.9167, "y": 5, "w": 1.75},
+                {"matrix": [4, 15], "x": 16.6667, "y": 5},
+
+                {"matrix": [4, 16], "x": 18.1667, "y": 5},
+                {"matrix": [4, 17], "x": 19.1667, "y": 5},
+                {"matrix": [4, 18], "x": 20.1667, "y": 5},
+
+                {"matrix": [4, 19], "x": 21.6667, "y": 5},
+                {"matrix": [4, 20], "x": 22.6667, "y": 5},
+                {"matrix": [4, 21], "x": 23.6667, "y": 5},
+                {"matrix": [4, 22], "x": 24.6667, "y": 5, "h": 2},
+
+                {"matrix": [5, 0], "x": 0, "y": 6},
+                {"matrix": [5, 1], "x": 1, "y": 6},
+
+                {"matrix": [5, 2], "x": 2.6667, "y": 6, "w": 1.5},
+                {"matrix": [5, 3], "x": 4.1667, "y": 6},
+                {"matrix": [5, 4], "x": 5.1667, "y": 6, "w": 1.5},
+                {"matrix": [5, 9], "x": 6.6667, "y": 6, "w": 7},
+                {"matrix": [5, 12], "x": 13.6667, "y": 6, "w": 1.5},
+                {"matrix": [5, 13], "x": 15.1667, "y": 6},
+                {"matrix": [5, 15], "x": 16.1667, "y": 6, "w": 1.5},
+
+                {"matrix": [5, 16], "x": 18.1667, "y": 6, "w": 1.5},
+                {"matrix": [5, 18], "x": 19.6667, "y": 6, "w": 1.5},
+
+                {"matrix": [5, 19], "x": 21.6667, "y": 6, "w": 2},
+                {"matrix": [5, 21], "x": 23.6667, "y": 6}
+            ]
+        },
+        "LAYOUT_ultra_rev3": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+
+                {"matrix": [0, 2], "x": 2.6667, "y": 0},
+
+                {"matrix": [0, 4], "x": 4.6667, "y": 0},
+                {"matrix": [0, 5], "x": 5.6667, "y": 0},
+                {"matrix": [0, 6], "x": 6.6667, "y": 0},
+                {"matrix": [0, 7], "x": 7.6667, "y": 0},
+
+                {"matrix": [0, 8], "x": 9.1667, "y": 0},
+                {"matrix": [0, 9], "x": 10.1667, "y": 0},
+                {"matrix": [0, 10], "x": 11.1667, "y": 0},
+                {"matrix": [0, 11], "x": 12.1667, "y": 0},
+
+                {"matrix": [0, 12], "x": 13.6667, "y": 0},
+                {"matrix": [0, 13], "x": 14.6667, "y": 0},
+                {"matrix": [0, 14], "x": 15.6667, "y": 0},
+                {"matrix": [0, 15], "x": 16.6667, "y": 0},
+
+                {"matrix": [0, 16], "x": 18.1667, "y": 0},
+                {"matrix": [0, 17], "x": 19.1667, "y": 0},
+                {"matrix": [0, 18], "x": 20.1667, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 2},
+                {"matrix": [1, 1], "x": 1, "y": 2},
+
+                {"matrix": [1, 2], "x": 2.6667, "y": 2},
+                {"matrix": [1, 3], "x": 3.6667, "y": 2},
+                {"matrix": [1, 4], "x": 4.6667, "y": 2},
+                {"matrix": [1, 5], "x": 5.6667, "y": 2},
+                {"matrix": [1, 6], "x": 6.6667, "y": 2},
+                {"matrix": [1, 7], "x": 7.6667, "y": 2},
+                {"matrix": [1, 8], "x": 8.6667, "y": 2},
+                {"matrix": [1, 9], "x": 9.6667, "y": 2},
+                {"matrix": [1, 10], "x": 10.6667, "y": 2},
+                {"matrix": [1, 11], "x": 11.6667, "y": 2},
+                {"matrix": [1, 12], "x": 12.6667, "y": 2},
+                {"matrix": [1, 13], "x": 13.6667, "y": 2},
+                {"matrix": [1, 14], "x": 14.6667, "y": 2},
+                {"matrix": [1, 15], "x": 15.6667, "y": 2, "w": 2},
+
+                {"matrix": [1, 16], "x": 18.1667, "y": 2},
+                {"matrix": [1, 17], "x": 19.1667, "y": 2},
+                {"matrix": [1, 18], "x": 20.1667, "y": 2},
+
+                {"matrix": [1, 19], "x": 21.6667, "y": 2},
+                {"matrix": [1, 20], "x": 22.6667, "y": 2},
+                {"matrix": [1, 21], "x": 23.6667, "y": 2},
+                {"matrix": [1, 22], "x": 24.6667, "y": 2},
+
+                {"matrix": [2, 0], "x": 0, "y": 3},
+                {"matrix": [2, 1], "x": 1, "y": 3},
+
+                {"matrix": [2, 2], "x": 2.6667, "y": 3, "w": 1.5},
+                {"matrix": [2, 3], "x": 4.1667, "y": 3},
+                {"matrix": [2, 4], "x": 5.1667, "y": 3},
+                {"matrix": [2, 5], "x": 6.1667, "y": 3},
+                {"matrix": [2, 6], "x": 7.1667, "y": 3},
+                {"matrix": [2, 7], "x": 8.1667, "y": 3},
+                {"matrix": [2, 8], "x": 9.1667, "y": 3},
+                {"matrix": [2, 9], "x": 10.1667, "y": 3},
+                {"matrix": [2, 10], "x": 11.1667, "y": 3},
+                {"matrix": [2, 11], "x": 12.1667, "y": 3},
+                {"matrix": [2, 12], "x": 13.1667, "y": 3},
+                {"matrix": [2, 13], "x": 14.1667, "y": 3},
+                {"matrix": [2, 14], "x": 15.1667, "y": 3},
+                {"matrix": [2, 16], "x": 16.1667, "y": 3, "w": 1.5, "h": 2},
+
+                {"matrix": [2, 17], "x": 18.1667, "y": 3},
+                {"matrix": [2, 18], "x": 19.1667, "y": 3},
+                {"matrix": [2, 19], "x": 20.1667, "y": 3},
+
+                {"matrix": [2, 20], "x": 21.6667, "y": 3},
+                {"matrix": [2, 21], "x": 22.6667, "y": 3},
+                {"matrix": [2, 22], "x": 23.6667, "y": 3},
+                {"matrix": [3, 0], "x": 24.6667, "y": 3},
+
+                {"matrix": [3, 1], "x": 0, "y": 4},
+                {"matrix": [3, 2], "x": 1, "y": 4},
+
+                {"matrix": [3, 3], "x": 2.6667, "y": 4, "w": 1.75},
+                {"matrix": [3, 4], "x": 4.4167, "y": 4},
+                {"matrix": [3, 5], "x": 5.4167, "y": 4},
+                {"matrix": [3, 6], "x": 6.4167, "y": 4},
+                {"matrix": [3, 7], "x": 7.4167, "y": 4},
+                {"matrix": [3, 8], "x": 8.4167, "y": 4},
+                {"matrix": [3, 9], "x": 9.4167, "y": 4},
+                {"matrix": [3, 10], "x": 10.4167, "y": 4},
+                {"matrix": [3, 11], "x": 11.4167, "y": 4},
+                {"matrix": [3, 12], "x": 12.4167, "y": 4},
+                {"matrix": [3, 13], "x": 13.4167, "y": 4},
+                {"matrix": [3, 15], "x": 14.4167, "y": 4},
+
+                {"matrix": [3, 16], "x": 18.1667, "y": 4},
+                {"matrix": [3, 17], "x": 19.1667, "y": 4},
+                {"matrix": [3, 18], "x": 20.1667, "y": 4},
+
+                {"matrix": [3, 19], "x": 21.6667, "y": 4},
+                {"matrix": [3, 20], "x": 22.6667, "y": 4},
+                {"matrix": [3, 21], "x": 23.6667, "y": 4},
+                {"matrix": [3, 22], "x": 24.6667, "y": 4},
+
+                {"matrix": [4, 0], "x": 0, "y": 5},
+                {"matrix": [4, 1], "x": 1, "y": 5},
+
+                {"matrix": [4, 2], "x": 2.6667, "y": 5, "w": 2.25},
+                {"matrix": [4, 4], "x": 4.9167, "y": 5},
+                {"matrix": [4, 5], "x": 5.9167, "y": 5},
+                {"matrix": [4, 6], "x": 6.9167, "y": 5},
+                {"matrix": [4, 7], "x": 7.9167, "y": 5},
+                {"matrix": [4, 8], "x": 8.9167, "y": 5},
+                {"matrix": [4, 9], "x": 9.9167, "y": 5},
+                {"matrix": [4, 10], "x": 10.9167, "y": 5},
+                {"matrix": [4, 11], "x": 11.9167, "y": 5},
+                {"matrix": [4, 12], "x": 12.9167, "y": 5},
+                {"matrix": [4, 13], "x": 13.9167, "y": 5},
+                {"matrix": [4, 14], "x": 14.9167, "y": 5, "w": 1.75},
+                {"matrix": [4, 15], "x": 16.6667, "y": 5},
+
+                {"matrix": [4, 16], "x": 18.1667, "y": 5},
+                {"matrix": [4, 17], "x": 19.1667, "y": 5},
+                {"matrix": [4, 18], "x": 20.1667, "y": 5},
+
+                {"matrix": [4, 19], "x": 21.6667, "y": 5},
+                {"matrix": [4, 20], "x": 22.6667, "y": 5},
+                {"matrix": [4, 21], "x": 23.6667, "y": 5},
+                {"matrix": [4, 22], "x": 24.6667, "y": 5, "h": 2},
+
+                {"matrix": [5, 0], "x": 0, "y": 6},
+                {"matrix": [5, 1], "x": 1, "y": 6},
+
+                {"matrix": [5, 2], "x": 2.6667, "y": 6, "w": 1.5},
+                {"matrix": [5, 3], "x": 4.1667, "y": 6},
+                {"matrix": [5, 4], "x": 5.1667, "y": 6, "w": 1.5},
+                {"matrix": [5, 9], "x": 6.6667, "y": 6, "w": 7},
+                {"matrix": [5, 12], "x": 13.6667, "y": 6, "w": 1.5},
+                {"matrix": [5, 13], "x": 15.1667, "y": 6},
+                {"matrix": [5, 15], "x": 16.1667, "y": 6, "w": 1.5},
+
+                {"matrix": [5, 16], "x": 18.1667, "y": 6, "w": 1.5},
+                {"matrix": [5, 18], "x": 19.6667, "y": 6, "w": 1.5},
+
+                {"matrix": [5, 19], "x": 21.6667, "y": 6, "w": 2},
+                {"matrix": [5, 21], "x": 23.6667, "y": 6}
+            ]
+        },
+        "LAYOUT_plus_rev3": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+
+                {"matrix": [0, 2], "x": 2.6667, "y": 0},
+
+                {"matrix": [0, 16], "x": 18.1667, "y": 0},
+                {"matrix": [0, 17], "x": 19.1667, "y": 0},
+                {"matrix": [0, 18], "x": 20.1667, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 2},
+                {"matrix": [1, 1], "x": 1, "y": 2},
+
+                {"matrix": [1, 2], "x": 2.6667, "y": 2},
+                {"matrix": [1, 3], "x": 3.6667, "y": 2},
+                {"matrix": [1, 4], "x": 4.6667, "y": 2},
+                {"matrix": [1, 5], "x": 5.6667, "y": 2},
+                {"matrix": [1, 6], "x": 6.6667, "y": 2},
+                {"matrix": [1, 7], "x": 7.6667, "y": 2},
+                {"matrix": [1, 8], "x": 8.6667, "y": 2},
+                {"matrix": [1, 9], "x": 9.6667, "y": 2},
+                {"matrix": [1, 10], "x": 10.6667, "y": 2},
+                {"matrix": [1, 11], "x": 11.6667, "y": 2},
+                {"matrix": [1, 12], "x": 12.6667, "y": 2},
+                {"matrix": [1, 13], "x": 13.6667, "y": 2},
+                {"matrix": [1, 14], "x": 14.6667, "y": 2},
+                {"matrix": [1, 15], "x": 15.6667, "y": 2, "w": 2},
+
+                {"matrix": [1, 16], "x": 18.1667, "y": 2},
+                {"matrix": [1, 17], "x": 19.1667, "y": 2},
+                {"matrix": [1, 18], "x": 20.1667, "y": 2},
+
+                {"matrix": [1, 19], "x": 21.6667, "y": 2},
+                {"matrix": [1, 20], "x": 22.6667, "y": 2},
+                {"matrix": [1, 21], "x": 23.6667, "y": 2},
+                {"matrix": [1, 22], "x": 24.6667, "y": 2},
+
+                {"matrix": [2, 0], "x": 0, "y": 3},
+                {"matrix": [2, 1], "x": 1, "y": 3},
+
+                {"matrix": [2, 2], "x": 2.6667, "y": 3, "w": 1.5},
+                {"matrix": [2, 3], "x": 4.1667, "y": 3},
+                {"matrix": [2, 4], "x": 5.1667, "y": 3},
+                {"matrix": [2, 5], "x": 6.1667, "y": 3},
+                {"matrix": [2, 6], "x": 7.1667, "y": 3},
+                {"matrix": [2, 7], "x": 8.1667, "y": 3},
+                {"matrix": [2, 8], "x": 9.1667, "y": 3},
+                {"matrix": [2, 9], "x": 10.1667, "y": 3},
+                {"matrix": [2, 10], "x": 11.1667, "y": 3},
+                {"matrix": [2, 11], "x": 12.1667, "y": 3},
+                {"matrix": [2, 12], "x": 13.1667, "y": 3},
+                {"matrix": [2, 13], "x": 14.1667, "y": 3},
+                {"matrix": [2, 14], "x": 15.1667, "y": 3},
+                {"matrix": [2, 16], "x": 16.1667, "y": 3, "w": 1.5, "h": 2},
+
+                {"matrix": [2, 17], "x": 18.1667, "y": 3},
+                {"matrix": [2, 18], "x": 19.1667, "y": 3},
+                {"matrix": [2, 19], "x": 20.1667, "y": 3},
+
+                {"matrix": [2, 20], "x": 21.6667, "y": 3},
+                {"matrix": [2, 21], "x": 22.6667, "y": 3},
+                {"matrix": [2, 22], "x": 23.6667, "y": 3},
+                {"matrix": [3, 0], "x": 24.6667, "y": 3},
+
+                {"matrix": [3, 1], "x": 0, "y": 4},
+                {"matrix": [3, 2], "x": 1, "y": 4},
+
+                {"matrix": [3, 3], "x": 2.6667, "y": 4, "w": 1.75},
+                {"matrix": [3, 4], "x": 4.4167, "y": 4},
+                {"matrix": [3, 5], "x": 5.4167, "y": 4},
+                {"matrix": [3, 6], "x": 6.4167, "y": 4},
+                {"matrix": [3, 7], "x": 7.4167, "y": 4},
+                {"matrix": [3, 8], "x": 8.4167, "y": 4},
+                {"matrix": [3, 9], "x": 9.4167, "y": 4},
+                {"matrix": [3, 10], "x": 10.4167, "y": 4},
+                {"matrix": [3, 11], "x": 11.4167, "y": 4},
+                {"matrix": [3, 12], "x": 12.4167, "y": 4},
+                {"matrix": [3, 13], "x": 13.4167, "y": 4},
+                {"matrix": [3, 15], "x": 14.4167, "y": 4},
+
+                {"matrix": [3, 16], "x": 18.1667, "y": 4},
+                {"matrix": [3, 17], "x": 19.1667, "y": 4},
+                {"matrix": [3, 18], "x": 20.1667, "y": 4},
+
+                {"matrix": [3, 19], "x": 21.6667, "y": 4},
+                {"matrix": [3, 20], "x": 22.6667, "y": 4},
+                {"matrix": [3, 21], "x": 23.6667, "y": 4},
+                {"matrix": [3, 22], "x": 24.6667, "y": 4},
+
+                {"matrix": [4, 0], "x": 0, "y": 5},
+                {"matrix": [4, 1], "x": 1, "y": 5},
+
+                {"matrix": [4, 2], "x": 2.6667, "y": 5, "w": 2.25},
+                {"matrix": [4, 4], "x": 4.9167, "y": 5},
+                {"matrix": [4, 5], "x": 5.9167, "y": 5},
+                {"matrix": [4, 6], "x": 6.9167, "y": 5},
+                {"matrix": [4, 7], "x": 7.9167, "y": 5},
+                {"matrix": [4, 8], "x": 8.9167, "y": 5},
+                {"matrix": [4, 9], "x": 9.9167, "y": 5},
+                {"matrix": [4, 10], "x": 10.9167, "y": 5},
+                {"matrix": [4, 11], "x": 11.9167, "y": 5},
+                {"matrix": [4, 12], "x": 12.9167, "y": 5},
+                {"matrix": [4, 13], "x": 13.9167, "y": 5},
+                {"matrix": [4, 14], "x": 14.9167, "y": 5, "w": 1.75},
+                {"matrix": [4, 15], "x": 16.6667, "y": 5},
+
+                {"matrix": [4, 16], "x": 18.1667, "y": 5},
+                {"matrix": [4, 17], "x": 19.1667, "y": 5},
+                {"matrix": [4, 18], "x": 20.1667, "y": 5},
+
+                {"matrix": [4, 19], "x": 21.6667, "y": 5},
+                {"matrix": [4, 20], "x": 22.6667, "y": 5},
+                {"matrix": [4, 21], "x": 23.6667, "y": 5},
+                {"matrix": [4, 22], "x": 24.6667, "y": 5, "h": 2},
+
+                {"matrix": [5, 0], "x": 0, "y": 6},
+                {"matrix": [5, 1], "x": 1, "y": 6},
+
+                {"matrix": [5, 2], "x": 2.6667, "y": 6, "w": 1.5},
+                {"matrix": [5, 3], "x": 4.1667, "y": 6},
+                {"matrix": [5, 4], "x": 5.1667, "y": 6, "w": 1.5},
+                {"matrix": [5, 9], "x": 6.6667, "y": 6, "w": 7},
+                {"matrix": [5, 12], "x": 13.6667, "y": 6, "w": 1.5},
+                {"matrix": [5, 13], "x": 15.1667, "y": 6},
+                {"matrix": [5, 15], "x": 16.1667, "y": 6, "w": 1.5},
+
+                {"matrix": [5, 16], "x": 18.1667, "y": 6, "w": 1.5},
+                {"matrix": [5, 18], "x": 19.6667, "y": 6, "w": 1.5},
+
+                {"matrix": [5, 19], "x": 21.6667, "y": 6, "w": 2},
+                {"matrix": [5, 21], "x": 23.6667, "y": 6}
+            ]
+        },
+        "LAYOUT_plus_rev1": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+
+                {"matrix": [0, 16], "x": 18.1667, "y": 0},
+                {"matrix": [0, 17], "x": 19.1667, "y": 0},
+                {"matrix": [0, 18], "x": 20.1667, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 2},
+                {"matrix": [1, 1], "x": 1, "y": 2},
+
+                {"matrix": [1, 2], "x": 2.6667, "y": 2},
+                {"matrix": [1, 3], "x": 3.6667, "y": 2},
+                {"matrix": [1, 4], "x": 4.6667, "y": 2},
+                {"matrix": [1, 5], "x": 5.6667, "y": 2},
+                {"matrix": [1, 6], "x": 6.6667, "y": 2},
+                {"matrix": [1, 7], "x": 7.6667, "y": 2},
+                {"matrix": [1, 8], "x": 8.6667, "y": 2},
+                {"matrix": [1, 9], "x": 9.6667, "y": 2},
+                {"matrix": [1, 10], "x": 10.6667, "y": 2},
+                {"matrix": [1, 11], "x": 11.6667, "y": 2},
+                {"matrix": [1, 12], "x": 12.6667, "y": 2},
+                {"matrix": [1, 13], "x": 13.6667, "y": 2},
+                {"matrix": [1, 14], "x": 14.6667, "y": 2},
+                {"matrix": [1, 15], "x": 15.6667, "y": 2, "w": 2},
+
+                {"matrix": [1, 16], "x": 18.1667, "y": 2},
+                {"matrix": [1, 17], "x": 19.1667, "y": 2},
+                {"matrix": [1, 18], "x": 20.1667, "y": 2},
+
+                {"matrix": [1, 19], "x": 21.6667, "y": 2},
+                {"matrix": [1, 20], "x": 22.6667, "y": 2},
+                {"matrix": [1, 21], "x": 23.6667, "y": 2},
+                {"matrix": [1, 22], "x": 24.6667, "y": 2},
+
+                {"matrix": [2, 0], "x": 0, "y": 3},
+                {"matrix": [2, 1], "x": 1, "y": 3},
+
+                {"matrix": [2, 2], "x": 2.6667, "y": 3, "w": 1.5},
+                {"matrix": [2, 3], "x": 4.1667, "y": 3},
+                {"matrix": [2, 4], "x": 5.1667, "y": 3},
+                {"matrix": [2, 5], "x": 6.1667, "y": 3},
+                {"matrix": [2, 6], "x": 7.1667, "y": 3},
+                {"matrix": [2, 7], "x": 8.1667, "y": 3},
+                {"matrix": [2, 8], "x": 9.1667, "y": 3},
+                {"matrix": [2, 9], "x": 10.1667, "y": 3},
+                {"matrix": [2, 10], "x": 11.1667, "y": 3},
+                {"matrix": [2, 11], "x": 12.1667, "y": 3},
+                {"matrix": [2, 12], "x": 13.1667, "y": 3},
+                {"matrix": [2, 13], "x": 14.1667, "y": 3},
+                {"matrix": [2, 14], "x": 15.1667, "y": 3},
+                {"matrix": [2, 16], "x": 16.1667, "y": 3, "w": 1.5, "h": 2},
+
+                {"matrix": [2, 17], "x": 18.1667, "y": 3},
+                {"matrix": [2, 18], "x": 19.1667, "y": 3},
+                {"matrix": [2, 19], "x": 20.1667, "y": 3},
+
+                {"matrix": [2, 20], "x": 21.6667, "y": 3},
+                {"matrix": [2, 21], "x": 22.6667, "y": 3},
+                {"matrix": [2, 22], "x": 23.6667, "y": 3},
+                {"matrix": [3, 0], "x": 24.6667, "y": 3},
+
+                {"matrix": [3, 1], "x": 0, "y": 4},
+                {"matrix": [3, 2], "x": 1, "y": 4},
+
+                {"matrix": [3, 3], "x": 2.6667, "y": 4, "w": 1.75},
+                {"matrix": [3, 4], "x": 4.4167, "y": 4},
+                {"matrix": [3, 5], "x": 5.4167, "y": 4},
+                {"matrix": [3, 6], "x": 6.4167, "y": 4},
+                {"matrix": [3, 7], "x": 7.4167, "y": 4},
+                {"matrix": [3, 8], "x": 8.4167, "y": 4},
+                {"matrix": [3, 9], "x": 9.4167, "y": 4},
+                {"matrix": [3, 10], "x": 10.4167, "y": 4},
+                {"matrix": [3, 11], "x": 11.4167, "y": 4},
+                {"matrix": [3, 12], "x": 12.4167, "y": 4},
+                {"matrix": [3, 13], "x": 13.4167, "y": 4},
+                {"matrix": [3, 15], "x": 14.4167, "y": 4},
+
+                {"matrix": [3, 16], "x": 18.1667, "y": 4},
+                {"matrix": [3, 17], "x": 19.1667, "y": 4},
+                {"matrix": [3, 18], "x": 20.1667, "y": 4},
+
+                {"matrix": [3, 19], "x": 21.6667, "y": 4},
+                {"matrix": [3, 20], "x": 22.6667, "y": 4},
+                {"matrix": [3, 21], "x": 23.6667, "y": 4},
+                {"matrix": [3, 22], "x": 24.6667, "y": 4},
+
+                {"matrix": [4, 0], "x": 0, "y": 5},
+                {"matrix": [4, 1], "x": 1, "y": 5},
+
+                {"matrix": [4, 2], "x": 2.6667, "y": 5, "w": 2.25},
+                {"matrix": [4, 4], "x": 4.9167, "y": 5},
+                {"matrix": [4, 5], "x": 5.9167, "y": 5},
+                {"matrix": [4, 6], "x": 6.9167, "y": 5},
+                {"matrix": [4, 7], "x": 7.9167, "y": 5},
+                {"matrix": [4, 8], "x": 8.9167, "y": 5},
+                {"matrix": [4, 9], "x": 9.9167, "y": 5},
+                {"matrix": [4, 10], "x": 10.9167, "y": 5},
+                {"matrix": [4, 11], "x": 11.9167, "y": 5},
+                {"matrix": [4, 12], "x": 12.9167, "y": 5},
+                {"matrix": [4, 13], "x": 13.9167, "y": 5},
+                {"matrix": [4, 14], "x": 14.9167, "y": 5, "w": 1.75},
+                {"matrix": [4, 15], "x": 16.6667, "y": 5},
+
+                {"matrix": [4, 16], "x": 18.1667, "y": 5},
+                {"matrix": [4, 17], "x": 19.1667, "y": 5},
+                {"matrix": [4, 18], "x": 20.1667, "y": 5},
+
+                {"matrix": [4, 19], "x": 21.6667, "y": 5},
+                {"matrix": [4, 20], "x": 22.6667, "y": 5},
+                {"matrix": [4, 21], "x": 23.6667, "y": 5},
+                {"matrix": [4, 22], "x": 24.6667, "y": 5, "h": 2},
+
+                {"matrix": [5, 0], "x": 0, "y": 6},
+                {"matrix": [5, 1], "x": 1, "y": 6},
+
+                {"matrix": [5, 2], "x": 2.6667, "y": 6, "w": 1.5},
+                {"matrix": [5, 3], "x": 4.1667, "y": 6},
+                {"matrix": [5, 4], "x": 5.1667, "y": 6, "w": 1.5},
+                {"matrix": [5, 9], "x": 6.6667, "y": 6, "w": 7},
+                {"matrix": [5, 12], "x": 13.6667, "y": 6, "w": 1.5},
+                {"matrix": [5, 13], "x": 15.1667, "y": 6},
+                {"matrix": [5, 15], "x": 16.1667, "y": 6, "w": 1.5},
+
+                {"matrix": [5, 16], "x": 18.1667, "y": 6, "w": 1.5},
+                {"matrix": [5, 18], "x": 19.6667, "y": 6, "w": 1.5},
+
+                {"matrix": [5, 19], "x": 21.6667, "y": 6, "w": 2},
+                {"matrix": [5, 21], "x": 23.6667, "y": 6}
+            ]
+        },
+        "LAYOUT_102_rev1": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+
+                {"matrix": [0, 16], "x": 18.1667, "y": 0},
+                {"matrix": [0, 17], "x": 19.1667, "y": 0},
+                {"matrix": [0, 18], "x": 20.1667, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 2},
+                {"matrix": [1, 1], "x": 1, "y": 2},
+
+                {"matrix": [1, 2], "x": 2.6667, "y": 2},
+                {"matrix": [1, 3], "x": 3.6667, "y": 2},
+                {"matrix": [1, 4], "x": 4.6667, "y": 2},
+                {"matrix": [1, 5], "x": 5.6667, "y": 2},
+                {"matrix": [1, 6], "x": 6.6667, "y": 2},
+                {"matrix": [1, 7], "x": 7.6667, "y": 2},
+                {"matrix": [1, 8], "x": 8.6667, "y": 2},
+                {"matrix": [1, 9], "x": 9.6667, "y": 2},
+                {"matrix": [1, 10], "x": 10.6667, "y": 2},
+                {"matrix": [1, 11], "x": 11.6667, "y": 2},
+                {"matrix": [1, 12], "x": 12.6667, "y": 2},
+                {"matrix": [1, 13], "x": 13.6667, "y": 2},
+                {"matrix": [1, 14], "x": 14.6667, "y": 2},
+                {"matrix": [1, 15], "x": 15.6667, "y": 2, "w": 2},
+
+                {"matrix": [1, 16], "x": 18.1667, "y": 2},
+                {"matrix": [1, 17], "x": 19.1667, "y": 2},
+                {"matrix": [1, 18], "x": 20.1667, "y": 2},
+
+                {"matrix": [1, 19], "x": 21.6667, "y": 2},
+                {"matrix": [1, 20], "x": 22.6667, "y": 2},
+                {"matrix": [1, 21], "x": 23.6667, "y": 2},
+                {"matrix": [1, 22], "x": 24.6667, "y": 2},
+
+                {"matrix": [2, 0], "x": 0, "y": 3},
+                {"matrix": [2, 1], "x": 1, "y": 3},
+
+                {"matrix": [2, 2], "x": 2.6667, "y": 3, "w": 1.5},
+                {"matrix": [2, 3], "x": 4.1667, "y": 3},
+                {"matrix": [2, 4], "x": 5.1667, "y": 3},
+                {"matrix": [2, 5], "x": 6.1667, "y": 3},
+                {"matrix": [2, 6], "x": 7.1667, "y": 3},
+                {"matrix": [2, 7], "x": 8.1667, "y": 3},
+                {"matrix": [2, 8], "x": 9.1667, "y": 3},
+                {"matrix": [2, 9], "x": 10.1667, "y": 3},
+                {"matrix": [2, 10], "x": 11.1667, "y": 3},
+                {"matrix": [2, 11], "x": 12.1667, "y": 3},
+                {"matrix": [2, 12], "x": 13.1667, "y": 3},
+                {"matrix": [2, 13], "x": 14.1667, "y": 3},
+                {"matrix": [2, 14], "x": 15.1667, "y": 3},
+                {"matrix": [2, 16], "x": 16.1667, "y": 3, "w": 1.5, "h": 2},
+
+                {"matrix": [2, 17], "x": 18.1667, "y": 3},
+                {"matrix": [2, 18], "x": 19.1667, "y": 3},
+                {"matrix": [2, 19], "x": 20.1667, "y": 3},
+
+                {"matrix": [2, 20], "x": 21.6667, "y": 3},
+                {"matrix": [2, 21], "x": 22.6667, "y": 3},
+                {"matrix": [2, 22], "x": 23.6667, "y": 3},
+                {"matrix": [3, 0], "x": 24.6667, "y": 3},
+
+                {"matrix": [3, 1], "x": 0, "y": 4},
+                {"matrix": [3, 2], "x": 1, "y": 4},
+
+                {"matrix": [3, 3], "x": 2.6667, "y": 4, "w": 1.75},
+                {"matrix": [3, 4], "x": 4.4167, "y": 4},
+                {"matrix": [3, 5], "x": 5.4167, "y": 4},
+                {"matrix": [3, 6], "x": 6.4167, "y": 4},
+                {"matrix": [3, 7], "x": 7.4167, "y": 4},
+                {"matrix": [3, 8], "x": 8.4167, "y": 4},
+                {"matrix": [3, 9], "x": 9.4167, "y": 4},
+                {"matrix": [3, 10], "x": 10.4167, "y": 4},
+                {"matrix": [3, 11], "x": 11.4167, "y": 4},
+                {"matrix": [3, 12], "x": 12.4167, "y": 4},
+                {"matrix": [3, 13], "x": 13.4167, "y": 4},
+                {"matrix": [3, 15], "x": 14.4167, "y": 4},
+
+                {"matrix": [3, 19], "x": 21.6667, "y": 4},
+                {"matrix": [3, 20], "x": 22.6667, "y": 4},
+                {"matrix": [3, 21], "x": 23.6667, "y": 4},
+                {"matrix": [3, 22], "x": 24.6667, "y": 4},
+
+                {"matrix": [4, 0], "x": 0, "y": 5},
+                {"matrix": [4, 1], "x": 1, "y": 5},
+
+                {"matrix": [4, 2], "x": 2.6667, "y": 5, "w": 2.25},
+                {"matrix": [4, 4], "x": 4.9167, "y": 5},
+                {"matrix": [4, 5], "x": 5.9167, "y": 5},
+                {"matrix": [4, 6], "x": 6.9167, "y": 5},
+                {"matrix": [4, 7], "x": 7.9167, "y": 5},
+                {"matrix": [4, 8], "x": 8.9167, "y": 5},
+                {"matrix": [4, 9], "x": 9.9167, "y": 5},
+                {"matrix": [4, 10], "x": 10.9167, "y": 5},
+                {"matrix": [4, 11], "x": 11.9167, "y": 5},
+                {"matrix": [4, 12], "x": 12.9167, "y": 5},
+                {"matrix": [4, 13], "x": 13.9167, "y": 5},
+                {"matrix": [4, 14], "x": 14.9167, "y": 5, "w": 1.75},
+                {"matrix": [4, 15], "x": 16.6667, "y": 5},
+
+                {"matrix": [4, 17], "x": 19.1667, "y": 5},
+
+                {"matrix": [4, 19], "x": 21.6667, "y": 5},
+                {"matrix": [4, 20], "x": 22.6667, "y": 5},
+                {"matrix": [4, 21], "x": 23.6667, "y": 5},
+                {"matrix": [4, 22], "x": 24.6667, "y": 5, "h": 2},
+
+                {"matrix": [5, 0], "x": 0, "y": 6},
+                {"matrix": [5, 1], "x": 1, "y": 6},
+
+                {"matrix": [5, 2], "x": 2.6667, "y": 6, "w": 1.5},
+                {"matrix": [5, 3], "x": 4.1667, "y": 6},
+                {"matrix": [5, 4], "x": 5.1667, "y": 6, "w": 1.5},
+                {"matrix": [5, 9], "x": 6.6667, "y": 6, "w": 7},
+                {"matrix": [5, 12], "x": 13.6667, "y": 6, "w": 1.5},
+                {"matrix": [5, 13], "x": 15.1667, "y": 6},
+                {"matrix": [5, 15], "x": 16.1667, "y": 6, "w": 1.5},
+
+                {"matrix": [5, 16], "x": 18.1667, "y": 6},
+                {"matrix": [5, 17], "x": 19.1667, "y": 6},
+                {"matrix": [5, 18], "x": 20.1667, "y": 6},
+
+                {"matrix": [5, 19], "x": 21.6667, "y": 6, "w": 2},
+                {"matrix": [5, 21], "x": 23.6667, "y": 6}
+            ]
+        },
+        "LAYOUT_102_rev3": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+
+                {"matrix": [0, 2], "x": 2.6667, "y": 0},
+
+                {"matrix": [0, 16], "x": 18.1667, "y": 0},
+                {"matrix": [0, 17], "x": 19.1667, "y": 0},
+                {"matrix": [0, 18], "x": 20.1667, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 2},
+                {"matrix": [1, 1], "x": 1, "y": 2},
+
+                {"matrix": [1, 2], "x": 2.6667, "y": 2},
+                {"matrix": [1, 3], "x": 3.6667, "y": 2},
+                {"matrix": [1, 4], "x": 4.6667, "y": 2},
+                {"matrix": [1, 5], "x": 5.6667, "y": 2},
+                {"matrix": [1, 6], "x": 6.6667, "y": 2},
+                {"matrix": [1, 7], "x": 7.6667, "y": 2},
+                {"matrix": [1, 8], "x": 8.6667, "y": 2},
+                {"matrix": [1, 9], "x": 9.6667, "y": 2},
+                {"matrix": [1, 10], "x": 10.6667, "y": 2},
+                {"matrix": [1, 11], "x": 11.6667, "y": 2},
+                {"matrix": [1, 12], "x": 12.6667, "y": 2},
+                {"matrix": [1, 13], "x": 13.6667, "y": 2},
+                {"matrix": [1, 14], "x": 14.6667, "y": 2},
+                {"matrix": [1, 15], "x": 15.6667, "y": 2, "w": 2},
+
+                {"matrix": [1, 16], "x": 18.1667, "y": 2},
+                {"matrix": [1, 17], "x": 19.1667, "y": 2},
+                {"matrix": [1, 18], "x": 20.1667, "y": 2},
+
+                {"matrix": [1, 19], "x": 21.6667, "y": 2},
+                {"matrix": [1, 20], "x": 22.6667, "y": 2},
+                {"matrix": [1, 21], "x": 23.6667, "y": 2},
+                {"matrix": [1, 22], "x": 24.6667, "y": 2},
+
+                {"matrix": [2, 0], "x": 0, "y": 3},
+                {"matrix": [2, 1], "x": 1, "y": 3},
+
+                {"matrix": [2, 2], "x": 2.6667, "y": 3, "w": 1.5},
+                {"matrix": [2, 3], "x": 4.1667, "y": 3},
+                {"matrix": [2, 4], "x": 5.1667, "y": 3},
+                {"matrix": [2, 5], "x": 6.1667, "y": 3},
+                {"matrix": [2, 6], "x": 7.1667, "y": 3},
+                {"matrix": [2, 7], "x": 8.1667, "y": 3},
+                {"matrix": [2, 8], "x": 9.1667, "y": 3},
+                {"matrix": [2, 9], "x": 10.1667, "y": 3},
+                {"matrix": [2, 10], "x": 11.1667, "y": 3},
+                {"matrix": [2, 11], "x": 12.1667, "y": 3},
+                {"matrix": [2, 12], "x": 13.1667, "y": 3},
+                {"matrix": [2, 13], "x": 14.1667, "y": 3},
+                {"matrix": [2, 14], "x": 15.1667, "y": 3},
+                {"matrix": [2, 16], "x": 16.1667, "y": 3, "w": 1.5, "h": 2},
+
+                {"matrix": [2, 17], "x": 18.1667, "y": 3},
+                {"matrix": [2, 18], "x": 19.1667, "y": 3},
+                {"matrix": [2, 19], "x": 20.1667, "y": 3},
+
+                {"matrix": [2, 20], "x": 21.6667, "y": 3},
+                {"matrix": [2, 21], "x": 22.6667, "y": 3},
+                {"matrix": [2, 22], "x": 23.6667, "y": 3},
+                {"matrix": [3, 0], "x": 24.6667, "y": 3},
+
+                {"matrix": [3, 1], "x": 0, "y": 4},
+                {"matrix": [3, 2], "x": 1, "y": 4},
+
+                {"matrix": [3, 3], "x": 2.6667, "y": 4, "w": 1.75},
+                {"matrix": [3, 4], "x": 4.4167, "y": 4},
+                {"matrix": [3, 5], "x": 5.4167, "y": 4},
+                {"matrix": [3, 6], "x": 6.4167, "y": 4},
+                {"matrix": [3, 7], "x": 7.4167, "y": 4},
+                {"matrix": [3, 8], "x": 8.4167, "y": 4},
+                {"matrix": [3, 9], "x": 9.4167, "y": 4},
+                {"matrix": [3, 10], "x": 10.4167, "y": 4},
+                {"matrix": [3, 11], "x": 11.4167, "y": 4},
+                {"matrix": [3, 12], "x": 12.4167, "y": 4},
+                {"matrix": [3, 13], "x": 13.4167, "y": 4},
+                {"matrix": [3, 15], "x": 14.4167, "y": 4},
+
+                {"matrix": [3, 19], "x": 21.6667, "y": 4},
+                {"matrix": [3, 20], "x": 22.6667, "y": 4},
+                {"matrix": [3, 21], "x": 23.6667, "y": 4},
+                {"matrix": [3, 22], "x": 24.6667, "y": 4},
+
+                {"matrix": [4, 0], "x": 0, "y": 5},
+                {"matrix": [4, 1], "x": 1, "y": 5},
+
+                {"matrix": [4, 2], "x": 2.6667, "y": 5, "w": 2.25},
+                {"matrix": [4, 4], "x": 4.9167, "y": 5},
+                {"matrix": [4, 5], "x": 5.9167, "y": 5},
+                {"matrix": [4, 6], "x": 6.9167, "y": 5},
+                {"matrix": [4, 7], "x": 7.9167, "y": 5},
+                {"matrix": [4, 8], "x": 8.9167, "y": 5},
+                {"matrix": [4, 9], "x": 9.9167, "y": 5},
+                {"matrix": [4, 10], "x": 10.9167, "y": 5},
+                {"matrix": [4, 11], "x": 11.9167, "y": 5},
+                {"matrix": [4, 12], "x": 12.9167, "y": 5},
+                {"matrix": [4, 13], "x": 13.9167, "y": 5},
+                {"matrix": [4, 14], "x": 14.9167, "y": 5, "w": 1.75},
+                {"matrix": [4, 15], "x": 16.6667, "y": 5},
+
+                {"matrix": [4, 17], "x": 19.1667, "y": 5},
+
+                {"matrix": [4, 19], "x": 21.6667, "y": 5},
+                {"matrix": [4, 20], "x": 22.6667, "y": 5},
+                {"matrix": [4, 21], "x": 23.6667, "y": 5},
+                {"matrix": [4, 22], "x": 24.6667, "y": 5, "h": 2},
+
+                {"matrix": [5, 0], "x": 0, "y": 6},
+                {"matrix": [5, 1], "x": 1, "y": 6},
+
+                {"matrix": [5, 2], "x": 2.6667, "y": 6, "w": 1.5},
+                {"matrix": [5, 3], "x": 4.1667, "y": 6},
+                {"matrix": [5, 4], "x": 5.1667, "y": 6, "w": 1.5},
+                {"matrix": [5, 9], "x": 6.6667, "y": 6, "w": 7},
+                {"matrix": [5, 12], "x": 13.6667, "y": 6, "w": 1.5},
+                {"matrix": [5, 13], "x": 15.1667, "y": 6},
+                {"matrix": [5, 15], "x": 16.1667, "y": 6, "w": 1.5},
+
+                {"matrix": [5, 16], "x": 18.1667, "y": 6},
+                {"matrix": [5, 17], "x": 19.1667, "y": 6},
+                {"matrix": [5, 18], "x": 20.1667, "y": 6},
+
+                {"matrix": [5, 19], "x": 21.6667, "y": 6, "w": 2},
+                {"matrix": [5, 21], "x": 23.6667, "y": 6}
+            ]
+        }
+    }
+}
diff --git a/keyboards/omnikeyish/rules.mk b/keyboards/omnikeyish/rules.mk
index a8a5143e24d..33820d54c07 100644
--- a/keyboards/omnikeyish/rules.mk
+++ b/keyboards/omnikeyish/rules.mk
@@ -1,15 +1,2 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no	# Mouse keys
-EXTRAKEY_ENABLE = yes	# Audio control and System control
-CONSOLE_ENABLE = yes	# Console for debug
-COMMAND_ENABLE = yes    # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no  	# Enable keyboard backlight functionality
-AUDIO_ENABLE = no
-RGBLIGHT_ENABLE = no
-
 # Project specific files
 SRC += dynamic_macro.c
diff --git a/keyboards/opendeck/32/rev1/info.json b/keyboards/opendeck/32/rev1/info.json
deleted file mode 100644
index 9ff22ec125e..00000000000
--- a/keyboards/opendeck/32/rev1/info.json
+++ /dev/null
@@ -1,102 +0,0 @@
-{
-    "matrix_pins": {
-        "cols": ["B4", "D7", "D6", "D4", "F7", "F6", "F5", "F4"],
-        "rows": ["C7", "C6", "B6", "B5"]
-    },
-    "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,
-            "rainbow_moving_chevron": true,
-            "cycle_out_in": true,
-            "cycle_out_in_dual": 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_rain": true,
-            "pixel_flow": true,
-            "pixel_fractal": 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
-        },
-        "default": {
-            "animation": "cycle_spiral"
-        },
-        "driver": "is31fl3731",
-        "sleep": true
-    },
-    "diode_direction": "COL2ROW",
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "layouts": {
-        "LAYOUT_ortho_4x8": {
-            "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": [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": [1, 4], "x": 4, "y": 1},
-                {"matrix": [1, 5], "x": 5, "y": 1},
-                {"matrix": [1, 6], "x": 6, "y": 1},
-                {"matrix": [1, 7], "x": 7, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2},
-                {"matrix": [2, 1], "x": 1, "y": 2},
-                {"matrix": [2, 2], "x": 2, "y": 2},
-                {"matrix": [2, 3], "x": 3, "y": 2},
-                {"matrix": [2, 4], "x": 4, "y": 2},
-                {"matrix": [2, 5], "x": 5, "y": 2},
-                {"matrix": [2, 6], "x": 6, "y": 2},
-                {"matrix": [2, 7], "x": 7, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3},
-                {"matrix": [3, 1], "x": 1, "y": 3},
-                {"matrix": [3, 2], "x": 2, "y": 3},
-                {"matrix": [3, 3], "x": 3, "y": 3},
-                {"matrix": [3, 4], "x": 4, "y": 3},
-                {"matrix": [3, 5], "x": 5, "y": 3},
-                {"matrix": [3, 6], "x": 6, "y": 3},
-                {"matrix": [3, 7], "x": 7, "y": 3}
-            ]
-        }
-    }
-}
diff --git a/keyboards/opendeck/32/rev1/keyboard.json b/keyboards/opendeck/32/rev1/keyboard.json
new file mode 100644
index 00000000000..e55c16c9fdd
--- /dev/null
+++ b/keyboards/opendeck/32/rev1/keyboard.json
@@ -0,0 +1,112 @@
+{
+    "build": {
+        "lto": true
+    },
+    "features": {
+        "bootmagic": false,
+        "extrakey": false,
+        "mousekey": false,
+        "nkro": true,
+        "rgb_matrix": true
+    },
+    "matrix_pins": {
+        "cols": ["B4", "D7", "D6", "D4", "F7", "F6", "F5", "F4"],
+        "rows": ["C7", "C6", "B6", "B5"]
+    },
+    "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,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": 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_rain": true,
+            "pixel_flow": true,
+            "pixel_fractal": 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
+        },
+        "default": {
+            "animation": "cycle_spiral"
+        },
+        "driver": "is31fl3731",
+        "sleep": true
+    },
+    "diode_direction": "COL2ROW",
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "layouts": {
+        "LAYOUT_ortho_4x8": {
+            "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": [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": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [2, 6], "x": 6, "y": 2},
+                {"matrix": [2, 7], "x": 7, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
+                {"matrix": [3, 6], "x": 6, "y": 3},
+                {"matrix": [3, 7], "x": 7, "y": 3}
+            ]
+        }
+    }
+}
diff --git a/keyboards/opendeck/32/rev1/rules.mk b/keyboards/opendeck/32/rev1/rules.mk
index d6a08c82512..3437a35bdf1 100644
--- a/keyboards/opendeck/32/rev1/rules.mk
+++ b/keyboards/opendeck/32/rev1/rules.mk
@@ -1,18 +1,2 @@
 # Processor frequency
 F_CPU = 8000000
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = no        # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-RGB_MATRIX_ENABLE = yes
-
-LTO_ENABLE = yes
diff --git a/keyboards/orthocode/info.json b/keyboards/orthocode/info.json
deleted file mode 100644
index b7fe9dab472..00000000000
--- a/keyboards/orthocode/info.json
+++ /dev/null
@@ -1,134 +0,0 @@
-{
-    "keyboard_name": "OrthoCode",
-    "manufacturer": "Jrodna",
-    "url": "https://github.com/Jrodna/OrthoCode",
-    "maintainer": "Jrodna",
-    "usb": {
-        "vid": "0x3415",
-        "pid": "0x0001",
-        "device_version": "0.0.1",
-        "max_power": 100
-    },
-    "matrix_pins": {
-        "cols": ["C4", "C3", "C2", "C1", "C0", "D7", "D6", "A7", "A4", "A5", "A6", "A3", "A2", "A1", "A0"],
-        "rows": ["B0", "B1", "B2", "B3", "B4"]
-    },
-    "diode_direction": "COL2ROW",
-    "encoder": {
-        "rotary": [
-            {"pin_a": "D1", "pin_b": "D0", "resolution": 1}
-        ]
-    },
-    "qmk": {
-        "tap_keycode_delay": 10
-    },
-    "rgblight": {
-        "saturation_steps": 8,
-        "brightness_steps": 8,
-        "led_count": 10,
-        "sleep": true,
-        "animations": {
-            "breathing": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true
-        }
-    },
-    "ws2812": {
-        "pin": "D5"
-    },
-    "processor": "atmega32a",
-    "bootloader": "usbasploader",
-    "debounce": 0,
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [3, 0], "x": 0.5, "y": 0},
-
-                {"matrix": [0, 0], "x": 0.5, "y": 1},
-
-                {"matrix": [0, 1], "x": 1.75, "y": 1},
-                {"matrix": [0, 2], "x": 3, "y": 1},
-                {"matrix": [0, 3], "x": 4, "y": 1},
-                {"matrix": [0, 4], "x": 5, "y": 1},
-                {"matrix": [0, 5], "x": 6, "y": 1},
-                {"matrix": [0, 6], "x": 7, "y": 1},
-
-                {"matrix": [0, 7], "x": 10.5, "y": 1},
-                {"matrix": [0, 8], "x": 11.5, "y": 1},
-                {"matrix": [0, 9], "x": 12.5, "y": 1},
-                {"matrix": [0, 10], "x": 13.5, "y": 1},
-                {"matrix": [0, 11], "x": 14.5, "y": 1},
-                {"matrix": [0, 12], "x": 15.5, "y": 1},
-                {"matrix": [0, 13], "x": 16.5, "y": 1},
-                {"matrix": [0, 14], "x": 17.5, "y": 1},
-
-                {"matrix": [1, 0], "x": 0.25, "y": 2},
-
-                {"matrix": [1, 1], "x": 1.5, "y": 2, "w": 1.5},
-                {"matrix": [1, 2], "x": 3, "y": 2},
-                {"matrix": [1, 3], "x": 4, "y": 2},
-                {"matrix": [1, 4], "x": 5, "y": 2},
-                {"matrix": [1, 5], "x": 6, "y": 2},
-                {"matrix": [1, 6], "x": 7, "y": 2},
-
-                {"matrix": [1, 7], "x": 10.5, "y": 2},
-                {"matrix": [1, 8], "x": 11.5, "y": 2},
-                {"matrix": [1, 9], "x": 12.5, "y": 2},
-                {"matrix": [1, 10], "x": 13.5, "y": 2},
-                {"matrix": [1, 11], "x": 14.5, "y": 2},
-                {"matrix": [1, 12], "x": 15.5, "y": 2, "w": 1.5},
-                {"matrix": [1, 13], "x": 17, "y": 2},
-                {"matrix": [1, 14], "x": 18, "y": 2},
-
-                {"matrix": [2, 0], "x": 0, "y": 3},
-
-                {"matrix": [2, 1], "x": 1.25, "y": 3, "w": 1.75},
-                {"matrix": [2, 2], "x": 3, "y": 3},
-                {"matrix": [2, 3], "x": 4, "y": 3},
-                {"matrix": [2, 4], "x": 5, "y": 3},
-                {"matrix": [2, 5], "x": 6, "y": 3},
-                {"matrix": [2, 6], "x": 7, "y": 3},
-
-                {"matrix": [2, 7], "x": 10.5, "y": 3},
-                {"matrix": [2, 8], "x": 11.5, "y": 3},
-                {"matrix": [2, 9], "x": 12.5, "y": 3},
-                {"matrix": [2, 10], "x": 13.5, "y": 3},
-                {"matrix": [2, 11], "x": 14.5, "y": 3},
-                {"matrix": [2, 12], "x": 15.5, "y": 3},
-                {"matrix": [2, 13], "x": 16.5, "y": 3, "w": 2.25},
-
-                {"matrix": [3, 1], "x": 0.75, "y": 4, "w": 2.25},
-                {"matrix": [3, 2], "x": 3, "y": 4},
-                {"matrix": [3, 3], "x": 4, "y": 4},
-                {"matrix": [3, 4], "x": 5, "y": 4},
-                {"matrix": [3, 5], "x": 6, "y": 4},
-                {"matrix": [3, 6], "x": 7, "y": 4},
-
-                {"matrix": [3, 7], "x": 10.5, "y": 4},
-                {"matrix": [3, 8], "x": 11.5, "y": 4},
-                {"matrix": [3, 9], "x": 12.5, "y": 4},
-                {"matrix": [3, 10], "x": 13.5, "y": 4},
-                {"matrix": [3, 11], "x": 14.5, "y": 4},
-
-                {"matrix": [3, 13], "x": 17, "y": 4},
-
-                {"matrix": [4, 1], "x": 1.25, "y": 5, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.5, "y": 5, "w": 1.25},
-                {"matrix": [4, 3], "x": 3.75, "y": 5, "w": 1.25},
-                {"matrix": [4, 4], "x": 5.5, "y": 5, "w": 1.25},
-                {"matrix": [4, 5], "x": 6.75, "y": 5, "h": 2.75},
-                {"matrix": [4, 6], "x": 7.75, "y": 5.25, "h": 2.25},
-
-                {"matrix": [4, 7], "x": 9.75, "y": 5.25, "h": 2.25},
-                {"matrix": [4, 8], "x": 10.75, "y": 5, "h": 2.75},
-                {"matrix": [4, 9], "x": 11.75, "y": 5, "w": 1.25},
-                {"matrix": [4, 10], "x": 13, "y": 5, "w": 1.25},
-                {"matrix": [4, 11], "x": 14.25, "y": 5, "w": 1.25},
-
-                {"matrix": [4, 12], "x": 16, "y": 5},
-                {"matrix": [4, 13], "x": 17, "y": 5},
-                {"matrix": [4, 14], "x": 18, "y": 5}
-            ]
-        }
-    }
-}
diff --git a/keyboards/orthocode/keyboard.json b/keyboards/orthocode/keyboard.json
new file mode 100644
index 00000000000..69f3374b27f
--- /dev/null
+++ b/keyboards/orthocode/keyboard.json
@@ -0,0 +1,145 @@
+{
+    "keyboard_name": "OrthoCode",
+    "manufacturer": "Jrodna",
+    "url": "https://github.com/Jrodna/OrthoCode",
+    "maintainer": "Jrodna",
+    "usb": {
+        "vid": "0x3415",
+        "pid": "0x0001",
+        "device_version": "0.0.1",
+        "max_power": 100
+    },
+    "build": {
+        "lto": true
+    },
+    "features": {
+        "bootmagic": true,
+        "encoder": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": false,
+        "rgblight": true
+    },
+    "matrix_pins": {
+        "cols": ["C4", "C3", "C2", "C1", "C0", "D7", "D6", "A7", "A4", "A5", "A6", "A3", "A2", "A1", "A0"],
+        "rows": ["B0", "B1", "B2", "B3", "B4"]
+    },
+    "diode_direction": "COL2ROW",
+    "encoder": {
+        "rotary": [
+            {"pin_a": "D1", "pin_b": "D0", "resolution": 1}
+        ]
+    },
+    "qmk": {
+        "tap_keycode_delay": 10
+    },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 10,
+        "sleep": true,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true
+        }
+    },
+    "ws2812": {
+        "pin": "D5"
+    },
+    "processor": "atmega32a",
+    "bootloader": "usbasploader",
+    "debounce": 0,
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [3, 0], "x": 0.5, "y": 0},
+
+                {"matrix": [0, 0], "x": 0.5, "y": 1},
+
+                {"matrix": [0, 1], "x": 1.75, "y": 1},
+                {"matrix": [0, 2], "x": 3, "y": 1},
+                {"matrix": [0, 3], "x": 4, "y": 1},
+                {"matrix": [0, 4], "x": 5, "y": 1},
+                {"matrix": [0, 5], "x": 6, "y": 1},
+                {"matrix": [0, 6], "x": 7, "y": 1},
+
+                {"matrix": [0, 7], "x": 10.5, "y": 1},
+                {"matrix": [0, 8], "x": 11.5, "y": 1},
+                {"matrix": [0, 9], "x": 12.5, "y": 1},
+                {"matrix": [0, 10], "x": 13.5, "y": 1},
+                {"matrix": [0, 11], "x": 14.5, "y": 1},
+                {"matrix": [0, 12], "x": 15.5, "y": 1},
+                {"matrix": [0, 13], "x": 16.5, "y": 1},
+                {"matrix": [0, 14], "x": 17.5, "y": 1},
+
+                {"matrix": [1, 0], "x": 0.25, "y": 2},
+
+                {"matrix": [1, 1], "x": 1.5, "y": 2, "w": 1.5},
+                {"matrix": [1, 2], "x": 3, "y": 2},
+                {"matrix": [1, 3], "x": 4, "y": 2},
+                {"matrix": [1, 4], "x": 5, "y": 2},
+                {"matrix": [1, 5], "x": 6, "y": 2},
+                {"matrix": [1, 6], "x": 7, "y": 2},
+
+                {"matrix": [1, 7], "x": 10.5, "y": 2},
+                {"matrix": [1, 8], "x": 11.5, "y": 2},
+                {"matrix": [1, 9], "x": 12.5, "y": 2},
+                {"matrix": [1, 10], "x": 13.5, "y": 2},
+                {"matrix": [1, 11], "x": 14.5, "y": 2},
+                {"matrix": [1, 12], "x": 15.5, "y": 2, "w": 1.5},
+                {"matrix": [1, 13], "x": 17, "y": 2},
+                {"matrix": [1, 14], "x": 18, "y": 2},
+
+                {"matrix": [2, 0], "x": 0, "y": 3},
+
+                {"matrix": [2, 1], "x": 1.25, "y": 3, "w": 1.75},
+                {"matrix": [2, 2], "x": 3, "y": 3},
+                {"matrix": [2, 3], "x": 4, "y": 3},
+                {"matrix": [2, 4], "x": 5, "y": 3},
+                {"matrix": [2, 5], "x": 6, "y": 3},
+                {"matrix": [2, 6], "x": 7, "y": 3},
+
+                {"matrix": [2, 7], "x": 10.5, "y": 3},
+                {"matrix": [2, 8], "x": 11.5, "y": 3},
+                {"matrix": [2, 9], "x": 12.5, "y": 3},
+                {"matrix": [2, 10], "x": 13.5, "y": 3},
+                {"matrix": [2, 11], "x": 14.5, "y": 3},
+                {"matrix": [2, 12], "x": 15.5, "y": 3},
+                {"matrix": [2, 13], "x": 16.5, "y": 3, "w": 2.25},
+
+                {"matrix": [3, 1], "x": 0.75, "y": 4, "w": 2.25},
+                {"matrix": [3, 2], "x": 3, "y": 4},
+                {"matrix": [3, 3], "x": 4, "y": 4},
+                {"matrix": [3, 4], "x": 5, "y": 4},
+                {"matrix": [3, 5], "x": 6, "y": 4},
+                {"matrix": [3, 6], "x": 7, "y": 4},
+
+                {"matrix": [3, 7], "x": 10.5, "y": 4},
+                {"matrix": [3, 8], "x": 11.5, "y": 4},
+                {"matrix": [3, 9], "x": 12.5, "y": 4},
+                {"matrix": [3, 10], "x": 13.5, "y": 4},
+                {"matrix": [3, 11], "x": 14.5, "y": 4},
+
+                {"matrix": [3, 13], "x": 17, "y": 4},
+
+                {"matrix": [4, 1], "x": 1.25, "y": 5, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 5, "w": 1.25},
+                {"matrix": [4, 3], "x": 3.75, "y": 5, "w": 1.25},
+                {"matrix": [4, 4], "x": 5.5, "y": 5, "w": 1.25},
+                {"matrix": [4, 5], "x": 6.75, "y": 5, "h": 2.75},
+                {"matrix": [4, 6], "x": 7.75, "y": 5.25, "h": 2.25},
+
+                {"matrix": [4, 7], "x": 9.75, "y": 5.25, "h": 2.25},
+                {"matrix": [4, 8], "x": 10.75, "y": 5, "h": 2.75},
+                {"matrix": [4, 9], "x": 11.75, "y": 5, "w": 1.25},
+                {"matrix": [4, 10], "x": 13, "y": 5, "w": 1.25},
+                {"matrix": [4, 11], "x": 14.25, "y": 5, "w": 1.25},
+
+                {"matrix": [4, 12], "x": 16, "y": 5},
+                {"matrix": [4, 13], "x": 17, "y": 5},
+                {"matrix": [4, 14], "x": 18, "y": 5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/orthocode/rules.mk b/keyboards/orthocode/rules.mk
index d9dd6a59c96..c2ee0bc86f9 100644
--- a/keyboards/orthocode/rules.mk
+++ b/keyboards/orthocode/rules.mk
@@ -1,17 +1,2 @@
 # Processor frequency
 F_CPU = 16000000
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-ENCODER_ENABLE = yes        # Enables the use of one or more encoders
-LTO_ENABLE = yes
diff --git a/keyboards/orthodox/info.json b/keyboards/orthodox/info.json
index 2b9790e84e6..107b0be8dd6 100644
--- a/keyboards/orthodox/info.json
+++ b/keyboards/orthodox/info.json
@@ -1,4 +1,11 @@
 {
+    "features": {
+        "bootmagic": false,
+        "command": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": false
+    },
     "split": {
         "enabled": true
     }
diff --git a/keyboards/orthodox/rev1/info.json b/keyboards/orthodox/rev1/keyboard.json
similarity index 100%
rename from keyboards/orthodox/rev1/info.json
rename to keyboards/orthodox/rev1/keyboard.json
diff --git a/keyboards/orthodox/rev1/rules.mk b/keyboards/orthodox/rev1/rules.mk
deleted file mode 100644
index 7b30c0beff2..00000000000
--- a/keyboards/orthodox/rev1/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-BACKLIGHT_ENABLE = no
diff --git a/keyboards/orthodox/rev3/info.json b/keyboards/orthodox/rev3/keyboard.json
similarity index 100%
rename from keyboards/orthodox/rev3/info.json
rename to keyboards/orthodox/rev3/keyboard.json
diff --git a/keyboards/orthodox/rev3/rules.mk b/keyboards/orthodox/rev3/rules.mk
deleted file mode 100644
index 7b30c0beff2..00000000000
--- a/keyboards/orthodox/rev3/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-BACKLIGHT_ENABLE = no
diff --git a/keyboards/orthodox/rev3_teensy/info.json b/keyboards/orthodox/rev3_teensy/keyboard.json
similarity index 100%
rename from keyboards/orthodox/rev3_teensy/info.json
rename to keyboards/orthodox/rev3_teensy/keyboard.json
diff --git a/keyboards/orthodox/rev3_teensy/rules.mk b/keyboards/orthodox/rev3_teensy/rules.mk
deleted file mode 100644
index 7b30c0beff2..00000000000
--- a/keyboards/orthodox/rev3_teensy/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-BACKLIGHT_ENABLE = no
diff --git a/keyboards/orthodox/rules.mk b/keyboards/orthodox/rules.mk
index 8fa7b0a404f..fd71b6c8fb1 100644
--- a/keyboards/orthodox/rules.mk
+++ b/keyboards/orthodox/rules.mk
@@ -1,14 +1 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no      # Enable keyboard backlight functionality
-AUDIO_ENABLE = no           # Audio output
-RGBLIGHT_ENABLE = no       # Enable WS2812 RGB underlight.
-
 DEFAULT_FOLDER = orthodox/rev3
diff --git a/keyboards/owlab/jelly_evolv/hotswap/625u/info.json b/keyboards/owlab/jelly_evolv/hotswap/625u/keyboard.json
similarity index 100%
rename from keyboards/owlab/jelly_evolv/hotswap/625u/info.json
rename to keyboards/owlab/jelly_evolv/hotswap/625u/keyboard.json
diff --git a/keyboards/owlab/jelly_evolv/hotswap/7u/info.json b/keyboards/owlab/jelly_evolv/hotswap/7u/keyboard.json
similarity index 100%
rename from keyboards/owlab/jelly_evolv/hotswap/7u/info.json
rename to keyboards/owlab/jelly_evolv/hotswap/7u/keyboard.json
diff --git a/keyboards/owlab/jelly_evolv/solder/info.json b/keyboards/owlab/jelly_evolv/solder/keyboard.json
similarity index 100%
rename from keyboards/owlab/jelly_evolv/solder/info.json
rename to keyboards/owlab/jelly_evolv/solder/keyboard.json
diff --git a/keyboards/palette1202/info.json b/keyboards/palette1202/info.json
deleted file mode 100644
index 99f43a73f2b..00000000000
--- a/keyboards/palette1202/info.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-  "keyboard_name": "Palette1202",
-  "manufacturer": "niltea",
-  "url": "https://github.com/niltea/Palette1202",
-  "maintainer": "niltea",
-  "usb": {
-    "vid": "0xFEED",
-    "pid": "0x1202",
-    "device_version": "0.0.1"
-  },
-  "matrix_pins": {
-    "cols": ["C6", "D7", "E6", "B4", "B5"],
-    "rows": ["B6", "B2", "B3"]
-  },
-  "diode_direction": "COL2ROW",
-  "encoder": {
-    "rotary": [
-      {"pin_a": "F4", "pin_b": "F5", "resolution": 2},
-      {"pin_a": "F6", "pin_b": "F7", "resolution": 2}
-    ]
-  },
-  "processor": "atmega32u4",
-  "bootloader": "atmel-dfu",
-  "layouts": {
-    "LAYOUT": {
-      "layout": [
-          {"matrix": [0, 0], "x": 0, "y": 0.75},
-          {"matrix": [0, 1], "x": 1, "y": 0.25},
-          {"matrix": [0, 2], "x": 2, "y": 0},
-          {"matrix": [0, 3], "x": 3, "y": 0.5},
-          {"matrix": [0, 4], "x": 4, "y": 0},
-
-          {"matrix": [1, 0], "x": 0, "y": 1.75},
-          {"matrix": [1, 1], "x": 1, "y": 1.25},
-          {"matrix": [1, 2], "x": 2, "y": 1},
-          {"matrix": [1, 3], "x": 3, "y": 1.5},
-          {"matrix": [1, 4], "x": 4, "y": 1},
-
-          {"matrix": [2, 1], "x": 1, "y": 2.5},
-          {"matrix": [2, 2], "x": 2, "y": 2.5},
-          {"matrix": [2, 3], "x": 3, "y": 2.5},
-          {"matrix": [2, 4], "x": 4, "y": 2.5, "r": 15}
-      ]
-    }
-  }
-}
diff --git a/keyboards/palette1202/keyboard.json b/keyboards/palette1202/keyboard.json
new file mode 100644
index 00000000000..db2a83573ac
--- /dev/null
+++ b/keyboards/palette1202/keyboard.json
@@ -0,0 +1,56 @@
+{
+  "keyboard_name": "Palette1202",
+  "manufacturer": "niltea",
+  "url": "https://github.com/niltea/Palette1202",
+  "maintainer": "niltea",
+  "usb": {
+    "vid": "0xFEED",
+    "pid": "0x1202",
+    "device_version": "0.0.1"
+  },
+  "features": {
+    "bootmagic": false,
+    "command": true,
+    "console": true,
+    "encoder": true,
+    "extrakey": true,
+    "mousekey": true,
+    "nkro": false,
+    "oled": true
+  },
+  "matrix_pins": {
+    "cols": ["C6", "D7", "E6", "B4", "B5"],
+    "rows": ["B6", "B2", "B3"]
+  },
+  "diode_direction": "COL2ROW",
+  "encoder": {
+    "rotary": [
+      {"pin_a": "F4", "pin_b": "F5", "resolution": 2},
+      {"pin_a": "F6", "pin_b": "F7", "resolution": 2}
+    ]
+  },
+  "processor": "atmega32u4",
+  "bootloader": "atmel-dfu",
+  "layouts": {
+    "LAYOUT": {
+      "layout": [
+          {"matrix": [0, 0], "x": 0, "y": 0.75},
+          {"matrix": [0, 1], "x": 1, "y": 0.25},
+          {"matrix": [0, 2], "x": 2, "y": 0},
+          {"matrix": [0, 3], "x": 3, "y": 0.5},
+          {"matrix": [0, 4], "x": 4, "y": 0},
+
+          {"matrix": [1, 0], "x": 0, "y": 1.75},
+          {"matrix": [1, 1], "x": 1, "y": 1.25},
+          {"matrix": [1, 2], "x": 2, "y": 1},
+          {"matrix": [1, 3], "x": 3, "y": 1.5},
+          {"matrix": [1, 4], "x": 4, "y": 1},
+
+          {"matrix": [2, 1], "x": 1, "y": 2.5},
+          {"matrix": [2, 2], "x": 2, "y": 2.5},
+          {"matrix": [2, 3], "x": 3, "y": 2.5},
+          {"matrix": [2, 4], "x": 4, "y": 2.5, "r": 15}
+      ]
+    }
+  }
+}
diff --git a/keyboards/palette1202/rules.mk b/keyboards/palette1202/rules.mk
index 8876586f4ba..37d8ebf017e 100644
--- a/keyboards/palette1202/rules.mk
+++ b/keyboards/palette1202/rules.mk
@@ -1,17 +1,2 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE  = yes      # Mouse keys
-EXTRAKEY_ENABLE  = yes      # Audio control and System control
-CONSOLE_ENABLE   = yes      # Console for debug
-COMMAND_ENABLE   = yes      # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE   = no     # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE    = no     # Enable keyboard RGB underglow
-AUDIO_ENABLE       = no     # Audio output
-ENCODER_ENABLE     = yes    # Enable support for rotary encoders
-OLED_ENABLE = yes
-
 # Additional code
 SRC += lib/oled_helper.c  # Adding OLED
diff --git a/keyboards/pearlboards/atlas/info.json b/keyboards/pearlboards/atlas/info.json
deleted file mode 100644
index 5433eb3c75f..00000000000
--- a/keyboards/pearlboards/atlas/info.json
+++ /dev/null
@@ -1,438 +0,0 @@
-{
-    "keyboard_name": "Atlas",
-    "manufacturer": "Koobaczech",
-    "url": "",
-    "maintainer": "Koobaczech",
-    "usb": {
-        "vid": "0x6963",
-        "pid": "0x6964",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["D5", "D4", "C1", "C2", "C3", "C5", "C7", "A7", "A6", "A5", "A4", "A3", "A2", "A1", "A0", "F7"],
-        "rows": ["D6", "E1", "C0", "C4", "E3"]
-    },
-    "diode_direction": "COL2ROW",
-    "encoder": {
-        "rotary": [
-            {"pin_a": "E0", "pin_b": "D7", "resolution": 1}
-        ]
-    },
-    "indicators": {
-        "caps_lock": "F4",
-        "num_lock": "F5",
-        "scroll_lock": "F6",
-        "on_state": 0
-    },
-    "rgblight": {
-        "saturation_steps": 8,
-        "brightness_steps": 8,
-        "led_count": 8,
-        "sleep": true,
-        "animations": {
-            "breathing": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "snake": true,
-            "knight": true,
-            "christmas": true,
-            "static_gradient": true,
-            "alternating": true,
-            "twinkle": true
-        }
-    },
-    "ws2812": {
-        "pin": "B6"
-    },
-    "processor": "at90usb1286",
-    "bootloader": "atmel-dfu",
-    "layouts": {
-        "LAYOUT_all": {
-            "layout": [
-                {"label": "Play/Pause", "matrix": [4, 2], "x": 3.5, "y": 0},
-
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 1},
-                {"label": "1", "matrix": [0, 1], "x": 1, "y": 1},
-                {"label": "2", "matrix": [0, 2], "x": 2, "y": 1},
-                {"label": "3", "matrix": [0, 3], "x": 3, "y": 1},
-                {"label": "4", "matrix": [0, 4], "x": 4, "y": 1},
-                {"label": "5", "matrix": [0, 5], "x": 5, "y": 1},
-                {"label": "6", "matrix": [0, 6], "x": 6, "y": 1},
-                {"label": "7", "matrix": [0, 7], "x": 7, "y": 1},
-                {"label": "8", "matrix": [0, 8], "x": 8, "y": 1},
-                {"label": "9", "matrix": [0, 9], "x": 9, "y": 1},
-                {"label": "0", "matrix": [0, 10], "x": 10, "y": 1},
-                {"label": "-", "matrix": [0, 11], "x": 11, "y": 1},
-                {"label": "=", "matrix": [0, 12], "x": 12, "y": 1},
-                {"label": "Delete", "matrix": [0, 13], "x": 13, "y": 1},
-                {"label": "Backspace", "matrix": [0, 14], "x": 14, "y": 1},
-                {"label": "Copy", "matrix": [0, 15], "x": 15, "y": 1},
-
-                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 2, "w": 1.5},
-                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 2},
-                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 2},
-                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 2},
-                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 2},
-                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 2},
-                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 2},
-                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 2},
-                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 2},
-                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 2},
-                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 2},
-                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 2},
-                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 2},
-                {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 2, "w": 1.5},
-                {"label": "Paste", "matrix": [1, 15], "x": 15, "y": 2},
-
-                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 3, "w": 1.75},
-                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 3},
-                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 3},
-                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 3},
-                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 3},
-                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 3},
-                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 3},
-                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 3},
-                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 3},
-                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 3},
-                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 3},
-                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 3},
-                {"label": "#", "matrix": [2, 12], "x": 12.75, "y": 3},
-                {"label": "Enter", "matrix": [2, 13], "x": 13.75, "y": 3, "w": 1.25},
-                {"label": "Find", "matrix": [2, 15], "x": 15, "y": 3},
-
-                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 4, "w": 1.25},
-                {"label": "\\", "matrix": [3, 1], "x": 1.25, "y": 4},
-                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 4},
-                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 4},
-                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 4},
-                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 4},
-                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 4},
-                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 4},
-                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 4},
-                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 4},
-                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 4},
-                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 4},
-                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 4, "w": 1.75},
-                {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 4},
-                {"label": "Fn", "matrix": [3, 15], "x": 15, "y": 4},
-
-                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 5, "w": 1.5},
-                {"label": "Alt", "matrix": [4, 1], "x": 2.25, "y": 5, "w": 1.5},
-                {"label": "Space", "matrix": [4, 7], "x": 3.75, "y": 5, "w": 7},
-                {"label": "Alt", "matrix": [4, 11], "x": 10.75, "y": 5, "w": 1.5},
-
-                {"label": "\u2190", "matrix": [4, 12], "x": 13, "y": 5},
-                {"label": "\u2193", "matrix": [4, 13], "x": 14, "y": 5},
-                {"label": "\u2192", "matrix": [4, 15], "x": 15, "y": 5}
-            ]
-        },
-        "LAYOUT_ansi_blocker_tsangan_wkl": {
-            "layout": [
-                {"label": "Play/Pause", "matrix": [4, 2], "x": 3.5, "y": 0},
-
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 1},
-                {"label": "1", "matrix": [0, 1], "x": 1, "y": 1},
-                {"label": "2", "matrix": [0, 2], "x": 2, "y": 1},
-                {"label": "3", "matrix": [0, 3], "x": 3, "y": 1},
-                {"label": "4", "matrix": [0, 4], "x": 4, "y": 1},
-                {"label": "5", "matrix": [0, 5], "x": 5, "y": 1},
-                {"label": "6", "matrix": [0, 6], "x": 6, "y": 1},
-                {"label": "7", "matrix": [0, 7], "x": 7, "y": 1},
-                {"label": "8", "matrix": [0, 8], "x": 8, "y": 1},
-                {"label": "9", "matrix": [0, 9], "x": 9, "y": 1},
-                {"label": "0", "matrix": [0, 10], "x": 10, "y": 1},
-                {"label": "-", "matrix": [0, 11], "x": 11, "y": 1},
-                {"label": "=", "matrix": [0, 12], "x": 12, "y": 1},
-                {"label": "Backspace", "matrix": [0, 14], "x": 13, "y": 1, "w": 2},
-                {"label": "Copy", "matrix": [0, 15], "x": 15, "y": 1},
-
-                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 2, "w": 1.5},
-                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 2},
-                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 2},
-                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 2},
-                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 2},
-                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 2},
-                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 2},
-                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 2},
-                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 2},
-                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 2},
-                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 2},
-                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 2},
-                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 2},
-                {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 2, "w": 1.5},
-                {"label": "Paste", "matrix": [1, 15], "x": 15, "y": 2},
-
-                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 3, "w": 1.75},
-                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 3},
-                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 3},
-                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 3},
-                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 3},
-                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 3},
-                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 3},
-                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 3},
-                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 3},
-                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 3},
-                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 3},
-                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 3},
-                {"label": "Enter", "matrix": [2, 13], "x": 12.75, "y": 3, "w": 2.25},
-                {"label": "Find", "matrix": [2, 15], "x": 15, "y": 3},
-
-                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 4, "w": 2.25},
-                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 4},
-                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 4},
-                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 4},
-                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 4},
-                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 4},
-                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 4},
-                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 4},
-                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 4},
-                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 4},
-                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 4},
-                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 4, "w": 1.75},
-                {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 4},
-                {"label": "Fn", "matrix": [3, 15], "x": 15, "y": 4},
-
-                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 5, "w": 1.5},
-                {"label": "Alt", "matrix": [4, 1], "x": 2.25, "y": 5, "w": 1.5},
-                {"label": "Space", "matrix": [4, 7], "x": 3.75, "y": 5, "w": 7},
-                {"label": "Alt", "matrix": [4, 11], "x": 10.75, "y": 5, "w": 1.5},
-
-                {"label": "\u2190", "matrix": [4, 12], "x": 13, "y": 5},
-                {"label": "\u2193", "matrix": [4, 13], "x": 14, "y": 5},
-                {"label": "\u2192", "matrix": [4, 15], "x": 15, "y": 5}
-            ]
-        },
-        "LAYOUT_ansi_blocker_tsangan_wkl_split_bs": {
-            "layout": [
-                {"label": "Play/Pause", "matrix": [4, 2], "x": 3.5, "y": 0},
-
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 1},
-                {"label": "1", "matrix": [0, 1], "x": 1, "y": 1},
-                {"label": "2", "matrix": [0, 2], "x": 2, "y": 1},
-                {"label": "3", "matrix": [0, 3], "x": 3, "y": 1},
-                {"label": "4", "matrix": [0, 4], "x": 4, "y": 1},
-                {"label": "5", "matrix": [0, 5], "x": 5, "y": 1},
-                {"label": "6", "matrix": [0, 6], "x": 6, "y": 1},
-                {"label": "7", "matrix": [0, 7], "x": 7, "y": 1},
-                {"label": "8", "matrix": [0, 8], "x": 8, "y": 1},
-                {"label": "9", "matrix": [0, 9], "x": 9, "y": 1},
-                {"label": "0", "matrix": [0, 10], "x": 10, "y": 1},
-                {"label": "-", "matrix": [0, 11], "x": 11, "y": 1},
-                {"label": "=", "matrix": [0, 12], "x": 12, "y": 1},
-                {"label": "Delete", "matrix": [0, 13], "x": 13, "y": 1},
-                {"label": "Backspace", "matrix": [0, 14], "x": 14, "y": 1},
-                {"label": "Copy", "matrix": [0, 15], "x": 15, "y": 1},
-
-                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 2, "w": 1.5},
-                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 2},
-                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 2},
-                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 2},
-                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 2},
-                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 2},
-                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 2},
-                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 2},
-                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 2},
-                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 2},
-                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 2},
-                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 2},
-                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 2},
-                {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 2, "w": 1.5},
-                {"label": "Paste", "matrix": [1, 15], "x": 15, "y": 2},
-
-                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 3, "w": 1.75},
-                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 3},
-                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 3},
-                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 3},
-                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 3},
-                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 3},
-                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 3},
-                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 3},
-                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 3},
-                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 3},
-                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 3},
-                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 3},
-                {"label": "Enter", "matrix": [2, 13], "x": 12.75, "y": 3, "w": 2.25},
-                {"label": "Find", "matrix": [2, 15], "x": 15, "y": 3},
-
-                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 4, "w": 2.25},
-                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 4},
-                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 4},
-                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 4},
-                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 4},
-                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 4},
-                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 4},
-                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 4},
-                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 4},
-                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 4},
-                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 4},
-                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 4, "w": 1.75},
-                {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 4},
-                {"label": "Fn", "matrix": [3, 15], "x": 15, "y": 4},
-
-                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 5, "w": 1.5},
-                {"label": "Alt", "matrix": [4, 1], "x": 2.25, "y": 5, "w": 1.5},
-                {"label": "Space", "matrix": [4, 7], "x": 3.75, "y": 5, "w": 7},
-                {"label": "Alt", "matrix": [4, 11], "x": 10.75, "y": 5, "w": 1.5},
-
-                {"label": "\u2190", "matrix": [4, 12], "x": 13, "y": 5},
-                {"label": "\u2193", "matrix": [4, 13], "x": 14, "y": 5},
-                {"label": "\u2192", "matrix": [4, 15], "x": 15, "y": 5}
-            ]
-        },
-        "LAYOUT_iso_blocker_tsangan_wkl": {
-            "layout": [
-                {"label": "Play/Pause", "matrix": [4, 2], "x": 3.5, "y": 0},
-
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 1},
-                {"label": "1", "matrix": [0, 1], "x": 1, "y": 1},
-                {"label": "2", "matrix": [0, 2], "x": 2, "y": 1},
-                {"label": "3", "matrix": [0, 3], "x": 3, "y": 1},
-                {"label": "4", "matrix": [0, 4], "x": 4, "y": 1},
-                {"label": "5", "matrix": [0, 5], "x": 5, "y": 1},
-                {"label": "6", "matrix": [0, 6], "x": 6, "y": 1},
-                {"label": "7", "matrix": [0, 7], "x": 7, "y": 1},
-                {"label": "8", "matrix": [0, 8], "x": 8, "y": 1},
-                {"label": "9", "matrix": [0, 9], "x": 9, "y": 1},
-                {"label": "0", "matrix": [0, 10], "x": 10, "y": 1},
-                {"label": "-", "matrix": [0, 11], "x": 11, "y": 1},
-                {"label": "=", "matrix": [0, 12], "x": 12, "y": 1},
-                {"label": "Backspace", "matrix": [0, 14], "x": 13, "y": 1, "w": 2},
-                {"label": "Copy", "matrix": [0, 15], "x": 15, "y": 1},
-
-                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 2, "w": 1.5},
-                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 2},
-                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 2},
-                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 2},
-                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 2},
-                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 2},
-                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 2},
-                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 2},
-                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 2},
-                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 2},
-                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 2},
-                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 2},
-                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 2},
-                {"label": "Paste", "matrix": [1, 15], "x": 15, "y": 2},
-
-                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 3, "w": 1.75},
-                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 3},
-                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 3},
-                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 3},
-                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 3},
-                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 3},
-                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 3},
-                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 3},
-                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 3},
-                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 3},
-                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 3},
-                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 3},
-                {"label": "#", "matrix": [2, 12], "x": 12.75, "y": 3},
-                {"label": "Enter", "matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.25, "h": 2},
-                {"label": "Find", "matrix": [2, 15], "x": 15, "y": 3},
-
-                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 4, "w": 1.25},
-                {"label": "\\", "matrix": [3, 1], "x": 1.25, "y": 4},
-                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 4},
-                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 4},
-                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 4},
-                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 4},
-                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 4},
-                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 4},
-                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 4},
-                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 4},
-                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 4},
-                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 4},
-                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 4, "w": 1.75},
-                {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 4},
-                {"label": "Fn", "matrix": [3, 15], "x": 15, "y": 4},
-
-                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 5, "w": 1.5},
-                {"label": "Alt", "matrix": [4, 1], "x": 2.25, "y": 5, "w": 1.5},
-                {"label": "Space", "matrix": [4, 7], "x": 3.75, "y": 5, "w": 7},
-                {"label": "Alt", "matrix": [4, 11], "x": 10.75, "y": 5, "w": 1.5},
-
-                {"label": "\u2190", "matrix": [4, 12], "x": 13, "y": 5},
-                {"label": "\u2193", "matrix": [4, 13], "x": 14, "y": 5},
-                {"label": "\u2192", "matrix": [4, 15], "x": 15, "y": 5}
-            ]
-        },
-        "LAYOUT_iso_blocker_tsangan_wkl_split_bs": {
-            "layout": [
-                {"label": "Play/Pause", "matrix": [4, 2], "x": 3.5, "y": 0},
-
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 1},
-                {"label": "1", "matrix": [0, 1], "x": 1, "y": 1},
-                {"label": "2", "matrix": [0, 2], "x": 2, "y": 1},
-                {"label": "3", "matrix": [0, 3], "x": 3, "y": 1},
-                {"label": "4", "matrix": [0, 4], "x": 4, "y": 1},
-                {"label": "5", "matrix": [0, 5], "x": 5, "y": 1},
-                {"label": "6", "matrix": [0, 6], "x": 6, "y": 1},
-                {"label": "7", "matrix": [0, 7], "x": 7, "y": 1},
-                {"label": "8", "matrix": [0, 8], "x": 8, "y": 1},
-                {"label": "9", "matrix": [0, 9], "x": 9, "y": 1},
-                {"label": "0", "matrix": [0, 10], "x": 10, "y": 1},
-                {"label": "-", "matrix": [0, 11], "x": 11, "y": 1},
-                {"label": "=", "matrix": [0, 12], "x": 12, "y": 1},
-                {"label": "Delete", "matrix": [0, 13], "x": 13, "y": 1},
-                {"label": "Backspace", "matrix": [0, 14], "x": 14, "y": 1},
-                {"label": "Copy", "matrix": [0, 15], "x": 15, "y": 1},
-
-                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 2, "w": 1.5},
-                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 2},
-                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 2},
-                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 2},
-                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 2},
-                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 2},
-                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 2},
-                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 2},
-                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 2},
-                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 2},
-                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 2},
-                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 2},
-                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 2},
-                {"label": "Paste", "matrix": [1, 15], "x": 15, "y": 2},
-
-                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 3, "w": 1.75},
-                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 3},
-                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 3},
-                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 3},
-                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 3},
-                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 3},
-                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 3},
-                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 3},
-                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 3},
-                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 3},
-                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 3},
-                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 3},
-                {"label": "#", "matrix": [2, 12], "x": 12.75, "y": 3},
-                {"label": "Enter", "matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.25, "h": 2},
-                {"label": "Find", "matrix": [2, 15], "x": 15, "y": 3},
-
-                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 4, "w": 1.25},
-                {"label": "\\", "matrix": [3, 1], "x": 1.25, "y": 4},
-                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 4},
-                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 4},
-                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 4},
-                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 4},
-                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 4},
-                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 4},
-                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 4},
-                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 4},
-                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 4},
-                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 4},
-                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 4, "w": 1.75},
-                {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 4},
-                {"label": "Fn", "matrix": [3, 15], "x": 15, "y": 4},
-
-                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 5, "w": 1.5},
-                {"label": "Alt", "matrix": [4, 1], "x": 2.25, "y": 5, "w": 1.5},
-                {"label": "Space", "matrix": [4, 7], "x": 3.75, "y": 5, "w": 7},
-                {"label": "Alt", "matrix": [4, 11], "x": 10.75, "y": 5, "w": 1.5},
-
-                {"label": "\u2190", "matrix": [4, 12], "x": 13, "y": 5},
-                {"label": "\u2193", "matrix": [4, 13], "x": 14, "y": 5},
-                {"label": "\u2192", "matrix": [4, 15], "x": 15, "y": 5}
-            ]
-        }
-    }
-}
diff --git a/keyboards/pearlboards/atlas/keyboard.json b/keyboards/pearlboards/atlas/keyboard.json
new file mode 100644
index 00000000000..714a344c33a
--- /dev/null
+++ b/keyboards/pearlboards/atlas/keyboard.json
@@ -0,0 +1,454 @@
+{
+    "keyboard_name": "Atlas",
+    "manufacturer": "Koobaczech",
+    "url": "",
+    "maintainer": "Koobaczech",
+    "usb": {
+        "vid": "0x6963",
+        "pid": "0x6964",
+        "device_version": "0.0.1"
+    },
+    "build": {
+        "lto": true
+    },
+    "features": {
+        "audio": true,
+        "bootmagic": false,
+        "encoder": true,
+        "extrakey": true,
+        "haptic": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgblight": true
+    },
+    "matrix_pins": {
+        "cols": ["D5", "D4", "C1", "C2", "C3", "C5", "C7", "A7", "A6", "A5", "A4", "A3", "A2", "A1", "A0", "F7"],
+        "rows": ["D6", "E1", "C0", "C4", "E3"]
+    },
+    "diode_direction": "COL2ROW",
+    "encoder": {
+        "rotary": [
+            {"pin_a": "E0", "pin_b": "D7", "resolution": 1}
+        ]
+    },
+    "haptic": {
+        "driver": "drv2605l"
+    },
+    "indicators": {
+        "caps_lock": "F4",
+        "num_lock": "F5",
+        "scroll_lock": "F6",
+        "on_state": 0
+    },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 8,
+        "sleep": true,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "alternating": true,
+            "twinkle": true
+        }
+    },
+    "ws2812": {
+        "pin": "B6"
+    },
+    "processor": "at90usb1286",
+    "bootloader": "atmel-dfu",
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                {"label": "Play/Pause", "matrix": [4, 2], "x": 3.5, "y": 0},
+
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 1},
+                {"label": "1", "matrix": [0, 1], "x": 1, "y": 1},
+                {"label": "2", "matrix": [0, 2], "x": 2, "y": 1},
+                {"label": "3", "matrix": [0, 3], "x": 3, "y": 1},
+                {"label": "4", "matrix": [0, 4], "x": 4, "y": 1},
+                {"label": "5", "matrix": [0, 5], "x": 5, "y": 1},
+                {"label": "6", "matrix": [0, 6], "x": 6, "y": 1},
+                {"label": "7", "matrix": [0, 7], "x": 7, "y": 1},
+                {"label": "8", "matrix": [0, 8], "x": 8, "y": 1},
+                {"label": "9", "matrix": [0, 9], "x": 9, "y": 1},
+                {"label": "0", "matrix": [0, 10], "x": 10, "y": 1},
+                {"label": "-", "matrix": [0, 11], "x": 11, "y": 1},
+                {"label": "=", "matrix": [0, 12], "x": 12, "y": 1},
+                {"label": "Delete", "matrix": [0, 13], "x": 13, "y": 1},
+                {"label": "Backspace", "matrix": [0, 14], "x": 14, "y": 1},
+                {"label": "Copy", "matrix": [0, 15], "x": 15, "y": 1},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 2, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 2},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 2},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 2},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 2},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 2},
+                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 2},
+                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 2},
+                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 2},
+                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 2},
+                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 2},
+                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 2},
+                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 2},
+                {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 2, "w": 1.5},
+                {"label": "Paste", "matrix": [1, 15], "x": 15, "y": 2},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 3, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 3},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 3},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 3},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 3},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 3},
+                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 3},
+                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 3},
+                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 3},
+                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 3},
+                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 3},
+                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 3},
+                {"label": "#", "matrix": [2, 12], "x": 12.75, "y": 3},
+                {"label": "Enter", "matrix": [2, 13], "x": 13.75, "y": 3, "w": 1.25},
+                {"label": "Find", "matrix": [2, 15], "x": 15, "y": 3},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "\\", "matrix": [3, 1], "x": 1.25, "y": 4},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 4},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 4},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 4},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 4},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 4},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 4},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 4},
+                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 4},
+                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 4},
+                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 4},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 4, "w": 1.75},
+                {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 4},
+                {"label": "Fn", "matrix": [3, 15], "x": 15, "y": 4},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 5, "w": 1.5},
+                {"label": "Alt", "matrix": [4, 1], "x": 2.25, "y": 5, "w": 1.5},
+                {"label": "Space", "matrix": [4, 7], "x": 3.75, "y": 5, "w": 7},
+                {"label": "Alt", "matrix": [4, 11], "x": 10.75, "y": 5, "w": 1.5},
+
+                {"label": "\u2190", "matrix": [4, 12], "x": 13, "y": 5},
+                {"label": "\u2193", "matrix": [4, 13], "x": 14, "y": 5},
+                {"label": "\u2192", "matrix": [4, 15], "x": 15, "y": 5}
+            ]
+        },
+        "LAYOUT_ansi_blocker_tsangan_wkl": {
+            "layout": [
+                {"label": "Play/Pause", "matrix": [4, 2], "x": 3.5, "y": 0},
+
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 1},
+                {"label": "1", "matrix": [0, 1], "x": 1, "y": 1},
+                {"label": "2", "matrix": [0, 2], "x": 2, "y": 1},
+                {"label": "3", "matrix": [0, 3], "x": 3, "y": 1},
+                {"label": "4", "matrix": [0, 4], "x": 4, "y": 1},
+                {"label": "5", "matrix": [0, 5], "x": 5, "y": 1},
+                {"label": "6", "matrix": [0, 6], "x": 6, "y": 1},
+                {"label": "7", "matrix": [0, 7], "x": 7, "y": 1},
+                {"label": "8", "matrix": [0, 8], "x": 8, "y": 1},
+                {"label": "9", "matrix": [0, 9], "x": 9, "y": 1},
+                {"label": "0", "matrix": [0, 10], "x": 10, "y": 1},
+                {"label": "-", "matrix": [0, 11], "x": 11, "y": 1},
+                {"label": "=", "matrix": [0, 12], "x": 12, "y": 1},
+                {"label": "Backspace", "matrix": [0, 14], "x": 13, "y": 1, "w": 2},
+                {"label": "Copy", "matrix": [0, 15], "x": 15, "y": 1},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 2, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 2},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 2},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 2},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 2},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 2},
+                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 2},
+                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 2},
+                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 2},
+                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 2},
+                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 2},
+                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 2},
+                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 2},
+                {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 2, "w": 1.5},
+                {"label": "Paste", "matrix": [1, 15], "x": 15, "y": 2},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 3, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 3},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 3},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 3},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 3},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 3},
+                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 3},
+                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 3},
+                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 3},
+                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 3},
+                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 3},
+                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 3},
+                {"label": "Enter", "matrix": [2, 13], "x": 12.75, "y": 3, "w": 2.25},
+                {"label": "Find", "matrix": [2, 15], "x": 15, "y": 3},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 4, "w": 2.25},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 4},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 4},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 4},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 4},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 4},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 4},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 4},
+                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 4},
+                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 4},
+                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 4},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 4, "w": 1.75},
+                {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 4},
+                {"label": "Fn", "matrix": [3, 15], "x": 15, "y": 4},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 5, "w": 1.5},
+                {"label": "Alt", "matrix": [4, 1], "x": 2.25, "y": 5, "w": 1.5},
+                {"label": "Space", "matrix": [4, 7], "x": 3.75, "y": 5, "w": 7},
+                {"label": "Alt", "matrix": [4, 11], "x": 10.75, "y": 5, "w": 1.5},
+
+                {"label": "\u2190", "matrix": [4, 12], "x": 13, "y": 5},
+                {"label": "\u2193", "matrix": [4, 13], "x": 14, "y": 5},
+                {"label": "\u2192", "matrix": [4, 15], "x": 15, "y": 5}
+            ]
+        },
+        "LAYOUT_ansi_blocker_tsangan_wkl_split_bs": {
+            "layout": [
+                {"label": "Play/Pause", "matrix": [4, 2], "x": 3.5, "y": 0},
+
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 1},
+                {"label": "1", "matrix": [0, 1], "x": 1, "y": 1},
+                {"label": "2", "matrix": [0, 2], "x": 2, "y": 1},
+                {"label": "3", "matrix": [0, 3], "x": 3, "y": 1},
+                {"label": "4", "matrix": [0, 4], "x": 4, "y": 1},
+                {"label": "5", "matrix": [0, 5], "x": 5, "y": 1},
+                {"label": "6", "matrix": [0, 6], "x": 6, "y": 1},
+                {"label": "7", "matrix": [0, 7], "x": 7, "y": 1},
+                {"label": "8", "matrix": [0, 8], "x": 8, "y": 1},
+                {"label": "9", "matrix": [0, 9], "x": 9, "y": 1},
+                {"label": "0", "matrix": [0, 10], "x": 10, "y": 1},
+                {"label": "-", "matrix": [0, 11], "x": 11, "y": 1},
+                {"label": "=", "matrix": [0, 12], "x": 12, "y": 1},
+                {"label": "Delete", "matrix": [0, 13], "x": 13, "y": 1},
+                {"label": "Backspace", "matrix": [0, 14], "x": 14, "y": 1},
+                {"label": "Copy", "matrix": [0, 15], "x": 15, "y": 1},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 2, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 2},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 2},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 2},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 2},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 2},
+                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 2},
+                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 2},
+                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 2},
+                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 2},
+                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 2},
+                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 2},
+                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 2},
+                {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 2, "w": 1.5},
+                {"label": "Paste", "matrix": [1, 15], "x": 15, "y": 2},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 3, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 3},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 3},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 3},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 3},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 3},
+                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 3},
+                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 3},
+                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 3},
+                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 3},
+                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 3},
+                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 3},
+                {"label": "Enter", "matrix": [2, 13], "x": 12.75, "y": 3, "w": 2.25},
+                {"label": "Find", "matrix": [2, 15], "x": 15, "y": 3},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 4, "w": 2.25},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 4},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 4},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 4},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 4},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 4},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 4},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 4},
+                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 4},
+                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 4},
+                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 4},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 4, "w": 1.75},
+                {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 4},
+                {"label": "Fn", "matrix": [3, 15], "x": 15, "y": 4},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 5, "w": 1.5},
+                {"label": "Alt", "matrix": [4, 1], "x": 2.25, "y": 5, "w": 1.5},
+                {"label": "Space", "matrix": [4, 7], "x": 3.75, "y": 5, "w": 7},
+                {"label": "Alt", "matrix": [4, 11], "x": 10.75, "y": 5, "w": 1.5},
+
+                {"label": "\u2190", "matrix": [4, 12], "x": 13, "y": 5},
+                {"label": "\u2193", "matrix": [4, 13], "x": 14, "y": 5},
+                {"label": "\u2192", "matrix": [4, 15], "x": 15, "y": 5}
+            ]
+        },
+        "LAYOUT_iso_blocker_tsangan_wkl": {
+            "layout": [
+                {"label": "Play/Pause", "matrix": [4, 2], "x": 3.5, "y": 0},
+
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 1},
+                {"label": "1", "matrix": [0, 1], "x": 1, "y": 1},
+                {"label": "2", "matrix": [0, 2], "x": 2, "y": 1},
+                {"label": "3", "matrix": [0, 3], "x": 3, "y": 1},
+                {"label": "4", "matrix": [0, 4], "x": 4, "y": 1},
+                {"label": "5", "matrix": [0, 5], "x": 5, "y": 1},
+                {"label": "6", "matrix": [0, 6], "x": 6, "y": 1},
+                {"label": "7", "matrix": [0, 7], "x": 7, "y": 1},
+                {"label": "8", "matrix": [0, 8], "x": 8, "y": 1},
+                {"label": "9", "matrix": [0, 9], "x": 9, "y": 1},
+                {"label": "0", "matrix": [0, 10], "x": 10, "y": 1},
+                {"label": "-", "matrix": [0, 11], "x": 11, "y": 1},
+                {"label": "=", "matrix": [0, 12], "x": 12, "y": 1},
+                {"label": "Backspace", "matrix": [0, 14], "x": 13, "y": 1, "w": 2},
+                {"label": "Copy", "matrix": [0, 15], "x": 15, "y": 1},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 2, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 2},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 2},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 2},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 2},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 2},
+                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 2},
+                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 2},
+                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 2},
+                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 2},
+                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 2},
+                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 2},
+                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 2},
+                {"label": "Paste", "matrix": [1, 15], "x": 15, "y": 2},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 3, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 3},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 3},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 3},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 3},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 3},
+                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 3},
+                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 3},
+                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 3},
+                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 3},
+                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 3},
+                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 3},
+                {"label": "#", "matrix": [2, 12], "x": 12.75, "y": 3},
+                {"label": "Enter", "matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.25, "h": 2},
+                {"label": "Find", "matrix": [2, 15], "x": 15, "y": 3},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "\\", "matrix": [3, 1], "x": 1.25, "y": 4},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 4},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 4},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 4},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 4},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 4},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 4},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 4},
+                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 4},
+                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 4},
+                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 4},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 4, "w": 1.75},
+                {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 4},
+                {"label": "Fn", "matrix": [3, 15], "x": 15, "y": 4},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 5, "w": 1.5},
+                {"label": "Alt", "matrix": [4, 1], "x": 2.25, "y": 5, "w": 1.5},
+                {"label": "Space", "matrix": [4, 7], "x": 3.75, "y": 5, "w": 7},
+                {"label": "Alt", "matrix": [4, 11], "x": 10.75, "y": 5, "w": 1.5},
+
+                {"label": "\u2190", "matrix": [4, 12], "x": 13, "y": 5},
+                {"label": "\u2193", "matrix": [4, 13], "x": 14, "y": 5},
+                {"label": "\u2192", "matrix": [4, 15], "x": 15, "y": 5}
+            ]
+        },
+        "LAYOUT_iso_blocker_tsangan_wkl_split_bs": {
+            "layout": [
+                {"label": "Play/Pause", "matrix": [4, 2], "x": 3.5, "y": 0},
+
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 1},
+                {"label": "1", "matrix": [0, 1], "x": 1, "y": 1},
+                {"label": "2", "matrix": [0, 2], "x": 2, "y": 1},
+                {"label": "3", "matrix": [0, 3], "x": 3, "y": 1},
+                {"label": "4", "matrix": [0, 4], "x": 4, "y": 1},
+                {"label": "5", "matrix": [0, 5], "x": 5, "y": 1},
+                {"label": "6", "matrix": [0, 6], "x": 6, "y": 1},
+                {"label": "7", "matrix": [0, 7], "x": 7, "y": 1},
+                {"label": "8", "matrix": [0, 8], "x": 8, "y": 1},
+                {"label": "9", "matrix": [0, 9], "x": 9, "y": 1},
+                {"label": "0", "matrix": [0, 10], "x": 10, "y": 1},
+                {"label": "-", "matrix": [0, 11], "x": 11, "y": 1},
+                {"label": "=", "matrix": [0, 12], "x": 12, "y": 1},
+                {"label": "Delete", "matrix": [0, 13], "x": 13, "y": 1},
+                {"label": "Backspace", "matrix": [0, 14], "x": 14, "y": 1},
+                {"label": "Copy", "matrix": [0, 15], "x": 15, "y": 1},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 2, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 2},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 2},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 2},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 2},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 2},
+                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 2},
+                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 2},
+                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 2},
+                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 2},
+                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 2},
+                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 2},
+                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 2},
+                {"label": "Paste", "matrix": [1, 15], "x": 15, "y": 2},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 3, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 3},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 3},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 3},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 3},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 3},
+                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 3},
+                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 3},
+                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 3},
+                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 3},
+                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 3},
+                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 3},
+                {"label": "#", "matrix": [2, 12], "x": 12.75, "y": 3},
+                {"label": "Enter", "matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.25, "h": 2},
+                {"label": "Find", "matrix": [2, 15], "x": 15, "y": 3},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "\\", "matrix": [3, 1], "x": 1.25, "y": 4},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 4},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 4},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 4},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 4},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 4},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 4},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 4},
+                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 4},
+                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 4},
+                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 4},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 4, "w": 1.75},
+                {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 4},
+                {"label": "Fn", "matrix": [3, 15], "x": 15, "y": 4},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 5, "w": 1.5},
+                {"label": "Alt", "matrix": [4, 1], "x": 2.25, "y": 5, "w": 1.5},
+                {"label": "Space", "matrix": [4, 7], "x": 3.75, "y": 5, "w": 7},
+                {"label": "Alt", "matrix": [4, 11], "x": 10.75, "y": 5, "w": 1.5},
+
+                {"label": "\u2190", "matrix": [4, 12], "x": 13, "y": 5},
+                {"label": "\u2193", "matrix": [4, 13], "x": 14, "y": 5},
+                {"label": "\u2192", "matrix": [4, 15], "x": 15, "y": 5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/pearlboards/atlas/rules.mk b/keyboards/pearlboards/atlas/rules.mk
deleted file mode 100644
index 1dd174f4366..00000000000
--- a/keyboards/pearlboards/atlas/rules.mk
+++ /dev/null
@@ -1,17 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-AUDIO_ENABLE = yes          # Audio output
-ENCODER_ENABLE = yes
-HAPTIC_ENABLE = yes
-HAPTIC_DRIVER = drv2605l
-
-LTO_ENABLE = yes
diff --git a/keyboards/pearlboards/pearl/info.json b/keyboards/pearlboards/pearl/info.json
deleted file mode 100644
index 43dd3ad871d..00000000000
--- a/keyboards/pearlboards/pearl/info.json
+++ /dev/null
@@ -1,148 +0,0 @@
-{
-    "keyboard_name": "Pearl",
-    "manufacturer": "Koobaczech",
-    "url": "",
-    "maintainer": "Koobaczech",
-    "usb": {
-        "vid": "0x6963",
-        "pid": "0x6965",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["D2", "F1", "F4", "F5", "F6", "C7", "B6", "B5", "B4", "D7", "D6", "D4", "D5"],
-        "rows": ["D3", "F7", "F0", "E6"]
-    },
-    "diode_direction": "COL2ROW",
-    "indicators": {
-        "caps_lock": "B0",
-        "num_lock": "B1",
-        "scroll_lock": "B2",
-        "on_state": 0
-    },
-    "rgblight": {
-        "saturation_steps": 8,
-        "brightness_steps": 8,
-        "led_count": 10,
-        "sleep": true,
-        "animations": {
-            "breathing": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "snake": true,
-            "knight": true,
-            "christmas": true,
-            "static_gradient": true,
-            "rgb_test": true,
-            "alternating": true,
-            "twinkle": true
-        }
-    },
-    "ws2812": {
-        "pin": "B3"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "debounce": 4,
-    "layouts": {
-        "LAYOUT_all": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "Q", "matrix": [0, 1], "x": 1, "y": 0},
-                {"label": "W", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "E", "matrix": [0, 3], "x": 3, "y": 0},
-                {"label": "R", "matrix": [0, 4], "x": 4, "y": 0},
-                {"label": "T", "matrix": [0, 5], "x": 5, "y": 0},
-                {"label": "Y", "matrix": [0, 6], "x": 6, "y": 0},
-                {"label": "U", "matrix": [0, 7], "x": 7, "y": 0},
-                {"label": "I", "matrix": [0, 8], "x": 8, "y": 0},
-                {"label": "O", "matrix": [0, 9], "x": 9, "y": 0},
-                {"label": "P", "matrix": [0, 10], "x": 10, "y": 0},
-                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
-                {"label": "Backspace", "matrix": [0, 12], "x": 12, "y": 0},
-
-                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"label": "A", "matrix": [1, 1], "x": 1.5, "y": 1},
-                {"label": "S", "matrix": [1, 2], "x": 2.5, "y": 1},
-                {"label": "D", "matrix": [1, 3], "x": 3.5, "y": 1},
-                {"label": "F", "matrix": [1, 4], "x": 4.5, "y": 1},
-                {"label": "G", "matrix": [1, 5], "x": 5.5, "y": 1},
-                {"label": "H", "matrix": [1, 6], "x": 6.5, "y": 1},
-                {"label": "J", "matrix": [1, 7], "x": 7.5, "y": 1},
-                {"label": "K", "matrix": [1, 8], "x": 8.5, "y": 1},
-                {"label": "L", "matrix": [1, 9], "x": 9.5, "y": 1},
-                {"label": ";", "matrix": [1, 10], "x": 10.5, "y": 1},
-                {"label": "Enter", "matrix": [1, 11], "x": 11.5, "y": 1, "w": 1.5},
-
-                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"label": "Z", "matrix": [2, 1], "x": 1.75, "y": 2},
-                {"label": "X", "matrix": [2, 2], "x": 2.75, "y": 2},
-                {"label": "C", "matrix": [2, 3], "x": 3.75, "y": 2},
-                {"label": "V", "matrix": [2, 4], "x": 4.75, "y": 2},
-                {"label": "B", "matrix": [2, 5], "x": 5.75, "y": 2},
-                {"label": "N", "matrix": [2, 6], "x": 6.75, "y": 2},
-                {"label": "M", "matrix": [2, 7], "x": 7.75, "y": 2},
-                {"label": ",", "matrix": [2, 8], "x": 8.75, "y": 2},
-                {"label": ".", "matrix": [2, 9], "x": 9.75, "y": 2},
-                {"label": "/", "matrix": [2, 10], "x": 10.75, "y": 2},
-                {"label": "Shift", "matrix": [2, 11], "x": 11.75, "y": 2, "w": 1.25},
-
-                {"label": "Ctrl", "matrix": [3, 0], "x": 1.125, "y": 3},
-                {"label": "Alt", "matrix": [3, 1], "x": 2.125, "y": 3, "w": 1.25},
-                {"label": "GUI", "matrix": [3, 2], "x": 3.375, "y": 3, "w": 1.25},
-                {"label": "Space", "matrix": [3, 3], "x": 4.625, "y": 3, "w": 2.25},
-                {"label": "Backspace", "matrix": [3, 4], "x": 6.875, "y": 3, "w": 2.75},
-                {"label": "Menu", "matrix": [3, 5], "x": 9.625, "y": 3, "w": 1.25},
-                {"label": "Fn", "matrix": [3, 6], "x": 10.875, "y": 3}
-            ]
-        },
-        "LAYOUT_625u_space": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "Q", "matrix": [0, 1], "x": 1, "y": 0},
-                {"label": "W", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "E", "matrix": [0, 3], "x": 3, "y": 0},
-                {"label": "R", "matrix": [0, 4], "x": 4, "y": 0},
-                {"label": "T", "matrix": [0, 5], "x": 5, "y": 0},
-                {"label": "Y", "matrix": [0, 6], "x": 6, "y": 0},
-                {"label": "U", "matrix": [0, 7], "x": 7, "y": 0},
-                {"label": "I", "matrix": [0, 8], "x": 8, "y": 0},
-                {"label": "O", "matrix": [0, 9], "x": 9, "y": 0},
-                {"label": "P", "matrix": [0, 10], "x": 10, "y": 0},
-                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
-                {"label": "Backspace", "matrix": [0, 12], "x": 12, "y": 0},
-
-                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"label": "A", "matrix": [1, 1], "x": 1.5, "y": 1},
-                {"label": "S", "matrix": [1, 2], "x": 2.5, "y": 1},
-                {"label": "D", "matrix": [1, 3], "x": 3.5, "y": 1},
-                {"label": "F", "matrix": [1, 4], "x": 4.5, "y": 1},
-                {"label": "G", "matrix": [1, 5], "x": 5.5, "y": 1},
-                {"label": "H", "matrix": [1, 6], "x": 6.5, "y": 1},
-                {"label": "J", "matrix": [1, 7], "x": 7.5, "y": 1},
-                {"label": "K", "matrix": [1, 8], "x": 8.5, "y": 1},
-                {"label": "L", "matrix": [1, 9], "x": 9.5, "y": 1},
-                {"label": ";", "matrix": [1, 10], "x": 10.5, "y": 1},
-                {"label": "Enter", "matrix": [1, 11], "x": 11.5, "y": 1, "w": 1.5},
-
-                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"label": "Z", "matrix": [2, 1], "x": 1.75, "y": 2},
-                {"label": "X", "matrix": [2, 2], "x": 2.75, "y": 2},
-                {"label": "C", "matrix": [2, 3], "x": 3.75, "y": 2},
-                {"label": "V", "matrix": [2, 4], "x": 4.75, "y": 2},
-                {"label": "B", "matrix": [2, 5], "x": 5.75, "y": 2},
-                {"label": "N", "matrix": [2, 6], "x": 6.75, "y": 2},
-                {"label": "M", "matrix": [2, 7], "x": 7.75, "y": 2},
-                {"label": ",", "matrix": [2, 8], "x": 8.75, "y": 2},
-                {"label": ".", "matrix": [2, 9], "x": 9.75, "y": 2},
-                {"label": "/", "matrix": [2, 10], "x": 10.75, "y": 2},
-                {"label": "Shift", "matrix": [2, 11], "x": 11.75, "y": 2, "w": 1.25},
-
-                {"label": "Ctrl", "matrix": [3, 0], "x": 1.125, "y": 3},
-                {"label": "Alt", "matrix": [3, 1], "x": 2.125, "y": 3, "w": 1.25},
-                {"label": "Space", "matrix": [3, 3], "x": 3.375, "y": 3, "w": 6.25},
-                {"label": "Menu", "matrix": [3, 5], "x": 9.625, "y": 3, "w": 1.25},
-                {"label": "Fn", "matrix": [3, 6], "x": 10.875, "y": 3}
-            ]
-        }
-    }
-}
diff --git a/keyboards/pearlboards/pearl/keyboard.json b/keyboards/pearlboards/pearl/keyboard.json
new file mode 100644
index 00000000000..0dc6f9a7a5e
--- /dev/null
+++ b/keyboards/pearlboards/pearl/keyboard.json
@@ -0,0 +1,163 @@
+{
+    "keyboard_name": "Pearl",
+    "manufacturer": "Koobaczech",
+    "url": "",
+    "maintainer": "Koobaczech",
+    "usb": {
+        "vid": "0x6963",
+        "pid": "0x6965",
+        "device_version": "0.0.1"
+    },
+    "build": {
+        "lto": true
+    },
+    "features": {
+        "audio": true,
+        "bootmagic": false,
+        "extrakey": true,
+        "haptic": true,
+        "mousekey": false,
+        "nkro": true,
+        "rgblight": true
+    },
+    "matrix_pins": {
+        "cols": ["D2", "F1", "F4", "F5", "F6", "C7", "B6", "B5", "B4", "D7", "D6", "D4", "D5"],
+        "rows": ["D3", "F7", "F0", "E6"]
+    },
+    "diode_direction": "COL2ROW",
+    "indicators": {
+        "caps_lock": "B0",
+        "num_lock": "B1",
+        "scroll_lock": "B2",
+        "on_state": 0
+    },
+    "haptic": {
+        "driver": "drv2605l"
+    },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 10,
+        "sleep": true,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": true,
+            "twinkle": true
+        }
+    },
+    "ws2812": {
+        "pin": "B3"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "debounce": 4,
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "Q", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "W", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "E", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "R", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "T", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "Y", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "U", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "I", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "O", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "P", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "Backspace", "matrix": [0, 12], "x": 12, "y": 0},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "A", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "S", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "D", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "F", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "G", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "H", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "J", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "K", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "L", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": ";", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "Enter", "matrix": [1, 11], "x": 11.5, "y": 1, "w": 1.5},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "Z", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "X", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "C", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "V", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "B", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "N", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "M", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": ",", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": ".", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": "/", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "Shift", "matrix": [2, 11], "x": 11.75, "y": 2, "w": 1.25},
+
+                {"label": "Ctrl", "matrix": [3, 0], "x": 1.125, "y": 3},
+                {"label": "Alt", "matrix": [3, 1], "x": 2.125, "y": 3, "w": 1.25},
+                {"label": "GUI", "matrix": [3, 2], "x": 3.375, "y": 3, "w": 1.25},
+                {"label": "Space", "matrix": [3, 3], "x": 4.625, "y": 3, "w": 2.25},
+                {"label": "Backspace", "matrix": [3, 4], "x": 6.875, "y": 3, "w": 2.75},
+                {"label": "Menu", "matrix": [3, 5], "x": 9.625, "y": 3, "w": 1.25},
+                {"label": "Fn", "matrix": [3, 6], "x": 10.875, "y": 3}
+            ]
+        },
+        "LAYOUT_625u_space": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "Q", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "W", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "E", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "R", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "T", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "Y", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "U", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "I", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "O", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "P", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "Backspace", "matrix": [0, 12], "x": 12, "y": 0},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "A", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "S", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "D", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "F", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "G", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "H", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "J", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "K", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "L", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": ";", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "Enter", "matrix": [1, 11], "x": 11.5, "y": 1, "w": 1.5},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "Z", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "X", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "C", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "V", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "B", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "N", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "M", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": ",", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": ".", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": "/", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "Shift", "matrix": [2, 11], "x": 11.75, "y": 2, "w": 1.25},
+
+                {"label": "Ctrl", "matrix": [3, 0], "x": 1.125, "y": 3},
+                {"label": "Alt", "matrix": [3, 1], "x": 2.125, "y": 3, "w": 1.25},
+                {"label": "Space", "matrix": [3, 3], "x": 3.375, "y": 3, "w": 6.25},
+                {"label": "Menu", "matrix": [3, 5], "x": 9.625, "y": 3, "w": 1.25},
+                {"label": "Fn", "matrix": [3, 6], "x": 10.875, "y": 3}
+            ]
+        }
+    }
+}
diff --git a/keyboards/pearlboards/pearl/rules.mk b/keyboards/pearlboards/pearl/rules.mk
deleted file mode 100644
index 83d6c3a33f5..00000000000
--- a/keyboards/pearlboards/pearl/rules.mk
+++ /dev/null
@@ -1,16 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-AUDIO_ENABLE = yes          # Audio output
-HAPTIC_ENABLE = yes
-HAPTIC_DRIVER = drv2605l
-
-LTO_ENABLE = yes
diff --git a/keyboards/pearlboards/zeus/info.json b/keyboards/pearlboards/zeus/info.json
deleted file mode 100644
index 3128b8c1d85..00000000000
--- a/keyboards/pearlboards/zeus/info.json
+++ /dev/null
@@ -1,1383 +0,0 @@
-{
-    "keyboard_name": "Zeus",
-    "manufacturer": "Koobaczech",
-    "url": "",
-    "maintainer": "Koobaczech",
-    "usb": {
-        "vid": "0x6963",
-        "pid": "0x6966",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["F1", "F2", "F3", "F4", "F5", "F6", "F7", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "C7", "C2", "C0"],
-        "rows": ["F0", "C1", "E1", "E0", "D7", "D6"]
-    },
-    "diode_direction": "COL2ROW",
-    "encoder": {
-        "rotary": [
-            {"pin_a": "E7", "pin_b": "E6", "resolution": 1}
-        ]
-    },
-    "indicators": {
-        "caps_lock": "C5",
-        "num_lock": "C4",
-        "scroll_lock": "C3",
-        "on_state": 0
-    },
-    "rgblight": {
-        "saturation_steps": 8,
-        "brightness_steps": 8,
-        "led_count": 2,
-        "sleep": true,
-        "animations": {
-            "breathing": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "snake": true,
-            "knight": true,
-            "christmas": true,
-            "static_gradient": true,
-            "alternating": true,
-            "twinkle": true
-        }
-    },
-    "ws2812": {
-        "pin": "D5"
-    },
-    "processor": "at90usb1286",
-    "bootloader": "atmel-dfu",
-    "layouts": {
-        "LAYOUT_all": {
-            "layout": [
-                {"label": "Play/Pause", "matrix": [4, 15], "x": 3, "y": 0},
-
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 1.5},
-
-                {"label": "F1", "matrix": [0, 1], "x": 2, "y": 1.5},
-                {"label": "F2", "matrix": [0, 2], "x": 3, "y": 1.5},
-                {"label": "F3", "matrix": [0, 3], "x": 4, "y": 1.5},
-                {"label": "F4", "matrix": [0, 4], "x": 5, "y": 1.5},
-
-                {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 1.5},
-                {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 1.5},
-                {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 1.5},
-                {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 1.5},
-
-                {"label": "F9", "matrix": [0, 9], "x": 11, "y": 1.5},
-                {"label": "F10", "matrix": [0, 10], "x": 12, "y": 1.5},
-                {"label": "F11", "matrix": [0, 11], "x": 13, "y": 1.5},
-                {"label": "F12", "matrix": [0, 12], "x": 14, "y": 1.5},
-
-                {"label": "`", "matrix": [1, 0], "x": 0, "y": 2.75},
-                {"label": "1", "matrix": [1, 1], "x": 1, "y": 2.75},
-                {"label": "2", "matrix": [1, 2], "x": 2, "y": 2.75},
-                {"label": "3", "matrix": [1, 3], "x": 3, "y": 2.75},
-                {"label": "4", "matrix": [1, 4], "x": 4, "y": 2.75},
-                {"label": "5", "matrix": [1, 5], "x": 5, "y": 2.75},
-                {"label": "6", "matrix": [1, 6], "x": 6, "y": 2.75},
-                {"label": "7", "matrix": [1, 7], "x": 7, "y": 2.75},
-                {"label": "8", "matrix": [1, 8], "x": 8, "y": 2.75},
-                {"label": "9", "matrix": [1, 9], "x": 9, "y": 2.75},
-                {"label": "0", "matrix": [1, 10], "x": 10, "y": 2.75},
-                {"label": "-", "matrix": [1, 11], "x": 11, "y": 2.75},
-                {"label": "=", "matrix": [1, 12], "x": 12, "y": 2.75},
-                {"label": "Delete", "matrix": [1, 13], "x": 13, "y": 2.75},
-                {"label": "Backspace", "matrix": [1, 14], "x": 14, "y": 2.75},
-
-                {"label": "Insert", "matrix": [1, 15], "x": 15.25, "y": 2.75},
-                {"label": "Home", "matrix": [1, 16], "x": 16.25, "y": 2.75},
-                {"label": "Page Up", "matrix": [1, 17], "x": 17.25, "y": 2.75},
-
-                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 3.75, "w": 1.5},
-                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 3.75},
-                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 3.75},
-                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 3.75},
-                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 3.75},
-                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 3.75},
-                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 3.75},
-                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 3.75},
-                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 3.75},
-                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 3.75},
-                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 3.75},
-                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 3.75},
-                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 3.75},
-                {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 3.75, "w": 1.5},
-
-                {"label": "Delete", "matrix": [2, 15], "x": 15.25, "y": 3.75},
-                {"label": "End", "matrix": [2, 16], "x": 16.25, "y": 3.75},
-                {"label": "Page Down", "matrix": [2, 17], "x": 17.25, "y": 3.75},
-
-                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 4.75, "w": 1.75},
-                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 4.75},
-                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 4.75},
-                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 4.75},
-                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 4.75},
-                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 4.75},
-                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 4.75},
-                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 4.75},
-                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 4.75},
-                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 4.75},
-                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 4.75},
-                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 4.75},
-                {"label": "#", "matrix": [3, 12], "x": 12.75, "y": 4.75},
-                {"label": "Enter", "matrix": [3, 13], "x": 13.75, "y": 4.75, "w": 1.25},
-
-                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 5.75, "w": 1.25},
-                {"label": "\\", "matrix": [4, 1], "x": 1.25, "y": 5.75},
-                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 5.75},
-                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 5.75},
-                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 5.75},
-                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 5.75},
-                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 5.75},
-                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 5.75},
-                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 5.75},
-                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 5.75},
-                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 5.75},
-                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 5.75},
-                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 5.75, "w": 1.75},
-                {"label": "Fn", "matrix": [4, 13], "x": 14, "y": 5.75},
-
-                {"label": "\u2191", "matrix": [4, 16], "x": 16.25, "y": 5.75},
-
-                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 6.75, "w": 1.25},
-                {"label": "GUI", "matrix": [5, 1], "x": 1.25, "y": 6.75, "w": 1.25},
-                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 6.75, "w": 1.25},
-                {"label": "Space", "matrix": [5, 6], "x": 3.75, "y": 6.75, "w": 6.25},
-                {"label": "Alt", "matrix": [5, 9], "x": 10, "y": 6.75, "w": 1.25},
-                {"label": "GUI", "matrix": [5, 10], "x": 11.25, "y": 6.75, "w": 1.25},
-                {"label": "Fn", "matrix": [5, 11], "x": 12.5, "y": 6.75, "w": 1.25},
-                {"label": "Ctrl", "matrix": [5, 12], "x": 13.75, "y": 6.75, "w": 1.25},
-
-                {"label": "\u2190", "matrix": [5, 15], "x": 15.25, "y": 6.75},
-                {"label": "\u2193", "matrix": [5, 16], "x": 16.25, "y": 6.75},
-                {"label": "\u2192", "matrix": [5, 17], "x": 17.25, "y": 6.75}
-            ]
-        },
-        "LAYOUT_ansi": {
-            "layout": [
-                {"label": "Play/Pause", "matrix": [4, 15], "x": 3, "y": 0},
-
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 1.5},
-
-                {"label": "F1", "matrix": [0, 1], "x": 2, "y": 1.5},
-                {"label": "F2", "matrix": [0, 2], "x": 3, "y": 1.5},
-                {"label": "F3", "matrix": [0, 3], "x": 4, "y": 1.5},
-                {"label": "F4", "matrix": [0, 4], "x": 5, "y": 1.5},
-
-                {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 1.5},
-                {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 1.5},
-                {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 1.5},
-                {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 1.5},
-
-                {"label": "F9", "matrix": [0, 9], "x": 11, "y": 1.5},
-                {"label": "F10", "matrix": [0, 10], "x": 12, "y": 1.5},
-                {"label": "F11", "matrix": [0, 11], "x": 13, "y": 1.5},
-                {"label": "F12", "matrix": [0, 12], "x": 14, "y": 1.5},
-
-                {"label": "`", "matrix": [1, 0], "x": 0, "y": 2.75},
-                {"label": "1", "matrix": [1, 1], "x": 1, "y": 2.75},
-                {"label": "2", "matrix": [1, 2], "x": 2, "y": 2.75},
-                {"label": "3", "matrix": [1, 3], "x": 3, "y": 2.75},
-                {"label": "4", "matrix": [1, 4], "x": 4, "y": 2.75},
-                {"label": "5", "matrix": [1, 5], "x": 5, "y": 2.75},
-                {"label": "6", "matrix": [1, 6], "x": 6, "y": 2.75},
-                {"label": "7", "matrix": [1, 7], "x": 7, "y": 2.75},
-                {"label": "8", "matrix": [1, 8], "x": 8, "y": 2.75},
-                {"label": "9", "matrix": [1, 9], "x": 9, "y": 2.75},
-                {"label": "0", "matrix": [1, 10], "x": 10, "y": 2.75},
-                {"label": "-", "matrix": [1, 11], "x": 11, "y": 2.75},
-                {"label": "=", "matrix": [1, 12], "x": 12, "y": 2.75},
-                {"label": "Backspace", "matrix": [1, 14], "x": 13, "y": 2.75, "w": 2},
-
-                {"label": "Insert", "matrix": [1, 15], "x": 15.25, "y": 2.75},
-                {"label": "Home", "matrix": [1, 16], "x": 16.25, "y": 2.75},
-                {"label": "Page Up", "matrix": [1, 17], "x": 17.25, "y": 2.75},
-
-                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 3.75, "w": 1.5},
-                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 3.75},
-                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 3.75},
-                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 3.75},
-                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 3.75},
-                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 3.75},
-                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 3.75},
-                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 3.75},
-                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 3.75},
-                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 3.75},
-                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 3.75},
-                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 3.75},
-                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 3.75},
-                {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 3.75, "w": 1.5},
-
-                {"label": "Delete", "matrix": [2, 15], "x": 15.25, "y": 3.75},
-                {"label": "End", "matrix": [2, 16], "x": 16.25, "y": 3.75},
-                {"label": "Page Down", "matrix": [2, 17], "x": 17.25, "y": 3.75},
-
-                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 4.75, "w": 1.75},
-                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 4.75},
-                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 4.75},
-                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 4.75},
-                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 4.75},
-                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 4.75},
-                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 4.75},
-                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 4.75},
-                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 4.75},
-                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 4.75},
-                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 4.75},
-                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 4.75},
-                {"label": "Enter", "matrix": [3, 13], "x": 12.75, "y": 4.75, "w": 2.25},
-
-                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 5.75, "w": 2.25},
-                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 5.75},
-                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 5.75},
-                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 5.75},
-                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 5.75},
-                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 5.75},
-                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 5.75},
-                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 5.75},
-                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 5.75},
-                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 5.75},
-                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 5.75},
-                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 5.75, "w": 2.75},
-
-                {"label": "\u2191", "matrix": [4, 16], "x": 16.25, "y": 5.75},
-
-                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 6.75, "w": 1.25},
-                {"label": "GUI", "matrix": [5, 1], "x": 1.25, "y": 6.75, "w": 1.25},
-                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 6.75, "w": 1.25},
-                {"label": "Space", "matrix": [5, 6], "x": 3.75, "y": 6.75, "w": 6.25},
-                {"label": "Alt", "matrix": [5, 9], "x": 10, "y": 6.75, "w": 1.25},
-                {"label": "GUI", "matrix": [5, 10], "x": 11.25, "y": 6.75, "w": 1.25},
-                {"label": "Fn", "matrix": [5, 11], "x": 12.5, "y": 6.75, "w": 1.25},
-                {"label": "Ctrl", "matrix": [5, 12], "x": 13.75, "y": 6.75, "w": 1.25},
-
-                {"label": "\u2190", "matrix": [5, 15], "x": 15.25, "y": 6.75},
-                {"label": "\u2193", "matrix": [5, 16], "x": 16.25, "y": 6.75},
-                {"label": "\u2192", "matrix": [5, 17], "x": 17.25, "y": 6.75}
-            ]
-        },
-        "LAYOUT_ansi_split_bs_rshift": {
-            "layout": [
-                {"label": "Play/Pause", "matrix": [4, 15], "x": 3, "y": 0},
-
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 1.5},
-
-                {"label": "F1", "matrix": [0, 1], "x": 2, "y": 1.5},
-                {"label": "F2", "matrix": [0, 2], "x": 3, "y": 1.5},
-                {"label": "F3", "matrix": [0, 3], "x": 4, "y": 1.5},
-                {"label": "F4", "matrix": [0, 4], "x": 5, "y": 1.5},
-
-                {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 1.5},
-                {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 1.5},
-                {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 1.5},
-                {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 1.5},
-
-                {"label": "F9", "matrix": [0, 9], "x": 11, "y": 1.5},
-                {"label": "F10", "matrix": [0, 10], "x": 12, "y": 1.5},
-                {"label": "F11", "matrix": [0, 11], "x": 13, "y": 1.5},
-                {"label": "F12", "matrix": [0, 12], "x": 14, "y": 1.5},
-
-                {"label": "`", "matrix": [1, 0], "x": 0, "y": 2.75},
-                {"label": "1", "matrix": [1, 1], "x": 1, "y": 2.75},
-                {"label": "2", "matrix": [1, 2], "x": 2, "y": 2.75},
-                {"label": "3", "matrix": [1, 3], "x": 3, "y": 2.75},
-                {"label": "4", "matrix": [1, 4], "x": 4, "y": 2.75},
-                {"label": "5", "matrix": [1, 5], "x": 5, "y": 2.75},
-                {"label": "6", "matrix": [1, 6], "x": 6, "y": 2.75},
-                {"label": "7", "matrix": [1, 7], "x": 7, "y": 2.75},
-                {"label": "8", "matrix": [1, 8], "x": 8, "y": 2.75},
-                {"label": "9", "matrix": [1, 9], "x": 9, "y": 2.75},
-                {"label": "0", "matrix": [1, 10], "x": 10, "y": 2.75},
-                {"label": "-", "matrix": [1, 11], "x": 11, "y": 2.75},
-                {"label": "=", "matrix": [1, 12], "x": 12, "y": 2.75},
-                {"label": "Delete", "matrix": [1, 13], "x": 13, "y": 2.75},
-                {"label": "Backspace", "matrix": [1, 14], "x": 14, "y": 2.75},
-
-                {"label": "Insert", "matrix": [1, 15], "x": 15.25, "y": 2.75},
-                {"label": "Home", "matrix": [1, 16], "x": 16.25, "y": 2.75},
-                {"label": "Page Up", "matrix": [1, 17], "x": 17.25, "y": 2.75},
-
-                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 3.75, "w": 1.5},
-                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 3.75},
-                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 3.75},
-                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 3.75},
-                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 3.75},
-                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 3.75},
-                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 3.75},
-                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 3.75},
-                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 3.75},
-                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 3.75},
-                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 3.75},
-                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 3.75},
-                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 3.75},
-                {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 3.75, "w": 1.5},
-
-                {"label": "Delete", "matrix": [2, 15], "x": 15.25, "y": 3.75},
-                {"label": "End", "matrix": [2, 16], "x": 16.25, "y": 3.75},
-                {"label": "Page Down", "matrix": [2, 17], "x": 17.25, "y": 3.75},
-
-                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 4.75, "w": 1.75},
-                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 4.75},
-                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 4.75},
-                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 4.75},
-                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 4.75},
-                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 4.75},
-                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 4.75},
-                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 4.75},
-                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 4.75},
-                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 4.75},
-                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 4.75},
-                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 4.75},
-                {"label": "Enter", "matrix": [3, 13], "x": 12.75, "y": 4.75, "w": 2.25},
-
-                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 5.75, "w": 2.25},
-                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 5.75},
-                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 5.75},
-                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 5.75},
-                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 5.75},
-                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 5.75},
-                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 5.75},
-                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 5.75},
-                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 5.75},
-                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 5.75},
-                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 5.75},
-                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 5.75, "w": 1.75},
-                {"label": "Fn", "matrix": [4, 13], "x": 14, "y": 5.75},
-
-                {"label": "\u2191", "matrix": [4, 16], "x": 16.25, "y": 5.75},
-
-                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 6.75, "w": 1.25},
-                {"label": "GUI", "matrix": [5, 1], "x": 1.25, "y": 6.75, "w": 1.25},
-                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 6.75, "w": 1.25},
-                {"label": "Space", "matrix": [5, 6], "x": 3.75, "y": 6.75, "w": 6.25},
-                {"label": "Alt", "matrix": [5, 9], "x": 10, "y": 6.75, "w": 1.25},
-                {"label": "GUI", "matrix": [5, 10], "x": 11.25, "y": 6.75, "w": 1.25},
-                {"label": "Fn", "matrix": [5, 11], "x": 12.5, "y": 6.75, "w": 1.25},
-                {"label": "Ctrl", "matrix": [5, 12], "x": 13.75, "y": 6.75, "w": 1.25},
-
-                {"label": "\u2190", "matrix": [5, 15], "x": 15.25, "y": 6.75},
-                {"label": "\u2193", "matrix": [5, 16], "x": 16.25, "y": 6.75},
-                {"label": "\u2192", "matrix": [5, 17], "x": 17.25, "y": 6.75}
-            ]
-        },
-        "LAYOUT_ansi_tsangan": {
-            "layout": [
-                {"label": "Play/Pause", "matrix": [4, 15], "x": 3, "y": 0},
-
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 1.5},
-
-                {"label": "F1", "matrix": [0, 1], "x": 2, "y": 1.5},
-                {"label": "F2", "matrix": [0, 2], "x": 3, "y": 1.5},
-                {"label": "F3", "matrix": [0, 3], "x": 4, "y": 1.5},
-                {"label": "F4", "matrix": [0, 4], "x": 5, "y": 1.5},
-
-                {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 1.5},
-                {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 1.5},
-                {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 1.5},
-                {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 1.5},
-
-                {"label": "F9", "matrix": [0, 9], "x": 11, "y": 1.5},
-                {"label": "F10", "matrix": [0, 10], "x": 12, "y": 1.5},
-                {"label": "F11", "matrix": [0, 11], "x": 13, "y": 1.5},
-                {"label": "F12", "matrix": [0, 12], "x": 14, "y": 1.5},
-
-                {"label": "`", "matrix": [1, 0], "x": 0, "y": 2.75},
-                {"label": "1", "matrix": [1, 1], "x": 1, "y": 2.75},
-                {"label": "2", "matrix": [1, 2], "x": 2, "y": 2.75},
-                {"label": "3", "matrix": [1, 3], "x": 3, "y": 2.75},
-                {"label": "4", "matrix": [1, 4], "x": 4, "y": 2.75},
-                {"label": "5", "matrix": [1, 5], "x": 5, "y": 2.75},
-                {"label": "6", "matrix": [1, 6], "x": 6, "y": 2.75},
-                {"label": "7", "matrix": [1, 7], "x": 7, "y": 2.75},
-                {"label": "8", "matrix": [1, 8], "x": 8, "y": 2.75},
-                {"label": "9", "matrix": [1, 9], "x": 9, "y": 2.75},
-                {"label": "0", "matrix": [1, 10], "x": 10, "y": 2.75},
-                {"label": "-", "matrix": [1, 11], "x": 11, "y": 2.75},
-                {"label": "=", "matrix": [1, 12], "x": 12, "y": 2.75},
-                {"label": "Backspace", "matrix": [1, 14], "x": 13, "y": 2.75, "w": 2},
-
-                {"label": "Insert", "matrix": [1, 15], "x": 15.25, "y": 2.75},
-                {"label": "Home", "matrix": [1, 16], "x": 16.25, "y": 2.75},
-                {"label": "Page Up", "matrix": [1, 17], "x": 17.25, "y": 2.75},
-
-                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 3.75, "w": 1.5},
-                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 3.75},
-                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 3.75},
-                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 3.75},
-                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 3.75},
-                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 3.75},
-                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 3.75},
-                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 3.75},
-                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 3.75},
-                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 3.75},
-                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 3.75},
-                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 3.75},
-                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 3.75},
-                {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 3.75, "w": 1.5},
-
-                {"label": "Delete", "matrix": [2, 15], "x": 15.25, "y": 3.75},
-                {"label": "End", "matrix": [2, 16], "x": 16.25, "y": 3.75},
-                {"label": "Page Down", "matrix": [2, 17], "x": 17.25, "y": 3.75},
-
-                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 4.75, "w": 1.75},
-                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 4.75},
-                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 4.75},
-                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 4.75},
-                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 4.75},
-                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 4.75},
-                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 4.75},
-                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 4.75},
-                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 4.75},
-                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 4.75},
-                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 4.75},
-                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 4.75},
-                {"label": "Enter", "matrix": [3, 13], "x": 12.75, "y": 4.75, "w": 2.25},
-
-                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 5.75, "w": 2.25},
-                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 5.75},
-                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 5.75},
-                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 5.75},
-                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 5.75},
-                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 5.75},
-                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 5.75},
-                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 5.75},
-                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 5.75},
-                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 5.75},
-                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 5.75},
-                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 5.75, "w": 2.75},
-
-                {"label": "\u2191", "matrix": [4, 16], "x": 16.25, "y": 5.75},
-
-                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 6.75, "w": 1.5},
-                {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 6.75},
-                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 6.75, "w": 1.5},
-                {"label": "Space", "matrix": [5, 6], "x": 4, "y": 6.75, "w": 7},
-                {"label": "Alt", "matrix": [5, 10], "x": 11, "y": 6.75, "w": 1.5},
-                {"label": "Fn", "matrix": [5, 11], "x": 12.5, "y": 6.75},
-                {"label": "Ctrl", "matrix": [5, 12], "x": 13.5, "y": 6.75, "w": 1.5},
-
-                {"label": "\u2190", "matrix": [5, 15], "x": 15.25, "y": 6.75},
-                {"label": "\u2193", "matrix": [5, 16], "x": 16.25, "y": 6.75},
-                {"label": "\u2192", "matrix": [5, 17], "x": 17.25, "y": 6.75}
-            ]
-        },
-        "LAYOUT_ansi_tsangan_split_bs_rshift": {
-            "layout": [
-                {"label": "Play/Pause", "matrix": [4, 15], "x": 3, "y": 0},
-
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 1.5},
-
-                {"label": "F1", "matrix": [0, 1], "x": 2, "y": 1.5},
-                {"label": "F2", "matrix": [0, 2], "x": 3, "y": 1.5},
-                {"label": "F3", "matrix": [0, 3], "x": 4, "y": 1.5},
-                {"label": "F4", "matrix": [0, 4], "x": 5, "y": 1.5},
-
-                {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 1.5},
-                {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 1.5},
-                {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 1.5},
-                {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 1.5},
-
-                {"label": "F9", "matrix": [0, 9], "x": 11, "y": 1.5},
-                {"label": "F10", "matrix": [0, 10], "x": 12, "y": 1.5},
-                {"label": "F11", "matrix": [0, 11], "x": 13, "y": 1.5},
-                {"label": "F12", "matrix": [0, 12], "x": 14, "y": 1.5},
-
-                {"label": "`", "matrix": [1, 0], "x": 0, "y": 2.75},
-                {"label": "1", "matrix": [1, 1], "x": 1, "y": 2.75},
-                {"label": "2", "matrix": [1, 2], "x": 2, "y": 2.75},
-                {"label": "3", "matrix": [1, 3], "x": 3, "y": 2.75},
-                {"label": "4", "matrix": [1, 4], "x": 4, "y": 2.75},
-                {"label": "5", "matrix": [1, 5], "x": 5, "y": 2.75},
-                {"label": "6", "matrix": [1, 6], "x": 6, "y": 2.75},
-                {"label": "7", "matrix": [1, 7], "x": 7, "y": 2.75},
-                {"label": "8", "matrix": [1, 8], "x": 8, "y": 2.75},
-                {"label": "9", "matrix": [1, 9], "x": 9, "y": 2.75},
-                {"label": "0", "matrix": [1, 10], "x": 10, "y": 2.75},
-                {"label": "-", "matrix": [1, 11], "x": 11, "y": 2.75},
-                {"label": "=", "matrix": [1, 12], "x": 12, "y": 2.75},
-                {"label": "Delete", "matrix": [1, 13], "x": 13, "y": 2.75},
-                {"label": "Backspace", "matrix": [1, 14], "x": 14, "y": 2.75},
-
-                {"label": "Insert", "matrix": [1, 15], "x": 15.25, "y": 2.75},
-                {"label": "Home", "matrix": [1, 16], "x": 16.25, "y": 2.75},
-                {"label": "Page Up", "matrix": [1, 17], "x": 17.25, "y": 2.75},
-
-                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 3.75, "w": 1.5},
-                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 3.75},
-                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 3.75},
-                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 3.75},
-                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 3.75},
-                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 3.75},
-                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 3.75},
-                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 3.75},
-                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 3.75},
-                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 3.75},
-                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 3.75},
-                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 3.75},
-                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 3.75},
-                {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 3.75, "w": 1.5},
-
-                {"label": "Delete", "matrix": [2, 15], "x": 15.25, "y": 3.75},
-                {"label": "End", "matrix": [2, 16], "x": 16.25, "y": 3.75},
-                {"label": "Page Down", "matrix": [2, 17], "x": 17.25, "y": 3.75},
-
-                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 4.75, "w": 1.75},
-                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 4.75},
-                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 4.75},
-                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 4.75},
-                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 4.75},
-                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 4.75},
-                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 4.75},
-                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 4.75},
-                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 4.75},
-                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 4.75},
-                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 4.75},
-                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 4.75},
-                {"label": "Enter", "matrix": [3, 13], "x": 12.75, "y": 4.75, "w": 2.25},
-
-                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 5.75, "w": 2.25},
-                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 5.75},
-                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 5.75},
-                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 5.75},
-                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 5.75},
-                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 5.75},
-                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 5.75},
-                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 5.75},
-                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 5.75},
-                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 5.75},
-                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 5.75},
-                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 5.75, "w": 1.75},
-                {"label": "Fn", "matrix": [4, 13], "x": 14, "y": 5.75},
-
-                {"label": "\u2191", "matrix": [4, 16], "x": 16.25, "y": 5.75},
-
-                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 6.75, "w": 1.5},
-                {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 6.75},
-                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 6.75, "w": 1.5},
-                {"label": "Space", "matrix": [5, 6], "x": 4, "y": 6.75, "w": 7},
-                {"label": "Alt", "matrix": [5, 10], "x": 11, "y": 6.75, "w": 1.5},
-                {"label": "Fn", "matrix": [5, 11], "x": 12.5, "y": 6.75},
-                {"label": "Ctrl", "matrix": [5, 12], "x": 13.5, "y": 6.75, "w": 1.5},
-
-                {"label": "\u2190", "matrix": [5, 15], "x": 15.25, "y": 6.75},
-                {"label": "\u2193", "matrix": [5, 16], "x": 16.25, "y": 6.75},
-                {"label": "\u2192", "matrix": [5, 17], "x": 17.25, "y": 6.75}
-            ]
-        },
-        "LAYOUT_ansi_wkl": {
-            "layout": [
-                {"label": "Play/Pause", "matrix": [4, 15], "x": 3, "y": 0},
-
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 1.5},
-
-                {"label": "F1", "matrix": [0, 1], "x": 2, "y": 1.5},
-                {"label": "F2", "matrix": [0, 2], "x": 3, "y": 1.5},
-                {"label": "F3", "matrix": [0, 3], "x": 4, "y": 1.5},
-                {"label": "F4", "matrix": [0, 4], "x": 5, "y": 1.5},
-
-                {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 1.5},
-                {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 1.5},
-                {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 1.5},
-                {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 1.5},
-
-                {"label": "F9", "matrix": [0, 9], "x": 11, "y": 1.5},
-                {"label": "F10", "matrix": [0, 10], "x": 12, "y": 1.5},
-                {"label": "F11", "matrix": [0, 11], "x": 13, "y": 1.5},
-                {"label": "F12", "matrix": [0, 12], "x": 14, "y": 1.5},
-
-                {"label": "`", "matrix": [1, 0], "x": 0, "y": 2.75},
-                {"label": "1", "matrix": [1, 1], "x": 1, "y": 2.75},
-                {"label": "2", "matrix": [1, 2], "x": 2, "y": 2.75},
-                {"label": "3", "matrix": [1, 3], "x": 3, "y": 2.75},
-                {"label": "4", "matrix": [1, 4], "x": 4, "y": 2.75},
-                {"label": "5", "matrix": [1, 5], "x": 5, "y": 2.75},
-                {"label": "6", "matrix": [1, 6], "x": 6, "y": 2.75},
-                {"label": "7", "matrix": [1, 7], "x": 7, "y": 2.75},
-                {"label": "8", "matrix": [1, 8], "x": 8, "y": 2.75},
-                {"label": "9", "matrix": [1, 9], "x": 9, "y": 2.75},
-                {"label": "0", "matrix": [1, 10], "x": 10, "y": 2.75},
-                {"label": "-", "matrix": [1, 11], "x": 11, "y": 2.75},
-                {"label": "=", "matrix": [1, 12], "x": 12, "y": 2.75},
-                {"label": "Backspace", "matrix": [1, 14], "x": 13, "y": 2.75, "w": 2},
-
-                {"label": "Insert", "matrix": [1, 15], "x": 15.25, "y": 2.75},
-                {"label": "Home", "matrix": [1, 16], "x": 16.25, "y": 2.75},
-                {"label": "Page Up", "matrix": [1, 17], "x": 17.25, "y": 2.75},
-
-                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 3.75, "w": 1.5},
-                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 3.75},
-                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 3.75},
-                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 3.75},
-                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 3.75},
-                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 3.75},
-                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 3.75},
-                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 3.75},
-                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 3.75},
-                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 3.75},
-                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 3.75},
-                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 3.75},
-                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 3.75},
-                {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 3.75, "w": 1.5},
-
-                {"label": "Delete", "matrix": [2, 15], "x": 15.25, "y": 3.75},
-                {"label": "End", "matrix": [2, 16], "x": 16.25, "y": 3.75},
-                {"label": "Page Down", "matrix": [2, 17], "x": 17.25, "y": 3.75},
-
-                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 4.75, "w": 1.75},
-                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 4.75},
-                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 4.75},
-                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 4.75},
-                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 4.75},
-                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 4.75},
-                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 4.75},
-                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 4.75},
-                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 4.75},
-                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 4.75},
-                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 4.75},
-                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 4.75},
-                {"label": "Enter", "matrix": [3, 13], "x": 12.75, "y": 4.75, "w": 2.25},
-
-                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 5.75, "w": 2.25},
-                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 5.75},
-                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 5.75},
-                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 5.75},
-                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 5.75},
-                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 5.75},
-                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 5.75},
-                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 5.75},
-                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 5.75},
-                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 5.75},
-                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 5.75},
-                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 5.75, "w": 2.75},
-
-                {"label": "\u2191", "matrix": [4, 16], "x": 16.25, "y": 5.75},
-
-                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 6.75, "w": 1.5},
-                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 6.75, "w": 1.5},
-                {"label": "Space", "matrix": [5, 6], "x": 4, "y": 6.75, "w": 7},
-                {"label": "Alt", "matrix": [5, 10], "x": 11, "y": 6.75, "w": 1.5},
-                {"label": "Ctrl", "matrix": [5, 12], "x": 13.5, "y": 6.75, "w": 1.5},
-
-                {"label": "\u2190", "matrix": [5, 15], "x": 15.25, "y": 6.75},
-                {"label": "\u2193", "matrix": [5, 16], "x": 16.25, "y": 6.75},
-                {"label": "\u2192", "matrix": [5, 17], "x": 17.25, "y": 6.75}
-            ]
-        },
-        "LAYOUT_ansi_wkl_split_bs_rshift": {
-            "layout": [
-                {"label": "Play/Pause", "matrix": [4, 15], "x": 3, "y": 0},
-
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 1.5},
-
-                {"label": "F1", "matrix": [0, 1], "x": 2, "y": 1.5},
-                {"label": "F2", "matrix": [0, 2], "x": 3, "y": 1.5},
-                {"label": "F3", "matrix": [0, 3], "x": 4, "y": 1.5},
-                {"label": "F4", "matrix": [0, 4], "x": 5, "y": 1.5},
-
-                {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 1.5},
-                {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 1.5},
-                {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 1.5},
-                {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 1.5},
-
-                {"label": "F9", "matrix": [0, 9], "x": 11, "y": 1.5},
-                {"label": "F10", "matrix": [0, 10], "x": 12, "y": 1.5},
-                {"label": "F11", "matrix": [0, 11], "x": 13, "y": 1.5},
-                {"label": "F12", "matrix": [0, 12], "x": 14, "y": 1.5},
-
-                {"label": "`", "matrix": [1, 0], "x": 0, "y": 2.75},
-                {"label": "1", "matrix": [1, 1], "x": 1, "y": 2.75},
-                {"label": "2", "matrix": [1, 2], "x": 2, "y": 2.75},
-                {"label": "3", "matrix": [1, 3], "x": 3, "y": 2.75},
-                {"label": "4", "matrix": [1, 4], "x": 4, "y": 2.75},
-                {"label": "5", "matrix": [1, 5], "x": 5, "y": 2.75},
-                {"label": "6", "matrix": [1, 6], "x": 6, "y": 2.75},
-                {"label": "7", "matrix": [1, 7], "x": 7, "y": 2.75},
-                {"label": "8", "matrix": [1, 8], "x": 8, "y": 2.75},
-                {"label": "9", "matrix": [1, 9], "x": 9, "y": 2.75},
-                {"label": "0", "matrix": [1, 10], "x": 10, "y": 2.75},
-                {"label": "-", "matrix": [1, 11], "x": 11, "y": 2.75},
-                {"label": "=", "matrix": [1, 12], "x": 12, "y": 2.75},
-                {"label": "Delete", "matrix": [1, 13], "x": 13, "y": 2.75},
-                {"label": "Backspace", "matrix": [1, 14], "x": 14, "y": 2.75},
-
-                {"label": "Insert", "matrix": [1, 15], "x": 15.25, "y": 2.75},
-                {"label": "Home", "matrix": [1, 16], "x": 16.25, "y": 2.75},
-                {"label": "Page Up", "matrix": [1, 17], "x": 17.25, "y": 2.75},
-
-                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 3.75, "w": 1.5},
-                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 3.75},
-                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 3.75},
-                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 3.75},
-                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 3.75},
-                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 3.75},
-                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 3.75},
-                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 3.75},
-                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 3.75},
-                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 3.75},
-                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 3.75},
-                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 3.75},
-                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 3.75},
-                {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 3.75, "w": 1.5},
-
-                {"label": "Delete", "matrix": [2, 15], "x": 15.25, "y": 3.75},
-                {"label": "End", "matrix": [2, 16], "x": 16.25, "y": 3.75},
-                {"label": "Page Down", "matrix": [2, 17], "x": 17.25, "y": 3.75},
-
-                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 4.75, "w": 1.75},
-                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 4.75},
-                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 4.75},
-                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 4.75},
-                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 4.75},
-                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 4.75},
-                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 4.75},
-                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 4.75},
-                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 4.75},
-                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 4.75},
-                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 4.75},
-                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 4.75},
-                {"label": "Enter", "matrix": [3, 13], "x": 12.75, "y": 4.75, "w": 2.25},
-
-                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 5.75, "w": 2.25},
-                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 5.75},
-                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 5.75},
-                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 5.75},
-                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 5.75},
-                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 5.75},
-                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 5.75},
-                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 5.75},
-                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 5.75},
-                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 5.75},
-                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 5.75},
-                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 5.75, "w": 1.75},
-                {"label": "Fn", "matrix": [4, 13], "x": 14, "y": 5.75},
-
-                {"label": "\u2191", "matrix": [4, 16], "x": 16.25, "y": 5.75},
-
-                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 6.75, "w": 1.5},
-                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 6.75, "w": 1.5},
-                {"label": "Space", "matrix": [5, 6], "x": 4, "y": 6.75, "w": 7},
-                {"label": "Alt", "matrix": [5, 10], "x": 11, "y": 6.75, "w": 1.5},
-                {"label": "Ctrl", "matrix": [5, 12], "x": 13.5, "y": 6.75, "w": 1.5},
-
-                {"label": "\u2190", "matrix": [5, 15], "x": 15.25, "y": 6.75},
-                {"label": "\u2193", "matrix": [5, 16], "x": 16.25, "y": 6.75},
-                {"label": "\u2192", "matrix": [5, 17], "x": 17.25, "y": 6.75}
-            ]
-        },
-        "LAYOUT_iso": {
-            "layout": [
-                {"label": "Play/Pause", "matrix": [4, 15], "x": 3, "y": 0},
-
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 1.5},
-
-                {"label": "F1", "matrix": [0, 1], "x": 2, "y": 1.5},
-                {"label": "F2", "matrix": [0, 2], "x": 3, "y": 1.5},
-                {"label": "F3", "matrix": [0, 3], "x": 4, "y": 1.5},
-                {"label": "F4", "matrix": [0, 4], "x": 5, "y": 1.5},
-
-                {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 1.5},
-                {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 1.5},
-                {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 1.5},
-                {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 1.5},
-
-                {"label": "F9", "matrix": [0, 9], "x": 11, "y": 1.5},
-                {"label": "F10", "matrix": [0, 10], "x": 12, "y": 1.5},
-                {"label": "F11", "matrix": [0, 11], "x": 13, "y": 1.5},
-                {"label": "F12", "matrix": [0, 12], "x": 14, "y": 1.5},
-
-                {"label": "`", "matrix": [1, 0], "x": 0, "y": 2.75},
-                {"label": "1", "matrix": [1, 1], "x": 1, "y": 2.75},
-                {"label": "2", "matrix": [1, 2], "x": 2, "y": 2.75},
-                {"label": "3", "matrix": [1, 3], "x": 3, "y": 2.75},
-                {"label": "4", "matrix": [1, 4], "x": 4, "y": 2.75},
-                {"label": "5", "matrix": [1, 5], "x": 5, "y": 2.75},
-                {"label": "6", "matrix": [1, 6], "x": 6, "y": 2.75},
-                {"label": "7", "matrix": [1, 7], "x": 7, "y": 2.75},
-                {"label": "8", "matrix": [1, 8], "x": 8, "y": 2.75},
-                {"label": "9", "matrix": [1, 9], "x": 9, "y": 2.75},
-                {"label": "0", "matrix": [1, 10], "x": 10, "y": 2.75},
-                {"label": "-", "matrix": [1, 11], "x": 11, "y": 2.75},
-                {"label": "=", "matrix": [1, 12], "x": 12, "y": 2.75},
-                {"label": "Backspace", "matrix": [1, 14], "x": 13, "y": 2.75, "w": 2},
-
-                {"label": "Insert", "matrix": [1, 15], "x": 15.25, "y": 2.75},
-                {"label": "Home", "matrix": [1, 16], "x": 16.25, "y": 2.75},
-                {"label": "Page Up", "matrix": [1, 17], "x": 17.25, "y": 2.75},
-
-                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 3.75, "w": 1.5},
-                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 3.75},
-                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 3.75},
-                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 3.75},
-                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 3.75},
-                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 3.75},
-                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 3.75},
-                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 3.75},
-                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 3.75},
-                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 3.75},
-                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 3.75},
-                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 3.75},
-                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 3.75},
-
-                {"label": "Delete", "matrix": [2, 15], "x": 15.25, "y": 3.75},
-                {"label": "End", "matrix": [2, 16], "x": 16.25, "y": 3.75},
-                {"label": "Page Down", "matrix": [2, 17], "x": 17.25, "y": 3.75},
-
-                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 4.75, "w": 1.75},
-                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 4.75},
-                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 4.75},
-                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 4.75},
-                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 4.75},
-                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 4.75},
-                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 4.75},
-                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 4.75},
-                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 4.75},
-                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 4.75},
-                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 4.75},
-                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 4.75},
-                {"label": "#", "matrix": [3, 12], "x": 12.75, "y": 4.75},
-                {"label": "Enter", "matrix": [3, 13], "x": 13.75, "y": 3.75, "w": 1.25, "h": 2},
-
-                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 5.75, "w": 1.25},
-                {"label": "\\", "matrix": [4, 1], "x": 1.25, "y": 5.75},
-                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 5.75},
-                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 5.75},
-                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 5.75},
-                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 5.75},
-                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 5.75},
-                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 5.75},
-                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 5.75},
-                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 5.75},
-                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 5.75},
-                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 5.75},
-                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 5.75, "w": 2.75},
-
-                {"label": "\u2191", "matrix": [4, 16], "x": 16.25, "y": 5.75},
-
-                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 6.75, "w": 1.25},
-                {"label": "GUI", "matrix": [5, 1], "x": 1.25, "y": 6.75, "w": 1.25},
-                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 6.75, "w": 1.25},
-                {"label": "Space", "matrix": [5, 6], "x": 3.75, "y": 6.75, "w": 6.25},
-                {"label": "Alt", "matrix": [5, 9], "x": 10, "y": 6.75, "w": 1.25},
-                {"label": "GUI", "matrix": [5, 10], "x": 11.25, "y": 6.75, "w": 1.25},
-                {"label": "Fn", "matrix": [5, 11], "x": 12.5, "y": 6.75, "w": 1.25},
-                {"label": "Ctrl", "matrix": [5, 12], "x": 13.75, "y": 6.75, "w": 1.25},
-
-                {"label": "\u2190", "matrix": [5, 15], "x": 15.25, "y": 6.75},
-                {"label": "\u2193", "matrix": [5, 16], "x": 16.25, "y": 6.75},
-                {"label": "\u2192", "matrix": [5, 17], "x": 17.25, "y": 6.75}
-            ]
-        },
-        "LAYOUT_iso_split_bs_rshift": {
-            "layout": [
-                {"label": "Play/Pause", "matrix": [4, 15], "x": 3, "y": 0},
-
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 1.5},
-
-                {"label": "F1", "matrix": [0, 1], "x": 2, "y": 1.5},
-                {"label": "F2", "matrix": [0, 2], "x": 3, "y": 1.5},
-                {"label": "F3", "matrix": [0, 3], "x": 4, "y": 1.5},
-                {"label": "F4", "matrix": [0, 4], "x": 5, "y": 1.5},
-
-                {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 1.5},
-                {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 1.5},
-                {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 1.5},
-                {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 1.5},
-
-                {"label": "F9", "matrix": [0, 9], "x": 11, "y": 1.5},
-                {"label": "F10", "matrix": [0, 10], "x": 12, "y": 1.5},
-                {"label": "F11", "matrix": [0, 11], "x": 13, "y": 1.5},
-                {"label": "F12", "matrix": [0, 12], "x": 14, "y": 1.5},
-
-                {"label": "`", "matrix": [1, 0], "x": 0, "y": 2.75},
-                {"label": "1", "matrix": [1, 1], "x": 1, "y": 2.75},
-                {"label": "2", "matrix": [1, 2], "x": 2, "y": 2.75},
-                {"label": "3", "matrix": [1, 3], "x": 3, "y": 2.75},
-                {"label": "4", "matrix": [1, 4], "x": 4, "y": 2.75},
-                {"label": "5", "matrix": [1, 5], "x": 5, "y": 2.75},
-                {"label": "6", "matrix": [1, 6], "x": 6, "y": 2.75},
-                {"label": "7", "matrix": [1, 7], "x": 7, "y": 2.75},
-                {"label": "8", "matrix": [1, 8], "x": 8, "y": 2.75},
-                {"label": "9", "matrix": [1, 9], "x": 9, "y": 2.75},
-                {"label": "0", "matrix": [1, 10], "x": 10, "y": 2.75},
-                {"label": "-", "matrix": [1, 11], "x": 11, "y": 2.75},
-                {"label": "=", "matrix": [1, 12], "x": 12, "y": 2.75},
-                {"label": "Delete", "matrix": [1, 13], "x": 13, "y": 2.75},
-                {"label": "Backspace", "matrix": [1, 14], "x": 14, "y": 2.75},
-
-                {"label": "Insert", "matrix": [1, 15], "x": 15.25, "y": 2.75},
-                {"label": "Home", "matrix": [1, 16], "x": 16.25, "y": 2.75},
-                {"label": "Page Up", "matrix": [1, 17], "x": 17.25, "y": 2.75},
-
-                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 3.75, "w": 1.5},
-                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 3.75},
-                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 3.75},
-                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 3.75},
-                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 3.75},
-                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 3.75},
-                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 3.75},
-                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 3.75},
-                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 3.75},
-                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 3.75},
-                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 3.75},
-                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 3.75},
-                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 3.75},
-
-                {"label": "Delete", "matrix": [2, 15], "x": 15.25, "y": 3.75},
-                {"label": "End", "matrix": [2, 16], "x": 16.25, "y": 3.75},
-                {"label": "Page Down", "matrix": [2, 17], "x": 17.25, "y": 3.75},
-
-                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 4.75, "w": 1.75},
-                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 4.75},
-                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 4.75},
-                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 4.75},
-                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 4.75},
-                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 4.75},
-                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 4.75},
-                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 4.75},
-                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 4.75},
-                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 4.75},
-                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 4.75},
-                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 4.75},
-                {"label": "#", "matrix": [3, 12], "x": 12.75, "y": 4.75},
-                {"label": "Enter", "matrix": [3, 13], "x": 13.75, "y": 3.75, "w": 1.25, "h": 2},
-
-                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 5.75, "w": 1.25},
-                {"label": "\\", "matrix": [4, 1], "x": 1.25, "y": 5.75},
-                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 5.75},
-                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 5.75},
-                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 5.75},
-                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 5.75},
-                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 5.75},
-                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 5.75},
-                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 5.75},
-                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 5.75},
-                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 5.75},
-                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 5.75},
-                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 5.75, "w": 1.75},
-                {"label": "Fn", "matrix": [4, 13], "x": 14, "y": 5.75},
-
-                {"label": "\u2191", "matrix": [4, 16], "x": 16.25, "y": 5.75},
-
-                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 6.75, "w": 1.25},
-                {"label": "GUI", "matrix": [5, 1], "x": 1.25, "y": 6.75, "w": 1.25},
-                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 6.75, "w": 1.25},
-                {"label": "Space", "matrix": [5, 6], "x": 3.75, "y": 6.75, "w": 6.25},
-                {"label": "Alt", "matrix": [5, 9], "x": 10, "y": 6.75, "w": 1.25},
-                {"label": "GUI", "matrix": [5, 10], "x": 11.25, "y": 6.75, "w": 1.25},
-                {"label": "Fn", "matrix": [5, 11], "x": 12.5, "y": 6.75, "w": 1.25},
-                {"label": "Ctrl", "matrix": [5, 12], "x": 13.75, "y": 6.75, "w": 1.25},
-
-                {"label": "\u2190", "matrix": [5, 15], "x": 15.25, "y": 6.75},
-                {"label": "\u2193", "matrix": [5, 16], "x": 16.25, "y": 6.75},
-                {"label": "\u2192", "matrix": [5, 17], "x": 17.25, "y": 6.75}
-            ]
-        },
-        "LAYOUT_iso_tsangan": {
-            "layout": [
-                {"label": "Play/Pause", "matrix": [4, 15], "x": 3, "y": 0},
-
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 1.5},
-
-                {"label": "F1", "matrix": [0, 1], "x": 2, "y": 1.5},
-                {"label": "F2", "matrix": [0, 2], "x": 3, "y": 1.5},
-                {"label": "F3", "matrix": [0, 3], "x": 4, "y": 1.5},
-                {"label": "F4", "matrix": [0, 4], "x": 5, "y": 1.5},
-
-                {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 1.5},
-                {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 1.5},
-                {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 1.5},
-                {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 1.5},
-
-                {"label": "F9", "matrix": [0, 9], "x": 11, "y": 1.5},
-                {"label": "F10", "matrix": [0, 10], "x": 12, "y": 1.5},
-                {"label": "F11", "matrix": [0, 11], "x": 13, "y": 1.5},
-                {"label": "F12", "matrix": [0, 12], "x": 14, "y": 1.5},
-
-                {"label": "`", "matrix": [1, 0], "x": 0, "y": 2.75},
-                {"label": "1", "matrix": [1, 1], "x": 1, "y": 2.75},
-                {"label": "2", "matrix": [1, 2], "x": 2, "y": 2.75},
-                {"label": "3", "matrix": [1, 3], "x": 3, "y": 2.75},
-                {"label": "4", "matrix": [1, 4], "x": 4, "y": 2.75},
-                {"label": "5", "matrix": [1, 5], "x": 5, "y": 2.75},
-                {"label": "6", "matrix": [1, 6], "x": 6, "y": 2.75},
-                {"label": "7", "matrix": [1, 7], "x": 7, "y": 2.75},
-                {"label": "8", "matrix": [1, 8], "x": 8, "y": 2.75},
-                {"label": "9", "matrix": [1, 9], "x": 9, "y": 2.75},
-                {"label": "0", "matrix": [1, 10], "x": 10, "y": 2.75},
-                {"label": "-", "matrix": [1, 11], "x": 11, "y": 2.75},
-                {"label": "=", "matrix": [1, 12], "x": 12, "y": 2.75},
-                {"label": "Backspace", "matrix": [1, 14], "x": 13, "y": 2.75, "w": 2},
-
-                {"label": "Insert", "matrix": [1, 15], "x": 15.25, "y": 2.75},
-                {"label": "Home", "matrix": [1, 16], "x": 16.25, "y": 2.75},
-                {"label": "Page Up", "matrix": [1, 17], "x": 17.25, "y": 2.75},
-
-                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 3.75, "w": 1.5},
-                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 3.75},
-                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 3.75},
-                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 3.75},
-                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 3.75},
-                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 3.75},
-                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 3.75},
-                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 3.75},
-                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 3.75},
-                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 3.75},
-                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 3.75},
-                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 3.75},
-                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 3.75},
-
-                {"label": "Delete", "matrix": [2, 15], "x": 15.25, "y": 3.75},
-                {"label": "End", "matrix": [2, 16], "x": 16.25, "y": 3.75},
-                {"label": "Page Down", "matrix": [2, 17], "x": 17.25, "y": 3.75},
-
-                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 4.75, "w": 1.75},
-                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 4.75},
-                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 4.75},
-                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 4.75},
-                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 4.75},
-                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 4.75},
-                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 4.75},
-                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 4.75},
-                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 4.75},
-                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 4.75},
-                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 4.75},
-                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 4.75},
-                {"label": "#", "matrix": [3, 12], "x": 12.75, "y": 4.75},
-                {"label": "Enter", "matrix": [3, 13], "x": 13.75, "y": 3.75, "w": 1.25, "h": 2},
-
-                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 5.75, "w": 1.25},
-                {"label": "\\", "matrix": [4, 1], "x": 1.25, "y": 5.75},
-                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 5.75},
-                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 5.75},
-                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 5.75},
-                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 5.75},
-                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 5.75},
-                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 5.75},
-                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 5.75},
-                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 5.75},
-                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 5.75},
-                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 5.75},
-                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 5.75, "w": 2.75},
-
-                {"label": "\u2191", "matrix": [4, 16], "x": 16.25, "y": 5.75},
-
-                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 6.75, "w": 1.5},
-                {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 6.75},
-                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 6.75, "w": 1.5},
-                {"label": "Space", "matrix": [5, 6], "x": 4, "y": 6.75, "w": 7},
-                {"label": "Alt", "matrix": [5, 10], "x": 11, "y": 6.75, "w": 1.5},
-                {"label": "Fn", "matrix": [5, 11], "x": 12.5, "y": 6.75},
-                {"label": "Ctrl", "matrix": [5, 12], "x": 13.5, "y": 6.75, "w": 1.5},
-
-                {"label": "\u2190", "matrix": [5, 15], "x": 15.25, "y": 6.75},
-                {"label": "\u2193", "matrix": [5, 16], "x": 16.25, "y": 6.75},
-                {"label": "\u2192", "matrix": [5, 17], "x": 17.25, "y": 6.75}
-            ]
-        },
-        "LAYOUT_iso_tsangan_split_bs_rshift": {
-            "layout": [
-                {"label": "Play/Pause", "matrix": [4, 15], "x": 3, "y": 0},
-
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 1.5},
-
-                {"label": "F1", "matrix": [0, 1], "x": 2, "y": 1.5},
-                {"label": "F2", "matrix": [0, 2], "x": 3, "y": 1.5},
-                {"label": "F3", "matrix": [0, 3], "x": 4, "y": 1.5},
-                {"label": "F4", "matrix": [0, 4], "x": 5, "y": 1.5},
-
-                {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 1.5},
-                {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 1.5},
-                {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 1.5},
-                {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 1.5},
-
-                {"label": "F9", "matrix": [0, 9], "x": 11, "y": 1.5},
-                {"label": "F10", "matrix": [0, 10], "x": 12, "y": 1.5},
-                {"label": "F11", "matrix": [0, 11], "x": 13, "y": 1.5},
-                {"label": "F12", "matrix": [0, 12], "x": 14, "y": 1.5},
-
-                {"label": "`", "matrix": [1, 0], "x": 0, "y": 2.75},
-                {"label": "1", "matrix": [1, 1], "x": 1, "y": 2.75},
-                {"label": "2", "matrix": [1, 2], "x": 2, "y": 2.75},
-                {"label": "3", "matrix": [1, 3], "x": 3, "y": 2.75},
-                {"label": "4", "matrix": [1, 4], "x": 4, "y": 2.75},
-                {"label": "5", "matrix": [1, 5], "x": 5, "y": 2.75},
-                {"label": "6", "matrix": [1, 6], "x": 6, "y": 2.75},
-                {"label": "7", "matrix": [1, 7], "x": 7, "y": 2.75},
-                {"label": "8", "matrix": [1, 8], "x": 8, "y": 2.75},
-                {"label": "9", "matrix": [1, 9], "x": 9, "y": 2.75},
-                {"label": "0", "matrix": [1, 10], "x": 10, "y": 2.75},
-                {"label": "-", "matrix": [1, 11], "x": 11, "y": 2.75},
-                {"label": "=", "matrix": [1, 12], "x": 12, "y": 2.75},
-                {"label": "Delete", "matrix": [1, 13], "x": 13, "y": 2.75},
-                {"label": "Backspace", "matrix": [1, 14], "x": 14, "y": 2.75},
-
-                {"label": "Insert", "matrix": [1, 15], "x": 15.25, "y": 2.75},
-                {"label": "Home", "matrix": [1, 16], "x": 16.25, "y": 2.75},
-                {"label": "Page Up", "matrix": [1, 17], "x": 17.25, "y": 2.75},
-
-                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 3.75, "w": 1.5},
-                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 3.75},
-                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 3.75},
-                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 3.75},
-                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 3.75},
-                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 3.75},
-                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 3.75},
-                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 3.75},
-                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 3.75},
-                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 3.75},
-                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 3.75},
-                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 3.75},
-                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 3.75},
-
-                {"label": "Delete", "matrix": [2, 15], "x": 15.25, "y": 3.75},
-                {"label": "End", "matrix": [2, 16], "x": 16.25, "y": 3.75},
-                {"label": "Page Down", "matrix": [2, 17], "x": 17.25, "y": 3.75},
-
-                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 4.75, "w": 1.75},
-                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 4.75},
-                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 4.75},
-                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 4.75},
-                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 4.75},
-                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 4.75},
-                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 4.75},
-                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 4.75},
-                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 4.75},
-                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 4.75},
-                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 4.75},
-                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 4.75},
-                {"label": "#", "matrix": [3, 12], "x": 12.75, "y": 4.75},
-                {"label": "Enter", "matrix": [3, 13], "x": 13.75, "y": 3.75, "w": 1.25, "h": 2},
-
-                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 5.75, "w": 1.25},
-                {"label": "\\", "matrix": [4, 1], "x": 1.25, "y": 5.75},
-                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 5.75},
-                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 5.75},
-                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 5.75},
-                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 5.75},
-                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 5.75},
-                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 5.75},
-                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 5.75},
-                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 5.75},
-                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 5.75},
-                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 5.75},
-                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 5.75, "w": 1.75},
-                {"label": "Fn", "matrix": [4, 13], "x": 14, "y": 5.75},
-
-                {"label": "\u2191", "matrix": [4, 16], "x": 16.25, "y": 5.75},
-
-                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 6.75, "w": 1.5},
-                {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 6.75},
-                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 6.75, "w": 1.5},
-                {"label": "Space", "matrix": [5, 6], "x": 4, "y": 6.75, "w": 7},
-                {"label": "Alt", "matrix": [5, 10], "x": 11, "y": 6.75, "w": 1.5},
-                {"label": "Fn", "matrix": [5, 11], "x": 12.5, "y": 6.75},
-                {"label": "Ctrl", "matrix": [5, 12], "x": 13.5, "y": 6.75, "w": 1.5},
-
-                {"label": "\u2190", "matrix": [5, 15], "x": 15.25, "y": 6.75},
-                {"label": "\u2193", "matrix": [5, 16], "x": 16.25, "y": 6.75},
-                {"label": "\u2192", "matrix": [5, 17], "x": 17.25, "y": 6.75}
-            ]
-        },
-        "LAYOUT_iso_wkl": {
-            "layout": [
-                {"label": "Play/Pause", "matrix": [4, 15], "x": 3, "y": 0},
-
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 1.5},
-
-                {"label": "F1", "matrix": [0, 1], "x": 2, "y": 1.5},
-                {"label": "F2", "matrix": [0, 2], "x": 3, "y": 1.5},
-                {"label": "F3", "matrix": [0, 3], "x": 4, "y": 1.5},
-                {"label": "F4", "matrix": [0, 4], "x": 5, "y": 1.5},
-
-                {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 1.5},
-                {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 1.5},
-                {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 1.5},
-                {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 1.5},
-
-                {"label": "F9", "matrix": [0, 9], "x": 11, "y": 1.5},
-                {"label": "F10", "matrix": [0, 10], "x": 12, "y": 1.5},
-                {"label": "F11", "matrix": [0, 11], "x": 13, "y": 1.5},
-                {"label": "F12", "matrix": [0, 12], "x": 14, "y": 1.5},
-
-                {"label": "`", "matrix": [1, 0], "x": 0, "y": 2.75},
-                {"label": "1", "matrix": [1, 1], "x": 1, "y": 2.75},
-                {"label": "2", "matrix": [1, 2], "x": 2, "y": 2.75},
-                {"label": "3", "matrix": [1, 3], "x": 3, "y": 2.75},
-                {"label": "4", "matrix": [1, 4], "x": 4, "y": 2.75},
-                {"label": "5", "matrix": [1, 5], "x": 5, "y": 2.75},
-                {"label": "6", "matrix": [1, 6], "x": 6, "y": 2.75},
-                {"label": "7", "matrix": [1, 7], "x": 7, "y": 2.75},
-                {"label": "8", "matrix": [1, 8], "x": 8, "y": 2.75},
-                {"label": "9", "matrix": [1, 9], "x": 9, "y": 2.75},
-                {"label": "0", "matrix": [1, 10], "x": 10, "y": 2.75},
-                {"label": "-", "matrix": [1, 11], "x": 11, "y": 2.75},
-                {"label": "=", "matrix": [1, 12], "x": 12, "y": 2.75},
-                {"label": "Backspace", "matrix": [1, 14], "x": 13, "y": 2.75, "w": 2},
-
-                {"label": "Insert", "matrix": [1, 15], "x": 15.25, "y": 2.75},
-                {"label": "Home", "matrix": [1, 16], "x": 16.25, "y": 2.75},
-                {"label": "Page Up", "matrix": [1, 17], "x": 17.25, "y": 2.75},
-
-                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 3.75, "w": 1.5},
-                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 3.75},
-                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 3.75},
-                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 3.75},
-                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 3.75},
-                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 3.75},
-                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 3.75},
-                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 3.75},
-                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 3.75},
-                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 3.75},
-                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 3.75},
-                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 3.75},
-                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 3.75},
-
-                {"label": "Delete", "matrix": [2, 15], "x": 15.25, "y": 3.75},
-                {"label": "End", "matrix": [2, 16], "x": 16.25, "y": 3.75},
-                {"label": "Page Down", "matrix": [2, 17], "x": 17.25, "y": 3.75},
-
-                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 4.75, "w": 1.75},
-                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 4.75},
-                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 4.75},
-                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 4.75},
-                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 4.75},
-                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 4.75},
-                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 4.75},
-                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 4.75},
-                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 4.75},
-                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 4.75},
-                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 4.75},
-                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 4.75},
-                {"label": "#", "matrix": [3, 12], "x": 12.75, "y": 4.75},
-                {"label": "Enter", "matrix": [3, 13], "x": 13.75, "y": 3.75, "w": 1.25, "h": 2},
-
-                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 5.75, "w": 1.25},
-                {"label": "\\", "matrix": [4, 1], "x": 1.25, "y": 5.75},
-                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 5.75},
-                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 5.75},
-                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 5.75},
-                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 5.75},
-                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 5.75},
-                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 5.75},
-                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 5.75},
-                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 5.75},
-                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 5.75},
-                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 5.75},
-                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 5.75, "w": 2.75},
-
-                {"label": "\u2191", "matrix": [4, 16], "x": 16.25, "y": 5.75},
-
-                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 6.75, "w": 1.5},
-                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 6.75, "w": 1.5},
-                {"label": "Space", "matrix": [5, 6], "x": 4, "y": 6.75, "w": 7},
-                {"label": "Alt", "matrix": [5, 10], "x": 11, "y": 6.75, "w": 1.5},
-                {"label": "Ctrl", "matrix": [5, 12], "x": 13.5, "y": 6.75, "w": 1.5},
-
-                {"label": "\u2190", "matrix": [5, 15], "x": 15.25, "y": 6.75},
-                {"label": "\u2193", "matrix": [5, 16], "x": 16.25, "y": 6.75},
-                {"label": "\u2192", "matrix": [5, 17], "x": 17.25, "y": 6.75}
-            ]
-        },
-        "LAYOUT_iso_wkl_split_bs_rshift": {
-            "layout": [
-                {"label": "Play/Pause", "matrix": [4, 15], "x": 3, "y": 0},
-
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 1.5},
-
-                {"label": "F1", "matrix": [0, 1], "x": 2, "y": 1.5},
-                {"label": "F2", "matrix": [0, 2], "x": 3, "y": 1.5},
-                {"label": "F3", "matrix": [0, 3], "x": 4, "y": 1.5},
-                {"label": "F4", "matrix": [0, 4], "x": 5, "y": 1.5},
-
-                {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 1.5},
-                {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 1.5},
-                {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 1.5},
-                {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 1.5},
-
-                {"label": "F9", "matrix": [0, 9], "x": 11, "y": 1.5},
-                {"label": "F10", "matrix": [0, 10], "x": 12, "y": 1.5},
-                {"label": "F11", "matrix": [0, 11], "x": 13, "y": 1.5},
-                {"label": "F12", "matrix": [0, 12], "x": 14, "y": 1.5},
-
-                {"label": "`", "matrix": [1, 0], "x": 0, "y": 2.75},
-                {"label": "1", "matrix": [1, 1], "x": 1, "y": 2.75},
-                {"label": "2", "matrix": [1, 2], "x": 2, "y": 2.75},
-                {"label": "3", "matrix": [1, 3], "x": 3, "y": 2.75},
-                {"label": "4", "matrix": [1, 4], "x": 4, "y": 2.75},
-                {"label": "5", "matrix": [1, 5], "x": 5, "y": 2.75},
-                {"label": "6", "matrix": [1, 6], "x": 6, "y": 2.75},
-                {"label": "7", "matrix": [1, 7], "x": 7, "y": 2.75},
-                {"label": "8", "matrix": [1, 8], "x": 8, "y": 2.75},
-                {"label": "9", "matrix": [1, 9], "x": 9, "y": 2.75},
-                {"label": "0", "matrix": [1, 10], "x": 10, "y": 2.75},
-                {"label": "-", "matrix": [1, 11], "x": 11, "y": 2.75},
-                {"label": "=", "matrix": [1, 12], "x": 12, "y": 2.75},
-                {"label": "Delete", "matrix": [1, 13], "x": 13, "y": 2.75},
-                {"label": "Backspace", "matrix": [1, 14], "x": 14, "y": 2.75},
-
-                {"label": "Insert", "matrix": [1, 15], "x": 15.25, "y": 2.75},
-                {"label": "Home", "matrix": [1, 16], "x": 16.25, "y": 2.75},
-                {"label": "Page Up", "matrix": [1, 17], "x": 17.25, "y": 2.75},
-
-                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 3.75, "w": 1.5},
-                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 3.75},
-                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 3.75},
-                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 3.75},
-                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 3.75},
-                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 3.75},
-                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 3.75},
-                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 3.75},
-                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 3.75},
-                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 3.75},
-                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 3.75},
-                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 3.75},
-                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 3.75},
-
-                {"label": "Delete", "matrix": [2, 15], "x": 15.25, "y": 3.75},
-                {"label": "End", "matrix": [2, 16], "x": 16.25, "y": 3.75},
-                {"label": "Page Down", "matrix": [2, 17], "x": 17.25, "y": 3.75},
-
-                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 4.75, "w": 1.75},
-                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 4.75},
-                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 4.75},
-                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 4.75},
-                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 4.75},
-                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 4.75},
-                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 4.75},
-                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 4.75},
-                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 4.75},
-                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 4.75},
-                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 4.75},
-                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 4.75},
-                {"label": "#", "matrix": [3, 12], "x": 12.75, "y": 4.75},
-                {"label": "Enter", "matrix": [3, 13], "x": 13.75, "y": 3.75, "w": 1.25, "h": 2},
-
-                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 5.75, "w": 1.25},
-                {"label": "\\", "matrix": [4, 1], "x": 1.25, "y": 5.75},
-                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 5.75},
-                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 5.75},
-                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 5.75},
-                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 5.75},
-                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 5.75},
-                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 5.75},
-                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 5.75},
-                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 5.75},
-                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 5.75},
-                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 5.75},
-                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 5.75, "w": 1.75},
-                {"label": "Fn", "matrix": [4, 13], "x": 14, "y": 5.75},
-
-                {"label": "\u2191", "matrix": [4, 16], "x": 16.25, "y": 5.75},
-
-                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 6.75, "w": 1.5},
-                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 6.75, "w": 1.5},
-                {"label": "Space", "matrix": [5, 6], "x": 4, "y": 6.75, "w": 7},
-                {"label": "Alt", "matrix": [5, 10], "x": 11, "y": 6.75, "w": 1.5},
-                {"label": "Ctrl", "matrix": [5, 12], "x": 13.5, "y": 6.75, "w": 1.5},
-
-                {"label": "\u2190", "matrix": [5, 15], "x": 15.25, "y": 6.75},
-                {"label": "\u2193", "matrix": [5, 16], "x": 16.25, "y": 6.75},
-                {"label": "\u2192", "matrix": [5, 17], "x": 17.25, "y": 6.75}
-            ]
-        }
-    }
-}
diff --git a/keyboards/pearlboards/zeus/keyboard.json b/keyboards/pearlboards/zeus/keyboard.json
new file mode 100644
index 00000000000..43639179509
--- /dev/null
+++ b/keyboards/pearlboards/zeus/keyboard.json
@@ -0,0 +1,1399 @@
+{
+    "keyboard_name": "Zeus",
+    "manufacturer": "Koobaczech",
+    "url": "",
+    "maintainer": "Koobaczech",
+    "usb": {
+        "vid": "0x6963",
+        "pid": "0x6966",
+        "device_version": "0.0.1"
+    },
+    "build": {
+        "lto": true
+    },
+    "features": {
+        "audio": true,
+        "bootmagic": false,
+        "encoder": true,
+        "extrakey": true,
+        "haptic": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgblight": true
+    },
+    "matrix_pins": {
+        "cols": ["F1", "F2", "F3", "F4", "F5", "F6", "F7", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "C7", "C2", "C0"],
+        "rows": ["F0", "C1", "E1", "E0", "D7", "D6"]
+    },
+    "diode_direction": "COL2ROW",
+    "encoder": {
+        "rotary": [
+            {"pin_a": "E7", "pin_b": "E6", "resolution": 1}
+        ]
+    },
+    "haptic": {
+        "driver": "drv2605l"
+    },
+    "indicators": {
+        "caps_lock": "C5",
+        "num_lock": "C4",
+        "scroll_lock": "C3",
+        "on_state": 0
+    },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 2,
+        "sleep": true,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "alternating": true,
+            "twinkle": true
+        }
+    },
+    "ws2812": {
+        "pin": "D5"
+    },
+    "processor": "at90usb1286",
+    "bootloader": "atmel-dfu",
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                {"label": "Play/Pause", "matrix": [4, 15], "x": 3, "y": 0},
+
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 1.5},
+
+                {"label": "F1", "matrix": [0, 1], "x": 2, "y": 1.5},
+                {"label": "F2", "matrix": [0, 2], "x": 3, "y": 1.5},
+                {"label": "F3", "matrix": [0, 3], "x": 4, "y": 1.5},
+                {"label": "F4", "matrix": [0, 4], "x": 5, "y": 1.5},
+
+                {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 1.5},
+                {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 1.5},
+                {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 1.5},
+                {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 1.5},
+
+                {"label": "F9", "matrix": [0, 9], "x": 11, "y": 1.5},
+                {"label": "F10", "matrix": [0, 10], "x": 12, "y": 1.5},
+                {"label": "F11", "matrix": [0, 11], "x": 13, "y": 1.5},
+                {"label": "F12", "matrix": [0, 12], "x": 14, "y": 1.5},
+
+                {"label": "`", "matrix": [1, 0], "x": 0, "y": 2.75},
+                {"label": "1", "matrix": [1, 1], "x": 1, "y": 2.75},
+                {"label": "2", "matrix": [1, 2], "x": 2, "y": 2.75},
+                {"label": "3", "matrix": [1, 3], "x": 3, "y": 2.75},
+                {"label": "4", "matrix": [1, 4], "x": 4, "y": 2.75},
+                {"label": "5", "matrix": [1, 5], "x": 5, "y": 2.75},
+                {"label": "6", "matrix": [1, 6], "x": 6, "y": 2.75},
+                {"label": "7", "matrix": [1, 7], "x": 7, "y": 2.75},
+                {"label": "8", "matrix": [1, 8], "x": 8, "y": 2.75},
+                {"label": "9", "matrix": [1, 9], "x": 9, "y": 2.75},
+                {"label": "0", "matrix": [1, 10], "x": 10, "y": 2.75},
+                {"label": "-", "matrix": [1, 11], "x": 11, "y": 2.75},
+                {"label": "=", "matrix": [1, 12], "x": 12, "y": 2.75},
+                {"label": "Delete", "matrix": [1, 13], "x": 13, "y": 2.75},
+                {"label": "Backspace", "matrix": [1, 14], "x": 14, "y": 2.75},
+
+                {"label": "Insert", "matrix": [1, 15], "x": 15.25, "y": 2.75},
+                {"label": "Home", "matrix": [1, 16], "x": 16.25, "y": 2.75},
+                {"label": "Page Up", "matrix": [1, 17], "x": 17.25, "y": 2.75},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 3.75, "w": 1.5},
+                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 3.75},
+                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 3.75},
+                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 3.75},
+                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 3.75},
+                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 3.75},
+                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 3.75},
+                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 3.75},
+                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 3.75},
+                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 3.75},
+                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 3.75},
+                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 3.75},
+                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 3.75},
+                {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 3.75, "w": 1.5},
+
+                {"label": "Delete", "matrix": [2, 15], "x": 15.25, "y": 3.75},
+                {"label": "End", "matrix": [2, 16], "x": 16.25, "y": 3.75},
+                {"label": "Page Down", "matrix": [2, 17], "x": 17.25, "y": 3.75},
+
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 4.75, "w": 1.75},
+                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 4.75},
+                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 4.75},
+                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 4.75},
+                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 4.75},
+                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 4.75},
+                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 4.75},
+                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 4.75},
+                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 4.75},
+                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 4.75},
+                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 4.75},
+                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 4.75},
+                {"label": "#", "matrix": [3, 12], "x": 12.75, "y": 4.75},
+                {"label": "Enter", "matrix": [3, 13], "x": 13.75, "y": 4.75, "w": 1.25},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 5.75, "w": 1.25},
+                {"label": "\\", "matrix": [4, 1], "x": 1.25, "y": 5.75},
+                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 5.75},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 5.75},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 5.75},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 5.75},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 5.75},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 5.75},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 5.75},
+                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 5.75},
+                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 5.75},
+                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 5.75},
+                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 5.75, "w": 1.75},
+                {"label": "Fn", "matrix": [4, 13], "x": 14, "y": 5.75},
+
+                {"label": "\u2191", "matrix": [4, 16], "x": 16.25, "y": 5.75},
+
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 6.75, "w": 1.25},
+                {"label": "GUI", "matrix": [5, 1], "x": 1.25, "y": 6.75, "w": 1.25},
+                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 6.75, "w": 1.25},
+                {"label": "Space", "matrix": [5, 6], "x": 3.75, "y": 6.75, "w": 6.25},
+                {"label": "Alt", "matrix": [5, 9], "x": 10, "y": 6.75, "w": 1.25},
+                {"label": "GUI", "matrix": [5, 10], "x": 11.25, "y": 6.75, "w": 1.25},
+                {"label": "Fn", "matrix": [5, 11], "x": 12.5, "y": 6.75, "w": 1.25},
+                {"label": "Ctrl", "matrix": [5, 12], "x": 13.75, "y": 6.75, "w": 1.25},
+
+                {"label": "\u2190", "matrix": [5, 15], "x": 15.25, "y": 6.75},
+                {"label": "\u2193", "matrix": [5, 16], "x": 16.25, "y": 6.75},
+                {"label": "\u2192", "matrix": [5, 17], "x": 17.25, "y": 6.75}
+            ]
+        },
+        "LAYOUT_ansi": {
+            "layout": [
+                {"label": "Play/Pause", "matrix": [4, 15], "x": 3, "y": 0},
+
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 1.5},
+
+                {"label": "F1", "matrix": [0, 1], "x": 2, "y": 1.5},
+                {"label": "F2", "matrix": [0, 2], "x": 3, "y": 1.5},
+                {"label": "F3", "matrix": [0, 3], "x": 4, "y": 1.5},
+                {"label": "F4", "matrix": [0, 4], "x": 5, "y": 1.5},
+
+                {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 1.5},
+                {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 1.5},
+                {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 1.5},
+                {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 1.5},
+
+                {"label": "F9", "matrix": [0, 9], "x": 11, "y": 1.5},
+                {"label": "F10", "matrix": [0, 10], "x": 12, "y": 1.5},
+                {"label": "F11", "matrix": [0, 11], "x": 13, "y": 1.5},
+                {"label": "F12", "matrix": [0, 12], "x": 14, "y": 1.5},
+
+                {"label": "`", "matrix": [1, 0], "x": 0, "y": 2.75},
+                {"label": "1", "matrix": [1, 1], "x": 1, "y": 2.75},
+                {"label": "2", "matrix": [1, 2], "x": 2, "y": 2.75},
+                {"label": "3", "matrix": [1, 3], "x": 3, "y": 2.75},
+                {"label": "4", "matrix": [1, 4], "x": 4, "y": 2.75},
+                {"label": "5", "matrix": [1, 5], "x": 5, "y": 2.75},
+                {"label": "6", "matrix": [1, 6], "x": 6, "y": 2.75},
+                {"label": "7", "matrix": [1, 7], "x": 7, "y": 2.75},
+                {"label": "8", "matrix": [1, 8], "x": 8, "y": 2.75},
+                {"label": "9", "matrix": [1, 9], "x": 9, "y": 2.75},
+                {"label": "0", "matrix": [1, 10], "x": 10, "y": 2.75},
+                {"label": "-", "matrix": [1, 11], "x": 11, "y": 2.75},
+                {"label": "=", "matrix": [1, 12], "x": 12, "y": 2.75},
+                {"label": "Backspace", "matrix": [1, 14], "x": 13, "y": 2.75, "w": 2},
+
+                {"label": "Insert", "matrix": [1, 15], "x": 15.25, "y": 2.75},
+                {"label": "Home", "matrix": [1, 16], "x": 16.25, "y": 2.75},
+                {"label": "Page Up", "matrix": [1, 17], "x": 17.25, "y": 2.75},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 3.75, "w": 1.5},
+                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 3.75},
+                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 3.75},
+                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 3.75},
+                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 3.75},
+                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 3.75},
+                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 3.75},
+                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 3.75},
+                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 3.75},
+                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 3.75},
+                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 3.75},
+                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 3.75},
+                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 3.75},
+                {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 3.75, "w": 1.5},
+
+                {"label": "Delete", "matrix": [2, 15], "x": 15.25, "y": 3.75},
+                {"label": "End", "matrix": [2, 16], "x": 16.25, "y": 3.75},
+                {"label": "Page Down", "matrix": [2, 17], "x": 17.25, "y": 3.75},
+
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 4.75, "w": 1.75},
+                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 4.75},
+                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 4.75},
+                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 4.75},
+                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 4.75},
+                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 4.75},
+                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 4.75},
+                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 4.75},
+                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 4.75},
+                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 4.75},
+                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 4.75},
+                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 4.75},
+                {"label": "Enter", "matrix": [3, 13], "x": 12.75, "y": 4.75, "w": 2.25},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 5.75, "w": 2.25},
+                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 5.75},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 5.75},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 5.75},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 5.75},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 5.75},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 5.75},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 5.75},
+                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 5.75},
+                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 5.75},
+                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 5.75},
+                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 5.75, "w": 2.75},
+
+                {"label": "\u2191", "matrix": [4, 16], "x": 16.25, "y": 5.75},
+
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 6.75, "w": 1.25},
+                {"label": "GUI", "matrix": [5, 1], "x": 1.25, "y": 6.75, "w": 1.25},
+                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 6.75, "w": 1.25},
+                {"label": "Space", "matrix": [5, 6], "x": 3.75, "y": 6.75, "w": 6.25},
+                {"label": "Alt", "matrix": [5, 9], "x": 10, "y": 6.75, "w": 1.25},
+                {"label": "GUI", "matrix": [5, 10], "x": 11.25, "y": 6.75, "w": 1.25},
+                {"label": "Fn", "matrix": [5, 11], "x": 12.5, "y": 6.75, "w": 1.25},
+                {"label": "Ctrl", "matrix": [5, 12], "x": 13.75, "y": 6.75, "w": 1.25},
+
+                {"label": "\u2190", "matrix": [5, 15], "x": 15.25, "y": 6.75},
+                {"label": "\u2193", "matrix": [5, 16], "x": 16.25, "y": 6.75},
+                {"label": "\u2192", "matrix": [5, 17], "x": 17.25, "y": 6.75}
+            ]
+        },
+        "LAYOUT_ansi_split_bs_rshift": {
+            "layout": [
+                {"label": "Play/Pause", "matrix": [4, 15], "x": 3, "y": 0},
+
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 1.5},
+
+                {"label": "F1", "matrix": [0, 1], "x": 2, "y": 1.5},
+                {"label": "F2", "matrix": [0, 2], "x": 3, "y": 1.5},
+                {"label": "F3", "matrix": [0, 3], "x": 4, "y": 1.5},
+                {"label": "F4", "matrix": [0, 4], "x": 5, "y": 1.5},
+
+                {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 1.5},
+                {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 1.5},
+                {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 1.5},
+                {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 1.5},
+
+                {"label": "F9", "matrix": [0, 9], "x": 11, "y": 1.5},
+                {"label": "F10", "matrix": [0, 10], "x": 12, "y": 1.5},
+                {"label": "F11", "matrix": [0, 11], "x": 13, "y": 1.5},
+                {"label": "F12", "matrix": [0, 12], "x": 14, "y": 1.5},
+
+                {"label": "`", "matrix": [1, 0], "x": 0, "y": 2.75},
+                {"label": "1", "matrix": [1, 1], "x": 1, "y": 2.75},
+                {"label": "2", "matrix": [1, 2], "x": 2, "y": 2.75},
+                {"label": "3", "matrix": [1, 3], "x": 3, "y": 2.75},
+                {"label": "4", "matrix": [1, 4], "x": 4, "y": 2.75},
+                {"label": "5", "matrix": [1, 5], "x": 5, "y": 2.75},
+                {"label": "6", "matrix": [1, 6], "x": 6, "y": 2.75},
+                {"label": "7", "matrix": [1, 7], "x": 7, "y": 2.75},
+                {"label": "8", "matrix": [1, 8], "x": 8, "y": 2.75},
+                {"label": "9", "matrix": [1, 9], "x": 9, "y": 2.75},
+                {"label": "0", "matrix": [1, 10], "x": 10, "y": 2.75},
+                {"label": "-", "matrix": [1, 11], "x": 11, "y": 2.75},
+                {"label": "=", "matrix": [1, 12], "x": 12, "y": 2.75},
+                {"label": "Delete", "matrix": [1, 13], "x": 13, "y": 2.75},
+                {"label": "Backspace", "matrix": [1, 14], "x": 14, "y": 2.75},
+
+                {"label": "Insert", "matrix": [1, 15], "x": 15.25, "y": 2.75},
+                {"label": "Home", "matrix": [1, 16], "x": 16.25, "y": 2.75},
+                {"label": "Page Up", "matrix": [1, 17], "x": 17.25, "y": 2.75},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 3.75, "w": 1.5},
+                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 3.75},
+                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 3.75},
+                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 3.75},
+                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 3.75},
+                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 3.75},
+                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 3.75},
+                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 3.75},
+                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 3.75},
+                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 3.75},
+                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 3.75},
+                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 3.75},
+                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 3.75},
+                {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 3.75, "w": 1.5},
+
+                {"label": "Delete", "matrix": [2, 15], "x": 15.25, "y": 3.75},
+                {"label": "End", "matrix": [2, 16], "x": 16.25, "y": 3.75},
+                {"label": "Page Down", "matrix": [2, 17], "x": 17.25, "y": 3.75},
+
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 4.75, "w": 1.75},
+                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 4.75},
+                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 4.75},
+                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 4.75},
+                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 4.75},
+                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 4.75},
+                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 4.75},
+                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 4.75},
+                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 4.75},
+                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 4.75},
+                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 4.75},
+                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 4.75},
+                {"label": "Enter", "matrix": [3, 13], "x": 12.75, "y": 4.75, "w": 2.25},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 5.75, "w": 2.25},
+                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 5.75},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 5.75},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 5.75},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 5.75},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 5.75},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 5.75},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 5.75},
+                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 5.75},
+                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 5.75},
+                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 5.75},
+                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 5.75, "w": 1.75},
+                {"label": "Fn", "matrix": [4, 13], "x": 14, "y": 5.75},
+
+                {"label": "\u2191", "matrix": [4, 16], "x": 16.25, "y": 5.75},
+
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 6.75, "w": 1.25},
+                {"label": "GUI", "matrix": [5, 1], "x": 1.25, "y": 6.75, "w": 1.25},
+                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 6.75, "w": 1.25},
+                {"label": "Space", "matrix": [5, 6], "x": 3.75, "y": 6.75, "w": 6.25},
+                {"label": "Alt", "matrix": [5, 9], "x": 10, "y": 6.75, "w": 1.25},
+                {"label": "GUI", "matrix": [5, 10], "x": 11.25, "y": 6.75, "w": 1.25},
+                {"label": "Fn", "matrix": [5, 11], "x": 12.5, "y": 6.75, "w": 1.25},
+                {"label": "Ctrl", "matrix": [5, 12], "x": 13.75, "y": 6.75, "w": 1.25},
+
+                {"label": "\u2190", "matrix": [5, 15], "x": 15.25, "y": 6.75},
+                {"label": "\u2193", "matrix": [5, 16], "x": 16.25, "y": 6.75},
+                {"label": "\u2192", "matrix": [5, 17], "x": 17.25, "y": 6.75}
+            ]
+        },
+        "LAYOUT_ansi_tsangan": {
+            "layout": [
+                {"label": "Play/Pause", "matrix": [4, 15], "x": 3, "y": 0},
+
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 1.5},
+
+                {"label": "F1", "matrix": [0, 1], "x": 2, "y": 1.5},
+                {"label": "F2", "matrix": [0, 2], "x": 3, "y": 1.5},
+                {"label": "F3", "matrix": [0, 3], "x": 4, "y": 1.5},
+                {"label": "F4", "matrix": [0, 4], "x": 5, "y": 1.5},
+
+                {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 1.5},
+                {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 1.5},
+                {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 1.5},
+                {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 1.5},
+
+                {"label": "F9", "matrix": [0, 9], "x": 11, "y": 1.5},
+                {"label": "F10", "matrix": [0, 10], "x": 12, "y": 1.5},
+                {"label": "F11", "matrix": [0, 11], "x": 13, "y": 1.5},
+                {"label": "F12", "matrix": [0, 12], "x": 14, "y": 1.5},
+
+                {"label": "`", "matrix": [1, 0], "x": 0, "y": 2.75},
+                {"label": "1", "matrix": [1, 1], "x": 1, "y": 2.75},
+                {"label": "2", "matrix": [1, 2], "x": 2, "y": 2.75},
+                {"label": "3", "matrix": [1, 3], "x": 3, "y": 2.75},
+                {"label": "4", "matrix": [1, 4], "x": 4, "y": 2.75},
+                {"label": "5", "matrix": [1, 5], "x": 5, "y": 2.75},
+                {"label": "6", "matrix": [1, 6], "x": 6, "y": 2.75},
+                {"label": "7", "matrix": [1, 7], "x": 7, "y": 2.75},
+                {"label": "8", "matrix": [1, 8], "x": 8, "y": 2.75},
+                {"label": "9", "matrix": [1, 9], "x": 9, "y": 2.75},
+                {"label": "0", "matrix": [1, 10], "x": 10, "y": 2.75},
+                {"label": "-", "matrix": [1, 11], "x": 11, "y": 2.75},
+                {"label": "=", "matrix": [1, 12], "x": 12, "y": 2.75},
+                {"label": "Backspace", "matrix": [1, 14], "x": 13, "y": 2.75, "w": 2},
+
+                {"label": "Insert", "matrix": [1, 15], "x": 15.25, "y": 2.75},
+                {"label": "Home", "matrix": [1, 16], "x": 16.25, "y": 2.75},
+                {"label": "Page Up", "matrix": [1, 17], "x": 17.25, "y": 2.75},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 3.75, "w": 1.5},
+                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 3.75},
+                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 3.75},
+                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 3.75},
+                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 3.75},
+                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 3.75},
+                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 3.75},
+                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 3.75},
+                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 3.75},
+                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 3.75},
+                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 3.75},
+                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 3.75},
+                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 3.75},
+                {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 3.75, "w": 1.5},
+
+                {"label": "Delete", "matrix": [2, 15], "x": 15.25, "y": 3.75},
+                {"label": "End", "matrix": [2, 16], "x": 16.25, "y": 3.75},
+                {"label": "Page Down", "matrix": [2, 17], "x": 17.25, "y": 3.75},
+
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 4.75, "w": 1.75},
+                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 4.75},
+                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 4.75},
+                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 4.75},
+                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 4.75},
+                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 4.75},
+                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 4.75},
+                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 4.75},
+                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 4.75},
+                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 4.75},
+                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 4.75},
+                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 4.75},
+                {"label": "Enter", "matrix": [3, 13], "x": 12.75, "y": 4.75, "w": 2.25},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 5.75, "w": 2.25},
+                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 5.75},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 5.75},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 5.75},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 5.75},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 5.75},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 5.75},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 5.75},
+                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 5.75},
+                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 5.75},
+                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 5.75},
+                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 5.75, "w": 2.75},
+
+                {"label": "\u2191", "matrix": [4, 16], "x": 16.25, "y": 5.75},
+
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 6.75, "w": 1.5},
+                {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 6.75},
+                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 6.75, "w": 1.5},
+                {"label": "Space", "matrix": [5, 6], "x": 4, "y": 6.75, "w": 7},
+                {"label": "Alt", "matrix": [5, 10], "x": 11, "y": 6.75, "w": 1.5},
+                {"label": "Fn", "matrix": [5, 11], "x": 12.5, "y": 6.75},
+                {"label": "Ctrl", "matrix": [5, 12], "x": 13.5, "y": 6.75, "w": 1.5},
+
+                {"label": "\u2190", "matrix": [5, 15], "x": 15.25, "y": 6.75},
+                {"label": "\u2193", "matrix": [5, 16], "x": 16.25, "y": 6.75},
+                {"label": "\u2192", "matrix": [5, 17], "x": 17.25, "y": 6.75}
+            ]
+        },
+        "LAYOUT_ansi_tsangan_split_bs_rshift": {
+            "layout": [
+                {"label": "Play/Pause", "matrix": [4, 15], "x": 3, "y": 0},
+
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 1.5},
+
+                {"label": "F1", "matrix": [0, 1], "x": 2, "y": 1.5},
+                {"label": "F2", "matrix": [0, 2], "x": 3, "y": 1.5},
+                {"label": "F3", "matrix": [0, 3], "x": 4, "y": 1.5},
+                {"label": "F4", "matrix": [0, 4], "x": 5, "y": 1.5},
+
+                {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 1.5},
+                {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 1.5},
+                {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 1.5},
+                {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 1.5},
+
+                {"label": "F9", "matrix": [0, 9], "x": 11, "y": 1.5},
+                {"label": "F10", "matrix": [0, 10], "x": 12, "y": 1.5},
+                {"label": "F11", "matrix": [0, 11], "x": 13, "y": 1.5},
+                {"label": "F12", "matrix": [0, 12], "x": 14, "y": 1.5},
+
+                {"label": "`", "matrix": [1, 0], "x": 0, "y": 2.75},
+                {"label": "1", "matrix": [1, 1], "x": 1, "y": 2.75},
+                {"label": "2", "matrix": [1, 2], "x": 2, "y": 2.75},
+                {"label": "3", "matrix": [1, 3], "x": 3, "y": 2.75},
+                {"label": "4", "matrix": [1, 4], "x": 4, "y": 2.75},
+                {"label": "5", "matrix": [1, 5], "x": 5, "y": 2.75},
+                {"label": "6", "matrix": [1, 6], "x": 6, "y": 2.75},
+                {"label": "7", "matrix": [1, 7], "x": 7, "y": 2.75},
+                {"label": "8", "matrix": [1, 8], "x": 8, "y": 2.75},
+                {"label": "9", "matrix": [1, 9], "x": 9, "y": 2.75},
+                {"label": "0", "matrix": [1, 10], "x": 10, "y": 2.75},
+                {"label": "-", "matrix": [1, 11], "x": 11, "y": 2.75},
+                {"label": "=", "matrix": [1, 12], "x": 12, "y": 2.75},
+                {"label": "Delete", "matrix": [1, 13], "x": 13, "y": 2.75},
+                {"label": "Backspace", "matrix": [1, 14], "x": 14, "y": 2.75},
+
+                {"label": "Insert", "matrix": [1, 15], "x": 15.25, "y": 2.75},
+                {"label": "Home", "matrix": [1, 16], "x": 16.25, "y": 2.75},
+                {"label": "Page Up", "matrix": [1, 17], "x": 17.25, "y": 2.75},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 3.75, "w": 1.5},
+                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 3.75},
+                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 3.75},
+                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 3.75},
+                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 3.75},
+                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 3.75},
+                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 3.75},
+                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 3.75},
+                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 3.75},
+                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 3.75},
+                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 3.75},
+                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 3.75},
+                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 3.75},
+                {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 3.75, "w": 1.5},
+
+                {"label": "Delete", "matrix": [2, 15], "x": 15.25, "y": 3.75},
+                {"label": "End", "matrix": [2, 16], "x": 16.25, "y": 3.75},
+                {"label": "Page Down", "matrix": [2, 17], "x": 17.25, "y": 3.75},
+
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 4.75, "w": 1.75},
+                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 4.75},
+                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 4.75},
+                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 4.75},
+                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 4.75},
+                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 4.75},
+                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 4.75},
+                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 4.75},
+                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 4.75},
+                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 4.75},
+                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 4.75},
+                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 4.75},
+                {"label": "Enter", "matrix": [3, 13], "x": 12.75, "y": 4.75, "w": 2.25},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 5.75, "w": 2.25},
+                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 5.75},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 5.75},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 5.75},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 5.75},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 5.75},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 5.75},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 5.75},
+                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 5.75},
+                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 5.75},
+                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 5.75},
+                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 5.75, "w": 1.75},
+                {"label": "Fn", "matrix": [4, 13], "x": 14, "y": 5.75},
+
+                {"label": "\u2191", "matrix": [4, 16], "x": 16.25, "y": 5.75},
+
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 6.75, "w": 1.5},
+                {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 6.75},
+                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 6.75, "w": 1.5},
+                {"label": "Space", "matrix": [5, 6], "x": 4, "y": 6.75, "w": 7},
+                {"label": "Alt", "matrix": [5, 10], "x": 11, "y": 6.75, "w": 1.5},
+                {"label": "Fn", "matrix": [5, 11], "x": 12.5, "y": 6.75},
+                {"label": "Ctrl", "matrix": [5, 12], "x": 13.5, "y": 6.75, "w": 1.5},
+
+                {"label": "\u2190", "matrix": [5, 15], "x": 15.25, "y": 6.75},
+                {"label": "\u2193", "matrix": [5, 16], "x": 16.25, "y": 6.75},
+                {"label": "\u2192", "matrix": [5, 17], "x": 17.25, "y": 6.75}
+            ]
+        },
+        "LAYOUT_ansi_wkl": {
+            "layout": [
+                {"label": "Play/Pause", "matrix": [4, 15], "x": 3, "y": 0},
+
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 1.5},
+
+                {"label": "F1", "matrix": [0, 1], "x": 2, "y": 1.5},
+                {"label": "F2", "matrix": [0, 2], "x": 3, "y": 1.5},
+                {"label": "F3", "matrix": [0, 3], "x": 4, "y": 1.5},
+                {"label": "F4", "matrix": [0, 4], "x": 5, "y": 1.5},
+
+                {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 1.5},
+                {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 1.5},
+                {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 1.5},
+                {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 1.5},
+
+                {"label": "F9", "matrix": [0, 9], "x": 11, "y": 1.5},
+                {"label": "F10", "matrix": [0, 10], "x": 12, "y": 1.5},
+                {"label": "F11", "matrix": [0, 11], "x": 13, "y": 1.5},
+                {"label": "F12", "matrix": [0, 12], "x": 14, "y": 1.5},
+
+                {"label": "`", "matrix": [1, 0], "x": 0, "y": 2.75},
+                {"label": "1", "matrix": [1, 1], "x": 1, "y": 2.75},
+                {"label": "2", "matrix": [1, 2], "x": 2, "y": 2.75},
+                {"label": "3", "matrix": [1, 3], "x": 3, "y": 2.75},
+                {"label": "4", "matrix": [1, 4], "x": 4, "y": 2.75},
+                {"label": "5", "matrix": [1, 5], "x": 5, "y": 2.75},
+                {"label": "6", "matrix": [1, 6], "x": 6, "y": 2.75},
+                {"label": "7", "matrix": [1, 7], "x": 7, "y": 2.75},
+                {"label": "8", "matrix": [1, 8], "x": 8, "y": 2.75},
+                {"label": "9", "matrix": [1, 9], "x": 9, "y": 2.75},
+                {"label": "0", "matrix": [1, 10], "x": 10, "y": 2.75},
+                {"label": "-", "matrix": [1, 11], "x": 11, "y": 2.75},
+                {"label": "=", "matrix": [1, 12], "x": 12, "y": 2.75},
+                {"label": "Backspace", "matrix": [1, 14], "x": 13, "y": 2.75, "w": 2},
+
+                {"label": "Insert", "matrix": [1, 15], "x": 15.25, "y": 2.75},
+                {"label": "Home", "matrix": [1, 16], "x": 16.25, "y": 2.75},
+                {"label": "Page Up", "matrix": [1, 17], "x": 17.25, "y": 2.75},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 3.75, "w": 1.5},
+                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 3.75},
+                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 3.75},
+                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 3.75},
+                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 3.75},
+                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 3.75},
+                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 3.75},
+                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 3.75},
+                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 3.75},
+                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 3.75},
+                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 3.75},
+                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 3.75},
+                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 3.75},
+                {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 3.75, "w": 1.5},
+
+                {"label": "Delete", "matrix": [2, 15], "x": 15.25, "y": 3.75},
+                {"label": "End", "matrix": [2, 16], "x": 16.25, "y": 3.75},
+                {"label": "Page Down", "matrix": [2, 17], "x": 17.25, "y": 3.75},
+
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 4.75, "w": 1.75},
+                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 4.75},
+                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 4.75},
+                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 4.75},
+                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 4.75},
+                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 4.75},
+                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 4.75},
+                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 4.75},
+                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 4.75},
+                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 4.75},
+                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 4.75},
+                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 4.75},
+                {"label": "Enter", "matrix": [3, 13], "x": 12.75, "y": 4.75, "w": 2.25},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 5.75, "w": 2.25},
+                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 5.75},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 5.75},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 5.75},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 5.75},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 5.75},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 5.75},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 5.75},
+                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 5.75},
+                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 5.75},
+                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 5.75},
+                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 5.75, "w": 2.75},
+
+                {"label": "\u2191", "matrix": [4, 16], "x": 16.25, "y": 5.75},
+
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 6.75, "w": 1.5},
+                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 6.75, "w": 1.5},
+                {"label": "Space", "matrix": [5, 6], "x": 4, "y": 6.75, "w": 7},
+                {"label": "Alt", "matrix": [5, 10], "x": 11, "y": 6.75, "w": 1.5},
+                {"label": "Ctrl", "matrix": [5, 12], "x": 13.5, "y": 6.75, "w": 1.5},
+
+                {"label": "\u2190", "matrix": [5, 15], "x": 15.25, "y": 6.75},
+                {"label": "\u2193", "matrix": [5, 16], "x": 16.25, "y": 6.75},
+                {"label": "\u2192", "matrix": [5, 17], "x": 17.25, "y": 6.75}
+            ]
+        },
+        "LAYOUT_ansi_wkl_split_bs_rshift": {
+            "layout": [
+                {"label": "Play/Pause", "matrix": [4, 15], "x": 3, "y": 0},
+
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 1.5},
+
+                {"label": "F1", "matrix": [0, 1], "x": 2, "y": 1.5},
+                {"label": "F2", "matrix": [0, 2], "x": 3, "y": 1.5},
+                {"label": "F3", "matrix": [0, 3], "x": 4, "y": 1.5},
+                {"label": "F4", "matrix": [0, 4], "x": 5, "y": 1.5},
+
+                {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 1.5},
+                {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 1.5},
+                {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 1.5},
+                {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 1.5},
+
+                {"label": "F9", "matrix": [0, 9], "x": 11, "y": 1.5},
+                {"label": "F10", "matrix": [0, 10], "x": 12, "y": 1.5},
+                {"label": "F11", "matrix": [0, 11], "x": 13, "y": 1.5},
+                {"label": "F12", "matrix": [0, 12], "x": 14, "y": 1.5},
+
+                {"label": "`", "matrix": [1, 0], "x": 0, "y": 2.75},
+                {"label": "1", "matrix": [1, 1], "x": 1, "y": 2.75},
+                {"label": "2", "matrix": [1, 2], "x": 2, "y": 2.75},
+                {"label": "3", "matrix": [1, 3], "x": 3, "y": 2.75},
+                {"label": "4", "matrix": [1, 4], "x": 4, "y": 2.75},
+                {"label": "5", "matrix": [1, 5], "x": 5, "y": 2.75},
+                {"label": "6", "matrix": [1, 6], "x": 6, "y": 2.75},
+                {"label": "7", "matrix": [1, 7], "x": 7, "y": 2.75},
+                {"label": "8", "matrix": [1, 8], "x": 8, "y": 2.75},
+                {"label": "9", "matrix": [1, 9], "x": 9, "y": 2.75},
+                {"label": "0", "matrix": [1, 10], "x": 10, "y": 2.75},
+                {"label": "-", "matrix": [1, 11], "x": 11, "y": 2.75},
+                {"label": "=", "matrix": [1, 12], "x": 12, "y": 2.75},
+                {"label": "Delete", "matrix": [1, 13], "x": 13, "y": 2.75},
+                {"label": "Backspace", "matrix": [1, 14], "x": 14, "y": 2.75},
+
+                {"label": "Insert", "matrix": [1, 15], "x": 15.25, "y": 2.75},
+                {"label": "Home", "matrix": [1, 16], "x": 16.25, "y": 2.75},
+                {"label": "Page Up", "matrix": [1, 17], "x": 17.25, "y": 2.75},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 3.75, "w": 1.5},
+                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 3.75},
+                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 3.75},
+                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 3.75},
+                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 3.75},
+                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 3.75},
+                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 3.75},
+                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 3.75},
+                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 3.75},
+                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 3.75},
+                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 3.75},
+                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 3.75},
+                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 3.75},
+                {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 3.75, "w": 1.5},
+
+                {"label": "Delete", "matrix": [2, 15], "x": 15.25, "y": 3.75},
+                {"label": "End", "matrix": [2, 16], "x": 16.25, "y": 3.75},
+                {"label": "Page Down", "matrix": [2, 17], "x": 17.25, "y": 3.75},
+
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 4.75, "w": 1.75},
+                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 4.75},
+                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 4.75},
+                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 4.75},
+                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 4.75},
+                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 4.75},
+                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 4.75},
+                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 4.75},
+                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 4.75},
+                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 4.75},
+                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 4.75},
+                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 4.75},
+                {"label": "Enter", "matrix": [3, 13], "x": 12.75, "y": 4.75, "w": 2.25},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 5.75, "w": 2.25},
+                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 5.75},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 5.75},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 5.75},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 5.75},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 5.75},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 5.75},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 5.75},
+                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 5.75},
+                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 5.75},
+                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 5.75},
+                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 5.75, "w": 1.75},
+                {"label": "Fn", "matrix": [4, 13], "x": 14, "y": 5.75},
+
+                {"label": "\u2191", "matrix": [4, 16], "x": 16.25, "y": 5.75},
+
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 6.75, "w": 1.5},
+                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 6.75, "w": 1.5},
+                {"label": "Space", "matrix": [5, 6], "x": 4, "y": 6.75, "w": 7},
+                {"label": "Alt", "matrix": [5, 10], "x": 11, "y": 6.75, "w": 1.5},
+                {"label": "Ctrl", "matrix": [5, 12], "x": 13.5, "y": 6.75, "w": 1.5},
+
+                {"label": "\u2190", "matrix": [5, 15], "x": 15.25, "y": 6.75},
+                {"label": "\u2193", "matrix": [5, 16], "x": 16.25, "y": 6.75},
+                {"label": "\u2192", "matrix": [5, 17], "x": 17.25, "y": 6.75}
+            ]
+        },
+        "LAYOUT_iso": {
+            "layout": [
+                {"label": "Play/Pause", "matrix": [4, 15], "x": 3, "y": 0},
+
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 1.5},
+
+                {"label": "F1", "matrix": [0, 1], "x": 2, "y": 1.5},
+                {"label": "F2", "matrix": [0, 2], "x": 3, "y": 1.5},
+                {"label": "F3", "matrix": [0, 3], "x": 4, "y": 1.5},
+                {"label": "F4", "matrix": [0, 4], "x": 5, "y": 1.5},
+
+                {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 1.5},
+                {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 1.5},
+                {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 1.5},
+                {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 1.5},
+
+                {"label": "F9", "matrix": [0, 9], "x": 11, "y": 1.5},
+                {"label": "F10", "matrix": [0, 10], "x": 12, "y": 1.5},
+                {"label": "F11", "matrix": [0, 11], "x": 13, "y": 1.5},
+                {"label": "F12", "matrix": [0, 12], "x": 14, "y": 1.5},
+
+                {"label": "`", "matrix": [1, 0], "x": 0, "y": 2.75},
+                {"label": "1", "matrix": [1, 1], "x": 1, "y": 2.75},
+                {"label": "2", "matrix": [1, 2], "x": 2, "y": 2.75},
+                {"label": "3", "matrix": [1, 3], "x": 3, "y": 2.75},
+                {"label": "4", "matrix": [1, 4], "x": 4, "y": 2.75},
+                {"label": "5", "matrix": [1, 5], "x": 5, "y": 2.75},
+                {"label": "6", "matrix": [1, 6], "x": 6, "y": 2.75},
+                {"label": "7", "matrix": [1, 7], "x": 7, "y": 2.75},
+                {"label": "8", "matrix": [1, 8], "x": 8, "y": 2.75},
+                {"label": "9", "matrix": [1, 9], "x": 9, "y": 2.75},
+                {"label": "0", "matrix": [1, 10], "x": 10, "y": 2.75},
+                {"label": "-", "matrix": [1, 11], "x": 11, "y": 2.75},
+                {"label": "=", "matrix": [1, 12], "x": 12, "y": 2.75},
+                {"label": "Backspace", "matrix": [1, 14], "x": 13, "y": 2.75, "w": 2},
+
+                {"label": "Insert", "matrix": [1, 15], "x": 15.25, "y": 2.75},
+                {"label": "Home", "matrix": [1, 16], "x": 16.25, "y": 2.75},
+                {"label": "Page Up", "matrix": [1, 17], "x": 17.25, "y": 2.75},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 3.75, "w": 1.5},
+                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 3.75},
+                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 3.75},
+                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 3.75},
+                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 3.75},
+                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 3.75},
+                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 3.75},
+                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 3.75},
+                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 3.75},
+                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 3.75},
+                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 3.75},
+                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 3.75},
+                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 3.75},
+
+                {"label": "Delete", "matrix": [2, 15], "x": 15.25, "y": 3.75},
+                {"label": "End", "matrix": [2, 16], "x": 16.25, "y": 3.75},
+                {"label": "Page Down", "matrix": [2, 17], "x": 17.25, "y": 3.75},
+
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 4.75, "w": 1.75},
+                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 4.75},
+                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 4.75},
+                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 4.75},
+                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 4.75},
+                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 4.75},
+                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 4.75},
+                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 4.75},
+                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 4.75},
+                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 4.75},
+                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 4.75},
+                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 4.75},
+                {"label": "#", "matrix": [3, 12], "x": 12.75, "y": 4.75},
+                {"label": "Enter", "matrix": [3, 13], "x": 13.75, "y": 3.75, "w": 1.25, "h": 2},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 5.75, "w": 1.25},
+                {"label": "\\", "matrix": [4, 1], "x": 1.25, "y": 5.75},
+                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 5.75},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 5.75},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 5.75},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 5.75},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 5.75},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 5.75},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 5.75},
+                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 5.75},
+                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 5.75},
+                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 5.75},
+                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 5.75, "w": 2.75},
+
+                {"label": "\u2191", "matrix": [4, 16], "x": 16.25, "y": 5.75},
+
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 6.75, "w": 1.25},
+                {"label": "GUI", "matrix": [5, 1], "x": 1.25, "y": 6.75, "w": 1.25},
+                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 6.75, "w": 1.25},
+                {"label": "Space", "matrix": [5, 6], "x": 3.75, "y": 6.75, "w": 6.25},
+                {"label": "Alt", "matrix": [5, 9], "x": 10, "y": 6.75, "w": 1.25},
+                {"label": "GUI", "matrix": [5, 10], "x": 11.25, "y": 6.75, "w": 1.25},
+                {"label": "Fn", "matrix": [5, 11], "x": 12.5, "y": 6.75, "w": 1.25},
+                {"label": "Ctrl", "matrix": [5, 12], "x": 13.75, "y": 6.75, "w": 1.25},
+
+                {"label": "\u2190", "matrix": [5, 15], "x": 15.25, "y": 6.75},
+                {"label": "\u2193", "matrix": [5, 16], "x": 16.25, "y": 6.75},
+                {"label": "\u2192", "matrix": [5, 17], "x": 17.25, "y": 6.75}
+            ]
+        },
+        "LAYOUT_iso_split_bs_rshift": {
+            "layout": [
+                {"label": "Play/Pause", "matrix": [4, 15], "x": 3, "y": 0},
+
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 1.5},
+
+                {"label": "F1", "matrix": [0, 1], "x": 2, "y": 1.5},
+                {"label": "F2", "matrix": [0, 2], "x": 3, "y": 1.5},
+                {"label": "F3", "matrix": [0, 3], "x": 4, "y": 1.5},
+                {"label": "F4", "matrix": [0, 4], "x": 5, "y": 1.5},
+
+                {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 1.5},
+                {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 1.5},
+                {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 1.5},
+                {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 1.5},
+
+                {"label": "F9", "matrix": [0, 9], "x": 11, "y": 1.5},
+                {"label": "F10", "matrix": [0, 10], "x": 12, "y": 1.5},
+                {"label": "F11", "matrix": [0, 11], "x": 13, "y": 1.5},
+                {"label": "F12", "matrix": [0, 12], "x": 14, "y": 1.5},
+
+                {"label": "`", "matrix": [1, 0], "x": 0, "y": 2.75},
+                {"label": "1", "matrix": [1, 1], "x": 1, "y": 2.75},
+                {"label": "2", "matrix": [1, 2], "x": 2, "y": 2.75},
+                {"label": "3", "matrix": [1, 3], "x": 3, "y": 2.75},
+                {"label": "4", "matrix": [1, 4], "x": 4, "y": 2.75},
+                {"label": "5", "matrix": [1, 5], "x": 5, "y": 2.75},
+                {"label": "6", "matrix": [1, 6], "x": 6, "y": 2.75},
+                {"label": "7", "matrix": [1, 7], "x": 7, "y": 2.75},
+                {"label": "8", "matrix": [1, 8], "x": 8, "y": 2.75},
+                {"label": "9", "matrix": [1, 9], "x": 9, "y": 2.75},
+                {"label": "0", "matrix": [1, 10], "x": 10, "y": 2.75},
+                {"label": "-", "matrix": [1, 11], "x": 11, "y": 2.75},
+                {"label": "=", "matrix": [1, 12], "x": 12, "y": 2.75},
+                {"label": "Delete", "matrix": [1, 13], "x": 13, "y": 2.75},
+                {"label": "Backspace", "matrix": [1, 14], "x": 14, "y": 2.75},
+
+                {"label": "Insert", "matrix": [1, 15], "x": 15.25, "y": 2.75},
+                {"label": "Home", "matrix": [1, 16], "x": 16.25, "y": 2.75},
+                {"label": "Page Up", "matrix": [1, 17], "x": 17.25, "y": 2.75},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 3.75, "w": 1.5},
+                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 3.75},
+                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 3.75},
+                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 3.75},
+                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 3.75},
+                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 3.75},
+                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 3.75},
+                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 3.75},
+                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 3.75},
+                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 3.75},
+                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 3.75},
+                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 3.75},
+                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 3.75},
+
+                {"label": "Delete", "matrix": [2, 15], "x": 15.25, "y": 3.75},
+                {"label": "End", "matrix": [2, 16], "x": 16.25, "y": 3.75},
+                {"label": "Page Down", "matrix": [2, 17], "x": 17.25, "y": 3.75},
+
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 4.75, "w": 1.75},
+                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 4.75},
+                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 4.75},
+                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 4.75},
+                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 4.75},
+                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 4.75},
+                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 4.75},
+                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 4.75},
+                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 4.75},
+                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 4.75},
+                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 4.75},
+                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 4.75},
+                {"label": "#", "matrix": [3, 12], "x": 12.75, "y": 4.75},
+                {"label": "Enter", "matrix": [3, 13], "x": 13.75, "y": 3.75, "w": 1.25, "h": 2},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 5.75, "w": 1.25},
+                {"label": "\\", "matrix": [4, 1], "x": 1.25, "y": 5.75},
+                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 5.75},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 5.75},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 5.75},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 5.75},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 5.75},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 5.75},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 5.75},
+                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 5.75},
+                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 5.75},
+                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 5.75},
+                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 5.75, "w": 1.75},
+                {"label": "Fn", "matrix": [4, 13], "x": 14, "y": 5.75},
+
+                {"label": "\u2191", "matrix": [4, 16], "x": 16.25, "y": 5.75},
+
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 6.75, "w": 1.25},
+                {"label": "GUI", "matrix": [5, 1], "x": 1.25, "y": 6.75, "w": 1.25},
+                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 6.75, "w": 1.25},
+                {"label": "Space", "matrix": [5, 6], "x": 3.75, "y": 6.75, "w": 6.25},
+                {"label": "Alt", "matrix": [5, 9], "x": 10, "y": 6.75, "w": 1.25},
+                {"label": "GUI", "matrix": [5, 10], "x": 11.25, "y": 6.75, "w": 1.25},
+                {"label": "Fn", "matrix": [5, 11], "x": 12.5, "y": 6.75, "w": 1.25},
+                {"label": "Ctrl", "matrix": [5, 12], "x": 13.75, "y": 6.75, "w": 1.25},
+
+                {"label": "\u2190", "matrix": [5, 15], "x": 15.25, "y": 6.75},
+                {"label": "\u2193", "matrix": [5, 16], "x": 16.25, "y": 6.75},
+                {"label": "\u2192", "matrix": [5, 17], "x": 17.25, "y": 6.75}
+            ]
+        },
+        "LAYOUT_iso_tsangan": {
+            "layout": [
+                {"label": "Play/Pause", "matrix": [4, 15], "x": 3, "y": 0},
+
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 1.5},
+
+                {"label": "F1", "matrix": [0, 1], "x": 2, "y": 1.5},
+                {"label": "F2", "matrix": [0, 2], "x": 3, "y": 1.5},
+                {"label": "F3", "matrix": [0, 3], "x": 4, "y": 1.5},
+                {"label": "F4", "matrix": [0, 4], "x": 5, "y": 1.5},
+
+                {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 1.5},
+                {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 1.5},
+                {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 1.5},
+                {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 1.5},
+
+                {"label": "F9", "matrix": [0, 9], "x": 11, "y": 1.5},
+                {"label": "F10", "matrix": [0, 10], "x": 12, "y": 1.5},
+                {"label": "F11", "matrix": [0, 11], "x": 13, "y": 1.5},
+                {"label": "F12", "matrix": [0, 12], "x": 14, "y": 1.5},
+
+                {"label": "`", "matrix": [1, 0], "x": 0, "y": 2.75},
+                {"label": "1", "matrix": [1, 1], "x": 1, "y": 2.75},
+                {"label": "2", "matrix": [1, 2], "x": 2, "y": 2.75},
+                {"label": "3", "matrix": [1, 3], "x": 3, "y": 2.75},
+                {"label": "4", "matrix": [1, 4], "x": 4, "y": 2.75},
+                {"label": "5", "matrix": [1, 5], "x": 5, "y": 2.75},
+                {"label": "6", "matrix": [1, 6], "x": 6, "y": 2.75},
+                {"label": "7", "matrix": [1, 7], "x": 7, "y": 2.75},
+                {"label": "8", "matrix": [1, 8], "x": 8, "y": 2.75},
+                {"label": "9", "matrix": [1, 9], "x": 9, "y": 2.75},
+                {"label": "0", "matrix": [1, 10], "x": 10, "y": 2.75},
+                {"label": "-", "matrix": [1, 11], "x": 11, "y": 2.75},
+                {"label": "=", "matrix": [1, 12], "x": 12, "y": 2.75},
+                {"label": "Backspace", "matrix": [1, 14], "x": 13, "y": 2.75, "w": 2},
+
+                {"label": "Insert", "matrix": [1, 15], "x": 15.25, "y": 2.75},
+                {"label": "Home", "matrix": [1, 16], "x": 16.25, "y": 2.75},
+                {"label": "Page Up", "matrix": [1, 17], "x": 17.25, "y": 2.75},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 3.75, "w": 1.5},
+                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 3.75},
+                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 3.75},
+                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 3.75},
+                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 3.75},
+                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 3.75},
+                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 3.75},
+                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 3.75},
+                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 3.75},
+                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 3.75},
+                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 3.75},
+                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 3.75},
+                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 3.75},
+
+                {"label": "Delete", "matrix": [2, 15], "x": 15.25, "y": 3.75},
+                {"label": "End", "matrix": [2, 16], "x": 16.25, "y": 3.75},
+                {"label": "Page Down", "matrix": [2, 17], "x": 17.25, "y": 3.75},
+
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 4.75, "w": 1.75},
+                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 4.75},
+                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 4.75},
+                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 4.75},
+                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 4.75},
+                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 4.75},
+                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 4.75},
+                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 4.75},
+                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 4.75},
+                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 4.75},
+                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 4.75},
+                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 4.75},
+                {"label": "#", "matrix": [3, 12], "x": 12.75, "y": 4.75},
+                {"label": "Enter", "matrix": [3, 13], "x": 13.75, "y": 3.75, "w": 1.25, "h": 2},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 5.75, "w": 1.25},
+                {"label": "\\", "matrix": [4, 1], "x": 1.25, "y": 5.75},
+                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 5.75},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 5.75},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 5.75},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 5.75},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 5.75},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 5.75},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 5.75},
+                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 5.75},
+                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 5.75},
+                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 5.75},
+                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 5.75, "w": 2.75},
+
+                {"label": "\u2191", "matrix": [4, 16], "x": 16.25, "y": 5.75},
+
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 6.75, "w": 1.5},
+                {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 6.75},
+                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 6.75, "w": 1.5},
+                {"label": "Space", "matrix": [5, 6], "x": 4, "y": 6.75, "w": 7},
+                {"label": "Alt", "matrix": [5, 10], "x": 11, "y": 6.75, "w": 1.5},
+                {"label": "Fn", "matrix": [5, 11], "x": 12.5, "y": 6.75},
+                {"label": "Ctrl", "matrix": [5, 12], "x": 13.5, "y": 6.75, "w": 1.5},
+
+                {"label": "\u2190", "matrix": [5, 15], "x": 15.25, "y": 6.75},
+                {"label": "\u2193", "matrix": [5, 16], "x": 16.25, "y": 6.75},
+                {"label": "\u2192", "matrix": [5, 17], "x": 17.25, "y": 6.75}
+            ]
+        },
+        "LAYOUT_iso_tsangan_split_bs_rshift": {
+            "layout": [
+                {"label": "Play/Pause", "matrix": [4, 15], "x": 3, "y": 0},
+
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 1.5},
+
+                {"label": "F1", "matrix": [0, 1], "x": 2, "y": 1.5},
+                {"label": "F2", "matrix": [0, 2], "x": 3, "y": 1.5},
+                {"label": "F3", "matrix": [0, 3], "x": 4, "y": 1.5},
+                {"label": "F4", "matrix": [0, 4], "x": 5, "y": 1.5},
+
+                {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 1.5},
+                {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 1.5},
+                {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 1.5},
+                {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 1.5},
+
+                {"label": "F9", "matrix": [0, 9], "x": 11, "y": 1.5},
+                {"label": "F10", "matrix": [0, 10], "x": 12, "y": 1.5},
+                {"label": "F11", "matrix": [0, 11], "x": 13, "y": 1.5},
+                {"label": "F12", "matrix": [0, 12], "x": 14, "y": 1.5},
+
+                {"label": "`", "matrix": [1, 0], "x": 0, "y": 2.75},
+                {"label": "1", "matrix": [1, 1], "x": 1, "y": 2.75},
+                {"label": "2", "matrix": [1, 2], "x": 2, "y": 2.75},
+                {"label": "3", "matrix": [1, 3], "x": 3, "y": 2.75},
+                {"label": "4", "matrix": [1, 4], "x": 4, "y": 2.75},
+                {"label": "5", "matrix": [1, 5], "x": 5, "y": 2.75},
+                {"label": "6", "matrix": [1, 6], "x": 6, "y": 2.75},
+                {"label": "7", "matrix": [1, 7], "x": 7, "y": 2.75},
+                {"label": "8", "matrix": [1, 8], "x": 8, "y": 2.75},
+                {"label": "9", "matrix": [1, 9], "x": 9, "y": 2.75},
+                {"label": "0", "matrix": [1, 10], "x": 10, "y": 2.75},
+                {"label": "-", "matrix": [1, 11], "x": 11, "y": 2.75},
+                {"label": "=", "matrix": [1, 12], "x": 12, "y": 2.75},
+                {"label": "Delete", "matrix": [1, 13], "x": 13, "y": 2.75},
+                {"label": "Backspace", "matrix": [1, 14], "x": 14, "y": 2.75},
+
+                {"label": "Insert", "matrix": [1, 15], "x": 15.25, "y": 2.75},
+                {"label": "Home", "matrix": [1, 16], "x": 16.25, "y": 2.75},
+                {"label": "Page Up", "matrix": [1, 17], "x": 17.25, "y": 2.75},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 3.75, "w": 1.5},
+                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 3.75},
+                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 3.75},
+                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 3.75},
+                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 3.75},
+                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 3.75},
+                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 3.75},
+                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 3.75},
+                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 3.75},
+                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 3.75},
+                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 3.75},
+                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 3.75},
+                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 3.75},
+
+                {"label": "Delete", "matrix": [2, 15], "x": 15.25, "y": 3.75},
+                {"label": "End", "matrix": [2, 16], "x": 16.25, "y": 3.75},
+                {"label": "Page Down", "matrix": [2, 17], "x": 17.25, "y": 3.75},
+
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 4.75, "w": 1.75},
+                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 4.75},
+                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 4.75},
+                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 4.75},
+                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 4.75},
+                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 4.75},
+                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 4.75},
+                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 4.75},
+                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 4.75},
+                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 4.75},
+                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 4.75},
+                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 4.75},
+                {"label": "#", "matrix": [3, 12], "x": 12.75, "y": 4.75},
+                {"label": "Enter", "matrix": [3, 13], "x": 13.75, "y": 3.75, "w": 1.25, "h": 2},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 5.75, "w": 1.25},
+                {"label": "\\", "matrix": [4, 1], "x": 1.25, "y": 5.75},
+                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 5.75},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 5.75},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 5.75},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 5.75},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 5.75},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 5.75},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 5.75},
+                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 5.75},
+                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 5.75},
+                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 5.75},
+                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 5.75, "w": 1.75},
+                {"label": "Fn", "matrix": [4, 13], "x": 14, "y": 5.75},
+
+                {"label": "\u2191", "matrix": [4, 16], "x": 16.25, "y": 5.75},
+
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 6.75, "w": 1.5},
+                {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 6.75},
+                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 6.75, "w": 1.5},
+                {"label": "Space", "matrix": [5, 6], "x": 4, "y": 6.75, "w": 7},
+                {"label": "Alt", "matrix": [5, 10], "x": 11, "y": 6.75, "w": 1.5},
+                {"label": "Fn", "matrix": [5, 11], "x": 12.5, "y": 6.75},
+                {"label": "Ctrl", "matrix": [5, 12], "x": 13.5, "y": 6.75, "w": 1.5},
+
+                {"label": "\u2190", "matrix": [5, 15], "x": 15.25, "y": 6.75},
+                {"label": "\u2193", "matrix": [5, 16], "x": 16.25, "y": 6.75},
+                {"label": "\u2192", "matrix": [5, 17], "x": 17.25, "y": 6.75}
+            ]
+        },
+        "LAYOUT_iso_wkl": {
+            "layout": [
+                {"label": "Play/Pause", "matrix": [4, 15], "x": 3, "y": 0},
+
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 1.5},
+
+                {"label": "F1", "matrix": [0, 1], "x": 2, "y": 1.5},
+                {"label": "F2", "matrix": [0, 2], "x": 3, "y": 1.5},
+                {"label": "F3", "matrix": [0, 3], "x": 4, "y": 1.5},
+                {"label": "F4", "matrix": [0, 4], "x": 5, "y": 1.5},
+
+                {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 1.5},
+                {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 1.5},
+                {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 1.5},
+                {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 1.5},
+
+                {"label": "F9", "matrix": [0, 9], "x": 11, "y": 1.5},
+                {"label": "F10", "matrix": [0, 10], "x": 12, "y": 1.5},
+                {"label": "F11", "matrix": [0, 11], "x": 13, "y": 1.5},
+                {"label": "F12", "matrix": [0, 12], "x": 14, "y": 1.5},
+
+                {"label": "`", "matrix": [1, 0], "x": 0, "y": 2.75},
+                {"label": "1", "matrix": [1, 1], "x": 1, "y": 2.75},
+                {"label": "2", "matrix": [1, 2], "x": 2, "y": 2.75},
+                {"label": "3", "matrix": [1, 3], "x": 3, "y": 2.75},
+                {"label": "4", "matrix": [1, 4], "x": 4, "y": 2.75},
+                {"label": "5", "matrix": [1, 5], "x": 5, "y": 2.75},
+                {"label": "6", "matrix": [1, 6], "x": 6, "y": 2.75},
+                {"label": "7", "matrix": [1, 7], "x": 7, "y": 2.75},
+                {"label": "8", "matrix": [1, 8], "x": 8, "y": 2.75},
+                {"label": "9", "matrix": [1, 9], "x": 9, "y": 2.75},
+                {"label": "0", "matrix": [1, 10], "x": 10, "y": 2.75},
+                {"label": "-", "matrix": [1, 11], "x": 11, "y": 2.75},
+                {"label": "=", "matrix": [1, 12], "x": 12, "y": 2.75},
+                {"label": "Backspace", "matrix": [1, 14], "x": 13, "y": 2.75, "w": 2},
+
+                {"label": "Insert", "matrix": [1, 15], "x": 15.25, "y": 2.75},
+                {"label": "Home", "matrix": [1, 16], "x": 16.25, "y": 2.75},
+                {"label": "Page Up", "matrix": [1, 17], "x": 17.25, "y": 2.75},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 3.75, "w": 1.5},
+                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 3.75},
+                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 3.75},
+                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 3.75},
+                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 3.75},
+                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 3.75},
+                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 3.75},
+                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 3.75},
+                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 3.75},
+                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 3.75},
+                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 3.75},
+                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 3.75},
+                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 3.75},
+
+                {"label": "Delete", "matrix": [2, 15], "x": 15.25, "y": 3.75},
+                {"label": "End", "matrix": [2, 16], "x": 16.25, "y": 3.75},
+                {"label": "Page Down", "matrix": [2, 17], "x": 17.25, "y": 3.75},
+
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 4.75, "w": 1.75},
+                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 4.75},
+                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 4.75},
+                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 4.75},
+                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 4.75},
+                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 4.75},
+                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 4.75},
+                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 4.75},
+                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 4.75},
+                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 4.75},
+                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 4.75},
+                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 4.75},
+                {"label": "#", "matrix": [3, 12], "x": 12.75, "y": 4.75},
+                {"label": "Enter", "matrix": [3, 13], "x": 13.75, "y": 3.75, "w": 1.25, "h": 2},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 5.75, "w": 1.25},
+                {"label": "\\", "matrix": [4, 1], "x": 1.25, "y": 5.75},
+                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 5.75},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 5.75},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 5.75},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 5.75},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 5.75},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 5.75},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 5.75},
+                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 5.75},
+                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 5.75},
+                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 5.75},
+                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 5.75, "w": 2.75},
+
+                {"label": "\u2191", "matrix": [4, 16], "x": 16.25, "y": 5.75},
+
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 6.75, "w": 1.5},
+                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 6.75, "w": 1.5},
+                {"label": "Space", "matrix": [5, 6], "x": 4, "y": 6.75, "w": 7},
+                {"label": "Alt", "matrix": [5, 10], "x": 11, "y": 6.75, "w": 1.5},
+                {"label": "Ctrl", "matrix": [5, 12], "x": 13.5, "y": 6.75, "w": 1.5},
+
+                {"label": "\u2190", "matrix": [5, 15], "x": 15.25, "y": 6.75},
+                {"label": "\u2193", "matrix": [5, 16], "x": 16.25, "y": 6.75},
+                {"label": "\u2192", "matrix": [5, 17], "x": 17.25, "y": 6.75}
+            ]
+        },
+        "LAYOUT_iso_wkl_split_bs_rshift": {
+            "layout": [
+                {"label": "Play/Pause", "matrix": [4, 15], "x": 3, "y": 0},
+
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 1.5},
+
+                {"label": "F1", "matrix": [0, 1], "x": 2, "y": 1.5},
+                {"label": "F2", "matrix": [0, 2], "x": 3, "y": 1.5},
+                {"label": "F3", "matrix": [0, 3], "x": 4, "y": 1.5},
+                {"label": "F4", "matrix": [0, 4], "x": 5, "y": 1.5},
+
+                {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 1.5},
+                {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 1.5},
+                {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 1.5},
+                {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 1.5},
+
+                {"label": "F9", "matrix": [0, 9], "x": 11, "y": 1.5},
+                {"label": "F10", "matrix": [0, 10], "x": 12, "y": 1.5},
+                {"label": "F11", "matrix": [0, 11], "x": 13, "y": 1.5},
+                {"label": "F12", "matrix": [0, 12], "x": 14, "y": 1.5},
+
+                {"label": "`", "matrix": [1, 0], "x": 0, "y": 2.75},
+                {"label": "1", "matrix": [1, 1], "x": 1, "y": 2.75},
+                {"label": "2", "matrix": [1, 2], "x": 2, "y": 2.75},
+                {"label": "3", "matrix": [1, 3], "x": 3, "y": 2.75},
+                {"label": "4", "matrix": [1, 4], "x": 4, "y": 2.75},
+                {"label": "5", "matrix": [1, 5], "x": 5, "y": 2.75},
+                {"label": "6", "matrix": [1, 6], "x": 6, "y": 2.75},
+                {"label": "7", "matrix": [1, 7], "x": 7, "y": 2.75},
+                {"label": "8", "matrix": [1, 8], "x": 8, "y": 2.75},
+                {"label": "9", "matrix": [1, 9], "x": 9, "y": 2.75},
+                {"label": "0", "matrix": [1, 10], "x": 10, "y": 2.75},
+                {"label": "-", "matrix": [1, 11], "x": 11, "y": 2.75},
+                {"label": "=", "matrix": [1, 12], "x": 12, "y": 2.75},
+                {"label": "Delete", "matrix": [1, 13], "x": 13, "y": 2.75},
+                {"label": "Backspace", "matrix": [1, 14], "x": 14, "y": 2.75},
+
+                {"label": "Insert", "matrix": [1, 15], "x": 15.25, "y": 2.75},
+                {"label": "Home", "matrix": [1, 16], "x": 16.25, "y": 2.75},
+                {"label": "Page Up", "matrix": [1, 17], "x": 17.25, "y": 2.75},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 3.75, "w": 1.5},
+                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 3.75},
+                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 3.75},
+                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 3.75},
+                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 3.75},
+                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 3.75},
+                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 3.75},
+                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 3.75},
+                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 3.75},
+                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 3.75},
+                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 3.75},
+                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 3.75},
+                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 3.75},
+
+                {"label": "Delete", "matrix": [2, 15], "x": 15.25, "y": 3.75},
+                {"label": "End", "matrix": [2, 16], "x": 16.25, "y": 3.75},
+                {"label": "Page Down", "matrix": [2, 17], "x": 17.25, "y": 3.75},
+
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 4.75, "w": 1.75},
+                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 4.75},
+                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 4.75},
+                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 4.75},
+                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 4.75},
+                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 4.75},
+                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 4.75},
+                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 4.75},
+                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 4.75},
+                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 4.75},
+                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 4.75},
+                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 4.75},
+                {"label": "#", "matrix": [3, 12], "x": 12.75, "y": 4.75},
+                {"label": "Enter", "matrix": [3, 13], "x": 13.75, "y": 3.75, "w": 1.25, "h": 2},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 5.75, "w": 1.25},
+                {"label": "\\", "matrix": [4, 1], "x": 1.25, "y": 5.75},
+                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 5.75},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 5.75},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 5.75},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 5.75},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 5.75},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 5.75},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 5.75},
+                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 5.75},
+                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 5.75},
+                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 5.75},
+                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 5.75, "w": 1.75},
+                {"label": "Fn", "matrix": [4, 13], "x": 14, "y": 5.75},
+
+                {"label": "\u2191", "matrix": [4, 16], "x": 16.25, "y": 5.75},
+
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 6.75, "w": 1.5},
+                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 6.75, "w": 1.5},
+                {"label": "Space", "matrix": [5, 6], "x": 4, "y": 6.75, "w": 7},
+                {"label": "Alt", "matrix": [5, 10], "x": 11, "y": 6.75, "w": 1.5},
+                {"label": "Ctrl", "matrix": [5, 12], "x": 13.5, "y": 6.75, "w": 1.5},
+
+                {"label": "\u2190", "matrix": [5, 15], "x": 15.25, "y": 6.75},
+                {"label": "\u2193", "matrix": [5, 16], "x": 16.25, "y": 6.75},
+                {"label": "\u2192", "matrix": [5, 17], "x": 17.25, "y": 6.75}
+            ]
+        }
+    }
+}
diff --git a/keyboards/pearlboards/zeus/rules.mk b/keyboards/pearlboards/zeus/rules.mk
deleted file mode 100644
index 5cb2d9b6493..00000000000
--- a/keyboards/pearlboards/zeus/rules.mk
+++ /dev/null
@@ -1,17 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-AUDIO_ENABLE = yes          # Audio output
-ENCODER_ENABLE = yes        # Rotary encoder
-HAPTIC_ENABLE = yes         # Rumble feefback
-HAPTIC_DRIVER = drv2605l    # Rumble motor
-
-LTO_ENABLE = yes            # Link time optimization
diff --git a/keyboards/peej/rosaline/ortho/info.json b/keyboards/peej/rosaline/ortho/info.json
deleted file mode 100644
index 9fb9d3cb40d..00000000000
--- a/keyboards/peej/rosaline/ortho/info.json
+++ /dev/null
@@ -1,88 +0,0 @@
-{
-  "keyboard_name": "Rosaline Ortho",
-  "manufacturer": "Peej",
-  "url": "https://github.com/peej/rosaline-keyboard",
-  "maintainer": "Peej",
-  "usb": {
-    "vid": "0x706A",
-    "pid": "0x0003",
-    "device_version": "0.0.1",
-    "max_power": 100
-  },
-  "matrix_pins": {
-    "cols": ["B0", "D7", "D6", "C2", "D4", "D1", "D0", "C1"],
-    "rows": ["C0", "B5", "B4", "B3", "B2", "B1", "C3", "D5"]
-  },
-  "diode_direction": "COL2ROW",
-  "processor": "atmega328p",
-  "bootloader": "usbasploader",
-  "layouts": {
-    "LAYOUT_ortho_4x15": {
-      "layout": [
-        {"matrix": [0, 0], "x": 0, "y": 0},
-        {"matrix": [4, 0], "x": 1, "y": 0},
-        {"matrix": [0, 1], "x": 2, "y": 0},
-        {"matrix": [4, 1], "x": 3, "y": 0},
-        {"matrix": [0, 2], "x": 4, "y": 0},
-        {"matrix": [4, 2], "x": 5, "y": 0},
-        {"matrix": [0, 3], "x": 6, "y": 0},
-        {"matrix": [4, 3], "x": 7, "y": 0},
-        {"matrix": [0, 4], "x": 8, "y": 0},
-        {"matrix": [4, 4], "x": 9, "y": 0},
-        {"matrix": [0, 5], "x": 10, "y": 0},
-        {"matrix": [4, 5], "x": 11, "y": 0},
-        {"matrix": [0, 6], "x": 12, "y": 0},
-        {"matrix": [4, 6], "x": 13, "y": 0},
-        {"matrix": [0, 7], "x": 14, "y": 0},
-
-        {"matrix": [1, 0], "x": 0, "y": 1},
-        {"matrix": [5, 0], "x": 1, "y": 1},
-        {"matrix": [1, 1], "x": 2, "y": 1},
-        {"matrix": [5, 1], "x": 3, "y": 1},
-        {"matrix": [1, 2], "x": 4, "y": 1},
-        {"matrix": [5, 2], "x": 5, "y": 1},
-        {"matrix": [1, 3], "x": 6, "y": 1},
-        {"matrix": [5, 3], "x": 7, "y": 1},
-        {"matrix": [1, 4], "x": 8, "y": 1},
-        {"matrix": [5, 4], "x": 9, "y": 1},
-        {"matrix": [1, 5], "x": 10, "y": 1},
-        {"matrix": [5, 5], "x": 11, "y": 1},
-        {"matrix": [1, 6], "x": 12, "y": 1},
-        {"matrix": [5, 6], "x": 13, "y": 1},
-        {"matrix": [1, 7], "x": 14, "y": 1},
-
-        {"matrix": [2, 0], "x": 0, "y": 2},
-        {"matrix": [6, 0], "x": 1, "y": 2},
-        {"matrix": [2, 1], "x": 2, "y": 2},
-        {"matrix": [6, 1], "x": 3, "y": 2},
-        {"matrix": [2, 2], "x": 4, "y": 2},
-        {"matrix": [6, 2], "x": 5, "y": 2},
-        {"matrix": [2, 3], "x": 6, "y": 2},
-        {"matrix": [6, 3], "x": 7, "y": 2},
-        {"matrix": [2, 4], "x": 8, "y": 2},
-        {"matrix": [6, 4], "x": 9, "y": 2},
-        {"matrix": [2, 5], "x": 10, "y": 2},
-        {"matrix": [6, 5], "x": 11, "y": 2},
-        {"matrix": [2, 6], "x": 12, "y": 2},
-        {"matrix": [6, 6], "x": 13, "y": 2},
-        {"matrix": [2, 7], "x": 14, "y": 2},
-
-        {"matrix": [3, 0], "x": 0, "y": 3},
-        {"matrix": [7, 0], "x": 1, "y": 3},
-        {"matrix": [3, 1], "x": 2, "y": 3},
-        {"matrix": [7, 1], "x": 3, "y": 3},
-        {"matrix": [3, 2], "x": 4, "y": 3},
-        {"matrix": [7, 2], "x": 5, "y": 3},
-        {"matrix": [3, 3], "x": 6, "y": 3},
-        {"matrix": [7, 3], "x": 7, "y": 3},
-        {"matrix": [3, 4], "x": 8, "y": 3},
-        {"matrix": [7, 4], "x": 9, "y": 3},
-        {"matrix": [3, 5], "x": 10, "y": 3},
-        {"matrix": [7, 5], "x": 11, "y": 3},
-        {"matrix": [3, 6], "x": 12, "y": 3},
-        {"matrix": [7, 6], "x": 13, "y": 3},
-        {"matrix": [3, 7], "x": 14, "y": 3}
-      ]
-    }
-  }
-}
diff --git a/keyboards/peej/rosaline/ortho/keyboard.json b/keyboards/peej/rosaline/ortho/keyboard.json
new file mode 100644
index 00000000000..49c3b9fb921
--- /dev/null
+++ b/keyboards/peej/rosaline/ortho/keyboard.json
@@ -0,0 +1,94 @@
+{
+  "keyboard_name": "Rosaline Ortho",
+  "manufacturer": "Peej",
+  "url": "https://github.com/peej/rosaline-keyboard",
+  "maintainer": "Peej",
+  "usb": {
+    "vid": "0x706A",
+    "pid": "0x0003",
+    "device_version": "0.0.1",
+    "max_power": 100
+  },
+  "features": {
+    "bootmagic": true,
+    "extrakey": true,
+    "mousekey": true,
+    "nkro": false
+  },
+  "matrix_pins": {
+    "cols": ["B0", "D7", "D6", "C2", "D4", "D1", "D0", "C1"],
+    "rows": ["C0", "B5", "B4", "B3", "B2", "B1", "C3", "D5"]
+  },
+  "diode_direction": "COL2ROW",
+  "processor": "atmega328p",
+  "bootloader": "usbasploader",
+  "layouts": {
+    "LAYOUT_ortho_4x15": {
+      "layout": [
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [4, 0], "x": 1, "y": 0},
+        {"matrix": [0, 1], "x": 2, "y": 0},
+        {"matrix": [4, 1], "x": 3, "y": 0},
+        {"matrix": [0, 2], "x": 4, "y": 0},
+        {"matrix": [4, 2], "x": 5, "y": 0},
+        {"matrix": [0, 3], "x": 6, "y": 0},
+        {"matrix": [4, 3], "x": 7, "y": 0},
+        {"matrix": [0, 4], "x": 8, "y": 0},
+        {"matrix": [4, 4], "x": 9, "y": 0},
+        {"matrix": [0, 5], "x": 10, "y": 0},
+        {"matrix": [4, 5], "x": 11, "y": 0},
+        {"matrix": [0, 6], "x": 12, "y": 0},
+        {"matrix": [4, 6], "x": 13, "y": 0},
+        {"matrix": [0, 7], "x": 14, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1},
+        {"matrix": [5, 0], "x": 1, "y": 1},
+        {"matrix": [1, 1], "x": 2, "y": 1},
+        {"matrix": [5, 1], "x": 3, "y": 1},
+        {"matrix": [1, 2], "x": 4, "y": 1},
+        {"matrix": [5, 2], "x": 5, "y": 1},
+        {"matrix": [1, 3], "x": 6, "y": 1},
+        {"matrix": [5, 3], "x": 7, "y": 1},
+        {"matrix": [1, 4], "x": 8, "y": 1},
+        {"matrix": [5, 4], "x": 9, "y": 1},
+        {"matrix": [1, 5], "x": 10, "y": 1},
+        {"matrix": [5, 5], "x": 11, "y": 1},
+        {"matrix": [1, 6], "x": 12, "y": 1},
+        {"matrix": [5, 6], "x": 13, "y": 1},
+        {"matrix": [1, 7], "x": 14, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2},
+        {"matrix": [6, 0], "x": 1, "y": 2},
+        {"matrix": [2, 1], "x": 2, "y": 2},
+        {"matrix": [6, 1], "x": 3, "y": 2},
+        {"matrix": [2, 2], "x": 4, "y": 2},
+        {"matrix": [6, 2], "x": 5, "y": 2},
+        {"matrix": [2, 3], "x": 6, "y": 2},
+        {"matrix": [6, 3], "x": 7, "y": 2},
+        {"matrix": [2, 4], "x": 8, "y": 2},
+        {"matrix": [6, 4], "x": 9, "y": 2},
+        {"matrix": [2, 5], "x": 10, "y": 2},
+        {"matrix": [6, 5], "x": 11, "y": 2},
+        {"matrix": [2, 6], "x": 12, "y": 2},
+        {"matrix": [6, 6], "x": 13, "y": 2},
+        {"matrix": [2, 7], "x": 14, "y": 2},
+
+        {"matrix": [3, 0], "x": 0, "y": 3},
+        {"matrix": [7, 0], "x": 1, "y": 3},
+        {"matrix": [3, 1], "x": 2, "y": 3},
+        {"matrix": [7, 1], "x": 3, "y": 3},
+        {"matrix": [3, 2], "x": 4, "y": 3},
+        {"matrix": [7, 2], "x": 5, "y": 3},
+        {"matrix": [3, 3], "x": 6, "y": 3},
+        {"matrix": [7, 3], "x": 7, "y": 3},
+        {"matrix": [3, 4], "x": 8, "y": 3},
+        {"matrix": [7, 4], "x": 9, "y": 3},
+        {"matrix": [3, 5], "x": 10, "y": 3},
+        {"matrix": [7, 5], "x": 11, "y": 3},
+        {"matrix": [3, 6], "x": 12, "y": 3},
+        {"matrix": [7, 6], "x": 13, "y": 3},
+        {"matrix": [3, 7], "x": 14, "y": 3}
+      ]
+    }
+  }
+}
diff --git a/keyboards/peej/rosaline/ortho/rules.mk b/keyboards/peej/rosaline/ortho/rules.mk
deleted file mode 100644
index ab2c49da70e..00000000000
--- a/keyboards/peej/rosaline/ortho/rules.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
diff --git a/keyboards/peej/rosaline/staggered/info.json b/keyboards/peej/rosaline/staggered/info.json
deleted file mode 100644
index 06792031632..00000000000
--- a/keyboards/peej/rosaline/staggered/info.json
+++ /dev/null
@@ -1,189 +0,0 @@
-{
-    "keyboard_name": "Rosaline Staggered",
-    "manufacturer": "Peej",
-    "url": "https://github.com/peej/rosaline-keyboard",
-    "maintainer": "Peej",
-    "usb": {
-        "vid": "0x706A",
-        "pid": "0x0003",
-        "device_version": "0.0.1",
-        "max_power": 100
-    },
-    "matrix_pins": {
-        "cols": ["B0", "D7", "D6", "C2", "D4", "D1", "D0", "C1"],
-        "rows": ["C0", "B5", "B4", "B3", "B2", "B1", "C3", "D5"]
-    },
-    "diode_direction": "COL2ROW",
-    "processor": "atmega328p",
-    "bootloader": "usbasploader",
-    "layout_aliases": {
-        "LAYOUT_staggered_40": "LAYOUT_all"
-    },
-    "layouts": {
-        "LAYOUT_all": {
-            "layout": [
-                {"label": "Tab", "matrix": [0, 0], "x": 0, "y": 0, "w": 1.5},
-                {"label": "Q", "matrix": [1, 0], "x": 1.5, "y": 0},
-                {"label": "W", "matrix": [0, 1], "x": 2.5, "y": 0},
-                {"label": "E", "matrix": [0, 2], "x": 3.5, "y": 0},
-                {"label": "R", "matrix": [1, 2], "x": 4.5, "y": 0},
-                {"label": "T", "matrix": [0, 3], "x": 5.5, "y": 0},
-                {"label": "Y", "matrix": [1, 3], "x": 6.5, "y": 0},
-                {"label": "U", "matrix": [0, 4], "x": 7.5, "y": 0},
-                {"label": "I", "matrix": [1, 4], "x": 8.5, "y": 0},
-                {"label": "O", "matrix": [0, 5], "x": 9.5, "y": 0},
-                {"label": "P", "matrix": [0, 6], "x": 10.5, "y": 0},
-                {"label": "[", "matrix": [1, 6], "x": 11.5, "y": 0},
-                {"label": "]", "matrix": [0, 7], "x": 12.5, "y": 0},
-                {"label": "Backspace", "matrix": [1, 7], "x": 13.5, "y": 0, "w": 1.5},
-
-                {"label": "Esc", "matrix": [2, 0], "x": 0, "y": 1, "w": 1.75},
-                {"label": "A", "matrix": [1, 1], "x": 1.75, "y": 1},
-                {"label": "S", "matrix": [2, 1], "x": 2.75, "y": 1},
-                {"label": "D", "matrix": [2, 2], "x": 3.75, "y": 1},
-                {"label": "F", "matrix": [3, 2], "x": 4.75, "y": 1},
-                {"label": "G", "matrix": [2, 3], "x": 5.75, "y": 1},
-                {"label": "H", "matrix": [3, 3], "x": 6.75, "y": 1},
-                {"label": "J", "matrix": [2, 4], "x": 7.75, "y": 1},
-                {"label": "K", "matrix": [1, 5], "x": 8.75, "y": 1},
-                {"label": "L", "matrix": [2, 5], "x": 9.75, "y": 1},
-                {"label": ";", "matrix": [2, 6], "x": 10.75, "y": 1},
-                {"label": "'", "matrix": [3, 6], "x": 11.75, "y": 1},
-                {"label": "Enter", "matrix": [2, 7], "x": 12.75, "y": 1, "w": 2.25},
-
-                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 2, "w": 2.25},
-                {"label": "Z", "matrix": [3, 1], "x": 2.25, "y": 2},
-                {"label": "X", "matrix": [4, 1], "x": 3.25, "y": 2},
-                {"label": "C", "matrix": [4, 2], "x": 4.25, "y": 2},
-                {"label": "V", "matrix": [4, 3], "x": 5.25, "y": 2},
-                {"label": "B", "matrix": [5, 3], "x": 6.25, "y": 2},
-                {"label": "N", "matrix": [3, 4], "x": 7.25, "y": 2},
-                {"label": "M", "matrix": [4, 4], "x": 8.25, "y": 2},
-                {"label": ",", "matrix": [3, 5], "x": 9.25, "y": 2},
-                {"label": ".", "matrix": [4, 5], "x": 10.25, "y": 2},
-                {"label": "/", "matrix": [4, 6], "x": 11.25, "y": 2},
-                {"label": "Shift", "matrix": [3, 7], "x": 12.25, "y": 2, "w": 1.75},
-                {"label": "Fn", "matrix": [4, 7], "x": 14, "y": 2},
-
-                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 3, "w": 1.5},
-                {"label": "GUI", "matrix": [5, 0], "x": 1.5, "y": 3},
-                {"label": "Alt", "matrix": [5, 1], "x": 2.5, "y": 3, "w": 1.5},
-                {"label": "Space", "matrix": [5, 2], "x": 4, "y": 3, "w": 2.75},
-                {"label": "Space", "matrix": [5, 4], "x": 6.75, "y": 3},
-                {"label": "Alt", "matrix": [5, 5], "x": 7.75, "y": 3, "w": 2.25},
-                {"label": "Ctrl", "matrix": [6, 5], "x": 10, "y": 3},
-                {"label": "\u2190", "matrix": [5, 6], "x": 11, "y": 3},
-                {"label": "\u2193", "matrix": [6, 6], "x": 12, "y": 3},
-                {"label": "\u2191", "matrix": [5, 7], "x": 13, "y": 3},
-                {"label": "\u2192", "matrix": [6, 7], "x": 14, "y": 3}
-            ]
-        },
-        "LAYOUT_tsangan": {
-            "layout": [
-                {"label": "Tab", "matrix": [0, 0], "x": 0, "y": 0, "w": 1.5},
-                {"label": "Q", "matrix": [1, 0], "x": 1.5, "y": 0},
-                {"label": "W", "matrix": [0, 1], "x": 2.5, "y": 0},
-                {"label": "E", "matrix": [0, 2], "x": 3.5, "y": 0},
-                {"label": "R", "matrix": [1, 2], "x": 4.5, "y": 0},
-                {"label": "T", "matrix": [0, 3], "x": 5.5, "y": 0},
-                {"label": "Y", "matrix": [1, 3], "x": 6.5, "y": 0},
-                {"label": "U", "matrix": [0, 4], "x": 7.5, "y": 0},
-                {"label": "I", "matrix": [1, 4], "x": 8.5, "y": 0},
-                {"label": "O", "matrix": [0, 5], "x": 9.5, "y": 0},
-                {"label": "P", "matrix": [0, 6], "x": 10.5, "y": 0},
-                {"label": "[", "matrix": [1, 6], "x": 11.5, "y": 0},
-                {"label": "]", "matrix": [0, 7], "x": 12.5, "y": 0},
-                {"label": "Backspace", "matrix": [1, 7], "x": 13.5, "y": 0, "w": 1.5},
-
-                {"label": "Esc", "matrix": [2, 0], "x": 0, "y": 1, "w": 1.75},
-                {"label": "A", "matrix": [1, 1], "x": 1.75, "y": 1},
-                {"label": "S", "matrix": [2, 1], "x": 2.75, "y": 1},
-                {"label": "D", "matrix": [2, 2], "x": 3.75, "y": 1},
-                {"label": "F", "matrix": [3, 2], "x": 4.75, "y": 1},
-                {"label": "G", "matrix": [2, 3], "x": 5.75, "y": 1},
-                {"label": "H", "matrix": [3, 3], "x": 6.75, "y": 1},
-                {"label": "J", "matrix": [2, 4], "x": 7.75, "y": 1},
-                {"label": "K", "matrix": [1, 5], "x": 8.75, "y": 1},
-                {"label": "L", "matrix": [2, 5], "x": 9.75, "y": 1},
-                {"label": ";", "matrix": [2, 6], "x": 10.75, "y": 1},
-                {"label": "'", "matrix": [3, 6], "x": 11.75, "y": 1},
-                {"label": "Enter", "matrix": [2, 7], "x": 12.75, "y": 1, "w": 2.25},
-
-                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 2, "w": 2.25},
-                {"label": "Z", "matrix": [3, 1], "x": 2.25, "y": 2},
-                {"label": "X", "matrix": [4, 1], "x": 3.25, "y": 2},
-                {"label": "C", "matrix": [4, 2], "x": 4.25, "y": 2},
-                {"label": "V", "matrix": [4, 3], "x": 5.25, "y": 2},
-                {"label": "B", "matrix": [5, 3], "x": 6.25, "y": 2},
-                {"label": "N", "matrix": [3, 4], "x": 7.25, "y": 2},
-                {"label": "M", "matrix": [4, 4], "x": 8.25, "y": 2},
-                {"label": ",", "matrix": [3, 5], "x": 9.25, "y": 2},
-                {"label": ".", "matrix": [4, 5], "x": 10.25, "y": 2},
-                {"label": "/", "matrix": [4, 6], "x": 11.25, "y": 2},
-                {"label": "Shift", "matrix": [3, 7], "x": 12.25, "y": 2, "w": 2.75},
-
-                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 3, "w": 1.5},
-                {"label": "GUI", "matrix": [5, 0], "x": 1.5, "y": 3},
-                {"label": "Alt", "matrix": [5, 1], "x": 2.5, "y": 3, "w": 1.5},
-                {"label": "Space", "matrix": [5, 4], "x": 4, "y": 3, "w":7},
-                {"label": "Alt", "matrix": [5, 6], "x": 11, "y": 3, "w": 1.5},
-                {"label": "Fn", "matrix": [6, 6], "x": 12.5, "y": 3},
-                {"label": "Ctrl", "matrix": [5, 7], "x": 13.5, "y": 3, "w": 1.5}
-            ]
-        },
-        "LAYOUT_tsangan_split_rshift": {
-            "layout": [
-                {"label": "Tab", "matrix": [0, 0], "x": 0, "y": 0, "w": 1.5},
-                {"label": "Q", "matrix": [1, 0], "x": 1.5, "y": 0},
-                {"label": "W", "matrix": [0, 1], "x": 2.5, "y": 0},
-                {"label": "E", "matrix": [0, 2], "x": 3.5, "y": 0},
-                {"label": "R", "matrix": [1, 2], "x": 4.5, "y": 0},
-                {"label": "T", "matrix": [0, 3], "x": 5.5, "y": 0},
-                {"label": "Y", "matrix": [1, 3], "x": 6.5, "y": 0},
-                {"label": "U", "matrix": [0, 4], "x": 7.5, "y": 0},
-                {"label": "I", "matrix": [1, 4], "x": 8.5, "y": 0},
-                {"label": "O", "matrix": [0, 5], "x": 9.5, "y": 0},
-                {"label": "P", "matrix": [0, 6], "x": 10.5, "y": 0},
-                {"label": "[", "matrix": [1, 6], "x": 11.5, "y": 0},
-                {"label": "]", "matrix": [0, 7], "x": 12.5, "y": 0},
-                {"label": "Backspace", "matrix": [1, 7], "x": 13.5, "y": 0, "w": 1.5},
-
-                {"label": "Esc", "matrix": [2, 0], "x": 0, "y": 1, "w": 1.75},
-                {"label": "A", "matrix": [1, 1], "x": 1.75, "y": 1},
-                {"label": "S", "matrix": [2, 1], "x": 2.75, "y": 1},
-                {"label": "D", "matrix": [2, 2], "x": 3.75, "y": 1},
-                {"label": "F", "matrix": [3, 2], "x": 4.75, "y": 1},
-                {"label": "G", "matrix": [2, 3], "x": 5.75, "y": 1},
-                {"label": "H", "matrix": [3, 3], "x": 6.75, "y": 1},
-                {"label": "J", "matrix": [2, 4], "x": 7.75, "y": 1},
-                {"label": "K", "matrix": [1, 5], "x": 8.75, "y": 1},
-                {"label": "L", "matrix": [2, 5], "x": 9.75, "y": 1},
-                {"label": ";", "matrix": [2, 6], "x": 10.75, "y": 1},
-                {"label": "'", "matrix": [3, 6], "x": 11.75, "y": 1},
-                {"label": "Enter", "matrix": [2, 7], "x": 12.75, "y": 1, "w": 2.25},
-
-                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 2, "w": 2.25},
-                {"label": "Z", "matrix": [3, 1], "x": 2.25, "y": 2},
-                {"label": "X", "matrix": [4, 1], "x": 3.25, "y": 2},
-                {"label": "C", "matrix": [4, 2], "x": 4.25, "y": 2},
-                {"label": "V", "matrix": [4, 3], "x": 5.25, "y": 2},
-                {"label": "B", "matrix": [5, 3], "x": 6.25, "y": 2},
-                {"label": "N", "matrix": [3, 4], "x": 7.25, "y": 2},
-                {"label": "M", "matrix": [4, 4], "x": 8.25, "y": 2},
-                {"label": ",", "matrix": [3, 5], "x": 9.25, "y": 2},
-                {"label": ".", "matrix": [4, 5], "x": 10.25, "y": 2},
-                {"label": "/", "matrix": [4, 6], "x": 11.25, "y": 2},
-                {"label": "Shift", "matrix": [3, 7], "x": 12.25, "y": 2, "w": 1.75},
-                {"label": "Fn", "matrix": [4, 7], "x": 14, "y": 2},
-
-                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 3, "w": 1.5},
-                {"label": "GUI", "matrix": [5, 0], "x": 1.5, "y": 3},
-                {"label": "Alt", "matrix": [5, 1], "x": 2.5, "y": 3, "w": 1.5},
-                {"label": "Space", "matrix": [5, 4], "x": 4, "y": 3, "w":7},
-                {"label": "Alt", "matrix": [5, 6], "x": 11, "y": 3, "w": 1.5},
-                {"label": "Fn", "matrix": [6, 6], "x": 12.5, "y": 3},
-                {"label": "Ctrl", "matrix": [5, 7], "x": 13.5, "y": 3, "w": 1.5}
-            ]
-        }
-    }
-}
diff --git a/keyboards/peej/rosaline/staggered/keyboard.json b/keyboards/peej/rosaline/staggered/keyboard.json
new file mode 100644
index 00000000000..ed4de2313f8
--- /dev/null
+++ b/keyboards/peej/rosaline/staggered/keyboard.json
@@ -0,0 +1,195 @@
+{
+    "keyboard_name": "Rosaline Staggered",
+    "manufacturer": "Peej",
+    "url": "https://github.com/peej/rosaline-keyboard",
+    "maintainer": "Peej",
+    "usb": {
+        "vid": "0x706A",
+        "pid": "0x0003",
+        "device_version": "0.0.1",
+        "max_power": 100
+    },
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": false
+    },
+    "matrix_pins": {
+        "cols": ["B0", "D7", "D6", "C2", "D4", "D1", "D0", "C1"],
+        "rows": ["C0", "B5", "B4", "B3", "B2", "B1", "C3", "D5"]
+    },
+    "diode_direction": "COL2ROW",
+    "processor": "atmega328p",
+    "bootloader": "usbasploader",
+    "layout_aliases": {
+        "LAYOUT_staggered_40": "LAYOUT_all"
+    },
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                {"label": "Tab", "matrix": [0, 0], "x": 0, "y": 0, "w": 1.5},
+                {"label": "Q", "matrix": [1, 0], "x": 1.5, "y": 0},
+                {"label": "W", "matrix": [0, 1], "x": 2.5, "y": 0},
+                {"label": "E", "matrix": [0, 2], "x": 3.5, "y": 0},
+                {"label": "R", "matrix": [1, 2], "x": 4.5, "y": 0},
+                {"label": "T", "matrix": [0, 3], "x": 5.5, "y": 0},
+                {"label": "Y", "matrix": [1, 3], "x": 6.5, "y": 0},
+                {"label": "U", "matrix": [0, 4], "x": 7.5, "y": 0},
+                {"label": "I", "matrix": [1, 4], "x": 8.5, "y": 0},
+                {"label": "O", "matrix": [0, 5], "x": 9.5, "y": 0},
+                {"label": "P", "matrix": [0, 6], "x": 10.5, "y": 0},
+                {"label": "[", "matrix": [1, 6], "x": 11.5, "y": 0},
+                {"label": "]", "matrix": [0, 7], "x": 12.5, "y": 0},
+                {"label": "Backspace", "matrix": [1, 7], "x": 13.5, "y": 0, "w": 1.5},
+
+                {"label": "Esc", "matrix": [2, 0], "x": 0, "y": 1, "w": 1.75},
+                {"label": "A", "matrix": [1, 1], "x": 1.75, "y": 1},
+                {"label": "S", "matrix": [2, 1], "x": 2.75, "y": 1},
+                {"label": "D", "matrix": [2, 2], "x": 3.75, "y": 1},
+                {"label": "F", "matrix": [3, 2], "x": 4.75, "y": 1},
+                {"label": "G", "matrix": [2, 3], "x": 5.75, "y": 1},
+                {"label": "H", "matrix": [3, 3], "x": 6.75, "y": 1},
+                {"label": "J", "matrix": [2, 4], "x": 7.75, "y": 1},
+                {"label": "K", "matrix": [1, 5], "x": 8.75, "y": 1},
+                {"label": "L", "matrix": [2, 5], "x": 9.75, "y": 1},
+                {"label": ";", "matrix": [2, 6], "x": 10.75, "y": 1},
+                {"label": "'", "matrix": [3, 6], "x": 11.75, "y": 1},
+                {"label": "Enter", "matrix": [2, 7], "x": 12.75, "y": 1, "w": 2.25},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 2, "w": 2.25},
+                {"label": "Z", "matrix": [3, 1], "x": 2.25, "y": 2},
+                {"label": "X", "matrix": [4, 1], "x": 3.25, "y": 2},
+                {"label": "C", "matrix": [4, 2], "x": 4.25, "y": 2},
+                {"label": "V", "matrix": [4, 3], "x": 5.25, "y": 2},
+                {"label": "B", "matrix": [5, 3], "x": 6.25, "y": 2},
+                {"label": "N", "matrix": [3, 4], "x": 7.25, "y": 2},
+                {"label": "M", "matrix": [4, 4], "x": 8.25, "y": 2},
+                {"label": ",", "matrix": [3, 5], "x": 9.25, "y": 2},
+                {"label": ".", "matrix": [4, 5], "x": 10.25, "y": 2},
+                {"label": "/", "matrix": [4, 6], "x": 11.25, "y": 2},
+                {"label": "Shift", "matrix": [3, 7], "x": 12.25, "y": 2, "w": 1.75},
+                {"label": "Fn", "matrix": [4, 7], "x": 14, "y": 2},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 3, "w": 1.5},
+                {"label": "GUI", "matrix": [5, 0], "x": 1.5, "y": 3},
+                {"label": "Alt", "matrix": [5, 1], "x": 2.5, "y": 3, "w": 1.5},
+                {"label": "Space", "matrix": [5, 2], "x": 4, "y": 3, "w": 2.75},
+                {"label": "Space", "matrix": [5, 4], "x": 6.75, "y": 3},
+                {"label": "Alt", "matrix": [5, 5], "x": 7.75, "y": 3, "w": 2.25},
+                {"label": "Ctrl", "matrix": [6, 5], "x": 10, "y": 3},
+                {"label": "\u2190", "matrix": [5, 6], "x": 11, "y": 3},
+                {"label": "\u2193", "matrix": [6, 6], "x": 12, "y": 3},
+                {"label": "\u2191", "matrix": [5, 7], "x": 13, "y": 3},
+                {"label": "\u2192", "matrix": [6, 7], "x": 14, "y": 3}
+            ]
+        },
+        "LAYOUT_tsangan": {
+            "layout": [
+                {"label": "Tab", "matrix": [0, 0], "x": 0, "y": 0, "w": 1.5},
+                {"label": "Q", "matrix": [1, 0], "x": 1.5, "y": 0},
+                {"label": "W", "matrix": [0, 1], "x": 2.5, "y": 0},
+                {"label": "E", "matrix": [0, 2], "x": 3.5, "y": 0},
+                {"label": "R", "matrix": [1, 2], "x": 4.5, "y": 0},
+                {"label": "T", "matrix": [0, 3], "x": 5.5, "y": 0},
+                {"label": "Y", "matrix": [1, 3], "x": 6.5, "y": 0},
+                {"label": "U", "matrix": [0, 4], "x": 7.5, "y": 0},
+                {"label": "I", "matrix": [1, 4], "x": 8.5, "y": 0},
+                {"label": "O", "matrix": [0, 5], "x": 9.5, "y": 0},
+                {"label": "P", "matrix": [0, 6], "x": 10.5, "y": 0},
+                {"label": "[", "matrix": [1, 6], "x": 11.5, "y": 0},
+                {"label": "]", "matrix": [0, 7], "x": 12.5, "y": 0},
+                {"label": "Backspace", "matrix": [1, 7], "x": 13.5, "y": 0, "w": 1.5},
+
+                {"label": "Esc", "matrix": [2, 0], "x": 0, "y": 1, "w": 1.75},
+                {"label": "A", "matrix": [1, 1], "x": 1.75, "y": 1},
+                {"label": "S", "matrix": [2, 1], "x": 2.75, "y": 1},
+                {"label": "D", "matrix": [2, 2], "x": 3.75, "y": 1},
+                {"label": "F", "matrix": [3, 2], "x": 4.75, "y": 1},
+                {"label": "G", "matrix": [2, 3], "x": 5.75, "y": 1},
+                {"label": "H", "matrix": [3, 3], "x": 6.75, "y": 1},
+                {"label": "J", "matrix": [2, 4], "x": 7.75, "y": 1},
+                {"label": "K", "matrix": [1, 5], "x": 8.75, "y": 1},
+                {"label": "L", "matrix": [2, 5], "x": 9.75, "y": 1},
+                {"label": ";", "matrix": [2, 6], "x": 10.75, "y": 1},
+                {"label": "'", "matrix": [3, 6], "x": 11.75, "y": 1},
+                {"label": "Enter", "matrix": [2, 7], "x": 12.75, "y": 1, "w": 2.25},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 2, "w": 2.25},
+                {"label": "Z", "matrix": [3, 1], "x": 2.25, "y": 2},
+                {"label": "X", "matrix": [4, 1], "x": 3.25, "y": 2},
+                {"label": "C", "matrix": [4, 2], "x": 4.25, "y": 2},
+                {"label": "V", "matrix": [4, 3], "x": 5.25, "y": 2},
+                {"label": "B", "matrix": [5, 3], "x": 6.25, "y": 2},
+                {"label": "N", "matrix": [3, 4], "x": 7.25, "y": 2},
+                {"label": "M", "matrix": [4, 4], "x": 8.25, "y": 2},
+                {"label": ",", "matrix": [3, 5], "x": 9.25, "y": 2},
+                {"label": ".", "matrix": [4, 5], "x": 10.25, "y": 2},
+                {"label": "/", "matrix": [4, 6], "x": 11.25, "y": 2},
+                {"label": "Shift", "matrix": [3, 7], "x": 12.25, "y": 2, "w": 2.75},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 3, "w": 1.5},
+                {"label": "GUI", "matrix": [5, 0], "x": 1.5, "y": 3},
+                {"label": "Alt", "matrix": [5, 1], "x": 2.5, "y": 3, "w": 1.5},
+                {"label": "Space", "matrix": [5, 4], "x": 4, "y": 3, "w":7},
+                {"label": "Alt", "matrix": [5, 6], "x": 11, "y": 3, "w": 1.5},
+                {"label": "Fn", "matrix": [6, 6], "x": 12.5, "y": 3},
+                {"label": "Ctrl", "matrix": [5, 7], "x": 13.5, "y": 3, "w": 1.5}
+            ]
+        },
+        "LAYOUT_tsangan_split_rshift": {
+            "layout": [
+                {"label": "Tab", "matrix": [0, 0], "x": 0, "y": 0, "w": 1.5},
+                {"label": "Q", "matrix": [1, 0], "x": 1.5, "y": 0},
+                {"label": "W", "matrix": [0, 1], "x": 2.5, "y": 0},
+                {"label": "E", "matrix": [0, 2], "x": 3.5, "y": 0},
+                {"label": "R", "matrix": [1, 2], "x": 4.5, "y": 0},
+                {"label": "T", "matrix": [0, 3], "x": 5.5, "y": 0},
+                {"label": "Y", "matrix": [1, 3], "x": 6.5, "y": 0},
+                {"label": "U", "matrix": [0, 4], "x": 7.5, "y": 0},
+                {"label": "I", "matrix": [1, 4], "x": 8.5, "y": 0},
+                {"label": "O", "matrix": [0, 5], "x": 9.5, "y": 0},
+                {"label": "P", "matrix": [0, 6], "x": 10.5, "y": 0},
+                {"label": "[", "matrix": [1, 6], "x": 11.5, "y": 0},
+                {"label": "]", "matrix": [0, 7], "x": 12.5, "y": 0},
+                {"label": "Backspace", "matrix": [1, 7], "x": 13.5, "y": 0, "w": 1.5},
+
+                {"label": "Esc", "matrix": [2, 0], "x": 0, "y": 1, "w": 1.75},
+                {"label": "A", "matrix": [1, 1], "x": 1.75, "y": 1},
+                {"label": "S", "matrix": [2, 1], "x": 2.75, "y": 1},
+                {"label": "D", "matrix": [2, 2], "x": 3.75, "y": 1},
+                {"label": "F", "matrix": [3, 2], "x": 4.75, "y": 1},
+                {"label": "G", "matrix": [2, 3], "x": 5.75, "y": 1},
+                {"label": "H", "matrix": [3, 3], "x": 6.75, "y": 1},
+                {"label": "J", "matrix": [2, 4], "x": 7.75, "y": 1},
+                {"label": "K", "matrix": [1, 5], "x": 8.75, "y": 1},
+                {"label": "L", "matrix": [2, 5], "x": 9.75, "y": 1},
+                {"label": ";", "matrix": [2, 6], "x": 10.75, "y": 1},
+                {"label": "'", "matrix": [3, 6], "x": 11.75, "y": 1},
+                {"label": "Enter", "matrix": [2, 7], "x": 12.75, "y": 1, "w": 2.25},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 2, "w": 2.25},
+                {"label": "Z", "matrix": [3, 1], "x": 2.25, "y": 2},
+                {"label": "X", "matrix": [4, 1], "x": 3.25, "y": 2},
+                {"label": "C", "matrix": [4, 2], "x": 4.25, "y": 2},
+                {"label": "V", "matrix": [4, 3], "x": 5.25, "y": 2},
+                {"label": "B", "matrix": [5, 3], "x": 6.25, "y": 2},
+                {"label": "N", "matrix": [3, 4], "x": 7.25, "y": 2},
+                {"label": "M", "matrix": [4, 4], "x": 8.25, "y": 2},
+                {"label": ",", "matrix": [3, 5], "x": 9.25, "y": 2},
+                {"label": ".", "matrix": [4, 5], "x": 10.25, "y": 2},
+                {"label": "/", "matrix": [4, 6], "x": 11.25, "y": 2},
+                {"label": "Shift", "matrix": [3, 7], "x": 12.25, "y": 2, "w": 1.75},
+                {"label": "Fn", "matrix": [4, 7], "x": 14, "y": 2},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 3, "w": 1.5},
+                {"label": "GUI", "matrix": [5, 0], "x": 1.5, "y": 3},
+                {"label": "Alt", "matrix": [5, 1], "x": 2.5, "y": 3, "w": 1.5},
+                {"label": "Space", "matrix": [5, 4], "x": 4, "y": 3, "w":7},
+                {"label": "Alt", "matrix": [5, 6], "x": 11, "y": 3, "w": 1.5},
+                {"label": "Fn", "matrix": [6, 6], "x": 12.5, "y": 3},
+                {"label": "Ctrl", "matrix": [5, 7], "x": 13.5, "y": 3, "w": 1.5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/peej/rosaline/staggered/rules.mk b/keyboards/peej/rosaline/staggered/rules.mk
deleted file mode 100644
index ab2c49da70e..00000000000
--- a/keyboards/peej/rosaline/staggered/rules.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
diff --git a/keyboards/peranekofactory/tone/rev1/config.h b/keyboards/peranekofactory/tone/rev1/config.h
deleted file mode 100644
index bbe3b73627f..00000000000
--- a/keyboards/peranekofactory/tone/rev1/config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-Copyright 2021 peraneko
-
-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
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/peranekofactory/tone/rev1/info.json b/keyboards/peranekofactory/tone/rev1/info.json
deleted file mode 100644
index 67e08be6885..00000000000
--- a/keyboards/peranekofactory/tone/rev1/info.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-    "keyboard_name": "tone",
-    "manufacturer": "PeranekoFactory",
-    "url": "https://shop.yushakobo.jp/collections/keyboard-1/products/consign_tone-note",
-    "maintainer": "PeranekoFactory",
-    "usb": {
-        "vid": "0xFEED",
-        "pid": "0x0000",
-        "device_version": "0.0.1"
-    },
-    "encoder": {
-        "rotary": [
-            {"pin_a": "B5", "pin_b": "B4"}
-        ]
-    },
-    "qmk": {
-        "tap_keycode_delay": 100
-    },
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
-    "matrix_pins": {
-        "direct": [
-            ["D4", "C6", "D7", "E6", "F6", "F7", "B1", "B3"]
-        ]
-    },
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"x": 0, "y": 0, "matrix": [0, 0]},
-                {"x": 1, "y": 0, "matrix": [0, 1]},
-                {"x": 2, "y": 0, "matrix": [0, 2]},
-                {"x": 3, "y": 0, "matrix": [0, 3]},
-                {"x": 0, "y": 1, "matrix": [0, 4]},
-                {"x": 1, "y": 1, "matrix": [0, 5]},
-                {"x": 2, "y": 1, "matrix": [0, 6]},
-                {"x": 3, "y": 1, "matrix": [0, 7]}
-            ]
-        }
-    }
-}
diff --git a/keyboards/peranekofactory/tone/rev1/keyboard.json b/keyboards/peranekofactory/tone/rev1/keyboard.json
new file mode 100644
index 00000000000..fb7b41b27a2
--- /dev/null
+++ b/keyboards/peranekofactory/tone/rev1/keyboard.json
@@ -0,0 +1,51 @@
+{
+    "keyboard_name": "tone",
+    "manufacturer": "PeranekoFactory",
+    "url": "https://shop.yushakobo.jp/collections/keyboard-1/products/consign_tone-note",
+    "maintainer": "PeranekoFactory",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0x0000",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "encoder": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": false
+    },
+    "encoder": {
+        "rotary": [
+            {"pin_a": "B5", "pin_b": "B4"}
+        ]
+    },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        },
+        "tap_keycode_delay": 100
+    },
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
+    "matrix_pins": {
+        "direct": [
+            ["D4", "C6", "D7", "E6", "F6", "F7", "B1", "B3"]
+        ]
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"x": 0, "y": 0, "matrix": [0, 0]},
+                {"x": 1, "y": 0, "matrix": [0, 1]},
+                {"x": 2, "y": 0, "matrix": [0, 2]},
+                {"x": 3, "y": 0, "matrix": [0, 3]},
+                {"x": 0, "y": 1, "matrix": [0, 4]},
+                {"x": 1, "y": 1, "matrix": [0, 5]},
+                {"x": 2, "y": 1, "matrix": [0, 6]},
+                {"x": 3, "y": 1, "matrix": [0, 7]}
+            ]
+        }
+    }
+}
diff --git a/keyboards/peranekofactory/tone/rev1/rules.mk b/keyboards/peranekofactory/tone/rev1/rules.mk
deleted file mode 100644
index b03b6fa9058..00000000000
--- a/keyboards/peranekofactory/tone/rev1/rules.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-ENCODER_ENABLE = yes
diff --git a/keyboards/peranekofactory/tone/rev2/config.h b/keyboards/peranekofactory/tone/rev2/config.h
deleted file mode 100644
index bbe3b73627f..00000000000
--- a/keyboards/peranekofactory/tone/rev2/config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-Copyright 2021 peraneko
-
-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
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/peranekofactory/tone/rev2/info.json b/keyboards/peranekofactory/tone/rev2/info.json
deleted file mode 100644
index 67e08be6885..00000000000
--- a/keyboards/peranekofactory/tone/rev2/info.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-    "keyboard_name": "tone",
-    "manufacturer": "PeranekoFactory",
-    "url": "https://shop.yushakobo.jp/collections/keyboard-1/products/consign_tone-note",
-    "maintainer": "PeranekoFactory",
-    "usb": {
-        "vid": "0xFEED",
-        "pid": "0x0000",
-        "device_version": "0.0.1"
-    },
-    "encoder": {
-        "rotary": [
-            {"pin_a": "B5", "pin_b": "B4"}
-        ]
-    },
-    "qmk": {
-        "tap_keycode_delay": 100
-    },
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
-    "matrix_pins": {
-        "direct": [
-            ["D4", "C6", "D7", "E6", "F6", "F7", "B1", "B3"]
-        ]
-    },
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"x": 0, "y": 0, "matrix": [0, 0]},
-                {"x": 1, "y": 0, "matrix": [0, 1]},
-                {"x": 2, "y": 0, "matrix": [0, 2]},
-                {"x": 3, "y": 0, "matrix": [0, 3]},
-                {"x": 0, "y": 1, "matrix": [0, 4]},
-                {"x": 1, "y": 1, "matrix": [0, 5]},
-                {"x": 2, "y": 1, "matrix": [0, 6]},
-                {"x": 3, "y": 1, "matrix": [0, 7]}
-            ]
-        }
-    }
-}
diff --git a/keyboards/peranekofactory/tone/rev2/keyboard.json b/keyboards/peranekofactory/tone/rev2/keyboard.json
new file mode 100644
index 00000000000..fb7b41b27a2
--- /dev/null
+++ b/keyboards/peranekofactory/tone/rev2/keyboard.json
@@ -0,0 +1,51 @@
+{
+    "keyboard_name": "tone",
+    "manufacturer": "PeranekoFactory",
+    "url": "https://shop.yushakobo.jp/collections/keyboard-1/products/consign_tone-note",
+    "maintainer": "PeranekoFactory",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0x0000",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "encoder": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": false
+    },
+    "encoder": {
+        "rotary": [
+            {"pin_a": "B5", "pin_b": "B4"}
+        ]
+    },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        },
+        "tap_keycode_delay": 100
+    },
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
+    "matrix_pins": {
+        "direct": [
+            ["D4", "C6", "D7", "E6", "F6", "F7", "B1", "B3"]
+        ]
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"x": 0, "y": 0, "matrix": [0, 0]},
+                {"x": 1, "y": 0, "matrix": [0, 1]},
+                {"x": 2, "y": 0, "matrix": [0, 2]},
+                {"x": 3, "y": 0, "matrix": [0, 3]},
+                {"x": 0, "y": 1, "matrix": [0, 4]},
+                {"x": 1, "y": 1, "matrix": [0, 5]},
+                {"x": 2, "y": 1, "matrix": [0, 6]},
+                {"x": 3, "y": 1, "matrix": [0, 7]}
+            ]
+        }
+    }
+}
diff --git a/keyboards/peranekofactory/tone/rev2/rules.mk b/keyboards/peranekofactory/tone/rev2/rules.mk
deleted file mode 100644
index b03b6fa9058..00000000000
--- a/keyboards/peranekofactory/tone/rev2/rules.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-ENCODER_ENABLE = yes
diff --git a/keyboards/percent/canoe_gen2/canoe_gen2.c b/keyboards/percent/canoe_gen2/canoe_gen2.c
index e5beff54a30..d174d01876c 100644
--- a/keyboards/percent/canoe_gen2/canoe_gen2.c
+++ b/keyboards/percent/canoe_gen2/canoe_gen2.c
@@ -20,6 +20,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 void keyboard_pre_init_kb(void) {
   setPinOutput(E6);
   writePinHigh(E6);
+
+  keyboard_pre_init_user();
 }
 
 bool led_update_kb(led_t led_state) {
diff --git a/keyboards/percent/canoe_gen2/config.h b/keyboards/percent/canoe_gen2/config.h
deleted file mode 100644
index 1f54b79bd00..00000000000
--- a/keyboards/percent/canoe_gen2/config.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
-Copyright 2020 Evy Dekkers
-
-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
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/percent/canoe_gen2/info.json b/keyboards/percent/canoe_gen2/info.json
deleted file mode 100644
index 0fe5d0e894d..00000000000
--- a/keyboards/percent/canoe_gen2/info.json
+++ /dev/null
@@ -1,216 +0,0 @@
-{
-    "keyboard_name": "Canoe Gen2",
-    "manufacturer": "Percent Studio",
-    "url": "",
-    "maintainer": "evyd13",
-    "usb": {
-        "vid": "0x9C12",
-        "pid": "0x89F0",
-        "device_version": "0.0.1"
-    },
-    "ws2812": {
-        "pin": "B7"
-    },
-    "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,
-            "rainbow_moving_chevron": true,
-            "cycle_out_in": true,
-            "cycle_out_in_dual": 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_rain": true,
-            "pixel_flow": true,
-            "pixel_fractal": true
-        },
-        "driver": "ws2812",
-        "max_brightness": 150,
-        "sleep": true
-    },
-    "matrix_pins": {
-        "cols": ["B0", "D0", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "F6", "F7"],
-        "rows": ["B1", "B3", "B2", "F5", "F4"]
-    },
-    "diode_direction": "COL2ROW",
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "community_layouts": ["65_ansi_blocker_split_bs", "65_iso_blocker_split_bs"],
-    "layout_aliases": {
-        "LAYOUT_all": "LAYOUT_65_iso_blocker_split_bs"
-    },
-    "layouts": {
-        "LAYOUT_65_ansi_blocker_split_bs": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"matrix": [1, 13], "x": 13, "y": 0},
-                {"matrix": [0, 13], "x": 14, "y": 0},
-                {"matrix": [0, 14], "x": 15, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [2, 12], "x": 13.5, "y": 1, "w": 1.5},
-                {"matrix": [1, 14], "x": 15, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
-                {"matrix": [2, 14], "x": 15, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 2], "x": 2.25, "y": 3},
-                {"matrix": [3, 3], "x": 3.25, "y": 3},
-                {"matrix": [3, 4], "x": 4.25, "y": 3},
-                {"matrix": [3, 5], "x": 5.25, "y": 3},
-                {"matrix": [3, 6], "x": 6.25, "y": 3},
-                {"matrix": [3, 7], "x": 7.25, "y": 3},
-                {"matrix": [3, 8], "x": 8.25, "y": 3},
-                {"matrix": [3, 9], "x": 9.25, "y": 3},
-                {"matrix": [3, 10], "x": 10.25, "y": 3},
-                {"matrix": [3, 11], "x": 11.25, "y": 3},
-                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"matrix": [3, 13], "x": 14, "y": 3},
-                {"matrix": [3, 14], "x": 15, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
-                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
-                {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 12], "x": 13, "y": 4},
-                {"matrix": [4, 13], "x": 14, "y": 4},
-                {"matrix": [4, 14], "x": 15, "y": 4}
-            ]
-        },
-        "LAYOUT_65_iso_blocker_split_bs": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"matrix": [1, 13], "x": 13, "y": 0},
-                {"matrix": [0, 13], "x": 14, "y": 0},
-                {"matrix": [0, 14], "x": 15, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 14], "x": 15, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 12], "x": 12.75, "y": 2},
-                {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
-                {"matrix": [2, 14], "x": 15, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
-                {"matrix": [3, 1], "x": 1.25, "y": 3},
-                {"matrix": [3, 2], "x": 2.25, "y": 3},
-                {"matrix": [3, 3], "x": 3.25, "y": 3},
-                {"matrix": [3, 4], "x": 4.25, "y": 3},
-                {"matrix": [3, 5], "x": 5.25, "y": 3},
-                {"matrix": [3, 6], "x": 6.25, "y": 3},
-                {"matrix": [3, 7], "x": 7.25, "y": 3},
-                {"matrix": [3, 8], "x": 8.25, "y": 3},
-                {"matrix": [3, 9], "x": 9.25, "y": 3},
-                {"matrix": [3, 10], "x": 10.25, "y": 3},
-                {"matrix": [3, 11], "x": 11.25, "y": 3},
-                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"matrix": [3, 13], "x": 14, "y": 3},
-                {"matrix": [3, 14], "x": 15, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
-                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
-                {"matrix": [4, 10], "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}
-            ]
-        }
-    }
-}
diff --git a/keyboards/percent/canoe_gen2/keyboard.json b/keyboards/percent/canoe_gen2/keyboard.json
new file mode 100644
index 00000000000..0b6ece2613c
--- /dev/null
+++ b/keyboards/percent/canoe_gen2/keyboard.json
@@ -0,0 +1,230 @@
+{
+    "keyboard_name": "Canoe Gen2",
+    "manufacturer": "Percent Studio",
+    "url": "",
+    "maintainer": "evyd13",
+    "usb": {
+        "vid": "0x9C12",
+        "pid": "0x89F0",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "console": true,
+        "extrakey": true,
+        "mousekey": false,
+        "nkro": false,
+        "rgb_matrix": true
+    },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
+    "ws2812": {
+        "pin": "B7"
+    },
+    "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,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": 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_rain": true,
+            "pixel_flow": true,
+            "pixel_fractal": true
+        },
+        "driver": "ws2812",
+        "max_brightness": 150,
+        "sleep": true
+    },
+    "matrix_pins": {
+        "cols": ["B0", "D0", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "F6", "F7"],
+        "rows": ["B1", "B3", "B2", "F5", "F4"]
+    },
+    "diode_direction": "COL2ROW",
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "community_layouts": ["65_ansi_blocker_split_bs", "65_iso_blocker_split_bs"],
+    "layout_aliases": {
+        "LAYOUT_all": "LAYOUT_65_iso_blocker_split_bs"
+    },
+    "layouts": {
+        "LAYOUT_65_ansi_blocker_split_bs": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [1, 13], "x": 13, "y": 0},
+                {"matrix": [0, 13], "x": 14, "y": 0},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [2, 12], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_65_iso_blocker_split_bs": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [1, 13], "x": 13, "y": 0},
+                {"matrix": [0, 13], "x": 14, "y": 0},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "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}
+            ]
+        }
+    }
+}
diff --git a/keyboards/percent/canoe_gen2/rules.mk b/keyboards/percent/canoe_gen2/rules.mk
index d399c10822b..942ef4c5dbd 100644
--- a/keyboards/percent/canoe_gen2/rules.mk
+++ b/keyboards/percent/canoe_gen2/rules.mk
@@ -1,15 +1 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = yes        # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-RGB_MATRIX_ENABLE = yes
-
 RGB_MATRIX_CUSTOM_KB = yes
diff --git a/keyboards/phage_studio/pila87/info.json b/keyboards/phage_studio/pila87/info.json
deleted file mode 100644
index 4d12cf2573d..00000000000
--- a/keyboards/phage_studio/pila87/info.json
+++ /dev/null
@@ -1,181 +0,0 @@
-{
-    "keyboard_name": "Pila87 / XM87 Pro",
-    "manufacturer": "Phage Studio",
-    "url": "https://item.taobao.com/item.htm?spm=a21wu.12321156-tw.0.0.22283343ytyJJv&id=649438917009",
-    "maintainer": "Phage Studio",
-    "usb": {
-        "vid": "0x5048",
-        "pid": "0x5887",
-        "device_version": "0.0.1"
-    },
-    "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,
-            "rainbow_moving_chevron": true,
-            "cycle_out_in": true,
-            "cycle_out_in_dual": 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_rain": true,
-            "pixel_flow": true,
-            "pixel_fractal": 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",
-        "max_brightness": 200
-    },
-    "processor": "STM32F103",
-    "bootloader": "stm32duino",
-    "matrix_pins": {
-        "cols": ["B5", "B4", "B6", "C0", "C1", "C2", "C3", "B7", "B3", "D2", "C12", "C11", "C10", "A15", "C15", "C13", "A3"],
-        "rows": ["A1", "A2", "A10", "A9", "A8", "C9"]
-    },
-    "diode_direction": "COL2ROW",
-    "indicators": {
-        "caps_lock": "C14",
-        "scroll_lock": "A0"
-    },
-    "ws2812": {
-        "pin": "A4"
-    },
-    "community_layouts": ["tkl_ansi"],
-    "layouts": {
-        "LAYOUT_tkl_ansi": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "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.5, "y": 0},
-                {"matrix": [0, 7], "x": 7.5, "y": 0},
-                {"matrix": [0, 8], "x": 8.5, "y": 0},
-                {"matrix": [0, 9], "x": 9.5, "y": 0},
-
-                {"matrix": [0, 10], "x": 11, "y": 0},
-                {"matrix": [0, 11], "x": 12, "y": 0},
-                {"matrix": [0, 12], "x": 13, "y": 0},
-                {"matrix": [0, 13], "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.5},
-                {"matrix": [1, 1], "x": 1, "y": 1.5},
-                {"matrix": [1, 2], "x": 2, "y": 1.5},
-                {"matrix": [1, 3], "x": 3, "y": 1.5},
-                {"matrix": [1, 4], "x": 4, "y": 1.5},
-                {"matrix": [1, 5], "x": 5, "y": 1.5},
-                {"matrix": [1, 6], "x": 6, "y": 1.5},
-                {"matrix": [1, 7], "x": 7, "y": 1.5},
-                {"matrix": [1, 8], "x": 8, "y": 1.5},
-                {"matrix": [1, 9], "x": 9, "y": 1.5},
-                {"matrix": [1, 10], "x": 10, "y": 1.5},
-                {"matrix": [1, 11], "x": 11, "y": 1.5},
-                {"matrix": [1, 12], "x": 12, "y": 1.5},
-                {"matrix": [1, 13], "x": 13, "y": 1.5, "w": 2},
-
-                {"matrix": [1, 14], "x": 15.25, "y": 1.5},
-                {"matrix": [1, 15], "x": 16.25, "y": 1.5},
-                {"matrix": [1, 16], "x": 17.25, "y": 1.5},
-
-                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
-                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
-                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
-                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
-                {"matrix": [2, 4], "x": 4.5, "y": 2.5},
-                {"matrix": [2, 5], "x": 5.5, "y": 2.5},
-                {"matrix": [2, 6], "x": 6.5, "y": 2.5},
-                {"matrix": [2, 7], "x": 7.5, "y": 2.5},
-                {"matrix": [2, 8], "x": 8.5, "y": 2.5},
-                {"matrix": [2, 9], "x": 9.5, "y": 2.5},
-                {"matrix": [2, 10], "x": 10.5, "y": 2.5},
-                {"matrix": [2, 11], "x": 11.5, "y": 2.5},
-                {"matrix": [2, 12], "x": 12.5, "y": 2.5},
-                {"matrix": [2, 13], "x": 13.5, "y": 2.5, "w": 1.5},
-
-                {"matrix": [2, 14], "x": 15.25, "y": 2.5},
-                {"matrix": [2, 15], "x": 16.25, "y": 2.5},
-                {"matrix": [2, 16], "x": 17.25, "y": 2.5},
-
-                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
-                {"matrix": [3, 1], "x": 1.75, "y": 3.5},
-                {"matrix": [3, 2], "x": 2.75, "y": 3.5},
-                {"matrix": [3, 3], "x": 3.75, "y": 3.5},
-                {"matrix": [3, 4], "x": 4.75, "y": 3.5},
-                {"matrix": [3, 5], "x": 5.75, "y": 3.5},
-                {"matrix": [3, 6], "x": 6.75, "y": 3.5},
-                {"matrix": [3, 7], "x": 7.75, "y": 3.5},
-                {"matrix": [3, 8], "x": 8.75, "y": 3.5},
-                {"matrix": [3, 9], "x": 9.75, "y": 3.5},
-                {"matrix": [3, 10], "x": 10.75, "y": 3.5},
-                {"matrix": [3, 11], "x": 11.75, "y": 3.5},
-                {"matrix": [3, 13], "x": 12.75, "y": 3.5, "w": 2.25},
-
-                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
-                {"matrix": [4, 1], "x": 2.25, "y": 4.5},
-                {"matrix": [4, 2], "x": 3.25, "y": 4.5},
-                {"matrix": [4, 3], "x": 4.25, "y": 4.5},
-                {"matrix": [4, 4], "x": 5.25, "y": 4.5},
-                {"matrix": [4, 5], "x": 6.25, "y": 4.5},
-                {"matrix": [4, 6], "x": 7.25, "y": 4.5},
-                {"matrix": [4, 7], "x": 8.25, "y": 4.5},
-                {"matrix": [4, 8], "x": 9.25, "y": 4.5},
-                {"matrix": [4, 9], "x": 10.25, "y": 4.5},
-                {"matrix": [4, 10], "x": 11.25, "y": 4.5},
-                {"matrix": [4, 13], "x": 12.25, "y": 4.5, "w": 2.75},
-
-                {"matrix": [4, 15], "x": 16.25, "y": 4.5},
-
-                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25},
-                {"matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25},
-                {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25},
-                {"matrix": [5, 5], "x": 3.75, "y": 5.5, "w": 6.25},
-                {"matrix": [5, 10], "x": 10, "y": 5.5, "w": 1.25},
-                {"matrix": [5, 11], "x": 11.25, "y": 5.5, "w": 1.25},
-                {"matrix": [5, 12], "x": 12.5, "y": 5.5, "w": 1.25},
-                {"matrix": [5, 13], "x": 13.75, "y": 5.5, "w": 1.25},
-
-                {"matrix": [5, 14], "x": 15.25, "y": 5.5},
-                {"matrix": [5, 15], "x": 16.25, "y": 5.5},
-                {"matrix": [5, 16], "x": 17.25, "y": 5.5}
-            ]
-        }
-    }
-}
diff --git a/keyboards/phage_studio/pila87/keyboard.json b/keyboards/phage_studio/pila87/keyboard.json
new file mode 100644
index 00000000000..fbdf5f637a3
--- /dev/null
+++ b/keyboards/phage_studio/pila87/keyboard.json
@@ -0,0 +1,188 @@
+{
+    "keyboard_name": "Pila87 / XM87 Pro",
+    "manufacturer": "Phage Studio",
+    "url": "https://item.taobao.com/item.htm?spm=a21wu.12321156-tw.0.0.22283343ytyJJv&id=649438917009",
+    "maintainer": "Phage Studio",
+    "usb": {
+        "vid": "0x5048",
+        "pid": "0x5887",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": false,
+        "nkro": true,
+        "rgb_matrix": true
+    },
+    "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,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": 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_rain": true,
+            "pixel_flow": true,
+            "pixel_fractal": 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",
+        "max_brightness": 200
+    },
+    "processor": "STM32F103",
+    "bootloader": "stm32duino",
+    "matrix_pins": {
+        "cols": ["B5", "B4", "B6", "C0", "C1", "C2", "C3", "B7", "B3", "D2", "C12", "C11", "C10", "A15", "C15", "C13", "A3"],
+        "rows": ["A1", "A2", "A10", "A9", "A8", "C9"]
+    },
+    "diode_direction": "COL2ROW",
+    "indicators": {
+        "caps_lock": "C14",
+        "scroll_lock": "A0"
+    },
+    "ws2812": {
+        "pin": "A4"
+    },
+    "community_layouts": ["tkl_ansi"],
+    "layouts": {
+        "LAYOUT_tkl_ansi": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "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.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 10], "x": 11, "y": 0},
+                {"matrix": [0, 11], "x": 12, "y": 0},
+                {"matrix": [0, 12], "x": 13, "y": 0},
+                {"matrix": [0, 13], "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.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1.5},
+                {"matrix": [1, 4], "x": 4, "y": 1.5},
+                {"matrix": [1, 5], "x": 5, "y": 1.5},
+                {"matrix": [1, 6], "x": 6, "y": 1.5},
+                {"matrix": [1, 7], "x": 7, "y": 1.5},
+                {"matrix": [1, 8], "x": 8, "y": 1.5},
+                {"matrix": [1, 9], "x": 9, "y": 1.5},
+                {"matrix": [1, 10], "x": 10, "y": 1.5},
+                {"matrix": [1, 11], "x": 11, "y": 1.5},
+                {"matrix": [1, 12], "x": 12, "y": 1.5},
+                {"matrix": [1, 13], "x": 13, "y": 1.5, "w": 2},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1.5},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.5},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.5},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.5},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.5},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.5, "w": 1.5},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 2.5},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.5},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.5},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.5, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
+                {"matrix": [4, 1], "x": 2.25, "y": 4.5},
+                {"matrix": [4, 2], "x": 3.25, "y": 4.5},
+                {"matrix": [4, 3], "x": 4.25, "y": 4.5},
+                {"matrix": [4, 4], "x": 5.25, "y": 4.5},
+                {"matrix": [4, 5], "x": 6.25, "y": 4.5},
+                {"matrix": [4, 6], "x": 7.25, "y": 4.5},
+                {"matrix": [4, 7], "x": 8.25, "y": 4.5},
+                {"matrix": [4, 8], "x": 9.25, "y": 4.5},
+                {"matrix": [4, 9], "x": 10.25, "y": 4.5},
+                {"matrix": [4, 10], "x": 11.25, "y": 4.5},
+                {"matrix": [4, 13], "x": 12.25, "y": 4.5, "w": 2.75},
+
+                {"matrix": [4, 15], "x": 16.25, "y": 4.5},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 5], "x": 3.75, "y": 5.5, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 11], "x": 11.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.5, "w": 1.25},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.5},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.5},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/phage_studio/pila87/rules.mk b/keyboards/phage_studio/pila87/rules.mk
index 25fb7ed8c08..6f0a3736a73 100644
--- a/keyboards/phage_studio/pila87/rules.mk
+++ b/keyboards/phage_studio/pila87/rules.mk
@@ -1,18 +1,2 @@
 # Configure for 128K flash
 MCU_LDSCRIPT = STM32F103xB
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
-# RGB Matrix enabled
-RGB_MATRIX_ENABLE = yes
diff --git a/keyboards/phase_studio/titan65/hotswap/info.json b/keyboards/phase_studio/titan65/hotswap/info.json
deleted file mode 100644
index 2c1f3e2854c..00000000000
--- a/keyboards/phase_studio/titan65/hotswap/info.json
+++ /dev/null
@@ -1,103 +0,0 @@
-{
-    "keyboard_name": "Titan 65 (hotswap)",
-    "manufacturer": "Phase Studio",
-    "url": "",
-    "maintainer": "drashna",
-    "usb": {
-        "vid": "0x5054",
-        "pid": "0xBB91",
-        "device_version": "0.0.1"
-    },
-    "ws2812": {
-        "pin": "E6"
-    },
-    "rgb_matrix": {
-        "driver": "ws2812",
-        "max_brightness": 150
-    },
-    "matrix_pins": {
-        "cols": ["B0", "B1", "B2", "B3", "B7", "D0", "D1", "D2", "D3", "D5", "F0", "F1", "C7", "F4", "F5", "F6"],
-        "rows": ["B4", "B5", "B6", "C6", "F7"]
-    },
-    "diode_direction": "COL2ROW",
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 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, 14], "x": 13, "y": 0, "w": 2},
-                {"matrix": [0, 15], "x": 15, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 2], "x": 1.5, "y": 1},
-                {"matrix": [1, 3], "x": 2.5, "y": 1},
-                {"matrix": [1, 4], "x": 3.5, "y": 1},
-                {"matrix": [1, 5], "x": 4.5, "y": 1},
-                {"matrix": [1, 6], "x": 5.5, "y": 1},
-                {"matrix": [1, 7], "x": 6.5, "y": 1},
-                {"matrix": [1, 8], "x": 7.5, "y": 1},
-                {"matrix": [1, 9], "x": 8.5, "y": 1},
-                {"matrix": [1, 10], "x": 9.5, "y": 1},
-                {"matrix": [1, 11], "x": 10.5, "y": 1},
-                {"matrix": [1, 12], "x": 11.5, "y": 1},
-                {"matrix": [1, 13], "x": 12.5, "y": 1},
-                {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
-                {"matrix": [1, 15], "x": 15, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 2], "x": 1.75, "y": 2},
-                {"matrix": [2, 3], "x": 2.75, "y": 2},
-                {"matrix": [2, 4], "x": 3.75, "y": 2},
-                {"matrix": [2, 5], "x": 4.75, "y": 2},
-                {"matrix": [2, 6], "x": 5.75, "y": 2},
-                {"matrix": [2, 7], "x": 6.75, "y": 2},
-                {"matrix": [2, 8], "x": 7.75, "y": 2},
-                {"matrix": [2, 9], "x": 8.75, "y": 2},
-                {"matrix": [2, 10], "x": 9.75, "y": 2},
-                {"matrix": [2, 11], "x": 10.75, "y": 2},
-                {"matrix": [2, 12], "x": 11.75, "y": 2},
-                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
-                {"matrix": [2, 15], "x": 15, "y": 2},
-
-                {"matrix": [3, 1], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 2], "x": 2.25, "y": 3},
-                {"matrix": [3, 3], "x": 3.25, "y": 3},
-                {"matrix": [3, 4], "x": 4.25, "y": 3},
-                {"matrix": [3, 5], "x": 5.25, "y": 3},
-                {"matrix": [3, 6], "x": 6.25, "y": 3},
-                {"matrix": [3, 7], "x": 7.25, "y": 3},
-                {"matrix": [3, 8], "x": 8.25, "y": 3},
-                {"matrix": [3, 9], "x": 9.25, "y": 3},
-                {"matrix": [3, 10], "x": 10.25, "y": 3},
-                {"matrix": [3, 11], "x": 11.25, "y": 3},
-                {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
-                {"matrix": [3, 14], "x": 14, "y": 3},
-                {"matrix": [3, 15], "x": 15, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4},
-                {"matrix": [4, 3], "x": 2.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 6], "x": 3.5, "y": 4, "w": 6.25},
-                {"matrix": [4, 10], "x": 9.75, "y": 4, "w": 1.25},
-                {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.25},
-
-                {"matrix": [4, 13], "x": 13, "y": 4},
-                {"matrix": [4, 14], "x": 14, "y": 4},
-                {"matrix": [4, 15], "x": 15, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/phase_studio/titan65/hotswap/keyboard.json b/keyboards/phase_studio/titan65/hotswap/keyboard.json
new file mode 100644
index 00000000000..8bf3152b903
--- /dev/null
+++ b/keyboards/phase_studio/titan65/hotswap/keyboard.json
@@ -0,0 +1,110 @@
+{
+    "keyboard_name": "Titan 65 (hotswap)",
+    "manufacturer": "Phase Studio",
+    "url": "",
+    "maintainer": "drashna",
+    "usb": {
+        "vid": "0x5054",
+        "pid": "0xBB91",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgb_matrix": true
+    },
+    "ws2812": {
+        "pin": "E6"
+    },
+    "rgb_matrix": {
+        "driver": "ws2812",
+        "max_brightness": 150
+    },
+    "matrix_pins": {
+        "cols": ["B0", "B1", "B2", "B3", "B7", "D0", "D1", "D2", "D3", "D5", "F0", "F1", "C7", "F4", "F5", "F6"],
+        "rows": ["B4", "B5", "B6", "C6", "F7"]
+    },
+    "diode_direction": "COL2ROW",
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 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, 14], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 1.5, "y": 1},
+                {"matrix": [1, 3], "x": 2.5, "y": 1},
+                {"matrix": [1, 4], "x": 3.5, "y": 1},
+                {"matrix": [1, 5], "x": 4.5, "y": 1},
+                {"matrix": [1, 6], "x": 5.5, "y": 1},
+                {"matrix": [1, 7], "x": 6.5, "y": 1},
+                {"matrix": [1, 8], "x": 7.5, "y": 1},
+                {"matrix": [1, 9], "x": 8.5, "y": 1},
+                {"matrix": [1, 10], "x": 9.5, "y": 1},
+                {"matrix": [1, 11], "x": 10.5, "y": 1},
+                {"matrix": [1, 12], "x": 11.5, "y": 1},
+                {"matrix": [1, 13], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 1.75, "y": 2},
+                {"matrix": [2, 3], "x": 2.75, "y": 2},
+                {"matrix": [2, 4], "x": 3.75, "y": 2},
+                {"matrix": [2, 5], "x": 4.75, "y": 2},
+                {"matrix": [2, 6], "x": 5.75, "y": 2},
+                {"matrix": [2, 7], "x": 6.75, "y": 2},
+                {"matrix": [2, 8], "x": 7.75, "y": 2},
+                {"matrix": [2, 9], "x": 8.75, "y": 2},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
+                {"matrix": [2, 12], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 1], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4},
+                {"matrix": [4, 3], "x": 2.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.5, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 9.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.25},
+
+                {"matrix": [4, 13], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/phase_studio/titan65/hotswap/rules.mk b/keyboards/phase_studio/titan65/hotswap/rules.mk
index a3b3ae4eaa8..5813081a716 100644
--- a/keyboards/phase_studio/titan65/hotswap/rules.mk
+++ b/keyboards/phase_studio/titan65/hotswap/rules.mk
@@ -1,17 +1,2 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no       # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-RGB_MATRIX_ENABLE = yes
-
 AUDIO_SUPPORTED = no
 RGBLIGHT_SUPPORTED = no
-RGB_MATRIX_SUPPORTED = yes
diff --git a/keyboards/phase_studio/titan65/soldered/info.json b/keyboards/phase_studio/titan65/soldered/info.json
deleted file mode 100644
index ad1b8c07b5e..00000000000
--- a/keyboards/phase_studio/titan65/soldered/info.json
+++ /dev/null
@@ -1,407 +0,0 @@
-{
-    "keyboard_name": "Titan 65 (soldered)",
-    "manufacturer": "Phase Studio",
-    "url": "",
-    "maintainer": "drashna",
-    "usb": {
-        "vid": "0x5054",
-        "pid": "0xBB92",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["D3", "D5", "D4", "D6", "D7", "B4", "B5", "F6", "F5", "F4", "F1", "F0", "B0", "B1", "B2", "B3"],
-        "rows": ["B6", "C6", "C7", "F7", "E6"]
-    },
-    "diode_direction": "COL2ROW",
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "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": [0, 14], "x": 14, "y": 0},
-                {"matrix": [0, 15], "x": 15, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 2], "x": 1.5, "y": 1},
-                {"matrix": [1, 3], "x": 2.5, "y": 1},
-                {"matrix": [1, 4], "x": 3.5, "y": 1},
-                {"matrix": [1, 5], "x": 4.5, "y": 1},
-                {"matrix": [1, 6], "x": 5.5, "y": 1},
-                {"matrix": [1, 7], "x": 6.5, "y": 1},
-                {"matrix": [1, 8], "x": 7.5, "y": 1},
-                {"matrix": [1, 9], "x": 8.5, "y": 1},
-                {"matrix": [1, 10], "x": 9.5, "y": 1},
-                {"matrix": [1, 11], "x": 10.5, "y": 1},
-                {"matrix": [1, 12], "x": 11.5, "y": 1},
-                {"matrix": [1, 13], "x": 12.5, "y": 1},
-                {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
-                {"matrix": [1, 15], "x": 15, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 2], "x": 1.75, "y": 2},
-                {"matrix": [2, 3], "x": 2.75, "y": 2},
-                {"matrix": [2, 4], "x": 3.75, "y": 2},
-                {"matrix": [2, 5], "x": 4.75, "y": 2},
-                {"matrix": [2, 6], "x": 5.75, "y": 2},
-                {"matrix": [2, 7], "x": 6.75, "y": 2},
-                {"matrix": [2, 8], "x": 7.75, "y": 2},
-                {"matrix": [2, 9], "x": 8.75, "y": 2},
-                {"matrix": [2, 10], "x": 9.75, "y": 2},
-                {"matrix": [2, 11], "x": 10.75, "y": 2},
-                {"matrix": [2, 12], "x": 11.75, "y": 2},
-                {"matrix": [2, 13], "x": 12.75, "y": 2},
-                {"matrix": [2, 14], "x": 13.75, "y": 2, "w": 1.25},
-                {"matrix": [2, 15], "x": 15, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
-                {"matrix": [3, 2], "x": 1.25, "y": 3},
-                {"matrix": [3, 3], "x": 2.25, "y": 3},
-                {"matrix": [3, 4], "x": 3.25, "y": 3},
-                {"matrix": [3, 5], "x": 4.25, "y": 3},
-                {"matrix": [3, 6], "x": 5.25, "y": 3},
-                {"matrix": [3, 7], "x": 6.25, "y": 3},
-                {"matrix": [3, 8], "x": 7.25, "y": 3},
-                {"matrix": [3, 9], "x": 8.25, "y": 3},
-                {"matrix": [3, 10], "x": 9.25, "y": 3},
-                {"matrix": [3, 11], "x": 10.25, "y": 3},
-                {"matrix": [3, 12], "x": 11.25, "y": 3},
-                {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
-                {"matrix": [3, 14], "x": 14, "y": 3},
-                {"matrix": [3, 15], "x": 15, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 7], "x": 3.75, "y": 4, "w": 6.25},
-                {"matrix": [4, 11], "x": 10, "y": 4, "w": 1.25},
-                {"matrix": [4, 12], "x": 11.25, "y": 4, "w": 1.25},
-
-                {"matrix": [4, 13], "x": 13, "y": 4},
-                {"matrix": [4, 14], "x": 14, "y": 4},
-                {"matrix": [4, 15], "x": 15, "y": 4}
-            ]
-        },
-        "LAYOUT_ansi": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 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, 15], "x": 15, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 2], "x": 1.5, "y": 1},
-                {"matrix": [1, 3], "x": 2.5, "y": 1},
-                {"matrix": [1, 4], "x": 3.5, "y": 1},
-                {"matrix": [1, 5], "x": 4.5, "y": 1},
-                {"matrix": [1, 6], "x": 5.5, "y": 1},
-                {"matrix": [1, 7], "x": 6.5, "y": 1},
-                {"matrix": [1, 8], "x": 7.5, "y": 1},
-                {"matrix": [1, 9], "x": 8.5, "y": 1},
-                {"matrix": [1, 10], "x": 9.5, "y": 1},
-                {"matrix": [1, 11], "x": 10.5, "y": 1},
-                {"matrix": [1, 12], "x": 11.5, "y": 1},
-                {"matrix": [1, 13], "x": 12.5, "y": 1},
-                {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
-                {"matrix": [1, 15], "x": 15, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 2], "x": 1.75, "y": 2},
-                {"matrix": [2, 3], "x": 2.75, "y": 2},
-                {"matrix": [2, 4], "x": 3.75, "y": 2},
-                {"matrix": [2, 5], "x": 4.75, "y": 2},
-                {"matrix": [2, 6], "x": 5.75, "y": 2},
-                {"matrix": [2, 7], "x": 6.75, "y": 2},
-                {"matrix": [2, 8], "x": 7.75, "y": 2},
-                {"matrix": [2, 9], "x": 8.75, "y": 2},
-                {"matrix": [2, 10], "x": 9.75, "y": 2},
-                {"matrix": [2, 11], "x": 10.75, "y": 2},
-                {"matrix": [2, 12], "x": 11.75, "y": 2},
-                {"matrix": [2, 14], "x": 12.75, "y": 2, "w": 2.25},
-                {"matrix": [2, 15], "x": 15, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 3], "x": 2.25, "y": 3},
-                {"matrix": [3, 4], "x": 3.25, "y": 3},
-                {"matrix": [3, 5], "x": 4.25, "y": 3},
-                {"matrix": [3, 6], "x": 5.25, "y": 3},
-                {"matrix": [3, 7], "x": 6.25, "y": 3},
-                {"matrix": [3, 8], "x": 7.25, "y": 3},
-                {"matrix": [3, 9], "x": 8.25, "y": 3},
-                {"matrix": [3, 10], "x": 9.25, "y": 3},
-                {"matrix": [3, 11], "x": 10.25, "y": 3},
-                {"matrix": [3, 12], "x": 11.25, "y": 3},
-                {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
-                {"matrix": [3, 14], "x": 14, "y": 3},
-                {"matrix": [3, 15], "x": 15, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 7], "x": 3.75, "y": 4, "w": 6.25},
-                {"matrix": [4, 11], "x": 10, "y": 4, "w": 1.25},
-                {"matrix": [4, 12], "x": 11.25, "y": 4, "w": 1.25},
-
-                {"matrix": [4, 13], "x": 13, "y": 4},
-                {"matrix": [4, 14], "x": 14, "y": 4},
-                {"matrix": [4, 15], "x": 15, "y": 4}
-            ]
-        },
-        "LAYOUT_ansi_split_bspc": {
-            "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, 14], "x": 14, "y": 0},
-                {"matrix": [0, 15], "x": 15, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 2], "x": 1.5, "y": 1},
-                {"matrix": [1, 3], "x": 2.5, "y": 1},
-                {"matrix": [1, 4], "x": 3.5, "y": 1},
-                {"matrix": [1, 5], "x": 4.5, "y": 1},
-                {"matrix": [1, 6], "x": 5.5, "y": 1},
-                {"matrix": [1, 7], "x": 6.5, "y": 1},
-                {"matrix": [1, 8], "x": 7.5, "y": 1},
-                {"matrix": [1, 9], "x": 8.5, "y": 1},
-                {"matrix": [1, 10], "x": 9.5, "y": 1},
-                {"matrix": [1, 11], "x": 10.5, "y": 1},
-                {"matrix": [1, 12], "x": 11.5, "y": 1},
-                {"matrix": [1, 13], "x": 12.5, "y": 1},
-                {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
-                {"matrix": [1, 15], "x": 15, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 2], "x": 1.75, "y": 2},
-                {"matrix": [2, 3], "x": 2.75, "y": 2},
-                {"matrix": [2, 4], "x": 3.75, "y": 2},
-                {"matrix": [2, 5], "x": 4.75, "y": 2},
-                {"matrix": [2, 6], "x": 5.75, "y": 2},
-                {"matrix": [2, 7], "x": 6.75, "y": 2},
-                {"matrix": [2, 8], "x": 7.75, "y": 2},
-                {"matrix": [2, 9], "x": 8.75, "y": 2},
-                {"matrix": [2, 10], "x": 9.75, "y": 2},
-                {"matrix": [2, 11], "x": 10.75, "y": 2},
-                {"matrix": [2, 12], "x": 11.75, "y": 2},
-                {"matrix": [2, 14], "x": 12.75, "y": 2, "w": 2.25},
-                {"matrix": [2, 15], "x": 15, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 3], "x": 2.25, "y": 3},
-                {"matrix": [3, 4], "x": 3.25, "y": 3},
-                {"matrix": [3, 5], "x": 4.25, "y": 3},
-                {"matrix": [3, 6], "x": 5.25, "y": 3},
-                {"matrix": [3, 7], "x": 6.25, "y": 3},
-                {"matrix": [3, 8], "x": 7.25, "y": 3},
-                {"matrix": [3, 9], "x": 8.25, "y": 3},
-                {"matrix": [3, 10], "x": 9.25, "y": 3},
-                {"matrix": [3, 11], "x": 10.25, "y": 3},
-                {"matrix": [3, 12], "x": 11.25, "y": 3},
-                {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
-                {"matrix": [3, 14], "x": 14, "y": 3},
-                {"matrix": [3, 15], "x": 15, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 7], "x": 3.75, "y": 4, "w": 6.25},
-                {"matrix": [4, 11], "x": 10, "y": 4, "w": 1.25},
-                {"matrix": [4, 12], "x": 11.25, "y": 4, "w": 1.25},
-
-                {"matrix": [4, 13], "x": 13, "y": 4},
-                {"matrix": [4, 14], "x": 14, "y": 4},
-                {"matrix": [4, 15], "x": 15, "y": 4}
-            ]
-        },
-        "LAYOUT_iso": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-                {"matrix": [0, 15], "x": 15, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 2], "x": 1.5, "y": 1},
-                {"matrix": [1, 3], "x": 2.5, "y": 1},
-                {"matrix": [1, 4], "x": 3.5, "y": 1},
-                {"matrix": [1, 5], "x": 4.5, "y": 1},
-                {"matrix": [1, 6], "x": 5.5, "y": 1},
-                {"matrix": [1, 7], "x": 6.5, "y": 1},
-                {"matrix": [1, 8], "x": 7.5, "y": 1},
-                {"matrix": [1, 9], "x": 8.5, "y": 1},
-                {"matrix": [1, 10], "x": 9.5, "y": 1},
-                {"matrix": [1, 11], "x": 10.5, "y": 1},
-                {"matrix": [1, 12], "x": 11.5, "y": 1},
-                {"matrix": [1, 13], "x": 12.5, "y": 1},
-                {"matrix": [1, 15], "x": 15, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 2], "x": 1.75, "y": 2},
-                {"matrix": [2, 3], "x": 2.75, "y": 2},
-                {"matrix": [2, 4], "x": 3.75, "y": 2},
-                {"matrix": [2, 5], "x": 4.75, "y": 2},
-                {"matrix": [2, 6], "x": 5.75, "y": 2},
-                {"matrix": [2, 7], "x": 6.75, "y": 2},
-                {"matrix": [2, 8], "x": 7.75, "y": 2},
-                {"matrix": [2, 9], "x": 8.75, "y": 2},
-                {"matrix": [2, 10], "x": 9.75, "y": 2},
-                {"matrix": [2, 11], "x": 10.75, "y": 2},
-                {"matrix": [2, 12], "x": 11.75, "y": 2},
-                {"matrix": [2, 13], "x": 12.75, "y": 2},
-                {"matrix": [2, 14], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
-                {"matrix": [2, 15], "x": 15, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
-                {"matrix": [3, 2], "x": 1.25, "y": 3},
-                {"matrix": [3, 3], "x": 2.25, "y": 3},
-                {"matrix": [3, 4], "x": 3.25, "y": 3},
-                {"matrix": [3, 5], "x": 4.25, "y": 3},
-                {"matrix": [3, 6], "x": 5.25, "y": 3},
-                {"matrix": [3, 7], "x": 6.25, "y": 3},
-                {"matrix": [3, 8], "x": 7.25, "y": 3},
-                {"matrix": [3, 9], "x": 8.25, "y": 3},
-                {"matrix": [3, 10], "x": 9.25, "y": 3},
-                {"matrix": [3, 11], "x": 10.25, "y": 3},
-                {"matrix": [3, 12], "x": 11.25, "y": 3},
-                {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
-                {"matrix": [3, 14], "x": 14, "y": 3},
-                {"matrix": [3, 15], "x": 15, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 7], "x": 3.75, "y": 4, "w": 6.25},
-                {"matrix": [4, 11], "x": 10, "y": 4, "w": 1.25},
-                {"matrix": [4, 12], "x": 11.25, "y": 4, "w": 1.25},
-
-                {"matrix": [4, 13], "x": 13, "y": 4},
-                {"matrix": [4, 14], "x": 14, "y": 4},
-                {"matrix": [4, 15], "x": 15, "y": 4}
-            ]
-        },
-        "LAYOUT_iso_split_bspc": {
-            "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, 14], "x": 14, "y": 0},
-                {"matrix": [0, 15], "x": 15, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 2], "x": 1.5, "y": 1},
-                {"matrix": [1, 3], "x": 2.5, "y": 1},
-                {"matrix": [1, 4], "x": 3.5, "y": 1},
-                {"matrix": [1, 5], "x": 4.5, "y": 1},
-                {"matrix": [1, 6], "x": 5.5, "y": 1},
-                {"matrix": [1, 7], "x": 6.5, "y": 1},
-                {"matrix": [1, 8], "x": 7.5, "y": 1},
-                {"matrix": [1, 9], "x": 8.5, "y": 1},
-                {"matrix": [1, 10], "x": 9.5, "y": 1},
-                {"matrix": [1, 11], "x": 10.5, "y": 1},
-                {"matrix": [1, 12], "x": 11.5, "y": 1},
-                {"matrix": [1, 13], "x": 12.5, "y": 1},
-                {"matrix": [1, 15], "x": 15, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 2], "x": 1.75, "y": 2},
-                {"matrix": [2, 3], "x": 2.75, "y": 2},
-                {"matrix": [2, 4], "x": 3.75, "y": 2},
-                {"matrix": [2, 5], "x": 4.75, "y": 2},
-                {"matrix": [2, 6], "x": 5.75, "y": 2},
-                {"matrix": [2, 7], "x": 6.75, "y": 2},
-                {"matrix": [2, 8], "x": 7.75, "y": 2},
-                {"matrix": [2, 9], "x": 8.75, "y": 2},
-                {"matrix": [2, 10], "x": 9.75, "y": 2},
-                {"matrix": [2, 11], "x": 10.75, "y": 2},
-                {"matrix": [2, 12], "x": 11.75, "y": 2},
-                {"matrix": [2, 13], "x": 12.75, "y": 2},
-                {"matrix": [2, 14], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
-                {"matrix": [2, 15], "x": 15, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
-                {"matrix": [3, 2], "x": 1.25, "y": 3},
-                {"matrix": [3, 3], "x": 2.25, "y": 3},
-                {"matrix": [3, 4], "x": 3.25, "y": 3},
-                {"matrix": [3, 5], "x": 4.25, "y": 3},
-                {"matrix": [3, 6], "x": 5.25, "y": 3},
-                {"matrix": [3, 7], "x": 6.25, "y": 3},
-                {"matrix": [3, 8], "x": 7.25, "y": 3},
-                {"matrix": [3, 9], "x": 8.25, "y": 3},
-                {"matrix": [3, 10], "x": 9.25, "y": 3},
-                {"matrix": [3, 11], "x": 10.25, "y": 3},
-                {"matrix": [3, 12], "x": 11.25, "y": 3},
-                {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
-                {"matrix": [3, 14], "x": 14, "y": 3},
-                {"matrix": [3, 15], "x": 15, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 7], "x": 3.75, "y": 4, "w": 6.25},
-                {"matrix": [4, 11], "x": 10, "y": 4, "w": 1.25},
-                {"matrix": [4, 12], "x": 11.25, "y": 4, "w": 1.25},
-
-                {"matrix": [4, 13], "x": 13, "y": 4},
-                {"matrix": [4, 14], "x": 14, "y": 4},
-                {"matrix": [4, 15], "x": 15, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/phase_studio/titan65/soldered/keyboard.json b/keyboards/phase_studio/titan65/soldered/keyboard.json
new file mode 100644
index 00000000000..c60c689932d
--- /dev/null
+++ b/keyboards/phase_studio/titan65/soldered/keyboard.json
@@ -0,0 +1,413 @@
+{
+    "keyboard_name": "Titan 65 (soldered)",
+    "manufacturer": "Phase Studio",
+    "url": "",
+    "maintainer": "drashna",
+    "usb": {
+        "vid": "0x5054",
+        "pid": "0xBB92",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "matrix_pins": {
+        "cols": ["D3", "D5", "D4", "D6", "D7", "B4", "B5", "F6", "F5", "F4", "F1", "F0", "B0", "B1", "B2", "B3"],
+        "rows": ["B6", "C6", "C7", "F7", "E6"]
+    },
+    "diode_direction": "COL2ROW",
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "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": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 1.5, "y": 1},
+                {"matrix": [1, 3], "x": 2.5, "y": 1},
+                {"matrix": [1, 4], "x": 3.5, "y": 1},
+                {"matrix": [1, 5], "x": 4.5, "y": 1},
+                {"matrix": [1, 6], "x": 5.5, "y": 1},
+                {"matrix": [1, 7], "x": 6.5, "y": 1},
+                {"matrix": [1, 8], "x": 7.5, "y": 1},
+                {"matrix": [1, 9], "x": 8.5, "y": 1},
+                {"matrix": [1, 10], "x": 9.5, "y": 1},
+                {"matrix": [1, 11], "x": 10.5, "y": 1},
+                {"matrix": [1, 12], "x": 11.5, "y": 1},
+                {"matrix": [1, 13], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 1.75, "y": 2},
+                {"matrix": [2, 3], "x": 2.75, "y": 2},
+                {"matrix": [2, 4], "x": 3.75, "y": 2},
+                {"matrix": [2, 5], "x": 4.75, "y": 2},
+                {"matrix": [2, 6], "x": 5.75, "y": 2},
+                {"matrix": [2, 7], "x": 6.75, "y": 2},
+                {"matrix": [2, 8], "x": 7.75, "y": 2},
+                {"matrix": [2, 9], "x": 8.75, "y": 2},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
+                {"matrix": [2, 12], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2},
+                {"matrix": [2, 14], "x": 13.75, "y": 2, "w": 1.25},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 2], "x": 1.25, "y": 3},
+                {"matrix": [3, 3], "x": 2.25, "y": 3},
+                {"matrix": [3, 4], "x": 3.25, "y": 3},
+                {"matrix": [3, 5], "x": 4.25, "y": 3},
+                {"matrix": [3, 6], "x": 5.25, "y": 3},
+                {"matrix": [3, 7], "x": 6.25, "y": 3},
+                {"matrix": [3, 8], "x": 7.25, "y": 3},
+                {"matrix": [3, 9], "x": 8.25, "y": 3},
+                {"matrix": [3, 10], "x": 9.25, "y": 3},
+                {"matrix": [3, 11], "x": 10.25, "y": 3},
+                {"matrix": [3, 12], "x": 11.25, "y": 3},
+                {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 7], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 11], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 11.25, "y": 4, "w": 1.25},
+
+                {"matrix": [4, 13], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_ansi": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 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, 15], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 1.5, "y": 1},
+                {"matrix": [1, 3], "x": 2.5, "y": 1},
+                {"matrix": [1, 4], "x": 3.5, "y": 1},
+                {"matrix": [1, 5], "x": 4.5, "y": 1},
+                {"matrix": [1, 6], "x": 5.5, "y": 1},
+                {"matrix": [1, 7], "x": 6.5, "y": 1},
+                {"matrix": [1, 8], "x": 7.5, "y": 1},
+                {"matrix": [1, 9], "x": 8.5, "y": 1},
+                {"matrix": [1, 10], "x": 9.5, "y": 1},
+                {"matrix": [1, 11], "x": 10.5, "y": 1},
+                {"matrix": [1, 12], "x": 11.5, "y": 1},
+                {"matrix": [1, 13], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 1.75, "y": 2},
+                {"matrix": [2, 3], "x": 2.75, "y": 2},
+                {"matrix": [2, 4], "x": 3.75, "y": 2},
+                {"matrix": [2, 5], "x": 4.75, "y": 2},
+                {"matrix": [2, 6], "x": 5.75, "y": 2},
+                {"matrix": [2, 7], "x": 6.75, "y": 2},
+                {"matrix": [2, 8], "x": 7.75, "y": 2},
+                {"matrix": [2, 9], "x": 8.75, "y": 2},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
+                {"matrix": [2, 12], "x": 11.75, "y": 2},
+                {"matrix": [2, 14], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 3], "x": 2.25, "y": 3},
+                {"matrix": [3, 4], "x": 3.25, "y": 3},
+                {"matrix": [3, 5], "x": 4.25, "y": 3},
+                {"matrix": [3, 6], "x": 5.25, "y": 3},
+                {"matrix": [3, 7], "x": 6.25, "y": 3},
+                {"matrix": [3, 8], "x": 7.25, "y": 3},
+                {"matrix": [3, 9], "x": 8.25, "y": 3},
+                {"matrix": [3, 10], "x": 9.25, "y": 3},
+                {"matrix": [3, 11], "x": 10.25, "y": 3},
+                {"matrix": [3, 12], "x": 11.25, "y": 3},
+                {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 7], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 11], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 11.25, "y": 4, "w": 1.25},
+
+                {"matrix": [4, 13], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_ansi_split_bspc": {
+            "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, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 1.5, "y": 1},
+                {"matrix": [1, 3], "x": 2.5, "y": 1},
+                {"matrix": [1, 4], "x": 3.5, "y": 1},
+                {"matrix": [1, 5], "x": 4.5, "y": 1},
+                {"matrix": [1, 6], "x": 5.5, "y": 1},
+                {"matrix": [1, 7], "x": 6.5, "y": 1},
+                {"matrix": [1, 8], "x": 7.5, "y": 1},
+                {"matrix": [1, 9], "x": 8.5, "y": 1},
+                {"matrix": [1, 10], "x": 9.5, "y": 1},
+                {"matrix": [1, 11], "x": 10.5, "y": 1},
+                {"matrix": [1, 12], "x": 11.5, "y": 1},
+                {"matrix": [1, 13], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 1.75, "y": 2},
+                {"matrix": [2, 3], "x": 2.75, "y": 2},
+                {"matrix": [2, 4], "x": 3.75, "y": 2},
+                {"matrix": [2, 5], "x": 4.75, "y": 2},
+                {"matrix": [2, 6], "x": 5.75, "y": 2},
+                {"matrix": [2, 7], "x": 6.75, "y": 2},
+                {"matrix": [2, 8], "x": 7.75, "y": 2},
+                {"matrix": [2, 9], "x": 8.75, "y": 2},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
+                {"matrix": [2, 12], "x": 11.75, "y": 2},
+                {"matrix": [2, 14], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 3], "x": 2.25, "y": 3},
+                {"matrix": [3, 4], "x": 3.25, "y": 3},
+                {"matrix": [3, 5], "x": 4.25, "y": 3},
+                {"matrix": [3, 6], "x": 5.25, "y": 3},
+                {"matrix": [3, 7], "x": 6.25, "y": 3},
+                {"matrix": [3, 8], "x": 7.25, "y": 3},
+                {"matrix": [3, 9], "x": 8.25, "y": 3},
+                {"matrix": [3, 10], "x": 9.25, "y": 3},
+                {"matrix": [3, 11], "x": 10.25, "y": 3},
+                {"matrix": [3, 12], "x": 11.25, "y": 3},
+                {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 7], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 11], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 11.25, "y": 4, "w": 1.25},
+
+                {"matrix": [4, 13], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_iso": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 1.5, "y": 1},
+                {"matrix": [1, 3], "x": 2.5, "y": 1},
+                {"matrix": [1, 4], "x": 3.5, "y": 1},
+                {"matrix": [1, 5], "x": 4.5, "y": 1},
+                {"matrix": [1, 6], "x": 5.5, "y": 1},
+                {"matrix": [1, 7], "x": 6.5, "y": 1},
+                {"matrix": [1, 8], "x": 7.5, "y": 1},
+                {"matrix": [1, 9], "x": 8.5, "y": 1},
+                {"matrix": [1, 10], "x": 9.5, "y": 1},
+                {"matrix": [1, 11], "x": 10.5, "y": 1},
+                {"matrix": [1, 12], "x": 11.5, "y": 1},
+                {"matrix": [1, 13], "x": 12.5, "y": 1},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 1.75, "y": 2},
+                {"matrix": [2, 3], "x": 2.75, "y": 2},
+                {"matrix": [2, 4], "x": 3.75, "y": 2},
+                {"matrix": [2, 5], "x": 4.75, "y": 2},
+                {"matrix": [2, 6], "x": 5.75, "y": 2},
+                {"matrix": [2, 7], "x": 6.75, "y": 2},
+                {"matrix": [2, 8], "x": 7.75, "y": 2},
+                {"matrix": [2, 9], "x": 8.75, "y": 2},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
+                {"matrix": [2, 12], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2},
+                {"matrix": [2, 14], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 2], "x": 1.25, "y": 3},
+                {"matrix": [3, 3], "x": 2.25, "y": 3},
+                {"matrix": [3, 4], "x": 3.25, "y": 3},
+                {"matrix": [3, 5], "x": 4.25, "y": 3},
+                {"matrix": [3, 6], "x": 5.25, "y": 3},
+                {"matrix": [3, 7], "x": 6.25, "y": 3},
+                {"matrix": [3, 8], "x": 7.25, "y": 3},
+                {"matrix": [3, 9], "x": 8.25, "y": 3},
+                {"matrix": [3, 10], "x": 9.25, "y": 3},
+                {"matrix": [3, 11], "x": 10.25, "y": 3},
+                {"matrix": [3, 12], "x": 11.25, "y": 3},
+                {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 7], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 11], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 11.25, "y": 4, "w": 1.25},
+
+                {"matrix": [4, 13], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_iso_split_bspc": {
+            "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, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 1.5, "y": 1},
+                {"matrix": [1, 3], "x": 2.5, "y": 1},
+                {"matrix": [1, 4], "x": 3.5, "y": 1},
+                {"matrix": [1, 5], "x": 4.5, "y": 1},
+                {"matrix": [1, 6], "x": 5.5, "y": 1},
+                {"matrix": [1, 7], "x": 6.5, "y": 1},
+                {"matrix": [1, 8], "x": 7.5, "y": 1},
+                {"matrix": [1, 9], "x": 8.5, "y": 1},
+                {"matrix": [1, 10], "x": 9.5, "y": 1},
+                {"matrix": [1, 11], "x": 10.5, "y": 1},
+                {"matrix": [1, 12], "x": 11.5, "y": 1},
+                {"matrix": [1, 13], "x": 12.5, "y": 1},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 1.75, "y": 2},
+                {"matrix": [2, 3], "x": 2.75, "y": 2},
+                {"matrix": [2, 4], "x": 3.75, "y": 2},
+                {"matrix": [2, 5], "x": 4.75, "y": 2},
+                {"matrix": [2, 6], "x": 5.75, "y": 2},
+                {"matrix": [2, 7], "x": 6.75, "y": 2},
+                {"matrix": [2, 8], "x": 7.75, "y": 2},
+                {"matrix": [2, 9], "x": 8.75, "y": 2},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
+                {"matrix": [2, 12], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2},
+                {"matrix": [2, 14], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 2], "x": 1.25, "y": 3},
+                {"matrix": [3, 3], "x": 2.25, "y": 3},
+                {"matrix": [3, 4], "x": 3.25, "y": 3},
+                {"matrix": [3, 5], "x": 4.25, "y": 3},
+                {"matrix": [3, 6], "x": 5.25, "y": 3},
+                {"matrix": [3, 7], "x": 6.25, "y": 3},
+                {"matrix": [3, 8], "x": 7.25, "y": 3},
+                {"matrix": [3, 9], "x": 8.25, "y": 3},
+                {"matrix": [3, 10], "x": 9.25, "y": 3},
+                {"matrix": [3, 11], "x": 10.25, "y": 3},
+                {"matrix": [3, 12], "x": 11.25, "y": 3},
+                {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 7], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 11], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 11.25, "y": 4, "w": 1.25},
+
+                {"matrix": [4, 13], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/phase_studio/titan65/soldered/rules.mk b/keyboards/phase_studio/titan65/soldered/rules.mk
index ad3fad5cb59..52030059798 100644
--- a/keyboards/phase_studio/titan65/soldered/rules.mk
+++ b/keyboards/phase_studio/titan65/soldered/rules.mk
@@ -1,17 +1,3 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no       # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
-
 AUDIO_SUPPORTED = no
 RGBLIGHT_SUPPORTED = no
 RGB_MATRIX_SUPPORTED = no
diff --git a/keyboards/phoenix/info.json b/keyboards/phoenix/info.json
deleted file mode 100644
index c6a55a973af..00000000000
--- a/keyboards/phoenix/info.json
+++ /dev/null
@@ -1,214 +0,0 @@
-{
-    "keyboard_name": "Phoenix",
-    "manufacturer": "ErgoKB",
-    "url": "ergokb.tw",
-    "maintainer": "ErgoKB via lschyi",
-    "usb": {
-        "vid": "0x456B",
-        "pid": "0x0001",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["B10", "B12", "B13", "B14", "B15", "A8", "A10"],
-        "rows": ["B1", "B0", "A7", "A6", "A5", "B7"]
-    },
-    "diode_direction": "ROW2COL",
-    "split": {
-        "enabled": true,
-        "soft_serial_pin": "A9"
-    },
-    "processor": "STM32F401",
-    "bootloader": "stm32-dfu",
-    "board": "BLACKPILL_STM32_F401",
-    "layouts": {
-        "LAYOUT_ergodox": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0.375, "w": 1.5},
-                {"matrix": [0, 1], "x": 1.5, "y": 0.375},
-                {"matrix": [0, 2], "x": 2.5, "y": 0.125},
-                {"matrix": [0, 3], "x": 3.5, "y": 0},
-                {"matrix": [0, 4], "x": 4.5, "y": 0.125},
-                {"matrix": [0, 5], "x": 5.5, "y": 0.25},
-                {"matrix": [0, 6], "x": 6.5, "y": 0.25},
-
-                {"matrix": [1, 0], "x": 0, "y": 1.375, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1.375},
-                {"matrix": [1, 2], "x": 2.5, "y": 1.125},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1.125},
-                {"matrix": [1, 5], "x": 5.5, "y": 1.25},
-                {"matrix": [1, 6], "x": 6.5, "y": 1.25, "h": 1.5},
-
-                {"matrix": [2, 0], "x": 0, "y": 2.375, "w": 1.5},
-                {"matrix": [2, 1], "x": 1.5, "y": 2.375},
-                {"matrix": [2, 2], "x": 2.5, "y": 2.125},
-                {"matrix": [2, 3], "x": 3.5, "y": 2},
-                {"matrix": [2, 4], "x": 4.5, "y": 2.125},
-                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
-
-                {"matrix": [3, 0], "x": 0, "y": 3.375, "w": 1.5},
-                {"matrix": [3, 1], "x": 1.5, "y": 3.375},
-                {"matrix": [3, 2], "x": 2.5, "y": 3.125},
-                {"matrix": [3, 3], "x": 3.5, "y": 3},
-                {"matrix": [3, 4], "x": 4.5, "y": 3.125},
-                {"matrix": [3, 5], "x": 5.5, "y": 3.25},
-                {"matrix": [3, 6], "x": 6.5, "y": 2.75, "h": 1.5},
-
-                {"matrix": [4, 0], "x": 0.5, "y": 4.375},
-                {"matrix": [4, 1], "x": 1.5, "y": 4.375},
-                {"matrix": [4, 2], "x": 2.5, "y": 4.125},
-                {"matrix": [4, 3], "x": 3.5, "y": 4},
-                {"matrix": [4, 4], "x": 4.5, "y": 4.125},
-
-                {"matrix": [5, 3], "x": 6, "y": 5},
-                {"matrix": [5, 4], "x": 7, "y": 5},
-
-                {"matrix": [5, 5], "x": 7, "y": 6},
-                {"matrix": [5, 0], "x": 5, "y": 6, "h": 2},
-                {"matrix": [5, 1], "x": 6, "y": 6, "h": 2},
-
-                {"matrix": [5, 2], "x": 7, "y": 7},
-
-                {"matrix": [6, 6], "x": 9.5, "y": 0.25},
-                {"matrix": [6, 5], "x": 10.5, "y": 0.25},
-                {"matrix": [6, 4], "x": 11.5, "y": 0.125},
-                {"matrix": [6, 3], "x": 12.5, "y": 0},
-                {"matrix": [6, 2], "x": 13.5, "y": 0.125},
-                {"matrix": [6, 1], "x": 14.5, "y": 0.375},
-                {"matrix": [6, 0], "x": 15.5, "y": 0.375, "w": 1.5},
-
-                {"matrix": [7, 6], "x": 9.5, "y": 1.25, "h": 1.5},
-                {"matrix": [7, 5], "x": 10.5, "y": 1.25},
-                {"matrix": [7, 4], "x": 11.5, "y": 1.125},
-                {"matrix": [7, 3], "x": 12.5, "y": 1},
-                {"matrix": [7, 2], "x": 13.5, "y": 1.125},
-                {"matrix": [7, 1], "x": 14.5, "y": 1.375},
-                {"matrix": [7, 0], "x": 15.5, "y": 1.375, "w": 1.5},
-
-                {"matrix": [8, 5], "x": 10.5, "y": 2.25},
-                {"matrix": [8, 4], "x": 11.5, "y": 2.125},
-                {"matrix": [8, 3], "x": 12.5, "y": 2},
-                {"matrix": [8, 2], "x": 13.5, "y": 2.125},
-                {"matrix": [8, 1], "x": 14.5, "y": 2.375},
-                {"matrix": [8, 0], "x": 15.5, "y": 2.375, "w": 1.5},
-                {"matrix": [9, 6], "x": 9.5, "y": 2.75, "h": 1.5},
-
-                {"matrix": [9, 5], "x": 10.5, "y": 3.25},
-                {"matrix": [9, 4], "x": 11.5, "y": 3.125},
-                {"matrix": [9, 3], "x": 12.5, "y": 3},
-                {"matrix": [9, 2], "x": 13.5, "y": 3.125},
-                {"matrix": [9, 1], "x": 14.5, "y": 3.375},
-                {"matrix": [9, 0], "x": 15.5, "y": 3.375, "w": 1.5},
-
-                {"matrix": [10, 4], "x": 11.5, "y": 4.125},
-                {"matrix": [10, 3], "x": 12.5, "y": 4},
-                {"matrix": [10, 2], "x": 13.5, "y": 4.125},
-                {"matrix": [10, 1], "x": 14.5, "y": 4.375},
-                {"matrix": [10, 0], "x": 15.5, "y": 4.375},
-
-                {"matrix": [11, 4], "x": 9, "y": 5},
-                {"matrix": [11, 3], "x": 10, "y": 5},
-
-                {"matrix": [11, 5], "x": 9, "y": 6},
-
-                {"matrix": [11, 2], "x": 9, "y": 7},
-
-                {"matrix": [11, 1], "x": 10, "y": 6, "h": 2},
-                {"matrix": [11, 0], "x": 11, "y": 6, "h": 2}
-            ]
-        },
-        "LAYOUT_ergodox_pretty": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0.375, "w": 1.5},
-                {"matrix": [0, 1], "x": 1.5, "y": 0.375},
-                {"matrix": [0, 2], "x": 2.5, "y": 0.125},
-                {"matrix": [0, 3], "x": 3.5, "y": 0},
-                {"matrix": [0, 4], "x": 4.5, "y": 0.125},
-                {"matrix": [0, 5], "x": 5.5, "y": 0.25},
-                {"matrix": [0, 6], "x": 6.5, "y": 0.25},
-
-                {"matrix": [6, 0], "x": 9.5, "y": 0.25},
-                {"matrix": [6, 1], "x": 10.5, "y": 0.25},
-                {"matrix": [6, 2], "x": 11.5, "y": 0.125},
-                {"matrix": [6, 3], "x": 12.5, "y": 0},
-                {"matrix": [6, 4], "x": 13.5, "y": 0.125},
-                {"matrix": [6, 5], "x": 14.5, "y": 0.375},
-                {"matrix": [6, 6], "x": 15.5, "y": 0.375, "w": 1.5},
-
-                {"matrix": [1, 0], "x": 0, "y": 1.375, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1.375},
-                {"matrix": [1, 2], "x": 2.5, "y": 1.125},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1.125},
-                {"matrix": [1, 5], "x": 5.5, "y": 1.25},
-                {"matrix": [1, 6], "x": 6.5, "y": 1.25, "h": 1.5},
-
-                {"matrix": [7, 0], "x": 9.5, "y": 1.25, "h": 1.5},
-                {"matrix": [7, 1], "x": 10.5, "y": 1.25},
-                {"matrix": [7, 2], "x": 11.5, "y": 1.125},
-                {"matrix": [7, 3], "x": 12.5, "y": 1},
-                {"matrix": [7, 4], "x": 13.5, "y": 1.125},
-                {"matrix": [7, 5], "x": 14.5, "y": 1.375},
-                {"matrix": [7, 6], "x": 15.5, "y": 1.375, "w": 1.5},
-
-                {"matrix": [2, 0], "x": 0, "y": 2.375, "w": 1.5},
-                {"matrix": [2, 1], "x": 1.5, "y": 2.375},
-                {"matrix": [2, 2], "x": 2.5, "y": 2.125},
-                {"matrix": [2, 3], "x": 3.5, "y": 2},
-                {"matrix": [2, 4], "x": 4.5, "y": 2.125},
-                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
-
-                {"matrix": [8, 0], "x": 10.5, "y": 2.25},
-                {"matrix": [8, 1], "x": 11.5, "y": 2.125},
-                {"matrix": [8, 2], "x": 12.5, "y": 2},
-                {"matrix": [8, 3], "x": 13.5, "y": 2.125},
-                {"matrix": [8, 4], "x": 14.5, "y": 2.375},
-                {"matrix": [8, 5], "x": 15.5, "y": 2.375, "w": 1.5},
-
-                {"matrix": [3, 0], "x": 0, "y": 3.375, "w": 1.5},
-                {"matrix": [3, 1], "x": 1.5, "y": 3.375},
-                {"matrix": [3, 2], "x": 2.5, "y": 3.125},
-                {"matrix": [3, 3], "x": 3.5, "y": 3},
-                {"matrix": [3, 4], "x": 4.5, "y": 3.125},
-                {"matrix": [3, 5], "x": 5.5, "y": 3.25},
-                {"matrix": [3, 6], "x": 6.5, "y": 2.75, "h": 1.5},
-
-                {"matrix": [9, 0], "x": 9.5, "y": 2.75, "h": 1.5},
-                {"matrix": [9, 1], "x": 10.5, "y": 3.25},
-                {"matrix": [9, 2], "x": 11.5, "y": 3.125},
-                {"matrix": [9, 3], "x": 12.5, "y": 3},
-                {"matrix": [9, 4], "x": 13.5, "y": 3.125},
-                {"matrix": [9, 5], "x": 14.5, "y": 3.375},
-                {"matrix": [9, 6], "x": 15.5, "y": 3.375, "w": 1.5},
-
-                {"matrix": [4, 0], "x": 0.5, "y": 4.375},
-                {"matrix": [4, 1], "x": 1.5, "y": 4.375},
-                {"matrix": [4, 2], "x": 2.5, "y": 4.125},
-                {"matrix": [4, 3], "x": 3.5, "y": 4},
-                {"matrix": [4, 4], "x": 4.5, "y": 4.125},
-
-                {"matrix": [10, 0], "x": 11.5, "y": 4.125},
-                {"matrix": [10, 1], "x": 12.5, "y": 4},
-                {"matrix": [10, 2], "x": 13.5, "y": 4.125},
-                {"matrix": [10, 3], "x": 14.5, "y": 4.375},
-                {"matrix": [10, 4], "x": 15.5, "y": 4.375},
-
-                {"matrix": [5, 3], "x": 6, "y": 5},
-                {"matrix": [5, 4], "x": 7, "y": 5},
-                {"matrix": [11, 4], "x": 9, "y": 5},
-                {"matrix": [11, 3], "x": 10, "y": 5},
-
-                {"matrix": [5, 5], "x": 7, "y": 6},
-                {"matrix": [11, 5], "x": 9, "y": 6},
-                {"matrix": [5, 0], "x": 5, "y": 6, "h": 2},
-                {"matrix": [5, 1], "x": 6, "y": 6, "h": 2},
-
-                {"matrix": [5, 2], "x": 7, "y": 7},
-                {"matrix": [11, 2], "x": 9, "y": 7},
-
-                {"matrix": [11, 1], "x": 10, "y": 6, "h": 2},
-                {"matrix": [11, 0], "x": 11, "y": 6, "h": 2}
-            ]
-        }
-    }
-}
diff --git a/keyboards/phoenix/keyboard.json b/keyboards/phoenix/keyboard.json
new file mode 100644
index 00000000000..b6dd3599662
--- /dev/null
+++ b/keyboards/phoenix/keyboard.json
@@ -0,0 +1,223 @@
+{
+    "keyboard_name": "Phoenix",
+    "manufacturer": "ErgoKB",
+    "url": "ergokb.tw",
+    "maintainer": "ErgoKB via lschyi",
+    "usb": {
+        "vid": "0x456B",
+        "pid": "0x0001",
+        "device_version": "0.0.1",
+        "shared_endpoint": {
+            "keyboard": true
+        }
+    },
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "matrix_pins": {
+        "cols": ["B10", "B12", "B13", "B14", "B15", "A8", "A10"],
+        "rows": ["B1", "B0", "A7", "A6", "A5", "B7"]
+    },
+    "diode_direction": "ROW2COL",
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "A9"
+    },
+    "processor": "STM32F401",
+    "bootloader": "stm32-dfu",
+    "board": "BLACKPILL_STM32_F401",
+    "layouts": {
+        "LAYOUT_ergodox": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0.375, "w": 1.5},
+                {"matrix": [0, 1], "x": 1.5, "y": 0.375},
+                {"matrix": [0, 2], "x": 2.5, "y": 0.125},
+                {"matrix": [0, 3], "x": 3.5, "y": 0},
+                {"matrix": [0, 4], "x": 4.5, "y": 0.125},
+                {"matrix": [0, 5], "x": 5.5, "y": 0.25},
+                {"matrix": [0, 6], "x": 6.5, "y": 0.25},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.375, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1.375},
+                {"matrix": [1, 2], "x": 2.5, "y": 1.125},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1.125},
+                {"matrix": [1, 5], "x": 5.5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6.5, "y": 1.25, "h": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.375, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.375},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.125},
+                {"matrix": [2, 3], "x": 3.5, "y": 2},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.125},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.375, "w": 1.5},
+                {"matrix": [3, 1], "x": 1.5, "y": 3.375},
+                {"matrix": [3, 2], "x": 2.5, "y": 3.125},
+                {"matrix": [3, 3], "x": 3.5, "y": 3},
+                {"matrix": [3, 4], "x": 4.5, "y": 3.125},
+                {"matrix": [3, 5], "x": 5.5, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.5, "y": 2.75, "h": 1.5},
+
+                {"matrix": [4, 0], "x": 0.5, "y": 4.375},
+                {"matrix": [4, 1], "x": 1.5, "y": 4.375},
+                {"matrix": [4, 2], "x": 2.5, "y": 4.125},
+                {"matrix": [4, 3], "x": 3.5, "y": 4},
+                {"matrix": [4, 4], "x": 4.5, "y": 4.125},
+
+                {"matrix": [5, 3], "x": 6, "y": 5},
+                {"matrix": [5, 4], "x": 7, "y": 5},
+
+                {"matrix": [5, 5], "x": 7, "y": 6},
+                {"matrix": [5, 0], "x": 5, "y": 6, "h": 2},
+                {"matrix": [5, 1], "x": 6, "y": 6, "h": 2},
+
+                {"matrix": [5, 2], "x": 7, "y": 7},
+
+                {"matrix": [6, 6], "x": 9.5, "y": 0.25},
+                {"matrix": [6, 5], "x": 10.5, "y": 0.25},
+                {"matrix": [6, 4], "x": 11.5, "y": 0.125},
+                {"matrix": [6, 3], "x": 12.5, "y": 0},
+                {"matrix": [6, 2], "x": 13.5, "y": 0.125},
+                {"matrix": [6, 1], "x": 14.5, "y": 0.375},
+                {"matrix": [6, 0], "x": 15.5, "y": 0.375, "w": 1.5},
+
+                {"matrix": [7, 6], "x": 9.5, "y": 1.25, "h": 1.5},
+                {"matrix": [7, 5], "x": 10.5, "y": 1.25},
+                {"matrix": [7, 4], "x": 11.5, "y": 1.125},
+                {"matrix": [7, 3], "x": 12.5, "y": 1},
+                {"matrix": [7, 2], "x": 13.5, "y": 1.125},
+                {"matrix": [7, 1], "x": 14.5, "y": 1.375},
+                {"matrix": [7, 0], "x": 15.5, "y": 1.375, "w": 1.5},
+
+                {"matrix": [8, 5], "x": 10.5, "y": 2.25},
+                {"matrix": [8, 4], "x": 11.5, "y": 2.125},
+                {"matrix": [8, 3], "x": 12.5, "y": 2},
+                {"matrix": [8, 2], "x": 13.5, "y": 2.125},
+                {"matrix": [8, 1], "x": 14.5, "y": 2.375},
+                {"matrix": [8, 0], "x": 15.5, "y": 2.375, "w": 1.5},
+                {"matrix": [9, 6], "x": 9.5, "y": 2.75, "h": 1.5},
+
+                {"matrix": [9, 5], "x": 10.5, "y": 3.25},
+                {"matrix": [9, 4], "x": 11.5, "y": 3.125},
+                {"matrix": [9, 3], "x": 12.5, "y": 3},
+                {"matrix": [9, 2], "x": 13.5, "y": 3.125},
+                {"matrix": [9, 1], "x": 14.5, "y": 3.375},
+                {"matrix": [9, 0], "x": 15.5, "y": 3.375, "w": 1.5},
+
+                {"matrix": [10, 4], "x": 11.5, "y": 4.125},
+                {"matrix": [10, 3], "x": 12.5, "y": 4},
+                {"matrix": [10, 2], "x": 13.5, "y": 4.125},
+                {"matrix": [10, 1], "x": 14.5, "y": 4.375},
+                {"matrix": [10, 0], "x": 15.5, "y": 4.375},
+
+                {"matrix": [11, 4], "x": 9, "y": 5},
+                {"matrix": [11, 3], "x": 10, "y": 5},
+
+                {"matrix": [11, 5], "x": 9, "y": 6},
+
+                {"matrix": [11, 2], "x": 9, "y": 7},
+
+                {"matrix": [11, 1], "x": 10, "y": 6, "h": 2},
+                {"matrix": [11, 0], "x": 11, "y": 6, "h": 2}
+            ]
+        },
+        "LAYOUT_ergodox_pretty": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0.375, "w": 1.5},
+                {"matrix": [0, 1], "x": 1.5, "y": 0.375},
+                {"matrix": [0, 2], "x": 2.5, "y": 0.125},
+                {"matrix": [0, 3], "x": 3.5, "y": 0},
+                {"matrix": [0, 4], "x": 4.5, "y": 0.125},
+                {"matrix": [0, 5], "x": 5.5, "y": 0.25},
+                {"matrix": [0, 6], "x": 6.5, "y": 0.25},
+
+                {"matrix": [6, 0], "x": 9.5, "y": 0.25},
+                {"matrix": [6, 1], "x": 10.5, "y": 0.25},
+                {"matrix": [6, 2], "x": 11.5, "y": 0.125},
+                {"matrix": [6, 3], "x": 12.5, "y": 0},
+                {"matrix": [6, 4], "x": 13.5, "y": 0.125},
+                {"matrix": [6, 5], "x": 14.5, "y": 0.375},
+                {"matrix": [6, 6], "x": 15.5, "y": 0.375, "w": 1.5},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.375, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1.375},
+                {"matrix": [1, 2], "x": 2.5, "y": 1.125},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1.125},
+                {"matrix": [1, 5], "x": 5.5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6.5, "y": 1.25, "h": 1.5},
+
+                {"matrix": [7, 0], "x": 9.5, "y": 1.25, "h": 1.5},
+                {"matrix": [7, 1], "x": 10.5, "y": 1.25},
+                {"matrix": [7, 2], "x": 11.5, "y": 1.125},
+                {"matrix": [7, 3], "x": 12.5, "y": 1},
+                {"matrix": [7, 4], "x": 13.5, "y": 1.125},
+                {"matrix": [7, 5], "x": 14.5, "y": 1.375},
+                {"matrix": [7, 6], "x": 15.5, "y": 1.375, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.375, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.375},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.125},
+                {"matrix": [2, 3], "x": 3.5, "y": 2},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.125},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+
+                {"matrix": [8, 0], "x": 10.5, "y": 2.25},
+                {"matrix": [8, 1], "x": 11.5, "y": 2.125},
+                {"matrix": [8, 2], "x": 12.5, "y": 2},
+                {"matrix": [8, 3], "x": 13.5, "y": 2.125},
+                {"matrix": [8, 4], "x": 14.5, "y": 2.375},
+                {"matrix": [8, 5], "x": 15.5, "y": 2.375, "w": 1.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.375, "w": 1.5},
+                {"matrix": [3, 1], "x": 1.5, "y": 3.375},
+                {"matrix": [3, 2], "x": 2.5, "y": 3.125},
+                {"matrix": [3, 3], "x": 3.5, "y": 3},
+                {"matrix": [3, 4], "x": 4.5, "y": 3.125},
+                {"matrix": [3, 5], "x": 5.5, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.5, "y": 2.75, "h": 1.5},
+
+                {"matrix": [9, 0], "x": 9.5, "y": 2.75, "h": 1.5},
+                {"matrix": [9, 1], "x": 10.5, "y": 3.25},
+                {"matrix": [9, 2], "x": 11.5, "y": 3.125},
+                {"matrix": [9, 3], "x": 12.5, "y": 3},
+                {"matrix": [9, 4], "x": 13.5, "y": 3.125},
+                {"matrix": [9, 5], "x": 14.5, "y": 3.375},
+                {"matrix": [9, 6], "x": 15.5, "y": 3.375, "w": 1.5},
+
+                {"matrix": [4, 0], "x": 0.5, "y": 4.375},
+                {"matrix": [4, 1], "x": 1.5, "y": 4.375},
+                {"matrix": [4, 2], "x": 2.5, "y": 4.125},
+                {"matrix": [4, 3], "x": 3.5, "y": 4},
+                {"matrix": [4, 4], "x": 4.5, "y": 4.125},
+
+                {"matrix": [10, 0], "x": 11.5, "y": 4.125},
+                {"matrix": [10, 1], "x": 12.5, "y": 4},
+                {"matrix": [10, 2], "x": 13.5, "y": 4.125},
+                {"matrix": [10, 3], "x": 14.5, "y": 4.375},
+                {"matrix": [10, 4], "x": 15.5, "y": 4.375},
+
+                {"matrix": [5, 3], "x": 6, "y": 5},
+                {"matrix": [5, 4], "x": 7, "y": 5},
+                {"matrix": [11, 4], "x": 9, "y": 5},
+                {"matrix": [11, 3], "x": 10, "y": 5},
+
+                {"matrix": [5, 5], "x": 7, "y": 6},
+                {"matrix": [11, 5], "x": 9, "y": 6},
+                {"matrix": [5, 0], "x": 5, "y": 6, "h": 2},
+                {"matrix": [5, 1], "x": 6, "y": 6, "h": 2},
+
+                {"matrix": [5, 2], "x": 7, "y": 7},
+                {"matrix": [11, 2], "x": 9, "y": 7},
+
+                {"matrix": [11, 1], "x": 10, "y": 6, "h": 2},
+                {"matrix": [11, 0], "x": 11, "y": 6, "h": 2}
+            ]
+        }
+    }
+}
diff --git a/keyboards/phoenix/rules.mk b/keyboards/phoenix/rules.mk
index 1e98eb214a5..c6e29883213 100644
--- a/keyboards/phoenix/rules.mk
+++ b/keyboards/phoenix/rules.mk
@@ -1,17 +1 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-STENO_ENABLE = no
 SERIAL_DRIVER = usart
-KEYBOARD_SHARED_EP = yes
-
-OPT_DEFS += -DSTM32_DMA_REQUIRED=TRUE
diff --git a/keyboards/pica40/rev2/info.json b/keyboards/pica40/rev2/keyboard.json
similarity index 100%
rename from keyboards/pica40/rev2/info.json
rename to keyboards/pica40/rev2/keyboard.json
diff --git a/keyboards/pierce/info.json b/keyboards/pierce/info.json
deleted file mode 100644
index 971b9939cf7..00000000000
--- a/keyboards/pierce/info.json
+++ /dev/null
@@ -1,63 +0,0 @@
-{
-    "keyboard_name": "pierce",
-    "manufacturer": "durken",
-    "url": "https://github.com/durken1/pierce",
-    "maintainer": "durken1",
-    "usb": {
-        "vid": "0x6431",
-        "pid": "0x6060",
-        "device_version": "0.0.1"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "community_layouts": ["split_3x5_3"],
-    "layouts": {
-        "LAYOUT_split_3x5_3": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0.5},
-                {"matrix": [0, 1], "x": 1, "y": 0.13},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0.13},
-                {"matrix": [0, 4], "x": 4, "y": 0.25},
-
-                {"matrix": [0, 5], "x": 7, "y": 0.25},
-                {"matrix": [0, 6], "x": 8, "y": 0.13},
-                {"matrix": [0, 7], "x": 9, "y": 0},
-                {"matrix": [0, 8], "x": 10, "y": 0.13},
-                {"matrix": [0, 9], "x": 11, "y": 0.5},
-
-                {"matrix": [1, 0], "x": 0, "y": 1.5},
-                {"matrix": [1, 1], "x": 1, "y": 1.13},
-                {"matrix": [1, 2], "x": 2, "y": 1},
-                {"matrix": [1, 3], "x": 3, "y": 1.13},
-                {"matrix": [1, 4], "x": 4, "y": 1.25},
-
-                {"matrix": [1, 5], "x": 7, "y": 1.25},
-                {"matrix": [1, 6], "x": 8, "y": 1.13},
-                {"matrix": [1, 7], "x": 9, "y": 1},
-                {"matrix": [1, 8], "x": 10, "y": 1.13},
-                {"matrix": [1, 9], "x": 11, "y": 1.5},
-
-                {"matrix": [2, 0], "x": 0, "y": 2.5},
-                {"matrix": [2, 1], "x": 1, "y": 2.13},
-                {"matrix": [2, 2], "x": 2, "y": 2},
-                {"matrix": [2, 3], "x": 3, "y": 2.13},
-                {"matrix": [2, 4], "x": 4, "y": 2.25},
-
-                {"matrix": [2, 5], "x": 7, "y": 2.25},
-                {"matrix": [2, 6], "x": 8, "y": 2.13},
-                {"matrix": [2, 7], "x": 9, "y": 2},
-                {"matrix": [2, 8], "x": 10, "y": 2.13},
-                {"matrix": [2, 9], "x": 11, "y": 2.5},
-
-                {"matrix": [3, 2], "x": 2.5, "y": 3.16},
-                {"matrix": [3, 3], "x": 3.5, "y": 3.5},
-                {"matrix": [3, 4], "x": 4.5, "y": 3.75},
-
-                {"matrix": [3, 5], "x": 6.5, "y": 3.75},
-                {"matrix": [3, 6], "x": 7.5, "y": 3.5},
-                {"matrix": [3, 7], "x": 8.5, "y": 3.16}
-            ]
-        }
-    }
-}
diff --git a/keyboards/pierce/keyboard.json b/keyboards/pierce/keyboard.json
new file mode 100644
index 00000000000..ca6bb484251
--- /dev/null
+++ b/keyboards/pierce/keyboard.json
@@ -0,0 +1,69 @@
+{
+    "keyboard_name": "pierce",
+    "manufacturer": "durken",
+    "url": "https://github.com/durken1/pierce",
+    "maintainer": "durken1",
+    "usb": {
+        "vid": "0x6431",
+        "pid": "0x6060",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "community_layouts": ["split_3x5_3"],
+    "layouts": {
+        "LAYOUT_split_3x5_3": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0.5},
+                {"matrix": [0, 1], "x": 1, "y": 0.13},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0.13},
+                {"matrix": [0, 4], "x": 4, "y": 0.25},
+
+                {"matrix": [0, 5], "x": 7, "y": 0.25},
+                {"matrix": [0, 6], "x": 8, "y": 0.13},
+                {"matrix": [0, 7], "x": 9, "y": 0},
+                {"matrix": [0, 8], "x": 10, "y": 0.13},
+                {"matrix": [0, 9], "x": 11, "y": 0.5},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.13},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1.13},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+
+                {"matrix": [1, 5], "x": 7, "y": 1.25},
+                {"matrix": [1, 6], "x": 8, "y": 1.13},
+                {"matrix": [1, 7], "x": 9, "y": 1},
+                {"matrix": [1, 8], "x": 10, "y": 1.13},
+                {"matrix": [1, 9], "x": 11, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.5},
+                {"matrix": [2, 1], "x": 1, "y": 2.13},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2.13},
+                {"matrix": [2, 4], "x": 4, "y": 2.25},
+
+                {"matrix": [2, 5], "x": 7, "y": 2.25},
+                {"matrix": [2, 6], "x": 8, "y": 2.13},
+                {"matrix": [2, 7], "x": 9, "y": 2},
+                {"matrix": [2, 8], "x": 10, "y": 2.13},
+                {"matrix": [2, 9], "x": 11, "y": 2.5},
+
+                {"matrix": [3, 2], "x": 2.5, "y": 3.16},
+                {"matrix": [3, 3], "x": 3.5, "y": 3.5},
+                {"matrix": [3, 4], "x": 4.5, "y": 3.75},
+
+                {"matrix": [3, 5], "x": 6.5, "y": 3.75},
+                {"matrix": [3, 6], "x": 7.5, "y": 3.5},
+                {"matrix": [3, 7], "x": 8.5, "y": 3.16}
+            ]
+        }
+    }
+}
diff --git a/keyboards/pierce/rules.mk b/keyboards/pierce/rules.mk
index 660bba3c3fd..721c8fd9036 100644
--- a/keyboards/pierce/rules.mk
+++ b/keyboards/pierce/rules.mk
@@ -1,16 +1,3 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
 CUSTOM_MATRIX = lite
 SRC += matrix.c
 QUANTUM_LIB_SRC += i2c_slave.c
diff --git a/keyboards/pinky/info.json b/keyboards/pinky/info.json
index 2b9790e84e6..7fb7f9efe6c 100644
--- a/keyboards/pinky/info.json
+++ b/keyboards/pinky/info.json
@@ -1,4 +1,10 @@
 {
+    "features": {
+        "bootmagic": false,
+        "extrakey": false,
+        "mousekey": false,
+        "nkro": false
+    },
     "split": {
         "enabled": true
     }
diff --git a/keyboards/pinky/rules.mk b/keyboards/pinky/rules.mk
index 0329fc8dd57..89b708f68f7 100644
--- a/keyboards/pinky/rules.mk
+++ b/keyboards/pinky/rules.mk
@@ -1,14 +1 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = no        # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
 DEFAULT_FOLDER = pinky/3
diff --git a/keyboards/pizzakeyboards/slice65/info.json b/keyboards/pizzakeyboards/slice65/keyboard.json
similarity index 100%
rename from keyboards/pizzakeyboards/slice65/info.json
rename to keyboards/pizzakeyboards/slice65/keyboard.json
diff --git a/keyboards/planck/ez/glow/info.json b/keyboards/planck/ez/glow/info.json
deleted file mode 100644
index 48522585709..00000000000
--- a/keyboards/planck/ez/glow/info.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "keyboard_name": "Planck EZ Glow",
-    "usb": {
-        "pid": "0xC6CF"
-    }
-}
diff --git a/keyboards/planck/ez/glow/keyboard.json b/keyboards/planck/ez/glow/keyboard.json
new file mode 100644
index 00000000000..6c957b165b0
--- /dev/null
+++ b/keyboards/planck/ez/glow/keyboard.json
@@ -0,0 +1,9 @@
+{
+    "keyboard_name": "Planck EZ Glow",
+    "usb": {
+        "pid": "0xC6CF"
+    },
+    "features": {
+        "rgb_matrix": true
+    }
+}
diff --git a/keyboards/planck/ez/glow/rules.mk b/keyboards/planck/ez/glow/rules.mk
deleted file mode 100644
index aad92997d0f..00000000000
--- a/keyboards/planck/ez/glow/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-RGB_MATRIX_ENABLE = yes
diff --git a/keyboards/planck/ez/info.json b/keyboards/planck/ez/info.json
index 044e187c4bc..f7b2a8f8a1f 100644
--- a/keyboards/planck/ez/info.json
+++ b/keyboards/planck/ez/info.json
@@ -4,7 +4,20 @@
   "maintainer": "jackhumbert",
   "usb": {
     "vid": "0x3297",
-    "device_version": "0.0.1"
+    "device_version": "0.0.1",
+    "shared_endpoint": {
+      "mouse": false
+    }
+  },
+  "features": {
+    "audio": true,
+    "bootmagic": true,
+    "command": true,
+    "console": true,
+    "encoder": true,
+    "extrakey": true,
+    "mousekey": true,
+    "nkro": true
   },
   "rgb_matrix": {
     "animations": {
@@ -62,6 +75,9 @@
     "rows": ["A10", "A9", "A8", "B15", "C13", "C14", "C15", "A2"]
   },
   "diode_direction": "COL2ROW",
+  "audio": {
+    "driver": "dac_additive"
+  },
   "encoder": {
     "rotary": [
       {"pin_a": "B12", "pin_b": "B13"}
diff --git a/keyboards/planck/ez/rules.mk b/keyboards/planck/ez/rules.mk
index 9d3db5cdb72..ef20f95b652 100644
--- a/keyboards/planck/ez/rules.mk
+++ b/keyboards/planck/ez/rules.mk
@@ -1,23 +1,4 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = yes        # Console for debug
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-AUDIO_ENABLE = yes          # Audio output
-AUDIO_DRIVER = dac_additive
-RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight.
-
-ENCODER_ENABLE = yes
-
-RGB_MATRIX_SUPPORTED = yes
 RGBLIGHT_SUPPORTED = no
 BAKCLIGHT_SUPPORTED = no
 
-MOUSE_SHARED_EP = no
-
 DEFAULT_FOLDER = planck/ez/base
diff --git a/keyboards/planck/rev6_drop/info.json b/keyboards/planck/rev6_drop/info.json
deleted file mode 100644
index aff2eef5d72..00000000000
--- a/keyboards/planck/rev6_drop/info.json
+++ /dev/null
@@ -1,315 +0,0 @@
-{
-  "keyboard_name": "Planck",
-  "manufacturer": "Drop",
-  "url": "https://olkb.com/planck",
-  "maintainer": "jackhumbert",
-  "usb": {
-    "vid": "0x03A8",
-    "pid": "0xA4F9",
-    "device_version": "0.0.6"
-  },
-  "rgblight": {
-    "led_count": 9
-  },
-  "ws2812": {
-    "pin": "A1",
-    "driver": "pwm"
-  },
-  "rgb_matrix": {
-    "driver": "ws2812",
-    "sleep": true
-  },
-  "matrix_pins": {
-    "cols": ["B11", "B10", "B2", "B1", "A7", "B0"],
-    "rows": ["A10", "A9", "A8", "B15", "C13", "C14", "C15", "A2"]
-  },
-  "diode_direction": "COL2ROW",
-  "dip_switch": {
-    "pins": ["B14", "A15", "A0", "B9"]
-  },
-  "encoder": {
-    "rotary": [
-      {"pin_a": "B12", "pin_b": "B13"}
-    ]
-  },
-  "processor": "STM32F303",
-  "bootloader": "stm32-dfu",
-  "community_layouts": ["ortho_4x12", "planck_mit"],
-  "layout_aliases": {
-    "LAYOUT": "LAYOUT_ortho_4x12",
-    "LAYOUT_planck_grid": "LAYOUT_ortho_4x12",
-    "LAYOUT_planck_mit": "LAYOUT_planck_1x2uC"
-  },
-  "layouts": {
-    "LAYOUT_ortho_4x12": {
-      "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": [4, 0], "x": 6, "y": 0},
-        {"matrix": [4, 1], "x": 7, "y": 0},
-        {"matrix": [4, 2], "x": 8, "y": 0},
-        {"matrix": [4, 3], "x": 9, "y": 0},
-        {"matrix": [4, 4], "x": 10, "y": 0},
-        {"matrix": [4, 5], "x": 11, "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": [1, 4], "x": 4, "y": 1},
-        {"matrix": [1, 5], "x": 5, "y": 1},
-        {"matrix": [5, 0], "x": 6, "y": 1},
-        {"matrix": [5, 1], "x": 7, "y": 1},
-        {"matrix": [5, 2], "x": 8, "y": 1},
-        {"matrix": [5, 3], "x": 9, "y": 1},
-        {"matrix": [5, 4], "x": 10, "y": 1},
-        {"matrix": [5, 5], "x": 11, "y": 1},
-
-        {"matrix": [2, 0], "x": 0, "y": 2},
-        {"matrix": [2, 1], "x": 1, "y": 2},
-        {"matrix": [2, 2], "x": 2, "y": 2},
-        {"matrix": [2, 3], "x": 3, "y": 2},
-        {"matrix": [2, 4], "x": 4, "y": 2},
-        {"matrix": [2, 5], "x": 5, "y": 2},
-        {"matrix": [6, 0], "x": 6, "y": 2},
-        {"matrix": [6, 1], "x": 7, "y": 2},
-        {"matrix": [6, 2], "x": 8, "y": 2},
-        {"matrix": [6, 3], "x": 9, "y": 2},
-        {"matrix": [6, 4], "x": 10, "y": 2},
-        {"matrix": [6, 5], "x": 11, "y": 2},
-
-        {"matrix": [3, 0], "x": 0, "y": 3},
-        {"matrix": [3, 1], "x": 1, "y": 3},
-        {"matrix": [3, 2], "x": 2, "y": 3},
-        {"matrix": [7, 3], "x": 3, "y": 3},
-        {"matrix": [7, 4], "x": 4, "y": 3},
-        {"matrix": [7, 5], "x": 5, "y": 3},
-        {"matrix": [7, 0], "x": 6, "y": 3},
-        {"matrix": [7, 1], "x": 7, "y": 3},
-        {"matrix": [7, 2], "x": 8, "y": 3},
-        {"matrix": [3, 3], "x": 9, "y": 3},
-        {"matrix": [3, 4], "x": 10, "y": 3},
-        {"matrix": [3, 5], "x": 11, "y": 3}
-      ]
-    },
-    "LAYOUT_planck_1x2uC": {
-      "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": [4, 0], "x": 6, "y": 0},
-        {"matrix": [4, 1], "x": 7, "y": 0},
-        {"matrix": [4, 2], "x": 8, "y": 0},
-        {"matrix": [4, 3], "x": 9, "y": 0},
-        {"matrix": [4, 4], "x": 10, "y": 0},
-        {"matrix": [4, 5], "x": 11, "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": [1, 4], "x": 4, "y": 1},
-        {"matrix": [1, 5], "x": 5, "y": 1},
-        {"matrix": [5, 0], "x": 6, "y": 1},
-        {"matrix": [5, 1], "x": 7, "y": 1},
-        {"matrix": [5, 2], "x": 8, "y": 1},
-        {"matrix": [5, 3], "x": 9, "y": 1},
-        {"matrix": [5, 4], "x": 10, "y": 1},
-        {"matrix": [5, 5], "x": 11, "y": 1},
-
-        {"matrix": [2, 0], "x": 0, "y": 2},
-        {"matrix": [2, 1], "x": 1, "y": 2},
-        {"matrix": [2, 2], "x": 2, "y": 2},
-        {"matrix": [2, 3], "x": 3, "y": 2},
-        {"matrix": [2, 4], "x": 4, "y": 2},
-        {"matrix": [2, 5], "x": 5, "y": 2},
-        {"matrix": [6, 0], "x": 6, "y": 2},
-        {"matrix": [6, 1], "x": 7, "y": 2},
-        {"matrix": [6, 2], "x": 8, "y": 2},
-        {"matrix": [6, 3], "x": 9, "y": 2},
-        {"matrix": [6, 4], "x": 10, "y": 2},
-        {"matrix": [6, 5], "x": 11, "y": 2},
-
-        {"matrix": [3, 0], "x": 0, "y": 3},
-        {"matrix": [3, 1], "x": 1, "y": 3},
-        {"matrix": [3, 2], "x": 2, "y": 3},
-        {"matrix": [7, 3], "x": 3, "y": 3},
-        {"matrix": [7, 4], "x": 4, "y": 3},
-        {"matrix": [7, 0], "x": 5, "y": 3, "w": 2},
-        {"matrix": [7, 1], "x": 7, "y": 3},
-        {"matrix": [7, 2], "x": 8, "y": 3},
-        {"matrix": [3, 3], "x": 9, "y": 3},
-        {"matrix": [3, 4], "x": 10, "y": 3},
-        {"matrix": [3, 5], "x": 11, "y": 3}
-      ]
-    },
-    "LAYOUT_planck_1x2uL": {
-      "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": [4, 0], "x": 6, "y": 0},
-        {"matrix": [4, 1], "x": 7, "y": 0},
-        {"matrix": [4, 2], "x": 8, "y": 0},
-        {"matrix": [4, 3], "x": 9, "y": 0},
-        {"matrix": [4, 4], "x": 10, "y": 0},
-        {"matrix": [4, 5], "x": 11, "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": [1, 4], "x": 4, "y": 1},
-        {"matrix": [1, 5], "x": 5, "y": 1},
-        {"matrix": [5, 0], "x": 6, "y": 1},
-        {"matrix": [5, 1], "x": 7, "y": 1},
-        {"matrix": [5, 2], "x": 8, "y": 1},
-        {"matrix": [5, 3], "x": 9, "y": 1},
-        {"matrix": [5, 4], "x": 10, "y": 1},
-        {"matrix": [5, 5], "x": 11, "y": 1},
-
-        {"matrix": [2, 0], "x": 0, "y": 2},
-        {"matrix": [2, 1], "x": 1, "y": 2},
-        {"matrix": [2, 2], "x": 2, "y": 2},
-        {"matrix": [2, 3], "x": 3, "y": 2},
-        {"matrix": [2, 4], "x": 4, "y": 2},
-        {"matrix": [2, 5], "x": 5, "y": 2},
-        {"matrix": [6, 0], "x": 6, "y": 2},
-        {"matrix": [6, 1], "x": 7, "y": 2},
-        {"matrix": [6, 2], "x": 8, "y": 2},
-        {"matrix": [6, 3], "x": 9, "y": 2},
-        {"matrix": [6, 4], "x": 10, "y": 2},
-        {"matrix": [6, 5], "x": 11, "y": 2},
-
-        {"matrix": [3, 0], "x": 0, "y": 3},
-        {"matrix": [3, 1], "x": 1, "y": 3},
-        {"matrix": [3, 2], "x": 2, "y": 3},
-        {"matrix": [7, 3], "x": 3, "y": 3},
-        {"matrix": [7, 5], "x": 4, "y": 3, "w": 2},
-        {"matrix": [7, 0], "x": 6, "y": 3},
-        {"matrix": [7, 1], "x": 7, "y": 3},
-        {"matrix": [7, 2], "x": 8, "y": 3},
-        {"matrix": [3, 3], "x": 9, "y": 3},
-        {"matrix": [3, 4], "x": 10, "y": 3},
-        {"matrix": [3, 5], "x": 11, "y": 3}
-      ]
-    },
-    "LAYOUT_planck_1x2uR": {
-      "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": [4, 0], "x": 6, "y": 0},
-        {"matrix": [4, 1], "x": 7, "y": 0},
-        {"matrix": [4, 2], "x": 8, "y": 0},
-        {"matrix": [4, 3], "x": 9, "y": 0},
-        {"matrix": [4, 4], "x": 10, "y": 0},
-        {"matrix": [4, 5], "x": 11, "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": [1, 4], "x": 4, "y": 1},
-        {"matrix": [1, 5], "x": 5, "y": 1},
-        {"matrix": [5, 0], "x": 6, "y": 1},
-        {"matrix": [5, 1], "x": 7, "y": 1},
-        {"matrix": [5, 2], "x": 8, "y": 1},
-        {"matrix": [5, 3], "x": 9, "y": 1},
-        {"matrix": [5, 4], "x": 10, "y": 1},
-        {"matrix": [5, 5], "x": 11, "y": 1},
-
-        {"matrix": [2, 0], "x": 0, "y": 2},
-        {"matrix": [2, 1], "x": 1, "y": 2},
-        {"matrix": [2, 2], "x": 2, "y": 2},
-        {"matrix": [2, 3], "x": 3, "y": 2},
-        {"matrix": [2, 4], "x": 4, "y": 2},
-        {"matrix": [2, 5], "x": 5, "y": 2},
-        {"matrix": [6, 0], "x": 6, "y": 2},
-        {"matrix": [6, 1], "x": 7, "y": 2},
-        {"matrix": [6, 2], "x": 8, "y": 2},
-        {"matrix": [6, 3], "x": 9, "y": 2},
-        {"matrix": [6, 4], "x": 10, "y": 2},
-        {"matrix": [6, 5], "x": 11, "y": 2},
-
-        {"matrix": [3, 0], "x": 0, "y": 3},
-        {"matrix": [3, 1], "x": 1, "y": 3},
-        {"matrix": [3, 2], "x": 2, "y": 3},
-        {"matrix": [7, 3], "x": 3, "y": 3},
-        {"matrix": [7, 4], "x": 4, "y": 3},
-        {"matrix": [7, 5], "x": 5, "y": 3},
-        {"matrix": [7, 1], "x": 6, "y": 3, "w": 2},
-        {"matrix": [7, 2], "x": 8, "y": 3},
-        {"matrix": [3, 3], "x": 9, "y": 3},
-        {"matrix": [3, 4], "x": 10, "y": 3},
-        {"matrix": [3, 5], "x": 11, "y": 3}
-      ]
-    },
-    "LAYOUT_planck_2x2u": {
-      "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": [4, 0], "x": 6, "y": 0},
-        {"matrix": [4, 1], "x": 7, "y": 0},
-        {"matrix": [4, 2], "x": 8, "y": 0},
-        {"matrix": [4, 3], "x": 9, "y": 0},
-        {"matrix": [4, 4], "x": 10, "y": 0},
-        {"matrix": [4, 5], "x": 11, "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": [1, 4], "x": 4, "y": 1},
-        {"matrix": [1, 5], "x": 5, "y": 1},
-        {"matrix": [5, 0], "x": 6, "y": 1},
-        {"matrix": [5, 1], "x": 7, "y": 1},
-        {"matrix": [5, 2], "x": 8, "y": 1},
-        {"matrix": [5, 3], "x": 9, "y": 1},
-        {"matrix": [5, 4], "x": 10, "y": 1},
-        {"matrix": [5, 5], "x": 11, "y": 1},
-
-        {"matrix": [2, 0], "x": 0, "y": 2},
-        {"matrix": [2, 1], "x": 1, "y": 2},
-        {"matrix": [2, 2], "x": 2, "y": 2},
-        {"matrix": [2, 3], "x": 3, "y": 2},
-        {"matrix": [2, 4], "x": 4, "y": 2},
-        {"matrix": [2, 5], "x": 5, "y": 2},
-        {"matrix": [6, 0], "x": 6, "y": 2},
-        {"matrix": [6, 1], "x": 7, "y": 2},
-        {"matrix": [6, 2], "x": 8, "y": 2},
-        {"matrix": [6, 3], "x": 9, "y": 2},
-        {"matrix": [6, 4], "x": 10, "y": 2},
-        {"matrix": [6, 5], "x": 11, "y": 2},
-
-        {"matrix": [3, 0], "x": 0, "y": 3},
-        {"matrix": [3, 1], "x": 1, "y": 3},
-        {"matrix": [3, 2], "x": 2, "y": 3},
-        {"matrix": [7, 3], "x": 3, "y": 3},
-        {"matrix": [7, 5], "x": 4, "y": 3, "w": 2},
-        {"matrix": [7, 1], "x": 6, "y": 3, "w": 2},
-        {"matrix": [7, 2], "x": 8, "y": 3},
-        {"matrix": [3, 3], "x": 9, "y": 3},
-        {"matrix": [3, 4], "x": 10, "y": 3},
-        {"matrix": [3, 5], "x": 11, "y": 3}
-      ]
-    }
-  }
-}
diff --git a/keyboards/planck/rev6_drop/keyboard.json b/keyboards/planck/rev6_drop/keyboard.json
new file mode 100644
index 00000000000..ff301f8c860
--- /dev/null
+++ b/keyboards/planck/rev6_drop/keyboard.json
@@ -0,0 +1,327 @@
+{
+  "keyboard_name": "Planck",
+  "manufacturer": "Drop",
+  "url": "https://olkb.com/planck",
+  "maintainer": "jackhumbert",
+  "usb": {
+    "vid": "0x03A8",
+    "pid": "0xA4F9",
+    "device_version": "0.0.6"
+  },
+  "features": {
+    "audio": true,
+    "bootmagic": true,
+    "command": true,
+    "console": true,
+    "dip_switch": true,
+    "encoder": true,
+    "extrakey": true,
+    "mousekey": true,
+    "nkro": true,
+    "rgblight": true
+  },
+  "rgblight": {
+    "led_count": 9
+  },
+  "ws2812": {
+    "pin": "A1",
+    "driver": "pwm"
+  },
+  "rgb_matrix": {
+    "driver": "ws2812",
+    "sleep": true
+  },
+  "matrix_pins": {
+    "cols": ["B11", "B10", "B2", "B1", "A7", "B0"],
+    "rows": ["A10", "A9", "A8", "B15", "C13", "C14", "C15", "A2"]
+  },
+  "diode_direction": "COL2ROW",
+  "dip_switch": {
+    "pins": ["B14", "A15", "A0", "B9"]
+  },
+  "encoder": {
+    "rotary": [
+      {"pin_a": "B12", "pin_b": "B13"}
+    ]
+  },
+  "processor": "STM32F303",
+  "bootloader": "stm32-dfu",
+  "community_layouts": ["ortho_4x12", "planck_mit"],
+  "layout_aliases": {
+    "LAYOUT": "LAYOUT_ortho_4x12",
+    "LAYOUT_planck_grid": "LAYOUT_ortho_4x12",
+    "LAYOUT_planck_mit": "LAYOUT_planck_1x2uC"
+  },
+  "layouts": {
+    "LAYOUT_ortho_4x12": {
+      "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": [4, 0], "x": 6, "y": 0},
+        {"matrix": [4, 1], "x": 7, "y": 0},
+        {"matrix": [4, 2], "x": 8, "y": 0},
+        {"matrix": [4, 3], "x": 9, "y": 0},
+        {"matrix": [4, 4], "x": 10, "y": 0},
+        {"matrix": [4, 5], "x": 11, "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": [1, 4], "x": 4, "y": 1},
+        {"matrix": [1, 5], "x": 5, "y": 1},
+        {"matrix": [5, 0], "x": 6, "y": 1},
+        {"matrix": [5, 1], "x": 7, "y": 1},
+        {"matrix": [5, 2], "x": 8, "y": 1},
+        {"matrix": [5, 3], "x": 9, "y": 1},
+        {"matrix": [5, 4], "x": 10, "y": 1},
+        {"matrix": [5, 5], "x": 11, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2},
+        {"matrix": [2, 1], "x": 1, "y": 2},
+        {"matrix": [2, 2], "x": 2, "y": 2},
+        {"matrix": [2, 3], "x": 3, "y": 2},
+        {"matrix": [2, 4], "x": 4, "y": 2},
+        {"matrix": [2, 5], "x": 5, "y": 2},
+        {"matrix": [6, 0], "x": 6, "y": 2},
+        {"matrix": [6, 1], "x": 7, "y": 2},
+        {"matrix": [6, 2], "x": 8, "y": 2},
+        {"matrix": [6, 3], "x": 9, "y": 2},
+        {"matrix": [6, 4], "x": 10, "y": 2},
+        {"matrix": [6, 5], "x": 11, "y": 2},
+
+        {"matrix": [3, 0], "x": 0, "y": 3},
+        {"matrix": [3, 1], "x": 1, "y": 3},
+        {"matrix": [3, 2], "x": 2, "y": 3},
+        {"matrix": [7, 3], "x": 3, "y": 3},
+        {"matrix": [7, 4], "x": 4, "y": 3},
+        {"matrix": [7, 5], "x": 5, "y": 3},
+        {"matrix": [7, 0], "x": 6, "y": 3},
+        {"matrix": [7, 1], "x": 7, "y": 3},
+        {"matrix": [7, 2], "x": 8, "y": 3},
+        {"matrix": [3, 3], "x": 9, "y": 3},
+        {"matrix": [3, 4], "x": 10, "y": 3},
+        {"matrix": [3, 5], "x": 11, "y": 3}
+      ]
+    },
+    "LAYOUT_planck_1x2uC": {
+      "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": [4, 0], "x": 6, "y": 0},
+        {"matrix": [4, 1], "x": 7, "y": 0},
+        {"matrix": [4, 2], "x": 8, "y": 0},
+        {"matrix": [4, 3], "x": 9, "y": 0},
+        {"matrix": [4, 4], "x": 10, "y": 0},
+        {"matrix": [4, 5], "x": 11, "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": [1, 4], "x": 4, "y": 1},
+        {"matrix": [1, 5], "x": 5, "y": 1},
+        {"matrix": [5, 0], "x": 6, "y": 1},
+        {"matrix": [5, 1], "x": 7, "y": 1},
+        {"matrix": [5, 2], "x": 8, "y": 1},
+        {"matrix": [5, 3], "x": 9, "y": 1},
+        {"matrix": [5, 4], "x": 10, "y": 1},
+        {"matrix": [5, 5], "x": 11, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2},
+        {"matrix": [2, 1], "x": 1, "y": 2},
+        {"matrix": [2, 2], "x": 2, "y": 2},
+        {"matrix": [2, 3], "x": 3, "y": 2},
+        {"matrix": [2, 4], "x": 4, "y": 2},
+        {"matrix": [2, 5], "x": 5, "y": 2},
+        {"matrix": [6, 0], "x": 6, "y": 2},
+        {"matrix": [6, 1], "x": 7, "y": 2},
+        {"matrix": [6, 2], "x": 8, "y": 2},
+        {"matrix": [6, 3], "x": 9, "y": 2},
+        {"matrix": [6, 4], "x": 10, "y": 2},
+        {"matrix": [6, 5], "x": 11, "y": 2},
+
+        {"matrix": [3, 0], "x": 0, "y": 3},
+        {"matrix": [3, 1], "x": 1, "y": 3},
+        {"matrix": [3, 2], "x": 2, "y": 3},
+        {"matrix": [7, 3], "x": 3, "y": 3},
+        {"matrix": [7, 4], "x": 4, "y": 3},
+        {"matrix": [7, 0], "x": 5, "y": 3, "w": 2},
+        {"matrix": [7, 1], "x": 7, "y": 3},
+        {"matrix": [7, 2], "x": 8, "y": 3},
+        {"matrix": [3, 3], "x": 9, "y": 3},
+        {"matrix": [3, 4], "x": 10, "y": 3},
+        {"matrix": [3, 5], "x": 11, "y": 3}
+      ]
+    },
+    "LAYOUT_planck_1x2uL": {
+      "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": [4, 0], "x": 6, "y": 0},
+        {"matrix": [4, 1], "x": 7, "y": 0},
+        {"matrix": [4, 2], "x": 8, "y": 0},
+        {"matrix": [4, 3], "x": 9, "y": 0},
+        {"matrix": [4, 4], "x": 10, "y": 0},
+        {"matrix": [4, 5], "x": 11, "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": [1, 4], "x": 4, "y": 1},
+        {"matrix": [1, 5], "x": 5, "y": 1},
+        {"matrix": [5, 0], "x": 6, "y": 1},
+        {"matrix": [5, 1], "x": 7, "y": 1},
+        {"matrix": [5, 2], "x": 8, "y": 1},
+        {"matrix": [5, 3], "x": 9, "y": 1},
+        {"matrix": [5, 4], "x": 10, "y": 1},
+        {"matrix": [5, 5], "x": 11, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2},
+        {"matrix": [2, 1], "x": 1, "y": 2},
+        {"matrix": [2, 2], "x": 2, "y": 2},
+        {"matrix": [2, 3], "x": 3, "y": 2},
+        {"matrix": [2, 4], "x": 4, "y": 2},
+        {"matrix": [2, 5], "x": 5, "y": 2},
+        {"matrix": [6, 0], "x": 6, "y": 2},
+        {"matrix": [6, 1], "x": 7, "y": 2},
+        {"matrix": [6, 2], "x": 8, "y": 2},
+        {"matrix": [6, 3], "x": 9, "y": 2},
+        {"matrix": [6, 4], "x": 10, "y": 2},
+        {"matrix": [6, 5], "x": 11, "y": 2},
+
+        {"matrix": [3, 0], "x": 0, "y": 3},
+        {"matrix": [3, 1], "x": 1, "y": 3},
+        {"matrix": [3, 2], "x": 2, "y": 3},
+        {"matrix": [7, 3], "x": 3, "y": 3},
+        {"matrix": [7, 5], "x": 4, "y": 3, "w": 2},
+        {"matrix": [7, 0], "x": 6, "y": 3},
+        {"matrix": [7, 1], "x": 7, "y": 3},
+        {"matrix": [7, 2], "x": 8, "y": 3},
+        {"matrix": [3, 3], "x": 9, "y": 3},
+        {"matrix": [3, 4], "x": 10, "y": 3},
+        {"matrix": [3, 5], "x": 11, "y": 3}
+      ]
+    },
+    "LAYOUT_planck_1x2uR": {
+      "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": [4, 0], "x": 6, "y": 0},
+        {"matrix": [4, 1], "x": 7, "y": 0},
+        {"matrix": [4, 2], "x": 8, "y": 0},
+        {"matrix": [4, 3], "x": 9, "y": 0},
+        {"matrix": [4, 4], "x": 10, "y": 0},
+        {"matrix": [4, 5], "x": 11, "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": [1, 4], "x": 4, "y": 1},
+        {"matrix": [1, 5], "x": 5, "y": 1},
+        {"matrix": [5, 0], "x": 6, "y": 1},
+        {"matrix": [5, 1], "x": 7, "y": 1},
+        {"matrix": [5, 2], "x": 8, "y": 1},
+        {"matrix": [5, 3], "x": 9, "y": 1},
+        {"matrix": [5, 4], "x": 10, "y": 1},
+        {"matrix": [5, 5], "x": 11, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2},
+        {"matrix": [2, 1], "x": 1, "y": 2},
+        {"matrix": [2, 2], "x": 2, "y": 2},
+        {"matrix": [2, 3], "x": 3, "y": 2},
+        {"matrix": [2, 4], "x": 4, "y": 2},
+        {"matrix": [2, 5], "x": 5, "y": 2},
+        {"matrix": [6, 0], "x": 6, "y": 2},
+        {"matrix": [6, 1], "x": 7, "y": 2},
+        {"matrix": [6, 2], "x": 8, "y": 2},
+        {"matrix": [6, 3], "x": 9, "y": 2},
+        {"matrix": [6, 4], "x": 10, "y": 2},
+        {"matrix": [6, 5], "x": 11, "y": 2},
+
+        {"matrix": [3, 0], "x": 0, "y": 3},
+        {"matrix": [3, 1], "x": 1, "y": 3},
+        {"matrix": [3, 2], "x": 2, "y": 3},
+        {"matrix": [7, 3], "x": 3, "y": 3},
+        {"matrix": [7, 4], "x": 4, "y": 3},
+        {"matrix": [7, 5], "x": 5, "y": 3},
+        {"matrix": [7, 1], "x": 6, "y": 3, "w": 2},
+        {"matrix": [7, 2], "x": 8, "y": 3},
+        {"matrix": [3, 3], "x": 9, "y": 3},
+        {"matrix": [3, 4], "x": 10, "y": 3},
+        {"matrix": [3, 5], "x": 11, "y": 3}
+      ]
+    },
+    "LAYOUT_planck_2x2u": {
+      "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": [4, 0], "x": 6, "y": 0},
+        {"matrix": [4, 1], "x": 7, "y": 0},
+        {"matrix": [4, 2], "x": 8, "y": 0},
+        {"matrix": [4, 3], "x": 9, "y": 0},
+        {"matrix": [4, 4], "x": 10, "y": 0},
+        {"matrix": [4, 5], "x": 11, "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": [1, 4], "x": 4, "y": 1},
+        {"matrix": [1, 5], "x": 5, "y": 1},
+        {"matrix": [5, 0], "x": 6, "y": 1},
+        {"matrix": [5, 1], "x": 7, "y": 1},
+        {"matrix": [5, 2], "x": 8, "y": 1},
+        {"matrix": [5, 3], "x": 9, "y": 1},
+        {"matrix": [5, 4], "x": 10, "y": 1},
+        {"matrix": [5, 5], "x": 11, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2},
+        {"matrix": [2, 1], "x": 1, "y": 2},
+        {"matrix": [2, 2], "x": 2, "y": 2},
+        {"matrix": [2, 3], "x": 3, "y": 2},
+        {"matrix": [2, 4], "x": 4, "y": 2},
+        {"matrix": [2, 5], "x": 5, "y": 2},
+        {"matrix": [6, 0], "x": 6, "y": 2},
+        {"matrix": [6, 1], "x": 7, "y": 2},
+        {"matrix": [6, 2], "x": 8, "y": 2},
+        {"matrix": [6, 3], "x": 9, "y": 2},
+        {"matrix": [6, 4], "x": 10, "y": 2},
+        {"matrix": [6, 5], "x": 11, "y": 2},
+
+        {"matrix": [3, 0], "x": 0, "y": 3},
+        {"matrix": [3, 1], "x": 1, "y": 3},
+        {"matrix": [3, 2], "x": 2, "y": 3},
+        {"matrix": [7, 3], "x": 3, "y": 3},
+        {"matrix": [7, 5], "x": 4, "y": 3, "w": 2},
+        {"matrix": [7, 1], "x": 6, "y": 3, "w": 2},
+        {"matrix": [7, 2], "x": 8, "y": 3},
+        {"matrix": [3, 3], "x": 9, "y": 3},
+        {"matrix": [3, 4], "x": 10, "y": 3},
+        {"matrix": [3, 5], "x": 11, "y": 3}
+      ]
+    }
+  }
+}
diff --git a/keyboards/planck/rev6_drop/rules.mk b/keyboards/planck/rev6_drop/rules.mk
index 022a5ccd537..30ce5d293b7 100644
--- a/keyboards/planck/rev6_drop/rules.mk
+++ b/keyboards/planck/rev6_drop/rules.mk
@@ -1,19 +1,2 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = yes        # Console for debug
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-AUDIO_ENABLE = yes          # Audio output
 CUSTOM_MATRIX = lite
-# Do not enable RGB_MATRIX_ENABLE together with RGBLIGHT_ENABLE
-RGB_MATRIX_ENABLE = no
-ENCODER_ENABLE = yes
-DIP_SWITCH_ENABLE = yes
-
 SRC += matrix.c
diff --git a/keyboards/planck/rev7/info.json b/keyboards/planck/rev7/info.json
deleted file mode 100644
index d674af98d17..00000000000
--- a/keyboards/planck/rev7/info.json
+++ /dev/null
@@ -1,333 +0,0 @@
-{
-  "keyboard_name": "Planck",
-  "manufacturer": "Drop",
-  "url": "https://olkb.com/planck",
-  "maintainer": "jackhumbert",
-  "usb": {
-    "vid": "0x03A8",
-    "pid": "0xA4F9",
-    "device_version": "0.0.7"
-  },
-  "ws2812": {
-    "pin": "A1",
-    "driver": "pwm"
-  },
-  "rgb_matrix": {
-    "driver": "ws2812",
-    "sleep": true
-  },
-  "matrix_pins": {
-    "cols": ["B11", "B10", "B2", "B1", "A7", "B0"],
-    "rows": ["A10", "A9", "A8", "B15", "C13", "C14", "C15", "A2"]
-  },
-  "diode_direction": "COL2ROW",
-  "dip_switch": {
-    "pins": ["B14", "A15", "A0", "B9"]
-  },
-  "encoder": {
-    "rotary": [
-        {"pin_a": "B12", "pin_b": "B13"},
-        {"pin_a": "B12", "pin_b": "B13"},
-        {"pin_a": "B12", "pin_b": "B13"},
-        {"pin_a": "B12", "pin_b": "B13"},
-        {"pin_a": "B12", "pin_b": "B13"},
-        {"pin_a": "B12", "pin_b": "B13"},
-        {"pin_a": "B12", "pin_b": "B13"},
-        {"pin_a": "B12", "pin_b": "B13"}
-    ]
-  },
-  "features": {
-    "audio": true,
-    "bootmagic": true,
-    "command": true,
-    "console": true,
-    "encoder": true,
-    "extrakey": true,
-    "mousekey": true,
-    "nkro": true,
-    "rgblight": true
-  },
-  "rgblight": {
-    "led_count": 9
-  },
-  "processor": "STM32F303",
-  "bootloader": "stm32-dfu",
-  "community_layouts": ["ortho_4x12", "planck_mit"],
-  "layout_aliases": {
-    "LAYOUT": "LAYOUT_ortho_4x12",
-    "LAYOUT_planck_grid": "LAYOUT_ortho_4x12",
-    "LAYOUT_planck_mit": "LAYOUT_planck_1x2uC"
-  },
-  "layouts": {
-    "LAYOUT_ortho_4x12": {
-      "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": [4, 0], "x": 6, "y": 0 },
-        { "matrix": [4, 1], "x": 7, "y": 0 },
-        { "matrix": [4, 2], "x": 8, "y": 0 },
-        { "matrix": [4, 3], "x": 9, "y": 0 },
-        { "matrix": [4, 4], "x": 10, "y": 0 },
-        { "matrix": [4, 5], "x": 11, "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": [1, 4], "x": 4, "y": 1 },
-        { "matrix": [1, 5], "x": 5, "y": 1 },
-        { "matrix": [5, 0], "x": 6, "y": 1 },
-        { "matrix": [5, 1], "x": 7, "y": 1 },
-        { "matrix": [5, 2], "x": 8, "y": 1 },
-        { "matrix": [5, 3], "x": 9, "y": 1 },
-        { "matrix": [5, 4], "x": 10, "y": 1 },
-        { "matrix": [5, 5], "x": 11, "y": 1 },
-
-        { "matrix": [2, 0], "x": 0, "y": 2 },
-        { "matrix": [2, 1], "x": 1, "y": 2 },
-        { "matrix": [2, 2], "x": 2, "y": 2 },
-        { "matrix": [2, 3], "x": 3, "y": 2 },
-        { "matrix": [2, 4], "x": 4, "y": 2 },
-        { "matrix": [2, 5], "x": 5, "y": 2 },
-        { "matrix": [6, 0], "x": 6, "y": 2 },
-        { "matrix": [6, 1], "x": 7, "y": 2 },
-        { "matrix": [6, 2], "x": 8, "y": 2 },
-        { "matrix": [6, 3], "x": 9, "y": 2 },
-        { "matrix": [6, 4], "x": 10, "y": 2 },
-        { "matrix": [6, 5], "x": 11, "y": 2 },
-
-        { "matrix": [3, 0], "x": 0, "y": 3 },
-        { "matrix": [3, 1], "x": 1, "y": 3 },
-        { "matrix": [3, 2], "x": 2, "y": 3 },
-        { "matrix": [7, 3], "x": 3, "y": 3 },
-        { "matrix": [7, 4], "x": 4, "y": 3 },
-        { "matrix": [7, 5], "x": 5, "y": 3 },
-        { "matrix": [7, 0], "x": 6, "y": 3 },
-        { "matrix": [7, 1], "x": 7, "y": 3 },
-        { "matrix": [7, 2], "x": 8, "y": 3 },
-        { "matrix": [3, 3], "x": 9, "y": 3 },
-        { "matrix": [3, 4], "x": 10, "y": 3 },
-        { "matrix": [3, 5], "x": 11, "y": 3 }
-      ]
-    },
-    "LAYOUT_planck_1x2uC": {
-      "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": [4, 0], "x": 6, "y": 0 },
-        { "matrix": [4, 1], "x": 7, "y": 0 },
-        { "matrix": [4, 2], "x": 8, "y": 0 },
-        { "matrix": [4, 3], "x": 9, "y": 0 },
-        { "matrix": [4, 4], "x": 10, "y": 0 },
-        { "matrix": [4, 5], "x": 11, "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": [1, 4], "x": 4, "y": 1 },
-        { "matrix": [1, 5], "x": 5, "y": 1 },
-        { "matrix": [5, 0], "x": 6, "y": 1 },
-        { "matrix": [5, 1], "x": 7, "y": 1 },
-        { "matrix": [5, 2], "x": 8, "y": 1 },
-        { "matrix": [5, 3], "x": 9, "y": 1 },
-        { "matrix": [5, 4], "x": 10, "y": 1 },
-        { "matrix": [5, 5], "x": 11, "y": 1 },
-
-        { "matrix": [2, 0], "x": 0, "y": 2 },
-        { "matrix": [2, 1], "x": 1, "y": 2 },
-        { "matrix": [2, 2], "x": 2, "y": 2 },
-        { "matrix": [2, 3], "x": 3, "y": 2 },
-        { "matrix": [2, 4], "x": 4, "y": 2 },
-        { "matrix": [2, 5], "x": 5, "y": 2 },
-        { "matrix": [6, 0], "x": 6, "y": 2 },
-        { "matrix": [6, 1], "x": 7, "y": 2 },
-        { "matrix": [6, 2], "x": 8, "y": 2 },
-        { "matrix": [6, 3], "x": 9, "y": 2 },
-        { "matrix": [6, 4], "x": 10, "y": 2 },
-        { "matrix": [6, 5], "x": 11, "y": 2 },
-
-        { "matrix": [3, 0], "x": 0, "y": 3 },
-        { "matrix": [3, 1], "x": 1, "y": 3 },
-        { "matrix": [3, 2], "x": 2, "y": 3 },
-        { "matrix": [7, 3], "x": 3, "y": 3 },
-        { "matrix": [7, 4], "x": 4, "y": 3 },
-        { "matrix": [7, 0], "x": 5, "y": 3, "w": 2 },
-        { "matrix": [7, 1], "x": 7, "y": 3 },
-        { "matrix": [7, 2], "x": 8, "y": 3 },
-        { "matrix": [3, 3], "x": 9, "y": 3 },
-        { "matrix": [3, 4], "x": 10, "y": 3 },
-        { "matrix": [3, 5], "x": 11, "y": 3 }
-      ]
-    },
-    "LAYOUT_planck_1x2uL": {
-      "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": [4, 0], "x": 6, "y": 0 },
-        { "matrix": [4, 1], "x": 7, "y": 0 },
-        { "matrix": [4, 2], "x": 8, "y": 0 },
-        { "matrix": [4, 3], "x": 9, "y": 0 },
-        { "matrix": [4, 4], "x": 10, "y": 0 },
-        { "matrix": [4, 5], "x": 11, "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": [1, 4], "x": 4, "y": 1 },
-        { "matrix": [1, 5], "x": 5, "y": 1 },
-        { "matrix": [5, 0], "x": 6, "y": 1 },
-        { "matrix": [5, 1], "x": 7, "y": 1 },
-        { "matrix": [5, 2], "x": 8, "y": 1 },
-        { "matrix": [5, 3], "x": 9, "y": 1 },
-        { "matrix": [5, 4], "x": 10, "y": 1 },
-        { "matrix": [5, 5], "x": 11, "y": 1 },
-
-        { "matrix": [2, 0], "x": 0, "y": 2 },
-        { "matrix": [2, 1], "x": 1, "y": 2 },
-        { "matrix": [2, 2], "x": 2, "y": 2 },
-        { "matrix": [2, 3], "x": 3, "y": 2 },
-        { "matrix": [2, 4], "x": 4, "y": 2 },
-        { "matrix": [2, 5], "x": 5, "y": 2 },
-        { "matrix": [6, 0], "x": 6, "y": 2 },
-        { "matrix": [6, 1], "x": 7, "y": 2 },
-        { "matrix": [6, 2], "x": 8, "y": 2 },
-        { "matrix": [6, 3], "x": 9, "y": 2 },
-        { "matrix": [6, 4], "x": 10, "y": 2 },
-        { "matrix": [6, 5], "x": 11, "y": 2 },
-
-        { "matrix": [3, 0], "x": 0, "y": 3 },
-        { "matrix": [3, 1], "x": 1, "y": 3 },
-        { "matrix": [3, 2], "x": 2, "y": 3 },
-        { "matrix": [7, 3], "x": 3, "y": 3 },
-        { "matrix": [7, 5], "x": 4, "y": 3, "w": 2 },
-        { "matrix": [7, 0], "x": 6, "y": 3 },
-        { "matrix": [7, 1], "x": 7, "y": 3 },
-        { "matrix": [7, 2], "x": 8, "y": 3 },
-        { "matrix": [3, 3], "x": 9, "y": 3 },
-        { "matrix": [3, 4], "x": 10, "y": 3 },
-        { "matrix": [3, 5], "x": 11, "y": 3 }
-      ]
-    },
-    "LAYOUT_planck_1x2uR": {
-      "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": [4, 0], "x": 6, "y": 0 },
-        { "matrix": [4, 1], "x": 7, "y": 0 },
-        { "matrix": [4, 2], "x": 8, "y": 0 },
-        { "matrix": [4, 3], "x": 9, "y": 0 },
-        { "matrix": [4, 4], "x": 10, "y": 0 },
-        { "matrix": [4, 5], "x": 11, "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": [1, 4], "x": 4, "y": 1 },
-        { "matrix": [1, 5], "x": 5, "y": 1 },
-        { "matrix": [5, 0], "x": 6, "y": 1 },
-        { "matrix": [5, 1], "x": 7, "y": 1 },
-        { "matrix": [5, 2], "x": 8, "y": 1 },
-        { "matrix": [5, 3], "x": 9, "y": 1 },
-        { "matrix": [5, 4], "x": 10, "y": 1 },
-        { "matrix": [5, 5], "x": 11, "y": 1 },
-
-        { "matrix": [2, 0], "x": 0, "y": 2 },
-        { "matrix": [2, 1], "x": 1, "y": 2 },
-        { "matrix": [2, 2], "x": 2, "y": 2 },
-        { "matrix": [2, 3], "x": 3, "y": 2 },
-        { "matrix": [2, 4], "x": 4, "y": 2 },
-        { "matrix": [2, 5], "x": 5, "y": 2 },
-        { "matrix": [6, 0], "x": 6, "y": 2 },
-        { "matrix": [6, 1], "x": 7, "y": 2 },
-        { "matrix": [6, 2], "x": 8, "y": 2 },
-        { "matrix": [6, 3], "x": 9, "y": 2 },
-        { "matrix": [6, 4], "x": 10, "y": 2 },
-        { "matrix": [6, 5], "x": 11, "y": 2 },
-
-        { "matrix": [3, 0], "x": 0, "y": 3 },
-        { "matrix": [3, 1], "x": 1, "y": 3 },
-        { "matrix": [3, 2], "x": 2, "y": 3 },
-        { "matrix": [7, 3], "x": 3, "y": 3 },
-        { "matrix": [7, 4], "x": 4, "y": 3 },
-        { "matrix": [7, 5], "x": 5, "y": 3 },
-        { "matrix": [7, 1], "x": 6, "y": 3, "w": 2 },
-        { "matrix": [7, 2], "x": 8, "y": 3 },
-        { "matrix": [3, 3], "x": 9, "y": 3 },
-        { "matrix": [3, 4], "x": 10, "y": 3 },
-        { "matrix": [3, 5], "x": 11, "y": 3 }
-      ]
-    },
-    "LAYOUT_planck_2x2u": {
-      "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": [4, 0], "x": 6, "y": 0 },
-        { "matrix": [4, 1], "x": 7, "y": 0 },
-        { "matrix": [4, 2], "x": 8, "y": 0 },
-        { "matrix": [4, 3], "x": 9, "y": 0 },
-        { "matrix": [4, 4], "x": 10, "y": 0 },
-        { "matrix": [4, 5], "x": 11, "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": [1, 4], "x": 4, "y": 1 },
-        { "matrix": [1, 5], "x": 5, "y": 1 },
-        { "matrix": [5, 0], "x": 6, "y": 1 },
-        { "matrix": [5, 1], "x": 7, "y": 1 },
-        { "matrix": [5, 2], "x": 8, "y": 1 },
-        { "matrix": [5, 3], "x": 9, "y": 1 },
-        { "matrix": [5, 4], "x": 10, "y": 1 },
-        { "matrix": [5, 5], "x": 11, "y": 1 },
-
-        { "matrix": [2, 0], "x": 0, "y": 2 },
-        { "matrix": [2, 1], "x": 1, "y": 2 },
-        { "matrix": [2, 2], "x": 2, "y": 2 },
-        { "matrix": [2, 3], "x": 3, "y": 2 },
-        { "matrix": [2, 4], "x": 4, "y": 2 },
-        { "matrix": [2, 5], "x": 5, "y": 2 },
-        { "matrix": [6, 0], "x": 6, "y": 2 },
-        { "matrix": [6, 1], "x": 7, "y": 2 },
-        { "matrix": [6, 2], "x": 8, "y": 2 },
-        { "matrix": [6, 3], "x": 9, "y": 2 },
-        { "matrix": [6, 4], "x": 10, "y": 2 },
-        { "matrix": [6, 5], "x": 11, "y": 2 },
-
-        { "matrix": [3, 0], "x": 0, "y": 3 },
-        { "matrix": [3, 1], "x": 1, "y": 3 },
-        { "matrix": [3, 2], "x": 2, "y": 3 },
-        { "matrix": [7, 3], "x": 3, "y": 3 },
-        { "matrix": [7, 5], "x": 4, "y": 3, "w": 2 },
-        { "matrix": [7, 1], "x": 6, "y": 3, "w": 2 },
-        { "matrix": [7, 2], "x": 8, "y": 3 },
-        { "matrix": [3, 3], "x": 9, "y": 3 },
-        { "matrix": [3, 4], "x": 10, "y": 3 },
-        { "matrix": [3, 5], "x": 11, "y": 3 }
-      ]
-    }
-  }
-}
diff --git a/keyboards/planck/rev7/keyboard.json b/keyboards/planck/rev7/keyboard.json
new file mode 100644
index 00000000000..691394d5d57
--- /dev/null
+++ b/keyboards/planck/rev7/keyboard.json
@@ -0,0 +1,334 @@
+{
+  "keyboard_name": "Planck",
+  "manufacturer": "Drop",
+  "url": "https://olkb.com/planck",
+  "maintainer": "jackhumbert",
+  "usb": {
+    "vid": "0x03A8",
+    "pid": "0xA4F9",
+    "device_version": "0.0.7"
+  },
+  "ws2812": {
+    "pin": "A1",
+    "driver": "pwm"
+  },
+  "rgb_matrix": {
+    "driver": "ws2812",
+    "sleep": true
+  },
+  "matrix_pins": {
+    "cols": ["B11", "B10", "B2", "B1", "A7", "B0"],
+    "rows": ["A10", "A9", "A8", "B15", "C13", "C14", "C15", "A2"]
+  },
+  "diode_direction": "COL2ROW",
+  "dip_switch": {
+    "pins": ["B14", "A15", "A0", "B9"]
+  },
+  "encoder": {
+    "rotary": [
+        {"pin_a": "B12", "pin_b": "B13"},
+        {"pin_a": "B12", "pin_b": "B13"},
+        {"pin_a": "B12", "pin_b": "B13"},
+        {"pin_a": "B12", "pin_b": "B13"},
+        {"pin_a": "B12", "pin_b": "B13"},
+        {"pin_a": "B12", "pin_b": "B13"},
+        {"pin_a": "B12", "pin_b": "B13"},
+        {"pin_a": "B12", "pin_b": "B13"}
+    ]
+  },
+  "features": {
+    "audio": true,
+    "bootmagic": true,
+    "command": true,
+    "console": true,
+    "encoder": true,
+    "dip_switch": true,
+    "extrakey": true,
+    "mousekey": true,
+    "nkro": true,
+    "rgblight": true
+  },
+  "rgblight": {
+    "led_count": 9
+  },
+  "processor": "STM32F303",
+  "bootloader": "stm32-dfu",
+  "community_layouts": ["ortho_4x12", "planck_mit"],
+  "layout_aliases": {
+    "LAYOUT": "LAYOUT_ortho_4x12",
+    "LAYOUT_planck_grid": "LAYOUT_ortho_4x12",
+    "LAYOUT_planck_mit": "LAYOUT_planck_1x2uC"
+  },
+  "layouts": {
+    "LAYOUT_ortho_4x12": {
+      "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": [4, 0], "x": 6, "y": 0 },
+        { "matrix": [4, 1], "x": 7, "y": 0 },
+        { "matrix": [4, 2], "x": 8, "y": 0 },
+        { "matrix": [4, 3], "x": 9, "y": 0 },
+        { "matrix": [4, 4], "x": 10, "y": 0 },
+        { "matrix": [4, 5], "x": 11, "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": [1, 4], "x": 4, "y": 1 },
+        { "matrix": [1, 5], "x": 5, "y": 1 },
+        { "matrix": [5, 0], "x": 6, "y": 1 },
+        { "matrix": [5, 1], "x": 7, "y": 1 },
+        { "matrix": [5, 2], "x": 8, "y": 1 },
+        { "matrix": [5, 3], "x": 9, "y": 1 },
+        { "matrix": [5, 4], "x": 10, "y": 1 },
+        { "matrix": [5, 5], "x": 11, "y": 1 },
+
+        { "matrix": [2, 0], "x": 0, "y": 2 },
+        { "matrix": [2, 1], "x": 1, "y": 2 },
+        { "matrix": [2, 2], "x": 2, "y": 2 },
+        { "matrix": [2, 3], "x": 3, "y": 2 },
+        { "matrix": [2, 4], "x": 4, "y": 2 },
+        { "matrix": [2, 5], "x": 5, "y": 2 },
+        { "matrix": [6, 0], "x": 6, "y": 2 },
+        { "matrix": [6, 1], "x": 7, "y": 2 },
+        { "matrix": [6, 2], "x": 8, "y": 2 },
+        { "matrix": [6, 3], "x": 9, "y": 2 },
+        { "matrix": [6, 4], "x": 10, "y": 2 },
+        { "matrix": [6, 5], "x": 11, "y": 2 },
+
+        { "matrix": [3, 0], "x": 0, "y": 3 },
+        { "matrix": [3, 1], "x": 1, "y": 3 },
+        { "matrix": [3, 2], "x": 2, "y": 3 },
+        { "matrix": [7, 3], "x": 3, "y": 3 },
+        { "matrix": [7, 4], "x": 4, "y": 3 },
+        { "matrix": [7, 5], "x": 5, "y": 3 },
+        { "matrix": [7, 0], "x": 6, "y": 3 },
+        { "matrix": [7, 1], "x": 7, "y": 3 },
+        { "matrix": [7, 2], "x": 8, "y": 3 },
+        { "matrix": [3, 3], "x": 9, "y": 3 },
+        { "matrix": [3, 4], "x": 10, "y": 3 },
+        { "matrix": [3, 5], "x": 11, "y": 3 }
+      ]
+    },
+    "LAYOUT_planck_1x2uC": {
+      "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": [4, 0], "x": 6, "y": 0 },
+        { "matrix": [4, 1], "x": 7, "y": 0 },
+        { "matrix": [4, 2], "x": 8, "y": 0 },
+        { "matrix": [4, 3], "x": 9, "y": 0 },
+        { "matrix": [4, 4], "x": 10, "y": 0 },
+        { "matrix": [4, 5], "x": 11, "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": [1, 4], "x": 4, "y": 1 },
+        { "matrix": [1, 5], "x": 5, "y": 1 },
+        { "matrix": [5, 0], "x": 6, "y": 1 },
+        { "matrix": [5, 1], "x": 7, "y": 1 },
+        { "matrix": [5, 2], "x": 8, "y": 1 },
+        { "matrix": [5, 3], "x": 9, "y": 1 },
+        { "matrix": [5, 4], "x": 10, "y": 1 },
+        { "matrix": [5, 5], "x": 11, "y": 1 },
+
+        { "matrix": [2, 0], "x": 0, "y": 2 },
+        { "matrix": [2, 1], "x": 1, "y": 2 },
+        { "matrix": [2, 2], "x": 2, "y": 2 },
+        { "matrix": [2, 3], "x": 3, "y": 2 },
+        { "matrix": [2, 4], "x": 4, "y": 2 },
+        { "matrix": [2, 5], "x": 5, "y": 2 },
+        { "matrix": [6, 0], "x": 6, "y": 2 },
+        { "matrix": [6, 1], "x": 7, "y": 2 },
+        { "matrix": [6, 2], "x": 8, "y": 2 },
+        { "matrix": [6, 3], "x": 9, "y": 2 },
+        { "matrix": [6, 4], "x": 10, "y": 2 },
+        { "matrix": [6, 5], "x": 11, "y": 2 },
+
+        { "matrix": [3, 0], "x": 0, "y": 3 },
+        { "matrix": [3, 1], "x": 1, "y": 3 },
+        { "matrix": [3, 2], "x": 2, "y": 3 },
+        { "matrix": [7, 3], "x": 3, "y": 3 },
+        { "matrix": [7, 4], "x": 4, "y": 3 },
+        { "matrix": [7, 0], "x": 5, "y": 3, "w": 2 },
+        { "matrix": [7, 1], "x": 7, "y": 3 },
+        { "matrix": [7, 2], "x": 8, "y": 3 },
+        { "matrix": [3, 3], "x": 9, "y": 3 },
+        { "matrix": [3, 4], "x": 10, "y": 3 },
+        { "matrix": [3, 5], "x": 11, "y": 3 }
+      ]
+    },
+    "LAYOUT_planck_1x2uL": {
+      "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": [4, 0], "x": 6, "y": 0 },
+        { "matrix": [4, 1], "x": 7, "y": 0 },
+        { "matrix": [4, 2], "x": 8, "y": 0 },
+        { "matrix": [4, 3], "x": 9, "y": 0 },
+        { "matrix": [4, 4], "x": 10, "y": 0 },
+        { "matrix": [4, 5], "x": 11, "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": [1, 4], "x": 4, "y": 1 },
+        { "matrix": [1, 5], "x": 5, "y": 1 },
+        { "matrix": [5, 0], "x": 6, "y": 1 },
+        { "matrix": [5, 1], "x": 7, "y": 1 },
+        { "matrix": [5, 2], "x": 8, "y": 1 },
+        { "matrix": [5, 3], "x": 9, "y": 1 },
+        { "matrix": [5, 4], "x": 10, "y": 1 },
+        { "matrix": [5, 5], "x": 11, "y": 1 },
+
+        { "matrix": [2, 0], "x": 0, "y": 2 },
+        { "matrix": [2, 1], "x": 1, "y": 2 },
+        { "matrix": [2, 2], "x": 2, "y": 2 },
+        { "matrix": [2, 3], "x": 3, "y": 2 },
+        { "matrix": [2, 4], "x": 4, "y": 2 },
+        { "matrix": [2, 5], "x": 5, "y": 2 },
+        { "matrix": [6, 0], "x": 6, "y": 2 },
+        { "matrix": [6, 1], "x": 7, "y": 2 },
+        { "matrix": [6, 2], "x": 8, "y": 2 },
+        { "matrix": [6, 3], "x": 9, "y": 2 },
+        { "matrix": [6, 4], "x": 10, "y": 2 },
+        { "matrix": [6, 5], "x": 11, "y": 2 },
+
+        { "matrix": [3, 0], "x": 0, "y": 3 },
+        { "matrix": [3, 1], "x": 1, "y": 3 },
+        { "matrix": [3, 2], "x": 2, "y": 3 },
+        { "matrix": [7, 3], "x": 3, "y": 3 },
+        { "matrix": [7, 5], "x": 4, "y": 3, "w": 2 },
+        { "matrix": [7, 0], "x": 6, "y": 3 },
+        { "matrix": [7, 1], "x": 7, "y": 3 },
+        { "matrix": [7, 2], "x": 8, "y": 3 },
+        { "matrix": [3, 3], "x": 9, "y": 3 },
+        { "matrix": [3, 4], "x": 10, "y": 3 },
+        { "matrix": [3, 5], "x": 11, "y": 3 }
+      ]
+    },
+    "LAYOUT_planck_1x2uR": {
+      "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": [4, 0], "x": 6, "y": 0 },
+        { "matrix": [4, 1], "x": 7, "y": 0 },
+        { "matrix": [4, 2], "x": 8, "y": 0 },
+        { "matrix": [4, 3], "x": 9, "y": 0 },
+        { "matrix": [4, 4], "x": 10, "y": 0 },
+        { "matrix": [4, 5], "x": 11, "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": [1, 4], "x": 4, "y": 1 },
+        { "matrix": [1, 5], "x": 5, "y": 1 },
+        { "matrix": [5, 0], "x": 6, "y": 1 },
+        { "matrix": [5, 1], "x": 7, "y": 1 },
+        { "matrix": [5, 2], "x": 8, "y": 1 },
+        { "matrix": [5, 3], "x": 9, "y": 1 },
+        { "matrix": [5, 4], "x": 10, "y": 1 },
+        { "matrix": [5, 5], "x": 11, "y": 1 },
+
+        { "matrix": [2, 0], "x": 0, "y": 2 },
+        { "matrix": [2, 1], "x": 1, "y": 2 },
+        { "matrix": [2, 2], "x": 2, "y": 2 },
+        { "matrix": [2, 3], "x": 3, "y": 2 },
+        { "matrix": [2, 4], "x": 4, "y": 2 },
+        { "matrix": [2, 5], "x": 5, "y": 2 },
+        { "matrix": [6, 0], "x": 6, "y": 2 },
+        { "matrix": [6, 1], "x": 7, "y": 2 },
+        { "matrix": [6, 2], "x": 8, "y": 2 },
+        { "matrix": [6, 3], "x": 9, "y": 2 },
+        { "matrix": [6, 4], "x": 10, "y": 2 },
+        { "matrix": [6, 5], "x": 11, "y": 2 },
+
+        { "matrix": [3, 0], "x": 0, "y": 3 },
+        { "matrix": [3, 1], "x": 1, "y": 3 },
+        { "matrix": [3, 2], "x": 2, "y": 3 },
+        { "matrix": [7, 3], "x": 3, "y": 3 },
+        { "matrix": [7, 4], "x": 4, "y": 3 },
+        { "matrix": [7, 5], "x": 5, "y": 3 },
+        { "matrix": [7, 1], "x": 6, "y": 3, "w": 2 },
+        { "matrix": [7, 2], "x": 8, "y": 3 },
+        { "matrix": [3, 3], "x": 9, "y": 3 },
+        { "matrix": [3, 4], "x": 10, "y": 3 },
+        { "matrix": [3, 5], "x": 11, "y": 3 }
+      ]
+    },
+    "LAYOUT_planck_2x2u": {
+      "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": [4, 0], "x": 6, "y": 0 },
+        { "matrix": [4, 1], "x": 7, "y": 0 },
+        { "matrix": [4, 2], "x": 8, "y": 0 },
+        { "matrix": [4, 3], "x": 9, "y": 0 },
+        { "matrix": [4, 4], "x": 10, "y": 0 },
+        { "matrix": [4, 5], "x": 11, "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": [1, 4], "x": 4, "y": 1 },
+        { "matrix": [1, 5], "x": 5, "y": 1 },
+        { "matrix": [5, 0], "x": 6, "y": 1 },
+        { "matrix": [5, 1], "x": 7, "y": 1 },
+        { "matrix": [5, 2], "x": 8, "y": 1 },
+        { "matrix": [5, 3], "x": 9, "y": 1 },
+        { "matrix": [5, 4], "x": 10, "y": 1 },
+        { "matrix": [5, 5], "x": 11, "y": 1 },
+
+        { "matrix": [2, 0], "x": 0, "y": 2 },
+        { "matrix": [2, 1], "x": 1, "y": 2 },
+        { "matrix": [2, 2], "x": 2, "y": 2 },
+        { "matrix": [2, 3], "x": 3, "y": 2 },
+        { "matrix": [2, 4], "x": 4, "y": 2 },
+        { "matrix": [2, 5], "x": 5, "y": 2 },
+        { "matrix": [6, 0], "x": 6, "y": 2 },
+        { "matrix": [6, 1], "x": 7, "y": 2 },
+        { "matrix": [6, 2], "x": 8, "y": 2 },
+        { "matrix": [6, 3], "x": 9, "y": 2 },
+        { "matrix": [6, 4], "x": 10, "y": 2 },
+        { "matrix": [6, 5], "x": 11, "y": 2 },
+
+        { "matrix": [3, 0], "x": 0, "y": 3 },
+        { "matrix": [3, 1], "x": 1, "y": 3 },
+        { "matrix": [3, 2], "x": 2, "y": 3 },
+        { "matrix": [7, 3], "x": 3, "y": 3 },
+        { "matrix": [7, 5], "x": 4, "y": 3, "w": 2 },
+        { "matrix": [7, 1], "x": 6, "y": 3, "w": 2 },
+        { "matrix": [7, 2], "x": 8, "y": 3 },
+        { "matrix": [3, 3], "x": 9, "y": 3 },
+        { "matrix": [3, 4], "x": 10, "y": 3 },
+        { "matrix": [3, 5], "x": 11, "y": 3 }
+      ]
+    }
+  }
+}
diff --git a/keyboards/planck/rev7/rules.mk b/keyboards/planck/rev7/rules.mk
index 04b21019aed..30ce5d293b7 100644
--- a/keyboards/planck/rev7/rules.mk
+++ b/keyboards/planck/rev7/rules.mk
@@ -1,7 +1,2 @@
-# Build Options
-#   change yes to no to disable
-#
 CUSTOM_MATRIX = lite
-DIP_SWITCH_ENABLE = yes
-
 SRC += matrix.c
diff --git a/keyboards/planck/thk/info.json b/keyboards/planck/thk/info.json
deleted file mode 100644
index 24b8d5f0a5b..00000000000
--- a/keyboards/planck/thk/info.json
+++ /dev/null
@@ -1,140 +0,0 @@
-{
-  "keyboard_name": "Planck THK",
-  "manufacturer": "OLKB",
-  "maintainer": "Erovia",
-  "url": "https://olkb.com/planck",
-  "usb": {
-    "vid": "0x03A8",
-    "pid": "0x25A7",
-    "device_version": "0.0.1"
-  },
-  "matrix_pins": {
-    "cols": ["D7", "C2", "C3", "C4", "C5", "C6", "C7", "A3", "A2", "A1", "A0", "B0"],
-    "rows": ["A7", "A6", "A5", "A4"]
-  },
-  "diode_direction": "COL2ROW",
-  "dip_switch": {
-    "pins": ["D0", "D1", "D4", "D6"]
-  },
-  "encoder": {
-    "rotary": [
-      {"pin_a": "B4", "pin_b": "B3"},
-      {"pin_a": "B2", "pin_b": "B1"}
-    ]
-  },
-  "processor": "atmega32a",
-  "bootloader": "usbasploader",
-  "tapping": {
-    "toggle": 3
-  },
-  "layout_aliases": {
-    "LAYOUT_planck_grid": "LAYOUT_ortho_4x12",
-    "LAYOUT_planck_mit": "LAYOUT_planck_1x2uC"
-  },
-  "community_layouts": ["ortho_4x12", "planck_mit"],
-  "layouts": {
-    "LAYOUT_ortho_4x12": {
-      "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": [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": [1, 4], "x": 4, "y": 1},
-        {"matrix": [1, 5], "x": 5, "y": 1},
-        {"matrix": [1, 6], "x": 6, "y": 1},
-        {"matrix": [1, 7], "x": 7, "y": 1},
-        {"matrix": [1, 8], "x": 8, "y": 1},
-        {"matrix": [1, 9], "x": 9, "y": 1},
-        {"matrix": [1, 10], "x": 10, "y": 1},
-        {"matrix": [1, 11], "x": 11, "y": 1},
-        {"matrix": [2, 0], "x": 0, "y": 2},
-        {"matrix": [2, 1], "x": 1, "y": 2},
-        {"matrix": [2, 2], "x": 2, "y": 2},
-        {"matrix": [2, 3], "x": 3, "y": 2},
-        {"matrix": [2, 4], "x": 4, "y": 2},
-        {"matrix": [2, 5], "x": 5, "y": 2},
-        {"matrix": [2, 6], "x": 6, "y": 2},
-        {"matrix": [2, 7], "x": 7, "y": 2},
-        {"matrix": [2, 8], "x": 8, "y": 2},
-        {"matrix": [2, 9], "x": 9, "y": 2},
-        {"matrix": [2, 10], "x": 10, "y": 2},
-        {"matrix": [2, 11], "x": 11, "y": 2},
-        {"matrix": [3, 0], "x": 0, "y": 3},
-        {"matrix": [3, 1], "x": 1, "y": 3},
-        {"matrix": [3, 2], "x": 2, "y": 3},
-        {"matrix": [3, 3], "x": 3, "y": 3},
-        {"matrix": [3, 4], "x": 4, "y": 3},
-        {"matrix": [3, 5], "x": 5, "y": 3},
-        {"matrix": [3, 6], "x": 6, "y": 3},
-        {"matrix": [3, 7], "x": 7, "y": 3},
-        {"matrix": [3, 8], "x": 8, "y": 3},
-        {"matrix": [3, 9], "x": 9, "y": 3},
-        {"matrix": [3, 10], "x": 10, "y": 3},
-        {"matrix": [3, 11], "x": 11, "y": 3}
-      ]
-    },
-    "LAYOUT_planck_1x2uC": {
-      "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": [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": [1, 4], "x": 4, "y": 1},
-        {"matrix": [1, 5], "x": 5, "y": 1},
-        {"matrix": [1, 6], "x": 6, "y": 1},
-        {"matrix": [1, 7], "x": 7, "y": 1},
-        {"matrix": [1, 8], "x": 8, "y": 1},
-        {"matrix": [1, 9], "x": 9, "y": 1},
-        {"matrix": [1, 10], "x": 10, "y": 1},
-        {"matrix": [1, 11], "x": 11, "y": 1},
-        {"matrix": [2, 0], "x": 0, "y": 2},
-        {"matrix": [2, 1], "x": 1, "y": 2},
-        {"matrix": [2, 2], "x": 2, "y": 2},
-        {"matrix": [2, 3], "x": 3, "y": 2},
-        {"matrix": [2, 4], "x": 4, "y": 2},
-        {"matrix": [2, 5], "x": 5, "y": 2},
-        {"matrix": [2, 6], "x": 6, "y": 2},
-        {"matrix": [2, 7], "x": 7, "y": 2},
-        {"matrix": [2, 8], "x": 8, "y": 2},
-        {"matrix": [2, 9], "x": 9, "y": 2},
-        {"matrix": [2, 10], "x": 10, "y": 2},
-        {"matrix": [2, 11], "x": 11, "y": 2},
-        {"matrix": [3, 0], "x": 0, "y": 3},
-        {"matrix": [3, 1], "x": 1, "y": 3},
-        {"matrix": [3, 2], "x": 2, "y": 3},
-        {"matrix": [3, 3], "x": 3, "y": 3},
-        {"matrix": [3, 4], "x": 4, "y": 3},
-        {"matrix": [3, 5], "x": 5, "y": 3, "w": 2},
-        {"matrix": [3, 7], "x": 7, "y": 3},
-        {"matrix": [3, 8], "x": 8, "y": 3},
-        {"matrix": [3, 9], "x": 9, "y": 3},
-        {"matrix": [3, 10], "x": 10, "y": 3},
-        {"matrix": [3, 11], "x": 11, "y": 3}
-      ]
-    }
-  }
-}
diff --git a/keyboards/planck/thk/keyboard.json b/keyboards/planck/thk/keyboard.json
new file mode 100644
index 00000000000..b2c07ca0f0c
--- /dev/null
+++ b/keyboards/planck/thk/keyboard.json
@@ -0,0 +1,148 @@
+{
+  "keyboard_name": "Planck THK",
+  "manufacturer": "OLKB",
+  "maintainer": "Erovia",
+  "url": "https://olkb.com/planck",
+  "usb": {
+    "vid": "0x03A8",
+    "pid": "0x25A7",
+    "device_version": "0.0.1"
+  },
+  "features": {
+    "bootmagic": true,
+    "dip_switch": true,
+    "encoder": true,
+    "extrakey": true,
+    "mousekey": true,
+    "nkro": false
+  },
+  "matrix_pins": {
+    "cols": ["D7", "C2", "C3", "C4", "C5", "C6", "C7", "A3", "A2", "A1", "A0", "B0"],
+    "rows": ["A7", "A6", "A5", "A4"]
+  },
+  "diode_direction": "COL2ROW",
+  "dip_switch": {
+    "pins": ["D0", "D1", "D4", "D6"]
+  },
+  "encoder": {
+    "rotary": [
+      {"pin_a": "B4", "pin_b": "B3"},
+      {"pin_a": "B2", "pin_b": "B1"}
+    ]
+  },
+  "processor": "atmega32a",
+  "bootloader": "usbasploader",
+  "tapping": {
+    "toggle": 3
+  },
+  "layout_aliases": {
+    "LAYOUT_planck_grid": "LAYOUT_ortho_4x12",
+    "LAYOUT_planck_mit": "LAYOUT_planck_1x2uC"
+  },
+  "community_layouts": ["ortho_4x12", "planck_mit"],
+  "layouts": {
+    "LAYOUT_ortho_4x12": {
+      "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": [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": [1, 4], "x": 4, "y": 1},
+        {"matrix": [1, 5], "x": 5, "y": 1},
+        {"matrix": [1, 6], "x": 6, "y": 1},
+        {"matrix": [1, 7], "x": 7, "y": 1},
+        {"matrix": [1, 8], "x": 8, "y": 1},
+        {"matrix": [1, 9], "x": 9, "y": 1},
+        {"matrix": [1, 10], "x": 10, "y": 1},
+        {"matrix": [1, 11], "x": 11, "y": 1},
+        {"matrix": [2, 0], "x": 0, "y": 2},
+        {"matrix": [2, 1], "x": 1, "y": 2},
+        {"matrix": [2, 2], "x": 2, "y": 2},
+        {"matrix": [2, 3], "x": 3, "y": 2},
+        {"matrix": [2, 4], "x": 4, "y": 2},
+        {"matrix": [2, 5], "x": 5, "y": 2},
+        {"matrix": [2, 6], "x": 6, "y": 2},
+        {"matrix": [2, 7], "x": 7, "y": 2},
+        {"matrix": [2, 8], "x": 8, "y": 2},
+        {"matrix": [2, 9], "x": 9, "y": 2},
+        {"matrix": [2, 10], "x": 10, "y": 2},
+        {"matrix": [2, 11], "x": 11, "y": 2},
+        {"matrix": [3, 0], "x": 0, "y": 3},
+        {"matrix": [3, 1], "x": 1, "y": 3},
+        {"matrix": [3, 2], "x": 2, "y": 3},
+        {"matrix": [3, 3], "x": 3, "y": 3},
+        {"matrix": [3, 4], "x": 4, "y": 3},
+        {"matrix": [3, 5], "x": 5, "y": 3},
+        {"matrix": [3, 6], "x": 6, "y": 3},
+        {"matrix": [3, 7], "x": 7, "y": 3},
+        {"matrix": [3, 8], "x": 8, "y": 3},
+        {"matrix": [3, 9], "x": 9, "y": 3},
+        {"matrix": [3, 10], "x": 10, "y": 3},
+        {"matrix": [3, 11], "x": 11, "y": 3}
+      ]
+    },
+    "LAYOUT_planck_1x2uC": {
+      "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": [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": [1, 4], "x": 4, "y": 1},
+        {"matrix": [1, 5], "x": 5, "y": 1},
+        {"matrix": [1, 6], "x": 6, "y": 1},
+        {"matrix": [1, 7], "x": 7, "y": 1},
+        {"matrix": [1, 8], "x": 8, "y": 1},
+        {"matrix": [1, 9], "x": 9, "y": 1},
+        {"matrix": [1, 10], "x": 10, "y": 1},
+        {"matrix": [1, 11], "x": 11, "y": 1},
+        {"matrix": [2, 0], "x": 0, "y": 2},
+        {"matrix": [2, 1], "x": 1, "y": 2},
+        {"matrix": [2, 2], "x": 2, "y": 2},
+        {"matrix": [2, 3], "x": 3, "y": 2},
+        {"matrix": [2, 4], "x": 4, "y": 2},
+        {"matrix": [2, 5], "x": 5, "y": 2},
+        {"matrix": [2, 6], "x": 6, "y": 2},
+        {"matrix": [2, 7], "x": 7, "y": 2},
+        {"matrix": [2, 8], "x": 8, "y": 2},
+        {"matrix": [2, 9], "x": 9, "y": 2},
+        {"matrix": [2, 10], "x": 10, "y": 2},
+        {"matrix": [2, 11], "x": 11, "y": 2},
+        {"matrix": [3, 0], "x": 0, "y": 3},
+        {"matrix": [3, 1], "x": 1, "y": 3},
+        {"matrix": [3, 2], "x": 2, "y": 3},
+        {"matrix": [3, 3], "x": 3, "y": 3},
+        {"matrix": [3, 4], "x": 4, "y": 3},
+        {"matrix": [3, 5], "x": 5, "y": 3, "w": 2},
+        {"matrix": [3, 7], "x": 7, "y": 3},
+        {"matrix": [3, 8], "x": 8, "y": 3},
+        {"matrix": [3, 9], "x": 9, "y": 3},
+        {"matrix": [3, 10], "x": 10, "y": 3},
+        {"matrix": [3, 11], "x": 11, "y": 3}
+      ]
+    }
+  }
+}
diff --git a/keyboards/planck/thk/rules.mk b/keyboards/planck/thk/rules.mk
index 417fb95129a..c2ee0bc86f9 100644
--- a/keyboards/planck/thk/rules.mk
+++ b/keyboards/planck/thk/rules.mk
@@ -1,17 +1,2 @@
 # Processor frequency
 F_CPU = 16000000
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-ENCODER_ENABLE = yes
-DIP_SWITCH_ENABLE = yes
diff --git a/keyboards/ploopyco/mouse/info.json b/keyboards/ploopyco/mouse/keyboard.json
similarity index 100%
rename from keyboards/ploopyco/mouse/info.json
rename to keyboards/ploopyco/mouse/keyboard.json
diff --git a/keyboards/pmk/posey_split/v4/info.json b/keyboards/pmk/posey_split/v4/keyboard.json
similarity index 100%
rename from keyboards/pmk/posey_split/v4/info.json
rename to keyboards/pmk/posey_split/v4/keyboard.json
diff --git a/keyboards/pmk/posey_split/v5/info.json b/keyboards/pmk/posey_split/v5/keyboard.json
similarity index 100%
rename from keyboards/pmk/posey_split/v5/info.json
rename to keyboards/pmk/posey_split/v5/keyboard.json
diff --git a/keyboards/pmk/recore/v3/info.json b/keyboards/pmk/recore/v3/keyboard.json
similarity index 100%
rename from keyboards/pmk/recore/v3/info.json
rename to keyboards/pmk/recore/v3/keyboard.json
diff --git a/keyboards/preonic/rev3_drop/info.json b/keyboards/preonic/rev3_drop/info.json
deleted file mode 100644
index 79487deaab7..00000000000
--- a/keyboards/preonic/rev3_drop/info.json
+++ /dev/null
@@ -1,387 +0,0 @@
-{
-    "keyboard_name": "Preonic",
-    "manufacturer": "Drop",
-    "usb": {
-        "vid": "0x03A8",
-        "pid": "0xA649",
-        "device_version": "0.0.3"
-    },
-    "rgblight": {
-        "led_count": 9,
-        "animations": {
-            "breathing": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "snake": true,
-            "knight": true,
-            "christmas": true,
-            "static_gradient": true,
-            "rgb_test": true,
-            "alternating": true,
-            "twinkle": true
-        }
-    },
-    "ws2812": {
-        "pin": "A1",
-        "driver": "pwm"
-    },
-    "rgb_matrix": {
-        "driver": "ws2812"
-    },
-    "matrix_pins": {
-        "cols": ["B11", "B10", "B2", "B1", "A7", "B0"],
-        "rows": ["A10", "A9", "A8", "B15", "C13", "C14", "C15", "A2", "A3", "A6"]
-    },
-    "diode_direction": "COL2ROW",
-    "dip_switch": {
-        "pins": ["B14", "A15", "A0", "B9"]
-    },
-    "encoder": {
-        "rotary": [
-            {"pin_a": "B12", "pin_b": "B13"}
-        ]
-    },
-    "processor": "STM32F303",
-    "bootloader": "stm32-dfu",
-    "community_layouts": ["ortho_5x12"],
-    "layout_aliases": {
-        "LAYOUT_preonic_grid": "LAYOUT_ortho_5x12"
-    },
-    "layouts": {
-        "LAYOUT_preonic_1x2uC": {
-            "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": [4, 0], "x": 6, "y": 0},
-                {"matrix": [4, 1], "x": 7, "y": 0},
-                {"matrix": [4, 2], "x": 8, "y": 0},
-                {"matrix": [4, 3], "x": 9, "y": 0},
-                {"matrix": [4, 4], "x": 10, "y": 0},
-                {"matrix": [4, 5], "x": 11, "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": [1, 4], "x": 4, "y": 1},
-                {"matrix": [1, 5], "x": 5, "y": 1},
-                {"matrix": [5, 0], "x": 6, "y": 1},
-                {"matrix": [5, 1], "x": 7, "y": 1},
-                {"matrix": [5, 2], "x": 8, "y": 1},
-                {"matrix": [5, 3], "x": 9, "y": 1},
-                {"matrix": [5, 4], "x": 10, "y": 1},
-                {"matrix": [5, 5], "x": 11, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2},
-                {"matrix": [2, 1], "x": 1, "y": 2},
-                {"matrix": [2, 2], "x": 2, "y": 2},
-                {"matrix": [2, 3], "x": 3, "y": 2},
-                {"matrix": [2, 4], "x": 4, "y": 2},
-                {"matrix": [2, 5], "x": 5, "y": 2},
-                {"matrix": [6, 0], "x": 6, "y": 2},
-                {"matrix": [6, 1], "x": 7, "y": 2},
-                {"matrix": [6, 2], "x": 8, "y": 2},
-                {"matrix": [6, 3], "x": 9, "y": 2},
-                {"matrix": [6, 4], "x": 10, "y": 2},
-                {"matrix": [6, 5], "x": 11, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3},
-                {"matrix": [3, 1], "x": 1, "y": 3},
-                {"matrix": [3, 2], "x": 2, "y": 3},
-                {"matrix": [3, 3], "x": 3, "y": 3},
-                {"matrix": [3, 4], "x": 4, "y": 3},
-                {"matrix": [3, 5], "x": 5, "y": 3},
-                {"matrix": [7, 0], "x": 6, "y": 3},
-                {"matrix": [7, 1], "x": 7, "y": 3},
-                {"matrix": [7, 2], "x": 8, "y": 3},
-                {"matrix": [7, 3], "x": 9, "y": 3},
-                {"matrix": [7, 4], "x": 10, "y": 3},
-                {"matrix": [7, 5], "x": 11, "y": 3},
-
-                {"matrix": [8, 0], "x": 0, "y": 4},
-                {"matrix": [8, 1], "x": 1, "y": 4},
-                {"matrix": [8, 2], "x": 2, "y": 4},
-                {"matrix": [9, 3], "x": 3, "y": 4},
-                {"matrix": [9, 4], "x": 4, "y": 4},
-                {"matrix": [9, 0], "x": 5, "y": 4, "w": 2},
-                {"matrix": [9, 1], "x": 7, "y": 4},
-                {"matrix": [9, 2], "x": 8, "y": 4},
-                {"matrix": [8, 3], "x": 9, "y": 4},
-                {"matrix": [8, 4], "x": 10, "y": 4},
-                {"matrix": [8, 5], "x": 11, "y": 4}
-            ]
-        },
-        "LAYOUT_preonic_1x2uR": {
-            "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": [4, 0], "x": 6, "y": 0},
-                {"matrix": [4, 1], "x": 7, "y": 0},
-                {"matrix": [4, 2], "x": 8, "y": 0},
-                {"matrix": [4, 3], "x": 9, "y": 0},
-                {"matrix": [4, 4], "x": 10, "y": 0},
-                {"matrix": [4, 5], "x": 11, "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": [1, 4], "x": 4, "y": 1},
-                {"matrix": [1, 5], "x": 5, "y": 1},
-                {"matrix": [5, 0], "x": 6, "y": 1},
-                {"matrix": [5, 1], "x": 7, "y": 1},
-                {"matrix": [5, 2], "x": 8, "y": 1},
-                {"matrix": [5, 3], "x": 9, "y": 1},
-                {"matrix": [5, 4], "x": 10, "y": 1},
-                {"matrix": [5, 5], "x": 11, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2},
-                {"matrix": [2, 1], "x": 1, "y": 2},
-                {"matrix": [2, 2], "x": 2, "y": 2},
-                {"matrix": [2, 3], "x": 3, "y": 2},
-                {"matrix": [2, 4], "x": 4, "y": 2},
-                {"matrix": [2, 5], "x": 5, "y": 2},
-                {"matrix": [6, 0], "x": 6, "y": 2},
-                {"matrix": [6, 1], "x": 7, "y": 2},
-                {"matrix": [6, 2], "x": 8, "y": 2},
-                {"matrix": [6, 3], "x": 9, "y": 2},
-                {"matrix": [6, 4], "x": 10, "y": 2},
-                {"matrix": [6, 5], "x": 11, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3},
-                {"matrix": [3, 1], "x": 1, "y": 3},
-                {"matrix": [3, 2], "x": 2, "y": 3},
-                {"matrix": [3, 3], "x": 3, "y": 3},
-                {"matrix": [3, 4], "x": 4, "y": 3},
-                {"matrix": [3, 5], "x": 5, "y": 3},
-                {"matrix": [7, 0], "x": 6, "y": 3},
-                {"matrix": [7, 1], "x": 7, "y": 3},
-                {"matrix": [7, 2], "x": 8, "y": 3},
-                {"matrix": [7, 3], "x": 9, "y": 3},
-                {"matrix": [7, 4], "x": 10, "y": 3},
-                {"matrix": [7, 5], "x": 11, "y": 3},
-
-                {"matrix": [8, 0], "x": 0, "y": 4},
-                {"matrix": [8, 1], "x": 1, "y": 4},
-                {"matrix": [8, 2], "x": 2, "y": 4},
-                {"matrix": [9, 3], "x": 3, "y": 4},
-                {"matrix": [9, 4], "x": 4, "y": 4},
-                {"matrix": [9, 5], "x": 5, "y": 4},
-                {"matrix": [9, 1], "x": 6, "y": 4, "w": 2},
-                {"matrix": [9, 2], "x": 8, "y": 4},
-                {"matrix": [8, 3], "x": 9, "y": 4},
-                {"matrix": [8, 4], "x": 10, "y": 4},
-                {"matrix": [8, 5], "x": 11, "y": 4}
-            ]
-        },
-        "LAYOUT_preonic_1x2uL": {
-            "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": [4, 0], "x": 6, "y": 0},
-                {"matrix": [4, 1], "x": 7, "y": 0},
-                {"matrix": [4, 2], "x": 8, "y": 0},
-                {"matrix": [4, 3], "x": 9, "y": 0},
-                {"matrix": [4, 4], "x": 10, "y": 0},
-                {"matrix": [4, 5], "x": 11, "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": [1, 4], "x": 4, "y": 1},
-                {"matrix": [1, 5], "x": 5, "y": 1},
-                {"matrix": [5, 0], "x": 6, "y": 1},
-                {"matrix": [5, 1], "x": 7, "y": 1},
-                {"matrix": [5, 2], "x": 8, "y": 1},
-                {"matrix": [5, 3], "x": 9, "y": 1},
-                {"matrix": [5, 4], "x": 10, "y": 1},
-                {"matrix": [5, 5], "x": 11, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2},
-                {"matrix": [2, 1], "x": 1, "y": 2},
-                {"matrix": [2, 2], "x": 2, "y": 2},
-                {"matrix": [2, 3], "x": 3, "y": 2},
-                {"matrix": [2, 4], "x": 4, "y": 2},
-                {"matrix": [2, 5], "x": 5, "y": 2},
-                {"matrix": [6, 0], "x": 6, "y": 2},
-                {"matrix": [6, 1], "x": 7, "y": 2},
-                {"matrix": [6, 2], "x": 8, "y": 2},
-                {"matrix": [6, 3], "x": 9, "y": 2},
-                {"matrix": [6, 4], "x": 10, "y": 2},
-                {"matrix": [6, 5], "x": 11, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3},
-                {"matrix": [3, 1], "x": 1, "y": 3},
-                {"matrix": [3, 2], "x": 2, "y": 3},
-                {"matrix": [3, 3], "x": 3, "y": 3},
-                {"matrix": [3, 4], "x": 4, "y": 3},
-                {"matrix": [3, 5], "x": 5, "y": 3},
-                {"matrix": [7, 0], "x": 6, "y": 3},
-                {"matrix": [7, 1], "x": 7, "y": 3},
-                {"matrix": [7, 2], "x": 8, "y": 3},
-                {"matrix": [7, 3], "x": 9, "y": 3},
-                {"matrix": [7, 4], "x": 10, "y": 3},
-                {"matrix": [7, 5], "x": 11, "y": 3},
-
-                {"matrix": [8, 0], "x": 0, "y": 4},
-                {"matrix": [8, 1], "x": 1, "y": 4},
-                {"matrix": [8, 2], "x": 2, "y": 4},
-                {"matrix": [9, 3], "x": 3, "y": 4},
-                {"matrix": [9, 5], "x": 4, "y": 4, "w": 2},
-                {"matrix": [9, 0], "x": 6, "y": 4},
-                {"matrix": [9, 1], "x": 7, "y": 4},
-                {"matrix": [9, 2], "x": 8, "y": 4},
-                {"matrix": [8, 3], "x": 9, "y": 4},
-                {"matrix": [8, 4], "x": 10, "y": 4},
-                {"matrix": [8, 5], "x": 11, "y": 4}
-            ]
-        },
-        "LAYOUT_preonic_2x2u": {
-            "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": [4, 0], "x": 6, "y": 0},
-                {"matrix": [4, 1], "x": 7, "y": 0},
-                {"matrix": [4, 2], "x": 8, "y": 0},
-                {"matrix": [4, 3], "x": 9, "y": 0},
-                {"matrix": [4, 4], "x": 10, "y": 0},
-                {"matrix": [4, 5], "x": 11, "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": [1, 4], "x": 4, "y": 1},
-                {"matrix": [1, 5], "x": 5, "y": 1},
-                {"matrix": [5, 0], "x": 6, "y": 1},
-                {"matrix": [5, 1], "x": 7, "y": 1},
-                {"matrix": [5, 2], "x": 8, "y": 1},
-                {"matrix": [5, 3], "x": 9, "y": 1},
-                {"matrix": [5, 4], "x": 10, "y": 1},
-                {"matrix": [5, 5], "x": 11, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2},
-                {"matrix": [2, 1], "x": 1, "y": 2},
-                {"matrix": [2, 2], "x": 2, "y": 2},
-                {"matrix": [2, 3], "x": 3, "y": 2},
-                {"matrix": [2, 4], "x": 4, "y": 2},
-                {"matrix": [2, 5], "x": 5, "y": 2},
-                {"matrix": [6, 0], "x": 6, "y": 2},
-                {"matrix": [6, 1], "x": 7, "y": 2},
-                {"matrix": [6, 2], "x": 8, "y": 2},
-                {"matrix": [6, 3], "x": 9, "y": 2},
-                {"matrix": [6, 4], "x": 10, "y": 2},
-                {"matrix": [6, 5], "x": 11, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3},
-                {"matrix": [3, 1], "x": 1, "y": 3},
-                {"matrix": [3, 2], "x": 2, "y": 3},
-                {"matrix": [3, 3], "x": 3, "y": 3},
-                {"matrix": [3, 4], "x": 4, "y": 3},
-                {"matrix": [3, 5], "x": 5, "y": 3},
-                {"matrix": [7, 0], "x": 6, "y": 3},
-                {"matrix": [7, 1], "x": 7, "y": 3},
-                {"matrix": [7, 2], "x": 8, "y": 3},
-                {"matrix": [7, 3], "x": 9, "y": 3},
-                {"matrix": [7, 4], "x": 10, "y": 3},
-                {"matrix": [7, 5], "x": 11, "y": 3},
-
-                {"matrix": [8, 0], "x": 0, "y": 4},
-                {"matrix": [8, 1], "x": 1, "y": 4},
-                {"matrix": [8, 2], "x": 2, "y": 4},
-                {"matrix": [9, 3], "x": 3, "y": 4},
-                {"matrix": [9, 5], "x": 4, "y": 4, "w": 2},
-                {"matrix": [9, 1], "x": 6, "y": 4, "w": 2},
-                {"matrix": [9, 2], "x": 8, "y": 4},
-                {"matrix": [8, 3], "x": 9, "y": 4},
-                {"matrix": [8, 4], "x": 10, "y": 4},
-                {"matrix": [8, 5], "x": 11, "y": 4}
-            ]
-        },
-        "LAYOUT_ortho_5x12": {
-            "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": [4, 0], "x": 6, "y": 0},
-                {"matrix": [4, 1], "x": 7, "y": 0},
-                {"matrix": [4, 2], "x": 8, "y": 0},
-                {"matrix": [4, 3], "x": 9, "y": 0},
-                {"matrix": [4, 4], "x": 10, "y": 0},
-                {"matrix": [4, 5], "x": 11, "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": [1, 4], "x": 4, "y": 1},
-                {"matrix": [1, 5], "x": 5, "y": 1},
-                {"matrix": [5, 0], "x": 6, "y": 1},
-                {"matrix": [5, 1], "x": 7, "y": 1},
-                {"matrix": [5, 2], "x": 8, "y": 1},
-                {"matrix": [5, 3], "x": 9, "y": 1},
-                {"matrix": [5, 4], "x": 10, "y": 1},
-                {"matrix": [5, 5], "x": 11, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2},
-                {"matrix": [2, 1], "x": 1, "y": 2},
-                {"matrix": [2, 2], "x": 2, "y": 2},
-                {"matrix": [2, 3], "x": 3, "y": 2},
-                {"matrix": [2, 4], "x": 4, "y": 2},
-                {"matrix": [2, 5], "x": 5, "y": 2},
-                {"matrix": [6, 0], "x": 6, "y": 2},
-                {"matrix": [6, 1], "x": 7, "y": 2},
-                {"matrix": [6, 2], "x": 8, "y": 2},
-                {"matrix": [6, 3], "x": 9, "y": 2},
-                {"matrix": [6, 4], "x": 10, "y": 2},
-                {"matrix": [6, 5], "x": 11, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3},
-                {"matrix": [3, 1], "x": 1, "y": 3},
-                {"matrix": [3, 2], "x": 2, "y": 3},
-                {"matrix": [3, 3], "x": 3, "y": 3},
-                {"matrix": [3, 4], "x": 4, "y": 3},
-                {"matrix": [3, 5], "x": 5, "y": 3},
-                {"matrix": [7, 0], "x": 6, "y": 3},
-                {"matrix": [7, 1], "x": 7, "y": 3},
-                {"matrix": [7, 2], "x": 8, "y": 3},
-                {"matrix": [7, 3], "x": 9, "y": 3},
-                {"matrix": [7, 4], "x": 10, "y": 3},
-                {"matrix": [7, 5], "x": 11, "y": 3},
-
-                {"matrix": [8, 0], "x": 0, "y": 4},
-                {"matrix": [8, 1], "x": 1, "y": 4},
-                {"matrix": [8, 2], "x": 2, "y": 4},
-                {"matrix": [9, 3], "x": 3, "y": 4},
-                {"matrix": [9, 4], "x": 4, "y": 4},
-                {"matrix": [9, 5], "x": 5, "y": 4},
-                {"matrix": [9, 0], "x": 6, "y": 4},
-                {"matrix": [9, 1], "x": 7, "y": 4},
-                {"matrix": [9, 2], "x": 8, "y": 4},
-                {"matrix": [8, 3], "x": 9, "y": 4},
-                {"matrix": [8, 4], "x": 10, "y": 4},
-                {"matrix": [8, 5], "x": 11, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/preonic/rev3_drop/keyboard.json b/keyboards/preonic/rev3_drop/keyboard.json
new file mode 100644
index 00000000000..f1cf1dfec1f
--- /dev/null
+++ b/keyboards/preonic/rev3_drop/keyboard.json
@@ -0,0 +1,399 @@
+{
+    "keyboard_name": "Preonic",
+    "manufacturer": "Drop",
+    "usb": {
+        "vid": "0x03A8",
+        "pid": "0xA649",
+        "device_version": "0.0.3"
+    },
+    "features": {
+        "audio": true,
+        "bootmagic": true,
+        "command": true,
+        "console": true,
+        "dip_switch": true,
+        "encoder": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgblight": true
+    },
+    "rgblight": {
+        "led_count": 9,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": true,
+            "twinkle": true
+        }
+    },
+    "ws2812": {
+        "pin": "A1",
+        "driver": "pwm"
+    },
+    "rgb_matrix": {
+        "driver": "ws2812"
+    },
+    "matrix_pins": {
+        "cols": ["B11", "B10", "B2", "B1", "A7", "B0"],
+        "rows": ["A10", "A9", "A8", "B15", "C13", "C14", "C15", "A2", "A3", "A6"]
+    },
+    "diode_direction": "COL2ROW",
+    "dip_switch": {
+        "pins": ["B14", "A15", "A0", "B9"]
+    },
+    "encoder": {
+        "rotary": [
+            {"pin_a": "B12", "pin_b": "B13"}
+        ]
+    },
+    "processor": "STM32F303",
+    "bootloader": "stm32-dfu",
+    "community_layouts": ["ortho_5x12"],
+    "layout_aliases": {
+        "LAYOUT_preonic_grid": "LAYOUT_ortho_5x12"
+    },
+    "layouts": {
+        "LAYOUT_preonic_1x2uC": {
+            "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": [4, 0], "x": 6, "y": 0},
+                {"matrix": [4, 1], "x": 7, "y": 0},
+                {"matrix": [4, 2], "x": 8, "y": 0},
+                {"matrix": [4, 3], "x": 9, "y": 0},
+                {"matrix": [4, 4], "x": 10, "y": 0},
+                {"matrix": [4, 5], "x": 11, "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": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [5, 0], "x": 6, "y": 1},
+                {"matrix": [5, 1], "x": 7, "y": 1},
+                {"matrix": [5, 2], "x": 8, "y": 1},
+                {"matrix": [5, 3], "x": 9, "y": 1},
+                {"matrix": [5, 4], "x": 10, "y": 1},
+                {"matrix": [5, 5], "x": 11, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [6, 0], "x": 6, "y": 2},
+                {"matrix": [6, 1], "x": 7, "y": 2},
+                {"matrix": [6, 2], "x": 8, "y": 2},
+                {"matrix": [6, 3], "x": 9, "y": 2},
+                {"matrix": [6, 4], "x": 10, "y": 2},
+                {"matrix": [6, 5], "x": 11, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
+                {"matrix": [7, 0], "x": 6, "y": 3},
+                {"matrix": [7, 1], "x": 7, "y": 3},
+                {"matrix": [7, 2], "x": 8, "y": 3},
+                {"matrix": [7, 3], "x": 9, "y": 3},
+                {"matrix": [7, 4], "x": 10, "y": 3},
+                {"matrix": [7, 5], "x": 11, "y": 3},
+
+                {"matrix": [8, 0], "x": 0, "y": 4},
+                {"matrix": [8, 1], "x": 1, "y": 4},
+                {"matrix": [8, 2], "x": 2, "y": 4},
+                {"matrix": [9, 3], "x": 3, "y": 4},
+                {"matrix": [9, 4], "x": 4, "y": 4},
+                {"matrix": [9, 0], "x": 5, "y": 4, "w": 2},
+                {"matrix": [9, 1], "x": 7, "y": 4},
+                {"matrix": [9, 2], "x": 8, "y": 4},
+                {"matrix": [8, 3], "x": 9, "y": 4},
+                {"matrix": [8, 4], "x": 10, "y": 4},
+                {"matrix": [8, 5], "x": 11, "y": 4}
+            ]
+        },
+        "LAYOUT_preonic_1x2uR": {
+            "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": [4, 0], "x": 6, "y": 0},
+                {"matrix": [4, 1], "x": 7, "y": 0},
+                {"matrix": [4, 2], "x": 8, "y": 0},
+                {"matrix": [4, 3], "x": 9, "y": 0},
+                {"matrix": [4, 4], "x": 10, "y": 0},
+                {"matrix": [4, 5], "x": 11, "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": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [5, 0], "x": 6, "y": 1},
+                {"matrix": [5, 1], "x": 7, "y": 1},
+                {"matrix": [5, 2], "x": 8, "y": 1},
+                {"matrix": [5, 3], "x": 9, "y": 1},
+                {"matrix": [5, 4], "x": 10, "y": 1},
+                {"matrix": [5, 5], "x": 11, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [6, 0], "x": 6, "y": 2},
+                {"matrix": [6, 1], "x": 7, "y": 2},
+                {"matrix": [6, 2], "x": 8, "y": 2},
+                {"matrix": [6, 3], "x": 9, "y": 2},
+                {"matrix": [6, 4], "x": 10, "y": 2},
+                {"matrix": [6, 5], "x": 11, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
+                {"matrix": [7, 0], "x": 6, "y": 3},
+                {"matrix": [7, 1], "x": 7, "y": 3},
+                {"matrix": [7, 2], "x": 8, "y": 3},
+                {"matrix": [7, 3], "x": 9, "y": 3},
+                {"matrix": [7, 4], "x": 10, "y": 3},
+                {"matrix": [7, 5], "x": 11, "y": 3},
+
+                {"matrix": [8, 0], "x": 0, "y": 4},
+                {"matrix": [8, 1], "x": 1, "y": 4},
+                {"matrix": [8, 2], "x": 2, "y": 4},
+                {"matrix": [9, 3], "x": 3, "y": 4},
+                {"matrix": [9, 4], "x": 4, "y": 4},
+                {"matrix": [9, 5], "x": 5, "y": 4},
+                {"matrix": [9, 1], "x": 6, "y": 4, "w": 2},
+                {"matrix": [9, 2], "x": 8, "y": 4},
+                {"matrix": [8, 3], "x": 9, "y": 4},
+                {"matrix": [8, 4], "x": 10, "y": 4},
+                {"matrix": [8, 5], "x": 11, "y": 4}
+            ]
+        },
+        "LAYOUT_preonic_1x2uL": {
+            "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": [4, 0], "x": 6, "y": 0},
+                {"matrix": [4, 1], "x": 7, "y": 0},
+                {"matrix": [4, 2], "x": 8, "y": 0},
+                {"matrix": [4, 3], "x": 9, "y": 0},
+                {"matrix": [4, 4], "x": 10, "y": 0},
+                {"matrix": [4, 5], "x": 11, "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": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [5, 0], "x": 6, "y": 1},
+                {"matrix": [5, 1], "x": 7, "y": 1},
+                {"matrix": [5, 2], "x": 8, "y": 1},
+                {"matrix": [5, 3], "x": 9, "y": 1},
+                {"matrix": [5, 4], "x": 10, "y": 1},
+                {"matrix": [5, 5], "x": 11, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [6, 0], "x": 6, "y": 2},
+                {"matrix": [6, 1], "x": 7, "y": 2},
+                {"matrix": [6, 2], "x": 8, "y": 2},
+                {"matrix": [6, 3], "x": 9, "y": 2},
+                {"matrix": [6, 4], "x": 10, "y": 2},
+                {"matrix": [6, 5], "x": 11, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
+                {"matrix": [7, 0], "x": 6, "y": 3},
+                {"matrix": [7, 1], "x": 7, "y": 3},
+                {"matrix": [7, 2], "x": 8, "y": 3},
+                {"matrix": [7, 3], "x": 9, "y": 3},
+                {"matrix": [7, 4], "x": 10, "y": 3},
+                {"matrix": [7, 5], "x": 11, "y": 3},
+
+                {"matrix": [8, 0], "x": 0, "y": 4},
+                {"matrix": [8, 1], "x": 1, "y": 4},
+                {"matrix": [8, 2], "x": 2, "y": 4},
+                {"matrix": [9, 3], "x": 3, "y": 4},
+                {"matrix": [9, 5], "x": 4, "y": 4, "w": 2},
+                {"matrix": [9, 0], "x": 6, "y": 4},
+                {"matrix": [9, 1], "x": 7, "y": 4},
+                {"matrix": [9, 2], "x": 8, "y": 4},
+                {"matrix": [8, 3], "x": 9, "y": 4},
+                {"matrix": [8, 4], "x": 10, "y": 4},
+                {"matrix": [8, 5], "x": 11, "y": 4}
+            ]
+        },
+        "LAYOUT_preonic_2x2u": {
+            "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": [4, 0], "x": 6, "y": 0},
+                {"matrix": [4, 1], "x": 7, "y": 0},
+                {"matrix": [4, 2], "x": 8, "y": 0},
+                {"matrix": [4, 3], "x": 9, "y": 0},
+                {"matrix": [4, 4], "x": 10, "y": 0},
+                {"matrix": [4, 5], "x": 11, "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": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [5, 0], "x": 6, "y": 1},
+                {"matrix": [5, 1], "x": 7, "y": 1},
+                {"matrix": [5, 2], "x": 8, "y": 1},
+                {"matrix": [5, 3], "x": 9, "y": 1},
+                {"matrix": [5, 4], "x": 10, "y": 1},
+                {"matrix": [5, 5], "x": 11, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [6, 0], "x": 6, "y": 2},
+                {"matrix": [6, 1], "x": 7, "y": 2},
+                {"matrix": [6, 2], "x": 8, "y": 2},
+                {"matrix": [6, 3], "x": 9, "y": 2},
+                {"matrix": [6, 4], "x": 10, "y": 2},
+                {"matrix": [6, 5], "x": 11, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
+                {"matrix": [7, 0], "x": 6, "y": 3},
+                {"matrix": [7, 1], "x": 7, "y": 3},
+                {"matrix": [7, 2], "x": 8, "y": 3},
+                {"matrix": [7, 3], "x": 9, "y": 3},
+                {"matrix": [7, 4], "x": 10, "y": 3},
+                {"matrix": [7, 5], "x": 11, "y": 3},
+
+                {"matrix": [8, 0], "x": 0, "y": 4},
+                {"matrix": [8, 1], "x": 1, "y": 4},
+                {"matrix": [8, 2], "x": 2, "y": 4},
+                {"matrix": [9, 3], "x": 3, "y": 4},
+                {"matrix": [9, 5], "x": 4, "y": 4, "w": 2},
+                {"matrix": [9, 1], "x": 6, "y": 4, "w": 2},
+                {"matrix": [9, 2], "x": 8, "y": 4},
+                {"matrix": [8, 3], "x": 9, "y": 4},
+                {"matrix": [8, 4], "x": 10, "y": 4},
+                {"matrix": [8, 5], "x": 11, "y": 4}
+            ]
+        },
+        "LAYOUT_ortho_5x12": {
+            "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": [4, 0], "x": 6, "y": 0},
+                {"matrix": [4, 1], "x": 7, "y": 0},
+                {"matrix": [4, 2], "x": 8, "y": 0},
+                {"matrix": [4, 3], "x": 9, "y": 0},
+                {"matrix": [4, 4], "x": 10, "y": 0},
+                {"matrix": [4, 5], "x": 11, "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": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [5, 0], "x": 6, "y": 1},
+                {"matrix": [5, 1], "x": 7, "y": 1},
+                {"matrix": [5, 2], "x": 8, "y": 1},
+                {"matrix": [5, 3], "x": 9, "y": 1},
+                {"matrix": [5, 4], "x": 10, "y": 1},
+                {"matrix": [5, 5], "x": 11, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [6, 0], "x": 6, "y": 2},
+                {"matrix": [6, 1], "x": 7, "y": 2},
+                {"matrix": [6, 2], "x": 8, "y": 2},
+                {"matrix": [6, 3], "x": 9, "y": 2},
+                {"matrix": [6, 4], "x": 10, "y": 2},
+                {"matrix": [6, 5], "x": 11, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
+                {"matrix": [7, 0], "x": 6, "y": 3},
+                {"matrix": [7, 1], "x": 7, "y": 3},
+                {"matrix": [7, 2], "x": 8, "y": 3},
+                {"matrix": [7, 3], "x": 9, "y": 3},
+                {"matrix": [7, 4], "x": 10, "y": 3},
+                {"matrix": [7, 5], "x": 11, "y": 3},
+
+                {"matrix": [8, 0], "x": 0, "y": 4},
+                {"matrix": [8, 1], "x": 1, "y": 4},
+                {"matrix": [8, 2], "x": 2, "y": 4},
+                {"matrix": [9, 3], "x": 3, "y": 4},
+                {"matrix": [9, 4], "x": 4, "y": 4},
+                {"matrix": [9, 5], "x": 5, "y": 4},
+                {"matrix": [9, 0], "x": 6, "y": 4},
+                {"matrix": [9, 1], "x": 7, "y": 4},
+                {"matrix": [9, 2], "x": 8, "y": 4},
+                {"matrix": [8, 3], "x": 9, "y": 4},
+                {"matrix": [8, 4], "x": 10, "y": 4},
+                {"matrix": [8, 5], "x": 11, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/preonic/rev3_drop/rules.mk b/keyboards/preonic/rev3_drop/rules.mk
index d3ff068813a..8784813b335 100644
--- a/keyboards/preonic/rev3_drop/rules.mk
+++ b/keyboards/preonic/rev3_drop/rules.mk
@@ -1,20 +1,2 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = yes        # Console for debug
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-AUDIO_ENABLE = yes          # Audio output
 CUSTOM_MATRIX = yes
-ENCODER_ENABLE = yes
-DIP_SWITCH_ENABLE = yes
-
-# Do not enable RGB_MATRIX_ENABLE together with RGBLIGHT_ENABLE
-RGB_MATRIX_ENABLE = no
-
 SRC += matrix.c
diff --git a/keyboards/primekb/prime_e/config.h b/keyboards/primekb/prime_e/config.h
deleted file mode 100644
index 6c8ce4c0eaf..00000000000
--- a/keyboards/primekb/prime_e/config.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
-Copyright 2019 Holten Campbell
-
-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
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/primekb/prime_e/info.json b/keyboards/primekb/prime_e/info.json
index 44b8227fb64..e7ed77e403a 100644
--- a/keyboards/primekb/prime_e/info.json
+++ b/keyboards/primekb/prime_e/info.json
@@ -13,6 +13,12 @@
     "mousekey": false,
     "nkro": true
   },
+  "qmk": {
+    "locking": {
+      "enabled": true,
+      "resync": true
+    }
+  },
   "matrix_pins": {
     "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "D6", "D4", "D5", "D3", "D2", "D1", "D0"],
     "rows": ["E6", "C7", "B5", "B4"]
diff --git a/keyboards/primekb/prime_e/rgb/info.json b/keyboards/primekb/prime_e/rgb/info.json
deleted file mode 100644
index 998331ad897..00000000000
--- a/keyboards/primekb/prime_e/rgb/info.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-    "keyboard_name": "Prime_E RGB",
-    "usb": {
-        "pid": "0x0052",
-        "device_version": "0.0.1"
-    },
-    "rgblight": {
-        "led_count": 8,
-        "animations": {
-            "breathing": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "snake": true,
-            "knight": true,
-            "christmas": true,
-            "static_gradient": true,
-            "rgb_test": true,
-            "alternating": true,
-            "twinkle": true
-        }
-    },
-    "ws2812": {
-        "pin": "B7"
-    }
-}
diff --git a/keyboards/primekb/prime_e/rgb/keyboard.json b/keyboards/primekb/prime_e/rgb/keyboard.json
new file mode 100644
index 00000000000..f1cb67358cb
--- /dev/null
+++ b/keyboards/primekb/prime_e/rgb/keyboard.json
@@ -0,0 +1,28 @@
+{
+    "keyboard_name": "Prime_E RGB",
+    "usb": {
+        "pid": "0x0052",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "rgblight": true
+    },
+    "rgblight": {
+        "led_count": 8,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": true,
+            "twinkle": true
+        }
+    },
+    "ws2812": {
+        "pin": "B7"
+    }
+}
diff --git a/keyboards/primekb/prime_e/rgb/rules.mk b/keyboards/primekb/prime_e/rgb/rules.mk
deleted file mode 100644
index 725c0cebcc5..00000000000
--- a/keyboards/primekb/prime_e/rgb/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-BACKLIGHT_ENABLE = no
-RGBLIGHT_ENABLE = yes
diff --git a/keyboards/primekb/prime_e/std/info.json b/keyboards/primekb/prime_e/std/info.json
deleted file mode 100644
index b6078c9d7a2..00000000000
--- a/keyboards/primekb/prime_e/std/info.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-    "keyboard_name": "Prime_E",
-    "usb": {
-        "pid": "0x0051",
-        "device_version": "0.0.1"
-    },
-    "backlight": {
-        "pin": "B7",
-        "levels": 5
-    }
-}
diff --git a/keyboards/primekb/prime_e/std/keyboard.json b/keyboards/primekb/prime_e/std/keyboard.json
new file mode 100644
index 00000000000..989ff941b5f
--- /dev/null
+++ b/keyboards/primekb/prime_e/std/keyboard.json
@@ -0,0 +1,14 @@
+{
+    "keyboard_name": "Prime_E",
+    "usb": {
+        "pid": "0x0051",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "backlight": true
+    },
+    "backlight": {
+        "pin": "B7",
+        "levels": 5
+    }
+}
diff --git a/keyboards/primekb/prime_e/std/rules.mk b/keyboards/primekb/prime_e/std/rules.mk
deleted file mode 100644
index f938676f448..00000000000
--- a/keyboards/primekb/prime_e/std/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-BACKLIGHT_ENABLE = yes
-RGBLIGHT_ENABLE = no
diff --git a/keyboards/primekb/prime_l/config.h b/keyboards/primekb/prime_l/config.h
deleted file mode 100644
index 053bc6236a7..00000000000
--- a/keyboards/primekb/prime_l/config.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
-Copyright 2018 Jumail Mundekkat
-Copyright 2020 Holten Campbell
-
-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
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/primekb/prime_l/info.json b/keyboards/primekb/prime_l/info.json
index 52d67139142..ed905f2b0b8 100644
--- a/keyboards/primekb/prime_l/info.json
+++ b/keyboards/primekb/prime_l/info.json
@@ -10,6 +10,12 @@
     "mousekey": true,
     "nkro": true
   },
+  "qmk": {
+    "locking": {
+      "enabled": true,
+      "resync": true
+    }
+  },
   "usb": {
     "vid": "0x5052"
   },
diff --git a/keyboards/primekb/prime_l/v1/info.json b/keyboards/primekb/prime_l/v1/info.json
deleted file mode 100644
index c68d9929433..00000000000
--- a/keyboards/primekb/prime_l/v1/info.json
+++ /dev/null
@@ -1,103 +0,0 @@
-{
-  "keyboard_name": "Prime_L V1",
-  "url": "https://www.primekb.com",
-  "maintainer": "MxBlu",
-  "usb": {
-    "pid": "0x504C",
-    "device_version": "0.0.1"
-  },
-  "matrix_pins": {
-    "cols": ["D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "C7", "C6", "F7", "F6", "F5", "F4", "F1", "F0"],
-    "rows": ["D1", "D0", "B7", "B3", "B2"]
-  },
-  "diode_direction": "COL2ROW",
-  "backlight": {
-    "pin": "B6",
-    "levels": 4
-  },
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 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, 14], "x": 14, "y": 0},
-                {"matrix": [0, 15], "x": 15, "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": [1, 4], "x": 4, "y": 1},
-                {"matrix": [1, 5], "x": 5, "y": 1},
-                {"matrix": [1, 6], "x": 6, "y": 1},
-                {"matrix": [1, 7], "x": 7, "y": 1},
-                {"matrix": [1, 8], "x": 8, "y": 1},
-                {"matrix": [1, 9], "x": 9, "y": 1},
-                {"matrix": [1, 10], "x": 10, "y": 1},
-                {"matrix": [1, 11], "x": 11, "y": 1},
-                {"matrix": [1, 12], "x": 12, "y": 1},
-                {"matrix": [1, 13], "x": 13, "y": 1},
-                {"matrix": [1, 14], "x": 14, "y": 1},
-                {"matrix": [1, 15], "x": 15, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2},
-                {"matrix": [2, 1], "x": 1, "y": 2},
-                {"matrix": [2, 2], "x": 2, "y": 2},
-                {"matrix": [2, 3], "x": 3, "y": 2, "w": 1.25},
-                {"matrix": [2, 4], "x": 4.25, "y": 2},
-                {"matrix": [2, 5], "x": 5.25, "y": 2},
-                {"matrix": [2, 6], "x": 6.25, "y": 2},
-                {"matrix": [2, 7], "x": 7.25, "y": 2},
-                {"matrix": [2, 8], "x": 8.25, "y": 2},
-                {"matrix": [2, 9], "x": 9.25, "y": 2},
-                {"matrix": [2, 10], "x": 10.25, "y": 2},
-                {"matrix": [2, 11], "x": 11.25, "y": 2},
-                {"matrix": [2, 12], "x": 12.25, "y": 2},
-                {"matrix": [2, 13], "x": 13.25, "y": 2},
-                {"matrix": [2, 15], "x": 14.25, "y": 2, "w": 1.75},
-
-                {"matrix": [3, 0], "x": 0, "y": 3},
-                {"matrix": [3, 1], "x": 1, "y": 3},
-                {"matrix": [3, 2], "x": 2, "y": 3},
-                {"matrix": [3, 3], "x": 3, "y": 3, "w": 1.75},
-                {"matrix": [3, 5], "x": 4.75, "y": 3},
-                {"matrix": [3, 6], "x": 5.75, "y": 3},
-                {"matrix": [3, 7], "x": 6.75, "y": 3},
-                {"matrix": [3, 8], "x": 7.75, "y": 3},
-                {"matrix": [3, 9], "x": 8.75, "y": 3},
-                {"matrix": [3, 10], "x": 9.75, "y": 3},
-                {"matrix": [3, 11], "x": 10.75, "y": 3},
-                {"matrix": [3, 12], "x": 11.75, "y": 3},
-                {"matrix": [3, 13], "x": 12.75, "y": 3},
-                {"matrix": [3, 14], "x": 13.75, "y": 3},
-                {"matrix": [3, 15], "x": 14.75, "y": 3, "w": 1.25},
-
-                {"matrix": [4, 0], "x": 0, "y": 4},
-                {"matrix": [4, 1], "x": 1, "y": 4},
-                {"matrix": [4, 2], "x": 2, "y": 4},
-                {"matrix": [4, 3], "x": 3, "y": 4, "w": 1.25},
-                {"matrix": [4, 5], "x": 4.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 6], "x": 5.5, "y": 4},
-                {"matrix": [4, 7], "x": 6.5, "y": 4},
-                {"matrix": [4, 8], "x": 7.5, "y": 4, "w": 2},
-                {"matrix": [4, 10], "x": 9.5, "y": 4, "w": 2.25},
-                {"matrix": [4, 12], "x": 11.75, "y": 4},
-                {"matrix": [4, 13], "x": 12.75, "y": 4},
-                {"matrix": [4, 14], "x": 13.75, "y": 4},
-                {"matrix": [4, 15], "x": 14.75, "y": 4, "w": 1.25}
-            ]
-        }
-    }
-}
diff --git a/keyboards/primekb/prime_l/v1/keyboard.json b/keyboards/primekb/prime_l/v1/keyboard.json
new file mode 100644
index 00000000000..c14d18ece3e
--- /dev/null
+++ b/keyboards/primekb/prime_l/v1/keyboard.json
@@ -0,0 +1,106 @@
+{
+  "keyboard_name": "Prime_L V1",
+  "url": "https://www.primekb.com",
+  "maintainer": "MxBlu",
+  "usb": {
+    "pid": "0x504C",
+    "device_version": "0.0.1"
+  },
+  "features": {
+    "backlight": true
+  },
+  "matrix_pins": {
+    "cols": ["D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "C7", "C6", "F7", "F6", "F5", "F4", "F1", "F0"],
+    "rows": ["D1", "D0", "B7", "B3", "B2"]
+  },
+  "diode_direction": "COL2ROW",
+  "backlight": {
+    "pin": "B6",
+    "levels": 4
+  },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 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, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "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": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+                {"matrix": [1, 12], "x": 12, "y": 1},
+                {"matrix": [1, 13], "x": 13, "y": 1},
+                {"matrix": [1, 14], "x": 14, "y": 1},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2, "w": 1.25},
+                {"matrix": [2, 4], "x": 4.25, "y": 2},
+                {"matrix": [2, 5], "x": 5.25, "y": 2},
+                {"matrix": [2, 6], "x": 6.25, "y": 2},
+                {"matrix": [2, 7], "x": 7.25, "y": 2},
+                {"matrix": [2, 8], "x": 8.25, "y": 2},
+                {"matrix": [2, 9], "x": 9.25, "y": 2},
+                {"matrix": [2, 10], "x": 10.25, "y": 2},
+                {"matrix": [2, 11], "x": 11.25, "y": 2},
+                {"matrix": [2, 12], "x": 12.25, "y": 2},
+                {"matrix": [2, 13], "x": 13.25, "y": 2},
+                {"matrix": [2, 15], "x": 14.25, "y": 2, "w": 1.75},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3, "w": 1.75},
+                {"matrix": [3, 5], "x": 4.75, "y": 3},
+                {"matrix": [3, 6], "x": 5.75, "y": 3},
+                {"matrix": [3, 7], "x": 6.75, "y": 3},
+                {"matrix": [3, 8], "x": 7.75, "y": 3},
+                {"matrix": [3, 9], "x": 8.75, "y": 3},
+                {"matrix": [3, 10], "x": 9.75, "y": 3},
+                {"matrix": [3, 11], "x": 10.75, "y": 3},
+                {"matrix": [3, 12], "x": 11.75, "y": 3},
+                {"matrix": [3, 13], "x": 12.75, "y": 3},
+                {"matrix": [3, 14], "x": 13.75, "y": 3},
+                {"matrix": [3, 15], "x": 14.75, "y": 3, "w": 1.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+                {"matrix": [4, 2], "x": 2, "y": 4},
+                {"matrix": [4, 3], "x": 3, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 4.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 5.5, "y": 4},
+                {"matrix": [4, 7], "x": 6.5, "y": 4},
+                {"matrix": [4, 8], "x": 7.5, "y": 4, "w": 2},
+                {"matrix": [4, 10], "x": 9.5, "y": 4, "w": 2.25},
+                {"matrix": [4, 12], "x": 11.75, "y": 4},
+                {"matrix": [4, 13], "x": 12.75, "y": 4},
+                {"matrix": [4, 14], "x": 13.75, "y": 4},
+                {"matrix": [4, 15], "x": 14.75, "y": 4, "w": 1.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/primekb/prime_l/v1/rules.mk b/keyboards/primekb/prime_l/v1/rules.mk
deleted file mode 100644
index 54a2685bf63..00000000000
--- a/keyboards/primekb/prime_l/v1/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-BACKLIGHT_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/primekb/prime_l/v2/info.json b/keyboards/primekb/prime_l/v2/keyboard.json
similarity index 100%
rename from keyboards/primekb/prime_l/v2/info.json
rename to keyboards/primekb/prime_l/v2/keyboard.json
diff --git a/keyboards/primekb/prime_l/v2/rules.mk b/keyboards/primekb/prime_l/v2/rules.mk
deleted file mode 100644
index f845616741c..00000000000
--- a/keyboards/primekb/prime_l/v2/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-BACKLIGHT_ENABLE = no
\ No newline at end of file
diff --git a/keyboards/printedpad/info.json b/keyboards/printedpad/keyboard.json
similarity index 100%
rename from keyboards/printedpad/info.json
rename to keyboards/printedpad/keyboard.json
diff --git a/keyboards/program_yoink/config.h b/keyboards/program_yoink/config.h
deleted file mode 100644
index dcf558fdf78..00000000000
--- a/keyboards/program_yoink/config.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
-Copyright 2020 melonbred
-
-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
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/program_yoink/info.json b/keyboards/program_yoink/info.json
new file mode 100644
index 00000000000..36a2befc701
--- /dev/null
+++ b/keyboards/program_yoink/info.json
@@ -0,0 +1,16 @@
+{
+    "features": {
+        "bootmagic": true,
+        "encoder": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": false,
+        "rgblight": true
+    },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    }
+}
\ No newline at end of file
diff --git a/keyboards/program_yoink/rules.mk b/keyboards/program_yoink/rules.mk
index 1d2265b8337..a7cc1a2dbf2 100644
--- a/keyboards/program_yoink/rules.mk
+++ b/keyboards/program_yoink/rules.mk
@@ -1,15 +1 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-ENCODER_ENABLE = yes        # Enable rotary encoder
-
 DEFAULT_FOLDER = program_yoink/staggered
diff --git a/keyboards/projectkb/alice/rev1/info.json b/keyboards/projectkb/alice/rev1/info.json
deleted file mode 100644
index 1157fb13ae2..00000000000
--- a/keyboards/projectkb/alice/rev1/info.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-    "rgblight": {
-        "led_count": 14,
-        "animations": {
-            "breathing": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "snake": true,
-            "knight": true,
-            "christmas": true,
-            "static_gradient": true,
-            "rgb_test": true,
-            "alternating": true,
-            "twinkle": true
-        }
-    },
-    "ws2812": {
-        "pin": "B15",
-        "driver": "spi"
-    },
-    "matrix_pins": {
-        "cols": ["B2", "B10", "B11", "A9", "A15", "B3", "B4", "B5", "B6", "B7", "B8", "B9", "C13", "C14", "C15", "B12"],
-        "rows": ["B1", "B0", "A7", "A5", "A4"]
-    },
-    "diode_direction": "COL2ROW"
-}
diff --git a/keyboards/projectkb/alice/rev1/keyboard.json b/keyboards/projectkb/alice/rev1/keyboard.json
new file mode 100644
index 00000000000..1e97746ee88
--- /dev/null
+++ b/keyboards/projectkb/alice/rev1/keyboard.json
@@ -0,0 +1,36 @@
+{
+    "features": {
+        "backlight": true,
+        "bootmagic": true,
+        "command": true,
+        "console": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgblight": true
+    },
+    "rgblight": {
+        "led_count": 14,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": true,
+            "twinkle": true
+        }
+    },
+    "ws2812": {
+        "pin": "B15",
+        "driver": "spi"
+    },
+    "matrix_pins": {
+        "cols": ["B2", "B10", "B11", "A9", "A15", "B3", "B4", "B5", "B6", "B7", "B8", "B9", "C13", "C14", "C15", "B12"],
+        "rows": ["B1", "B0", "A7", "A5", "A4"]
+    },
+    "diode_direction": "COL2ROW"
+}
diff --git a/keyboards/projectkb/alice/rev1/rules.mk b/keyboards/projectkb/alice/rev1/rules.mk
deleted file mode 100644
index f689205b388..00000000000
--- a/keyboards/projectkb/alice/rev1/rules.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = yes        # Console for debug
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
diff --git a/keyboards/projectkb/alice/rev2/info.json b/keyboards/projectkb/alice/rev2/info.json
deleted file mode 100644
index be97136ccd2..00000000000
--- a/keyboards/projectkb/alice/rev2/info.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-    "rgblight": {
-        "led_count": 14,
-        "animations": {
-            "breathing": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "snake": true,
-            "knight": true,
-            "christmas": true,
-            "static_gradient": true,
-            "rgb_test": true,
-            "alternating": true,
-            "twinkle": true
-        }
-    },
-    "ws2812": {
-        "pin": "B15",
-        "driver": "spi"
-    },
-    "matrix_pins": {
-        "cols": ["B1", "B0", "A7", "A1", "A5", "A4", "A3", "A10", "B9", "B8", "B7", "B6", "B5", "B4", "B3", "A15"],
-        "rows": ["B2", "B10", "B11", "A2", "A0"]
-    },
-    "diode_direction": "COL2ROW"
-}
diff --git a/keyboards/projectkb/alice/rev2/keyboard.json b/keyboards/projectkb/alice/rev2/keyboard.json
new file mode 100644
index 00000000000..0ed3b88ea2a
--- /dev/null
+++ b/keyboards/projectkb/alice/rev2/keyboard.json
@@ -0,0 +1,36 @@
+{
+    "features": {
+        "backlight": true,
+        "bootmagic": true,
+        "command": true,
+        "console": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgblight": true
+    },
+    "rgblight": {
+        "led_count": 14,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": true,
+            "twinkle": true
+        }
+    },
+    "ws2812": {
+        "pin": "B15",
+        "driver": "spi"
+    },
+    "matrix_pins": {
+        "cols": ["B1", "B0", "A7", "A1", "A5", "A4", "A3", "A10", "B9", "B8", "B7", "B6", "B5", "B4", "B3", "A15"],
+        "rows": ["B2", "B10", "B11", "A2", "A0"]
+    },
+    "diode_direction": "COL2ROW"
+}
diff --git a/keyboards/projectkb/alice/rev2/rules.mk b/keyboards/projectkb/alice/rev2/rules.mk
deleted file mode 100644
index f689205b388..00000000000
--- a/keyboards/projectkb/alice/rev2/rules.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = yes        # Console for debug
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
diff --git a/keyboards/prototypist/oceanographer/info.json b/keyboards/prototypist/oceanographer/info.json
deleted file mode 100644
index d7117d6abc3..00000000000
--- a/keyboards/prototypist/oceanographer/info.json
+++ /dev/null
@@ -1,216 +0,0 @@
-{
-    "manufacturer": "Proto[Typist]",
-    "keyboard_name": "Oceanographer",
-    "maintainer": "Anjheos",
-    "bootloader": "atmel-dfu",
-    "diode_direction": "COL2ROW",
-    "features": {
-        "bootmagic": true,
-        "command": false,
-        "console": false,
-        "extrakey": true,
-        "mousekey": false,
-        "nkro": true
-    },
-    "encoder": {
-        "rotary": [
-            {"pin_a": "B2", "pin_b": "B1", "resolution": 2}
-        ]
-    },
-    "ws2812": {
-        "pin": "B3"
-    },
-    "rgblight": {
-        "led_count": 3,
-        "sleep": true,
-        "hue_steps": 10,
-        "saturation_steps": 17,
-        "brightness_steps": 17,
-        "max_brightness": 155,
-        "animations": {
-            "alternating": true,
-            "breathing": true
-        },
-        "default": {
-            "val": 155
-        },
-        "layers": {
-            "enabled": true,
-            "max": 4
-        }
-    },
-    "matrix_pins": {
-        "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "B6", "B5", "B4", "D7", "D6", "D4"],
-        "rows": ["B0", "D5", "D3", "D2"]
-    },
-    "processor": "atmega32u4",
-    "url": "",
-    "usb": {
-        "device_version": "1.0.0",
-        "pid": "0x0002",
-        "vid": "0x4A46"
-    },
-    "layouts": {
-        "LAYOUT_225_1": {
-            "layout": [
-                {"matrix": [0, 0], "label": "Esc", "x": 0, "y": 0},
-                {"matrix": [0, 1], "label": "Q", "x": 1, "y": 0},
-                {"matrix": [0, 2], "label": "W", "x": 2, "y": 0},
-                {"matrix": [0, 3], "label": "E", "x": 3, "y": 0},
-                {"matrix": [0, 4], "label": "R", "x": 4, "y": 0},
-                {"matrix": [0, 5], "label": "T", "x": 5, "y": 0},
-                {"matrix": [0, 6], "label": "Y", "x": 6, "y": 0},
-                {"matrix": [0, 7], "label": "U", "x": 7, "y": 0},
-                {"matrix": [0, 8], "label": "I", "x": 8, "y": 0},
-                {"matrix": [0, 9], "label": "O", "x": 9, "y": 0},
-                {"matrix": [0, 10], "label": "P", "x": 10, "y": 0},
-                {"matrix": [0, 11], "label": "Backspace", "w": 1.75, "x": 11, "y": 0},
-
-                {"matrix": [1, 0], "label": "Tab", "w": 1.25, "x": 0, "y": 1},
-                {"matrix": [1, 1], "label": "A", "x": 1.25, "y": 1},
-                {"matrix": [1, 2], "label": "S", "x": 2.25, "y": 1},
-                {"matrix": [1, 3], "label": "D", "x": 3.25, "y": 1},
-                {"matrix": [1, 4], "label": "F", "x": 4.25, "y": 1},
-                {"matrix": [1, 5], "label": "G", "x": 5.25, "y": 1},
-                {"matrix": [1, 6], "label": "H", "x": 6.25, "y": 1},
-                {"matrix": [1, 7], "label": "J", "x": 7.25, "y": 1},
-                {"matrix": [1, 8], "label": "K", "x": 8.25, "y": 1},
-                {"matrix": [1, 9], "label": "L", "x": 9.25, "y": 1},
-                {"matrix": [1, 10], "label": ":", "x": 10.25, "y": 1},
-                {"matrix": [1, 11], "label": "Enter", "w": 1.5, "x": 11.25, "y": 1},
-
-                {"matrix": [2, 0], "label": "Shift", "w": 1.75, "x": 0, "y": 2},
-                {"matrix": [2, 1], "label": "Z", "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "label": "X", "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "label": "C", "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "label": "V", "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "label": "B", "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "label": "N", "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "label": "M", "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "label": "<", "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "label": ">", "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "label": "?", "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "label": "\u2191", "x": 11.75, "y": 2},
-                {"matrix": [2, 12], "label": "\u2191", "x": 12.75, "y": 2},
-
-                {"matrix": [3, 0], "label": "Ctrl", "x": 0, "y": 3},
-                {"matrix": [3, 1], "label": "Win", "x": 1, "y": 3},
-                {"matrix": [3, 2], "label": "Alt", "x": 2, "y": 3},
-                {"matrix": [3, 3], "label": "Fn", "x": 3, "y": 3},
-                {"matrix": [3, 5], "w": 2.25, "x": 4, "y": 3},
-                {"matrix": [3, 6], "w": 2, "x": 6.25, "y": 3},
-                {"matrix": [3, 7], "label": "Alt", "x": 8.25, "y": 3},
-                {"matrix": [3, 8], "label": "Ctrl", "x": 9.25, "y": 3},
-                {"matrix": [3, 10], "label": "\u2190", "x": 10.75, "y": 3},
-                {"matrix": [3, 11], "label": "\u2193", "x": 11.75, "y": 3},
-                {"matrix": [3, 12], "label": "\u2192", "x": 12.75, "y": 3}
-            ]
-        },
-        "LAYOUT_225_2": {
-            "layout": [
-                {"matrix": [0, 0], "label": "Esc", "x": 0, "y": 0},
-                {"matrix": [0, 1], "label": "Q", "x": 1, "y": 0},
-                {"matrix": [0, 2], "label": "W", "x": 2, "y": 0},
-                {"matrix": [0, 3], "label": "E", "x": 3, "y": 0},
-                {"matrix": [0, 4], "label": "R", "x": 4, "y": 0},
-                {"matrix": [0, 5], "label": "T", "x": 5, "y": 0},
-                {"matrix": [0, 6], "label": "Y", "x": 6, "y": 0},
-                {"matrix": [0, 7], "label": "U", "x": 7, "y": 0},
-                {"matrix": [0, 8], "label": "I", "x": 8, "y": 0},
-                {"matrix": [0, 9], "label": "O", "x": 9, "y": 0},
-                {"matrix": [0, 10], "label": "P", "x": 10, "y": 0},
-                {"matrix": [0, 11], "label": "Backspace", "w": 1.75, "x": 11, "y": 0},
-
-                {"matrix": [1, 0], "label": "Tab", "w": 1.25, "x": 0, "y": 1},
-                {"matrix": [1, 1], "label": "A", "x": 1.25, "y": 1},
-                {"matrix": [1, 2], "label": "S", "x": 2.25, "y": 1},
-                {"matrix": [1, 3], "label": "D", "x": 3.25, "y": 1},
-                {"matrix": [1, 4], "label": "F", "x": 4.25, "y": 1},
-                {"matrix": [1, 5], "label": "G", "x": 5.25, "y": 1},
-                {"matrix": [1, 6], "label": "H", "x": 6.25, "y": 1},
-                {"matrix": [1, 7], "label": "J", "x": 7.25, "y": 1},
-                {"matrix": [1, 8], "label": "K", "x": 8.25, "y": 1},
-                {"matrix": [1, 9], "label": "L", "x": 9.25, "y": 1},
-                {"matrix": [1, 10], "label": ":", "x": 10.25, "y": 1},
-                {"matrix": [1, 11], "label": "Enter", "w": 1.5, "x": 11.25, "y": 1},
-
-                {"matrix": [2, 0], "label": "Shift", "w": 1.75, "x": 0, "y": 2},
-                {"matrix": [2, 1], "label": "Z", "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "label": "X", "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "label": "C", "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "label": "V", "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "label": "B", "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "label": "N", "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "label": "M", "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "label": "<", "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "label": ">", "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "label": "?", "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "label": "\u2191", "x": 11.75, "y": 2},
-                {"matrix": [2, 12], "label": "\u2191", "x": 12.75, "y": 2},
-
-                {"matrix": [3, 0], "label": "Ctrl", "w": 1.25, "x": 0, "y": 3},
-                {"matrix": [3, 1], "label": "Win", "x": 1.25, "y": 3},
-                {"matrix": [3, 2], "label": "Alt", "w": 1.25, "x": 2.25, "y": 3},
-                {"matrix": [3, 5], "w": 2.25, "x": 3.5, "y": 3},
-                {"matrix": [3, 6], "w": 2, "x": 5.75, "y": 3},
-                {"matrix": [3, 7], "label": "Alt", "w": 1.5, "x": 7.75, "y": 3},
-                {"matrix": [3, 8], "label": "Ctrl", "x": 9.25, "y": 3},
-                {"matrix": [3, 10], "label": "\u2190", "x": 10.75, "y": 3},
-                {"matrix": [3, 11], "label": "\u2193", "x": 11.75, "y": 3},
-                {"matrix": [3, 12], "label": "\u2192", "x": 12.75, "y": 3}
-            ]
-        },
-        "LAYOUT_625": {
-            "layout": [
-                {"matrix": [0, 0], "label": "Esc", "x": 0, "y": 0},
-                {"matrix": [0, 1], "label": "Q", "x": 1, "y": 0},
-                {"matrix": [0, 2], "label": "W", "x": 2, "y": 0},
-                {"matrix": [0, 3], "label": "E", "x": 3, "y": 0},
-                {"matrix": [0, 4], "label": "R", "x": 4, "y": 0},
-                {"matrix": [0, 5], "label": "T", "x": 5, "y": 0},
-                {"matrix": [0, 6], "label": "Y", "x": 6, "y": 0},
-                {"matrix": [0, 7], "label": "U", "x": 7, "y": 0},
-                {"matrix": [0, 8], "label": "I", "x": 8, "y": 0},
-                {"matrix": [0, 9], "label": "O", "x": 9, "y": 0},
-                {"matrix": [0, 10], "label": "P", "x": 10, "y": 0},
-                {"matrix": [0, 11], "label": "Backspace", "w": 1.75, "x": 11, "y": 0},
-
-                {"matrix": [1, 0], "label": "Tab", "w": 1.25, "x": 0, "y": 1},
-                {"matrix": [1, 1], "label": "A", "x": 1.25, "y": 1},
-                {"matrix": [1, 2], "label": "S", "x": 2.25, "y": 1},
-                {"matrix": [1, 3], "label": "D", "x": 3.25, "y": 1},
-                {"matrix": [1, 4], "label": "F", "x": 4.25, "y": 1},
-                {"matrix": [1, 5], "label": "G", "x": 5.25, "y": 1},
-                {"matrix": [1, 6], "label": "H", "x": 6.25, "y": 1},
-                {"matrix": [1, 7], "label": "J", "x": 7.25, "y": 1},
-                {"matrix": [1, 8], "label": "K", "x": 8.25, "y": 1},
-                {"matrix": [1, 9], "label": "L", "x": 9.25, "y": 1},
-                {"matrix": [1, 10], "label": ":", "x": 10.25, "y": 1},
-                {"matrix": [1, 11], "label": "Enter", "w": 1.5, "x": 11.25, "y": 1},
-
-                {"matrix": [2, 0], "label": "Shift", "w": 1.75, "x": 0, "y": 2},
-                {"matrix": [2, 1], "label": "Z", "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "label": "X", "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "label": "C", "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "label": "V", "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "label": "B", "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "label": "N", "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "label": "M", "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "label": "<", "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "label": ">", "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "label": "?", "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "label": "\u2191", "x": 11.75, "y": 2},
-                {"matrix": [2, 12], "label": "\u2191", "x": 12.75, "y": 2},
-
-                {"matrix": [3, 0], "label": "Ctrl", "x": 0, "y": 3},
-                {"matrix": [3, 1], "label": "Win", "x": 1, "y": 3},
-                {"matrix": [3, 2], "label": "Alt", "x": 2, "y": 3},
-                {"matrix": [3, 5], "w": 6.25, "x": 3, "y": 3},
-                {"matrix": [3, 8], "label": "Ctrl", "x": 9.25, "y": 3},
-                {"matrix": [3, 10], "label": "\u2190", "x": 10.75, "y": 3},
-                {"matrix": [3, 11], "label": "\u2193", "x": 11.75, "y": 3},
-                {"matrix": [3, 12], "label": "\u2192", "x": 12.75, "y": 3}
-            ]
-        }
-    }
-}
diff --git a/keyboards/prototypist/oceanographer/keyboard.json b/keyboards/prototypist/oceanographer/keyboard.json
new file mode 100644
index 00000000000..8b0209d451f
--- /dev/null
+++ b/keyboards/prototypist/oceanographer/keyboard.json
@@ -0,0 +1,221 @@
+{
+    "manufacturer": "Proto[Typist]",
+    "keyboard_name": "Oceanographer",
+    "maintainer": "Anjheos",
+    "bootloader": "atmel-dfu",
+    "diode_direction": "COL2ROW",
+    "build": {
+        "lto": true
+    },
+    "features": {
+        "audio": true,
+        "bootmagic": true,
+        "encoder": true,
+        "extrakey": true,
+        "mousekey": false,
+        "nkro": true,
+        "oled": true,
+        "rgblight": true
+    },
+    "encoder": {
+        "rotary": [
+            {"pin_a": "B2", "pin_b": "B1", "resolution": 2}
+        ]
+    },
+    "ws2812": {
+        "pin": "B3"
+    },
+    "rgblight": {
+        "led_count": 3,
+        "sleep": true,
+        "hue_steps": 10,
+        "saturation_steps": 17,
+        "brightness_steps": 17,
+        "max_brightness": 155,
+        "animations": {
+            "alternating": true,
+            "breathing": true
+        },
+        "default": {
+            "val": 155
+        },
+        "layers": {
+            "enabled": true,
+            "max": 4
+        }
+    },
+    "matrix_pins": {
+        "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "B6", "B5", "B4", "D7", "D6", "D4"],
+        "rows": ["B0", "D5", "D3", "D2"]
+    },
+    "processor": "atmega32u4",
+    "url": "",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x0002",
+        "vid": "0x4A46"
+    },
+    "layouts": {
+        "LAYOUT_225_1": {
+            "layout": [
+                {"matrix": [0, 0], "label": "Esc", "x": 0, "y": 0},
+                {"matrix": [0, 1], "label": "Q", "x": 1, "y": 0},
+                {"matrix": [0, 2], "label": "W", "x": 2, "y": 0},
+                {"matrix": [0, 3], "label": "E", "x": 3, "y": 0},
+                {"matrix": [0, 4], "label": "R", "x": 4, "y": 0},
+                {"matrix": [0, 5], "label": "T", "x": 5, "y": 0},
+                {"matrix": [0, 6], "label": "Y", "x": 6, "y": 0},
+                {"matrix": [0, 7], "label": "U", "x": 7, "y": 0},
+                {"matrix": [0, 8], "label": "I", "x": 8, "y": 0},
+                {"matrix": [0, 9], "label": "O", "x": 9, "y": 0},
+                {"matrix": [0, 10], "label": "P", "x": 10, "y": 0},
+                {"matrix": [0, 11], "label": "Backspace", "w": 1.75, "x": 11, "y": 0},
+
+                {"matrix": [1, 0], "label": "Tab", "w": 1.25, "x": 0, "y": 1},
+                {"matrix": [1, 1], "label": "A", "x": 1.25, "y": 1},
+                {"matrix": [1, 2], "label": "S", "x": 2.25, "y": 1},
+                {"matrix": [1, 3], "label": "D", "x": 3.25, "y": 1},
+                {"matrix": [1, 4], "label": "F", "x": 4.25, "y": 1},
+                {"matrix": [1, 5], "label": "G", "x": 5.25, "y": 1},
+                {"matrix": [1, 6], "label": "H", "x": 6.25, "y": 1},
+                {"matrix": [1, 7], "label": "J", "x": 7.25, "y": 1},
+                {"matrix": [1, 8], "label": "K", "x": 8.25, "y": 1},
+                {"matrix": [1, 9], "label": "L", "x": 9.25, "y": 1},
+                {"matrix": [1, 10], "label": ":", "x": 10.25, "y": 1},
+                {"matrix": [1, 11], "label": "Enter", "w": 1.5, "x": 11.25, "y": 1},
+
+                {"matrix": [2, 0], "label": "Shift", "w": 1.75, "x": 0, "y": 2},
+                {"matrix": [2, 1], "label": "Z", "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "label": "X", "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "label": "C", "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "label": "V", "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "label": "B", "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "label": "N", "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "label": "M", "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "label": "<", "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "label": ">", "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "label": "?", "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "label": "\u2191", "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "label": "\u2191", "x": 12.75, "y": 2},
+
+                {"matrix": [3, 0], "label": "Ctrl", "x": 0, "y": 3},
+                {"matrix": [3, 1], "label": "Win", "x": 1, "y": 3},
+                {"matrix": [3, 2], "label": "Alt", "x": 2, "y": 3},
+                {"matrix": [3, 3], "label": "Fn", "x": 3, "y": 3},
+                {"matrix": [3, 5], "w": 2.25, "x": 4, "y": 3},
+                {"matrix": [3, 6], "w": 2, "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "label": "Alt", "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "label": "Ctrl", "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "label": "\u2190", "x": 10.75, "y": 3},
+                {"matrix": [3, 11], "label": "\u2193", "x": 11.75, "y": 3},
+                {"matrix": [3, 12], "label": "\u2192", "x": 12.75, "y": 3}
+            ]
+        },
+        "LAYOUT_225_2": {
+            "layout": [
+                {"matrix": [0, 0], "label": "Esc", "x": 0, "y": 0},
+                {"matrix": [0, 1], "label": "Q", "x": 1, "y": 0},
+                {"matrix": [0, 2], "label": "W", "x": 2, "y": 0},
+                {"matrix": [0, 3], "label": "E", "x": 3, "y": 0},
+                {"matrix": [0, 4], "label": "R", "x": 4, "y": 0},
+                {"matrix": [0, 5], "label": "T", "x": 5, "y": 0},
+                {"matrix": [0, 6], "label": "Y", "x": 6, "y": 0},
+                {"matrix": [0, 7], "label": "U", "x": 7, "y": 0},
+                {"matrix": [0, 8], "label": "I", "x": 8, "y": 0},
+                {"matrix": [0, 9], "label": "O", "x": 9, "y": 0},
+                {"matrix": [0, 10], "label": "P", "x": 10, "y": 0},
+                {"matrix": [0, 11], "label": "Backspace", "w": 1.75, "x": 11, "y": 0},
+
+                {"matrix": [1, 0], "label": "Tab", "w": 1.25, "x": 0, "y": 1},
+                {"matrix": [1, 1], "label": "A", "x": 1.25, "y": 1},
+                {"matrix": [1, 2], "label": "S", "x": 2.25, "y": 1},
+                {"matrix": [1, 3], "label": "D", "x": 3.25, "y": 1},
+                {"matrix": [1, 4], "label": "F", "x": 4.25, "y": 1},
+                {"matrix": [1, 5], "label": "G", "x": 5.25, "y": 1},
+                {"matrix": [1, 6], "label": "H", "x": 6.25, "y": 1},
+                {"matrix": [1, 7], "label": "J", "x": 7.25, "y": 1},
+                {"matrix": [1, 8], "label": "K", "x": 8.25, "y": 1},
+                {"matrix": [1, 9], "label": "L", "x": 9.25, "y": 1},
+                {"matrix": [1, 10], "label": ":", "x": 10.25, "y": 1},
+                {"matrix": [1, 11], "label": "Enter", "w": 1.5, "x": 11.25, "y": 1},
+
+                {"matrix": [2, 0], "label": "Shift", "w": 1.75, "x": 0, "y": 2},
+                {"matrix": [2, 1], "label": "Z", "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "label": "X", "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "label": "C", "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "label": "V", "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "label": "B", "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "label": "N", "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "label": "M", "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "label": "<", "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "label": ">", "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "label": "?", "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "label": "\u2191", "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "label": "\u2191", "x": 12.75, "y": 2},
+
+                {"matrix": [3, 0], "label": "Ctrl", "w": 1.25, "x": 0, "y": 3},
+                {"matrix": [3, 1], "label": "Win", "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "label": "Alt", "w": 1.25, "x": 2.25, "y": 3},
+                {"matrix": [3, 5], "w": 2.25, "x": 3.5, "y": 3},
+                {"matrix": [3, 6], "w": 2, "x": 5.75, "y": 3},
+                {"matrix": [3, 7], "label": "Alt", "w": 1.5, "x": 7.75, "y": 3},
+                {"matrix": [3, 8], "label": "Ctrl", "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "label": "\u2190", "x": 10.75, "y": 3},
+                {"matrix": [3, 11], "label": "\u2193", "x": 11.75, "y": 3},
+                {"matrix": [3, 12], "label": "\u2192", "x": 12.75, "y": 3}
+            ]
+        },
+        "LAYOUT_625": {
+            "layout": [
+                {"matrix": [0, 0], "label": "Esc", "x": 0, "y": 0},
+                {"matrix": [0, 1], "label": "Q", "x": 1, "y": 0},
+                {"matrix": [0, 2], "label": "W", "x": 2, "y": 0},
+                {"matrix": [0, 3], "label": "E", "x": 3, "y": 0},
+                {"matrix": [0, 4], "label": "R", "x": 4, "y": 0},
+                {"matrix": [0, 5], "label": "T", "x": 5, "y": 0},
+                {"matrix": [0, 6], "label": "Y", "x": 6, "y": 0},
+                {"matrix": [0, 7], "label": "U", "x": 7, "y": 0},
+                {"matrix": [0, 8], "label": "I", "x": 8, "y": 0},
+                {"matrix": [0, 9], "label": "O", "x": 9, "y": 0},
+                {"matrix": [0, 10], "label": "P", "x": 10, "y": 0},
+                {"matrix": [0, 11], "label": "Backspace", "w": 1.75, "x": 11, "y": 0},
+
+                {"matrix": [1, 0], "label": "Tab", "w": 1.25, "x": 0, "y": 1},
+                {"matrix": [1, 1], "label": "A", "x": 1.25, "y": 1},
+                {"matrix": [1, 2], "label": "S", "x": 2.25, "y": 1},
+                {"matrix": [1, 3], "label": "D", "x": 3.25, "y": 1},
+                {"matrix": [1, 4], "label": "F", "x": 4.25, "y": 1},
+                {"matrix": [1, 5], "label": "G", "x": 5.25, "y": 1},
+                {"matrix": [1, 6], "label": "H", "x": 6.25, "y": 1},
+                {"matrix": [1, 7], "label": "J", "x": 7.25, "y": 1},
+                {"matrix": [1, 8], "label": "K", "x": 8.25, "y": 1},
+                {"matrix": [1, 9], "label": "L", "x": 9.25, "y": 1},
+                {"matrix": [1, 10], "label": ":", "x": 10.25, "y": 1},
+                {"matrix": [1, 11], "label": "Enter", "w": 1.5, "x": 11.25, "y": 1},
+
+                {"matrix": [2, 0], "label": "Shift", "w": 1.75, "x": 0, "y": 2},
+                {"matrix": [2, 1], "label": "Z", "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "label": "X", "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "label": "C", "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "label": "V", "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "label": "B", "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "label": "N", "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "label": "M", "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "label": "<", "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "label": ">", "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "label": "?", "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "label": "\u2191", "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "label": "\u2191", "x": 12.75, "y": 2},
+
+                {"matrix": [3, 0], "label": "Ctrl", "x": 0, "y": 3},
+                {"matrix": [3, 1], "label": "Win", "x": 1, "y": 3},
+                {"matrix": [3, 2], "label": "Alt", "x": 2, "y": 3},
+                {"matrix": [3, 5], "w": 6.25, "x": 3, "y": 3},
+                {"matrix": [3, 8], "label": "Ctrl", "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "label": "\u2190", "x": 10.75, "y": 3},
+                {"matrix": [3, 11], "label": "\u2193", "x": 11.75, "y": 3},
+                {"matrix": [3, 12], "label": "\u2192", "x": 12.75, "y": 3}
+            ]
+        }
+    }
+}
diff --git a/keyboards/prototypist/oceanographer/rules.mk b/keyboards/prototypist/oceanographer/rules.mk
deleted file mode 100644
index e18a6cecee5..00000000000
--- a/keyboards/prototypist/oceanographer/rules.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-OLED_ENABLE = yes
-AUDIO_ENABLE = yes
-LTO_ENABLE = yes
-RGBLIGHT_ENABLE = yes
-ENCODER_ENABLE = yes
diff --git a/keyboards/protozoa/cassini/info.json b/keyboards/protozoa/cassini/info.json
deleted file mode 100644
index 079679be437..00000000000
--- a/keyboards/protozoa/cassini/info.json
+++ /dev/null
@@ -1,665 +0,0 @@
-{
-    "keyboard_name": "Cassini",
-    "manufacturer": "Yiancar-Designs",
-    "url": "https://yiancar-designs.com",
-    "maintainer": "Yiancar-Designs",
-    "usb": {
-        "vid": "0x8968",
-        "pid": "0x4341",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["A1", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "B2", "B10", "B11", "B12", "B13", "B14"],
-        "rows": ["A2", "B9", "B8", "B5", "B4"]
-    },
-    "diode_direction": "COL2ROW",
-    "indicators": {
-        "caps_lock": "B6",
-        "on_state": 0
-    },
-    "processor": "STM32F072",
-    "bootloader": "stm32-dfu",
-    "community_layouts": [
-        "60_ansi",
-        "60_ansi_split_bs_rshift",
-        "60_ansi_tsangan",
-        "60_tsangan_hhkb",
-        "60_iso",
-        "60_iso_split_bs_rshift",
-        "60_iso_tsangan"
-    ],
-    "layouts": {
-        "LAYOUT_all": {
-            "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": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
-                {"label": "Delete", "matrix": [2, 12], "x": 14, "y": 0},
-
-                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
-                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
-                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
-                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
-                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
-                {"label": "Y", "matrix": [1, 6], "x": 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], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
-                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
-                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
-                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
-                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
-                {"label": "H", "matrix": [2, 6], "x": 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], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
-                {"label": "\\", "matrix": [3, 1], "x": 1.25, "y": 3},
-                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
-                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
-                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
-                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
-                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
-                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
-                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
-                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
-                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
-                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
-                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"label": "Fn", "matrix": [3, 13], "x": 14, "y": 3},
-
-                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"label": "Space", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
-                {"label": "Alt", "matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
-                {"label": "Menu", "matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
-                {"label": "Ctrl", "matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
-                {"label": "Fn", "matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
-            ]
-        },
-        "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": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-
-                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
-                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
-                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
-                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
-                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
-                {"label": "Y", "matrix": [1, 6], "x": 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], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
-                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
-                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
-                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
-                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
-                {"label": "H", "matrix": [2, 6], "x": 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], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
-                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
-                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
-                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
-                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
-                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
-                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
-                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
-                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
-                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
-                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
-
-                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"label": "Space", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
-                {"label": "Alt", "matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
-                {"label": "GUI", "matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
-                {"label": "Menu", "matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
-                {"label": "Ctrl", "matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
-            ]
-        },
-        "LAYOUT_60_ansi_split_bs_rshift": {
-            "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": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
-                {"label": "Delete", "matrix": [2, 12], "x": 14, "y": 0},
-
-                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
-                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
-                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
-                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
-                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
-                {"label": "Y", "matrix": [1, 6], "x": 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], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
-                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
-                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
-                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
-                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
-                {"label": "H", "matrix": [2, 6], "x": 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], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
-                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
-                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
-                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
-                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
-                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
-                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
-                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
-                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
-                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
-                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"label": "Fn", "matrix": [3, 13], "x": 14, "y": 3},
-
-                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"label": "Space", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
-                {"label": "Alt", "matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
-                {"label": "GUI", "matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
-                {"label": "Menu", "matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
-                {"label": "Ctrl", "matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
-            ]
-        },
-        "LAYOUT_60_ansi_tsangan": {
-            "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": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-
-                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
-                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
-                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
-                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
-                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
-                {"label": "Y", "matrix": [1, 6], "x": 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], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
-                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
-                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
-                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
-                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
-                {"label": "H", "matrix": [2, 6], "x": 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], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
-                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
-                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
-                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
-                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
-                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
-                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
-                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
-                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
-                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
-                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
-
-                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
-                {"label": "GUI", "matrix": [4, 1], "x": 1.5, "y": 4},
-                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
-                {"label": "Space", "matrix": [4, 6], "x": 4, "y": 4, "w": 7},
-                {"label": "Alt", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
-                {"label": "Menu", "matrix": [4, 12], "x": 12.5, "y": 4},
-                {"label": "Ctrl", "matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
-            ]
-        },
-        "LAYOUT_60_tsangan_hhkb": {
-            "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": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
-                {"label": "Delete", "matrix": [2, 12], "x": 14, "y": 0},
-
-                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
-                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
-                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
-                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
-                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
-                {"label": "Y", "matrix": [1, 6], "x": 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], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
-                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
-                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
-                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
-                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
-                {"label": "H", "matrix": [2, 6], "x": 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], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
-                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
-                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
-                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
-                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
-                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
-                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
-                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
-                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
-                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
-                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"label": "Fn", "matrix": [3, 13], "x": 14, "y": 3},
-
-                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
-                {"label": "GUI", "matrix": [4, 1], "x": 1.5, "y": 4},
-                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
-                {"label": "Space", "matrix": [4, 6], "x": 4, "y": 4, "w": 7},
-                {"label": "Alt", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
-                {"label": "Menu", "matrix": [4, 12], "x": 12.5, "y": 4},
-                {"label": "Ctrl", "matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
-            ]
-        },
-        "LAYOUT_60_iso": {
-            "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": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-
-                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
-                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
-                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
-                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
-                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
-                {"label": "Y", "matrix": [1, 6], "x": 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": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
-                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
-                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
-                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
-                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
-                {"label": "H", "matrix": [2, 6], "x": 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": "#", "matrix": [1, 13], "x": 12.75, "y": 2},
-                {"label": "Enter", "matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
-
-                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
-                {"label": "\\", "matrix": [3, 1], "x": 1.25, "y": 3},
-                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
-                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
-                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
-                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
-                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
-                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
-                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
-                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
-                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
-                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
-                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
-
-                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"label": "Space", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
-                {"label": "Alt", "matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
-                {"label": "GUI", "matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
-                {"label": "Menu", "matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
-                {"label": "Ctrl", "matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
-            ]
-        },
-        "LAYOUT_60_iso_split_bs_rshift": {
-            "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": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
-                {"label": "Delete", "matrix": [2, 12], "x": 14, "y": 0},
-
-                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
-                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
-                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
-                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
-                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
-                {"label": "Y", "matrix": [1, 6], "x": 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": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
-                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
-                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
-                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
-                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
-                {"label": "H", "matrix": [2, 6], "x": 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": "#", "matrix": [1, 13], "x": 12.75, "y": 2},
-                {"label": "Enter", "matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
-
-                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
-                {"label": "\\", "matrix": [3, 1], "x": 1.25, "y": 3},
-                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
-                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
-                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
-                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
-                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
-                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
-                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
-                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
-                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
-                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
-                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"label": "Fn", "matrix": [3, 13], "x": 14, "y": 3},
-
-                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"label": "Space", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
-                {"label": "Alt", "matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
-                {"label": "GUI", "matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
-                {"label": "Menu", "matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
-                {"label": "Ctrl", "matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
-            ]
-        },
-        "LAYOUT_60_iso_tsangan": {
-            "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": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-
-                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
-                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
-                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
-                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
-                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
-                {"label": "Y", "matrix": [1, 6], "x": 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": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
-                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
-                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
-                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
-                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
-                {"label": "H", "matrix": [2, 6], "x": 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": "#", "matrix": [1, 13], "x": 12.75, "y": 2},
-                {"label": "Enter", "matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
-
-                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
-                {"label": "\\", "matrix": [3, 1], "x": 1.25, "y": 3},
-                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
-                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
-                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
-                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
-                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
-                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
-                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
-                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
-                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
-                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
-                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
-
-                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
-                {"label": "GUI", "matrix": [4, 1], "x": 1.5, "y": 4},
-                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
-                {"label": "Space", "matrix": [4, 6], "x": 4, "y": 4, "w": 7},
-                {"label": "Alt", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
-                {"label": "Menu", "matrix": [4, 12], "x": 12.5, "y": 4},
-                {"label": "Ctrl", "matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
-            ]
-        },
-        "LAYOUT_60_iso_tsangan_split_bs_rshift": {
-            "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": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
-                {"label": "Delete", "matrix": [2, 12], "x": 14, "y": 0},
-
-                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
-                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
-                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
-                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
-                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
-                {"label": "Y", "matrix": [1, 6], "x": 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": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
-                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
-                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
-                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
-                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
-                {"label": "H", "matrix": [2, 6], "x": 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": "#", "matrix": [1, 13], "x": 12.75, "y": 2},
-                {"label": "Enter", "matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
-
-                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
-                {"label": "\\", "matrix": [3, 1], "x": 1.25, "y": 3},
-                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
-                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
-                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
-                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
-                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
-                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
-                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
-                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
-                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
-                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
-                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"label": "Fn", "matrix": [3, 13], "x": 14, "y": 3},
-
-                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
-                {"label": "GUI", "matrix": [4, 1], "x": 1.5, "y": 4},
-                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
-                {"label": "Space", "matrix": [4, 6], "x": 4, "y": 4, "w": 7},
-                {"label": "Alt", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
-                {"label": "Menu", "matrix": [4, 12], "x": 12.5, "y": 4},
-                {"label": "Ctrl", "matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
-            ]
-        }
-    }
-}
diff --git a/keyboards/protozoa/cassini/keyboard.json b/keyboards/protozoa/cassini/keyboard.json
new file mode 100644
index 00000000000..696480024fe
--- /dev/null
+++ b/keyboards/protozoa/cassini/keyboard.json
@@ -0,0 +1,671 @@
+{
+    "keyboard_name": "Cassini",
+    "manufacturer": "Yiancar-Designs",
+    "url": "https://yiancar-designs.com",
+    "maintainer": "Yiancar-Designs",
+    "usb": {
+        "vid": "0x8968",
+        "pid": "0x4341",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "matrix_pins": {
+        "cols": ["A1", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "B2", "B10", "B11", "B12", "B13", "B14"],
+        "rows": ["A2", "B9", "B8", "B5", "B4"]
+    },
+    "diode_direction": "COL2ROW",
+    "indicators": {
+        "caps_lock": "B6",
+        "on_state": 0
+    },
+    "processor": "STM32F072",
+    "bootloader": "stm32-dfu",
+    "community_layouts": [
+        "60_ansi",
+        "60_ansi_split_bs_rshift",
+        "60_ansi_tsangan",
+        "60_tsangan_hhkb",
+        "60_iso",
+        "60_iso_split_bs_rshift",
+        "60_iso_tsangan"
+    ],
+    "layouts": {
+        "LAYOUT_all": {
+            "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": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "Delete", "matrix": [2, 12], "x": 14, "y": 0},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 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], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 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], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"label": "\\", "matrix": [3, 1], "x": 1.25, "y": 3},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "Fn", "matrix": [3, 13], "x": 14, "y": 3},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "Space", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "Alt", "matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"label": "Menu", "matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"label": "Ctrl", "matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+                {"label": "Fn", "matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
+            ]
+        },
+        "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": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 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], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 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], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "Space", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "Alt", "matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"label": "GUI", "matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"label": "Menu", "matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+                {"label": "Ctrl", "matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
+            ]
+        },
+        "LAYOUT_60_ansi_split_bs_rshift": {
+            "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": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "Delete", "matrix": [2, 12], "x": 14, "y": 0},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 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], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 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], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "Fn", "matrix": [3, 13], "x": 14, "y": 3},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "Space", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "Alt", "matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"label": "GUI", "matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"label": "Menu", "matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+                {"label": "Ctrl", "matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
+            ]
+        },
+        "LAYOUT_60_ansi_tsangan": {
+            "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": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 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], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 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], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"label": "GUI", "matrix": [4, 1], "x": 1.5, "y": 4},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"label": "Space", "matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"label": "Alt", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+                {"label": "Menu", "matrix": [4, 12], "x": 12.5, "y": 4},
+                {"label": "Ctrl", "matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_60_tsangan_hhkb": {
+            "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": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "Delete", "matrix": [2, 12], "x": 14, "y": 0},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 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], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 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], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "Fn", "matrix": [3, 13], "x": 14, "y": 3},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"label": "GUI", "matrix": [4, 1], "x": 1.5, "y": 4},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"label": "Space", "matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"label": "Alt", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+                {"label": "Menu", "matrix": [4, 12], "x": 12.5, "y": 4},
+                {"label": "Ctrl", "matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_60_iso": {
+            "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": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 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": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 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": "#", "matrix": [1, 13], "x": 12.75, "y": 2},
+                {"label": "Enter", "matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"label": "\\", "matrix": [3, 1], "x": 1.25, "y": 3},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "Space", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "Alt", "matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"label": "GUI", "matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"label": "Menu", "matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+                {"label": "Ctrl", "matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
+            ]
+        },
+        "LAYOUT_60_iso_split_bs_rshift": {
+            "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": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "Delete", "matrix": [2, 12], "x": 14, "y": 0},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 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": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 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": "#", "matrix": [1, 13], "x": 12.75, "y": 2},
+                {"label": "Enter", "matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"label": "\\", "matrix": [3, 1], "x": 1.25, "y": 3},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "Fn", "matrix": [3, 13], "x": 14, "y": 3},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "Space", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "Alt", "matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"label": "GUI", "matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"label": "Menu", "matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+                {"label": "Ctrl", "matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
+            ]
+        },
+        "LAYOUT_60_iso_tsangan": {
+            "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": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 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": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 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": "#", "matrix": [1, 13], "x": 12.75, "y": 2},
+                {"label": "Enter", "matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"label": "\\", "matrix": [3, 1], "x": 1.25, "y": 3},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"label": "GUI", "matrix": [4, 1], "x": 1.5, "y": 4},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"label": "Space", "matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"label": "Alt", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+                {"label": "Menu", "matrix": [4, 12], "x": 12.5, "y": 4},
+                {"label": "Ctrl", "matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_60_iso_tsangan_split_bs_rshift": {
+            "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": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "Delete", "matrix": [2, 12], "x": 14, "y": 0},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 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": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 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": "#", "matrix": [1, 13], "x": 12.75, "y": 2},
+                {"label": "Enter", "matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"label": "\\", "matrix": [3, 1], "x": 1.25, "y": 3},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "Fn", "matrix": [3, 13], "x": 14, "y": 3},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"label": "GUI", "matrix": [4, 1], "x": 1.5, "y": 4},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"label": "Space", "matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"label": "Alt", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+                {"label": "Menu", "matrix": [4, 12], "x": 12.5, "y": 4},
+                {"label": "Ctrl", "matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/protozoa/cassini/rules.mk b/keyboards/protozoa/cassini/rules.mk
index 7c0709f41e6..0ab54aaaf71 100644
--- a/keyboards/protozoa/cassini/rules.mk
+++ b/keyboards/protozoa/cassini/rules.mk
@@ -1,15 +1,2 @@
 # Wildcard to allow APM32 MCU
 DFU_SUFFIX_ARGS = -v FFFF -p FFFF
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
diff --git a/keyboards/protozoa/event_horizon/info.json b/keyboards/protozoa/event_horizon/keyboard.json
similarity index 100%
rename from keyboards/protozoa/event_horizon/info.json
rename to keyboards/protozoa/event_horizon/keyboard.json
diff --git a/keyboards/protozoa/p01/info.json b/keyboards/protozoa/p01/info.json
deleted file mode 100644
index f414d6d71ad..00000000000
--- a/keyboards/protozoa/p01/info.json
+++ /dev/null
@@ -1,1413 +0,0 @@
-{
-    "keyboard_name": "P.01",
-    "manufacturer": "Yiancar-Designs",
-    "url": "https://yiancar-designs.com",
-    "maintainer": "Yiancar-Designs",
-    "usb": {
-        "vid": "0x8968",
-        "pid": "0x5031",
-        "device_version": "0.0.1"
-    },
-    "rgblight": {
-        "saturation_steps": 8,
-        "brightness_steps": 8,
-        "led_count": 18,
-        "animations": {
-            "breathing": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "snake": true,
-            "knight": true,
-            "christmas": true,
-            "static_gradient": true,
-            "rgb_test": true,
-            "alternating": true,
-            "twinkle": true
-        }
-    },
-    "ws2812": {
-        "pin": "A9",
-        "driver": "pwm"
-    },
-    "matrix_pins": {
-        "cols": ["A14", "A15", "B3", "B4", "B5", "B6", "B7", "B8", "B9", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0"],
-        "rows": ["B1", "B2", "B10", "B11", "B12", "B13"]
-    },
-    "diode_direction": "COL2ROW",
-    "encoder": {
-        "rotary": [
-            {"pin_a": "B15", "pin_b": "B14"}
-        ]
-    },
-    "processor": "STM32F072",
-    "bootloader": "stm32-dfu",
-    "community_layouts": [
-        "tkl_ansi",
-        "tkl_ansi_split_bs_rshift",
-        "tkl_ansi_tsangan",
-        "tkl_ansi_tsangan_split_bs_rshift",
-        "tkl_iso",
-        "tkl_iso_split_bs_rshift",
-        "tkl_iso_tsangan",
-        "tkl_iso_tsangan_split_bs_rshift"
-    ],
-    "layouts": {
-        "LAYOUT_all": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-
-                {"label": "F1", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "F2", "matrix": [0, 3], "x": 3, "y": 0},
-                {"label": "F3", "matrix": [0, 4], "x": 4, "y": 0},
-                {"label": "F4", "matrix": [0, 5], "x": 5, "y": 0},
-
-                {"label": "F5", "matrix": [0, 6], "x": 6.5, "y": 0},
-                {"label": "F6", "matrix": [0, 7], "x": 7.5, "y": 0},
-                {"label": "F7", "matrix": [0, 8], "x": 8.5, "y": 0},
-                {"label": "F8", "matrix": [0, 9], "x": 9.5, "y": 0},
-
-                {"label": "F9", "matrix": [0, 11], "x": 11, "y": 0},
-                {"label": "F10", "matrix": [0, 12], "x": 12, "y": 0},
-                {"label": "F11", "matrix": [0, 13], "x": 13, "y": 0},
-                {"label": "F12", "matrix": [0, 14], "x": 14, "y": 0},
-
-                {"label": "Print Screen", "matrix": [0, 15], "x": 15.25, "y": 0},
-                {"label": "Scroll Lock", "matrix": [0, 16], "x": 16.25, "y": 0},
-                {"label": "Mute", "matrix": [0, 17], "x": 17.25, "y": 0},
-
-                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
-                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
-                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
-                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
-                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
-                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
-                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
-                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
-                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
-                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
-                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
-                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
-                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
-                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25},
-                {"label": "Delete", "matrix": [3, 14], "x": 14, "y": 1.25},
-
-                {"label": "Insert", "matrix": [1, 15], "x": 15.25, "y": 1.25},
-                {"label": "Home", "matrix": [1, 16], "x": 16.25, "y": 1.25},
-                {"label": "Page Up", "matrix": [1, 17], "x": 17.25, "y": 1.25},
-
-                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
-                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
-                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
-                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
-                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
-                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
-                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
-                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
-                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
-                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
-                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
-                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
-                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
-                {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
-
-                {"label": "Delete", "matrix": [2, 15], "x": 15.25, "y": 2.25},
-                {"label": "End", "matrix": [2, 16], "x": 16.25, "y": 2.25},
-                {"label": "Page Down", "matrix": [2, 17], "x": 17.25, "y": 2.25},
-
-                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
-                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
-                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
-                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
-                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
-                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
-                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
-                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
-                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
-                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
-                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
-                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
-                {"label": "Enter", "matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
-
-                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
-                {"label": "\\", "matrix": [4, 1], "x": 1.25, "y": 4.25},
-                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
-                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
-                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
-                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
-                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
-                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
-                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
-                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
-                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
-                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
-                {"label": "Shift", "matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 1.75},
-                {"label": "Shift", "matrix": [4, 14], "x": 14, "y": 4.25},
-
-                {"label": "\u2191", "matrix": [4, 16], "x": 16.25, "y": 4.25},
-
-                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
-                {"label": "GUI", "matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
-                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
-                {"label": "Space", "matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
-                {"label": "Alt", "matrix": [5, 9], "x": 10, "y": 5.25, "w": 1.25},
-                {"label": "Fn", "matrix": [5, 10], "x": 11.25, "y": 5.25, "w": 1.25},
-                {"label": "Menu", "matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
-                {"label": "Ctrl", "matrix": [5, 14], "x": 13.75, "y": 5.25, "w": 1.25},
-
-                {"label": "\u2190", "matrix": [5, 15], "x": 15.25, "y": 5.25},
-                {"label": "\u2193", "matrix": [5, 16], "x": 16.25, "y": 5.25},
-                {"label": "\u2192", "matrix": [5, 17], "x": 17.25, "y": 5.25}
-            ]
-        },
-        "LAYOUT_tkl_ansi": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-
-                {"label": "F1", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "F2", "matrix": [0, 3], "x": 3, "y": 0},
-                {"label": "F3", "matrix": [0, 4], "x": 4, "y": 0},
-                {"label": "F4", "matrix": [0, 5], "x": 5, "y": 0},
-
-                {"label": "F5", "matrix": [0, 6], "x": 6.5, "y": 0},
-                {"label": "F6", "matrix": [0, 7], "x": 7.5, "y": 0},
-                {"label": "F7", "matrix": [0, 8], "x": 8.5, "y": 0},
-                {"label": "F8", "matrix": [0, 9], "x": 9.5, "y": 0},
-
-                {"label": "F9", "matrix": [0, 11], "x": 11, "y": 0},
-                {"label": "F10", "matrix": [0, 12], "x": 12, "y": 0},
-                {"label": "F11", "matrix": [0, 13], "x": 13, "y": 0},
-                {"label": "F12", "matrix": [0, 14], "x": 14, "y": 0},
-
-                {"label": "Print Screen", "matrix": [0, 15], "x": 15.25, "y": 0},
-                {"label": "Scroll Lock", "matrix": [0, 16], "x": 16.25, "y": 0},
-                {"label": "Mute", "matrix": [0, 17], "x": 17.25, "y": 0},
-
-                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
-                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
-                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
-                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
-                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
-                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
-                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
-                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
-                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
-                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
-                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
-                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
-                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
-                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
-
-                {"label": "Insert", "matrix": [1, 15], "x": 15.25, "y": 1.25},
-                {"label": "Home", "matrix": [1, 16], "x": 16.25, "y": 1.25},
-                {"label": "Page Up", "matrix": [1, 17], "x": 17.25, "y": 1.25},
-
-                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
-                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
-                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
-                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
-                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
-                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
-                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
-                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
-                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
-                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
-                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
-                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
-                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
-                {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
-
-                {"label": "Delete", "matrix": [2, 15], "x": 15.25, "y": 2.25},
-                {"label": "End", "matrix": [2, 16], "x": 16.25, "y": 2.25},
-                {"label": "Page Down", "matrix": [2, 17], "x": 17.25, "y": 2.25},
-
-                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
-                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
-                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
-                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
-                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
-                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
-                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
-                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
-                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
-                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
-                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
-                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
-                {"label": "Enter", "matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
-
-                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
-                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
-                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
-                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
-                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
-                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
-                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
-                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
-                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
-                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
-                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
-                {"label": "Shift", "matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 2.75},
-
-                {"label": "\u2191", "matrix": [4, 16], "x": 16.25, "y": 4.25},
-
-                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
-                {"label": "GUI", "matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
-                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
-                {"label": "Space", "matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
-                {"label": "Alt", "matrix": [5, 9], "x": 10, "y": 5.25, "w": 1.25},
-                {"label": "GUI", "matrix": [5, 10], "x": 11.25, "y": 5.25, "w": 1.25},
-                {"label": "Menu", "matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
-                {"label": "Ctrl", "matrix": [5, 14], "x": 13.75, "y": 5.25, "w": 1.25},
-
-                {"label": "\u2190", "matrix": [5, 15], "x": 15.25, "y": 5.25},
-                {"label": "\u2193", "matrix": [5, 16], "x": 16.25, "y": 5.25},
-                {"label": "\u2192", "matrix": [5, 17], "x": 17.25, "y": 5.25}
-            ]
-        },
-        "LAYOUT_tkl_ansi_split_bs_rshift": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-
-                {"label": "F1", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "F2", "matrix": [0, 3], "x": 3, "y": 0},
-                {"label": "F3", "matrix": [0, 4], "x": 4, "y": 0},
-                {"label": "F4", "matrix": [0, 5], "x": 5, "y": 0},
-
-                {"label": "F5", "matrix": [0, 6], "x": 6.5, "y": 0},
-                {"label": "F6", "matrix": [0, 7], "x": 7.5, "y": 0},
-                {"label": "F7", "matrix": [0, 8], "x": 8.5, "y": 0},
-                {"label": "F8", "matrix": [0, 9], "x": 9.5, "y": 0},
-
-                {"label": "F9", "matrix": [0, 11], "x": 11, "y": 0},
-                {"label": "F10", "matrix": [0, 12], "x": 12, "y": 0},
-                {"label": "F11", "matrix": [0, 13], "x": 13, "y": 0},
-                {"label": "F12", "matrix": [0, 14], "x": 14, "y": 0},
-
-                {"label": "Print Screen", "matrix": [0, 15], "x": 15.25, "y": 0},
-                {"label": "Scroll Lock", "matrix": [0, 16], "x": 16.25, "y": 0},
-                {"label": "Mute", "matrix": [0, 17], "x": 17.25, "y": 0},
-
-                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
-                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
-                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
-                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
-                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
-                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
-                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
-                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
-                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
-                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
-                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
-                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
-                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
-                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25},
-                {"label": "Delete", "matrix": [3, 14], "x": 14, "y": 1.25},
-
-                {"label": "Insert", "matrix": [1, 15], "x": 15.25, "y": 1.25},
-                {"label": "Home", "matrix": [1, 16], "x": 16.25, "y": 1.25},
-                {"label": "Page Up", "matrix": [1, 17], "x": 17.25, "y": 1.25},
-
-                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
-                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
-                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
-                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
-                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
-                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
-                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
-                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
-                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
-                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
-                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
-                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
-                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
-                {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
-
-                {"label": "Delete", "matrix": [2, 15], "x": 15.25, "y": 2.25},
-                {"label": "End", "matrix": [2, 16], "x": 16.25, "y": 2.25},
-                {"label": "Page Down", "matrix": [2, 17], "x": 17.25, "y": 2.25},
-
-                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
-                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
-                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
-                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
-                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
-                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
-                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
-                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
-                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
-                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
-                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
-                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
-                {"label": "Enter", "matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
-
-                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
-                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
-                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
-                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
-                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
-                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
-                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
-                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
-                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
-                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
-                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
-                {"label": "Shift", "matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 1.75},
-                {"label": "Shift", "matrix": [4, 14], "x": 14, "y": 4.25},
-
-                {"label": "\u2191", "matrix": [4, 16], "x": 16.25, "y": 4.25},
-
-                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
-                {"label": "GUI", "matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
-                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
-                {"label": "Space", "matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
-                {"label": "Alt", "matrix": [5, 9], "x": 10, "y": 5.25, "w": 1.25},
-                {"label": "GUI", "matrix": [5, 10], "x": 11.25, "y": 5.25, "w": 1.25},
-                {"label": "Menu", "matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
-                {"label": "Ctrl", "matrix": [5, 14], "x": 13.75, "y": 5.25, "w": 1.25},
-
-                {"label": "\u2190", "matrix": [5, 15], "x": 15.25, "y": 5.25},
-                {"label": "\u2193", "matrix": [5, 16], "x": 16.25, "y": 5.25},
-                {"label": "\u2192", "matrix": [5, 17], "x": 17.25, "y": 5.25}
-            ]
-        },
-        "LAYOUT_tkl_ansi_tsangan": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-
-                {"label": "F1", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "F2", "matrix": [0, 3], "x": 3, "y": 0},
-                {"label": "F3", "matrix": [0, 4], "x": 4, "y": 0},
-                {"label": "F4", "matrix": [0, 5], "x": 5, "y": 0},
-
-                {"label": "F5", "matrix": [0, 6], "x": 6.5, "y": 0},
-                {"label": "F6", "matrix": [0, 7], "x": 7.5, "y": 0},
-                {"label": "F7", "matrix": [0, 8], "x": 8.5, "y": 0},
-                {"label": "F8", "matrix": [0, 9], "x": 9.5, "y": 0},
-
-                {"label": "F9", "matrix": [0, 11], "x": 11, "y": 0},
-                {"label": "F10", "matrix": [0, 12], "x": 12, "y": 0},
-                {"label": "F11", "matrix": [0, 13], "x": 13, "y": 0},
-                {"label": "F12", "matrix": [0, 14], "x": 14, "y": 0},
-
-                {"label": "Print Screen", "matrix": [0, 15], "x": 15.25, "y": 0},
-                {"label": "Scroll Lock", "matrix": [0, 16], "x": 16.25, "y": 0},
-                {"label": "Mute", "matrix": [0, 17], "x": 17.25, "y": 0},
-
-                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
-                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
-                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
-                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
-                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
-                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
-                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
-                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
-                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
-                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
-                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
-                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
-                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
-                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
-
-                {"label": "Insert", "matrix": [1, 15], "x": 15.25, "y": 1.25},
-                {"label": "Home", "matrix": [1, 16], "x": 16.25, "y": 1.25},
-                {"label": "Page Up", "matrix": [1, 17], "x": 17.25, "y": 1.25},
-
-                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
-                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
-                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
-                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
-                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
-                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
-                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
-                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
-                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
-                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
-                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
-                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
-                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
-                {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
-
-                {"label": "Delete", "matrix": [2, 15], "x": 15.25, "y": 2.25},
-                {"label": "End", "matrix": [2, 16], "x": 16.25, "y": 2.25},
-                {"label": "Page Down", "matrix": [2, 17], "x": 17.25, "y": 2.25},
-
-                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
-                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
-                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
-                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
-                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
-                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
-                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
-                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
-                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
-                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
-                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
-                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
-                {"label": "Enter", "matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
-
-                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
-                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
-                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
-                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
-                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
-                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
-                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
-                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
-                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
-                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
-                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
-                {"label": "Shift", "matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 2.75},
-
-                {"label": "\u2191", "matrix": [4, 16], "x": 16.25, "y": 4.25},
-
-                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
-                {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 5.25},
-                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
-                {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
-                {"label": "Alt", "matrix": [5, 10], "x": 11, "y": 5.25, "w": 1.5},
-                {"label": "Menu", "matrix": [5, 12], "x": 12.5, "y": 5.25},
-                {"label": "Ctrl", "matrix": [5, 14], "x": 13.5, "y": 5.25, "w": 1.5},
-
-                {"label": "\u2190", "matrix": [5, 15], "x": 15.25, "y": 5.25},
-                {"label": "\u2193", "matrix": [5, 16], "x": 16.25, "y": 5.25},
-                {"label": "\u2192", "matrix": [5, 17], "x": 17.25, "y": 5.25}
-            ]
-        },
-        "LAYOUT_tkl_ansi_tsangan_split_bs_rshift": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-
-                {"label": "F1", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "F2", "matrix": [0, 3], "x": 3, "y": 0},
-                {"label": "F3", "matrix": [0, 4], "x": 4, "y": 0},
-                {"label": "F4", "matrix": [0, 5], "x": 5, "y": 0},
-
-                {"label": "F5", "matrix": [0, 6], "x": 6.5, "y": 0},
-                {"label": "F6", "matrix": [0, 7], "x": 7.5, "y": 0},
-                {"label": "F7", "matrix": [0, 8], "x": 8.5, "y": 0},
-                {"label": "F8", "matrix": [0, 9], "x": 9.5, "y": 0},
-
-                {"label": "F9", "matrix": [0, 11], "x": 11, "y": 0},
-                {"label": "F10", "matrix": [0, 12], "x": 12, "y": 0},
-                {"label": "F11", "matrix": [0, 13], "x": 13, "y": 0},
-                {"label": "F12", "matrix": [0, 14], "x": 14, "y": 0},
-
-                {"label": "Print Screen", "matrix": [0, 15], "x": 15.25, "y": 0},
-                {"label": "Scroll Lock", "matrix": [0, 16], "x": 16.25, "y": 0},
-                {"label": "Mute", "matrix": [0, 17], "x": 17.25, "y": 0},
-
-                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
-                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
-                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
-                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
-                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
-                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
-                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
-                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
-                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
-                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
-                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
-                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
-                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
-                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25},
-                {"label": "Delete", "matrix": [3, 14], "x": 14, "y": 1.25},
-
-                {"label": "Insert", "matrix": [1, 15], "x": 15.25, "y": 1.25},
-                {"label": "Home", "matrix": [1, 16], "x": 16.25, "y": 1.25},
-                {"label": "Page Up", "matrix": [1, 17], "x": 17.25, "y": 1.25},
-
-                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
-                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
-                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
-                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
-                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
-                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
-                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
-                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
-                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
-                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
-                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
-                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
-                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
-                {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
-
-                {"label": "Delete", "matrix": [2, 15], "x": 15.25, "y": 2.25},
-                {"label": "End", "matrix": [2, 16], "x": 16.25, "y": 2.25},
-                {"label": "Page Down", "matrix": [2, 17], "x": 17.25, "y": 2.25},
-
-                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
-                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
-                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
-                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
-                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
-                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
-                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
-                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
-                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
-                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
-                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
-                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
-                {"label": "Enter", "matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
-
-                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
-                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
-                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
-                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
-                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
-                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
-                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
-                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
-                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
-                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
-                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
-                {"label": "Shift", "matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 1.75},
-                {"label": "Shift", "matrix": [4, 14], "x": 14, "y": 4.25},
-
-                {"label": "\u2191", "matrix": [4, 16], "x": 16.25, "y": 4.25},
-
-                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
-                {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 5.25},
-                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
-                {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
-                {"label": "Alt", "matrix": [5, 10], "x": 11, "y": 5.25, "w": 1.5},
-                {"label": "Menu", "matrix": [5, 12], "x": 12.5, "y": 5.25},
-                {"label": "Ctrl", "matrix": [5, 14], "x": 13.5, "y": 5.25, "w": 1.5},
-
-                {"label": "\u2190", "matrix": [5, 15], "x": 15.25, "y": 5.25},
-                {"label": "\u2193", "matrix": [5, 16], "x": 16.25, "y": 5.25},
-                {"label": "\u2192", "matrix": [5, 17], "x": 17.25, "y": 5.25}
-            ]
-        },
-        "LAYOUT_tkl_ansi_wkl": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-
-                {"label": "F1", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "F2", "matrix": [0, 3], "x": 3, "y": 0},
-                {"label": "F3", "matrix": [0, 4], "x": 4, "y": 0},
-                {"label": "F4", "matrix": [0, 5], "x": 5, "y": 0},
-
-                {"label": "F5", "matrix": [0, 6], "x": 6.5, "y": 0},
-                {"label": "F6", "matrix": [0, 7], "x": 7.5, "y": 0},
-                {"label": "F7", "matrix": [0, 8], "x": 8.5, "y": 0},
-                {"label": "F8", "matrix": [0, 9], "x": 9.5, "y": 0},
-
-                {"label": "F9", "matrix": [0, 11], "x": 11, "y": 0},
-                {"label": "F10", "matrix": [0, 12], "x": 12, "y": 0},
-                {"label": "F11", "matrix": [0, 13], "x": 13, "y": 0},
-                {"label": "F12", "matrix": [0, 14], "x": 14, "y": 0},
-
-                {"label": "Print Screen", "matrix": [0, 15], "x": 15.25, "y": 0},
-                {"label": "Scroll Lock", "matrix": [0, 16], "x": 16.25, "y": 0},
-                {"label": "Mute", "matrix": [0, 17], "x": 17.25, "y": 0},
-
-                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
-                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
-                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
-                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
-                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
-                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
-                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
-                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
-                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
-                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
-                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
-                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
-                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
-                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
-
-                {"label": "Insert", "matrix": [1, 15], "x": 15.25, "y": 1.25},
-                {"label": "Home", "matrix": [1, 16], "x": 16.25, "y": 1.25},
-                {"label": "Page Up", "matrix": [1, 17], "x": 17.25, "y": 1.25},
-
-                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
-                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
-                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
-                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
-                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
-                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
-                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
-                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
-                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
-                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
-                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
-                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
-                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
-                {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
-
-                {"label": "Delete", "matrix": [2, 15], "x": 15.25, "y": 2.25},
-                {"label": "End", "matrix": [2, 16], "x": 16.25, "y": 2.25},
-                {"label": "Page Down", "matrix": [2, 17], "x": 17.25, "y": 2.25},
-
-                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
-                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
-                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
-                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
-                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
-                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
-                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
-                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
-                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
-                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
-                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
-                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
-                {"label": "Enter", "matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
-
-                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
-                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
-                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
-                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
-                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
-                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
-                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
-                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
-                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
-                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
-                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
-                {"label": "Shift", "matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 2.75},
-
-                {"label": "\u2191", "matrix": [4, 16], "x": 16.25, "y": 4.25},
-
-                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
-                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
-                {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
-                {"label": "Alt", "matrix": [5, 10], "x": 11, "y": 5.25, "w": 1.5},
-                {"label": "Ctrl", "matrix": [5, 14], "x": 13.5, "y": 5.25, "w": 1.5},
-
-                {"label": "\u2190", "matrix": [5, 15], "x": 15.25, "y": 5.25},
-                {"label": "\u2193", "matrix": [5, 16], "x": 16.25, "y": 5.25},
-                {"label": "\u2192", "matrix": [5, 17], "x": 17.25, "y": 5.25}
-            ]
-        },
-        "LAYOUT_tkl_ansi_wkl_split_bs_rshift": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-
-                {"label": "F1", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "F2", "matrix": [0, 3], "x": 3, "y": 0},
-                {"label": "F3", "matrix": [0, 4], "x": 4, "y": 0},
-                {"label": "F4", "matrix": [0, 5], "x": 5, "y": 0},
-
-                {"label": "F5", "matrix": [0, 6], "x": 6.5, "y": 0},
-                {"label": "F6", "matrix": [0, 7], "x": 7.5, "y": 0},
-                {"label": "F7", "matrix": [0, 8], "x": 8.5, "y": 0},
-                {"label": "F8", "matrix": [0, 9], "x": 9.5, "y": 0},
-
-                {"label": "F9", "matrix": [0, 11], "x": 11, "y": 0},
-                {"label": "F10", "matrix": [0, 12], "x": 12, "y": 0},
-                {"label": "F11", "matrix": [0, 13], "x": 13, "y": 0},
-                {"label": "F12", "matrix": [0, 14], "x": 14, "y": 0},
-
-                {"label": "Print Screen", "matrix": [0, 15], "x": 15.25, "y": 0},
-                {"label": "Scroll Lock", "matrix": [0, 16], "x": 16.25, "y": 0},
-                {"label": "Mute", "matrix": [0, 17], "x": 17.25, "y": 0},
-
-                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
-                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
-                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
-                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
-                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
-                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
-                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
-                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
-                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
-                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
-                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
-                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
-                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
-                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25},
-                {"label": "Delete", "matrix": [3, 14], "x": 14, "y": 1.25},
-
-                {"label": "Insert", "matrix": [1, 15], "x": 15.25, "y": 1.25},
-                {"label": "Home", "matrix": [1, 16], "x": 16.25, "y": 1.25},
-                {"label": "Page Up", "matrix": [1, 17], "x": 17.25, "y": 1.25},
-
-                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
-                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
-                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
-                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
-                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
-                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
-                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
-                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
-                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
-                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
-                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
-                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
-                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
-                {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
-
-                {"label": "Delete", "matrix": [2, 15], "x": 15.25, "y": 2.25},
-                {"label": "End", "matrix": [2, 16], "x": 16.25, "y": 2.25},
-                {"label": "Page Down", "matrix": [2, 17], "x": 17.25, "y": 2.25},
-
-                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
-                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
-                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
-                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
-                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
-                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
-                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
-                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
-                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
-                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
-                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
-                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
-                {"label": "Enter", "matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
-
-                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
-                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
-                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
-                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
-                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
-                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
-                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
-                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
-                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
-                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
-                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
-                {"label": "Shift", "matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 1.75},
-                {"label": "Shift", "matrix": [4, 14], "x": 14, "y": 4.25},
-
-                {"label": "\u2191", "matrix": [4, 16], "x": 16.25, "y": 4.25},
-
-                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
-                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
-                {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
-                {"label": "Alt", "matrix": [5, 10], "x": 11, "y": 5.25, "w": 1.5},
-                {"label": "Ctrl", "matrix": [5, 14], "x": 13.5, "y": 5.25, "w": 1.5},
-
-                {"label": "\u2190", "matrix": [5, 15], "x": 15.25, "y": 5.25},
-                {"label": "\u2193", "matrix": [5, 16], "x": 16.25, "y": 5.25},
-                {"label": "\u2192", "matrix": [5, 17], "x": 17.25, "y": 5.25}
-            ]
-        },
-        "LAYOUT_tkl_iso": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-
-                {"label": "F1", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "F2", "matrix": [0, 3], "x": 3, "y": 0},
-                {"label": "F3", "matrix": [0, 4], "x": 4, "y": 0},
-                {"label": "F4", "matrix": [0, 5], "x": 5, "y": 0},
-
-                {"label": "F5", "matrix": [0, 6], "x": 6.5, "y": 0},
-                {"label": "F6", "matrix": [0, 7], "x": 7.5, "y": 0},
-                {"label": "F7", "matrix": [0, 8], "x": 8.5, "y": 0},
-                {"label": "F8", "matrix": [0, 9], "x": 9.5, "y": 0},
-
-                {"label": "F9", "matrix": [0, 11], "x": 11, "y": 0},
-                {"label": "F10", "matrix": [0, 12], "x": 12, "y": 0},
-                {"label": "F11", "matrix": [0, 13], "x": 13, "y": 0},
-                {"label": "F12", "matrix": [0, 14], "x": 14, "y": 0},
-
-                {"label": "Print Screen", "matrix": [0, 15], "x": 15.25, "y": 0},
-                {"label": "Scroll Lock", "matrix": [0, 16], "x": 16.25, "y": 0},
-                {"label": "Mute", "matrix": [0, 17], "x": 17.25, "y": 0},
-
-                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
-                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
-                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
-                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
-                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
-                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
-                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
-                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
-                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
-                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
-                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
-                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
-                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
-                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
-
-                {"label": "Insert", "matrix": [1, 15], "x": 15.25, "y": 1.25},
-                {"label": "Home", "matrix": [1, 16], "x": 16.25, "y": 1.25},
-                {"label": "Page Up", "matrix": [1, 17], "x": 17.25, "y": 1.25},
-
-                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
-                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
-                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
-                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
-                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
-                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
-                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
-                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
-                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
-                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
-                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
-                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
-                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
-
-                {"label": "Delete", "matrix": [2, 15], "x": 15.25, "y": 2.25},
-                {"label": "End", "matrix": [2, 16], "x": 16.25, "y": 2.25},
-                {"label": "Page Down", "matrix": [2, 17], "x": 17.25, "y": 2.25},
-
-                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
-                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
-                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
-                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
-                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
-                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
-                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
-                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
-                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
-                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
-                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
-                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
-                {"label": "#", "matrix": [2, 13], "x": 12.75, "y": 3.25},
-                {"label": "Enter", "matrix": [3, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
-
-                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
-                {"label": "\\", "matrix": [4, 1], "x": 1.25, "y": 4.25},
-                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
-                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
-                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
-                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
-                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
-                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
-                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
-                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
-                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
-                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
-                {"label": "Shift", "matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 2.75},
-
-                {"label": "\u2191", "matrix": [4, 16], "x": 16.25, "y": 4.25},
-
-                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
-                {"label": "GUI", "matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
-                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
-                {"label": "Space", "matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
-                {"label": "Alt", "matrix": [5, 9], "x": 10, "y": 5.25, "w": 1.25},
-                {"label": "GUI", "matrix": [5, 10], "x": 11.25, "y": 5.25, "w": 1.25},
-                {"label": "Menu", "matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
-                {"label": "Ctrl", "matrix": [5, 14], "x": 13.75, "y": 5.25, "w": 1.25},
-
-                {"label": "\u2190", "matrix": [5, 15], "x": 15.25, "y": 5.25},
-                {"label": "\u2193", "matrix": [5, 16], "x": 16.25, "y": 5.25},
-                {"label": "\u2192", "matrix": [5, 17], "x": 17.25, "y": 5.25}
-            ]
-        },
-        "LAYOUT_tkl_iso_split_bs_rshift": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-
-                {"label": "F1", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "F2", "matrix": [0, 3], "x": 3, "y": 0},
-                {"label": "F3", "matrix": [0, 4], "x": 4, "y": 0},
-                {"label": "F4", "matrix": [0, 5], "x": 5, "y": 0},
-
-                {"label": "F5", "matrix": [0, 6], "x": 6.5, "y": 0},
-                {"label": "F6", "matrix": [0, 7], "x": 7.5, "y": 0},
-                {"label": "F7", "matrix": [0, 8], "x": 8.5, "y": 0},
-                {"label": "F8", "matrix": [0, 9], "x": 9.5, "y": 0},
-
-                {"label": "F9", "matrix": [0, 11], "x": 11, "y": 0},
-                {"label": "F10", "matrix": [0, 12], "x": 12, "y": 0},
-                {"label": "F11", "matrix": [0, 13], "x": 13, "y": 0},
-                {"label": "F12", "matrix": [0, 14], "x": 14, "y": 0},
-
-                {"label": "Print Screen", "matrix": [0, 15], "x": 15.25, "y": 0},
-                {"label": "Scroll Lock", "matrix": [0, 16], "x": 16.25, "y": 0},
-                {"label": "Mute", "matrix": [0, 17], "x": 17.25, "y": 0},
-
-                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
-                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
-                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
-                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
-                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
-                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
-                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
-                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
-                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
-                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
-                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
-                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
-                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
-                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25},
-                {"label": "Delete", "matrix": [3, 14], "x": 14, "y": 1.25},
-
-                {"label": "Insert", "matrix": [1, 15], "x": 15.25, "y": 1.25},
-                {"label": "Home", "matrix": [1, 16], "x": 16.25, "y": 1.25},
-                {"label": "Page Up", "matrix": [1, 17], "x": 17.25, "y": 1.25},
-
-                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
-                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
-                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
-                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
-                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
-                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
-                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
-                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
-                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
-                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
-                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
-                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
-                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
-
-                {"label": "Delete", "matrix": [2, 15], "x": 15.25, "y": 2.25},
-                {"label": "End", "matrix": [2, 16], "x": 16.25, "y": 2.25},
-                {"label": "Page Down", "matrix": [2, 17], "x": 17.25, "y": 2.25},
-
-                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
-                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
-                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
-                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
-                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
-                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
-                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
-                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
-                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
-                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
-                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
-                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
-                {"label": "#", "matrix": [2, 13], "x": 12.75, "y": 3.25},
-                {"label": "Enter", "matrix": [3, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
-
-                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
-                {"label": "\\", "matrix": [4, 1], "x": 1.25, "y": 4.25},
-                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
-                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
-                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
-                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
-                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
-                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
-                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
-                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
-                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
-                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
-                {"label": "Shift", "matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 1.75},
-                {"label": "Shift", "matrix": [4, 14], "x": 14, "y": 4.25},
-
-                {"label": "\u2191", "matrix": [4, 16], "x": 16.25, "y": 4.25},
-
-                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
-                {"label": "GUI", "matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
-                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
-                {"label": "Space", "matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
-                {"label": "Alt", "matrix": [5, 9], "x": 10, "y": 5.25, "w": 1.25},
-                {"label": "GUI", "matrix": [5, 10], "x": 11.25, "y": 5.25, "w": 1.25},
-                {"label": "Menu", "matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
-                {"label": "Ctrl", "matrix": [5, 14], "x": 13.75, "y": 5.25, "w": 1.25},
-
-                {"label": "\u2190", "matrix": [5, 15], "x": 15.25, "y": 5.25},
-                {"label": "\u2193", "matrix": [5, 16], "x": 16.25, "y": 5.25},
-                {"label": "\u2192", "matrix": [5, 17], "x": 17.25, "y": 5.25}
-            ]
-        },
-        "LAYOUT_tkl_iso_tsangan": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-
-                {"label": "F1", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "F2", "matrix": [0, 3], "x": 3, "y": 0},
-                {"label": "F3", "matrix": [0, 4], "x": 4, "y": 0},
-                {"label": "F4", "matrix": [0, 5], "x": 5, "y": 0},
-
-                {"label": "F5", "matrix": [0, 6], "x": 6.5, "y": 0},
-                {"label": "F6", "matrix": [0, 7], "x": 7.5, "y": 0},
-                {"label": "F7", "matrix": [0, 8], "x": 8.5, "y": 0},
-                {"label": "F8", "matrix": [0, 9], "x": 9.5, "y": 0},
-
-                {"label": "F9", "matrix": [0, 11], "x": 11, "y": 0},
-                {"label": "F10", "matrix": [0, 12], "x": 12, "y": 0},
-                {"label": "F11", "matrix": [0, 13], "x": 13, "y": 0},
-                {"label": "F12", "matrix": [0, 14], "x": 14, "y": 0},
-
-                {"label": "Print Screen", "matrix": [0, 15], "x": 15.25, "y": 0},
-                {"label": "Scroll Lock", "matrix": [0, 16], "x": 16.25, "y": 0},
-                {"label": "Mute", "matrix": [0, 17], "x": 17.25, "y": 0},
-
-                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
-                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
-                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
-                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
-                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
-                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
-                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
-                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
-                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
-                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
-                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
-                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
-                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
-                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
-
-                {"label": "Insert", "matrix": [1, 15], "x": 15.25, "y": 1.25},
-                {"label": "Home", "matrix": [1, 16], "x": 16.25, "y": 1.25},
-                {"label": "Page Up", "matrix": [1, 17], "x": 17.25, "y": 1.25},
-
-                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
-                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
-                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
-                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
-                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
-                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
-                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
-                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
-                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
-                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
-                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
-                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
-                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
-
-                {"label": "Delete", "matrix": [2, 15], "x": 15.25, "y": 2.25},
-                {"label": "End", "matrix": [2, 16], "x": 16.25, "y": 2.25},
-                {"label": "Page Down", "matrix": [2, 17], "x": 17.25, "y": 2.25},
-
-                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
-                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
-                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
-                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
-                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
-                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
-                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
-                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
-                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
-                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
-                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
-                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
-                {"label": "#", "matrix": [2, 13], "x": 12.75, "y": 3.25},
-                {"label": "Enter", "matrix": [3, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
-
-                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
-                {"label": "\\", "matrix": [4, 1], "x": 1.25, "y": 4.25},
-                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
-                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
-                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
-                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
-                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
-                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
-                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
-                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
-                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
-                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
-                {"label": "Shift", "matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 2.75},
-
-                {"label": "\u2191", "matrix": [4, 16], "x": 16.25, "y": 4.25},
-
-                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
-                {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 5.25},
-                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
-                {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
-                {"label": "Alt", "matrix": [5, 10], "x": 11, "y": 5.25, "w": 1.5},
-                {"label": "Menu", "matrix": [5, 12], "x": 12.5, "y": 5.25},
-                {"label": "Ctrl", "matrix": [5, 14], "x": 13.5, "y": 5.25, "w": 1.5},
-
-                {"label": "\u2190", "matrix": [5, 15], "x": 15.25, "y": 5.25},
-                {"label": "\u2193", "matrix": [5, 16], "x": 16.25, "y": 5.25},
-                {"label": "\u2192", "matrix": [5, 17], "x": 17.25, "y": 5.25}
-            ]
-        },
-        "LAYOUT_tkl_iso_tsangan_split_bs_rshift": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-
-                {"label": "F1", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "F2", "matrix": [0, 3], "x": 3, "y": 0},
-                {"label": "F3", "matrix": [0, 4], "x": 4, "y": 0},
-                {"label": "F4", "matrix": [0, 5], "x": 5, "y": 0},
-
-                {"label": "F5", "matrix": [0, 6], "x": 6.5, "y": 0},
-                {"label": "F6", "matrix": [0, 7], "x": 7.5, "y": 0},
-                {"label": "F7", "matrix": [0, 8], "x": 8.5, "y": 0},
-                {"label": "F8", "matrix": [0, 9], "x": 9.5, "y": 0},
-
-                {"label": "F9", "matrix": [0, 11], "x": 11, "y": 0},
-                {"label": "F10", "matrix": [0, 12], "x": 12, "y": 0},
-                {"label": "F11", "matrix": [0, 13], "x": 13, "y": 0},
-                {"label": "F12", "matrix": [0, 14], "x": 14, "y": 0},
-
-                {"label": "Print Screen", "matrix": [0, 15], "x": 15.25, "y": 0},
-                {"label": "Scroll Lock", "matrix": [0, 16], "x": 16.25, "y": 0},
-                {"label": "Mute", "matrix": [0, 17], "x": 17.25, "y": 0},
-
-                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
-                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
-                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
-                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
-                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
-                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
-                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
-                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
-                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
-                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
-                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
-                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
-                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
-                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25},
-                {"label": "Delete", "matrix": [3, 14], "x": 14, "y": 1.25},
-
-                {"label": "Insert", "matrix": [1, 15], "x": 15.25, "y": 1.25},
-                {"label": "Home", "matrix": [1, 16], "x": 16.25, "y": 1.25},
-                {"label": "Page Up", "matrix": [1, 17], "x": 17.25, "y": 1.25},
-
-                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
-                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
-                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
-                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
-                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
-                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
-                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
-                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
-                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
-                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
-                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
-                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
-                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
-
-                {"label": "Delete", "matrix": [2, 15], "x": 15.25, "y": 2.25},
-                {"label": "End", "matrix": [2, 16], "x": 16.25, "y": 2.25},
-                {"label": "Page Down", "matrix": [2, 17], "x": 17.25, "y": 2.25},
-
-                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
-                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
-                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
-                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
-                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
-                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
-                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
-                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
-                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
-                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
-                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
-                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
-                {"label": "#", "matrix": [2, 13], "x": 12.75, "y": 3.25},
-                {"label": "Enter", "matrix": [3, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
-
-                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
-                {"label": "\\", "matrix": [4, 1], "x": 1.25, "y": 4.25},
-                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
-                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
-                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
-                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
-                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
-                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
-                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
-                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
-                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
-                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
-                {"label": "Shift", "matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 1.75},
-                {"label": "Shift", "matrix": [4, 14], "x": 14, "y": 4.25},
-
-                {"label": "\u2191", "matrix": [4, 16], "x": 16.25, "y": 4.25},
-
-                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
-                {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 5.25},
-                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
-                {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
-                {"label": "Alt", "matrix": [5, 10], "x": 11, "y": 5.25, "w": 1.5},
-                {"label": "Menu", "matrix": [5, 12], "x": 12.5, "y": 5.25},
-                {"label": "Ctrl", "matrix": [5, 14], "x": 13.5, "y": 5.25, "w": 1.5},
-
-                {"label": "\u2190", "matrix": [5, 15], "x": 15.25, "y": 5.25},
-                {"label": "\u2193", "matrix": [5, 16], "x": 16.25, "y": 5.25},
-                {"label": "\u2192", "matrix": [5, 17], "x": 17.25, "y": 5.25}
-            ]
-        },
-        "LAYOUT_tkl_iso_wkl": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-
-                {"label": "F1", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "F2", "matrix": [0, 3], "x": 3, "y": 0},
-                {"label": "F3", "matrix": [0, 4], "x": 4, "y": 0},
-                {"label": "F4", "matrix": [0, 5], "x": 5, "y": 0},
-
-                {"label": "F5", "matrix": [0, 6], "x": 6.5, "y": 0},
-                {"label": "F6", "matrix": [0, 7], "x": 7.5, "y": 0},
-                {"label": "F7", "matrix": [0, 8], "x": 8.5, "y": 0},
-                {"label": "F8", "matrix": [0, 9], "x": 9.5, "y": 0},
-
-                {"label": "F9", "matrix": [0, 11], "x": 11, "y": 0},
-                {"label": "F10", "matrix": [0, 12], "x": 12, "y": 0},
-                {"label": "F11", "matrix": [0, 13], "x": 13, "y": 0},
-                {"label": "F12", "matrix": [0, 14], "x": 14, "y": 0},
-
-                {"label": "Print Screen", "matrix": [0, 15], "x": 15.25, "y": 0},
-                {"label": "Scroll Lock", "matrix": [0, 16], "x": 16.25, "y": 0},
-                {"label": "Mute", "matrix": [0, 17], "x": 17.25, "y": 0},
-
-                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
-                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
-                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
-                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
-                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
-                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
-                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
-                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
-                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
-                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
-                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
-                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
-                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
-                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
-
-                {"label": "Insert", "matrix": [1, 15], "x": 15.25, "y": 1.25},
-                {"label": "Home", "matrix": [1, 16], "x": 16.25, "y": 1.25},
-                {"label": "Page Up", "matrix": [1, 17], "x": 17.25, "y": 1.25},
-
-                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
-                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
-                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
-                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
-                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
-                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
-                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
-                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
-                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
-                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
-                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
-                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
-                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
-
-                {"label": "Delete", "matrix": [2, 15], "x": 15.25, "y": 2.25},
-                {"label": "End", "matrix": [2, 16], "x": 16.25, "y": 2.25},
-                {"label": "Page Down", "matrix": [2, 17], "x": 17.25, "y": 2.25},
-
-                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
-                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
-                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
-                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
-                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
-                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
-                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
-                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
-                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
-                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
-                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
-                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
-                {"label": "#", "matrix": [2, 13], "x": 12.75, "y": 3.25},
-                {"label": "Enter", "matrix": [3, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
-
-                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
-                {"label": "\\", "matrix": [4, 1], "x": 1.25, "y": 4.25},
-                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
-                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
-                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
-                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
-                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
-                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
-                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
-                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
-                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
-                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
-                {"label": "Shift", "matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 2.75},
-
-                {"label": "\u2191", "matrix": [4, 16], "x": 16.25, "y": 4.25},
-
-                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
-                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
-                {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
-                {"label": "Alt", "matrix": [5, 10], "x": 11, "y": 5.25, "w": 1.5},
-                {"label": "Ctrl", "matrix": [5, 14], "x": 13.5, "y": 5.25, "w": 1.5},
-
-                {"label": "\u2190", "matrix": [5, 15], "x": 15.25, "y": 5.25},
-                {"label": "\u2193", "matrix": [5, 16], "x": 16.25, "y": 5.25},
-                {"label": "\u2192", "matrix": [5, 17], "x": 17.25, "y": 5.25}
-            ]
-        },
-        "LAYOUT_tkl_iso_wkl_split_bs_rshift": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-
-                {"label": "F1", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "F2", "matrix": [0, 3], "x": 3, "y": 0},
-                {"label": "F3", "matrix": [0, 4], "x": 4, "y": 0},
-                {"label": "F4", "matrix": [0, 5], "x": 5, "y": 0},
-
-                {"label": "F5", "matrix": [0, 6], "x": 6.5, "y": 0},
-                {"label": "F6", "matrix": [0, 7], "x": 7.5, "y": 0},
-                {"label": "F7", "matrix": [0, 8], "x": 8.5, "y": 0},
-                {"label": "F8", "matrix": [0, 9], "x": 9.5, "y": 0},
-
-                {"label": "F9", "matrix": [0, 11], "x": 11, "y": 0},
-                {"label": "F10", "matrix": [0, 12], "x": 12, "y": 0},
-                {"label": "F11", "matrix": [0, 13], "x": 13, "y": 0},
-                {"label": "F12", "matrix": [0, 14], "x": 14, "y": 0},
-
-                {"label": "Print Screen", "matrix": [0, 15], "x": 15.25, "y": 0},
-                {"label": "Scroll Lock", "matrix": [0, 16], "x": 16.25, "y": 0},
-                {"label": "Mute", "matrix": [0, 17], "x": 17.25, "y": 0},
-
-                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
-                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
-                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
-                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
-                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
-                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
-                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
-                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
-                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
-                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
-                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
-                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
-                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
-                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25},
-                {"label": "Delete", "matrix": [3, 14], "x": 14, "y": 1.25},
-
-                {"label": "Insert", "matrix": [1, 15], "x": 15.25, "y": 1.25},
-                {"label": "Home", "matrix": [1, 16], "x": 16.25, "y": 1.25},
-                {"label": "Page Up", "matrix": [1, 17], "x": 17.25, "y": 1.25},
-
-                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
-                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
-                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
-                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
-                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
-                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
-                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
-                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
-                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
-                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
-                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
-                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
-                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
-
-                {"label": "Delete", "matrix": [2, 15], "x": 15.25, "y": 2.25},
-                {"label": "End", "matrix": [2, 16], "x": 16.25, "y": 2.25},
-                {"label": "Page Down", "matrix": [2, 17], "x": 17.25, "y": 2.25},
-
-                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
-                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
-                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
-                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
-                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
-                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
-                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
-                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
-                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
-                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
-                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
-                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
-                {"label": "#", "matrix": [2, 13], "x": 12.75, "y": 3.25},
-                {"label": "Enter", "matrix": [3, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
-
-                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
-                {"label": "\\", "matrix": [4, 1], "x": 1.25, "y": 4.25},
-                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
-                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
-                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
-                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
-                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
-                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
-                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
-                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
-                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
-                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
-                {"label": "Shift", "matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 1.75},
-                {"label": "Shift", "matrix": [4, 14], "x": 14, "y": 4.25},
-
-                {"label": "\u2191", "matrix": [4, 16], "x": 16.25, "y": 4.25},
-
-                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
-                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
-                {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
-                {"label": "Alt", "matrix": [5, 10], "x": 11, "y": 5.25, "w": 1.5},
-                {"label": "Ctrl", "matrix": [5, 14], "x": 13.5, "y": 5.25, "w": 1.5},
-
-                {"label": "\u2190", "matrix": [5, 15], "x": 15.25, "y": 5.25},
-                {"label": "\u2193", "matrix": [5, 16], "x": 16.25, "y": 5.25},
-                {"label": "\u2192", "matrix": [5, 17], "x": 17.25, "y": 5.25}
-            ]
-        }
-    }
-}
diff --git a/keyboards/protozoa/p01/keyboard.json b/keyboards/protozoa/p01/keyboard.json
new file mode 100644
index 00000000000..4b453855525
--- /dev/null
+++ b/keyboards/protozoa/p01/keyboard.json
@@ -0,0 +1,1421 @@
+{
+    "keyboard_name": "P.01",
+    "manufacturer": "Yiancar-Designs",
+    "url": "https://yiancar-designs.com",
+    "maintainer": "Yiancar-Designs",
+    "usb": {
+        "vid": "0x8968",
+        "pid": "0x5031",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "encoder": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgblight": true
+    },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 18,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": true,
+            "twinkle": true
+        }
+    },
+    "ws2812": {
+        "pin": "A9",
+        "driver": "pwm"
+    },
+    "matrix_pins": {
+        "cols": ["A14", "A15", "B3", "B4", "B5", "B6", "B7", "B8", "B9", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0"],
+        "rows": ["B1", "B2", "B10", "B11", "B12", "B13"]
+    },
+    "diode_direction": "COL2ROW",
+    "encoder": {
+        "rotary": [
+            {"pin_a": "B15", "pin_b": "B14"}
+        ]
+    },
+    "processor": "STM32F072",
+    "bootloader": "stm32-dfu",
+    "community_layouts": [
+        "tkl_ansi",
+        "tkl_ansi_split_bs_rshift",
+        "tkl_ansi_tsangan",
+        "tkl_ansi_tsangan_split_bs_rshift",
+        "tkl_iso",
+        "tkl_iso_split_bs_rshift",
+        "tkl_iso_tsangan",
+        "tkl_iso_tsangan_split_bs_rshift"
+    ],
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "F1", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "F2", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "F3", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "F4", "matrix": [0, 5], "x": 5, "y": 0},
+
+                {"label": "F5", "matrix": [0, 6], "x": 6.5, "y": 0},
+                {"label": "F6", "matrix": [0, 7], "x": 7.5, "y": 0},
+                {"label": "F7", "matrix": [0, 8], "x": 8.5, "y": 0},
+                {"label": "F8", "matrix": [0, 9], "x": 9.5, "y": 0},
+
+                {"label": "F9", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "F10", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "F11", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "F12", "matrix": [0, 14], "x": 14, "y": 0},
+
+                {"label": "Print Screen", "matrix": [0, 15], "x": 15.25, "y": 0},
+                {"label": "Scroll Lock", "matrix": [0, 16], "x": 16.25, "y": 0},
+                {"label": "Mute", "matrix": [0, 17], "x": 17.25, "y": 0},
+
+                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
+                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
+                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
+                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
+                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
+                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
+                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
+                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
+                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
+                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
+                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
+                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
+                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
+                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25},
+                {"label": "Delete", "matrix": [3, 14], "x": 14, "y": 1.25},
+
+                {"label": "Insert", "matrix": [1, 15], "x": 15.25, "y": 1.25},
+                {"label": "Home", "matrix": [1, 16], "x": 16.25, "y": 1.25},
+                {"label": "Page Up", "matrix": [1, 17], "x": 17.25, "y": 1.25},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"label": "Delete", "matrix": [2, 15], "x": 15.25, "y": 2.25},
+                {"label": "End", "matrix": [2, 16], "x": 16.25, "y": 2.25},
+                {"label": "Page Down", "matrix": [2, 17], "x": 17.25, "y": 2.25},
+
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"label": "Enter", "matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"label": "\\", "matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"label": "Shift", "matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"label": "Shift", "matrix": [4, 14], "x": 14, "y": 4.25},
+
+                {"label": "\u2191", "matrix": [4, 16], "x": 16.25, "y": 4.25},
+
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"label": "GUI", "matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"label": "Space", "matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"label": "Alt", "matrix": [5, 9], "x": 10, "y": 5.25, "w": 1.25},
+                {"label": "Fn", "matrix": [5, 10], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"label": "Menu", "matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"label": "Ctrl", "matrix": [5, 14], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"label": "\u2190", "matrix": [5, 15], "x": 15.25, "y": 5.25},
+                {"label": "\u2193", "matrix": [5, 16], "x": 16.25, "y": 5.25},
+                {"label": "\u2192", "matrix": [5, 17], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_ansi": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "F1", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "F2", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "F3", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "F4", "matrix": [0, 5], "x": 5, "y": 0},
+
+                {"label": "F5", "matrix": [0, 6], "x": 6.5, "y": 0},
+                {"label": "F6", "matrix": [0, 7], "x": 7.5, "y": 0},
+                {"label": "F7", "matrix": [0, 8], "x": 8.5, "y": 0},
+                {"label": "F8", "matrix": [0, 9], "x": 9.5, "y": 0},
+
+                {"label": "F9", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "F10", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "F11", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "F12", "matrix": [0, 14], "x": 14, "y": 0},
+
+                {"label": "Print Screen", "matrix": [0, 15], "x": 15.25, "y": 0},
+                {"label": "Scroll Lock", "matrix": [0, 16], "x": 16.25, "y": 0},
+                {"label": "Mute", "matrix": [0, 17], "x": 17.25, "y": 0},
+
+                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
+                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
+                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
+                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
+                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
+                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
+                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
+                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
+                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
+                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
+                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
+                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
+                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
+                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+
+                {"label": "Insert", "matrix": [1, 15], "x": 15.25, "y": 1.25},
+                {"label": "Home", "matrix": [1, 16], "x": 16.25, "y": 1.25},
+                {"label": "Page Up", "matrix": [1, 17], "x": 17.25, "y": 1.25},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"label": "Delete", "matrix": [2, 15], "x": 15.25, "y": 2.25},
+                {"label": "End", "matrix": [2, 16], "x": 16.25, "y": 2.25},
+                {"label": "Page Down", "matrix": [2, 17], "x": 17.25, "y": 2.25},
+
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"label": "Enter", "matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"label": "Shift", "matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"label": "\u2191", "matrix": [4, 16], "x": 16.25, "y": 4.25},
+
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"label": "GUI", "matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"label": "Space", "matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"label": "Alt", "matrix": [5, 9], "x": 10, "y": 5.25, "w": 1.25},
+                {"label": "GUI", "matrix": [5, 10], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"label": "Menu", "matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"label": "Ctrl", "matrix": [5, 14], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"label": "\u2190", "matrix": [5, 15], "x": 15.25, "y": 5.25},
+                {"label": "\u2193", "matrix": [5, 16], "x": 16.25, "y": 5.25},
+                {"label": "\u2192", "matrix": [5, 17], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_ansi_split_bs_rshift": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "F1", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "F2", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "F3", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "F4", "matrix": [0, 5], "x": 5, "y": 0},
+
+                {"label": "F5", "matrix": [0, 6], "x": 6.5, "y": 0},
+                {"label": "F6", "matrix": [0, 7], "x": 7.5, "y": 0},
+                {"label": "F7", "matrix": [0, 8], "x": 8.5, "y": 0},
+                {"label": "F8", "matrix": [0, 9], "x": 9.5, "y": 0},
+
+                {"label": "F9", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "F10", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "F11", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "F12", "matrix": [0, 14], "x": 14, "y": 0},
+
+                {"label": "Print Screen", "matrix": [0, 15], "x": 15.25, "y": 0},
+                {"label": "Scroll Lock", "matrix": [0, 16], "x": 16.25, "y": 0},
+                {"label": "Mute", "matrix": [0, 17], "x": 17.25, "y": 0},
+
+                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
+                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
+                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
+                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
+                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
+                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
+                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
+                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
+                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
+                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
+                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
+                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
+                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
+                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25},
+                {"label": "Delete", "matrix": [3, 14], "x": 14, "y": 1.25},
+
+                {"label": "Insert", "matrix": [1, 15], "x": 15.25, "y": 1.25},
+                {"label": "Home", "matrix": [1, 16], "x": 16.25, "y": 1.25},
+                {"label": "Page Up", "matrix": [1, 17], "x": 17.25, "y": 1.25},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"label": "Delete", "matrix": [2, 15], "x": 15.25, "y": 2.25},
+                {"label": "End", "matrix": [2, 16], "x": 16.25, "y": 2.25},
+                {"label": "Page Down", "matrix": [2, 17], "x": 17.25, "y": 2.25},
+
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"label": "Enter", "matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"label": "Shift", "matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"label": "Shift", "matrix": [4, 14], "x": 14, "y": 4.25},
+
+                {"label": "\u2191", "matrix": [4, 16], "x": 16.25, "y": 4.25},
+
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"label": "GUI", "matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"label": "Space", "matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"label": "Alt", "matrix": [5, 9], "x": 10, "y": 5.25, "w": 1.25},
+                {"label": "GUI", "matrix": [5, 10], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"label": "Menu", "matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"label": "Ctrl", "matrix": [5, 14], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"label": "\u2190", "matrix": [5, 15], "x": 15.25, "y": 5.25},
+                {"label": "\u2193", "matrix": [5, 16], "x": 16.25, "y": 5.25},
+                {"label": "\u2192", "matrix": [5, 17], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_ansi_tsangan": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "F1", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "F2", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "F3", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "F4", "matrix": [0, 5], "x": 5, "y": 0},
+
+                {"label": "F5", "matrix": [0, 6], "x": 6.5, "y": 0},
+                {"label": "F6", "matrix": [0, 7], "x": 7.5, "y": 0},
+                {"label": "F7", "matrix": [0, 8], "x": 8.5, "y": 0},
+                {"label": "F8", "matrix": [0, 9], "x": 9.5, "y": 0},
+
+                {"label": "F9", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "F10", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "F11", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "F12", "matrix": [0, 14], "x": 14, "y": 0},
+
+                {"label": "Print Screen", "matrix": [0, 15], "x": 15.25, "y": 0},
+                {"label": "Scroll Lock", "matrix": [0, 16], "x": 16.25, "y": 0},
+                {"label": "Mute", "matrix": [0, 17], "x": 17.25, "y": 0},
+
+                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
+                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
+                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
+                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
+                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
+                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
+                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
+                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
+                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
+                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
+                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
+                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
+                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
+                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+
+                {"label": "Insert", "matrix": [1, 15], "x": 15.25, "y": 1.25},
+                {"label": "Home", "matrix": [1, 16], "x": 16.25, "y": 1.25},
+                {"label": "Page Up", "matrix": [1, 17], "x": 17.25, "y": 1.25},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"label": "Delete", "matrix": [2, 15], "x": 15.25, "y": 2.25},
+                {"label": "End", "matrix": [2, 16], "x": 16.25, "y": 2.25},
+                {"label": "Page Down", "matrix": [2, 17], "x": 17.25, "y": 2.25},
+
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"label": "Enter", "matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"label": "Shift", "matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"label": "\u2191", "matrix": [4, 16], "x": 16.25, "y": 4.25},
+
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 5.25},
+                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
+                {"label": "Alt", "matrix": [5, 10], "x": 11, "y": 5.25, "w": 1.5},
+                {"label": "Menu", "matrix": [5, 12], "x": 12.5, "y": 5.25},
+                {"label": "Ctrl", "matrix": [5, 14], "x": 13.5, "y": 5.25, "w": 1.5},
+
+                {"label": "\u2190", "matrix": [5, 15], "x": 15.25, "y": 5.25},
+                {"label": "\u2193", "matrix": [5, 16], "x": 16.25, "y": 5.25},
+                {"label": "\u2192", "matrix": [5, 17], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_ansi_tsangan_split_bs_rshift": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "F1", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "F2", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "F3", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "F4", "matrix": [0, 5], "x": 5, "y": 0},
+
+                {"label": "F5", "matrix": [0, 6], "x": 6.5, "y": 0},
+                {"label": "F6", "matrix": [0, 7], "x": 7.5, "y": 0},
+                {"label": "F7", "matrix": [0, 8], "x": 8.5, "y": 0},
+                {"label": "F8", "matrix": [0, 9], "x": 9.5, "y": 0},
+
+                {"label": "F9", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "F10", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "F11", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "F12", "matrix": [0, 14], "x": 14, "y": 0},
+
+                {"label": "Print Screen", "matrix": [0, 15], "x": 15.25, "y": 0},
+                {"label": "Scroll Lock", "matrix": [0, 16], "x": 16.25, "y": 0},
+                {"label": "Mute", "matrix": [0, 17], "x": 17.25, "y": 0},
+
+                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
+                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
+                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
+                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
+                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
+                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
+                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
+                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
+                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
+                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
+                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
+                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
+                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
+                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25},
+                {"label": "Delete", "matrix": [3, 14], "x": 14, "y": 1.25},
+
+                {"label": "Insert", "matrix": [1, 15], "x": 15.25, "y": 1.25},
+                {"label": "Home", "matrix": [1, 16], "x": 16.25, "y": 1.25},
+                {"label": "Page Up", "matrix": [1, 17], "x": 17.25, "y": 1.25},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"label": "Delete", "matrix": [2, 15], "x": 15.25, "y": 2.25},
+                {"label": "End", "matrix": [2, 16], "x": 16.25, "y": 2.25},
+                {"label": "Page Down", "matrix": [2, 17], "x": 17.25, "y": 2.25},
+
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"label": "Enter", "matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"label": "Shift", "matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"label": "Shift", "matrix": [4, 14], "x": 14, "y": 4.25},
+
+                {"label": "\u2191", "matrix": [4, 16], "x": 16.25, "y": 4.25},
+
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 5.25},
+                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
+                {"label": "Alt", "matrix": [5, 10], "x": 11, "y": 5.25, "w": 1.5},
+                {"label": "Menu", "matrix": [5, 12], "x": 12.5, "y": 5.25},
+                {"label": "Ctrl", "matrix": [5, 14], "x": 13.5, "y": 5.25, "w": 1.5},
+
+                {"label": "\u2190", "matrix": [5, 15], "x": 15.25, "y": 5.25},
+                {"label": "\u2193", "matrix": [5, 16], "x": 16.25, "y": 5.25},
+                {"label": "\u2192", "matrix": [5, 17], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_ansi_wkl": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "F1", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "F2", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "F3", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "F4", "matrix": [0, 5], "x": 5, "y": 0},
+
+                {"label": "F5", "matrix": [0, 6], "x": 6.5, "y": 0},
+                {"label": "F6", "matrix": [0, 7], "x": 7.5, "y": 0},
+                {"label": "F7", "matrix": [0, 8], "x": 8.5, "y": 0},
+                {"label": "F8", "matrix": [0, 9], "x": 9.5, "y": 0},
+
+                {"label": "F9", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "F10", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "F11", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "F12", "matrix": [0, 14], "x": 14, "y": 0},
+
+                {"label": "Print Screen", "matrix": [0, 15], "x": 15.25, "y": 0},
+                {"label": "Scroll Lock", "matrix": [0, 16], "x": 16.25, "y": 0},
+                {"label": "Mute", "matrix": [0, 17], "x": 17.25, "y": 0},
+
+                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
+                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
+                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
+                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
+                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
+                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
+                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
+                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
+                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
+                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
+                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
+                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
+                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
+                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+
+                {"label": "Insert", "matrix": [1, 15], "x": 15.25, "y": 1.25},
+                {"label": "Home", "matrix": [1, 16], "x": 16.25, "y": 1.25},
+                {"label": "Page Up", "matrix": [1, 17], "x": 17.25, "y": 1.25},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"label": "Delete", "matrix": [2, 15], "x": 15.25, "y": 2.25},
+                {"label": "End", "matrix": [2, 16], "x": 16.25, "y": 2.25},
+                {"label": "Page Down", "matrix": [2, 17], "x": 17.25, "y": 2.25},
+
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"label": "Enter", "matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"label": "Shift", "matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"label": "\u2191", "matrix": [4, 16], "x": 16.25, "y": 4.25},
+
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
+                {"label": "Alt", "matrix": [5, 10], "x": 11, "y": 5.25, "w": 1.5},
+                {"label": "Ctrl", "matrix": [5, 14], "x": 13.5, "y": 5.25, "w": 1.5},
+
+                {"label": "\u2190", "matrix": [5, 15], "x": 15.25, "y": 5.25},
+                {"label": "\u2193", "matrix": [5, 16], "x": 16.25, "y": 5.25},
+                {"label": "\u2192", "matrix": [5, 17], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_ansi_wkl_split_bs_rshift": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "F1", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "F2", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "F3", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "F4", "matrix": [0, 5], "x": 5, "y": 0},
+
+                {"label": "F5", "matrix": [0, 6], "x": 6.5, "y": 0},
+                {"label": "F6", "matrix": [0, 7], "x": 7.5, "y": 0},
+                {"label": "F7", "matrix": [0, 8], "x": 8.5, "y": 0},
+                {"label": "F8", "matrix": [0, 9], "x": 9.5, "y": 0},
+
+                {"label": "F9", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "F10", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "F11", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "F12", "matrix": [0, 14], "x": 14, "y": 0},
+
+                {"label": "Print Screen", "matrix": [0, 15], "x": 15.25, "y": 0},
+                {"label": "Scroll Lock", "matrix": [0, 16], "x": 16.25, "y": 0},
+                {"label": "Mute", "matrix": [0, 17], "x": 17.25, "y": 0},
+
+                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
+                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
+                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
+                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
+                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
+                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
+                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
+                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
+                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
+                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
+                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
+                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
+                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
+                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25},
+                {"label": "Delete", "matrix": [3, 14], "x": 14, "y": 1.25},
+
+                {"label": "Insert", "matrix": [1, 15], "x": 15.25, "y": 1.25},
+                {"label": "Home", "matrix": [1, 16], "x": 16.25, "y": 1.25},
+                {"label": "Page Up", "matrix": [1, 17], "x": 17.25, "y": 1.25},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"label": "Delete", "matrix": [2, 15], "x": 15.25, "y": 2.25},
+                {"label": "End", "matrix": [2, 16], "x": 16.25, "y": 2.25},
+                {"label": "Page Down", "matrix": [2, 17], "x": 17.25, "y": 2.25},
+
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"label": "Enter", "matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"label": "Shift", "matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"label": "Shift", "matrix": [4, 14], "x": 14, "y": 4.25},
+
+                {"label": "\u2191", "matrix": [4, 16], "x": 16.25, "y": 4.25},
+
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
+                {"label": "Alt", "matrix": [5, 10], "x": 11, "y": 5.25, "w": 1.5},
+                {"label": "Ctrl", "matrix": [5, 14], "x": 13.5, "y": 5.25, "w": 1.5},
+
+                {"label": "\u2190", "matrix": [5, 15], "x": 15.25, "y": 5.25},
+                {"label": "\u2193", "matrix": [5, 16], "x": 16.25, "y": 5.25},
+                {"label": "\u2192", "matrix": [5, 17], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_iso": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "F1", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "F2", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "F3", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "F4", "matrix": [0, 5], "x": 5, "y": 0},
+
+                {"label": "F5", "matrix": [0, 6], "x": 6.5, "y": 0},
+                {"label": "F6", "matrix": [0, 7], "x": 7.5, "y": 0},
+                {"label": "F7", "matrix": [0, 8], "x": 8.5, "y": 0},
+                {"label": "F8", "matrix": [0, 9], "x": 9.5, "y": 0},
+
+                {"label": "F9", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "F10", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "F11", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "F12", "matrix": [0, 14], "x": 14, "y": 0},
+
+                {"label": "Print Screen", "matrix": [0, 15], "x": 15.25, "y": 0},
+                {"label": "Scroll Lock", "matrix": [0, 16], "x": 16.25, "y": 0},
+                {"label": "Mute", "matrix": [0, 17], "x": 17.25, "y": 0},
+
+                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
+                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
+                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
+                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
+                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
+                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
+                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
+                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
+                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
+                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
+                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
+                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
+                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
+                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+
+                {"label": "Insert", "matrix": [1, 15], "x": 15.25, "y": 1.25},
+                {"label": "Home", "matrix": [1, 16], "x": 16.25, "y": 1.25},
+                {"label": "Page Up", "matrix": [1, 17], "x": 17.25, "y": 1.25},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
+
+                {"label": "Delete", "matrix": [2, 15], "x": 15.25, "y": 2.25},
+                {"label": "End", "matrix": [2, 16], "x": 16.25, "y": 2.25},
+                {"label": "Page Down", "matrix": [2, 17], "x": 17.25, "y": 2.25},
+
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"label": "#", "matrix": [2, 13], "x": 12.75, "y": 3.25},
+                {"label": "Enter", "matrix": [3, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"label": "\\", "matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"label": "Shift", "matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"label": "\u2191", "matrix": [4, 16], "x": 16.25, "y": 4.25},
+
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"label": "GUI", "matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"label": "Space", "matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"label": "Alt", "matrix": [5, 9], "x": 10, "y": 5.25, "w": 1.25},
+                {"label": "GUI", "matrix": [5, 10], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"label": "Menu", "matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"label": "Ctrl", "matrix": [5, 14], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"label": "\u2190", "matrix": [5, 15], "x": 15.25, "y": 5.25},
+                {"label": "\u2193", "matrix": [5, 16], "x": 16.25, "y": 5.25},
+                {"label": "\u2192", "matrix": [5, 17], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_iso_split_bs_rshift": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "F1", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "F2", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "F3", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "F4", "matrix": [0, 5], "x": 5, "y": 0},
+
+                {"label": "F5", "matrix": [0, 6], "x": 6.5, "y": 0},
+                {"label": "F6", "matrix": [0, 7], "x": 7.5, "y": 0},
+                {"label": "F7", "matrix": [0, 8], "x": 8.5, "y": 0},
+                {"label": "F8", "matrix": [0, 9], "x": 9.5, "y": 0},
+
+                {"label": "F9", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "F10", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "F11", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "F12", "matrix": [0, 14], "x": 14, "y": 0},
+
+                {"label": "Print Screen", "matrix": [0, 15], "x": 15.25, "y": 0},
+                {"label": "Scroll Lock", "matrix": [0, 16], "x": 16.25, "y": 0},
+                {"label": "Mute", "matrix": [0, 17], "x": 17.25, "y": 0},
+
+                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
+                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
+                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
+                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
+                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
+                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
+                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
+                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
+                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
+                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
+                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
+                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
+                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
+                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25},
+                {"label": "Delete", "matrix": [3, 14], "x": 14, "y": 1.25},
+
+                {"label": "Insert", "matrix": [1, 15], "x": 15.25, "y": 1.25},
+                {"label": "Home", "matrix": [1, 16], "x": 16.25, "y": 1.25},
+                {"label": "Page Up", "matrix": [1, 17], "x": 17.25, "y": 1.25},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
+
+                {"label": "Delete", "matrix": [2, 15], "x": 15.25, "y": 2.25},
+                {"label": "End", "matrix": [2, 16], "x": 16.25, "y": 2.25},
+                {"label": "Page Down", "matrix": [2, 17], "x": 17.25, "y": 2.25},
+
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"label": "#", "matrix": [2, 13], "x": 12.75, "y": 3.25},
+                {"label": "Enter", "matrix": [3, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"label": "\\", "matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"label": "Shift", "matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"label": "Shift", "matrix": [4, 14], "x": 14, "y": 4.25},
+
+                {"label": "\u2191", "matrix": [4, 16], "x": 16.25, "y": 4.25},
+
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"label": "GUI", "matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"label": "Space", "matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"label": "Alt", "matrix": [5, 9], "x": 10, "y": 5.25, "w": 1.25},
+                {"label": "GUI", "matrix": [5, 10], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"label": "Menu", "matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"label": "Ctrl", "matrix": [5, 14], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"label": "\u2190", "matrix": [5, 15], "x": 15.25, "y": 5.25},
+                {"label": "\u2193", "matrix": [5, 16], "x": 16.25, "y": 5.25},
+                {"label": "\u2192", "matrix": [5, 17], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_iso_tsangan": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "F1", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "F2", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "F3", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "F4", "matrix": [0, 5], "x": 5, "y": 0},
+
+                {"label": "F5", "matrix": [0, 6], "x": 6.5, "y": 0},
+                {"label": "F6", "matrix": [0, 7], "x": 7.5, "y": 0},
+                {"label": "F7", "matrix": [0, 8], "x": 8.5, "y": 0},
+                {"label": "F8", "matrix": [0, 9], "x": 9.5, "y": 0},
+
+                {"label": "F9", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "F10", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "F11", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "F12", "matrix": [0, 14], "x": 14, "y": 0},
+
+                {"label": "Print Screen", "matrix": [0, 15], "x": 15.25, "y": 0},
+                {"label": "Scroll Lock", "matrix": [0, 16], "x": 16.25, "y": 0},
+                {"label": "Mute", "matrix": [0, 17], "x": 17.25, "y": 0},
+
+                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
+                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
+                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
+                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
+                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
+                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
+                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
+                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
+                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
+                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
+                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
+                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
+                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
+                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+
+                {"label": "Insert", "matrix": [1, 15], "x": 15.25, "y": 1.25},
+                {"label": "Home", "matrix": [1, 16], "x": 16.25, "y": 1.25},
+                {"label": "Page Up", "matrix": [1, 17], "x": 17.25, "y": 1.25},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
+
+                {"label": "Delete", "matrix": [2, 15], "x": 15.25, "y": 2.25},
+                {"label": "End", "matrix": [2, 16], "x": 16.25, "y": 2.25},
+                {"label": "Page Down", "matrix": [2, 17], "x": 17.25, "y": 2.25},
+
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"label": "#", "matrix": [2, 13], "x": 12.75, "y": 3.25},
+                {"label": "Enter", "matrix": [3, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"label": "\\", "matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"label": "Shift", "matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"label": "\u2191", "matrix": [4, 16], "x": 16.25, "y": 4.25},
+
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 5.25},
+                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
+                {"label": "Alt", "matrix": [5, 10], "x": 11, "y": 5.25, "w": 1.5},
+                {"label": "Menu", "matrix": [5, 12], "x": 12.5, "y": 5.25},
+                {"label": "Ctrl", "matrix": [5, 14], "x": 13.5, "y": 5.25, "w": 1.5},
+
+                {"label": "\u2190", "matrix": [5, 15], "x": 15.25, "y": 5.25},
+                {"label": "\u2193", "matrix": [5, 16], "x": 16.25, "y": 5.25},
+                {"label": "\u2192", "matrix": [5, 17], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_iso_tsangan_split_bs_rshift": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "F1", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "F2", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "F3", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "F4", "matrix": [0, 5], "x": 5, "y": 0},
+
+                {"label": "F5", "matrix": [0, 6], "x": 6.5, "y": 0},
+                {"label": "F6", "matrix": [0, 7], "x": 7.5, "y": 0},
+                {"label": "F7", "matrix": [0, 8], "x": 8.5, "y": 0},
+                {"label": "F8", "matrix": [0, 9], "x": 9.5, "y": 0},
+
+                {"label": "F9", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "F10", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "F11", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "F12", "matrix": [0, 14], "x": 14, "y": 0},
+
+                {"label": "Print Screen", "matrix": [0, 15], "x": 15.25, "y": 0},
+                {"label": "Scroll Lock", "matrix": [0, 16], "x": 16.25, "y": 0},
+                {"label": "Mute", "matrix": [0, 17], "x": 17.25, "y": 0},
+
+                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
+                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
+                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
+                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
+                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
+                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
+                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
+                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
+                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
+                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
+                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
+                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
+                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
+                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25},
+                {"label": "Delete", "matrix": [3, 14], "x": 14, "y": 1.25},
+
+                {"label": "Insert", "matrix": [1, 15], "x": 15.25, "y": 1.25},
+                {"label": "Home", "matrix": [1, 16], "x": 16.25, "y": 1.25},
+                {"label": "Page Up", "matrix": [1, 17], "x": 17.25, "y": 1.25},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
+
+                {"label": "Delete", "matrix": [2, 15], "x": 15.25, "y": 2.25},
+                {"label": "End", "matrix": [2, 16], "x": 16.25, "y": 2.25},
+                {"label": "Page Down", "matrix": [2, 17], "x": 17.25, "y": 2.25},
+
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"label": "#", "matrix": [2, 13], "x": 12.75, "y": 3.25},
+                {"label": "Enter", "matrix": [3, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"label": "\\", "matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"label": "Shift", "matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"label": "Shift", "matrix": [4, 14], "x": 14, "y": 4.25},
+
+                {"label": "\u2191", "matrix": [4, 16], "x": 16.25, "y": 4.25},
+
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 5.25},
+                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
+                {"label": "Alt", "matrix": [5, 10], "x": 11, "y": 5.25, "w": 1.5},
+                {"label": "Menu", "matrix": [5, 12], "x": 12.5, "y": 5.25},
+                {"label": "Ctrl", "matrix": [5, 14], "x": 13.5, "y": 5.25, "w": 1.5},
+
+                {"label": "\u2190", "matrix": [5, 15], "x": 15.25, "y": 5.25},
+                {"label": "\u2193", "matrix": [5, 16], "x": 16.25, "y": 5.25},
+                {"label": "\u2192", "matrix": [5, 17], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_iso_wkl": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "F1", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "F2", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "F3", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "F4", "matrix": [0, 5], "x": 5, "y": 0},
+
+                {"label": "F5", "matrix": [0, 6], "x": 6.5, "y": 0},
+                {"label": "F6", "matrix": [0, 7], "x": 7.5, "y": 0},
+                {"label": "F7", "matrix": [0, 8], "x": 8.5, "y": 0},
+                {"label": "F8", "matrix": [0, 9], "x": 9.5, "y": 0},
+
+                {"label": "F9", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "F10", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "F11", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "F12", "matrix": [0, 14], "x": 14, "y": 0},
+
+                {"label": "Print Screen", "matrix": [0, 15], "x": 15.25, "y": 0},
+                {"label": "Scroll Lock", "matrix": [0, 16], "x": 16.25, "y": 0},
+                {"label": "Mute", "matrix": [0, 17], "x": 17.25, "y": 0},
+
+                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
+                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
+                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
+                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
+                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
+                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
+                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
+                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
+                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
+                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
+                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
+                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
+                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
+                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+
+                {"label": "Insert", "matrix": [1, 15], "x": 15.25, "y": 1.25},
+                {"label": "Home", "matrix": [1, 16], "x": 16.25, "y": 1.25},
+                {"label": "Page Up", "matrix": [1, 17], "x": 17.25, "y": 1.25},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
+
+                {"label": "Delete", "matrix": [2, 15], "x": 15.25, "y": 2.25},
+                {"label": "End", "matrix": [2, 16], "x": 16.25, "y": 2.25},
+                {"label": "Page Down", "matrix": [2, 17], "x": 17.25, "y": 2.25},
+
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"label": "#", "matrix": [2, 13], "x": 12.75, "y": 3.25},
+                {"label": "Enter", "matrix": [3, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"label": "\\", "matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"label": "Shift", "matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"label": "\u2191", "matrix": [4, 16], "x": 16.25, "y": 4.25},
+
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
+                {"label": "Alt", "matrix": [5, 10], "x": 11, "y": 5.25, "w": 1.5},
+                {"label": "Ctrl", "matrix": [5, 14], "x": 13.5, "y": 5.25, "w": 1.5},
+
+                {"label": "\u2190", "matrix": [5, 15], "x": 15.25, "y": 5.25},
+                {"label": "\u2193", "matrix": [5, 16], "x": 16.25, "y": 5.25},
+                {"label": "\u2192", "matrix": [5, 17], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_iso_wkl_split_bs_rshift": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "F1", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "F2", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "F3", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "F4", "matrix": [0, 5], "x": 5, "y": 0},
+
+                {"label": "F5", "matrix": [0, 6], "x": 6.5, "y": 0},
+                {"label": "F6", "matrix": [0, 7], "x": 7.5, "y": 0},
+                {"label": "F7", "matrix": [0, 8], "x": 8.5, "y": 0},
+                {"label": "F8", "matrix": [0, 9], "x": 9.5, "y": 0},
+
+                {"label": "F9", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "F10", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "F11", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "F12", "matrix": [0, 14], "x": 14, "y": 0},
+
+                {"label": "Print Screen", "matrix": [0, 15], "x": 15.25, "y": 0},
+                {"label": "Scroll Lock", "matrix": [0, 16], "x": 16.25, "y": 0},
+                {"label": "Mute", "matrix": [0, 17], "x": 17.25, "y": 0},
+
+                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
+                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
+                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
+                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
+                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
+                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
+                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
+                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
+                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
+                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
+                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
+                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
+                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
+                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25},
+                {"label": "Delete", "matrix": [3, 14], "x": 14, "y": 1.25},
+
+                {"label": "Insert", "matrix": [1, 15], "x": 15.25, "y": 1.25},
+                {"label": "Home", "matrix": [1, 16], "x": 16.25, "y": 1.25},
+                {"label": "Page Up", "matrix": [1, 17], "x": 17.25, "y": 1.25},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
+
+                {"label": "Delete", "matrix": [2, 15], "x": 15.25, "y": 2.25},
+                {"label": "End", "matrix": [2, 16], "x": 16.25, "y": 2.25},
+                {"label": "Page Down", "matrix": [2, 17], "x": 17.25, "y": 2.25},
+
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"label": "#", "matrix": [2, 13], "x": 12.75, "y": 3.25},
+                {"label": "Enter", "matrix": [3, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"label": "\\", "matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"label": "Shift", "matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"label": "Shift", "matrix": [4, 14], "x": 14, "y": 4.25},
+
+                {"label": "\u2191", "matrix": [4, 16], "x": 16.25, "y": 4.25},
+
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
+                {"label": "Alt", "matrix": [5, 10], "x": 11, "y": 5.25, "w": 1.5},
+                {"label": "Ctrl", "matrix": [5, 14], "x": 13.5, "y": 5.25, "w": 1.5},
+
+                {"label": "\u2190", "matrix": [5, 15], "x": 15.25, "y": 5.25},
+                {"label": "\u2193", "matrix": [5, 16], "x": 16.25, "y": 5.25},
+                {"label": "\u2192", "matrix": [5, 17], "x": 17.25, "y": 5.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/protozoa/p01/rules.mk b/keyboards/protozoa/p01/rules.mk
index adb0000e016..0ab54aaaf71 100644
--- a/keyboards/protozoa/p01/rules.mk
+++ b/keyboards/protozoa/p01/rules.mk
@@ -1,16 +1,2 @@
 # Wildcard to allow APM32 MCU
 DFU_SUFFIX_ARGS = -v FFFF -p FFFF
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-ENCODER_ENABLE = yes        # Encoder support
diff --git a/keyboards/punk75/info.json b/keyboards/punk75/info.json
deleted file mode 100644
index 81f2bcc8183..00000000000
--- a/keyboards/punk75/info.json
+++ /dev/null
@@ -1,110 +0,0 @@
-{
-    "keyboard_name": "punk75",
-    "manufacturer": "dsanchezseco",
-    "url": "",
-    "maintainer": "dsanchezseco",
-    "usb": {
-        "vid": "0xDEED",
-        "pid": "0x0001",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["C2", "C3", "C6", "C5", "C4", "A7", "A6", "A5", "A4", "B4", "A3", "B3", "A2", "B2", "A1"],
-        "rows": ["D6", "D5", "C1", "C0", "D7"]
-    },
-    "diode_direction": "COL2ROW",
-    "encoder": {
-        "rotary": [
-            {"pin_a": "D0", "pin_b": "D1"},
-            {"pin_a": "B1", "pin_b": "B0"}
-        ]
-    },
-    "processor": "atmega32a",
-    "bootloader": "usbasploader",
-    "community_layouts": ["ortho_5x15"],
-    "layouts": {
-        "LAYOUT_ortho_5x15": {
-            "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, 14], "x": 14, "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": [1, 4], "x": 4, "y": 1},
-                {"matrix": [1, 5], "x": 5, "y": 1},
-                {"matrix": [1, 6], "x": 6, "y": 1},
-                {"matrix": [1, 7], "x": 7, "y": 1},
-                {"matrix": [1, 8], "x": 8, "y": 1},
-                {"matrix": [1, 9], "x": 9, "y": 1},
-                {"matrix": [1, 10], "x": 10, "y": 1},
-                {"matrix": [1, 11], "x": 11, "y": 1},
-                {"matrix": [1, 12], "x": 12, "y": 1},
-                {"matrix": [1, 13], "x": 13, "y": 1},
-                {"matrix": [1, 14], "x": 14, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2},
-                {"matrix": [2, 1], "x": 1, "y": 2},
-                {"matrix": [2, 2], "x": 2, "y": 2},
-                {"matrix": [2, 3], "x": 3, "y": 2},
-                {"matrix": [2, 4], "x": 4, "y": 2},
-                {"matrix": [2, 5], "x": 5, "y": 2},
-                {"matrix": [2, 6], "x": 6, "y": 2},
-                {"matrix": [2, 7], "x": 7, "y": 2},
-                {"matrix": [2, 8], "x": 8, "y": 2},
-                {"matrix": [2, 9], "x": 9, "y": 2},
-                {"matrix": [2, 10], "x": 10, "y": 2},
-                {"matrix": [2, 11], "x": 11, "y": 2},
-                {"matrix": [2, 12], "x": 12, "y": 2},
-                {"matrix": [2, 13], "x": 13, "y": 2},
-                {"matrix": [2, 14], "x": 14, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3},
-                {"matrix": [3, 1], "x": 1, "y": 3},
-                {"matrix": [3, 2], "x": 2, "y": 3},
-                {"matrix": [3, 3], "x": 3, "y": 3},
-                {"matrix": [3, 4], "x": 4, "y": 3},
-                {"matrix": [3, 5], "x": 5, "y": 3},
-                {"matrix": [3, 6], "x": 6, "y": 3},
-                {"matrix": [3, 7], "x": 7, "y": 3},
-                {"matrix": [3, 8], "x": 8, "y": 3},
-                {"matrix": [3, 9], "x": 9, "y": 3},
-                {"matrix": [3, 10], "x": 10, "y": 3},
-                {"matrix": [3, 11], "x": 11, "y": 3},
-                {"matrix": [3, 12], "x": 12, "y": 3},
-                {"matrix": [3, 13], "x": 13, "y": 3},
-                {"matrix": [3, 14], "x": 14, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4},
-                {"matrix": [4, 1], "x": 1, "y": 4},
-                {"matrix": [4, 2], "x": 2, "y": 4},
-                {"matrix": [4, 3], "x": 3, "y": 4},
-                {"matrix": [4, 4], "x": 4, "y": 4},
-                {"matrix": [4, 5], "x": 5, "y": 4},
-                {"matrix": [4, 6], "x": 6, "y": 4},
-                {"matrix": [4, 7], "x": 7, "y": 4},
-                {"matrix": [4, 8], "x": 8, "y": 4},
-                {"matrix": [4, 9], "x": 9, "y": 4},
-                {"matrix": [4, 10], "x": 10, "y": 4},
-                {"matrix": [4, 11], "x": 11, "y": 4},
-                {"matrix": [4, 12], "x": 12, "y": 4},
-                {"matrix": [4, 13], "x": 13, "y": 4},
-                {"matrix": [4, 14], "x": 14, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/punk75/keyboard.json b/keyboards/punk75/keyboard.json
new file mode 100644
index 00000000000..5c1bd94a5ed
--- /dev/null
+++ b/keyboards/punk75/keyboard.json
@@ -0,0 +1,117 @@
+{
+    "keyboard_name": "punk75",
+    "manufacturer": "dsanchezseco",
+    "url": "",
+    "maintainer": "dsanchezseco",
+    "usb": {
+        "vid": "0xDEED",
+        "pid": "0x0001",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": false,
+        "encoder": true,
+        "extrakey": true,
+        "mousekey": false,
+        "nkro": false
+    },
+    "matrix_pins": {
+        "cols": ["C2", "C3", "C6", "C5", "C4", "A7", "A6", "A5", "A4", "B4", "A3", "B3", "A2", "B2", "A1"],
+        "rows": ["D6", "D5", "C1", "C0", "D7"]
+    },
+    "diode_direction": "COL2ROW",
+    "encoder": {
+        "rotary": [
+            {"pin_a": "D0", "pin_b": "D1"},
+            {"pin_a": "B1", "pin_b": "B0"}
+        ]
+    },
+    "processor": "atmega32a",
+    "bootloader": "usbasploader",
+    "community_layouts": ["ortho_5x15"],
+    "layouts": {
+        "LAYOUT_ortho_5x15": {
+            "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, 14], "x": 14, "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": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+                {"matrix": [1, 12], "x": 12, "y": 1},
+                {"matrix": [1, 13], "x": 13, "y": 1},
+                {"matrix": [1, 14], "x": 14, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [2, 6], "x": 6, "y": 2},
+                {"matrix": [2, 7], "x": 7, "y": 2},
+                {"matrix": [2, 8], "x": 8, "y": 2},
+                {"matrix": [2, 9], "x": 9, "y": 2},
+                {"matrix": [2, 10], "x": 10, "y": 2},
+                {"matrix": [2, 11], "x": 11, "y": 2},
+                {"matrix": [2, 12], "x": 12, "y": 2},
+                {"matrix": [2, 13], "x": 13, "y": 2},
+                {"matrix": [2, 14], "x": 14, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
+                {"matrix": [3, 6], "x": 6, "y": 3},
+                {"matrix": [3, 7], "x": 7, "y": 3},
+                {"matrix": [3, 8], "x": 8, "y": 3},
+                {"matrix": [3, 9], "x": 9, "y": 3},
+                {"matrix": [3, 10], "x": 10, "y": 3},
+                {"matrix": [3, 11], "x": 11, "y": 3},
+                {"matrix": [3, 12], "x": 12, "y": 3},
+                {"matrix": [3, 13], "x": 13, "y": 3},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+                {"matrix": [4, 2], "x": 2, "y": 4},
+                {"matrix": [4, 3], "x": 3, "y": 4},
+                {"matrix": [4, 4], "x": 4, "y": 4},
+                {"matrix": [4, 5], "x": 5, "y": 4},
+                {"matrix": [4, 6], "x": 6, "y": 4},
+                {"matrix": [4, 7], "x": 7, "y": 4},
+                {"matrix": [4, 8], "x": 8, "y": 4},
+                {"matrix": [4, 9], "x": 9, "y": 4},
+                {"matrix": [4, 10], "x": 10, "y": 4},
+                {"matrix": [4, 11], "x": 11, "y": 4},
+                {"matrix": [4, 12], "x": 12, "y": 4},
+                {"matrix": [4, 13], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/punk75/rules.mk b/keyboards/punk75/rules.mk
index 362b5c8e08d..c2ee0bc86f9 100644
--- a/keyboards/punk75/rules.mk
+++ b/keyboards/punk75/rules.mk
@@ -1,16 +1,2 @@
 # Processor frequency
 F_CPU = 16000000
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-ENCODER_ENABLE = yes        # Enable rotary encoders support
diff --git a/keyboards/qpockets/space_space/rev1/info.json b/keyboards/qpockets/space_space/rev1/info.json
deleted file mode 100644
index f54e5e8e3a8..00000000000
--- a/keyboards/qpockets/space_space/rev1/info.json
+++ /dev/null
@@ -1,116 +0,0 @@
-{
-  "keyboard_name": "space_space",
-  "manufacturer": "qpockets",
-  "url": "",
-  "maintainer": "qpockets",
-  "usb": {
-    "vid": "0x7170",
-    "pid": "0x7373",
-    "device_version": "30.0.0"
-  },
-  "matrix_pins": {
-    "cols": ["D4", "B4", "B5", "B6", "C6", "F7", "F6", "F0", "B0", "E6", "B1"],
-    "rows": ["F1", "F4", "F5", "C7"]
-  },
-  "diode_direction": "COL2ROW",
-  "encoder": {
-    "rotary": [
-      {"pin_a": "B3", "pin_b": "B2", "resolution": 3},
-      {"pin_a": "D6", "pin_b": "D7"}
-    ]
-  },
-  "processor": "atmega32u4",
-  "bootloader": "atmel-dfu",
-  "debounce": 7,
-  "layouts": {
-    "LAYOUT_default": {
-      "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, "w": 1.5},
-        {"matrix": [0, 6], "x": 6.5, "y": 0},
-        {"matrix": [0, 7], "x": 7.5, "y": 0},
-        {"matrix": [0, 8], "x": 8.5, "y": 0},
-        {"matrix": [0, 9], "x": 9.5, "y": 0},
-        {"matrix": [0, 10], "x": 10.5, "y": 0},
-
-        {"matrix": [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": [1, 4], "x": 4, "y": 1},
-        {"matrix": [1, 5], "x": 5, "y": 1, "w": 1.5},
-        {"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": [2, 0], "x": 0, "y": 2},
-        {"matrix": [2, 1], "x": 1, "y": 2},
-        {"matrix": [2, 2], "x": 2, "y": 2},
-        {"matrix": [2, 3], "x": 3, "y": 2},
-        {"matrix": [2, 4], "x": 4, "y": 2},
-        {"matrix": [2, 5], "x": 5, "y": 2, "w": 1.5},
-        {"matrix": [2, 6], "x": 6.5, "y": 2},
-        {"matrix": [2, 7], "x": 7.5, "y": 2},
-        {"matrix": [2, 8], "x": 8.5, "y": 2},
-        {"matrix": [2, 9], "x": 9.5, "y": 2},
-        {"matrix": [2, 10], "x": 10.5, "y": 2},
-
-        {"matrix": [3, 2], "x": 1.25, "y": 3.35, "w": 1.25},
-        {"matrix": [3, 3], "x": 2.5, "y": 3.35},
-        {"matrix": [3, 4], "x": 3.5, "y": 3.35, "w": 2},
-        {"matrix": [3, 6], "x": 5.5, "y": 3.35, "w": 2.25},
-        {"matrix": [3, 7], "x": 7.75, "y": 3.35},
-        {"matrix": [3, 8], "x": 8.75, "y": 3.35, "w": 1.25}
-      ]
-    },
-    "LAYOUT_big_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, "w": 1.5},
-        {"matrix": [0, 6], "x": 6.5, "y": 0},
-        {"matrix": [0, 7], "x": 7.5, "y": 0},
-        {"matrix": [0, 8], "x": 8.5, "y": 0},
-        {"matrix": [0, 9], "x": 9.5, "y": 0},
-        {"matrix": [0, 10], "x": 10.5, "y": 0},
-
-        {"matrix": [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": [1, 4], "x": 4, "y": 1},
-        {"matrix": [1, 5], "x": 5, "y": 1, "w": 1.5},
-        {"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": [2, 0], "x": 0, "y": 2},
-        {"matrix": [2, 1], "x": 1, "y": 2},
-        {"matrix": [2, 2], "x": 2, "y": 2},
-        {"matrix": [2, 3], "x": 3, "y": 2},
-        {"matrix": [2, 4], "x": 4, "y": 2},
-        {"matrix": [2, 5], "x": 5, "y": 2, "w": 1.5},
-        {"matrix": [2, 6], "x": 6.5, "y": 2},
-        {"matrix": [2, 7], "x": 7.5, "y": 2},
-        {"matrix": [2, 8], "x": 8.5, "y": 2},
-        {"matrix": [2, 9], "x": 9.5, "y": 2},
-        {"matrix": [2, 10], "x": 10.5, "y": 2},
-
-        {"matrix": [3, 2], "x": 1.25, "y": 3.35, "w": 1.25},
-        {"matrix": [3, 5], "x": 2.5, "y": 3.35, "w": 6.25},
-        {"matrix": [3, 8], "x": 8.75, "y": 3.35, "w": 1.25}
-      ]
-    }
-  }
-}
diff --git a/keyboards/qpockets/space_space/rev1/keyboard.json b/keyboards/qpockets/space_space/rev1/keyboard.json
new file mode 100644
index 00000000000..70adf4997c2
--- /dev/null
+++ b/keyboards/qpockets/space_space/rev1/keyboard.json
@@ -0,0 +1,123 @@
+{
+  "keyboard_name": "space_space",
+  "manufacturer": "qpockets",
+  "url": "",
+  "maintainer": "qpockets",
+  "usb": {
+    "vid": "0x7170",
+    "pid": "0x7373",
+    "device_version": "30.0.0"
+  },
+  "features": {
+    "bootmagic": true,
+    "encoder": true,
+    "extrakey": true,
+    "mousekey": true,
+    "nkro": true
+  },
+  "matrix_pins": {
+    "cols": ["D4", "B4", "B5", "B6", "C6", "F7", "F6", "F0", "B0", "E6", "B1"],
+    "rows": ["F1", "F4", "F5", "C7"]
+  },
+  "diode_direction": "COL2ROW",
+  "encoder": {
+    "rotary": [
+      {"pin_a": "B3", "pin_b": "B2", "resolution": 3},
+      {"pin_a": "D6", "pin_b": "D7"}
+    ]
+  },
+  "processor": "atmega32u4",
+  "bootloader": "atmel-dfu",
+  "debounce": 7,
+  "layouts": {
+    "LAYOUT_default": {
+      "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, "w": 1.5},
+        {"matrix": [0, 6], "x": 6.5, "y": 0},
+        {"matrix": [0, 7], "x": 7.5, "y": 0},
+        {"matrix": [0, 8], "x": 8.5, "y": 0},
+        {"matrix": [0, 9], "x": 9.5, "y": 0},
+        {"matrix": [0, 10], "x": 10.5, "y": 0},
+
+        {"matrix": [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": [1, 4], "x": 4, "y": 1},
+        {"matrix": [1, 5], "x": 5, "y": 1, "w": 1.5},
+        {"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": [2, 0], "x": 0, "y": 2},
+        {"matrix": [2, 1], "x": 1, "y": 2},
+        {"matrix": [2, 2], "x": 2, "y": 2},
+        {"matrix": [2, 3], "x": 3, "y": 2},
+        {"matrix": [2, 4], "x": 4, "y": 2},
+        {"matrix": [2, 5], "x": 5, "y": 2, "w": 1.5},
+        {"matrix": [2, 6], "x": 6.5, "y": 2},
+        {"matrix": [2, 7], "x": 7.5, "y": 2},
+        {"matrix": [2, 8], "x": 8.5, "y": 2},
+        {"matrix": [2, 9], "x": 9.5, "y": 2},
+        {"matrix": [2, 10], "x": 10.5, "y": 2},
+
+        {"matrix": [3, 2], "x": 1.25, "y": 3.35, "w": 1.25},
+        {"matrix": [3, 3], "x": 2.5, "y": 3.35},
+        {"matrix": [3, 4], "x": 3.5, "y": 3.35, "w": 2},
+        {"matrix": [3, 6], "x": 5.5, "y": 3.35, "w": 2.25},
+        {"matrix": [3, 7], "x": 7.75, "y": 3.35},
+        {"matrix": [3, 8], "x": 8.75, "y": 3.35, "w": 1.25}
+      ]
+    },
+    "LAYOUT_big_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, "w": 1.5},
+        {"matrix": [0, 6], "x": 6.5, "y": 0},
+        {"matrix": [0, 7], "x": 7.5, "y": 0},
+        {"matrix": [0, 8], "x": 8.5, "y": 0},
+        {"matrix": [0, 9], "x": 9.5, "y": 0},
+        {"matrix": [0, 10], "x": 10.5, "y": 0},
+
+        {"matrix": [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": [1, 4], "x": 4, "y": 1},
+        {"matrix": [1, 5], "x": 5, "y": 1, "w": 1.5},
+        {"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": [2, 0], "x": 0, "y": 2},
+        {"matrix": [2, 1], "x": 1, "y": 2},
+        {"matrix": [2, 2], "x": 2, "y": 2},
+        {"matrix": [2, 3], "x": 3, "y": 2},
+        {"matrix": [2, 4], "x": 4, "y": 2},
+        {"matrix": [2, 5], "x": 5, "y": 2, "w": 1.5},
+        {"matrix": [2, 6], "x": 6.5, "y": 2},
+        {"matrix": [2, 7], "x": 7.5, "y": 2},
+        {"matrix": [2, 8], "x": 8.5, "y": 2},
+        {"matrix": [2, 9], "x": 9.5, "y": 2},
+        {"matrix": [2, 10], "x": 10.5, "y": 2},
+
+        {"matrix": [3, 2], "x": 1.25, "y": 3.35, "w": 1.25},
+        {"matrix": [3, 5], "x": 2.5, "y": 3.35, "w": 6.25},
+        {"matrix": [3, 8], "x": 8.75, "y": 3.35, "w": 1.25}
+      ]
+    }
+  }
+}
diff --git a/keyboards/qpockets/space_space/rev1/rules.mk b/keyboards/qpockets/space_space/rev1/rules.mk
deleted file mode 100644
index 131aa72aeb5..00000000000
--- a/keyboards/qpockets/space_space/rev1/rules.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-ENCODER_ENABLE = yes
diff --git a/keyboards/qpockets/space_space/rev2/info.json b/keyboards/qpockets/space_space/rev2/info.json
deleted file mode 100644
index 3fe0f71497c..00000000000
--- a/keyboards/qpockets/space_space/rev2/info.json
+++ /dev/null
@@ -1,124 +0,0 @@
-{
-  "keyboard_name": "space_space",
-  "manufacturer": "qpockets",
-  "url": "",
-  "maintainer": "qpockets",
-  "usb": {
-    "vid": "0x7170",
-    "pid": "0x7373",
-    "device_version": "30.0.2"
-  },
-  "matrix_pins": {
-    "cols": ["C6", "F6", "F1", "F4", "F5", "E6", "D6", "B2", "B5", "D3", "D2"],
-    "rows": ["B1", "B0", "D5", "B6"]
-  },
-  "diode_direction": "COL2ROW",
-  "encoder": {
-    "rotary": [
-      {"pin_a": "B4", "pin_b": "D7", "resolution": 3},
-      {"pin_a": "C7", "pin_b": "F7", "resolution": 3}
-    ]
-  },
-  "rgblight": {
-    "led_count": 4,
-    "default": {
-      "hue": 130
-    }
-  },
-  "ws2812": {
-    "pin": "F0"
-  },
-  "processor": "atmega32u4",
-  "bootloader": "atmel-dfu",
-  "layouts": {
-    "LAYOUT_default": {
-      "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, "w": 1.5},
-        {"matrix": [0, 6], "x": 6.5, "y": 0},
-        {"matrix": [0, 7], "x": 7.5, "y": 0},
-        {"matrix": [0, 8], "x": 8.5, "y": 0},
-        {"matrix": [0, 9], "x": 9.5, "y": 0},
-        {"matrix": [0, 10], "x": 10.5, "y": 0},
-
-        {"matrix": [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": [1, 4], "x": 4, "y": 1},
-        {"matrix": [1, 5], "x": 5, "y": 1, "w": 1.5},
-        {"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": [2, 0], "x": 0, "y": 2},
-        {"matrix": [2, 1], "x": 1, "y": 2},
-        {"matrix": [2, 2], "x": 2, "y": 2},
-        {"matrix": [2, 3], "x": 3, "y": 2},
-        {"matrix": [2, 4], "x": 4, "y": 2},
-        {"matrix": [2, 5], "x": 5, "y": 2, "w": 1.5},
-        {"matrix": [2, 6], "x": 6.5, "y": 2},
-        {"matrix": [2, 7], "x": 7.5, "y": 2},
-        {"matrix": [2, 8], "x": 8.5, "y": 2},
-        {"matrix": [2, 9], "x": 9.5, "y": 2},
-        {"matrix": [2, 10], "x": 10.5, "y": 2},
-
-        {"matrix": [3, 2], "x": 1.25, "y": 3.35, "w": 1.25},
-        {"matrix": [3, 3], "x": 2.5, "y": 3.35},
-        {"matrix": [3, 4], "x": 3.5, "y": 3.35, "w": 2},
-        {"matrix": [3, 6], "x": 5.5, "y": 3.35, "w": 2.25},
-        {"matrix": [3, 7], "x": 7.75, "y": 3.35},
-        {"matrix": [3, 8], "x": 8.75, "y": 3.35, "w": 1.25}
-      ]
-    },
-    "LAYOUT_big_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, "w": 1.5},
-        {"matrix": [0, 6], "x": 6.5, "y": 0},
-        {"matrix": [0, 7], "x": 7.5, "y": 0},
-        {"matrix": [0, 8], "x": 8.5, "y": 0},
-        {"matrix": [0, 9], "x": 9.5, "y": 0},
-        {"matrix": [0, 10], "x": 10.5, "y": 0},
-
-        {"matrix": [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": [1, 4], "x": 4, "y": 1},
-        {"matrix": [1, 5], "x": 5, "y": 1, "w": 1.5},
-        {"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": [2, 0], "x": 0, "y": 2},
-        {"matrix": [2, 1], "x": 1, "y": 2},
-        {"matrix": [2, 2], "x": 2, "y": 2},
-        {"matrix": [2, 3], "x": 3, "y": 2},
-        {"matrix": [2, 4], "x": 4, "y": 2},
-        {"matrix": [2, 5], "x": 5, "y": 2, "w": 1.5},
-        {"matrix": [2, 6], "x": 6.5, "y": 2},
-        {"matrix": [2, 7], "x": 7.5, "y": 2},
-        {"matrix": [2, 8], "x": 8.5, "y": 2},
-        {"matrix": [2, 9], "x": 9.5, "y": 2},
-        {"matrix": [2, 10], "x": 10.5, "y": 2},
-
-        {"matrix": [3, 2], "x": 1.25, "y": 3.35, "w": 1.25},
-        {"matrix": [3, 5], "x": 2.5, "y": 3.35, "w": 6.25},
-        {"matrix": [3, 8], "x": 8.75, "y": 3.35, "w": 1.25}
-      ]
-    }
-  }
-}
diff --git a/keyboards/qpockets/space_space/rev2/keyboard.json b/keyboards/qpockets/space_space/rev2/keyboard.json
new file mode 100644
index 00000000000..b57e16db68b
--- /dev/null
+++ b/keyboards/qpockets/space_space/rev2/keyboard.json
@@ -0,0 +1,131 @@
+{
+  "keyboard_name": "space_space",
+  "manufacturer": "qpockets",
+  "url": "",
+  "maintainer": "qpockets",
+  "usb": {
+    "vid": "0x7170",
+    "pid": "0x7373",
+    "device_version": "30.0.2"
+  },
+  "features": {
+    "bootmagic": true,
+    "encoder": true,
+    "extrakey": true,
+    "mousekey": true,
+    "nkro": true
+  },
+  "matrix_pins": {
+    "cols": ["C6", "F6", "F1", "F4", "F5", "E6", "D6", "B2", "B5", "D3", "D2"],
+    "rows": ["B1", "B0", "D5", "B6"]
+  },
+  "diode_direction": "COL2ROW",
+  "encoder": {
+    "rotary": [
+      {"pin_a": "B4", "pin_b": "D7", "resolution": 3},
+      {"pin_a": "C7", "pin_b": "F7", "resolution": 3}
+    ]
+  },
+  "rgblight": {
+    "led_count": 4,
+    "default": {
+      "hue": 130
+    }
+  },
+  "ws2812": {
+    "pin": "F0"
+  },
+  "processor": "atmega32u4",
+  "bootloader": "atmel-dfu",
+  "layouts": {
+    "LAYOUT_default": {
+      "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, "w": 1.5},
+        {"matrix": [0, 6], "x": 6.5, "y": 0},
+        {"matrix": [0, 7], "x": 7.5, "y": 0},
+        {"matrix": [0, 8], "x": 8.5, "y": 0},
+        {"matrix": [0, 9], "x": 9.5, "y": 0},
+        {"matrix": [0, 10], "x": 10.5, "y": 0},
+
+        {"matrix": [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": [1, 4], "x": 4, "y": 1},
+        {"matrix": [1, 5], "x": 5, "y": 1, "w": 1.5},
+        {"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": [2, 0], "x": 0, "y": 2},
+        {"matrix": [2, 1], "x": 1, "y": 2},
+        {"matrix": [2, 2], "x": 2, "y": 2},
+        {"matrix": [2, 3], "x": 3, "y": 2},
+        {"matrix": [2, 4], "x": 4, "y": 2},
+        {"matrix": [2, 5], "x": 5, "y": 2, "w": 1.5},
+        {"matrix": [2, 6], "x": 6.5, "y": 2},
+        {"matrix": [2, 7], "x": 7.5, "y": 2},
+        {"matrix": [2, 8], "x": 8.5, "y": 2},
+        {"matrix": [2, 9], "x": 9.5, "y": 2},
+        {"matrix": [2, 10], "x": 10.5, "y": 2},
+
+        {"matrix": [3, 2], "x": 1.25, "y": 3.35, "w": 1.25},
+        {"matrix": [3, 3], "x": 2.5, "y": 3.35},
+        {"matrix": [3, 4], "x": 3.5, "y": 3.35, "w": 2},
+        {"matrix": [3, 6], "x": 5.5, "y": 3.35, "w": 2.25},
+        {"matrix": [3, 7], "x": 7.75, "y": 3.35},
+        {"matrix": [3, 8], "x": 8.75, "y": 3.35, "w": 1.25}
+      ]
+    },
+    "LAYOUT_big_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, "w": 1.5},
+        {"matrix": [0, 6], "x": 6.5, "y": 0},
+        {"matrix": [0, 7], "x": 7.5, "y": 0},
+        {"matrix": [0, 8], "x": 8.5, "y": 0},
+        {"matrix": [0, 9], "x": 9.5, "y": 0},
+        {"matrix": [0, 10], "x": 10.5, "y": 0},
+
+        {"matrix": [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": [1, 4], "x": 4, "y": 1},
+        {"matrix": [1, 5], "x": 5, "y": 1, "w": 1.5},
+        {"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": [2, 0], "x": 0, "y": 2},
+        {"matrix": [2, 1], "x": 1, "y": 2},
+        {"matrix": [2, 2], "x": 2, "y": 2},
+        {"matrix": [2, 3], "x": 3, "y": 2},
+        {"matrix": [2, 4], "x": 4, "y": 2},
+        {"matrix": [2, 5], "x": 5, "y": 2, "w": 1.5},
+        {"matrix": [2, 6], "x": 6.5, "y": 2},
+        {"matrix": [2, 7], "x": 7.5, "y": 2},
+        {"matrix": [2, 8], "x": 8.5, "y": 2},
+        {"matrix": [2, 9], "x": 9.5, "y": 2},
+        {"matrix": [2, 10], "x": 10.5, "y": 2},
+
+        {"matrix": [3, 2], "x": 1.25, "y": 3.35, "w": 1.25},
+        {"matrix": [3, 5], "x": 2.5, "y": 3.35, "w": 6.25},
+        {"matrix": [3, 8], "x": 8.75, "y": 3.35, "w": 1.25}
+      ]
+    }
+  }
+}
diff --git a/keyboards/qpockets/space_space/rev2/rules.mk b/keyboards/qpockets/space_space/rev2/rules.mk
deleted file mode 100644
index ebe0d0e0e32..00000000000
--- a/keyboards/qpockets/space_space/rev2/rules.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE =  no      # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-ENCODER_ENABLE = yes
diff --git a/keyboards/quokka/info.json b/keyboards/quokka/info.json
deleted file mode 100644
index 0c34b0ee65f..00000000000
--- a/keyboards/quokka/info.json
+++ /dev/null
@@ -1,121 +0,0 @@
-{
-    "manufacturer": "dlford",
-    "keyboard_name": "Quokka",
-    "maintainer": "dlford",
-    "bootloader": "rp2040",
-    "build": {
-        "lto": true
-    },
-    "diode_direction": "ROW2COL",
-    "features": {
-        "audio": true,
-        "extrakey": true,
-        "oled": true,
-        "rgb_matrix": true
-    },
-    "matrix_pins": {
-        "cols": ["GP8", "GP7", "GP6", "GP5", "GP4"],
-        "rows": ["GP10", "GP19", "GP20", "GP18"]
-    },
-    "processor": "RP2040",
-    "rgb_matrix": {
-        "center_point": [133, 54],
-        "driver": "ws2812",
-        "layout": [
-            {"matrix": [3, 4], "x": 122, "y": 85, "flags": 4},
-            {"matrix": [3, 3], "x": 102, "y": 85, "flags": 4},
-            {"matrix": [3, 2], "x": 81, "y": 85, "flags": 4},
-            {"matrix": [2, 4], "x": 102, "y": 64, "flags": 4},
-            {"matrix": [1, 4], "x": 102, "y": 43, "flags": 4},
-            {"matrix": [0, 4], "x": 102, "y": 21, "flags": 4},
-            {"matrix": [0, 3], "x": 81, "y": 21, "flags": 4},
-            {"matrix": [1, 3], "x": 81, "y": 43, "flags": 4},
-            {"matrix": [2, 3], "x": 81, "y": 64, "flags": 4},
-            {"matrix": [2, 2], "x": 61, "y": 64, "flags": 4},
-            {"matrix": [1, 2], "x": 61, "y": 43, "flags": 4},
-            {"matrix": [0, 2], "x": 61, "y": 21, "flags": 4},
-            {"matrix": [0, 1], "x": 41, "y": 21, "flags": 4},
-            {"matrix": [1, 1], "x": 41, "y": 43, "flags": 4},
-            {"matrix": [2, 1], "x": 41, "y": 64, "flags": 4},
-            {"matrix": [2, 0], "x": 20, "y": 64, "flags": 4},
-            {"matrix": [1, 0], "x": 20, "y": 43, "flags": 4},
-            {"matrix": [0, 0], "x": 20, "y": 21, "flags": 4},
-            {"matrix": [7, 0], "x": 143, "y": 85, "flags": 4},
-            {"matrix": [7, 1], "x": 163, "y": 85, "flags": 4},
-            {"matrix": [7, 2], "x": 183, "y": 85, "flags": 4},
-            {"matrix": [6, 0], "x": 163, "y": 64, "flags": 4},
-            {"matrix": [5, 0], "x": 163, "y": 43, "flags": 4},
-            {"matrix": [4, 0], "x": 163, "y": 21, "flags": 4},
-            {"matrix": [4, 1], "x": 183, "y": 21, "flags": 4},
-            {"matrix": [5, 1], "x": 183, "y": 43, "flags": 4},
-            {"matrix": [6, 1], "x": 183, "y": 64, "flags": 4},
-            {"matrix": [6, 2], "x": 204, "y": 64, "flags": 4},
-            {"matrix": [5, 2], "x": 204, "y": 43, "flags": 4},
-            {"matrix": [4, 2], "x": 204, "y": 21, "flags": 4},
-            {"matrix": [4, 3], "x": 224, "y": 21, "flags": 4},
-            {"matrix": [5, 3], "x": 224, "y": 43, "flags": 4},
-            {"matrix": [6, 3], "x": 224, "y": 64, "flags": 4},
-            {"matrix": [6, 4], "x": 244, "y": 64, "flags": 4},
-            {"matrix": [5, 4], "x": 244, "y": 43, "flags": 4},
-            {"matrix": [4, 4], "x": 244, "y": 21, "flags": 4}
-        ],
-        "split_count": [18, 18]
-    },
-    "split": {
-        "enabled": true,
-        "soft_serial_pin": "GP0"
-    },
-    "url": "https://github.com/dlford/quokka",
-    "usb": {
-        "device_version": "1.0.0",
-        "pid": "0x3537",
-        "vid": "0x444D"
-    },
-    "ws2812": {
-        "driver": "vendor",
-        "pin": "GP29"
-    },
-    "community_layouts": ["split_3x5_3"],
-    "layouts": {
-        "LAYOUT_split_3x5_3": {
-            "layout": [
-                {"label": "L00", "matrix": [0, 0], "x": 0, "y": 1.25},
-                {"label": "L01", "matrix": [0, 1], "x": 1, "y": 0.25},
-                {"label": "L02", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "L03", "matrix": [0, 3], "x": 3, "y": 0.5},
-                {"label": "L04", "matrix": [0, 4], "x": 4, "y": 0.65},
-                {"label": "R00", "matrix": [4, 4], "x": 7, "y": 0.65},
-                {"label": "R01", "matrix": [4, 3], "x": 8, "y": 0.5},
-                {"label": "R02", "matrix": [4, 2], "x": 9, "y": 0},
-                {"label": "R03", "matrix": [4, 1], "x": 10, "y": 0.25},
-                {"label": "R04", "matrix": [4, 0], "x": 11, "y": 1.25},
-                {"label": "L10", "matrix": [1, 0], "x": 0, "y": 2.25},
-                {"label": "L11", "matrix": [1, 1], "x": 1, "y": 1.25},
-                {"label": "L12", "matrix": [1, 2], "x": 2, "y": 1},
-                {"label": "L13", "matrix": [1, 3], "x": 3, "y": 1.5},
-                {"label": "L14", "matrix": [1, 4], "x": 4, "y": 1.65},
-                {"label": "R10", "matrix": [5, 4], "x": 7, "y": 1.65},
-                {"label": "R11", "matrix": [5, 3], "x": 8, "y": 1.5},
-                {"label": "R12", "matrix": [5, 2], "x": 9, "y": 1},
-                {"label": "R13", "matrix": [5, 1], "x": 10, "y": 1.25},
-                {"label": "R14", "matrix": [5, 0], "x": 11, "y": 2.25},
-                {"label": "L20", "matrix": [2, 0], "x": 0, "y": 3.25},
-                {"label": "L21", "matrix": [2, 1], "x": 1, "y": 2.25},
-                {"label": "L22", "matrix": [2, 2], "x": 2, "y": 2},
-                {"label": "L23", "matrix": [2, 3], "x": 3, "y": 2.5},
-                {"label": "L24", "matrix": [2, 4], "x": 4, "y": 2.65},
-                {"label": "R20", "matrix": [6, 4], "x": 7, "y": 2.65},
-                {"label": "R21", "matrix": [6, 3], "x": 8, "y": 2.5},
-                {"label": "R22", "matrix": [6, 2], "x": 9, "y": 2},
-                {"label": "R23", "matrix": [6, 1], "x": 10, "y": 2.25},
-                {"label": "R24", "matrix": [6, 0], "x": 11, "y": 3.25},
-                {"label": "L32", "matrix": [3, 2], "x": 2.5, "y": 3.65},
-                {"label": "L33", "matrix": [3, 3], "x": 3.5, "y": 3.75},
-                {"label": "L34", "matrix": [3, 4], "x": 4.5, "y": 4.15},
-                {"label": "R30", "matrix": [7, 4], "x": 6.5, "y": 4.15},
-                {"label": "R31", "matrix": [7, 3], "x": 7.5, "y": 3.75},
-                {"label": "R32", "matrix": [7, 2], "x": 8.5, "y": 3.65}
-            ]
-        }
-    }
-}
diff --git a/keyboards/quokka/keyboard.json b/keyboards/quokka/keyboard.json
new file mode 100644
index 00000000000..094e3e496eb
--- /dev/null
+++ b/keyboards/quokka/keyboard.json
@@ -0,0 +1,124 @@
+{
+    "manufacturer": "dlford",
+    "keyboard_name": "Quokka",
+    "maintainer": "dlford",
+    "bootloader": "rp2040",
+    "build": {
+        "lto": true
+    },
+    "diode_direction": "ROW2COL",
+    "features": {
+        "audio": true,
+        "extrakey": true,
+        "oled": true,
+        "rgb_matrix": true
+    },
+    "audio": {
+        "driver": "pwm_hardware"
+    },
+    "matrix_pins": {
+        "cols": ["GP8", "GP7", "GP6", "GP5", "GP4"],
+        "rows": ["GP10", "GP19", "GP20", "GP18"]
+    },
+    "processor": "RP2040",
+    "rgb_matrix": {
+        "center_point": [133, 54],
+        "driver": "ws2812",
+        "layout": [
+            {"matrix": [3, 4], "x": 122, "y": 85, "flags": 4},
+            {"matrix": [3, 3], "x": 102, "y": 85, "flags": 4},
+            {"matrix": [3, 2], "x": 81, "y": 85, "flags": 4},
+            {"matrix": [2, 4], "x": 102, "y": 64, "flags": 4},
+            {"matrix": [1, 4], "x": 102, "y": 43, "flags": 4},
+            {"matrix": [0, 4], "x": 102, "y": 21, "flags": 4},
+            {"matrix": [0, 3], "x": 81, "y": 21, "flags": 4},
+            {"matrix": [1, 3], "x": 81, "y": 43, "flags": 4},
+            {"matrix": [2, 3], "x": 81, "y": 64, "flags": 4},
+            {"matrix": [2, 2], "x": 61, "y": 64, "flags": 4},
+            {"matrix": [1, 2], "x": 61, "y": 43, "flags": 4},
+            {"matrix": [0, 2], "x": 61, "y": 21, "flags": 4},
+            {"matrix": [0, 1], "x": 41, "y": 21, "flags": 4},
+            {"matrix": [1, 1], "x": 41, "y": 43, "flags": 4},
+            {"matrix": [2, 1], "x": 41, "y": 64, "flags": 4},
+            {"matrix": [2, 0], "x": 20, "y": 64, "flags": 4},
+            {"matrix": [1, 0], "x": 20, "y": 43, "flags": 4},
+            {"matrix": [0, 0], "x": 20, "y": 21, "flags": 4},
+            {"matrix": [7, 0], "x": 143, "y": 85, "flags": 4},
+            {"matrix": [7, 1], "x": 163, "y": 85, "flags": 4},
+            {"matrix": [7, 2], "x": 183, "y": 85, "flags": 4},
+            {"matrix": [6, 0], "x": 163, "y": 64, "flags": 4},
+            {"matrix": [5, 0], "x": 163, "y": 43, "flags": 4},
+            {"matrix": [4, 0], "x": 163, "y": 21, "flags": 4},
+            {"matrix": [4, 1], "x": 183, "y": 21, "flags": 4},
+            {"matrix": [5, 1], "x": 183, "y": 43, "flags": 4},
+            {"matrix": [6, 1], "x": 183, "y": 64, "flags": 4},
+            {"matrix": [6, 2], "x": 204, "y": 64, "flags": 4},
+            {"matrix": [5, 2], "x": 204, "y": 43, "flags": 4},
+            {"matrix": [4, 2], "x": 204, "y": 21, "flags": 4},
+            {"matrix": [4, 3], "x": 224, "y": 21, "flags": 4},
+            {"matrix": [5, 3], "x": 224, "y": 43, "flags": 4},
+            {"matrix": [6, 3], "x": 224, "y": 64, "flags": 4},
+            {"matrix": [6, 4], "x": 244, "y": 64, "flags": 4},
+            {"matrix": [5, 4], "x": 244, "y": 43, "flags": 4},
+            {"matrix": [4, 4], "x": 244, "y": 21, "flags": 4}
+        ],
+        "split_count": [18, 18]
+    },
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "GP0"
+    },
+    "url": "https://github.com/dlford/quokka",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x3537",
+        "vid": "0x444D"
+    },
+    "ws2812": {
+        "driver": "vendor",
+        "pin": "GP29"
+    },
+    "community_layouts": ["split_3x5_3"],
+    "layouts": {
+        "LAYOUT_split_3x5_3": {
+            "layout": [
+                {"label": "L00", "matrix": [0, 0], "x": 0, "y": 1.25},
+                {"label": "L01", "matrix": [0, 1], "x": 1, "y": 0.25},
+                {"label": "L02", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "L03", "matrix": [0, 3], "x": 3, "y": 0.5},
+                {"label": "L04", "matrix": [0, 4], "x": 4, "y": 0.65},
+                {"label": "R00", "matrix": [4, 4], "x": 7, "y": 0.65},
+                {"label": "R01", "matrix": [4, 3], "x": 8, "y": 0.5},
+                {"label": "R02", "matrix": [4, 2], "x": 9, "y": 0},
+                {"label": "R03", "matrix": [4, 1], "x": 10, "y": 0.25},
+                {"label": "R04", "matrix": [4, 0], "x": 11, "y": 1.25},
+                {"label": "L10", "matrix": [1, 0], "x": 0, "y": 2.25},
+                {"label": "L11", "matrix": [1, 1], "x": 1, "y": 1.25},
+                {"label": "L12", "matrix": [1, 2], "x": 2, "y": 1},
+                {"label": "L13", "matrix": [1, 3], "x": 3, "y": 1.5},
+                {"label": "L14", "matrix": [1, 4], "x": 4, "y": 1.65},
+                {"label": "R10", "matrix": [5, 4], "x": 7, "y": 1.65},
+                {"label": "R11", "matrix": [5, 3], "x": 8, "y": 1.5},
+                {"label": "R12", "matrix": [5, 2], "x": 9, "y": 1},
+                {"label": "R13", "matrix": [5, 1], "x": 10, "y": 1.25},
+                {"label": "R14", "matrix": [5, 0], "x": 11, "y": 2.25},
+                {"label": "L20", "matrix": [2, 0], "x": 0, "y": 3.25},
+                {"label": "L21", "matrix": [2, 1], "x": 1, "y": 2.25},
+                {"label": "L22", "matrix": [2, 2], "x": 2, "y": 2},
+                {"label": "L23", "matrix": [2, 3], "x": 3, "y": 2.5},
+                {"label": "L24", "matrix": [2, 4], "x": 4, "y": 2.65},
+                {"label": "R20", "matrix": [6, 4], "x": 7, "y": 2.65},
+                {"label": "R21", "matrix": [6, 3], "x": 8, "y": 2.5},
+                {"label": "R22", "matrix": [6, 2], "x": 9, "y": 2},
+                {"label": "R23", "matrix": [6, 1], "x": 10, "y": 2.25},
+                {"label": "R24", "matrix": [6, 0], "x": 11, "y": 3.25},
+                {"label": "L32", "matrix": [3, 2], "x": 2.5, "y": 3.65},
+                {"label": "L33", "matrix": [3, 3], "x": 3.5, "y": 3.75},
+                {"label": "L34", "matrix": [3, 4], "x": 4.5, "y": 4.15},
+                {"label": "R30", "matrix": [7, 4], "x": 6.5, "y": 4.15},
+                {"label": "R31", "matrix": [7, 3], "x": 7.5, "y": 3.75},
+                {"label": "R32", "matrix": [7, 2], "x": 8.5, "y": 3.65}
+            ]
+        }
+    }
+}
diff --git a/keyboards/quokka/rules.mk b/keyboards/quokka/rules.mk
index c53818be735..161ec22b16e 100644
--- a/keyboards/quokka/rules.mk
+++ b/keyboards/quokka/rules.mk
@@ -1,2 +1 @@
-AUDIO_DRIVER = pwm_hardware
 SERIAL_DRIVER = vendor
diff --git a/keyboards/qvex/lynepad2/info.json b/keyboards/qvex/lynepad2/keyboard.json
similarity index 100%
rename from keyboards/qvex/lynepad2/info.json
rename to keyboards/qvex/lynepad2/keyboard.json
diff --git a/keyboards/rarepotato8de/3x3macropad/3x3macropad.c b/keyboards/rarepotato8de/3x3macropad/3x3macropad.c
new file mode 100644
index 00000000000..ad7ad642158
--- /dev/null
+++ b/keyboards/rarepotato8de/3x3macropad/3x3macropad.c
@@ -0,0 +1,54 @@
+/* Copyright 2024 RarePotato8DE
+ *
+ * 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"
+
+#ifdef OLED_ENABLE
+static void render_bongo1(void) {
+    static const char PROGMEM data[] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xc0, 0x40, 0x60, 0x20, 0x30, 0x30, 0x18, 0x1c, 0x0e, 0x03, 0x01, 0x03, 0x07, 0x1c, 0x38, 0x30, 0x60, 0x60, 0x60, 0xc0, 0xc0, 0x80, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xe0, 0x30, 0x18, 0x18, 0x08, 0x18, 0x98, 0x30, 0x70, 0xf0, 0xb0, 0x18, 0x0c, 0x06, 0x07, 0x03, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x03, 0x03, 0x03, 0x06, 0x06, 0x0c, 0x0c, 0x18, 0x18, 0x30, 0x60, 0x60, 0x60, 0xc0, 0x60, 0x60, 0x30, 0x30, 0x30, 0xf8, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                        0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x04, 0x04, 0x04, 0x04, 0x08, 0x08, 0x08, 0x08, 0x18, 0x10, 0x10, 0x10, 0x10, 0x20, 0x20, 0x20, 0x20, 0x40, 0x40, 0x40, 0x40, 0xc0, 0x80, 0x80, 0xff, 0xff, 0xc0, 0x80, 0x80, 0x8e, 0x06, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0e, 0x1e, 0x1e, 0x0e, 0x00, 0x10, 0x38, 0x70, 0x70, 0x70, 0x70, 0xe0, 0xe0, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xf8, 0x3f, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x03, 0x03, 0x03, 0x03, 0x06, 0x06, 0x06, 0x06, 0x0c, 0x0c, 0x0c, 0x1c, 0x18, 0x18, 0x18, 0x38, 0x30, 0x30, 0x30, 0x30, 0x60, 0x60, 0x60, 0x60, 0xe0, 0xc0, 0xc0, 0xc0, 0x80, 0x80, 0x80, 0x80, 0x00, 0x87, 0xc7, 0xc7, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x0f, 0x3c, 0xf0, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+    oled_write_raw_P(data, sizeof(data));
+}
+
+static void render_bongo2(void) {
+    static const char PROGMEM data[] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0xc0, 0x40, 0x60, 0x20, 0x20, 0x30, 0x10, 0x18, 0x0e, 0x07, 0x03, 0x01, 0x07, 0x0e, 0x1c, 0x30, 0x20, 0x60, 0x60, 0x40, 0xc0, 0xc0, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0x60, 0x70, 0x30, 0x18, 0x0c, 0x06, 0x06, 0x03, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x03, 0x03, 0x03, 0x06, 0x06, 0x06, 0x0c, 0x08, 0x18, 0x30, 0x30, 0x60, 0x60, 0xc0, 0x60, 0x60, 0x20, 0x30, 0x30, 0x18, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                        0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x04, 0x04, 0x04, 0x04, 0x08, 0x08, 0x08, 0x08, 0x18, 0x10, 0x10, 0x10, 0x10, 0x20, 0x20, 0x20, 0x20, 0x40, 0x40, 0x40, 0x40, 0xc0, 0x80, 0x80, 0xc0, 0xe0, 0x38, 0x1c, 0x06, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0e, 0x1f, 0x0e, 0x04, 0x00, 0x38, 0x30, 0x70, 0x30, 0x70, 0xe0, 0xe0, 0xc0, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x00, 0x00, 0xc0, 0xe0, 0x60, 0x60, 0x70, 0x60, 0x60, 0xe0, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xfc, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x30, 0x90, 0x00, 0x1f, 0x31, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x20, 0x30, 0x30, 0x10, 0x18, 0x18, 0x08, 0x0c, 0x0c, 0x0c, 0x0c, 0x18, 0x18, 0x18, 0x18, 0x38, 0x30, 0x30, 0x30, 0x30, 0x60, 0x60, 0x60, 0x60, 0xc0, 0xc0, 0xc0, 0xc0, 0x80, 0x80, 0x80, 0x80, 0x03, 0x07, 0x07, 0x00, 0xff, 0xff, 0x00, 0x08, 0x01, 0x38, 0x38, 0x02, 0x00, 0x01, 0x03, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x1c, 0x78, 0xe0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+    oled_write_raw_P(data, sizeof(data));
+}
+
+/* This code switches the shown image on the oled on every 350th call of this function */
+bool showBongo1 = true;
+int  calls      = 0;
+bool oled_task_kb(void) {
+    if (!oled_task_user()) {
+        return false;
+    }
+    if (calls++ > 350) {
+        showBongo1 = !showBongo1;
+        calls      = 0;
+    }
+    if (showBongo1) {
+        render_bongo1();
+    } else {
+        render_bongo2();
+    }
+    return false;
+}
+#endif
diff --git a/keyboards/rarepotato8de/3x3macropad/info.json b/keyboards/rarepotato8de/3x3macropad/info.json
new file mode 100644
index 00000000000..607c6509966
--- /dev/null
+++ b/keyboards/rarepotato8de/3x3macropad/info.json
@@ -0,0 +1,63 @@
+{
+    "manufacturer": "RarePotato8DE",
+    "keyboard_name": "3x3macropad",
+    "maintainer": "RarePotato8DE",
+    "development_board": "promicro",
+    "build": {
+        "lto": true
+    },
+    "diode_direction": "COL2ROW",
+    "encoder": {
+        "rotary": [
+            {"pin_a": "F4", "pin_b": "B1"}
+        ]
+    },
+    "features": {
+        "bootmagic": true,
+        "encoder": true,
+        "extrakey": true,
+        "nkro": true,
+        "oled": true,
+        "rgblight": true
+    },
+    "matrix_pins": {
+        "cols": ["D7", "B3", "B2"],
+        "rows": ["F7", "B5", "B6"]
+    },
+    "rgblight": {
+        "animations": {
+            "alternating": true,
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "static_gradient": true
+        },
+        "led_count": 6
+    },
+    "url": "https://github.com/rarepotato8de/3x3macropad",
+    "usb": {
+        "device_version": "0.0.1",
+        "pid": "0x0001",
+        "vid": "0x5353"
+    },
+    "ws2812": {
+        "pin": "E6"
+    },
+    "community_layouts": ["ortho_3x3"],
+    "layouts": {
+        "LAYOUT_ortho_3x3": {
+            "layout": [
+                {"label": "k00", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "k01", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "k02", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "k10", "matrix": [1, 0], "x": 0, "y": 1},
+                {"label": "k11", "matrix": [1, 1], "x": 1, "y": 1},
+                {"label": "k12", "matrix": [1, 2], "x": 2, "y": 1},
+                {"label": "k20", "matrix": [2, 0], "x": 0, "y": 2},
+                {"label": "k21", "matrix": [2, 1], "x": 1, "y": 2},
+                {"label": "k22", "matrix": [2, 2], "x": 2, "y": 2}
+            ]
+        }
+    }
+}
diff --git a/keyboards/rarepotato8de/3x3macropad/keymaps/default/keymap.c b/keyboards/rarepotato8de/3x3macropad/keymaps/default/keymap.c
new file mode 100644
index 00000000000..7f68e145e73
--- /dev/null
+++ b/keyboards/rarepotato8de/3x3macropad/keymaps/default/keymap.c
@@ -0,0 +1,25 @@
+/* Copyright 2024 RarePotato8DE
+ * 
+ * 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_3x3(
+        KC_1,   KC_2,   KC_3,
+        KC_4,   KC_5,   KC_6,
+        KC_7,   KC_8,   KC_9
+    )
+};
diff --git a/keyboards/rarepotato8de/3x3macropad/readme.md b/keyboards/rarepotato8de/3x3macropad/readme.md
new file mode 100644
index 00000000000..60a5caa2220
--- /dev/null
+++ b/keyboards/rarepotato8de/3x3macropad/readme.md
@@ -0,0 +1,28 @@
+# 3x3macropad
+
+![3x3macropad](https://i.imgur.com/LMkcKOw.jpg)
+
+The 3x3macropad is a small macropad with a cool OLED screen and rotary encoder.
+It was inspired by stacked FR4 keyboards like the Discipline65.
+
+* Keyboard Maintainer: [RarePotato8DE](https://github.com/rarepotato8de)
+* Hardware Supported: 3x3macropad
+* Hardware Availability: [Open source!](https://github.com/rarepotato8de/3x3macropad)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make rarepotato8de/3x3macropad:default
+
+Flashing example for this keyboard:
+
+    make rarepotato8de/3x3macropad: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,1) in the matrix (the top left one below the OLED) and plug in the keyboard
+* **Physical reset button**: Short the two through hole pins on the back of the PCB (positioned at the rotary encoder)
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
\ No newline at end of file
diff --git a/keyboards/rarepotato8de/3x3macropad/rules.mk b/keyboards/rarepotato8de/3x3macropad/rules.mk
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/keyboards/rart/rart75hs/config.h b/keyboards/rart/rart75hs/config.h
deleted file mode 100644
index 3715a98a6d1..00000000000
--- a/keyboards/rart/rart75hs/config.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
-Copyright 2022 Alabahuy
-
-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
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/rart/rart75hs/info.json b/keyboards/rart/rart75hs/info.json
deleted file mode 100644
index 148dfba3852..00000000000
--- a/keyboards/rart/rart75hs/info.json
+++ /dev/null
@@ -1,465 +0,0 @@
-{
-    "keyboard_name": "RART75 Hotswap",
-    "manufacturer": "Alabahuy",
-    "url": "",
-    "maintainer": "Alabahuy",
-    "usb": {
-        "vid": "0x414C",
-        "pid": "0x5575",
-        "device_version": "0.0.3"
-    },
-    "matrix_pins": {
-        "cols": ["B4", "B3", "B2", "B1", "B0", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "C7", "C6", "C3"],
-        "rows": ["D5", "D6", "D7", "D0", "C5", "C4"]
-    },
-    "diode_direction": "COL2ROW",
-    "encoder": {
-        "rotary": [
-            {"pin_a": "C1", "pin_b": "C2"}
-        ]
-    },
-    "indicators": {
-        "caps_lock": "D4",
-        "on_state": 0
-    },
-    "ws2812": {
-        "pin": "C0"
-    },
-    "rgblight": {
-        "saturation_steps": 8,
-        "brightness_steps": 8,
-        "led_count": 11,
-        "max_brightness": 240,
-        "sleep": true,
-        "animations": {
-            "breathing": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "knight": true,
-            "static_gradient": true,
-            "twinkle": true
-        }
-    },
-    "bootmagic": {
-        "matrix": [0, 1]
-    },
-    "processor": "atmega32a",
-    "bootloader": "usbasploader",
-    "layout_aliases": {
-        "LAYOUT_all": "LAYOUT_ansi"
-    },
-    "layouts": {
-        "LAYOUT_ansi": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-
-                {"label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0},
-                {"label": "F2", "matrix": [0, 2], "x": 2.25, "y": 0},
-                {"label": "F3", "matrix": [0, 3], "x": 3.25, "y": 0},
-                {"label": "F4", "matrix": [0, 4], "x": 4.25, "y": 0},
-
-                {"label": "F5", "matrix": [0, 5], "x": 5.5, "y": 0},
-                {"label": "F6", "matrix": [0, 6], "x": 6.5, "y": 0},
-                {"label": "F7", "matrix": [0, 7], "x": 7.5, "y": 0},
-                {"label": "F8", "matrix": [0, 8], "x": 8.5, "y": 0},
-
-                {"label": "F9", "matrix": [0, 10], "x": 9.75, "y": 0},
-                {"label": "F10", "matrix": [0, 11], "x": 10.75, "y": 0},
-                {"label": "F11", "matrix": [0, 12], "x": 11.75, "y": 0},
-                {"label": "F12", "matrix": [0, 13], "x": 12.75, "y": 0},
-
-                {"label": "Insert", "matrix": [0, 14], "x": 14, "y": 0},
-
-                {"label": "Play/Pause", "matrix": [0, 15], "x": 15.5, "y": 0},
-
-                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
-                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
-                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
-                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
-                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
-                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
-                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
-                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
-                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
-                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
-                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
-                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
-                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
-                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
-
-                {"label": "Home", "matrix": [1, 15], "x": 15.5, "y": 1.25},
-
-                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
-                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
-                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
-                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
-                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
-                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
-                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
-                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
-                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
-                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
-                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
-                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
-                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
-                {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
-
-                {"label": "End", "matrix": [2, 15], "x": 15.5, "y": 2.25},
-
-                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
-                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
-                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
-                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
-                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
-                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
-                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
-                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
-                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
-                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
-                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
-                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
-                {"label": "Enter", "matrix": [3, 12], "x": 12.75, "y": 3.25, "w": 2.25},
-
-                {"label": "Page Up", "matrix": [3, 15], "x": 15.5, "y": 3.25},
-
-                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
-                {"label": "Z", "matrix": [4, 1], "x": 2.25, "y": 4.25},
-                {"label": "X", "matrix": [4, 2], "x": 3.25, "y": 4.25},
-                {"label": "C", "matrix": [4, 3], "x": 4.25, "y": 4.25},
-                {"label": "V", "matrix": [4, 4], "x": 5.25, "y": 4.25},
-                {"label": "B", "matrix": [4, 5], "x": 6.25, "y": 4.25},
-                {"label": "N", "matrix": [4, 6], "x": 7.25, "y": 4.25},
-                {"label": "M", "matrix": [4, 7], "x": 8.25, "y": 4.25},
-                {"label": ",", "matrix": [4, 8], "x": 9.25, "y": 4.25},
-                {"label": ".", "matrix": [4, 9], "x": 10.25, "y": 4.25},
-                {"label": "/", "matrix": [4, 10], "x": 11.25, "y": 4.25},
-                {"label": "Shift", "matrix": [4, 11], "x": 12.25, "y": 4.25, "w": 1.75},
-
-                {"label": "\u2191", "matrix": [4, 14], "x": 14.25, "y": 4.5},
-
-                {"label": "Page Down", "matrix": [4, 15], "x": 15.5, "y": 4.25},
-
-                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
-                {"label": "GUI", "matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
-                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
-                {"label": "Space", "matrix": [5, 4], "x": 3.75, "y": 5.25, "w": 6.25},
-                {"label": "Alt", "matrix": [5, 8], "x": 10, "y": 5.25},
-                {"label": "Fn", "matrix": [5, 9], "x": 11, "y": 5.25},
-                {"label": "Ctrl", "matrix": [5, 10], "x": 12, "y": 5.25},
-
-                {"label": "\u2190", "matrix": [5, 11], "x": 13.25, "y": 5.5},
-                {"label": "\u2193", "matrix": [5, 14], "x": 14.25, "y": 5.5},
-                {"label": "\u2192", "matrix": [5, 15], "x": 15.25, "y": 5.5}
-            ]
-        },
-        "LAYOUT_ansi_split_bs": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-
-                {"label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0},
-                {"label": "F2", "matrix": [0, 2], "x": 2.25, "y": 0},
-                {"label": "F3", "matrix": [0, 3], "x": 3.25, "y": 0},
-                {"label": "F4", "matrix": [0, 4], "x": 4.25, "y": 0},
-
-                {"label": "F5", "matrix": [0, 5], "x": 5.5, "y": 0},
-                {"label": "F6", "matrix": [0, 6], "x": 6.5, "y": 0},
-                {"label": "F7", "matrix": [0, 7], "x": 7.5, "y": 0},
-                {"label": "F8", "matrix": [0, 8], "x": 8.5, "y": 0},
-
-                {"label": "F9", "matrix": [0, 10], "x": 9.75, "y": 0},
-                {"label": "F10", "matrix": [0, 11], "x": 10.75, "y": 0},
-                {"label": "F11", "matrix": [0, 12], "x": 11.75, "y": 0},
-                {"label": "F12", "matrix": [0, 13], "x": 12.75, "y": 0},
-
-                {"label": "Insert", "matrix": [0, 14], "x": 14, "y": 0},
-
-                {"label": "Play/Pause", "matrix": [0, 15], "x": 15.5, "y": 0},
-
-                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
-                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
-                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
-                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
-                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
-                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
-                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
-                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
-                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
-                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
-                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
-                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
-                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
-                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25},
-                {"label": "Backspace", "matrix": [1, 14], "x": 14, "y": 1.25},
-
-                {"label": "Home", "matrix": [1, 15], "x": 15.5, "y": 1.25},
-
-                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
-                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
-                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
-                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
-                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
-                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
-                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
-                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
-                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
-                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
-                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
-                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
-                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
-                {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
-
-                {"label": "End", "matrix": [2, 15], "x": 15.5, "y": 2.25},
-
-                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
-                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
-                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
-                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
-                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
-                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
-                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
-                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
-                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
-                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
-                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
-                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
-                {"label": "Enter", "matrix": [3, 12], "x": 12.75, "y": 3.25, "w": 2.25},
-
-                {"label": "Page Up", "matrix": [3, 15], "x": 15.5, "y": 3.25},
-
-                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
-                {"label": "Z", "matrix": [4, 1], "x": 2.25, "y": 4.25},
-                {"label": "X", "matrix": [4, 2], "x": 3.25, "y": 4.25},
-                {"label": "C", "matrix": [4, 3], "x": 4.25, "y": 4.25},
-                {"label": "V", "matrix": [4, 4], "x": 5.25, "y": 4.25},
-                {"label": "B", "matrix": [4, 5], "x": 6.25, "y": 4.25},
-                {"label": "N", "matrix": [4, 6], "x": 7.25, "y": 4.25},
-                {"label": "M", "matrix": [4, 7], "x": 8.25, "y": 4.25},
-                {"label": ",", "matrix": [4, 8], "x": 9.25, "y": 4.25},
-                {"label": ".", "matrix": [4, 9], "x": 10.25, "y": 4.25},
-                {"label": "/", "matrix": [4, 10], "x": 11.25, "y": 4.25},
-                {"label": "Shift", "matrix": [4, 11], "x": 12.25, "y": 4.25, "w": 1.75},
-
-                {"label": "\u2191", "matrix": [4, 14], "x": 14.25, "y": 4.5},
-
-                {"label": "Page Down", "matrix": [4, 15], "x": 15.5, "y": 4.25},
-
-                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
-                {"label": "GUI", "matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
-                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
-                {"label": "Space", "matrix": [5, 4], "x": 3.75, "y": 5.25, "w": 6.25},
-                {"label": "Alt", "matrix": [5, 8], "x": 10, "y": 5.25},
-                {"label": "Fn", "matrix": [5, 9], "x": 11, "y": 5.25},
-                {"label": "Ctrl", "matrix": [5, 10], "x": 12, "y": 5.25},
-
-                {"label": "\u2190", "matrix": [5, 11], "x": 13.25, "y": 5.5},
-                {"label": "\u2193", "matrix": [5, 14], "x": 14.25, "y": 5.5},
-                {"label": "\u2192", "matrix": [5, 15], "x": 15.25, "y": 5.5}
-            ]
-        },
-        "LAYOUT_ansi_rwkl": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-
-                {"label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0},
-                {"label": "F2", "matrix": [0, 2], "x": 2.25, "y": 0},
-                {"label": "F3", "matrix": [0, 3], "x": 3.25, "y": 0},
-                {"label": "F4", "matrix": [0, 4], "x": 4.25, "y": 0},
-
-                {"label": "F5", "matrix": [0, 5], "x": 5.5, "y": 0},
-                {"label": "F6", "matrix": [0, 6], "x": 6.5, "y": 0},
-                {"label": "F7", "matrix": [0, 7], "x": 7.5, "y": 0},
-                {"label": "F8", "matrix": [0, 8], "x": 8.5, "y": 0},
-
-                {"label": "F9", "matrix": [0, 10], "x": 9.75, "y": 0},
-                {"label": "F10", "matrix": [0, 11], "x": 10.75, "y": 0},
-                {"label": "F11", "matrix": [0, 12], "x": 11.75, "y": 0},
-                {"label": "F12", "matrix": [0, 13], "x": 12.75, "y": 0},
-
-                {"label": "Insert", "matrix": [0, 14], "x": 14, "y": 0},
-
-                {"label": "Play/Pause", "matrix": [0, 15], "x": 15.5, "y": 0},
-
-                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
-                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
-                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
-                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
-                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
-                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
-                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
-                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
-                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
-                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
-                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
-                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
-                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
-                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
-
-                {"label": "Home", "matrix": [1, 15], "x": 15.5, "y": 1.25},
-
-                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
-                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
-                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
-                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
-                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
-                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
-                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
-                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
-                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
-                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
-                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
-                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
-                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
-                {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
-
-                {"label": "End", "matrix": [2, 15], "x": 15.5, "y": 2.25},
-
-                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
-                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
-                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
-                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
-                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
-                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
-                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
-                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
-                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
-                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
-                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
-                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
-                {"label": "Enter", "matrix": [3, 12], "x": 12.75, "y": 3.25, "w": 2.25},
-
-                {"label": "Page Up", "matrix": [3, 15], "x": 15.5, "y": 3.25},
-
-                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
-                {"label": "Z", "matrix": [4, 1], "x": 2.25, "y": 4.25},
-                {"label": "X", "matrix": [4, 2], "x": 3.25, "y": 4.25},
-                {"label": "C", "matrix": [4, 3], "x": 4.25, "y": 4.25},
-                {"label": "V", "matrix": [4, 4], "x": 5.25, "y": 4.25},
-                {"label": "B", "matrix": [4, 5], "x": 6.25, "y": 4.25},
-                {"label": "N", "matrix": [4, 6], "x": 7.25, "y": 4.25},
-                {"label": "M", "matrix": [4, 7], "x": 8.25, "y": 4.25},
-                {"label": ",", "matrix": [4, 8], "x": 9.25, "y": 4.25},
-                {"label": ".", "matrix": [4, 9], "x": 10.25, "y": 4.25},
-                {"label": "/", "matrix": [4, 10], "x": 11.25, "y": 4.25},
-                {"label": "Shift", "matrix": [4, 11], "x": 12.25, "y": 4.25, "w": 1.75},
-
-                {"label": "\u2191", "matrix": [4, 14], "x": 14.25, "y": 4.5},
-
-                {"label": "Page Down", "matrix": [4, 15], "x": 15.5, "y": 4.25},
-
-                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
-                {"label": "GUI", "matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
-                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
-                {"label": "Space", "matrix": [5, 4], "x": 3.75, "y": 5.25, "w": 6.25},
-                {"label": "Alt", "matrix": [5, 8], "x": 10, "y": 5.25, "w": 1.5},
-                {"label": "Ctrl", "matrix": [5, 10], "x": 11.5, "y": 5.25, "w": 1.5},
-
-                {"label": "\u2190", "matrix": [5, 11], "x": 13.25, "y": 5.5},
-                {"label": "\u2193", "matrix": [5, 14], "x": 14.25, "y": 5.5},
-                {"label": "\u2192", "matrix": [5, 15], "x": 15.25, "y": 5.5}
-            ]
-        },
-        "LAYOUT_ansi_rwkl_split_bs": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-
-                {"label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0},
-                {"label": "F2", "matrix": [0, 2], "x": 2.25, "y": 0},
-                {"label": "F3", "matrix": [0, 3], "x": 3.25, "y": 0},
-                {"label": "F4", "matrix": [0, 4], "x": 4.25, "y": 0},
-
-                {"label": "F5", "matrix": [0, 5], "x": 5.5, "y": 0},
-                {"label": "F6", "matrix": [0, 6], "x": 6.5, "y": 0},
-                {"label": "F7", "matrix": [0, 7], "x": 7.5, "y": 0},
-                {"label": "F8", "matrix": [0, 8], "x": 8.5, "y": 0},
-
-                {"label": "F9", "matrix": [0, 10], "x": 9.75, "y": 0},
-                {"label": "F10", "matrix": [0, 11], "x": 10.75, "y": 0},
-                {"label": "F11", "matrix": [0, 12], "x": 11.75, "y": 0},
-                {"label": "F12", "matrix": [0, 13], "x": 12.75, "y": 0},
-
-                {"label": "Insert", "matrix": [0, 14], "x": 14, "y": 0},
-
-                {"label": "Play/Pause", "matrix": [0, 15], "x": 15.5, "y": 0},
-
-                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
-                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
-                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
-                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
-                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
-                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
-                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
-                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
-                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
-                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
-                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
-                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
-                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
-                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25},
-                {"label": "Backspace", "matrix": [1, 14], "x": 14, "y": 1.25},
-
-                {"label": "Home", "matrix": [1, 15], "x": 15.5, "y": 1.25},
-
-                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
-                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
-                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
-                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
-                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
-                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
-                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
-                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
-                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
-                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
-                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
-                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
-                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
-                {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
-
-                {"label": "End", "matrix": [2, 15], "x": 15.5, "y": 2.25},
-
-                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
-                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
-                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
-                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
-                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
-                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
-                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
-                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
-                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
-                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
-                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
-                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
-                {"label": "Enter", "matrix": [3, 12], "x": 12.75, "y": 3.25, "w": 2.25},
-
-                {"label": "Page Up", "matrix": [3, 15], "x": 15.5, "y": 3.25},
-
-                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
-                {"label": "Z", "matrix": [4, 1], "x": 2.25, "y": 4.25},
-                {"label": "X", "matrix": [4, 2], "x": 3.25, "y": 4.25},
-                {"label": "C", "matrix": [4, 3], "x": 4.25, "y": 4.25},
-                {"label": "V", "matrix": [4, 4], "x": 5.25, "y": 4.25},
-                {"label": "B", "matrix": [4, 5], "x": 6.25, "y": 4.25},
-                {"label": "N", "matrix": [4, 6], "x": 7.25, "y": 4.25},
-                {"label": "M", "matrix": [4, 7], "x": 8.25, "y": 4.25},
-                {"label": ",", "matrix": [4, 8], "x": 9.25, "y": 4.25},
-                {"label": ".", "matrix": [4, 9], "x": 10.25, "y": 4.25},
-                {"label": "/", "matrix": [4, 10], "x": 11.25, "y": 4.25},
-                {"label": "Shift", "matrix": [4, 11], "x": 12.25, "y": 4.25, "w": 1.75},
-
-                {"label": "\u2191", "matrix": [4, 14], "x": 14.25, "y": 4.5},
-
-                {"label": "Page Down", "matrix": [4, 15], "x": 15.5, "y": 4.25},
-
-                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
-                {"label": "GUI", "matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
-                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
-                {"label": "Space", "matrix": [5, 4], "x": 3.75, "y": 5.25, "w": 6.25},
-                {"label": "Alt", "matrix": [5, 8], "x": 10, "y": 5.25, "w": 1.5},
-                {"label": "Ctrl", "matrix": [5, 10], "x": 11.5, "y": 5.25, "w": 1.5},
-
-                {"label": "\u2190", "matrix": [5, 11], "x": 13.25, "y": 5.5},
-                {"label": "\u2193", "matrix": [5, 14], "x": 14.25, "y": 5.5},
-                {"label": "\u2192", "matrix": [5, 15], "x": 15.25, "y": 5.5}
-            ]
-        }
-    }
-}
diff --git a/keyboards/rart/rart75hs/keyboard.json b/keyboards/rart/rart75hs/keyboard.json
new file mode 100644
index 00000000000..f8763bfbee9
--- /dev/null
+++ b/keyboards/rart/rart75hs/keyboard.json
@@ -0,0 +1,480 @@
+{
+    "keyboard_name": "RART75 Hotswap",
+    "manufacturer": "Alabahuy",
+    "url": "",
+    "maintainer": "Alabahuy",
+    "usb": {
+        "vid": "0x414C",
+        "pid": "0x5575",
+        "device_version": "0.0.3"
+    },
+    "features": {
+        "bootmagic": true,
+        "command": true,
+        "encoder": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": false,
+        "rgblight": true
+    },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
+    "matrix_pins": {
+        "cols": ["B4", "B3", "B2", "B1", "B0", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "C7", "C6", "C3"],
+        "rows": ["D5", "D6", "D7", "D0", "C5", "C4"]
+    },
+    "diode_direction": "COL2ROW",
+    "encoder": {
+        "rotary": [
+            {"pin_a": "C1", "pin_b": "C2"}
+        ]
+    },
+    "indicators": {
+        "caps_lock": "D4",
+        "on_state": 0
+    },
+    "ws2812": {
+        "pin": "C0"
+    },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 11,
+        "max_brightness": 240,
+        "sleep": true,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "knight": true,
+            "static_gradient": true,
+            "twinkle": true
+        }
+    },
+    "bootmagic": {
+        "matrix": [0, 1]
+    },
+    "processor": "atmega32a",
+    "bootloader": "usbasploader",
+    "layout_aliases": {
+        "LAYOUT_all": "LAYOUT_ansi"
+    },
+    "layouts": {
+        "LAYOUT_ansi": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0},
+                {"label": "F2", "matrix": [0, 2], "x": 2.25, "y": 0},
+                {"label": "F3", "matrix": [0, 3], "x": 3.25, "y": 0},
+                {"label": "F4", "matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"label": "F5", "matrix": [0, 5], "x": 5.5, "y": 0},
+                {"label": "F6", "matrix": [0, 6], "x": 6.5, "y": 0},
+                {"label": "F7", "matrix": [0, 7], "x": 7.5, "y": 0},
+                {"label": "F8", "matrix": [0, 8], "x": 8.5, "y": 0},
+
+                {"label": "F9", "matrix": [0, 10], "x": 9.75, "y": 0},
+                {"label": "F10", "matrix": [0, 11], "x": 10.75, "y": 0},
+                {"label": "F11", "matrix": [0, 12], "x": 11.75, "y": 0},
+                {"label": "F12", "matrix": [0, 13], "x": 12.75, "y": 0},
+
+                {"label": "Insert", "matrix": [0, 14], "x": 14, "y": 0},
+
+                {"label": "Play/Pause", "matrix": [0, 15], "x": 15.5, "y": 0},
+
+                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
+                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
+                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
+                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
+                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
+                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
+                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
+                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
+                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
+                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
+                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
+                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
+                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
+                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+
+                {"label": "Home", "matrix": [1, 15], "x": 15.5, "y": 1.25},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"label": "End", "matrix": [2, 15], "x": 15.5, "y": 2.25},
+
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"label": "Enter", "matrix": [3, 12], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"label": "Page Up", "matrix": [3, 15], "x": 15.5, "y": 3.25},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"label": "Z", "matrix": [4, 1], "x": 2.25, "y": 4.25},
+                {"label": "X", "matrix": [4, 2], "x": 3.25, "y": 4.25},
+                {"label": "C", "matrix": [4, 3], "x": 4.25, "y": 4.25},
+                {"label": "V", "matrix": [4, 4], "x": 5.25, "y": 4.25},
+                {"label": "B", "matrix": [4, 5], "x": 6.25, "y": 4.25},
+                {"label": "N", "matrix": [4, 6], "x": 7.25, "y": 4.25},
+                {"label": "M", "matrix": [4, 7], "x": 8.25, "y": 4.25},
+                {"label": ",", "matrix": [4, 8], "x": 9.25, "y": 4.25},
+                {"label": ".", "matrix": [4, 9], "x": 10.25, "y": 4.25},
+                {"label": "/", "matrix": [4, 10], "x": 11.25, "y": 4.25},
+                {"label": "Shift", "matrix": [4, 11], "x": 12.25, "y": 4.25, "w": 1.75},
+
+                {"label": "\u2191", "matrix": [4, 14], "x": 14.25, "y": 4.5},
+
+                {"label": "Page Down", "matrix": [4, 15], "x": 15.5, "y": 4.25},
+
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"label": "GUI", "matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"label": "Space", "matrix": [5, 4], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"label": "Alt", "matrix": [5, 8], "x": 10, "y": 5.25},
+                {"label": "Fn", "matrix": [5, 9], "x": 11, "y": 5.25},
+                {"label": "Ctrl", "matrix": [5, 10], "x": 12, "y": 5.25},
+
+                {"label": "\u2190", "matrix": [5, 11], "x": 13.25, "y": 5.5},
+                {"label": "\u2193", "matrix": [5, 14], "x": 14.25, "y": 5.5},
+                {"label": "\u2192", "matrix": [5, 15], "x": 15.25, "y": 5.5}
+            ]
+        },
+        "LAYOUT_ansi_split_bs": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0},
+                {"label": "F2", "matrix": [0, 2], "x": 2.25, "y": 0},
+                {"label": "F3", "matrix": [0, 3], "x": 3.25, "y": 0},
+                {"label": "F4", "matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"label": "F5", "matrix": [0, 5], "x": 5.5, "y": 0},
+                {"label": "F6", "matrix": [0, 6], "x": 6.5, "y": 0},
+                {"label": "F7", "matrix": [0, 7], "x": 7.5, "y": 0},
+                {"label": "F8", "matrix": [0, 8], "x": 8.5, "y": 0},
+
+                {"label": "F9", "matrix": [0, 10], "x": 9.75, "y": 0},
+                {"label": "F10", "matrix": [0, 11], "x": 10.75, "y": 0},
+                {"label": "F11", "matrix": [0, 12], "x": 11.75, "y": 0},
+                {"label": "F12", "matrix": [0, 13], "x": 12.75, "y": 0},
+
+                {"label": "Insert", "matrix": [0, 14], "x": 14, "y": 0},
+
+                {"label": "Play/Pause", "matrix": [0, 15], "x": 15.5, "y": 0},
+
+                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
+                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
+                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
+                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
+                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
+                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
+                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
+                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
+                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
+                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
+                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
+                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
+                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
+                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25},
+                {"label": "Backspace", "matrix": [1, 14], "x": 14, "y": 1.25},
+
+                {"label": "Home", "matrix": [1, 15], "x": 15.5, "y": 1.25},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"label": "End", "matrix": [2, 15], "x": 15.5, "y": 2.25},
+
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"label": "Enter", "matrix": [3, 12], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"label": "Page Up", "matrix": [3, 15], "x": 15.5, "y": 3.25},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"label": "Z", "matrix": [4, 1], "x": 2.25, "y": 4.25},
+                {"label": "X", "matrix": [4, 2], "x": 3.25, "y": 4.25},
+                {"label": "C", "matrix": [4, 3], "x": 4.25, "y": 4.25},
+                {"label": "V", "matrix": [4, 4], "x": 5.25, "y": 4.25},
+                {"label": "B", "matrix": [4, 5], "x": 6.25, "y": 4.25},
+                {"label": "N", "matrix": [4, 6], "x": 7.25, "y": 4.25},
+                {"label": "M", "matrix": [4, 7], "x": 8.25, "y": 4.25},
+                {"label": ",", "matrix": [4, 8], "x": 9.25, "y": 4.25},
+                {"label": ".", "matrix": [4, 9], "x": 10.25, "y": 4.25},
+                {"label": "/", "matrix": [4, 10], "x": 11.25, "y": 4.25},
+                {"label": "Shift", "matrix": [4, 11], "x": 12.25, "y": 4.25, "w": 1.75},
+
+                {"label": "\u2191", "matrix": [4, 14], "x": 14.25, "y": 4.5},
+
+                {"label": "Page Down", "matrix": [4, 15], "x": 15.5, "y": 4.25},
+
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"label": "GUI", "matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"label": "Space", "matrix": [5, 4], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"label": "Alt", "matrix": [5, 8], "x": 10, "y": 5.25},
+                {"label": "Fn", "matrix": [5, 9], "x": 11, "y": 5.25},
+                {"label": "Ctrl", "matrix": [5, 10], "x": 12, "y": 5.25},
+
+                {"label": "\u2190", "matrix": [5, 11], "x": 13.25, "y": 5.5},
+                {"label": "\u2193", "matrix": [5, 14], "x": 14.25, "y": 5.5},
+                {"label": "\u2192", "matrix": [5, 15], "x": 15.25, "y": 5.5}
+            ]
+        },
+        "LAYOUT_ansi_rwkl": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0},
+                {"label": "F2", "matrix": [0, 2], "x": 2.25, "y": 0},
+                {"label": "F3", "matrix": [0, 3], "x": 3.25, "y": 0},
+                {"label": "F4", "matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"label": "F5", "matrix": [0, 5], "x": 5.5, "y": 0},
+                {"label": "F6", "matrix": [0, 6], "x": 6.5, "y": 0},
+                {"label": "F7", "matrix": [0, 7], "x": 7.5, "y": 0},
+                {"label": "F8", "matrix": [0, 8], "x": 8.5, "y": 0},
+
+                {"label": "F9", "matrix": [0, 10], "x": 9.75, "y": 0},
+                {"label": "F10", "matrix": [0, 11], "x": 10.75, "y": 0},
+                {"label": "F11", "matrix": [0, 12], "x": 11.75, "y": 0},
+                {"label": "F12", "matrix": [0, 13], "x": 12.75, "y": 0},
+
+                {"label": "Insert", "matrix": [0, 14], "x": 14, "y": 0},
+
+                {"label": "Play/Pause", "matrix": [0, 15], "x": 15.5, "y": 0},
+
+                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
+                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
+                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
+                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
+                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
+                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
+                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
+                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
+                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
+                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
+                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
+                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
+                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
+                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+
+                {"label": "Home", "matrix": [1, 15], "x": 15.5, "y": 1.25},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"label": "End", "matrix": [2, 15], "x": 15.5, "y": 2.25},
+
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"label": "Enter", "matrix": [3, 12], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"label": "Page Up", "matrix": [3, 15], "x": 15.5, "y": 3.25},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"label": "Z", "matrix": [4, 1], "x": 2.25, "y": 4.25},
+                {"label": "X", "matrix": [4, 2], "x": 3.25, "y": 4.25},
+                {"label": "C", "matrix": [4, 3], "x": 4.25, "y": 4.25},
+                {"label": "V", "matrix": [4, 4], "x": 5.25, "y": 4.25},
+                {"label": "B", "matrix": [4, 5], "x": 6.25, "y": 4.25},
+                {"label": "N", "matrix": [4, 6], "x": 7.25, "y": 4.25},
+                {"label": "M", "matrix": [4, 7], "x": 8.25, "y": 4.25},
+                {"label": ",", "matrix": [4, 8], "x": 9.25, "y": 4.25},
+                {"label": ".", "matrix": [4, 9], "x": 10.25, "y": 4.25},
+                {"label": "/", "matrix": [4, 10], "x": 11.25, "y": 4.25},
+                {"label": "Shift", "matrix": [4, 11], "x": 12.25, "y": 4.25, "w": 1.75},
+
+                {"label": "\u2191", "matrix": [4, 14], "x": 14.25, "y": 4.5},
+
+                {"label": "Page Down", "matrix": [4, 15], "x": 15.5, "y": 4.25},
+
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"label": "GUI", "matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"label": "Space", "matrix": [5, 4], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"label": "Alt", "matrix": [5, 8], "x": 10, "y": 5.25, "w": 1.5},
+                {"label": "Ctrl", "matrix": [5, 10], "x": 11.5, "y": 5.25, "w": 1.5},
+
+                {"label": "\u2190", "matrix": [5, 11], "x": 13.25, "y": 5.5},
+                {"label": "\u2193", "matrix": [5, 14], "x": 14.25, "y": 5.5},
+                {"label": "\u2192", "matrix": [5, 15], "x": 15.25, "y": 5.5}
+            ]
+        },
+        "LAYOUT_ansi_rwkl_split_bs": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0},
+                {"label": "F2", "matrix": [0, 2], "x": 2.25, "y": 0},
+                {"label": "F3", "matrix": [0, 3], "x": 3.25, "y": 0},
+                {"label": "F4", "matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"label": "F5", "matrix": [0, 5], "x": 5.5, "y": 0},
+                {"label": "F6", "matrix": [0, 6], "x": 6.5, "y": 0},
+                {"label": "F7", "matrix": [0, 7], "x": 7.5, "y": 0},
+                {"label": "F8", "matrix": [0, 8], "x": 8.5, "y": 0},
+
+                {"label": "F9", "matrix": [0, 10], "x": 9.75, "y": 0},
+                {"label": "F10", "matrix": [0, 11], "x": 10.75, "y": 0},
+                {"label": "F11", "matrix": [0, 12], "x": 11.75, "y": 0},
+                {"label": "F12", "matrix": [0, 13], "x": 12.75, "y": 0},
+
+                {"label": "Insert", "matrix": [0, 14], "x": 14, "y": 0},
+
+                {"label": "Play/Pause", "matrix": [0, 15], "x": 15.5, "y": 0},
+
+                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
+                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
+                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
+                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
+                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
+                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
+                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
+                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
+                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
+                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
+                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
+                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
+                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
+                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25},
+                {"label": "Backspace", "matrix": [1, 14], "x": 14, "y": 1.25},
+
+                {"label": "Home", "matrix": [1, 15], "x": 15.5, "y": 1.25},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"label": "End", "matrix": [2, 15], "x": 15.5, "y": 2.25},
+
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"label": "Enter", "matrix": [3, 12], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"label": "Page Up", "matrix": [3, 15], "x": 15.5, "y": 3.25},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"label": "Z", "matrix": [4, 1], "x": 2.25, "y": 4.25},
+                {"label": "X", "matrix": [4, 2], "x": 3.25, "y": 4.25},
+                {"label": "C", "matrix": [4, 3], "x": 4.25, "y": 4.25},
+                {"label": "V", "matrix": [4, 4], "x": 5.25, "y": 4.25},
+                {"label": "B", "matrix": [4, 5], "x": 6.25, "y": 4.25},
+                {"label": "N", "matrix": [4, 6], "x": 7.25, "y": 4.25},
+                {"label": "M", "matrix": [4, 7], "x": 8.25, "y": 4.25},
+                {"label": ",", "matrix": [4, 8], "x": 9.25, "y": 4.25},
+                {"label": ".", "matrix": [4, 9], "x": 10.25, "y": 4.25},
+                {"label": "/", "matrix": [4, 10], "x": 11.25, "y": 4.25},
+                {"label": "Shift", "matrix": [4, 11], "x": 12.25, "y": 4.25, "w": 1.75},
+
+                {"label": "\u2191", "matrix": [4, 14], "x": 14.25, "y": 4.5},
+
+                {"label": "Page Down", "matrix": [4, 15], "x": 15.5, "y": 4.25},
+
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"label": "GUI", "matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"label": "Space", "matrix": [5, 4], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"label": "Alt", "matrix": [5, 8], "x": 10, "y": 5.25, "w": 1.5},
+                {"label": "Ctrl", "matrix": [5, 10], "x": 11.5, "y": 5.25, "w": 1.5},
+
+                {"label": "\u2190", "matrix": [5, 11], "x": 13.25, "y": 5.5},
+                {"label": "\u2193", "matrix": [5, 14], "x": 14.25, "y": 5.5},
+                {"label": "\u2192", "matrix": [5, 15], "x": 15.25, "y": 5.5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/rart/rart75hs/rules.mk b/keyboards/rart/rart75hs/rules.mk
index 804d61435b6..c2ee0bc86f9 100644
--- a/keyboards/rart/rart75hs/rules.mk
+++ b/keyboards/rart/rart75hs/rules.mk
@@ -1,16 +1,2 @@
 # Processor frequency
 F_CPU = 16000000
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-ENCODER_ENABLE = yes
diff --git a/keyboards/rart/rart80/config.h b/keyboards/rart/rart80/config.h
deleted file mode 100644
index 3715a98a6d1..00000000000
--- a/keyboards/rart/rart80/config.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
-Copyright 2022 Alabahuy
-
-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
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/rart/rart80/info.json b/keyboards/rart/rart80/info.json
deleted file mode 100644
index e2093e50292..00000000000
--- a/keyboards/rart/rart80/info.json
+++ /dev/null
@@ -1,1413 +0,0 @@
-{
-    "keyboard_name": "RART80 Hotswap",
-    "manufacturer": "Alabahuy",
-    "url": "",
-    "maintainer": "Alabahuy",
-    "usb": {
-        "vid": "0x414C",
-        "pid": "0x0080",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["A2", "A3", "A4", "A5", "A6", "A7", "C7", "C6", "C5", "C4", "C2", "C1", "C0", "D7", "B4", "B2", "B1"],
-        "rows": ["B3", "A1", "B0", "C3", "D0", "D1"]
-    },
-    "diode_direction": "COL2ROW",
-    "indicators": {
-        "caps_lock": "D4",
-        "on_state": 0
-    },
-    "ws2812": {
-        "pin": "D5"
-    },
-    "rgblight": {
-        "saturation_steps": 8,
-        "brightness_steps": 8,
-        "led_count": 6,
-        "max_brightness": 240,
-        "sleep": true,
-        "animations": {
-            "breathing": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "knight": true,
-            "static_gradient": true,
-            "twinkle": true
-        }
-    },
-    "bootmagic": {
-        "matrix": [0, 1]
-    },
-    "processor": "atmega32a",
-    "bootloader": "usbasploader",
-    "community_layouts": [
-        "tkl_ansi_tsangan",
-        "tkl_ansi_tsangan_split_bs_rshift",
-        "tkl_f13_ansi_tsangan",
-        "tkl_f13_ansi_tsangan_split_bs_rshift"
-    ],
-    "layouts": {
-        "LAYOUT_all": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-
-                {"label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0},
-                {"label": "F2", "matrix": [0, 2], "x": 2.25, "y": 0},
-                {"label": "F3", "matrix": [0, 3], "x": 3.25, "y": 0},
-                {"label": "F4", "matrix": [0, 4], "x": 4.25, "y": 0},
-
-                {"label": "F5", "matrix": [0, 5], "x": 5.5, "y": 0},
-                {"label": "F6", "matrix": [0, 6], "x": 6.5, "y": 0},
-                {"label": "F7", "matrix": [0, 7], "x": 7.5, "y": 0},
-                {"label": "F8", "matrix": [0, 8], "x": 8.5, "y": 0},
-
-                {"label": "F9", "matrix": [0, 9], "x": 9.75, "y": 0},
-                {"label": "F10", "matrix": [0, 10], "x": 10.75, "y": 0},
-                {"label": "F11", "matrix": [0, 11], "x": 11.75, "y": 0},
-                {"label": "F12", "matrix": [0, 12], "x": 12.75, "y": 0},
-
-                {"label": "F13", "matrix": [0, 13], "x": 14, "y": 0},
-
-                {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
-                {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
-                {"label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0},
-
-                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
-                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
-                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
-                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
-                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
-                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
-                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
-                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
-                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
-                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
-                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
-                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
-                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
-                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25},
-                {"label": "Backspace", "matrix": [2, 13], "x": 14, "y": 1.25},
-
-                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
-                {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25},
-                {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "y": 1.25},
-
-                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
-                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
-                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
-                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
-                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
-                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
-                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
-                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
-                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
-                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
-                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
-                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
-                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
-                {"label": "\\", "matrix": [3, 13], "x": 13.5, "y": 2.25, "w": 1.5},
-
-                {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
-                {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25},
-                {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2.25},
-
-                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
-                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
-                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
-                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
-                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
-                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
-                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
-                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
-                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
-                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
-                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
-                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
-                {"label": "Enter", "matrix": [3, 12], "x": 12.75, "y": 3.25, "w": 2.25},
-
-                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
-                {"label": "\\", "matrix": [4, 1], "x": 1.25, "y": 4.25},
-                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
-                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
-                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
-                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
-                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
-                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
-                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
-                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
-                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
-                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
-                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
-                {"label": "Fn", "matrix": [4, 13], "x": 14, "y": 4.25},
-
-                {"label": "\u25bd", "matrix": [4, 14], "x": 15.25, "y": 4.25},
-                {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25},
-                {"label": "\u25bd", "matrix": [4, 16], "x": 17.25, "y": 4.25},
-
-                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
-                {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 5.25},
-                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
-                {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
-                {"label": "Alt", "matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5},
-                {"label": "GUI", "matrix": [5, 12], "x": 12.5, "y": 5.25},
-                {"label": "Ctrl", "matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
-
-                {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
-                {"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25},
-                {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
-            ]
-        },
-        "LAYOUT_tkl_ansi_tsangan": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-
-                {"label": "F1", "matrix": [0, 1], "x": 2, "y": 0},
-                {"label": "F2", "matrix": [0, 2], "x": 3, "y": 0},
-                {"label": "F3", "matrix": [0, 3], "x": 4, "y": 0},
-                {"label": "F4", "matrix": [0, 4], "x": 5, "y": 0},
-
-                {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 0},
-                {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 0},
-                {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 0},
-                {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 0},
-
-                {"label": "F9", "matrix": [0, 9], "x": 11, "y": 0},
-                {"label": "F10", "matrix": [0, 10], "x": 12, "y": 0},
-                {"label": "F11", "matrix": [0, 11], "x": 13, "y": 0},
-                {"label": "F12", "matrix": [0, 12], "x": 14, "y": 0},
-
-                {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
-                {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
-                {"label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0},
-
-                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
-                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
-                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
-                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
-                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
-                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
-                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
-                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
-                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
-                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
-                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
-                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
-                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
-                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
-
-                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
-                {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25},
-                {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "y": 1.25},
-
-                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
-                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
-                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
-                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
-                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
-                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
-                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
-                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
-                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
-                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
-                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
-                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
-                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
-                {"label": "\\", "matrix": [3, 13], "x": 13.5, "y": 2.25, "w": 1.5},
-
-                {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
-                {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25},
-                {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2.25},
-
-                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
-                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
-                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
-                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
-                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
-                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
-                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
-                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
-                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
-                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
-                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
-                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
-                {"label": "Enter", "matrix": [3, 12], "x": 12.75, "y": 3.25, "w": 2.25},
-
-                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
-                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
-                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
-                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
-                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
-                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
-                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
-                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
-                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
-                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
-                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
-                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75},
-
-                {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25},
-
-                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
-                {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 5.25},
-                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
-                {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
-                {"label": "Alt", "matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5},
-                {"label": "GUI", "matrix": [5, 12], "x": 12.5, "y": 5.25},
-                {"label": "Ctrl", "matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
-
-                {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
-                {"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25},
-                {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
-            ]
-        },
-        "LAYOUT_tkl_ansi_tsangan_split_bs_rshift": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-
-                {"label": "F1", "matrix": [0, 1], "x": 2, "y": 0},
-                {"label": "F2", "matrix": [0, 2], "x": 3, "y": 0},
-                {"label": "F3", "matrix": [0, 3], "x": 4, "y": 0},
-                {"label": "F4", "matrix": [0, 4], "x": 5, "y": 0},
-
-                {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 0},
-                {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 0},
-                {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 0},
-                {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 0},
-
-                {"label": "F9", "matrix": [0, 9], "x": 11, "y": 0},
-                {"label": "F10", "matrix": [0, 10], "x": 12, "y": 0},
-                {"label": "F11", "matrix": [0, 11], "x": 13, "y": 0},
-                {"label": "F12", "matrix": [0, 12], "x": 14, "y": 0},
-
-                {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
-                {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
-                {"label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0},
-
-                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
-                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
-                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
-                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
-                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
-                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
-                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
-                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
-                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
-                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
-                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
-                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
-                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
-                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25},
-                {"label": "Backspace", "matrix": [2, 13], "x": 14, "y": 1.25},
-
-                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
-                {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25},
-                {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "y": 1.25},
-
-                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
-                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
-                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
-                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
-                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
-                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
-                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
-                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
-                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
-                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
-                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
-                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
-                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
-                {"label": "\\", "matrix": [3, 13], "x": 13.5, "y": 2.25, "w": 1.5},
-
-                {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
-                {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25},
-                {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2.25},
-
-                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
-                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
-                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
-                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
-                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
-                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
-                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
-                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
-                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
-                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
-                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
-                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
-                {"label": "Enter", "matrix": [3, 12], "x": 12.75, "y": 3.25, "w": 2.25},
-
-                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
-                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
-                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
-                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
-                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
-                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
-                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
-                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
-                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
-                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
-                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
-                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
-                {"label": "Fn", "matrix": [4, 13], "x": 14, "y": 4.25},
-
-                {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25},
-
-                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
-                {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 5.25},
-                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
-                {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
-                {"label": "Alt", "matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5},
-                {"label": "GUI", "matrix": [5, 12], "x": 12.5, "y": 5.25},
-                {"label": "Ctrl", "matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
-
-                {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
-                {"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25},
-                {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
-            ]
-        },
-        "LAYOUT_tkl_ansi_wkl": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-
-                {"label": "F1", "matrix": [0, 1], "x": 2, "y": 0},
-                {"label": "F2", "matrix": [0, 2], "x": 3, "y": 0},
-                {"label": "F3", "matrix": [0, 3], "x": 4, "y": 0},
-                {"label": "F4", "matrix": [0, 4], "x": 5, "y": 0},
-
-                {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 0},
-                {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 0},
-                {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 0},
-                {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 0},
-
-                {"label": "F9", "matrix": [0, 9], "x": 11, "y": 0},
-                {"label": "F10", "matrix": [0, 10], "x": 12, "y": 0},
-                {"label": "F11", "matrix": [0, 11], "x": 13, "y": 0},
-                {"label": "F12", "matrix": [0, 12], "x": 14, "y": 0},
-
-                {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
-                {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
-                {"label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0},
-
-                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
-                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
-                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
-                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
-                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
-                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
-                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
-                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
-                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
-                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
-                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
-                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
-                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
-                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
-
-                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
-                {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25},
-                {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "y": 1.25},
-
-                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
-                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
-                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
-                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
-                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
-                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
-                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
-                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
-                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
-                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
-                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
-                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
-                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
-                {"label": "\\", "matrix": [3, 13], "x": 13.5, "y": 2.25, "w": 1.5},
-
-                {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
-                {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25},
-                {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2.25},
-
-                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
-                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
-                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
-                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
-                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
-                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
-                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
-                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
-                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
-                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
-                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
-                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
-                {"label": "Enter", "matrix": [3, 12], "x": 12.75, "y": 3.25, "w": 2.25},
-
-                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
-                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
-                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
-                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
-                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
-                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
-                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
-                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
-                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
-                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
-                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
-                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75},
-
-                {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25},
-
-                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
-                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
-                {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
-                {"label": "Alt", "matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5},
-                {"label": "Ctrl", "matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
-
-                {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
-                {"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25},
-                {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
-            ]
-        },
-        "LAYOUT_tkl_ansi_wkl_split_bs_rshift": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-
-                {"label": "F1", "matrix": [0, 1], "x": 2, "y": 0},
-                {"label": "F2", "matrix": [0, 2], "x": 3, "y": 0},
-                {"label": "F3", "matrix": [0, 3], "x": 4, "y": 0},
-                {"label": "F4", "matrix": [0, 4], "x": 5, "y": 0},
-
-                {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 0},
-                {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 0},
-                {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 0},
-                {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 0},
-
-                {"label": "F9", "matrix": [0, 9], "x": 11, "y": 0},
-                {"label": "F10", "matrix": [0, 10], "x": 12, "y": 0},
-                {"label": "F11", "matrix": [0, 11], "x": 13, "y": 0},
-                {"label": "F12", "matrix": [0, 12], "x": 14, "y": 0},
-
-                {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
-                {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
-                {"label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0},
-
-                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
-                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
-                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
-                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
-                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
-                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
-                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
-                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
-                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
-                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
-                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
-                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
-                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
-                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25},
-                {"label": "Backspace", "matrix": [2, 13], "x": 14, "y": 1.25},
-
-                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
-                {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25},
-                {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "y": 1.25},
-
-                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
-                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
-                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
-                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
-                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
-                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
-                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
-                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
-                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
-                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
-                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
-                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
-                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
-                {"label": "\\", "matrix": [3, 13], "x": 13.5, "y": 2.25, "w": 1.5},
-
-                {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
-                {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25},
-                {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2.25},
-
-                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
-                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
-                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
-                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
-                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
-                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
-                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
-                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
-                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
-                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
-                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
-                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
-                {"label": "Enter", "matrix": [3, 12], "x": 12.75, "y": 3.25, "w": 2.25},
-
-                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
-                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
-                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
-                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
-                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
-                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
-                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
-                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
-                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
-                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
-                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
-                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
-                {"label": "Fn", "matrix": [4, 13], "x": 14, "y": 4.25},
-
-                {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25},
-
-                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
-                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
-                {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
-                {"label": "Alt", "matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5},
-                {"label": "Ctrl", "matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
-
-                {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
-                {"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25},
-                {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
-            ]
-        },
-        "LAYOUT_tkl_ansi_cwkl": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-
-                {"label": "F1", "matrix": [0, 1], "x": 2, "y": 0},
-                {"label": "F2", "matrix": [0, 2], "x": 3, "y": 0},
-                {"label": "F3", "matrix": [0, 3], "x": 4, "y": 0},
-                {"label": "F4", "matrix": [0, 4], "x": 5, "y": 0},
-
-                {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 0},
-                {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 0},
-                {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 0},
-                {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 0},
-
-                {"label": "F9", "matrix": [0, 9], "x": 11, "y": 0},
-                {"label": "F10", "matrix": [0, 10], "x": 12, "y": 0},
-                {"label": "F11", "matrix": [0, 11], "x": 13, "y": 0},
-                {"label": "F12", "matrix": [0, 12], "x": 14, "y": 0},
-
-                {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
-                {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
-                {"label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0},
-
-                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
-                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
-                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
-                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
-                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
-                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
-                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
-                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
-                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
-                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
-                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
-                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
-                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
-                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
-
-                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
-                {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25},
-                {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "y": 1.25},
-
-                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
-                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
-                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
-                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
-                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
-                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
-                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
-                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
-                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
-                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
-                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
-                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
-                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
-                {"label": "\\", "matrix": [3, 13], "x": 13.5, "y": 2.25, "w": 1.5},
-
-                {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
-                {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25},
-                {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2.25},
-
-                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
-                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
-                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
-                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
-                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
-                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
-                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
-                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
-                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
-                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
-                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
-                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
-                {"label": "Enter", "matrix": [3, 12], "x": 12.75, "y": 3.25, "w": 2.25},
-
-                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
-                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
-                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
-                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
-                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
-                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
-                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
-                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
-                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
-                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
-                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
-                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75},
-
-                {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25},
-
-                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
-                {"label": "GUI", "matrix": [5, 1], "x": 1.875, "y": 5.25, "w": 1.25},
-                {"label": "Alt", "matrix": [5, 2], "x": 3.125, "y": 5.25, "w": 1.25},
-                {"label": "Space", "matrix": [5, 6], "x": 4.375, "y": 5.25, "w": 6.25},
-                {"label": "Alt", "matrix": [5, 11], "x": 10.625, "y": 5.25, "w": 1.25},
-                {"label": "GUI", "matrix": [5, 12], "x": 11.875, "y": 5.25, "w": 1.25},
-                {"label": "Ctrl", "matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
-
-                {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
-                {"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25},
-                {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
-            ]
-        },
-        "LAYOUT_tkl_ansi_cwkl_split_bs_rshift": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-
-                {"label": "F1", "matrix": [0, 1], "x": 2, "y": 0},
-                {"label": "F2", "matrix": [0, 2], "x": 3, "y": 0},
-                {"label": "F3", "matrix": [0, 3], "x": 4, "y": 0},
-                {"label": "F4", "matrix": [0, 4], "x": 5, "y": 0},
-
-                {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 0},
-                {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 0},
-                {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 0},
-                {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 0},
-
-                {"label": "F9", "matrix": [0, 9], "x": 11, "y": 0},
-                {"label": "F10", "matrix": [0, 10], "x": 12, "y": 0},
-                {"label": "F11", "matrix": [0, 11], "x": 13, "y": 0},
-                {"label": "F12", "matrix": [0, 12], "x": 14, "y": 0},
-
-                {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
-                {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
-                {"label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0},
-
-                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
-                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
-                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
-                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
-                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
-                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
-                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
-                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
-                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
-                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
-                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
-                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
-                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
-                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25},
-                {"label": "Backspace", "matrix": [2, 13], "x": 14, "y": 1.25},
-
-                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
-                {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25},
-                {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "y": 1.25},
-
-                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
-                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
-                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
-                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
-                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
-                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
-                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
-                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
-                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
-                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
-                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
-                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
-                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
-                {"label": "\\", "matrix": [3, 13], "x": 13.5, "y": 2.25, "w": 1.5},
-
-                {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
-                {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25},
-                {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2.25},
-
-                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
-                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
-                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
-                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
-                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
-                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
-                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
-                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
-                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
-                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
-                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
-                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
-                {"label": "Enter", "matrix": [3, 12], "x": 12.75, "y": 3.25, "w": 2.25},
-
-                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
-                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
-                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
-                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
-                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
-                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
-                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
-                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
-                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
-                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
-                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
-                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
-                {"label": "Fn", "matrix": [4, 13], "x": 14, "y": 4.25},
-
-                {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25},
-
-                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
-                {"label": "GUI", "matrix": [5, 1], "x": 1.875, "y": 5.25, "w": 1.25},
-                {"label": "Alt", "matrix": [5, 2], "x": 3.125, "y": 5.25, "w": 1.25},
-                {"label": "Space", "matrix": [5, 6], "x": 4.375, "y": 5.25, "w": 6.25},
-                {"label": "Alt", "matrix": [5, 11], "x": 10.625, "y": 5.25, "w": 1.25},
-                {"label": "GUI", "matrix": [5, 12], "x": 11.875, "y": 5.25, "w": 1.25},
-                {"label": "Ctrl", "matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
-
-                {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
-                {"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25},
-                {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
-            ]
-        },
-        "LAYOUT_tkl_f13_ansi_tsangan": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-
-                {"label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0},
-                {"label": "F2", "matrix": [0, 2], "x": 2.25, "y": 0},
-                {"label": "F3", "matrix": [0, 3], "x": 3.25, "y": 0},
-                {"label": "F4", "matrix": [0, 4], "x": 4.25, "y": 0},
-
-                {"label": "F5", "matrix": [0, 5], "x": 5.5, "y": 0},
-                {"label": "F6", "matrix": [0, 6], "x": 6.5, "y": 0},
-                {"label": "F7", "matrix": [0, 7], "x": 7.5, "y": 0},
-                {"label": "F8", "matrix": [0, 8], "x": 8.5, "y": 0},
-
-                {"label": "F9", "matrix": [0, 9], "x": 9.75, "y": 0},
-                {"label": "F10", "matrix": [0, 10], "x": 10.75, "y": 0},
-                {"label": "F11", "matrix": [0, 11], "x": 11.75, "y": 0},
-                {"label": "F12", "matrix": [0, 12], "x": 12.75, "y": 0},
-
-                {"label": "F13", "matrix": [0, 13], "x": 14, "y": 0},
-
-                {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
-                {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
-                {"label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0},
-
-                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
-                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
-                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
-                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
-                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
-                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
-                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
-                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
-                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
-                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
-                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
-                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
-                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
-                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
-
-                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
-                {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25},
-                {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "y": 1.25},
-
-                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
-                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
-                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
-                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
-                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
-                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
-                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
-                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
-                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
-                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
-                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
-                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
-                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
-                {"label": "\\", "matrix": [3, 13], "x": 13.5, "y": 2.25, "w": 1.5},
-
-                {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
-                {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25},
-                {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2.25},
-
-                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
-                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
-                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
-                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
-                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
-                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
-                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
-                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
-                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
-                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
-                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
-                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
-                {"label": "Enter", "matrix": [3, 12], "x": 12.75, "y": 3.25, "w": 2.25},
-
-                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
-                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
-                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
-                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
-                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
-                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
-                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
-                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
-                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
-                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
-                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
-                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75},
-
-                {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25},
-
-                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
-                {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 5.25},
-                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
-                {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
-                {"label": "Alt", "matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5},
-                {"label": "GUI", "matrix": [5, 12], "x": 12.5, "y": 5.25},
-                {"label": "Ctrl", "matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
-
-                {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
-                {"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25},
-                {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
-            ]
-        },
-        "LAYOUT_tkl_f13_ansi_tsangan_split_bs_rshift": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-
-                {"label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0},
-                {"label": "F2", "matrix": [0, 2], "x": 2.25, "y": 0},
-                {"label": "F3", "matrix": [0, 3], "x": 3.25, "y": 0},
-                {"label": "F4", "matrix": [0, 4], "x": 4.25, "y": 0},
-
-                {"label": "F5", "matrix": [0, 5], "x": 5.5, "y": 0},
-                {"label": "F6", "matrix": [0, 6], "x": 6.5, "y": 0},
-                {"label": "F7", "matrix": [0, 7], "x": 7.5, "y": 0},
-                {"label": "F8", "matrix": [0, 8], "x": 8.5, "y": 0},
-
-                {"label": "F9", "matrix": [0, 9], "x": 9.75, "y": 0},
-                {"label": "F10", "matrix": [0, 10], "x": 10.75, "y": 0},
-                {"label": "F11", "matrix": [0, 11], "x": 11.75, "y": 0},
-                {"label": "F12", "matrix": [0, 12], "x": 12.75, "y": 0},
-
-                {"label": "F13", "matrix": [0, 13], "x": 14, "y": 0},
-
-                {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
-                {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
-                {"label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0},
-
-                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
-                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
-                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
-                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
-                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
-                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
-                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
-                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
-                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
-                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
-                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
-                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
-                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
-                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25},
-                {"label": "Backspace", "matrix": [2, 13], "x": 14, "y": 1.25},
-
-                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
-                {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25},
-                {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "y": 1.25},
-
-                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
-                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
-                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
-                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
-                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
-                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
-                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
-                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
-                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
-                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
-                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
-                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
-                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
-                {"label": "\\", "matrix": [3, 13], "x": 13.5, "y": 2.25, "w": 1.5},
-
-                {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
-                {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25},
-                {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2.25},
-
-                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
-                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
-                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
-                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
-                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
-                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
-                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
-                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
-                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
-                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
-                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
-                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
-                {"label": "Enter", "matrix": [3, 12], "x": 12.75, "y": 3.25, "w": 2.25},
-
-                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
-                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
-                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
-                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
-                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
-                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
-                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
-                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
-                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
-                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
-                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
-                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
-                {"label": "Fn", "matrix": [4, 13], "x": 14, "y": 4.25},
-
-                {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25},
-
-                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
-                {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 5.25},
-                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
-                {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
-                {"label": "Alt", "matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5},
-                {"label": "GUI", "matrix": [5, 12], "x": 12.5, "y": 5.25},
-                {"label": "Ctrl", "matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
-
-                {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
-                {"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25},
-                {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
-            ]
-        },
-        "LAYOUT_tkl_f13_ansi_wkl": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-
-                {"label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0},
-                {"label": "F2", "matrix": [0, 2], "x": 2.25, "y": 0},
-                {"label": "F3", "matrix": [0, 3], "x": 3.25, "y": 0},
-                {"label": "F4", "matrix": [0, 4], "x": 4.25, "y": 0},
-
-                {"label": "F5", "matrix": [0, 5], "x": 5.5, "y": 0},
-                {"label": "F6", "matrix": [0, 6], "x": 6.5, "y": 0},
-                {"label": "F7", "matrix": [0, 7], "x": 7.5, "y": 0},
-                {"label": "F8", "matrix": [0, 8], "x": 8.5, "y": 0},
-
-                {"label": "F9", "matrix": [0, 9], "x": 9.75, "y": 0},
-                {"label": "F10", "matrix": [0, 10], "x": 10.75, "y": 0},
-                {"label": "F11", "matrix": [0, 11], "x": 11.75, "y": 0},
-                {"label": "F12", "matrix": [0, 12], "x": 12.75, "y": 0},
-
-                {"label": "F13", "matrix": [0, 13], "x": 14, "y": 0},
-
-                {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
-                {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
-                {"label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0},
-
-                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
-                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
-                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
-                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
-                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
-                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
-                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
-                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
-                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
-                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
-                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
-                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
-                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
-                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
-
-                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
-                {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25},
-                {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "y": 1.25},
-
-                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
-                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
-                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
-                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
-                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
-                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
-                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
-                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
-                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
-                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
-                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
-                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
-                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
-                {"label": "\\", "matrix": [3, 13], "x": 13.5, "y": 2.25, "w": 1.5},
-
-                {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
-                {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25},
-                {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2.25},
-
-                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
-                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
-                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
-                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
-                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
-                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
-                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
-                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
-                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
-                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
-                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
-                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
-                {"label": "Enter", "matrix": [3, 12], "x": 12.75, "y": 3.25, "w": 2.25},
-
-                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
-                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
-                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
-                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
-                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
-                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
-                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
-                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
-                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
-                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
-                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
-                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75},
-
-                {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25},
-
-                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
-                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
-                {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
-                {"label": "Alt", "matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5},
-                {"label": "Ctrl", "matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
-
-                {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
-                {"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25},
-                {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
-            ]
-        },
-        "LAYOUT_tkl_f13_ansi_wkl_split_bs_rshift": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-
-                {"label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0},
-                {"label": "F2", "matrix": [0, 2], "x": 2.25, "y": 0},
-                {"label": "F3", "matrix": [0, 3], "x": 3.25, "y": 0},
-                {"label": "F4", "matrix": [0, 4], "x": 4.25, "y": 0},
-
-                {"label": "F5", "matrix": [0, 5], "x": 5.5, "y": 0},
-                {"label": "F6", "matrix": [0, 6], "x": 6.5, "y": 0},
-                {"label": "F7", "matrix": [0, 7], "x": 7.5, "y": 0},
-                {"label": "F8", "matrix": [0, 8], "x": 8.5, "y": 0},
-
-                {"label": "F9", "matrix": [0, 9], "x": 9.75, "y": 0},
-                {"label": "F10", "matrix": [0, 10], "x": 10.75, "y": 0},
-                {"label": "F11", "matrix": [0, 11], "x": 11.75, "y": 0},
-                {"label": "F12", "matrix": [0, 12], "x": 12.75, "y": 0},
-
-                {"label": "F13", "matrix": [0, 13], "x": 14, "y": 0},
-
-                {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
-                {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
-                {"label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0},
-
-                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
-                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
-                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
-                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
-                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
-                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
-                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
-                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
-                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
-                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
-                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
-                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
-                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
-                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25},
-                {"label": "Backspace", "matrix": [2, 13], "x": 14, "y": 1.25},
-
-                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
-                {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25},
-                {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "y": 1.25},
-
-                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
-                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
-                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
-                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
-                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
-                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
-                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
-                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
-                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
-                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
-                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
-                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
-                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
-                {"label": "\\", "matrix": [3, 13], "x": 13.5, "y": 2.25, "w": 1.5},
-
-                {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
-                {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25},
-                {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2.25},
-
-                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
-                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
-                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
-                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
-                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
-                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
-                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
-                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
-                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
-                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
-                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
-                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
-                {"label": "Enter", "matrix": [3, 12], "x": 12.75, "y": 3.25, "w": 2.25},
-
-                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
-                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
-                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
-                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
-                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
-                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
-                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
-                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
-                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
-                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
-                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
-                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
-                {"label": "Fn", "matrix": [4, 13], "x": 14, "y": 4.25},
-
-                {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25},
-
-                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
-                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
-                {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
-                {"label": "Alt", "matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5},
-                {"label": "Ctrl", "matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
-
-                {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
-                {"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25},
-                {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
-            ]
-        },
-        "LAYOUT_tkl_f13_ansi_cwkl": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-
-                {"label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0},
-                {"label": "F2", "matrix": [0, 2], "x": 2.25, "y": 0},
-                {"label": "F3", "matrix": [0, 3], "x": 3.25, "y": 0},
-                {"label": "F4", "matrix": [0, 4], "x": 4.25, "y": 0},
-
-                {"label": "F5", "matrix": [0, 5], "x": 5.5, "y": 0},
-                {"label": "F6", "matrix": [0, 6], "x": 6.5, "y": 0},
-                {"label": "F7", "matrix": [0, 7], "x": 7.5, "y": 0},
-                {"label": "F8", "matrix": [0, 8], "x": 8.5, "y": 0},
-
-                {"label": "F9", "matrix": [0, 9], "x": 9.75, "y": 0},
-                {"label": "F10", "matrix": [0, 10], "x": 10.75, "y": 0},
-                {"label": "F11", "matrix": [0, 11], "x": 11.75, "y": 0},
-                {"label": "F12", "matrix": [0, 12], "x": 12.75, "y": 0},
-
-                {"label": "F13", "matrix": [0, 13], "x": 14, "y": 0},
-
-                {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
-                {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
-                {"label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0},
-
-                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
-                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
-                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
-                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
-                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
-                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
-                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
-                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
-                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
-                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
-                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
-                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
-                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
-                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
-
-                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
-                {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25},
-                {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "y": 1.25},
-
-                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
-                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
-                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
-                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
-                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
-                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
-                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
-                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
-                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
-                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
-                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
-                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
-                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
-                {"label": "\\", "matrix": [3, 13], "x": 13.5, "y": 2.25, "w": 1.5},
-
-                {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
-                {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25},
-                {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2.25},
-
-                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
-                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
-                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
-                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
-                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
-                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
-                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
-                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
-                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
-                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
-                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
-                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
-                {"label": "Enter", "matrix": [3, 12], "x": 12.75, "y": 3.25, "w": 2.25},
-
-                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
-                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
-                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
-                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
-                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
-                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
-                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
-                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
-                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
-                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
-                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
-                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75},
-
-                {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25},
-
-                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
-                {"label": "GUI", "matrix": [5, 1], "x": 1.875, "y": 5.25, "w": 1.25},
-                {"label": "Alt", "matrix": [5, 2], "x": 3.125, "y": 5.25, "w": 1.25},
-                {"label": "Space", "matrix": [5, 6], "x": 4.375, "y": 5.25, "w": 6.25},
-                {"label": "Alt", "matrix": [5, 11], "x": 10.625, "y": 5.25, "w": 1.25},
-                {"label": "GUI", "matrix": [5, 12], "x": 11.875, "y": 5.25, "w": 1.25},
-                {"label": "Ctrl", "matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
-
-                {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
-                {"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25},
-                {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
-            ]
-        },
-        "LAYOUT_tkl_f13_ansi_cwkl_split_bs_rshift": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-
-                {"label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0},
-                {"label": "F2", "matrix": [0, 2], "x": 2.25, "y": 0},
-                {"label": "F3", "matrix": [0, 3], "x": 3.25, "y": 0},
-                {"label": "F4", "matrix": [0, 4], "x": 4.25, "y": 0},
-
-                {"label": "F5", "matrix": [0, 5], "x": 5.5, "y": 0},
-                {"label": "F6", "matrix": [0, 6], "x": 6.5, "y": 0},
-                {"label": "F7", "matrix": [0, 7], "x": 7.5, "y": 0},
-                {"label": "F8", "matrix": [0, 8], "x": 8.5, "y": 0},
-
-                {"label": "F9", "matrix": [0, 9], "x": 9.75, "y": 0},
-                {"label": "F10", "matrix": [0, 10], "x": 10.75, "y": 0},
-                {"label": "F11", "matrix": [0, 11], "x": 11.75, "y": 0},
-                {"label": "F12", "matrix": [0, 12], "x": 12.75, "y": 0},
-
-                {"label": "F13", "matrix": [0, 13], "x": 14, "y": 0},
-
-                {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
-                {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
-                {"label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0},
-
-                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
-                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
-                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
-                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
-                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
-                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
-                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
-                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
-                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
-                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
-                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
-                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
-                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
-                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25},
-                {"label": "Backspace", "matrix": [2, 13], "x": 14, "y": 1.25},
-
-                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
-                {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25},
-                {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "y": 1.25},
-
-                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
-                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
-                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
-                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
-                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
-                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
-                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
-                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
-                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
-                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
-                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
-                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
-                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
-                {"label": "\\", "matrix": [3, 13], "x": 13.5, "y": 2.25, "w": 1.5},
-
-                {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
-                {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25},
-                {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2.25},
-
-                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
-                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
-                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
-                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
-                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
-                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
-                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
-                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
-                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
-                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
-                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
-                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
-                {"label": "Enter", "matrix": [3, 12], "x": 12.75, "y": 3.25, "w": 2.25},
-
-                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
-                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
-                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
-                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
-                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
-                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
-                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
-                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
-                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
-                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
-                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
-                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
-                {"label": "Fn", "matrix": [4, 13], "x": 14, "y": 4.25},
-
-                {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25},
-
-                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
-                {"label": "GUI", "matrix": [5, 1], "x": 1.875, "y": 5.25, "w": 1.25},
-                {"label": "Alt", "matrix": [5, 2], "x": 3.125, "y": 5.25, "w": 1.25},
-                {"label": "Space", "matrix": [5, 6], "x": 4.375, "y": 5.25, "w": 6.25},
-                {"label": "Alt", "matrix": [5, 11], "x": 10.625, "y": 5.25, "w": 1.25},
-                {"label": "GUI", "matrix": [5, 12], "x": 11.875, "y": 5.25, "w": 1.25},
-                {"label": "Ctrl", "matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
-
-                {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
-                {"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25},
-                {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
-            ]
-        }
-    }
-}
diff --git a/keyboards/rart/rart80/keyboard.json b/keyboards/rart/rart80/keyboard.json
new file mode 100644
index 00000000000..06fbd1add67
--- /dev/null
+++ b/keyboards/rart/rart80/keyboard.json
@@ -0,0 +1,1427 @@
+{
+    "keyboard_name": "RART80 Hotswap",
+    "manufacturer": "Alabahuy",
+    "url": "",
+    "maintainer": "Alabahuy",
+    "usb": {
+        "vid": "0x414C",
+        "pid": "0x0080",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "command": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgblight": true
+    },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
+    "matrix_pins": {
+        "cols": ["A2", "A3", "A4", "A5", "A6", "A7", "C7", "C6", "C5", "C4", "C2", "C1", "C0", "D7", "B4", "B2", "B1"],
+        "rows": ["B3", "A1", "B0", "C3", "D0", "D1"]
+    },
+    "diode_direction": "COL2ROW",
+    "indicators": {
+        "caps_lock": "D4",
+        "on_state": 0
+    },
+    "ws2812": {
+        "pin": "D5"
+    },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 6,
+        "max_brightness": 240,
+        "sleep": true,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "knight": true,
+            "static_gradient": true,
+            "twinkle": true
+        }
+    },
+    "bootmagic": {
+        "matrix": [0, 1]
+    },
+    "processor": "atmega32a",
+    "bootloader": "usbasploader",
+    "community_layouts": [
+        "tkl_ansi_tsangan",
+        "tkl_ansi_tsangan_split_bs_rshift",
+        "tkl_f13_ansi_tsangan",
+        "tkl_f13_ansi_tsangan_split_bs_rshift"
+    ],
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0},
+                {"label": "F2", "matrix": [0, 2], "x": 2.25, "y": 0},
+                {"label": "F3", "matrix": [0, 3], "x": 3.25, "y": 0},
+                {"label": "F4", "matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"label": "F5", "matrix": [0, 5], "x": 5.5, "y": 0},
+                {"label": "F6", "matrix": [0, 6], "x": 6.5, "y": 0},
+                {"label": "F7", "matrix": [0, 7], "x": 7.5, "y": 0},
+                {"label": "F8", "matrix": [0, 8], "x": 8.5, "y": 0},
+
+                {"label": "F9", "matrix": [0, 9], "x": 9.75, "y": 0},
+                {"label": "F10", "matrix": [0, 10], "x": 10.75, "y": 0},
+                {"label": "F11", "matrix": [0, 11], "x": 11.75, "y": 0},
+                {"label": "F12", "matrix": [0, 12], "x": 12.75, "y": 0},
+
+                {"label": "F13", "matrix": [0, 13], "x": 14, "y": 0},
+
+                {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
+                {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
+                {"label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
+                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
+                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
+                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
+                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
+                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
+                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
+                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
+                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
+                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
+                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
+                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
+                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
+                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25},
+                {"label": "Backspace", "matrix": [2, 13], "x": 14, "y": 1.25},
+
+                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"label": "\\", "matrix": [3, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"label": "Enter", "matrix": [3, 12], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"label": "\\", "matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"label": "Fn", "matrix": [4, 13], "x": 14, "y": 4.25},
+
+                {"label": "\u25bd", "matrix": [4, 14], "x": 15.25, "y": 4.25},
+                {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25},
+                {"label": "\u25bd", "matrix": [4, 16], "x": 17.25, "y": 4.25},
+
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 5.25},
+                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
+                {"label": "Alt", "matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5},
+                {"label": "GUI", "matrix": [5, 12], "x": 12.5, "y": 5.25},
+                {"label": "Ctrl", "matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
+
+                {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_ansi_tsangan": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "F1", "matrix": [0, 1], "x": 2, "y": 0},
+                {"label": "F2", "matrix": [0, 2], "x": 3, "y": 0},
+                {"label": "F3", "matrix": [0, 3], "x": 4, "y": 0},
+                {"label": "F4", "matrix": [0, 4], "x": 5, "y": 0},
+
+                {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 0},
+                {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 0},
+                {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 0},
+                {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 0},
+
+                {"label": "F9", "matrix": [0, 9], "x": 11, "y": 0},
+                {"label": "F10", "matrix": [0, 10], "x": 12, "y": 0},
+                {"label": "F11", "matrix": [0, 11], "x": 13, "y": 0},
+                {"label": "F12", "matrix": [0, 12], "x": 14, "y": 0},
+
+                {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
+                {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
+                {"label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
+                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
+                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
+                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
+                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
+                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
+                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
+                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
+                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
+                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
+                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
+                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
+                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
+                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+
+                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"label": "\\", "matrix": [3, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"label": "Enter", "matrix": [3, 12], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 5.25},
+                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
+                {"label": "Alt", "matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5},
+                {"label": "GUI", "matrix": [5, 12], "x": 12.5, "y": 5.25},
+                {"label": "Ctrl", "matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
+
+                {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_ansi_tsangan_split_bs_rshift": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "F1", "matrix": [0, 1], "x": 2, "y": 0},
+                {"label": "F2", "matrix": [0, 2], "x": 3, "y": 0},
+                {"label": "F3", "matrix": [0, 3], "x": 4, "y": 0},
+                {"label": "F4", "matrix": [0, 4], "x": 5, "y": 0},
+
+                {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 0},
+                {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 0},
+                {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 0},
+                {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 0},
+
+                {"label": "F9", "matrix": [0, 9], "x": 11, "y": 0},
+                {"label": "F10", "matrix": [0, 10], "x": 12, "y": 0},
+                {"label": "F11", "matrix": [0, 11], "x": 13, "y": 0},
+                {"label": "F12", "matrix": [0, 12], "x": 14, "y": 0},
+
+                {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
+                {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
+                {"label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
+                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
+                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
+                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
+                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
+                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
+                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
+                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
+                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
+                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
+                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
+                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
+                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
+                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25},
+                {"label": "Backspace", "matrix": [2, 13], "x": 14, "y": 1.25},
+
+                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"label": "\\", "matrix": [3, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"label": "Enter", "matrix": [3, 12], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"label": "Fn", "matrix": [4, 13], "x": 14, "y": 4.25},
+
+                {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 5.25},
+                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
+                {"label": "Alt", "matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5},
+                {"label": "GUI", "matrix": [5, 12], "x": 12.5, "y": 5.25},
+                {"label": "Ctrl", "matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
+
+                {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_ansi_wkl": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "F1", "matrix": [0, 1], "x": 2, "y": 0},
+                {"label": "F2", "matrix": [0, 2], "x": 3, "y": 0},
+                {"label": "F3", "matrix": [0, 3], "x": 4, "y": 0},
+                {"label": "F4", "matrix": [0, 4], "x": 5, "y": 0},
+
+                {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 0},
+                {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 0},
+                {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 0},
+                {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 0},
+
+                {"label": "F9", "matrix": [0, 9], "x": 11, "y": 0},
+                {"label": "F10", "matrix": [0, 10], "x": 12, "y": 0},
+                {"label": "F11", "matrix": [0, 11], "x": 13, "y": 0},
+                {"label": "F12", "matrix": [0, 12], "x": 14, "y": 0},
+
+                {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
+                {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
+                {"label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
+                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
+                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
+                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
+                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
+                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
+                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
+                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
+                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
+                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
+                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
+                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
+                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
+                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+
+                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"label": "\\", "matrix": [3, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"label": "Enter", "matrix": [3, 12], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
+                {"label": "Alt", "matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5},
+                {"label": "Ctrl", "matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
+
+                {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_ansi_wkl_split_bs_rshift": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "F1", "matrix": [0, 1], "x": 2, "y": 0},
+                {"label": "F2", "matrix": [0, 2], "x": 3, "y": 0},
+                {"label": "F3", "matrix": [0, 3], "x": 4, "y": 0},
+                {"label": "F4", "matrix": [0, 4], "x": 5, "y": 0},
+
+                {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 0},
+                {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 0},
+                {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 0},
+                {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 0},
+
+                {"label": "F9", "matrix": [0, 9], "x": 11, "y": 0},
+                {"label": "F10", "matrix": [0, 10], "x": 12, "y": 0},
+                {"label": "F11", "matrix": [0, 11], "x": 13, "y": 0},
+                {"label": "F12", "matrix": [0, 12], "x": 14, "y": 0},
+
+                {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
+                {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
+                {"label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
+                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
+                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
+                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
+                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
+                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
+                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
+                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
+                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
+                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
+                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
+                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
+                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
+                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25},
+                {"label": "Backspace", "matrix": [2, 13], "x": 14, "y": 1.25},
+
+                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"label": "\\", "matrix": [3, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"label": "Enter", "matrix": [3, 12], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"label": "Fn", "matrix": [4, 13], "x": 14, "y": 4.25},
+
+                {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
+                {"label": "Alt", "matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5},
+                {"label": "Ctrl", "matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
+
+                {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_ansi_cwkl": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "F1", "matrix": [0, 1], "x": 2, "y": 0},
+                {"label": "F2", "matrix": [0, 2], "x": 3, "y": 0},
+                {"label": "F3", "matrix": [0, 3], "x": 4, "y": 0},
+                {"label": "F4", "matrix": [0, 4], "x": 5, "y": 0},
+
+                {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 0},
+                {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 0},
+                {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 0},
+                {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 0},
+
+                {"label": "F9", "matrix": [0, 9], "x": 11, "y": 0},
+                {"label": "F10", "matrix": [0, 10], "x": 12, "y": 0},
+                {"label": "F11", "matrix": [0, 11], "x": 13, "y": 0},
+                {"label": "F12", "matrix": [0, 12], "x": 14, "y": 0},
+
+                {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
+                {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
+                {"label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
+                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
+                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
+                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
+                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
+                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
+                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
+                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
+                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
+                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
+                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
+                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
+                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
+                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+
+                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"label": "\\", "matrix": [3, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"label": "Enter", "matrix": [3, 12], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"label": "GUI", "matrix": [5, 1], "x": 1.875, "y": 5.25, "w": 1.25},
+                {"label": "Alt", "matrix": [5, 2], "x": 3.125, "y": 5.25, "w": 1.25},
+                {"label": "Space", "matrix": [5, 6], "x": 4.375, "y": 5.25, "w": 6.25},
+                {"label": "Alt", "matrix": [5, 11], "x": 10.625, "y": 5.25, "w": 1.25},
+                {"label": "GUI", "matrix": [5, 12], "x": 11.875, "y": 5.25, "w": 1.25},
+                {"label": "Ctrl", "matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_ansi_cwkl_split_bs_rshift": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "F1", "matrix": [0, 1], "x": 2, "y": 0},
+                {"label": "F2", "matrix": [0, 2], "x": 3, "y": 0},
+                {"label": "F3", "matrix": [0, 3], "x": 4, "y": 0},
+                {"label": "F4", "matrix": [0, 4], "x": 5, "y": 0},
+
+                {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 0},
+                {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 0},
+                {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 0},
+                {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 0},
+
+                {"label": "F9", "matrix": [0, 9], "x": 11, "y": 0},
+                {"label": "F10", "matrix": [0, 10], "x": 12, "y": 0},
+                {"label": "F11", "matrix": [0, 11], "x": 13, "y": 0},
+                {"label": "F12", "matrix": [0, 12], "x": 14, "y": 0},
+
+                {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
+                {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
+                {"label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
+                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
+                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
+                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
+                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
+                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
+                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
+                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
+                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
+                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
+                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
+                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
+                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
+                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25},
+                {"label": "Backspace", "matrix": [2, 13], "x": 14, "y": 1.25},
+
+                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"label": "\\", "matrix": [3, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"label": "Enter", "matrix": [3, 12], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"label": "Fn", "matrix": [4, 13], "x": 14, "y": 4.25},
+
+                {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"label": "GUI", "matrix": [5, 1], "x": 1.875, "y": 5.25, "w": 1.25},
+                {"label": "Alt", "matrix": [5, 2], "x": 3.125, "y": 5.25, "w": 1.25},
+                {"label": "Space", "matrix": [5, 6], "x": 4.375, "y": 5.25, "w": 6.25},
+                {"label": "Alt", "matrix": [5, 11], "x": 10.625, "y": 5.25, "w": 1.25},
+                {"label": "GUI", "matrix": [5, 12], "x": 11.875, "y": 5.25, "w": 1.25},
+                {"label": "Ctrl", "matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_f13_ansi_tsangan": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0},
+                {"label": "F2", "matrix": [0, 2], "x": 2.25, "y": 0},
+                {"label": "F3", "matrix": [0, 3], "x": 3.25, "y": 0},
+                {"label": "F4", "matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"label": "F5", "matrix": [0, 5], "x": 5.5, "y": 0},
+                {"label": "F6", "matrix": [0, 6], "x": 6.5, "y": 0},
+                {"label": "F7", "matrix": [0, 7], "x": 7.5, "y": 0},
+                {"label": "F8", "matrix": [0, 8], "x": 8.5, "y": 0},
+
+                {"label": "F9", "matrix": [0, 9], "x": 9.75, "y": 0},
+                {"label": "F10", "matrix": [0, 10], "x": 10.75, "y": 0},
+                {"label": "F11", "matrix": [0, 11], "x": 11.75, "y": 0},
+                {"label": "F12", "matrix": [0, 12], "x": 12.75, "y": 0},
+
+                {"label": "F13", "matrix": [0, 13], "x": 14, "y": 0},
+
+                {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
+                {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
+                {"label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
+                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
+                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
+                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
+                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
+                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
+                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
+                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
+                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
+                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
+                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
+                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
+                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
+                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+
+                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"label": "\\", "matrix": [3, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"label": "Enter", "matrix": [3, 12], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 5.25},
+                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
+                {"label": "Alt", "matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5},
+                {"label": "GUI", "matrix": [5, 12], "x": 12.5, "y": 5.25},
+                {"label": "Ctrl", "matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
+
+                {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_f13_ansi_tsangan_split_bs_rshift": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0},
+                {"label": "F2", "matrix": [0, 2], "x": 2.25, "y": 0},
+                {"label": "F3", "matrix": [0, 3], "x": 3.25, "y": 0},
+                {"label": "F4", "matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"label": "F5", "matrix": [0, 5], "x": 5.5, "y": 0},
+                {"label": "F6", "matrix": [0, 6], "x": 6.5, "y": 0},
+                {"label": "F7", "matrix": [0, 7], "x": 7.5, "y": 0},
+                {"label": "F8", "matrix": [0, 8], "x": 8.5, "y": 0},
+
+                {"label": "F9", "matrix": [0, 9], "x": 9.75, "y": 0},
+                {"label": "F10", "matrix": [0, 10], "x": 10.75, "y": 0},
+                {"label": "F11", "matrix": [0, 11], "x": 11.75, "y": 0},
+                {"label": "F12", "matrix": [0, 12], "x": 12.75, "y": 0},
+
+                {"label": "F13", "matrix": [0, 13], "x": 14, "y": 0},
+
+                {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
+                {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
+                {"label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
+                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
+                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
+                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
+                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
+                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
+                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
+                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
+                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
+                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
+                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
+                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
+                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
+                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25},
+                {"label": "Backspace", "matrix": [2, 13], "x": 14, "y": 1.25},
+
+                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"label": "\\", "matrix": [3, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"label": "Enter", "matrix": [3, 12], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"label": "Fn", "matrix": [4, 13], "x": 14, "y": 4.25},
+
+                {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 5.25},
+                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
+                {"label": "Alt", "matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5},
+                {"label": "GUI", "matrix": [5, 12], "x": 12.5, "y": 5.25},
+                {"label": "Ctrl", "matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
+
+                {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_f13_ansi_wkl": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0},
+                {"label": "F2", "matrix": [0, 2], "x": 2.25, "y": 0},
+                {"label": "F3", "matrix": [0, 3], "x": 3.25, "y": 0},
+                {"label": "F4", "matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"label": "F5", "matrix": [0, 5], "x": 5.5, "y": 0},
+                {"label": "F6", "matrix": [0, 6], "x": 6.5, "y": 0},
+                {"label": "F7", "matrix": [0, 7], "x": 7.5, "y": 0},
+                {"label": "F8", "matrix": [0, 8], "x": 8.5, "y": 0},
+
+                {"label": "F9", "matrix": [0, 9], "x": 9.75, "y": 0},
+                {"label": "F10", "matrix": [0, 10], "x": 10.75, "y": 0},
+                {"label": "F11", "matrix": [0, 11], "x": 11.75, "y": 0},
+                {"label": "F12", "matrix": [0, 12], "x": 12.75, "y": 0},
+
+                {"label": "F13", "matrix": [0, 13], "x": 14, "y": 0},
+
+                {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
+                {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
+                {"label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
+                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
+                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
+                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
+                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
+                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
+                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
+                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
+                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
+                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
+                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
+                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
+                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
+                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+
+                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"label": "\\", "matrix": [3, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"label": "Enter", "matrix": [3, 12], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
+                {"label": "Alt", "matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5},
+                {"label": "Ctrl", "matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
+
+                {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_f13_ansi_wkl_split_bs_rshift": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0},
+                {"label": "F2", "matrix": [0, 2], "x": 2.25, "y": 0},
+                {"label": "F3", "matrix": [0, 3], "x": 3.25, "y": 0},
+                {"label": "F4", "matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"label": "F5", "matrix": [0, 5], "x": 5.5, "y": 0},
+                {"label": "F6", "matrix": [0, 6], "x": 6.5, "y": 0},
+                {"label": "F7", "matrix": [0, 7], "x": 7.5, "y": 0},
+                {"label": "F8", "matrix": [0, 8], "x": 8.5, "y": 0},
+
+                {"label": "F9", "matrix": [0, 9], "x": 9.75, "y": 0},
+                {"label": "F10", "matrix": [0, 10], "x": 10.75, "y": 0},
+                {"label": "F11", "matrix": [0, 11], "x": 11.75, "y": 0},
+                {"label": "F12", "matrix": [0, 12], "x": 12.75, "y": 0},
+
+                {"label": "F13", "matrix": [0, 13], "x": 14, "y": 0},
+
+                {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
+                {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
+                {"label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
+                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
+                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
+                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
+                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
+                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
+                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
+                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
+                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
+                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
+                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
+                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
+                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
+                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25},
+                {"label": "Backspace", "matrix": [2, 13], "x": 14, "y": 1.25},
+
+                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"label": "\\", "matrix": [3, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"label": "Enter", "matrix": [3, 12], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"label": "Fn", "matrix": [4, 13], "x": 14, "y": 4.25},
+
+                {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
+                {"label": "Alt", "matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5},
+                {"label": "Ctrl", "matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
+
+                {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_f13_ansi_cwkl": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0},
+                {"label": "F2", "matrix": [0, 2], "x": 2.25, "y": 0},
+                {"label": "F3", "matrix": [0, 3], "x": 3.25, "y": 0},
+                {"label": "F4", "matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"label": "F5", "matrix": [0, 5], "x": 5.5, "y": 0},
+                {"label": "F6", "matrix": [0, 6], "x": 6.5, "y": 0},
+                {"label": "F7", "matrix": [0, 7], "x": 7.5, "y": 0},
+                {"label": "F8", "matrix": [0, 8], "x": 8.5, "y": 0},
+
+                {"label": "F9", "matrix": [0, 9], "x": 9.75, "y": 0},
+                {"label": "F10", "matrix": [0, 10], "x": 10.75, "y": 0},
+                {"label": "F11", "matrix": [0, 11], "x": 11.75, "y": 0},
+                {"label": "F12", "matrix": [0, 12], "x": 12.75, "y": 0},
+
+                {"label": "F13", "matrix": [0, 13], "x": 14, "y": 0},
+
+                {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
+                {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
+                {"label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
+                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
+                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
+                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
+                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
+                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
+                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
+                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
+                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
+                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
+                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
+                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
+                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
+                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+
+                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"label": "\\", "matrix": [3, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"label": "Enter", "matrix": [3, 12], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"label": "GUI", "matrix": [5, 1], "x": 1.875, "y": 5.25, "w": 1.25},
+                {"label": "Alt", "matrix": [5, 2], "x": 3.125, "y": 5.25, "w": 1.25},
+                {"label": "Space", "matrix": [5, 6], "x": 4.375, "y": 5.25, "w": 6.25},
+                {"label": "Alt", "matrix": [5, 11], "x": 10.625, "y": 5.25, "w": 1.25},
+                {"label": "GUI", "matrix": [5, 12], "x": 11.875, "y": 5.25, "w": 1.25},
+                {"label": "Ctrl", "matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_f13_ansi_cwkl_split_bs_rshift": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0},
+                {"label": "F2", "matrix": [0, 2], "x": 2.25, "y": 0},
+                {"label": "F3", "matrix": [0, 3], "x": 3.25, "y": 0},
+                {"label": "F4", "matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"label": "F5", "matrix": [0, 5], "x": 5.5, "y": 0},
+                {"label": "F6", "matrix": [0, 6], "x": 6.5, "y": 0},
+                {"label": "F7", "matrix": [0, 7], "x": 7.5, "y": 0},
+                {"label": "F8", "matrix": [0, 8], "x": 8.5, "y": 0},
+
+                {"label": "F9", "matrix": [0, 9], "x": 9.75, "y": 0},
+                {"label": "F10", "matrix": [0, 10], "x": 10.75, "y": 0},
+                {"label": "F11", "matrix": [0, 11], "x": 11.75, "y": 0},
+                {"label": "F12", "matrix": [0, 12], "x": 12.75, "y": 0},
+
+                {"label": "F13", "matrix": [0, 13], "x": 14, "y": 0},
+
+                {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
+                {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
+                {"label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
+                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
+                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
+                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
+                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
+                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
+                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
+                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
+                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
+                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
+                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
+                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
+                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
+                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25},
+                {"label": "Backspace", "matrix": [2, 13], "x": 14, "y": 1.25},
+
+                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"label": "\\", "matrix": [3, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"label": "Enter", "matrix": [3, 12], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"label": "Fn", "matrix": [4, 13], "x": 14, "y": 4.25},
+
+                {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"label": "GUI", "matrix": [5, 1], "x": 1.875, "y": 5.25, "w": 1.25},
+                {"label": "Alt", "matrix": [5, 2], "x": 3.125, "y": 5.25, "w": 1.25},
+                {"label": "Space", "matrix": [5, 6], "x": 4.375, "y": 5.25, "w": 6.25},
+                {"label": "Alt", "matrix": [5, 11], "x": 10.625, "y": 5.25, "w": 1.25},
+                {"label": "GUI", "matrix": [5, 12], "x": 11.875, "y": 5.25, "w": 1.25},
+                {"label": "Ctrl", "matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/rart/rart80/rules.mk b/keyboards/rart/rart80/rules.mk
index 044259ad5de..c2ee0bc86f9 100644
--- a/keyboards/rart/rart80/rules.mk
+++ b/keyboards/rart/rart80/rules.mk
@@ -1,15 +1,2 @@
 # Processor frequency
 F_CPU = 16000000
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
diff --git a/keyboards/rart/rartland/info.json b/keyboards/rart/rartland/info.json
deleted file mode 100644
index c1e167d1d81..00000000000
--- a/keyboards/rart/rartland/info.json
+++ /dev/null
@@ -1,261 +0,0 @@
-{
-    "keyboard_name": "RARTLAND",
-    "manufacturer": "Alabahuy",
-    "url": " ",
-    "maintainer": "Alabahuy",
-    "usb": {
-        "vid": "0x414C",
-        "pid": "0x6065",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["B0", "A1", "B1", "A2", "B2", "A3", "B3", "A4", "C7", "C6", "D0", "C5", "D1", "C4"],
-        "rows": ["B4", "A7", "A5", "A6", "C3"]
-    },
-    "diode_direction": "COL2ROW",
-    "encoder": {
-        "rotary": [
-            {"pin_a": "D5", "pin_b": "C2", "resolution": 2}
-        ]
-    },
-    "indicators": {
-        "caps_lock": "A0",
-        "on_state": 0
-    },
-    "processor": "atmega32a",
-    "bootloader": "usbasploader",
-    "community_layouts": ["65_ansi", "65_iso"],
-    "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": [4, 13], "x": 15, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [2, 13], "x": 13.5, "y": 1, "w": 1.5},
-                {"matrix": [4, 12], "x": 15, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-                {"matrix": [4, 11], "x": 15, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
-                {"matrix": [3, 1], "x": 1.25, "y": 3},
-                {"matrix": [3, 2], "x": 2.25, "y": 3},
-                {"matrix": [3, 3], "x": 3.25, "y": 3},
-                {"matrix": [3, 4], "x": 4.25, "y": 3},
-                {"matrix": [3, 5], "x": 5.25, "y": 3},
-                {"matrix": [3, 6], "x": 6.25, "y": 3},
-                {"matrix": [3, 7], "x": 7.25, "y": 3},
-                {"matrix": [3, 8], "x": 8.25, "y": 3},
-                {"matrix": [3, 9], "x": 9.25, "y": 3},
-                {"matrix": [3, 10], "x": 10.25, "y": 3},
-                {"matrix": [3, 11], "x": 11.25, "y": 3},
-                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"matrix": [3, 13], "x": 14, "y": 3},
-                {"matrix": [4, 10], "x": 15, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 6.25},
-                {"matrix": [4, 4], "x": 10, "y": 4},
-                {"matrix": [4, 5], "x": 11, "y": 4},
-                {"matrix": [4, 6], "x": 12, "y": 4},
-                {"matrix": [4, 7], "x": 13, "y": 4},
-                {"matrix": [4, 8], "x": 14, "y": 4},
-                {"matrix": [4, 9], "x": 15, "y": 4}
-            ]
-        },
-        "LAYOUT_65_ansi": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 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": [4, 13], "x": 15, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [2, 13], "x": 13.5, "y": 1, "w": 1.5},
-                {"matrix": [4, 12], "x": 15, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-                {"matrix": [4, 11], "x": 15, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 2], "x": 2.25, "y": 3},
-                {"matrix": [3, 3], "x": 3.25, "y": 3},
-                {"matrix": [3, 4], "x": 4.25, "y": 3},
-                {"matrix": [3, 5], "x": 5.25, "y": 3},
-                {"matrix": [3, 6], "x": 6.25, "y": 3},
-                {"matrix": [3, 7], "x": 7.25, "y": 3},
-                {"matrix": [3, 8], "x": 8.25, "y": 3},
-                {"matrix": [3, 9], "x": 9.25, "y": 3},
-                {"matrix": [3, 10], "x": 10.25, "y": 3},
-                {"matrix": [3, 11], "x": 11.25, "y": 3},
-                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"matrix": [3, 13], "x": 14, "y": 3},
-                {"matrix": [4, 10], "x": 15, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 6.25},
-                {"matrix": [4, 4], "x": 10, "y": 4},
-                {"matrix": [4, 5], "x": 11, "y": 4},
-                {"matrix": [4, 6], "x": 12, "y": 4},
-                {"matrix": [4, 7], "x": 13, "y": 4},
-                {"matrix": [4, 8], "x": 14, "y": 4},
-                {"matrix": [4, 9], "x": 15, "y": 4}
-            ]
-        },
-        "LAYOUT_65_iso": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-                {"matrix": [4, 13], "x": 15, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [4, 12], "x": 15, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 12], "x": 12.75, "y": 2},
-                {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
-                {"matrix": [4, 11], "x": 15, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
-                {"matrix": [3, 1], "x": 1.25, "y": 3},
-                {"matrix": [3, 2], "x": 2.25, "y": 3},
-                {"matrix": [3, 3], "x": 3.25, "y": 3},
-                {"matrix": [3, 4], "x": 4.25, "y": 3},
-                {"matrix": [3, 5], "x": 5.25, "y": 3},
-                {"matrix": [3, 6], "x": 6.25, "y": 3},
-                {"matrix": [3, 7], "x": 7.25, "y": 3},
-                {"matrix": [3, 8], "x": 8.25, "y": 3},
-                {"matrix": [3, 9], "x": 9.25, "y": 3},
-                {"matrix": [3, 10], "x": 10.25, "y": 3},
-                {"matrix": [3, 11], "x": 11.25, "y": 3},
-                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"matrix": [3, 13], "x": 14, "y": 3},
-                {"matrix": [4, 10], "x": 15, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 6.25},
-                {"matrix": [4, 4], "x": 10, "y": 4},
-                {"matrix": [4, 5], "x": 11, "y": 4},
-                {"matrix": [4, 6], "x": 12, "y": 4},
-                {"matrix": [4, 7], "x": 13, "y": 4},
-                {"matrix": [4, 8], "x": 14, "y": 4},
-                {"matrix": [4, 9], "x": 15, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/rart/rartland/keyboard.json b/keyboards/rart/rartland/keyboard.json
new file mode 100644
index 00000000000..ea037b78b60
--- /dev/null
+++ b/keyboards/rart/rartland/keyboard.json
@@ -0,0 +1,270 @@
+{
+    "keyboard_name": "RARTLAND",
+    "manufacturer": "Alabahuy",
+    "url": " ",
+    "maintainer": "Alabahuy",
+    "usb": {
+        "vid": "0x414C",
+        "pid": "0x6065",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "encoder": true,
+        "extrakey": true,
+        "mousekey": false,
+        "nkro": false,
+        "oled": true,
+        "unicode": true
+    },
+    "matrix_pins": {
+        "cols": ["B0", "A1", "B1", "A2", "B2", "A3", "B3", "A4", "C7", "C6", "D0", "C5", "D1", "C4"],
+        "rows": ["B4", "A7", "A5", "A6", "C3"]
+    },
+    "diode_direction": "COL2ROW",
+    "encoder": {
+        "rotary": [
+            {"pin_a": "D5", "pin_b": "C2", "resolution": 2}
+        ]
+    },
+    "indicators": {
+        "caps_lock": "A0",
+        "on_state": 0
+    },
+    "processor": "atmega32a",
+    "bootloader": "usbasploader",
+    "community_layouts": ["65_ansi", "65_iso"],
+    "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": [4, 13], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [2, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [4, 12], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [4, 11], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [4, 10], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 4], "x": 10, "y": 4},
+                {"matrix": [4, 5], "x": 11, "y": 4},
+                {"matrix": [4, 6], "x": 12, "y": 4},
+                {"matrix": [4, 7], "x": 13, "y": 4},
+                {"matrix": [4, 8], "x": 14, "y": 4},
+                {"matrix": [4, 9], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_65_ansi": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 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": [4, 13], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [2, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [4, 12], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [4, 11], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [4, 10], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 4], "x": 10, "y": 4},
+                {"matrix": [4, 5], "x": 11, "y": 4},
+                {"matrix": [4, 6], "x": 12, "y": 4},
+                {"matrix": [4, 7], "x": 13, "y": 4},
+                {"matrix": [4, 8], "x": 14, "y": 4},
+                {"matrix": [4, 9], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_65_iso": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [4, 13], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [4, 12], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [4, 11], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [4, 10], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 4], "x": 10, "y": 4},
+                {"matrix": [4, 5], "x": 11, "y": 4},
+                {"matrix": [4, 6], "x": 12, "y": 4},
+                {"matrix": [4, 7], "x": 13, "y": 4},
+                {"matrix": [4, 8], "x": 14, "y": 4},
+                {"matrix": [4, 9], "x": 15, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/rart/rartland/rules.mk b/keyboards/rart/rartland/rules.mk
index 5e5e0f090d7..c2ee0bc86f9 100644
--- a/keyboards/rart/rartland/rules.mk
+++ b/keyboards/rart/rartland/rules.mk
@@ -1,18 +1,2 @@
 # Processor frequency
 F_CPU = 16000000
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-UNICODE_ENABLE = yes
-OLED_ENABLE = yes
-ENCODER_ENABLE = yes
diff --git a/keyboards/rart/rartlice/keyboard.json b/keyboards/rart/rartlice/keyboard.json
index 4d65deedefd..b22ca30c558 100644
--- a/keyboards/rart/rartlice/keyboard.json
+++ b/keyboards/rart/rartlice/keyboard.json
@@ -49,8 +49,7 @@
         "pin": "B15",
         "driver": "spi"
     },
-    "processor": "STM32F103",
-    "bootloader": "stm32duino",
+    "development_board": "bluepill",
     "layout_aliases": {
         "LAYOUT_all": "LAYOUT"
     },
diff --git a/keyboards/rate/pistachio/rev1/info.json b/keyboards/rate/pistachio/rev1/info.json
deleted file mode 100644
index ca8434fdd7d..00000000000
--- a/keyboards/rate/pistachio/rev1/info.json
+++ /dev/null
@@ -1,140 +0,0 @@
-{
-    "rgblight": {
-        "hue_steps": 10,
-        "led_count": 2,
-        "split_count": [1, 1]
-    },
-    "split": {
-        "enabled": true
-    },
-    "ws2812": {
-        "pin": "D2"
-    },
-    "matrix_pins": {
-        "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6", "D3"],
-        "rows": ["D4", "C6", "D7", "E6", "B4", "B5"]
-    },
-    "diode_direction": "COL2ROW",
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 0], "x": 1.25, "y": 0},
-
-                {"matrix": [0, 1], "x": 2.75, "y": 0},
-                {"matrix": [0, 2], "x": 3.75, "y": 0},
-                {"matrix": [0, 3], "x": 4.75, "y": 0},
-                {"matrix": [0, 4], "x": 5.75, "y": 0},
-
-                {"matrix": [0, 5], "x": 7.25, "y": 0},
-
-                {"matrix": [6, 0], "x": 9.5, "y": 0},
-                {"matrix": [6, 1], "x": 10.5, "y": 0},
-                {"matrix": [6, 2], "x": 11.5, "y": 0},
-                {"matrix": [6, 3], "x": 12.5, "y": 0},
-
-                {"matrix": [6, 4], "x": 14, "y": 0},
-                {"matrix": [6, 5], "x": 15, "y": 0},
-                {"matrix": [6, 6], "x": 16, "y": 0},
-                {"matrix": [6, 7], "x": 17, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1.5},
-
-                {"matrix": [1, 1], "x": 1.25, "y": 1.5},
-                {"matrix": [1, 2], "x": 2.25, "y": 1.5},
-                {"matrix": [1, 3], "x": 3.25, "y": 1.5},
-                {"matrix": [1, 4], "x": 4.25, "y": 1.5},
-                {"matrix": [1, 5], "x": 5.25, "y": 1.5},
-                {"matrix": [1, 6], "x": 6.25, "y": 1.5},
-                {"matrix": [1, 7], "x": 7.25, "y": 1.5},
-
-                {"matrix": [7, 0], "x": 10, "y": 1.5},
-                {"matrix": [7, 1], "x": 11, "y": 1.5},
-                {"matrix": [7, 2], "x": 12, "y": 1.5},
-                {"matrix": [7, 3], "x": 13, "y": 1.5},
-                {"matrix": [7, 4], "x": 14, "y": 1.5},
-                {"matrix": [7, 5], "x": 15, "y": 1.5},
-                {"matrix": [7, 6], "x": 16, "y": 1.5},
-                {"matrix": [7, 7], "x": 17, "y": 1.5},
-
-                {"matrix": [7, 8], "x": 18.25, "y": 1.5},
-
-                {"matrix": [2, 0], "x": 0, "y": 2.5},
-
-                {"matrix": [2, 1], "x": 1.25, "y": 2.5, "w": 1.5},
-                {"matrix": [2, 2], "x": 2.75, "y": 2.5},
-                {"matrix": [2, 3], "x": 3.75, "y": 2.5},
-                {"matrix": [2, 4], "x": 4.75, "y": 2.5},
-                {"matrix": [2, 5], "x": 5.75, "y": 2.5},
-                {"matrix": [2, 6], "x": 6.75, "y": 2.5},
-
-                {"matrix": [8, 0], "x": 9.5, "y": 2.5},
-                {"matrix": [8, 1], "x": 10.5, "y": 2.5},
-                {"matrix": [8, 2], "x": 11.5, "y": 2.5},
-                {"matrix": [8, 3], "x": 12.5, "y": 2.5},
-                {"matrix": [8, 4], "x": 13.5, "y": 2.5},
-                {"matrix": [8, 5], "x": 14.5, "y": 2.5},
-                {"matrix": [8, 6], "x": 15.5, "y": 2.5},
-
-                {"matrix": [8, 8], "x": 18.25, "y": 2.5},
-
-                {"matrix": [3, 0], "x": 0, "y": 3.5},
-
-                {"matrix": [3, 1], "x": 1.25, "y": 3.5, "w": 1.75},
-                {"matrix": [3, 2], "x": 3, "y": 3.5},
-                {"matrix": [3, 3], "x": 4, "y": 3.5},
-                {"matrix": [3, 4], "x": 5, "y": 3.5},
-                {"matrix": [3, 5], "x": 6, "y": 3.5},
-                {"matrix": [3, 6], "x": 7, "y": 3.5},
-
-                {"matrix": [9, 0], "x": 9.75, "y": 3.5},
-                {"matrix": [9, 1], "x": 10.75, "y": 3.5},
-                {"matrix": [9, 2], "x": 11.75, "y": 3.5},
-                {"matrix": [9, 3], "x": 12.75, "y": 3.5},
-                {"matrix": [9, 4], "x": 13.75, "y": 3.5},
-                {"matrix": [9, 5], "x": 14.75, "y": 3.5},
-                {"matrix": [9, 6], "x": 15.75, "y": 3.5},
-                {"matrix": [8, 7], "x": 16.75, "y": 2.5, "w": 1.25, "h": 2},
-
-                {"matrix": [9, 7], "x": 18.25, "y": 3.5},
-
-                {"matrix": [4, 0], "x": 0, "y": 4.5},
-
-                {"matrix": [4, 1], "x": 1.25, "y": 4.5, "w": 2.25},
-                {"matrix": [4, 2], "x": 3.5, "y": 4.5},
-                {"matrix": [4, 3], "x": 4.5, "y": 4.5},
-                {"matrix": [4, 4], "x": 5.5, "y": 4.5},
-                {"matrix": [4, 5], "x": 6.5, "y": 4.5},
-                {"matrix": [4, 6], "x": 7.5, "y": 4.5},
-
-                {"matrix": [10, 0], "x": 10.25, "y": 4.5},
-                {"matrix": [10, 1], "x": 11.25, "y": 4.5},
-                {"matrix": [10, 2], "x": 12.25, "y": 4.5},
-                {"matrix": [10, 3], "x": 13.25, "y": 4.5},
-                {"matrix": [10, 4], "x": 14.25, "y": 4.5},
-                {"matrix": [10, 5], "x": 15.25, "y": 4.5},
-                {"matrix": [10, 6], "x": 16.25, "y": 4.5, "w": 1.75},
-
-                {"matrix": [10, 7], "x": 18.25, "y": 4.5},
-
-                {"matrix": [5, 0], "x": 0, "y": 5.5},
-
-                {"matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25},
-                {"matrix": [5, 2], "x": 2.5, "y": 5.5},
-                {"matrix": [5, 3], "x": 3.5, "y": 5.5, "w": 1.25},
-                {"matrix": [5, 4], "x": 4.75, "y": 5.5},
-                {"matrix": [5, 5], "x": 5.75, "y": 5.5},
-                {"matrix": [5, 6], "x": 6.75, "y": 5.5, "w": 1.25},
-
-                {"matrix": [11, 0], "x": 10.5, "y": 5.5, "w": 1.25},
-                {"matrix": [11, 1], "x": 11.75, "y": 5.5},
-                {"matrix": [11, 2], "x": 12.75, "y": 5.5},
-                {"matrix": [11, 3], "x": 13.75, "y": 5.5},
-                {"matrix": [11, 4], "x": 14.75, "y": 5.5},
-                {"matrix": [11, 5], "x": 15.75, "y": 5.5},
-                {"matrix": [11, 6], "x": 16.75, "y": 5.5, "w": 1.25},
-
-                {"matrix": [11, 7], "x": 18.25, "y": 5.5}
-            ]
-        }
-    }
-}
diff --git a/keyboards/rate/pistachio/rev1/keyboard.json b/keyboards/rate/pistachio/rev1/keyboard.json
new file mode 100644
index 00000000000..2a74e00c0d2
--- /dev/null
+++ b/keyboards/rate/pistachio/rev1/keyboard.json
@@ -0,0 +1,148 @@
+{
+    "features": {
+        "bootmagic": false,
+        "command": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgblight": true
+    },
+    "rgblight": {
+        "hue_steps": 10,
+        "led_count": 2,
+        "split_count": [1, 1]
+    },
+    "split": {
+        "enabled": true
+    },
+    "ws2812": {
+        "pin": "D2"
+    },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6", "D3"],
+        "rows": ["D4", "C6", "D7", "E6", "B4", "B5"]
+    },
+    "diode_direction": "COL2ROW",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 1.25, "y": 0},
+
+                {"matrix": [0, 1], "x": 2.75, "y": 0},
+                {"matrix": [0, 2], "x": 3.75, "y": 0},
+                {"matrix": [0, 3], "x": 4.75, "y": 0},
+                {"matrix": [0, 4], "x": 5.75, "y": 0},
+
+                {"matrix": [0, 5], "x": 7.25, "y": 0},
+
+                {"matrix": [6, 0], "x": 9.5, "y": 0},
+                {"matrix": [6, 1], "x": 10.5, "y": 0},
+                {"matrix": [6, 2], "x": 11.5, "y": 0},
+                {"matrix": [6, 3], "x": 12.5, "y": 0},
+
+                {"matrix": [6, 4], "x": 14, "y": 0},
+                {"matrix": [6, 5], "x": 15, "y": 0},
+                {"matrix": [6, 6], "x": 16, "y": 0},
+                {"matrix": [6, 7], "x": 17, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+
+                {"matrix": [1, 1], "x": 1.25, "y": 1.5},
+                {"matrix": [1, 2], "x": 2.25, "y": 1.5},
+                {"matrix": [1, 3], "x": 3.25, "y": 1.5},
+                {"matrix": [1, 4], "x": 4.25, "y": 1.5},
+                {"matrix": [1, 5], "x": 5.25, "y": 1.5},
+                {"matrix": [1, 6], "x": 6.25, "y": 1.5},
+                {"matrix": [1, 7], "x": 7.25, "y": 1.5},
+
+                {"matrix": [7, 0], "x": 10, "y": 1.5},
+                {"matrix": [7, 1], "x": 11, "y": 1.5},
+                {"matrix": [7, 2], "x": 12, "y": 1.5},
+                {"matrix": [7, 3], "x": 13, "y": 1.5},
+                {"matrix": [7, 4], "x": 14, "y": 1.5},
+                {"matrix": [7, 5], "x": 15, "y": 1.5},
+                {"matrix": [7, 6], "x": 16, "y": 1.5},
+                {"matrix": [7, 7], "x": 17, "y": 1.5},
+
+                {"matrix": [7, 8], "x": 18.25, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.5},
+
+                {"matrix": [2, 1], "x": 1.25, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 2], "x": 2.75, "y": 2.5},
+                {"matrix": [2, 3], "x": 3.75, "y": 2.5},
+                {"matrix": [2, 4], "x": 4.75, "y": 2.5},
+                {"matrix": [2, 5], "x": 5.75, "y": 2.5},
+                {"matrix": [2, 6], "x": 6.75, "y": 2.5},
+
+                {"matrix": [8, 0], "x": 9.5, "y": 2.5},
+                {"matrix": [8, 1], "x": 10.5, "y": 2.5},
+                {"matrix": [8, 2], "x": 11.5, "y": 2.5},
+                {"matrix": [8, 3], "x": 12.5, "y": 2.5},
+                {"matrix": [8, 4], "x": 13.5, "y": 2.5},
+                {"matrix": [8, 5], "x": 14.5, "y": 2.5},
+                {"matrix": [8, 6], "x": 15.5, "y": 2.5},
+
+                {"matrix": [8, 8], "x": 18.25, "y": 2.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.5},
+
+                {"matrix": [3, 1], "x": 1.25, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 2], "x": 3, "y": 3.5},
+                {"matrix": [3, 3], "x": 4, "y": 3.5},
+                {"matrix": [3, 4], "x": 5, "y": 3.5},
+                {"matrix": [3, 5], "x": 6, "y": 3.5},
+                {"matrix": [3, 6], "x": 7, "y": 3.5},
+
+                {"matrix": [9, 0], "x": 9.75, "y": 3.5},
+                {"matrix": [9, 1], "x": 10.75, "y": 3.5},
+                {"matrix": [9, 2], "x": 11.75, "y": 3.5},
+                {"matrix": [9, 3], "x": 12.75, "y": 3.5},
+                {"matrix": [9, 4], "x": 13.75, "y": 3.5},
+                {"matrix": [9, 5], "x": 14.75, "y": 3.5},
+                {"matrix": [9, 6], "x": 15.75, "y": 3.5},
+                {"matrix": [8, 7], "x": 16.75, "y": 2.5, "w": 1.25, "h": 2},
+
+                {"matrix": [9, 7], "x": 18.25, "y": 3.5},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.5},
+
+                {"matrix": [4, 1], "x": 1.25, "y": 4.5, "w": 2.25},
+                {"matrix": [4, 2], "x": 3.5, "y": 4.5},
+                {"matrix": [4, 3], "x": 4.5, "y": 4.5},
+                {"matrix": [4, 4], "x": 5.5, "y": 4.5},
+                {"matrix": [4, 5], "x": 6.5, "y": 4.5},
+                {"matrix": [4, 6], "x": 7.5, "y": 4.5},
+
+                {"matrix": [10, 0], "x": 10.25, "y": 4.5},
+                {"matrix": [10, 1], "x": 11.25, "y": 4.5},
+                {"matrix": [10, 2], "x": 12.25, "y": 4.5},
+                {"matrix": [10, 3], "x": 13.25, "y": 4.5},
+                {"matrix": [10, 4], "x": 14.25, "y": 4.5},
+                {"matrix": [10, 5], "x": 15.25, "y": 4.5},
+                {"matrix": [10, 6], "x": 16.25, "y": 4.5, "w": 1.75},
+
+                {"matrix": [10, 7], "x": 18.25, "y": 4.5},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.5},
+
+                {"matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.5},
+                {"matrix": [5, 3], "x": 3.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 4], "x": 4.75, "y": 5.5},
+                {"matrix": [5, 5], "x": 5.75, "y": 5.5},
+                {"matrix": [5, 6], "x": 6.75, "y": 5.5, "w": 1.25},
+
+                {"matrix": [11, 0], "x": 10.5, "y": 5.5, "w": 1.25},
+                {"matrix": [11, 1], "x": 11.75, "y": 5.5},
+                {"matrix": [11, 2], "x": 12.75, "y": 5.5},
+                {"matrix": [11, 3], "x": 13.75, "y": 5.5},
+                {"matrix": [11, 4], "x": 14.75, "y": 5.5},
+                {"matrix": [11, 5], "x": 15.75, "y": 5.5},
+                {"matrix": [11, 6], "x": 16.75, "y": 5.5, "w": 1.25},
+
+                {"matrix": [11, 7], "x": 18.25, "y": 5.5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/rate/pistachio/rev1/rules.mk b/keyboards/rate/pistachio/rev1/rules.mk
deleted file mode 100644
index 09f976d0e64..00000000000
--- a/keyboards/rate/pistachio/rev1/rules.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
diff --git a/keyboards/rate/pistachio/rev2/info.json b/keyboards/rate/pistachio/rev2/info.json
deleted file mode 100644
index 0bca53aca36..00000000000
--- a/keyboards/rate/pistachio/rev2/info.json
+++ /dev/null
@@ -1,141 +0,0 @@
-{
-    "ws2812": {
-        "pin": "D2"
-    },
-    "rgblight": {
-        "hue_steps": 10,
-        "led_count": 84,
-        "max_brightness": 195,
-        "split_count": [38, 46]
-    },
-    "split": {
-        "enabled": true
-    },
-    "matrix_pins": {
-        "cols": ["B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4", "D3"],
-        "rows": ["B5", "B4", "E6", "D7", "C6", "D4"]
-    },
-    "diode_direction": "COL2ROW",
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 0], "x": 1.25, "y": 0},
-
-                {"matrix": [0, 1], "x": 2.75, "y": 0},
-                {"matrix": [0, 2], "x": 3.75, "y": 0},
-                {"matrix": [0, 3], "x": 4.75, "y": 0},
-                {"matrix": [0, 4], "x": 5.75, "y": 0},
-
-                {"matrix": [0, 5], "x": 7.25, "y": 0},
-
-                {"matrix": [6, 0], "x": 9.5, "y": 0},
-                {"matrix": [6, 1], "x": 10.5, "y": 0},
-                {"matrix": [6, 2], "x": 11.5, "y": 0},
-                {"matrix": [6, 3], "x": 12.5, "y": 0},
-
-                {"matrix": [6, 4], "x": 14, "y": 0},
-                {"matrix": [6, 5], "x": 15, "y": 0},
-                {"matrix": [6, 6], "x": 16, "y": 0},
-                {"matrix": [6, 7], "x": 17, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1.5},
-
-                {"matrix": [1, 1], "x": 1.25, "y": 1.5},
-                {"matrix": [1, 2], "x": 2.25, "y": 1.5},
-                {"matrix": [1, 3], "x": 3.25, "y": 1.5},
-                {"matrix": [1, 4], "x": 4.25, "y": 1.5},
-                {"matrix": [1, 5], "x": 5.25, "y": 1.5},
-                {"matrix": [1, 6], "x": 6.25, "y": 1.5},
-                {"matrix": [1, 7], "x": 7.25, "y": 1.5},
-
-                {"matrix": [7, 0], "x": 10, "y": 1.5},
-                {"matrix": [7, 1], "x": 11, "y": 1.5},
-                {"matrix": [7, 2], "x": 12, "y": 1.5},
-                {"matrix": [7, 3], "x": 13, "y": 1.5},
-                {"matrix": [7, 4], "x": 14, "y": 1.5},
-                {"matrix": [7, 5], "x": 15, "y": 1.5},
-                {"matrix": [7, 6], "x": 16, "y": 1.5},
-                {"matrix": [7, 7], "x": 17, "y": 1.5},
-
-                {"matrix": [7, 8], "x": 18.25, "y": 1.5},
-
-                {"matrix": [2, 0], "x": 0, "y": 2.5},
-
-                {"matrix": [2, 1], "x": 1.25, "y": 2.5, "w": 1.5},
-                {"matrix": [2, 2], "x": 2.75, "y": 2.5},
-                {"matrix": [2, 3], "x": 3.75, "y": 2.5},
-                {"matrix": [2, 4], "x": 4.75, "y": 2.5},
-                {"matrix": [2, 5], "x": 5.75, "y": 2.5},
-                {"matrix": [2, 6], "x": 6.75, "y": 2.5},
-
-                {"matrix": [8, 0], "x": 9.5, "y": 2.5},
-                {"matrix": [8, 1], "x": 10.5, "y": 2.5},
-                {"matrix": [8, 2], "x": 11.5, "y": 2.5},
-                {"matrix": [8, 3], "x": 12.5, "y": 2.5},
-                {"matrix": [8, 4], "x": 13.5, "y": 2.5},
-                {"matrix": [8, 5], "x": 14.5, "y": 2.5},
-                {"matrix": [8, 6], "x": 15.5, "y": 2.5},
-
-                {"matrix": [8, 7], "x": 18.25, "y": 2.5},
-
-                {"matrix": [3, 0], "x": 0, "y": 3.5},
-
-                {"matrix": [3, 1], "x": 1.25, "y": 3.5, "w": 1.75},
-                {"matrix": [3, 2], "x": 3, "y": 3.5},
-                {"matrix": [3, 3], "x": 4, "y": 3.5},
-                {"matrix": [3, 4], "x": 5, "y": 3.5},
-                {"matrix": [3, 5], "x": 6, "y": 3.5},
-                {"matrix": [3, 6], "x": 7, "y": 3.5},
-
-                {"matrix": [9, 0], "x": 9.75, "y": 3.5},
-                {"matrix": [9, 1], "x": 10.75, "y": 3.5},
-                {"matrix": [9, 2], "x": 11.75, "y": 3.5},
-                {"matrix": [9, 3], "x": 12.75, "y": 3.5},
-                {"matrix": [9, 4], "x": 13.75, "y": 3.5},
-                {"matrix": [9, 5], "x": 14.75, "y": 3.5},
-                {"matrix": [9, 6], "x": 15.75, "y": 3.5},
-                {"matrix": [9, 7], "x": 16.75, "y": 2.5, "w": 1.25, "h": 2},
-
-                {"matrix": [9, 8], "x": 18.25, "y": 3.5},
-
-                {"matrix": [4, 0], "x": 0, "y": 4.5},
-
-                {"matrix": [4, 1], "x": 1.25, "y": 4.5, "w": 2.25},
-                {"matrix": [4, 2], "x": 3.5, "y": 4.5},
-                {"matrix": [4, 3], "x": 4.5, "y": 4.5},
-                {"matrix": [4, 4], "x": 5.5, "y": 4.5},
-                {"matrix": [4, 5], "x": 6.5, "y": 4.5},
-                {"matrix": [4, 6], "x": 7.5, "y": 4.5},
-
-                {"matrix": [10, 0], "x": 10.25, "y": 4.5},
-                {"matrix": [10, 1], "x": 11.25, "y": 4.5},
-                {"matrix": [10, 2], "x": 12.25, "y": 4.5},
-                {"matrix": [10, 3], "x": 13.25, "y": 4.5},
-                {"matrix": [10, 4], "x": 14.25, "y": 4.5},
-                {"matrix": [10, 5], "x": 15.25, "y": 4.5},
-                {"matrix": [10, 6], "x": 16.25, "y": 4.5, "w": 1.75},
-
-                {"matrix": [10, 7], "x": 18.25, "y": 4.5},
-
-                {"matrix": [5, 0], "x": 0, "y": 5.5},
-
-                {"matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25},
-                {"matrix": [5, 2], "x": 2.5, "y": 5.5},
-                {"matrix": [5, 3], "x": 3.5, "y": 5.5, "w": 1.25},
-                {"matrix": [5, 4], "x": 4.75, "y": 5.5},
-                {"matrix": [5, 5], "x": 5.75, "y": 5.5},
-                {"matrix": [5, 6], "x": 6.75, "y": 5.5, "w": 1.25},
-
-                {"matrix": [11, 0], "x": 10.5, "y": 5.5, "w": 1.25},
-                {"matrix": [11, 1], "x": 11.75, "y": 5.5},
-                {"matrix": [11, 2], "x": 12.75, "y": 5.5},
-                {"matrix": [11, 3], "x": 13.75, "y": 5.5},
-                {"matrix": [11, 4], "x": 14.75, "y": 5.5},
-                {"matrix": [11, 5], "x": 15.75, "y": 5.5},
-                {"matrix": [11, 6], "x": 16.75, "y": 5.5, "w": 1.25},
-
-                {"matrix": [11, 7], "x": 18.25, "y": 5.5}
-            ]
-        }
-    }
-}
diff --git a/keyboards/rate/pistachio/rev2/keyboard.json b/keyboards/rate/pistachio/rev2/keyboard.json
new file mode 100644
index 00000000000..72ad90478e5
--- /dev/null
+++ b/keyboards/rate/pistachio/rev2/keyboard.json
@@ -0,0 +1,149 @@
+{
+    "features": {
+        "bootmagic": false,
+        "command": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgblight": true
+    },
+    "ws2812": {
+        "pin": "D2"
+    },
+    "rgblight": {
+        "hue_steps": 10,
+        "led_count": 84,
+        "max_brightness": 195,
+        "split_count": [38, 46]
+    },
+    "split": {
+        "enabled": true
+    },
+    "matrix_pins": {
+        "cols": ["B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4", "D3"],
+        "rows": ["B5", "B4", "E6", "D7", "C6", "D4"]
+    },
+    "diode_direction": "COL2ROW",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 1.25, "y": 0},
+
+                {"matrix": [0, 1], "x": 2.75, "y": 0},
+                {"matrix": [0, 2], "x": 3.75, "y": 0},
+                {"matrix": [0, 3], "x": 4.75, "y": 0},
+                {"matrix": [0, 4], "x": 5.75, "y": 0},
+
+                {"matrix": [0, 5], "x": 7.25, "y": 0},
+
+                {"matrix": [6, 0], "x": 9.5, "y": 0},
+                {"matrix": [6, 1], "x": 10.5, "y": 0},
+                {"matrix": [6, 2], "x": 11.5, "y": 0},
+                {"matrix": [6, 3], "x": 12.5, "y": 0},
+
+                {"matrix": [6, 4], "x": 14, "y": 0},
+                {"matrix": [6, 5], "x": 15, "y": 0},
+                {"matrix": [6, 6], "x": 16, "y": 0},
+                {"matrix": [6, 7], "x": 17, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+
+                {"matrix": [1, 1], "x": 1.25, "y": 1.5},
+                {"matrix": [1, 2], "x": 2.25, "y": 1.5},
+                {"matrix": [1, 3], "x": 3.25, "y": 1.5},
+                {"matrix": [1, 4], "x": 4.25, "y": 1.5},
+                {"matrix": [1, 5], "x": 5.25, "y": 1.5},
+                {"matrix": [1, 6], "x": 6.25, "y": 1.5},
+                {"matrix": [1, 7], "x": 7.25, "y": 1.5},
+
+                {"matrix": [7, 0], "x": 10, "y": 1.5},
+                {"matrix": [7, 1], "x": 11, "y": 1.5},
+                {"matrix": [7, 2], "x": 12, "y": 1.5},
+                {"matrix": [7, 3], "x": 13, "y": 1.5},
+                {"matrix": [7, 4], "x": 14, "y": 1.5},
+                {"matrix": [7, 5], "x": 15, "y": 1.5},
+                {"matrix": [7, 6], "x": 16, "y": 1.5},
+                {"matrix": [7, 7], "x": 17, "y": 1.5},
+
+                {"matrix": [7, 8], "x": 18.25, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.5},
+
+                {"matrix": [2, 1], "x": 1.25, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 2], "x": 2.75, "y": 2.5},
+                {"matrix": [2, 3], "x": 3.75, "y": 2.5},
+                {"matrix": [2, 4], "x": 4.75, "y": 2.5},
+                {"matrix": [2, 5], "x": 5.75, "y": 2.5},
+                {"matrix": [2, 6], "x": 6.75, "y": 2.5},
+
+                {"matrix": [8, 0], "x": 9.5, "y": 2.5},
+                {"matrix": [8, 1], "x": 10.5, "y": 2.5},
+                {"matrix": [8, 2], "x": 11.5, "y": 2.5},
+                {"matrix": [8, 3], "x": 12.5, "y": 2.5},
+                {"matrix": [8, 4], "x": 13.5, "y": 2.5},
+                {"matrix": [8, 5], "x": 14.5, "y": 2.5},
+                {"matrix": [8, 6], "x": 15.5, "y": 2.5},
+
+                {"matrix": [8, 7], "x": 18.25, "y": 2.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.5},
+
+                {"matrix": [3, 1], "x": 1.25, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 2], "x": 3, "y": 3.5},
+                {"matrix": [3, 3], "x": 4, "y": 3.5},
+                {"matrix": [3, 4], "x": 5, "y": 3.5},
+                {"matrix": [3, 5], "x": 6, "y": 3.5},
+                {"matrix": [3, 6], "x": 7, "y": 3.5},
+
+                {"matrix": [9, 0], "x": 9.75, "y": 3.5},
+                {"matrix": [9, 1], "x": 10.75, "y": 3.5},
+                {"matrix": [9, 2], "x": 11.75, "y": 3.5},
+                {"matrix": [9, 3], "x": 12.75, "y": 3.5},
+                {"matrix": [9, 4], "x": 13.75, "y": 3.5},
+                {"matrix": [9, 5], "x": 14.75, "y": 3.5},
+                {"matrix": [9, 6], "x": 15.75, "y": 3.5},
+                {"matrix": [9, 7], "x": 16.75, "y": 2.5, "w": 1.25, "h": 2},
+
+                {"matrix": [9, 8], "x": 18.25, "y": 3.5},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.5},
+
+                {"matrix": [4, 1], "x": 1.25, "y": 4.5, "w": 2.25},
+                {"matrix": [4, 2], "x": 3.5, "y": 4.5},
+                {"matrix": [4, 3], "x": 4.5, "y": 4.5},
+                {"matrix": [4, 4], "x": 5.5, "y": 4.5},
+                {"matrix": [4, 5], "x": 6.5, "y": 4.5},
+                {"matrix": [4, 6], "x": 7.5, "y": 4.5},
+
+                {"matrix": [10, 0], "x": 10.25, "y": 4.5},
+                {"matrix": [10, 1], "x": 11.25, "y": 4.5},
+                {"matrix": [10, 2], "x": 12.25, "y": 4.5},
+                {"matrix": [10, 3], "x": 13.25, "y": 4.5},
+                {"matrix": [10, 4], "x": 14.25, "y": 4.5},
+                {"matrix": [10, 5], "x": 15.25, "y": 4.5},
+                {"matrix": [10, 6], "x": 16.25, "y": 4.5, "w": 1.75},
+
+                {"matrix": [10, 7], "x": 18.25, "y": 4.5},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.5},
+
+                {"matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.5},
+                {"matrix": [5, 3], "x": 3.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 4], "x": 4.75, "y": 5.5},
+                {"matrix": [5, 5], "x": 5.75, "y": 5.5},
+                {"matrix": [5, 6], "x": 6.75, "y": 5.5, "w": 1.25},
+
+                {"matrix": [11, 0], "x": 10.5, "y": 5.5, "w": 1.25},
+                {"matrix": [11, 1], "x": 11.75, "y": 5.5},
+                {"matrix": [11, 2], "x": 12.75, "y": 5.5},
+                {"matrix": [11, 3], "x": 13.75, "y": 5.5},
+                {"matrix": [11, 4], "x": 14.75, "y": 5.5},
+                {"matrix": [11, 5], "x": 15.75, "y": 5.5},
+                {"matrix": [11, 6], "x": 16.75, "y": 5.5, "w": 1.25},
+
+                {"matrix": [11, 7], "x": 18.25, "y": 5.5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/rate/pistachio/rev2/rules.mk b/keyboards/rate/pistachio/rev2/rules.mk
deleted file mode 100644
index 09f976d0e64..00000000000
--- a/keyboards/rate/pistachio/rev2/rules.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
diff --git a/keyboards/rate/pistachio_pro/info.json b/keyboards/rate/pistachio_pro/info.json
deleted file mode 100644
index cf0218b050f..00000000000
--- a/keyboards/rate/pistachio_pro/info.json
+++ /dev/null
@@ -1,127 +0,0 @@
-{
-    "keyboard_name": "PistachioPro",
-    "manufacturer": "rate",
-    "url": "https://rates.booth.pm/items/2925303",
-    "maintainer": "rate",
-    "usb": {
-        "vid": "0x5255",
-        "pid": "0xF40C",
-        "device_version": "0.0.1"
-    },
-    "encoder": {
-        "rotary": [
-            {"pin_a": "D2", "pin_b": "D3"}
-        ]
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "layouts": {
-        "LAYOUT": {
-            "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, 13], "x": 17.25, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1.5},
-                {"matrix": [1, 1], "x": 1, "y": 1.5},
-                {"matrix": [1, 2], "x": 2, "y": 1.5},
-                {"matrix": [1, 3], "x": 3, "y": 1.5},
-                {"matrix": [1, 4], "x": 4, "y": 1.5},
-                {"matrix": [1, 5], "x": 5, "y": 1.5},
-                {"matrix": [1, 6], "x": 6, "y": 1.5},
-                {"matrix": [1, 7], "x": 7, "y": 1.5},
-                {"matrix": [1, 8], "x": 8, "y": 1.5},
-                {"matrix": [1, 9], "x": 9, "y": 1.5},
-                {"matrix": [1, 10], "x": 10, "y": 1.5},
-                {"matrix": [1, 11], "x": 11, "y": 1.5},
-                {"matrix": [1, 12], "x": 12, "y": 1.5},
-                {"matrix": [1, 13], "x": 13, "y": 1.5},
-                {"matrix": [1, 14], "x": 14, "y": 1.5},
-
-                {"matrix": [1, 15], "x": 15.25, "y": 1.5},
-                {"matrix": [1, 16], "x": 16.25, "y": 1.5},
-                {"matrix": [1, 17], "x": 17.25, "y": 1.5},
-
-                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
-                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
-                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
-                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
-                {"matrix": [2, 4], "x": 4.5, "y": 2.5},
-                {"matrix": [2, 5], "x": 5.5, "y": 2.5},
-                {"matrix": [2, 6], "x": 6.5, "y": 2.5},
-                {"matrix": [2, 7], "x": 7.5, "y": 2.5},
-                {"matrix": [2, 8], "x": 8.5, "y": 2.5},
-                {"matrix": [2, 9], "x": 9.5, "y": 2.5},
-                {"matrix": [2, 10], "x": 10.5, "y": 2.5},
-                {"matrix": [2, 11], "x": 11.5, "y": 2.5},
-                {"matrix": [2, 12], "x": 12.5, "y": 2.5},
-
-                {"matrix": [2, 13], "x": 15.25, "y": 2.5},
-                {"matrix": [2, 14], "x": 16.25, "y": 2.5},
-                {"matrix": [2, 15], "x": 17.25, "y": 2.5},
-
-                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
-                {"matrix": [3, 1], "x": 1.75, "y": 3.5},
-                {"matrix": [3, 2], "x": 2.75, "y": 3.5},
-                {"matrix": [3, 3], "x": 3.75, "y": 3.5},
-                {"matrix": [3, 4], "x": 4.75, "y": 3.5},
-                {"matrix": [3, 5], "x": 5.75, "y": 3.5},
-                {"matrix": [3, 6], "x": 6.75, "y": 3.5},
-                {"matrix": [3, 7], "x": 7.75, "y": 3.5},
-                {"matrix": [3, 8], "x": 8.75, "y": 3.5},
-                {"matrix": [3, 9], "x": 9.75, "y": 3.5},
-                {"matrix": [3, 10], "x": 10.75, "y": 3.5},
-                {"matrix": [3, 11], "x": 11.75, "y": 3.5},
-                {"matrix": [3, 12], "x": 12.75, "y": 3.5},
-                {"matrix": [3, 13], "x": 13.75, "y": 2.5, "w": 1.25, "h": 2},
-
-                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
-                {"matrix": [4, 1], "x": 2.25, "y": 4.5},
-                {"matrix": [4, 2], "x": 3.25, "y": 4.5},
-                {"matrix": [4, 3], "x": 4.25, "y": 4.5},
-                {"matrix": [4, 4], "x": 5.25, "y": 4.5},
-                {"matrix": [4, 5], "x": 6.25, "y": 4.5},
-                {"matrix": [4, 6], "x": 7.25, "y": 4.5},
-                {"matrix": [4, 7], "x": 8.25, "y": 4.5},
-                {"matrix": [4, 8], "x": 9.25, "y": 4.5},
-                {"matrix": [4, 9], "x": 10.25, "y": 4.5},
-                {"matrix": [4, 10], "x": 11.25, "y": 4.5},
-                {"matrix": [4, 11], "x": 12.25, "y": 4.5},
-                {"matrix": [4, 12], "x": 13.25, "y": 4.5, "w": 1.75},
-
-                {"matrix": [4, 13], "x": 16.25, "y": 4.5},
-
-                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25},
-                {"matrix": [5, 1], "x": 1.25, "y": 5.5},
-                {"matrix": [5, 2], "x": 2.25, "y": 5.5, "w": 1.25},
-                {"matrix": [5, 3], "x": 3.5, "y": 5.5},
-                {"matrix": [5, 4], "x": 4.5, "y": 5.5, "w": 2.25},
-                {"matrix": [5, 5], "x": 6.75, "y": 5.5, "w": 2.25},
-                {"matrix": [5, 6], "x": 9, "y": 5.5, "w": 1.25},
-                {"matrix": [5, 7], "x": 10.25, "y": 5.5, "w": 1.25},
-                {"matrix": [5, 8], "x": 11.5, "y": 5.5, "w": 1.25},
-                {"matrix": [5, 9], "x": 12.75, "y": 5.5},
-                {"matrix": [5, 10], "x": 13.75, "y": 5.5, "w": 1.25},
-
-                {"matrix": [5, 11], "x": 15.25, "y": 5.5},
-                {"matrix": [5, 12], "x": 16.25, "y": 5.5},
-                {"matrix": [5, 13], "x": 17.25, "y": 5.5}
-            ]
-        }
-    }
-}
diff --git a/keyboards/rate/pistachio_pro/keyboard.json b/keyboards/rate/pistachio_pro/keyboard.json
new file mode 100644
index 00000000000..4dc439c4721
--- /dev/null
+++ b/keyboards/rate/pistachio_pro/keyboard.json
@@ -0,0 +1,135 @@
+{
+    "keyboard_name": "PistachioPro",
+    "manufacturer": "rate",
+    "url": "https://rates.booth.pm/items/2925303",
+    "maintainer": "rate",
+    "usb": {
+        "vid": "0x5255",
+        "pid": "0xF40C",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": false,
+        "encoder": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": false,
+        "oled": true
+    },
+    "encoder": {
+        "rotary": [
+            {"pin_a": "D2", "pin_b": "D3"}
+        ]
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "layouts": {
+        "LAYOUT": {
+            "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, 13], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1.5},
+                {"matrix": [1, 4], "x": 4, "y": 1.5},
+                {"matrix": [1, 5], "x": 5, "y": 1.5},
+                {"matrix": [1, 6], "x": 6, "y": 1.5},
+                {"matrix": [1, 7], "x": 7, "y": 1.5},
+                {"matrix": [1, 8], "x": 8, "y": 1.5},
+                {"matrix": [1, 9], "x": 9, "y": 1.5},
+                {"matrix": [1, 10], "x": 10, "y": 1.5},
+                {"matrix": [1, 11], "x": 11, "y": 1.5},
+                {"matrix": [1, 12], "x": 12, "y": 1.5},
+                {"matrix": [1, 13], "x": 13, "y": 1.5},
+                {"matrix": [1, 14], "x": 14, "y": 1.5},
+
+                {"matrix": [1, 15], "x": 15.25, "y": 1.5},
+                {"matrix": [1, 16], "x": 16.25, "y": 1.5},
+                {"matrix": [1, 17], "x": 17.25, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.5},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.5},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.5},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+
+                {"matrix": [2, 13], "x": 15.25, "y": 2.5},
+                {"matrix": [2, 14], "x": 16.25, "y": 2.5},
+                {"matrix": [2, 15], "x": 17.25, "y": 2.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.5},
+                {"matrix": [3, 12], "x": 12.75, "y": 3.5},
+                {"matrix": [3, 13], "x": 13.75, "y": 2.5, "w": 1.25, "h": 2},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
+                {"matrix": [4, 1], "x": 2.25, "y": 4.5},
+                {"matrix": [4, 2], "x": 3.25, "y": 4.5},
+                {"matrix": [4, 3], "x": 4.25, "y": 4.5},
+                {"matrix": [4, 4], "x": 5.25, "y": 4.5},
+                {"matrix": [4, 5], "x": 6.25, "y": 4.5},
+                {"matrix": [4, 6], "x": 7.25, "y": 4.5},
+                {"matrix": [4, 7], "x": 8.25, "y": 4.5},
+                {"matrix": [4, 8], "x": 9.25, "y": 4.5},
+                {"matrix": [4, 9], "x": 10.25, "y": 4.5},
+                {"matrix": [4, 10], "x": 11.25, "y": 4.5},
+                {"matrix": [4, 11], "x": 12.25, "y": 4.5},
+                {"matrix": [4, 12], "x": 13.25, "y": 4.5, "w": 1.75},
+
+                {"matrix": [4, 13], "x": 16.25, "y": 4.5},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.5},
+                {"matrix": [5, 2], "x": 2.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 3], "x": 3.5, "y": 5.5},
+                {"matrix": [5, 4], "x": 4.5, "y": 5.5, "w": 2.25},
+                {"matrix": [5, 5], "x": 6.75, "y": 5.5, "w": 2.25},
+                {"matrix": [5, 6], "x": 9, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 7], "x": 10.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 8], "x": 11.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 9], "x": 12.75, "y": 5.5},
+                {"matrix": [5, 10], "x": 13.75, "y": 5.5, "w": 1.25},
+
+                {"matrix": [5, 11], "x": 15.25, "y": 5.5},
+                {"matrix": [5, 12], "x": 16.25, "y": 5.5},
+                {"matrix": [5, 13], "x": 17.25, "y": 5.5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/rate/pistachio_pro/rules.mk b/keyboards/rate/pistachio_pro/rules.mk
index 7d8b50ef3fd..73e734bd968 100644
--- a/keyboards/rate/pistachio_pro/rules.mk
+++ b/keyboards/rate/pistachio_pro/rules.mk
@@ -1,18 +1,3 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-OLED_ENABLE = yes
-ENCODER_ENABLE = yes
-
 CUSTOM_MATRIX = lite
 SRC += matrix.c
 SRC += ./lib/bme280.c
diff --git a/keyboards/rationalist/ratio60_hotswap/rev_a/info.json b/keyboards/rationalist/ratio60_hotswap/rev_a/keyboard.json
similarity index 100%
rename from keyboards/rationalist/ratio60_hotswap/rev_a/info.json
rename to keyboards/rationalist/ratio60_hotswap/rev_a/keyboard.json
diff --git a/keyboards/recompile_keys/choco60/rev1/info.json b/keyboards/recompile_keys/choco60/rev1/info.json
deleted file mode 100644
index 2a4dd3f7f3d..00000000000
--- a/keyboards/recompile_keys/choco60/rev1/info.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-    "matrix_pins": {
-        "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6", "D1"],
-        "rows": ["C6", "D7", "E6", "B4", "B5"]
-    },
-    "diode_direction": "COL2ROW",
-    "split": {
-        "enabled": true,
-        "soft_serial_pin": "D3"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "caterina"
-}
diff --git a/keyboards/recompile_keys/choco60/rev1/keyboard.json b/keyboards/recompile_keys/choco60/rev1/keyboard.json
new file mode 100644
index 00000000000..916c3de8d03
--- /dev/null
+++ b/keyboards/recompile_keys/choco60/rev1/keyboard.json
@@ -0,0 +1,19 @@
+{
+    "features": {
+        "bootmagic": false,
+        "extrakey": true,
+        "mousekey": false,
+        "nkro": false
+    },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6", "D1"],
+        "rows": ["C6", "D7", "E6", "B4", "B5"]
+    },
+    "diode_direction": "COL2ROW",
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "D3"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "caterina"
+}
diff --git a/keyboards/recompile_keys/choco60/rev1/rules.mk b/keyboards/recompile_keys/choco60/rev1/rules.mk
deleted file mode 100644
index 4d82dff69aa..00000000000
--- a/keyboards/recompile_keys/choco60/rev1/rules.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no        # Console for debug
-COMMAND_ENABLE = no        # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
diff --git a/keyboards/recompile_keys/choco60/rev2/info.json b/keyboards/recompile_keys/choco60/rev2/info.json
deleted file mode 100644
index 6565dc98347..00000000000
--- a/keyboards/recompile_keys/choco60/rev2/info.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-    "matrix_pins": {
-        "cols": ["C6", "B4", "B3", "B2", "B1", "B0", null, null, null],
-        "rows": ["C5", "C4", "B6", "B7", "C7"]
-    },
-    "diode_direction": "COL2ROW",
-    "split": {
-        "enabled": true,
-        "soft_serial_pin": "D0",
-        "matrix_pins": {
-            "right": {
-                "cols": ["C7", "B7", "B6", "B5", "B4", "B3", "B2", "C6", "D4"],
-                "rows": ["D3", "D2", "D5", "D6", "B0"]
-            }
-        }
-    },
-    "processor": "atmega32u2",
-    "bootloader": "atmel-dfu"
-}
diff --git a/keyboards/recompile_keys/choco60/rev2/keyboard.json b/keyboards/recompile_keys/choco60/rev2/keyboard.json
new file mode 100644
index 00000000000..fbc947a9f0c
--- /dev/null
+++ b/keyboards/recompile_keys/choco60/rev2/keyboard.json
@@ -0,0 +1,25 @@
+{
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": false,
+        "nkro": false
+    },
+    "matrix_pins": {
+        "cols": ["C6", "B4", "B3", "B2", "B1", "B0", null, null, null],
+        "rows": ["C5", "C4", "B6", "B7", "C7"]
+    },
+    "diode_direction": "COL2ROW",
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "D0",
+        "matrix_pins": {
+            "right": {
+                "cols": ["C7", "B7", "B6", "B5", "B4", "B3", "B2", "C6", "D4"],
+                "rows": ["D3", "D2", "D5", "D6", "B0"]
+            }
+        }
+    },
+    "processor": "atmega32u2",
+    "bootloader": "atmel-dfu"
+}
diff --git a/keyboards/recompile_keys/choco60/rev2/rules.mk b/keyboards/recompile_keys/choco60/rev2/rules.mk
deleted file mode 100644
index fa6fbf34d9f..00000000000
--- a/keyboards/recompile_keys/choco60/rev2/rules.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
diff --git a/keyboards/recompile_keys/nomu30/rev1/info.json b/keyboards/recompile_keys/nomu30/rev1/info.json
deleted file mode 100644
index 815f200cd8e..00000000000
--- a/keyboards/recompile_keys/nomu30/rev1/info.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "matrix_pins": {
-        "cols": ["C6", "D7", "E6", "B4", "F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6"],
-        "rows": ["D1", "D0", "D4"]
-    },
-    "diode_direction": "COL2ROW",
-    "processor": "atmega32u4",
-    "bootloader": "caterina"
-}
diff --git a/keyboards/recompile_keys/nomu30/rev1/keyboard.json b/keyboards/recompile_keys/nomu30/rev1/keyboard.json
new file mode 100644
index 00000000000..01afb9fe7d5
--- /dev/null
+++ b/keyboards/recompile_keys/nomu30/rev1/keyboard.json
@@ -0,0 +1,15 @@
+{
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": false,
+        "nkro": false
+    },
+    "matrix_pins": {
+        "cols": ["C6", "D7", "E6", "B4", "F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6"],
+        "rows": ["D1", "D0", "D4"]
+    },
+    "diode_direction": "COL2ROW",
+    "processor": "atmega32u4",
+    "bootloader": "caterina"
+}
diff --git a/keyboards/recompile_keys/nomu30/rev1/rules.mk b/keyboards/recompile_keys/nomu30/rev1/rules.mk
deleted file mode 100644
index e29387316f7..00000000000
--- a/keyboards/recompile_keys/nomu30/rev1/rules.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no        # Console for debug
-COMMAND_ENABLE = no        # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
diff --git a/keyboards/recompile_keys/nomu30/rev2/config.h b/keyboards/recompile_keys/nomu30/rev2/config.h
deleted file mode 100644
index ff4630d838a..00000000000
--- a/keyboards/recompile_keys/nomu30/rev2/config.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
-Copyright 2020 Naoto Takai
-
-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
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/recompile_keys/nomu30/rev2/info.json b/keyboards/recompile_keys/nomu30/rev2/info.json
deleted file mode 100644
index 70730415a5c..00000000000
--- a/keyboards/recompile_keys/nomu30/rev2/info.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "matrix_pins": {
-        "cols": ["C4", "C5", "C6", "C7", "B7", "B6", "B5", "B4", "B3", "D5", "D4", "D3"],
-        "rows": ["B2", "B1", "B0"]
-    },
-    "diode_direction": "COL2ROW",
-    "processor": "atmega32u2",
-    "bootloader": "atmel-dfu"
-}
diff --git a/keyboards/recompile_keys/nomu30/rev2/keyboard.json b/keyboards/recompile_keys/nomu30/rev2/keyboard.json
new file mode 100644
index 00000000000..0e1df3f32ad
--- /dev/null
+++ b/keyboards/recompile_keys/nomu30/rev2/keyboard.json
@@ -0,0 +1,21 @@
+{
+    "features": {
+        "bootmagic": true,
+        "extrakey": false,
+        "mousekey": false,
+        "nkro": false
+    },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
+    "matrix_pins": {
+        "cols": ["C4", "C5", "C6", "C7", "B7", "B6", "B5", "B4", "B3", "D5", "D4", "D3"],
+        "rows": ["B2", "B1", "B0"]
+    },
+    "diode_direction": "COL2ROW",
+    "processor": "atmega32u2",
+    "bootloader": "atmel-dfu"
+}
diff --git a/keyboards/recompile_keys/nomu30/rev2/rules.mk b/keyboards/recompile_keys/nomu30/rev2/rules.mk
deleted file mode 100644
index c3de5dd6e58..00000000000
--- a/keyboards/recompile_keys/nomu30/rev2/rules.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no       # Mouse keys
-EXTRAKEY_ENABLE = no       # Audio control and System control
-CONSOLE_ENABLE = no        # Console for debug
-COMMAND_ENABLE = no        # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
diff --git a/keyboards/redox/rev1/proton_c/info.json b/keyboards/redox/rev1/proton_c/keyboard.json
similarity index 100%
rename from keyboards/redox/rev1/proton_c/info.json
rename to keyboards/redox/rev1/proton_c/keyboard.json
diff --git a/keyboards/redox/wireless/info.json b/keyboards/redox/wireless/keyboard.json
similarity index 100%
rename from keyboards/redox/wireless/info.json
rename to keyboards/redox/wireless/keyboard.json
diff --git a/keyboards/redox_media/config.h b/keyboards/redox_media/config.h
deleted file mode 100644
index ca325c381e3..00000000000
--- a/keyboards/redox_media/config.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
-Copyright 2021 Shiftux <shiftux@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
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/redox_media/info.json b/keyboards/redox_media/info.json
deleted file mode 100644
index c4e890f5577..00000000000
--- a/keyboards/redox_media/info.json
+++ /dev/null
@@ -1,117 +0,0 @@
-{
-    "keyboard_name": "Redox Media",
-    "manufacturer": "shiftux",
-    "url": "",
-    "maintainer": "shiftux",
-    "usb": {
-        "vid": "0xFEED",
-        "pid": "0x0000",
-        "device_version": "1.0.0"
-    },
-    "matrix_pins": {
-        "cols": ["F6", "F7", "B1", "B3", "B2", "B6", "D1"],
-        "rows": ["D4", "C6", "D7", "E6", "B4", "B5"]
-    },
-    "diode_direction": "COL2ROW",
-    "encoder": {
-        "rotary": [
-            {"pin_a": "F4", "pin_b": "F5"}
-        ]
-    },
-    "split": {
-        "enabled": true,
-        "soft_serial_pin": "D0"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [5, 6], "x": 5.25, "y": 0.15},
-
-                {"matrix": [11, 6], "x": 12.25, "y": 0.15},
-                {"matrix": [11, 5], "x": 13.5, "y": 0},
-
-                {"matrix": [0, 0], "x": 0, "y": 1.375, "w": 1.25},
-                {"matrix": [0, 1], "x": 1.25, "y": 1.375},
-                {"matrix": [0, 2], "x": 2.25, "y": 1.125},
-                {"matrix": [0, 3], "x": 3.25, "y": 1},
-                {"matrix": [0, 4], "x": 4.25, "y": 1.125},
-                {"matrix": [0, 5], "x": 5.25, "y": 1.25},
-
-                {"matrix": [6, 5], "x": 12.25, "y": 1.25},
-                {"matrix": [6, 4], "x": 13.25, "y": 1.125},
-                {"matrix": [6, 3], "x": 14.25, "y": 1},
-                {"matrix": [6, 2], "x": 15.25, "y": 1.125},
-                {"matrix": [6, 1], "x": 16.25, "y": 1.375},
-                {"matrix": [6, 0], "x": 17.25, "y": 1.375, "w": 1.25},
-
-                {"matrix": [1, 0], "x": 0, "y": 2.375, "w": 1.25},
-                {"matrix": [1, 1], "x": 1.25, "y": 2.375},
-                {"matrix": [1, 2], "x": 2.25, "y": 2.125},
-                {"matrix": [1, 3], "x": 3.25, "y": 2},
-                {"matrix": [1, 4], "x": 4.25, "y": 2.125},
-                {"matrix": [1, 5], "x": 5.25, "y": 2.25},
-                {"matrix": [0, 6], "x": 6.25, "y": 1.75},
-
-                {"matrix": [6, 6], "x": 11.25, "y": 1.75},
-                {"matrix": [7, 5], "x": 12.25, "y": 2.25},
-                {"matrix": [7, 4], "x": 13.25, "y": 2.125},
-                {"matrix": [7, 3], "x": 14.25, "y": 2},
-                {"matrix": [7, 2], "x": 15.25, "y": 2.125},
-                {"matrix": [7, 1], "x": 16.25, "y": 2.375},
-                {"matrix": [7, 0], "x": 17.25, "y": 2.375, "w": 1.25},
-
-                {"matrix": [2, 0], "x": 0, "y": 3.375, "w": 1.25},
-                {"matrix": [2, 1], "x": 1.25, "y": 3.375},
-                {"matrix": [2, 2], "x": 2.25, "y": 3.125},
-                {"matrix": [2, 3], "x": 3.25, "y": 3},
-                {"matrix": [2, 4], "x": 4.25, "y": 3.125},
-                {"matrix": [2, 5], "x": 5.25, "y": 3.25},
-                {"matrix": [1, 6], "x": 6.25, "y": 3},
-
-                {"matrix": [7, 6], "x": 11.25, "y": 3},
-                {"matrix": [8, 5], "x": 12.25, "y": 3.25},
-                {"matrix": [8, 4], "x": 13.25, "y": 3.125},
-                {"matrix": [8, 3], "x": 14.25, "y": 3},
-                {"matrix": [8, 2], "x": 15.25, "y": 3.125},
-                {"matrix": [8, 1], "x": 16.25, "y": 3.375},
-                {"matrix": [8, 0], "x": 17.25, "y": 3.375, "w": 1.25},
-
-                {"matrix": [3, 0], "x": 0, "y": 4.375, "w": 1.25},
-                {"matrix": [3, 1], "x": 1.25, "y": 4.375},
-                {"matrix": [3, 2], "x": 2.25, "y": 4.125},
-                {"matrix": [3, 3], "x": 3.25, "y": 4},
-                {"matrix": [3, 4], "x": 4.25, "y": 4.125},
-                {"matrix": [3, 5], "x": 5.25, "y": 4.25},
-                {"matrix": [2, 6], "x": 6.75, "y": 4.75},
-                {"matrix": [3, 6], "x": 7.75, "y": 4.75},
-
-                {"matrix": [9, 6], "x": 9.75, "y": 4.75},
-                {"matrix": [8, 6], "x": 10.75, "y": 4.75},
-                {"matrix": [9, 5], "x": 12.25, "y": 4.25},
-                {"matrix": [9, 4], "x": 13.25, "y": 4.125},
-                {"matrix": [9, 3], "x": 14.25, "y": 4},
-                {"matrix": [9, 2], "x": 15.25, "y": 4.125},
-                {"matrix": [9, 1], "x": 16.25, "y": 4.375},
-                {"matrix": [9, 0], "x": 17.25, "y": 4.375, "w": 1.25},
-
-                {"matrix": [4, 0], "x": 0.25, "y": 5.375},
-                {"matrix": [4, 1], "x": 1.25, "y": 5.375},
-                {"matrix": [4, 2], "x": 2.25, "y": 5.125},
-                {"matrix": [4, 3], "x": 3.25, "y": 5},
-                {"matrix": [4, 4], "x": 5.5, "y": 6.25, "w": 1.25},
-                {"matrix": [4, 5], "x": 6.75, "y": 5.75, "h": 1.5},
-                {"matrix": [4, 6], "x": 7.75, "y": 5.75, "h": 1.5},
-
-                {"matrix": [10, 6], "x": 9.75, "y": 5.75, "h": 1.5},
-                {"matrix": [10, 5], "x": 10.75, "y": 5.75, "h": 1.5},
-                {"matrix": [10, 4], "x": 11.75, "y": 6.25, "w": 1.25},
-                {"matrix": [10, 3], "x": 14.25, "y": 5},
-                {"matrix": [10, 2], "x": 15.25, "y": 5.125},
-                {"matrix": [10, 1], "x": 16.25, "y": 5.375},
-                {"matrix": [10, 0], "x": 17.25, "y": 5.375}
-            ]
-        }
-    }
-}
diff --git a/keyboards/redox_media/keyboard.json b/keyboards/redox_media/keyboard.json
new file mode 100644
index 00000000000..baf1cfeb434
--- /dev/null
+++ b/keyboards/redox_media/keyboard.json
@@ -0,0 +1,130 @@
+{
+    "keyboard_name": "Redox Media",
+    "manufacturer": "shiftux",
+    "url": "",
+    "maintainer": "shiftux",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0x0000",
+        "device_version": "1.0.0"
+    },
+    "features": {
+        "bootmagic": true,
+        "encoder": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
+    "matrix_pins": {
+        "cols": ["F6", "F7", "B1", "B3", "B2", "B6", "D1"],
+        "rows": ["D4", "C6", "D7", "E6", "B4", "B5"]
+    },
+    "diode_direction": "COL2ROW",
+    "encoder": {
+        "rotary": [
+            {"pin_a": "F4", "pin_b": "F5"}
+        ]
+    },
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "D0"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [5, 6], "x": 5.25, "y": 0.15},
+
+                {"matrix": [11, 6], "x": 12.25, "y": 0.15},
+                {"matrix": [11, 5], "x": 13.5, "y": 0},
+
+                {"matrix": [0, 0], "x": 0, "y": 1.375, "w": 1.25},
+                {"matrix": [0, 1], "x": 1.25, "y": 1.375},
+                {"matrix": [0, 2], "x": 2.25, "y": 1.125},
+                {"matrix": [0, 3], "x": 3.25, "y": 1},
+                {"matrix": [0, 4], "x": 4.25, "y": 1.125},
+                {"matrix": [0, 5], "x": 5.25, "y": 1.25},
+
+                {"matrix": [6, 5], "x": 12.25, "y": 1.25},
+                {"matrix": [6, 4], "x": 13.25, "y": 1.125},
+                {"matrix": [6, 3], "x": 14.25, "y": 1},
+                {"matrix": [6, 2], "x": 15.25, "y": 1.125},
+                {"matrix": [6, 1], "x": 16.25, "y": 1.375},
+                {"matrix": [6, 0], "x": 17.25, "y": 1.375, "w": 1.25},
+
+                {"matrix": [1, 0], "x": 0, "y": 2.375, "w": 1.25},
+                {"matrix": [1, 1], "x": 1.25, "y": 2.375},
+                {"matrix": [1, 2], "x": 2.25, "y": 2.125},
+                {"matrix": [1, 3], "x": 3.25, "y": 2},
+                {"matrix": [1, 4], "x": 4.25, "y": 2.125},
+                {"matrix": [1, 5], "x": 5.25, "y": 2.25},
+                {"matrix": [0, 6], "x": 6.25, "y": 1.75},
+
+                {"matrix": [6, 6], "x": 11.25, "y": 1.75},
+                {"matrix": [7, 5], "x": 12.25, "y": 2.25},
+                {"matrix": [7, 4], "x": 13.25, "y": 2.125},
+                {"matrix": [7, 3], "x": 14.25, "y": 2},
+                {"matrix": [7, 2], "x": 15.25, "y": 2.125},
+                {"matrix": [7, 1], "x": 16.25, "y": 2.375},
+                {"matrix": [7, 0], "x": 17.25, "y": 2.375, "w": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 3.375, "w": 1.25},
+                {"matrix": [2, 1], "x": 1.25, "y": 3.375},
+                {"matrix": [2, 2], "x": 2.25, "y": 3.125},
+                {"matrix": [2, 3], "x": 3.25, "y": 3},
+                {"matrix": [2, 4], "x": 4.25, "y": 3.125},
+                {"matrix": [2, 5], "x": 5.25, "y": 3.25},
+                {"matrix": [1, 6], "x": 6.25, "y": 3},
+
+                {"matrix": [7, 6], "x": 11.25, "y": 3},
+                {"matrix": [8, 5], "x": 12.25, "y": 3.25},
+                {"matrix": [8, 4], "x": 13.25, "y": 3.125},
+                {"matrix": [8, 3], "x": 14.25, "y": 3},
+                {"matrix": [8, 2], "x": 15.25, "y": 3.125},
+                {"matrix": [8, 1], "x": 16.25, "y": 3.375},
+                {"matrix": [8, 0], "x": 17.25, "y": 3.375, "w": 1.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 4.375, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 4.375},
+                {"matrix": [3, 2], "x": 2.25, "y": 4.125},
+                {"matrix": [3, 3], "x": 3.25, "y": 4},
+                {"matrix": [3, 4], "x": 4.25, "y": 4.125},
+                {"matrix": [3, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [2, 6], "x": 6.75, "y": 4.75},
+                {"matrix": [3, 6], "x": 7.75, "y": 4.75},
+
+                {"matrix": [9, 6], "x": 9.75, "y": 4.75},
+                {"matrix": [8, 6], "x": 10.75, "y": 4.75},
+                {"matrix": [9, 5], "x": 12.25, "y": 4.25},
+                {"matrix": [9, 4], "x": 13.25, "y": 4.125},
+                {"matrix": [9, 3], "x": 14.25, "y": 4},
+                {"matrix": [9, 2], "x": 15.25, "y": 4.125},
+                {"matrix": [9, 1], "x": 16.25, "y": 4.375},
+                {"matrix": [9, 0], "x": 17.25, "y": 4.375, "w": 1.25},
+
+                {"matrix": [4, 0], "x": 0.25, "y": 5.375},
+                {"matrix": [4, 1], "x": 1.25, "y": 5.375},
+                {"matrix": [4, 2], "x": 2.25, "y": 5.125},
+                {"matrix": [4, 3], "x": 3.25, "y": 5},
+                {"matrix": [4, 4], "x": 5.5, "y": 6.25, "w": 1.25},
+                {"matrix": [4, 5], "x": 6.75, "y": 5.75, "h": 1.5},
+                {"matrix": [4, 6], "x": 7.75, "y": 5.75, "h": 1.5},
+
+                {"matrix": [10, 6], "x": 9.75, "y": 5.75, "h": 1.5},
+                {"matrix": [10, 5], "x": 10.75, "y": 5.75, "h": 1.5},
+                {"matrix": [10, 4], "x": 11.75, "y": 6.25, "w": 1.25},
+                {"matrix": [10, 3], "x": 14.25, "y": 5},
+                {"matrix": [10, 2], "x": 15.25, "y": 5.125},
+                {"matrix": [10, 1], "x": 16.25, "y": 5.375},
+                {"matrix": [10, 0], "x": 17.25, "y": 5.375}
+            ]
+        }
+    }
+}
diff --git a/keyboards/redox_media/rules.mk b/keyboards/redox_media/rules.mk
index 5ad7700a767..1056aa2c41b 100644
--- a/keyboards/redox_media/rules.mk
+++ b/keyboards/redox_media/rules.mk
@@ -1,17 +1,3 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-ENCODER_ENABLE = yes
-
 # Disable unsupported hardware
 AUDIO_SUPPORTED = no
 BACKLIGHT_SUPPORTED = no
diff --git a/keyboards/redscarf_iiplus/verb/info.json b/keyboards/redscarf_iiplus/verb/info.json
deleted file mode 100644
index 82892e9325a..00000000000
--- a/keyboards/redscarf_iiplus/verb/info.json
+++ /dev/null
@@ -1,208 +0,0 @@
-{
-    "keyboard_name": "RedScarfII+ Ver.B (RS78)",
-    "manufacturer": "RedScarf",
-    "url": "",
-    "maintainer": "qmk",
-    "usb": {
-        "vid": "0xFEED",
-        "pid": "0x0000",
-        "device_version": "0.0.1"
-    },
-    "backlight": {
-        "pin": "B7"
-    },
-    "indicators": {
-        "caps_lock": "C7",
-        "num_lock": "E6",
-        "on_state": 0
-    },
-    "processor": "atmega32u4",
-    "bootloader": "qmk-dfu",
-    "layouts": {
-        "LAYOUT_78_ansi": {
-            "layout": [
-                {"matrix": [5, 1], "x": 0, "y": 0},
-                {"matrix": [5, 2], "x": 1, "y": 0},
-
-                {"matrix": [0, 0], "x": 2.25, "y": 0},
-                {"matrix": [0, 1], "x": 3.25, "y": 0},
-                {"matrix": [0, 2], "x": 4.25, "y": 0},
-                {"matrix": [0, 3], "x": 5.25, "y": 0},
-                {"matrix": [0, 4], "x": 6.25, "y": 0},
-                {"matrix": [0, 5], "x": 7.25, "y": 0},
-                {"matrix": [0, 6], "x": 8.25, "y": 0},
-                {"matrix": [0, 7], "x": 9.25, "y": 0},
-                {"matrix": [0, 8], "x": 10.25, "y": 0},
-                {"matrix": [0, 9], "x": 11.25, "y": 0},
-                {"matrix": [0, 10], "x": 12.25, "y": 0},
-                {"matrix": [0, 11], "x": 13.25, "y": 0},
-                {"matrix": [0, 12], "x": 14.25, "y": 0},
-                {"matrix": [0, 13], "x": 15.25, "y": 0},
-                {"matrix": [2, 12], "x": 16.25, "y": 0},
-                {"matrix": [0, 14], "x": 17.25, "y": 0},
-
-                {"matrix": [5, 3], "x": 0, "y": 1},
-                {"matrix": [5, 4], "x": 1, "y": 1},
-
-                {"matrix": [1, 0], "x": 2.25, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 3.75, "y": 1},
-                {"matrix": [1, 2], "x": 4.75, "y": 1},
-                {"matrix": [1, 3], "x": 5.75, "y": 1},
-                {"matrix": [1, 4], "x": 6.75, "y": 1},
-                {"matrix": [1, 5], "x": 7.75, "y": 1},
-                {"matrix": [1, 6], "x": 8.75, "y": 1},
-                {"matrix": [1, 7], "x": 9.75, "y": 1},
-                {"matrix": [1, 8], "x": 10.75, "y": 1},
-                {"matrix": [1, 9], "x": 11.75, "y": 1},
-                {"matrix": [1, 10], "x": 12.75, "y": 1},
-                {"matrix": [1, 11], "x": 13.75, "y": 1},
-                {"matrix": [1, 12], "x": 14.75, "y": 1},
-                {"matrix": [1, 13], "x": 15.75, "y": 1, "w": 1.5},
-                {"matrix": [1, 14], "x": 17.25, "y": 1},
-
-                {"matrix": [5, 5], "x": 0, "y": 2},
-                {"matrix": [5, 6], "x": 1, "y": 2},
-
-                {"matrix": [2, 0], "x": 2.25, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 4, "y": 2},
-                {"matrix": [2, 2], "x": 5, "y": 2},
-                {"matrix": [2, 3], "x": 6, "y": 2},
-                {"matrix": [2, 4], "x": 7, "y": 2},
-                {"matrix": [2, 5], "x": 8, "y": 2},
-                {"matrix": [2, 6], "x": 9, "y": 2},
-                {"matrix": [2, 7], "x": 10, "y": 2},
-                {"matrix": [2, 8], "x": 11, "y": 2},
-                {"matrix": [2, 9], "x": 12, "y": 2},
-                {"matrix": [2, 10], "x": 13, "y": 2},
-                {"matrix": [2, 11], "x": 14, "y": 2},
-                {"matrix": [2, 13], "x": 15, "y": 2, "w": 2.25},
-                {"matrix": [2, 14], "x": 17.25, "y": 2},
-
-                {"matrix": [5, 7], "x": 0, "y": 3},
-                {"matrix": [5, 8], "x": 1, "y": 3},
-
-                {"matrix": [3, 0], "x": 2.25, "y": 3, "w": 2.25},
-                {"matrix": [3, 2], "x": 4.5, "y": 3},
-                {"matrix": [3, 3], "x": 5.5, "y": 3},
-                {"matrix": [3, 4], "x": 6.5, "y": 3},
-                {"matrix": [3, 5], "x": 7.5, "y": 3},
-                {"matrix": [3, 6], "x": 8.5, "y": 3},
-                {"matrix": [3, 7], "x": 9.5, "y": 3},
-                {"matrix": [3, 8], "x": 10.5, "y": 3},
-                {"matrix": [3, 9], "x": 11.5, "y": 3},
-                {"matrix": [3, 10], "x": 12.5, "y": 3},
-                {"matrix": [3, 11], "x": 13.5, "y": 3},
-                {"matrix": [3, 12], "x": 14.5, "y": 3, "w": 1.75},
-                {"matrix": [3, 13], "x": 16.25, "y": 3},
-                {"matrix": [3, 14], "x": 17.25, "y": 3},
-
-                {"matrix": [5, 9], "x": 0, "y": 4},
-                {"matrix": [5, 10], "x": 1, "y": 4},
-
-                {"matrix": [4, 0], "x": 2.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 3.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 4.75, "y": 4, "w": 1.25},
-                {"matrix": [4, 9], "x": 6, "y": 4, "w": 6.25},
-                {"matrix": [4, 10], "x": 12.25, "y": 4},
-                {"matrix": [4, 11], "x": 13.25, "y": 4},
-                {"matrix": [4, 7], "x": 14.25, "y": 4},
-                {"matrix": [4, 12], "x": 15.25, "y": 4},
-                {"matrix": [4, 13], "x": 16.25, "y": 4},
-                {"matrix": [4, 14], "x": 17.25, "y": 4}
-            ]
-        },
-        "LAYOUT_78_iso": {
-            "layout": [
-                {"matrix": [5, 1], "x": 0, "y": 0},
-                {"matrix": [5, 2], "x": 1, "y": 0},
-
-                {"matrix": [0, 0], "x": 2.25, "y": 0},
-                {"matrix": [0, 1], "x": 3.25, "y": 0},
-                {"matrix": [0, 2], "x": 4.25, "y": 0},
-                {"matrix": [0, 3], "x": 5.25, "y": 0},
-                {"matrix": [0, 4], "x": 6.25, "y": 0},
-                {"matrix": [0, 5], "x": 7.25, "y": 0},
-                {"matrix": [0, 6], "x": 8.25, "y": 0},
-                {"matrix": [0, 7], "x": 9.25, "y": 0},
-                {"matrix": [0, 8], "x": 10.25, "y": 0},
-                {"matrix": [0, 9], "x": 11.25, "y": 0},
-                {"matrix": [0, 10], "x": 12.25, "y": 0},
-                {"matrix": [0, 11], "x": 13.25, "y": 0},
-                {"matrix": [0, 12], "x": 14.25, "y": 0},
-                {"matrix": [0, 13], "x": 15.25, "y": 0},
-                {"matrix": [2, 12], "x": 16.25, "y": 0},
-                {"matrix": [0, 14], "x": 17.25, "y": 0},
-
-                {"matrix": [5, 3], "x": 0, "y": 1},
-                {"matrix": [5, 4], "x": 1, "y": 1},
-
-                {"matrix": [1, 0], "x": 2.25, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 3.75, "y": 1},
-                {"matrix": [1, 2], "x": 4.75, "y": 1},
-                {"matrix": [1, 3], "x": 5.75, "y": 1},
-                {"matrix": [1, 4], "x": 6.75, "y": 1},
-                {"matrix": [1, 5], "x": 7.75, "y": 1},
-                {"matrix": [1, 6], "x": 8.75, "y": 1},
-                {"matrix": [1, 7], "x": 9.75, "y": 1},
-                {"matrix": [1, 8], "x": 10.75, "y": 1},
-                {"matrix": [1, 9], "x": 11.75, "y": 1},
-                {"matrix": [1, 10], "x": 12.75, "y": 1},
-                {"matrix": [1, 11], "x": 13.75, "y": 1},
-                {"matrix": [1, 12], "x": 14.75, "y": 1},
-                {"matrix": [1, 14], "x": 16, "y": 1, "w": 1.25, "h": 2},
-                {"matrix": [5, 5], "x": 17.25, "y": 1},
-
-                {"matrix": [5, 6], "x": 0, "y": 2},
-                {"matrix": [2, 0], "x": 1, "y": 2},
-
-                {"matrix": [2, 1], "x": 2.25, "y": 2, "w": 1.75},
-                {"matrix": [2, 2], "x": 4, "y": 2},
-                {"matrix": [2, 3], "x": 5, "y": 2},
-                {"matrix": [2, 4], "x": 6, "y": 2},
-                {"matrix": [2, 5], "x": 7, "y": 2},
-                {"matrix": [2, 6], "x": 8, "y": 2},
-                {"matrix": [2, 7], "x": 9, "y": 2},
-                {"matrix": [2, 8], "x": 10, "y": 2},
-                {"matrix": [2, 9], "x": 11, "y": 2},
-                {"matrix": [2, 10], "x": 12, "y": 2},
-                {"matrix": [2, 11], "x": 13, "y": 2},
-                {"matrix": [1, 13], "x": 14, "y": 2},
-                {"matrix": [2, 13], "x": 15, "y": 2},
-                {"matrix": [2, 14], "x": 17.25, "y": 2},
-
-                {"matrix": [5, 7], "x": 0, "y": 3},
-                {"matrix": [5, 8], "x": 1, "y": 3},
-
-                {"matrix": [3, 0], "x": 2.25, "y": 3, "w": 1.25},
-                {"matrix": [3, 1], "x": 3.5, "y": 3},
-                {"matrix": [3, 2], "x": 4.5, "y": 3},
-                {"matrix": [3, 3], "x": 5.5, "y": 3},
-                {"matrix": [3, 4], "x": 6.5, "y": 3},
-                {"matrix": [3, 5], "x": 7.5, "y": 3},
-                {"matrix": [3, 6], "x": 8.5, "y": 3},
-                {"matrix": [3, 7], "x": 9.5, "y": 3},
-                {"matrix": [3, 8], "x": 10.5, "y": 3},
-                {"matrix": [3, 9], "x": 11.5, "y": 3},
-                {"matrix": [3, 10], "x": 12.5, "y": 3},
-                {"matrix": [3, 11], "x": 13.5, "y": 3},
-                {"matrix": [3, 12], "x": 14.5, "y": 3, "w": 1.75},
-                {"matrix": [3, 13], "x": 16.25, "y": 3},
-                {"matrix": [3, 14], "x": 17.25, "y": 3},
-
-                {"matrix": [5, 9], "x": 0, "y": 4},
-                {"matrix": [5, 10], "x": 1, "y": 4},
-
-                {"matrix": [4, 0], "x": 2.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 3.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 4.75, "y": 4, "w": 1.25},
-                {"matrix": [4, 9], "x": 6, "y": 4, "w": 6.25},
-                {"matrix": [4, 10], "x": 12.25, "y": 4},
-                {"matrix": [4, 11], "x": 13.25, "y": 4},
-                {"matrix": [4, 7], "x": 14.25, "y": 4},
-                {"matrix": [4, 12], "x": 15.25, "y": 4},
-                {"matrix": [4, 13], "x": 16.25, "y": 4},
-                {"matrix": [4, 14], "x": 17.25, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/redscarf_iiplus/verb/keyboard.json b/keyboards/redscarf_iiplus/verb/keyboard.json
new file mode 100644
index 00000000000..a027fe1003f
--- /dev/null
+++ b/keyboards/redscarf_iiplus/verb/keyboard.json
@@ -0,0 +1,215 @@
+{
+    "keyboard_name": "RedScarfII+ Ver.B (RS78)",
+    "manufacturer": "RedScarf",
+    "url": "",
+    "maintainer": "qmk",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0x0000",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "backlight": true,
+        "bootmagic": false,
+        "extrakey": true,
+        "mousekey": false,
+        "nkro": true
+    },
+    "backlight": {
+        "pin": "B7"
+    },
+    "indicators": {
+        "caps_lock": "C7",
+        "num_lock": "E6",
+        "on_state": 0
+    },
+    "processor": "atmega32u4",
+    "bootloader": "qmk-dfu",
+    "layouts": {
+        "LAYOUT_78_ansi": {
+            "layout": [
+                {"matrix": [5, 1], "x": 0, "y": 0},
+                {"matrix": [5, 2], "x": 1, "y": 0},
+
+                {"matrix": [0, 0], "x": 2.25, "y": 0},
+                {"matrix": [0, 1], "x": 3.25, "y": 0},
+                {"matrix": [0, 2], "x": 4.25, "y": 0},
+                {"matrix": [0, 3], "x": 5.25, "y": 0},
+                {"matrix": [0, 4], "x": 6.25, "y": 0},
+                {"matrix": [0, 5], "x": 7.25, "y": 0},
+                {"matrix": [0, 6], "x": 8.25, "y": 0},
+                {"matrix": [0, 7], "x": 9.25, "y": 0},
+                {"matrix": [0, 8], "x": 10.25, "y": 0},
+                {"matrix": [0, 9], "x": 11.25, "y": 0},
+                {"matrix": [0, 10], "x": 12.25, "y": 0},
+                {"matrix": [0, 11], "x": 13.25, "y": 0},
+                {"matrix": [0, 12], "x": 14.25, "y": 0},
+                {"matrix": [0, 13], "x": 15.25, "y": 0},
+                {"matrix": [2, 12], "x": 16.25, "y": 0},
+                {"matrix": [0, 14], "x": 17.25, "y": 0},
+
+                {"matrix": [5, 3], "x": 0, "y": 1},
+                {"matrix": [5, 4], "x": 1, "y": 1},
+
+                {"matrix": [1, 0], "x": 2.25, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 3.75, "y": 1},
+                {"matrix": [1, 2], "x": 4.75, "y": 1},
+                {"matrix": [1, 3], "x": 5.75, "y": 1},
+                {"matrix": [1, 4], "x": 6.75, "y": 1},
+                {"matrix": [1, 5], "x": 7.75, "y": 1},
+                {"matrix": [1, 6], "x": 8.75, "y": 1},
+                {"matrix": [1, 7], "x": 9.75, "y": 1},
+                {"matrix": [1, 8], "x": 10.75, "y": 1},
+                {"matrix": [1, 9], "x": 11.75, "y": 1},
+                {"matrix": [1, 10], "x": 12.75, "y": 1},
+                {"matrix": [1, 11], "x": 13.75, "y": 1},
+                {"matrix": [1, 12], "x": 14.75, "y": 1},
+                {"matrix": [1, 13], "x": 15.75, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 17.25, "y": 1},
+
+                {"matrix": [5, 5], "x": 0, "y": 2},
+                {"matrix": [5, 6], "x": 1, "y": 2},
+
+                {"matrix": [2, 0], "x": 2.25, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 4, "y": 2},
+                {"matrix": [2, 2], "x": 5, "y": 2},
+                {"matrix": [2, 3], "x": 6, "y": 2},
+                {"matrix": [2, 4], "x": 7, "y": 2},
+                {"matrix": [2, 5], "x": 8, "y": 2},
+                {"matrix": [2, 6], "x": 9, "y": 2},
+                {"matrix": [2, 7], "x": 10, "y": 2},
+                {"matrix": [2, 8], "x": 11, "y": 2},
+                {"matrix": [2, 9], "x": 12, "y": 2},
+                {"matrix": [2, 10], "x": 13, "y": 2},
+                {"matrix": [2, 11], "x": 14, "y": 2},
+                {"matrix": [2, 13], "x": 15, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 17.25, "y": 2},
+
+                {"matrix": [5, 7], "x": 0, "y": 3},
+                {"matrix": [5, 8], "x": 1, "y": 3},
+
+                {"matrix": [3, 0], "x": 2.25, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 4.5, "y": 3},
+                {"matrix": [3, 3], "x": 5.5, "y": 3},
+                {"matrix": [3, 4], "x": 6.5, "y": 3},
+                {"matrix": [3, 5], "x": 7.5, "y": 3},
+                {"matrix": [3, 6], "x": 8.5, "y": 3},
+                {"matrix": [3, 7], "x": 9.5, "y": 3},
+                {"matrix": [3, 8], "x": 10.5, "y": 3},
+                {"matrix": [3, 9], "x": 11.5, "y": 3},
+                {"matrix": [3, 10], "x": 12.5, "y": 3},
+                {"matrix": [3, 11], "x": 13.5, "y": 3},
+                {"matrix": [3, 12], "x": 14.5, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 16.25, "y": 3},
+                {"matrix": [3, 14], "x": 17.25, "y": 3},
+
+                {"matrix": [5, 9], "x": 0, "y": 4},
+                {"matrix": [5, 10], "x": 1, "y": 4},
+
+                {"matrix": [4, 0], "x": 2.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 3.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 4.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 9], "x": 6, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 12.25, "y": 4},
+                {"matrix": [4, 11], "x": 13.25, "y": 4},
+                {"matrix": [4, 7], "x": 14.25, "y": 4},
+                {"matrix": [4, 12], "x": 15.25, "y": 4},
+                {"matrix": [4, 13], "x": 16.25, "y": 4},
+                {"matrix": [4, 14], "x": 17.25, "y": 4}
+            ]
+        },
+        "LAYOUT_78_iso": {
+            "layout": [
+                {"matrix": [5, 1], "x": 0, "y": 0},
+                {"matrix": [5, 2], "x": 1, "y": 0},
+
+                {"matrix": [0, 0], "x": 2.25, "y": 0},
+                {"matrix": [0, 1], "x": 3.25, "y": 0},
+                {"matrix": [0, 2], "x": 4.25, "y": 0},
+                {"matrix": [0, 3], "x": 5.25, "y": 0},
+                {"matrix": [0, 4], "x": 6.25, "y": 0},
+                {"matrix": [0, 5], "x": 7.25, "y": 0},
+                {"matrix": [0, 6], "x": 8.25, "y": 0},
+                {"matrix": [0, 7], "x": 9.25, "y": 0},
+                {"matrix": [0, 8], "x": 10.25, "y": 0},
+                {"matrix": [0, 9], "x": 11.25, "y": 0},
+                {"matrix": [0, 10], "x": 12.25, "y": 0},
+                {"matrix": [0, 11], "x": 13.25, "y": 0},
+                {"matrix": [0, 12], "x": 14.25, "y": 0},
+                {"matrix": [0, 13], "x": 15.25, "y": 0},
+                {"matrix": [2, 12], "x": 16.25, "y": 0},
+                {"matrix": [0, 14], "x": 17.25, "y": 0},
+
+                {"matrix": [5, 3], "x": 0, "y": 1},
+                {"matrix": [5, 4], "x": 1, "y": 1},
+
+                {"matrix": [1, 0], "x": 2.25, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 3.75, "y": 1},
+                {"matrix": [1, 2], "x": 4.75, "y": 1},
+                {"matrix": [1, 3], "x": 5.75, "y": 1},
+                {"matrix": [1, 4], "x": 6.75, "y": 1},
+                {"matrix": [1, 5], "x": 7.75, "y": 1},
+                {"matrix": [1, 6], "x": 8.75, "y": 1},
+                {"matrix": [1, 7], "x": 9.75, "y": 1},
+                {"matrix": [1, 8], "x": 10.75, "y": 1},
+                {"matrix": [1, 9], "x": 11.75, "y": 1},
+                {"matrix": [1, 10], "x": 12.75, "y": 1},
+                {"matrix": [1, 11], "x": 13.75, "y": 1},
+                {"matrix": [1, 12], "x": 14.75, "y": 1},
+                {"matrix": [1, 14], "x": 16, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [5, 5], "x": 17.25, "y": 1},
+
+                {"matrix": [5, 6], "x": 0, "y": 2},
+                {"matrix": [2, 0], "x": 1, "y": 2},
+
+                {"matrix": [2, 1], "x": 2.25, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 4, "y": 2},
+                {"matrix": [2, 3], "x": 5, "y": 2},
+                {"matrix": [2, 4], "x": 6, "y": 2},
+                {"matrix": [2, 5], "x": 7, "y": 2},
+                {"matrix": [2, 6], "x": 8, "y": 2},
+                {"matrix": [2, 7], "x": 9, "y": 2},
+                {"matrix": [2, 8], "x": 10, "y": 2},
+                {"matrix": [2, 9], "x": 11, "y": 2},
+                {"matrix": [2, 10], "x": 12, "y": 2},
+                {"matrix": [2, 11], "x": 13, "y": 2},
+                {"matrix": [1, 13], "x": 14, "y": 2},
+                {"matrix": [2, 13], "x": 15, "y": 2},
+                {"matrix": [2, 14], "x": 17.25, "y": 2},
+
+                {"matrix": [5, 7], "x": 0, "y": 3},
+                {"matrix": [5, 8], "x": 1, "y": 3},
+
+                {"matrix": [3, 0], "x": 2.25, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 3.5, "y": 3},
+                {"matrix": [3, 2], "x": 4.5, "y": 3},
+                {"matrix": [3, 3], "x": 5.5, "y": 3},
+                {"matrix": [3, 4], "x": 6.5, "y": 3},
+                {"matrix": [3, 5], "x": 7.5, "y": 3},
+                {"matrix": [3, 6], "x": 8.5, "y": 3},
+                {"matrix": [3, 7], "x": 9.5, "y": 3},
+                {"matrix": [3, 8], "x": 10.5, "y": 3},
+                {"matrix": [3, 9], "x": 11.5, "y": 3},
+                {"matrix": [3, 10], "x": 12.5, "y": 3},
+                {"matrix": [3, 11], "x": 13.5, "y": 3},
+                {"matrix": [3, 12], "x": 14.5, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 16.25, "y": 3},
+                {"matrix": [3, 14], "x": 17.25, "y": 3},
+
+                {"matrix": [5, 9], "x": 0, "y": 4},
+                {"matrix": [5, 10], "x": 1, "y": 4},
+
+                {"matrix": [4, 0], "x": 2.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 3.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 4.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 9], "x": 6, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 12.25, "y": 4},
+                {"matrix": [4, 11], "x": 13.25, "y": 4},
+                {"matrix": [4, 7], "x": 14.25, "y": 4},
+                {"matrix": [4, 12], "x": 15.25, "y": 4},
+                {"matrix": [4, 13], "x": 16.25, "y": 4},
+                {"matrix": [4, 14], "x": 17.25, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/redscarf_iiplus/verb/rules.mk b/keyboards/redscarf_iiplus/verb/rules.mk
index 73a2fe6487b..8784813b335 100755
--- a/keyboards/redscarf_iiplus/verb/rules.mk
+++ b/keyboards/redscarf_iiplus/verb/rules.mk
@@ -1,15 +1,2 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = yes       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
 CUSTOM_MATRIX = yes
 SRC += matrix.c
diff --git a/keyboards/redscarf_iiplus/verc/info.json b/keyboards/redscarf_iiplus/verc/info.json
deleted file mode 100644
index b0c785e1b65..00000000000
--- a/keyboards/redscarf_iiplus/verc/info.json
+++ /dev/null
@@ -1,177 +0,0 @@
-{
-    "keyboard_name": "RedScarfII+ Ver.C (RS68)",
-    "manufacturer": "RedScarf",
-    "url": "",
-    "maintainer": "qmk",
-    "usb": {
-        "vid": "0xFEED",
-        "pid": "0x0000",
-        "device_version": "0.0.1"
-    },
-    "backlight": {
-        "pin": "B7"
-    },
-    "indicators": {
-        "caps_lock": "C7",
-        "num_lock": "E6",
-        "on_state": 0
-    },
-    "processor": "atmega32u4",
-    "bootloader": "qmk-dfu",
-    "community_layouts": ["65_ansi"],
-    "layouts": {
-        "LAYOUT_65_ansi": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-                {"matrix": [0, 14], "x": 15, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-                {"matrix": [1, 14], "x": 15, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
-                {"matrix": [2, 14], "x": 15, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 2], "x": 2.25, "y": 3},
-                {"matrix": [3, 3], "x": 3.25, "y": 3},
-                {"matrix": [3, 4], "x": 4.25, "y": 3},
-                {"matrix": [3, 5], "x": 5.25, "y": 3},
-                {"matrix": [3, 6], "x": 6.25, "y": 3},
-                {"matrix": [3, 7], "x": 7.25, "y": 3},
-                {"matrix": [3, 8], "x": 8.25, "y": 3},
-                {"matrix": [3, 9], "x": 9.25, "y": 3},
-                {"matrix": [3, 10], "x": 10.25, "y": 3},
-                {"matrix": [3, 11], "x": 11.25, "y": 3},
-                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"matrix": [3, 13], "x": 14, "y": 3},
-                {"matrix": [3, 14], "x": 15, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 9], "x": 3.75, "y": 4, "w": 6.25},
-                {"matrix": [4, 10], "x": 10, "y": 4},
-                {"matrix": [4, 11], "x": 11, "y": 4},
-                {"matrix": [4, 7], "x": 12, "y": 4},
-                {"matrix": [4, 12], "x": 13, "y": 4},
-                {"matrix": [4, 13], "x": 14, "y": 4},
-                {"matrix": [4, 14], "x": 15, "y": 4}
-            ]
-        },
-        "LAYOUT_65_iso": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-                {"matrix": [0, 14], "x": 15, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 14], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
-                {"matrix": [2, 0], "x": 15, "y": 1},
-
-                {"matrix": [2, 1], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 2], "x": 1.75, "y": 2},
-                {"matrix": [2, 3], "x": 2.75, "y": 2},
-                {"matrix": [2, 4], "x": 3.75, "y": 2},
-                {"matrix": [2, 5], "x": 4.75, "y": 2},
-                {"matrix": [2, 6], "x": 5.75, "y": 2},
-                {"matrix": [2, 7], "x": 6.75, "y": 2},
-                {"matrix": [2, 8], "x": 7.75, "y": 2},
-                {"matrix": [2, 9], "x": 8.75, "y": 2},
-                {"matrix": [2, 10], "x": 9.75, "y": 2},
-                {"matrix": [2, 11], "x": 10.75, "y": 2},
-                {"matrix": [1, 13], "x": 11.75, "y": 2},
-                {"matrix": [2, 13], "x": 12.75, "y": 2},
-                {"matrix": [2, 14], "x": 15, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
-                {"matrix": [3, 1], "x": 1.25, "y": 3},
-                {"matrix": [3, 2], "x": 2.25, "y": 3},
-                {"matrix": [3, 3], "x": 3.25, "y": 3},
-                {"matrix": [3, 4], "x": 4.25, "y": 3},
-                {"matrix": [3, 5], "x": 5.25, "y": 3},
-                {"matrix": [3, 6], "x": 6.25, "y": 3},
-                {"matrix": [3, 7], "x": 7.25, "y": 3},
-                {"matrix": [3, 8], "x": 8.25, "y": 3},
-                {"matrix": [3, 9], "x": 9.25, "y": 3},
-                {"matrix": [3, 10], "x": 10.25, "y": 3},
-                {"matrix": [3, 11], "x": 11.25, "y": 3},
-                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"matrix": [3, 13], "x": 14, "y": 3},
-                {"matrix": [3, 14], "x": 15, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 9], "x": 3.75, "y": 4, "w": 6.25},
-                {"matrix": [4, 10], "x": 10, "y": 4},
-                {"matrix": [4, 11], "x": 11, "y": 4},
-                {"matrix": [4, 7], "x": 12, "y": 4},
-                {"matrix": [4, 12], "x": 13, "y": 4},
-                {"matrix": [4, 13], "x": 14, "y": 4},
-                {"matrix": [4, 14], "x": 15, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/redscarf_iiplus/verc/keyboard.json b/keyboards/redscarf_iiplus/verc/keyboard.json
new file mode 100644
index 00000000000..c7f5314e7a8
--- /dev/null
+++ b/keyboards/redscarf_iiplus/verc/keyboard.json
@@ -0,0 +1,184 @@
+{
+    "keyboard_name": "RedScarfII+ Ver.C (RS68)",
+    "manufacturer": "RedScarf",
+    "url": "",
+    "maintainer": "qmk",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0x0000",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "backlight": true,
+        "bootmagic": false,
+        "extrakey": true,
+        "mousekey": false,
+        "nkro": true
+    },
+    "backlight": {
+        "pin": "B7"
+    },
+    "indicators": {
+        "caps_lock": "C7",
+        "num_lock": "E6",
+        "on_state": 0
+    },
+    "processor": "atmega32u4",
+    "bootloader": "qmk-dfu",
+    "community_layouts": ["65_ansi"],
+    "layouts": {
+        "LAYOUT_65_ansi": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 9], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4},
+                {"matrix": [4, 11], "x": 11, "y": 4},
+                {"matrix": [4, 7], "x": 12, "y": 4},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_65_iso": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [2, 0], "x": 15, "y": 1},
+
+                {"matrix": [2, 1], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 1.75, "y": 2},
+                {"matrix": [2, 3], "x": 2.75, "y": 2},
+                {"matrix": [2, 4], "x": 3.75, "y": 2},
+                {"matrix": [2, 5], "x": 4.75, "y": 2},
+                {"matrix": [2, 6], "x": 5.75, "y": 2},
+                {"matrix": [2, 7], "x": 6.75, "y": 2},
+                {"matrix": [2, 8], "x": 7.75, "y": 2},
+                {"matrix": [2, 9], "x": 8.75, "y": 2},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
+                {"matrix": [1, 13], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 9], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4},
+                {"matrix": [4, 11], "x": 11, "y": 4},
+                {"matrix": [4, 7], "x": 12, "y": 4},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/redscarf_iiplus/verc/rules.mk b/keyboards/redscarf_iiplus/verc/rules.mk
index 73a2fe6487b..8784813b335 100755
--- a/keyboards/redscarf_iiplus/verc/rules.mk
+++ b/keyboards/redscarf_iiplus/verc/rules.mk
@@ -1,15 +1,2 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = yes       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
 CUSTOM_MATRIX = yes
 SRC += matrix.c
diff --git a/keyboards/redscarf_iiplus/verd/info.json b/keyboards/redscarf_iiplus/verd/info.json
deleted file mode 100644
index c8de6db7c27..00000000000
--- a/keyboards/redscarf_iiplus/verd/info.json
+++ /dev/null
@@ -1,196 +0,0 @@
-{
-  "keyboard_name": "RedScarfII+ Ver.D",
-  "manufacturer": "RedScarf",
-  "url": "",
-  "maintainer": "qmk",
-  "usb": {
-    "vid": "0xFEED",
-    "pid": "0x7778",
-    "device_version": "0.0.1"
-  },
-  "backlight": {
-    "pin": "B7"
-  },
-  "indicators": {
-    "caps_lock": "C6",
-    "num_lock": "E6",
-    "on_state": 0
-  },
-  "processor": "atmega32u4",
-  "bootloader": "halfkay",
-  "layouts": {
-    "LAYOUT_60_ansi_numpad_split0": {
-      "layout": [
-        {"matrix": [0, 0], "x": 0, "y": 0},
-        {"matrix": [0, 1], "x": 1, "y": 0},
-        {"matrix": [0, 2], "x": 2, "y": 0},
-        {"matrix": [0, 3], "x": 3, "y": 0},
-        {"matrix": [0, 4], "x": 4, "y": 0},
-        {"matrix": [0, 5], "x": 5, "y": 0},
-        {"matrix": [0, 6], "x": 6, "y": 0},
-        {"matrix": [0, 7], "x": 7, "y": 0},
-        {"matrix": [0, 8], "x": 8, "y": 0},
-        {"matrix": [0, 9], "x": 9, "y": 0},
-        {"matrix": [0, 10], "x": 10, "y": 0},
-        {"matrix": [0, 11], "x": 11, "y": 0},
-        {"matrix": [0, 12], "x": 12, "y": 0},
-        {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-        {"matrix": [0, 14], "x": 15, "y": 0},
-        {"matrix": [0, 15], "x": 16, "y": 0},
-        {"matrix": [0, 16], "x": 17, "y": 0},
-        {"matrix": [0, 17], "x": 18, "y": 0},
-
-        {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-        {"matrix": [1, 1], "x": 1.5, "y": 1},
-        {"matrix": [1, 2], "x": 2.5, "y": 1},
-        {"matrix": [1, 3], "x": 3.5, "y": 1},
-        {"matrix": [1, 4], "x": 4.5, "y": 1},
-        {"matrix": [1, 5], "x": 5.5, "y": 1},
-        {"matrix": [1, 6], "x": 6.5, "y": 1},
-        {"matrix": [1, 7], "x": 7.5, "y": 1},
-        {"matrix": [1, 8], "x": 8.5, "y": 1},
-        {"matrix": [1, 9], "x": 9.5, "y": 1},
-        {"matrix": [1, 10], "x": 10.5, "y": 1},
-        {"matrix": [1, 11], "x": 11.5, "y": 1},
-        {"matrix": [1, 12], "x": 12.5, "y": 1},
-        {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-        {"matrix": [1, 14], "x": 15, "y": 1},
-        {"matrix": [1, 15], "x": 16, "y": 1},
-        {"matrix": [1, 16], "x": 17, "y": 1},
-
-        {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-        {"matrix": [2, 1], "x": 1.75, "y": 2},
-        {"matrix": [2, 2], "x": 2.75, "y": 2},
-        {"matrix": [2, 3], "x": 3.75, "y": 2},
-        {"matrix": [2, 4], "x": 4.75, "y": 2},
-        {"matrix": [2, 5], "x": 5.75, "y": 2},
-        {"matrix": [2, 6], "x": 6.75, "y": 2},
-        {"matrix": [2, 7], "x": 7.75, "y": 2},
-        {"matrix": [2, 8], "x": 8.75, "y": 2},
-        {"matrix": [2, 9], "x": 9.75, "y": 2},
-        {"matrix": [2, 10], "x": 10.75, "y": 2},
-        {"matrix": [2, 11], "x": 11.75, "y": 2},
-        {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
-        {"matrix": [2, 14], "x": 15, "y": 2},
-        {"matrix": [2, 15], "x": 16, "y": 2},
-        {"matrix": [2, 16], "x": 17, "y": 2},
-        {"matrix": [1, 17], "x": 18, "y": 1, "h": 2},
-
-        {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-        {"matrix": [3, 2], "x": 2.25, "y": 3},
-        {"matrix": [3, 3], "x": 3.25, "y": 3},
-        {"matrix": [3, 4], "x": 4.25, "y": 3},
-        {"matrix": [3, 5], "x": 5.25, "y": 3},
-        {"matrix": [3, 6], "x": 6.25, "y": 3},
-        {"matrix": [3, 7], "x": 7.25, "y": 3},
-        {"matrix": [3, 8], "x": 8.25, "y": 3},
-        {"matrix": [3, 9], "x": 9.25, "y": 3},
-        {"matrix": [3, 10], "x": 10.25, "y": 3},
-        {"matrix": [3, 11], "x": 11.25, "y": 3},
-        {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
-        {"matrix": [3, 14], "x": 15, "y": 3},
-        {"matrix": [3, 15], "x": 16, "y": 3},
-        {"matrix": [3, 16], "x": 17, "y": 3},
-
-        {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-        {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-        {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-        {"matrix": [4, 9], "x": 3.75, "y": 4, "w": 6.25},
-        {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
-        {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
-        {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
-        {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25},
-        {"matrix": [4, 14], "x": 15, "y": 4},
-        {"matrix": [4, 15], "x": 16, "y": 4},
-        {"matrix": [4, 16], "x": 17, "y": 4},
-        {"matrix": [4, 17], "x": 18, "y": 3, "h": 2}
-      ]
-    },
-    "LAYOUT_60_ansi_numpad": {
-      "layout": [
-        {"matrix": [0, 0], "x": 0, "y": 0},
-        {"matrix": [0, 1], "x": 1, "y": 0},
-        {"matrix": [0, 2], "x": 2, "y": 0},
-        {"matrix": [0, 3], "x": 3, "y": 0},
-        {"matrix": [0, 4], "x": 4, "y": 0},
-        {"matrix": [0, 5], "x": 5, "y": 0},
-        {"matrix": [0, 6], "x": 6, "y": 0},
-        {"matrix": [0, 7], "x": 7, "y": 0},
-        {"matrix": [0, 8], "x": 8, "y": 0},
-        {"matrix": [0, 9], "x": 9, "y": 0},
-        {"matrix": [0, 10], "x": 10, "y": 0},
-        {"matrix": [0, 11], "x": 11, "y": 0},
-        {"matrix": [0, 12], "x": 12, "y": 0},
-        {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-        {"matrix": [0, 14], "x": 15, "y": 0},
-        {"matrix": [0, 15], "x": 16, "y": 0},
-        {"matrix": [0, 16], "x": 17, "y": 0},
-        {"matrix": [0, 17], "x": 18, "y": 0},
-
-        {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-        {"matrix": [1, 1], "x": 1.5, "y": 1},
-        {"matrix": [1, 2], "x": 2.5, "y": 1},
-        {"matrix": [1, 3], "x": 3.5, "y": 1},
-        {"matrix": [1, 4], "x": 4.5, "y": 1},
-        {"matrix": [1, 5], "x": 5.5, "y": 1},
-        {"matrix": [1, 6], "x": 6.5, "y": 1},
-        {"matrix": [1, 7], "x": 7.5, "y": 1},
-        {"matrix": [1, 8], "x": 8.5, "y": 1},
-        {"matrix": [1, 9], "x": 9.5, "y": 1},
-        {"matrix": [1, 10], "x": 10.5, "y": 1},
-        {"matrix": [1, 11], "x": 11.5, "y": 1},
-        {"matrix": [1, 12], "x": 12.5, "y": 1},
-        {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-        {"matrix": [1, 14], "x": 15, "y": 1},
-        {"matrix": [1, 15], "x": 16, "y": 1},
-        {"matrix": [1, 16], "x": 17, "y": 1},
-
-        {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-        {"matrix": [2, 1], "x": 1.75, "y": 2},
-        {"matrix": [2, 2], "x": 2.75, "y": 2},
-        {"matrix": [2, 3], "x": 3.75, "y": 2},
-        {"matrix": [2, 4], "x": 4.75, "y": 2},
-        {"matrix": [2, 5], "x": 5.75, "y": 2},
-        {"matrix": [2, 6], "x": 6.75, "y": 2},
-        {"matrix": [2, 7], "x": 7.75, "y": 2},
-        {"matrix": [2, 8], "x": 8.75, "y": 2},
-        {"matrix": [2, 9], "x": 9.75, "y": 2},
-        {"matrix": [2, 10], "x": 10.75, "y": 2},
-        {"matrix": [2, 11], "x": 11.75, "y": 2},
-        {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
-        {"matrix": [2, 14], "x": 15, "y": 2},
-        {"matrix": [2, 15], "x": 16, "y": 2},
-        {"matrix": [2, 16], "x": 17, "y": 2},
-        {"matrix": [1, 17], "x": 18, "y": 1, "h": 2},
-
-        {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-        {"matrix": [3, 2], "x": 2.25, "y": 3},
-        {"matrix": [3, 3], "x": 3.25, "y": 3},
-        {"matrix": [3, 4], "x": 4.25, "y": 3},
-        {"matrix": [3, 5], "x": 5.25, "y": 3},
-        {"matrix": [3, 6], "x": 6.25, "y": 3},
-        {"matrix": [3, 7], "x": 7.25, "y": 3},
-        {"matrix": [3, 8], "x": 8.25, "y": 3},
-        {"matrix": [3, 9], "x": 9.25, "y": 3},
-        {"matrix": [3, 10], "x": 10.25, "y": 3},
-        {"matrix": [3, 11], "x": 11.25, "y": 3},
-        {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
-        {"matrix": [3, 14], "x": 15, "y": 3},
-        {"matrix": [3, 15], "x": 16, "y": 3},
-        {"matrix": [3, 16], "x": 17, "y": 3},
-
-        {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-        {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-        {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-        {"matrix": [4, 9], "x": 3.75, "y": 4, "w": 6.25},
-        {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
-        {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
-        {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
-        {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25},
-        {"matrix": [4, 14], "x": 15, "y": 4, "w": 2},
-        {"matrix": [4, 16], "x": 17, "y": 4},
-        {"matrix": [4, 17], "x": 18, "y": 3, "h": 2}
-      ]
-    }
-  }
-}
diff --git a/keyboards/redscarf_iiplus/verd/keyboard.json b/keyboards/redscarf_iiplus/verd/keyboard.json
new file mode 100644
index 00000000000..ef8dba4a4e1
--- /dev/null
+++ b/keyboards/redscarf_iiplus/verd/keyboard.json
@@ -0,0 +1,203 @@
+{
+  "keyboard_name": "RedScarfII+ Ver.D",
+  "manufacturer": "RedScarf",
+  "url": "",
+  "maintainer": "qmk",
+  "usb": {
+    "vid": "0xFEED",
+    "pid": "0x7778",
+    "device_version": "0.0.1"
+  },
+  "features": {
+    "backlight": true,
+    "bootmagic": false,
+    "extrakey": true,
+    "mousekey": false,
+    "nkro": true
+  },
+  "backlight": {
+    "pin": "B7"
+  },
+  "indicators": {
+    "caps_lock": "C6",
+    "num_lock": "E6",
+    "on_state": 0
+  },
+  "processor": "atmega32u4",
+  "bootloader": "halfkay",
+  "layouts": {
+    "LAYOUT_60_ansi_numpad_split0": {
+      "layout": [
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0},
+        {"matrix": [0, 5], "x": 5, "y": 0},
+        {"matrix": [0, 6], "x": 6, "y": 0},
+        {"matrix": [0, 7], "x": 7, "y": 0},
+        {"matrix": [0, 8], "x": 8, "y": 0},
+        {"matrix": [0, 9], "x": 9, "y": 0},
+        {"matrix": [0, 10], "x": 10, "y": 0},
+        {"matrix": [0, 11], "x": 11, "y": 0},
+        {"matrix": [0, 12], "x": 12, "y": 0},
+        {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+        {"matrix": [0, 14], "x": 15, "y": 0},
+        {"matrix": [0, 15], "x": 16, "y": 0},
+        {"matrix": [0, 16], "x": 17, "y": 0},
+        {"matrix": [0, 17], "x": 18, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+        {"matrix": [1, 1], "x": 1.5, "y": 1},
+        {"matrix": [1, 2], "x": 2.5, "y": 1},
+        {"matrix": [1, 3], "x": 3.5, "y": 1},
+        {"matrix": [1, 4], "x": 4.5, "y": 1},
+        {"matrix": [1, 5], "x": 5.5, "y": 1},
+        {"matrix": [1, 6], "x": 6.5, "y": 1},
+        {"matrix": [1, 7], "x": 7.5, "y": 1},
+        {"matrix": [1, 8], "x": 8.5, "y": 1},
+        {"matrix": [1, 9], "x": 9.5, "y": 1},
+        {"matrix": [1, 10], "x": 10.5, "y": 1},
+        {"matrix": [1, 11], "x": 11.5, "y": 1},
+        {"matrix": [1, 12], "x": 12.5, "y": 1},
+        {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+        {"matrix": [1, 14], "x": 15, "y": 1},
+        {"matrix": [1, 15], "x": 16, "y": 1},
+        {"matrix": [1, 16], "x": 17, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+        {"matrix": [2, 1], "x": 1.75, "y": 2},
+        {"matrix": [2, 2], "x": 2.75, "y": 2},
+        {"matrix": [2, 3], "x": 3.75, "y": 2},
+        {"matrix": [2, 4], "x": 4.75, "y": 2},
+        {"matrix": [2, 5], "x": 5.75, "y": 2},
+        {"matrix": [2, 6], "x": 6.75, "y": 2},
+        {"matrix": [2, 7], "x": 7.75, "y": 2},
+        {"matrix": [2, 8], "x": 8.75, "y": 2},
+        {"matrix": [2, 9], "x": 9.75, "y": 2},
+        {"matrix": [2, 10], "x": 10.75, "y": 2},
+        {"matrix": [2, 11], "x": 11.75, "y": 2},
+        {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+        {"matrix": [2, 14], "x": 15, "y": 2},
+        {"matrix": [2, 15], "x": 16, "y": 2},
+        {"matrix": [2, 16], "x": 17, "y": 2},
+        {"matrix": [1, 17], "x": 18, "y": 1, "h": 2},
+
+        {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+        {"matrix": [3, 2], "x": 2.25, "y": 3},
+        {"matrix": [3, 3], "x": 3.25, "y": 3},
+        {"matrix": [3, 4], "x": 4.25, "y": 3},
+        {"matrix": [3, 5], "x": 5.25, "y": 3},
+        {"matrix": [3, 6], "x": 6.25, "y": 3},
+        {"matrix": [3, 7], "x": 7.25, "y": 3},
+        {"matrix": [3, 8], "x": 8.25, "y": 3},
+        {"matrix": [3, 9], "x": 9.25, "y": 3},
+        {"matrix": [3, 10], "x": 10.25, "y": 3},
+        {"matrix": [3, 11], "x": 11.25, "y": 3},
+        {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
+        {"matrix": [3, 14], "x": 15, "y": 3},
+        {"matrix": [3, 15], "x": 16, "y": 3},
+        {"matrix": [3, 16], "x": 17, "y": 3},
+
+        {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+        {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+        {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+        {"matrix": [4, 9], "x": 3.75, "y": 4, "w": 6.25},
+        {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+        {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+        {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+        {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25},
+        {"matrix": [4, 14], "x": 15, "y": 4},
+        {"matrix": [4, 15], "x": 16, "y": 4},
+        {"matrix": [4, 16], "x": 17, "y": 4},
+        {"matrix": [4, 17], "x": 18, "y": 3, "h": 2}
+      ]
+    },
+    "LAYOUT_60_ansi_numpad": {
+      "layout": [
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0},
+        {"matrix": [0, 5], "x": 5, "y": 0},
+        {"matrix": [0, 6], "x": 6, "y": 0},
+        {"matrix": [0, 7], "x": 7, "y": 0},
+        {"matrix": [0, 8], "x": 8, "y": 0},
+        {"matrix": [0, 9], "x": 9, "y": 0},
+        {"matrix": [0, 10], "x": 10, "y": 0},
+        {"matrix": [0, 11], "x": 11, "y": 0},
+        {"matrix": [0, 12], "x": 12, "y": 0},
+        {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+        {"matrix": [0, 14], "x": 15, "y": 0},
+        {"matrix": [0, 15], "x": 16, "y": 0},
+        {"matrix": [0, 16], "x": 17, "y": 0},
+        {"matrix": [0, 17], "x": 18, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+        {"matrix": [1, 1], "x": 1.5, "y": 1},
+        {"matrix": [1, 2], "x": 2.5, "y": 1},
+        {"matrix": [1, 3], "x": 3.5, "y": 1},
+        {"matrix": [1, 4], "x": 4.5, "y": 1},
+        {"matrix": [1, 5], "x": 5.5, "y": 1},
+        {"matrix": [1, 6], "x": 6.5, "y": 1},
+        {"matrix": [1, 7], "x": 7.5, "y": 1},
+        {"matrix": [1, 8], "x": 8.5, "y": 1},
+        {"matrix": [1, 9], "x": 9.5, "y": 1},
+        {"matrix": [1, 10], "x": 10.5, "y": 1},
+        {"matrix": [1, 11], "x": 11.5, "y": 1},
+        {"matrix": [1, 12], "x": 12.5, "y": 1},
+        {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+        {"matrix": [1, 14], "x": 15, "y": 1},
+        {"matrix": [1, 15], "x": 16, "y": 1},
+        {"matrix": [1, 16], "x": 17, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+        {"matrix": [2, 1], "x": 1.75, "y": 2},
+        {"matrix": [2, 2], "x": 2.75, "y": 2},
+        {"matrix": [2, 3], "x": 3.75, "y": 2},
+        {"matrix": [2, 4], "x": 4.75, "y": 2},
+        {"matrix": [2, 5], "x": 5.75, "y": 2},
+        {"matrix": [2, 6], "x": 6.75, "y": 2},
+        {"matrix": [2, 7], "x": 7.75, "y": 2},
+        {"matrix": [2, 8], "x": 8.75, "y": 2},
+        {"matrix": [2, 9], "x": 9.75, "y": 2},
+        {"matrix": [2, 10], "x": 10.75, "y": 2},
+        {"matrix": [2, 11], "x": 11.75, "y": 2},
+        {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+        {"matrix": [2, 14], "x": 15, "y": 2},
+        {"matrix": [2, 15], "x": 16, "y": 2},
+        {"matrix": [2, 16], "x": 17, "y": 2},
+        {"matrix": [1, 17], "x": 18, "y": 1, "h": 2},
+
+        {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+        {"matrix": [3, 2], "x": 2.25, "y": 3},
+        {"matrix": [3, 3], "x": 3.25, "y": 3},
+        {"matrix": [3, 4], "x": 4.25, "y": 3},
+        {"matrix": [3, 5], "x": 5.25, "y": 3},
+        {"matrix": [3, 6], "x": 6.25, "y": 3},
+        {"matrix": [3, 7], "x": 7.25, "y": 3},
+        {"matrix": [3, 8], "x": 8.25, "y": 3},
+        {"matrix": [3, 9], "x": 9.25, "y": 3},
+        {"matrix": [3, 10], "x": 10.25, "y": 3},
+        {"matrix": [3, 11], "x": 11.25, "y": 3},
+        {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
+        {"matrix": [3, 14], "x": 15, "y": 3},
+        {"matrix": [3, 15], "x": 16, "y": 3},
+        {"matrix": [3, 16], "x": 17, "y": 3},
+
+        {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+        {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+        {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+        {"matrix": [4, 9], "x": 3.75, "y": 4, "w": 6.25},
+        {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+        {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+        {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+        {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25},
+        {"matrix": [4, 14], "x": 15, "y": 4, "w": 2},
+        {"matrix": [4, 16], "x": 17, "y": 4},
+        {"matrix": [4, 17], "x": 18, "y": 3, "h": 2}
+      ]
+    }
+  }
+}
diff --git a/keyboards/redscarf_iiplus/verd/rules.mk b/keyboards/redscarf_iiplus/verd/rules.mk
index 4164035629a..8784813b335 100644
--- a/keyboards/redscarf_iiplus/verd/rules.mk
+++ b/keyboards/redscarf_iiplus/verd/rules.mk
@@ -1,15 +1,2 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no       # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
 CUSTOM_MATRIX = yes
 SRC += matrix.c
diff --git a/keyboards/reviung/reviung61/config.h b/keyboards/reviung/reviung61/config.h
deleted file mode 100644
index 2e9cb65b562..00000000000
--- a/keyboards/reviung/reviung61/config.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
-Copyright 2020 gtips
-
-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
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/reviung/reviung61/info.json b/keyboards/reviung/reviung61/info.json
deleted file mode 100644
index c76f797d409..00000000000
--- a/keyboards/reviung/reviung61/info.json
+++ /dev/null
@@ -1,90 +0,0 @@
-{
-    "keyboard_name": "reviung61",
-    "manufacturer": "gtips",
-    "url": "",
-    "maintainer": "gtips",
-    "usb": {
-        "vid": "0xFEED",
-        "pid": "0x7C1A",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"],
-        "rows": ["D0", "D1", "D2", "D3", "D5"]
-    },
-    "diode_direction": "COL2ROW",
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "community_layouts": ["60_ansi"],
-    "layouts": {
-        "LAYOUT_60_ansi": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 1], "x": 2.25, "y": 3},
-                {"matrix": [3, 2], "x": 3.25, "y": 3},
-                {"matrix": [3, 3], "x": 4.25, "y": 3},
-                {"matrix": [3, 4], "x": 5.25, "y": 3},
-                {"matrix": [3, 5], "x": 6.25, "y": 3},
-                {"matrix": [3, 6], "x": 7.25, "y": 3},
-                {"matrix": [3, 7], "x": 8.25, "y": 3},
-                {"matrix": [3, 8], "x": 9.25, "y": 3},
-                {"matrix": [3, 9], "x": 10.25, "y": 3},
-                {"matrix": [3, 10], "x": 11.25, "y": 3},
-                {"matrix": [3, 11], "x": 12.25, "y": 3, "w": 2.75},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
-                {"matrix": [4, 8], "x": 10, "y": 4, "w": 1.25},
-                {"matrix": [4, 9], "x": 11.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 10], "x": 12.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 11], "x": 13.75, "y": 4, "w": 1.25}
-            ]
-        }
-    }
-}
diff --git a/keyboards/reviung/reviung61/keyboard.json b/keyboards/reviung/reviung61/keyboard.json
new file mode 100644
index 00000000000..99a297bde4c
--- /dev/null
+++ b/keyboards/reviung/reviung61/keyboard.json
@@ -0,0 +1,102 @@
+{
+    "keyboard_name": "reviung61",
+    "manufacturer": "gtips",
+    "url": "",
+    "maintainer": "gtips",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0x7C1A",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": false,
+        "extrakey": false,
+        "mousekey": false,
+        "nkro": false
+    },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
+    "matrix_pins": {
+        "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"],
+        "rows": ["D0", "D1", "D2", "D3", "D5"]
+    },
+    "diode_direction": "COL2ROW",
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "community_layouts": ["60_ansi"],
+    "layouts": {
+        "LAYOUT_60_ansi": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 10], "x": 11.25, "y": 3},
+                {"matrix": [3, 11], "x": 12.25, "y": 3, "w": 2.75},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 8], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 9], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 13.75, "y": 4, "w": 1.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/reviung/reviung61/rules.mk b/keyboards/reviung/reviung61/rules.mk
deleted file mode 100644
index ad81ce036a2..00000000000
--- a/keyboards/reviung/reviung61/rules.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no       # Mouse keys
-EXTRAKEY_ENABLE = no       # Audio control and System control
-CONSOLE_ENABLE = no        # Console for debug
-COMMAND_ENABLE = no        # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
diff --git a/keyboards/rgbkb/pan/pan.c b/keyboards/rgbkb/pan/pan.c
index 191ff1ac1fb..401831e0e20 100644
--- a/keyboards/rgbkb/pan/pan.c
+++ b/keyboards/rgbkb/pan/pan.c
@@ -42,7 +42,7 @@ static inline void setled(int i, uint8_t r, uint8_t g, uint8_t b) {
         rgb_matrix_ws2812_array[i].g = g;
         rgb_matrix_ws2812_array[i].b = b;
     }
-#        ifdef RGBW
+#        ifdef WS2812_RGBW
     convert_rgb_to_rgbw(&rgb_matrix_ws2812_array[i]);
 #        endif
 }
diff --git a/keyboards/rgbkb/pan/rev1/32a/info.json b/keyboards/rgbkb/pan/rev1/32a/keyboard.json
similarity index 100%
rename from keyboards/rgbkb/pan/rev1/32a/info.json
rename to keyboards/rgbkb/pan/rev1/32a/keyboard.json
diff --git a/keyboards/rgbkb/pan/rev1/proton_c/keyboard.json b/keyboards/rgbkb/pan/rev1/proton_c/keyboard.json
index ff81cd10925..2ad3c056c8e 100644
--- a/keyboards/rgbkb/pan/rev1/proton_c/keyboard.json
+++ b/keyboards/rgbkb/pan/rev1/proton_c/keyboard.json
@@ -4,9 +4,7 @@
         "rows": ["A15", "B10", "A14", "A13", "A7"]
     },
     "diode_direction": "COL2ROW",
-    "processor": "STM32F303",
-    "bootloader": "stm32-dfu",
-    "board": "QMK_PROTON_C",
+    "development_board": "proton_c",
     "encoder": {
         "rotary": [
             {"pin_a": "B14", "pin_b": "B15"},
diff --git a/keyboards/rgbkb/sol/rev1/info.json b/keyboards/rgbkb/sol/rev1/keyboard.json
similarity index 100%
rename from keyboards/rgbkb/sol/rev1/info.json
rename to keyboards/rgbkb/sol/rev1/keyboard.json
diff --git a/keyboards/rgbkb/sol/rev2/info.json b/keyboards/rgbkb/sol/rev2/keyboard.json
similarity index 100%
rename from keyboards/rgbkb/sol/rev2/info.json
rename to keyboards/rgbkb/sol/rev2/keyboard.json
diff --git a/keyboards/rgbkb/sol3/rev1/keyboard.json b/keyboards/rgbkb/sol3/rev1/keyboard.json
index 3b8b7d060c8..83e0a7a9275 100644
--- a/keyboards/rgbkb/sol3/rev1/keyboard.json
+++ b/keyboards/rgbkb/sol3/rev1/keyboard.json
@@ -24,6 +24,9 @@
             "twinkle": true
         }
     },
+    "audio": {
+        "driver": "dac_additive"
+    },
     "ws2812": {
         "pin": "B5",
         "driver": "pwm"
diff --git a/keyboards/rgbkb/sol3/rules.mk b/keyboards/rgbkb/sol3/rules.mk
index bf22130a55a..0c48b5d30e4 100644
--- a/keyboards/rgbkb/sol3/rules.mk
+++ b/keyboards/rgbkb/sol3/rules.mk
@@ -14,7 +14,6 @@ CONSOLE_ENABLE = no        # Console for debug
 COMMAND_ENABLE = no         # Commands for debug and configuration
 NKRO_ENABLE = yes           # Enable N-Key Rollover
 AUDIO_ENABLE = yes          # Audio output
-AUDIO_DRIVER = dac_additive
 
 DYNAMIC_MACRO_ENABLE = yes
 DIP_SWITCH_ENABLE = yes
diff --git a/keyboards/rgbkb/zen/rev2/info.json b/keyboards/rgbkb/zen/rev2/keyboard.json
similarity index 100%
rename from keyboards/rgbkb/zen/rev2/info.json
rename to keyboards/rgbkb/zen/rev2/keyboard.json
diff --git a/keyboards/ristretto/config.h b/keyboards/ristretto/config.h
deleted file mode 100644
index de203ddc4e6..00000000000
--- a/keyboards/ristretto/config.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Copyright 2021 Brandon Lewis
-  * 
-  * 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
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/ristretto/info.json b/keyboards/ristretto/info.json
deleted file mode 100644
index 3853accd9b7..00000000000
--- a/keyboards/ristretto/info.json
+++ /dev/null
@@ -1,86 +0,0 @@
-{
-    "keyboard_name": "ristretto",
-    "manufacturer": "fruitykeeb",
-    "url": "https://www.fruitykeeb.xyz/product/ristretto",
-    "maintainer": "Fruit",
-    "usb": {
-        "vid": "0x666B",
-        "pid": "0x7273",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["C7", "C6", "B6", "B5", "B4", "D7", "B7", "F0", "F1", "F4", "F5", "F6", "F7"],
-        "rows": ["B1", "B2", "B3", "D3"]
-    },
-    "diode_direction": "COL2ROW",
-    "encoder": {
-        "rotary": [
-            {"pin_a": "D4", "pin_b": "D6"}
-        ]
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0.25},
-                {"matrix": [0, 1], "x": 1, "y": 0.25},
-                {"matrix": [0, 2], "x": 2, "y": 0.25},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0.25},
-                {"matrix": [0, 5], "x": 5, "y": 0.25},
-
-                {"matrix": [0, 7], "x": 9, "y": 0.25},
-                {"matrix": [0, 8], "x": 10, "y": 0.25},
-                {"matrix": [0, 9], "x": 11, "y": 0},
-                {"matrix": [0, 10], "x": 12, "y": 0.25},
-                {"matrix": [0, 11], "x": 13, "y": 0.25},
-                {"matrix": [0, 12], "x": 14, "y": 0.25},
-
-                {"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},
-                {"matrix": [1, 4], "x": 4, "y": 1.25},
-                {"matrix": [1, 5], "x": 5, "y": 1.25},
-
-                {"matrix": [1, 7], "x": 9, "y": 1.25},
-                {"matrix": [1, 8], "x": 10, "y": 1.25},
-                {"matrix": [1, 9], "x": 11, "y": 1},
-                {"matrix": [1, 10], "x": 12, "y": 1.25},
-                {"matrix": [1, 11], "x": 13, "y": 1.25},
-                {"matrix": [1, 12], "x": 14, "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},
-                {"matrix": [2, 4], "x": 4, "y": 2.25},
-                {"matrix": [2, 5], "x": 5, "y": 2.25},
-
-                {"matrix": [2, 7], "x": 9, "y": 2.25},
-                {"matrix": [2, 8], "x": 10, "y": 2.25},
-                {"matrix": [2, 9], "x": 11, "y": 2},
-                {"matrix": [2, 10], "x": 12, "y": 2.25},
-                {"matrix": [2, 11], "x": 13, "y": 2.25},
-                {"matrix": [2, 12], "x": 14, "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, "h": 1.25},
-                {"matrix": [3, 4], "x": 4, "y": 3.25},
-                {"matrix": [3, 5], "x": 5, "y": 3.25, "w": 1.5},
-
-                {"matrix": [3, 6], "x": 7, "y": 3.25},
-
-                {"matrix": [3, 7], "x": 8.5, "y": 3.25, "w": 1.5},
-                {"matrix": [3, 8], "x": 10, "y": 3.25},
-                {"matrix": [3, 9], "x": 11, "y": 3, "h": 1.25},
-                {"matrix": [3, 10], "x": 12, "y": 3.25},
-                {"matrix": [3, 11], "x": 13, "y": 3.25},
-                {"matrix": [3, 12], "x": 14, "y": 3.25}
-            ]
-        }
-    }
-}
diff --git a/keyboards/ristretto/keyboard.json b/keyboards/ristretto/keyboard.json
new file mode 100644
index 00000000000..e8e812b7d2f
--- /dev/null
+++ b/keyboards/ristretto/keyboard.json
@@ -0,0 +1,101 @@
+{
+    "keyboard_name": "ristretto",
+    "manufacturer": "fruitykeeb",
+    "url": "https://www.fruitykeeb.xyz/product/ristretto",
+    "maintainer": "Fruit",
+    "usb": {
+        "vid": "0x666B",
+        "pid": "0x7273",
+        "device_version": "0.0.1",
+        "wait_for_enumeration": true
+    },
+    "features": {
+        "bootmagic": false,
+        "encoder": true,
+        "extrakey": true,
+        "mousekey": false,
+        "nkro": true,
+        "oled": true
+    },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
+    "matrix_pins": {
+        "cols": ["C7", "C6", "B6", "B5", "B4", "D7", "B7", "F0", "F1", "F4", "F5", "F6", "F7"],
+        "rows": ["B1", "B2", "B3", "D3"]
+    },
+    "diode_direction": "COL2ROW",
+    "encoder": {
+        "rotary": [
+            {"pin_a": "D4", "pin_b": "D6"}
+        ]
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0.25},
+                {"matrix": [0, 1], "x": 1, "y": 0.25},
+                {"matrix": [0, 2], "x": 2, "y": 0.25},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0.25},
+                {"matrix": [0, 5], "x": 5, "y": 0.25},
+
+                {"matrix": [0, 7], "x": 9, "y": 0.25},
+                {"matrix": [0, 8], "x": 10, "y": 0.25},
+                {"matrix": [0, 9], "x": 11, "y": 0},
+                {"matrix": [0, 10], "x": 12, "y": 0.25},
+                {"matrix": [0, 11], "x": 13, "y": 0.25},
+                {"matrix": [0, 12], "x": 14, "y": 0.25},
+
+                {"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},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+
+                {"matrix": [1, 7], "x": 9, "y": 1.25},
+                {"matrix": [1, 8], "x": 10, "y": 1.25},
+                {"matrix": [1, 9], "x": 11, "y": 1},
+                {"matrix": [1, 10], "x": 12, "y": 1.25},
+                {"matrix": [1, 11], "x": 13, "y": 1.25},
+                {"matrix": [1, 12], "x": 14, "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},
+                {"matrix": [2, 4], "x": 4, "y": 2.25},
+                {"matrix": [2, 5], "x": 5, "y": 2.25},
+
+                {"matrix": [2, 7], "x": 9, "y": 2.25},
+                {"matrix": [2, 8], "x": 10, "y": 2.25},
+                {"matrix": [2, 9], "x": 11, "y": 2},
+                {"matrix": [2, 10], "x": 12, "y": 2.25},
+                {"matrix": [2, 11], "x": 13, "y": 2.25},
+                {"matrix": [2, 12], "x": 14, "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, "h": 1.25},
+                {"matrix": [3, 4], "x": 4, "y": 3.25},
+                {"matrix": [3, 5], "x": 5, "y": 3.25, "w": 1.5},
+
+                {"matrix": [3, 6], "x": 7, "y": 3.25},
+
+                {"matrix": [3, 7], "x": 8.5, "y": 3.25, "w": 1.5},
+                {"matrix": [3, 8], "x": 10, "y": 3.25},
+                {"matrix": [3, 9], "x": 11, "y": 3, "h": 1.25},
+                {"matrix": [3, 10], "x": 12, "y": 3.25},
+                {"matrix": [3, 11], "x": 13, "y": 3.25},
+                {"matrix": [3, 12], "x": 14, "y": 3.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/ristretto/rules.mk b/keyboards/ristretto/rules.mk
deleted file mode 100644
index 13002485f83..00000000000
--- a/keyboards/ristretto/rules.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-ENCODER_ENABLE = yes
-OLED_ENABLE = yes
-WAIT_FOR_USB = yes
diff --git a/keyboards/rmi_kb/aelith/info.json b/keyboards/rmi_kb/aelith/info.json
deleted file mode 100644
index 269839dfe5d..00000000000
--- a/keyboards/rmi_kb/aelith/info.json
+++ /dev/null
@@ -1,182 +0,0 @@
-{
-    "keyboard_name": "AELITH",
-    "manufacturer": "RMI-KB",
-    "url": "",
-    "maintainer": "ramonimbao",
-    "usb": {
-        "vid": "0xB16B",
-        "pid": "0xE460",
-        "device_version": "0.1.2"
-    },
-    "matrix_pins": {
-        "cols": ["D7", "C0", "C1", "C2", "C3", "C4", "C5", "C6", "C7", "A6", "A5", "A0", "A1", "A2", "A3", "A4"],
-        "rows": ["D5", "D1", "D0", "D6", "A7"]
-    },
-    "diode_direction": "COL2ROW",
-    "processor": "atmega32a",
-    "bootloader": "usbasploader",
-    "community_layouts": ["alice", "alice_split_bs"],
-    "layouts": {
-        "LAYOUT_alice_split_bs": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0.5, "y": 0},
-
-                {"matrix": [0, 1], "x": 1.75, "y": 0},
-                {"matrix": [0, 2], "x": 2.75, "y": 0},
-                {"matrix": [0, 3], "x": 3.75, "y": 0},
-                {"matrix": [0, 4], "x": 4.75, "y": 0},
-                {"matrix": [0, 5], "x": 5.75, "y": 0},
-                {"matrix": [0, 6], "x": 6.75, "y": 0},
-                {"matrix": [0, 7], "x": 7.75, "y": 0},
-
-                {"matrix": [0, 8], "x": 11, "y": 0},
-                {"matrix": [0, 9], "x": 12, "y": 0},
-                {"matrix": [0, 10], "x": 13, "y": 0},
-                {"matrix": [0, 11], "x": 14, "y": 0},
-                {"matrix": [0, 12], "x": 15, "y": 0},
-                {"matrix": [0, 13], "x": 16, "y": 0},
-                {"matrix": [0, 14], "x": 17, "y": 0},
-                {"matrix": [0, 15], "x": 18, "y": 0},
-
-                {"matrix": [1, 0], "x": 0.25, "y": 1},
-
-                {"matrix": [1, 1], "x": 1.75, "y": 1, "w": 1.5},
-                {"matrix": [1, 2], "x": 3.25, "y": 1},
-                {"matrix": [1, 3], "x": 4.25, "y": 1},
-                {"matrix": [1, 4], "x": 5.25, "y": 1},
-                {"matrix": [1, 5], "x": 6.25, "y": 1},
-                {"matrix": [1, 6], "x": 7.25, "y": 1},
-
-                {"matrix": [1, 8], "x": 10.5, "y": 1},
-                {"matrix": [1, 9], "x": 11.5, "y": 1},
-                {"matrix": [1, 10], "x": 12.5, "y": 1},
-                {"matrix": [1, 11], "x": 13.5, "y": 1},
-                {"matrix": [1, 12], "x": 14.5, "y": 1},
-                {"matrix": [1, 13], "x": 15.5, "y": 1},
-                {"matrix": [1, 14], "x": 16.5, "y": 1},
-                {"matrix": [1, 15], "x": 17.5, "y": 1, "w": 1.5},
-
-                {"matrix": [2, 0], "x": 0, "y": 2},
-
-                {"matrix": [2, 1], "x": 1.75, "y": 2, "w": 1.75},
-                {"matrix": [2, 2], "x": 3.5, "y": 2},
-                {"matrix": [2, 3], "x": 4.5, "y": 2},
-                {"matrix": [2, 4], "x": 5.5, "y": 2},
-                {"matrix": [2, 5], "x": 6.5, "y": 2},
-                {"matrix": [2, 6], "x": 7.5, "y": 2},
-
-                {"matrix": [2, 8], "x": 10.75, "y": 2},
-                {"matrix": [2, 9], "x": 11.75, "y": 2},
-                {"matrix": [2, 10], "x": 12.75, "y": 2},
-                {"matrix": [2, 11], "x": 13.75, "y": 2},
-                {"matrix": [2, 12], "x": 14.75, "y": 2},
-                {"matrix": [2, 13], "x": 15.75, "y": 2},
-                {"matrix": [2, 15], "x": 16.75, "y": 2, "w": 2.25},
-
-                {"matrix": [3, 1], "x": 1.75, "y": 3, "w": 2.25},
-                {"matrix": [3, 2], "x": 4, "y": 3},
-                {"matrix": [3, 3], "x": 5, "y": 3},
-                {"matrix": [3, 4], "x": 6, "y": 3},
-                {"matrix": [3, 5], "x": 7, "y": 3},
-                {"matrix": [3, 6], "x": 8, "y": 3},
-
-                {"matrix": [3, 8], "x": 10.25, "y": 3},
-                {"matrix": [3, 9], "x": 11.25, "y": 3},
-                {"matrix": [3, 10], "x": 12.25, "y": 3},
-                {"matrix": [3, 11], "x": 13.25, "y": 3},
-                {"matrix": [3, 12], "x": 14.25, "y": 3},
-                {"matrix": [3, 13], "x": 15.25, "y": 3},
-                {"matrix": [3, 14], "x": 16.25, "y": 3, "w": 1.75},
-                {"matrix": [3, 15], "x": 18, "y": 3},
-
-                {"matrix": [4, 1], "x": 1.75, "y": 4, "w": 1.5},
-                {"matrix": [4, 3], "x": 4.5, "y": 4, "w": 1.5},
-                {"matrix": [4, 4], "x": 6, "y": 4, "w": 2.25},
-                {"matrix": [4, 6], "x": 8.25, "y": 4},
-                {"matrix": [4, 9], "x": 10.25, "y": 4, "w": 2.75},
-                {"matrix": [4, 11], "x": 13, "y": 4, "w": 1.5},
-                {"matrix": [4, 15], "x": 17.5, "y": 4, "w": 1.5}
-            ]
-        },
-        "LAYOUT_alice": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0.5, "y": 0},
-
-                {"matrix": [0, 1], "x": 1.75, "y": 0},
-                {"matrix": [0, 2], "x": 2.75, "y": 0},
-                {"matrix": [0, 3], "x": 3.75, "y": 0},
-                {"matrix": [0, 4], "x": 4.75, "y": 0},
-                {"matrix": [0, 5], "x": 5.75, "y": 0},
-                {"matrix": [0, 6], "x": 6.75, "y": 0},
-                {"matrix": [0, 7], "x": 7.75, "y": 0},
-
-                {"matrix": [0, 8], "x": 11, "y": 0},
-                {"matrix": [0, 9], "x": 12, "y": 0},
-                {"matrix": [0, 10], "x": 13, "y": 0},
-                {"matrix": [0, 11], "x": 14, "y": 0},
-                {"matrix": [0, 12], "x": 15, "y": 0},
-                {"matrix": [0, 13], "x": 16, "y": 0},
-                {"matrix": [0, 15], "x": 17, "y": 0, "w": 2},
-
-                {"matrix": [1, 0], "x": 0.25, "y": 1},
-
-                {"matrix": [1, 1], "x": 1.75, "y": 1, "w": 1.5},
-                {"matrix": [1, 2], "x": 3.25, "y": 1},
-                {"matrix": [1, 3], "x": 4.25, "y": 1},
-                {"matrix": [1, 4], "x": 5.25, "y": 1},
-                {"matrix": [1, 5], "x": 6.25, "y": 1},
-                {"matrix": [1, 6], "x": 7.25, "y": 1},
-
-                {"matrix": [1, 8], "x": 10.5, "y": 1},
-                {"matrix": [1, 9], "x": 11.5, "y": 1},
-                {"matrix": [1, 10], "x": 12.5, "y": 1},
-                {"matrix": [1, 11], "x": 13.5, "y": 1},
-                {"matrix": [1, 12], "x": 14.5, "y": 1},
-                {"matrix": [1, 13], "x": 15.5, "y": 1},
-                {"matrix": [1, 14], "x": 16.5, "y": 1},
-                {"matrix": [1, 15], "x": 17.5, "y": 1, "w": 1.5},
-
-                {"matrix": [2, 0], "x": 0, "y": 2},
-
-                {"matrix": [2, 1], "x": 1.75, "y": 2, "w": 1.75},
-                {"matrix": [2, 2], "x": 3.5, "y": 2},
-                {"matrix": [2, 3], "x": 4.5, "y": 2},
-                {"matrix": [2, 4], "x": 5.5, "y": 2},
-                {"matrix": [2, 5], "x": 6.5, "y": 2},
-                {"matrix": [2, 6], "x": 7.5, "y": 2},
-
-                {"matrix": [2, 8], "x": 10.75, "y": 2},
-                {"matrix": [2, 9], "x": 11.75, "y": 2},
-                {"matrix": [2, 10], "x": 12.75, "y": 2},
-                {"matrix": [2, 11], "x": 13.75, "y": 2},
-                {"matrix": [2, 12], "x": 14.75, "y": 2},
-                {"matrix": [2, 13], "x": 15.75, "y": 2},
-                {"matrix": [2, 15], "x": 16.75, "y": 2, "w": 2.25},
-
-                {"matrix": [3, 1], "x": 1.75, "y": 3, "w": 2.25},
-                {"matrix": [3, 2], "x": 4, "y": 3},
-                {"matrix": [3, 3], "x": 5, "y": 3},
-                {"matrix": [3, 4], "x": 6, "y": 3},
-                {"matrix": [3, 5], "x": 7, "y": 3},
-                {"matrix": [3, 6], "x": 8, "y": 3},
-
-                {"matrix": [3, 8], "x": 10.25, "y": 3},
-                {"matrix": [3, 9], "x": 11.25, "y": 3},
-                {"matrix": [3, 10], "x": 12.25, "y": 3},
-                {"matrix": [3, 11], "x": 13.25, "y": 3},
-                {"matrix": [3, 12], "x": 14.25, "y": 3},
-                {"matrix": [3, 13], "x": 15.25, "y": 3},
-                {"matrix": [3, 14], "x": 16.25, "y": 3, "w": 1.75},
-                {"matrix": [3, 15], "x": 18, "y": 3},
-
-                {"matrix": [4, 1], "x": 1.75, "y": 4, "w": 1.5},
-                {"matrix": [4, 3], "x": 4.5, "y": 4, "w": 1.5},
-                {"matrix": [4, 4], "x": 6, "y": 4, "w": 2.25},
-                {"matrix": [4, 6], "x": 8.25, "y": 4},
-                {"matrix": [4, 9], "x": 10.25, "y": 4, "w": 2.75},
-                {"matrix": [4, 11], "x": 13, "y": 4, "w": 1.5},
-                {"matrix": [4, 15], "x": 17.5, "y": 4, "w": 1.5}
-            ]
-        }
-    }
-}
diff --git a/keyboards/rmi_kb/aelith/keyboard.json b/keyboards/rmi_kb/aelith/keyboard.json
new file mode 100644
index 00000000000..bacc4801876
--- /dev/null
+++ b/keyboards/rmi_kb/aelith/keyboard.json
@@ -0,0 +1,188 @@
+{
+    "keyboard_name": "AELITH",
+    "manufacturer": "RMI-KB",
+    "url": "",
+    "maintainer": "ramonimbao",
+    "usb": {
+        "vid": "0xB16B",
+        "pid": "0xE460",
+        "device_version": "0.1.2"
+    },
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": false
+    },
+    "matrix_pins": {
+        "cols": ["D7", "C0", "C1", "C2", "C3", "C4", "C5", "C6", "C7", "A6", "A5", "A0", "A1", "A2", "A3", "A4"],
+        "rows": ["D5", "D1", "D0", "D6", "A7"]
+    },
+    "diode_direction": "COL2ROW",
+    "processor": "atmega32a",
+    "bootloader": "usbasploader",
+    "community_layouts": ["alice", "alice_split_bs"],
+    "layouts": {
+        "LAYOUT_alice_split_bs": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0.5, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.75, "y": 0},
+                {"matrix": [0, 2], "x": 2.75, "y": 0},
+                {"matrix": [0, 3], "x": 3.75, "y": 0},
+                {"matrix": [0, 4], "x": 4.75, "y": 0},
+                {"matrix": [0, 5], "x": 5.75, "y": 0},
+                {"matrix": [0, 6], "x": 6.75, "y": 0},
+                {"matrix": [0, 7], "x": 7.75, "y": 0},
+
+                {"matrix": [0, 8], "x": 11, "y": 0},
+                {"matrix": [0, 9], "x": 12, "y": 0},
+                {"matrix": [0, 10], "x": 13, "y": 0},
+                {"matrix": [0, 11], "x": 14, "y": 0},
+                {"matrix": [0, 12], "x": 15, "y": 0},
+                {"matrix": [0, 13], "x": 16, "y": 0},
+                {"matrix": [0, 14], "x": 17, "y": 0},
+                {"matrix": [0, 15], "x": 18, "y": 0},
+
+                {"matrix": [1, 0], "x": 0.25, "y": 1},
+
+                {"matrix": [1, 1], "x": 1.75, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 3.25, "y": 1},
+                {"matrix": [1, 3], "x": 4.25, "y": 1},
+                {"matrix": [1, 4], "x": 5.25, "y": 1},
+                {"matrix": [1, 5], "x": 6.25, "y": 1},
+                {"matrix": [1, 6], "x": 7.25, "y": 1},
+
+                {"matrix": [1, 8], "x": 10.5, "y": 1},
+                {"matrix": [1, 9], "x": 11.5, "y": 1},
+                {"matrix": [1, 10], "x": 12.5, "y": 1},
+                {"matrix": [1, 11], "x": 13.5, "y": 1},
+                {"matrix": [1, 12], "x": 14.5, "y": 1},
+                {"matrix": [1, 13], "x": 15.5, "y": 1},
+                {"matrix": [1, 14], "x": 16.5, "y": 1},
+                {"matrix": [1, 15], "x": 17.5, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+
+                {"matrix": [2, 1], "x": 1.75, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 3.5, "y": 2},
+                {"matrix": [2, 3], "x": 4.5, "y": 2},
+                {"matrix": [2, 4], "x": 5.5, "y": 2},
+                {"matrix": [2, 5], "x": 6.5, "y": 2},
+                {"matrix": [2, 6], "x": 7.5, "y": 2},
+
+                {"matrix": [2, 8], "x": 10.75, "y": 2},
+                {"matrix": [2, 9], "x": 11.75, "y": 2},
+                {"matrix": [2, 10], "x": 12.75, "y": 2},
+                {"matrix": [2, 11], "x": 13.75, "y": 2},
+                {"matrix": [2, 12], "x": 14.75, "y": 2},
+                {"matrix": [2, 13], "x": 15.75, "y": 2},
+                {"matrix": [2, 15], "x": 16.75, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 1], "x": 1.75, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 4, "y": 3},
+                {"matrix": [3, 3], "x": 5, "y": 3},
+                {"matrix": [3, 4], "x": 6, "y": 3},
+                {"matrix": [3, 5], "x": 7, "y": 3},
+                {"matrix": [3, 6], "x": 8, "y": 3},
+
+                {"matrix": [3, 8], "x": 10.25, "y": 3},
+                {"matrix": [3, 9], "x": 11.25, "y": 3},
+                {"matrix": [3, 10], "x": 12.25, "y": 3},
+                {"matrix": [3, 11], "x": 13.25, "y": 3},
+                {"matrix": [3, 12], "x": 14.25, "y": 3},
+                {"matrix": [3, 13], "x": 15.25, "y": 3},
+                {"matrix": [3, 14], "x": 16.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 15], "x": 18, "y": 3},
+
+                {"matrix": [4, 1], "x": 1.75, "y": 4, "w": 1.5},
+                {"matrix": [4, 3], "x": 4.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 4], "x": 6, "y": 4, "w": 2.25},
+                {"matrix": [4, 6], "x": 8.25, "y": 4},
+                {"matrix": [4, 9], "x": 10.25, "y": 4, "w": 2.75},
+                {"matrix": [4, 11], "x": 13, "y": 4, "w": 1.5},
+                {"matrix": [4, 15], "x": 17.5, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_alice": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0.5, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.75, "y": 0},
+                {"matrix": [0, 2], "x": 2.75, "y": 0},
+                {"matrix": [0, 3], "x": 3.75, "y": 0},
+                {"matrix": [0, 4], "x": 4.75, "y": 0},
+                {"matrix": [0, 5], "x": 5.75, "y": 0},
+                {"matrix": [0, 6], "x": 6.75, "y": 0},
+                {"matrix": [0, 7], "x": 7.75, "y": 0},
+
+                {"matrix": [0, 8], "x": 11, "y": 0},
+                {"matrix": [0, 9], "x": 12, "y": 0},
+                {"matrix": [0, 10], "x": 13, "y": 0},
+                {"matrix": [0, 11], "x": 14, "y": 0},
+                {"matrix": [0, 12], "x": 15, "y": 0},
+                {"matrix": [0, 13], "x": 16, "y": 0},
+                {"matrix": [0, 15], "x": 17, "y": 0, "w": 2},
+
+                {"matrix": [1, 0], "x": 0.25, "y": 1},
+
+                {"matrix": [1, 1], "x": 1.75, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 3.25, "y": 1},
+                {"matrix": [1, 3], "x": 4.25, "y": 1},
+                {"matrix": [1, 4], "x": 5.25, "y": 1},
+                {"matrix": [1, 5], "x": 6.25, "y": 1},
+                {"matrix": [1, 6], "x": 7.25, "y": 1},
+
+                {"matrix": [1, 8], "x": 10.5, "y": 1},
+                {"matrix": [1, 9], "x": 11.5, "y": 1},
+                {"matrix": [1, 10], "x": 12.5, "y": 1},
+                {"matrix": [1, 11], "x": 13.5, "y": 1},
+                {"matrix": [1, 12], "x": 14.5, "y": 1},
+                {"matrix": [1, 13], "x": 15.5, "y": 1},
+                {"matrix": [1, 14], "x": 16.5, "y": 1},
+                {"matrix": [1, 15], "x": 17.5, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+
+                {"matrix": [2, 1], "x": 1.75, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 3.5, "y": 2},
+                {"matrix": [2, 3], "x": 4.5, "y": 2},
+                {"matrix": [2, 4], "x": 5.5, "y": 2},
+                {"matrix": [2, 5], "x": 6.5, "y": 2},
+                {"matrix": [2, 6], "x": 7.5, "y": 2},
+
+                {"matrix": [2, 8], "x": 10.75, "y": 2},
+                {"matrix": [2, 9], "x": 11.75, "y": 2},
+                {"matrix": [2, 10], "x": 12.75, "y": 2},
+                {"matrix": [2, 11], "x": 13.75, "y": 2},
+                {"matrix": [2, 12], "x": 14.75, "y": 2},
+                {"matrix": [2, 13], "x": 15.75, "y": 2},
+                {"matrix": [2, 15], "x": 16.75, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 1], "x": 1.75, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 4, "y": 3},
+                {"matrix": [3, 3], "x": 5, "y": 3},
+                {"matrix": [3, 4], "x": 6, "y": 3},
+                {"matrix": [3, 5], "x": 7, "y": 3},
+                {"matrix": [3, 6], "x": 8, "y": 3},
+
+                {"matrix": [3, 8], "x": 10.25, "y": 3},
+                {"matrix": [3, 9], "x": 11.25, "y": 3},
+                {"matrix": [3, 10], "x": 12.25, "y": 3},
+                {"matrix": [3, 11], "x": 13.25, "y": 3},
+                {"matrix": [3, 12], "x": 14.25, "y": 3},
+                {"matrix": [3, 13], "x": 15.25, "y": 3},
+                {"matrix": [3, 14], "x": 16.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 15], "x": 18, "y": 3},
+
+                {"matrix": [4, 1], "x": 1.75, "y": 4, "w": 1.5},
+                {"matrix": [4, 3], "x": 4.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 4], "x": 6, "y": 4, "w": 2.25},
+                {"matrix": [4, 6], "x": 8.25, "y": 4},
+                {"matrix": [4, 9], "x": 10.25, "y": 4, "w": 2.75},
+                {"matrix": [4, 11], "x": 13, "y": 4, "w": 1.5},
+                {"matrix": [4, 15], "x": 17.5, "y": 4, "w": 1.5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/rmi_kb/aelith/rules.mk b/keyboards/rmi_kb/aelith/rules.mk
index 1e9f9255447..c2ee0bc86f9 100644
--- a/keyboards/rmi_kb/aelith/rules.mk
+++ b/keyboards/rmi_kb/aelith/rules.mk
@@ -1,15 +1,2 @@
 # Processor frequency
 F_CPU = 16000000
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
diff --git a/keyboards/rmi_kb/chevron/info.json b/keyboards/rmi_kb/chevron/info.json
deleted file mode 100644
index 48f4373c263..00000000000
--- a/keyboards/rmi_kb/chevron/info.json
+++ /dev/null
@@ -1,141 +0,0 @@
-{
-    "keyboard_name": "Chevron",
-    "manufacturer": "RMI-KB",
-    "url": "",
-    "maintainer": "ramonimbao",
-    "usb": {
-        "vid": "0xB16B",
-        "pid": "0xC4EE",
-        "device_version": "0.1.2"
-    },
-    "matrix_pins": {
-        "cols": ["A5", "A6", "A7", "C7", "C6", "C5", "C4", "C3", "C2", "C1", "A4", "A3", "A2", "B4"],
-        "rows": ["D5", "D6", "C0", "D7"]
-    },
-    "diode_direction": "COL2ROW",
-    "encoder": {
-        "rotary": [
-            {"pin_a": "A0", "pin_b": "A1"}
-        ]
-    },
-    "processor": "atmega32a",
-    "bootloader": "usbasploader",
-    "layouts": {
-        "LAYOUT_ansi": {
-            "layout": [
-                {"matrix": [1, 13], "x": 13.5, "y": 0},
-
-                {"matrix": [0, 0], "x": 0, "y": 1},
-                {"matrix": [0, 1], "x": 1, "y": 1},
-                {"matrix": [0, 2], "x": 2, "y": 1},
-                {"matrix": [0, 3], "x": 3, "y": 1},
-                {"matrix": [0, 4], "x": 4, "y": 1},
-                {"matrix": [0, 5], "x": 5, "y": 1},
-                {"matrix": [0, 6], "x": 6, "y": 1},
-                {"matrix": [0, 7], "x": 7, "y": 1},
-                {"matrix": [0, 8], "x": 8, "y": 1},
-                {"matrix": [0, 9], "x": 9, "y": 1},
-                {"matrix": [0, 10], "x": 10, "y": 1},
-                {"matrix": [0, 11], "x": 11, "y": 1},
-                {"matrix": [0, 12], "x": 12, "y": 1},
-                {"matrix": [0, 13], "x": 13, "y": 1, "w": 1.5},
-
-                {"matrix": [1, 0], "x": 0, "y": 2, "w": 1.25},
-                {"matrix": [1, 1], "x": 1.25, "y": 2},
-                {"matrix": [1, 2], "x": 2.25, "y": 2},
-                {"matrix": [1, 3], "x": 3.25, "y": 2},
-                {"matrix": [1, 4], "x": 4.25, "y": 2},
-                {"matrix": [1, 5], "x": 5.25, "y": 2},
-                {"matrix": [1, 6], "x": 6.25, "y": 2},
-                {"matrix": [1, 7], "x": 7.25, "y": 2},
-                {"matrix": [1, 8], "x": 8.25, "y": 2},
-                {"matrix": [1, 9], "x": 9.25, "y": 2},
-                {"matrix": [1, 10], "x": 10.25, "y": 2},
-                {"matrix": [1, 11], "x": 11.25, "y": 2},
-                {"matrix": [1, 12], "x": 12.25, "y": 2, "w": 2.25},
-
-                {"matrix": [2, 0], "x": 0, "y": 3, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 3},
-                {"matrix": [2, 2], "x": 2.75, "y": 3},
-                {"matrix": [2, 3], "x": 3.75, "y": 3},
-                {"matrix": [2, 4], "x": 4.75, "y": 3},
-                {"matrix": [2, 5], "x": 5.75, "y": 3},
-                {"matrix": [2, 6], "x": 6.75, "y": 3},
-                {"matrix": [2, 7], "x": 7.75, "y": 3},
-                {"matrix": [2, 8], "x": 8.75, "y": 3},
-                {"matrix": [2, 9], "x": 9.75, "y": 3},
-                {"matrix": [2, 10], "x": 10.75, "y": 3},
-                {"matrix": [2, 12], "x": 11.75, "y": 3, "w": 1.75},
-                {"matrix": [2, 13], "x": 13.5, "y": 3},
-
-                {"matrix": [3, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [3, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [3, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [3, 4], "x": 3.75, "y": 4, "w": 3},
-                {"matrix": [3, 6], "x": 6.75, "y": 4},
-                {"matrix": [3, 8], "x": 7.75, "y": 4, "w": 3},
-                {"matrix": [3, 11], "x": 10.75, "y": 4, "w": 1.25},
-                {"matrix": [3, 12], "x": 12, "y": 4, "w": 1.25},
-                {"matrix": [3, 13], "x": 13.25, "y": 4, "w": 1.25}
-            ]
-        },
-        "LAYOUT_iso": {
-            "layout": [
-                {"matrix": [1, 13], "x": 13.5, "y": 0},
-
-                {"matrix": [0, 0], "x": 0, "y": 1},
-                {"matrix": [0, 1], "x": 1, "y": 1},
-                {"matrix": [0, 2], "x": 2, "y": 1},
-                {"matrix": [0, 3], "x": 3, "y": 1},
-                {"matrix": [0, 4], "x": 4, "y": 1},
-                {"matrix": [0, 5], "x": 5, "y": 1},
-                {"matrix": [0, 6], "x": 6, "y": 1},
-                {"matrix": [0, 7], "x": 7, "y": 1},
-                {"matrix": [0, 8], "x": 8, "y": 1},
-                {"matrix": [0, 9], "x": 9, "y": 1},
-                {"matrix": [0, 10], "x": 10, "y": 1},
-                {"matrix": [0, 11], "x": 11, "y": 1},
-                {"matrix": [0, 12], "x": 12, "y": 1},
-
-                {"matrix": [1, 0], "x": 0, "y": 2, "w": 1.25},
-                {"matrix": [1, 1], "x": 1.25, "y": 2},
-                {"matrix": [1, 2], "x": 2.25, "y": 2},
-                {"matrix": [1, 3], "x": 3.25, "y": 2},
-                {"matrix": [1, 4], "x": 4.25, "y": 2},
-                {"matrix": [1, 5], "x": 5.25, "y": 2},
-                {"matrix": [1, 6], "x": 6.25, "y": 2},
-                {"matrix": [1, 7], "x": 7.25, "y": 2},
-                {"matrix": [1, 8], "x": 8.25, "y": 2},
-                {"matrix": [1, 9], "x": 9.25, "y": 2},
-                {"matrix": [1, 10], "x": 10.25, "y": 2},
-                {"matrix": [1, 11], "x": 11.25, "y": 2},
-                {"matrix": [1, 12], "x": 12.25, "y": 2},
-                {"matrix": [0, 13], "x": 13.25, "y": 1, "w": 1.25, "h": 2},
-
-                {"matrix": [2, 0], "x": 0, "y": 3, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 3},
-                {"matrix": [2, 2], "x": 2.75, "y": 3},
-                {"matrix": [2, 3], "x": 3.75, "y": 3},
-                {"matrix": [2, 4], "x": 4.75, "y": 3},
-                {"matrix": [2, 5], "x": 5.75, "y": 3},
-                {"matrix": [2, 6], "x": 6.75, "y": 3},
-                {"matrix": [2, 7], "x": 7.75, "y": 3},
-                {"matrix": [2, 8], "x": 8.75, "y": 3},
-                {"matrix": [2, 9], "x": 9.75, "y": 3},
-                {"matrix": [2, 10], "x": 10.75, "y": 3},
-                {"matrix": [2, 12], "x": 11.75, "y": 3, "w": 1.75},
-                {"matrix": [2, 13], "x": 13.5, "y": 3},
-
-                {"matrix": [3, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [3, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [3, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [3, 4], "x": 3.75, "y": 4, "w": 3},
-                {"matrix": [3, 6], "x": 6.75, "y": 4},
-                {"matrix": [3, 8], "x": 7.75, "y": 4, "w": 3},
-                {"matrix": [3, 11], "x": 10.75, "y": 4, "w": 1.25},
-                {"matrix": [3, 12], "x": 12, "y": 4, "w": 1.25},
-                {"matrix": [3, 13], "x": 13.25, "y": 4, "w": 1.25}
-            ]
-        }
-    }
-}
diff --git a/keyboards/rmi_kb/chevron/keyboard.json b/keyboards/rmi_kb/chevron/keyboard.json
new file mode 100644
index 00000000000..a4cb864705e
--- /dev/null
+++ b/keyboards/rmi_kb/chevron/keyboard.json
@@ -0,0 +1,148 @@
+{
+    "keyboard_name": "Chevron",
+    "manufacturer": "RMI-KB",
+    "url": "",
+    "maintainer": "ramonimbao",
+    "usb": {
+        "vid": "0xB16B",
+        "pid": "0xC4EE",
+        "device_version": "0.1.2"
+    },
+    "features": {
+        "bootmagic": true,
+        "encoder": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": false
+    },
+    "matrix_pins": {
+        "cols": ["A5", "A6", "A7", "C7", "C6", "C5", "C4", "C3", "C2", "C1", "A4", "A3", "A2", "B4"],
+        "rows": ["D5", "D6", "C0", "D7"]
+    },
+    "diode_direction": "COL2ROW",
+    "encoder": {
+        "rotary": [
+            {"pin_a": "A0", "pin_b": "A1"}
+        ]
+    },
+    "processor": "atmega32a",
+    "bootloader": "usbasploader",
+    "layouts": {
+        "LAYOUT_ansi": {
+            "layout": [
+                {"matrix": [1, 13], "x": 13.5, "y": 0},
+
+                {"matrix": [0, 0], "x": 0, "y": 1},
+                {"matrix": [0, 1], "x": 1, "y": 1},
+                {"matrix": [0, 2], "x": 2, "y": 1},
+                {"matrix": [0, 3], "x": 3, "y": 1},
+                {"matrix": [0, 4], "x": 4, "y": 1},
+                {"matrix": [0, 5], "x": 5, "y": 1},
+                {"matrix": [0, 6], "x": 6, "y": 1},
+                {"matrix": [0, 7], "x": 7, "y": 1},
+                {"matrix": [0, 8], "x": 8, "y": 1},
+                {"matrix": [0, 9], "x": 9, "y": 1},
+                {"matrix": [0, 10], "x": 10, "y": 1},
+                {"matrix": [0, 11], "x": 11, "y": 1},
+                {"matrix": [0, 12], "x": 12, "y": 1},
+                {"matrix": [0, 13], "x": 13, "y": 1, "w": 1.5},
+
+                {"matrix": [1, 0], "x": 0, "y": 2, "w": 1.25},
+                {"matrix": [1, 1], "x": 1.25, "y": 2},
+                {"matrix": [1, 2], "x": 2.25, "y": 2},
+                {"matrix": [1, 3], "x": 3.25, "y": 2},
+                {"matrix": [1, 4], "x": 4.25, "y": 2},
+                {"matrix": [1, 5], "x": 5.25, "y": 2},
+                {"matrix": [1, 6], "x": 6.25, "y": 2},
+                {"matrix": [1, 7], "x": 7.25, "y": 2},
+                {"matrix": [1, 8], "x": 8.25, "y": 2},
+                {"matrix": [1, 9], "x": 9.25, "y": 2},
+                {"matrix": [1, 10], "x": 10.25, "y": 2},
+                {"matrix": [1, 11], "x": 11.25, "y": 2},
+                {"matrix": [1, 12], "x": 12.25, "y": 2, "w": 2.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 3, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 3},
+                {"matrix": [2, 2], "x": 2.75, "y": 3},
+                {"matrix": [2, 3], "x": 3.75, "y": 3},
+                {"matrix": [2, 4], "x": 4.75, "y": 3},
+                {"matrix": [2, 5], "x": 5.75, "y": 3},
+                {"matrix": [2, 6], "x": 6.75, "y": 3},
+                {"matrix": [2, 7], "x": 7.75, "y": 3},
+                {"matrix": [2, 8], "x": 8.75, "y": 3},
+                {"matrix": [2, 9], "x": 9.75, "y": 3},
+                {"matrix": [2, 10], "x": 10.75, "y": 3},
+                {"matrix": [2, 12], "x": 11.75, "y": 3, "w": 1.75},
+                {"matrix": [2, 13], "x": 13.5, "y": 3},
+
+                {"matrix": [3, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [3, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [3, 4], "x": 3.75, "y": 4, "w": 3},
+                {"matrix": [3, 6], "x": 6.75, "y": 4},
+                {"matrix": [3, 8], "x": 7.75, "y": 4, "w": 3},
+                {"matrix": [3, 11], "x": 10.75, "y": 4, "w": 1.25},
+                {"matrix": [3, 12], "x": 12, "y": 4, "w": 1.25},
+                {"matrix": [3, 13], "x": 13.25, "y": 4, "w": 1.25}
+            ]
+        },
+        "LAYOUT_iso": {
+            "layout": [
+                {"matrix": [1, 13], "x": 13.5, "y": 0},
+
+                {"matrix": [0, 0], "x": 0, "y": 1},
+                {"matrix": [0, 1], "x": 1, "y": 1},
+                {"matrix": [0, 2], "x": 2, "y": 1},
+                {"matrix": [0, 3], "x": 3, "y": 1},
+                {"matrix": [0, 4], "x": 4, "y": 1},
+                {"matrix": [0, 5], "x": 5, "y": 1},
+                {"matrix": [0, 6], "x": 6, "y": 1},
+                {"matrix": [0, 7], "x": 7, "y": 1},
+                {"matrix": [0, 8], "x": 8, "y": 1},
+                {"matrix": [0, 9], "x": 9, "y": 1},
+                {"matrix": [0, 10], "x": 10, "y": 1},
+                {"matrix": [0, 11], "x": 11, "y": 1},
+                {"matrix": [0, 12], "x": 12, "y": 1},
+
+                {"matrix": [1, 0], "x": 0, "y": 2, "w": 1.25},
+                {"matrix": [1, 1], "x": 1.25, "y": 2},
+                {"matrix": [1, 2], "x": 2.25, "y": 2},
+                {"matrix": [1, 3], "x": 3.25, "y": 2},
+                {"matrix": [1, 4], "x": 4.25, "y": 2},
+                {"matrix": [1, 5], "x": 5.25, "y": 2},
+                {"matrix": [1, 6], "x": 6.25, "y": 2},
+                {"matrix": [1, 7], "x": 7.25, "y": 2},
+                {"matrix": [1, 8], "x": 8.25, "y": 2},
+                {"matrix": [1, 9], "x": 9.25, "y": 2},
+                {"matrix": [1, 10], "x": 10.25, "y": 2},
+                {"matrix": [1, 11], "x": 11.25, "y": 2},
+                {"matrix": [1, 12], "x": 12.25, "y": 2},
+                {"matrix": [0, 13], "x": 13.25, "y": 1, "w": 1.25, "h": 2},
+
+                {"matrix": [2, 0], "x": 0, "y": 3, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 3},
+                {"matrix": [2, 2], "x": 2.75, "y": 3},
+                {"matrix": [2, 3], "x": 3.75, "y": 3},
+                {"matrix": [2, 4], "x": 4.75, "y": 3},
+                {"matrix": [2, 5], "x": 5.75, "y": 3},
+                {"matrix": [2, 6], "x": 6.75, "y": 3},
+                {"matrix": [2, 7], "x": 7.75, "y": 3},
+                {"matrix": [2, 8], "x": 8.75, "y": 3},
+                {"matrix": [2, 9], "x": 9.75, "y": 3},
+                {"matrix": [2, 10], "x": 10.75, "y": 3},
+                {"matrix": [2, 12], "x": 11.75, "y": 3, "w": 1.75},
+                {"matrix": [2, 13], "x": 13.5, "y": 3},
+
+                {"matrix": [3, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [3, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [3, 4], "x": 3.75, "y": 4, "w": 3},
+                {"matrix": [3, 6], "x": 6.75, "y": 4},
+                {"matrix": [3, 8], "x": 7.75, "y": 4, "w": 3},
+                {"matrix": [3, 11], "x": 10.75, "y": 4, "w": 1.25},
+                {"matrix": [3, 12], "x": 12, "y": 4, "w": 1.25},
+                {"matrix": [3, 13], "x": 13.25, "y": 4, "w": 1.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/rmi_kb/chevron/rules.mk b/keyboards/rmi_kb/chevron/rules.mk
index 36c6a2d0500..c2ee0bc86f9 100644
--- a/keyboards/rmi_kb/chevron/rules.mk
+++ b/keyboards/rmi_kb/chevron/rules.mk
@@ -1,16 +1,2 @@
 # Processor frequency
 F_CPU = 16000000
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no        # Console for debug
-COMMAND_ENABLE = no        # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-ENCODER_ENABLE = yes
diff --git a/keyboards/rmi_kb/herringbone/pro/info.json b/keyboards/rmi_kb/herringbone/pro/info.json
deleted file mode 100644
index caab0f11e15..00000000000
--- a/keyboards/rmi_kb/herringbone/pro/info.json
+++ /dev/null
@@ -1,336 +0,0 @@
-{
-    "keyboard_name": "Herringbone Pro",
-    "manufacturer": "RMI-KB",
-    "url": "",
-    "maintainer": "ramonimbao",
-    "usb": {
-        "vid": "0xB16B",
-        "pid": "0x440B",
-        "device_version": "0.1.2"
-    },
-    "matrix_pins": {
-        "cols": ["A0", "A1", "A2", "A3", "A4", "A5", "D6", "D5", "D1", "B0", "B1", "B2", "B3", "B4", "D7"],
-        "rows": ["C4", "C5", "C6", "C7", "A7", "A6", null]
-    },
-    "diode_direction": "COL2ROW",
-    "encoder": {
-        "rotary": [
-            {"pin_a": "C3", "pin_b": "C2", "resolution": 2}
-        ]
-    },
-    "processor": "atmega32a",
-    "bootloader": "usbasploader",
-    "layouts": {
-        "LAYOUT_ansi": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-
-                {"matrix": [0, 1], "x": 1.25, "y": 0},
-                {"matrix": [0, 2], "x": 2.25, "y": 0},
-                {"matrix": [0, 3], "x": 3.25, "y": 0},
-                {"matrix": [0, 4], "x": 4.25, "y": 0},
-
-                {"matrix": [0, 5], "x": 5.5, "y": 0},
-                {"matrix": [0, 6], "x": 6.5, "y": 0},
-                {"matrix": [0, 7], "x": 7.5, "y": 0},
-                {"matrix": [0, 8], "x": 8.5, "y": 0},
-
-                {"matrix": [0, 9], "x": 9.75, "y": 0},
-                {"matrix": [0, 10], "x": 10.75, "y": 0},
-                {"matrix": [0, 11], "x": 11.75, "y": 0},
-                {"matrix": [0, 12], "x": 12.75, "y": 0},
-
-                {"matrix": [0, 13], "x": 14, "y": 0},
-
-                {"matrix": [0, 14], "x": 15.5, "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.5, "y": 1.25},
-
-                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
-                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
-                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
-                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
-                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
-                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
-                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
-                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
-                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
-                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
-                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
-                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
-                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
-                {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
-
-                {"matrix": [2, 14], "x": 15.5, "y": 2.25},
-
-                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
-                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
-                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
-                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
-                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
-                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
-                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
-                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
-                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
-                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
-                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
-                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
-                {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
-
-                {"matrix": [3, 14], "x": 15.5, "y": 3.25},
-
-                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
-                {"matrix": [4, 1], "x": 2.25, "y": 4.25},
-                {"matrix": [4, 2], "x": 3.25, "y": 4.25},
-                {"matrix": [4, 3], "x": 4.25, "y": 4.25},
-                {"matrix": [4, 4], "x": 5.25, "y": 4.25},
-                {"matrix": [4, 5], "x": 6.25, "y": 4.25},
-                {"matrix": [4, 6], "x": 7.25, "y": 4.25},
-                {"matrix": [4, 7], "x": 8.25, "y": 4.25},
-                {"matrix": [4, 8], "x": 9.25, "y": 4.25},
-                {"matrix": [4, 9], "x": 10.25, "y": 4.25},
-                {"matrix": [4, 10], "x": 11.25, "y": 4.25},
-                {"matrix": [4, 11], "x": 12.25, "y": 4.25, "w": 1.75},
-
-                {"matrix": [4, 13], "x": 14.25, "y": 4.5},
-
-                {"matrix": [4, 14], "x": 15.5, "y": 4.25},
-
-                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 2], "x": 1.25, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 3], "x": 2.5, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 5], "x": 3.75, "y": 5.25, "w": 6.25},
-                {"matrix": [5, 9], "x": 10, "y": 5.25, "w": 1.5},
-                {"matrix": [5, 10], "x": 11.5, "y": 5.25, "w": 1.5},
-
-                {"matrix": [5, 12], "x": 13.25, "y": 5.5},
-                {"matrix": [5, 13], "x": 14.25, "y": 5.5},
-                {"matrix": [5, 14], "x": 15.25, "y": 5.5}
-            ]
-        },
-        "LAYOUT_iso": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-
-                {"matrix": [0, 1], "x": 1.25, "y": 0},
-                {"matrix": [0, 2], "x": 2.25, "y": 0},
-                {"matrix": [0, 3], "x": 3.25, "y": 0},
-                {"matrix": [0, 4], "x": 4.25, "y": 0},
-
-                {"matrix": [0, 5], "x": 5.5, "y": 0},
-                {"matrix": [0, 6], "x": 6.5, "y": 0},
-                {"matrix": [0, 7], "x": 7.5, "y": 0},
-                {"matrix": [0, 8], "x": 8.5, "y": 0},
-
-                {"matrix": [0, 9], "x": 9.75, "y": 0},
-                {"matrix": [0, 10], "x": 10.75, "y": 0},
-                {"matrix": [0, 11], "x": 11.75, "y": 0},
-                {"matrix": [0, 12], "x": 12.75, "y": 0},
-
-                {"matrix": [0, 13], "x": 14, "y": 0},
-
-                {"matrix": [0, 14], "x": 15.5, "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.5, "y": 1.25},
-
-                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
-                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
-                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
-                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
-                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
-                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
-                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
-                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
-                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
-                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
-                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
-                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
-                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
-
-                {"matrix": [2, 14], "x": 15.5, "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},
-                {"matrix": [2, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
-
-                {"matrix": [3, 14], "x": 15.5, "y": 3.25},
-
-                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
-                {"matrix": [5, 1], "x": 1.25, "y": 4.25},
-                {"matrix": [4, 1], "x": 2.25, "y": 4.25},
-                {"matrix": [4, 2], "x": 3.25, "y": 4.25},
-                {"matrix": [4, 3], "x": 4.25, "y": 4.25},
-                {"matrix": [4, 4], "x": 5.25, "y": 4.25},
-                {"matrix": [4, 5], "x": 6.25, "y": 4.25},
-                {"matrix": [4, 6], "x": 7.25, "y": 4.25},
-                {"matrix": [4, 7], "x": 8.25, "y": 4.25},
-                {"matrix": [4, 8], "x": 9.25, "y": 4.25},
-                {"matrix": [4, 9], "x": 10.25, "y": 4.25},
-                {"matrix": [4, 10], "x": 11.25, "y": 4.25},
-                {"matrix": [4, 11], "x": 12.25, "y": 4.25, "w": 1.75},
-
-                {"matrix": [4, 13], "x": 14.25, "y": 4.5},
-
-                {"matrix": [4, 14], "x": 15.5, "y": 4.25},
-
-                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 2], "x": 1.25, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 3], "x": 2.5, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 5], "x": 3.75, "y": 5.25, "w": 6.25},
-                {"matrix": [5, 9], "x": 10, "y": 5.25, "w": 1.5},
-                {"matrix": [5, 10], "x": 11.5, "y": 5.25, "w": 1.5},
-
-                {"matrix": [5, 12], "x": 13.25, "y": 5.5},
-                {"matrix": [5, 13], "x": 14.25, "y": 5.5},
-                {"matrix": [5, 14], "x": 15.25, "y": 5.5}
-            ]
-        },
-        "LAYOUT_all": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-
-                {"matrix": [0, 1], "x": 1.25, "y": 0},
-                {"matrix": [0, 2], "x": 2.25, "y": 0},
-                {"matrix": [0, 3], "x": 3.25, "y": 0},
-                {"matrix": [0, 4], "x": 4.25, "y": 0},
-
-                {"matrix": [0, 5], "x": 5.5, "y": 0},
-                {"matrix": [0, 6], "x": 6.5, "y": 0},
-                {"matrix": [0, 7], "x": 7.5, "y": 0},
-                {"matrix": [0, 8], "x": 8.5, "y": 0},
-
-                {"matrix": [0, 9], "x": 9.75, "y": 0},
-                {"matrix": [0, 10], "x": 10.75, "y": 0},
-                {"matrix": [0, 11], "x": 11.75, "y": 0},
-                {"matrix": [0, 12], "x": 12.75, "y": 0},
-
-                {"matrix": [0, 13], "x": 14, "y": 0},
-
-                {"matrix": [0, 14], "x": 15.5, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1.25},
-                {"matrix": [1, 1], "x": 1, "y": 1.25},
-                {"matrix": [1, 2], "x": 2, "y": 1.25},
-                {"matrix": [1, 3], "x": 3, "y": 1.25},
-                {"matrix": [1, 4], "x": 4, "y": 1.25},
-                {"matrix": [1, 5], "x": 5, "y": 1.25},
-                {"matrix": [1, 6], "x": 6, "y": 1.25},
-                {"matrix": [1, 7], "x": 7, "y": 1.25},
-                {"matrix": [1, 8], "x": 8, "y": 1.25},
-                {"matrix": [1, 9], "x": 9, "y": 1.25},
-                {"matrix": [1, 10], "x": 10, "y": 1.25},
-                {"matrix": [1, 11], "x": 11, "y": 1.25},
-                {"matrix": [1, 12], "x": 12, "y": 1.25},
-                {"matrix": [1, 13], "x": 13, "y": 1.25},
-                {"matrix": [3, 12], "x": 14, "y": 1.25},
-
-                {"matrix": [1, 14], "x": 15.5, "y": 1.25},
-
-                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
-                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
-                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
-                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
-                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
-                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
-                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
-                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
-                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
-                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
-                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
-                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
-                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
-                {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
-
-                {"matrix": [2, 14], "x": 15.5, "y": 2.25},
-
-                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
-                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
-                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
-                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
-                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
-                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
-                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
-                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
-                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
-                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
-                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
-                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
-                {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
-
-                {"matrix": [3, 14], "x": 15.5, "y": 3.25},
-
-                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
-                {"matrix": [5, 1], "x": 1.25, "y": 4.25},
-                {"matrix": [4, 1], "x": 2.25, "y": 4.25},
-                {"matrix": [4, 2], "x": 3.25, "y": 4.25},
-                {"matrix": [4, 3], "x": 4.25, "y": 4.25},
-                {"matrix": [4, 4], "x": 5.25, "y": 4.25},
-                {"matrix": [4, 5], "x": 6.25, "y": 4.25},
-                {"matrix": [4, 6], "x": 7.25, "y": 4.25},
-                {"matrix": [4, 7], "x": 8.25, "y": 4.25},
-                {"matrix": [4, 8], "x": 9.25, "y": 4.25},
-                {"matrix": [4, 9], "x": 10.25, "y": 4.25},
-                {"matrix": [4, 10], "x": 11.25, "y": 4.25},
-                {"matrix": [4, 11], "x": 12.25, "y": 4.25, "w": 1.75},
-
-                {"matrix": [4, 13], "x": 14.25, "y": 4.5},
-
-                {"matrix": [4, 14], "x": 15.5, "y": 4.25},
-
-                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 2], "x": 1.25, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 3], "x": 2.5, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 4], "x": 3.75, "y": 5.25, "w": 2.25},
-                {"matrix": [5, 5], "x": 6, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 7], "x": 7.25, "y": 5.25, "w": 2.75},
-                {"matrix": [5, 9], "x": 10, "y": 5.25, "w": 1.5},
-                {"matrix": [5, 10], "x": 11.5, "y": 5.25, "w": 1.5},
-
-                {"matrix": [5, 12], "x": 13.25, "y": 5.5},
-                {"matrix": [5, 13], "x": 14.25, "y": 5.5},
-                {"matrix": [5, 14], "x": 15.25, "y": 5.5}
-            ]
-        }
-    }
-}
diff --git a/keyboards/rmi_kb/herringbone/pro/keyboard.json b/keyboards/rmi_kb/herringbone/pro/keyboard.json
new file mode 100644
index 00000000000..506022a42b4
--- /dev/null
+++ b/keyboards/rmi_kb/herringbone/pro/keyboard.json
@@ -0,0 +1,348 @@
+{
+    "keyboard_name": "Herringbone Pro",
+    "manufacturer": "RMI-KB",
+    "url": "",
+    "maintainer": "ramonimbao",
+    "usb": {
+        "vid": "0xB16B",
+        "pid": "0x440B",
+        "device_version": "0.1.2"
+    },
+    "build": {
+        "lto": true
+    },
+    "features": {
+        "bootmagic": true,
+        "encoder": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": false,
+        "oled": true,
+        "wpm": true
+    },
+    "matrix_pins": {
+        "cols": ["A0", "A1", "A2", "A3", "A4", "A5", "D6", "D5", "D1", "B0", "B1", "B2", "B3", "B4", "D7"],
+        "rows": ["C4", "C5", "C6", "C7", "A7", "A6", null]
+    },
+    "diode_direction": "COL2ROW",
+    "encoder": {
+        "rotary": [
+            {"pin_a": "C3", "pin_b": "C2", "resolution": 2}
+        ]
+    },
+    "processor": "atmega32a",
+    "bootloader": "usbasploader",
+    "layouts": {
+        "LAYOUT_ansi": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 9.75, "y": 0},
+                {"matrix": [0, 10], "x": 10.75, "y": 0},
+                {"matrix": [0, 11], "x": 11.75, "y": 0},
+                {"matrix": [0, 12], "x": 12.75, "y": 0},
+
+                {"matrix": [0, 13], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.5, "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.5, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [2, 14], "x": 15.5, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"matrix": [3, 14], "x": 15.5, "y": 3.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 1], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 12.25, "y": 4.25, "w": 1.75},
+
+                {"matrix": [4, 13], "x": 14.25, "y": 4.5},
+
+                {"matrix": [4, 14], "x": 15.5, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 3], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 5], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 9], "x": 10, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 10], "x": 11.5, "y": 5.25, "w": 1.5},
+
+                {"matrix": [5, 12], "x": 13.25, "y": 5.5},
+                {"matrix": [5, 13], "x": 14.25, "y": 5.5},
+                {"matrix": [5, 14], "x": 15.25, "y": 5.5}
+            ]
+        },
+        "LAYOUT_iso": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 9.75, "y": 0},
+                {"matrix": [0, 10], "x": 10.75, "y": 0},
+                {"matrix": [0, 11], "x": 11.75, "y": 0},
+                {"matrix": [0, 12], "x": 12.75, "y": 0},
+
+                {"matrix": [0, 13], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.5, "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.5, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+
+                {"matrix": [2, 14], "x": 15.5, "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},
+                {"matrix": [2, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+
+                {"matrix": [3, 14], "x": 15.5, "y": 3.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 4.25},
+                {"matrix": [4, 1], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 12.25, "y": 4.25, "w": 1.75},
+
+                {"matrix": [4, 13], "x": 14.25, "y": 4.5},
+
+                {"matrix": [4, 14], "x": 15.5, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 3], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 5], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 9], "x": 10, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 10], "x": 11.5, "y": 5.25, "w": 1.5},
+
+                {"matrix": [5, 12], "x": 13.25, "y": 5.5},
+                {"matrix": [5, 13], "x": 14.25, "y": 5.5},
+                {"matrix": [5, 14], "x": 15.25, "y": 5.5}
+            ]
+        },
+        "LAYOUT_all": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 9.75, "y": 0},
+                {"matrix": [0, 10], "x": 10.75, "y": 0},
+                {"matrix": [0, 11], "x": 11.75, "y": 0},
+                {"matrix": [0, 12], "x": 12.75, "y": 0},
+
+                {"matrix": [0, 13], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.5, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25},
+                {"matrix": [3, 12], "x": 14, "y": 1.25},
+
+                {"matrix": [1, 14], "x": 15.5, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [2, 14], "x": 15.5, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"matrix": [3, 14], "x": 15.5, "y": 3.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 4.25},
+                {"matrix": [4, 1], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 12.25, "y": 4.25, "w": 1.75},
+
+                {"matrix": [4, 13], "x": 14.25, "y": 4.5},
+
+                {"matrix": [4, 14], "x": 15.5, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 3], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 4], "x": 3.75, "y": 5.25, "w": 2.25},
+                {"matrix": [5, 5], "x": 6, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 7], "x": 7.25, "y": 5.25, "w": 2.75},
+                {"matrix": [5, 9], "x": 10, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 10], "x": 11.5, "y": 5.25, "w": 1.5},
+
+                {"matrix": [5, 12], "x": 13.25, "y": 5.5},
+                {"matrix": [5, 13], "x": 14.25, "y": 5.5},
+                {"matrix": [5, 14], "x": 15.25, "y": 5.5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/rmi_kb/herringbone/pro/rules.mk b/keyboards/rmi_kb/herringbone/pro/rules.mk
index 890f20de86a..85b16472c53 100644
--- a/keyboards/rmi_kb/herringbone/pro/rules.mk
+++ b/keyboards/rmi_kb/herringbone/pro/rules.mk
@@ -1,21 +1,4 @@
 # Processor frequency
 F_CPU = 16000000
 
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-ENCODER_ENABLE = yes
-OLED_ENABLE = yes
-WPM_ENABLE = yes
-LTO_ENABLE = yes
-
 SRC += pattern.c
diff --git a/keyboards/rmi_kb/herringbone/v1/info.json b/keyboards/rmi_kb/herringbone/v1/info.json
deleted file mode 100644
index 89e15d9c350..00000000000
--- a/keyboards/rmi_kb/herringbone/v1/info.json
+++ /dev/null
@@ -1,329 +0,0 @@
-{
-    "keyboard_name": "Herringbone",
-    "manufacturer": "RMI-KB",
-    "url": "",
-    "maintainer": "ramonimbao",
-    "usb": {
-        "vid": "0xB16B",
-        "pid": "0x04E5",
-        "device_version": "0.1.2"
-    },
-    "matrix_pins": {
-        "cols": ["A0", "A1", "A2", "A3", "A4", "A5", "D6", "D5", "D1", "B0", "B1", "B2", "B3", "B4", "D7"],
-        "rows": ["C4", "C5", "C6", "C7", "A7", "A6"]
-    },
-    "diode_direction": "COL2ROW",
-    "processor": "atmega32a",
-    "bootloader": "usbasploader",
-    "layouts": {
-        "LAYOUT_ansi": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-
-                {"matrix": [0, 1], "x": 1.25, "y": 0},
-                {"matrix": [0, 2], "x": 2.25, "y": 0},
-                {"matrix": [0, 3], "x": 3.25, "y": 0},
-                {"matrix": [0, 4], "x": 4.25, "y": 0},
-
-                {"matrix": [0, 5], "x": 5.5, "y": 0},
-                {"matrix": [0, 6], "x": 6.5, "y": 0},
-                {"matrix": [0, 7], "x": 7.5, "y": 0},
-                {"matrix": [0, 8], "x": 8.5, "y": 0},
-
-                {"matrix": [0, 9], "x": 9.75, "y": 0},
-                {"matrix": [0, 10], "x": 10.75, "y": 0},
-                {"matrix": [0, 11], "x": 11.75, "y": 0},
-                {"matrix": [0, 12], "x": 12.75, "y": 0},
-
-                {"matrix": [0, 13], "x": 14, "y": 0},
-
-                {"matrix": [0, 14], "x": 15.5, "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.5, "y": 1.25},
-
-                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
-                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
-                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
-                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
-                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
-                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
-                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
-                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
-                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
-                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
-                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
-                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
-                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
-                {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
-
-                {"matrix": [2, 14], "x": 15.5, "y": 2.25},
-
-                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
-                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
-                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
-                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
-                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
-                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
-                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
-                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
-                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
-                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
-                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
-                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
-                {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
-
-                {"matrix": [3, 14], "x": 15.5, "y": 3.25},
-
-                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
-                {"matrix": [4, 1], "x": 2.25, "y": 4.25},
-                {"matrix": [4, 2], "x": 3.25, "y": 4.25},
-                {"matrix": [4, 3], "x": 4.25, "y": 4.25},
-                {"matrix": [4, 4], "x": 5.25, "y": 4.25},
-                {"matrix": [4, 5], "x": 6.25, "y": 4.25},
-                {"matrix": [4, 6], "x": 7.25, "y": 4.25},
-                {"matrix": [4, 7], "x": 8.25, "y": 4.25},
-                {"matrix": [4, 8], "x": 9.25, "y": 4.25},
-                {"matrix": [4, 9], "x": 10.25, "y": 4.25},
-                {"matrix": [4, 10], "x": 11.25, "y": 4.25},
-                {"matrix": [4, 11], "x": 12.25, "y": 4.25, "w": 1.75},
-
-                {"matrix": [4, 13], "x": 14.25, "y": 4.5},
-
-                {"matrix": [4, 14], "x": 15.5, "y": 4.25},
-
-                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 2], "x": 1.25, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 3], "x": 2.5, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 5], "x": 3.75, "y": 5.25, "w": 6.25},
-                {"matrix": [5, 9], "x": 10, "y": 5.25, "w": 1.5},
-                {"matrix": [5, 10], "x": 11.5, "y": 5.25, "w": 1.5},
-
-                {"matrix": [5, 12], "x": 13.25, "y": 5.5},
-                {"matrix": [5, 13], "x": 14.25, "y": 5.5},
-                {"matrix": [5, 14], "x": 15.25, "y": 5.5}
-            ]
-        },
-        "LAYOUT_iso": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-
-                {"matrix": [0, 1], "x": 1.25, "y": 0},
-                {"matrix": [0, 2], "x": 2.25, "y": 0},
-                {"matrix": [0, 3], "x": 3.25, "y": 0},
-                {"matrix": [0, 4], "x": 4.25, "y": 0},
-
-                {"matrix": [0, 5], "x": 5.5, "y": 0},
-                {"matrix": [0, 6], "x": 6.5, "y": 0},
-                {"matrix": [0, 7], "x": 7.5, "y": 0},
-                {"matrix": [0, 8], "x": 8.5, "y": 0},
-
-                {"matrix": [0, 9], "x": 9.75, "y": 0},
-                {"matrix": [0, 10], "x": 10.75, "y": 0},
-                {"matrix": [0, 11], "x": 11.75, "y": 0},
-                {"matrix": [0, 12], "x": 12.75, "y": 0},
-
-                {"matrix": [0, 13], "x": 14, "y": 0},
-
-                {"matrix": [0, 14], "x": 15.5, "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.5, "y": 1.25},
-
-                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
-                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
-                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
-                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
-                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
-                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
-                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
-                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
-                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
-                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
-                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
-                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
-                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
-                {"matrix": [2, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
-
-                {"matrix": [2, 14], "x": 15.5, "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},
-
-                {"matrix": [3, 14], "x": 15.5, "y": 3.25},
-
-                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
-                {"matrix": [5, 1], "x": 1.25, "y": 4.25},
-                {"matrix": [4, 1], "x": 2.25, "y": 4.25},
-                {"matrix": [4, 2], "x": 3.25, "y": 4.25},
-                {"matrix": [4, 3], "x": 4.25, "y": 4.25},
-                {"matrix": [4, 4], "x": 5.25, "y": 4.25},
-                {"matrix": [4, 5], "x": 6.25, "y": 4.25},
-                {"matrix": [4, 6], "x": 7.25, "y": 4.25},
-                {"matrix": [4, 7], "x": 8.25, "y": 4.25},
-                {"matrix": [4, 8], "x": 9.25, "y": 4.25},
-                {"matrix": [4, 9], "x": 10.25, "y": 4.25},
-                {"matrix": [4, 10], "x": 11.25, "y": 4.25},
-                {"matrix": [4, 11], "x": 12.25, "y": 4.25, "w": 1.75},
-
-                {"matrix": [4, 13], "x": 14.25, "y": 4.5},
-
-                {"matrix": [4, 14], "x": 15.5, "y": 4.25},
-
-                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 2], "x": 1.25, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 3], "x": 2.5, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 5], "x": 3.75, "y": 5.25, "w": 6.25},
-                {"matrix": [5, 9], "x": 10, "y": 5.25, "w": 1.5},
-                {"matrix": [5, 10], "x": 11.5, "y": 5.25, "w": 1.5},
-
-                {"matrix": [5, 12], "x": 13.25, "y": 5.5},
-                {"matrix": [5, 13], "x": 14.25, "y": 5.5},
-                {"matrix": [5, 14], "x": 15.25, "y": 5.5}
-            ]
-        },
-        "LAYOUT_all": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-
-                {"matrix": [0, 1], "x": 1.25, "y": 0},
-                {"matrix": [0, 2], "x": 2.25, "y": 0},
-                {"matrix": [0, 3], "x": 3.25, "y": 0},
-                {"matrix": [0, 4], "x": 4.25, "y": 0},
-
-                {"matrix": [0, 5], "x": 5.5, "y": 0},
-                {"matrix": [0, 6], "x": 6.5, "y": 0},
-                {"matrix": [0, 7], "x": 7.5, "y": 0},
-                {"matrix": [0, 8], "x": 8.5, "y": 0},
-
-                {"matrix": [0, 9], "x": 9.75, "y": 0},
-                {"matrix": [0, 10], "x": 10.75, "y": 0},
-                {"matrix": [0, 11], "x": 11.75, "y": 0},
-                {"matrix": [0, 12], "x": 12.75, "y": 0},
-
-                {"matrix": [0, 13], "x": 14, "y": 0},
-
-                {"matrix": [0, 14], "x": 15.5, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1.25},
-                {"matrix": [1, 1], "x": 1, "y": 1.25},
-                {"matrix": [1, 2], "x": 2, "y": 1.25},
-                {"matrix": [1, 3], "x": 3, "y": 1.25},
-                {"matrix": [1, 4], "x": 4, "y": 1.25},
-                {"matrix": [1, 5], "x": 5, "y": 1.25},
-                {"matrix": [1, 6], "x": 6, "y": 1.25},
-                {"matrix": [1, 7], "x": 7, "y": 1.25},
-                {"matrix": [1, 8], "x": 8, "y": 1.25},
-                {"matrix": [1, 9], "x": 9, "y": 1.25},
-                {"matrix": [1, 10], "x": 10, "y": 1.25},
-                {"matrix": [1, 11], "x": 11, "y": 1.25},
-                {"matrix": [1, 12], "x": 12, "y": 1.25},
-                {"matrix": [1, 13], "x": 13, "y": 1.25},
-                {"matrix": [3, 12], "x": 14, "y": 1.25},
-
-                {"matrix": [1, 14], "x": 15.5, "y": 1.25},
-
-                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
-                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
-                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
-                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
-                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
-                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
-                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
-                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
-                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
-                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
-                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
-                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
-                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
-                {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
-
-                {"matrix": [2, 14], "x": 15.5, "y": 2.25},
-
-                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
-                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
-                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
-                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
-                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
-                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
-                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
-                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
-                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
-                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
-                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
-                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
-                {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
-
-                {"matrix": [3, 14], "x": 15.5, "y": 3.25},
-
-                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
-                {"matrix": [5, 1], "x": 1.25, "y": 4.25},
-                {"matrix": [4, 1], "x": 2.25, "y": 4.25},
-                {"matrix": [4, 2], "x": 3.25, "y": 4.25},
-                {"matrix": [4, 3], "x": 4.25, "y": 4.25},
-                {"matrix": [4, 4], "x": 5.25, "y": 4.25},
-                {"matrix": [4, 5], "x": 6.25, "y": 4.25},
-                {"matrix": [4, 6], "x": 7.25, "y": 4.25},
-                {"matrix": [4, 7], "x": 8.25, "y": 4.25},
-                {"matrix": [4, 8], "x": 9.25, "y": 4.25},
-                {"matrix": [4, 9], "x": 10.25, "y": 4.25},
-                {"matrix": [4, 10], "x": 11.25, "y": 4.25},
-                {"matrix": [4, 11], "x": 12.25, "y": 4.25, "w": 1.75},
-
-                {"matrix": [4, 13], "x": 14.25, "y": 4.5},
-
-                {"matrix": [4, 14], "x": 15.5, "y": 4.25},
-
-                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 2], "x": 1.25, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 3], "x": 2.5, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 5], "x": 3.75, "y": 5.25, "w": 6.25},
-                {"matrix": [5, 9], "x": 10, "y": 5.25, "w": 1.5},
-                {"matrix": [5, 10], "x": 11.5, "y": 5.25, "w": 1.5},
-
-                {"matrix": [5, 12], "x": 13.25, "y": 5.5},
-                {"matrix": [5, 13], "x": 14.25, "y": 5.5},
-                {"matrix": [5, 14], "x": 15.25, "y": 5.5}
-            ]
-        }
-    }
-}
diff --git a/keyboards/rmi_kb/herringbone/v1/keyboard.json b/keyboards/rmi_kb/herringbone/v1/keyboard.json
new file mode 100644
index 00000000000..91fbf2cf244
--- /dev/null
+++ b/keyboards/rmi_kb/herringbone/v1/keyboard.json
@@ -0,0 +1,335 @@
+{
+    "keyboard_name": "Herringbone",
+    "manufacturer": "RMI-KB",
+    "url": "",
+    "maintainer": "ramonimbao",
+    "usb": {
+        "vid": "0xB16B",
+        "pid": "0x04E5",
+        "device_version": "0.1.2"
+    },
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": false
+    },
+    "matrix_pins": {
+        "cols": ["A0", "A1", "A2", "A3", "A4", "A5", "D6", "D5", "D1", "B0", "B1", "B2", "B3", "B4", "D7"],
+        "rows": ["C4", "C5", "C6", "C7", "A7", "A6"]
+    },
+    "diode_direction": "COL2ROW",
+    "processor": "atmega32a",
+    "bootloader": "usbasploader",
+    "layouts": {
+        "LAYOUT_ansi": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 9.75, "y": 0},
+                {"matrix": [0, 10], "x": 10.75, "y": 0},
+                {"matrix": [0, 11], "x": 11.75, "y": 0},
+                {"matrix": [0, 12], "x": 12.75, "y": 0},
+
+                {"matrix": [0, 13], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.5, "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.5, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [2, 14], "x": 15.5, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"matrix": [3, 14], "x": 15.5, "y": 3.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 1], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 12.25, "y": 4.25, "w": 1.75},
+
+                {"matrix": [4, 13], "x": 14.25, "y": 4.5},
+
+                {"matrix": [4, 14], "x": 15.5, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 3], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 5], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 9], "x": 10, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 10], "x": 11.5, "y": 5.25, "w": 1.5},
+
+                {"matrix": [5, 12], "x": 13.25, "y": 5.5},
+                {"matrix": [5, 13], "x": 14.25, "y": 5.5},
+                {"matrix": [5, 14], "x": 15.25, "y": 5.5}
+            ]
+        },
+        "LAYOUT_iso": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 9.75, "y": 0},
+                {"matrix": [0, 10], "x": 10.75, "y": 0},
+                {"matrix": [0, 11], "x": 11.75, "y": 0},
+                {"matrix": [0, 12], "x": 12.75, "y": 0},
+
+                {"matrix": [0, 13], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.5, "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.5, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+
+                {"matrix": [2, 14], "x": 15.5, "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},
+
+                {"matrix": [3, 14], "x": 15.5, "y": 3.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 4.25},
+                {"matrix": [4, 1], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 12.25, "y": 4.25, "w": 1.75},
+
+                {"matrix": [4, 13], "x": 14.25, "y": 4.5},
+
+                {"matrix": [4, 14], "x": 15.5, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 3], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 5], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 9], "x": 10, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 10], "x": 11.5, "y": 5.25, "w": 1.5},
+
+                {"matrix": [5, 12], "x": 13.25, "y": 5.5},
+                {"matrix": [5, 13], "x": 14.25, "y": 5.5},
+                {"matrix": [5, 14], "x": 15.25, "y": 5.5}
+            ]
+        },
+        "LAYOUT_all": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 9.75, "y": 0},
+                {"matrix": [0, 10], "x": 10.75, "y": 0},
+                {"matrix": [0, 11], "x": 11.75, "y": 0},
+                {"matrix": [0, 12], "x": 12.75, "y": 0},
+
+                {"matrix": [0, 13], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.5, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25},
+                {"matrix": [3, 12], "x": 14, "y": 1.25},
+
+                {"matrix": [1, 14], "x": 15.5, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [2, 14], "x": 15.5, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"matrix": [3, 14], "x": 15.5, "y": 3.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 4.25},
+                {"matrix": [4, 1], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 12.25, "y": 4.25, "w": 1.75},
+
+                {"matrix": [4, 13], "x": 14.25, "y": 4.5},
+
+                {"matrix": [4, 14], "x": 15.5, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 3], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 5], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 9], "x": 10, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 10], "x": 11.5, "y": 5.25, "w": 1.5},
+
+                {"matrix": [5, 12], "x": 13.25, "y": 5.5},
+                {"matrix": [5, 13], "x": 14.25, "y": 5.5},
+                {"matrix": [5, 14], "x": 15.25, "y": 5.5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/rmi_kb/herringbone/v1/rules.mk b/keyboards/rmi_kb/herringbone/v1/rules.mk
index 18550f0a64d..c2ee0bc86f9 100644
--- a/keyboards/rmi_kb/herringbone/v1/rules.mk
+++ b/keyboards/rmi_kb/herringbone/v1/rules.mk
@@ -1,15 +1,2 @@
 # Processor frequency
 F_CPU = 16000000
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no        # Console for debug
-COMMAND_ENABLE = no        # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
diff --git a/keyboards/rmi_kb/mona/v1/config.h b/keyboards/rmi_kb/mona/v1/config.h
deleted file mode 100644
index b53bfc15542..00000000000
--- a/keyboards/rmi_kb/mona/v1/config.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
-Copyright 2020 Ramon Imbao
-
-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
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/rmi_kb/mona/v1/info.json b/keyboards/rmi_kb/mona/v1/info.json
deleted file mode 100644
index abb6877be61..00000000000
--- a/keyboards/rmi_kb/mona/v1/info.json
+++ /dev/null
@@ -1,373 +0,0 @@
-{
-    "keyboard_name": "Mona",
-    "manufacturer": "RMI-KB",
-    "url": "",
-    "maintainer": "ramonimbao",
-    "usb": {
-        "vid": "0xB16B",
-        "pid": "0x404A",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["D0", "D3", "D2", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"],
-        "rows": ["D1", "D5", "B7", "F0", "F1"]
-    },
-    "diode_direction": "COL2ROW",
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "layout_aliases": {
-        "LAYOUT_all": "LAYOUT_60_iso_split_bs_rshift"
-    },
-    "layouts": {
-        "LAYOUT_60_ansi": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 2], "x": 2.25, "y": 3},
-                {"matrix": [3, 3], "x": 3.25, "y": 3},
-                {"matrix": [3, 4], "x": 4.25, "y": 3},
-                {"matrix": [3, 5], "x": 5.25, "y": 3},
-                {"matrix": [3, 6], "x": 6.25, "y": 3},
-                {"matrix": [3, 7], "x": 7.25, "y": 3},
-                {"matrix": [3, 8], "x": 8.25, "y": 3},
-                {"matrix": [3, 9], "x": 9.25, "y": 3},
-                {"matrix": [3, 10], "x": 10.25, "y": 3},
-                {"matrix": [3, 11], "x": 11.25, "y": 3},
-                {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 2.75},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
-                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
-                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 13], "x": 12.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 14], "x": 13.75, "y": 4, "w": 1.25}
-            ]
-        },
-        "LAYOUT_60_tsangan_hhkb": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"matrix": [0, 13], "x": 13, "y": 0},
-                {"matrix": [0, 14], "x": 14, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 2], "x": 2.25, "y": 3},
-                {"matrix": [3, 3], "x": 3.25, "y": 3},
-                {"matrix": [3, 4], "x": 4.25, "y": 3},
-                {"matrix": [3, 5], "x": 5.25, "y": 3},
-                {"matrix": [3, 6], "x": 6.25, "y": 3},
-                {"matrix": [3, 7], "x": 7.25, "y": 3},
-                {"matrix": [3, 8], "x": 8.25, "y": 3},
-                {"matrix": [3, 9], "x": 9.25, "y": 3},
-                {"matrix": [3, 10], "x": 10.25, "y": 3},
-                {"matrix": [3, 11], "x": 11.25, "y": 3},
-                {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
-                {"matrix": [3, 14], "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, 13], "x": 12.5, "y": 4},
-                {"matrix": [4, 14], "x": 13.5, "y": 4, "w": 1.5}
-            ]
-        },
-        "LAYOUT_60_iso": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 14], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 13], "x": 12.75, "y": 2},
-
-                {"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, 13], "x": 12.25, "y": 3, "w": 2.75},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
-                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
-                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 13], "x": 12.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 14], "x": 13.75, "y": 4, "w": 1.25}
-            ]
-        },
-        "LAYOUT_60_iso_split_bs_rshift": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"matrix": [0, 13], "x": 13, "y": 0},
-                {"matrix": [0, 14], "x": 14, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 14], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 13], "x": 12.75, "y": 2},
-
-                {"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, 13], "x": 12.25, "y": 3, "w": 1.75},
-                {"matrix": [3, 14], "x": 14, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
-                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
-                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 13], "x": 12.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 14], "x": 13.75, "y": 4, "w": 1.25}
-            ]
-        },
-        "LAYOUT_60_iso_tsangan": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 14], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 13], "x": 12.75, "y": 2},
-
-                {"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, 13], "x": 12.25, "y": 3, "w": 2.75},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
-                {"matrix": [4, 1], "x": 1.5, "y": 4},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
-                {"matrix": [4, 6], "x": 4, "y": 4, "w": 7},
-                {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
-                {"matrix": [4, 13], "x": 12.5, "y": 4},
-                {"matrix": [4, 14], "x": 13.5, "y": 4, "w": 1.5}
-            ]
-        }
-    }
-}
diff --git a/keyboards/rmi_kb/mona/v1/keyboard.json b/keyboards/rmi_kb/mona/v1/keyboard.json
new file mode 100644
index 00000000000..7bd5f56e142
--- /dev/null
+++ b/keyboards/rmi_kb/mona/v1/keyboard.json
@@ -0,0 +1,385 @@
+{
+    "keyboard_name": "Mona",
+    "manufacturer": "RMI-KB",
+    "url": "",
+    "maintainer": "ramonimbao",
+    "usb": {
+        "vid": "0xB16B",
+        "pid": "0x404A",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": false
+    },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
+    "matrix_pins": {
+        "cols": ["D0", "D3", "D2", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"],
+        "rows": ["D1", "D5", "B7", "F0", "F1"]
+    },
+    "diode_direction": "COL2ROW",
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "layout_aliases": {
+        "LAYOUT_all": "LAYOUT_60_iso_split_bs_rshift"
+    },
+    "layouts": {
+        "LAYOUT_60_ansi": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 2.75},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 14], "x": 13.75, "y": 4, "w": 1.25}
+            ]
+        },
+        "LAYOUT_60_tsangan_hhkb": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "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, 13], "x": 12.5, "y": 4},
+                {"matrix": [4, 14], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_60_iso": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2},
+
+                {"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, 13], "x": 12.25, "y": 3, "w": 2.75},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 14], "x": 13.75, "y": 4, "w": 1.25}
+            ]
+        },
+        "LAYOUT_60_iso_split_bs_rshift": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2},
+
+                {"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, 13], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 14], "x": 13.75, "y": 4, "w": 1.25}
+            ]
+        },
+        "LAYOUT_60_iso_tsangan": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2},
+
+                {"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, 13], "x": 12.25, "y": 3, "w": 2.75},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 13], "x": 12.5, "y": 4},
+                {"matrix": [4, 14], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/rmi_kb/mona/v1/rules.mk b/keyboards/rmi_kb/mona/v1/rules.mk
deleted file mode 100644
index ab2c49da70e..00000000000
--- a/keyboards/rmi_kb/mona/v1/rules.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
diff --git a/keyboards/rmi_kb/mona/v1_1/info.json b/keyboards/rmi_kb/mona/v1_1/info.json
deleted file mode 100644
index 3457d9cf739..00000000000
--- a/keyboards/rmi_kb/mona/v1_1/info.json
+++ /dev/null
@@ -1,447 +0,0 @@
-{
-    "keyboard_name": "Mona",
-    "manufacturer": "RMI-KB",
-    "url": "",
-    "maintainer": "ramonimbao",
-    "usb": {
-        "vid": "0xB16B",
-        "pid": "0x404B",
-        "device_version": "0.1.1"
-    },
-    "matrix_pins": {
-        "cols": ["D0", "D3", "D2", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"],
-        "rows": ["D1", "D5", "B7", "F0", "F1"]
-    },
-    "diode_direction": "COL2ROW",
-    "indicators": {
-        "caps_lock": "B3"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "layouts": {
-        "LAYOUT_60_ansi": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 2], "x": 2.25, "y": 3},
-                {"matrix": [3, 3], "x": 3.25, "y": 3},
-                {"matrix": [3, 4], "x": 4.25, "y": 3},
-                {"matrix": [3, 5], "x": 5.25, "y": 3},
-                {"matrix": [3, 6], "x": 6.25, "y": 3},
-                {"matrix": [3, 7], "x": 7.25, "y": 3},
-                {"matrix": [3, 8], "x": 8.25, "y": 3},
-                {"matrix": [3, 9], "x": 9.25, "y": 3},
-                {"matrix": [3, 10], "x": 10.25, "y": 3},
-                {"matrix": [3, 11], "x": 11.25, "y": 3},
-                {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 2.75},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
-                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
-                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 13], "x": 12.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 14], "x": 13.75, "y": 4, "w": 1.25}
-            ]
-        },
-        "LAYOUT_60_tsangan_hhkb": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"matrix": [0, 13], "x": 13, "y": 0},
-                {"matrix": [0, 14], "x": 14, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 2], "x": 2.25, "y": 3},
-                {"matrix": [3, 3], "x": 3.25, "y": 3},
-                {"matrix": [3, 4], "x": 4.25, "y": 3},
-                {"matrix": [3, 5], "x": 5.25, "y": 3},
-                {"matrix": [3, 6], "x": 6.25, "y": 3},
-                {"matrix": [3, 7], "x": 7.25, "y": 3},
-                {"matrix": [3, 8], "x": 8.25, "y": 3},
-                {"matrix": [3, 9], "x": 9.25, "y": 3},
-                {"matrix": [3, 10], "x": 10.25, "y": 3},
-                {"matrix": [3, 11], "x": 11.25, "y": 3},
-                {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
-                {"matrix": [3, 14], "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, 13], "x": 12.5, "y": 4},
-                {"matrix": [4, 14], "x": 13.5, "y": 4, "w": 1.5}
-            ]
-        },
-        "LAYOUT_60_iso": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 14], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 13], "x": 12.75, "y": 2},
-
-                {"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, 13], "x": 12.25, "y": 3, "w": 2.75},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
-                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
-                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 13], "x": 12.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 14], "x": 13.75, "y": 4, "w": 1.25}
-            ]
-        },
-        "LAYOUT_60_iso_split_bs_rshift": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"matrix": [0, 13], "x": 13, "y": 0},
-                {"matrix": [0, 14], "x": 14, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 14], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 13], "x": 12.75, "y": 2},
-
-                {"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, 13], "x": 12.25, "y": 3, "w": 1.75},
-                {"matrix": [3, 14], "x": 14, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
-                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
-                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 13], "x": 12.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 14], "x": 13.75, "y": 4, "w": 1.25}
-            ]
-        },
-        "LAYOUT_60_iso_tsangan": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 14], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 13], "x": 12.75, "y": 2},
-
-                {"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, 13], "x": 12.25, "y": 3, "w": 2.75},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
-                {"matrix": [4, 1], "x": 1.5, "y": 4},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
-                {"matrix": [4, 6], "x": 4, "y": 4, "w": 7},
-                {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
-                {"matrix": [4, 13], "x": 12.5, "y": 4},
-                {"matrix": [4, 14], "x": 13.5, "y": 4, "w": 1.5}
-            ]
-        },
-        "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": [0, 14], "x": 14, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 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, 13], "x": 12.25, "y": 3, "w": 1.75},
-                {"matrix": [3, 14], "x": 14, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 4], "x": 3.75, "y": 4, "w": 2.5},
-                {"matrix": [4, 6], "x": 6.25, "y": 4},
-                {"matrix": [4, 8], "x": 7.25, "y": 4, "w": 2.75},
-                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
-                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 13], "x": 12.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 14], "x": 13.75, "y": 4, "w": 1.25}
-            ]
-        }
-    }
-}
diff --git a/keyboards/rmi_kb/mona/v1_1/keyboard.json b/keyboards/rmi_kb/mona/v1_1/keyboard.json
new file mode 100644
index 00000000000..7f25b8da478
--- /dev/null
+++ b/keyboards/rmi_kb/mona/v1_1/keyboard.json
@@ -0,0 +1,453 @@
+{
+    "keyboard_name": "Mona",
+    "manufacturer": "RMI-KB",
+    "url": "",
+    "maintainer": "ramonimbao",
+    "usb": {
+        "vid": "0xB16B",
+        "pid": "0x404B",
+        "device_version": "0.1.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": false
+    },
+    "matrix_pins": {
+        "cols": ["D0", "D3", "D2", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"],
+        "rows": ["D1", "D5", "B7", "F0", "F1"]
+    },
+    "diode_direction": "COL2ROW",
+    "indicators": {
+        "caps_lock": "B3"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "layouts": {
+        "LAYOUT_60_ansi": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 2.75},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 14], "x": 13.75, "y": 4, "w": 1.25}
+            ]
+        },
+        "LAYOUT_60_tsangan_hhkb": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "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, 13], "x": 12.5, "y": 4},
+                {"matrix": [4, 14], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_60_iso": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2},
+
+                {"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, 13], "x": 12.25, "y": 3, "w": 2.75},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 14], "x": 13.75, "y": 4, "w": 1.25}
+            ]
+        },
+        "LAYOUT_60_iso_split_bs_rshift": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2},
+
+                {"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, 13], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 14], "x": 13.75, "y": 4, "w": 1.25}
+            ]
+        },
+        "LAYOUT_60_iso_tsangan": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2},
+
+                {"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, 13], "x": 12.25, "y": 3, "w": 2.75},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 13], "x": 12.5, "y": 4},
+                {"matrix": [4, 14], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        },
+        "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": [0, 14], "x": 14, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 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, 13], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 3.75, "y": 4, "w": 2.5},
+                {"matrix": [4, 6], "x": 6.25, "y": 4},
+                {"matrix": [4, 8], "x": 7.25, "y": 4, "w": 2.75},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 14], "x": 13.75, "y": 4, "w": 1.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/rmi_kb/mona/v1_1/rules.mk b/keyboards/rmi_kb/mona/v1_1/rules.mk
deleted file mode 100644
index ab2c49da70e..00000000000
--- a/keyboards/rmi_kb/mona/v1_1/rules.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
diff --git a/keyboards/rmi_kb/mona/v32a/info.json b/keyboards/rmi_kb/mona/v32a/info.json
deleted file mode 100644
index a489e0fffc6..00000000000
--- a/keyboards/rmi_kb/mona/v32a/info.json
+++ /dev/null
@@ -1,447 +0,0 @@
-{
-    "keyboard_name": "Mona",
-    "manufacturer": "RMI-KB",
-    "url": "",
-    "maintainer": "ramonimbao",
-    "usb": {
-        "vid": "0xB16B",
-        "pid": "0x4032",
-        "device_version": "0.1.1"
-    },
-    "matrix_pins": {
-        "cols": ["B4", "B3", "B2", "B1", "B0", "A0", "A1", "A2", "A5", "A4", "A3", "A7", "D5", "C7", "C6"],
-        "rows": ["C2", "C3", "D6", "D1", "A6"]
-    },
-    "diode_direction": "COL2ROW",
-    "indicators": {
-        "caps_lock": "C1"
-    },
-    "processor": "atmega32a",
-    "bootloader": "usbasploader",
-    "layouts": {
-        "LAYOUT_60_ansi": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 2], "x": 2.25, "y": 3},
-                {"matrix": [3, 3], "x": 3.25, "y": 3},
-                {"matrix": [3, 4], "x": 4.25, "y": 3},
-                {"matrix": [3, 5], "x": 5.25, "y": 3},
-                {"matrix": [3, 6], "x": 6.25, "y": 3},
-                {"matrix": [3, 7], "x": 7.25, "y": 3},
-                {"matrix": [3, 8], "x": 8.25, "y": 3},
-                {"matrix": [3, 9], "x": 9.25, "y": 3},
-                {"matrix": [3, 10], "x": 10.25, "y": 3},
-                {"matrix": [3, 11], "x": 11.25, "y": 3},
-                {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 2.75},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
-                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
-                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 13], "x": 12.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 14], "x": 13.75, "y": 4, "w": 1.25}
-            ]
-        },
-        "LAYOUT_60_tsangan_hhkb": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"matrix": [0, 13], "x": 13, "y": 0},
-                {"matrix": [0, 14], "x": 14, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 2], "x": 2.25, "y": 3},
-                {"matrix": [3, 3], "x": 3.25, "y": 3},
-                {"matrix": [3, 4], "x": 4.25, "y": 3},
-                {"matrix": [3, 5], "x": 5.25, "y": 3},
-                {"matrix": [3, 6], "x": 6.25, "y": 3},
-                {"matrix": [3, 7], "x": 7.25, "y": 3},
-                {"matrix": [3, 8], "x": 8.25, "y": 3},
-                {"matrix": [3, 9], "x": 9.25, "y": 3},
-                {"matrix": [3, 10], "x": 10.25, "y": 3},
-                {"matrix": [3, 11], "x": 11.25, "y": 3},
-                {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
-                {"matrix": [3, 14], "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, 13], "x": 12.5, "y": 4},
-                {"matrix": [4, 14], "x": 13.5, "y": 4, "w": 1.5}
-            ]
-        },
-        "LAYOUT_60_iso": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 14], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 13], "x": 12.75, "y": 2},
-
-                {"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, 13], "x": 12.25, "y": 3, "w": 2.75},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
-                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
-                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 13], "x": 12.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 14], "x": 13.75, "y": 4, "w": 1.25}
-            ]
-        },
-        "LAYOUT_60_iso_split_bs_rshift": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"matrix": [0, 13], "x": 13, "y": 0},
-                {"matrix": [0, 14], "x": 14, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 14], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 13], "x": 12.75, "y": 2},
-
-                {"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, 13], "x": 12.25, "y": 3, "w": 1.75},
-                {"matrix": [3, 14], "x": 14, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
-                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
-                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 13], "x": 12.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 14], "x": 13.75, "y": 4, "w": 1.25}
-            ]
-        },
-        "LAYOUT_60_iso_tsangan": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 14], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 13], "x": 12.75, "y": 2},
-
-                {"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, 13], "x": 12.25, "y": 3, "w": 2.75},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
-                {"matrix": [4, 1], "x": 1.5, "y": 4},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
-                {"matrix": [4, 6], "x": 4, "y": 4, "w": 7},
-                {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
-                {"matrix": [4, 13], "x": 12.5, "y": 4},
-                {"matrix": [4, 14], "x": 13.5, "y": 4, "w": 1.5}
-            ]
-        },
-        "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": [0, 14], "x": 14, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 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, 13], "x": 12.25, "y": 3, "w": 1.75},
-                {"matrix": [3, 14], "x": 14, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 2.5},
-                {"matrix": [4, 6], "x": 6.25, "y": 4},
-                {"matrix": [4, 9], "x": 7.25, "y": 4, "w": 2.75},
-                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
-                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 13], "x": 12.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 14], "x": 13.75, "y": 4, "w": 1.25}
-            ]
-        }
-    }
-}
diff --git a/keyboards/rmi_kb/mona/v32a/keyboard.json b/keyboards/rmi_kb/mona/v32a/keyboard.json
new file mode 100644
index 00000000000..363ea3438f5
--- /dev/null
+++ b/keyboards/rmi_kb/mona/v32a/keyboard.json
@@ -0,0 +1,453 @@
+{
+    "keyboard_name": "Mona",
+    "manufacturer": "RMI-KB",
+    "url": "",
+    "maintainer": "ramonimbao",
+    "usb": {
+        "vid": "0xB16B",
+        "pid": "0x4032",
+        "device_version": "0.1.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": false
+    },
+    "matrix_pins": {
+        "cols": ["B4", "B3", "B2", "B1", "B0", "A0", "A1", "A2", "A5", "A4", "A3", "A7", "D5", "C7", "C6"],
+        "rows": ["C2", "C3", "D6", "D1", "A6"]
+    },
+    "diode_direction": "COL2ROW",
+    "indicators": {
+        "caps_lock": "C1"
+    },
+    "processor": "atmega32a",
+    "bootloader": "usbasploader",
+    "layouts": {
+        "LAYOUT_60_ansi": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 2.75},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 14], "x": 13.75, "y": 4, "w": 1.25}
+            ]
+        },
+        "LAYOUT_60_tsangan_hhkb": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "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, 13], "x": 12.5, "y": 4},
+                {"matrix": [4, 14], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_60_iso": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2},
+
+                {"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, 13], "x": 12.25, "y": 3, "w": 2.75},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 14], "x": 13.75, "y": 4, "w": 1.25}
+            ]
+        },
+        "LAYOUT_60_iso_split_bs_rshift": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2},
+
+                {"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, 13], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 14], "x": 13.75, "y": 4, "w": 1.25}
+            ]
+        },
+        "LAYOUT_60_iso_tsangan": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2},
+
+                {"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, 13], "x": 12.25, "y": 3, "w": 2.75},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 13], "x": 12.5, "y": 4},
+                {"matrix": [4, 14], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        },
+        "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": [0, 14], "x": 14, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 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, 13], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 2.5},
+                {"matrix": [4, 6], "x": 6.25, "y": 4},
+                {"matrix": [4, 9], "x": 7.25, "y": 4, "w": 2.75},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 14], "x": 13.75, "y": 4, "w": 1.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/rmi_kb/mona/v32a/rules.mk b/keyboards/rmi_kb/mona/v32a/rules.mk
index 1e9f9255447..c2ee0bc86f9 100644
--- a/keyboards/rmi_kb/mona/v32a/rules.mk
+++ b/keyboards/rmi_kb/mona/v32a/rules.mk
@@ -1,15 +1,2 @@
 # Processor frequency
 F_CPU = 16000000
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
diff --git a/keyboards/rmi_kb/tkl_ff/config.h b/keyboards/rmi_kb/tkl_ff/config.h
deleted file mode 100644
index 656deab55a6..00000000000
--- a/keyboards/rmi_kb/tkl_ff/config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-Copyright 2021 Ramon Imbao
-
-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
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/rmi_kb/tkl_ff/info.json b/keyboards/rmi_kb/tkl_ff/info.json
index b09e0e888ec..a4fe24cab73 100644
--- a/keyboards/rmi_kb/tkl_ff/info.json
+++ b/keyboards/rmi_kb/tkl_ff/info.json
@@ -15,6 +15,12 @@
         "mousekey": true,
         "nkro": false
     },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
     "matrix_pins": {
         "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D4", "D5", "B0", "B1", "D1"],
         "rows": ["B2", "B3", "B7", "D6", "D3", "D2"]
diff --git a/keyboards/rmi_kb/tkl_ff/v2/info.json b/keyboards/rmi_kb/tkl_ff/v2/info.json
deleted file mode 100644
index 72a3406af3e..00000000000
--- a/keyboards/rmi_kb/tkl_ff/v2/info.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "usb": {
-        "pid": "0x10FF"
-    },
-    "rgblight": {
-        "hue_steps": 32,
-        "saturation_steps": 32,
-        "brightness_steps": 32,
-        "led_count": 26,
-        "animations": {
-            "breathing": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "christmas": true,
-            "static_gradient": true,
-            "rgb_test": true,
-            "alternating": true
-        }
-    },
-    "ws2812": {
-        "pin": "E2"
-    }
-}
diff --git a/keyboards/rmi_kb/tkl_ff/v2/keyboard.json b/keyboards/rmi_kb/tkl_ff/v2/keyboard.json
new file mode 100644
index 00000000000..49e662fecc4
--- /dev/null
+++ b/keyboards/rmi_kb/tkl_ff/v2/keyboard.json
@@ -0,0 +1,26 @@
+{
+    "usb": {
+        "pid": "0x10FF"
+    },
+    "features": {
+        "rgblight": true
+    },
+    "rgblight": {
+        "hue_steps": 32,
+        "saturation_steps": 32,
+        "brightness_steps": 32,
+        "led_count": 26,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "christmas": true,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": true
+        }
+    },
+    "ws2812": {
+        "pin": "E2"
+    }
+}
diff --git a/keyboards/rmi_kb/tkl_ff/v2/rules.mk b/keyboards/rmi_kb/tkl_ff/v2/rules.mk
deleted file mode 100644
index 84ef473c02e..00000000000
--- a/keyboards/rmi_kb/tkl_ff/v2/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-RGBLIGHT_ENABLE = yes        # Enable keyboard RGB underglow
diff --git a/keyboards/rmi_kb/wete/v1/info.json b/keyboards/rmi_kb/wete/v1/info.json
deleted file mode 100644
index 47a6befec34..00000000000
--- a/keyboards/rmi_kb/wete/v1/info.json
+++ /dev/null
@@ -1,1295 +0,0 @@
-{
-    "keyboard_name": "Wete",
-    "manufacturer": "RMI-KB",
-    "url": "",
-    "maintainer": "ramonimbao",
-    "usb": {
-        "vid": "0xB16B",
-        "pid": "0x00B5",
-        "device_version": "0.1.2"
-    },
-    "matrix_pins": {
-        "cols": ["B13", "B14", "B15", "A8", "B0", "A7", "A5", "A4", "A3", "B9", "C13", "C14", "C15", "F0", "F1", "A0", "A1", "A2", "B8", "B7"],
-        "rows": ["A9", "B12", "B11", "B10", "B2", "B1"]
-    },
-    "diode_direction": "COL2ROW",
-    "backlight": {
-        "pin": "A6",
-        "levels": 24,
-        "breathing": true
-    },
-    "rgblight": {
-        "led_count": 24,
-        "animations": {
-            "breathing": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "snake": true,
-            "knight": true,
-            "christmas": true,
-            "static_gradient": true,
-            "rgb_test": true,
-            "alternating": true,
-            "twinkle": true
-        }
-    },
-    "ws2812": {
-        "pin": "B4"
-    },
-    "processor": "STM32F072",
-    "bootloader": "stm32-dfu",
-    "layouts": {
-        "LAYOUT_ansi_rhnp": {
-            "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.25, "y": 0},
-
-                {"matrix": [0, 5], "x": 5.75, "y": 0},
-                {"matrix": [0, 6], "x": 6.75, "y": 0},
-                {"matrix": [0, 7], "x": 7.75, "y": 0},
-                {"matrix": [0, 8], "x": 8.75, "y": 0},
-
-                {"matrix": [0, 10], "x": 10.25, "y": 0},
-                {"matrix": [0, 11], "x": 11.25, "y": 0},
-                {"matrix": [0, 12], "x": 12.25, "y": 0},
-                {"matrix": [0, 13], "x": 13.25, "y": 0},
-
-                {"matrix": [0, 15], "x": 14.75, "y": 0},
-                {"matrix": [0, 16], "x": 15.75, "y": 0},
-                {"matrix": [0, 17], "x": 16.75, "y": 0},
-                {"matrix": [0, 18], "x": 17.75, "y": 0},
-
-                {"matrix": [0, 19], "x": 19.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.25, "y": 1.25},
-                {"matrix": [1, 5], "x": 5.25, "y": 1.25},
-                {"matrix": [1, 6], "x": 6.25, "y": 1.25},
-                {"matrix": [1, 7], "x": 7.25, "y": 1.25},
-                {"matrix": [1, 8], "x": 8.25, "y": 1.25},
-                {"matrix": [1, 9], "x": 9.25, "y": 1.25},
-                {"matrix": [1, 10], "x": 10.25, "y": 1.25},
-                {"matrix": [1, 11], "x": 11.25, "y": 1.25},
-                {"matrix": [1, 12], "x": 12.25, "y": 1.25},
-                {"matrix": [1, 13], "x": 13.25, "y": 1.25},
-                {"matrix": [1, 14], "x": 14.25, "y": 1.25},
-                {"matrix": [1, 15], "x": 15.25, "y": 1.25},
-                {"matrix": [1, 16], "x": 16.25, "y": 1.25},
-                {"matrix": [1, 17], "x": 17.25, "y": 1.25, "w": 2},
-                {"matrix": [1, 19], "x": 19.25, "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, "h": 2},
-
-                {"matrix": [2, 4], "x": 4.25, "y": 2.25, "w": 1.5},
-                {"matrix": [2, 5], "x": 5.75, "y": 2.25},
-                {"matrix": [2, 6], "x": 6.75, "y": 2.25},
-                {"matrix": [2, 7], "x": 7.75, "y": 2.25},
-                {"matrix": [2, 8], "x": 8.75, "y": 2.25},
-                {"matrix": [2, 9], "x": 9.75, "y": 2.25},
-                {"matrix": [2, 10], "x": 10.75, "y": 2.25},
-                {"matrix": [2, 11], "x": 11.75, "y": 2.25},
-                {"matrix": [2, 12], "x": 12.75, "y": 2.25},
-                {"matrix": [2, 13], "x": 13.75, "y": 2.25},
-                {"matrix": [2, 14], "x": 14.75, "y": 2.25},
-                {"matrix": [2, 15], "x": 15.75, "y": 2.25},
-                {"matrix": [2, 16], "x": 16.75, "y": 2.25},
-                {"matrix": [2, 18], "x": 17.75, "y": 2.25, "w": 1.5},
-                {"matrix": [2, 19], "x": 19.25, "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, 4], "x": 4.25, "y": 3.25, "w": 1.75},
-                {"matrix": [3, 5], "x": 6, "y": 3.25},
-                {"matrix": [3, 6], "x": 7, "y": 3.25},
-                {"matrix": [3, 7], "x": 8, "y": 3.25},
-                {"matrix": [3, 8], "x": 9, "y": 3.25},
-                {"matrix": [3, 9], "x": 10, "y": 3.25},
-                {"matrix": [3, 10], "x": 11, "y": 3.25},
-                {"matrix": [3, 11], "x": 12, "y": 3.25},
-                {"matrix": [3, 12], "x": 13, "y": 3.25},
-                {"matrix": [3, 13], "x": 14, "y": 3.25},
-                {"matrix": [3, 14], "x": 15, "y": 3.25},
-                {"matrix": [3, 15], "x": 16, "y": 3.25},
-                {"matrix": [3, 18], "x": 17, "y": 3.25, "w": 2.25},
-                {"matrix": [3, 19], "x": 19.25, "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, "h": 2},
-
-                {"matrix": [4, 4], "x": 4.25, "y": 4.25, "w": 2.25},
-                {"matrix": [4, 6], "x": 6.5, "y": 4.25},
-                {"matrix": [4, 7], "x": 7.5, "y": 4.25},
-                {"matrix": [4, 8], "x": 8.5, "y": 4.25},
-                {"matrix": [4, 9], "x": 9.5, "y": 4.25},
-                {"matrix": [4, 10], "x": 10.5, "y": 4.25},
-                {"matrix": [4, 11], "x": 11.5, "y": 4.25},
-                {"matrix": [4, 12], "x": 12.5, "y": 4.25},
-                {"matrix": [4, 13], "x": 13.5, "y": 4.25},
-                {"matrix": [4, 14], "x": 14.5, "y": 4.25},
-                {"matrix": [4, 15], "x": 15.5, "y": 4.25},
-                {"matrix": [4, 17], "x": 16.5, "y": 4.25, "w": 1.75},
-                {"matrix": [4, 18], "x": 18.25, "y": 4.25},
-                {"matrix": [4, 19], "x": 19.25, "y": 4.25},
-
-                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 2},
-                {"matrix": [5, 2], "x": 2, "y": 5.25},
-
-                {"matrix": [5, 4], "x": 4.25, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 5], "x": 5.5, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 6], "x": 6.75, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 10], "x": 8, "y": 5.25, "w": 6.25},
-                {"matrix": [5, 13], "x": 14.25, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 15], "x": 15.5, "y": 5.25, "w": 1.25},
-
-                {"matrix": [5, 17], "x": 17.25, "y": 5.25},
-                {"matrix": [5, 18], "x": 18.25, "y": 5.25},
-                {"matrix": [5, 19], "x": 19.25, "y": 5.25}
-            ]
-        },
-        "LAYOUT_ansi_lhnp": {
-            "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.25, "y": 0},
-
-                {"matrix": [0, 5], "x": 5.75, "y": 0},
-                {"matrix": [0, 6], "x": 6.75, "y": 0},
-                {"matrix": [0, 7], "x": 7.75, "y": 0},
-                {"matrix": [0, 8], "x": 8.75, "y": 0},
-
-                {"matrix": [0, 10], "x": 10.25, "y": 0},
-                {"matrix": [0, 11], "x": 11.25, "y": 0},
-                {"matrix": [0, 12], "x": 12.25, "y": 0},
-                {"matrix": [0, 13], "x": 13.25, "y": 0},
-
-                {"matrix": [0, 15], "x": 14.75, "y": 0},
-                {"matrix": [0, 16], "x": 15.75, "y": 0},
-                {"matrix": [0, 17], "x": 16.75, "y": 0},
-                {"matrix": [0, 18], "x": 17.75, "y": 0},
-
-                {"matrix": [0, 19], "x": 19.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.25, "y": 1.25},
-                {"matrix": [1, 5], "x": 5.25, "y": 1.25},
-                {"matrix": [1, 6], "x": 6.25, "y": 1.25},
-                {"matrix": [1, 7], "x": 7.25, "y": 1.25},
-                {"matrix": [1, 8], "x": 8.25, "y": 1.25},
-                {"matrix": [1, 9], "x": 9.25, "y": 1.25},
-                {"matrix": [1, 10], "x": 10.25, "y": 1.25},
-                {"matrix": [1, 11], "x": 11.25, "y": 1.25},
-                {"matrix": [1, 12], "x": 12.25, "y": 1.25},
-                {"matrix": [1, 13], "x": 13.25, "y": 1.25},
-                {"matrix": [1, 14], "x": 14.25, "y": 1.25},
-                {"matrix": [1, 15], "x": 15.25, "y": 1.25},
-                {"matrix": [1, 16], "x": 16.25, "y": 1.25},
-                {"matrix": [1, 17], "x": 17.25, "y": 1.25, "w": 2},
-                {"matrix": [1, 19], "x": 19.25, "y": 1.25},
-
-                {"matrix": [2, 0], "x": 0, "y": 2.25, "h": 2},
-                {"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": [2, 4], "x": 4.25, "y": 2.25, "w": 1.5},
-                {"matrix": [2, 5], "x": 5.75, "y": 2.25},
-                {"matrix": [2, 6], "x": 6.75, "y": 2.25},
-                {"matrix": [2, 7], "x": 7.75, "y": 2.25},
-                {"matrix": [2, 8], "x": 8.75, "y": 2.25},
-                {"matrix": [2, 9], "x": 9.75, "y": 2.25},
-                {"matrix": [2, 10], "x": 10.75, "y": 2.25},
-                {"matrix": [2, 11], "x": 11.75, "y": 2.25},
-                {"matrix": [2, 12], "x": 12.75, "y": 2.25},
-                {"matrix": [2, 13], "x": 13.75, "y": 2.25},
-                {"matrix": [2, 14], "x": 14.75, "y": 2.25},
-                {"matrix": [2, 15], "x": 15.75, "y": 2.25},
-                {"matrix": [2, 16], "x": 16.75, "y": 2.25},
-                {"matrix": [2, 18], "x": 17.75, "y": 2.25, "w": 1.5},
-                {"matrix": [2, 19], "x": 19.25, "y": 2.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": [3, 4], "x": 4.25, "y": 3.25, "w": 1.75},
-                {"matrix": [3, 5], "x": 6, "y": 3.25},
-                {"matrix": [3, 6], "x": 7, "y": 3.25},
-                {"matrix": [3, 7], "x": 8, "y": 3.25},
-                {"matrix": [3, 8], "x": 9, "y": 3.25},
-                {"matrix": [3, 9], "x": 10, "y": 3.25},
-                {"matrix": [3, 10], "x": 11, "y": 3.25},
-                {"matrix": [3, 11], "x": 12, "y": 3.25},
-                {"matrix": [3, 12], "x": 13, "y": 3.25},
-                {"matrix": [3, 13], "x": 14, "y": 3.25},
-                {"matrix": [3, 14], "x": 15, "y": 3.25},
-                {"matrix": [3, 15], "x": 16, "y": 3.25},
-                {"matrix": [3, 18], "x": 17, "y": 3.25, "w": 2.25},
-                {"matrix": [3, 19], "x": 19.25, "y": 3.25},
-
-                {"matrix": [4, 0], "x": 0, "y": 4.25, "h": 2},
-                {"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": [4, 4], "x": 4.25, "y": 4.25, "w": 2.25},
-                {"matrix": [4, 6], "x": 6.5, "y": 4.25},
-                {"matrix": [4, 7], "x": 7.5, "y": 4.25},
-                {"matrix": [4, 8], "x": 8.5, "y": 4.25},
-                {"matrix": [4, 9], "x": 9.5, "y": 4.25},
-                {"matrix": [4, 10], "x": 10.5, "y": 4.25},
-                {"matrix": [4, 11], "x": 11.5, "y": 4.25},
-                {"matrix": [4, 12], "x": 12.5, "y": 4.25},
-                {"matrix": [4, 13], "x": 13.5, "y": 4.25},
-                {"matrix": [4, 14], "x": 14.5, "y": 4.25},
-                {"matrix": [4, 15], "x": 15.5, "y": 4.25},
-                {"matrix": [4, 17], "x": 16.5, "y": 4.25, "w": 1.75},
-                {"matrix": [4, 18], "x": 18.25, "y": 4.25},
-                {"matrix": [4, 19], "x": 19.25, "y": 4.25},
-
-                {"matrix": [5, 1], "x": 1, "y": 5.25},
-                {"matrix": [5, 2], "x": 2, "y": 5.25, "w": 2},
-
-                {"matrix": [5, 4], "x": 4.25, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 5], "x": 5.5, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 6], "x": 6.75, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 10], "x": 8, "y": 5.25, "w": 6.25},
-                {"matrix": [5, 13], "x": 14.25, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 15], "x": 15.5, "y": 5.25, "w": 1.25},
-
-                {"matrix": [5, 17], "x": 17.25, "y": 5.25},
-                {"matrix": [5, 18], "x": 18.25, "y": 5.25},
-                {"matrix": [5, 19], "x": 19.25, "y": 5.25}
-            ]
-        },
-        "LAYOUT_ansi_macro": {
-            "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.25, "y": 0},
-
-                {"matrix": [0, 5], "x": 5.75, "y": 0},
-                {"matrix": [0, 6], "x": 6.75, "y": 0},
-                {"matrix": [0, 7], "x": 7.75, "y": 0},
-                {"matrix": [0, 8], "x": 8.75, "y": 0},
-
-                {"matrix": [0, 10], "x": 10.25, "y": 0},
-                {"matrix": [0, 11], "x": 11.25, "y": 0},
-                {"matrix": [0, 12], "x": 12.25, "y": 0},
-                {"matrix": [0, 13], "x": 13.25, "y": 0},
-
-                {"matrix": [0, 15], "x": 14.75, "y": 0},
-                {"matrix": [0, 16], "x": 15.75, "y": 0},
-                {"matrix": [0, 17], "x": 16.75, "y": 0},
-                {"matrix": [0, 18], "x": 17.75, "y": 0},
-
-                {"matrix": [0, 19], "x": 19.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.25, "y": 1.25},
-                {"matrix": [1, 5], "x": 5.25, "y": 1.25},
-                {"matrix": [1, 6], "x": 6.25, "y": 1.25},
-                {"matrix": [1, 7], "x": 7.25, "y": 1.25},
-                {"matrix": [1, 8], "x": 8.25, "y": 1.25},
-                {"matrix": [1, 9], "x": 9.25, "y": 1.25},
-                {"matrix": [1, 10], "x": 10.25, "y": 1.25},
-                {"matrix": [1, 11], "x": 11.25, "y": 1.25},
-                {"matrix": [1, 12], "x": 12.25, "y": 1.25},
-                {"matrix": [1, 13], "x": 13.25, "y": 1.25},
-                {"matrix": [1, 14], "x": 14.25, "y": 1.25},
-                {"matrix": [1, 15], "x": 15.25, "y": 1.25},
-                {"matrix": [1, 16], "x": 16.25, "y": 1.25},
-                {"matrix": [1, 17], "x": 17.25, "y": 1.25, "w": 2},
-                {"matrix": [1, 19], "x": 19.25, "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": [2, 4], "x": 4.25, "y": 2.25, "w": 1.5},
-                {"matrix": [2, 5], "x": 5.75, "y": 2.25},
-                {"matrix": [2, 6], "x": 6.75, "y": 2.25},
-                {"matrix": [2, 7], "x": 7.75, "y": 2.25},
-                {"matrix": [2, 8], "x": 8.75, "y": 2.25},
-                {"matrix": [2, 9], "x": 9.75, "y": 2.25},
-                {"matrix": [2, 10], "x": 10.75, "y": 2.25},
-                {"matrix": [2, 11], "x": 11.75, "y": 2.25},
-                {"matrix": [2, 12], "x": 12.75, "y": 2.25},
-                {"matrix": [2, 13], "x": 13.75, "y": 2.25},
-                {"matrix": [2, 14], "x": 14.75, "y": 2.25},
-                {"matrix": [2, 15], "x": 15.75, "y": 2.25},
-                {"matrix": [2, 16], "x": 16.75, "y": 2.25},
-                {"matrix": [2, 18], "x": 17.75, "y": 2.25, "w": 1.5},
-                {"matrix": [2, 19], "x": 19.25, "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": [3, 4], "x": 4.25, "y": 3.25, "w": 1.75},
-                {"matrix": [3, 5], "x": 6, "y": 3.25},
-                {"matrix": [3, 6], "x": 7, "y": 3.25},
-                {"matrix": [3, 7], "x": 8, "y": 3.25},
-                {"matrix": [3, 8], "x": 9, "y": 3.25},
-                {"matrix": [3, 9], "x": 10, "y": 3.25},
-                {"matrix": [3, 10], "x": 11, "y": 3.25},
-                {"matrix": [3, 11], "x": 12, "y": 3.25},
-                {"matrix": [3, 12], "x": 13, "y": 3.25},
-                {"matrix": [3, 13], "x": 14, "y": 3.25},
-                {"matrix": [3, 14], "x": 15, "y": 3.25},
-                {"matrix": [3, 15], "x": 16, "y": 3.25},
-                {"matrix": [3, 18], "x": 17, "y": 3.25, "w": 2.25},
-                {"matrix": [3, 19], "x": 19.25, "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": [4, 4], "x": 4.25, "y": 4.25, "w": 2.25},
-                {"matrix": [4, 6], "x": 6.5, "y": 4.25},
-                {"matrix": [4, 7], "x": 7.5, "y": 4.25},
-                {"matrix": [4, 8], "x": 8.5, "y": 4.25},
-                {"matrix": [4, 9], "x": 9.5, "y": 4.25},
-                {"matrix": [4, 10], "x": 10.5, "y": 4.25},
-                {"matrix": [4, 11], "x": 11.5, "y": 4.25},
-                {"matrix": [4, 12], "x": 12.5, "y": 4.25},
-                {"matrix": [4, 13], "x": 13.5, "y": 4.25},
-                {"matrix": [4, 14], "x": 14.5, "y": 4.25},
-                {"matrix": [4, 15], "x": 15.5, "y": 4.25},
-                {"matrix": [4, 17], "x": 16.5, "y": 4.25, "w": 1.75},
-                {"matrix": [4, 18], "x": 18.25, "y": 4.25},
-                {"matrix": [4, 19], "x": 19.25, "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},
-
-                {"matrix": [5, 4], "x": 4.25, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 5], "x": 5.5, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 6], "x": 6.75, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 10], "x": 8, "y": 5.25, "w": 6.25},
-                {"matrix": [5, 13], "x": 14.25, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 15], "x": 15.5, "y": 5.25, "w": 1.25},
-
-                {"matrix": [5, 17], "x": 17.25, "y": 5.25},
-                {"matrix": [5, 18], "x": 18.25, "y": 5.25},
-                {"matrix": [5, 19], "x": 19.25, "y": 5.25}
-            ]
-        },
-        "LAYOUT_iso_rhnp": {
-            "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.25, "y": 0},
-
-                {"matrix": [0, 5], "x": 5.75, "y": 0},
-                {"matrix": [0, 6], "x": 6.75, "y": 0},
-                {"matrix": [0, 7], "x": 7.75, "y": 0},
-                {"matrix": [0, 8], "x": 8.75, "y": 0},
-
-                {"matrix": [0, 10], "x": 10.25, "y": 0},
-                {"matrix": [0, 11], "x": 11.25, "y": 0},
-                {"matrix": [0, 12], "x": 12.25, "y": 0},
-                {"matrix": [0, 13], "x": 13.25, "y": 0},
-
-                {"matrix": [0, 15], "x": 14.75, "y": 0},
-                {"matrix": [0, 16], "x": 15.75, "y": 0},
-                {"matrix": [0, 17], "x": 16.75, "y": 0},
-                {"matrix": [0, 18], "x": 17.75, "y": 0},
-
-                {"matrix": [0, 19], "x": 19.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.25, "y": 1.25},
-                {"matrix": [1, 5], "x": 5.25, "y": 1.25},
-                {"matrix": [1, 6], "x": 6.25, "y": 1.25},
-                {"matrix": [1, 7], "x": 7.25, "y": 1.25},
-                {"matrix": [1, 8], "x": 8.25, "y": 1.25},
-                {"matrix": [1, 9], "x": 9.25, "y": 1.25},
-                {"matrix": [1, 10], "x": 10.25, "y": 1.25},
-                {"matrix": [1, 11], "x": 11.25, "y": 1.25},
-                {"matrix": [1, 12], "x": 12.25, "y": 1.25},
-                {"matrix": [1, 13], "x": 13.25, "y": 1.25},
-                {"matrix": [1, 14], "x": 14.25, "y": 1.25},
-                {"matrix": [1, 15], "x": 15.25, "y": 1.25},
-                {"matrix": [1, 16], "x": 16.25, "y": 1.25},
-                {"matrix": [1, 17], "x": 17.25, "y": 1.25, "w": 2},
-                {"matrix": [1, 19], "x": 19.25, "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, "h": 2},
-
-                {"matrix": [2, 4], "x": 4.25, "y": 2.25, "w": 1.5},
-                {"matrix": [2, 5], "x": 5.75, "y": 2.25},
-                {"matrix": [2, 6], "x": 6.75, "y": 2.25},
-                {"matrix": [2, 7], "x": 7.75, "y": 2.25},
-                {"matrix": [2, 8], "x": 8.75, "y": 2.25},
-                {"matrix": [2, 9], "x": 9.75, "y": 2.25},
-                {"matrix": [2, 10], "x": 10.75, "y": 2.25},
-                {"matrix": [2, 11], "x": 11.75, "y": 2.25},
-                {"matrix": [2, 12], "x": 12.75, "y": 2.25},
-                {"matrix": [2, 13], "x": 13.75, "y": 2.25},
-                {"matrix": [2, 14], "x": 14.75, "y": 2.25},
-                {"matrix": [2, 15], "x": 15.75, "y": 2.25},
-                {"matrix": [2, 16], "x": 16.75, "y": 2.25},
-                {"matrix": [2, 18], "x": 18, "y": 2.25, "w": 1.25, "h": 2},
-                {"matrix": [2, 19], "x": 19.25, "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, 4], "x": 4.25, "y": 3.25, "w": 1.75},
-                {"matrix": [3, 5], "x": 6, "y": 3.25},
-                {"matrix": [3, 6], "x": 7, "y": 3.25},
-                {"matrix": [3, 7], "x": 8, "y": 3.25},
-                {"matrix": [3, 8], "x": 9, "y": 3.25},
-                {"matrix": [3, 9], "x": 10, "y": 3.25},
-                {"matrix": [3, 10], "x": 11, "y": 3.25},
-                {"matrix": [3, 11], "x": 12, "y": 3.25},
-                {"matrix": [3, 12], "x": 13, "y": 3.25},
-                {"matrix": [3, 13], "x": 14, "y": 3.25},
-                {"matrix": [3, 14], "x": 15, "y": 3.25},
-                {"matrix": [3, 15], "x": 16, "y": 3.25},
-                {"matrix": [3, 18], "x": 17, "y": 3.25},
-                {"matrix": [3, 19], "x": 19.25, "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, "h": 2},
-
-                {"matrix": [4, 4], "x": 4.25, "y": 4.25, "w": 1.25},
-                {"matrix": [4, 5], "x": 5.5, "y": 4.25},
-                {"matrix": [4, 6], "x": 6.5, "y": 4.25},
-                {"matrix": [4, 7], "x": 7.5, "y": 4.25},
-                {"matrix": [4, 8], "x": 8.5, "y": 4.25},
-                {"matrix": [4, 9], "x": 9.5, "y": 4.25},
-                {"matrix": [4, 10], "x": 10.5, "y": 4.25},
-                {"matrix": [4, 11], "x": 11.5, "y": 4.25},
-                {"matrix": [4, 12], "x": 12.5, "y": 4.25},
-                {"matrix": [4, 13], "x": 13.5, "y": 4.25},
-                {"matrix": [4, 14], "x": 14.5, "y": 4.25},
-                {"matrix": [4, 15], "x": 15.5, "y": 4.25},
-                {"matrix": [4, 17], "x": 16.5, "y": 4.25, "w": 1.75},
-                {"matrix": [4, 18], "x": 18.25, "y": 4.25},
-                {"matrix": [4, 19], "x": 19.25, "y": 4.25},
-
-                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 2},
-                {"matrix": [5, 2], "x": 2, "y": 5.25},
-
-                {"matrix": [5, 4], "x": 4.25, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 5], "x": 5.5, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 6], "x": 6.75, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 10], "x": 8, "y": 5.25, "w": 6.25},
-                {"matrix": [5, 13], "x": 14.25, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 15], "x": 15.5, "y": 5.25, "w": 1.25},
-
-                {"matrix": [5, 17], "x": 17.25, "y": 5.25},
-                {"matrix": [5, 18], "x": 18.25, "y": 5.25},
-                {"matrix": [5, 19], "x": 19.25, "y": 5.25}
-            ]
-        },
-        "LAYOUT_iso_lhnp": {
-            "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.25, "y": 0},
-
-                {"matrix": [0, 5], "x": 5.75, "y": 0},
-                {"matrix": [0, 6], "x": 6.75, "y": 0},
-                {"matrix": [0, 7], "x": 7.75, "y": 0},
-                {"matrix": [0, 8], "x": 8.75, "y": 0},
-
-                {"matrix": [0, 10], "x": 10.25, "y": 0},
-                {"matrix": [0, 11], "x": 11.25, "y": 0},
-                {"matrix": [0, 12], "x": 12.25, "y": 0},
-                {"matrix": [0, 13], "x": 13.25, "y": 0},
-
-                {"matrix": [0, 15], "x": 14.75, "y": 0},
-                {"matrix": [0, 16], "x": 15.75, "y": 0},
-                {"matrix": [0, 17], "x": 16.75, "y": 0},
-                {"matrix": [0, 18], "x": 17.75, "y": 0},
-
-                {"matrix": [0, 19], "x": 19.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.25, "y": 1.25},
-                {"matrix": [1, 5], "x": 5.25, "y": 1.25},
-                {"matrix": [1, 6], "x": 6.25, "y": 1.25},
-                {"matrix": [1, 7], "x": 7.25, "y": 1.25},
-                {"matrix": [1, 8], "x": 8.25, "y": 1.25},
-                {"matrix": [1, 9], "x": 9.25, "y": 1.25},
-                {"matrix": [1, 10], "x": 10.25, "y": 1.25},
-                {"matrix": [1, 11], "x": 11.25, "y": 1.25},
-                {"matrix": [1, 12], "x": 12.25, "y": 1.25},
-                {"matrix": [1, 13], "x": 13.25, "y": 1.25},
-                {"matrix": [1, 14], "x": 14.25, "y": 1.25},
-                {"matrix": [1, 15], "x": 15.25, "y": 1.25},
-                {"matrix": [1, 16], "x": 16.25, "y": 1.25},
-                {"matrix": [1, 17], "x": 17.25, "y": 1.25, "w": 2},
-                {"matrix": [1, 19], "x": 19.25, "y": 1.25},
-
-                {"matrix": [2, 0], "x": 0, "y": 2.25, "h": 2},
-                {"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": [2, 4], "x": 4.25, "y": 2.25, "w": 1.5},
-                {"matrix": [2, 5], "x": 5.75, "y": 2.25},
-                {"matrix": [2, 6], "x": 6.75, "y": 2.25},
-                {"matrix": [2, 7], "x": 7.75, "y": 2.25},
-                {"matrix": [2, 8], "x": 8.75, "y": 2.25},
-                {"matrix": [2, 9], "x": 9.75, "y": 2.25},
-                {"matrix": [2, 10], "x": 10.75, "y": 2.25},
-                {"matrix": [2, 11], "x": 11.75, "y": 2.25},
-                {"matrix": [2, 12], "x": 12.75, "y": 2.25},
-                {"matrix": [2, 13], "x": 13.75, "y": 2.25},
-                {"matrix": [2, 14], "x": 14.75, "y": 2.25},
-                {"matrix": [2, 15], "x": 15.75, "y": 2.25},
-                {"matrix": [2, 16], "x": 16.75, "y": 2.25},
-                {"matrix": [2, 18], "x": 18, "y": 2.25, "w": 1.25, "h": 2},
-                {"matrix": [2, 19], "x": 19.25, "y": 2.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": [3, 4], "x": 4.25, "y": 3.25, "w": 1.75},
-                {"matrix": [3, 5], "x": 6, "y": 3.25},
-                {"matrix": [3, 6], "x": 7, "y": 3.25},
-                {"matrix": [3, 7], "x": 8, "y": 3.25},
-                {"matrix": [3, 8], "x": 9, "y": 3.25},
-                {"matrix": [3, 9], "x": 10, "y": 3.25},
-                {"matrix": [3, 10], "x": 11, "y": 3.25},
-                {"matrix": [3, 11], "x": 12, "y": 3.25},
-                {"matrix": [3, 12], "x": 13, "y": 3.25},
-                {"matrix": [3, 13], "x": 14, "y": 3.25},
-                {"matrix": [3, 14], "x": 15, "y": 3.25},
-                {"matrix": [3, 15], "x": 16, "y": 3.25},
-                {"matrix": [3, 18], "x": 17, "y": 3.25},
-                {"matrix": [3, 19], "x": 19.25, "y": 3.25},
-
-                {"matrix": [4, 0], "x": 0, "y": 4.25, "h": 2},
-                {"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": [4, 4], "x": 4.25, "y": 4.25, "w": 1.25},
-                {"matrix": [4, 5], "x": 5.5, "y": 4.25},
-                {"matrix": [4, 6], "x": 6.5, "y": 4.25},
-                {"matrix": [4, 7], "x": 7.5, "y": 4.25},
-                {"matrix": [4, 8], "x": 8.5, "y": 4.25},
-                {"matrix": [4, 9], "x": 9.5, "y": 4.25},
-                {"matrix": [4, 10], "x": 10.5, "y": 4.25},
-                {"matrix": [4, 11], "x": 11.5, "y": 4.25},
-                {"matrix": [4, 12], "x": 12.5, "y": 4.25},
-                {"matrix": [4, 13], "x": 13.5, "y": 4.25},
-                {"matrix": [4, 14], "x": 14.5, "y": 4.25},
-                {"matrix": [4, 15], "x": 15.5, "y": 4.25},
-                {"matrix": [4, 17], "x": 16.5, "y": 4.25, "w": 1.75},
-                {"matrix": [4, 18], "x": 18.25, "y": 4.25},
-                {"matrix": [4, 19], "x": 19.25, "y": 4.25},
-
-                {"matrix": [5, 1], "x": 1, "y": 5.25},
-                {"matrix": [5, 2], "x": 2, "y": 5.25, "w": 2},
-
-                {"matrix": [5, 4], "x": 4.25, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 5], "x": 5.5, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 6], "x": 6.75, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 10], "x": 8, "y": 5.25, "w": 6.25},
-                {"matrix": [5, 13], "x": 14.25, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 15], "x": 15.5, "y": 5.25, "w": 1.25},
-
-                {"matrix": [5, 17], "x": 17.25, "y": 5.25},
-                {"matrix": [5, 18], "x": 18.25, "y": 5.25},
-                {"matrix": [5, 19], "x": 19.25, "y": 5.25}
-            ]
-        },
-        "LAYOUT_iso_macro": {
-            "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.25, "y": 0},
-
-                {"matrix": [0, 5], "x": 5.75, "y": 0},
-                {"matrix": [0, 6], "x": 6.75, "y": 0},
-                {"matrix": [0, 7], "x": 7.75, "y": 0},
-                {"matrix": [0, 8], "x": 8.75, "y": 0},
-
-                {"matrix": [0, 10], "x": 10.25, "y": 0},
-                {"matrix": [0, 11], "x": 11.25, "y": 0},
-                {"matrix": [0, 12], "x": 12.25, "y": 0},
-                {"matrix": [0, 13], "x": 13.25, "y": 0},
-
-                {"matrix": [0, 15], "x": 14.75, "y": 0},
-                {"matrix": [0, 16], "x": 15.75, "y": 0},
-                {"matrix": [0, 17], "x": 16.75, "y": 0},
-                {"matrix": [0, 18], "x": 17.75, "y": 0},
-
-                {"matrix": [0, 19], "x": 19.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.25, "y": 1.25},
-                {"matrix": [1, 5], "x": 5.25, "y": 1.25},
-                {"matrix": [1, 6], "x": 6.25, "y": 1.25},
-                {"matrix": [1, 7], "x": 7.25, "y": 1.25},
-                {"matrix": [1, 8], "x": 8.25, "y": 1.25},
-                {"matrix": [1, 9], "x": 9.25, "y": 1.25},
-                {"matrix": [1, 10], "x": 10.25, "y": 1.25},
-                {"matrix": [1, 11], "x": 11.25, "y": 1.25},
-                {"matrix": [1, 12], "x": 12.25, "y": 1.25},
-                {"matrix": [1, 13], "x": 13.25, "y": 1.25},
-                {"matrix": [1, 14], "x": 14.25, "y": 1.25},
-                {"matrix": [1, 15], "x": 15.25, "y": 1.25},
-                {"matrix": [1, 16], "x": 16.25, "y": 1.25},
-                {"matrix": [1, 17], "x": 17.25, "y": 1.25, "w": 2},
-                {"matrix": [1, 19], "x": 19.25, "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": [2, 4], "x": 4.25, "y": 2.25, "w": 1.5},
-                {"matrix": [2, 5], "x": 5.75, "y": 2.25},
-                {"matrix": [2, 6], "x": 6.75, "y": 2.25},
-                {"matrix": [2, 7], "x": 7.75, "y": 2.25},
-                {"matrix": [2, 8], "x": 8.75, "y": 2.25},
-                {"matrix": [2, 9], "x": 9.75, "y": 2.25},
-                {"matrix": [2, 10], "x": 10.75, "y": 2.25},
-                {"matrix": [2, 11], "x": 11.75, "y": 2.25},
-                {"matrix": [2, 12], "x": 12.75, "y": 2.25},
-                {"matrix": [2, 13], "x": 13.75, "y": 2.25},
-                {"matrix": [2, 14], "x": 14.75, "y": 2.25},
-                {"matrix": [2, 15], "x": 15.75, "y": 2.25},
-                {"matrix": [2, 16], "x": 16.75, "y": 2.25},
-                {"matrix": [2, 18], "x": 18, "y": 2.25, "w": 1.25, "h": 2},
-                {"matrix": [2, 19], "x": 19.25, "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": [3, 4], "x": 4.25, "y": 3.25, "w": 1.75},
-                {"matrix": [3, 5], "x": 6, "y": 3.25},
-                {"matrix": [3, 6], "x": 7, "y": 3.25},
-                {"matrix": [3, 7], "x": 8, "y": 3.25},
-                {"matrix": [3, 8], "x": 9, "y": 3.25},
-                {"matrix": [3, 9], "x": 10, "y": 3.25},
-                {"matrix": [3, 10], "x": 11, "y": 3.25},
-                {"matrix": [3, 11], "x": 12, "y": 3.25},
-                {"matrix": [3, 12], "x": 13, "y": 3.25},
-                {"matrix": [3, 13], "x": 14, "y": 3.25},
-                {"matrix": [3, 14], "x": 15, "y": 3.25},
-                {"matrix": [3, 15], "x": 16, "y": 3.25},
-                {"matrix": [3, 18], "x": 17, "y": 3.25},
-                {"matrix": [3, 19], "x": 19.25, "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": [4, 4], "x": 4.25, "y": 4.25, "w": 1.25},
-                {"matrix": [4, 5], "x": 5.5, "y": 4.25},
-                {"matrix": [4, 6], "x": 6.5, "y": 4.25},
-                {"matrix": [4, 7], "x": 7.5, "y": 4.25},
-                {"matrix": [4, 8], "x": 8.5, "y": 4.25},
-                {"matrix": [4, 9], "x": 9.5, "y": 4.25},
-                {"matrix": [4, 10], "x": 10.5, "y": 4.25},
-                {"matrix": [4, 11], "x": 11.5, "y": 4.25},
-                {"matrix": [4, 12], "x": 12.5, "y": 4.25},
-                {"matrix": [4, 13], "x": 13.5, "y": 4.25},
-                {"matrix": [4, 14], "x": 14.5, "y": 4.25},
-                {"matrix": [4, 15], "x": 15.5, "y": 4.25},
-                {"matrix": [4, 17], "x": 16.5, "y": 4.25, "w": 1.75},
-                {"matrix": [4, 18], "x": 18.25, "y": 4.25},
-                {"matrix": [4, 19], "x": 19.25, "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},
-
-                {"matrix": [5, 4], "x": 4.25, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 5], "x": 5.5, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 6], "x": 6.75, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 10], "x": 8, "y": 5.25, "w": 6.25},
-                {"matrix": [5, 13], "x": 14.25, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 15], "x": 15.5, "y": 5.25, "w": 1.25},
-
-                {"matrix": [5, 17], "x": 17.25, "y": 5.25},
-                {"matrix": [5, 18], "x": 18.25, "y": 5.25},
-                {"matrix": [5, 19], "x": 19.25, "y": 5.25}
-            ]
-        },
-        "LAYOUT_jis_rhnp": {
-            "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.25, "y": 0},
-
-                {"matrix": [0, 5], "x": 5.75, "y": 0},
-                {"matrix": [0, 6], "x": 6.75, "y": 0},
-                {"matrix": [0, 7], "x": 7.75, "y": 0},
-                {"matrix": [0, 8], "x": 8.75, "y": 0},
-
-                {"matrix": [0, 10], "x": 10.25, "y": 0},
-                {"matrix": [0, 11], "x": 11.25, "y": 0},
-                {"matrix": [0, 12], "x": 12.25, "y": 0},
-                {"matrix": [0, 13], "x": 13.25, "y": 0},
-
-                {"matrix": [0, 15], "x": 14.75, "y": 0},
-                {"matrix": [0, 16], "x": 15.75, "y": 0},
-                {"matrix": [0, 17], "x": 16.75, "y": 0},
-                {"matrix": [0, 18], "x": 17.75, "y": 0},
-
-                {"matrix": [0, 19], "x": 19.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.25, "y": 1.25},
-                {"matrix": [1, 5], "x": 5.25, "y": 1.25},
-                {"matrix": [1, 6], "x": 6.25, "y": 1.25},
-                {"matrix": [1, 7], "x": 7.25, "y": 1.25},
-                {"matrix": [1, 8], "x": 8.25, "y": 1.25},
-                {"matrix": [1, 9], "x": 9.25, "y": 1.25},
-                {"matrix": [1, 10], "x": 10.25, "y": 1.25},
-                {"matrix": [1, 11], "x": 11.25, "y": 1.25},
-                {"matrix": [1, 12], "x": 12.25, "y": 1.25},
-                {"matrix": [1, 13], "x": 13.25, "y": 1.25},
-                {"matrix": [1, 14], "x": 14.25, "y": 1.25},
-                {"matrix": [1, 15], "x": 15.25, "y": 1.25},
-                {"matrix": [1, 16], "x": 16.25, "y": 1.25},
-                {"matrix": [1, 17], "x": 17.25, "y": 1.25},
-                {"matrix": [1, 18], "x": 18.25, "y": 1.25},
-                {"matrix": [1, 19], "x": 19.25, "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, "h": 2},
-
-                {"matrix": [2, 4], "x": 4.25, "y": 2.25, "w": 1.5},
-                {"matrix": [2, 5], "x": 5.75, "y": 2.25},
-                {"matrix": [2, 6], "x": 6.75, "y": 2.25},
-                {"matrix": [2, 7], "x": 7.75, "y": 2.25},
-                {"matrix": [2, 8], "x": 8.75, "y": 2.25},
-                {"matrix": [2, 9], "x": 9.75, "y": 2.25},
-                {"matrix": [2, 10], "x": 10.75, "y": 2.25},
-                {"matrix": [2, 11], "x": 11.75, "y": 2.25},
-                {"matrix": [2, 12], "x": 12.75, "y": 2.25},
-                {"matrix": [2, 13], "x": 13.75, "y": 2.25},
-                {"matrix": [2, 14], "x": 14.75, "y": 2.25},
-                {"matrix": [2, 15], "x": 15.75, "y": 2.25},
-                {"matrix": [2, 16], "x": 16.75, "y": 2.25},
-                {"matrix": [2, 18], "x": 18, "y": 2.25, "w": 1.25, "h": 2},
-                {"matrix": [2, 19], "x": 19.25, "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, 4], "x": 4.25, "y": 3.25, "w": 1.75},
-                {"matrix": [3, 5], "x": 6, "y": 3.25},
-                {"matrix": [3, 6], "x": 7, "y": 3.25},
-                {"matrix": [3, 7], "x": 8, "y": 3.25},
-                {"matrix": [3, 8], "x": 9, "y": 3.25},
-                {"matrix": [3, 9], "x": 10, "y": 3.25},
-                {"matrix": [3, 10], "x": 11, "y": 3.25},
-                {"matrix": [3, 11], "x": 12, "y": 3.25},
-                {"matrix": [3, 12], "x": 13, "y": 3.25},
-                {"matrix": [3, 13], "x": 14, "y": 3.25},
-                {"matrix": [3, 14], "x": 15, "y": 3.25},
-                {"matrix": [3, 15], "x": 16, "y": 3.25},
-                {"matrix": [3, 18], "x": 17, "y": 3.25},
-                {"matrix": [3, 19], "x": 19.25, "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, "h": 2},
-
-                {"matrix": [4, 4], "x": 4.25, "y": 4.25, "w": 2.25},
-                {"matrix": [4, 6], "x": 6.5, "y": 4.25},
-                {"matrix": [4, 7], "x": 7.5, "y": 4.25},
-                {"matrix": [4, 8], "x": 8.5, "y": 4.25},
-                {"matrix": [4, 9], "x": 9.5, "y": 4.25},
-                {"matrix": [4, 10], "x": 10.5, "y": 4.25},
-                {"matrix": [4, 11], "x": 11.5, "y": 4.25},
-                {"matrix": [4, 12], "x": 12.5, "y": 4.25},
-                {"matrix": [4, 13], "x": 13.5, "y": 4.25},
-                {"matrix": [4, 14], "x": 14.5, "y": 4.25},
-                {"matrix": [4, 15], "x": 15.5, "y": 4.25},
-                {"matrix": [4, 17], "x": 16.5, "y": 4.25},
-                {"matrix": [4, 18], "x": 17.5, "y": 4.25, "w": 1.75},
-                {"matrix": [4, 19], "x": 19.25, "y": 4.25},
-
-                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 2},
-                {"matrix": [5, 2], "x": 2, "y": 5.25},
-
-                {"matrix": [5, 4], "x": 4.25, "y": 5.25, "w": 1.5},
-                {"matrix": [5, 5], "x": 5.75, "y": 5.25},
-                {"matrix": [5, 6], "x": 6.75, "y": 5.25, "w": 1.5},
-                {"matrix": [5, 7], "x": 8.25, "y": 5.25},
-                {"matrix": [5, 10], "x": 9.25, "y": 5.25, "w": 3},
-                {"matrix": [5, 11], "x": 12.25, "y": 5.25},
-                {"matrix": [5, 12], "x": 13.25, "y": 5.25},
-                {"matrix": [5, 13], "x": 14.25, "y": 5.25},
-                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
-                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
-                {"matrix": [5, 17], "x": 17.25, "y": 5.25},
-                {"matrix": [5, 18], "x": 18.25, "y": 5.25},
-                {"matrix": [5, 19], "x": 19.25, "y": 5.25}
-            ]
-        },
-        "LAYOUT_jis_lhnp": {
-            "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.25, "y": 0},
-
-                {"matrix": [0, 5], "x": 5.75, "y": 0},
-                {"matrix": [0, 6], "x": 6.75, "y": 0},
-                {"matrix": [0, 7], "x": 7.75, "y": 0},
-                {"matrix": [0, 8], "x": 8.75, "y": 0},
-
-                {"matrix": [0, 10], "x": 10.25, "y": 0},
-                {"matrix": [0, 11], "x": 11.25, "y": 0},
-                {"matrix": [0, 12], "x": 12.25, "y": 0},
-                {"matrix": [0, 13], "x": 13.25, "y": 0},
-
-                {"matrix": [0, 15], "x": 14.75, "y": 0},
-                {"matrix": [0, 16], "x": 15.75, "y": 0},
-                {"matrix": [0, 17], "x": 16.75, "y": 0},
-                {"matrix": [0, 18], "x": 17.75, "y": 0},
-
-                {"matrix": [0, 19], "x": 19.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.25, "y": 1.25},
-                {"matrix": [1, 5], "x": 5.25, "y": 1.25},
-                {"matrix": [1, 6], "x": 6.25, "y": 1.25},
-                {"matrix": [1, 7], "x": 7.25, "y": 1.25},
-                {"matrix": [1, 8], "x": 8.25, "y": 1.25},
-                {"matrix": [1, 9], "x": 9.25, "y": 1.25},
-                {"matrix": [1, 10], "x": 10.25, "y": 1.25},
-                {"matrix": [1, 11], "x": 11.25, "y": 1.25},
-                {"matrix": [1, 12], "x": 12.25, "y": 1.25},
-                {"matrix": [1, 13], "x": 13.25, "y": 1.25},
-                {"matrix": [1, 14], "x": 14.25, "y": 1.25},
-                {"matrix": [1, 15], "x": 15.25, "y": 1.25},
-                {"matrix": [1, 16], "x": 16.25, "y": 1.25},
-                {"matrix": [1, 17], "x": 17.25, "y": 1.25},
-                {"matrix": [1, 18], "x": 18.25, "y": 1.25},
-                {"matrix": [1, 19], "x": 19.25, "y": 1.25},
-
-                {"matrix": [2, 0], "x": 0, "y": 2.25, "h": 2},
-                {"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": [2, 4], "x": 4.25, "y": 2.25, "w": 1.5},
-                {"matrix": [2, 5], "x": 5.75, "y": 2.25},
-                {"matrix": [2, 6], "x": 6.75, "y": 2.25},
-                {"matrix": [2, 7], "x": 7.75, "y": 2.25},
-                {"matrix": [2, 8], "x": 8.75, "y": 2.25},
-                {"matrix": [2, 9], "x": 9.75, "y": 2.25},
-                {"matrix": [2, 10], "x": 10.75, "y": 2.25},
-                {"matrix": [2, 11], "x": 11.75, "y": 2.25},
-                {"matrix": [2, 12], "x": 12.75, "y": 2.25},
-                {"matrix": [2, 13], "x": 13.75, "y": 2.25},
-                {"matrix": [2, 14], "x": 14.75, "y": 2.25},
-                {"matrix": [2, 15], "x": 15.75, "y": 2.25},
-                {"matrix": [2, 16], "x": 16.75, "y": 2.25},
-                {"matrix": [2, 18], "x": 18, "y": 2.25, "w": 1.25, "h": 2},
-                {"matrix": [2, 19], "x": 19.25, "y": 2.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": [3, 4], "x": 4.25, "y": 3.25, "w": 1.75},
-                {"matrix": [3, 5], "x": 6, "y": 3.25},
-                {"matrix": [3, 6], "x": 7, "y": 3.25},
-                {"matrix": [3, 7], "x": 8, "y": 3.25},
-                {"matrix": [3, 8], "x": 9, "y": 3.25},
-                {"matrix": [3, 9], "x": 10, "y": 3.25},
-                {"matrix": [3, 10], "x": 11, "y": 3.25},
-                {"matrix": [3, 11], "x": 12, "y": 3.25},
-                {"matrix": [3, 12], "x": 13, "y": 3.25},
-                {"matrix": [3, 13], "x": 14, "y": 3.25},
-                {"matrix": [3, 14], "x": 15, "y": 3.25},
-                {"matrix": [3, 15], "x": 16, "y": 3.25},
-                {"matrix": [3, 18], "x": 17, "y": 3.25},
-                {"matrix": [3, 19], "x": 19.25, "y": 3.25},
-
-                {"matrix": [4, 0], "x": 0, "y": 4.25, "h": 2},
-                {"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": [4, 4], "x": 4.25, "y": 4.25, "w": 2.25},
-                {"matrix": [4, 6], "x": 6.5, "y": 4.25},
-                {"matrix": [4, 7], "x": 7.5, "y": 4.25},
-                {"matrix": [4, 8], "x": 8.5, "y": 4.25},
-                {"matrix": [4, 9], "x": 9.5, "y": 4.25},
-                {"matrix": [4, 10], "x": 10.5, "y": 4.25},
-                {"matrix": [4, 11], "x": 11.5, "y": 4.25},
-                {"matrix": [4, 12], "x": 12.5, "y": 4.25},
-                {"matrix": [4, 13], "x": 13.5, "y": 4.25},
-                {"matrix": [4, 14], "x": 14.5, "y": 4.25},
-                {"matrix": [4, 15], "x": 15.5, "y": 4.25},
-                {"matrix": [4, 17], "x": 16.5, "y": 4.25},
-                {"matrix": [4, 18], "x": 17.5, "y": 4.25, "w": 1.75},
-                {"matrix": [4, 19], "x": 19.25, "y": 4.25},
-
-                {"matrix": [5, 1], "x": 1, "y": 5.25},
-                {"matrix": [5, 2], "x": 2, "y": 5.25, "w": 2},
-
-                {"matrix": [5, 4], "x": 4.25, "y": 5.25, "w": 1.5},
-                {"matrix": [5, 5], "x": 5.75, "y": 5.25},
-                {"matrix": [5, 6], "x": 6.75, "y": 5.25, "w": 1.5},
-                {"matrix": [5, 7], "x": 8.25, "y": 5.25},
-                {"matrix": [5, 10], "x": 9.25, "y": 5.25, "w": 3},
-                {"matrix": [5, 11], "x": 12.25, "y": 5.25},
-                {"matrix": [5, 12], "x": 13.25, "y": 5.25},
-                {"matrix": [5, 13], "x": 14.25, "y": 5.25},
-                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
-                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
-                {"matrix": [5, 17], "x": 17.25, "y": 5.25},
-                {"matrix": [5, 18], "x": 18.25, "y": 5.25},
-                {"matrix": [5, 19], "x": 19.25, "y": 5.25}
-            ]
-        },
-        "LAYOUT_jis_macro": {
-            "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.25, "y": 0},
-
-                {"matrix": [0, 5], "x": 5.75, "y": 0},
-                {"matrix": [0, 6], "x": 6.75, "y": 0},
-                {"matrix": [0, 7], "x": 7.75, "y": 0},
-                {"matrix": [0, 8], "x": 8.75, "y": 0},
-
-                {"matrix": [0, 10], "x": 10.25, "y": 0},
-                {"matrix": [0, 11], "x": 11.25, "y": 0},
-                {"matrix": [0, 12], "x": 12.25, "y": 0},
-                {"matrix": [0, 13], "x": 13.25, "y": 0},
-
-                {"matrix": [0, 15], "x": 14.75, "y": 0},
-                {"matrix": [0, 16], "x": 15.75, "y": 0},
-                {"matrix": [0, 17], "x": 16.75, "y": 0},
-                {"matrix": [0, 18], "x": 17.75, "y": 0},
-
-                {"matrix": [0, 19], "x": 19.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.25, "y": 1.25},
-                {"matrix": [1, 5], "x": 5.25, "y": 1.25},
-                {"matrix": [1, 6], "x": 6.25, "y": 1.25},
-                {"matrix": [1, 7], "x": 7.25, "y": 1.25},
-                {"matrix": [1, 8], "x": 8.25, "y": 1.25},
-                {"matrix": [1, 9], "x": 9.25, "y": 1.25},
-                {"matrix": [1, 10], "x": 10.25, "y": 1.25},
-                {"matrix": [1, 11], "x": 11.25, "y": 1.25},
-                {"matrix": [1, 12], "x": 12.25, "y": 1.25},
-                {"matrix": [1, 13], "x": 13.25, "y": 1.25},
-                {"matrix": [1, 14], "x": 14.25, "y": 1.25},
-                {"matrix": [1, 15], "x": 15.25, "y": 1.25},
-                {"matrix": [1, 16], "x": 16.25, "y": 1.25},
-                {"matrix": [1, 17], "x": 17.25, "y": 1.25},
-                {"matrix": [1, 18], "x": 18.25, "y": 1.25},
-                {"matrix": [1, 19], "x": 19.25, "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": [2, 4], "x": 4.25, "y": 2.25, "w": 1.5},
-                {"matrix": [2, 5], "x": 5.75, "y": 2.25},
-                {"matrix": [2, 6], "x": 6.75, "y": 2.25},
-                {"matrix": [2, 7], "x": 7.75, "y": 2.25},
-                {"matrix": [2, 8], "x": 8.75, "y": 2.25},
-                {"matrix": [2, 9], "x": 9.75, "y": 2.25},
-                {"matrix": [2, 10], "x": 10.75, "y": 2.25},
-                {"matrix": [2, 11], "x": 11.75, "y": 2.25},
-                {"matrix": [2, 12], "x": 12.75, "y": 2.25},
-                {"matrix": [2, 13], "x": 13.75, "y": 2.25},
-                {"matrix": [2, 14], "x": 14.75, "y": 2.25},
-                {"matrix": [2, 15], "x": 15.75, "y": 2.25},
-                {"matrix": [2, 16], "x": 16.75, "y": 2.25},
-                {"matrix": [2, 18], "x": 18, "y": 2.25, "w": 1.25, "h": 2},
-                {"matrix": [2, 19], "x": 19.25, "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": [3, 4], "x": 4.25, "y": 3.25, "w": 1.75},
-                {"matrix": [3, 5], "x": 6, "y": 3.25},
-                {"matrix": [3, 6], "x": 7, "y": 3.25},
-                {"matrix": [3, 7], "x": 8, "y": 3.25},
-                {"matrix": [3, 8], "x": 9, "y": 3.25},
-                {"matrix": [3, 9], "x": 10, "y": 3.25},
-                {"matrix": [3, 10], "x": 11, "y": 3.25},
-                {"matrix": [3, 11], "x": 12, "y": 3.25},
-                {"matrix": [3, 12], "x": 13, "y": 3.25},
-                {"matrix": [3, 13], "x": 14, "y": 3.25},
-                {"matrix": [3, 14], "x": 15, "y": 3.25},
-                {"matrix": [3, 15], "x": 16, "y": 3.25},
-                {"matrix": [3, 18], "x": 17, "y": 3.25},
-                {"matrix": [3, 19], "x": 19.25, "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": [4, 4], "x": 4.25, "y": 4.25, "w": 2.25},
-                {"matrix": [4, 6], "x": 6.5, "y": 4.25},
-                {"matrix": [4, 7], "x": 7.5, "y": 4.25},
-                {"matrix": [4, 8], "x": 8.5, "y": 4.25},
-                {"matrix": [4, 9], "x": 9.5, "y": 4.25},
-                {"matrix": [4, 10], "x": 10.5, "y": 4.25},
-                {"matrix": [4, 11], "x": 11.5, "y": 4.25},
-                {"matrix": [4, 12], "x": 12.5, "y": 4.25},
-                {"matrix": [4, 13], "x": 13.5, "y": 4.25},
-                {"matrix": [4, 14], "x": 14.5, "y": 4.25},
-                {"matrix": [4, 15], "x": 15.5, "y": 4.25},
-                {"matrix": [4, 17], "x": 16.5, "y": 4.25},
-                {"matrix": [4, 18], "x": 17.5, "y": 4.25, "w": 1.75},
-                {"matrix": [4, 19], "x": 19.25, "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},
-
-                {"matrix": [5, 4], "x": 4.25, "y": 5.25, "w": 1.5},
-                {"matrix": [5, 5], "x": 5.75, "y": 5.25},
-                {"matrix": [5, 6], "x": 6.75, "y": 5.25, "w": 1.5},
-                {"matrix": [5, 7], "x": 8.25, "y": 5.25},
-                {"matrix": [5, 10], "x": 9.25, "y": 5.25, "w": 3},
-                {"matrix": [5, 11], "x": 12.25, "y": 5.25},
-                {"matrix": [5, 12], "x": 13.25, "y": 5.25},
-                {"matrix": [5, 13], "x": 14.25, "y": 5.25},
-                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
-                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
-                {"matrix": [5, 17], "x": 17.25, "y": 5.25},
-                {"matrix": [5, 18], "x": 18.25, "y": 5.25},
-                {"matrix": [5, 19], "x": 19.25, "y": 5.25}
-            ]
-        },
-        "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.25, "y": 0},
-
-                {"matrix": [0, 5], "x": 5.75, "y": 0},
-                {"matrix": [0, 6], "x": 6.75, "y": 0},
-                {"matrix": [0, 7], "x": 7.75, "y": 0},
-                {"matrix": [0, 8], "x": 8.75, "y": 0},
-
-                {"matrix": [0, 10], "x": 10.25, "y": 0},
-                {"matrix": [0, 11], "x": 11.25, "y": 0},
-                {"matrix": [0, 12], "x": 12.25, "y": 0},
-                {"matrix": [0, 13], "x": 13.25, "y": 0},
-
-                {"matrix": [0, 15], "x": 14.75, "y": 0},
-                {"matrix": [0, 16], "x": 15.75, "y": 0},
-                {"matrix": [0, 17], "x": 16.75, "y": 0},
-                {"matrix": [0, 18], "x": 17.75, "y": 0},
-
-                {"matrix": [0, 19], "x": 19.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.25, "y": 1.25},
-                {"matrix": [1, 5], "x": 5.25, "y": 1.25},
-                {"matrix": [1, 6], "x": 6.25, "y": 1.25},
-                {"matrix": [1, 7], "x": 7.25, "y": 1.25},
-                {"matrix": [1, 8], "x": 8.25, "y": 1.25},
-                {"matrix": [1, 9], "x": 9.25, "y": 1.25},
-                {"matrix": [1, 10], "x": 10.25, "y": 1.25},
-                {"matrix": [1, 11], "x": 11.25, "y": 1.25},
-                {"matrix": [1, 12], "x": 12.25, "y": 1.25},
-                {"matrix": [1, 13], "x": 13.25, "y": 1.25},
-                {"matrix": [1, 14], "x": 14.25, "y": 1.25},
-                {"matrix": [1, 15], "x": 15.25, "y": 1.25},
-                {"matrix": [1, 16], "x": 16.25, "y": 1.25},
-                {"matrix": [1, 17], "x": 17.25, "y": 1.25},
-                {"matrix": [1, 18], "x": 18.25, "y": 1.25},
-                {"matrix": [1, 19], "x": 19.25, "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": [2, 4], "x": 4.25, "y": 2.25, "w": 1.5},
-                {"matrix": [2, 5], "x": 5.75, "y": 2.25},
-                {"matrix": [2, 6], "x": 6.75, "y": 2.25},
-                {"matrix": [2, 7], "x": 7.75, "y": 2.25},
-                {"matrix": [2, 8], "x": 8.75, "y": 2.25},
-                {"matrix": [2, 9], "x": 9.75, "y": 2.25},
-                {"matrix": [2, 10], "x": 10.75, "y": 2.25},
-                {"matrix": [2, 11], "x": 11.75, "y": 2.25},
-                {"matrix": [2, 12], "x": 12.75, "y": 2.25},
-                {"matrix": [2, 13], "x": 13.75, "y": 2.25},
-                {"matrix": [2, 14], "x": 14.75, "y": 2.25},
-                {"matrix": [2, 15], "x": 15.75, "y": 2.25},
-                {"matrix": [2, 16], "x": 16.75, "y": 2.25},
-                {"matrix": [2, 18], "x": 17.75, "y": 2.25, "w": 1.5},
-                {"matrix": [2, 19], "x": 19.25, "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": [3, 4], "x": 4.25, "y": 3.25, "w": 1.75},
-                {"matrix": [3, 5], "x": 6, "y": 3.25},
-                {"matrix": [3, 6], "x": 7, "y": 3.25},
-                {"matrix": [3, 7], "x": 8, "y": 3.25},
-                {"matrix": [3, 8], "x": 9, "y": 3.25},
-                {"matrix": [3, 9], "x": 10, "y": 3.25},
-                {"matrix": [3, 10], "x": 11, "y": 3.25},
-                {"matrix": [3, 11], "x": 12, "y": 3.25},
-                {"matrix": [3, 12], "x": 13, "y": 3.25},
-                {"matrix": [3, 13], "x": 14, "y": 3.25},
-                {"matrix": [3, 14], "x": 15, "y": 3.25},
-                {"matrix": [3, 15], "x": 16, "y": 3.25},
-                {"matrix": [3, 18], "x": 17, "y": 3.25, "w": 2.25},
-                {"matrix": [3, 19], "x": 19.25, "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": [4, 4], "x": 4.25, "y": 4.25, "w": 1.25},
-                {"matrix": [4, 5], "x": 5.5, "y": 4.25},
-                {"matrix": [4, 6], "x": 6.5, "y": 4.25},
-                {"matrix": [4, 7], "x": 7.5, "y": 4.25},
-                {"matrix": [4, 8], "x": 8.5, "y": 4.25},
-                {"matrix": [4, 9], "x": 9.5, "y": 4.25},
-                {"matrix": [4, 10], "x": 10.5, "y": 4.25},
-                {"matrix": [4, 11], "x": 11.5, "y": 4.25},
-                {"matrix": [4, 12], "x": 12.5, "y": 4.25},
-                {"matrix": [4, 13], "x": 13.5, "y": 4.25},
-                {"matrix": [4, 14], "x": 14.5, "y": 4.25},
-                {"matrix": [4, 15], "x": 15.5, "y": 4.25},
-                {"matrix": [4, 17], "x": 16.5, "y": 4.25, "w": 1.75},
-                {"matrix": [4, 18], "x": 18.25, "y": 4.25},
-                {"matrix": [4, 19], "x": 19.25, "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},
-
-                {"matrix": [5, 4], "x": 4.25, "y": 5.25, "w": 1.5},
-                {"matrix": [5, 5], "x": 5.75, "y": 5.25},
-                {"matrix": [5, 6], "x": 6.75, "y": 5.25, "w": 1.5},
-                {"matrix": [5, 7], "x": 8.25, "y": 5.25},
-                {"matrix": [5, 10], "x": 9.25, "y": 5.25, "w": 3},
-                {"matrix": [5, 11], "x": 12.25, "y": 5.25},
-                {"matrix": [5, 12], "x": 13.25, "y": 5.25},
-                {"matrix": [5, 13], "x": 14.25, "y": 5.25},
-                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
-                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
-                {"matrix": [5, 17], "x": 17.25, "y": 5.25},
-                {"matrix": [5, 18], "x": 18.25, "y": 5.25},
-                {"matrix": [5, 19], "x": 19.25, "y": 5.25}
-            ]
-        }
-    }
-}
diff --git a/keyboards/rmi_kb/wete/v1/keyboard.json b/keyboards/rmi_kb/wete/v1/keyboard.json
new file mode 100644
index 00000000000..569455923ca
--- /dev/null
+++ b/keyboards/rmi_kb/wete/v1/keyboard.json
@@ -0,0 +1,1306 @@
+{
+    "keyboard_name": "Wete",
+    "manufacturer": "RMI-KB",
+    "url": "",
+    "maintainer": "ramonimbao",
+    "usb": {
+        "vid": "0xB16B",
+        "pid": "0x00B5",
+        "device_version": "0.1.2"
+    },
+    "features": {
+        "backlight": true,
+        "bootmagic": false,
+        "command": true,
+        "console": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgblight": true,
+        "sleep_led": true
+    },
+    "matrix_pins": {
+        "cols": ["B13", "B14", "B15", "A8", "B0", "A7", "A5", "A4", "A3", "B9", "C13", "C14", "C15", "F0", "F1", "A0", "A1", "A2", "B8", "B7"],
+        "rows": ["A9", "B12", "B11", "B10", "B2", "B1"]
+    },
+    "diode_direction": "COL2ROW",
+    "backlight": {
+        "pin": "A6",
+        "levels": 24,
+        "breathing": true
+    },
+    "rgblight": {
+        "led_count": 24,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": true,
+            "twinkle": true
+        }
+    },
+    "ws2812": {
+        "pin": "B4"
+    },
+    "processor": "STM32F072",
+    "bootloader": "stm32-dfu",
+    "layouts": {
+        "LAYOUT_ansi_rhnp": {
+            "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.25, "y": 0},
+
+                {"matrix": [0, 5], "x": 5.75, "y": 0},
+                {"matrix": [0, 6], "x": 6.75, "y": 0},
+                {"matrix": [0, 7], "x": 7.75, "y": 0},
+                {"matrix": [0, 8], "x": 8.75, "y": 0},
+
+                {"matrix": [0, 10], "x": 10.25, "y": 0},
+                {"matrix": [0, 11], "x": 11.25, "y": 0},
+                {"matrix": [0, 12], "x": 12.25, "y": 0},
+                {"matrix": [0, 13], "x": 13.25, "y": 0},
+
+                {"matrix": [0, 15], "x": 14.75, "y": 0},
+                {"matrix": [0, 16], "x": 15.75, "y": 0},
+                {"matrix": [0, 17], "x": 16.75, "y": 0},
+                {"matrix": [0, 18], "x": 17.75, "y": 0},
+
+                {"matrix": [0, 19], "x": 19.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.25, "y": 1.25},
+                {"matrix": [1, 5], "x": 5.25, "y": 1.25},
+                {"matrix": [1, 6], "x": 6.25, "y": 1.25},
+                {"matrix": [1, 7], "x": 7.25, "y": 1.25},
+                {"matrix": [1, 8], "x": 8.25, "y": 1.25},
+                {"matrix": [1, 9], "x": 9.25, "y": 1.25},
+                {"matrix": [1, 10], "x": 10.25, "y": 1.25},
+                {"matrix": [1, 11], "x": 11.25, "y": 1.25},
+                {"matrix": [1, 12], "x": 12.25, "y": 1.25},
+                {"matrix": [1, 13], "x": 13.25, "y": 1.25},
+                {"matrix": [1, 14], "x": 14.25, "y": 1.25},
+                {"matrix": [1, 15], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 17], "x": 17.25, "y": 1.25, "w": 2},
+                {"matrix": [1, 19], "x": 19.25, "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, "h": 2},
+
+                {"matrix": [2, 4], "x": 4.25, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 5], "x": 5.75, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.75, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.75, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.75, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.75, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.75, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.75, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.75, "y": 2.25},
+                {"matrix": [2, 13], "x": 13.75, "y": 2.25},
+                {"matrix": [2, 14], "x": 14.75, "y": 2.25},
+                {"matrix": [2, 15], "x": 15.75, "y": 2.25},
+                {"matrix": [2, 16], "x": 16.75, "y": 2.25},
+                {"matrix": [2, 18], "x": 17.75, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 19], "x": 19.25, "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, 4], "x": 4.25, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 5], "x": 6, "y": 3.25},
+                {"matrix": [3, 6], "x": 7, "y": 3.25},
+                {"matrix": [3, 7], "x": 8, "y": 3.25},
+                {"matrix": [3, 8], "x": 9, "y": 3.25},
+                {"matrix": [3, 9], "x": 10, "y": 3.25},
+                {"matrix": [3, 10], "x": 11, "y": 3.25},
+                {"matrix": [3, 11], "x": 12, "y": 3.25},
+                {"matrix": [3, 12], "x": 13, "y": 3.25},
+                {"matrix": [3, 13], "x": 14, "y": 3.25},
+                {"matrix": [3, 14], "x": 15, "y": 3.25},
+                {"matrix": [3, 15], "x": 16, "y": 3.25},
+                {"matrix": [3, 18], "x": 17, "y": 3.25, "w": 2.25},
+                {"matrix": [3, 19], "x": 19.25, "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, "h": 2},
+
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 6], "x": 6.5, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.5, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.5, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.5, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.5, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.5, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.5, "y": 4.25},
+                {"matrix": [4, 13], "x": 13.5, "y": 4.25},
+                {"matrix": [4, 14], "x": 14.5, "y": 4.25},
+                {"matrix": [4, 15], "x": 15.5, "y": 4.25},
+                {"matrix": [4, 17], "x": 16.5, "y": 4.25, "w": 1.75},
+                {"matrix": [4, 18], "x": 18.25, "y": 4.25},
+                {"matrix": [4, 19], "x": 19.25, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 2},
+                {"matrix": [5, 2], "x": 2, "y": 5.25},
+
+                {"matrix": [5, 4], "x": 4.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 5], "x": 5.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 6.75, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 10], "x": 8, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 13], "x": 14.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 15], "x": 15.5, "y": 5.25, "w": 1.25},
+
+                {"matrix": [5, 17], "x": 17.25, "y": 5.25},
+                {"matrix": [5, 18], "x": 18.25, "y": 5.25},
+                {"matrix": [5, 19], "x": 19.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_ansi_lhnp": {
+            "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.25, "y": 0},
+
+                {"matrix": [0, 5], "x": 5.75, "y": 0},
+                {"matrix": [0, 6], "x": 6.75, "y": 0},
+                {"matrix": [0, 7], "x": 7.75, "y": 0},
+                {"matrix": [0, 8], "x": 8.75, "y": 0},
+
+                {"matrix": [0, 10], "x": 10.25, "y": 0},
+                {"matrix": [0, 11], "x": 11.25, "y": 0},
+                {"matrix": [0, 12], "x": 12.25, "y": 0},
+                {"matrix": [0, 13], "x": 13.25, "y": 0},
+
+                {"matrix": [0, 15], "x": 14.75, "y": 0},
+                {"matrix": [0, 16], "x": 15.75, "y": 0},
+                {"matrix": [0, 17], "x": 16.75, "y": 0},
+                {"matrix": [0, 18], "x": 17.75, "y": 0},
+
+                {"matrix": [0, 19], "x": 19.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.25, "y": 1.25},
+                {"matrix": [1, 5], "x": 5.25, "y": 1.25},
+                {"matrix": [1, 6], "x": 6.25, "y": 1.25},
+                {"matrix": [1, 7], "x": 7.25, "y": 1.25},
+                {"matrix": [1, 8], "x": 8.25, "y": 1.25},
+                {"matrix": [1, 9], "x": 9.25, "y": 1.25},
+                {"matrix": [1, 10], "x": 10.25, "y": 1.25},
+                {"matrix": [1, 11], "x": 11.25, "y": 1.25},
+                {"matrix": [1, 12], "x": 12.25, "y": 1.25},
+                {"matrix": [1, 13], "x": 13.25, "y": 1.25},
+                {"matrix": [1, 14], "x": 14.25, "y": 1.25},
+                {"matrix": [1, 15], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 17], "x": 17.25, "y": 1.25, "w": 2},
+                {"matrix": [1, 19], "x": 19.25, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "h": 2},
+                {"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": [2, 4], "x": 4.25, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 5], "x": 5.75, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.75, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.75, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.75, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.75, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.75, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.75, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.75, "y": 2.25},
+                {"matrix": [2, 13], "x": 13.75, "y": 2.25},
+                {"matrix": [2, 14], "x": 14.75, "y": 2.25},
+                {"matrix": [2, 15], "x": 15.75, "y": 2.25},
+                {"matrix": [2, 16], "x": 16.75, "y": 2.25},
+                {"matrix": [2, 18], "x": 17.75, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 19], "x": 19.25, "y": 2.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": [3, 4], "x": 4.25, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 5], "x": 6, "y": 3.25},
+                {"matrix": [3, 6], "x": 7, "y": 3.25},
+                {"matrix": [3, 7], "x": 8, "y": 3.25},
+                {"matrix": [3, 8], "x": 9, "y": 3.25},
+                {"matrix": [3, 9], "x": 10, "y": 3.25},
+                {"matrix": [3, 10], "x": 11, "y": 3.25},
+                {"matrix": [3, 11], "x": 12, "y": 3.25},
+                {"matrix": [3, 12], "x": 13, "y": 3.25},
+                {"matrix": [3, 13], "x": 14, "y": 3.25},
+                {"matrix": [3, 14], "x": 15, "y": 3.25},
+                {"matrix": [3, 15], "x": 16, "y": 3.25},
+                {"matrix": [3, 18], "x": 17, "y": 3.25, "w": 2.25},
+                {"matrix": [3, 19], "x": 19.25, "y": 3.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "h": 2},
+                {"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": [4, 4], "x": 4.25, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 6], "x": 6.5, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.5, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.5, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.5, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.5, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.5, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.5, "y": 4.25},
+                {"matrix": [4, 13], "x": 13.5, "y": 4.25},
+                {"matrix": [4, 14], "x": 14.5, "y": 4.25},
+                {"matrix": [4, 15], "x": 15.5, "y": 4.25},
+                {"matrix": [4, 17], "x": 16.5, "y": 4.25, "w": 1.75},
+                {"matrix": [4, 18], "x": 18.25, "y": 4.25},
+                {"matrix": [4, 19], "x": 19.25, "y": 4.25},
+
+                {"matrix": [5, 1], "x": 1, "y": 5.25},
+                {"matrix": [5, 2], "x": 2, "y": 5.25, "w": 2},
+
+                {"matrix": [5, 4], "x": 4.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 5], "x": 5.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 6.75, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 10], "x": 8, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 13], "x": 14.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 15], "x": 15.5, "y": 5.25, "w": 1.25},
+
+                {"matrix": [5, 17], "x": 17.25, "y": 5.25},
+                {"matrix": [5, 18], "x": 18.25, "y": 5.25},
+                {"matrix": [5, 19], "x": 19.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_ansi_macro": {
+            "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.25, "y": 0},
+
+                {"matrix": [0, 5], "x": 5.75, "y": 0},
+                {"matrix": [0, 6], "x": 6.75, "y": 0},
+                {"matrix": [0, 7], "x": 7.75, "y": 0},
+                {"matrix": [0, 8], "x": 8.75, "y": 0},
+
+                {"matrix": [0, 10], "x": 10.25, "y": 0},
+                {"matrix": [0, 11], "x": 11.25, "y": 0},
+                {"matrix": [0, 12], "x": 12.25, "y": 0},
+                {"matrix": [0, 13], "x": 13.25, "y": 0},
+
+                {"matrix": [0, 15], "x": 14.75, "y": 0},
+                {"matrix": [0, 16], "x": 15.75, "y": 0},
+                {"matrix": [0, 17], "x": 16.75, "y": 0},
+                {"matrix": [0, 18], "x": 17.75, "y": 0},
+
+                {"matrix": [0, 19], "x": 19.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.25, "y": 1.25},
+                {"matrix": [1, 5], "x": 5.25, "y": 1.25},
+                {"matrix": [1, 6], "x": 6.25, "y": 1.25},
+                {"matrix": [1, 7], "x": 7.25, "y": 1.25},
+                {"matrix": [1, 8], "x": 8.25, "y": 1.25},
+                {"matrix": [1, 9], "x": 9.25, "y": 1.25},
+                {"matrix": [1, 10], "x": 10.25, "y": 1.25},
+                {"matrix": [1, 11], "x": 11.25, "y": 1.25},
+                {"matrix": [1, 12], "x": 12.25, "y": 1.25},
+                {"matrix": [1, 13], "x": 13.25, "y": 1.25},
+                {"matrix": [1, 14], "x": 14.25, "y": 1.25},
+                {"matrix": [1, 15], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 17], "x": 17.25, "y": 1.25, "w": 2},
+                {"matrix": [1, 19], "x": 19.25, "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": [2, 4], "x": 4.25, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 5], "x": 5.75, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.75, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.75, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.75, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.75, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.75, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.75, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.75, "y": 2.25},
+                {"matrix": [2, 13], "x": 13.75, "y": 2.25},
+                {"matrix": [2, 14], "x": 14.75, "y": 2.25},
+                {"matrix": [2, 15], "x": 15.75, "y": 2.25},
+                {"matrix": [2, 16], "x": 16.75, "y": 2.25},
+                {"matrix": [2, 18], "x": 17.75, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 19], "x": 19.25, "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": [3, 4], "x": 4.25, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 5], "x": 6, "y": 3.25},
+                {"matrix": [3, 6], "x": 7, "y": 3.25},
+                {"matrix": [3, 7], "x": 8, "y": 3.25},
+                {"matrix": [3, 8], "x": 9, "y": 3.25},
+                {"matrix": [3, 9], "x": 10, "y": 3.25},
+                {"matrix": [3, 10], "x": 11, "y": 3.25},
+                {"matrix": [3, 11], "x": 12, "y": 3.25},
+                {"matrix": [3, 12], "x": 13, "y": 3.25},
+                {"matrix": [3, 13], "x": 14, "y": 3.25},
+                {"matrix": [3, 14], "x": 15, "y": 3.25},
+                {"matrix": [3, 15], "x": 16, "y": 3.25},
+                {"matrix": [3, 18], "x": 17, "y": 3.25, "w": 2.25},
+                {"matrix": [3, 19], "x": 19.25, "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": [4, 4], "x": 4.25, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 6], "x": 6.5, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.5, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.5, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.5, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.5, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.5, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.5, "y": 4.25},
+                {"matrix": [4, 13], "x": 13.5, "y": 4.25},
+                {"matrix": [4, 14], "x": 14.5, "y": 4.25},
+                {"matrix": [4, 15], "x": 15.5, "y": 4.25},
+                {"matrix": [4, 17], "x": 16.5, "y": 4.25, "w": 1.75},
+                {"matrix": [4, 18], "x": 18.25, "y": 4.25},
+                {"matrix": [4, 19], "x": 19.25, "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},
+
+                {"matrix": [5, 4], "x": 4.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 5], "x": 5.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 6.75, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 10], "x": 8, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 13], "x": 14.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 15], "x": 15.5, "y": 5.25, "w": 1.25},
+
+                {"matrix": [5, 17], "x": 17.25, "y": 5.25},
+                {"matrix": [5, 18], "x": 18.25, "y": 5.25},
+                {"matrix": [5, 19], "x": 19.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_iso_rhnp": {
+            "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.25, "y": 0},
+
+                {"matrix": [0, 5], "x": 5.75, "y": 0},
+                {"matrix": [0, 6], "x": 6.75, "y": 0},
+                {"matrix": [0, 7], "x": 7.75, "y": 0},
+                {"matrix": [0, 8], "x": 8.75, "y": 0},
+
+                {"matrix": [0, 10], "x": 10.25, "y": 0},
+                {"matrix": [0, 11], "x": 11.25, "y": 0},
+                {"matrix": [0, 12], "x": 12.25, "y": 0},
+                {"matrix": [0, 13], "x": 13.25, "y": 0},
+
+                {"matrix": [0, 15], "x": 14.75, "y": 0},
+                {"matrix": [0, 16], "x": 15.75, "y": 0},
+                {"matrix": [0, 17], "x": 16.75, "y": 0},
+                {"matrix": [0, 18], "x": 17.75, "y": 0},
+
+                {"matrix": [0, 19], "x": 19.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.25, "y": 1.25},
+                {"matrix": [1, 5], "x": 5.25, "y": 1.25},
+                {"matrix": [1, 6], "x": 6.25, "y": 1.25},
+                {"matrix": [1, 7], "x": 7.25, "y": 1.25},
+                {"matrix": [1, 8], "x": 8.25, "y": 1.25},
+                {"matrix": [1, 9], "x": 9.25, "y": 1.25},
+                {"matrix": [1, 10], "x": 10.25, "y": 1.25},
+                {"matrix": [1, 11], "x": 11.25, "y": 1.25},
+                {"matrix": [1, 12], "x": 12.25, "y": 1.25},
+                {"matrix": [1, 13], "x": 13.25, "y": 1.25},
+                {"matrix": [1, 14], "x": 14.25, "y": 1.25},
+                {"matrix": [1, 15], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 17], "x": 17.25, "y": 1.25, "w": 2},
+                {"matrix": [1, 19], "x": 19.25, "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, "h": 2},
+
+                {"matrix": [2, 4], "x": 4.25, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 5], "x": 5.75, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.75, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.75, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.75, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.75, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.75, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.75, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.75, "y": 2.25},
+                {"matrix": [2, 13], "x": 13.75, "y": 2.25},
+                {"matrix": [2, 14], "x": 14.75, "y": 2.25},
+                {"matrix": [2, 15], "x": 15.75, "y": 2.25},
+                {"matrix": [2, 16], "x": 16.75, "y": 2.25},
+                {"matrix": [2, 18], "x": 18, "y": 2.25, "w": 1.25, "h": 2},
+                {"matrix": [2, 19], "x": 19.25, "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, 4], "x": 4.25, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 5], "x": 6, "y": 3.25},
+                {"matrix": [3, 6], "x": 7, "y": 3.25},
+                {"matrix": [3, 7], "x": 8, "y": 3.25},
+                {"matrix": [3, 8], "x": 9, "y": 3.25},
+                {"matrix": [3, 9], "x": 10, "y": 3.25},
+                {"matrix": [3, 10], "x": 11, "y": 3.25},
+                {"matrix": [3, 11], "x": 12, "y": 3.25},
+                {"matrix": [3, 12], "x": 13, "y": 3.25},
+                {"matrix": [3, 13], "x": 14, "y": 3.25},
+                {"matrix": [3, 14], "x": 15, "y": 3.25},
+                {"matrix": [3, 15], "x": 16, "y": 3.25},
+                {"matrix": [3, 18], "x": 17, "y": 3.25},
+                {"matrix": [3, 19], "x": 19.25, "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, "h": 2},
+
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 5], "x": 5.5, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.5, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.5, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.5, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.5, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.5, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.5, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.5, "y": 4.25},
+                {"matrix": [4, 13], "x": 13.5, "y": 4.25},
+                {"matrix": [4, 14], "x": 14.5, "y": 4.25},
+                {"matrix": [4, 15], "x": 15.5, "y": 4.25},
+                {"matrix": [4, 17], "x": 16.5, "y": 4.25, "w": 1.75},
+                {"matrix": [4, 18], "x": 18.25, "y": 4.25},
+                {"matrix": [4, 19], "x": 19.25, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 2},
+                {"matrix": [5, 2], "x": 2, "y": 5.25},
+
+                {"matrix": [5, 4], "x": 4.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 5], "x": 5.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 6.75, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 10], "x": 8, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 13], "x": 14.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 15], "x": 15.5, "y": 5.25, "w": 1.25},
+
+                {"matrix": [5, 17], "x": 17.25, "y": 5.25},
+                {"matrix": [5, 18], "x": 18.25, "y": 5.25},
+                {"matrix": [5, 19], "x": 19.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_iso_lhnp": {
+            "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.25, "y": 0},
+
+                {"matrix": [0, 5], "x": 5.75, "y": 0},
+                {"matrix": [0, 6], "x": 6.75, "y": 0},
+                {"matrix": [0, 7], "x": 7.75, "y": 0},
+                {"matrix": [0, 8], "x": 8.75, "y": 0},
+
+                {"matrix": [0, 10], "x": 10.25, "y": 0},
+                {"matrix": [0, 11], "x": 11.25, "y": 0},
+                {"matrix": [0, 12], "x": 12.25, "y": 0},
+                {"matrix": [0, 13], "x": 13.25, "y": 0},
+
+                {"matrix": [0, 15], "x": 14.75, "y": 0},
+                {"matrix": [0, 16], "x": 15.75, "y": 0},
+                {"matrix": [0, 17], "x": 16.75, "y": 0},
+                {"matrix": [0, 18], "x": 17.75, "y": 0},
+
+                {"matrix": [0, 19], "x": 19.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.25, "y": 1.25},
+                {"matrix": [1, 5], "x": 5.25, "y": 1.25},
+                {"matrix": [1, 6], "x": 6.25, "y": 1.25},
+                {"matrix": [1, 7], "x": 7.25, "y": 1.25},
+                {"matrix": [1, 8], "x": 8.25, "y": 1.25},
+                {"matrix": [1, 9], "x": 9.25, "y": 1.25},
+                {"matrix": [1, 10], "x": 10.25, "y": 1.25},
+                {"matrix": [1, 11], "x": 11.25, "y": 1.25},
+                {"matrix": [1, 12], "x": 12.25, "y": 1.25},
+                {"matrix": [1, 13], "x": 13.25, "y": 1.25},
+                {"matrix": [1, 14], "x": 14.25, "y": 1.25},
+                {"matrix": [1, 15], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 17], "x": 17.25, "y": 1.25, "w": 2},
+                {"matrix": [1, 19], "x": 19.25, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "h": 2},
+                {"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": [2, 4], "x": 4.25, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 5], "x": 5.75, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.75, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.75, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.75, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.75, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.75, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.75, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.75, "y": 2.25},
+                {"matrix": [2, 13], "x": 13.75, "y": 2.25},
+                {"matrix": [2, 14], "x": 14.75, "y": 2.25},
+                {"matrix": [2, 15], "x": 15.75, "y": 2.25},
+                {"matrix": [2, 16], "x": 16.75, "y": 2.25},
+                {"matrix": [2, 18], "x": 18, "y": 2.25, "w": 1.25, "h": 2},
+                {"matrix": [2, 19], "x": 19.25, "y": 2.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": [3, 4], "x": 4.25, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 5], "x": 6, "y": 3.25},
+                {"matrix": [3, 6], "x": 7, "y": 3.25},
+                {"matrix": [3, 7], "x": 8, "y": 3.25},
+                {"matrix": [3, 8], "x": 9, "y": 3.25},
+                {"matrix": [3, 9], "x": 10, "y": 3.25},
+                {"matrix": [3, 10], "x": 11, "y": 3.25},
+                {"matrix": [3, 11], "x": 12, "y": 3.25},
+                {"matrix": [3, 12], "x": 13, "y": 3.25},
+                {"matrix": [3, 13], "x": 14, "y": 3.25},
+                {"matrix": [3, 14], "x": 15, "y": 3.25},
+                {"matrix": [3, 15], "x": 16, "y": 3.25},
+                {"matrix": [3, 18], "x": 17, "y": 3.25},
+                {"matrix": [3, 19], "x": 19.25, "y": 3.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "h": 2},
+                {"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": [4, 4], "x": 4.25, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 5], "x": 5.5, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.5, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.5, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.5, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.5, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.5, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.5, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.5, "y": 4.25},
+                {"matrix": [4, 13], "x": 13.5, "y": 4.25},
+                {"matrix": [4, 14], "x": 14.5, "y": 4.25},
+                {"matrix": [4, 15], "x": 15.5, "y": 4.25},
+                {"matrix": [4, 17], "x": 16.5, "y": 4.25, "w": 1.75},
+                {"matrix": [4, 18], "x": 18.25, "y": 4.25},
+                {"matrix": [4, 19], "x": 19.25, "y": 4.25},
+
+                {"matrix": [5, 1], "x": 1, "y": 5.25},
+                {"matrix": [5, 2], "x": 2, "y": 5.25, "w": 2},
+
+                {"matrix": [5, 4], "x": 4.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 5], "x": 5.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 6.75, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 10], "x": 8, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 13], "x": 14.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 15], "x": 15.5, "y": 5.25, "w": 1.25},
+
+                {"matrix": [5, 17], "x": 17.25, "y": 5.25},
+                {"matrix": [5, 18], "x": 18.25, "y": 5.25},
+                {"matrix": [5, 19], "x": 19.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_iso_macro": {
+            "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.25, "y": 0},
+
+                {"matrix": [0, 5], "x": 5.75, "y": 0},
+                {"matrix": [0, 6], "x": 6.75, "y": 0},
+                {"matrix": [0, 7], "x": 7.75, "y": 0},
+                {"matrix": [0, 8], "x": 8.75, "y": 0},
+
+                {"matrix": [0, 10], "x": 10.25, "y": 0},
+                {"matrix": [0, 11], "x": 11.25, "y": 0},
+                {"matrix": [0, 12], "x": 12.25, "y": 0},
+                {"matrix": [0, 13], "x": 13.25, "y": 0},
+
+                {"matrix": [0, 15], "x": 14.75, "y": 0},
+                {"matrix": [0, 16], "x": 15.75, "y": 0},
+                {"matrix": [0, 17], "x": 16.75, "y": 0},
+                {"matrix": [0, 18], "x": 17.75, "y": 0},
+
+                {"matrix": [0, 19], "x": 19.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.25, "y": 1.25},
+                {"matrix": [1, 5], "x": 5.25, "y": 1.25},
+                {"matrix": [1, 6], "x": 6.25, "y": 1.25},
+                {"matrix": [1, 7], "x": 7.25, "y": 1.25},
+                {"matrix": [1, 8], "x": 8.25, "y": 1.25},
+                {"matrix": [1, 9], "x": 9.25, "y": 1.25},
+                {"matrix": [1, 10], "x": 10.25, "y": 1.25},
+                {"matrix": [1, 11], "x": 11.25, "y": 1.25},
+                {"matrix": [1, 12], "x": 12.25, "y": 1.25},
+                {"matrix": [1, 13], "x": 13.25, "y": 1.25},
+                {"matrix": [1, 14], "x": 14.25, "y": 1.25},
+                {"matrix": [1, 15], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 17], "x": 17.25, "y": 1.25, "w": 2},
+                {"matrix": [1, 19], "x": 19.25, "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": [2, 4], "x": 4.25, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 5], "x": 5.75, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.75, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.75, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.75, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.75, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.75, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.75, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.75, "y": 2.25},
+                {"matrix": [2, 13], "x": 13.75, "y": 2.25},
+                {"matrix": [2, 14], "x": 14.75, "y": 2.25},
+                {"matrix": [2, 15], "x": 15.75, "y": 2.25},
+                {"matrix": [2, 16], "x": 16.75, "y": 2.25},
+                {"matrix": [2, 18], "x": 18, "y": 2.25, "w": 1.25, "h": 2},
+                {"matrix": [2, 19], "x": 19.25, "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": [3, 4], "x": 4.25, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 5], "x": 6, "y": 3.25},
+                {"matrix": [3, 6], "x": 7, "y": 3.25},
+                {"matrix": [3, 7], "x": 8, "y": 3.25},
+                {"matrix": [3, 8], "x": 9, "y": 3.25},
+                {"matrix": [3, 9], "x": 10, "y": 3.25},
+                {"matrix": [3, 10], "x": 11, "y": 3.25},
+                {"matrix": [3, 11], "x": 12, "y": 3.25},
+                {"matrix": [3, 12], "x": 13, "y": 3.25},
+                {"matrix": [3, 13], "x": 14, "y": 3.25},
+                {"matrix": [3, 14], "x": 15, "y": 3.25},
+                {"matrix": [3, 15], "x": 16, "y": 3.25},
+                {"matrix": [3, 18], "x": 17, "y": 3.25},
+                {"matrix": [3, 19], "x": 19.25, "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": [4, 4], "x": 4.25, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 5], "x": 5.5, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.5, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.5, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.5, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.5, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.5, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.5, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.5, "y": 4.25},
+                {"matrix": [4, 13], "x": 13.5, "y": 4.25},
+                {"matrix": [4, 14], "x": 14.5, "y": 4.25},
+                {"matrix": [4, 15], "x": 15.5, "y": 4.25},
+                {"matrix": [4, 17], "x": 16.5, "y": 4.25, "w": 1.75},
+                {"matrix": [4, 18], "x": 18.25, "y": 4.25},
+                {"matrix": [4, 19], "x": 19.25, "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},
+
+                {"matrix": [5, 4], "x": 4.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 5], "x": 5.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 6.75, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 10], "x": 8, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 13], "x": 14.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 15], "x": 15.5, "y": 5.25, "w": 1.25},
+
+                {"matrix": [5, 17], "x": 17.25, "y": 5.25},
+                {"matrix": [5, 18], "x": 18.25, "y": 5.25},
+                {"matrix": [5, 19], "x": 19.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_jis_rhnp": {
+            "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.25, "y": 0},
+
+                {"matrix": [0, 5], "x": 5.75, "y": 0},
+                {"matrix": [0, 6], "x": 6.75, "y": 0},
+                {"matrix": [0, 7], "x": 7.75, "y": 0},
+                {"matrix": [0, 8], "x": 8.75, "y": 0},
+
+                {"matrix": [0, 10], "x": 10.25, "y": 0},
+                {"matrix": [0, 11], "x": 11.25, "y": 0},
+                {"matrix": [0, 12], "x": 12.25, "y": 0},
+                {"matrix": [0, 13], "x": 13.25, "y": 0},
+
+                {"matrix": [0, 15], "x": 14.75, "y": 0},
+                {"matrix": [0, 16], "x": 15.75, "y": 0},
+                {"matrix": [0, 17], "x": 16.75, "y": 0},
+                {"matrix": [0, 18], "x": 17.75, "y": 0},
+
+                {"matrix": [0, 19], "x": 19.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.25, "y": 1.25},
+                {"matrix": [1, 5], "x": 5.25, "y": 1.25},
+                {"matrix": [1, 6], "x": 6.25, "y": 1.25},
+                {"matrix": [1, 7], "x": 7.25, "y": 1.25},
+                {"matrix": [1, 8], "x": 8.25, "y": 1.25},
+                {"matrix": [1, 9], "x": 9.25, "y": 1.25},
+                {"matrix": [1, 10], "x": 10.25, "y": 1.25},
+                {"matrix": [1, 11], "x": 11.25, "y": 1.25},
+                {"matrix": [1, 12], "x": 12.25, "y": 1.25},
+                {"matrix": [1, 13], "x": 13.25, "y": 1.25},
+                {"matrix": [1, 14], "x": 14.25, "y": 1.25},
+                {"matrix": [1, 15], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 17], "x": 17.25, "y": 1.25},
+                {"matrix": [1, 18], "x": 18.25, "y": 1.25},
+                {"matrix": [1, 19], "x": 19.25, "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, "h": 2},
+
+                {"matrix": [2, 4], "x": 4.25, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 5], "x": 5.75, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.75, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.75, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.75, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.75, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.75, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.75, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.75, "y": 2.25},
+                {"matrix": [2, 13], "x": 13.75, "y": 2.25},
+                {"matrix": [2, 14], "x": 14.75, "y": 2.25},
+                {"matrix": [2, 15], "x": 15.75, "y": 2.25},
+                {"matrix": [2, 16], "x": 16.75, "y": 2.25},
+                {"matrix": [2, 18], "x": 18, "y": 2.25, "w": 1.25, "h": 2},
+                {"matrix": [2, 19], "x": 19.25, "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, 4], "x": 4.25, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 5], "x": 6, "y": 3.25},
+                {"matrix": [3, 6], "x": 7, "y": 3.25},
+                {"matrix": [3, 7], "x": 8, "y": 3.25},
+                {"matrix": [3, 8], "x": 9, "y": 3.25},
+                {"matrix": [3, 9], "x": 10, "y": 3.25},
+                {"matrix": [3, 10], "x": 11, "y": 3.25},
+                {"matrix": [3, 11], "x": 12, "y": 3.25},
+                {"matrix": [3, 12], "x": 13, "y": 3.25},
+                {"matrix": [3, 13], "x": 14, "y": 3.25},
+                {"matrix": [3, 14], "x": 15, "y": 3.25},
+                {"matrix": [3, 15], "x": 16, "y": 3.25},
+                {"matrix": [3, 18], "x": 17, "y": 3.25},
+                {"matrix": [3, 19], "x": 19.25, "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, "h": 2},
+
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 6], "x": 6.5, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.5, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.5, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.5, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.5, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.5, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.5, "y": 4.25},
+                {"matrix": [4, 13], "x": 13.5, "y": 4.25},
+                {"matrix": [4, 14], "x": 14.5, "y": 4.25},
+                {"matrix": [4, 15], "x": 15.5, "y": 4.25},
+                {"matrix": [4, 17], "x": 16.5, "y": 4.25},
+                {"matrix": [4, 18], "x": 17.5, "y": 4.25, "w": 1.75},
+                {"matrix": [4, 19], "x": 19.25, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 2},
+                {"matrix": [5, 2], "x": 2, "y": 5.25},
+
+                {"matrix": [5, 4], "x": 4.25, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 5], "x": 5.75, "y": 5.25},
+                {"matrix": [5, 6], "x": 6.75, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 7], "x": 8.25, "y": 5.25},
+                {"matrix": [5, 10], "x": 9.25, "y": 5.25, "w": 3},
+                {"matrix": [5, 11], "x": 12.25, "y": 5.25},
+                {"matrix": [5, 12], "x": 13.25, "y": 5.25},
+                {"matrix": [5, 13], "x": 14.25, "y": 5.25},
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 17], "x": 17.25, "y": 5.25},
+                {"matrix": [5, 18], "x": 18.25, "y": 5.25},
+                {"matrix": [5, 19], "x": 19.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_jis_lhnp": {
+            "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.25, "y": 0},
+
+                {"matrix": [0, 5], "x": 5.75, "y": 0},
+                {"matrix": [0, 6], "x": 6.75, "y": 0},
+                {"matrix": [0, 7], "x": 7.75, "y": 0},
+                {"matrix": [0, 8], "x": 8.75, "y": 0},
+
+                {"matrix": [0, 10], "x": 10.25, "y": 0},
+                {"matrix": [0, 11], "x": 11.25, "y": 0},
+                {"matrix": [0, 12], "x": 12.25, "y": 0},
+                {"matrix": [0, 13], "x": 13.25, "y": 0},
+
+                {"matrix": [0, 15], "x": 14.75, "y": 0},
+                {"matrix": [0, 16], "x": 15.75, "y": 0},
+                {"matrix": [0, 17], "x": 16.75, "y": 0},
+                {"matrix": [0, 18], "x": 17.75, "y": 0},
+
+                {"matrix": [0, 19], "x": 19.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.25, "y": 1.25},
+                {"matrix": [1, 5], "x": 5.25, "y": 1.25},
+                {"matrix": [1, 6], "x": 6.25, "y": 1.25},
+                {"matrix": [1, 7], "x": 7.25, "y": 1.25},
+                {"matrix": [1, 8], "x": 8.25, "y": 1.25},
+                {"matrix": [1, 9], "x": 9.25, "y": 1.25},
+                {"matrix": [1, 10], "x": 10.25, "y": 1.25},
+                {"matrix": [1, 11], "x": 11.25, "y": 1.25},
+                {"matrix": [1, 12], "x": 12.25, "y": 1.25},
+                {"matrix": [1, 13], "x": 13.25, "y": 1.25},
+                {"matrix": [1, 14], "x": 14.25, "y": 1.25},
+                {"matrix": [1, 15], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 17], "x": 17.25, "y": 1.25},
+                {"matrix": [1, 18], "x": 18.25, "y": 1.25},
+                {"matrix": [1, 19], "x": 19.25, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "h": 2},
+                {"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": [2, 4], "x": 4.25, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 5], "x": 5.75, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.75, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.75, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.75, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.75, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.75, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.75, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.75, "y": 2.25},
+                {"matrix": [2, 13], "x": 13.75, "y": 2.25},
+                {"matrix": [2, 14], "x": 14.75, "y": 2.25},
+                {"matrix": [2, 15], "x": 15.75, "y": 2.25},
+                {"matrix": [2, 16], "x": 16.75, "y": 2.25},
+                {"matrix": [2, 18], "x": 18, "y": 2.25, "w": 1.25, "h": 2},
+                {"matrix": [2, 19], "x": 19.25, "y": 2.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": [3, 4], "x": 4.25, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 5], "x": 6, "y": 3.25},
+                {"matrix": [3, 6], "x": 7, "y": 3.25},
+                {"matrix": [3, 7], "x": 8, "y": 3.25},
+                {"matrix": [3, 8], "x": 9, "y": 3.25},
+                {"matrix": [3, 9], "x": 10, "y": 3.25},
+                {"matrix": [3, 10], "x": 11, "y": 3.25},
+                {"matrix": [3, 11], "x": 12, "y": 3.25},
+                {"matrix": [3, 12], "x": 13, "y": 3.25},
+                {"matrix": [3, 13], "x": 14, "y": 3.25},
+                {"matrix": [3, 14], "x": 15, "y": 3.25},
+                {"matrix": [3, 15], "x": 16, "y": 3.25},
+                {"matrix": [3, 18], "x": 17, "y": 3.25},
+                {"matrix": [3, 19], "x": 19.25, "y": 3.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "h": 2},
+                {"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": [4, 4], "x": 4.25, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 6], "x": 6.5, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.5, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.5, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.5, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.5, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.5, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.5, "y": 4.25},
+                {"matrix": [4, 13], "x": 13.5, "y": 4.25},
+                {"matrix": [4, 14], "x": 14.5, "y": 4.25},
+                {"matrix": [4, 15], "x": 15.5, "y": 4.25},
+                {"matrix": [4, 17], "x": 16.5, "y": 4.25},
+                {"matrix": [4, 18], "x": 17.5, "y": 4.25, "w": 1.75},
+                {"matrix": [4, 19], "x": 19.25, "y": 4.25},
+
+                {"matrix": [5, 1], "x": 1, "y": 5.25},
+                {"matrix": [5, 2], "x": 2, "y": 5.25, "w": 2},
+
+                {"matrix": [5, 4], "x": 4.25, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 5], "x": 5.75, "y": 5.25},
+                {"matrix": [5, 6], "x": 6.75, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 7], "x": 8.25, "y": 5.25},
+                {"matrix": [5, 10], "x": 9.25, "y": 5.25, "w": 3},
+                {"matrix": [5, 11], "x": 12.25, "y": 5.25},
+                {"matrix": [5, 12], "x": 13.25, "y": 5.25},
+                {"matrix": [5, 13], "x": 14.25, "y": 5.25},
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 17], "x": 17.25, "y": 5.25},
+                {"matrix": [5, 18], "x": 18.25, "y": 5.25},
+                {"matrix": [5, 19], "x": 19.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_jis_macro": {
+            "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.25, "y": 0},
+
+                {"matrix": [0, 5], "x": 5.75, "y": 0},
+                {"matrix": [0, 6], "x": 6.75, "y": 0},
+                {"matrix": [0, 7], "x": 7.75, "y": 0},
+                {"matrix": [0, 8], "x": 8.75, "y": 0},
+
+                {"matrix": [0, 10], "x": 10.25, "y": 0},
+                {"matrix": [0, 11], "x": 11.25, "y": 0},
+                {"matrix": [0, 12], "x": 12.25, "y": 0},
+                {"matrix": [0, 13], "x": 13.25, "y": 0},
+
+                {"matrix": [0, 15], "x": 14.75, "y": 0},
+                {"matrix": [0, 16], "x": 15.75, "y": 0},
+                {"matrix": [0, 17], "x": 16.75, "y": 0},
+                {"matrix": [0, 18], "x": 17.75, "y": 0},
+
+                {"matrix": [0, 19], "x": 19.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.25, "y": 1.25},
+                {"matrix": [1, 5], "x": 5.25, "y": 1.25},
+                {"matrix": [1, 6], "x": 6.25, "y": 1.25},
+                {"matrix": [1, 7], "x": 7.25, "y": 1.25},
+                {"matrix": [1, 8], "x": 8.25, "y": 1.25},
+                {"matrix": [1, 9], "x": 9.25, "y": 1.25},
+                {"matrix": [1, 10], "x": 10.25, "y": 1.25},
+                {"matrix": [1, 11], "x": 11.25, "y": 1.25},
+                {"matrix": [1, 12], "x": 12.25, "y": 1.25},
+                {"matrix": [1, 13], "x": 13.25, "y": 1.25},
+                {"matrix": [1, 14], "x": 14.25, "y": 1.25},
+                {"matrix": [1, 15], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 17], "x": 17.25, "y": 1.25},
+                {"matrix": [1, 18], "x": 18.25, "y": 1.25},
+                {"matrix": [1, 19], "x": 19.25, "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": [2, 4], "x": 4.25, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 5], "x": 5.75, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.75, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.75, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.75, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.75, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.75, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.75, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.75, "y": 2.25},
+                {"matrix": [2, 13], "x": 13.75, "y": 2.25},
+                {"matrix": [2, 14], "x": 14.75, "y": 2.25},
+                {"matrix": [2, 15], "x": 15.75, "y": 2.25},
+                {"matrix": [2, 16], "x": 16.75, "y": 2.25},
+                {"matrix": [2, 18], "x": 18, "y": 2.25, "w": 1.25, "h": 2},
+                {"matrix": [2, 19], "x": 19.25, "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": [3, 4], "x": 4.25, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 5], "x": 6, "y": 3.25},
+                {"matrix": [3, 6], "x": 7, "y": 3.25},
+                {"matrix": [3, 7], "x": 8, "y": 3.25},
+                {"matrix": [3, 8], "x": 9, "y": 3.25},
+                {"matrix": [3, 9], "x": 10, "y": 3.25},
+                {"matrix": [3, 10], "x": 11, "y": 3.25},
+                {"matrix": [3, 11], "x": 12, "y": 3.25},
+                {"matrix": [3, 12], "x": 13, "y": 3.25},
+                {"matrix": [3, 13], "x": 14, "y": 3.25},
+                {"matrix": [3, 14], "x": 15, "y": 3.25},
+                {"matrix": [3, 15], "x": 16, "y": 3.25},
+                {"matrix": [3, 18], "x": 17, "y": 3.25},
+                {"matrix": [3, 19], "x": 19.25, "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": [4, 4], "x": 4.25, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 6], "x": 6.5, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.5, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.5, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.5, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.5, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.5, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.5, "y": 4.25},
+                {"matrix": [4, 13], "x": 13.5, "y": 4.25},
+                {"matrix": [4, 14], "x": 14.5, "y": 4.25},
+                {"matrix": [4, 15], "x": 15.5, "y": 4.25},
+                {"matrix": [4, 17], "x": 16.5, "y": 4.25},
+                {"matrix": [4, 18], "x": 17.5, "y": 4.25, "w": 1.75},
+                {"matrix": [4, 19], "x": 19.25, "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},
+
+                {"matrix": [5, 4], "x": 4.25, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 5], "x": 5.75, "y": 5.25},
+                {"matrix": [5, 6], "x": 6.75, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 7], "x": 8.25, "y": 5.25},
+                {"matrix": [5, 10], "x": 9.25, "y": 5.25, "w": 3},
+                {"matrix": [5, 11], "x": 12.25, "y": 5.25},
+                {"matrix": [5, 12], "x": 13.25, "y": 5.25},
+                {"matrix": [5, 13], "x": 14.25, "y": 5.25},
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 17], "x": 17.25, "y": 5.25},
+                {"matrix": [5, 18], "x": 18.25, "y": 5.25},
+                {"matrix": [5, 19], "x": 19.25, "y": 5.25}
+            ]
+        },
+        "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.25, "y": 0},
+
+                {"matrix": [0, 5], "x": 5.75, "y": 0},
+                {"matrix": [0, 6], "x": 6.75, "y": 0},
+                {"matrix": [0, 7], "x": 7.75, "y": 0},
+                {"matrix": [0, 8], "x": 8.75, "y": 0},
+
+                {"matrix": [0, 10], "x": 10.25, "y": 0},
+                {"matrix": [0, 11], "x": 11.25, "y": 0},
+                {"matrix": [0, 12], "x": 12.25, "y": 0},
+                {"matrix": [0, 13], "x": 13.25, "y": 0},
+
+                {"matrix": [0, 15], "x": 14.75, "y": 0},
+                {"matrix": [0, 16], "x": 15.75, "y": 0},
+                {"matrix": [0, 17], "x": 16.75, "y": 0},
+                {"matrix": [0, 18], "x": 17.75, "y": 0},
+
+                {"matrix": [0, 19], "x": 19.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.25, "y": 1.25},
+                {"matrix": [1, 5], "x": 5.25, "y": 1.25},
+                {"matrix": [1, 6], "x": 6.25, "y": 1.25},
+                {"matrix": [1, 7], "x": 7.25, "y": 1.25},
+                {"matrix": [1, 8], "x": 8.25, "y": 1.25},
+                {"matrix": [1, 9], "x": 9.25, "y": 1.25},
+                {"matrix": [1, 10], "x": 10.25, "y": 1.25},
+                {"matrix": [1, 11], "x": 11.25, "y": 1.25},
+                {"matrix": [1, 12], "x": 12.25, "y": 1.25},
+                {"matrix": [1, 13], "x": 13.25, "y": 1.25},
+                {"matrix": [1, 14], "x": 14.25, "y": 1.25},
+                {"matrix": [1, 15], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 17], "x": 17.25, "y": 1.25},
+                {"matrix": [1, 18], "x": 18.25, "y": 1.25},
+                {"matrix": [1, 19], "x": 19.25, "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": [2, 4], "x": 4.25, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 5], "x": 5.75, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.75, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.75, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.75, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.75, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.75, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.75, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.75, "y": 2.25},
+                {"matrix": [2, 13], "x": 13.75, "y": 2.25},
+                {"matrix": [2, 14], "x": 14.75, "y": 2.25},
+                {"matrix": [2, 15], "x": 15.75, "y": 2.25},
+                {"matrix": [2, 16], "x": 16.75, "y": 2.25},
+                {"matrix": [2, 18], "x": 17.75, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 19], "x": 19.25, "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": [3, 4], "x": 4.25, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 5], "x": 6, "y": 3.25},
+                {"matrix": [3, 6], "x": 7, "y": 3.25},
+                {"matrix": [3, 7], "x": 8, "y": 3.25},
+                {"matrix": [3, 8], "x": 9, "y": 3.25},
+                {"matrix": [3, 9], "x": 10, "y": 3.25},
+                {"matrix": [3, 10], "x": 11, "y": 3.25},
+                {"matrix": [3, 11], "x": 12, "y": 3.25},
+                {"matrix": [3, 12], "x": 13, "y": 3.25},
+                {"matrix": [3, 13], "x": 14, "y": 3.25},
+                {"matrix": [3, 14], "x": 15, "y": 3.25},
+                {"matrix": [3, 15], "x": 16, "y": 3.25},
+                {"matrix": [3, 18], "x": 17, "y": 3.25, "w": 2.25},
+                {"matrix": [3, 19], "x": 19.25, "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": [4, 4], "x": 4.25, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 5], "x": 5.5, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.5, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.5, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.5, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.5, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.5, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.5, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.5, "y": 4.25},
+                {"matrix": [4, 13], "x": 13.5, "y": 4.25},
+                {"matrix": [4, 14], "x": 14.5, "y": 4.25},
+                {"matrix": [4, 15], "x": 15.5, "y": 4.25},
+                {"matrix": [4, 17], "x": 16.5, "y": 4.25, "w": 1.75},
+                {"matrix": [4, 18], "x": 18.25, "y": 4.25},
+                {"matrix": [4, 19], "x": 19.25, "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},
+
+                {"matrix": [5, 4], "x": 4.25, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 5], "x": 5.75, "y": 5.25},
+                {"matrix": [5, 6], "x": 6.75, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 7], "x": 8.25, "y": 5.25},
+                {"matrix": [5, 10], "x": 9.25, "y": 5.25, "w": 3},
+                {"matrix": [5, 11], "x": 12.25, "y": 5.25},
+                {"matrix": [5, 12], "x": 13.25, "y": 5.25},
+                {"matrix": [5, 13], "x": 14.25, "y": 5.25},
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 17], "x": 17.25, "y": 5.25},
+                {"matrix": [5, 18], "x": 18.25, "y": 5.25},
+                {"matrix": [5, 19], "x": 19.25, "y": 5.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/rmi_kb/wete/v1/rules.mk b/keyboards/rmi_kb/wete/v1/rules.mk
deleted file mode 100644
index 108db79ad0b..00000000000
--- a/keyboards/rmi_kb/wete/v1/rules.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = yes        # Console for debug
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-SLEEP_LED_ENABLE = yes
-
diff --git a/keyboards/rmi_kb/wete/v2/info.json b/keyboards/rmi_kb/wete/v2/info.json
deleted file mode 100644
index 45ae1b5708c..00000000000
--- a/keyboards/rmi_kb/wete/v2/info.json
+++ /dev/null
@@ -1,415 +0,0 @@
-{
-    "keyboard_name": "Wete R2",
-    "manufacturer": "RMI-KB",
-    "url": "",
-    "maintainer": "ramonimbao",
-    "usb": {
-        "vid": "0xB16B",
-        "pid": "0x00B3",
-        "device_version": "35.0.0"
-    },
-    "matrix_pins": {
-        "cols": ["B1", "B0", "B7", "B5", "B4", "D7", "D6", "D4", "D5", "D3"],
-        "rows": ["B3", "B2", "B6", "C6", "C7", "E6", "F7", "F6", "F5", "F4", "F1", "F0", null]
-    },
-    "diode_direction": "COL2ROW",
-    "encoder": {
-        "rotary": [
-            {"pin_a": "D2", "pin_b": "D1"}
-        ]
-    },
-    "rgblight": {
-        "hue_steps": 32,
-        "saturation_steps": 32,
-        "brightness_steps": 32,
-        "led_count": 18,
-        "animations": {
-            "breathing": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "christmas": true,
-            "static_gradient": true,
-            "rgb_test": true,
-            "alternating": true
-        }
-    },
-    "ws2812": {
-        "pin": "D0"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "layouts": {
-        "LAYOUT_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.25, "y": 0},
-
-                {"matrix": [1, 2], "x": 5.75, "y": 0},
-                {"matrix": [0, 3], "x": 6.75, "y": 0},
-                {"matrix": [1, 3], "x": 7.75, "y": 0},
-                {"matrix": [0, 4], "x": 8.75, "y": 0},
-
-                {"matrix": [0, 5], "x": 10.25, "y": 0},
-                {"matrix": [1, 5], "x": 11.25, "y": 0},
-                {"matrix": [0, 6], "x": 12.25, "y": 0},
-                {"matrix": [1, 6], "x": 13.25, "y": 0},
-
-                {"matrix": [1, 7], "x": 14.75, "y": 0},
-                {"matrix": [0, 8], "x": 15.75, "y": 0},
-                {"matrix": [1, 8], "x": 16.75, "y": 0},
-                {"matrix": [0, 9], "x": 17.75, "y": 0},
-
-                {"matrix": [1, 9], "x": 19.25, "y": 0},
-
-                {"matrix": [2, 0], "x": 0, "y": 1.25},
-                {"matrix": [3, 0], "x": 1, "y": 1.25},
-                {"matrix": [2, 1], "x": 2, "y": 1.25},
-                {"matrix": [3, 1], "x": 3, "y": 1.25},
-
-                {"matrix": [2, 2], "x": 4.25, "y": 1.25},
-                {"matrix": [3, 2], "x": 5.25, "y": 1.25},
-                {"matrix": [2, 3], "x": 6.25, "y": 1.25},
-                {"matrix": [3, 3], "x": 7.25, "y": 1.25},
-                {"matrix": [2, 4], "x": 8.25, "y": 1.25},
-                {"matrix": [3, 4], "x": 9.25, "y": 1.25},
-                {"matrix": [2, 5], "x": 10.25, "y": 1.25},
-                {"matrix": [3, 5], "x": 11.25, "y": 1.25},
-                {"matrix": [2, 6], "x": 12.25, "y": 1.25},
-                {"matrix": [3, 6], "x": 13.25, "y": 1.25},
-                {"matrix": [2, 7], "x": 14.25, "y": 1.25},
-                {"matrix": [3, 7], "x": 15.25, "y": 1.25},
-                {"matrix": [2, 8], "x": 16.25, "y": 1.25},
-                {"matrix": [3, 8], "x": 17.25, "y": 1.25, "w": 2},
-                {"matrix": [3, 9], "x": 19.25, "y": 1.25},
-
-                {"matrix": [4, 0], "x": 0, "y": 2.25},
-                {"matrix": [5, 0], "x": 1, "y": 2.25},
-                {"matrix": [4, 1], "x": 2, "y": 2.25},
-                {"matrix": [5, 1], "x": 3, "y": 2.25, "h": 2},
-
-                {"matrix": [4, 2], "x": 4.25, "y": 2.25, "w": 1.5},
-                {"matrix": [5, 2], "x": 5.75, "y": 2.25},
-                {"matrix": [4, 3], "x": 6.75, "y": 2.25},
-                {"matrix": [5, 3], "x": 7.75, "y": 2.25},
-                {"matrix": [4, 4], "x": 8.75, "y": 2.25},
-                {"matrix": [5, 4], "x": 9.75, "y": 2.25},
-                {"matrix": [4, 5], "x": 10.75, "y": 2.25},
-                {"matrix": [5, 5], "x": 11.75, "y": 2.25},
-                {"matrix": [4, 6], "x": 12.75, "y": 2.25},
-                {"matrix": [5, 6], "x": 13.75, "y": 2.25},
-                {"matrix": [4, 7], "x": 14.75, "y": 2.25},
-                {"matrix": [5, 7], "x": 15.75, "y": 2.25},
-                {"matrix": [4, 8], "x": 16.75, "y": 2.25},
-                {"matrix": [4, 9], "x": 17.75, "y": 2.25, "w": 1.5},
-                {"matrix": [5, 9], "x": 19.25, "y": 2.25},
-
-                {"matrix": [6, 0], "x": 0, "y": 3.25},
-                {"matrix": [7, 0], "x": 1, "y": 3.25},
-                {"matrix": [6, 1], "x": 2, "y": 3.25},
-
-                {"matrix": [6, 2], "x": 4.25, "y": 3.25, "w": 1.75},
-                {"matrix": [7, 2], "x": 6, "y": 3.25},
-                {"matrix": [6, 3], "x": 7, "y": 3.25},
-                {"matrix": [7, 3], "x": 8, "y": 3.25},
-                {"matrix": [6, 4], "x": 9, "y": 3.25},
-                {"matrix": [7, 4], "x": 10, "y": 3.25},
-                {"matrix": [6, 5], "x": 11, "y": 3.25},
-                {"matrix": [7, 5], "x": 12, "y": 3.25},
-                {"matrix": [6, 6], "x": 13, "y": 3.25},
-                {"matrix": [7, 6], "x": 14, "y": 3.25},
-                {"matrix": [6, 7], "x": 15, "y": 3.25},
-                {"matrix": [7, 7], "x": 16, "y": 3.25},
-                {"matrix": [7, 8], "x": 17, "y": 3.25, "w": 2.25},
-                {"matrix": [7, 9], "x": 19.25, "y": 3.25},
-
-                {"matrix": [8, 0], "x": 0, "y": 4.25},
-                {"matrix": [9, 0], "x": 1, "y": 4.25},
-                {"matrix": [8, 1], "x": 2, "y": 4.25},
-                {"matrix": [9, 1], "x": 3, "y": 4.25, "h": 2},
-
-                {"matrix": [8, 2], "x": 4.25, "y": 4.25, "w": 2.25},
-                {"matrix": [8, 3], "x": 6.5, "y": 4.25},
-                {"matrix": [9, 3], "x": 7.5, "y": 4.25},
-                {"matrix": [8, 4], "x": 8.5, "y": 4.25},
-                {"matrix": [9, 4], "x": 9.5, "y": 4.25},
-                {"matrix": [8, 5], "x": 10.5, "y": 4.25},
-                {"matrix": [9, 5], "x": 11.5, "y": 4.25},
-                {"matrix": [8, 6], "x": 12.5, "y": 4.25},
-                {"matrix": [9, 6], "x": 13.5, "y": 4.25},
-                {"matrix": [8, 7], "x": 14.5, "y": 4.25},
-                {"matrix": [9, 7], "x": 15.5, "y": 4.25},
-                {"matrix": [9, 8], "x": 16.5, "y": 4.25, "w": 1.75},
-                {"matrix": [8, 9], "x": 18.25, "y": 4.25},
-                {"matrix": [9, 9], "x": 19.25, "y": 4.25},
-
-                {"matrix": [10, 0], "x": 0, "y": 5.25, "w": 2},
-                {"matrix": [10, 1], "x": 2, "y": 5.25},
-
-                {"matrix": [10, 2], "x": 4.25, "y": 5.25, "w": 1.25},
-                {"matrix": [11, 2], "x": 5.5, "y": 5.25, "w": 1.25},
-                {"matrix": [10, 3], "x": 6.75, "y": 5.25, "w": 1.25},
-                {"matrix": [10, 5], "x": 8, "y": 5.25, "w": 6.25},
-                {"matrix": [10, 7], "x": 14.25, "y": 5.25, "w": 1.25},
-                {"matrix": [11, 7], "x": 15.5, "y": 5.25, "w": 1.25},
-
-                {"matrix": [11, 8], "x": 17.25, "y": 5.25},
-                {"matrix": [10, 9], "x": 18.25, "y": 5.25},
-                {"matrix": [11, 9], "x": 19.25, "y": 5.25}
-            ]
-        },
-        "LAYOUT_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.25, "y": 0},
-
-                {"matrix": [1, 2], "x": 5.75, "y": 0},
-                {"matrix": [0, 3], "x": 6.75, "y": 0},
-                {"matrix": [1, 3], "x": 7.75, "y": 0},
-                {"matrix": [0, 4], "x": 8.75, "y": 0},
-
-                {"matrix": [0, 5], "x": 10.25, "y": 0},
-                {"matrix": [1, 5], "x": 11.25, "y": 0},
-                {"matrix": [0, 6], "x": 12.25, "y": 0},
-                {"matrix": [1, 6], "x": 13.25, "y": 0},
-
-                {"matrix": [1, 7], "x": 14.75, "y": 0},
-                {"matrix": [0, 8], "x": 15.75, "y": 0},
-                {"matrix": [1, 8], "x": 16.75, "y": 0},
-                {"matrix": [0, 9], "x": 17.75, "y": 0},
-
-                {"matrix": [1, 9], "x": 19.25, "y": 0},
-
-                {"matrix": [2, 0], "x": 0, "y": 1.25},
-                {"matrix": [3, 0], "x": 1, "y": 1.25},
-                {"matrix": [2, 1], "x": 2, "y": 1.25},
-                {"matrix": [3, 1], "x": 3, "y": 1.25},
-
-                {"matrix": [2, 2], "x": 4.25, "y": 1.25},
-                {"matrix": [3, 2], "x": 5.25, "y": 1.25},
-                {"matrix": [2, 3], "x": 6.25, "y": 1.25},
-                {"matrix": [3, 3], "x": 7.25, "y": 1.25},
-                {"matrix": [2, 4], "x": 8.25, "y": 1.25},
-                {"matrix": [3, 4], "x": 9.25, "y": 1.25},
-                {"matrix": [2, 5], "x": 10.25, "y": 1.25},
-                {"matrix": [3, 5], "x": 11.25, "y": 1.25},
-                {"matrix": [2, 6], "x": 12.25, "y": 1.25},
-                {"matrix": [3, 6], "x": 13.25, "y": 1.25},
-                {"matrix": [2, 7], "x": 14.25, "y": 1.25},
-                {"matrix": [3, 7], "x": 15.25, "y": 1.25},
-                {"matrix": [2, 8], "x": 16.25, "y": 1.25},
-                {"matrix": [3, 8], "x": 17.25, "y": 1.25, "w": 2},
-                {"matrix": [3, 9], "x": 19.25, "y": 1.25},
-
-                {"matrix": [4, 0], "x": 0, "y": 2.25},
-                {"matrix": [5, 0], "x": 1, "y": 2.25},
-                {"matrix": [4, 1], "x": 2, "y": 2.25},
-                {"matrix": [5, 1], "x": 3, "y": 2.25, "h": 2},
-
-                {"matrix": [4, 2], "x": 4.25, "y": 2.25, "w": 1.5},
-                {"matrix": [5, 2], "x": 5.75, "y": 2.25},
-                {"matrix": [4, 3], "x": 6.75, "y": 2.25},
-                {"matrix": [5, 3], "x": 7.75, "y": 2.25},
-                {"matrix": [4, 4], "x": 8.75, "y": 2.25},
-                {"matrix": [5, 4], "x": 9.75, "y": 2.25},
-                {"matrix": [4, 5], "x": 10.75, "y": 2.25},
-                {"matrix": [5, 5], "x": 11.75, "y": 2.25},
-                {"matrix": [4, 6], "x": 12.75, "y": 2.25},
-                {"matrix": [5, 6], "x": 13.75, "y": 2.25},
-                {"matrix": [4, 7], "x": 14.75, "y": 2.25},
-                {"matrix": [5, 7], "x": 15.75, "y": 2.25},
-                {"matrix": [4, 8], "x": 16.75, "y": 2.25},
-                {"matrix": [5, 9], "x": 19.25, "y": 2.25},
-
-                {"matrix": [6, 0], "x": 0, "y": 3.25},
-                {"matrix": [7, 0], "x": 1, "y": 3.25},
-                {"matrix": [6, 1], "x": 2, "y": 3.25},
-
-                {"matrix": [6, 2], "x": 4.25, "y": 3.25, "w": 1.75},
-                {"matrix": [7, 2], "x": 6, "y": 3.25},
-                {"matrix": [6, 3], "x": 7, "y": 3.25},
-                {"matrix": [7, 3], "x": 8, "y": 3.25},
-                {"matrix": [6, 4], "x": 9, "y": 3.25},
-                {"matrix": [7, 4], "x": 10, "y": 3.25},
-                {"matrix": [6, 5], "x": 11, "y": 3.25},
-                {"matrix": [7, 5], "x": 12, "y": 3.25},
-                {"matrix": [6, 6], "x": 13, "y": 3.25},
-                {"matrix": [7, 6], "x": 14, "y": 3.25},
-                {"matrix": [6, 7], "x": 15, "y": 3.25},
-                {"matrix": [7, 7], "x": 16, "y": 3.25},
-                {"matrix": [7, 8], "x": 17, "y": 3.25},
-                {"matrix": [4, 9], "x": 18, "y": 2.25, "w": 1.25, "h": 2},
-                {"matrix": [7, 9], "x": 19.25, "y": 3.25},
-
-                {"matrix": [8, 0], "x": 0, "y": 4.25},
-                {"matrix": [9, 0], "x": 1, "y": 4.25},
-                {"matrix": [8, 1], "x": 2, "y": 4.25},
-                {"matrix": [9, 1], "x": 3, "y": 4.25, "h": 2},
-
-                {"matrix": [8, 2], "x": 4.25, "y": 4.25, "w": 1.25},
-                {"matrix": [9, 2], "x": 5.5, "y": 4.25},
-                {"matrix": [8, 3], "x": 6.5, "y": 4.25},
-                {"matrix": [9, 3], "x": 7.5, "y": 4.25},
-                {"matrix": [8, 4], "x": 8.5, "y": 4.25},
-                {"matrix": [9, 4], "x": 9.5, "y": 4.25},
-                {"matrix": [8, 5], "x": 10.5, "y": 4.25},
-                {"matrix": [9, 5], "x": 11.5, "y": 4.25},
-                {"matrix": [8, 6], "x": 12.5, "y": 4.25},
-                {"matrix": [9, 6], "x": 13.5, "y": 4.25},
-                {"matrix": [8, 7], "x": 14.5, "y": 4.25},
-                {"matrix": [9, 7], "x": 15.5, "y": 4.25},
-                {"matrix": [9, 8], "x": 16.5, "y": 4.25, "w": 1.75},
-                {"matrix": [8, 9], "x": 18.25, "y": 4.25},
-                {"matrix": [9, 9], "x": 19.25, "y": 4.25},
-
-                {"matrix": [10, 0], "x": 0, "y": 5.25, "w": 2},
-                {"matrix": [10, 1], "x": 2, "y": 5.25},
-
-                {"matrix": [10, 2], "x": 4.25, "y": 5.25, "w": 1.25},
-                {"matrix": [11, 2], "x": 5.5, "y": 5.25, "w": 1.25},
-                {"matrix": [10, 3], "x": 6.75, "y": 5.25, "w": 1.25},
-                {"matrix": [10, 5], "x": 8, "y": 5.25, "w": 6.25},
-                {"matrix": [10, 7], "x": 14.25, "y": 5.25, "w": 1.25},
-                {"matrix": [11, 7], "x": 15.5, "y": 5.25, "w": 1.25},
-
-                {"matrix": [11, 8], "x": 17.25, "y": 5.25},
-                {"matrix": [10, 9], "x": 18.25, "y": 5.25},
-                {"matrix": [11, 9], "x": 19.25, "y": 5.25}
-            ]
-        },
-        "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.25, "y": 0},
-
-                {"matrix": [1, 2], "x": 5.75, "y": 0},
-                {"matrix": [0, 3], "x": 6.75, "y": 0},
-                {"matrix": [1, 3], "x": 7.75, "y": 0},
-                {"matrix": [0, 4], "x": 8.75, "y": 0},
-
-                {"matrix": [0, 5], "x": 10.25, "y": 0},
-                {"matrix": [1, 5], "x": 11.25, "y": 0},
-                {"matrix": [0, 6], "x": 12.25, "y": 0},
-                {"matrix": [1, 6], "x": 13.25, "y": 0},
-
-                {"matrix": [1, 7], "x": 14.75, "y": 0},
-                {"matrix": [0, 8], "x": 15.75, "y": 0},
-                {"matrix": [1, 8], "x": 16.75, "y": 0},
-                {"matrix": [0, 9], "x": 17.75, "y": 0},
-
-                {"matrix": [1, 9], "x": 19.5, "y": 0},
-
-                {"matrix": [2, 0], "x": 0, "y": 1.25},
-                {"matrix": [3, 0], "x": 1, "y": 1.25},
-                {"matrix": [2, 1], "x": 2, "y": 1.25},
-                {"matrix": [3, 1], "x": 3, "y": 1.25},
-
-                {"matrix": [2, 2], "x": 4.25, "y": 1.25},
-                {"matrix": [3, 2], "x": 5.25, "y": 1.25},
-                {"matrix": [2, 3], "x": 6.25, "y": 1.25},
-                {"matrix": [3, 3], "x": 7.25, "y": 1.25},
-                {"matrix": [2, 4], "x": 8.25, "y": 1.25},
-                {"matrix": [3, 4], "x": 9.25, "y": 1.25},
-                {"matrix": [2, 5], "x": 10.25, "y": 1.25},
-                {"matrix": [3, 5], "x": 11.25, "y": 1.25},
-                {"matrix": [2, 6], "x": 12.25, "y": 1.25},
-                {"matrix": [3, 6], "x": 13.25, "y": 1.25},
-                {"matrix": [2, 7], "x": 14.25, "y": 1.25},
-                {"matrix": [3, 7], "x": 15.25, "y": 1.25},
-                {"matrix": [2, 8], "x": 16.25, "y": 1.25},
-                {"matrix": [3, 8], "x": 17.25, "y": 1.25},
-                {"matrix": [2, 9], "x": 18.25, "y": 1.25},
-                {"matrix": [3, 9], "x": 19.25, "y": 1.25},
-
-                {"matrix": [4, 0], "x": 0, "y": 2.25},
-                {"matrix": [5, 0], "x": 1, "y": 2.25},
-                {"matrix": [4, 1], "x": 2, "y": 2.25},
-                {"matrix": [5, 1], "x": 3, "y": 2.25},
-
-                {"matrix": [4, 2], "x": 4.25, "y": 2.25, "w": 1.5},
-                {"matrix": [5, 2], "x": 5.75, "y": 2.25},
-                {"matrix": [4, 3], "x": 6.75, "y": 2.25},
-                {"matrix": [5, 3], "x": 7.75, "y": 2.25},
-                {"matrix": [4, 4], "x": 8.75, "y": 2.25},
-                {"matrix": [5, 4], "x": 9.75, "y": 2.25},
-                {"matrix": [4, 5], "x": 10.75, "y": 2.25},
-                {"matrix": [5, 5], "x": 11.75, "y": 2.25},
-                {"matrix": [4, 6], "x": 12.75, "y": 2.25},
-                {"matrix": [5, 6], "x": 13.75, "y": 2.25},
-                {"matrix": [4, 7], "x": 14.75, "y": 2.25},
-                {"matrix": [5, 7], "x": 15.75, "y": 2.25},
-                {"matrix": [4, 8], "x": 16.75, "y": 2.25},
-                {"matrix": [4, 9], "x": 17.75, "y": 2.25, "w": 1.5},
-                {"matrix": [5, 9], "x": 19.25, "y": 2.25},
-
-                {"matrix": [6, 0], "x": 0, "y": 3.25},
-                {"matrix": [7, 0], "x": 1, "y": 3.25},
-                {"matrix": [6, 1], "x": 2, "y": 3.25},
-                {"matrix": [7, 1], "x": 3, "y": 3.25},
-
-                {"matrix": [6, 2], "x": 4.25, "y": 3.25, "w": 1.75},
-                {"matrix": [7, 2], "x": 6, "y": 3.25},
-                {"matrix": [6, 3], "x": 7, "y": 3.25},
-                {"matrix": [7, 3], "x": 8, "y": 3.25},
-                {"matrix": [6, 4], "x": 9, "y": 3.25},
-                {"matrix": [7, 4], "x": 10, "y": 3.25},
-                {"matrix": [6, 5], "x": 11, "y": 3.25},
-                {"matrix": [7, 5], "x": 12, "y": 3.25},
-                {"matrix": [6, 6], "x": 13, "y": 3.25},
-                {"matrix": [7, 6], "x": 14, "y": 3.25},
-                {"matrix": [6, 7], "x": 15, "y": 3.25},
-                {"matrix": [7, 7], "x": 16, "y": 3.25},
-                {"matrix": [7, 8], "x": 17, "y": 3.25, "w": 2.25},
-                {"matrix": [7, 9], "x": 19.25, "y": 3.25},
-
-                {"matrix": [8, 0], "x": 0, "y": 4.25},
-                {"matrix": [9, 0], "x": 1, "y": 4.25},
-                {"matrix": [8, 1], "x": 2, "y": 4.25},
-                {"matrix": [9, 1], "x": 3, "y": 4.25},
-
-                {"matrix": [8, 2], "x": 4.25, "y": 4.25, "w": 1.25},
-                {"matrix": [9, 2], "x": 5.5, "y": 4.25},
-                {"matrix": [8, 3], "x": 6.5, "y": 4.25},
-                {"matrix": [9, 3], "x": 7.5, "y": 4.25},
-                {"matrix": [8, 4], "x": 8.5, "y": 4.25},
-                {"matrix": [9, 4], "x": 9.5, "y": 4.25},
-                {"matrix": [8, 5], "x": 10.5, "y": 4.25},
-                {"matrix": [9, 5], "x": 11.5, "y": 4.25},
-                {"matrix": [8, 6], "x": 12.5, "y": 4.25},
-                {"matrix": [9, 6], "x": 13.5, "y": 4.25},
-                {"matrix": [8, 7], "x": 14.5, "y": 4.25},
-                {"matrix": [9, 7], "x": 15.5, "y": 4.25},
-                {"matrix": [9, 8], "x": 16.5, "y": 4.25, "w": 1.75},
-                {"matrix": [8, 9], "x": 18.25, "y": 4.25},
-                {"matrix": [9, 9], "x": 19.25, "y": 4.25},
-
-                {"matrix": [10, 0], "x": 0, "y": 5.25},
-                {"matrix": [11, 0], "x": 1, "y": 5.25},
-                {"matrix": [10, 1], "x": 2, "y": 5.25},
-                {"matrix": [11, 1], "x": 3, "y": 5.25},
-
-                {"matrix": [10, 2], "x": 4.25, "y": 5.25, "w": 1.25},
-                {"matrix": [11, 2], "x": 5.5, "y": 5.25, "w": 1.25},
-                {"matrix": [10, 3], "x": 6.75, "y": 5.25, "w": 1.25},
-                {"matrix": [10, 5], "x": 8, "y": 5.25, "w": 6.25},
-                {"matrix": [10, 7], "x": 14.25, "y": 5.25},
-                {"matrix": [11, 7], "x": 15.25, "y": 5.25},
-                {"matrix": [10, 8], "x": 16.25, "y": 5.25},
-                {"matrix": [11, 8], "x": 17.25, "y": 5.25},
-                {"matrix": [10, 9], "x": 18.25, "y": 5.25},
-                {"matrix": [11, 9], "x": 19.25, "y": 5.25}
-            ]
-        }
-    }
-}
diff --git a/keyboards/rmi_kb/wete/v2/keyboard.json b/keyboards/rmi_kb/wete/v2/keyboard.json
new file mode 100644
index 00000000000..140071d01f7
--- /dev/null
+++ b/keyboards/rmi_kb/wete/v2/keyboard.json
@@ -0,0 +1,423 @@
+{
+    "keyboard_name": "Wete R2",
+    "manufacturer": "RMI-KB",
+    "url": "",
+    "maintainer": "ramonimbao",
+    "usb": {
+        "vid": "0xB16B",
+        "pid": "0x00B3",
+        "device_version": "35.0.0"
+    },
+    "features": {
+        "bootmagic": true,
+        "encoder": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": false,
+        "rgblight": true
+    },
+    "matrix_pins": {
+        "cols": ["B1", "B0", "B7", "B5", "B4", "D7", "D6", "D4", "D5", "D3"],
+        "rows": ["B3", "B2", "B6", "C6", "C7", "E6", "F7", "F6", "F5", "F4", "F1", "F0", null]
+    },
+    "diode_direction": "COL2ROW",
+    "encoder": {
+        "rotary": [
+            {"pin_a": "D2", "pin_b": "D1"}
+        ]
+    },
+    "rgblight": {
+        "hue_steps": 32,
+        "saturation_steps": 32,
+        "brightness_steps": 32,
+        "led_count": 18,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "christmas": true,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": true
+        }
+    },
+    "ws2812": {
+        "pin": "D0"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "layouts": {
+        "LAYOUT_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.25, "y": 0},
+
+                {"matrix": [1, 2], "x": 5.75, "y": 0},
+                {"matrix": [0, 3], "x": 6.75, "y": 0},
+                {"matrix": [1, 3], "x": 7.75, "y": 0},
+                {"matrix": [0, 4], "x": 8.75, "y": 0},
+
+                {"matrix": [0, 5], "x": 10.25, "y": 0},
+                {"matrix": [1, 5], "x": 11.25, "y": 0},
+                {"matrix": [0, 6], "x": 12.25, "y": 0},
+                {"matrix": [1, 6], "x": 13.25, "y": 0},
+
+                {"matrix": [1, 7], "x": 14.75, "y": 0},
+                {"matrix": [0, 8], "x": 15.75, "y": 0},
+                {"matrix": [1, 8], "x": 16.75, "y": 0},
+                {"matrix": [0, 9], "x": 17.75, "y": 0},
+
+                {"matrix": [1, 9], "x": 19.25, "y": 0},
+
+                {"matrix": [2, 0], "x": 0, "y": 1.25},
+                {"matrix": [3, 0], "x": 1, "y": 1.25},
+                {"matrix": [2, 1], "x": 2, "y": 1.25},
+                {"matrix": [3, 1], "x": 3, "y": 1.25},
+
+                {"matrix": [2, 2], "x": 4.25, "y": 1.25},
+                {"matrix": [3, 2], "x": 5.25, "y": 1.25},
+                {"matrix": [2, 3], "x": 6.25, "y": 1.25},
+                {"matrix": [3, 3], "x": 7.25, "y": 1.25},
+                {"matrix": [2, 4], "x": 8.25, "y": 1.25},
+                {"matrix": [3, 4], "x": 9.25, "y": 1.25},
+                {"matrix": [2, 5], "x": 10.25, "y": 1.25},
+                {"matrix": [3, 5], "x": 11.25, "y": 1.25},
+                {"matrix": [2, 6], "x": 12.25, "y": 1.25},
+                {"matrix": [3, 6], "x": 13.25, "y": 1.25},
+                {"matrix": [2, 7], "x": 14.25, "y": 1.25},
+                {"matrix": [3, 7], "x": 15.25, "y": 1.25},
+                {"matrix": [2, 8], "x": 16.25, "y": 1.25},
+                {"matrix": [3, 8], "x": 17.25, "y": 1.25, "w": 2},
+                {"matrix": [3, 9], "x": 19.25, "y": 1.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 2.25},
+                {"matrix": [5, 0], "x": 1, "y": 2.25},
+                {"matrix": [4, 1], "x": 2, "y": 2.25},
+                {"matrix": [5, 1], "x": 3, "y": 2.25, "h": 2},
+
+                {"matrix": [4, 2], "x": 4.25, "y": 2.25, "w": 1.5},
+                {"matrix": [5, 2], "x": 5.75, "y": 2.25},
+                {"matrix": [4, 3], "x": 6.75, "y": 2.25},
+                {"matrix": [5, 3], "x": 7.75, "y": 2.25},
+                {"matrix": [4, 4], "x": 8.75, "y": 2.25},
+                {"matrix": [5, 4], "x": 9.75, "y": 2.25},
+                {"matrix": [4, 5], "x": 10.75, "y": 2.25},
+                {"matrix": [5, 5], "x": 11.75, "y": 2.25},
+                {"matrix": [4, 6], "x": 12.75, "y": 2.25},
+                {"matrix": [5, 6], "x": 13.75, "y": 2.25},
+                {"matrix": [4, 7], "x": 14.75, "y": 2.25},
+                {"matrix": [5, 7], "x": 15.75, "y": 2.25},
+                {"matrix": [4, 8], "x": 16.75, "y": 2.25},
+                {"matrix": [4, 9], "x": 17.75, "y": 2.25, "w": 1.5},
+                {"matrix": [5, 9], "x": 19.25, "y": 2.25},
+
+                {"matrix": [6, 0], "x": 0, "y": 3.25},
+                {"matrix": [7, 0], "x": 1, "y": 3.25},
+                {"matrix": [6, 1], "x": 2, "y": 3.25},
+
+                {"matrix": [6, 2], "x": 4.25, "y": 3.25, "w": 1.75},
+                {"matrix": [7, 2], "x": 6, "y": 3.25},
+                {"matrix": [6, 3], "x": 7, "y": 3.25},
+                {"matrix": [7, 3], "x": 8, "y": 3.25},
+                {"matrix": [6, 4], "x": 9, "y": 3.25},
+                {"matrix": [7, 4], "x": 10, "y": 3.25},
+                {"matrix": [6, 5], "x": 11, "y": 3.25},
+                {"matrix": [7, 5], "x": 12, "y": 3.25},
+                {"matrix": [6, 6], "x": 13, "y": 3.25},
+                {"matrix": [7, 6], "x": 14, "y": 3.25},
+                {"matrix": [6, 7], "x": 15, "y": 3.25},
+                {"matrix": [7, 7], "x": 16, "y": 3.25},
+                {"matrix": [7, 8], "x": 17, "y": 3.25, "w": 2.25},
+                {"matrix": [7, 9], "x": 19.25, "y": 3.25},
+
+                {"matrix": [8, 0], "x": 0, "y": 4.25},
+                {"matrix": [9, 0], "x": 1, "y": 4.25},
+                {"matrix": [8, 1], "x": 2, "y": 4.25},
+                {"matrix": [9, 1], "x": 3, "y": 4.25, "h": 2},
+
+                {"matrix": [8, 2], "x": 4.25, "y": 4.25, "w": 2.25},
+                {"matrix": [8, 3], "x": 6.5, "y": 4.25},
+                {"matrix": [9, 3], "x": 7.5, "y": 4.25},
+                {"matrix": [8, 4], "x": 8.5, "y": 4.25},
+                {"matrix": [9, 4], "x": 9.5, "y": 4.25},
+                {"matrix": [8, 5], "x": 10.5, "y": 4.25},
+                {"matrix": [9, 5], "x": 11.5, "y": 4.25},
+                {"matrix": [8, 6], "x": 12.5, "y": 4.25},
+                {"matrix": [9, 6], "x": 13.5, "y": 4.25},
+                {"matrix": [8, 7], "x": 14.5, "y": 4.25},
+                {"matrix": [9, 7], "x": 15.5, "y": 4.25},
+                {"matrix": [9, 8], "x": 16.5, "y": 4.25, "w": 1.75},
+                {"matrix": [8, 9], "x": 18.25, "y": 4.25},
+                {"matrix": [9, 9], "x": 19.25, "y": 4.25},
+
+                {"matrix": [10, 0], "x": 0, "y": 5.25, "w": 2},
+                {"matrix": [10, 1], "x": 2, "y": 5.25},
+
+                {"matrix": [10, 2], "x": 4.25, "y": 5.25, "w": 1.25},
+                {"matrix": [11, 2], "x": 5.5, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 3], "x": 6.75, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 5], "x": 8, "y": 5.25, "w": 6.25},
+                {"matrix": [10, 7], "x": 14.25, "y": 5.25, "w": 1.25},
+                {"matrix": [11, 7], "x": 15.5, "y": 5.25, "w": 1.25},
+
+                {"matrix": [11, 8], "x": 17.25, "y": 5.25},
+                {"matrix": [10, 9], "x": 18.25, "y": 5.25},
+                {"matrix": [11, 9], "x": 19.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_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.25, "y": 0},
+
+                {"matrix": [1, 2], "x": 5.75, "y": 0},
+                {"matrix": [0, 3], "x": 6.75, "y": 0},
+                {"matrix": [1, 3], "x": 7.75, "y": 0},
+                {"matrix": [0, 4], "x": 8.75, "y": 0},
+
+                {"matrix": [0, 5], "x": 10.25, "y": 0},
+                {"matrix": [1, 5], "x": 11.25, "y": 0},
+                {"matrix": [0, 6], "x": 12.25, "y": 0},
+                {"matrix": [1, 6], "x": 13.25, "y": 0},
+
+                {"matrix": [1, 7], "x": 14.75, "y": 0},
+                {"matrix": [0, 8], "x": 15.75, "y": 0},
+                {"matrix": [1, 8], "x": 16.75, "y": 0},
+                {"matrix": [0, 9], "x": 17.75, "y": 0},
+
+                {"matrix": [1, 9], "x": 19.25, "y": 0},
+
+                {"matrix": [2, 0], "x": 0, "y": 1.25},
+                {"matrix": [3, 0], "x": 1, "y": 1.25},
+                {"matrix": [2, 1], "x": 2, "y": 1.25},
+                {"matrix": [3, 1], "x": 3, "y": 1.25},
+
+                {"matrix": [2, 2], "x": 4.25, "y": 1.25},
+                {"matrix": [3, 2], "x": 5.25, "y": 1.25},
+                {"matrix": [2, 3], "x": 6.25, "y": 1.25},
+                {"matrix": [3, 3], "x": 7.25, "y": 1.25},
+                {"matrix": [2, 4], "x": 8.25, "y": 1.25},
+                {"matrix": [3, 4], "x": 9.25, "y": 1.25},
+                {"matrix": [2, 5], "x": 10.25, "y": 1.25},
+                {"matrix": [3, 5], "x": 11.25, "y": 1.25},
+                {"matrix": [2, 6], "x": 12.25, "y": 1.25},
+                {"matrix": [3, 6], "x": 13.25, "y": 1.25},
+                {"matrix": [2, 7], "x": 14.25, "y": 1.25},
+                {"matrix": [3, 7], "x": 15.25, "y": 1.25},
+                {"matrix": [2, 8], "x": 16.25, "y": 1.25},
+                {"matrix": [3, 8], "x": 17.25, "y": 1.25, "w": 2},
+                {"matrix": [3, 9], "x": 19.25, "y": 1.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 2.25},
+                {"matrix": [5, 0], "x": 1, "y": 2.25},
+                {"matrix": [4, 1], "x": 2, "y": 2.25},
+                {"matrix": [5, 1], "x": 3, "y": 2.25, "h": 2},
+
+                {"matrix": [4, 2], "x": 4.25, "y": 2.25, "w": 1.5},
+                {"matrix": [5, 2], "x": 5.75, "y": 2.25},
+                {"matrix": [4, 3], "x": 6.75, "y": 2.25},
+                {"matrix": [5, 3], "x": 7.75, "y": 2.25},
+                {"matrix": [4, 4], "x": 8.75, "y": 2.25},
+                {"matrix": [5, 4], "x": 9.75, "y": 2.25},
+                {"matrix": [4, 5], "x": 10.75, "y": 2.25},
+                {"matrix": [5, 5], "x": 11.75, "y": 2.25},
+                {"matrix": [4, 6], "x": 12.75, "y": 2.25},
+                {"matrix": [5, 6], "x": 13.75, "y": 2.25},
+                {"matrix": [4, 7], "x": 14.75, "y": 2.25},
+                {"matrix": [5, 7], "x": 15.75, "y": 2.25},
+                {"matrix": [4, 8], "x": 16.75, "y": 2.25},
+                {"matrix": [5, 9], "x": 19.25, "y": 2.25},
+
+                {"matrix": [6, 0], "x": 0, "y": 3.25},
+                {"matrix": [7, 0], "x": 1, "y": 3.25},
+                {"matrix": [6, 1], "x": 2, "y": 3.25},
+
+                {"matrix": [6, 2], "x": 4.25, "y": 3.25, "w": 1.75},
+                {"matrix": [7, 2], "x": 6, "y": 3.25},
+                {"matrix": [6, 3], "x": 7, "y": 3.25},
+                {"matrix": [7, 3], "x": 8, "y": 3.25},
+                {"matrix": [6, 4], "x": 9, "y": 3.25},
+                {"matrix": [7, 4], "x": 10, "y": 3.25},
+                {"matrix": [6, 5], "x": 11, "y": 3.25},
+                {"matrix": [7, 5], "x": 12, "y": 3.25},
+                {"matrix": [6, 6], "x": 13, "y": 3.25},
+                {"matrix": [7, 6], "x": 14, "y": 3.25},
+                {"matrix": [6, 7], "x": 15, "y": 3.25},
+                {"matrix": [7, 7], "x": 16, "y": 3.25},
+                {"matrix": [7, 8], "x": 17, "y": 3.25},
+                {"matrix": [4, 9], "x": 18, "y": 2.25, "w": 1.25, "h": 2},
+                {"matrix": [7, 9], "x": 19.25, "y": 3.25},
+
+                {"matrix": [8, 0], "x": 0, "y": 4.25},
+                {"matrix": [9, 0], "x": 1, "y": 4.25},
+                {"matrix": [8, 1], "x": 2, "y": 4.25},
+                {"matrix": [9, 1], "x": 3, "y": 4.25, "h": 2},
+
+                {"matrix": [8, 2], "x": 4.25, "y": 4.25, "w": 1.25},
+                {"matrix": [9, 2], "x": 5.5, "y": 4.25},
+                {"matrix": [8, 3], "x": 6.5, "y": 4.25},
+                {"matrix": [9, 3], "x": 7.5, "y": 4.25},
+                {"matrix": [8, 4], "x": 8.5, "y": 4.25},
+                {"matrix": [9, 4], "x": 9.5, "y": 4.25},
+                {"matrix": [8, 5], "x": 10.5, "y": 4.25},
+                {"matrix": [9, 5], "x": 11.5, "y": 4.25},
+                {"matrix": [8, 6], "x": 12.5, "y": 4.25},
+                {"matrix": [9, 6], "x": 13.5, "y": 4.25},
+                {"matrix": [8, 7], "x": 14.5, "y": 4.25},
+                {"matrix": [9, 7], "x": 15.5, "y": 4.25},
+                {"matrix": [9, 8], "x": 16.5, "y": 4.25, "w": 1.75},
+                {"matrix": [8, 9], "x": 18.25, "y": 4.25},
+                {"matrix": [9, 9], "x": 19.25, "y": 4.25},
+
+                {"matrix": [10, 0], "x": 0, "y": 5.25, "w": 2},
+                {"matrix": [10, 1], "x": 2, "y": 5.25},
+
+                {"matrix": [10, 2], "x": 4.25, "y": 5.25, "w": 1.25},
+                {"matrix": [11, 2], "x": 5.5, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 3], "x": 6.75, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 5], "x": 8, "y": 5.25, "w": 6.25},
+                {"matrix": [10, 7], "x": 14.25, "y": 5.25, "w": 1.25},
+                {"matrix": [11, 7], "x": 15.5, "y": 5.25, "w": 1.25},
+
+                {"matrix": [11, 8], "x": 17.25, "y": 5.25},
+                {"matrix": [10, 9], "x": 18.25, "y": 5.25},
+                {"matrix": [11, 9], "x": 19.25, "y": 5.25}
+            ]
+        },
+        "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.25, "y": 0},
+
+                {"matrix": [1, 2], "x": 5.75, "y": 0},
+                {"matrix": [0, 3], "x": 6.75, "y": 0},
+                {"matrix": [1, 3], "x": 7.75, "y": 0},
+                {"matrix": [0, 4], "x": 8.75, "y": 0},
+
+                {"matrix": [0, 5], "x": 10.25, "y": 0},
+                {"matrix": [1, 5], "x": 11.25, "y": 0},
+                {"matrix": [0, 6], "x": 12.25, "y": 0},
+                {"matrix": [1, 6], "x": 13.25, "y": 0},
+
+                {"matrix": [1, 7], "x": 14.75, "y": 0},
+                {"matrix": [0, 8], "x": 15.75, "y": 0},
+                {"matrix": [1, 8], "x": 16.75, "y": 0},
+                {"matrix": [0, 9], "x": 17.75, "y": 0},
+
+                {"matrix": [1, 9], "x": 19.5, "y": 0},
+
+                {"matrix": [2, 0], "x": 0, "y": 1.25},
+                {"matrix": [3, 0], "x": 1, "y": 1.25},
+                {"matrix": [2, 1], "x": 2, "y": 1.25},
+                {"matrix": [3, 1], "x": 3, "y": 1.25},
+
+                {"matrix": [2, 2], "x": 4.25, "y": 1.25},
+                {"matrix": [3, 2], "x": 5.25, "y": 1.25},
+                {"matrix": [2, 3], "x": 6.25, "y": 1.25},
+                {"matrix": [3, 3], "x": 7.25, "y": 1.25},
+                {"matrix": [2, 4], "x": 8.25, "y": 1.25},
+                {"matrix": [3, 4], "x": 9.25, "y": 1.25},
+                {"matrix": [2, 5], "x": 10.25, "y": 1.25},
+                {"matrix": [3, 5], "x": 11.25, "y": 1.25},
+                {"matrix": [2, 6], "x": 12.25, "y": 1.25},
+                {"matrix": [3, 6], "x": 13.25, "y": 1.25},
+                {"matrix": [2, 7], "x": 14.25, "y": 1.25},
+                {"matrix": [3, 7], "x": 15.25, "y": 1.25},
+                {"matrix": [2, 8], "x": 16.25, "y": 1.25},
+                {"matrix": [3, 8], "x": 17.25, "y": 1.25},
+                {"matrix": [2, 9], "x": 18.25, "y": 1.25},
+                {"matrix": [3, 9], "x": 19.25, "y": 1.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 2.25},
+                {"matrix": [5, 0], "x": 1, "y": 2.25},
+                {"matrix": [4, 1], "x": 2, "y": 2.25},
+                {"matrix": [5, 1], "x": 3, "y": 2.25},
+
+                {"matrix": [4, 2], "x": 4.25, "y": 2.25, "w": 1.5},
+                {"matrix": [5, 2], "x": 5.75, "y": 2.25},
+                {"matrix": [4, 3], "x": 6.75, "y": 2.25},
+                {"matrix": [5, 3], "x": 7.75, "y": 2.25},
+                {"matrix": [4, 4], "x": 8.75, "y": 2.25},
+                {"matrix": [5, 4], "x": 9.75, "y": 2.25},
+                {"matrix": [4, 5], "x": 10.75, "y": 2.25},
+                {"matrix": [5, 5], "x": 11.75, "y": 2.25},
+                {"matrix": [4, 6], "x": 12.75, "y": 2.25},
+                {"matrix": [5, 6], "x": 13.75, "y": 2.25},
+                {"matrix": [4, 7], "x": 14.75, "y": 2.25},
+                {"matrix": [5, 7], "x": 15.75, "y": 2.25},
+                {"matrix": [4, 8], "x": 16.75, "y": 2.25},
+                {"matrix": [4, 9], "x": 17.75, "y": 2.25, "w": 1.5},
+                {"matrix": [5, 9], "x": 19.25, "y": 2.25},
+
+                {"matrix": [6, 0], "x": 0, "y": 3.25},
+                {"matrix": [7, 0], "x": 1, "y": 3.25},
+                {"matrix": [6, 1], "x": 2, "y": 3.25},
+                {"matrix": [7, 1], "x": 3, "y": 3.25},
+
+                {"matrix": [6, 2], "x": 4.25, "y": 3.25, "w": 1.75},
+                {"matrix": [7, 2], "x": 6, "y": 3.25},
+                {"matrix": [6, 3], "x": 7, "y": 3.25},
+                {"matrix": [7, 3], "x": 8, "y": 3.25},
+                {"matrix": [6, 4], "x": 9, "y": 3.25},
+                {"matrix": [7, 4], "x": 10, "y": 3.25},
+                {"matrix": [6, 5], "x": 11, "y": 3.25},
+                {"matrix": [7, 5], "x": 12, "y": 3.25},
+                {"matrix": [6, 6], "x": 13, "y": 3.25},
+                {"matrix": [7, 6], "x": 14, "y": 3.25},
+                {"matrix": [6, 7], "x": 15, "y": 3.25},
+                {"matrix": [7, 7], "x": 16, "y": 3.25},
+                {"matrix": [7, 8], "x": 17, "y": 3.25, "w": 2.25},
+                {"matrix": [7, 9], "x": 19.25, "y": 3.25},
+
+                {"matrix": [8, 0], "x": 0, "y": 4.25},
+                {"matrix": [9, 0], "x": 1, "y": 4.25},
+                {"matrix": [8, 1], "x": 2, "y": 4.25},
+                {"matrix": [9, 1], "x": 3, "y": 4.25},
+
+                {"matrix": [8, 2], "x": 4.25, "y": 4.25, "w": 1.25},
+                {"matrix": [9, 2], "x": 5.5, "y": 4.25},
+                {"matrix": [8, 3], "x": 6.5, "y": 4.25},
+                {"matrix": [9, 3], "x": 7.5, "y": 4.25},
+                {"matrix": [8, 4], "x": 8.5, "y": 4.25},
+                {"matrix": [9, 4], "x": 9.5, "y": 4.25},
+                {"matrix": [8, 5], "x": 10.5, "y": 4.25},
+                {"matrix": [9, 5], "x": 11.5, "y": 4.25},
+                {"matrix": [8, 6], "x": 12.5, "y": 4.25},
+                {"matrix": [9, 6], "x": 13.5, "y": 4.25},
+                {"matrix": [8, 7], "x": 14.5, "y": 4.25},
+                {"matrix": [9, 7], "x": 15.5, "y": 4.25},
+                {"matrix": [9, 8], "x": 16.5, "y": 4.25, "w": 1.75},
+                {"matrix": [8, 9], "x": 18.25, "y": 4.25},
+                {"matrix": [9, 9], "x": 19.25, "y": 4.25},
+
+                {"matrix": [10, 0], "x": 0, "y": 5.25},
+                {"matrix": [11, 0], "x": 1, "y": 5.25},
+                {"matrix": [10, 1], "x": 2, "y": 5.25},
+                {"matrix": [11, 1], "x": 3, "y": 5.25},
+
+                {"matrix": [10, 2], "x": 4.25, "y": 5.25, "w": 1.25},
+                {"matrix": [11, 2], "x": 5.5, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 3], "x": 6.75, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 5], "x": 8, "y": 5.25, "w": 6.25},
+                {"matrix": [10, 7], "x": 14.25, "y": 5.25},
+                {"matrix": [11, 7], "x": 15.25, "y": 5.25},
+                {"matrix": [10, 8], "x": 16.25, "y": 5.25},
+                {"matrix": [11, 8], "x": 17.25, "y": 5.25},
+                {"matrix": [10, 9], "x": 18.25, "y": 5.25},
+                {"matrix": [11, 9], "x": 19.25, "y": 5.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/rmi_kb/wete/v2/rules.mk b/keyboards/rmi_kb/wete/v2/rules.mk
deleted file mode 100644
index 7386bf69993..00000000000
--- a/keyboards/rmi_kb/wete/v2/rules.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-ENCODER_ENABLE = yes		# Rotary encoder
diff --git a/keyboards/rocketboard_16/info.json b/keyboards/rocketboard_16/info.json
deleted file mode 100644
index 5e3ee7b0e8f..00000000000
--- a/keyboards/rocketboard_16/info.json
+++ /dev/null
@@ -1,81 +0,0 @@
-{
-    "keyboard_name": "Rocketboard-16",
-    "manufacturer": "Rocketboard",
-    "url": "",
-    "maintainer": "fl3tching101",
-    "usb": {
-        "vid": "0xB034",
-        "pid": "0xFF16",
-        "device_version": "0.0.1"
-    },
-    "processor": "STM32F103",
-    "bootloader": "stm32duino",
-    "matrix_pins": {
-        "cols": ["B8", "B9", "B10", "B11"],
-        "rows": ["A9", "B13", "B14", "B15", "B3"]
-    },
-    "diode_direction": "COL2ROW",
-    "encoder": {
-        "rotary": [
-            {"pin_a": "A0", "pin_b": "A1"},
-            {"pin_a": "A2", "pin_b": "A3"}
-        ]
-    },
-    "qmk": {
-        "tap_keycode_delay": 20
-    },
-    "bootmagic": {
-        "matrix": [4, 1]
-    },
-    "rgblight": {
-        "brightness_steps": 8,
-        "led_count": 16,
-        "sleep": true,
-        "animations": {
-            "breathing": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "snake": true,
-            "knight": true,
-            "christmas": true,
-            "static_gradient": true,
-            "rgb_test": true,
-            "alternating": true,
-            "twinkle": true
-        }
-    },
-    "ws2812": {
-        "pin": "A4"
-    },
-    "layout_aliases": {
-        "LAYOUT_default": "LAYOUT"
-    },
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "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": [2, 3], "x": 3, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3},
-                {"matrix": [3, 1], "x": 1, "y": 3},
-                {"matrix": [3, 2], "x": 2, "y": 3},
-                {"matrix": [3, 3], "x": 3, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4},
-                {"matrix": [4, 1], "x": 1, "y": 4},
-                {"matrix": [4, 2], "x": 2, "y": 4},
-                {"matrix": [4, 3], "x": 3, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/rocketboard_16/keyboard.json b/keyboards/rocketboard_16/keyboard.json
new file mode 100644
index 00000000000..84baf6c5a76
--- /dev/null
+++ b/keyboards/rocketboard_16/keyboard.json
@@ -0,0 +1,95 @@
+{
+    "keyboard_name": "Rocketboard-16",
+    "manufacturer": "Rocketboard",
+    "url": "",
+    "maintainer": "fl3tching101",
+    "usb": {
+        "vid": "0xB034",
+        "pid": "0xFF16",
+        "device_version": "0.0.1"
+    },
+    "build": {
+        "lto": true
+    },
+    "features": {
+        "bootmagic": true,
+        "command": true,
+        "console": true,
+        "encoder": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "oled": true,
+        "rgblight": true
+    },
+    "processor": "STM32F103",
+    "bootloader": "stm32duino",
+    "matrix_pins": {
+        "cols": ["B8", "B9", "B10", "B11"],
+        "rows": ["A9", "B13", "B14", "B15", "B3"]
+    },
+    "diode_direction": "COL2ROW",
+    "encoder": {
+        "rotary": [
+            {"pin_a": "A0", "pin_b": "A1"},
+            {"pin_a": "A2", "pin_b": "A3"}
+        ]
+    },
+    "qmk": {
+        "tap_keycode_delay": 20
+    },
+    "bootmagic": {
+        "matrix": [4, 1]
+    },
+    "rgblight": {
+        "brightness_steps": 8,
+        "led_count": 16,
+        "sleep": true,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": true,
+            "twinkle": true
+        }
+    },
+    "ws2812": {
+        "pin": "A4"
+    },
+    "layout_aliases": {
+        "LAYOUT_default": "LAYOUT"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "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": [2, 3], "x": 3, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+                {"matrix": [4, 2], "x": 2, "y": 4},
+                {"matrix": [4, 3], "x": 3, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/rocketboard_16/rules.mk b/keyboards/rocketboard_16/rules.mk
index dcc3d4516bd..ad74cd9306c 100644
--- a/keyboards/rocketboard_16/rules.mk
+++ b/keyboards/rocketboard_16/rules.mk
@@ -3,22 +3,3 @@ MCU_LDSCRIPT = STM32F103xB
 
 # Extra include
 SRC += keycode_lookup.c
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = yes        # Console for debug
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB backlit keys
-AUDIO_ENABLE = no           # Audio output
-OLED_ENABLE = yes
-ENCODER_ENABLE = yes
-
-RAW_ENABLE = yes            # Enables HID RAW communication between the board and the PC
-
-LTO_ENABLE = yes
diff --git a/keyboards/rookiebwoy/neopad/rev1/info.json b/keyboards/rookiebwoy/neopad/rev1/info.json
deleted file mode 100755
index 0a0340c06df..00000000000
--- a/keyboards/rookiebwoy/neopad/rev1/info.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-    "keyboard_name": "neopad",
-    "manufacturer": "rookiebwoy",
-    "url": "https://github.com/rookiebwoy/neopad)",
-    "maintainer": "rookiebwoy",
-    "usb": {
-        "vid": "0xFEED",
-        "pid": "0x0913",
-        "device_version": "0.1.0"
-    },
-    "matrix_pins": {
-        "cols": ["B3", "B2", "B6"],
-        "rows": ["F4", "F5"]
-    },
-    "diode_direction": "COL2ROW",
-    "encoder": {
-        "rotary": [
-            {"pin_a": "D1", "pin_b": "D0"},
-            {"pin_a": "D4", "pin_b": "C6"}
-        ]
-    },
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
-    "tapping": {
-        "toggle": 2
-    },
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1},
-                {"matrix": [1, 1], "x": 1, "y": 1},
-                {"matrix": [1, 2], "x": 2, "y": 1}
-            ]
-        }
-    }
-}
diff --git a/keyboards/rookiebwoy/neopad/rev1/keyboard.json b/keyboards/rookiebwoy/neopad/rev1/keyboard.json
new file mode 100755
index 00000000000..426d8af7ec0
--- /dev/null
+++ b/keyboards/rookiebwoy/neopad/rev1/keyboard.json
@@ -0,0 +1,49 @@
+{
+    "keyboard_name": "neopad",
+    "manufacturer": "rookiebwoy",
+    "url": "https://github.com/rookiebwoy/neopad)",
+    "maintainer": "rookiebwoy",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0x0913",
+        "device_version": "0.1.0"
+    },
+    "features": {
+        "bootmagic": true,
+        "console": true,
+        "encoder": true,
+        "extrakey": true,
+        "key_lock": true,
+        "mousekey": true,
+        "nkro": false
+    },
+    "matrix_pins": {
+        "cols": ["B3", "B2", "B6"],
+        "rows": ["F4", "F5"]
+    },
+    "diode_direction": "COL2ROW",
+    "encoder": {
+        "rotary": [
+            {"pin_a": "D1", "pin_b": "D0"},
+            {"pin_a": "D4", "pin_b": "C6"}
+        ]
+    },
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
+    "tapping": {
+        "toggle": 2
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1}
+            ]
+        }
+    }
+}
diff --git a/keyboards/rookiebwoy/neopad/rev1/rules.mk b/keyboards/rookiebwoy/neopad/rev1/rules.mk
deleted file mode 100755
index 7816aab001a..00000000000
--- a/keyboards/rookiebwoy/neopad/rev1/rules.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = yes        # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
-ENCODER_ENABLE = yes
-KEY_LOCK_ENABLE = yes
diff --git a/keyboards/rose75/info.json b/keyboards/rose75/keyboard.json
similarity index 100%
rename from keyboards/rose75/info.json
rename to keyboards/rose75/keyboard.json
diff --git a/keyboards/rot13labs/hackboard/info.json b/keyboards/rot13labs/hackboard/keyboard.json
similarity index 100%
rename from keyboards/rot13labs/hackboard/info.json
rename to keyboards/rot13labs/hackboard/keyboard.json
diff --git a/keyboards/rubi/info.json b/keyboards/rubi/info.json
deleted file mode 100644
index d61ef345481..00000000000
--- a/keyboards/rubi/info.json
+++ /dev/null
@@ -1,52 +0,0 @@
-{
-   "keyboard_name": "Rubi",
-   "manufacturer": "gregorio",
-   "url": "https://github.com/ohchiko/qmk_firmware/tree/master/keyboards/rubi",
-   "maintainer": "gregorio",
-   "usb": {
-      "vid": "0x4752",
-      "pid": "0x5242",
-      "device_version": "0.0.1"
-   },
-   "matrix_pins": {
-      "cols": ["B3", "B2", "B1", "F7"],
-      "rows": ["F0", "F1", "F4", "F5", "F6"]
-   },
-   "diode_direction": "COL2ROW",
-   "encoder": {
-      "rotary": [
-         {"pin_a": "D7", "pin_b": "D6"}
-      ]
-   },
-   "processor": "atmega32u4",
-   "bootloader": "atmel-dfu",
-   "layouts": {
-      "LAYOUT": {
-         "layout": [
-            {"matrix": [2, 3], "x": 3, "y": 0},
-
-            {"matrix": [0, 0], "x": 0, "y": 1.25},
-            {"matrix": [0, 1], "x": 1, "y": 1.25},
-            {"matrix": [0, 2], "x": 2, "y": 1.25},
-            {"matrix": [0, 3], "x": 3, "y": 1.25},
-
-            {"matrix": [1, 0], "x": 0, "y": 2.25},
-            {"matrix": [1, 1], "x": 1, "y": 2.25},
-            {"matrix": [1, 2], "x": 2, "y": 2.25},
-            {"matrix": [1, 3], "x": 3, "y": 2.25, "h": 2},
-
-            {"matrix": [2, 0], "x": 0, "y": 3.25},
-            {"matrix": [2, 1], "x": 1, "y": 3.25},
-            {"matrix": [2, 2], "x": 2, "y": 3.25},
-
-            {"matrix": [3, 0], "x": 0, "y": 4.25},
-            {"matrix": [3, 1], "x": 1, "y": 4.25},
-            {"matrix": [3, 2], "x": 2, "y": 4.25},
-            {"matrix": [3, 3], "x": 3, "y": 4.25, "h": 2},
-
-            {"matrix": [4, 1], "x": 0, "y": 5.25, "w": 2},
-            {"matrix": [4, 2], "x": 2, "y": 5.25}
-         ]
-      }
-   }
-}
diff --git a/keyboards/rubi/keyboard.json b/keyboards/rubi/keyboard.json
new file mode 100644
index 00000000000..e434977b37c
--- /dev/null
+++ b/keyboards/rubi/keyboard.json
@@ -0,0 +1,60 @@
+{
+   "keyboard_name": "Rubi",
+   "manufacturer": "gregorio",
+   "url": "https://github.com/ohchiko/qmk_firmware/tree/master/keyboards/rubi",
+   "maintainer": "gregorio",
+   "usb": {
+      "vid": "0x4752",
+      "pid": "0x5242",
+      "device_version": "0.0.1"
+   },
+   "features": {
+      "bootmagic": false,
+      "encoder": true,
+      "extrakey": true,
+      "mousekey": false,
+      "nkro": true,
+      "oled": true
+   },
+   "matrix_pins": {
+      "cols": ["B3", "B2", "B1", "F7"],
+      "rows": ["F0", "F1", "F4", "F5", "F6"]
+   },
+   "diode_direction": "COL2ROW",
+   "encoder": {
+      "rotary": [
+         {"pin_a": "D7", "pin_b": "D6"}
+      ]
+   },
+   "processor": "atmega32u4",
+   "bootloader": "atmel-dfu",
+   "layouts": {
+      "LAYOUT": {
+         "layout": [
+            {"matrix": [2, 3], "x": 3, "y": 0},
+
+            {"matrix": [0, 0], "x": 0, "y": 1.25},
+            {"matrix": [0, 1], "x": 1, "y": 1.25},
+            {"matrix": [0, 2], "x": 2, "y": 1.25},
+            {"matrix": [0, 3], "x": 3, "y": 1.25},
+
+            {"matrix": [1, 0], "x": 0, "y": 2.25},
+            {"matrix": [1, 1], "x": 1, "y": 2.25},
+            {"matrix": [1, 2], "x": 2, "y": 2.25},
+            {"matrix": [1, 3], "x": 3, "y": 2.25, "h": 2},
+
+            {"matrix": [2, 0], "x": 0, "y": 3.25},
+            {"matrix": [2, 1], "x": 1, "y": 3.25},
+            {"matrix": [2, 2], "x": 2, "y": 3.25},
+
+            {"matrix": [3, 0], "x": 0, "y": 4.25},
+            {"matrix": [3, 1], "x": 1, "y": 4.25},
+            {"matrix": [3, 2], "x": 2, "y": 4.25},
+            {"matrix": [3, 3], "x": 3, "y": 4.25, "h": 2},
+
+            {"matrix": [4, 1], "x": 0, "y": 5.25, "w": 2},
+            {"matrix": [4, 2], "x": 2, "y": 5.25}
+         ]
+      }
+   }
+}
diff --git a/keyboards/rubi/rules.mk b/keyboards/rubi/rules.mk
index e4810730443..c10753cb62b 100644
--- a/keyboards/rubi/rules.mk
+++ b/keyboards/rubi/rules.mk
@@ -1,18 +1,3 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-OLED_ENABLE = yes
-ENCODER_ENABLE = yes
-
 SRC += lib/oled.c \
 	   lib/encoder.c \
 	   lib/calc.c
diff --git a/keyboards/rura66/rev1/info.json b/keyboards/rura66/rev1/info.json
deleted file mode 100644
index 71bb374bfb7..00000000000
--- a/keyboards/rura66/rev1/info.json
+++ /dev/null
@@ -1,122 +0,0 @@
-{
-    "keyboard_name": "RURA66",
-    "manufacturer": "ShinoharaTa",
-    "url": "https://github.com/ShinoharaTa/keyboards/tree/master/RURA66",
-    "maintainer": "ShinoharaTa",
-    "usb": {
-        "vid": "0x7335",
-        "pid": "0x0200",
-        "device_version": "0.0.1"
-    },
-    "rgb_matrix": {
-        "driver": "ws2812"
-    },
-    "rgblight": {
-        "saturation_steps": 8,
-        "brightness_steps": 8,
-        "led_count": 66,
-        "max_brightness": 120,
-        "split_count": [33, 33],
-        "animations": {
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "static_gradient": true,
-            "rgb_test": true
-        }
-    },
-    "matrix_pins": {
-        "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"],
-        "rows": ["D4", "C6", "D7", "E6", "B4"]
-    },
-    "diode_direction": "COL2ROW",
-    "split": {
-        "enabled": true,
-        "soft_serial_pin": "D2"
-    },
-    "ws2812": {
-        "pin": "D3"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0.75},
-                {"matrix": [0, 1], "x": 1, "y": 0.75},
-                {"matrix": [0, 2], "x": 2, "y": 0.25},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-
-                {"matrix": [5, 5], "x": 11, "y": 0},
-                {"matrix": [5, 4], "x": 12, "y": 0},
-                {"matrix": [5, 3], "x": 13, "y": 0},
-                {"matrix": [5, 2], "x": 14, "y": 0.25},
-                {"matrix": [5, 1], "x": 15, "y": 0.75},
-                {"matrix": [5, 0], "x": 16, "y": 0.75},
-
-                {"matrix": [1, 0], "x": 0, "y": 1.75},
-                {"matrix": [1, 1], "x": 1, "y": 1.75},
-                {"matrix": [1, 2], "x": 2, "y": 1.25},
-                {"matrix": [1, 3], "x": 3, "y": 1},
-                {"matrix": [1, 4], "x": 4, "y": 1},
-                {"matrix": [1, 5], "x": 5, "y": 1},
-
-                {"matrix": [6, 5], "x": 11, "y": 1},
-                {"matrix": [6, 4], "x": 12, "y": 1},
-                {"matrix": [6, 3], "x": 13, "y": 1},
-                {"matrix": [6, 2], "x": 14, "y": 1.25},
-                {"matrix": [6, 1], "x": 15, "y": 1.75},
-                {"matrix": [6, 0], "x": 16, "y": 1.75},
-
-                {"matrix": [2, 0], "x": 0, "y": 2.75},
-                {"matrix": [2, 1], "x": 1, "y": 2.75},
-                {"matrix": [2, 2], "x": 2, "y": 2.25},
-                {"matrix": [2, 3], "x": 3, "y": 2},
-                {"matrix": [2, 4], "x": 4, "y": 2},
-                {"matrix": [2, 5], "x": 5, "y": 2},
-                {"matrix": [2, 6], "x": 6, "y": 2},
-
-                {"matrix": [7, 6], "x": 10, "y": 2},
-                {"matrix": [7, 5], "x": 11, "y": 2},
-                {"matrix": [7, 4], "x": 12, "y": 2},
-                {"matrix": [7, 3], "x": 13, "y": 2},
-                {"matrix": [7, 2], "x": 14, "y": 2.25},
-                {"matrix": [7, 1], "x": 15, "y": 2.75},
-                {"matrix": [7, 0], "x": 16, "y": 2.75},
-
-                {"matrix": [3, 0], "x": 0, "y": 3.75},
-                {"matrix": [3, 1], "x": 1, "y": 3.75},
-                {"matrix": [3, 2], "x": 2, "y": 3.25},
-                {"matrix": [3, 3], "x": 3, "y": 3},
-                {"matrix": [3, 4], "x": 4, "y": 3},
-                {"matrix": [3, 5], "x": 5, "y": 3},
-                {"matrix": [3, 6], "x": 6, "y": 3},
-                {"matrix": [0, 6], "x": 7, "y": 3.8},
-                {"matrix": [5, 6], "x": 9, "y": 3.8},
-                {"matrix": [8, 6], "x": 10, "y": 3},
-                {"matrix": [8, 5], "x": 11, "y": 3},
-                {"matrix": [8, 4], "x": 12, "y": 3},
-                {"matrix": [8, 3], "x": 13, "y": 3},
-                {"matrix": [8, 2], "x": 14, "y": 3.25},
-                {"matrix": [8, 1], "x": 15, "y": 3.75},
-                {"matrix": [8, 0], "x": 16, "y": 3.75},
-
-                {"matrix": [4, 0], "x": 0, "y": 4.75, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4.75, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.5, "y": 4.25, "w": 1.25},
-
-                {"matrix": [4, 5], "x": 4.8, "y": 4},
-                {"matrix": [4, 6], "x": 6, "y": 4.4},
-                {"matrix": [1, 6], "x": 7, "y": 4.8},
-                {"matrix": [6, 6], "x": 9, "y": 4.8},
-                {"matrix": [9, 6], "x": 10, "y": 4.4},
-                {"matrix": [9, 5], "x": 11.2, "y": 4},
-
-                {"matrix": [9, 2], "x": 13.25, "y": 4.25, "w": 1.25},
-                {"matrix": [9, 1], "x": 14.5, "y": 4.75, "w": 1.25},
-                {"matrix": [9, 0], "x": 15.75, "y": 4.75, "w": 1.25}
-            ]
-        }
-    }
-}
diff --git a/keyboards/rura66/rev1/keyboard.json b/keyboards/rura66/rev1/keyboard.json
new file mode 100644
index 00000000000..ded87a7e0e9
--- /dev/null
+++ b/keyboards/rura66/rev1/keyboard.json
@@ -0,0 +1,133 @@
+{
+    "keyboard_name": "RURA66",
+    "manufacturer": "ShinoharaTa",
+    "url": "https://github.com/ShinoharaTa/keyboards/tree/master/RURA66",
+    "maintainer": "ShinoharaTa",
+    "usb": {
+        "vid": "0x7335",
+        "pid": "0x0200",
+        "device_version": "0.0.1"
+    },
+    "build": {
+        "lto": true
+    },
+    "features": {
+        "bootmagic": false,
+        "extrakey": true,
+        "mousekey": false,
+        "nkro": false,
+        "oled": true,
+        "rgblight": true
+    },
+    "rgb_matrix": {
+        "driver": "ws2812"
+    },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 66,
+        "max_brightness": 120,
+        "split_count": [33, 33],
+        "animations": {
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "static_gradient": true,
+            "rgb_test": true
+        }
+    },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"],
+        "rows": ["D4", "C6", "D7", "E6", "B4"]
+    },
+    "diode_direction": "COL2ROW",
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "D2"
+    },
+    "ws2812": {
+        "pin": "D3"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0.75},
+                {"matrix": [0, 1], "x": 1, "y": 0.75},
+                {"matrix": [0, 2], "x": 2, "y": 0.25},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+
+                {"matrix": [5, 5], "x": 11, "y": 0},
+                {"matrix": [5, 4], "x": 12, "y": 0},
+                {"matrix": [5, 3], "x": 13, "y": 0},
+                {"matrix": [5, 2], "x": 14, "y": 0.25},
+                {"matrix": [5, 1], "x": 15, "y": 0.75},
+                {"matrix": [5, 0], "x": 16, "y": 0.75},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.75},
+                {"matrix": [1, 1], "x": 1, "y": 1.75},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+
+                {"matrix": [6, 5], "x": 11, "y": 1},
+                {"matrix": [6, 4], "x": 12, "y": 1},
+                {"matrix": [6, 3], "x": 13, "y": 1},
+                {"matrix": [6, 2], "x": 14, "y": 1.25},
+                {"matrix": [6, 1], "x": 15, "y": 1.75},
+                {"matrix": [6, 0], "x": 16, "y": 1.75},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.75},
+                {"matrix": [2, 1], "x": 1, "y": 2.75},
+                {"matrix": [2, 2], "x": 2, "y": 2.25},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [2, 6], "x": 6, "y": 2},
+
+                {"matrix": [7, 6], "x": 10, "y": 2},
+                {"matrix": [7, 5], "x": 11, "y": 2},
+                {"matrix": [7, 4], "x": 12, "y": 2},
+                {"matrix": [7, 3], "x": 13, "y": 2},
+                {"matrix": [7, 2], "x": 14, "y": 2.25},
+                {"matrix": [7, 1], "x": 15, "y": 2.75},
+                {"matrix": [7, 0], "x": 16, "y": 2.75},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.75},
+                {"matrix": [3, 1], "x": 1, "y": 3.75},
+                {"matrix": [3, 2], "x": 2, "y": 3.25},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
+                {"matrix": [3, 6], "x": 6, "y": 3},
+                {"matrix": [0, 6], "x": 7, "y": 3.8},
+                {"matrix": [5, 6], "x": 9, "y": 3.8},
+                {"matrix": [8, 6], "x": 10, "y": 3},
+                {"matrix": [8, 5], "x": 11, "y": 3},
+                {"matrix": [8, 4], "x": 12, "y": 3},
+                {"matrix": [8, 3], "x": 13, "y": 3},
+                {"matrix": [8, 2], "x": 14, "y": 3.25},
+                {"matrix": [8, 1], "x": 15, "y": 3.75},
+                {"matrix": [8, 0], "x": 16, "y": 3.75},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.75, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.75, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4.25, "w": 1.25},
+
+                {"matrix": [4, 5], "x": 4.8, "y": 4},
+                {"matrix": [4, 6], "x": 6, "y": 4.4},
+                {"matrix": [1, 6], "x": 7, "y": 4.8},
+                {"matrix": [6, 6], "x": 9, "y": 4.8},
+                {"matrix": [9, 6], "x": 10, "y": 4.4},
+                {"matrix": [9, 5], "x": 11.2, "y": 4},
+
+                {"matrix": [9, 2], "x": 13.25, "y": 4.25, "w": 1.25},
+                {"matrix": [9, 1], "x": 14.5, "y": 4.75, "w": 1.25},
+                {"matrix": [9, 0], "x": 15.75, "y": 4.75, "w": 1.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/rura66/rev1/rules.mk b/keyboards/rura66/rev1/rules.mk
index ec47c1e0348..0e22d6afa96 100644
--- a/keyboards/rura66/rev1/rules.mk
+++ b/keyboards/rura66/rev1/rules.mk
@@ -1,7 +1 @@
-EXTRAKEY_ENABLE = yes    # Audio control and System control
-RGBLIGHT_ENABLE = yes    # Enable keyboard RGB underglow
-RGB_MATRIX_ENABLE = no
-ENCODER_ENABLE = no
-LTO_ENABLE = yes
-
 SRC += oled_display.c
diff --git a/keyboards/rura66/rules.mk b/keyboards/rura66/rules.mk
index 4cbe55ac766..556ec176559 100644
--- a/keyboards/rura66/rules.mk
+++ b/keyboards/rura66/rules.mk
@@ -1,16 +1 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-OLED_ENABLE = yes
-LTO_ENABLE = yes
-
 DEFAULT_FOLDER = rura66/rev1
diff --git a/keyboards/ryanskidmore/rskeys100/info.json b/keyboards/ryanskidmore/rskeys100/info.json
deleted file mode 100644
index dfd6ce5c24c..00000000000
--- a/keyboards/ryanskidmore/rskeys100/info.json
+++ /dev/null
@@ -1,154 +0,0 @@
-{
-    "keyboard_name": "rsKeys100",
-    "manufacturer": "ryanskidmore",
-    "usb": {
-        "vid": "0x7273",
-        "pid": "0x0064",
-        "device_version": "0.0.1",
-        "force_nkro": true
-    },
-    "ws2812": {
-        "pin": "C7"
-    },
-    "rgb_matrix": {
-        "animations": {
-            "cycle_left_right": true
-        },
-        "driver": "ws2812",
-        "max_brightness": 110
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "url": "",
-    "maintainer": "ryanskidmore",
-    "community_layouts": ["fullsize_iso"],
-    "layouts": {
-        "LAYOUT_fullsize_iso": {
-            "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": [1, 17], "x": 18.5, "y": 1.25},
-                {"matrix": [1, 18], "x": 19.5, "y": 1.25},
-                {"matrix": [1, 19], "x": 20.5, "y": 1.25},
-                {"matrix": [1, 20], "x": 21.5, "y": 1.25},
-
-                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
-                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
-                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
-                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
-                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
-                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
-                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
-                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
-                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
-                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
-                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
-                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
-                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
-
-                {"matrix": [2, 14], "x": 15.25, "y": 2.25},
-                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
-                {"matrix": [2, 16], "x": 17.25, "y": 2.25},
-
-                {"matrix": [2, 17], "x": 18.5, "y": 2.25},
-                {"matrix": [2, 18], "x": 19.5, "y": 2.25},
-                {"matrix": [2, 19], "x": 20.5, "y": 2.25},
-                {"matrix": [2, 20], "x": 21.5, "y": 2.25, "h": 2},
-
-                {"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, 12], "x": 12.75, "y": 3.25},
-                {"matrix": [2, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
-
-                {"matrix": [3, 17], "x": 18.5, "y": 3.25},
-                {"matrix": [3, 18], "x": 19.5, "y": 3.25},
-                {"matrix": [3, 19], "x": 20.5, "y": 3.25},
-
-                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4.25},
-                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
-                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
-                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
-                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
-                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
-                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
-                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
-                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
-                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
-                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
-                {"matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 2.75},
-
-                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
-
-                {"matrix": [4, 17], "x": 18.5, "y": 4.25},
-                {"matrix": [4, 18], "x": 19.5, "y": 4.25},
-                {"matrix": [4, 19], "x": 20.5, "y": 4.25},
-                {"matrix": [4, 20], "x": 21.5, "y": 4.25, "h": 2},
-
-                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 2], "x": 1.25, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 3], "x": 2.5, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
-                {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
-
-                {"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},
-
-                {"matrix": [5, 17], "x": 18.5, "y": 5.25, "w": 2},
-                {"matrix": [5, 19], "x": 20.5, "y": 5.25}
-            ]
-        }
-    }
-}
diff --git a/keyboards/ryanskidmore/rskeys100/keyboard.json b/keyboards/ryanskidmore/rskeys100/keyboard.json
new file mode 100644
index 00000000000..b42a23217dc
--- /dev/null
+++ b/keyboards/ryanskidmore/rskeys100/keyboard.json
@@ -0,0 +1,162 @@
+{
+    "keyboard_name": "rsKeys100",
+    "manufacturer": "ryanskidmore",
+    "usb": {
+        "vid": "0x7273",
+        "pid": "0x0064",
+        "device_version": "0.0.1",
+        "force_nkro": true
+    },
+    "features": {
+        "bootmagic": true,
+        "command": true,
+        "extrakey": false,
+        "mousekey": false,
+        "nkro": true,
+        "rgb_matrix": true
+    },
+    "ws2812": {
+        "pin": "C7"
+    },
+    "rgb_matrix": {
+        "animations": {
+            "cycle_left_right": true
+        },
+        "driver": "ws2812",
+        "max_brightness": 110
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "url": "",
+    "maintainer": "ryanskidmore",
+    "community_layouts": ["fullsize_iso"],
+    "layouts": {
+        "LAYOUT_fullsize_iso": {
+            "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": [1, 17], "x": 18.5, "y": 1.25},
+                {"matrix": [1, 18], "x": 19.5, "y": 1.25},
+                {"matrix": [1, 19], "x": 20.5, "y": 1.25},
+                {"matrix": [1, 20], "x": 21.5, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"matrix": [2, 17], "x": 18.5, "y": 2.25},
+                {"matrix": [2, 18], "x": 19.5, "y": 2.25},
+                {"matrix": [2, 19], "x": 20.5, "y": 2.25},
+                {"matrix": [2, 20], "x": 21.5, "y": 2.25, "h": 2},
+
+                {"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, 12], "x": 12.75, "y": 3.25},
+                {"matrix": [2, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+
+                {"matrix": [3, 17], "x": 18.5, "y": 3.25},
+                {"matrix": [3, 18], "x": 19.5, "y": 3.25},
+                {"matrix": [3, 19], "x": 20.5, "y": 3.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"matrix": [4, 17], "x": 18.5, "y": 4.25},
+                {"matrix": [4, 18], "x": 19.5, "y": 4.25},
+                {"matrix": [4, 19], "x": 20.5, "y": 4.25},
+                {"matrix": [4, 20], "x": 21.5, "y": 4.25, "h": 2},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 3], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"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},
+
+                {"matrix": [5, 17], "x": 18.5, "y": 5.25, "w": 2},
+                {"matrix": [5, 19], "x": 20.5, "y": 5.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/ryanskidmore/rskeys100/rules.mk b/keyboards/ryanskidmore/rskeys100/rules.mk
index 8db3728a22a..179d02c3c68 100644
--- a/keyboards/ryanskidmore/rskeys100/rules.mk
+++ b/keyboards/ryanskidmore/rskeys100/rules.mk
@@ -1,16 +1,3 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no         # Mouse keys
-EXTRAKEY_ENABLE = no         # Audio control and System control
-CONSOLE_ENABLE = no          # Console for debug
-COMMAND_ENABLE = yes          # Commands for debug and configuration
-NKRO_ENABLE = yes            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no        # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no         # Enable keyboard RGB underglow
-RGB_MATRIX_ENABLE = yes
-AUDIO_ENABLE = no            # Audio output
 CUSTOM_MATRIX = lite
 
 SRC += matrix.c
diff --git a/keyboards/salicylic_acid3/7skb/rev1/keyboard.json b/keyboards/salicylic_acid3/7skb/rev1/keyboard.json
index 3ea79da589d..5b5e63b7ca2 100644
--- a/keyboards/salicylic_acid3/7skb/rev1/keyboard.json
+++ b/keyboards/salicylic_acid3/7skb/rev1/keyboard.json
@@ -8,6 +8,14 @@
         "pid": "0xEB5F",
         "device_version": "0.0.7"
     },
+    "features": {
+        "bootmagic": false,
+        "command": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": false,
+        "rgblight": true
+    },
     "matrix_pins": {
         "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B5"],
         "rows": ["D4", "C6", "D7", "E6", "B4"]
diff --git a/keyboards/salicylic_acid3/7skb/rules.mk b/keyboards/salicylic_acid3/7skb/rules.mk
index 09cad7556c4..15364c29a51 100644
--- a/keyboards/salicylic_acid3/7skb/rules.mk
+++ b/keyboards/salicylic_acid3/7skb/rules.mk
@@ -1,14 +1 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-AUDIO_ENABLE = no           # Audio output
-RGBLIGHT_ENABLE = yes       # Enable WS2812 RGB underlight.
-
 DEFAULT_FOLDER = salicylic_acid3/7skb/rev1
diff --git a/keyboards/salicylic_acid3/getta25/rev1/keyboard.json b/keyboards/salicylic_acid3/getta25/rev1/keyboard.json
index e2148f9302a..3399f9e081b 100644
--- a/keyboards/salicylic_acid3/getta25/rev1/keyboard.json
+++ b/keyboards/salicylic_acid3/getta25/rev1/keyboard.json
@@ -8,6 +8,14 @@
         "pid": "0x3060",
         "device_version": "0.1.3"
     },
+    "features": {
+        "bootmagic": false,
+        "command": true,
+        "extrakey": true,
+        "mousekey": false,
+        "nkro": false,
+        "rgblight": true
+    },
     "rgblight": {
         "hue_steps": 10,
         "led_count": 9,
diff --git a/keyboards/salicylic_acid3/getta25/rules.mk b/keyboards/salicylic_acid3/getta25/rules.mk
index dae9b6ae3bd..069fe74b142 100644
--- a/keyboards/salicylic_acid3/getta25/rules.mk
+++ b/keyboards/salicylic_acid3/getta25/rules.mk
@@ -1,15 +1 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-AUDIO_ENABLE = no           # Audio output
-RGBLIGHT_ENABLE = yes       # Enable WS2812 RGB underlight.
-OLED_ENABLE = no
-
 DEFAULT_FOLDER = salicylic_acid3/getta25/rev1
diff --git a/keyboards/salicylic_acid3/jisplit89/rev1/keyboard.json b/keyboards/salicylic_acid3/jisplit89/rev1/keyboard.json
index ccfe99ad18f..7c72c9b17aa 100644
--- a/keyboards/salicylic_acid3/jisplit89/rev1/keyboard.json
+++ b/keyboards/salicylic_acid3/jisplit89/rev1/keyboard.json
@@ -8,6 +8,14 @@
         "pid": "0xEB4F",
         "device_version": "0.0.1"
     },
+    "features": {
+        "bootmagic": true,
+        "command": true,
+        "extrakey": true,
+        "mousekey": false,
+        "nkro": false,
+        "rgblight": true
+    },
     "matrix_pins": {
         "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B5"],
         "rows": ["D1", "D0", "D4", "C6", "D7", "E6", "B4"]
diff --git a/keyboards/salicylic_acid3/jisplit89/rules.mk b/keyboards/salicylic_acid3/jisplit89/rules.mk
index f90f3d9c07c..d54d2ccef4d 100644
--- a/keyboards/salicylic_acid3/jisplit89/rules.mk
+++ b/keyboards/salicylic_acid3/jisplit89/rules.mk
@@ -1,14 +1 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
 DEFAULT_FOLDER = salicylic_acid3/jisplit89/rev1
diff --git a/keyboards/salicylic_acid3/naked48/rev1/keyboard.json b/keyboards/salicylic_acid3/naked48/rev1/keyboard.json
index da82c1a16c1..f390db51f14 100644
--- a/keyboards/salicylic_acid3/naked48/rev1/keyboard.json
+++ b/keyboards/salicylic_acid3/naked48/rev1/keyboard.json
@@ -8,6 +8,13 @@
         "pid": "0xE8BA",
         "device_version": "0.0.1"
     },
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": false,
+        "rgblight": true
+    },
     "rgb_matrix": {
         "driver": "ws2812"
     },
diff --git a/keyboards/salicylic_acid3/naked48/rules.mk b/keyboards/salicylic_acid3/naked48/rules.mk
index fd9a93f5030..dadfa7a2579 100644
--- a/keyboards/salicylic_acid3/naked48/rules.mk
+++ b/keyboards/salicylic_acid3/naked48/rules.mk
@@ -1,15 +1 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-RGB_MATRIX_ENABLE = no
-
 DEFAULT_FOLDER = salicylic_acid3/naked48/rev1
diff --git a/keyboards/salicylic_acid3/naked60/rev1/keyboard.json b/keyboards/salicylic_acid3/naked60/rev1/keyboard.json
index f5d53c001d4..1916b01eb21 100644
--- a/keyboards/salicylic_acid3/naked60/rev1/keyboard.json
+++ b/keyboards/salicylic_acid3/naked60/rev1/keyboard.json
@@ -8,6 +8,12 @@
         "pid": "0xEB5C",
         "device_version": "0.0.1"
     },
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": false
+    },
     "matrix_pins": {
         "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "D7", "E6", "B4", "B5", "D3"],
         "rows": ["B6", "D1", "D0", "D4", "C6"]
diff --git a/keyboards/salicylic_acid3/naked60/rules.mk b/keyboards/salicylic_acid3/naked60/rules.mk
index 2210ae765c9..904309ea356 100644
--- a/keyboards/salicylic_acid3/naked60/rules.mk
+++ b/keyboards/salicylic_acid3/naked60/rules.mk
@@ -1,14 +1 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no       # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
 DEFAULT_FOLDER = salicylic_acid3/naked60/rev1
diff --git a/keyboards/salicylic_acid3/naked64/rev1/keyboard.json b/keyboards/salicylic_acid3/naked64/rev1/keyboard.json
index 2034b7d9ab4..8dc9a49c7a6 100644
--- a/keyboards/salicylic_acid3/naked64/rev1/keyboard.json
+++ b/keyboards/salicylic_acid3/naked64/rev1/keyboard.json
@@ -8,6 +8,14 @@
         "pid": "0x3060",
         "device_version": "0.0.3"
     },
+    "features": {
+        "bootmagic": false,
+        "command": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": false,
+        "rgblight": true
+    },
     "matrix_pins": {
         "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "D3"],
         "rows": ["D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5"]
diff --git a/keyboards/salicylic_acid3/naked64/rules.mk b/keyboards/salicylic_acid3/naked64/rules.mk
index 03a0fe22c08..0ac8d83bfcc 100644
--- a/keyboards/salicylic_acid3/naked64/rules.mk
+++ b/keyboards/salicylic_acid3/naked64/rules.mk
@@ -1,16 +1 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes        # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-AUDIO_ENABLE = no           # Audio output
-RGBLIGHT_ENABLE = yes       # Enable WS2812 RGB underlight.
-OLED_ENABLE = no
-USE_I2C = no
-
 DEFAULT_FOLDER = salicylic_acid3/naked64/rev1
diff --git a/keyboards/salicylic_acid3/setta21/rev1/keyboard.json b/keyboards/salicylic_acid3/setta21/rev1/keyboard.json
index d510c2c3b2a..0d20c99f269 100644
--- a/keyboards/salicylic_acid3/setta21/rev1/keyboard.json
+++ b/keyboards/salicylic_acid3/setta21/rev1/keyboard.json
@@ -8,6 +8,13 @@
         "pid": "0x3060",
         "device_version": "0.1.1"
     },
+    "features": {
+        "bootmagic": false,
+        "extrakey": false,
+        "mousekey": false,
+        "nkro": false,
+        "rgblight": true
+    },
     "rgblight": {
         "hue_steps": 10,
         "led_count": 21,
diff --git a/keyboards/salicylic_acid3/setta21/rules.mk b/keyboards/salicylic_acid3/setta21/rules.mk
index d4aab3ee3f0..02e68b57487 100644
--- a/keyboards/salicylic_acid3/setta21/rules.mk
+++ b/keyboards/salicylic_acid3/setta21/rules.mk
@@ -1,17 +1 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = no        # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-AUDIO_ENABLE = no           # Audio output
-RGBLIGHT_ENABLE = yes       # Enable WS2812 RGB underlight.
-OLED_ENABLE = no
-USE_I2C = no
-RGB_MATRIX_ENABLE = no
-
 DEFAULT_FOLDER = salicylic_acid3/setta21/rev1
diff --git a/keyboards/satt/comet46/info.json b/keyboards/satt/comet46/info.json
deleted file mode 100644
index 5b11be662e5..00000000000
--- a/keyboards/satt/comet46/info.json
+++ /dev/null
@@ -1,72 +0,0 @@
-{
-    "keyboard_name": "Comet46",
-    "manufacturer": "SatT",
-    "url": "",
-    "maintainer": "SatT",
-    "usb": {
-        "vid": "0xFEED",
-        "pid": "0x6060",
-        "device_version": "0.0.1"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 4], "x": 0, "y": 0.45},
-                {"matrix": [0, 1], "x": 1, "y": 0.45},
-                {"matrix": [1, 3], "x": 2, "y": 0.15},
-                {"matrix": [1, 0], "x": 3, "y": 0},
-                {"matrix": [2, 2], "x": 4, "y": 0.3},
-                {"matrix": [3, 3], "x": 5, "y": 0.45},
-
-                {"matrix": [3, 6], "x": 9, "y": 0.45},
-                {"matrix": [2, 7], "x": 10, "y": 0.3},
-                {"matrix": [1, 9], "x": 11, "y": 0},
-                {"matrix": [1, 6], "x": 12, "y": 0.15},
-                {"matrix": [0, 8], "x": 13, "y": 0.45},
-                {"matrix": [0, 5], "x": 14, "y": 0.45},
-
-                {"matrix": [0, 3], "x": 0, "y": 1.45},
-                {"matrix": [0, 0], "x": 1, "y": 1.45},
-                {"matrix": [1, 2], "x": 2, "y": 1.15},
-                {"matrix": [2, 4], "x": 3, "y": 1},
-                {"matrix": [2, 1], "x": 4, "y": 1.3},
-                {"matrix": [3, 2], "x": 5, "y": 1.45},
-                {"matrix": [4, 3], "x": 6, "y": 1},
-
-                {"matrix": [4, 6], "x": 8, "y": 1},
-                {"matrix": [3, 7], "x": 9, "y": 1.45},
-                {"matrix": [2, 8], "x": 10, "y": 1.3},
-                {"matrix": [2, 5], "x": 11, "y": 1},
-                {"matrix": [1, 7], "x": 12, "y": 1.15},
-                {"matrix": [0, 9], "x": 13, "y": 1.45},
-                {"matrix": [0, 6], "x": 14, "y": 1.45},
-
-                {"matrix": [0, 2], "x": 0, "y": 2.45},
-                {"matrix": [1, 4], "x": 1, "y": 2.45},
-                {"matrix": [1, 1], "x": 2, "y": 2.15},
-                {"matrix": [2, 3], "x": 3, "y": 2},
-                {"matrix": [2, 0], "x": 4, "y": 2.3},
-                {"matrix": [3, 1], "x": 5, "y": 2.45},
-                {"matrix": [4, 2], "x": 6, "y": 2},
-
-                {"matrix": [4, 7], "x": 8, "y": 2},
-                {"matrix": [3, 8], "x": 9, "y": 2.45},
-                {"matrix": [2, 9], "x": 10, "y": 2.3},
-                {"matrix": [2, 6], "x": 11, "y": 2},
-                {"matrix": [1, 8], "x": 12, "y": 2.15},
-                {"matrix": [1, 5], "x": 13, "y": 2.45},
-                {"matrix": [0, 7], "x": 14, "y": 2.45},
-
-                {"matrix": [3, 4], "x": 4, "y": 3.9},
-                {"matrix": [4, 4], "x": 5, "y": 3.9},
-                {"matrix": [4, 1], "x": 6, "y": 3.4, "h": 1.5},
-
-                {"matrix": [4, 8], "x": 8, "y": 3.4, "h": 1.5},
-                {"matrix": [4, 5], "x": 9, "y": 3.9},
-                {"matrix": [3, 5], "x": 10, "y": 3.9}
-            ]
-        }
-    }
-}
diff --git a/keyboards/satt/comet46/keyboard.json b/keyboards/satt/comet46/keyboard.json
new file mode 100644
index 00000000000..0092f19c799
--- /dev/null
+++ b/keyboards/satt/comet46/keyboard.json
@@ -0,0 +1,78 @@
+{
+    "keyboard_name": "Comet46",
+    "manufacturer": "SatT",
+    "url": "",
+    "maintainer": "SatT",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0x6060",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": false,
+        "extrakey": false,
+        "mousekey": false,
+        "nkro": true
+    },
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 4], "x": 0, "y": 0.45},
+                {"matrix": [0, 1], "x": 1, "y": 0.45},
+                {"matrix": [1, 3], "x": 2, "y": 0.15},
+                {"matrix": [1, 0], "x": 3, "y": 0},
+                {"matrix": [2, 2], "x": 4, "y": 0.3},
+                {"matrix": [3, 3], "x": 5, "y": 0.45},
+
+                {"matrix": [3, 6], "x": 9, "y": 0.45},
+                {"matrix": [2, 7], "x": 10, "y": 0.3},
+                {"matrix": [1, 9], "x": 11, "y": 0},
+                {"matrix": [1, 6], "x": 12, "y": 0.15},
+                {"matrix": [0, 8], "x": 13, "y": 0.45},
+                {"matrix": [0, 5], "x": 14, "y": 0.45},
+
+                {"matrix": [0, 3], "x": 0, "y": 1.45},
+                {"matrix": [0, 0], "x": 1, "y": 1.45},
+                {"matrix": [1, 2], "x": 2, "y": 1.15},
+                {"matrix": [2, 4], "x": 3, "y": 1},
+                {"matrix": [2, 1], "x": 4, "y": 1.3},
+                {"matrix": [3, 2], "x": 5, "y": 1.45},
+                {"matrix": [4, 3], "x": 6, "y": 1},
+
+                {"matrix": [4, 6], "x": 8, "y": 1},
+                {"matrix": [3, 7], "x": 9, "y": 1.45},
+                {"matrix": [2, 8], "x": 10, "y": 1.3},
+                {"matrix": [2, 5], "x": 11, "y": 1},
+                {"matrix": [1, 7], "x": 12, "y": 1.15},
+                {"matrix": [0, 9], "x": 13, "y": 1.45},
+                {"matrix": [0, 6], "x": 14, "y": 1.45},
+
+                {"matrix": [0, 2], "x": 0, "y": 2.45},
+                {"matrix": [1, 4], "x": 1, "y": 2.45},
+                {"matrix": [1, 1], "x": 2, "y": 2.15},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 0], "x": 4, "y": 2.3},
+                {"matrix": [3, 1], "x": 5, "y": 2.45},
+                {"matrix": [4, 2], "x": 6, "y": 2},
+
+                {"matrix": [4, 7], "x": 8, "y": 2},
+                {"matrix": [3, 8], "x": 9, "y": 2.45},
+                {"matrix": [2, 9], "x": 10, "y": 2.3},
+                {"matrix": [2, 6], "x": 11, "y": 2},
+                {"matrix": [1, 8], "x": 12, "y": 2.15},
+                {"matrix": [1, 5], "x": 13, "y": 2.45},
+                {"matrix": [0, 7], "x": 14, "y": 2.45},
+
+                {"matrix": [3, 4], "x": 4, "y": 3.9},
+                {"matrix": [4, 4], "x": 5, "y": 3.9},
+                {"matrix": [4, 1], "x": 6, "y": 3.4, "h": 1.5},
+
+                {"matrix": [4, 8], "x": 8, "y": 3.4, "h": 1.5},
+                {"matrix": [4, 5], "x": 9, "y": 3.9},
+                {"matrix": [3, 5], "x": 10, "y": 3.9}
+            ]
+        }
+    }
+}
diff --git a/keyboards/satt/comet46/rules.mk b/keyboards/satt/comet46/rules.mk
index 0db5166ffac..18d234d62a0 100644
--- a/keyboards/satt/comet46/rules.mk
+++ b/keyboards/satt/comet46/rules.mk
@@ -1,15 +1,3 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = no        # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
 CUSTOM_MATRIX = lite
 
 # project specific files
diff --git a/keyboards/sawnsprojects/krush/krush60/solder/keyboard.json b/keyboards/sawnsprojects/krush/krush60/solder/keyboard.json
index b3d4f8f97c6..4f5ca808ceb 100644
--- a/keyboards/sawnsprojects/krush/krush60/solder/keyboard.json
+++ b/keyboards/sawnsprojects/krush/krush60/solder/keyboard.json
@@ -48,7 +48,7 @@
         "LAYOUT_60_ansi_arrow_split_bs_7u_spc": "LAYOUT_60_ansi_arrow_tsangan_split_bs",
         "LAYOUT_60_ansi_arrow_7u_spc": "LAYOUT_60_ansi_arrow_tsangan"
     },
-    "community_layouts": ["60_ansi", "60_ansi_arrow", "60_ansi_arrow_split_bs_7u_spc"],
+    "community_layouts": ["60_ansi", "60_ansi_arrow"],
     "layouts": {
         "LAYOUT_all": {
             "layout": [
diff --git a/keyboards/scottokeebs/scottowing/info.json b/keyboards/scottokeebs/scottowing/info.json
new file mode 100644
index 00000000000..770e2fd18ec
--- /dev/null
+++ b/keyboards/scottokeebs/scottowing/info.json
@@ -0,0 +1,75 @@
+{
+    "manufacturer": "ScottoKeebs",
+    "keyboard_name": "ScottoWing (PCB Edition)",
+    "maintainer": "joe-scotto",
+    "bootloader": "rp2040",
+    "bootmagic": {
+        "matrix": [0, 1]
+    },
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "matrix_pins": {
+        "cols": ["GP2", "GP3", "GP4", "GP5", "GP6", "GP7", "GP20", "GP22", "GP26", "GP27", "GP28", "GP29"],
+        "rows": ["GP8", "GP9", "GP23", "GP21"]
+    },
+    "processor": "RP2040",
+    "url": "https://scottokeebs.com",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x1026",
+        "vid": "0x534B"
+    },
+    "layouts": {
+        "LAYOUT_split_3x6_2": {
+            "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": [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": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [2, 6], "x": 6, "y": 2},
+                {"matrix": [2, 7], "x": 7, "y": 2},
+                {"matrix": [2, 8], "x": 8, "y": 2},
+                {"matrix": [2, 9], "x": 9, "y": 2},
+                {"matrix": [2, 10], "x": 10, "y": 2},
+                {"matrix": [2, 11], "x": 11, "y": 2},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
+                {"matrix": [3, 6], "x": 6, "y": 3},
+                {"matrix": [3, 7], "x": 7, "y": 3}
+            ]
+        }
+    }
+}
diff --git a/keyboards/scottokeebs/scottowing/keymaps/default/config.h b/keyboards/scottokeebs/scottowing/keymaps/default/config.h
new file mode 100644
index 00000000000..eb03070d83a
--- /dev/null
+++ b/keyboards/scottokeebs/scottowing/keymaps/default/config.h
@@ -0,0 +1,23 @@
+/*
+Copyright 2024 Joe Scotto
+
+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 options
+#define TAPPING_TERM 135
+#define PERMISSIVE_HOLD
+#define TAPPING_TERM_PER_KEY
diff --git a/keyboards/scottokeebs/scottowing/keymaps/default/keymap.c b/keyboards/scottokeebs/scottowing/keymaps/default/keymap.c
new file mode 100644
index 00000000000..9a1c7daef30
--- /dev/null
+++ b/keyboards/scottokeebs/scottowing/keymaps/default/keymap.c
@@ -0,0 +1,45 @@
+/*
+Copyright 2024 Joe Scotto
+
+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_split_3x6_2(
+        KC_TAB,  KC_Q,         KC_W, KC_E, KC_R,    KC_T,           KC_Y,          KC_U,         KC_I,     KC_O,   KC_P,            KC_BSPC,
+        KC_ENT,  KC_A,         KC_S, KC_D, KC_F,    KC_G,           KC_H,          KC_J,         KC_K,     KC_L,   KC_BSPC,         KC_QUOT,
+        KC_LSFT, LSFT_T(KC_Z), KC_X, KC_C, KC_V,    KC_B,           KC_N,          KC_M,         KC_COMMA, KC_DOT, RSFT_T(KC_SLSH), KC_RSFT,
+                                           KC_LALT, LGUI_T(KC_SPC), LT(1, KC_TAB), LT(2, KC_ENT)
+    ),
+    [1] = LAYOUT_split_3x6_2(
+        KC_TRNS, KC_UNDS,         KC_MINS, KC_PLUS, KC_EQL,  KC_COLN, KC_GRV,   KC_MRWD, KC_MPLY, KC_MFFD, KC_DEL,          KC_TRNS,
+        KC_TRNS, KC_LCBR,         KC_LPRN, KC_RPRN, KC_RCBR, KC_PIPE, KC_ESC,   KC_LEFT, KC_UP,   KC_DOWN, KC_RGHT,         KC_TRNS,
+        KC_TRNS, LSFT_T(KC_LBRC), KC_QUOT, KC_DQUO, KC_RBRC, KC_SCLN, KC_TILDE, KC_VOLD, KC_MUTE, KC_VOLU, RSFT_T(KC_BSLS), KC_TRNS,
+                                                    KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS
+    ),
+    [2] = LAYOUT_split_3x6_2(
+        KC_TRNS, KC_EXLM, KC_AT, KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_CAPS, KC_BSPC,         KC_TRNS,
+        KC_TRNS, KC_1,    KC_2,  KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,            KC_TRNS,
+        KC_TRNS, KC_LSFT, KC_NO, KC_NO,   KC_NO,   MO(3),   KC_NO,   KC_NO,   KC_COMM, KC_DOT,  RSFT_T(KC_SLSH), KC_TRNS,
+                                          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+    [3] = LAYOUT_split_3x6_2(
+        KC_TRNS, KC_NO,  KC_NO, KC_NO, KC_NO,   KC_NO,   KC_NO,   KC_NO,  KC_NO, KC_NO, KC_NO,  KC_TRNS,
+        KC_TRNS, KC_F1,  KC_F2, KC_F3, KC_F4,   KC_F5,   KC_F6,   KC_F7,  KC_F8, KC_F9, KC_F10, KC_TRNS,
+        KC_TRNS, KC_F11, KC_NO, KC_NO, QK_BOOT, KC_TRNS, KC_NO,   KC_NO,  KC_NO, KC_NO, KC_F12, KC_TRNS,
+                                       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+    )
+};
\ No newline at end of file
diff --git a/keyboards/scottokeebs/scottowing/readme.md b/keyboards/scottokeebs/scottowing/readme.md
new file mode 100644
index 00000000000..bf20164e666
--- /dev/null
+++ b/keyboards/scottokeebs/scottowing/readme.md
@@ -0,0 +1,29 @@
+# ScottoWing (PCB Edition)
+
+![ScottoWing](https://i.imgur.com/ckaYMAx.jpeg)
+
+The ScottoWing (PCB Edition) is a 3x5 (34-keys) or 3x6 (40-keys) split monoblock ergonomic column-staggered keyboard.
+
+* Keyboard Maintainer: [Joe Scotto](https://github.com/joe-scotto)
+* Hardware Supported: RP2040 Pro Micro, nice!nano
+* Hardware Availability: [ScottoKeebs](https://scottokeebs.com), [Amazon](https://amazon.com), [AliExpress](https://aliexpress.com)
+
+# Compiling
+
+Make example for this keyboard (after setting up your build environment):
+
+    make scottokeebs/scottowing:default
+
+Flashing example for this keyboard:
+
+    make scottokeebs/scottowing: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,1) 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
diff --git a/keyboards/scottokeebs/scottowing/rules.mk b/keyboards/scottokeebs/scottowing/rules.mk
new file mode 100644
index 00000000000..6e7633bfe01
--- /dev/null
+++ b/keyboards/scottokeebs/scottowing/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
diff --git a/keyboards/sekigon/grs_70ec/info.json b/keyboards/sekigon/grs_70ec/info.json
deleted file mode 100644
index 833cd747895..00000000000
--- a/keyboards/sekigon/grs_70ec/info.json
+++ /dev/null
@@ -1,103 +0,0 @@
-{
-    "keyboard_name": "GRS-70EC",
-    "manufacturer": "sekigon-gonnoc",
-    "url": "https://github.com/sekigon-gonnoc/GRS-70EC-doc/",
-    "maintainer": "sekigon-gonnoc",
-    "usb": {
-        "vid": "0xFEED",
-        "pid": "0x70EC",
-        "device_version": "0.0.1"
-    },
-    "split": {
-        "enabled": true,
-        "soft_serial_pin": "D3"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-
-                {"matrix": [5, 0], "x": 7.75, "y": 0},
-                {"matrix": [5, 1], "x": 8.75, "y": 0},
-                {"matrix": [5, 2], "x": 9.75, "y": 0},
-                {"matrix": [5, 3], "x": 10.75, "y": 0},
-                {"matrix": [5, 4], "x": 11.75, "y": 0},
-                {"matrix": [5, 5], "x": 12.75, "y": 0},
-                {"matrix": [5, 6], "x": 13.75, "y": 0},
-                {"matrix": [5, 7], "x": 14.75, "y": 0},
-
-                {"matrix": [1, 1], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 2], "x": 1.5, "y": 1},
-                {"matrix": [1, 3], "x": 2.5, "y": 1},
-                {"matrix": [1, 4], "x": 3.5, "y": 1},
-                {"matrix": [1, 5], "x": 4.5, "y": 1},
-                {"matrix": [1, 6], "x": 5.5, "y": 1},
-
-                {"matrix": [6, 0], "x": 7.25, "y": 1},
-                {"matrix": [6, 1], "x": 8.25, "y": 1},
-                {"matrix": [6, 2], "x": 9.25, "y": 1},
-                {"matrix": [6, 3], "x": 10.25, "y": 1},
-                {"matrix": [6, 4], "x": 11.25, "y": 1},
-                {"matrix": [6, 5], "x": 12.25, "y": 1},
-                {"matrix": [6, 6], "x": 13.25, "y": 1},
-                {"matrix": [6, 7], "x": 14.25, "y": 1, "w": 1.5},
-
-                {"matrix": [2, 1], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 2], "x": 1.75, "y": 2},
-                {"matrix": [2, 3], "x": 2.75, "y": 2},
-                {"matrix": [2, 4], "x": 3.75, "y": 2},
-                {"matrix": [2, 5], "x": 4.75, "y": 2},
-                {"matrix": [2, 6], "x": 5.75, "y": 2},
-
-                {"matrix": [7, 0], "x": 7.5, "y": 2},
-                {"matrix": [7, 1], "x": 8.5, "y": 2},
-                {"matrix": [7, 2], "x": 9.5, "y": 2},
-                {"matrix": [7, 3], "x": 10.5, "y": 2},
-                {"matrix": [7, 4], "x": 11.5, "y": 2},
-                {"matrix": [7, 5], "x": 12.5, "y": 2},
-                {"matrix": [7, 6], "x": 13.5, "y": 2},
-                {"matrix": [7, 7], "x": 14.5, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3},
-                {"matrix": [3, 1], "x": 1, "y": 3},
-                {"matrix": [3, 2], "x": 2, "y": 3},
-                {"matrix": [3, 3], "x": 3, "y": 3},
-                {"matrix": [3, 4], "x": 4, "y": 3},
-                {"matrix": [3, 5], "x": 5, "y": 3},
-                {"matrix": [3, 6], "x": 6, "y": 3},
-
-                {"matrix": [8, 0], "x": 7.75, "y": 3},
-                {"matrix": [8, 1], "x": 8.75, "y": 3},
-                {"matrix": [8, 2], "x": 9.75, "y": 3},
-                {"matrix": [8, 3], "x": 10.75, "y": 3},
-                {"matrix": [8, 4], "x": 11.75, "y": 3},
-                {"matrix": [8, 5], "x": 12.75, "y": 3},
-                {"matrix": [8, 6], "x": 13.75, "y": 3},
-                {"matrix": [8, 7], "x": 14.75, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2, "y": 4},
-                {"matrix": [4, 3], "x": 3, "y": 4, "w": 1.25},
-                {"matrix": [4, 5], "x": 4.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 6], "x": 5.5, "y": 4, "w": 1.25},
-
-                {"matrix": [9, 0], "x": 7.5, "y": 4, "w": 1.25},
-                {"matrix": [9, 1], "x": 8.75, "y": 4, "w": 1.25},
-                {"matrix": [9, 2], "x": 10, "y": 4, "w": 1.25},
-                {"matrix": [9, 3], "x": 11.25, "y": 4},
-
-                {"matrix": [9, 5], "x": 12.75, "y": 4},
-                {"matrix": [9, 6], "x": 13.75, "y": 4},
-                {"matrix": [9, 7], "x": 14.75, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/sekigon/grs_70ec/keyboard.json b/keyboards/sekigon/grs_70ec/keyboard.json
new file mode 100644
index 00000000000..e940e71d884
--- /dev/null
+++ b/keyboards/sekigon/grs_70ec/keyboard.json
@@ -0,0 +1,110 @@
+{
+    "keyboard_name": "GRS-70EC",
+    "manufacturer": "sekigon-gonnoc",
+    "url": "https://github.com/sekigon-gonnoc/GRS-70EC-doc/",
+    "maintainer": "sekigon-gonnoc",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0x70EC",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "console": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": false
+    },
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "D3"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+
+                {"matrix": [5, 0], "x": 7.75, "y": 0},
+                {"matrix": [5, 1], "x": 8.75, "y": 0},
+                {"matrix": [5, 2], "x": 9.75, "y": 0},
+                {"matrix": [5, 3], "x": 10.75, "y": 0},
+                {"matrix": [5, 4], "x": 11.75, "y": 0},
+                {"matrix": [5, 5], "x": 12.75, "y": 0},
+                {"matrix": [5, 6], "x": 13.75, "y": 0},
+                {"matrix": [5, 7], "x": 14.75, "y": 0},
+
+                {"matrix": [1, 1], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 1.5, "y": 1},
+                {"matrix": [1, 3], "x": 2.5, "y": 1},
+                {"matrix": [1, 4], "x": 3.5, "y": 1},
+                {"matrix": [1, 5], "x": 4.5, "y": 1},
+                {"matrix": [1, 6], "x": 5.5, "y": 1},
+
+                {"matrix": [6, 0], "x": 7.25, "y": 1},
+                {"matrix": [6, 1], "x": 8.25, "y": 1},
+                {"matrix": [6, 2], "x": 9.25, "y": 1},
+                {"matrix": [6, 3], "x": 10.25, "y": 1},
+                {"matrix": [6, 4], "x": 11.25, "y": 1},
+                {"matrix": [6, 5], "x": 12.25, "y": 1},
+                {"matrix": [6, 6], "x": 13.25, "y": 1},
+                {"matrix": [6, 7], "x": 14.25, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 1], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 1.75, "y": 2},
+                {"matrix": [2, 3], "x": 2.75, "y": 2},
+                {"matrix": [2, 4], "x": 3.75, "y": 2},
+                {"matrix": [2, 5], "x": 4.75, "y": 2},
+                {"matrix": [2, 6], "x": 5.75, "y": 2},
+
+                {"matrix": [7, 0], "x": 7.5, "y": 2},
+                {"matrix": [7, 1], "x": 8.5, "y": 2},
+                {"matrix": [7, 2], "x": 9.5, "y": 2},
+                {"matrix": [7, 3], "x": 10.5, "y": 2},
+                {"matrix": [7, 4], "x": 11.5, "y": 2},
+                {"matrix": [7, 5], "x": 12.5, "y": 2},
+                {"matrix": [7, 6], "x": 13.5, "y": 2},
+                {"matrix": [7, 7], "x": 14.5, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
+                {"matrix": [3, 6], "x": 6, "y": 3},
+
+                {"matrix": [8, 0], "x": 7.75, "y": 3},
+                {"matrix": [8, 1], "x": 8.75, "y": 3},
+                {"matrix": [8, 2], "x": 9.75, "y": 3},
+                {"matrix": [8, 3], "x": 10.75, "y": 3},
+                {"matrix": [8, 4], "x": 11.75, "y": 3},
+                {"matrix": [8, 5], "x": 12.75, "y": 3},
+                {"matrix": [8, 6], "x": 13.75, "y": 3},
+                {"matrix": [8, 7], "x": 14.75, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2, "y": 4},
+                {"matrix": [4, 3], "x": 3, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 4.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 5.5, "y": 4, "w": 1.25},
+
+                {"matrix": [9, 0], "x": 7.5, "y": 4, "w": 1.25},
+                {"matrix": [9, 1], "x": 8.75, "y": 4, "w": 1.25},
+                {"matrix": [9, 2], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [9, 3], "x": 11.25, "y": 4},
+
+                {"matrix": [9, 5], "x": 12.75, "y": 4},
+                {"matrix": [9, 6], "x": 13.75, "y": 4},
+                {"matrix": [9, 7], "x": 14.75, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/sekigon/grs_70ec/rules.mk b/keyboards/sekigon/grs_70ec/rules.mk
index ac989e7ea83..37cfffd7692 100644
--- a/keyboards/sekigon/grs_70ec/rules.mk
+++ b/keyboards/sekigon/grs_70ec/rules.mk
@@ -1,15 +1,3 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = yes        # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
 CUSTOM_MATRIX = lite
 
 ANALOG_DRIVER_REQUIRED = yes
diff --git a/keyboards/shandoncodes/mino_plus/hotswap/info.json b/keyboards/shandoncodes/mino_plus/hotswap/info.json
deleted file mode 100644
index b7cda6d71ff..00000000000
--- a/keyboards/shandoncodes/mino_plus/hotswap/info.json
+++ /dev/null
@@ -1,100 +0,0 @@
-{
-    "manufacturer": "ShandonCodes",
-    "keyboard_name": "Mino Plus (Hotswap)",
-    "maintainer": "ShandonCodes",
-    "bootloader": "stm32-dfu",
-    "diode_direction": "COL2ROW",
-    "features": {
-        "bootmagic": true,
-        "command": false,
-        "console": false,
-        "extrakey": true,
-        "mousekey": true,
-        "nkro": true
-    },
-    "matrix_pins": {
-        "cols": ["B12", "A15", "B3", "B2", "B0", "A7", "A5", "A4", "A3", "A2", "A1", "F1", "A0", "A8", "A10"],
-        "rows": ["B14", "B10", "F0", "C15", "C14"]
-    },
-    "processor": "STM32F072",
-    "url": "",
-    "usb": {
-        "device_version": "1.0.0",
-        "pid": "0x0004",
-        "vid": "0x7877"
-    },
-    "layouts": {
-        "LAYOUT": {
-            "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": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-                {"label": "Del", "matrix": [0, 14], "x": 14, "y": 0},
-                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
-                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
-                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
-                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
-                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
-                {"label": "Y", "matrix": [1, 6], "x": 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], "x": 13.5, "y": 1, "w": 1.5},
-                {"label": "Ins", "matrix": [1, 14], "x": 15, "y": 1},
-                {"label": "Caps", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
-                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
-                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
-                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
-                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
-                {"label": "H", "matrix": [2, 6], "x": 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": 10.75, "y": 2},
-                {"label": "Enter", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-                {"label": "Pgup", "matrix": [2, 14], "x": 14, "y": 2},
-                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"label": "Z", "matrix": [3, 1], "x": 2.25, "y": 3},
-                {"label": "X", "matrix": [3, 2], "x": 3.25, "y": 3},
-                {"label": "C", "matrix": [3, 3], "x": 4.25, "y": 3},
-                {"label": "V", "matrix": [3, 4], "x": 5.25, "y": 3},
-                {"label": "B", "matrix": [3, 5], "x": 6.25, "y": 3},
-                {"label": "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": "Shift", "matrix": [3, 11], "x": 12.25, "y": 3, "w": 1.75},
-                {"label": "Up", "matrix": [3, 12], "x": 14, "y": 3},
-                {"label": "Pgdn", "matrix": [3, 14], "x": 15, "y": 3},
-                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"label": "Super", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"label": "Space", "matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
-                {"label": "Meta", "matrix": [4, 9], "x": 10, "y": 4},
-                {"label": "Win", "matrix": [4, 10], "x": 11, "y": 4},
-                {"label": "Ctrl", "matrix": [4, 11], "x": 12, "y": 4},
-                {"label": "Left", "matrix": [4, 12], "x": 13, "y": 4},
-                {"label": "Down", "matrix": [4, 13], "x": 14, "y": 4},
-                {"label": "Right", "matrix": [4, 14], "x": 15, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/shandoncodes/mino_plus/hotswap/keyboard.json b/keyboards/shandoncodes/mino_plus/hotswap/keyboard.json
new file mode 100644
index 00000000000..f181c610ed1
--- /dev/null
+++ b/keyboards/shandoncodes/mino_plus/hotswap/keyboard.json
@@ -0,0 +1,102 @@
+{
+    "manufacturer": "ShandonCodes",
+    "keyboard_name": "Mino Plus (Hotswap)",
+    "maintainer": "ShandonCodes",
+    "bootloader": "stm32-dfu",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "oled": true,
+        "wpm": true
+    },
+    "matrix_pins": {
+        "cols": ["B12", "A15", "B3", "B2", "B0", "A7", "A5", "A4", "A3", "A2", "A1", "F1", "A0", "A8", "A10"],
+        "rows": ["B14", "B10", "F0", "C15", "C14"]
+    },
+    "processor": "STM32F072",
+    "url": "",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x0004",
+        "vid": "0x7877"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "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": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"label": "Del", "matrix": [0, 14], "x": 14, "y": 0},
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 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], "x": 13.5, "y": 1, "w": 1.5},
+                {"label": "Ins", "matrix": [1, 14], "x": 15, "y": 1},
+                {"label": "Caps", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 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": 10.75, "y": 2},
+                {"label": "Enter", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+                {"label": "Pgup", "matrix": [2, 14], "x": 14, "y": 2},
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"label": "Z", "matrix": [3, 1], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 2], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 3], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 4], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 5], "x": 6.25, "y": 3},
+                {"label": "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": "Shift", "matrix": [3, 11], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "Up", "matrix": [3, 12], "x": 14, "y": 3},
+                {"label": "Pgdn", "matrix": [3, 14], "x": 15, "y": 3},
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "Super", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "Space", "matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "Meta", "matrix": [4, 9], "x": 10, "y": 4},
+                {"label": "Win", "matrix": [4, 10], "x": 11, "y": 4},
+                {"label": "Ctrl", "matrix": [4, 11], "x": 12, "y": 4},
+                {"label": "Left", "matrix": [4, 12], "x": 13, "y": 4},
+                {"label": "Down", "matrix": [4, 13], "x": 14, "y": 4},
+                {"label": "Right", "matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/shandoncodes/mino_plus/hotswap/rules.mk b/keyboards/shandoncodes/mino_plus/hotswap/rules.mk
deleted file mode 100644
index 76e55c05f48..00000000000
--- a/keyboards/shandoncodes/mino_plus/hotswap/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-OLED_ENABLE = yes
-WPM_ENABLE = yes
diff --git a/keyboards/shandoncodes/mino_plus/soldered/info.json b/keyboards/shandoncodes/mino_plus/soldered/info.json
deleted file mode 100644
index 52b612e01bf..00000000000
--- a/keyboards/shandoncodes/mino_plus/soldered/info.json
+++ /dev/null
@@ -1,107 +0,0 @@
-{
-    "manufacturer": "ShandonCodes",
-    "keyboard_name": "Mino Plus",
-    "maintainer": "ShandonCodes",
-    "bootloader": "stm32-dfu",
-    "diode_direction": "COL2ROW",
-    "features": {
-        "bootmagic": true,
-        "command": false,
-        "console": false,
-        "extrakey": true,
-        "mousekey": true,
-        "nkro": true
-    },
-    "matrix_pins": {
-        "cols": ["B4", "B3", "A15", "A10", "A8", "B14", "B12", "B10", "A5", "A4", "A3", "B0", "A7", "C15", "B5"],
-        "rows": ["B9", "B8", "A2", "A1", "A0"]
-    },
-    "processor": "STM32F072",
-    "url": "",
-    "usb": {
-        "device_version": "1.0.0",
-        "pid": "0x0003",
-        "vid": "0x7877"
-    },
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 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, 14], "x": 14, "y": 0},
-                {"matrix": [2, 14], "x": 15, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-                {"matrix": [1, 14], "x": 15, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-                {"matrix": [2, 13], "x": 15, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 1], "x": 2.25, "y": 3},
-                {"matrix": [3, 2], "x": 3.25, "y": 3},
-                {"matrix": [3, 3], "x": 4.25, "y": 3},
-                {"matrix": [3, 4], "x": 5.25, "y": 3},
-                {"matrix": [3, 5], "x": 6.25, "y": 3},
-                {"matrix": [3, 6], "x": 7.25, "y": 3},
-                {"matrix": [3, 7], "x": 8.25, "y": 3},
-                {"matrix": [3, 8], "x": 9.25, "y": 3},
-                {"matrix": [3, 9], "x": 10.25, "y": 3},
-                {"matrix": [3, 10], "x": 11.25, "y": 3},
-                {"matrix": [3, 11], "x": 12.25, "y": 3, "w": 1.75},
-                {"matrix": [3, 12], "x": 14, "y": 3},
-                {"matrix": [3, 13], "x": 15, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 2.25},
-                {"matrix": [4, 5], "x": 6, "y": 4, "w": 1.25},
-                {"matrix": [4, 7], "x": 7.25, "y": 4, "w": 2.75},
-                {"matrix": [4, 9], "x": 10, "y": 4},
-                {"matrix": [4, 10], "x": 11, "y": 4},
-                {"matrix": [4, 11], "x": 12, "y": 4},
-                {"matrix": [4, 12], "x": 13, "y": 4},
-                {"matrix": [4, 13], "x": 14, "y": 4},
-                {"matrix": [4, 14], "x": 15, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/shandoncodes/mino_plus/soldered/keyboard.json b/keyboards/shandoncodes/mino_plus/soldered/keyboard.json
new file mode 100644
index 00000000000..2b717c4c597
--- /dev/null
+++ b/keyboards/shandoncodes/mino_plus/soldered/keyboard.json
@@ -0,0 +1,109 @@
+{
+    "manufacturer": "ShandonCodes",
+    "keyboard_name": "Mino Plus",
+    "maintainer": "ShandonCodes",
+    "bootloader": "stm32-dfu",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "oled": true,
+        "wpm": true
+    },
+    "matrix_pins": {
+        "cols": ["B4", "B3", "A15", "A10", "A8", "B14", "B12", "B10", "A5", "A4", "A3", "B0", "A7", "C15", "B5"],
+        "rows": ["B9", "B8", "A2", "A1", "A0"]
+    },
+    "processor": "STM32F072",
+    "url": "",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x0003",
+        "vid": "0x7877"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 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, 14], "x": 14, "y": 0},
+                {"matrix": [2, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 13], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 10], "x": 11.25, "y": 3},
+                {"matrix": [3, 11], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 12], "x": 14, "y": 3},
+                {"matrix": [3, 13], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 2.25},
+                {"matrix": [4, 5], "x": 6, "y": 4, "w": 1.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4, "w": 2.75},
+                {"matrix": [4, 9], "x": 10, "y": 4},
+                {"matrix": [4, 10], "x": 11, "y": 4},
+                {"matrix": [4, 11], "x": 12, "y": 4},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/shandoncodes/mino_plus/soldered/rules.mk b/keyboards/shandoncodes/mino_plus/soldered/rules.mk
deleted file mode 100644
index 76e55c05f48..00000000000
--- a/keyboards/shandoncodes/mino_plus/soldered/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-OLED_ENABLE = yes
-WPM_ENABLE = yes
diff --git a/keyboards/sharkoon/skiller_sgk50_s2/info.json b/keyboards/sharkoon/skiller_sgk50_s2/keyboard.json
similarity index 100%
rename from keyboards/sharkoon/skiller_sgk50_s2/info.json
rename to keyboards/sharkoon/skiller_sgk50_s2/keyboard.json
diff --git a/keyboards/sharkoon/skiller_sgk50_s4/config.h b/keyboards/sharkoon/skiller_sgk50_s4/config.h
new file mode 100644
index 00000000000..1d0f8f9a901
--- /dev/null
+++ b/keyboards/sharkoon/skiller_sgk50_s4/config.h
@@ -0,0 +1,13 @@
+// Copyright 2024 JoyLee (@itarze)
+// 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
diff --git a/keyboards/sharkoon/skiller_sgk50_s4/halconf.h b/keyboards/sharkoon/skiller_sgk50_s4/halconf.h
new file mode 100644
index 00000000000..9d456a5106f
--- /dev/null
+++ b/keyboards/sharkoon/skiller_sgk50_s4/halconf.h
@@ -0,0 +1,10 @@
+// Copyright 2024 JoyLee (@itarze)
+// 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>
diff --git a/keyboards/sharkoon/skiller_sgk50_s4/info.json b/keyboards/sharkoon/skiller_sgk50_s4/info.json
new file mode 100644
index 00000000000..7d36616e52b
--- /dev/null
+++ b/keyboards/sharkoon/skiller_sgk50_s4/info.json
@@ -0,0 +1,356 @@
+{
+    "manufacturer": "Sharkoon Technologies GmbH",
+    "keyboard_name": "SKILLER SGK50 S4",
+    "maintainer": "JoyLee",
+    "bootloader": "wb32-dfu",
+    "diode_direction": "ROW2COL",
+    "eeprom": {
+        "driver": "wear_leveling",
+        "wear_leveling": {
+            "backing_size": 4096,
+            "driver": "spi_flash"
+        }
+    },
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgb_matrix": true
+    },
+    "matrix_pins": {
+        "cols": ["C0", "C1", "C2", "C3", "A6", "B1", "B10", "B11", "B12", "B13", "B14", "B15", "C6", "C7"],
+        "rows": ["A0", "A1", "A2", "A3", "C13"]
+    },
+    "processor": "WB32FQ95",
+    "rgb_matrix": {
+        "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_fractal": 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
+        },
+        "default": {
+            "val": 80
+        },
+        "driver": "ws2812",
+        "layout": [
+            {"matrix": [4, 6], "x": 103, "y": 64, "flags": 4},
+            {"matrix": [4, 10], "x": 172, "y": 64, "flags": 4},
+            {"matrix": [4, 11], "x": 190, "y": 64, "flags": 4},
+            {"matrix": [4, 12], "x": 207, "y": 64, "flags": 4},
+            {"matrix": [4, 13], "x": 224, "y": 64, "flags": 4},
+            {"matrix": [3, 13], "x": 224, "y": 48, "flags": 4},
+            {"matrix": [3, 11], "x": 190, "y": 48, "flags": 4},
+            {"matrix": [3, 10], "x": 172, "y": 48, "flags": 4},
+            {"matrix": [3, 9], "x": 155, "y": 48, "flags": 4},
+            {"matrix": [3, 8], "x": 138, "y": 48, "flags": 4},
+            {"matrix": [3, 7], "x": 121, "y": 48, "flags": 4},
+            {"matrix": [3, 6], "x": 103, "y": 48, "flags": 4},
+            {"matrix": [3, 5], "x": 86, "y": 48, "flags": 4},
+            {"matrix": [3, 4], "x": 69, "y": 48, "flags": 4},
+            {"matrix": [3, 3], "x": 52, "y": 48, "flags": 4},
+            {"matrix": [3, 2], "x": 34, "y": 48, "flags": 4},
+            {"matrix": [3, 1], "x": 17, "y": 48, "flags": 4},
+            {"matrix": [4, 2], "x": 34, "y": 64, "flags": 4},
+            {"matrix": [4, 1], "x": 17, "y": 64, "flags": 4},
+            {"matrix": [4, 0], "x": 0, "y": 64, "flags": 4},
+            {"matrix": [3, 0], "x": 0, "y": 48, "flags": 4},
+            {"matrix": [2, 0], "x": 0, "y": 32, "flags": 4},
+            {"matrix": [2, 1], "x": 17, "y": 32, "flags": 4},
+            {"matrix": [2, 2], "x": 34, "y": 32, "flags": 4},
+            {"matrix": [2, 3], "x": 52, "y": 32, "flags": 4},
+            {"matrix": [2, 4], "x": 69, "y": 32, "flags": 4},
+            {"matrix": [2, 5], "x": 86, "y": 32, "flags": 4},
+            {"matrix": [2, 6], "x": 103, "y": 32, "flags": 4},
+            {"matrix": [2, 7], "x": 121, "y": 32, "flags": 4},
+            {"matrix": [2, 8], "x": 138, "y": 32, "flags": 4},
+            {"matrix": [2, 9], "x": 155, "y": 32, "flags": 4},
+            {"matrix": [2, 10], "x": 172, "y": 32, "flags": 4},
+            {"matrix": [2, 11], "x": 190, "y": 32, "flags": 4},
+            {"matrix": [2, 13], "x": 207, "y": 32, "flags": 4},
+            {"matrix": [2, 12], "x": 224, "y": 16, "flags": 4},
+            {"matrix": [1, 12], "x": 207, "y": 16, "flags": 4},
+            {"matrix": [1, 11], "x": 190, "y": 16, "flags": 4},
+            {"matrix": [1, 10], "x": 172, "y": 16, "flags": 4},
+            {"matrix": [1, 9], "x": 155, "y": 16, "flags": 4},
+            {"matrix": [1, 8], "x": 138, "y": 16, "flags": 4},
+            {"matrix": [1, 7], "x": 121, "y": 16, "flags": 4},
+            {"matrix": [1, 6], "x": 103, "y": 16, "flags": 4},
+            {"matrix": [1, 5], "x": 86, "y": 16, "flags": 4},
+            {"matrix": [1, 4], "x": 69, "y": 16, "flags": 4},
+            {"matrix": [1, 3], "x": 52, "y": 16, "flags": 4},
+            {"matrix": [1, 2], "x": 34, "y": 16, "flags": 4},
+            {"matrix": [1, 1], "x": 17, "y": 16, "flags": 4},
+            {"matrix": [1, 0], "x": 0, "y": 16, "flags": 4},
+            {"matrix": [0, 0], "x": 0, "y": 0, "flags": 4},
+            {"matrix": [0, 1], "x": 17, "y": 0, "flags": 4},
+            {"matrix": [0, 2], "x": 34, "y": 0, "flags": 4},
+            {"matrix": [0, 3], "x": 52, "y": 0, "flags": 4},
+            {"matrix": [0, 4], "x": 69, "y": 0, "flags": 4},
+            {"matrix": [0, 5], "x": 86, "y": 0, "flags": 4},
+            {"matrix": [0, 6], "x": 103, "y": 0, "flags": 4},
+            {"matrix": [0, 7], "x": 121, "y": 0, "flags": 4},
+            {"matrix": [0, 8], "x": 138, "y": 0, "flags": 4},
+            {"matrix": [0, 9], "x": 155, "y": 0, "flags": 4},
+            {"matrix": [0, 10], "x": 172, "y": 0, "flags": 4},
+            {"matrix": [0, 11], "x": 190, "y": 0, "flags": 4},
+            {"matrix": [0, 12], "x": 207, "y": 0, "flags": 4},
+            {"matrix": [0, 13], "x": 224, "y": 0, "flags": 4}
+        ],
+        "max_brightness": 110,
+        "sleep": true,
+        "val_steps": 28
+    },
+    "url": "",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x1020",
+        "suspend_wakeup_delay": 1000,
+        "vid": "0x6332"
+    },
+    "ws2812": {
+        "pin": "A8"
+    },
+    "community_layouts": ["60_ansi", "60_iso"],
+    "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, "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, 12], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 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, 13], "x": 12.25, "y": 3, "w": 2.75},
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
+            ]
+        },
+        "LAYOUT_60_ansi": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [2, 12], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 2.75},
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
+            ]
+        },
+        "LAYOUT_60_iso": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [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, 13], "x": 12.25, "y": 3, "w": 2.75},
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/sharkoon/skiller_sgk50_s4/keymaps/default/keymap.c b/keyboards/sharkoon/skiller_sgk50_s4/keymaps/default/keymap.c
new file mode 100644
index 00000000000..84e72510d79
--- /dev/null
+++ b/keyboards/sharkoon/skiller_sgk50_s4/keymaps/default/keymap.c
@@ -0,0 +1,22 @@
+// Copyright 2024 JoyLee (@itarze)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#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_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,
+        KC_LCTL, KC_LGUI, KC_LALT,                             KC_SPC,                               KC_RALT, MO(1),   KC_APP,  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_INS,  _______,  KC_UP,    KC_PAUS, KC_PGUP, KC_HOME, KC_PSCR, RGB_VAI,
+        _______, _______, _______, _______, _______,  _______, KC_SCRL, KC_LEFT,  KC_DOWN,  KC_RGHT, KC_PGDN, KC_END,           _______,
+        _______, _______, _______, _______, _______,  _______, _______, _______,  KC_MUTE,  KC_VOLD, KC_VOLU, RGB_VAD,          _______,
+        _______, GU_TOGG, _______,                             _______,                              _______, _______, RGB_HUI, RGB_MOD
+    )
+};
diff --git a/keyboards/sharkoon/skiller_sgk50_s4/keymaps/via/keymap.c b/keyboards/sharkoon/skiller_sgk50_s4/keymaps/via/keymap.c
new file mode 100644
index 00000000000..84e72510d79
--- /dev/null
+++ b/keyboards/sharkoon/skiller_sgk50_s4/keymaps/via/keymap.c
@@ -0,0 +1,22 @@
+// Copyright 2024 JoyLee (@itarze)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#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_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,
+        KC_LCTL, KC_LGUI, KC_LALT,                             KC_SPC,                               KC_RALT, MO(1),   KC_APP,  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_INS,  _______,  KC_UP,    KC_PAUS, KC_PGUP, KC_HOME, KC_PSCR, RGB_VAI,
+        _______, _______, _______, _______, _______,  _______, KC_SCRL, KC_LEFT,  KC_DOWN,  KC_RGHT, KC_PGDN, KC_END,           _______,
+        _______, _______, _______, _______, _______,  _______, _______, _______,  KC_MUTE,  KC_VOLD, KC_VOLU, RGB_VAD,          _______,
+        _______, GU_TOGG, _______,                             _______,                              _______, _______, RGB_HUI, RGB_MOD
+    )
+};
diff --git a/keyboards/sharkoon/skiller_sgk50_s4/keymaps/via/rules.mk b/keyboards/sharkoon/skiller_sgk50_s4/keymaps/via/rules.mk
new file mode 100644
index 00000000000..1e5b99807cb
--- /dev/null
+++ b/keyboards/sharkoon/skiller_sgk50_s4/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/sharkoon/skiller_sgk50_s4/mcuconf.h b/keyboards/sharkoon/skiller_sgk50_s4/mcuconf.h
new file mode 100644
index 00000000000..ae7ee58001a
--- /dev/null
+++ b/keyboards/sharkoon/skiller_sgk50_s4/mcuconf.h
@@ -0,0 +1,9 @@
+// Copyright 2024 JoyLee (@itarze)
+// 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
diff --git a/keyboards/sharkoon/skiller_sgk50_s4/readme.md b/keyboards/sharkoon/skiller_sgk50_s4/readme.md
new file mode 100644
index 00000000000..db6650546ed
--- /dev/null
+++ b/keyboards/sharkoon/skiller_sgk50_s4/readme.md
@@ -0,0 +1,24 @@
+# SHARKOON SKILLER SGK50 S4
+
+![ISO](https://i.imgur.com/4WDIMm0.png)
+
+* Keyboard Maintainer: [JoyLee](https://github.com/itarze)
+* Hardware Supported: [SHARKOON SKILLER SGK50 S4 PCB](http://www.sharkoon.com/)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make sharkoon/skiller_sgk50_s4:default
+
+Flashing example for this keyboard:
+
+    make sharkoon/skiller_sgk50_s4: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
diff --git a/keyboards/sharkoon/skiller_sgk50_s4/rules.mk b/keyboards/sharkoon/skiller_sgk50_s4/rules.mk
new file mode 100644
index 00000000000..6e7633bfe01
--- /dev/null
+++ b/keyboards/sharkoon/skiller_sgk50_s4/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
diff --git a/keyboards/signum/3_0/elitec/info.json b/keyboards/signum/3_0/elitec/info.json
deleted file mode 100644
index 84336ac59f4..00000000000
--- a/keyboards/signum/3_0/elitec/info.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    "matrix_pins": {
-        "cols": ["B4", "D7", "D0", "E6", "D4", "F6", "F4", "F7", "B1", "B3", "C6", "B2"],
-        "rows": ["D2", "D1", "F5", "B5"]
-    },
-    "diode_direction": "COL2ROW"
-}
diff --git a/keyboards/signum/3_0/elitec/keyboard.json b/keyboards/signum/3_0/elitec/keyboard.json
new file mode 100644
index 00000000000..5482e519a1a
--- /dev/null
+++ b/keyboards/signum/3_0/elitec/keyboard.json
@@ -0,0 +1,13 @@
+{
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "matrix_pins": {
+        "cols": ["B4", "D7", "D0", "E6", "D4", "F6", "F4", "F7", "B1", "B3", "C6", "B2"],
+        "rows": ["D2", "D1", "F5", "B5"]
+    },
+    "diode_direction": "COL2ROW"
+}
diff --git a/keyboards/signum/3_0/elitec/rules.mk b/keyboards/signum/3_0/elitec/rules.mk
index 614691a01be..16051206467 100644
--- a/keyboards/signum/3_0/elitec/rules.mk
+++ b/keyboards/signum/3_0/elitec/rules.mk
@@ -1,16 +1,3 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
 # Disable unsupported hardware
 RGBLIGHT_SUPPORTED = no
 AUDIO_SUPPORTED = no
diff --git a/keyboards/signum/3_0/teensy/info.json b/keyboards/signum/3_0/teensy/info.json
deleted file mode 100644
index 7eae1153236..00000000000
--- a/keyboards/signum/3_0/teensy/info.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    "matrix_pins": {
-        "cols": ["C6", "D2", "B7", "D3", "D0", "F7", "F5", "B6", "B5", "B4", "D1", "D7"],
-        "rows": ["B0", "B3", "F6", "C7"]
-    },
-    "diode_direction": "COL2ROW"
-}
diff --git a/keyboards/signum/3_0/teensy/keyboard.json b/keyboards/signum/3_0/teensy/keyboard.json
new file mode 100644
index 00000000000..1db8479d9b0
--- /dev/null
+++ b/keyboards/signum/3_0/teensy/keyboard.json
@@ -0,0 +1,13 @@
+{
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "matrix_pins": {
+        "cols": ["C6", "D2", "B7", "D3", "D0", "F7", "F5", "B6", "B5", "B4", "D1", "D7"],
+        "rows": ["B0", "B3", "F6", "C7"]
+    },
+    "diode_direction": "COL2ROW"
+}
diff --git a/keyboards/signum/3_0/teensy/rules.mk b/keyboards/signum/3_0/teensy/rules.mk
index 614691a01be..16051206467 100644
--- a/keyboards/signum/3_0/teensy/rules.mk
+++ b/keyboards/signum/3_0/teensy/rules.mk
@@ -1,16 +1,3 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
 # Disable unsupported hardware
 RGBLIGHT_SUPPORTED = no
 AUDIO_SUPPORTED = no
diff --git a/keyboards/silverbullet44/info.json b/keyboards/silverbullet44/info.json
deleted file mode 100644
index e232fdba3e8..00000000000
--- a/keyboards/silverbullet44/info.json
+++ /dev/null
@@ -1,110 +0,0 @@
-{
-    "keyboard_name": "SilverBullet44",
-    "manufacturer": "SwanMatch",
-    "url": "https://swanmatch.booth.pm/items/1561270",
-    "maintainer": "swanmatch",
-    "usb": {
-        "vid": "0x16C0",
-        "pid": "0x27DB",
-        "device_version": "0.0.1"
-    },
-    "ws2812": {
-        "pin": "D3"
-    },
-    "rgb_matrix": {
-        "animations": {
-            "typing_heatmap": true
-        },
-        "default": {
-            "animation": "typing_heatmap"
-        },
-        "driver": "ws2812",
-        "max_brightness": 150,
-        "sat_steps": 8,
-        "val_steps": 8,
-        "speed_steps": 8
-    },
-    "rgblight": {
-        "saturation_steps": 8,
-        "brightness_steps": 8,
-        "led_count": 52,
-        "max_brightness": 150,
-        "led_map": [0, 1, 2, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 3, 4, 5, 6, 26, 27, 28, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 29, 30, 31, 32],
-        "split_count": [26, 26],
-        "animations": {
-            "breathing": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "snake": true
-        }
-    },
-    "matrix_pins": {
-        "cols": ["B3", "B1", "F7", "F6", "F5", "F4"],
-        "rows": ["D4", "C6", "D7", "E6"]
-    },
-    "diode_direction": "COL2ROW",
-    "split": {
-        "enabled": true,
-        "soft_serial_pin": "D2"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
-    "debounce": 10,
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 1.375},
-                {"matrix": [0, 1], "x": 1, "y": 0.75},
-                {"matrix": [0, 2], "x": 2, "y": 0.25},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0.25},
-                {"matrix": [0, 5], "x": 5, "y": 0.5},
-
-                {"matrix": [4, 5], "x": 12, "y": 0.5},
-                {"matrix": [4, 4], "x": 13, "y": 0.25},
-                {"matrix": [4, 3], "x": 14, "y": 0},
-                {"matrix": [4, 2], "x": 15, "y": 0.25},
-                {"matrix": [4, 1], "x": 16, "y": 0.75},
-                {"matrix": [4, 0], "x": 17, "y": 1.375},
-
-                {"matrix": [1, 0], "x": 0, "y": 2.375},
-                {"matrix": [1, 1], "x": 1, "y": 1.75},
-                {"matrix": [1, 2], "x": 2, "y": 1.25},
-                {"matrix": [1, 3], "x": 3, "y": 1},
-                {"matrix": [1, 4], "x": 4, "y": 1.25},
-                {"matrix": [1, 5], "x": 5, "y": 1.5},
-
-                {"matrix": [5, 5], "x": 12, "y": 1.5},
-                {"matrix": [5, 4], "x": 13, "y": 1.25},
-                {"matrix": [5, 3], "x": 14, "y": 1},
-                {"matrix": [5, 2], "x": 15, "y": 1.25},
-                {"matrix": [5, 1], "x": 16, "y": 1.75},
-                {"matrix": [5, 0], "x": 17, "y": 2.375},
-
-                {"matrix": [2, 0], "x": 12, "y": 2.5},
-                {"matrix": [2, 1], "x": 13, "y": 2.25},
-                {"matrix": [2, 2], "x": 14, "y": 2},
-                {"matrix": [2, 3], "x": 15, "y": 2.25},
-                {"matrix": [2, 4], "x": 16, "y": 2.75},
-                {"matrix": [2, 5], "x": 17, "y": 3.375},
-
-                {"matrix": [6, 5], "x": 0, "y": 3.375},
-                {"matrix": [6, 4], "x": 1, "y": 2.75},
-                {"matrix": [6, 3], "x": 2, "y": 2.25},
-                {"matrix": [6, 2], "x": 3, "y": 2},
-                {"matrix": [6, 1], "x": 4, "y": 2.25},
-                {"matrix": [6, 0], "x": 5, "y": 2.5},
-
-                {"matrix": [3, 2], "x": 4, "y": 3.25, "h": 1.25},
-                {"matrix": [3, 3], "x": 5, "y": 3.5},
-                {"matrix": [3, 4], "x": -0.5, "y": 3.5, "h": 1.5},
-                {"matrix": [3, 5], "x": 7, "y": 3.25, "h": 1.5},
-
-                {"matrix": [7, 5], "x": -3, "y": 3.5, "h": 1.5},
-                {"matrix": [7, 4], "x": -2, "y": 3.5, "h": 1.5},
-                {"matrix": [7, 3], "x": 12, "y": 3.5},
-                {"matrix": [7, 2], "x": 13, "y": 3.25, "w": 1.25}
-            ]
-        }
-    }
-}
diff --git a/keyboards/silverbullet44/keyboard.json b/keyboards/silverbullet44/keyboard.json
new file mode 100644
index 00000000000..793ec229e4b
--- /dev/null
+++ b/keyboards/silverbullet44/keyboard.json
@@ -0,0 +1,121 @@
+{
+    "keyboard_name": "SilverBullet44",
+    "manufacturer": "SwanMatch",
+    "url": "https://swanmatch.booth.pm/items/1561270",
+    "maintainer": "swanmatch",
+    "usb": {
+        "vid": "0x16C0",
+        "pid": "0x27DB",
+        "device_version": "0.0.1"
+    },
+    "build": {
+        "lto": true
+    },
+    "features": {
+        "audio": true,
+        "bootmagic": true,
+        "extrakey": false,
+        "mousekey": false,
+        "nkro": false,
+        "rgblight": true
+    },
+    "ws2812": {
+        "pin": "D3"
+    },
+    "rgb_matrix": {
+        "animations": {
+            "typing_heatmap": true
+        },
+        "default": {
+            "animation": "typing_heatmap"
+        },
+        "driver": "ws2812",
+        "max_brightness": 150,
+        "sat_steps": 8,
+        "val_steps": 8,
+        "speed_steps": 8
+    },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 52,
+        "max_brightness": 150,
+        "led_map": [0, 1, 2, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 3, 4, 5, 6, 26, 27, 28, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 29, 30, 31, 32],
+        "split_count": [26, 26],
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true
+        }
+    },
+    "matrix_pins": {
+        "cols": ["B3", "B1", "F7", "F6", "F5", "F4"],
+        "rows": ["D4", "C6", "D7", "E6"]
+    },
+    "diode_direction": "COL2ROW",
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "D2"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
+    "debounce": 10,
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 1.375},
+                {"matrix": [0, 1], "x": 1, "y": 0.75},
+                {"matrix": [0, 2], "x": 2, "y": 0.25},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0.25},
+                {"matrix": [0, 5], "x": 5, "y": 0.5},
+
+                {"matrix": [4, 5], "x": 12, "y": 0.5},
+                {"matrix": [4, 4], "x": 13, "y": 0.25},
+                {"matrix": [4, 3], "x": 14, "y": 0},
+                {"matrix": [4, 2], "x": 15, "y": 0.25},
+                {"matrix": [4, 1], "x": 16, "y": 0.75},
+                {"matrix": [4, 0], "x": 17, "y": 1.375},
+
+                {"matrix": [1, 0], "x": 0, "y": 2.375},
+                {"matrix": [1, 1], "x": 1, "y": 1.75},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.5},
+
+                {"matrix": [5, 5], "x": 12, "y": 1.5},
+                {"matrix": [5, 4], "x": 13, "y": 1.25},
+                {"matrix": [5, 3], "x": 14, "y": 1},
+                {"matrix": [5, 2], "x": 15, "y": 1.25},
+                {"matrix": [5, 1], "x": 16, "y": 1.75},
+                {"matrix": [5, 0], "x": 17, "y": 2.375},
+
+                {"matrix": [2, 0], "x": 12, "y": 2.5},
+                {"matrix": [2, 1], "x": 13, "y": 2.25},
+                {"matrix": [2, 2], "x": 14, "y": 2},
+                {"matrix": [2, 3], "x": 15, "y": 2.25},
+                {"matrix": [2, 4], "x": 16, "y": 2.75},
+                {"matrix": [2, 5], "x": 17, "y": 3.375},
+
+                {"matrix": [6, 5], "x": 0, "y": 3.375},
+                {"matrix": [6, 4], "x": 1, "y": 2.75},
+                {"matrix": [6, 3], "x": 2, "y": 2.25},
+                {"matrix": [6, 2], "x": 3, "y": 2},
+                {"matrix": [6, 1], "x": 4, "y": 2.25},
+                {"matrix": [6, 0], "x": 5, "y": 2.5},
+
+                {"matrix": [3, 2], "x": 4, "y": 3.25, "h": 1.25},
+                {"matrix": [3, 3], "x": 5, "y": 3.5},
+                {"matrix": [3, 4], "x": -0.5, "y": 3.5, "h": 1.5},
+                {"matrix": [3, 5], "x": 7, "y": 3.25, "h": 1.5},
+
+                {"matrix": [7, 5], "x": -3, "y": 3.5, "h": 1.5},
+                {"matrix": [7, 4], "x": -2, "y": 3.5, "h": 1.5},
+                {"matrix": [7, 3], "x": 12, "y": 3.5},
+                {"matrix": [7, 2], "x": 13, "y": 3.25, "w": 1.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/silverbullet44/rules.mk b/keyboards/silverbullet44/rules.mk
deleted file mode 100644
index 95e92dce2a4..00000000000
--- a/keyboards/silverbullet44/rules.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = no        # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-RGB_MATRIX_ENABLE = no
-AUDIO_ENABLE = yes          # Audio output
-LTO_ENABLE = yes
diff --git a/keyboards/sirius/uni660/rev1/info.json b/keyboards/sirius/uni660/rev1/info.json
deleted file mode 100644
index f5b070f87e1..00000000000
--- a/keyboards/sirius/uni660/rev1/info.json
+++ /dev/null
@@ -1,109 +0,0 @@
-{
-    "keyboard_name": "Uni660",
-    "manufacturer": "SiRius",
-    "url": "",
-    "maintainer": "qmk",
-    "usb": {
-        "vid": "0x5352",
-        "pid": "0x0201",
-        "device_version": "19.1.2"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-
-                {"matrix": [0, 1], "x": 1.5, "y": 0},
-                {"matrix": [0, 2], "x": 2.5, "y": 0},
-                {"matrix": [0, 3], "x": 3.5, "y": 0},
-                {"matrix": [0, 4], "x": 4.5, "y": 0},
-                {"matrix": [0, 5], "x": 5.5, "y": 0},
-                {"matrix": [0, 6], "x": 6.5, "y": 0},
-                {"matrix": [4, 6], "x": 7.5, "y": 0},
-
-                {"matrix": [0, 8], "x": 9.5, "y": 0},
-                {"matrix": [0, 9], "x": 10.5, "y": 0},
-                {"matrix": [0, 10], "x": 11.5, "y": 0},
-                {"matrix": [0, 11], "x": 12.5, "y": 0},
-                {"matrix": [0, 12], "x": 13.5, "y": 0},
-                {"matrix": [0, 13], "x": 14.5, "y": 0},
-                {"matrix": [0, 14], "x": 15.5, "y": 0},
-                {"matrix": [0, 15], "x": 16.5, "y": 0},
-
-                {"matrix": [3, 15], "x": 18, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1},
-
-                {"matrix": [1, 1], "x": 1.5, "y": 1, "w": 1.5},
-                {"matrix": [1, 2], "x": 3, "y": 1},
-                {"matrix": [1, 3], "x": 4, "y": 1},
-                {"matrix": [1, 4], "x": 5, "y": 1},
-                {"matrix": [1, 5], "x": 6, "y": 1},
-                {"matrix": [1, 6], "x": 7, "y": 1},
-
-                {"matrix": [1, 8], "x": 9, "y": 1},
-                {"matrix": [1, 9], "x": 10, "y": 1},
-                {"matrix": [1, 10], "x": 11, "y": 1},
-                {"matrix": [1, 11], "x": 12, "y": 1},
-                {"matrix": [1, 12], "x": 13, "y": 1},
-                {"matrix": [1, 13], "x": 14, "y": 1},
-                {"matrix": [1, 14], "x": 15, "y": 1},
-                {"matrix": [1, 15], "x": 16, "y": 1, "w": 1.5},
-
-                {"matrix": [2, 15], "x": 18, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2},
-
-                {"matrix": [2, 1], "x": 1.5, "y": 2, "w": 1.75},
-                {"matrix": [2, 2], "x": 3.25, "y": 2},
-                {"matrix": [2, 3], "x": 4.25, "y": 2},
-                {"matrix": [2, 4], "x": 5.25, "y": 2},
-                {"matrix": [2, 5], "x": 6.25, "y": 2},
-                {"matrix": [2, 6], "x": 7.25, "y": 2},
-
-                {"matrix": [2, 8], "x": 9.25, "y": 2},
-                {"matrix": [2, 9], "x": 10.25, "y": 2},
-                {"matrix": [2, 10], "x": 11.25, "y": 2},
-                {"matrix": [2, 11], "x": 12.25, "y": 2},
-                {"matrix": [2, 12], "x": 13.25, "y": 2},
-                {"matrix": [2, 13], "x": 14.25, "y": 2},
-                {"matrix": [2, 14], "x": 15.25, "y": 2, "w": 2.25},
-
-                {"matrix": [3, 0], "x": 0, "y": 3},
-
-                {"matrix": [3, 1], "x": 1.5, "y": 3, "w": 2.25},
-                {"matrix": [3, 2], "x": 3.75, "y": 3},
-                {"matrix": [3, 3], "x": 4.75, "y": 3},
-                {"matrix": [3, 4], "x": 5.75, "y": 3},
-                {"matrix": [3, 5], "x": 6.75, "y": 3},
-                {"matrix": [3, 6], "x": 7.75, "y": 3},
-
-                {"matrix": [3, 8], "x": 9.75, "y": 3},
-                {"matrix": [3, 9], "x": 10.75, "y": 3},
-                {"matrix": [3, 10], "x": 11.75, "y": 3},
-                {"matrix": [3, 11], "x": 12.75, "y": 3},
-                {"matrix": [3, 12], "x": 13.75, "y": 3},
-                {"matrix": [3, 13], "x": 14.75, "y": 3, "w": 2.25},
-                {"matrix": [3, 14], "x": 17, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4},
-
-                {"matrix": [4, 1], "x": 1.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.75, "y": 4, "w": 1.25},
-                {"matrix": [4, 3], "x": 4, "y": 4, "w": 1.25},
-                {"matrix": [4, 4], "x": 5.25, "y": 4, "w": 2.25},
-                {"matrix": [4, 5], "x": 7.5, "y": 4},
-
-                {"matrix": [4, 8], "x": 9.5, "y": 4, "w": 2.75},
-                {"matrix": [4, 9], "x": 12.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 10], "x": 13.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 12], "x": 14.75, "y": 4, "w": 1.25},
-                {"matrix": [4, 13], "x": 16, "y": 4},
-                {"matrix": [4, 14], "x": 17, "y": 4},
-                {"matrix": [4, 15], "x": 18, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/sirius/uni660/rev1/keyboard.json b/keyboards/sirius/uni660/rev1/keyboard.json
new file mode 100644
index 00000000000..793edcc6858
--- /dev/null
+++ b/keyboards/sirius/uni660/rev1/keyboard.json
@@ -0,0 +1,118 @@
+{
+    "keyboard_name": "Uni660",
+    "manufacturer": "SiRius",
+    "url": "",
+    "maintainer": "qmk",
+    "usb": {
+        "vid": "0x5352",
+        "pid": "0x0201",
+        "device_version": "19.1.2"
+    },
+    "features": {
+        "bootmagic": true,
+        "command": true,
+        "console": true,
+        "extrakey": true,
+        "mousekey": false,
+        "nkro": true,
+        "unicode": true
+    },
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.5, "y": 0},
+                {"matrix": [0, 2], "x": 2.5, "y": 0},
+                {"matrix": [0, 3], "x": 3.5, "y": 0},
+                {"matrix": [0, 4], "x": 4.5, "y": 0},
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [4, 6], "x": 7.5, "y": 0},
+
+                {"matrix": [0, 8], "x": 9.5, "y": 0},
+                {"matrix": [0, 9], "x": 10.5, "y": 0},
+                {"matrix": [0, 10], "x": 11.5, "y": 0},
+                {"matrix": [0, 11], "x": 12.5, "y": 0},
+                {"matrix": [0, 12], "x": 13.5, "y": 0},
+                {"matrix": [0, 13], "x": 14.5, "y": 0},
+                {"matrix": [0, 14], "x": 15.5, "y": 0},
+                {"matrix": [0, 15], "x": 16.5, "y": 0},
+
+                {"matrix": [3, 15], "x": 18, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+
+                {"matrix": [1, 1], "x": 1.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 3, "y": 1},
+                {"matrix": [1, 3], "x": 4, "y": 1},
+                {"matrix": [1, 4], "x": 5, "y": 1},
+                {"matrix": [1, 5], "x": 6, "y": 1},
+                {"matrix": [1, 6], "x": 7, "y": 1},
+
+                {"matrix": [1, 8], "x": 9, "y": 1},
+                {"matrix": [1, 9], "x": 10, "y": 1},
+                {"matrix": [1, 10], "x": 11, "y": 1},
+                {"matrix": [1, 11], "x": 12, "y": 1},
+                {"matrix": [1, 12], "x": 13, "y": 1},
+                {"matrix": [1, 13], "x": 14, "y": 1},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+                {"matrix": [1, 15], "x": 16, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 15], "x": 18, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+
+                {"matrix": [2, 1], "x": 1.5, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 3.25, "y": 2},
+                {"matrix": [2, 3], "x": 4.25, "y": 2},
+                {"matrix": [2, 4], "x": 5.25, "y": 2},
+                {"matrix": [2, 5], "x": 6.25, "y": 2},
+                {"matrix": [2, 6], "x": 7.25, "y": 2},
+
+                {"matrix": [2, 8], "x": 9.25, "y": 2},
+                {"matrix": [2, 9], "x": 10.25, "y": 2},
+                {"matrix": [2, 10], "x": 11.25, "y": 2},
+                {"matrix": [2, 11], "x": 12.25, "y": 2},
+                {"matrix": [2, 12], "x": 13.25, "y": 2},
+                {"matrix": [2, 13], "x": 14.25, "y": 2},
+                {"matrix": [2, 14], "x": 15.25, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+
+                {"matrix": [3, 1], "x": 1.5, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 3.75, "y": 3},
+                {"matrix": [3, 3], "x": 4.75, "y": 3},
+                {"matrix": [3, 4], "x": 5.75, "y": 3},
+                {"matrix": [3, 5], "x": 6.75, "y": 3},
+                {"matrix": [3, 6], "x": 7.75, "y": 3},
+
+                {"matrix": [3, 8], "x": 9.75, "y": 3},
+                {"matrix": [3, 9], "x": 10.75, "y": 3},
+                {"matrix": [3, 10], "x": 11.75, "y": 3},
+                {"matrix": [3, 11], "x": 12.75, "y": 3},
+                {"matrix": [3, 12], "x": 13.75, "y": 3},
+                {"matrix": [3, 13], "x": 14.75, "y": 3, "w": 2.25},
+                {"matrix": [3, 14], "x": 17, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4},
+
+                {"matrix": [4, 1], "x": 1.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 4, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 5.25, "y": 4, "w": 2.25},
+                {"matrix": [4, 5], "x": 7.5, "y": 4},
+
+                {"matrix": [4, 8], "x": 9.5, "y": 4, "w": 2.75},
+                {"matrix": [4, 9], "x": 12.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "x": 13.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 14.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 16, "y": 4},
+                {"matrix": [4, 14], "x": 17, "y": 4},
+                {"matrix": [4, 15], "x": 18, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/sirius/uni660/rev1/rules.mk b/keyboards/sirius/uni660/rev1/rules.mk
index 7ac75072699..18d234d62a0 100644
--- a/keyboards/sirius/uni660/rev1/rules.mk
+++ b/keyboards/sirius/uni660/rev1/rules.mk
@@ -1,16 +1,3 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = yes        # Console for debug
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-UNICODE_ENABLE = yes        # Unicode
 CUSTOM_MATRIX = lite
 
 # project specific files
diff --git a/keyboards/sirius/unigo66/info.json b/keyboards/sirius/unigo66/info.json
deleted file mode 100644
index 866fd9abbf9..00000000000
--- a/keyboards/sirius/unigo66/info.json
+++ /dev/null
@@ -1,182 +0,0 @@
-{
-    "keyboard_name": "UniGo66",
-    "manufacturer": "Sirius",
-    "url": "https://discord.gg/GJ8bdM",
-    "maintainer": "qmk",
-    "usb": {
-        "vid": "0xFEED",
-        "pid": "0x1001",
-        "device_version": "19.0.1"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [2, 9], "x": 0, "y": 0, "w": 1.5},
-                {"matrix": [1, 14], "x": 1.5, "y": 0},
-                {"matrix": [1, 15], "x": 2.5, "y": 0},
-                {"matrix": [2, 0], "x": 3.5, "y": 0},
-                {"matrix": [2, 1], "x": 4.5, "y": 0},
-                {"matrix": [2, 2], "x": 5.5, "y": 0},
-                {"matrix": [2, 13], "x": 6.5, "y": 0},
-
-                {"matrix": [2, 14], "x": 9.5, "y": 0},
-                {"matrix": [2, 3], "x": 10.5, "y": 0},
-                {"matrix": [2, 4], "x": 11.5, "y": 0},
-                {"matrix": [2, 5], "x": 12.5, "y": 0},
-                {"matrix": [2, 6], "x": 13.5, "y": 0},
-                {"matrix": [2, 7], "x": 14.5, "y": 0},
-                {"matrix": [2, 10], "x": 15.5, "y": 0, "w": 1.5},
-
-                {"matrix": [2, 11], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 4], "x": 1.5, "y": 1},
-                {"matrix": [1, 10], "x": 2.5, "y": 1},
-                {"matrix": [0, 8], "x": 3.5, "y": 1},
-                {"matrix": [1, 5], "x": 4.5, "y": 1},
-                {"matrix": [1, 7], "x": 5.5, "y": 1},
-                {"matrix": [4, 11], "x": 6.5, "y": 1, "h": 1.5},
-
-                {"matrix": [2, 15], "x": 9.5, "y": 1, "h": 1.5},
-                {"matrix": [1, 12], "x": 10.5, "y": 1},
-                {"matrix": [1, 8], "x": 11.5, "y": 1},
-                {"matrix": [0, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 2], "x": 13.5, "y": 1},
-                {"matrix": [1, 3], "x": 14.5, "y": 1},
-                {"matrix": [3, 1], "x": 15.5, "y": 1, "w": 1.5},
-
-                {"matrix": [3, 9], "x": 0, "y": 2, "w": 1.5},
-                {"matrix": [0, 4], "x": 1.5, "y": 2},
-                {"matrix": [1, 6], "x": 2.5, "y": 2},
-                {"matrix": [0, 7], "x": 3.5, "y": 2},
-                {"matrix": [0, 9], "x": 4.5, "y": 2},
-                {"matrix": [0, 10], "x": 5.5, "y": 2},
-
-                {"matrix": [0, 11], "x": 10.5, "y": 2},
-                {"matrix": [0, 13], "x": 11.5, "y": 2},
-                {"matrix": [0, 14], "x": 12.5, "y": 2},
-                {"matrix": [0, 15], "x": 13.5, "y": 2},
-                {"matrix": [3, 3], "x": 14.5, "y": 2},
-                {"matrix": [3, 4], "x": 15.5, "y": 2, "w": 1.5},
-
-                {"matrix": [14, 1], "x": 0, "y": 3, "w": 1.5},
-                {"matrix": [1, 13], "x": 1.5, "y": 3},
-                {"matrix": [1, 11], "x": 2.5, "y": 3},
-                {"matrix": [0, 6], "x": 3.5, "y": 3},
-                {"matrix": [1, 9], "x": 4.5, "y": 3},
-                {"matrix": [0, 5], "x": 5.5, "y": 3},
-                {"matrix": [4, 14], "x": 6.5, "y": 2.5, "h": 1.5},
-
-                {"matrix": [3, 0], "x": 9.5, "y": 2.5, "h": 1.5},
-                {"matrix": [1, 1], "x": 10.5, "y": 3},
-                {"matrix": [1, 0], "x": 11.5, "y": 3},
-                {"matrix": [3, 6], "x": 12.5, "y": 3},
-                {"matrix": [3, 7], "x": 13.5, "y": 3},
-                {"matrix": [5, 2], "x": 14.5, "y": 3},
-                {"matrix": [14, 5], "x": 15.5, "y": 3, "w": 1.5},
-
-                {"matrix": [14, 0], "x": 0.5, "y": 4},
-                {"matrix": [14, 3], "x": 1.5, "y": 4},
-                {"matrix": [14, 2], "x": 2.5, "y": 4},
-                {"matrix": [5, 0], "x": 13.5, "y": 4},
-                {"matrix": [5, 1], "x": 14.5, "y": 4},
-                {"matrix": [4, 15], "x": 15.5, "y": 4},
-
-                {"matrix": [2, 12], "x": 5.5, "y": 5},
-                {"matrix": [4, 9], "x": 6.5, "y": 5},
-
-                {"matrix": [4, 10], "x": 9.5, "y": 5},
-                {"matrix": [2, 8], "x": 10.5, "y": 5},
-
-                {"matrix": [14, 6], "x": 5.5, "y": 6},
-                {"matrix": [4, 12], "x": 6.5, "y": 6},
-
-                {"matrix": [4, 13], "x": 9.5, "y": 6},
-                {"matrix": [14, 4], "x": 10.5, "y": 6}
-            ]
-        },
-        "LAYOUT_beta_pcb": {
-            "layout": [
-                {"matrix": [1, 13], "x": 0, "y": 0, "w": 1.5},
-                {"matrix": [1, 14], "x": 1.5, "y": 0},
-                {"matrix": [3, 0], "x": 2.5, "y": 0},
-                {"matrix": [2, 15], "x": 3.5, "y": 0},
-                {"matrix": [4, 5], "x": 4.5, "y": 0},
-                {"matrix": [3, 11], "x": 5.5, "y": 0},
-                {"matrix": [14, 6], "x": 6.5, "y": 0},
-
-                {"matrix": [14, 2], "x": 9.5, "y": 0},
-                {"matrix": [3, 10], "x": 10.5, "y": 0},
-                {"matrix": [3, 9], "x": 11.5, "y": 0},
-                {"matrix": [1, 4], "x": 12.5, "y": 0},
-                {"matrix": [0, 4], "x": 13.5, "y": 0},
-                {"matrix": [0, 9], "x": 14.5, "y": 0},
-                {"matrix": [0, 7], "x": 15.5, "y": 0, "w": 1.5},
-
-                {"matrix": [2, 9], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 5], "x": 1.5, "y": 1},
-                {"matrix": [3, 12], "x": 2.5, "y": 1},
-                {"matrix": [3, 13], "x": 3.5, "y": 1},
-                {"matrix": [3, 14], "x": 4.5, "y": 1},
-                {"matrix": [3, 15], "x": 5.5, "y": 1},
-                {"matrix": [5, 8], "x": 6.5, "y": 1, "h": 1.5},
-
-                {"matrix": [5, 0], "x": 9.5, "y": 1, "h": 1.5},
-                {"matrix": [2, 12], "x": 10.5, "y": 1},
-                {"matrix": [1, 1], "x": 11.5, "y": 1},
-                {"matrix": [0, 5], "x": 12.5, "y": 1},
-                {"matrix": [5, 5], "x": 13.5, "y": 1},
-                {"matrix": [1, 0], "x": 14.5, "y": 1},
-                {"matrix": [0, 6], "x": 15.5, "y": 1, "w": 1.5},
-
-                {"matrix": [3, 1], "x": 0, "y": 2, "w": 1.5},
-                {"matrix": [5, 15], "x": 1.5, "y": 2},
-                {"matrix": [5, 14], "x": 2.5, "y": 2},
-                {"matrix": [6, 1], "x": 3.5, "y": 2},
-                {"matrix": [2, 10], "x": 4.5, "y": 2},
-                {"matrix": [3, 8], "x": 5.5, "y": 2},
-
-                {"matrix": [4, 12], "x": 10.5, "y": 2},
-                {"matrix": [5, 7], "x": 11.5, "y": 2},
-                {"matrix": [5, 3], "x": 12.5, "y": 2},
-                {"matrix": [5, 11], "x": 13.5, "y": 2},
-                {"matrix": [5, 10], "x": 14.5, "y": 2},
-                {"matrix": [0, 8], "x": 15.5, "y": 2, "w": 1.5},
-
-                {"matrix": [3, 5], "x": 0, "y": 3, "w": 1.5},
-                {"matrix": [5, 13], "x": 1.5, "y": 3},
-                {"matrix": [1, 7], "x": 2.5, "y": 3},
-                {"matrix": [1, 11], "x": 3.5, "y": 3},
-                {"matrix": [1, 10], "x": 4.5, "y": 3},
-                {"matrix": [5, 2], "x": 5.5, "y": 3},
-                {"matrix": [5, 6], "x": 6.5, "y": 2.5, "h": 1.5},
-
-                {"matrix": [5, 1], "x": 9.5, "y": 2.5, "h": 1.5},
-                {"matrix": [4, 13], "x": 10.5, "y": 3},
-                {"matrix": [2, 3], "x": 11.5, "y": 3},
-                {"matrix": [1, 12], "x": 12.5, "y": 3},
-                {"matrix": [1, 3], "x": 13.5, "y": 3},
-                {"matrix": [2, 14], "x": 14.5, "y": 3},
-                {"matrix": [0, 12], "x": 15.5, "y": 3, "w": 1.5},
-
-                {"matrix": [5, 12], "x": 0.5, "y": 4},
-                {"matrix": [0, 10], "x": 1.5, "y": 4},
-                {"matrix": [0, 15], "x": 2.5, "y": 4},
-
-                {"matrix": [3, 6], "x": 13.5, "y": 4},
-                {"matrix": [0, 14], "x": 14.5, "y": 4},
-                {"matrix": [3, 7], "x": 15.5, "y": 4},
-
-                {"matrix": [14, 4], "x": 5.5, "y": 5, "h": 2},
-                {"matrix": [4, 9], "x": 6.5, "y": 5},
-
-                {"matrix": [4, 11], "x": 9.5, "y": 5},
-                {"matrix": [14, 0], "x": 10.5, "y": 5, "h": 2},
-
-                {"matrix": [14, 5], "x": 6.5, "y": 6},
-
-                {"matrix": [14, 1], "x": 9.5, "y": 6}
-            ]
-        }
-    }
-}
diff --git a/keyboards/sirius/unigo66/keyboard.json b/keyboards/sirius/unigo66/keyboard.json
new file mode 100644
index 00000000000..ac683a0f1db
--- /dev/null
+++ b/keyboards/sirius/unigo66/keyboard.json
@@ -0,0 +1,190 @@
+{
+    "keyboard_name": "UniGo66",
+    "manufacturer": "Sirius",
+    "url": "https://discord.gg/GJ8bdM",
+    "maintainer": "qmk",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0x1001",
+        "device_version": "19.0.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": false,
+        "nkro": false,
+        "rgblight": false,
+        "usb_hid": true
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [2, 9], "x": 0, "y": 0, "w": 1.5},
+                {"matrix": [1, 14], "x": 1.5, "y": 0},
+                {"matrix": [1, 15], "x": 2.5, "y": 0},
+                {"matrix": [2, 0], "x": 3.5, "y": 0},
+                {"matrix": [2, 1], "x": 4.5, "y": 0},
+                {"matrix": [2, 2], "x": 5.5, "y": 0},
+                {"matrix": [2, 13], "x": 6.5, "y": 0},
+
+                {"matrix": [2, 14], "x": 9.5, "y": 0},
+                {"matrix": [2, 3], "x": 10.5, "y": 0},
+                {"matrix": [2, 4], "x": 11.5, "y": 0},
+                {"matrix": [2, 5], "x": 12.5, "y": 0},
+                {"matrix": [2, 6], "x": 13.5, "y": 0},
+                {"matrix": [2, 7], "x": 14.5, "y": 0},
+                {"matrix": [2, 10], "x": 15.5, "y": 0, "w": 1.5},
+
+                {"matrix": [2, 11], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 4], "x": 1.5, "y": 1},
+                {"matrix": [1, 10], "x": 2.5, "y": 1},
+                {"matrix": [0, 8], "x": 3.5, "y": 1},
+                {"matrix": [1, 5], "x": 4.5, "y": 1},
+                {"matrix": [1, 7], "x": 5.5, "y": 1},
+                {"matrix": [4, 11], "x": 6.5, "y": 1, "h": 1.5},
+
+                {"matrix": [2, 15], "x": 9.5, "y": 1, "h": 1.5},
+                {"matrix": [1, 12], "x": 10.5, "y": 1},
+                {"matrix": [1, 8], "x": 11.5, "y": 1},
+                {"matrix": [0, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 2], "x": 13.5, "y": 1},
+                {"matrix": [1, 3], "x": 14.5, "y": 1},
+                {"matrix": [3, 1], "x": 15.5, "y": 1, "w": 1.5},
+
+                {"matrix": [3, 9], "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [0, 4], "x": 1.5, "y": 2},
+                {"matrix": [1, 6], "x": 2.5, "y": 2},
+                {"matrix": [0, 7], "x": 3.5, "y": 2},
+                {"matrix": [0, 9], "x": 4.5, "y": 2},
+                {"matrix": [0, 10], "x": 5.5, "y": 2},
+
+                {"matrix": [0, 11], "x": 10.5, "y": 2},
+                {"matrix": [0, 13], "x": 11.5, "y": 2},
+                {"matrix": [0, 14], "x": 12.5, "y": 2},
+                {"matrix": [0, 15], "x": 13.5, "y": 2},
+                {"matrix": [3, 3], "x": 14.5, "y": 2},
+                {"matrix": [3, 4], "x": 15.5, "y": 2, "w": 1.5},
+
+                {"matrix": [14, 1], "x": 0, "y": 3, "w": 1.5},
+                {"matrix": [1, 13], "x": 1.5, "y": 3},
+                {"matrix": [1, 11], "x": 2.5, "y": 3},
+                {"matrix": [0, 6], "x": 3.5, "y": 3},
+                {"matrix": [1, 9], "x": 4.5, "y": 3},
+                {"matrix": [0, 5], "x": 5.5, "y": 3},
+                {"matrix": [4, 14], "x": 6.5, "y": 2.5, "h": 1.5},
+
+                {"matrix": [3, 0], "x": 9.5, "y": 2.5, "h": 1.5},
+                {"matrix": [1, 1], "x": 10.5, "y": 3},
+                {"matrix": [1, 0], "x": 11.5, "y": 3},
+                {"matrix": [3, 6], "x": 12.5, "y": 3},
+                {"matrix": [3, 7], "x": 13.5, "y": 3},
+                {"matrix": [5, 2], "x": 14.5, "y": 3},
+                {"matrix": [14, 5], "x": 15.5, "y": 3, "w": 1.5},
+
+                {"matrix": [14, 0], "x": 0.5, "y": 4},
+                {"matrix": [14, 3], "x": 1.5, "y": 4},
+                {"matrix": [14, 2], "x": 2.5, "y": 4},
+                {"matrix": [5, 0], "x": 13.5, "y": 4},
+                {"matrix": [5, 1], "x": 14.5, "y": 4},
+                {"matrix": [4, 15], "x": 15.5, "y": 4},
+
+                {"matrix": [2, 12], "x": 5.5, "y": 5},
+                {"matrix": [4, 9], "x": 6.5, "y": 5},
+
+                {"matrix": [4, 10], "x": 9.5, "y": 5},
+                {"matrix": [2, 8], "x": 10.5, "y": 5},
+
+                {"matrix": [14, 6], "x": 5.5, "y": 6},
+                {"matrix": [4, 12], "x": 6.5, "y": 6},
+
+                {"matrix": [4, 13], "x": 9.5, "y": 6},
+                {"matrix": [14, 4], "x": 10.5, "y": 6}
+            ]
+        },
+        "LAYOUT_beta_pcb": {
+            "layout": [
+                {"matrix": [1, 13], "x": 0, "y": 0, "w": 1.5},
+                {"matrix": [1, 14], "x": 1.5, "y": 0},
+                {"matrix": [3, 0], "x": 2.5, "y": 0},
+                {"matrix": [2, 15], "x": 3.5, "y": 0},
+                {"matrix": [4, 5], "x": 4.5, "y": 0},
+                {"matrix": [3, 11], "x": 5.5, "y": 0},
+                {"matrix": [14, 6], "x": 6.5, "y": 0},
+
+                {"matrix": [14, 2], "x": 9.5, "y": 0},
+                {"matrix": [3, 10], "x": 10.5, "y": 0},
+                {"matrix": [3, 9], "x": 11.5, "y": 0},
+                {"matrix": [1, 4], "x": 12.5, "y": 0},
+                {"matrix": [0, 4], "x": 13.5, "y": 0},
+                {"matrix": [0, 9], "x": 14.5, "y": 0},
+                {"matrix": [0, 7], "x": 15.5, "y": 0, "w": 1.5},
+
+                {"matrix": [2, 9], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 5], "x": 1.5, "y": 1},
+                {"matrix": [3, 12], "x": 2.5, "y": 1},
+                {"matrix": [3, 13], "x": 3.5, "y": 1},
+                {"matrix": [3, 14], "x": 4.5, "y": 1},
+                {"matrix": [3, 15], "x": 5.5, "y": 1},
+                {"matrix": [5, 8], "x": 6.5, "y": 1, "h": 1.5},
+
+                {"matrix": [5, 0], "x": 9.5, "y": 1, "h": 1.5},
+                {"matrix": [2, 12], "x": 10.5, "y": 1},
+                {"matrix": [1, 1], "x": 11.5, "y": 1},
+                {"matrix": [0, 5], "x": 12.5, "y": 1},
+                {"matrix": [5, 5], "x": 13.5, "y": 1},
+                {"matrix": [1, 0], "x": 14.5, "y": 1},
+                {"matrix": [0, 6], "x": 15.5, "y": 1, "w": 1.5},
+
+                {"matrix": [3, 1], "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [5, 15], "x": 1.5, "y": 2},
+                {"matrix": [5, 14], "x": 2.5, "y": 2},
+                {"matrix": [6, 1], "x": 3.5, "y": 2},
+                {"matrix": [2, 10], "x": 4.5, "y": 2},
+                {"matrix": [3, 8], "x": 5.5, "y": 2},
+
+                {"matrix": [4, 12], "x": 10.5, "y": 2},
+                {"matrix": [5, 7], "x": 11.5, "y": 2},
+                {"matrix": [5, 3], "x": 12.5, "y": 2},
+                {"matrix": [5, 11], "x": 13.5, "y": 2},
+                {"matrix": [5, 10], "x": 14.5, "y": 2},
+                {"matrix": [0, 8], "x": 15.5, "y": 2, "w": 1.5},
+
+                {"matrix": [3, 5], "x": 0, "y": 3, "w": 1.5},
+                {"matrix": [5, 13], "x": 1.5, "y": 3},
+                {"matrix": [1, 7], "x": 2.5, "y": 3},
+                {"matrix": [1, 11], "x": 3.5, "y": 3},
+                {"matrix": [1, 10], "x": 4.5, "y": 3},
+                {"matrix": [5, 2], "x": 5.5, "y": 3},
+                {"matrix": [5, 6], "x": 6.5, "y": 2.5, "h": 1.5},
+
+                {"matrix": [5, 1], "x": 9.5, "y": 2.5, "h": 1.5},
+                {"matrix": [4, 13], "x": 10.5, "y": 3},
+                {"matrix": [2, 3], "x": 11.5, "y": 3},
+                {"matrix": [1, 12], "x": 12.5, "y": 3},
+                {"matrix": [1, 3], "x": 13.5, "y": 3},
+                {"matrix": [2, 14], "x": 14.5, "y": 3},
+                {"matrix": [0, 12], "x": 15.5, "y": 3, "w": 1.5},
+
+                {"matrix": [5, 12], "x": 0.5, "y": 4},
+                {"matrix": [0, 10], "x": 1.5, "y": 4},
+                {"matrix": [0, 15], "x": 2.5, "y": 4},
+
+                {"matrix": [3, 6], "x": 13.5, "y": 4},
+                {"matrix": [0, 14], "x": 14.5, "y": 4},
+                {"matrix": [3, 7], "x": 15.5, "y": 4},
+
+                {"matrix": [14, 4], "x": 5.5, "y": 5, "h": 2},
+                {"matrix": [4, 9], "x": 6.5, "y": 5},
+
+                {"matrix": [4, 11], "x": 9.5, "y": 5},
+                {"matrix": [14, 0], "x": 10.5, "y": 5, "h": 2},
+
+                {"matrix": [14, 5], "x": 6.5, "y": 6},
+
+                {"matrix": [14, 1], "x": 9.5, "y": 6}
+            ]
+        }
+    }
+}
diff --git a/keyboards/sirius/unigo66/rules.mk b/keyboards/sirius/unigo66/rules.mk
index 6cf02169cf6..56889eab51a 100644
--- a/keyboards/sirius/unigo66/rules.mk
+++ b/keyboards/sirius/unigo66/rules.mk
@@ -1,18 +1,3 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
-USB_HID_ENABLE = yes
-
 CUSTOM_MATRIX = yes
 SRC += custom_matrix.cpp\
 	main.c
diff --git a/keyboards/sixkeyboard/info.json b/keyboards/sixkeyboard/info.json
deleted file mode 100644
index 247b255a363..00000000000
--- a/keyboards/sixkeyboard/info.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-  "keyboard_name": "SixKeyBoard",
-  "manufacturer": "TechKeys",
-  "url": "",
-  "maintainer": "qmk",
-  "usb": {
-    "vid": "0x746B",
-    "pid": "0x736B",
-    "device_version": "0.0.1",
-    "force_nkro": true
-  },
-  "processor": "atmega16u2",
-  "bootloader": "atmel-dfu",
-  "community_layouts": ["ortho_2x3"],
-  "layouts": {
-    "LAYOUT_ortho_2x3": {
-      "layout": [
-        {"matrix": [0, 0], "x": 0, "y": 0},
-        {"matrix": [0, 1], "x": 1, "y": 0},
-        {"matrix": [0, 2], "x": 2, "y": 0},
-
-        {"matrix": [1, 0], "x": 0, "y": 1},
-        {"matrix": [1, 1], "x": 1, "y": 1},
-        {"matrix": [1, 2], "x": 2, "y": 1}
-      ]
-    }
-  }
-}
diff --git a/keyboards/sixkeyboard/keyboard.json b/keyboards/sixkeyboard/keyboard.json
new file mode 100644
index 00000000000..aff5c985f79
--- /dev/null
+++ b/keyboards/sixkeyboard/keyboard.json
@@ -0,0 +1,34 @@
+{
+  "keyboard_name": "SixKeyBoard",
+  "manufacturer": "TechKeys",
+  "url": "",
+  "maintainer": "qmk",
+  "usb": {
+    "vid": "0x746B",
+    "pid": "0x736B",
+    "device_version": "0.0.1",
+    "force_nkro": true
+  },
+  "features": {
+    "bootmagic": false,
+    "extrakey": false,
+    "mousekey": false,
+    "nkro": false
+  },
+  "processor": "atmega16u2",
+  "bootloader": "atmel-dfu",
+  "community_layouts": ["ortho_2x3"],
+  "layouts": {
+    "LAYOUT_ortho_2x3": {
+      "layout": [
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1},
+        {"matrix": [1, 1], "x": 1, "y": 1},
+        {"matrix": [1, 2], "x": 2, "y": 1}
+      ]
+    }
+  }
+}
diff --git a/keyboards/sixkeyboard/rules.mk b/keyboards/sixkeyboard/rules.mk
index d1d7bc48818..09c02c88b0d 100644
--- a/keyboards/sixkeyboard/rules.mk
+++ b/keyboards/sixkeyboard/rules.mk
@@ -1,14 +1,3 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no		# Mouse keys
-EXTRAKEY_ENABLE = no		# Audio control and System control
-CONSOLE_ENABLE = no		# Console for debug
-COMMAND_ENABLE = no		# Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no	# Enable keyboard backlight functionality
-AUDIO_ENABLE = no
 CUSTOM_MATRIX = yes
 
 SRC += matrix.c
diff --git a/keyboards/skergo/config.h b/keyboards/skergo/config.h
deleted file mode 100644
index a463c64167e..00000000000
--- a/keyboards/skergo/config.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Copyright (C) 2021  Keyz.io Ltd.
-*
-* 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 3 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
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/skergo/info.json b/keyboards/skergo/info.json
deleted file mode 100644
index 0e68b6aedd7..00000000000
--- a/keyboards/skergo/info.json
+++ /dev/null
@@ -1,194 +0,0 @@
-{
-    "keyboard_name": "SKErgo",
-    "manufacturer": "Keyzio",
-    "url": "https://keyz.io",
-    "maintainer": "kevinzhao-tech",
-    "usb": {
-        "vid": "0x4B49",
-        "pid": "0x534B",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["A1", "A2", "A3", "A4", "A5", "A6", "A7", "C7", "C6", "C5", "C4", "C2", "C1", "C0", "D7"],
-        "rows": ["B0", "B4", "B3", "B2", "B1"]
-    },
-    "diode_direction": "COL2ROW",
-    "processor": "atmega32a",
-    "bootloader": "usbasploader",
-    "layout_aliases": {
-        "LAYOUT_all": "LAYOUT_split_bs"
-    },
-    "layouts": {
-        "LAYOUT_2u_bs": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0.5, "y": 0.25},
-                {"matrix": [0, 1], "x": 1.5, "y": 0.25},
-                {"matrix": [0, 2], "x": 2.5, "y": 0.25},
-                {"matrix": [0, 3], "x": 3.5, "y": 0.25},
-                {"matrix": [0, 4], "x": 4.5, "y": 0.25},
-                {"matrix": [0, 5], "x": 5.5, "y": 0.25},
-                {"matrix": [0, 6], "x": 6.5, "y": 0.25},
-
-                {"matrix": [0, 7], "x": 8.75, "y": 0.25},
-                {"matrix": [0, 8], "x": 9.75, "y": 0.25},
-                {"matrix": [0, 9], "x": 10.75, "y": 0.25},
-                {"matrix": [0, 10], "x": 11.75, "y": 0.25},
-                {"matrix": [0, 11], "x": 12.75, "y": 0.25},
-                {"matrix": [0, 12], "x": 13.75, "y": 0.25},
-                {"matrix": [0, 14], "x": 14.75, "y": 0.25, "w": 2},
-
-                {"matrix": [1, 14], "x": 17, "y": 0},
-
-                {"matrix": [1, 0], "x": 0.25, "y": 1.25, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.75, "y": 1.25},
-                {"matrix": [1, 2], "x": 2.75, "y": 1.25},
-                {"matrix": [1, 3], "x": 3.75, "y": 1.25},
-                {"matrix": [1, 4], "x": 4.75, "y": 1.25},
-                {"matrix": [1, 5], "x": 5.75, "y": 1.25},
-
-                {"matrix": [1, 6], "x": 8.4, "y": 1.25},
-                {"matrix": [1, 7], "x": 9.4, "y": 1.25},
-                {"matrix": [1, 8], "x": 10.4, "y": 1.25},
-                {"matrix": [1, 9], "x": 11.4, "y": 1.25},
-                {"matrix": [1, 10], "x": 12.4, "y": 1.25},
-                {"matrix": [1, 11], "x": 13.4, "y": 1.25},
-                {"matrix": [1, 12], "x": 14.4, "y": 1.25},
-                {"matrix": [1, 13], "x": 15.4, "y": 1.25, "w": 1.5},
-
-                {"matrix": [2, 14], "x": 17.15, "y": 1},
-
-                {"matrix": [2, 0], "x": 0.15, "y": 2.25, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.9, "y": 2.25},
-                {"matrix": [2, 2], "x": 2.9, "y": 2.25},
-                {"matrix": [2, 3], "x": 3.9, "y": 2.25},
-                {"matrix": [2, 4], "x": 4.9, "y": 2.25},
-                {"matrix": [2, 5], "x": 5.9, "y": 2.25},
-
-                {"matrix": [2, 6], "x": 8.75, "y": 2.25},
-                {"matrix": [2, 7], "x": 9.75, "y": 2.25},
-                {"matrix": [2, 8], "x": 10.75, "y": 2.25},
-                {"matrix": [2, 9], "x": 11.75, "y": 2.25},
-                {"matrix": [2, 10], "x": 12.75, "y": 2.25},
-                {"matrix": [2, 11], "x": 13.75, "y": 2.25},
-                {"matrix": [2, 12], "x": 14.75, "y": 2.25, "w": 2.25},
-
-                {"matrix": [3, 14], "x": 17.25, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 2.25},
-                {"matrix": [3, 1], "x": 2.25, "y": 3.25},
-                {"matrix": [3, 2], "x": 3.25, "y": 3.25},
-                {"matrix": [3, 3], "x": 4.25, "y": 3.25},
-                {"matrix": [3, 4], "x": 5.25, "y": 3.25},
-                {"matrix": [3, 5], "x": 6.25, "y": 3.25},
-
-                {"matrix": [4, 6], "x": 8.25, "y": 3.25},
-                {"matrix": [3, 6], "x": 9.25, "y": 3.25},
-                {"matrix": [3, 7], "x": 10.25, "y": 3.25},
-                {"matrix": [3, 8], "x": 11.25, "y": 3.25},
-                {"matrix": [3, 9], "x": 12.25, "y": 3.25},
-                {"matrix": [3, 10], "x": 13.25, "y": 3.25},
-                {"matrix": [3, 11], "x": 14.25, "y": 3.25, "w": 1.75},
-
-                {"matrix": [3, 13], "x": 16.25, "y": 3.5},
-
-                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.5},
-                {"matrix": [4, 2], "x": 3.25, "y": 4.25, "w": 1.5},
-                {"matrix": [4, 4], "x": 4.75, "y": 4.25, "w": 2},
-                {"matrix": [4, 5], "x": 6.75, "y": 4.25},
-
-                {"matrix": [4, 7], "x": 8.75, "y": 4.25, "w": 2.75},
-                {"matrix": [4, 9], "x": 11.5, "y": 4.25, "w": 1.5},
-
-                {"matrix": [4, 12], "x": 15.25, "y": 4.5},
-                {"matrix": [4, 13], "x": 16.25, "y": 4.5},
-                {"matrix": [4, 14], "x": 17.25, "y": 4.5}
-            ]
-        },
-        "LAYOUT_split_bs": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0.5, "y": 0.25},
-                {"matrix": [0, 1], "x": 1.5, "y": 0.25},
-                {"matrix": [0, 2], "x": 2.5, "y": 0.25},
-                {"matrix": [0, 3], "x": 3.5, "y": 0.25},
-                {"matrix": [0, 4], "x": 4.5, "y": 0.25},
-                {"matrix": [0, 5], "x": 5.5, "y": 0.25},
-                {"matrix": [0, 6], "x": 6.5, "y": 0.25},
-
-                {"matrix": [0, 7], "x": 8.75, "y": 0.25},
-                {"matrix": [0, 8], "x": 9.75, "y": 0.25},
-                {"matrix": [0, 9], "x": 10.75, "y": 0.25},
-                {"matrix": [0, 10], "x": 11.75, "y": 0.25},
-                {"matrix": [0, 11], "x": 12.75, "y": 0.25},
-                {"matrix": [0, 12], "x": 13.75, "y": 0.25},
-                {"matrix": [0, 13], "x": 14.75, "y": 0.25},
-                {"matrix": [0, 14], "x": 15.75, "y": 0.25},
-
-                {"matrix": [1, 14], "x": 17, "y": 0},
-
-                {"matrix": [1, 0], "x": 0.25, "y": 1.25, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.75, "y": 1.25},
-                {"matrix": [1, 2], "x": 2.75, "y": 1.25},
-                {"matrix": [1, 3], "x": 3.75, "y": 1.25},
-                {"matrix": [1, 4], "x": 4.75, "y": 1.25},
-                {"matrix": [1, 5], "x": 5.75, "y": 1.25},
-
-                {"matrix": [1, 6], "x": 8.4, "y": 1.25},
-                {"matrix": [1, 7], "x": 9.4, "y": 1.25},
-                {"matrix": [1, 8], "x": 10.4, "y": 1.25},
-                {"matrix": [1, 9], "x": 11.4, "y": 1.25},
-                {"matrix": [1, 10], "x": 12.4, "y": 1.25},
-                {"matrix": [1, 11], "x": 13.4, "y": 1.25},
-                {"matrix": [1, 12], "x": 14.4, "y": 1.25},
-                {"matrix": [1, 13], "x": 15.4, "y": 1.25, "w": 1.5},
-
-                {"matrix": [2, 14], "x": 17.15, "y": 1},
-
-                {"matrix": [2, 0], "x": 0.15, "y": 2.25, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.9, "y": 2.25},
-                {"matrix": [2, 2], "x": 2.9, "y": 2.25},
-                {"matrix": [2, 3], "x": 3.9, "y": 2.25},
-                {"matrix": [2, 4], "x": 4.9, "y": 2.25},
-                {"matrix": [2, 5], "x": 5.9, "y": 2.25},
-
-                {"matrix": [2, 6], "x": 8.75, "y": 2.25},
-                {"matrix": [2, 7], "x": 9.75, "y": 2.25},
-                {"matrix": [2, 8], "x": 10.75, "y": 2.25},
-                {"matrix": [2, 9], "x": 11.75, "y": 2.25},
-                {"matrix": [2, 10], "x": 12.75, "y": 2.25},
-                {"matrix": [2, 11], "x": 13.75, "y": 2.25},
-                {"matrix": [2, 12], "x": 14.75, "y": 2.25, "w": 2.25},
-
-                {"matrix": [3, 14], "x": 17.25, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 2.25},
-                {"matrix": [3, 1], "x": 2.25, "y": 3.25},
-                {"matrix": [3, 2], "x": 3.25, "y": 3.25},
-                {"matrix": [3, 3], "x": 4.25, "y": 3.25},
-                {"matrix": [3, 4], "x": 5.25, "y": 3.25},
-                {"matrix": [3, 5], "x": 6.25, "y": 3.25},
-
-                {"matrix": [4, 6], "x": 8.25, "y": 3.25},
-                {"matrix": [3, 6], "x": 9.25, "y": 3.25},
-                {"matrix": [3, 7], "x": 10.25, "y": 3.25},
-                {"matrix": [3, 8], "x": 11.25, "y": 3.25},
-                {"matrix": [3, 9], "x": 12.25, "y": 3.25},
-                {"matrix": [3, 10], "x": 13.25, "y": 3.25},
-                {"matrix": [3, 11], "x": 14.25, "y": 3.25, "w": 1.75},
-
-                {"matrix": [3, 13], "x": 16.25, "y": 3.5},
-
-                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.5},
-                {"matrix": [4, 2], "x": 3.25, "y": 4.25, "w": 1.5},
-                {"matrix": [4, 4], "x": 4.75, "y": 4.25, "w": 2},
-                {"matrix": [4, 5], "x": 6.75, "y": 4.25},
-
-                {"matrix": [4, 7], "x": 8.75, "y": 4.25, "w": 2.75},
-                {"matrix": [4, 9], "x": 11.5, "y": 4.25, "w": 1.5},
-
-                {"matrix": [4, 12], "x": 15.25, "y": 4.5},
-                {"matrix": [4, 13], "x": 16.25, "y": 4.5},
-                {"matrix": [4, 14], "x": 17.25, "y": 4.5}
-            ]
-        }
-    }
-}
diff --git a/keyboards/skergo/keyboard.json b/keyboards/skergo/keyboard.json
new file mode 100644
index 00000000000..49ff7b81b6e
--- /dev/null
+++ b/keyboards/skergo/keyboard.json
@@ -0,0 +1,206 @@
+{
+    "keyboard_name": "SKErgo",
+    "manufacturer": "Keyzio",
+    "url": "https://keyz.io",
+    "maintainer": "kevinzhao-tech",
+    "usb": {
+        "vid": "0x4B49",
+        "pid": "0x534B",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": false
+    },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
+    "matrix_pins": {
+        "cols": ["A1", "A2", "A3", "A4", "A5", "A6", "A7", "C7", "C6", "C5", "C4", "C2", "C1", "C0", "D7"],
+        "rows": ["B0", "B4", "B3", "B2", "B1"]
+    },
+    "diode_direction": "COL2ROW",
+    "processor": "atmega32a",
+    "bootloader": "usbasploader",
+    "layout_aliases": {
+        "LAYOUT_all": "LAYOUT_split_bs"
+    },
+    "layouts": {
+        "LAYOUT_2u_bs": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0.5, "y": 0.25},
+                {"matrix": [0, 1], "x": 1.5, "y": 0.25},
+                {"matrix": [0, 2], "x": 2.5, "y": 0.25},
+                {"matrix": [0, 3], "x": 3.5, "y": 0.25},
+                {"matrix": [0, 4], "x": 4.5, "y": 0.25},
+                {"matrix": [0, 5], "x": 5.5, "y": 0.25},
+                {"matrix": [0, 6], "x": 6.5, "y": 0.25},
+
+                {"matrix": [0, 7], "x": 8.75, "y": 0.25},
+                {"matrix": [0, 8], "x": 9.75, "y": 0.25},
+                {"matrix": [0, 9], "x": 10.75, "y": 0.25},
+                {"matrix": [0, 10], "x": 11.75, "y": 0.25},
+                {"matrix": [0, 11], "x": 12.75, "y": 0.25},
+                {"matrix": [0, 12], "x": 13.75, "y": 0.25},
+                {"matrix": [0, 14], "x": 14.75, "y": 0.25, "w": 2},
+
+                {"matrix": [1, 14], "x": 17, "y": 0},
+
+                {"matrix": [1, 0], "x": 0.25, "y": 1.25, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.75, "y": 1.25},
+                {"matrix": [1, 2], "x": 2.75, "y": 1.25},
+                {"matrix": [1, 3], "x": 3.75, "y": 1.25},
+                {"matrix": [1, 4], "x": 4.75, "y": 1.25},
+                {"matrix": [1, 5], "x": 5.75, "y": 1.25},
+
+                {"matrix": [1, 6], "x": 8.4, "y": 1.25},
+                {"matrix": [1, 7], "x": 9.4, "y": 1.25},
+                {"matrix": [1, 8], "x": 10.4, "y": 1.25},
+                {"matrix": [1, 9], "x": 11.4, "y": 1.25},
+                {"matrix": [1, 10], "x": 12.4, "y": 1.25},
+                {"matrix": [1, 11], "x": 13.4, "y": 1.25},
+                {"matrix": [1, 12], "x": 14.4, "y": 1.25},
+                {"matrix": [1, 13], "x": 15.4, "y": 1.25, "w": 1.5},
+
+                {"matrix": [2, 14], "x": 17.15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0.15, "y": 2.25, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.9, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.9, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.9, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.9, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.9, "y": 2.25},
+
+                {"matrix": [2, 6], "x": 8.75, "y": 2.25},
+                {"matrix": [2, 7], "x": 9.75, "y": 2.25},
+                {"matrix": [2, 8], "x": 10.75, "y": 2.25},
+                {"matrix": [2, 9], "x": 11.75, "y": 2.25},
+                {"matrix": [2, 10], "x": 12.75, "y": 2.25},
+                {"matrix": [2, 11], "x": 13.75, "y": 2.25},
+                {"matrix": [2, 12], "x": 14.75, "y": 2.25, "w": 2.25},
+
+                {"matrix": [3, 14], "x": 17.25, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3.25},
+                {"matrix": [3, 2], "x": 3.25, "y": 3.25},
+                {"matrix": [3, 3], "x": 4.25, "y": 3.25},
+                {"matrix": [3, 4], "x": 5.25, "y": 3.25},
+                {"matrix": [3, 5], "x": 6.25, "y": 3.25},
+
+                {"matrix": [4, 6], "x": 8.25, "y": 3.25},
+                {"matrix": [3, 6], "x": 9.25, "y": 3.25},
+                {"matrix": [3, 7], "x": 10.25, "y": 3.25},
+                {"matrix": [3, 8], "x": 11.25, "y": 3.25},
+                {"matrix": [3, 9], "x": 12.25, "y": 3.25},
+                {"matrix": [3, 10], "x": 13.25, "y": 3.25},
+                {"matrix": [3, 11], "x": 14.25, "y": 3.25, "w": 1.75},
+
+                {"matrix": [3, 13], "x": 16.25, "y": 3.5},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.5},
+                {"matrix": [4, 2], "x": 3.25, "y": 4.25, "w": 1.5},
+                {"matrix": [4, 4], "x": 4.75, "y": 4.25, "w": 2},
+                {"matrix": [4, 5], "x": 6.75, "y": 4.25},
+
+                {"matrix": [4, 7], "x": 8.75, "y": 4.25, "w": 2.75},
+                {"matrix": [4, 9], "x": 11.5, "y": 4.25, "w": 1.5},
+
+                {"matrix": [4, 12], "x": 15.25, "y": 4.5},
+                {"matrix": [4, 13], "x": 16.25, "y": 4.5},
+                {"matrix": [4, 14], "x": 17.25, "y": 4.5}
+            ]
+        },
+        "LAYOUT_split_bs": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0.5, "y": 0.25},
+                {"matrix": [0, 1], "x": 1.5, "y": 0.25},
+                {"matrix": [0, 2], "x": 2.5, "y": 0.25},
+                {"matrix": [0, 3], "x": 3.5, "y": 0.25},
+                {"matrix": [0, 4], "x": 4.5, "y": 0.25},
+                {"matrix": [0, 5], "x": 5.5, "y": 0.25},
+                {"matrix": [0, 6], "x": 6.5, "y": 0.25},
+
+                {"matrix": [0, 7], "x": 8.75, "y": 0.25},
+                {"matrix": [0, 8], "x": 9.75, "y": 0.25},
+                {"matrix": [0, 9], "x": 10.75, "y": 0.25},
+                {"matrix": [0, 10], "x": 11.75, "y": 0.25},
+                {"matrix": [0, 11], "x": 12.75, "y": 0.25},
+                {"matrix": [0, 12], "x": 13.75, "y": 0.25},
+                {"matrix": [0, 13], "x": 14.75, "y": 0.25},
+                {"matrix": [0, 14], "x": 15.75, "y": 0.25},
+
+                {"matrix": [1, 14], "x": 17, "y": 0},
+
+                {"matrix": [1, 0], "x": 0.25, "y": 1.25, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.75, "y": 1.25},
+                {"matrix": [1, 2], "x": 2.75, "y": 1.25},
+                {"matrix": [1, 3], "x": 3.75, "y": 1.25},
+                {"matrix": [1, 4], "x": 4.75, "y": 1.25},
+                {"matrix": [1, 5], "x": 5.75, "y": 1.25},
+
+                {"matrix": [1, 6], "x": 8.4, "y": 1.25},
+                {"matrix": [1, 7], "x": 9.4, "y": 1.25},
+                {"matrix": [1, 8], "x": 10.4, "y": 1.25},
+                {"matrix": [1, 9], "x": 11.4, "y": 1.25},
+                {"matrix": [1, 10], "x": 12.4, "y": 1.25},
+                {"matrix": [1, 11], "x": 13.4, "y": 1.25},
+                {"matrix": [1, 12], "x": 14.4, "y": 1.25},
+                {"matrix": [1, 13], "x": 15.4, "y": 1.25, "w": 1.5},
+
+                {"matrix": [2, 14], "x": 17.15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0.15, "y": 2.25, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.9, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.9, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.9, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.9, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.9, "y": 2.25},
+
+                {"matrix": [2, 6], "x": 8.75, "y": 2.25},
+                {"matrix": [2, 7], "x": 9.75, "y": 2.25},
+                {"matrix": [2, 8], "x": 10.75, "y": 2.25},
+                {"matrix": [2, 9], "x": 11.75, "y": 2.25},
+                {"matrix": [2, 10], "x": 12.75, "y": 2.25},
+                {"matrix": [2, 11], "x": 13.75, "y": 2.25},
+                {"matrix": [2, 12], "x": 14.75, "y": 2.25, "w": 2.25},
+
+                {"matrix": [3, 14], "x": 17.25, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3.25},
+                {"matrix": [3, 2], "x": 3.25, "y": 3.25},
+                {"matrix": [3, 3], "x": 4.25, "y": 3.25},
+                {"matrix": [3, 4], "x": 5.25, "y": 3.25},
+                {"matrix": [3, 5], "x": 6.25, "y": 3.25},
+
+                {"matrix": [4, 6], "x": 8.25, "y": 3.25},
+                {"matrix": [3, 6], "x": 9.25, "y": 3.25},
+                {"matrix": [3, 7], "x": 10.25, "y": 3.25},
+                {"matrix": [3, 8], "x": 11.25, "y": 3.25},
+                {"matrix": [3, 9], "x": 12.25, "y": 3.25},
+                {"matrix": [3, 10], "x": 13.25, "y": 3.25},
+                {"matrix": [3, 11], "x": 14.25, "y": 3.25, "w": 1.75},
+
+                {"matrix": [3, 13], "x": 16.25, "y": 3.5},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.5},
+                {"matrix": [4, 2], "x": 3.25, "y": 4.25, "w": 1.5},
+                {"matrix": [4, 4], "x": 4.75, "y": 4.25, "w": 2},
+                {"matrix": [4, 5], "x": 6.75, "y": 4.25},
+
+                {"matrix": [4, 7], "x": 8.75, "y": 4.25, "w": 2.75},
+                {"matrix": [4, 9], "x": 11.5, "y": 4.25, "w": 1.5},
+
+                {"matrix": [4, 12], "x": 15.25, "y": 4.5},
+                {"matrix": [4, 13], "x": 16.25, "y": 4.5},
+                {"matrix": [4, 14], "x": 17.25, "y": 4.5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/skergo/rules.mk b/keyboards/skergo/rules.mk
index 1e9f9255447..c2ee0bc86f9 100644
--- a/keyboards/skergo/rules.mk
+++ b/keyboards/skergo/rules.mk
@@ -1,15 +1,2 @@
 # Processor frequency
 F_CPU = 16000000
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
diff --git a/keyboards/skippys_custom_pcs/rooboard65/config.h b/keyboards/skippys_custom_pcs/rooboard65/config.h
deleted file mode 100644
index b352868d2d4..00000000000
--- a/keyboards/skippys_custom_pcs/rooboard65/config.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
-Copyright 2021 <me@fjlaboratories.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
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-/* Define less important options */
-
-/*
- * Feature disable options
- * These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/skippys_custom_pcs/rooboard65/info.json b/keyboards/skippys_custom_pcs/rooboard65/info.json
deleted file mode 100644
index b6151a303c4..00000000000
--- a/keyboards/skippys_custom_pcs/rooboard65/info.json
+++ /dev/null
@@ -1,120 +0,0 @@
-{
-    "keyboard_name": "Rooboard65",
-    "manufacturer": "FJLabs",
-    "url": "https://www.fjlaboratories.com/",
-    "maintainer": "FJLabs",
-    "usb": {
-        "vid": "0x36B6",
-        "pid": "0x0002",
-        "device_version": "0.0.1"
-    },
-    "ws2812": {
-        "pin": "F7"
-    },
-    "rgblight": {
-        "led_count": 68,
-        "max_brightness": 96,
-        "animations": {
-            "breathing": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "snake": true,
-            "knight": true,
-            "christmas": true,
-            "static_gradient": true,
-            "rgb_test": true,
-            "alternating": true,
-            "twinkle": true
-        },
-        "default": {
-            "animation": "rainbow_swirl",
-            "speed": 144
-        }
-    },
-    "matrix_pins": {
-        "cols": ["C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "B3", "B2", "B1", "D1"],
-        "rows": ["F0", "F1", "F4", "F5", "F6"]
-    },
-    "diode_direction": "COL2ROW",
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "community_layouts": ["65_ansi"],
-    "layouts": {
-        "LAYOUT_65_ansi": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-                {"matrix": [0, 14], "x": 15, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-                {"matrix": [2, 14], "x": 15, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
-                {"matrix": [1, 14], "x": 15, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 1], "x": 2.25, "y": 3},
-                {"matrix": [3, 2], "x": 3.25, "y": 3},
-                {"matrix": [3, 3], "x": 4.25, "y": 3},
-                {"matrix": [3, 4], "x": 5.25, "y": 3},
-                {"matrix": [3, 5], "x": 6.25, "y": 3},
-                {"matrix": [3, 6], "x": 7.25, "y": 3},
-                {"matrix": [3, 7], "x": 8.25, "y": 3},
-                {"matrix": [3, 8], "x": 9.25, "y": 3},
-                {"matrix": [3, 9], "x": 10.25, "y": 3},
-                {"matrix": [3, 10], "x": 11.25, "y": 3},
-                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"matrix": [3, 13], "x": 14, "y": 3},
-                {"matrix": [3, 14], "x": 15, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
-                {"matrix": [4, 9], "x": 10, "y": 4},
-                {"matrix": [4, 10], "x": 11, "y": 4},
-                {"matrix": [4, 11], "x": 12, "y": 4},
-                {"matrix": [4, 12], "x": 13, "y": 4},
-                {"matrix": [4, 13], "x": 14, "y": 4},
-                {"matrix": [4, 14], "x": 15, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/skippys_custom_pcs/rooboard65/keyboard.json b/keyboards/skippys_custom_pcs/rooboard65/keyboard.json
new file mode 100644
index 00000000000..527884714b2
--- /dev/null
+++ b/keyboards/skippys_custom_pcs/rooboard65/keyboard.json
@@ -0,0 +1,134 @@
+{
+    "keyboard_name": "Rooboard65",
+    "manufacturer": "FJLabs",
+    "url": "https://www.fjlaboratories.com/",
+    "maintainer": "FJLabs",
+    "usb": {
+        "vid": "0x36B6",
+        "pid": "0x0002",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "command": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgblight": true
+    },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
+    "ws2812": {
+        "pin": "F7"
+    },
+    "rgblight": {
+        "led_count": 68,
+        "max_brightness": 96,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": true,
+            "twinkle": true
+        },
+        "default": {
+            "animation": "rainbow_swirl",
+            "speed": 144
+        }
+    },
+    "matrix_pins": {
+        "cols": ["C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "B3", "B2", "B1", "D1"],
+        "rows": ["F0", "F1", "F4", "F5", "F6"]
+    },
+    "diode_direction": "COL2ROW",
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "community_layouts": ["65_ansi"],
+    "layouts": {
+        "LAYOUT_65_ansi": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [2, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [1, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 10], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4},
+                {"matrix": [4, 10], "x": 11, "y": 4},
+                {"matrix": [4, 11], "x": 12, "y": 4},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/skippys_custom_pcs/rooboard65/rules.mk b/keyboards/skippys_custom_pcs/rooboard65/rules.mk
index 52a18008f4a..3437a35bdf1 100644
--- a/keyboards/skippys_custom_pcs/rooboard65/rules.mk
+++ b/keyboards/skippys_custom_pcs/rooboard65/rules.mk
@@ -1,15 +1,2 @@
 # Processor frequency
 F_CPU = 8000000
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
diff --git a/keyboards/skippys_custom_pcs/roopad/info.json b/keyboards/skippys_custom_pcs/roopad/info.json
deleted file mode 100644
index c44fcd1541f..00000000000
--- a/keyboards/skippys_custom_pcs/roopad/info.json
+++ /dev/null
@@ -1,68 +0,0 @@
-{
-    "keyboard_name": "RooPad",
-    "manufacturer": "ToastyStoemp",
-    "url": "",
-    "maintainer": "ToastyStoemp",
-    "usb": {
-        "vid": "0x36B6",
-        "pid": "0x0001",
-        "device_version": "0.0.1"
-    },
-    "rgblight": {
-        "led_count": 21,
-        "sleep": true,
-        "animations": {
-            "breathing": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "snake": true,
-            "knight": true,
-            "christmas": true,
-            "static_gradient": true,
-            "rgb_test": true,
-            "alternating": true,
-            "twinkle": true
-        }
-    },
-    "ws2812": {
-        "pin": "B6"
-    },
-    "matrix_pins": {
-        "cols": ["F0", "B4", "D7", "D6", "D4"],
-        "rows": ["B5", "F6", "F5", "F4", "F1"]
-    },
-    "diode_direction": "COL2ROW",
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 1], "x": 1.5, "y": 0},
-                {"matrix": [0, 2], "x": 2.5, "y": 0},
-                {"matrix": [0, 3], "x": 3.5, "y": 0},
-                {"matrix": [0, 4], "x": 4.5, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1},
-                {"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, "h": 2},
-
-                {"matrix": [2, 0], "x": 0, "y": 2},
-                {"matrix": [2, 1], "x": 1.5, "y": 2},
-                {"matrix": [2, 2], "x": 2.5, "y": 2},
-                {"matrix": [2, 3], "x": 3.5, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3},
-                {"matrix": [3, 1], "x": 1.5, "y": 3},
-                {"matrix": [3, 2], "x": 2.5, "y": 3},
-                {"matrix": [3, 3], "x": 3.5, "y": 3},
-                {"matrix": [3, 4], "x": 4.5, "y": 3, "h": 2},
-
-                {"matrix": [4, 0], "x": 0, "y": 4},
-                {"matrix": [4, 1], "x": 1.5, "y": 4, "w": 2},
-                {"matrix": [4, 3], "x": 3.5, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/skippys_custom_pcs/roopad/keyboard.json b/keyboards/skippys_custom_pcs/roopad/keyboard.json
new file mode 100644
index 00000000000..0da722ff120
--- /dev/null
+++ b/keyboards/skippys_custom_pcs/roopad/keyboard.json
@@ -0,0 +1,75 @@
+{
+    "keyboard_name": "RooPad",
+    "manufacturer": "ToastyStoemp",
+    "url": "",
+    "maintainer": "ToastyStoemp",
+    "usb": {
+        "vid": "0x36B6",
+        "pid": "0x0001",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": false,
+        "nkro": true,
+        "rgblight": true
+    },
+    "rgblight": {
+        "led_count": 21,
+        "sleep": true,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": true,
+            "twinkle": true
+        }
+    },
+    "ws2812": {
+        "pin": "B6"
+    },
+    "matrix_pins": {
+        "cols": ["F0", "B4", "D7", "D6", "D4"],
+        "rows": ["B5", "F6", "F5", "F4", "F1"]
+    },
+    "diode_direction": "COL2ROW",
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 1], "x": 1.5, "y": 0},
+                {"matrix": [0, 2], "x": 2.5, "y": 0},
+                {"matrix": [0, 3], "x": 3.5, "y": 0},
+                {"matrix": [0, 4], "x": 4.5, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"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, "h": 2},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1.5, "y": 2},
+                {"matrix": [2, 2], "x": 2.5, "y": 2},
+                {"matrix": [2, 3], "x": 3.5, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1.5, "y": 3},
+                {"matrix": [3, 2], "x": 2.5, "y": 3},
+                {"matrix": [3, 3], "x": 3.5, "y": 3},
+                {"matrix": [3, 4], "x": 4.5, "y": 3, "h": 2},
+
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1.5, "y": 4, "w": 2},
+                {"matrix": [4, 3], "x": 3.5, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/skippys_custom_pcs/roopad/rules.mk b/keyboards/skippys_custom_pcs/roopad/rules.mk
index d280d696f53..3437a35bdf1 100644
--- a/keyboards/skippys_custom_pcs/roopad/rules.mk
+++ b/keyboards/skippys_custom_pcs/roopad/rules.mk
@@ -1,15 +1,2 @@
 # Processor frequency
 F_CPU = 8000000
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes     # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no        # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
diff --git a/keyboards/skmt/15k/info.json b/keyboards/skmt/15k/info.json
deleted file mode 100644
index 903a13b985e..00000000000
--- a/keyboards/skmt/15k/info.json
+++ /dev/null
@@ -1,119 +0,0 @@
-{
-    "manufacturer": "SKMT",
-    "keyboard_name": "SKMT 15k",
-    "maintainer": "satorusaka",
-    "bootloader": "rp2040",
-    "diode_direction": "COL2ROW",
-    "features": {
-        "bootmagic": true,
-        "command": false,
-        "console": false,
-        "extrakey": true,
-        "mousekey": true,
-        "nkro": true,
-        "rgb_matrix": true
-    },
-    "matrix_pins": {
-        "cols": ["GP2", "GP3", "GP4", "GP5", "GP6"],
-        "rows": ["GP7", "GP8", "GP9"]
-    },
-    "processor": "RP2040",
-    "url": "https://github.com/satorusaka/15k-macropad",
-    "usb": {
-        "device_version": "1.1.0",
-        "pid": "0x3488",
-        "vid": "0xFEFE",
-        "force_nkro": true
-    },
-    "layouts": {
-        "LAYOUT_default": {
-            "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": [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": [1, 4], "x": 4, "y": 1},
-                {"matrix": [2, 0], "x": 0, "y": 2},
-                {"matrix": [2, 1], "x": 1, "y": 2},
-                {"matrix": [2, 2], "x": 2, "y": 2},
-                {"matrix": [2, 3], "x": 3, "y": 2},
-                {"matrix": [2, 4], "x": 4, "y": 2}
-            ]
-        }
-    },
-    "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,
-            "rainbow_moving_chevron": true,
-            "cycle_out_in": true,
-            "cycle_out_in_dual": 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_rain": true,
-            "pixel_flow": true,
-            "pixel_fractal": 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": [
-            {"flags": 4, "matrix": [2, 4], "x": 224, "y": 64},
-            {"flags": 4, "matrix": [2, 3], "x": 168, "y": 64},
-            {"flags": 4, "matrix": [2, 2], "x": 112, "y": 64},
-            {"flags": 4, "matrix": [2, 1], "x": 56, "y": 64},
-            {"flags": 4, "matrix": [2, 0], "x": 0, "y": 64},
-            {"flags": 4, "matrix": [1, 4], "x": 224, "y": 32},
-            {"flags": 4, "matrix": [1, 3], "x": 168, "y": 32},
-            {"flags": 4, "matrix": [1, 2], "x": 112, "y": 32},
-            {"flags": 4, "matrix": [1, 1], "x": 56, "y": 32},
-            {"flags": 4, "matrix": [1, 0], "x": 0, "y": 32},
-            {"flags": 4, "matrix": [0, 4], "x": 224, "y": 0},
-            {"flags": 4, "matrix": [0, 3], "x": 168, "y": 0},
-            {"flags": 4, "matrix": [0, 2], "x": 112, "y": 0},
-            {"flags": 4, "matrix": [0, 1], "x": 56, "y": 0},
-            {"flags": 4, "matrix": [0, 0], "x": 0, "y": 0}
-        ],
-        "sleep": true
-    },
-    "ws2812": {
-        "pin": "GP1",
-        "driver": "vendor"
-    }
-}
diff --git a/keyboards/skmt/15k/keyboard.json b/keyboards/skmt/15k/keyboard.json
new file mode 100644
index 00000000000..9cf215f4d48
--- /dev/null
+++ b/keyboards/skmt/15k/keyboard.json
@@ -0,0 +1,122 @@
+{
+    "manufacturer": "SKMT",
+    "keyboard_name": "SKMT 15k",
+    "maintainer": "satorusaka",
+    "bootloader": "rp2040",
+    "diode_direction": "COL2ROW",
+    "build": {
+        "lto": true
+    },
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgb_matrix": true
+    },
+    "matrix_pins": {
+        "cols": ["GP2", "GP3", "GP4", "GP5", "GP6"],
+        "rows": ["GP7", "GP8", "GP9"]
+    },
+    "processor": "RP2040",
+    "url": "https://github.com/satorusaka/15k-macropad",
+    "usb": {
+        "device_version": "1.1.0",
+        "pid": "0x3488",
+        "vid": "0xFEFE",
+        "force_nkro": true
+    },
+    "layouts": {
+        "LAYOUT_default": {
+            "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": [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": [1, 4], "x": 4, "y": 1},
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2}
+            ]
+        }
+    },
+    "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,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": 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_rain": true,
+            "pixel_flow": true,
+            "pixel_fractal": 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": [
+            {"flags": 4, "matrix": [2, 4], "x": 224, "y": 64},
+            {"flags": 4, "matrix": [2, 3], "x": 168, "y": 64},
+            {"flags": 4, "matrix": [2, 2], "x": 112, "y": 64},
+            {"flags": 4, "matrix": [2, 1], "x": 56, "y": 64},
+            {"flags": 4, "matrix": [2, 0], "x": 0, "y": 64},
+            {"flags": 4, "matrix": [1, 4], "x": 224, "y": 32},
+            {"flags": 4, "matrix": [1, 3], "x": 168, "y": 32},
+            {"flags": 4, "matrix": [1, 2], "x": 112, "y": 32},
+            {"flags": 4, "matrix": [1, 1], "x": 56, "y": 32},
+            {"flags": 4, "matrix": [1, 0], "x": 0, "y": 32},
+            {"flags": 4, "matrix": [0, 4], "x": 224, "y": 0},
+            {"flags": 4, "matrix": [0, 3], "x": 168, "y": 0},
+            {"flags": 4, "matrix": [0, 2], "x": 112, "y": 0},
+            {"flags": 4, "matrix": [0, 1], "x": 56, "y": 0},
+            {"flags": 4, "matrix": [0, 0], "x": 0, "y": 0}
+        ],
+        "sleep": true
+    },
+    "ws2812": {
+        "pin": "GP1",
+        "driver": "vendor"
+    }
+}
diff --git a/keyboards/skmt/15k/rules.mk b/keyboards/skmt/15k/rules.mk
deleted file mode 100644
index 4da205a168c..00000000000
--- a/keyboards/skmt/15k/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-LTO_ENABLE = yes
diff --git a/keyboards/smallkeyboard/info.json b/keyboards/smallkeyboard/info.json
deleted file mode 100644
index d5a64f465ad..00000000000
--- a/keyboards/smallkeyboard/info.json
+++ /dev/null
@@ -1,64 +0,0 @@
-{
-  "keyboard_name": "smallkeyboard",
-  "manufacturer": "zhouqiong19840119",
-  "url": "",
-  "maintainer": "zhouqiong19840119",
-  "usb": {
-    "vid": "0x7A71",
-    "pid": "0x736B",
-    "device_version": "0.0.1"
-  },
-  "rgb_matrix": {
-    "animations": {
-      "alphas_mods": true,
-      "gradient_left_right": true,
-      "breathing": true,
-      "band_val": true,
-      "band_pinwheel_val": true,
-      "band_spiral_val": true,
-      "cycle_all": true,
-      "cycle_left_right": true,
-      "cycle_up_down": true,
-      "rainbow_moving_chevron": true,
-      "cycle_out_in": true,
-      "cycle_out_in_dual": 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_rain": true,
-      "typing_heatmap": true,
-      "solid_reactive_simple": true,
-      "solid_reactive": true
-    },
-    "driver": "is31fl3731",
-    "sleep": true
-  },
-  "matrix_pins": {
-    "cols": ["F7", "F6", "F5"],
-    "rows": ["C7", "C6"]
-  },
-  "diode_direction": "ROW2COL",
-  "processor": "atmega32u4",
-  "bootloader": "atmel-dfu",
-  "debounce": 3,
-  "layouts": {
-    "LAYOUT_ortho_2x3": {
-      "layout": [
-        {"matrix": [0, 0], "x": 0, "y": 0},
-        {"matrix": [0, 1], "x": 1, "y": 0},
-        {"matrix": [0, 2], "x": 2, "y": 0},
-
-        {"matrix": [1, 0], "x": 0, "y": 1},
-        {"matrix": [1, 1], "x": 1, "y": 1},
-        {"matrix": [1, 2], "x": 2, "y": 1}
-      ]
-    }
-  }
-}
diff --git a/keyboards/smallkeyboard/keyboard.json b/keyboards/smallkeyboard/keyboard.json
new file mode 100644
index 00000000000..9963d83a47f
--- /dev/null
+++ b/keyboards/smallkeyboard/keyboard.json
@@ -0,0 +1,71 @@
+{
+  "keyboard_name": "smallkeyboard",
+  "manufacturer": "zhouqiong19840119",
+  "url": "",
+  "maintainer": "zhouqiong19840119",
+  "usb": {
+    "vid": "0x7A71",
+    "pid": "0x736B",
+    "device_version": "0.0.1"
+  },
+  "features": {
+    "bootmagic": true,
+    "extrakey": true,
+    "mousekey": true,
+    "nkro": false,
+    "rgb_matrix": true
+  },
+  "rgb_matrix": {
+    "animations": {
+      "alphas_mods": true,
+      "gradient_left_right": true,
+      "breathing": true,
+      "band_val": true,
+      "band_pinwheel_val": true,
+      "band_spiral_val": true,
+      "cycle_all": true,
+      "cycle_left_right": true,
+      "cycle_up_down": true,
+      "rainbow_moving_chevron": true,
+      "cycle_out_in": true,
+      "cycle_out_in_dual": 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_rain": true,
+      "typing_heatmap": true,
+      "solid_reactive_simple": true,
+      "solid_reactive": true
+    },
+    "driver": "is31fl3731",
+    "sleep": true
+  },
+  "matrix_pins": {
+    "cols": ["F7", "F6", "F5"],
+    "rows": ["C7", "C6"]
+  },
+  "diode_direction": "ROW2COL",
+  "processor": "atmega32u4",
+  "bootloader": "atmel-dfu",
+  "debounce": 3,
+  "layouts": {
+    "LAYOUT_ortho_2x3": {
+      "layout": [
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1},
+        {"matrix": [1, 1], "x": 1, "y": 1},
+        {"matrix": [1, 2], "x": 2, "y": 1}
+      ]
+    }
+  }
+}
diff --git a/keyboards/smallkeyboard/rules.mk b/keyboards/smallkeyboard/rules.mk
deleted file mode 100644
index 1dcdf891550..00000000000
--- a/keyboards/smallkeyboard/rules.mk
+++ /dev/null
@@ -1,16 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no        # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
-RGB_MATRIX_ENABLE = yes
-
-RGB_MATRIX_SUPPORTED = yes
diff --git a/keyboards/smithrune/iron160/iron160_h/info.json b/keyboards/smithrune/iron160/iron160_h/info.json
deleted file mode 100644
index 3fb14989d69..00000000000
--- a/keyboards/smithrune/iron160/iron160_h/info.json
+++ /dev/null
@@ -1,174 +0,0 @@
-{
-    "keyboard_name": "I160-H",
-    "manufacturer": "SmithRune",
-    "url": "",
-    "maintainer": "Gondolindrim",
-    "usb": {
-        "vid": "0x8384",
-        "pid": "0x1648",
-        "device_version": "0.0.1"
-    },
-   "processor": "STM32F072",
-   "bootloader": "stm32-dfu",
-   "matrix_pins": {
-       "cols": ["A3", "B9", "B8", "B5", "B4", "B3", "A6", "A5", "A4", "A2", "A1", "A0", "C15", "C14"],
-       "rows": ["A10", "A15", "C13", "A7", "B0"]
-   },
-   "ws2812": {
-       "pin": "B15"
-   },
-    "rgblight": {
-        "led_count": 1,
-        "default": {
-           "val": 50
-        }
-    },
-   "diode_direction": "COL2ROW",
-    "layout_aliases": {
-        "LAYOUT": "LAYOUT_60_tsangan_hhkb"
-    },
-    "community_layouts": [
-        "60_tsangan_hhkb"
-    ],
-    "layouts": {
-        "LAYOUT_60_ansi_tsangan_split_rshift": {
-            "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": "Bspc", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-
-                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
-                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
-                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
-                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
-                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
-                {"label": "Y", "matrix": [1, 6], "x": 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], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"label": "Caps", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
-                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
-                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
-                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
-                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
-                {"label": "H", "matrix": [2, 6], "x": 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], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
-                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
-                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
-                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
-                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
-                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
-                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
-                {"label": "<", "matrix": [3, 9], "x": 9.25, "y": 3},
-                {"label": ">", "matrix": [3, 10], "x": 10.25, "y": 3},
-                {"label": "?", "matrix": [3, 11], "x": 11.25, "y": 3},
-                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"label": "MO(1)", "matrix": [3, 13], "x": 14, "y": 3},
-
-                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
-                {"label": "Win", "matrix": [4, 1], "x": 1.5, "y": 4},
-                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
-                {"label": "Space", "matrix": [4, 6], "x": 4, "y": 4, "w": 7},
-                {"label": "Alt", "matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
-                {"label": "Win", "matrix": [4, 11], "x": 12.5, "y": 4},
-                {"label": "Ctrl", "matrix": [4, 12], "x": 13.5, "y": 4, "w": 1.5}
-            ]
-        },
-        "LAYOUT_60_tsangan_hhkb": {
-            "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": "Bspc", "matrix": [0, 13], "x": 13, "y": 0},
-                {"label": "Bspc", "matrix": [4, 13], "x": 14, "y": 0},
-
-                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
-                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
-                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
-                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
-                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
-                {"label": "Y", "matrix": [1, 6], "x": 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], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"label": "Caps", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
-                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
-                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
-                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
-                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
-                {"label": "H", "matrix": [2, 6], "x": 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], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
-                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
-                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
-                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
-                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
-                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
-                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
-                {"label": "<", "matrix": [3, 9], "x": 9.25, "y": 3},
-                {"label": ">", "matrix": [3, 10], "x": 10.25, "y": 3},
-                {"label": "?", "matrix": [3, 11], "x": 11.25, "y": 3},
-                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"label": "MO(1)", "matrix": [3, 13], "x": 14, "y": 3},
-
-                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
-                {"label": "Win", "matrix": [4, 1], "x": 1.5, "y": 4},
-                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
-                {"label": "Space", "matrix": [4, 6], "x": 4, "y": 4, "w": 7},
-                {"label": "Alt", "matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
-                {"label": "Win", "matrix": [4, 11], "x": 12.5, "y": 4},
-                {"label": "Ctrl", "matrix": [4, 12], "x": 13.5, "y": 4, "w": 1.5}
-            ]
-        }
-    }
-}
diff --git a/keyboards/smithrune/iron160/iron160_h/keyboard.json b/keyboards/smithrune/iron160/iron160_h/keyboard.json
new file mode 100644
index 00000000000..d9ada0879d5
--- /dev/null
+++ b/keyboards/smithrune/iron160/iron160_h/keyboard.json
@@ -0,0 +1,182 @@
+{
+    "keyboard_name": "I160-H",
+    "manufacturer": "SmithRune",
+    "url": "",
+    "maintainer": "Gondolindrim",
+    "usb": {
+        "vid": "0x8384",
+        "pid": "0x1648",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "command": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgblight": true
+    },
+   "processor": "STM32F072",
+   "bootloader": "stm32-dfu",
+   "matrix_pins": {
+       "cols": ["A3", "B9", "B8", "B5", "B4", "B3", "A6", "A5", "A4", "A2", "A1", "A0", "C15", "C14"],
+       "rows": ["A10", "A15", "C13", "A7", "B0"]
+   },
+   "ws2812": {
+       "pin": "B15"
+   },
+    "rgblight": {
+        "led_count": 1,
+        "default": {
+           "val": 50
+        }
+    },
+   "diode_direction": "COL2ROW",
+    "layout_aliases": {
+        "LAYOUT": "LAYOUT_60_tsangan_hhkb"
+    },
+    "community_layouts": [
+        "60_tsangan_hhkb"
+    ],
+    "layouts": {
+        "LAYOUT_60_ansi_tsangan_split_rshift": {
+            "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": "Bspc", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 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], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"label": "Caps", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 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], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": "<", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ">", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "?", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "MO(1)", "matrix": [3, 13], "x": 14, "y": 3},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"label": "Win", "matrix": [4, 1], "x": 1.5, "y": 4},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"label": "Space", "matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"label": "Alt", "matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
+                {"label": "Win", "matrix": [4, 11], "x": 12.5, "y": 4},
+                {"label": "Ctrl", "matrix": [4, 12], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_60_tsangan_hhkb": {
+            "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": "Bspc", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "Bspc", "matrix": [4, 13], "x": 14, "y": 0},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 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], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"label": "Caps", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 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], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": "<", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ">", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "?", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "MO(1)", "matrix": [3, 13], "x": 14, "y": 3},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"label": "Win", "matrix": [4, 1], "x": 1.5, "y": 4},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"label": "Space", "matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"label": "Alt", "matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
+                {"label": "Win", "matrix": [4, 11], "x": 12.5, "y": 4},
+                {"label": "Ctrl", "matrix": [4, 12], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/smithrune/iron160/iron160_h/rules.mk b/keyboards/smithrune/iron160/iron160_h/rules.mk
index c889da168d6..4138455538f 100644
--- a/keyboards/smithrune/iron160/iron160_h/rules.mk
+++ b/keyboards/smithrune/iron160/iron160_h/rules.mk
@@ -1,18 +1,2 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes           # USB Nkey Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-ENCODER_ENABLE = no
-LTO_ENABLE = no
-
 EEPROM_DRIVER = wear_leveling
 WEAR_LEVELING_DRIVER = legacy
-
diff --git a/keyboards/smithrune/iron160/iron160_s/info.json b/keyboards/smithrune/iron160/iron160_s/info.json
deleted file mode 100644
index 91c66a3d4fb..00000000000
--- a/keyboards/smithrune/iron160/iron160_s/info.json
+++ /dev/null
@@ -1,674 +0,0 @@
-{
-    "keyboard_name": "I160-S",
-    "manufacturer": "SmithRune",
-    "url": "",
-    "maintainer": "Gondolindrim",
-    "usb": {
-        "vid": "0x8384",
-        "pid": "0x1653",
-        "device_version": "0.0.1"
-    },
-    "processor": "STM32F072",
-    "bootloader": "stm32-dfu",
-    "matrix_pins": {
-        "cols": ["A3", "B9", "B8", "B5", "B4", "B3", "A6", "A5", "A4", "A2", "A1", "A0", "C15", "C14"],
-        "rows": ["A10", "A15", "C13", "B1", "B10"]
-    },
-    "diode_direction": "COL2ROW",
-    "backlight": {
-        "pin": "A7",
-        "levels": 20,
-        "breathing": true,
-        "breathing_period": 3
-    },
-    "indicators": {
-        "caps_lock": "B0"
-    },
-    "layout_aliases": {
-        "LAYOUT": "LAYOUT_all"
-    },
-    "community_layouts": [
-        "60_ansi",
-        "60_ansi_split_bs_rshift",
-        "60_ansi_tsangan",
-        "60_tsangan_hhkb",
-        "60_iso",
-        "60_iso_split_bs_rshift",
-        "60_iso_tsangan"
-    ],
-    "layouts": {
-        "LAYOUT_all": {
-            "layout": [
-                {"label": "~", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "!", "matrix": [0, 1], "x": 1, "y": 0},
-                {"label": "@", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "#", "matrix": [0, 3], "x": 3, "y": 0},
-                {"label": "$", "matrix": [0, 4], "x": 4, "y": 0},
-                {"label": "%", "matrix": [0, 5], "x": 5, "y": 0},
-                {"label": "^", "matrix": [0, 6], "x": 6, "y": 0},
-                {"label": "&", "matrix": [0, 7], "x": 7, "y": 0},
-                {"label": "*", "matrix": [0, 8], "x": 8, "y": 0},
-                {"label": "(", "matrix": [0, 9], "x": 9, "y": 0},
-                {"label": ")", "matrix": [0, 10], "x": 10, "y": 0},
-                {"label": "_", "matrix": [0, 11], "x": 11, "y": 0},
-                {"label": "+", "matrix": [0, 12], "x": 12, "y": 0},
-                {"label": "Bspc", "matrix": [0, 13], "x": 13, "y": 0},
-                {"label": "Bspc", "matrix": [4, 13], "x": 14, "y": 0},
-
-                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
-                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
-                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
-                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
-                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
-                {"label": "Y", "matrix": [1, 6], "x": 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], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"label": "Caps", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
-                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
-                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
-                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
-                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
-                {"label": "H", "matrix": [2, 6], "x": 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": "~", "matrix": [2, 12], "x": 12.75, "y": 2},
-                {"label": "Enter", "matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.25},
-
-                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
-                {"label": "|", "matrix": [3, 1], "x": 1.25, "y": 3},
-                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
-                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
-                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
-                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
-                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
-                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
-                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
-                {"label": "<", "matrix": [3, 9], "x": 9.25, "y": 3},
-                {"label": ">", "matrix": [3, 10], "x": 10.25, "y": 3},
-                {"label": "?", "matrix": [3, 11], "x": 11.25, "y": 3},
-                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"label": "MO(1)", "matrix": [3, 13], "x": 14, "y": 3},
-
-                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"label": "Win", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"label": "Space", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
-                {"label": "Alt", "matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
-                {"label": "Win", "matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
-                {"label": "Menu", "matrix": [4, 11], "x": 12.5, "y": 4, "w": 1.25},
-                {"label": "Ctrl", "matrix": [4, 12], "x": 13.75, "y": 4, "w": 1.25}
-            ]
-        },
-        "LAYOUT_60_ansi": {
-            "layout": [
-                {"label": "~", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "!", "matrix": [0, 1], "x": 1, "y": 0},
-                {"label": "@", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "#", "matrix": [0, 3], "x": 3, "y": 0},
-                {"label": "$", "matrix": [0, 4], "x": 4, "y": 0},
-                {"label": "%", "matrix": [0, 5], "x": 5, "y": 0},
-                {"label": "^", "matrix": [0, 6], "x": 6, "y": 0},
-                {"label": "&", "matrix": [0, 7], "x": 7, "y": 0},
-                {"label": "*", "matrix": [0, 8], "x": 8, "y": 0},
-                {"label": "(", "matrix": [0, 9], "x": 9, "y": 0},
-                {"label": ")", "matrix": [0, 10], "x": 10, "y": 0},
-                {"label": "_", "matrix": [0, 11], "x": 11, "y": 0},
-                {"label": "+", "matrix": [0, 12], "x": 12, "y": 0},
-                {"label": "Bspc", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-
-                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
-                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
-                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
-                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
-                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
-                {"label": "Y", "matrix": [1, 6], "x": 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], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"label": "Caps", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
-                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
-                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
-                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
-                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
-                {"label": "H", "matrix": [2, 6], "x": 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], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
-                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
-                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
-                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
-                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
-                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
-                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
-                {"label": "<", "matrix": [3, 9], "x": 9.25, "y": 3},
-                {"label": ">", "matrix": [3, 10], "x": 10.25, "y": 3},
-                {"label": "?", "matrix": [3, 11], "x": 11.25, "y": 3},
-                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
-
-                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"label": "Win", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"label": "Space", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
-                {"label": "Alt", "matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
-                {"label": "Win", "matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
-                {"label": "Menu", "matrix": [4, 11], "x": 12.5, "y": 4, "w": 1.25},
-                {"label": "Ctrl", "matrix": [4, 12], "x": 13.75, "y": 4, "w": 1.25}
-            ]
-        },
-        "LAYOUT_60_ansi_split_bs_rshift": {
-            "layout": [
-                {"label": "~", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "!", "matrix": [0, 1], "x": 1, "y": 0},
-                {"label": "@", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "#", "matrix": [0, 3], "x": 3, "y": 0},
-                {"label": "$", "matrix": [0, 4], "x": 4, "y": 0},
-                {"label": "%", "matrix": [0, 5], "x": 5, "y": 0},
-                {"label": "^", "matrix": [0, 6], "x": 6, "y": 0},
-                {"label": "&", "matrix": [0, 7], "x": 7, "y": 0},
-                {"label": "*", "matrix": [0, 8], "x": 8, "y": 0},
-                {"label": "(", "matrix": [0, 9], "x": 9, "y": 0},
-                {"label": ")", "matrix": [0, 10], "x": 10, "y": 0},
-                {"label": "_", "matrix": [0, 11], "x": 11, "y": 0},
-                {"label": "+", "matrix": [0, 12], "x": 12, "y": 0},
-                {"label": "Bspc", "matrix": [0, 13], "x": 13, "y": 0},
-                {"label": "Bspc", "matrix": [4, 13], "x": 14, "y": 0},
-
-                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
-                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
-                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
-                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
-                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
-                {"label": "Y", "matrix": [1, 6], "x": 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], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"label": "Caps", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
-                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
-                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
-                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
-                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
-                {"label": "H", "matrix": [2, 6], "x": 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], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
-                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
-                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
-                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
-                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
-                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
-                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
-                {"label": "<", "matrix": [3, 9], "x": 9.25, "y": 3},
-                {"label": ">", "matrix": [3, 10], "x": 10.25, "y": 3},
-                {"label": "?", "matrix": [3, 11], "x": 11.25, "y": 3},
-                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"label": "MO(1)", "matrix": [3, 13], "x": 14, "y": 3},
-
-                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"label": "Win", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"label": "Space", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
-                {"label": "Alt", "matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
-                {"label": "Win", "matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
-                {"label": "Menu", "matrix": [4, 11], "x": 12.5, "y": 4, "w": 1.25},
-                {"label": "Ctrl", "matrix": [4, 12], "x": 13.75, "y": 4, "w": 1.25}
-            ]
-        },
-        "LAYOUT_60_ansi_tsangan": {
-            "layout": [
-                {"label": "~", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "!", "matrix": [0, 1], "x": 1, "y": 0},
-                {"label": "@", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "#", "matrix": [0, 3], "x": 3, "y": 0},
-                {"label": "$", "matrix": [0, 4], "x": 4, "y": 0},
-                {"label": "%", "matrix": [0, 5], "x": 5, "y": 0},
-                {"label": "^", "matrix": [0, 6], "x": 6, "y": 0},
-                {"label": "&", "matrix": [0, 7], "x": 7, "y": 0},
-                {"label": "*", "matrix": [0, 8], "x": 8, "y": 0},
-                {"label": "(", "matrix": [0, 9], "x": 9, "y": 0},
-                {"label": ")", "matrix": [0, 10], "x": 10, "y": 0},
-                {"label": "_", "matrix": [0, 11], "x": 11, "y": 0},
-                {"label": "+", "matrix": [0, 12], "x": 12, "y": 0},
-                {"label": "Bspc", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-
-                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
-                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
-                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
-                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
-                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
-                {"label": "Y", "matrix": [1, 6], "x": 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], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"label": "Caps", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
-                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
-                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
-                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
-                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
-                {"label": "H", "matrix": [2, 6], "x": 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], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
-                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
-                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
-                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
-                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
-                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
-                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
-                {"label": "<", "matrix": [3, 9], "x": 9.25, "y": 3},
-                {"label": ">", "matrix": [3, 10], "x": 10.25, "y": 3},
-                {"label": "?", "matrix": [3, 11], "x": 11.25, "y": 3},
-                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
-
-                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
-                {"label": "Win", "matrix": [4, 1], "x": 1.5, "y": 4},
-                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
-                {"label": "Space", "matrix": [4, 6], "x": 4, "y": 4, "w": 7},
-                {"label": "Alt", "matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
-                {"label": "Menu", "matrix": [4, 11], "x": 12.5, "y": 4},
-                {"label": "Ctrl", "matrix": [4, 12], "x": 13.5, "y": 4, "w": 1.5}
-            ]
-        },
-        "LAYOUT_60_tsangan_hhkb": {
-            "layout": [
-                {"label": "~", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "!", "matrix": [0, 1], "x": 1, "y": 0},
-                {"label": "@", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "#", "matrix": [0, 3], "x": 3, "y": 0},
-                {"label": "$", "matrix": [0, 4], "x": 4, "y": 0},
-                {"label": "%", "matrix": [0, 5], "x": 5, "y": 0},
-                {"label": "^", "matrix": [0, 6], "x": 6, "y": 0},
-                {"label": "&", "matrix": [0, 7], "x": 7, "y": 0},
-                {"label": "*", "matrix": [0, 8], "x": 8, "y": 0},
-                {"label": "(", "matrix": [0, 9], "x": 9, "y": 0},
-                {"label": ")", "matrix": [0, 10], "x": 10, "y": 0},
-                {"label": "_", "matrix": [0, 11], "x": 11, "y": 0},
-                {"label": "+", "matrix": [0, 12], "x": 12, "y": 0},
-                {"label": "Bspc", "matrix": [0, 13], "x": 13, "y": 0},
-                {"label": "Bspc", "matrix": [4, 13], "x": 14, "y": 0},
-
-                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
-                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
-                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
-                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
-                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
-                {"label": "Y", "matrix": [1, 6], "x": 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], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"label": "Caps", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
-                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
-                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
-                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
-                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
-                {"label": "H", "matrix": [2, 6], "x": 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], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
-                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
-                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
-                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
-                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
-                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
-                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
-                {"label": "<", "matrix": [3, 9], "x": 9.25, "y": 3},
-                {"label": ">", "matrix": [3, 10], "x": 10.25, "y": 3},
-                {"label": "?", "matrix": [3, 11], "x": 11.25, "y": 3},
-                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"label": "MO(1)", "matrix": [3, 13], "x": 14, "y": 3},
-
-                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
-                {"label": "Win", "matrix": [4, 1], "x": 1.5, "y": 4},
-                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
-                {"label": "Space", "matrix": [4, 6], "x": 4, "y": 4, "w": 7},
-                {"label": "Alt", "matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
-                {"label": "Menu", "matrix": [4, 11], "x": 12.5, "y": 4},
-                {"label": "Ctrl", "matrix": [4, 12], "x": 13.5, "y": 4, "w": 1.5}
-            ]
-        },
-        "LAYOUT_60_iso": {
-            "layout": [
-                {"label": "~", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "!", "matrix": [0, 1], "x": 1, "y": 0},
-                {"label": "@", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "#", "matrix": [0, 3], "x": 3, "y": 0},
-                {"label": "$", "matrix": [0, 4], "x": 4, "y": 0},
-                {"label": "%", "matrix": [0, 5], "x": 5, "y": 0},
-                {"label": "^", "matrix": [0, 6], "x": 6, "y": 0},
-                {"label": "&", "matrix": [0, 7], "x": 7, "y": 0},
-                {"label": "*", "matrix": [0, 8], "x": 8, "y": 0},
-                {"label": "(", "matrix": [0, 9], "x": 9, "y": 0},
-                {"label": ")", "matrix": [0, 10], "x": 10, "y": 0},
-                {"label": "_", "matrix": [0, 11], "x": 11, "y": 0},
-                {"label": "+", "matrix": [0, 12], "x": 12, "y": 0},
-                {"label": "Bspc", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-
-                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
-                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
-                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
-                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
-                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
-                {"label": "Y", "matrix": [1, 6], "x": 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": "Caps", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
-                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
-                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
-                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
-                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
-                {"label": "H", "matrix": [2, 6], "x": 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": "~", "matrix": [2, 12], "x": 12.75, "y": 2},
-                {"label": "Enter", "matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
-
-                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
-                {"label": "|", "matrix": [3, 1], "x": 1.25, "y": 3},
-                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
-                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
-                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
-                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
-                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
-                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
-                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
-                {"label": "<", "matrix": [3, 9], "x": 9.25, "y": 3},
-                {"label": ">", "matrix": [3, 10], "x": 10.25, "y": 3},
-                {"label": "?", "matrix": [3, 11], "x": 11.25, "y": 3},
-                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
-
-                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"label": "Win", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"label": "Space", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
-                {"label": "Alt", "matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
-                {"label": "Win", "matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
-                {"label": "Menu", "matrix": [4, 11], "x": 12.5, "y": 4, "w": 1.25},
-                {"label": "Ctrl", "matrix": [4, 12], "x": 13.75, "y": 4, "w": 1.25}
-            ]
-        },
-        "LAYOUT_60_iso_split_bs_rshift": {
-            "layout": [
-                {"label": "~", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "!", "matrix": [0, 1], "x": 1, "y": 0},
-                {"label": "@", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "#", "matrix": [0, 3], "x": 3, "y": 0},
-                {"label": "$", "matrix": [0, 4], "x": 4, "y": 0},
-                {"label": "%", "matrix": [0, 5], "x": 5, "y": 0},
-                {"label": "^", "matrix": [0, 6], "x": 6, "y": 0},
-                {"label": "&", "matrix": [0, 7], "x": 7, "y": 0},
-                {"label": "*", "matrix": [0, 8], "x": 8, "y": 0},
-                {"label": "(", "matrix": [0, 9], "x": 9, "y": 0},
-                {"label": ")", "matrix": [0, 10], "x": 10, "y": 0},
-                {"label": "_", "matrix": [0, 11], "x": 11, "y": 0},
-                {"label": "+", "matrix": [0, 12], "x": 12, "y": 0},
-                {"label": "Bspc", "matrix": [0, 13], "x": 13, "y": 0},
-                {"label": "Bspc", "matrix": [4, 13], "x": 14, "y": 0},
-
-                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
-                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
-                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
-                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
-                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
-                {"label": "Y", "matrix": [1, 6], "x": 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": "Caps", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
-                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
-                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
-                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
-                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
-                {"label": "H", "matrix": [2, 6], "x": 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": "~", "matrix": [2, 12], "x": 12.75, "y": 2},
-                {"label": "Enter", "matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
-
-                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
-                {"label": "|", "matrix": [3, 1], "x": 1.25, "y": 3},
-                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
-                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
-                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
-                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
-                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
-                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
-                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
-                {"label": "<", "matrix": [3, 9], "x": 9.25, "y": 3},
-                {"label": ">", "matrix": [3, 10], "x": 10.25, "y": 3},
-                {"label": "?", "matrix": [3, 11], "x": 11.25, "y": 3},
-                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"label": "MO(1)", "matrix": [3, 13], "x": 14, "y": 3},
-
-                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"label": "Win", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"label": "Space", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
-                {"label": "Alt", "matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
-                {"label": "Win", "matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
-                {"label": "Menu", "matrix": [4, 11], "x": 12.5, "y": 4, "w": 1.25},
-                {"label": "Ctrl", "matrix": [4, 12], "x": 13.75, "y": 4, "w": 1.25}
-            ]
-        },
-        "LAYOUT_60_iso_tsangan": {
-            "layout": [
-                {"label": "~", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "!", "matrix": [0, 1], "x": 1, "y": 0},
-                {"label": "@", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "#", "matrix": [0, 3], "x": 3, "y": 0},
-                {"label": "$", "matrix": [0, 4], "x": 4, "y": 0},
-                {"label": "%", "matrix": [0, 5], "x": 5, "y": 0},
-                {"label": "^", "matrix": [0, 6], "x": 6, "y": 0},
-                {"label": "&", "matrix": [0, 7], "x": 7, "y": 0},
-                {"label": "*", "matrix": [0, 8], "x": 8, "y": 0},
-                {"label": "(", "matrix": [0, 9], "x": 9, "y": 0},
-                {"label": ")", "matrix": [0, 10], "x": 10, "y": 0},
-                {"label": "_", "matrix": [0, 11], "x": 11, "y": 0},
-                {"label": "+", "matrix": [0, 12], "x": 12, "y": 0},
-                {"label": "Bspc", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-
-                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
-                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
-                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
-                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
-                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
-                {"label": "Y", "matrix": [1, 6], "x": 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": "Caps", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
-                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
-                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
-                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
-                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
-                {"label": "H", "matrix": [2, 6], "x": 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": "~", "matrix": [2, 12], "x": 12.75, "y": 2},
-                {"label": "Enter", "matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
-
-                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
-                {"label": "|", "matrix": [3, 1], "x": 1.25, "y": 3},
-                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
-                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
-                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
-                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
-                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
-                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
-                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
-                {"label": "<", "matrix": [3, 9], "x": 9.25, "y": 3},
-                {"label": ">", "matrix": [3, 10], "x": 10.25, "y": 3},
-                {"label": "?", "matrix": [3, 11], "x": 11.25, "y": 3},
-                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
-
-                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
-                {"label": "Win", "matrix": [4, 1], "x": 1.5, "y": 4},
-                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
-                {"label": "Space", "matrix": [4, 6], "x": 4, "y": 4, "w": 7},
-                {"label": "Alt", "matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
-                {"label": "Menu", "matrix": [4, 11], "x": 12.5, "y": 4},
-                {"label": "Ctrl", "matrix": [4, 12], "x": 13.5, "y": 4, "w": 1.5}
-            ]
-        },
-        "LAYOUT_60_iso_tsangan_split_bs_rshift": {
-            "layout": [
-                {"label": "~", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "!", "matrix": [0, 1], "x": 1, "y": 0},
-                {"label": "@", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "#", "matrix": [0, 3], "x": 3, "y": 0},
-                {"label": "$", "matrix": [0, 4], "x": 4, "y": 0},
-                {"label": "%", "matrix": [0, 5], "x": 5, "y": 0},
-                {"label": "^", "matrix": [0, 6], "x": 6, "y": 0},
-                {"label": "&", "matrix": [0, 7], "x": 7, "y": 0},
-                {"label": "*", "matrix": [0, 8], "x": 8, "y": 0},
-                {"label": "(", "matrix": [0, 9], "x": 9, "y": 0},
-                {"label": ")", "matrix": [0, 10], "x": 10, "y": 0},
-                {"label": "_", "matrix": [0, 11], "x": 11, "y": 0},
-                {"label": "+", "matrix": [0, 12], "x": 12, "y": 0},
-                {"label": "Bspc", "matrix": [0, 13], "x": 13, "y": 0},
-                {"label": "Bspc", "matrix": [4, 13], "x": 14, "y": 0},
-
-                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
-                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
-                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
-                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
-                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
-                {"label": "Y", "matrix": [1, 6], "x": 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": "Caps", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
-                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
-                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
-                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
-                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
-                {"label": "H", "matrix": [2, 6], "x": 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": "~", "matrix": [2, 12], "x": 12.75, "y": 2},
-                {"label": "Enter", "matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
-
-                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
-                {"label": "|", "matrix": [3, 1], "x": 1.25, "y": 3},
-                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
-                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
-                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
-                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
-                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
-                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
-                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
-                {"label": "<", "matrix": [3, 9], "x": 9.25, "y": 3},
-                {"label": ">", "matrix": [3, 10], "x": 10.25, "y": 3},
-                {"label": "?", "matrix": [3, 11], "x": 11.25, "y": 3},
-                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"label": "MO(1)", "matrix": [3, 13], "x": 14, "y": 3},
-
-                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
-                {"label": "Win", "matrix": [4, 1], "x": 1.5, "y": 4},
-                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
-                {"label": "Space", "matrix": [4, 6], "x": 4, "y": 4, "w": 7},
-                {"label": "Alt", "matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
-                {"label": "Menu", "matrix": [4, 11], "x": 12.5, "y": 4},
-                {"label": "Ctrl", "matrix": [4, 12], "x": 13.5, "y": 4, "w": 1.5}
-            ]
-        }
-    }
-}
diff --git a/keyboards/smithrune/iron160/iron160_s/keyboard.json b/keyboards/smithrune/iron160/iron160_s/keyboard.json
new file mode 100644
index 00000000000..b2a465399f5
--- /dev/null
+++ b/keyboards/smithrune/iron160/iron160_s/keyboard.json
@@ -0,0 +1,682 @@
+{
+    "keyboard_name": "I160-S",
+    "manufacturer": "SmithRune",
+    "url": "",
+    "maintainer": "Gondolindrim",
+    "usb": {
+        "vid": "0x8384",
+        "pid": "0x1653",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "backlight": true,
+        "bootmagic": true,
+        "command": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "processor": "STM32F072",
+    "bootloader": "stm32-dfu",
+    "matrix_pins": {
+        "cols": ["A3", "B9", "B8", "B5", "B4", "B3", "A6", "A5", "A4", "A2", "A1", "A0", "C15", "C14"],
+        "rows": ["A10", "A15", "C13", "B1", "B10"]
+    },
+    "diode_direction": "COL2ROW",
+    "backlight": {
+        "pin": "A7",
+        "levels": 20,
+        "breathing": true,
+        "breathing_period": 3
+    },
+    "indicators": {
+        "caps_lock": "B0"
+    },
+    "layout_aliases": {
+        "LAYOUT": "LAYOUT_all"
+    },
+    "community_layouts": [
+        "60_ansi",
+        "60_ansi_split_bs_rshift",
+        "60_ansi_tsangan",
+        "60_tsangan_hhkb",
+        "60_iso",
+        "60_iso_split_bs_rshift",
+        "60_iso_tsangan"
+    ],
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                {"label": "~", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "!", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "@", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "#", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "$", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "%", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "^", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "&", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "*", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "(", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": ")", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "_", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "+", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "Bspc", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "Bspc", "matrix": [4, 13], "x": 14, "y": 0},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 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], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"label": "Caps", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 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": "~", "matrix": [2, 12], "x": 12.75, "y": 2},
+                {"label": "Enter", "matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.25},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"label": "|", "matrix": [3, 1], "x": 1.25, "y": 3},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": "<", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ">", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "?", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "MO(1)", "matrix": [3, 13], "x": 14, "y": 3},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "Win", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "Space", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "Alt", "matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"label": "Win", "matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+                {"label": "Menu", "matrix": [4, 11], "x": 12.5, "y": 4, "w": 1.25},
+                {"label": "Ctrl", "matrix": [4, 12], "x": 13.75, "y": 4, "w": 1.25}
+            ]
+        },
+        "LAYOUT_60_ansi": {
+            "layout": [
+                {"label": "~", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "!", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "@", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "#", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "$", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "%", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "^", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "&", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "*", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "(", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": ")", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "_", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "+", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "Bspc", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 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], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"label": "Caps", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 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], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": "<", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ">", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "?", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "Win", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "Space", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "Alt", "matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"label": "Win", "matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+                {"label": "Menu", "matrix": [4, 11], "x": 12.5, "y": 4, "w": 1.25},
+                {"label": "Ctrl", "matrix": [4, 12], "x": 13.75, "y": 4, "w": 1.25}
+            ]
+        },
+        "LAYOUT_60_ansi_split_bs_rshift": {
+            "layout": [
+                {"label": "~", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "!", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "@", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "#", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "$", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "%", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "^", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "&", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "*", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "(", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": ")", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "_", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "+", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "Bspc", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "Bspc", "matrix": [4, 13], "x": 14, "y": 0},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 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], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"label": "Caps", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 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], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": "<", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ">", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "?", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "MO(1)", "matrix": [3, 13], "x": 14, "y": 3},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "Win", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "Space", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "Alt", "matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"label": "Win", "matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+                {"label": "Menu", "matrix": [4, 11], "x": 12.5, "y": 4, "w": 1.25},
+                {"label": "Ctrl", "matrix": [4, 12], "x": 13.75, "y": 4, "w": 1.25}
+            ]
+        },
+        "LAYOUT_60_ansi_tsangan": {
+            "layout": [
+                {"label": "~", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "!", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "@", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "#", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "$", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "%", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "^", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "&", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "*", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "(", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": ")", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "_", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "+", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "Bspc", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 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], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"label": "Caps", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 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], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": "<", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ">", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "?", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"label": "Win", "matrix": [4, 1], "x": 1.5, "y": 4},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"label": "Space", "matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"label": "Alt", "matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
+                {"label": "Menu", "matrix": [4, 11], "x": 12.5, "y": 4},
+                {"label": "Ctrl", "matrix": [4, 12], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_60_tsangan_hhkb": {
+            "layout": [
+                {"label": "~", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "!", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "@", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "#", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "$", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "%", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "^", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "&", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "*", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "(", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": ")", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "_", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "+", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "Bspc", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "Bspc", "matrix": [4, 13], "x": 14, "y": 0},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 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], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"label": "Caps", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 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], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": "<", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ">", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "?", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "MO(1)", "matrix": [3, 13], "x": 14, "y": 3},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"label": "Win", "matrix": [4, 1], "x": 1.5, "y": 4},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"label": "Space", "matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"label": "Alt", "matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
+                {"label": "Menu", "matrix": [4, 11], "x": 12.5, "y": 4},
+                {"label": "Ctrl", "matrix": [4, 12], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_60_iso": {
+            "layout": [
+                {"label": "~", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "!", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "@", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "#", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "$", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "%", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "^", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "&", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "*", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "(", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": ")", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "_", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "+", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "Bspc", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 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": "Caps", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 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": "~", "matrix": [2, 12], "x": 12.75, "y": 2},
+                {"label": "Enter", "matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"label": "|", "matrix": [3, 1], "x": 1.25, "y": 3},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": "<", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ">", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "?", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "Win", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "Space", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "Alt", "matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"label": "Win", "matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+                {"label": "Menu", "matrix": [4, 11], "x": 12.5, "y": 4, "w": 1.25},
+                {"label": "Ctrl", "matrix": [4, 12], "x": 13.75, "y": 4, "w": 1.25}
+            ]
+        },
+        "LAYOUT_60_iso_split_bs_rshift": {
+            "layout": [
+                {"label": "~", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "!", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "@", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "#", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "$", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "%", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "^", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "&", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "*", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "(", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": ")", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "_", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "+", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "Bspc", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "Bspc", "matrix": [4, 13], "x": 14, "y": 0},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 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": "Caps", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 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": "~", "matrix": [2, 12], "x": 12.75, "y": 2},
+                {"label": "Enter", "matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"label": "|", "matrix": [3, 1], "x": 1.25, "y": 3},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": "<", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ">", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "?", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "MO(1)", "matrix": [3, 13], "x": 14, "y": 3},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "Win", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "Space", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "Alt", "matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"label": "Win", "matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+                {"label": "Menu", "matrix": [4, 11], "x": 12.5, "y": 4, "w": 1.25},
+                {"label": "Ctrl", "matrix": [4, 12], "x": 13.75, "y": 4, "w": 1.25}
+            ]
+        },
+        "LAYOUT_60_iso_tsangan": {
+            "layout": [
+                {"label": "~", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "!", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "@", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "#", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "$", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "%", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "^", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "&", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "*", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "(", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": ")", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "_", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "+", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "Bspc", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 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": "Caps", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 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": "~", "matrix": [2, 12], "x": 12.75, "y": 2},
+                {"label": "Enter", "matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"label": "|", "matrix": [3, 1], "x": 1.25, "y": 3},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": "<", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ">", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "?", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"label": "Win", "matrix": [4, 1], "x": 1.5, "y": 4},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"label": "Space", "matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"label": "Alt", "matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
+                {"label": "Menu", "matrix": [4, 11], "x": 12.5, "y": 4},
+                {"label": "Ctrl", "matrix": [4, 12], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_60_iso_tsangan_split_bs_rshift": {
+            "layout": [
+                {"label": "~", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "!", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "@", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "#", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "$", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "%", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "^", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "&", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "*", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "(", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": ")", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "_", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "+", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "Bspc", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "Bspc", "matrix": [4, 13], "x": 14, "y": 0},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 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": "Caps", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 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": "~", "matrix": [2, 12], "x": 12.75, "y": 2},
+                {"label": "Enter", "matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"label": "|", "matrix": [3, 1], "x": 1.25, "y": 3},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": "<", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ">", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "?", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "MO(1)", "matrix": [3, 13], "x": 14, "y": 3},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"label": "Win", "matrix": [4, 1], "x": 1.5, "y": 4},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"label": "Space", "matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"label": "Alt", "matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
+                {"label": "Menu", "matrix": [4, 11], "x": 12.5, "y": 4},
+                {"label": "Ctrl", "matrix": [4, 12], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/smithrune/iron160/iron160_s/rules.mk b/keyboards/smithrune/iron160/iron160_s/rules.mk
index 2c863bbe31a..4138455538f 100644
--- a/keyboards/smithrune/iron160/iron160_s/rules.mk
+++ b/keyboards/smithrune/iron160/iron160_s/rules.mk
@@ -1,18 +1,2 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes           # USB Nkey Rollover
-BACKLIGHT_ENABLE = yes       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-ENCODER_ENABLE = no
-LTO_ENABLE = no
-
 EEPROM_DRIVER = wear_leveling
 WEAR_LEVELING_DRIVER = legacy
-
diff --git a/keyboards/smithrune/iron165r2/f072/info.json b/keyboards/smithrune/iron165r2/f072/info.json
deleted file mode 100644
index 2cbbaa84f3f..00000000000
--- a/keyboards/smithrune/iron165r2/f072/info.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-    "backlight": {
-        "pin": "A6",
-        "levels": 20,
-        "breathing": true
-    },
-    "rgblight": {
-        "led_count": 22,
-        "animations": {
-            "breathing": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "snake": true,
-            "knight": true,
-            "christmas": true,
-            "static_gradient": true,
-            "rgb_test": true,
-            "alternating": true,
-            "twinkle": true
-        },
-        "default": {
-            "val": 0
-        }
-    },
-    "ws2812": {
-        "pin": "B15"
-    },
-    "processor": "STM32F072",
-    "bootloader": "stm32-dfu"
-}
diff --git a/keyboards/smithrune/iron165r2/f072/keyboard.json b/keyboards/smithrune/iron165r2/f072/keyboard.json
new file mode 100644
index 00000000000..e16493d0b5c
--- /dev/null
+++ b/keyboards/smithrune/iron165r2/f072/keyboard.json
@@ -0,0 +1,42 @@
+{
+    "build": {
+        "lto": false
+    },
+    "features": {
+        "backlight": true,
+        "bootmagic": true,
+        "command": true,
+        "extrakey": true,
+        "mousekey": false,
+        "nkro": true,
+        "rgblight": true
+    },
+    "backlight": {
+        "pin": "A6",
+        "levels": 20,
+        "breathing": true
+    },
+    "rgblight": {
+        "led_count": 22,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": true,
+            "twinkle": true
+        },
+        "default": {
+            "val": 0
+        }
+    },
+    "ws2812": {
+        "pin": "B15"
+    },
+    "processor": "STM32F072",
+    "bootloader": "stm32-dfu"
+}
diff --git a/keyboards/smithrune/iron165r2/f072/rules.mk b/keyboards/smithrune/iron165r2/f072/rules.mk
deleted file mode 100644
index b524e61f4bb..00000000000
--- a/keyboards/smithrune/iron165r2/f072/rules.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes           # USB Nkey Rollover
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-LTO_ENABLE = no
-ENCODER_ENABLE = no
-BACKLIGHT_ENABLE = yes
-
diff --git a/keyboards/smithrune/iron165r2/f411/info.json b/keyboards/smithrune/iron165r2/f411/info.json
deleted file mode 100644
index ff685e3cdd8..00000000000
--- a/keyboards/smithrune/iron165r2/f411/info.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-    "eeprom": {
-        "driver": "i2c"
-    },
-    "backlight": {
-        "pin": "A6",
-        "levels": 20,
-        "breathing": true
-    },
-    "rgblight": {
-        "led_count": 22,
-        "animations": {
-            "breathing": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "snake": true,
-            "knight": true,
-            "christmas": true,
-            "static_gradient": true,
-            "rgb_test": true,
-            "alternating": true,
-            "twinkle": true
-        },
-        "default": {
-            "val": 0
-        }
-    },
-    "ws2812": {
-        "pin": "B15",
-        "driver": "pwm"
-    },
-    "processor": "STM32F411",
-    "bootloader": "stm32-dfu"
-}
diff --git a/keyboards/smithrune/iron165r2/f411/keyboard.json b/keyboards/smithrune/iron165r2/f411/keyboard.json
new file mode 100644
index 00000000000..d3d4b3de506
--- /dev/null
+++ b/keyboards/smithrune/iron165r2/f411/keyboard.json
@@ -0,0 +1,46 @@
+{
+    "build": {
+        "lto": false
+    },
+    "features": {
+        "backlight": true,
+        "bootmagic": true,
+        "command": true,
+        "extrakey": true,
+        "mousekey": false,
+        "nkro": true,
+        "rgblight": true
+    },
+    "eeprom": {
+        "driver": "i2c"
+    },
+    "backlight": {
+        "pin": "A6",
+        "levels": 20,
+        "breathing": true
+    },
+    "rgblight": {
+        "led_count": 22,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": true,
+            "twinkle": true
+        },
+        "default": {
+            "val": 0
+        }
+    },
+    "ws2812": {
+        "pin": "B15",
+        "driver": "pwm"
+    },
+    "processor": "STM32F411",
+    "bootloader": "stm32-dfu"
+}
diff --git a/keyboards/smithrune/iron165r2/f411/rules.mk b/keyboards/smithrune/iron165r2/f411/rules.mk
deleted file mode 100644
index f5a58ab0cb7..00000000000
--- a/keyboards/smithrune/iron165r2/f411/rules.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes           # USB Nkey Rollover
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-LTO_ENABLE = no
-ENCODER_ENABLE = no
-BACKLIGHT_ENABLE = yes
diff --git a/keyboards/snes_macropad/info.json b/keyboards/snes_macropad/keyboard.json
similarity index 100%
rename from keyboards/snes_macropad/info.json
rename to keyboards/snes_macropad/keyboard.json
diff --git a/keyboards/soda/cherish/config.h b/keyboards/soda/cherish/config.h
deleted file mode 100644
index f608132b5af..00000000000
--- a/keyboards/soda/cherish/config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-Copyright 2015 Álvaro "Gondolindrim" Volpato  <gondolindrim@acheronproject.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
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/soda/cherish/info.json b/keyboards/soda/cherish/info.json
deleted file mode 100644
index 1284c79ce4a..00000000000
--- a/keyboards/soda/cherish/info.json
+++ /dev/null
@@ -1,138 +0,0 @@
-{
-    "keyboard_name": "Cherish-75",
-    "url": "",
-    "maintainer": "gezhaoyou",
-    "manufacturer": "gezhaoyou",
-    "usb": {
-        "vid": "0xEB50",
-        "pid": "0xEB52",
-        "device_version": "0.0.1"
-    },
-    "rgblight": {
-        "saturation_steps": 8,
-        "brightness_steps": 8,
-        "led_count": 1,
-        "animations": {
-            "breathing": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "snake": true,
-            "knight": true,
-            "christmas": true,
-            "static_gradient": true,
-            "rgb_test": true,
-            "alternating": true,
-            "twinkle": true
-        }
-    },
-    "ws2812": {
-        "pin": "A13"
-    },
-    "matrix_pins": {
-        "cols": ["B12", "B13", "B14", "B15", "A8", "A9", "A10", "A14", "A15", "B3", "B4", "B5", "B6", "B7", "B8"],
-        "rows": ["A7", "B0", "B1", "B2", "B10", "B11"]
-    },
-    "diode_direction": "COL2ROW",
-    "processor": "STM32F072",
-    "bootloader": "stm32-dfu",
-    "layout_aliases": {
-        "LAYOUT_75_ansi": "LAYOUT"
-    },
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-
-                {"matrix": [0, 1], "x": 1.5, "y": 0},
-                {"matrix": [0, 2], "x": 2.5, "y": 0},
-                {"matrix": [0, 3], "x": 3.5, "y": 0},
-                {"matrix": [0, 4], "x": 4.5, "y": 0},
-
-                {"matrix": [0, 5], "x": 6, "y": 0},
-                {"matrix": [0, 6], "x": 7, "y": 0},
-                {"matrix": [0, 7], "x": 8, "y": 0},
-                {"matrix": [0, 8], "x": 9, "y": 0},
-
-                {"matrix": [0, 9], "x": 10.5, "y": 0},
-                {"matrix": [0, 10], "x": 11.5, "y": 0},
-                {"matrix": [0, 11], "x": 12.5, "y": 0},
-                {"matrix": [0, 12], "x": 13.5, "y": 0},
-
-                {"matrix": [0, 14], "x": 15, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1.25},
-                {"matrix": [1, 1], "x": 1, "y": 1.25},
-                {"matrix": [1, 2], "x": 2, "y": 1.25},
-                {"matrix": [1, 3], "x": 3, "y": 1.25},
-                {"matrix": [1, 4], "x": 4, "y": 1.25},
-                {"matrix": [1, 5], "x": 5, "y": 1.25},
-                {"matrix": [1, 6], "x": 6, "y": 1.25},
-                {"matrix": [1, 7], "x": 7, "y": 1.25},
-                {"matrix": [1, 8], "x": 8, "y": 1.25},
-                {"matrix": [1, 9], "x": 9, "y": 1.25},
-                {"matrix": [1, 10], "x": 10, "y": 1.25},
-                {"matrix": [1, 11], "x": 11, "y": 1.25},
-                {"matrix": [1, 12], "x": 12, "y": 1.25},
-                {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
-                {"matrix": [1, 14], "x": 15, "y": 1.25},
-
-                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
-                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
-                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
-                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
-                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
-                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
-                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
-                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
-                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
-                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
-                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
-                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
-                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
-                {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
-                {"matrix": [2, 14], "x": 15, "y": 2.25},
-
-                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
-                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
-                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
-                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
-                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
-                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
-                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
-                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
-                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
-                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
-                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
-                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
-                {"matrix": [3, 12], "x": 12.75, "y": 3.25, "w": 2.25},
-                {"matrix": [3, 14], "x": 15, "y": 3.25},
-
-                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
-                {"matrix": [4, 1], "x": 2.25, "y": 4.25},
-                {"matrix": [4, 2], "x": 3.25, "y": 4.25},
-                {"matrix": [4, 3], "x": 4.25, "y": 4.25},
-                {"matrix": [4, 4], "x": 5.25, "y": 4.25},
-                {"matrix": [4, 5], "x": 6.25, "y": 4.25},
-                {"matrix": [4, 6], "x": 7.25, "y": 4.25},
-                {"matrix": [4, 7], "x": 8.25, "y": 4.25},
-                {"matrix": [4, 8], "x": 9.25, "y": 4.25},
-                {"matrix": [4, 9], "x": 10.25, "y": 4.25},
-                {"matrix": [4, 10], "x": 11.25, "y": 4.25},
-                {"matrix": [4, 11], "x": 12.25, "y": 4.25, "w": 1.75},
-                {"matrix": [4, 12], "x": 14, "y": 4.25},
-                {"matrix": [4, 14], "x": 15, "y": 4.25},
-
-                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 5], "x": 3.75, "y": 5.25, "w": 6.25},
-                {"matrix": [5, 9], "x": 10, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 10], "x": 11.25, "y": 5.25, "w": 1.25},
-
-                {"matrix": [5, 11], "x": 13, "y": 5.25},
-                {"matrix": [5, 12], "x": 14, "y": 5.25},
-                {"matrix": [5, 14], "x": 15, "y": 5.25}
-            ]
-        }
-    }
-}
diff --git a/keyboards/soda/cherish/keyboard.json b/keyboards/soda/cherish/keyboard.json
new file mode 100644
index 00000000000..b256e939651
--- /dev/null
+++ b/keyboards/soda/cherish/keyboard.json
@@ -0,0 +1,153 @@
+{
+    "keyboard_name": "Cherish-75",
+    "url": "",
+    "maintainer": "gezhaoyou",
+    "manufacturer": "gezhaoyou",
+    "usb": {
+        "vid": "0xEB50",
+        "pid": "0xEB52",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "command": true,
+        "console": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgblight": true
+    },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 1,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": true,
+            "twinkle": true
+        }
+    },
+    "ws2812": {
+        "pin": "A13"
+    },
+    "matrix_pins": {
+        "cols": ["B12", "B13", "B14", "B15", "A8", "A9", "A10", "A14", "A15", "B3", "B4", "B5", "B6", "B7", "B8"],
+        "rows": ["A7", "B0", "B1", "B2", "B10", "B11"]
+    },
+    "diode_direction": "COL2ROW",
+    "processor": "STM32F072",
+    "bootloader": "stm32-dfu",
+    "layout_aliases": {
+        "LAYOUT_75_ansi": "LAYOUT"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.5, "y": 0},
+                {"matrix": [0, 2], "x": 2.5, "y": 0},
+                {"matrix": [0, 3], "x": 3.5, "y": 0},
+                {"matrix": [0, 4], "x": 4.5, "y": 0},
+
+                {"matrix": [0, 5], "x": 6, "y": 0},
+                {"matrix": [0, 6], "x": 7, "y": 0},
+                {"matrix": [0, 7], "x": 8, "y": 0},
+                {"matrix": [0, 8], "x": 9, "y": 0},
+
+                {"matrix": [0, 9], "x": 10.5, "y": 0},
+                {"matrix": [0, 10], "x": 11.5, "y": 0},
+                {"matrix": [0, 11], "x": 12.5, "y": 0},
+                {"matrix": [0, 12], "x": 13.5, "y": 0},
+
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+                {"matrix": [1, 14], "x": 15, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 14], "x": 15, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 12], "x": 12.75, "y": 3.25, "w": 2.25},
+                {"matrix": [3, 14], "x": 15, "y": 3.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 1], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"matrix": [4, 12], "x": 14, "y": 4.25},
+                {"matrix": [4, 14], "x": 15, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 5], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 9], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 10], "x": 11.25, "y": 5.25, "w": 1.25},
+
+                {"matrix": [5, 11], "x": 13, "y": 5.25},
+                {"matrix": [5, 12], "x": 14, "y": 5.25},
+                {"matrix": [5, 14], "x": 15, "y": 5.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/soda/cherish/rules.mk b/keyboards/soda/cherish/rules.mk
index a8af2d4ebca..04fe1eba2ac 100644
--- a/keyboards/soda/cherish/rules.mk
+++ b/keyboards/soda/cherish/rules.mk
@@ -1,16 +1,2 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = yes        # Console for debug
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
 # Wildcard to allow APM32 MCU
 DFU_SUFFIX_ARGS = -p FFFF -v FFFF
-
diff --git a/keyboards/sofle/keymaps/default/config.h b/keyboards/sofle/keymaps/default/config.h
new file mode 100644
index 00000000000..085d5844d9f
--- /dev/null
+++ b/keyboards/sofle/keymaps/default/config.h
@@ -0,0 +1,8 @@
+// Copyright 2024 Santosh Kumar (@santosh)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#define TRI_LAYER_LOWER_LAYER 2
+#define TRI_LAYER_UPPER_LAYER 3
+#define TRI_LAYER_ADJUST_LAYER 4
diff --git a/keyboards/sowbug/68keys/keyboard.json b/keyboards/sowbug/68keys/keyboard.json
index cfdf78efaf2..2b8f7da3d50 100644
--- a/keyboards/sowbug/68keys/keyboard.json
+++ b/keyboards/sowbug/68keys/keyboard.json
@@ -74,8 +74,7 @@
         "rows": ["C14", "C15", "A0", "A1", "A2"]
     },
     "diode_direction": "COL2ROW",
-    "processor": "STM32F103",
-    "bootloader": "stm32duino",
+    "development_board": "bluepill",
     "layout_aliases": {
         "LAYOUT_default": "LAYOUT"
     },
diff --git a/keyboards/sowbug/ansi_tkl/keyboard.json b/keyboards/sowbug/ansi_tkl/keyboard.json
index e6b9d28fdcb..69f78cba6d4 100644
--- a/keyboards/sowbug/ansi_tkl/keyboard.json
+++ b/keyboards/sowbug/ansi_tkl/keyboard.json
@@ -74,8 +74,7 @@
         "rows": ["C14", "C15", "A0", "A1", "A2", "A3"]
     },
     "diode_direction": "COL2ROW",
-    "processor": "STM32F103",
-    "bootloader": "stm32duino",
+    "development_board": "bluepill",
     "layout_aliases": {
         "LAYOUT": "LAYOUT_default"
     },
diff --git a/keyboards/spaceholdings/nebula12/info.json b/keyboards/spaceholdings/nebula12/info.json
deleted file mode 100755
index 6638498e0c6..00000000000
--- a/keyboards/spaceholdings/nebula12/info.json
+++ /dev/null
@@ -1,60 +0,0 @@
-{
-    "keyboard_name": "NEBULA12",
-    "manufacturer": "Yiancar-Designs",
-    "url": "",
-    "maintainer": "yiancar",
-    "usb": {
-        "vid": "0x8968",
-        "pid": "0x5337",
-        "device_version": "0.0.1"
-    },
-    "rgblight": {
-        "saturation_steps": 8,
-        "brightness_steps": 8,
-        "led_count": 10,
-        "animations": {
-            "breathing": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "snake": true,
-            "knight": true,
-            "christmas": true,
-            "static_gradient": true,
-            "rgb_test": true,
-            "alternating": true,
-            "twinkle": true
-        }
-    },
-    "ws2812": {
-        "pin": "B15",
-        "driver": "spi"
-    },
-    "matrix_pins": {
-        "cols": ["A9", "C13", "C14"],
-        "rows": ["A8", "C15", "A0", "A1"]
-    },
-    "diode_direction": "COL2ROW",
-    "processor": "STM32F072",
-    "bootloader": "stm32-dfu",
-    "layouts": {
-        "LAYOUT_ortho_4x3": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1},
-                {"matrix": [1, 1], "x": 1, "y": 1},
-                {"matrix": [1, 2], "x": 2, "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}
-            ]
-        }
-    }
-}
diff --git a/keyboards/spaceholdings/nebula12/keyboard.json b/keyboards/spaceholdings/nebula12/keyboard.json
new file mode 100755
index 00000000000..2b170e8e618
--- /dev/null
+++ b/keyboards/spaceholdings/nebula12/keyboard.json
@@ -0,0 +1,67 @@
+{
+    "keyboard_name": "NEBULA12",
+    "manufacturer": "Yiancar-Designs",
+    "url": "",
+    "maintainer": "yiancar",
+    "usb": {
+        "vid": "0x8968",
+        "pid": "0x5337",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgblight": true
+    },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 10,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": true,
+            "twinkle": true
+        }
+    },
+    "ws2812": {
+        "pin": "B15",
+        "driver": "spi"
+    },
+    "matrix_pins": {
+        "cols": ["A9", "C13", "C14"],
+        "rows": ["A8", "C15", "A0", "A1"]
+    },
+    "diode_direction": "COL2ROW",
+    "processor": "STM32F072",
+    "bootloader": "stm32-dfu",
+    "layouts": {
+        "LAYOUT_ortho_4x3": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "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}
+            ]
+        }
+    }
+}
diff --git a/keyboards/spaceholdings/nebula12/rules.mk b/keyboards/spaceholdings/nebula12/rules.mk
index a0b1795cee0..edd7b800ef2 100755
--- a/keyboards/spaceholdings/nebula12/rules.mk
+++ b/keyboards/spaceholdings/nebula12/rules.mk
@@ -1,26 +1,13 @@
 # Do not put the microcontroller into power saving mode
 # when we get USB suspend event. We want it to keep updating
 # backlight effects.
-OPT_DEFS += -DNO_SUSPEND_POWER_DOWN
-
-# Build Options
-#   change yes to no to disable
-#
-BACKLIGHT_ENABLE = no              # Enable keyboard backlight functionality
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes              # Mouse keys
-EXTRAKEY_ENABLE = yes              # Audio control and System control
-CONSOLE_ENABLE = no                # Console for debug
-COMMAND_ENABLE = no                # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-AUDIO_ENABLE = no                  # Audio output
-RGBLIGHT_ENABLE = yes              # Underglow RGB
+NO_SUSPEND_POWER_DOWN = yes
 
 CIE1931_CURVE = yes
+I2C_DRIVER_REQUIRED = yes
 
 # project specific files
 SRC +=  keyboards/wilba_tech/wt_main.c \
         keyboards/wilba_tech/wt_rgb_backlight.c \
         drivers/led/issi/is31fl3731.c \
         quantum/color.c
-I2C_DRIVER_REQUIRED = yes
diff --git a/keyboards/spaceholdings/nebula68/info.json b/keyboards/spaceholdings/nebula68/info.json
deleted file mode 100755
index dfc61b3a2d1..00000000000
--- a/keyboards/spaceholdings/nebula68/info.json
+++ /dev/null
@@ -1,124 +0,0 @@
-{
-    "keyboard_name": "NEBULA68",
-    "manufacturer": "Yiancar-Designs",
-    "url": "",
-    "maintainer": "yiancar",
-    "usb": {
-        "vid": "0x8968",
-        "pid": "0x5336",
-        "device_version": "0.0.1"
-    },
-    "ws2812": {
-        "pin": "A7",
-        "driver": "pwm"
-    },
-    "rgblight": {
-        "saturation_steps": 8,
-        "brightness_steps": 8,
-        "led_count": 10,
-        "max_brightness": 210,
-        "animations": {
-            "breathing": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "snake": true,
-            "knight": true,
-            "christmas": true,
-            "static_gradient": true,
-            "rgb_test": true,
-            "alternating": true,
-            "twinkle": true
-        }
-    },
-    "matrix_pins": {
-        "cols": ["A13", "A10", "A9", "A14", "A15", "B8", "B9", "C13", "C14", "C15", "A0", "A1", "A2", "A3", "A5"],
-        "rows": ["B3", "B4", "B5", "A8", "A4"]
-    },
-    "diode_direction": "COL2ROW",
-    "processor": "STM32F303",
-    "bootloader": "stm32-dfu",
-    "board": "QMK_PROTON_C",
-    "community_layouts": ["68_ansi"],
-    "layouts": {
-        "LAYOUT_68_ansi": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 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": [2, 14], "x": 16.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": [2, 12], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"matrix": [1, 14], "x": 15.25, "y": 1},
-                {"matrix": [3, 14], "x": 16.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": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 2], "x": 2.25, "y": 3},
-                {"matrix": [3, 3], "x": 3.25, "y": 3},
-                {"matrix": [3, 4], "x": 4.25, "y": 3},
-                {"matrix": [3, 5], "x": 5.25, "y": 3},
-                {"matrix": [3, 6], "x": 6.25, "y": 3},
-                {"matrix": [3, 7], "x": 7.25, "y": 3},
-                {"matrix": [3, 8], "x": 8.25, "y": 3},
-                {"matrix": [3, 9], "x": 9.25, "y": 3},
-                {"matrix": [3, 10], "x": 10.25, "y": 3},
-                {"matrix": [3, 11], "x": 11.25, "y": 3},
-                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
-
-                {"matrix": [3, 13], "x": 15.25, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
-                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
-                {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 11], "x": 12.5, "y": 4, "w": 1.25},
-
-                {"matrix": [4, 12], "x": 14.25, "y": 4},
-                {"matrix": [4, 13], "x": 15.25, "y": 4},
-                {"matrix": [4, 14], "x": 16.25, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/spaceholdings/nebula68/keyboard.json b/keyboards/spaceholdings/nebula68/keyboard.json
new file mode 100755
index 00000000000..47cab7a5b02
--- /dev/null
+++ b/keyboards/spaceholdings/nebula68/keyboard.json
@@ -0,0 +1,131 @@
+{
+    "keyboard_name": "NEBULA68",
+    "manufacturer": "Yiancar-Designs",
+    "url": "",
+    "maintainer": "yiancar",
+    "usb": {
+        "vid": "0x8968",
+        "pid": "0x5336",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgblight": true
+    },
+    "ws2812": {
+        "pin": "A7",
+        "driver": "pwm"
+    },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 10,
+        "max_brightness": 210,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": true,
+            "twinkle": true
+        }
+    },
+    "matrix_pins": {
+        "cols": ["A13", "A10", "A9", "A14", "A15", "B8", "B9", "C13", "C14", "C15", "A0", "A1", "A2", "A3", "A5"],
+        "rows": ["B3", "B4", "B5", "A8", "A4"]
+    },
+    "diode_direction": "COL2ROW",
+    "processor": "STM32F303",
+    "bootloader": "stm32-dfu",
+    "board": "QMK_PROTON_C",
+    "community_layouts": ["68_ansi"],
+    "layouts": {
+        "LAYOUT_68_ansi": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 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": [2, 14], "x": 16.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": [2, 12], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1},
+                {"matrix": [3, 14], "x": 16.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": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
+
+                {"matrix": [3, 13], "x": 15.25, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 12.5, "y": 4, "w": 1.25},
+
+                {"matrix": [4, 12], "x": 14.25, "y": 4},
+                {"matrix": [4, 13], "x": 15.25, "y": 4},
+                {"matrix": [4, 14], "x": 16.25, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/spaceholdings/nebula68/rules.mk b/keyboards/spaceholdings/nebula68/rules.mk
index d2484b627c3..60dc97f0586 100755
--- a/keyboards/spaceholdings/nebula68/rules.mk
+++ b/keyboards/spaceholdings/nebula68/rules.mk
@@ -1,26 +1,13 @@
 # Do not put the microcontroller into power saving mode
 # when we get USB suspend event. We want it to keep updating
 # backlight effects.
-OPT_DEFS += -DNO_SUSPEND_POWER_DOWN
-
-# Build Options
-#   change yes to no to disable
-#
-BACKLIGHT_ENABLE = no              # Enable keyboard backlight functionality
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes              # Mouse keys
-EXTRAKEY_ENABLE = yes              # Audio control and System control
-CONSOLE_ENABLE = no                # Console for debug
-COMMAND_ENABLE = no                # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-AUDIO_ENABLE = no                  # Audio output
-RGBLIGHT_ENABLE = yes              # Underglow RGB
+NO_SUSPEND_POWER_DOWN = yes
 
 CIE1931_CURVE = yes
+I2C_DRIVER_REQUIRED = yes
 
 # project specific files
 SRC +=  keyboards/wilba_tech/wt_main.c \
         keyboards/wilba_tech/wt_rgb_backlight.c \
         drivers/led/issi/is31fl3733.c \
         quantum/color.c
-I2C_DRIVER_REQUIRED = yes
diff --git a/keyboards/spaceman/pancake/rev1/feather/info.json b/keyboards/spaceman/pancake/rev1/feather/info.json
deleted file mode 100644
index 85f95a011bb..00000000000
--- a/keyboards/spaceman/pancake/rev1/feather/info.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-    "matrix_pins": {
-        "cols": ["C7", "D6", "B7", "B6", "F0", "D2", "D3", "F1", "F4", "F5", "F6", "F7"],
-        "rows": ["B5", "D7", "C6", "D0"]
-    },
-    "diode_direction": "COL2ROW",
-    "bluetooth": {
-        "driver": "bluefruit_le"
-    }
-}
diff --git a/keyboards/spaceman/pancake/rev1/feather/keyboard.json b/keyboards/spaceman/pancake/rev1/feather/keyboard.json
new file mode 100644
index 00000000000..3b82e3d4999
--- /dev/null
+++ b/keyboards/spaceman/pancake/rev1/feather/keyboard.json
@@ -0,0 +1,19 @@
+{
+    "features": {
+        "bluetooth": true,
+        "bootmagic": true,
+        "command": true,
+        "console": true,
+        "extrakey": true,
+        "mousekey": false,
+        "nkro": true
+    },
+    "matrix_pins": {
+        "cols": ["C7", "D6", "B7", "B6", "F0", "D2", "D3", "F1", "F4", "F5", "F6", "F7"],
+        "rows": ["B5", "D7", "C6", "D0"]
+    },
+    "diode_direction": "COL2ROW",
+    "bluetooth": {
+        "driver": "bluefruit_le"
+    }
+}
diff --git a/keyboards/spaceman/pancake/rev1/feather/rules.mk b/keyboards/spaceman/pancake/rev1/feather/rules.mk
index 35ad61d4a17..bccd7dfa97e 100644
--- a/keyboards/spaceman/pancake/rev1/feather/rules.mk
+++ b/keyboards/spaceman/pancake/rev1/feather/rules.mk
@@ -1,20 +1,6 @@
 # Processor frequency
 F_CPU = 8000000
 
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE  = no	# Mouse keys
-EXTRAKEY_ENABLE  = yes	# Audio control and System control
-CONSOLE_ENABLE  = yes	# Console for debug
-COMMAND_ENABLE  = yes    # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE  = no  # Custom backlighting code is used, so this should not be enabled
-AUDIO_ENABLE  = no # This can be enabled if a speaker is connected to the expansion port. Not compatible with RGBLIGHT below
-RGBLIGHT_ENABLE  = no # This can be enabled if a ws2812 strip is connected to the expansion port.
-BLUETOOTH_ENABLE = yes
-
 # Disable unsupported hardware
 RGBLIGHT_SUPPORTED = no
 AUDIO_SUPPORTED = no
diff --git a/keyboards/spaceman/pancake/rev1/promicro/info.json b/keyboards/spaceman/pancake/rev1/promicro/info.json
deleted file mode 100644
index 47ab8fdcd0a..00000000000
--- a/keyboards/spaceman/pancake/rev1/promicro/info.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    "matrix_pins": {
-        "cols": ["F4", "F5", "F6", "F7", "E6", "B4", "B5", "D7", "C6", "D4", "D0", "D1"],
-        "rows": ["B1", "B3", "B2", "B6"]
-    },
-    "diode_direction": "COL2ROW"
-}
diff --git a/keyboards/spaceman/pancake/rev1/promicro/keyboard.json b/keyboards/spaceman/pancake/rev1/promicro/keyboard.json
new file mode 100644
index 00000000000..658eaa39c15
--- /dev/null
+++ b/keyboards/spaceman/pancake/rev1/promicro/keyboard.json
@@ -0,0 +1,15 @@
+{
+    "features": {
+        "bootmagic": true,
+        "command": true,
+        "console": true,
+        "extrakey": true,
+        "mousekey": false,
+        "nkro": true
+    },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "F6", "F7", "E6", "B4", "B5", "D7", "C6", "D4", "D0", "D1"],
+        "rows": ["B1", "B3", "B2", "B6"]
+    },
+    "diode_direction": "COL2ROW"
+}
diff --git a/keyboards/spaceman/pancake/rev1/promicro/rules.mk b/keyboards/spaceman/pancake/rev1/promicro/rules.mk
index 96e36eba388..16051206467 100644
--- a/keyboards/spaceman/pancake/rev1/promicro/rules.mk
+++ b/keyboards/spaceman/pancake/rev1/promicro/rules.mk
@@ -1,16 +1,3 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE  = no	# Mouse keys
-EXTRAKEY_ENABLE  = yes	# Audio control and System control
-CONSOLE_ENABLE  = yes	# Console for debug
-COMMAND_ENABLE  = yes    # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE  = no  # Custom backlighting code is used, so this should not be enabled
-AUDIO_ENABLE  = no # This can be enabled if a speaker is connected to the expansion port. Not compatible with RGBLIGHT below
-RGBLIGHT_ENABLE  = no # This can be enabled if a ws2812 strip is connected to the expansion port.
-
 # Disable unsupported hardware
 RGBLIGHT_SUPPORTED = no
 AUDIO_SUPPORTED = no
diff --git a/keyboards/specskeys/config.h b/keyboards/specskeys/config.h
deleted file mode 100644
index 490ac5e5c02..00000000000
--- a/keyboards/specskeys/config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-Copyright 2021 Nico
-
-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
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/specskeys/info.json b/keyboards/specskeys/info.json
deleted file mode 100644
index eb92e6f34fd..00000000000
--- a/keyboards/specskeys/info.json
+++ /dev/null
@@ -1,135 +0,0 @@
-{
-    "keyboard_name": "Specskeys",
-    "manufacturer": "Specs32",
-    "url": "",
-    "maintainer": "qmk",
-    "usb": {
-        "vid": "0xCAFE",
-        "pid": "0x0080",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["E6", "B0", "B1", "B2", "B3", "D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "B6"],
-        "rows": ["F0", "F1", "F4", "F5", "F6", "F7"]
-    },
-    "diode_direction": "COL2ROW",
-    "backlight": {
-        "pin": "B7",
-        "levels": 1
-    },
-    "indicators": {
-        "caps_lock": "C7",
-        "scroll_lock": "C6"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "layout_aliases": {
-        "LAYOUT": "LAYOUT_tkl_iso_tsangan"
-    },
-    "layouts": {
-        "LAYOUT_tkl_iso_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, 13], "x": 15.5, "y": 0},
-                {"matrix": [0, 14], "x": 16.5, "y": 0},
-                {"matrix": [0, 15], "x": 17.5, "y": 0},
-
-                {"matrix": [5, 0], "x": 0, "y": 2},
-                {"matrix": [1, 0], "x": 1, "y": 2},
-                {"matrix": [1, 1], "x": 2, "y": 2},
-                {"matrix": [1, 2], "x": 3, "y": 2},
-                {"matrix": [1, 3], "x": 4, "y": 2},
-                {"matrix": [1, 4], "x": 5, "y": 2},
-                {"matrix": [1, 5], "x": 6, "y": 2},
-                {"matrix": [1, 6], "x": 7, "y": 2},
-                {"matrix": [1, 7], "x": 8, "y": 2},
-                {"matrix": [1, 8], "x": 9, "y": 2},
-                {"matrix": [1, 9], "x": 10, "y": 2},
-                {"matrix": [1, 10], "x": 11, "y": 2},
-                {"matrix": [1, 11], "x": 12, "y": 2},
-                {"matrix": [1, 12], "x": 13, "y": 2, "w": 2},
-
-                {"matrix": [1, 13], "x": 15.5, "y": 2},
-                {"matrix": [1, 14], "x": 16.5, "y": 2},
-                {"matrix": [1, 15], "x": 17.5, "y": 2},
-
-                {"matrix": [5, 1], "x": 0, "y": 3, "w": 1.5},
-                {"matrix": [2, 0], "x": 1.5, "y": 3},
-                {"matrix": [2, 1], "x": 2.5, "y": 3},
-                {"matrix": [2, 2], "x": 3.5, "y": 3},
-                {"matrix": [2, 3], "x": 4.5, "y": 3},
-                {"matrix": [2, 4], "x": 5.5, "y": 3},
-                {"matrix": [2, 5], "x": 6.5, "y": 3},
-                {"matrix": [2, 6], "x": 7.5, "y": 3},
-                {"matrix": [2, 7], "x": 8.5, "y": 3},
-                {"matrix": [2, 8], "x": 9.5, "y": 3},
-                {"matrix": [2, 9], "x": 10.5, "y": 3},
-                {"matrix": [2, 10], "x": 11.5, "y": 3},
-                {"matrix": [2, 11], "x": 12.5, "y": 3},
-
-                {"matrix": [2, 13], "x": 15.5, "y": 3},
-                {"matrix": [2, 14], "x": 16.5, "y": 3},
-                {"matrix": [2, 15], "x": 17.5, "y": 3},
-
-                {"matrix": [5, 2], "x": 0, "y": 4, "w": 1.75},
-                {"matrix": [3, 0], "x": 1.75, "y": 4},
-                {"matrix": [3, 1], "x": 2.75, "y": 4},
-                {"matrix": [3, 2], "x": 3.75, "y": 4},
-                {"matrix": [3, 3], "x": 4.75, "y": 4},
-                {"matrix": [3, 4], "x": 5.75, "y": 4},
-                {"matrix": [3, 5], "x": 6.75, "y": 4},
-                {"matrix": [3, 6], "x": 7.75, "y": 4},
-                {"matrix": [3, 7], "x": 8.75, "y": 4},
-                {"matrix": [3, 8], "x": 9.75, "y": 4},
-                {"matrix": [3, 9], "x": 10.75, "y": 4},
-                {"matrix": [3, 10], "x": 11.75, "y": 4},
-                {"matrix": [3, 11], "x": 12.75, "y": 4},
-                {"matrix": [2, 12], "x": 13.75, "y": 3, "w": 1.25, "h": 2},
-
-                {"matrix": [5, 3], "x": 0, "y": 5, "w": 1.25},
-                {"matrix": [4, 0], "x": 1.25, "y": 5},
-                {"matrix": [4, 1], "x": 2.25, "y": 5},
-                {"matrix": [4, 2], "x": 3.25, "y": 5},
-                {"matrix": [4, 3], "x": 4.25, "y": 5},
-                {"matrix": [4, 4], "x": 5.25, "y": 5},
-                {"matrix": [4, 5], "x": 6.25, "y": 5},
-                {"matrix": [4, 6], "x": 7.25, "y": 5},
-                {"matrix": [4, 7], "x": 8.25, "y": 5},
-                {"matrix": [4, 8], "x": 9.25, "y": 5},
-                {"matrix": [4, 9], "x": 10.25, "y": 5},
-                {"matrix": [4, 10], "x": 11.25, "y": 5},
-                {"matrix": [4, 11], "x": 12.25, "y": 5, "w": 2.75},
-
-                {"matrix": [4, 14], "x": 16.5, "y": 5},
-
-                {"matrix": [5, 4], "x": 0, "y": 6, "w": 1.5},
-                {"matrix": [5, 5], "x": 1.5, "y": 6},
-                {"matrix": [5, 6], "x": 2.5, "y": 6, "w": 1.5},
-                {"matrix": [5, 7], "x": 4, "y": 6, "w": 7},
-                {"matrix": [5, 9], "x": 11, "y": 6, "w": 1.5},
-                {"matrix": [5, 10], "x": 12.5, "y": 6},
-                {"matrix": [5, 11], "x": 13.5, "y": 6, "w": 1.5},
-
-                {"matrix": [5, 13], "x": 15.5, "y": 6},
-                {"matrix": [5, 14], "x": 16.5, "y": 6},
-                {"matrix": [5, 15], "x": 17.5, "y": 6}
-            ]
-        }
-    }
-}
diff --git a/keyboards/specskeys/keyboard.json b/keyboards/specskeys/keyboard.json
new file mode 100644
index 00000000000..104b1ea13d9
--- /dev/null
+++ b/keyboards/specskeys/keyboard.json
@@ -0,0 +1,148 @@
+{
+    "keyboard_name": "Specskeys",
+    "manufacturer": "Specs32",
+    "url": "",
+    "maintainer": "qmk",
+    "usb": {
+        "vid": "0xCAFE",
+        "pid": "0x0080",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "backlight": true,
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": false,
+        "nkro": false
+    },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
+    "matrix_pins": {
+        "cols": ["E6", "B0", "B1", "B2", "B3", "D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "B6"],
+        "rows": ["F0", "F1", "F4", "F5", "F6", "F7"]
+    },
+    "diode_direction": "COL2ROW",
+    "backlight": {
+        "pin": "B7",
+        "levels": 1
+    },
+    "indicators": {
+        "caps_lock": "C7",
+        "scroll_lock": "C6"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "layout_aliases": {
+        "LAYOUT": "LAYOUT_tkl_iso_tsangan"
+    },
+    "layouts": {
+        "LAYOUT_tkl_iso_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, 13], "x": 15.5, "y": 0},
+                {"matrix": [0, 14], "x": 16.5, "y": 0},
+                {"matrix": [0, 15], "x": 17.5, "y": 0},
+
+                {"matrix": [5, 0], "x": 0, "y": 2},
+                {"matrix": [1, 0], "x": 1, "y": 2},
+                {"matrix": [1, 1], "x": 2, "y": 2},
+                {"matrix": [1, 2], "x": 3, "y": 2},
+                {"matrix": [1, 3], "x": 4, "y": 2},
+                {"matrix": [1, 4], "x": 5, "y": 2},
+                {"matrix": [1, 5], "x": 6, "y": 2},
+                {"matrix": [1, 6], "x": 7, "y": 2},
+                {"matrix": [1, 7], "x": 8, "y": 2},
+                {"matrix": [1, 8], "x": 9, "y": 2},
+                {"matrix": [1, 9], "x": 10, "y": 2},
+                {"matrix": [1, 10], "x": 11, "y": 2},
+                {"matrix": [1, 11], "x": 12, "y": 2},
+                {"matrix": [1, 12], "x": 13, "y": 2, "w": 2},
+
+                {"matrix": [1, 13], "x": 15.5, "y": 2},
+                {"matrix": [1, 14], "x": 16.5, "y": 2},
+                {"matrix": [1, 15], "x": 17.5, "y": 2},
+
+                {"matrix": [5, 1], "x": 0, "y": 3, "w": 1.5},
+                {"matrix": [2, 0], "x": 1.5, "y": 3},
+                {"matrix": [2, 1], "x": 2.5, "y": 3},
+                {"matrix": [2, 2], "x": 3.5, "y": 3},
+                {"matrix": [2, 3], "x": 4.5, "y": 3},
+                {"matrix": [2, 4], "x": 5.5, "y": 3},
+                {"matrix": [2, 5], "x": 6.5, "y": 3},
+                {"matrix": [2, 6], "x": 7.5, "y": 3},
+                {"matrix": [2, 7], "x": 8.5, "y": 3},
+                {"matrix": [2, 8], "x": 9.5, "y": 3},
+                {"matrix": [2, 9], "x": 10.5, "y": 3},
+                {"matrix": [2, 10], "x": 11.5, "y": 3},
+                {"matrix": [2, 11], "x": 12.5, "y": 3},
+
+                {"matrix": [2, 13], "x": 15.5, "y": 3},
+                {"matrix": [2, 14], "x": 16.5, "y": 3},
+                {"matrix": [2, 15], "x": 17.5, "y": 3},
+
+                {"matrix": [5, 2], "x": 0, "y": 4, "w": 1.75},
+                {"matrix": [3, 0], "x": 1.75, "y": 4},
+                {"matrix": [3, 1], "x": 2.75, "y": 4},
+                {"matrix": [3, 2], "x": 3.75, "y": 4},
+                {"matrix": [3, 3], "x": 4.75, "y": 4},
+                {"matrix": [3, 4], "x": 5.75, "y": 4},
+                {"matrix": [3, 5], "x": 6.75, "y": 4},
+                {"matrix": [3, 6], "x": 7.75, "y": 4},
+                {"matrix": [3, 7], "x": 8.75, "y": 4},
+                {"matrix": [3, 8], "x": 9.75, "y": 4},
+                {"matrix": [3, 9], "x": 10.75, "y": 4},
+                {"matrix": [3, 10], "x": 11.75, "y": 4},
+                {"matrix": [3, 11], "x": 12.75, "y": 4},
+                {"matrix": [2, 12], "x": 13.75, "y": 3, "w": 1.25, "h": 2},
+
+                {"matrix": [5, 3], "x": 0, "y": 5, "w": 1.25},
+                {"matrix": [4, 0], "x": 1.25, "y": 5},
+                {"matrix": [4, 1], "x": 2.25, "y": 5},
+                {"matrix": [4, 2], "x": 3.25, "y": 5},
+                {"matrix": [4, 3], "x": 4.25, "y": 5},
+                {"matrix": [4, 4], "x": 5.25, "y": 5},
+                {"matrix": [4, 5], "x": 6.25, "y": 5},
+                {"matrix": [4, 6], "x": 7.25, "y": 5},
+                {"matrix": [4, 7], "x": 8.25, "y": 5},
+                {"matrix": [4, 8], "x": 9.25, "y": 5},
+                {"matrix": [4, 9], "x": 10.25, "y": 5},
+                {"matrix": [4, 10], "x": 11.25, "y": 5},
+                {"matrix": [4, 11], "x": 12.25, "y": 5, "w": 2.75},
+
+                {"matrix": [4, 14], "x": 16.5, "y": 5},
+
+                {"matrix": [5, 4], "x": 0, "y": 6, "w": 1.5},
+                {"matrix": [5, 5], "x": 1.5, "y": 6},
+                {"matrix": [5, 6], "x": 2.5, "y": 6, "w": 1.5},
+                {"matrix": [5, 7], "x": 4, "y": 6, "w": 7},
+                {"matrix": [5, 9], "x": 11, "y": 6, "w": 1.5},
+                {"matrix": [5, 10], "x": 12.5, "y": 6},
+                {"matrix": [5, 11], "x": 13.5, "y": 6, "w": 1.5},
+
+                {"matrix": [5, 13], "x": 15.5, "y": 6},
+                {"matrix": [5, 14], "x": 16.5, "y": 6},
+                {"matrix": [5, 15], "x": 17.5, "y": 6}
+            ]
+        }
+    }
+}
diff --git a/keyboards/specskeys/rules.mk b/keyboards/specskeys/rules.mk
index 05f8c4ece5f..3437a35bdf1 100644
--- a/keyboards/specskeys/rules.mk
+++ b/keyboards/specskeys/rules.mk
@@ -1,15 +1,2 @@
 # Processor frequency
 F_CPU = 8000000
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no     # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = yes       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
diff --git a/keyboards/spiderisland/split78/info.json b/keyboards/spiderisland/split78/info.json
deleted file mode 100644
index e507a668b1d..00000000000
--- a/keyboards/spiderisland/split78/info.json
+++ /dev/null
@@ -1,122 +0,0 @@
-{
-    "keyboard_name": "Split 78-key",
-    "manufacturer": "SpiderIsland",
-    "url": "",
-    "maintainer": "qmk",
-    "usb": {
-        "vid": "0xFEED",
-        "pid": "0xF4E4",
-        "device_version": "0.0.1"
-    },
-    "backlight": {
-        "pin": "D4",
-        "breathing": true
-    },
-    "ws2812": {
-        "driver": "i2c"
-    },
-    "build": {
-        "debounce_type": "sym_eager_pr"
-    },
-    "processor": "atmega32a",
-    "bootloader": "bootloadhid",
-    "debounce": 50,
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-
-                {"matrix": [1, 0], "x": 2, "y": 0},
-                {"matrix": [2, 0], "x": 3, "y": 0},
-                {"matrix": [3, 0], "x": 4, "y": 0},
-                {"matrix": [4, 0], "x": 5, "y": 0},
-
-                {"matrix": [5, 0], "x": 6.5, "y": 0},
-
-                {"matrix": [0, 7], "x": 8.5, "y": 0},
-                {"matrix": [1, 7], "x": 9.5, "y": 0},
-                {"matrix": [2, 7], "x": 10.5, "y": 0},
-
-                {"matrix": [3, 7], "x": 12, "y": 0},
-                {"matrix": [4, 7], "x": 13, "y": 0},
-                {"matrix": [5, 7], "x": 14, "y": 0},
-                {"matrix": [6, 7], "x": 15, "y": 0},
-
-                {"matrix": [0, 1], "x": 0, "y": 1.25},
-                {"matrix": [1, 1], "x": 1, "y": 1.25},
-                {"matrix": [2, 1], "x": 2, "y": 1.25},
-                {"matrix": [3, 1], "x": 3, "y": 1.25},
-                {"matrix": [4, 1], "x": 4, "y": 1.25},
-                {"matrix": [5, 1], "x": 5, "y": 1.25},
-                {"matrix": [5, 5], "x": 6, "y": 1.25},
-
-                {"matrix": [0, 8], "x": 8, "y": 1.25},
-                {"matrix": [1, 8], "x": 9, "y": 1.25},
-                {"matrix": [2, 8], "x": 10, "y": 1.25},
-                {"matrix": [3, 8], "x": 11, "y": 1.25},
-                {"matrix": [4, 8], "x": 12, "y": 1.25},
-                {"matrix": [5, 8], "x": 13, "y": 1.25},
-                {"matrix": [6, 8], "x": 14, "y": 1.25, "w": 2},
-
-                {"matrix": [0, 2], "x": 0, "y": 2.25, "w": 1.5},
-                {"matrix": [1, 2], "x": 1.5, "y": 2.25},
-                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
-                {"matrix": [3, 2], "x": 3.5, "y": 2.25},
-                {"matrix": [4, 2], "x": 4.5, "y": 2.25},
-                {"matrix": [5, 2], "x": 5.5, "y": 2.25},
-
-                {"matrix": [0, 9], "x": 7.5, "y": 2.25},
-                {"matrix": [1, 9], "x": 8.5, "y": 2.25},
-                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
-                {"matrix": [3, 9], "x": 10.5, "y": 2.25},
-                {"matrix": [4, 9], "x": 11.5, "y": 2.25},
-                {"matrix": [5, 9], "x": 12.5, "y": 2.25},
-                {"matrix": [6, 9], "x": 13.5, "y": 2.25},
-                {"matrix": [0, 12], "x": 14.5, "y": 2.25, "w": 1.5},
-
-                {"matrix": [0, 3], "x": 0, "y": 3.25, "w": 1.75},
-                {"matrix": [1, 3], "x": 1.75, "y": 3.25},
-                {"matrix": [2, 3], "x": 2.75, "y": 3.25},
-                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
-                {"matrix": [4, 3], "x": 4.75, "y": 3.25},
-                {"matrix": [5, 3], "x": 5.75, "y": 3.25},
-
-                {"matrix": [0, 10], "x": 7.75, "y": 3.25},
-                {"matrix": [1, 10], "x": 8.75, "y": 3.25},
-                {"matrix": [2, 10], "x": 9.75, "y": 3.25},
-                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
-                {"matrix": [5, 10], "x": 11.75, "y": 3.25},
-                {"matrix": [4, 10], "x": 12.75, "y": 3.25},
-                {"matrix": [6, 10], "x": 13.75, "y": 3.25, "w": 2.25},
-
-                {"matrix": [0, 4], "x": 0, "y": 4.25, "w": 2.25},
-                {"matrix": [1, 4], "x": 2.25, "y": 4.25},
-                {"matrix": [2, 4], "x": 3.25, "y": 4.25},
-                {"matrix": [3, 4], "x": 4.25, "y": 4.25},
-                {"matrix": [4, 4], "x": 5.25, "y": 4.25},
-                {"matrix": [5, 4], "x": 6.25, "y": 4.25},
-
-                {"matrix": [0, 11], "x": 8.25, "y": 4.25},
-                {"matrix": [1, 11], "x": 9.25, "y": 4.25},
-                {"matrix": [2, 11], "x": 10.25, "y": 4.25},
-                {"matrix": [3, 11], "x": 11.25, "y": 4.25},
-                {"matrix": [4, 11], "x": 12.25, "y": 4.25, "w": 1.75},
-                {"matrix": [5, 11], "x": 14, "y": 4.25},
-                {"matrix": [6, 11], "x": 15, "y": 4.25},
-
-                {"matrix": [0, 5], "x": 0, "y": 5.25, "w": 1.25},
-                {"matrix": [1, 5], "x": 1.25, "y": 5.25, "w": 1.25},
-                {"matrix": [2, 5], "x": 2.5, "y": 5.25, "w": 1.25},
-                {"matrix": [3, 5], "x": 3.75, "y": 5.25, "w": 1.25},
-                {"matrix": [4, 5], "x": 5, "y": 5.25, "w": 2.25},
-
-                {"matrix": [1, 12], "x": 8.25, "y": 5.25, "w": 2.25},
-                {"matrix": [2, 12], "x": 10.5, "y": 5.25, "w": 1.25},
-                {"matrix": [3, 12], "x": 11.75, "y": 5.25, "w": 1.25},
-                {"matrix": [4, 12], "x": 13, "y": 5.25},
-                {"matrix": [5, 12], "x": 14, "y": 5.25},
-                {"matrix": [6, 12], "x": 15, "y": 5.25}
-            ]
-        }
-    }
-}
diff --git a/keyboards/spiderisland/split78/keyboard.json b/keyboards/spiderisland/split78/keyboard.json
new file mode 100644
index 00000000000..cd49755b0f4
--- /dev/null
+++ b/keyboards/spiderisland/split78/keyboard.json
@@ -0,0 +1,129 @@
+{
+    "keyboard_name": "Split 78-key",
+    "manufacturer": "SpiderIsland",
+    "url": "",
+    "maintainer": "qmk",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0xF4E4",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "backlight": true,
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": false,
+        "nkro": false
+    },
+    "backlight": {
+        "pin": "D4",
+        "breathing": true
+    },
+    "ws2812": {
+        "driver": "i2c"
+    },
+    "build": {
+        "debounce_type": "sym_eager_pr"
+    },
+    "processor": "atmega32a",
+    "bootloader": "bootloadhid",
+    "debounce": 50,
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [1, 0], "x": 2, "y": 0},
+                {"matrix": [2, 0], "x": 3, "y": 0},
+                {"matrix": [3, 0], "x": 4, "y": 0},
+                {"matrix": [4, 0], "x": 5, "y": 0},
+
+                {"matrix": [5, 0], "x": 6.5, "y": 0},
+
+                {"matrix": [0, 7], "x": 8.5, "y": 0},
+                {"matrix": [1, 7], "x": 9.5, "y": 0},
+                {"matrix": [2, 7], "x": 10.5, "y": 0},
+
+                {"matrix": [3, 7], "x": 12, "y": 0},
+                {"matrix": [4, 7], "x": 13, "y": 0},
+                {"matrix": [5, 7], "x": 14, "y": 0},
+                {"matrix": [6, 7], "x": 15, "y": 0},
+
+                {"matrix": [0, 1], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [2, 1], "x": 2, "y": 1.25},
+                {"matrix": [3, 1], "x": 3, "y": 1.25},
+                {"matrix": [4, 1], "x": 4, "y": 1.25},
+                {"matrix": [5, 1], "x": 5, "y": 1.25},
+                {"matrix": [5, 5], "x": 6, "y": 1.25},
+
+                {"matrix": [0, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 8], "x": 9, "y": 1.25},
+                {"matrix": [2, 8], "x": 10, "y": 1.25},
+                {"matrix": [3, 8], "x": 11, "y": 1.25},
+                {"matrix": [4, 8], "x": 12, "y": 1.25},
+                {"matrix": [5, 8], "x": 13, "y": 1.25},
+                {"matrix": [6, 8], "x": 14, "y": 1.25, "w": 2},
+
+                {"matrix": [0, 2], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [1, 2], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [3, 2], "x": 3.5, "y": 2.25},
+                {"matrix": [4, 2], "x": 4.5, "y": 2.25},
+                {"matrix": [5, 2], "x": 5.5, "y": 2.25},
+
+                {"matrix": [0, 9], "x": 7.5, "y": 2.25},
+                {"matrix": [1, 9], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [3, 9], "x": 10.5, "y": 2.25},
+                {"matrix": [4, 9], "x": 11.5, "y": 2.25},
+                {"matrix": [5, 9], "x": 12.5, "y": 2.25},
+                {"matrix": [6, 9], "x": 13.5, "y": 2.25},
+                {"matrix": [0, 12], "x": 14.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [0, 3], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [1, 3], "x": 1.75, "y": 3.25},
+                {"matrix": [2, 3], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [4, 3], "x": 4.75, "y": 3.25},
+                {"matrix": [5, 3], "x": 5.75, "y": 3.25},
+
+                {"matrix": [0, 10], "x": 7.75, "y": 3.25},
+                {"matrix": [1, 10], "x": 8.75, "y": 3.25},
+                {"matrix": [2, 10], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [5, 10], "x": 11.75, "y": 3.25},
+                {"matrix": [4, 10], "x": 12.75, "y": 3.25},
+                {"matrix": [6, 10], "x": 13.75, "y": 3.25, "w": 2.25},
+
+                {"matrix": [0, 4], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [1, 4], "x": 2.25, "y": 4.25},
+                {"matrix": [2, 4], "x": 3.25, "y": 4.25},
+                {"matrix": [3, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 5.25, "y": 4.25},
+                {"matrix": [5, 4], "x": 6.25, "y": 4.25},
+
+                {"matrix": [0, 11], "x": 8.25, "y": 4.25},
+                {"matrix": [1, 11], "x": 9.25, "y": 4.25},
+                {"matrix": [2, 11], "x": 10.25, "y": 4.25},
+                {"matrix": [3, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"matrix": [5, 11], "x": 14, "y": 4.25},
+                {"matrix": [6, 11], "x": 15, "y": 4.25},
+
+                {"matrix": [0, 5], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [1, 5], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [2, 5], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [3, 5], "x": 3.75, "y": 5.25, "w": 1.25},
+                {"matrix": [4, 5], "x": 5, "y": 5.25, "w": 2.25},
+
+                {"matrix": [1, 12], "x": 8.25, "y": 5.25, "w": 2.25},
+                {"matrix": [2, 12], "x": 10.5, "y": 5.25, "w": 1.25},
+                {"matrix": [3, 12], "x": 11.75, "y": 5.25, "w": 1.25},
+                {"matrix": [4, 12], "x": 13, "y": 5.25},
+                {"matrix": [5, 12], "x": 14, "y": 5.25},
+                {"matrix": [6, 12], "x": 15, "y": 5.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/spiderisland/split78/rules.mk b/keyboards/spiderisland/split78/rules.mk
index db8262a763b..2d02998dd10 100644
--- a/keyboards/spiderisland/split78/rules.mk
+++ b/keyboards/spiderisland/split78/rules.mk
@@ -1,14 +1,3 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-
 # custom matrix setup
 CUSTOM_MATRIX = lite
 SRC += matrix.c
diff --git a/keyboards/spleeb/info.json b/keyboards/spleeb/keyboard.json
similarity index 100%
rename from keyboards/spleeb/info.json
rename to keyboards/spleeb/keyboard.json
diff --git a/keyboards/splitkb/kyria/rev1/info.json b/keyboards/splitkb/kyria/rev1/info.json
index 38a2e6bf3fa..3d84b37b311 100644
--- a/keyboards/splitkb/kyria/rev1/info.json
+++ b/keyboards/splitkb/kyria/rev1/info.json
@@ -4,6 +4,15 @@
         "pid": "0x9D9D",
         "device_version": "0.0.1"
     },
+    "features": {
+        "bootmagic": false,
+        "encoder": true,
+        "extrakey": true,
+        "mousekey": false,
+        "nkro": false,
+        "oled": true,
+        "rgblight": true
+    },
     "rgblight": {
         "led_count": 20,
         "split_count": [10, 10]
diff --git a/keyboards/splitkb/kyria/rev1/proton_c/info.json b/keyboards/splitkb/kyria/rev1/proton_c/keyboard.json
similarity index 100%
rename from keyboards/splitkb/kyria/rev1/proton_c/info.json
rename to keyboards/splitkb/kyria/rev1/proton_c/keyboard.json
diff --git a/keyboards/splitkb/kyria/rev1/rules.mk b/keyboards/splitkb/kyria/rev1/rules.mk
index c4c82d05aa4..3a8bfbe0896 100644
--- a/keyboards/splitkb/kyria/rev1/rules.mk
+++ b/keyboards/splitkb/kyria/rev1/rules.mk
@@ -1,13 +1 @@
-BOOTMAGIC_ENABLE = no      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no       # Mouse keys
-EXTRAKEY_ENABLE = yes      # Audio control and System control
-CONSOLE_ENABLE = no        # Console for debug
-COMMAND_ENABLE = no        # Commands for debug and configuration
-NKRO_ENABLE = no           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no      # Enable keyboard backlight functionality
-AUDIO_ENABLE = no          # Audio output
-
-OLED_ENABLE = yes          # Enables the use of OLED displays
-ENCODER_ENABLE = yes       # Enables the use of one or more encoders
-RGBLIGHT_ENABLE = yes      # Enable keyboard RGB underglow
-RGB_MATRIX_ENABLE = no     # Enable keyboard RGB matrix (do not use together with RGBLIGHT_ENABLE)
+DEFAULT_FOLDER = splitkb/kyria/rev1/base
diff --git a/keyboards/splitkb/kyria/rev2/info.json b/keyboards/splitkb/kyria/rev2/info.json
index 0290153f4ad..80f801e3d15 100644
--- a/keyboards/splitkb/kyria/rev2/info.json
+++ b/keyboards/splitkb/kyria/rev2/info.json
@@ -4,6 +4,15 @@
         "pid": "0x9D9D",
         "device_version": "0.0.2"
     },
+    "features": {
+        "bootmagic": false,
+        "encoder": true,
+        "extrakey": true,
+        "mousekey": false,
+        "nkro": false,
+        "oled": true,
+        "rgblight": true
+    },
     "rgblight": {
         "led_count": 20,
         "split_count": [10, 10]
diff --git a/keyboards/splitkb/kyria/rev2/proton_c/info.json b/keyboards/splitkb/kyria/rev2/proton_c/keyboard.json
similarity index 100%
rename from keyboards/splitkb/kyria/rev2/proton_c/info.json
rename to keyboards/splitkb/kyria/rev2/proton_c/keyboard.json
diff --git a/keyboards/splitkb/kyria/rev2/rules.mk b/keyboards/splitkb/kyria/rev2/rules.mk
index c4c82d05aa4..fb808070bf8 100644
--- a/keyboards/splitkb/kyria/rev2/rules.mk
+++ b/keyboards/splitkb/kyria/rev2/rules.mk
@@ -1,13 +1 @@
-BOOTMAGIC_ENABLE = no      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no       # Mouse keys
-EXTRAKEY_ENABLE = yes      # Audio control and System control
-CONSOLE_ENABLE = no        # Console for debug
-COMMAND_ENABLE = no        # Commands for debug and configuration
-NKRO_ENABLE = no           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no      # Enable keyboard backlight functionality
-AUDIO_ENABLE = no          # Audio output
-
-OLED_ENABLE = yes          # Enables the use of OLED displays
-ENCODER_ENABLE = yes       # Enables the use of one or more encoders
-RGBLIGHT_ENABLE = yes      # Enable keyboard RGB underglow
-RGB_MATRIX_ENABLE = no     # Enable keyboard RGB matrix (do not use together with RGBLIGHT_ENABLE)
+DEFAULT_FOLDER = splitkb/kyria/rev2/base
diff --git a/keyboards/splitkb/zima/info.json b/keyboards/splitkb/zima/info.json
deleted file mode 100644
index 0c6a104c528..00000000000
--- a/keyboards/splitkb/zima/info.json
+++ /dev/null
@@ -1,60 +0,0 @@
-{
-    "keyboard_name": "Zima",
-    "manufacturer": "splitkb",
-    "url": "splitkb.com",
-    "maintainer": "splitkb.com, drashna",
-    "usb": {
-        "vid": "0x8D1D",
-        "pid": "0xF75B",
-        "device_version": "0.0.1"
-    },
-    "rgblight": {
-        "saturation_steps": 8,
-        "brightness_steps": 8,
-        "led_count": 5,
-        "sleep": true,
-        "animations": {
-            "breathing": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "static_gradient": true,
-            "twinkle": true
-        }
-    },
-    "ws2812": {
-        "pin": "B5"
-    },
-    "encoder": {
-        "rotary": [
-            {"pin_a": "B4", "pin_b": "D7", "resolution": 2}
-        ]
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "matrix_pins": {
-        "direct": [
-            ["C6", "D6", "D5"],
-            ["C7", "F7", "D4"],
-            ["E6", "F5", "F6"],
-            ["F0", "F1", "F4"]
-        ]
-    },
-    "layouts": {
-        "LAYOUT_ortho_4x3": {
-            "layout": [
-                {"x": 0, "y": 0, "matrix": [0, 0]},
-                {"x": 1, "y": 0, "matrix": [0, 1]},
-                {"x": 2, "y": 0, "matrix": [0, 2]},
-                {"x": 0, "y": 1, "matrix": [1, 0]},
-                {"x": 1, "y": 1, "matrix": [1, 1]},
-                {"x": 2, "y": 1, "matrix": [1, 2]},
-                {"x": 0, "y": 2, "matrix": [2, 0]},
-                {"x": 1, "y": 2, "matrix": [2, 1]},
-                {"x": 2, "y": 2, "matrix": [2, 2]},
-                {"x": 0, "y": 3, "matrix": [3, 0]},
-                {"x": 1, "y": 3, "matrix": [3, 1]},
-                {"x": 2, "y": 3, "matrix": [3, 2]}
-            ]
-        }
-    }
-}
diff --git a/keyboards/splitkb/zima/keyboard.json b/keyboards/splitkb/zima/keyboard.json
new file mode 100644
index 00000000000..c3e33d939e1
--- /dev/null
+++ b/keyboards/splitkb/zima/keyboard.json
@@ -0,0 +1,77 @@
+{
+    "keyboard_name": "Zima",
+    "manufacturer": "splitkb",
+    "url": "splitkb.com",
+    "maintainer": "splitkb.com, drashna",
+    "usb": {
+        "vid": "0x8D1D",
+        "pid": "0xF75B",
+        "device_version": "0.0.1"
+    },
+    "build": {
+        "lto": true
+    },
+    "features": {
+        "audio": true,
+        "bootmagic": false,
+        "encoder": true,
+        "extrakey": true,
+        "haptic": true,
+        "mousekey": false,
+        "nkro": false,
+        "oled": true,
+        "rgblight": true
+    },
+    "haptic": {
+        "driver": "drv2605l"
+    },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 5,
+        "sleep": true,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "static_gradient": true,
+            "twinkle": true
+        }
+    },
+    "ws2812": {
+        "pin": "B5"
+    },
+    "encoder": {
+        "rotary": [
+            {"pin_a": "B4", "pin_b": "D7", "resolution": 2}
+        ]
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "matrix_pins": {
+        "direct": [
+            ["C6", "D6", "D5"],
+            ["C7", "F7", "D4"],
+            ["E6", "F5", "F6"],
+            ["F0", "F1", "F4"]
+        ]
+    },
+    "layouts": {
+        "LAYOUT_ortho_4x3": {
+            "layout": [
+                {"x": 0, "y": 0, "matrix": [0, 0]},
+                {"x": 1, "y": 0, "matrix": [0, 1]},
+                {"x": 2, "y": 0, "matrix": [0, 2]},
+                {"x": 0, "y": 1, "matrix": [1, 0]},
+                {"x": 1, "y": 1, "matrix": [1, 1]},
+                {"x": 2, "y": 1, "matrix": [1, 2]},
+                {"x": 0, "y": 2, "matrix": [2, 0]},
+                {"x": 1, "y": 2, "matrix": [2, 1]},
+                {"x": 2, "y": 2, "matrix": [2, 2]},
+                {"x": 0, "y": 3, "matrix": [3, 0]},
+                {"x": 1, "y": 3, "matrix": [3, 1]},
+                {"x": 2, "y": 3, "matrix": [3, 2]}
+            ]
+        }
+    }
+}
diff --git a/keyboards/splitkb/zima/rules.mk b/keyboards/splitkb/zima/rules.mk
deleted file mode 100644
index 3bcfccdd7bd..00000000000
--- a/keyboards/splitkb/zima/rules.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no       # Mouse keys
-EXTRAKEY_ENABLE = yes      # Audio control and System control
-CONSOLE_ENABLE = no        # Console for debug
-COMMAND_ENABLE = no        # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no      # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes      # Enable keyboard RGB underglow
-AUDIO_ENABLE = yes         # Audio output
-
-ENCODER_ENABLE = yes       # ENables the use of one or more encoders
-OLED_ENABLE = yes
-HAPTIC_ENABLE = yes        # Supported but not included by defaut
-HAPTIC_DRIVER = drv2605l
-
-LTO_ENABLE = yes
diff --git a/keyboards/sthlmkb/lagom/info.json b/keyboards/sthlmkb/lagom/keyboard.json
similarity index 100%
rename from keyboards/sthlmkb/lagom/info.json
rename to keyboards/sthlmkb/lagom/keyboard.json
diff --git a/keyboards/sthlmkb/lagom/rules.mk b/keyboards/sthlmkb/lagom/rules.mk
index 39bdd537d5d..2e2102e76be 100644
--- a/keyboards/sthlmkb/lagom/rules.mk
+++ b/keyboards/sthlmkb/lagom/rules.mk
@@ -1,8 +1,4 @@
-# Build Options
-#   change yes to no to disable
-#
-CUSTOM_MATRIX = lite        # Lite custom matrix
-
+CUSTOM_MATRIX = lite
 
 # Project specific files
 SRC += matrix.c
diff --git a/keyboards/stront/info.json b/keyboards/stront/info.json
deleted file mode 100644
index d2726c85f0e..00000000000
--- a/keyboards/stront/info.json
+++ /dev/null
@@ -1,200 +0,0 @@
-{
-    "keyboard_name": "stront",
-    "manufacturer": "zzeneg",
-    "url": "https://github.com/zzeneg/stront",
-    "maintainer": "zzeneg",
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                { "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": [4, 4], "x": 8, "y": 0 },
-                { "matrix": [4, 3], "x": 9, "y": 0 },
-                { "matrix": [4, 2], "x": 10, "y": 0 },
-                { "matrix": [4, 1], "x": 11, "y": 0 },
-
-                { "matrix": [0, 0], "x": 0, "y": 1 },
-                { "matrix": [1, 0], "x": 1, "y": 1 },
-                { "matrix": [1, 1], "x": 2, "y": 1 },
-                { "matrix": [1, 2], "x": 3, "y": 1 },
-                { "matrix": [1, 3], "x": 4, "y": 1 },
-                { "matrix": [1, 4], "x": 5, "y": 1 },
-
-                { "matrix": [5, 4], "x": 8, "y": 1 },
-                { "matrix": [5, 3], "x": 9, "y": 1 },
-                { "matrix": [5, 2], "x": 10, "y": 1 },
-                { "matrix": [5, 1], "x": 11, "y": 1 },
-                { "matrix": [5, 0], "x": 12, "y": 1 },
-                { "matrix": [4, 0], "x": 13, "y": 1 },
-
-                { "matrix": [3, 0], "x": 0, "y": 2 },
-                { "matrix": [2, 0], "x": 1, "y": 2 },
-                { "matrix": [2, 1], "x": 2, "y": 2 },
-                { "matrix": [2, 2], "x": 3, "y": 2 },
-                { "matrix": [2, 3], "x": 4, "y": 2 },
-                { "matrix": [2, 4], "x": 5, "y": 2 },
-
-                { "matrix": [6, 4], "x": 8, "y": 2 },
-                { "matrix": [6, 3], "x": 9, "y": 2 },
-                { "matrix": [6, 2], "x": 10, "y": 2 },
-                { "matrix": [6, 1], "x": 11, "y": 2 },
-                { "matrix": [6, 0], "x": 12, "y": 2 },
-                { "matrix": [7, 0], "x": 13, "y": 2 },
-
-                { "matrix": [3, 2], "x": 4, "y": 3 },
-                { "matrix": [3, 3], "x": 5, "y": 3 },
-                { "matrix": [3, 4], "x": 6, "y": 3 },
-                { "matrix": [7, 4], "x": 7, "y": 3 },
-                { "matrix": [7, 3], "x": 8, "y": 3 },
-                { "matrix": [7, 2], "x": 9, "y": 3 }
-            ]
-        }
-    },
-    "processor": "RP2040",
-    "bootloader": "rp2040",
-    "diode_direction": "COL2ROW",
-    "matrix_pins": {
-        "cols": ["GP2", "GP3", "GP4", "GP5", "GP6"],
-        "rows": ["GP28", "GP27", "GP26", "GP15"]
-    },
-    "split": {
-        "enabled": true,
-        "transport": {
-            "sync": {
-                "indicators": true,
-                "matrix_state": true,
-                "modifiers": true
-            }
-        }
-    },
-    "encoder": {
-        "rotary": [
-            {
-                "pin_a": "GP7",
-                "pin_b": "GP8",
-                "resolution": 4
-            }
-        ]
-    },
-    "features": {
-        "bootmagic": true,
-        "console": false,
-        "encoder": true,
-        "backlight": true,
-        "extrakey": true,
-        "rgb_matrix": true,
-        "nkro": false
-    },
-    "backlight": {
-        "pin": "GP14"
-    },
-    "ws2812": {
-        "driver": "vendor",
-        "pin": "GP29"
-    },
-    "rgblight": {
-        "led_count": 38,
-        "split": true,
-        "split_count": [19, 19]
-    },
-    "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",
-        "led_count": 38,
-        "split_count": [19, 19],
-        "layout": [
-            { "flags": 4, "matrix": [0, 4], "x": 71, "y": 7 },
-            { "flags": 4, "matrix": [0, 3], "x": 57, "y": 5 },
-            { "flags": 4, "matrix": [0, 2], "x": 44, "y": 0 },
-            { "flags": 4, "matrix": [0, 1], "x": 27, "y": 5 },
-            { "flags": 4, "matrix": [1, 1], "x": 29, "y": 22 },
-            { "flags": 4, "matrix": [1, 0], "x": 14, "y": 26 },
-            { "flags": 4, "matrix": [0, 0], "x": 0, "y": 26 },
-            { "flags": 4, "matrix": [3, 0], "x": 2, "y": 43 },
-            { "flags": 4, "matrix": [2, 0], "x": 16, "y": 43 },
-            { "flags": 4, "matrix": [2, 1], "x": 30, "y": 38 },
-            { "flags": 4, "matrix": [2, 2], "x": 44, "y": 33 },
-            { "flags": 4, "matrix": [1, 2], "x": 44, "y": 17 },
-            { "flags": 4, "matrix": [1, 3], "x": 57, "y": 22 },
-            { "flags": 4, "matrix": [1, 4], "x": 71, "y": 24 },
-            { "flags": 4, "matrix": [2, 4], "x": 71, "y": 40 },
-            { "flags": 4, "matrix": [2, 3], "x": 57, "y": 38 },
-            { "flags": 4, "matrix": [3, 2], "x": 56, "y": 57 },
-            { "flags": 4, "matrix": [3, 3], "x": 71, "y": 59 },
-            { "flags": 4, "matrix": [3, 4], "x": 85, "y": 64 },
-
-            { "flags": 4, "matrix": [7, 4], "x": 139, "y": 64 },
-            { "flags": 4, "matrix": [7, 3], "x": 153, "y": 59 },
-            { "flags": 4, "matrix": [7, 2], "x": 168, "y": 57 },
-            { "flags": 4, "matrix": [6, 3], "x": 167, "y": 38 },
-            { "flags": 4, "matrix": [6, 4], "x": 153, "y": 40 },
-            { "flags": 4, "matrix": [5, 4], "x": 153, "y": 24 },
-            { "flags": 4, "matrix": [5, 3], "x": 167, "y": 22 },
-            { "flags": 4, "matrix": [5, 2], "x": 180, "y": 17 },
-            { "flags": 4, "matrix": [6, 2], "x": 180, "y": 33 },
-            { "flags": 4, "matrix": [6, 1], "x": 194, "y": 38 },
-            { "flags": 4, "matrix": [6, 0], "x": 208, "y": 43 },
-            { "flags": 4, "matrix": [7, 0], "x": 222, "y": 43 },
-            { "flags": 4, "matrix": [4, 0], "x": 224, "y": 26 },
-            { "flags": 4, "matrix": [5, 0], "x": 210, "y": 26 },
-            { "flags": 4, "matrix": [5, 1], "x": 195, "y": 22 },
-            { "flags": 4, "matrix": [4, 1], "x": 197, "y": 5 },
-            { "flags": 4, "matrix": [4, 2], "x": 180, "y": 0 },
-            { "flags": 4, "matrix": [4, 3], "x": 167, "y": 5 },
-            { "flags": 4, "matrix": [4, 4], "x": 153, "y": 7 }
-        ],
-        "sleep": true
-    },
-    "usb": {
-        "device_version": "1.0.0",
-        "pid": "0x0844",
-        "vid": "0xFEED"
-    }
-}
diff --git a/keyboards/stront/keyboard.json b/keyboards/stront/keyboard.json
new file mode 100644
index 00000000000..5055a4fb30e
--- /dev/null
+++ b/keyboards/stront/keyboard.json
@@ -0,0 +1,202 @@
+{
+    "keyboard_name": "stront",
+    "manufacturer": "zzeneg",
+    "url": "https://github.com/zzeneg/stront",
+    "maintainer": "zzeneg",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                { "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": [4, 4], "x": 8, "y": 0 },
+                { "matrix": [4, 3], "x": 9, "y": 0 },
+                { "matrix": [4, 2], "x": 10, "y": 0 },
+                { "matrix": [4, 1], "x": 11, "y": 0 },
+
+                { "matrix": [0, 0], "x": 0, "y": 1 },
+                { "matrix": [1, 0], "x": 1, "y": 1 },
+                { "matrix": [1, 1], "x": 2, "y": 1 },
+                { "matrix": [1, 2], "x": 3, "y": 1 },
+                { "matrix": [1, 3], "x": 4, "y": 1 },
+                { "matrix": [1, 4], "x": 5, "y": 1 },
+
+                { "matrix": [5, 4], "x": 8, "y": 1 },
+                { "matrix": [5, 3], "x": 9, "y": 1 },
+                { "matrix": [5, 2], "x": 10, "y": 1 },
+                { "matrix": [5, 1], "x": 11, "y": 1 },
+                { "matrix": [5, 0], "x": 12, "y": 1 },
+                { "matrix": [4, 0], "x": 13, "y": 1 },
+
+                { "matrix": [3, 0], "x": 0, "y": 2 },
+                { "matrix": [2, 0], "x": 1, "y": 2 },
+                { "matrix": [2, 1], "x": 2, "y": 2 },
+                { "matrix": [2, 2], "x": 3, "y": 2 },
+                { "matrix": [2, 3], "x": 4, "y": 2 },
+                { "matrix": [2, 4], "x": 5, "y": 2 },
+
+                { "matrix": [6, 4], "x": 8, "y": 2 },
+                { "matrix": [6, 3], "x": 9, "y": 2 },
+                { "matrix": [6, 2], "x": 10, "y": 2 },
+                { "matrix": [6, 1], "x": 11, "y": 2 },
+                { "matrix": [6, 0], "x": 12, "y": 2 },
+                { "matrix": [7, 0], "x": 13, "y": 2 },
+
+                { "matrix": [3, 2], "x": 4, "y": 3 },
+                { "matrix": [3, 3], "x": 5, "y": 3 },
+                { "matrix": [3, 4], "x": 6, "y": 3 },
+                { "matrix": [7, 4], "x": 7, "y": 3 },
+                { "matrix": [7, 3], "x": 8, "y": 3 },
+                { "matrix": [7, 2], "x": 9, "y": 3 }
+            ]
+        }
+    },
+    "processor": "RP2040",
+    "bootloader": "rp2040",
+    "diode_direction": "COL2ROW",
+    "matrix_pins": {
+        "cols": ["GP2", "GP3", "GP4", "GP5", "GP6"],
+        "rows": ["GP28", "GP27", "GP26", "GP15"]
+    },
+    "split": {
+        "enabled": true,
+        "transport": {
+            "sync": {
+                "indicators": true,
+                "matrix_state": true,
+                "modifiers": true
+            }
+        }
+    },
+    "encoder": {
+        "rotary": [
+            {
+                "pin_a": "GP7",
+                "pin_b": "GP8",
+                "resolution": 4
+            }
+        ]
+    },
+    "features": {
+        "backlight": true,
+        "bootmagic": true,
+        "console": false,
+        "encoder": true,
+        "extrakey": true,
+        "nkro": false,
+        "pointing_device": true,
+        "quantum_painter": true,
+        "rgb_matrix": true
+    },
+    "backlight": {
+        "pin": "GP14"
+    },
+    "ws2812": {
+        "driver": "vendor",
+        "pin": "GP29"
+    },
+    "rgblight": {
+        "led_count": 38,
+        "split": true,
+        "split_count": [19, 19]
+    },
+    "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",
+        "led_count": 38,
+        "split_count": [19, 19],
+        "layout": [
+            { "flags": 4, "matrix": [0, 4], "x": 71, "y": 7 },
+            { "flags": 4, "matrix": [0, 3], "x": 57, "y": 5 },
+            { "flags": 4, "matrix": [0, 2], "x": 44, "y": 0 },
+            { "flags": 4, "matrix": [0, 1], "x": 27, "y": 5 },
+            { "flags": 4, "matrix": [1, 1], "x": 29, "y": 22 },
+            { "flags": 4, "matrix": [1, 0], "x": 14, "y": 26 },
+            { "flags": 4, "matrix": [0, 0], "x": 0, "y": 26 },
+            { "flags": 4, "matrix": [3, 0], "x": 2, "y": 43 },
+            { "flags": 4, "matrix": [2, 0], "x": 16, "y": 43 },
+            { "flags": 4, "matrix": [2, 1], "x": 30, "y": 38 },
+            { "flags": 4, "matrix": [2, 2], "x": 44, "y": 33 },
+            { "flags": 4, "matrix": [1, 2], "x": 44, "y": 17 },
+            { "flags": 4, "matrix": [1, 3], "x": 57, "y": 22 },
+            { "flags": 4, "matrix": [1, 4], "x": 71, "y": 24 },
+            { "flags": 4, "matrix": [2, 4], "x": 71, "y": 40 },
+            { "flags": 4, "matrix": [2, 3], "x": 57, "y": 38 },
+            { "flags": 4, "matrix": [3, 2], "x": 56, "y": 57 },
+            { "flags": 4, "matrix": [3, 3], "x": 71, "y": 59 },
+            { "flags": 4, "matrix": [3, 4], "x": 85, "y": 64 },
+
+            { "flags": 4, "matrix": [7, 4], "x": 139, "y": 64 },
+            { "flags": 4, "matrix": [7, 3], "x": 153, "y": 59 },
+            { "flags": 4, "matrix": [7, 2], "x": 168, "y": 57 },
+            { "flags": 4, "matrix": [6, 3], "x": 167, "y": 38 },
+            { "flags": 4, "matrix": [6, 4], "x": 153, "y": 40 },
+            { "flags": 4, "matrix": [5, 4], "x": 153, "y": 24 },
+            { "flags": 4, "matrix": [5, 3], "x": 167, "y": 22 },
+            { "flags": 4, "matrix": [5, 2], "x": 180, "y": 17 },
+            { "flags": 4, "matrix": [6, 2], "x": 180, "y": 33 },
+            { "flags": 4, "matrix": [6, 1], "x": 194, "y": 38 },
+            { "flags": 4, "matrix": [6, 0], "x": 208, "y": 43 },
+            { "flags": 4, "matrix": [7, 0], "x": 222, "y": 43 },
+            { "flags": 4, "matrix": [4, 0], "x": 224, "y": 26 },
+            { "flags": 4, "matrix": [5, 0], "x": 210, "y": 26 },
+            { "flags": 4, "matrix": [5, 1], "x": 195, "y": 22 },
+            { "flags": 4, "matrix": [4, 1], "x": 197, "y": 5 },
+            { "flags": 4, "matrix": [4, 2], "x": 180, "y": 0 },
+            { "flags": 4, "matrix": [4, 3], "x": 167, "y": 5 },
+            { "flags": 4, "matrix": [4, 4], "x": 153, "y": 7 }
+        ],
+        "sleep": true
+    },
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x0844",
+        "vid": "0xFEED"
+    }
+}
diff --git a/keyboards/stront/rules.mk b/keyboards/stront/rules.mk
index c6cdeb5bfca..61d59017cb7 100644
--- a/keyboards/stront/rules.mk
+++ b/keyboards/stront/rules.mk
@@ -1,9 +1,7 @@
 SERIAL_DRIVER = vendor
 
-POINTING_DEVICE_ENABLE = yes
 POINTING_DEVICE_DRIVER = cirque_pinnacle_spi
 
-QUANTUM_PAINTER_ENABLE = yes
 QUANTUM_PAINTER_DRIVERS += st7789_spi
 QUANTUM_PAINTER_LVGL_INTEGRATION = yes
 
diff --git a/keyboards/suikagiken/suika85ergo/keyboard.json b/keyboards/suikagiken/suika85ergo/keyboard.json
new file mode 100644
index 00000000000..e0514dfab85
--- /dev/null
+++ b/keyboards/suikagiken/suika85ergo/keyboard.json
@@ -0,0 +1,124 @@
+{
+    "manufacturer": "suikagiken",
+    "keyboard_name": "suika85ergo",
+    "maintainer": "suikagiken",
+    "development_board": "elite_c",
+    "pin_compatible": "elite_c",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "matrix_pins": {
+        "cols": ["B3", "B2", "B6", "F0", "F1", "C7", "D5", "B7", "B5", "B4", "E6", "D7", "C6", "D4", "D0", "D1", "D2"],
+        "rows": ["B0", "F4", "F5", "F6", "F7", "B1"]
+    },
+    "url": "https://github.com/suikagiken/suika85ergo",
+    "usb": {
+        "device_version": "1.0.0",
+        "vid": "0x4B48",
+        "pid": "0x0002"
+    },
+    "dynamic_keymap": {
+        "layer_count": 2
+    },
+    "build": {
+        "debounce_type": "sym_eager_pk"
+    },
+    "debounce": 50,
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0,  0], "x":  0, "y": 0},
+                {"matrix": [0,  1], "x":  1, "y": 0},
+                {"matrix": [0,  2], "x":  2, "y": 0},
+                {"matrix": [0,  3], "x":  3, "y": 0},
+                {"matrix": [0,  4], "x":  4, "y": 0},
+                {"matrix": [0,  5], "x":  5, "y": 0},
+                {"matrix": [0,  6], "x":  6, "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, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+                {"matrix": [0, 16], "x": 16, "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": [1,  4], "x":  4, "y": 1},
+                {"matrix": [1,  5], "x":  5, "y": 1},
+                {"matrix": [1,  6], "x":  6, "y": 1},
+                {"matrix": [1,  8], "x":  8, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+                {"matrix": [1, 12], "x": 12, "y": 1},
+                {"matrix": [1, 13], "x": 13, "y": 1},
+                {"matrix": [1, 14], "x": 14, "y": 1},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+                {"matrix": [1, 16], "x": 16, "y": 1},
+                {"matrix": [2,  0], "x":  0, "y": 2},
+                {"matrix": [2,  1], "x":  1, "y": 2},
+                {"matrix": [2,  2], "x":  2, "y": 2},
+                {"matrix": [2,  3], "x":  3, "y": 2},
+                {"matrix": [2,  4], "x":  4, "y": 2},
+                {"matrix": [2,  5], "x":  5, "y": 2},
+                {"matrix": [2,  6], "x":  6, "y": 2},
+                {"matrix": [2,  8], "x":  8, "y": 2},
+                {"matrix": [2, 10], "x": 10, "y": 2},
+                {"matrix": [2, 11], "x": 11, "y": 2},
+                {"matrix": [2, 12], "x": 12, "y": 2},
+                {"matrix": [2, 13], "x": 13, "y": 2},
+                {"matrix": [2, 14], "x": 14, "y": 2},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+                {"matrix": [2, 16], "x": 16, "y": 2},
+                {"matrix": [3,  0], "x":  0, "y": 3},
+                {"matrix": [3,  1], "x":  1, "y": 3},
+                {"matrix": [3,  2], "x":  2, "y": 3},
+                {"matrix": [3,  3], "x":  3, "y": 3},
+                {"matrix": [3,  4], "x":  4, "y": 3},
+                {"matrix": [3,  5], "x":  5, "y": 3},
+                {"matrix": [3,  6], "x":  6, "y": 3},
+                {"matrix": [3,  7], "x":  7, "y": 3},
+                {"matrix": [3,  9], "x":  9, "y": 3},
+                {"matrix": [3, 10], "x": 10, "y": 3},
+                {"matrix": [3, 11], "x": 11, "y": 3},
+                {"matrix": [3, 12], "x": 12, "y": 3},
+                {"matrix": [3, 13], "x": 13, "y": 3},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+                {"matrix": [4,  1], "x":  1, "y": 4},
+                {"matrix": [4,  2], "x":  2, "y": 4},
+                {"matrix": [4,  3], "x":  3, "y": 4},
+                {"matrix": [4,  4], "x":  4, "y": 4},
+                {"matrix": [4,  5], "x":  5, "y": 4},
+                {"matrix": [4,  6], "x":  6, "y": 4},
+                {"matrix": [4,  8], "x":  8, "y": 4},
+                {"matrix": [4, 10], "x": 10, "y": 4},
+                {"matrix": [4, 11], "x": 11, "y": 4},
+                {"matrix": [4, 12], "x": 12, "y": 4},
+                {"matrix": [4, 13], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4},
+                {"matrix": [5,  2], "x":  2, "y": 5},
+                {"matrix": [5,  3], "x":  3, "y": 5},
+                {"matrix": [5,  4], "x":  4, "y": 5},
+                {"matrix": [5,  5], "x":  5, "y": 5},
+                {"matrix": [5,  6], "x":  6, "y": 5},
+                {"matrix": [5,  7], "x":  7, "y": 5},
+                {"matrix": [5,  8], "x":  8, "y": 5},
+                {"matrix": [5,  9], "x":  9, "y": 5},
+                {"matrix": [5, 10], "x": 10, "y": 5},
+                {"matrix": [5, 11], "x": 11, "y": 5},
+                {"matrix": [5, 12], "x": 12, "y": 5},
+                {"matrix": [5, 13], "x": 13, "y": 5},
+                {"matrix": [5, 14], "x": 14, "y": 5}
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/keyboards/suikagiken/suika85ergo/keymaps/default/keymap.c b/keyboards/suikagiken/suika85ergo/keymaps/default/keymap.c
new file mode 100644
index 00000000000..3678c5481db
--- /dev/null
+++ b/keyboards/suikagiken/suika85ergo/keymaps/default/keymap.c
@@ -0,0 +1,23 @@
+// Copyright 2024 suikagiken (@suikagiken)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT(
+        KC_ESC , KC_F1  , KC_F2  , KC_F3  , KC_F4  , KC_F5  , KC_F6  ,                            KC_F7  , KC_F8  , KC_F9  , KC_F10 , KC_F11 , KC_F12 , KC_DEL , 
+        C(KC_X), KC_GRV , KC_1   , KC_2   , KC_3   , KC_4   , KC_5   ,          KC_PSCR,          KC_6   , KC_7   , KC_8   , KC_9   , KC_0   , KC_MINS, KC_BSPC, 
+        C(KC_C), KC_TAB , KC_Q   , KC_W   , KC_E   , KC_R   , KC_T   ,          KC_EQL ,          KC_Y   , KC_U   , KC_I   , KC_O   , KC_P   , KC_BSLS, KC_ENT , 
+        C(KC_V), KC_CAPS, KC_A   , KC_S   , KC_D   , KC_F   , KC_G   , KC_LBRC,          KC_RBRC, 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_UP  ,          KC_N   , KC_M   , KC_COMM, KC_DOT , KC_SLSH, KC_RSFT,  
+                          KC_LCTL, KC_LWIN, KC_LOPT, MO(1)  , KC_SPC , KC_LEFT, KC_DOWN, KC_RGHT, KC_SPC , MO(1)  , KC_ROPT, KC_APP , KC_RCTL  
+    ),
+    [1] = LAYOUT(
+        _______, _______, _______, _______, _______, _______, _______,                            _______, _______, _______, _______, _______, _______, _______, 
+        _______, _______, _______, _______, _______, _______, _______,          _______,          _______, _______, _______, _______, _______, _______, _______, 
+        _______, _______, _______, _______, _______, _______, _______,          _______,          _______, _______, _______, _______, _______, _______, _______, 
+        _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______, _______, _______,  
+                 _______, _______, _______, _______, _______, _______,          KC_PGUP,          _______, _______, _______, _______, _______, _______,  
+                          _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_END , _______, _______, _______, _______, _______  
+    )
+};
diff --git a/keyboards/suikagiken/suika85ergo/keymaps/via/keymap.c b/keyboards/suikagiken/suika85ergo/keymaps/via/keymap.c
new file mode 100644
index 00000000000..3678c5481db
--- /dev/null
+++ b/keyboards/suikagiken/suika85ergo/keymaps/via/keymap.c
@@ -0,0 +1,23 @@
+// Copyright 2024 suikagiken (@suikagiken)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT(
+        KC_ESC , KC_F1  , KC_F2  , KC_F3  , KC_F4  , KC_F5  , KC_F6  ,                            KC_F7  , KC_F8  , KC_F9  , KC_F10 , KC_F11 , KC_F12 , KC_DEL , 
+        C(KC_X), KC_GRV , KC_1   , KC_2   , KC_3   , KC_4   , KC_5   ,          KC_PSCR,          KC_6   , KC_7   , KC_8   , KC_9   , KC_0   , KC_MINS, KC_BSPC, 
+        C(KC_C), KC_TAB , KC_Q   , KC_W   , KC_E   , KC_R   , KC_T   ,          KC_EQL ,          KC_Y   , KC_U   , KC_I   , KC_O   , KC_P   , KC_BSLS, KC_ENT , 
+        C(KC_V), KC_CAPS, KC_A   , KC_S   , KC_D   , KC_F   , KC_G   , KC_LBRC,          KC_RBRC, 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_UP  ,          KC_N   , KC_M   , KC_COMM, KC_DOT , KC_SLSH, KC_RSFT,  
+                          KC_LCTL, KC_LWIN, KC_LOPT, MO(1)  , KC_SPC , KC_LEFT, KC_DOWN, KC_RGHT, KC_SPC , MO(1)  , KC_ROPT, KC_APP , KC_RCTL  
+    ),
+    [1] = LAYOUT(
+        _______, _______, _______, _______, _______, _______, _______,                            _______, _______, _______, _______, _______, _______, _______, 
+        _______, _______, _______, _______, _______, _______, _______,          _______,          _______, _______, _______, _______, _______, _______, _______, 
+        _______, _______, _______, _______, _______, _______, _______,          _______,          _______, _______, _______, _______, _______, _______, _______, 
+        _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______, _______, _______,  
+                 _______, _______, _______, _______, _______, _______,          KC_PGUP,          _______, _______, _______, _______, _______, _______,  
+                          _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_END , _______, _______, _______, _______, _______  
+    )
+};
diff --git a/keyboards/suikagiken/suika85ergo/keymaps/via/rules.mk b/keyboards/suikagiken/suika85ergo/keymaps/via/rules.mk
new file mode 100644
index 00000000000..036bd6d1c3e
--- /dev/null
+++ b/keyboards/suikagiken/suika85ergo/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/suikagiken/suika85ergo/readme.md b/keyboards/suikagiken/suika85ergo/readme.md
new file mode 100644
index 00000000000..956755bcccf
--- /dev/null
+++ b/keyboards/suikagiken/suika85ergo/readme.md
@@ -0,0 +1,44 @@
+# suika85ergo
+(English Follows Japanese)
+
+## 概要
+
+suika85ergoはカラムスタッガードの一体型エルゴキーボードです。
+ファンクションキーや矢印キーなど、コンパクトキーボードでは省略されがちなキーも備えており、フルキーボードからの移行も容易です。
+
+* 制作 : すいか技研 （https://suikagiken.net） GitHub [suikagiken](https://github.com/suikagiken)
+* 販売 : 遊舎工房様（ https://shop.yushakobo.jp/products/9015 ）にてお求め頂けます
+
+## ビルドガイド
+
+[こちらのリンク](https://github.com/suikagiken/suika85ergo/blob/main/buildguide.md)からご覧下さい。
+
+---
+
+## Overview
+
+suika85ergo is a column-staggered ergonomic keyboard with 85 keys. It has function keys or arrow keys, which are omitted in compact keyboards, making it easy to switch from a conventional full keyboard.
+
+* Keyboard Maintainer: [suikagiken](https://github.com/suikagiken)
+* Hardware Supported: Purchase PCBs from the following stores.
+* Hardware Availability: Available at YushaKobo (https://shop.yushakobo.jp/products/9015)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make suikagiken/suika85ergo:default
+
+Flashing example for this keyboard:
+
+    make suikagiken/suika85ergo: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
+
+
diff --git a/keyboards/supersplit/info.json b/keyboards/supersplit/keyboard.json
similarity index 100%
rename from keyboards/supersplit/info.json
rename to keyboards/supersplit/keyboard.json
diff --git a/keyboards/switchplate/southpaw_65/info.json b/keyboards/switchplate/southpaw_65/info.json
deleted file mode 100644
index 19d08ee61a5..00000000000
--- a/keyboards/switchplate/southpaw_65/info.json
+++ /dev/null
@@ -1,323 +0,0 @@
-{
-    "keyboard_name": "Southpaw Extended 65%",
-    "manufacturer": "Switchplate Peripherals",
-    "url": "https://geekhack.org/index.php?topic=92344.0",
-    "maintainer": "qmk",
-    "usb": {
-        "vid": "0xFEED",
-        "pid": "0x4084",
-        "device_version": "0.0.1"
-    },
-    "backlight": {
-        "pin": "B5",
-        "levels": 10
-    },
-    "rgblight": {
-        "led_count": 9,
-        "animations": {
-            "breathing": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "snake": true,
-            "knight": true,
-            "christmas": true,
-            "static_gradient": true,
-            "rgb_test": true,
-            "alternating": true,
-            "twinkle": true
-        }
-    },
-    "ws2812": {
-        "pin": "C7"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "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": [0, 14], "x": 14, "y": 0},
-                {"matrix": [0, 15], "x": 15, "y": 0},
-                {"matrix": [0, 16], "x": 16, "y": 0},
-                {"matrix": [0, 17], "x": 17, "y": 0},
-                {"matrix": [4, 13], "x": 18, "y": 0},
-                {"matrix": [0, 18], "x": 19, "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": [1, 4], "x": 4, "y": 1, "w": 1.5},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 13], "x": 13.5, "y": 1},
-                {"matrix": [1, 14], "x": 14.5, "y": 1},
-                {"matrix": [1, 15], "x": 15.5, "y": 1},
-                {"matrix": [1, 16], "x": 16.5, "y": 1},
-                {"matrix": [1, 17], "x": 17.5, "y": 1, "w": 1.5},
-                {"matrix": [1, 18], "x": 19, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2},
-                {"matrix": [2, 1], "x": 1, "y": 2},
-                {"matrix": [2, 2], "x": 2, "y": 2},
-                {"matrix": [2, 3], "x": 3, "y": 2},
-                {"matrix": [2, 4], "x": 4, "y": 2, "w": 1.75},
-                {"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": 2},
-                {"matrix": [2, 14], "x": 14.75, "y": 2},
-                {"matrix": [2, 15], "x": 15.75, "y": 2},
-                {"matrix": [2, 16], "x": 16.75, "y": 2},
-                {"matrix": [2, 17], "x": 17.75, "y": 2, "w": 1.25},
-                {"matrix": [2, 18], "x": 19, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3},
-                {"matrix": [3, 1], "x": 1, "y": 3},
-                {"matrix": [3, 2], "x": 2, "y": 3},
-                {"matrix": [3, 3], "x": 3, "y": 3},
-                {"matrix": [3, 4], "x": 4, "y": 3, "w": 1.25},
-                {"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},
-                {"matrix": [3, 13], "x": 13.25, "y": 3},
-                {"matrix": [3, 14], "x": 14.25, "y": 3},
-                {"matrix": [3, 15], "x": 15.25, "y": 3},
-                {"matrix": [3, 16], "x": 16.25, "y": 3, "w": 1.75},
-                {"matrix": [3, 17], "x": 18, "y": 3},
-                {"matrix": [3, 18], "x": 19, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4},
-                {"matrix": [4, 1], "x": 1, "y": 4},
-                {"matrix": [4, 2], "x": 2, "y": 4},
-                {"matrix": [4, 3], "x": 3, "y": 4},
-                {"matrix": [4, 4], "x": 4, "y": 4, "w": 1.25},
-                {"matrix": [4, 5], "x": 5.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 6], "x": 6.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 9], "x": 7.75, "y": 4, "w": 6.25},
-                {"matrix": [4, 14], "x": 14, "y": 4},
-                {"matrix": [4, 15], "x": 15, "y": 4},
-                {"matrix": [4, 12], "x": 16, "y": 4},
-                {"matrix": [4, 16], "x": 17, "y": 4},
-                {"matrix": [4, 17], "x": 18, "y": 4},
-                {"matrix": [4, 18], "x": 19, "y": 4}
-            ]
-        },
-        "LAYOUT_ansi": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 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, 14], "x": 14, "y": 0},
-                {"matrix": [0, 15], "x": 15, "y": 0},
-                {"matrix": [0, 16], "x": 16, "y": 0},
-                {"matrix": [0, 17], "x": 17, "y": 0, "w": 2},
-                {"matrix": [0, 18], "x": 19, "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, "h": 2},
-                {"matrix": [1, 4], "x": 4, "y": 1, "w": 1.5},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 13], "x": 13.5, "y": 1},
-                {"matrix": [1, 14], "x": 14.5, "y": 1},
-                {"matrix": [1, 15], "x": 15.5, "y": 1},
-                {"matrix": [1, 16], "x": 16.5, "y": 1},
-                {"matrix": [1, 17], "x": 17.5, "y": 1, "w": 1.5},
-                {"matrix": [1, 18], "x": 19, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2},
-                {"matrix": [2, 1], "x": 1, "y": 2},
-                {"matrix": [2, 2], "x": 2, "y": 2},
-                {"matrix": [2, 4], "x": 4, "y": 2, "w": 1.75},
-                {"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": 2},
-                {"matrix": [2, 14], "x": 14.75, "y": 2},
-                {"matrix": [2, 15], "x": 15.75, "y": 2},
-                {"matrix": [2, 17], "x": 16.75, "y": 2, "w": 2.25},
-                {"matrix": [2, 18], "x": 19, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3},
-                {"matrix": [3, 1], "x": 1, "y": 3},
-                {"matrix": [3, 2], "x": 2, "y": 3},
-                {"matrix": [3, 3], "x": 3, "y": 3, "h": 2},
-                {"matrix": [3, 4], "x": 4, "y": 3, "w": 2.25},
-                {"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},
-                {"matrix": [3, 13], "x": 13.25, "y": 3},
-                {"matrix": [3, 14], "x": 14.25, "y": 3},
-                {"matrix": [3, 15], "x": 15.25, "y": 3},
-                {"matrix": [3, 16], "x": 16.25, "y": 3, "w": 1.75},
-                {"matrix": [3, 17], "x": 18, "y": 3},
-                {"matrix": [3, 18], "x": 19, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 2},
-                {"matrix": [4, 2], "x": 2, "y": 4},
-                {"matrix": [4, 4], "x": 4, "y": 4, "w": 1.25},
-                {"matrix": [4, 5], "x": 5.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 6], "x": 6.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 9], "x": 7.75, "y": 4, "w": 6.25},
-                {"matrix": [4, 14], "x": 14, "y": 4},
-                {"matrix": [4, 15], "x": 15, "y": 4},
-                {"matrix": [4, 12], "x": 16, "y": 4},
-                {"matrix": [4, 16], "x": 17, "y": 4},
-                {"matrix": [4, 17], "x": 18, "y": 4},
-                {"matrix": [4, 18], "x": 19, "y": 4}
-            ]
-        },
-        "LAYOUT_iso": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"matrix": [0, 13], "x": 13, "y": 0},
-                {"matrix": [0, 14], "x": 14, "y": 0},
-                {"matrix": [0, 15], "x": 15, "y": 0},
-                {"matrix": [0, 16], "x": 16, "y": 0},
-                {"matrix": [0, 17], "x": 17, "y": 0, "w": 2},
-                {"matrix": [0, 18], "x": 19, "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, "h": 2},
-                {"matrix": [1, 4], "x": 4, "y": 1, "w": 1.5},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 13], "x": 13.5, "y": 1},
-                {"matrix": [1, 14], "x": 14.5, "y": 1},
-                {"matrix": [1, 15], "x": 15.5, "y": 1},
-                {"matrix": [1, 16], "x": 16.5, "y": 1},
-                {"matrix": [1, 18], "x": 19, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2},
-                {"matrix": [2, 1], "x": 1, "y": 2},
-                {"matrix": [2, 2], "x": 2, "y": 2},
-                {"matrix": [2, 4], "x": 4, "y": 2, "w": 1.75},
-                {"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": 2},
-                {"matrix": [2, 14], "x": 14.75, "y": 2},
-                {"matrix": [2, 15], "x": 15.75, "y": 2},
-                {"matrix": [2, 16], "x": 16.75, "y": 2},
-                {"matrix": [2, 17], "x": 17.75, "y": 1, "w": 1.25, "h": 2},
-                {"matrix": [2, 18], "x": 19, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3},
-                {"matrix": [3, 1], "x": 1, "y": 3},
-                {"matrix": [3, 2], "x": 2, "y": 3},
-                {"matrix": [3, 3], "x": 3, "y": 3, "h": 2},
-                {"matrix": [3, 4], "x": 4, "y": 3, "w": 1.25},
-                {"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},
-                {"matrix": [3, 13], "x": 13.25, "y": 3},
-                {"matrix": [3, 14], "x": 14.25, "y": 3},
-                {"matrix": [3, 15], "x": 15.25, "y": 3},
-                {"matrix": [3, 16], "x": 16.25, "y": 3, "w": 1.75},
-                {"matrix": [3, 17], "x": 18, "y": 3},
-                {"matrix": [3, 18], "x": 19, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 2},
-                {"matrix": [4, 2], "x": 2, "y": 4},
-                {"matrix": [4, 4], "x": 4, "y": 4, "w": 1.25},
-                {"matrix": [4, 5], "x": 5.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 6], "x": 6.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 9], "x": 7.75, "y": 4, "w": 6.25},
-                {"matrix": [4, 14], "x": 14, "y": 4},
-                {"matrix": [4, 15], "x": 15, "y": 4},
-                {"matrix": [4, 12], "x": 16, "y": 4},
-                {"matrix": [4, 16], "x": 17, "y": 4},
-                {"matrix": [4, 17], "x": 18, "y": 4},
-                {"matrix": [4, 18], "x": 19, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/switchplate/southpaw_65/keyboard.json b/keyboards/switchplate/southpaw_65/keyboard.json
new file mode 100644
index 00000000000..fd879349f25
--- /dev/null
+++ b/keyboards/switchplate/southpaw_65/keyboard.json
@@ -0,0 +1,334 @@
+{
+    "keyboard_name": "Southpaw Extended 65%",
+    "manufacturer": "Switchplate Peripherals",
+    "url": "https://geekhack.org/index.php?topic=92344.0",
+    "maintainer": "qmk",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0x4084",
+        "device_version": "0.0.1"
+    },
+    "build": {
+        "lto": true
+    },
+    "features": {
+        "backlight": true,
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": false,
+        "nkro": false,
+        "rgblight": true
+    },
+    "backlight": {
+        "pin": "B5",
+        "levels": 10
+    },
+    "rgblight": {
+        "led_count": 9,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": true,
+            "twinkle": true
+        }
+    },
+    "ws2812": {
+        "pin": "C7"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "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": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+                {"matrix": [0, 16], "x": 16, "y": 0},
+                {"matrix": [0, 17], "x": 17, "y": 0},
+                {"matrix": [4, 13], "x": 18, "y": 0},
+                {"matrix": [0, 18], "x": 19, "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": [1, 4], "x": 4, "y": 1, "w": 1.5},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1},
+                {"matrix": [1, 14], "x": 14.5, "y": 1},
+                {"matrix": [1, 15], "x": 15.5, "y": 1},
+                {"matrix": [1, 16], "x": 16.5, "y": 1},
+                {"matrix": [1, 17], "x": 17.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 18], "x": 19, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2, "w": 1.75},
+                {"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": 2},
+                {"matrix": [2, 14], "x": 14.75, "y": 2},
+                {"matrix": [2, 15], "x": 15.75, "y": 2},
+                {"matrix": [2, 16], "x": 16.75, "y": 2},
+                {"matrix": [2, 17], "x": 17.75, "y": 2, "w": 1.25},
+                {"matrix": [2, 18], "x": 19, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3, "w": 1.25},
+                {"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},
+                {"matrix": [3, 13], "x": 13.25, "y": 3},
+                {"matrix": [3, 14], "x": 14.25, "y": 3},
+                {"matrix": [3, 15], "x": 15.25, "y": 3},
+                {"matrix": [3, 16], "x": 16.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 17], "x": 18, "y": 3},
+                {"matrix": [3, 18], "x": 19, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+                {"matrix": [4, 2], "x": 2, "y": 4},
+                {"matrix": [4, 3], "x": 3, "y": 4},
+                {"matrix": [4, 4], "x": 4, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 6.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 9], "x": 7.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4},
+                {"matrix": [4, 12], "x": 16, "y": 4},
+                {"matrix": [4, 16], "x": 17, "y": 4},
+                {"matrix": [4, 17], "x": 18, "y": 4},
+                {"matrix": [4, 18], "x": 19, "y": 4}
+            ]
+        },
+        "LAYOUT_ansi": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 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, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+                {"matrix": [0, 16], "x": 16, "y": 0},
+                {"matrix": [0, 17], "x": 17, "y": 0, "w": 2},
+                {"matrix": [0, 18], "x": 19, "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, "h": 2},
+                {"matrix": [1, 4], "x": 4, "y": 1, "w": 1.5},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1},
+                {"matrix": [1, 14], "x": 14.5, "y": 1},
+                {"matrix": [1, 15], "x": 15.5, "y": 1},
+                {"matrix": [1, 16], "x": 16.5, "y": 1},
+                {"matrix": [1, 17], "x": 17.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 18], "x": 19, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2, "w": 1.75},
+                {"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": 2},
+                {"matrix": [2, 14], "x": 14.75, "y": 2},
+                {"matrix": [2, 15], "x": 15.75, "y": 2},
+                {"matrix": [2, 17], "x": 16.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 18], "x": 19, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3, "h": 2},
+                {"matrix": [3, 4], "x": 4, "y": 3, "w": 2.25},
+                {"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},
+                {"matrix": [3, 13], "x": 13.25, "y": 3},
+                {"matrix": [3, 14], "x": 14.25, "y": 3},
+                {"matrix": [3, 15], "x": 15.25, "y": 3},
+                {"matrix": [3, 16], "x": 16.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 17], "x": 18, "y": 3},
+                {"matrix": [3, 18], "x": 19, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 2},
+                {"matrix": [4, 2], "x": 2, "y": 4},
+                {"matrix": [4, 4], "x": 4, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 6.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 9], "x": 7.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4},
+                {"matrix": [4, 12], "x": 16, "y": 4},
+                {"matrix": [4, 16], "x": 17, "y": 4},
+                {"matrix": [4, 17], "x": 18, "y": 4},
+                {"matrix": [4, 18], "x": 19, "y": 4}
+            ]
+        },
+        "LAYOUT_iso": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+                {"matrix": [0, 16], "x": 16, "y": 0},
+                {"matrix": [0, 17], "x": 17, "y": 0, "w": 2},
+                {"matrix": [0, 18], "x": 19, "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, "h": 2},
+                {"matrix": [1, 4], "x": 4, "y": 1, "w": 1.5},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1},
+                {"matrix": [1, 14], "x": 14.5, "y": 1},
+                {"matrix": [1, 15], "x": 15.5, "y": 1},
+                {"matrix": [1, 16], "x": 16.5, "y": 1},
+                {"matrix": [1, 18], "x": 19, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2, "w": 1.75},
+                {"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": 2},
+                {"matrix": [2, 14], "x": 14.75, "y": 2},
+                {"matrix": [2, 15], "x": 15.75, "y": 2},
+                {"matrix": [2, 16], "x": 16.75, "y": 2},
+                {"matrix": [2, 17], "x": 17.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [2, 18], "x": 19, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3, "h": 2},
+                {"matrix": [3, 4], "x": 4, "y": 3, "w": 1.25},
+                {"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},
+                {"matrix": [3, 13], "x": 13.25, "y": 3},
+                {"matrix": [3, 14], "x": 14.25, "y": 3},
+                {"matrix": [3, 15], "x": 15.25, "y": 3},
+                {"matrix": [3, 16], "x": 16.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 17], "x": 18, "y": 3},
+                {"matrix": [3, 18], "x": 19, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 2},
+                {"matrix": [4, 2], "x": 2, "y": 4},
+                {"matrix": [4, 4], "x": 4, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 6.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 9], "x": 7.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4},
+                {"matrix": [4, 12], "x": 16, "y": 4},
+                {"matrix": [4, 16], "x": 17, "y": 4},
+                {"matrix": [4, 17], "x": 18, "y": 4},
+                {"matrix": [4, 18], "x": 19, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/switchplate/southpaw_65/rules.mk b/keyboards/switchplate/southpaw_65/rules.mk
index 89d05c5487e..e11c65db028 100644
--- a/keyboards/switchplate/southpaw_65/rules.mk
+++ b/keyboards/switchplate/southpaw_65/rules.mk
@@ -1,17 +1,3 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-LTO_ENABLE = yes
-
 # custom matrix setup
 CUSTOM_MATRIX = lite
 
diff --git a/keyboards/sx60/info.json b/keyboards/sx60/info.json
deleted file mode 100644
index 246d2892f45..00000000000
--- a/keyboards/sx60/info.json
+++ /dev/null
@@ -1,367 +0,0 @@
-{
-    "keyboard_name": "SX60",
-    "manufacturer": "Quantrik",
-    "url": "",
-    "maintainer": "https://github.com/amnobis",
-    "usb": {
-        "vid": "0x5154",
-        "pid": "0x0010",
-        "device_version": "0.0.1"
-    },
-    "backlight": {
-        "pin": "B7"
-    },
-    "indicators": {
-        "caps_lock": "F4",
-        "num_lock": "F5",
-        "scroll_lock": "F1"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 0], "x": 1.25, "y": 0},
-                {"matrix": [0, 1], "x": 2.25, "y": 0},
-                {"matrix": [0, 2], "x": 3.25, "y": 0},
-                {"matrix": [0, 3], "x": 4.25, "y": 0},
-                {"matrix": [0, 4], "x": 5.25, "y": 0},
-                {"matrix": [0, 5], "x": 6.25, "y": 0},
-                {"matrix": [0, 6], "x": 7.25, "y": 0},
-
-                {"matrix": [0, 8], "x": 9.25, "y": 0},
-                {"matrix": [0, 9], "x": 10.25, "y": 0},
-                {"matrix": [0, 10], "x": 11.25, "y": 0},
-                {"matrix": [0, 11], "x": 12.25, "y": 0},
-                {"matrix": [0, 12], "x": 13.25, "y": 0},
-                {"matrix": [0, 13], "x": 14.25, "y": 0},
-                {"matrix": [0, 14], "x": 15.25, "y": 0},
-                {"matrix": [0, 15], "x": 16.25, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1},
-
-                {"matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
-                {"matrix": [1, 2], "x": 2.75, "y": 1},
-                {"matrix": [1, 3], "x": 3.75, "y": 1},
-                {"matrix": [1, 4], "x": 4.75, "y": 1},
-                {"matrix": [1, 5], "x": 5.75, "y": 1},
-                {"matrix": [1, 6], "x": 6.75, "y": 1},
-
-                {"matrix": [1, 8], "x": 8.75, "y": 1},
-                {"matrix": [1, 9], "x": 9.75, "y": 1},
-                {"matrix": [1, 10], "x": 10.75, "y": 1},
-                {"matrix": [1, 11], "x": 11.75, "y": 1},
-                {"matrix": [1, 12], "x": 12.75, "y": 1},
-                {"matrix": [1, 13], "x": 13.75, "y": 1},
-                {"matrix": [1, 14], "x": 14.75, "y": 1},
-                {"matrix": [1, 15], "x": 15.75, "y": 1, "w": 1.5},
-
-                {"matrix": [2, 0], "x": 0, "y": 2},
-
-                {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
-                {"matrix": [2, 2], "x": 3, "y": 2},
-                {"matrix": [2, 3], "x": 4, "y": 2},
-                {"matrix": [2, 4], "x": 5, "y": 2},
-                {"matrix": [2, 5], "x": 6, "y": 2},
-                {"matrix": [2, 6], "x": 7, "y": 2},
-
-                {"matrix": [2, 8], "x": 9, "y": 2},
-                {"matrix": [2, 9], "x": 10, "y": 2},
-                {"matrix": [2, 10], "x": 11, "y": 2},
-                {"matrix": [2, 11], "x": 12, "y": 2},
-                {"matrix": [2, 12], "x": 13, "y": 2},
-                {"matrix": [2, 13], "x": 14, "y": 2},
-                {"matrix": [2, 14], "x": 15, "y": 2},
-                {"matrix": [2, 15], "x": 16, "y": 2, "w": 1.25},
-
-                {"matrix": [3, 0], "x": 0, "y": 3},
-
-                {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 1.25},
-                {"matrix": [3, 2], "x": 2.5, "y": 3},
-                {"matrix": [3, 3], "x": 3.5, "y": 3},
-                {"matrix": [3, 4], "x": 4.5, "y": 3},
-                {"matrix": [3, 5], "x": 5.5, "y": 3},
-                {"matrix": [3, 6], "x": 6.5, "y": 3},
-                {"matrix": [3, 7], "x": 7.5, "y": 3},
-
-                {"matrix": [3, 8], "x": 9.5, "y": 3},
-                {"matrix": [3, 9], "x": 10.5, "y": 3},
-                {"matrix": [3, 10], "x": 11.5, "y": 3},
-                {"matrix": [3, 11], "x": 12.5, "y": 3},
-                {"matrix": [3, 12], "x": 13.5, "y": 3},
-                {"matrix": [3, 13], "x": 14.5, "y": 3, "w": 1.75},
-                {"matrix": [3, 14], "x": 16.25, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4},
-
-                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 1.25},
-                {"matrix": [4, 4], "x": 5, "y": 4, "w": 2},
-                {"matrix": [4, 5], "x": 7, "y": 4},
-
-                {"matrix": [4, 8], "x": 9, "y": 4, "w": 2.75},
-                {"matrix": [4, 9], "x": 11.75, "y": 4, "w": 1.25},
-                {"matrix": [4, 10], "x": 13, "y": 4, "w": 1.25},
-                {"matrix": [4, 11], "x": 14.25, "y": 4},
-                {"matrix": [4, 12], "x": 15.25, "y": 4},
-                {"matrix": [4, 13], "x": 16.25, "y": 4}
-            ]
-        },
-        "LAYOUT_ansi_split_bs_rshift": {
-            "layout": [
-                {"matrix": [0, 0], "x": 1.25, "y": 0},
-                {"matrix": [0, 1], "x": 2.25, "y": 0},
-                {"matrix": [0, 2], "x": 3.25, "y": 0},
-                {"matrix": [0, 3], "x": 4.25, "y": 0},
-                {"matrix": [0, 4], "x": 5.25, "y": 0},
-                {"matrix": [0, 5], "x": 6.25, "y": 0},
-                {"matrix": [0, 6], "x": 7.25, "y": 0},
-
-                {"matrix": [0, 8], "x": 9.25, "y": 0},
-                {"matrix": [0, 9], "x": 10.25, "y": 0},
-                {"matrix": [0, 10], "x": 11.25, "y": 0},
-                {"matrix": [0, 11], "x": 12.25, "y": 0},
-                {"matrix": [0, 12], "x": 13.25, "y": 0},
-                {"matrix": [0, 13], "x": 14.25, "y": 0},
-                {"matrix": [0, 14], "x": 15.25, "y": 0},
-                {"matrix": [0, 15], "x": 16.25, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1},
-
-                {"matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
-                {"matrix": [1, 2], "x": 2.75, "y": 1},
-                {"matrix": [1, 3], "x": 3.75, "y": 1},
-                {"matrix": [1, 4], "x": 4.75, "y": 1},
-                {"matrix": [1, 5], "x": 5.75, "y": 1},
-                {"matrix": [1, 6], "x": 6.75, "y": 1},
-
-                {"matrix": [1, 8], "x": 8.75, "y": 1},
-                {"matrix": [1, 9], "x": 9.75, "y": 1},
-                {"matrix": [1, 10], "x": 10.75, "y": 1},
-                {"matrix": [1, 11], "x": 11.75, "y": 1},
-                {"matrix": [1, 12], "x": 12.75, "y": 1},
-                {"matrix": [1, 13], "x": 13.75, "y": 1},
-                {"matrix": [1, 14], "x": 14.75, "y": 1},
-                {"matrix": [1, 15], "x": 15.75, "y": 1, "w": 1.5},
-
-                {"matrix": [2, 0], "x": 0, "y": 2},
-
-                {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
-                {"matrix": [2, 2], "x": 3, "y": 2},
-                {"matrix": [2, 3], "x": 4, "y": 2},
-                {"matrix": [2, 4], "x": 5, "y": 2},
-                {"matrix": [2, 5], "x": 6, "y": 2},
-                {"matrix": [2, 6], "x": 7, "y": 2},
-
-                {"matrix": [2, 8], "x": 9, "y": 2},
-                {"matrix": [2, 9], "x": 10, "y": 2},
-                {"matrix": [2, 10], "x": 11, "y": 2},
-                {"matrix": [2, 11], "x": 12, "y": 2},
-                {"matrix": [2, 12], "x": 13, "y": 2},
-                {"matrix": [2, 13], "x": 14, "y": 2},
-                {"matrix": [2, 14], "x": 15, "y": 2, "w": 2.25},
-
-                {"matrix": [3, 0], "x": 0, "y": 3},
-
-                {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
-                {"matrix": [3, 3], "x": 3.5, "y": 3},
-                {"matrix": [3, 4], "x": 4.5, "y": 3},
-                {"matrix": [3, 5], "x": 5.5, "y": 3},
-                {"matrix": [3, 6], "x": 6.5, "y": 3},
-                {"matrix": [3, 7], "x": 7.5, "y": 3},
-                {"matrix": [3, 8], "x": 9.5, "y": 3},
-                {"matrix": [3, 9], "x": 10.5, "y": 3},
-                {"matrix": [3, 10], "x": 11.5, "y": 3},
-                {"matrix": [3, 11], "x": 12.5, "y": 3},
-                {"matrix": [3, 12], "x": 13.5, "y": 3},
-                {"matrix": [3, 13], "x": 14.5, "y": 3, "w": 1.75},
-                {"matrix": [3, 15], "x": 16.25, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4},
-
-                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 1.25},
-                {"matrix": [4, 4], "x": 5, "y": 4, "w": 2},
-                {"matrix": [4, 5], "x": 7, "y": 4},
-
-                {"matrix": [4, 8], "x": 9, "y": 4, "w": 2.75},
-                {"matrix": [4, 9], "x": 11.75, "y": 4, "w": 1.25},
-                {"matrix": [4, 10], "x": 13, "y": 4, "w": 1.25},
-                {"matrix": [4, 11], "x": 14.25, "y": 4},
-                {"matrix": [4, 12], "x": 15.25, "y": 4},
-                {"matrix": [4, 13], "x": 16.25, "y": 4}
-            ]
-        },
-        "LAYOUT_ansi_split_bs": {
-            "layout": [
-                {"matrix": [0, 0], "x": 1.25, "y": 0},
-                {"matrix": [0, 1], "x": 2.25, "y": 0},
-                {"matrix": [0, 2], "x": 3.25, "y": 0},
-                {"matrix": [0, 3], "x": 4.25, "y": 0},
-                {"matrix": [0, 4], "x": 5.25, "y": 0},
-                {"matrix": [0, 5], "x": 6.25, "y": 0},
-                {"matrix": [0, 6], "x": 7.25, "y": 0},
-
-                {"matrix": [0, 8], "x": 9.25, "y": 0},
-                {"matrix": [0, 9], "x": 10.25, "y": 0},
-                {"matrix": [0, 10], "x": 11.25, "y": 0},
-                {"matrix": [0, 11], "x": 12.25, "y": 0},
-                {"matrix": [0, 12], "x": 13.25, "y": 0},
-                {"matrix": [0, 13], "x": 14.25, "y": 0},
-                {"matrix": [0, 14], "x": 15.25, "y": 0},
-                {"matrix": [0, 15], "x": 16.25, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1},
-
-                {"matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
-                {"matrix": [1, 2], "x": 2.75, "y": 1},
-                {"matrix": [1, 3], "x": 3.75, "y": 1},
-                {"matrix": [1, 4], "x": 4.75, "y": 1},
-                {"matrix": [1, 5], "x": 5.75, "y": 1},
-                {"matrix": [1, 6], "x": 6.75, "y": 1},
-
-                {"matrix": [1, 8], "x": 8.75, "y": 1},
-                {"matrix": [1, 9], "x": 9.75, "y": 1},
-                {"matrix": [1, 10], "x": 10.75, "y": 1},
-                {"matrix": [1, 11], "x": 11.75, "y": 1},
-                {"matrix": [1, 12], "x": 12.75, "y": 1},
-                {"matrix": [1, 13], "x": 13.75, "y": 1},
-                {"matrix": [1, 14], "x": 14.75, "y": 1},
-                {"matrix": [1, 15], "x": 15.75, "y": 1, "w": 1.5},
-
-                {"matrix": [2, 0], "x": 0, "y": 2},
-
-                {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
-                {"matrix": [2, 2], "x": 3, "y": 2},
-                {"matrix": [2, 3], "x": 4, "y": 2},
-                {"matrix": [2, 4], "x": 5, "y": 2},
-                {"matrix": [2, 5], "x": 6, "y": 2},
-                {"matrix": [2, 6], "x": 7, "y": 2},
-
-                {"matrix": [2, 8], "x": 9, "y": 2},
-                {"matrix": [2, 9], "x": 10, "y": 2},
-                {"matrix": [2, 10], "x": 11, "y": 2},
-                {"matrix": [2, 11], "x": 12, "y": 2},
-                {"matrix": [2, 12], "x": 13, "y": 2},
-                {"matrix": [2, 13], "x": 14, "y": 2},
-                {"matrix": [2, 14], "x": 15, "y": 2, "w": 2.25},
-
-                {"matrix": [3, 0], "x": 0, "y": 3},
-
-                {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
-                {"matrix": [3, 3], "x": 3.5, "y": 3},
-                {"matrix": [3, 4], "x": 4.5, "y": 3},
-                {"matrix": [3, 5], "x": 5.5, "y": 3},
-                {"matrix": [3, 6], "x": 6.5, "y": 3},
-                {"matrix": [3, 7], "x": 7.5, "y": 3},
-
-                {"matrix": [3, 8], "x": 9.5, "y": 3},
-                {"matrix": [3, 9], "x": 10.5, "y": 3},
-                {"matrix": [3, 10], "x": 11.5, "y": 3},
-                {"matrix": [3, 11], "x": 12.5, "y": 3},
-                {"matrix": [3, 12], "x": 13.5, "y": 3},
-                {"matrix": [3, 14], "x": 14.5, "y": 3, "w": 2.75},
-
-                {"matrix": [4, 0], "x": 0, "y": 4},
-                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 1.25},
-                {"matrix": [4, 4], "x": 5, "y": 4, "w": 2},
-                {"matrix": [4, 5], "x": 7, "y": 4},
-
-                {"matrix": [4, 8], "x": 9, "y": 4, "w": 2.75},
-                {"matrix": [4, 9], "x": 11.75, "y": 4, "w": 1.25},
-                {"matrix": [4, 10], "x": 13, "y": 4, "w": 1.25},
-                {"matrix": [4, 11], "x": 14.25, "y": 4},
-                {"matrix": [4, 12], "x": 15.25, "y": 4},
-                {"matrix": [4, 13], "x": 16.25, "y": 4}
-            ]
-        },
-        "LAYOUT_ansi_split_rshift": {
-            "layout": [
-                {"matrix": [0, 0], "x": 1.25, "y": 0},
-                {"matrix": [0, 1], "x": 2.25, "y": 0},
-                {"matrix": [0, 2], "x": 3.25, "y": 0},
-                {"matrix": [0, 3], "x": 4.25, "y": 0},
-                {"matrix": [0, 4], "x": 5.25, "y": 0},
-                {"matrix": [0, 5], "x": 6.25, "y": 0},
-                {"matrix": [0, 6], "x": 7.25, "y": 0},
-
-                {"matrix": [0, 8], "x": 9.25, "y": 0},
-                {"matrix": [0, 9], "x": 10.25, "y": 0},
-                {"matrix": [0, 10], "x": 11.25, "y": 0},
-                {"matrix": [0, 11], "x": 12.25, "y": 0},
-                {"matrix": [0, 12], "x": 13.25, "y": 0},
-                {"matrix": [0, 13], "x": 14.25, "y": 0},
-                {"matrix": [0, 14], "x": 15.25, "y": 0, "w": 2},
-
-                {"matrix": [1, 0], "x": 0, "y": 1},
-
-                {"matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
-                {"matrix": [1, 2], "x": 2.75, "y": 1},
-                {"matrix": [1, 3], "x": 3.75, "y": 1},
-                {"matrix": [1, 4], "x": 4.75, "y": 1},
-                {"matrix": [1, 5], "x": 5.75, "y": 1},
-                {"matrix": [1, 6], "x": 6.75, "y": 1},
-
-                {"matrix": [1, 8], "x": 8.75, "y": 1},
-                {"matrix": [1, 9], "x": 9.75, "y": 1},
-                {"matrix": [1, 10], "x": 10.75, "y": 1},
-                {"matrix": [1, 11], "x": 11.75, "y": 1},
-                {"matrix": [1, 12], "x": 12.75, "y": 1},
-                {"matrix": [1, 13], "x": 13.75, "y": 1},
-                {"matrix": [1, 14], "x": 14.75, "y": 1},
-                {"matrix": [1, 15], "x": 15.75, "y": 1, "w": 1.5},
-
-                {"matrix": [2, 0], "x": 0, "y": 2},
-
-                {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
-                {"matrix": [2, 2], "x": 3, "y": 2},
-                {"matrix": [2, 3], "x": 4, "y": 2},
-                {"matrix": [2, 4], "x": 5, "y": 2},
-                {"matrix": [2, 5], "x": 6, "y": 2},
-                {"matrix": [2, 6], "x": 7, "y": 2},
-                {"matrix": [2, 8], "x": 9, "y": 2},
-                {"matrix": [2, 9], "x": 10, "y": 2},
-                {"matrix": [2, 10], "x": 11, "y": 2},
-                {"matrix": [2, 11], "x": 12, "y": 2},
-                {"matrix": [2, 12], "x": 13, "y": 2},
-                {"matrix": [2, 13], "x": 14, "y": 2},
-                {"matrix": [2, 14], "x": 15, "y": 2, "w": 2.25},
-
-                {"matrix": [3, 0], "x": 0, "y": 3},
-
-                {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
-                {"matrix": [3, 3], "x": 3.5, "y": 3},
-                {"matrix": [3, 4], "x": 4.5, "y": 3},
-                {"matrix": [3, 5], "x": 5.5, "y": 3},
-                {"matrix": [3, 6], "x": 6.5, "y": 3},
-                {"matrix": [3, 7], "x": 7.5, "y": 3},
-                {"matrix": [3, 8], "x": 9.5, "y": 3},
-                {"matrix": [3, 9], "x": 10.5, "y": 3},
-                {"matrix": [3, 10], "x": 11.5, "y": 3},
-                {"matrix": [3, 11], "x": 12.5, "y": 3},
-                {"matrix": [3, 12], "x": 13.5, "y": 3},
-                {"matrix": [3, 13], "x": 14.5, "y": 3, "w": 1.75},
-                {"matrix": [3, 15], "x": 16.25, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4},
-
-                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 1.25},
-                {"matrix": [4, 4], "x": 5, "y": 4, "w": 2},
-                {"matrix": [4, 5], "x": 7, "y": 4},
-
-                {"matrix": [4, 8], "x": 9, "y": 4, "w": 2.75},
-                {"matrix": [4, 9], "x": 11.75, "y": 4, "w": 1.25},
-                {"matrix": [4, 10], "x": 13, "y": 4, "w": 1.25},
-                {"matrix": [4, 11], "x": 14.25, "y": 4},
-                {"matrix": [4, 12], "x": 15.25, "y": 4},
-                {"matrix": [4, 13], "x": 16.25, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/sx60/keyboard.json b/keyboards/sx60/keyboard.json
new file mode 100644
index 00000000000..42eefbc81a8
--- /dev/null
+++ b/keyboards/sx60/keyboard.json
@@ -0,0 +1,374 @@
+{
+    "keyboard_name": "SX60",
+    "manufacturer": "Quantrik",
+    "url": "",
+    "maintainer": "https://github.com/amnobis",
+    "usb": {
+        "vid": "0x5154",
+        "pid": "0x0010",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "backlight": true,
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "backlight": {
+        "pin": "B7"
+    },
+    "indicators": {
+        "caps_lock": "F4",
+        "num_lock": "F5",
+        "scroll_lock": "F1"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 1.25, "y": 0},
+                {"matrix": [0, 1], "x": 2.25, "y": 0},
+                {"matrix": [0, 2], "x": 3.25, "y": 0},
+                {"matrix": [0, 3], "x": 4.25, "y": 0},
+                {"matrix": [0, 4], "x": 5.25, "y": 0},
+                {"matrix": [0, 5], "x": 6.25, "y": 0},
+                {"matrix": [0, 6], "x": 7.25, "y": 0},
+
+                {"matrix": [0, 8], "x": 9.25, "y": 0},
+                {"matrix": [0, 9], "x": 10.25, "y": 0},
+                {"matrix": [0, 10], "x": 11.25, "y": 0},
+                {"matrix": [0, 11], "x": 12.25, "y": 0},
+                {"matrix": [0, 12], "x": 13.25, "y": 0},
+                {"matrix": [0, 13], "x": 14.25, "y": 0},
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+
+                {"matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 2.75, "y": 1},
+                {"matrix": [1, 3], "x": 3.75, "y": 1},
+                {"matrix": [1, 4], "x": 4.75, "y": 1},
+                {"matrix": [1, 5], "x": 5.75, "y": 1},
+                {"matrix": [1, 6], "x": 6.75, "y": 1},
+
+                {"matrix": [1, 8], "x": 8.75, "y": 1},
+                {"matrix": [1, 9], "x": 9.75, "y": 1},
+                {"matrix": [1, 10], "x": 10.75, "y": 1},
+                {"matrix": [1, 11], "x": 11.75, "y": 1},
+                {"matrix": [1, 12], "x": 12.75, "y": 1},
+                {"matrix": [1, 13], "x": 13.75, "y": 1},
+                {"matrix": [1, 14], "x": 14.75, "y": 1},
+                {"matrix": [1, 15], "x": 15.75, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+
+                {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 3, "y": 2},
+                {"matrix": [2, 3], "x": 4, "y": 2},
+                {"matrix": [2, 4], "x": 5, "y": 2},
+                {"matrix": [2, 5], "x": 6, "y": 2},
+                {"matrix": [2, 6], "x": 7, "y": 2},
+
+                {"matrix": [2, 8], "x": 9, "y": 2},
+                {"matrix": [2, 9], "x": 10, "y": 2},
+                {"matrix": [2, 10], "x": 11, "y": 2},
+                {"matrix": [2, 11], "x": 12, "y": 2},
+                {"matrix": [2, 12], "x": 13, "y": 2},
+                {"matrix": [2, 13], "x": 14, "y": 2},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+                {"matrix": [2, 15], "x": 16, "y": 2, "w": 1.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+
+                {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 1.25},
+                {"matrix": [3, 2], "x": 2.5, "y": 3},
+                {"matrix": [3, 3], "x": 3.5, "y": 3},
+                {"matrix": [3, 4], "x": 4.5, "y": 3},
+                {"matrix": [3, 5], "x": 5.5, "y": 3},
+                {"matrix": [3, 6], "x": 6.5, "y": 3},
+                {"matrix": [3, 7], "x": 7.5, "y": 3},
+
+                {"matrix": [3, 8], "x": 9.5, "y": 3},
+                {"matrix": [3, 9], "x": 10.5, "y": 3},
+                {"matrix": [3, 10], "x": 11.5, "y": 3},
+                {"matrix": [3, 11], "x": 12.5, "y": 3},
+                {"matrix": [3, 12], "x": 13.5, "y": 3},
+                {"matrix": [3, 13], "x": 14.5, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 16.25, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4},
+
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 5, "y": 4, "w": 2},
+                {"matrix": [4, 5], "x": 7, "y": 4},
+
+                {"matrix": [4, 8], "x": 9, "y": 4, "w": 2.75},
+                {"matrix": [4, 9], "x": 11.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "x": 13, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 14.25, "y": 4},
+                {"matrix": [4, 12], "x": 15.25, "y": 4},
+                {"matrix": [4, 13], "x": 16.25, "y": 4}
+            ]
+        },
+        "LAYOUT_ansi_split_bs_rshift": {
+            "layout": [
+                {"matrix": [0, 0], "x": 1.25, "y": 0},
+                {"matrix": [0, 1], "x": 2.25, "y": 0},
+                {"matrix": [0, 2], "x": 3.25, "y": 0},
+                {"matrix": [0, 3], "x": 4.25, "y": 0},
+                {"matrix": [0, 4], "x": 5.25, "y": 0},
+                {"matrix": [0, 5], "x": 6.25, "y": 0},
+                {"matrix": [0, 6], "x": 7.25, "y": 0},
+
+                {"matrix": [0, 8], "x": 9.25, "y": 0},
+                {"matrix": [0, 9], "x": 10.25, "y": 0},
+                {"matrix": [0, 10], "x": 11.25, "y": 0},
+                {"matrix": [0, 11], "x": 12.25, "y": 0},
+                {"matrix": [0, 12], "x": 13.25, "y": 0},
+                {"matrix": [0, 13], "x": 14.25, "y": 0},
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+
+                {"matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 2.75, "y": 1},
+                {"matrix": [1, 3], "x": 3.75, "y": 1},
+                {"matrix": [1, 4], "x": 4.75, "y": 1},
+                {"matrix": [1, 5], "x": 5.75, "y": 1},
+                {"matrix": [1, 6], "x": 6.75, "y": 1},
+
+                {"matrix": [1, 8], "x": 8.75, "y": 1},
+                {"matrix": [1, 9], "x": 9.75, "y": 1},
+                {"matrix": [1, 10], "x": 10.75, "y": 1},
+                {"matrix": [1, 11], "x": 11.75, "y": 1},
+                {"matrix": [1, 12], "x": 12.75, "y": 1},
+                {"matrix": [1, 13], "x": 13.75, "y": 1},
+                {"matrix": [1, 14], "x": 14.75, "y": 1},
+                {"matrix": [1, 15], "x": 15.75, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+
+                {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 3, "y": 2},
+                {"matrix": [2, 3], "x": 4, "y": 2},
+                {"matrix": [2, 4], "x": 5, "y": 2},
+                {"matrix": [2, 5], "x": 6, "y": 2},
+                {"matrix": [2, 6], "x": 7, "y": 2},
+
+                {"matrix": [2, 8], "x": 9, "y": 2},
+                {"matrix": [2, 9], "x": 10, "y": 2},
+                {"matrix": [2, 10], "x": 11, "y": 2},
+                {"matrix": [2, 11], "x": 12, "y": 2},
+                {"matrix": [2, 12], "x": 13, "y": 2},
+                {"matrix": [2, 13], "x": 14, "y": 2},
+                {"matrix": [2, 14], "x": 15, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+
+                {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
+                {"matrix": [3, 3], "x": 3.5, "y": 3},
+                {"matrix": [3, 4], "x": 4.5, "y": 3},
+                {"matrix": [3, 5], "x": 5.5, "y": 3},
+                {"matrix": [3, 6], "x": 6.5, "y": 3},
+                {"matrix": [3, 7], "x": 7.5, "y": 3},
+                {"matrix": [3, 8], "x": 9.5, "y": 3},
+                {"matrix": [3, 9], "x": 10.5, "y": 3},
+                {"matrix": [3, 10], "x": 11.5, "y": 3},
+                {"matrix": [3, 11], "x": 12.5, "y": 3},
+                {"matrix": [3, 12], "x": 13.5, "y": 3},
+                {"matrix": [3, 13], "x": 14.5, "y": 3, "w": 1.75},
+                {"matrix": [3, 15], "x": 16.25, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4},
+
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 5, "y": 4, "w": 2},
+                {"matrix": [4, 5], "x": 7, "y": 4},
+
+                {"matrix": [4, 8], "x": 9, "y": 4, "w": 2.75},
+                {"matrix": [4, 9], "x": 11.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "x": 13, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 14.25, "y": 4},
+                {"matrix": [4, 12], "x": 15.25, "y": 4},
+                {"matrix": [4, 13], "x": 16.25, "y": 4}
+            ]
+        },
+        "LAYOUT_ansi_split_bs": {
+            "layout": [
+                {"matrix": [0, 0], "x": 1.25, "y": 0},
+                {"matrix": [0, 1], "x": 2.25, "y": 0},
+                {"matrix": [0, 2], "x": 3.25, "y": 0},
+                {"matrix": [0, 3], "x": 4.25, "y": 0},
+                {"matrix": [0, 4], "x": 5.25, "y": 0},
+                {"matrix": [0, 5], "x": 6.25, "y": 0},
+                {"matrix": [0, 6], "x": 7.25, "y": 0},
+
+                {"matrix": [0, 8], "x": 9.25, "y": 0},
+                {"matrix": [0, 9], "x": 10.25, "y": 0},
+                {"matrix": [0, 10], "x": 11.25, "y": 0},
+                {"matrix": [0, 11], "x": 12.25, "y": 0},
+                {"matrix": [0, 12], "x": 13.25, "y": 0},
+                {"matrix": [0, 13], "x": 14.25, "y": 0},
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+
+                {"matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 2.75, "y": 1},
+                {"matrix": [1, 3], "x": 3.75, "y": 1},
+                {"matrix": [1, 4], "x": 4.75, "y": 1},
+                {"matrix": [1, 5], "x": 5.75, "y": 1},
+                {"matrix": [1, 6], "x": 6.75, "y": 1},
+
+                {"matrix": [1, 8], "x": 8.75, "y": 1},
+                {"matrix": [1, 9], "x": 9.75, "y": 1},
+                {"matrix": [1, 10], "x": 10.75, "y": 1},
+                {"matrix": [1, 11], "x": 11.75, "y": 1},
+                {"matrix": [1, 12], "x": 12.75, "y": 1},
+                {"matrix": [1, 13], "x": 13.75, "y": 1},
+                {"matrix": [1, 14], "x": 14.75, "y": 1},
+                {"matrix": [1, 15], "x": 15.75, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+
+                {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 3, "y": 2},
+                {"matrix": [2, 3], "x": 4, "y": 2},
+                {"matrix": [2, 4], "x": 5, "y": 2},
+                {"matrix": [2, 5], "x": 6, "y": 2},
+                {"matrix": [2, 6], "x": 7, "y": 2},
+
+                {"matrix": [2, 8], "x": 9, "y": 2},
+                {"matrix": [2, 9], "x": 10, "y": 2},
+                {"matrix": [2, 10], "x": 11, "y": 2},
+                {"matrix": [2, 11], "x": 12, "y": 2},
+                {"matrix": [2, 12], "x": 13, "y": 2},
+                {"matrix": [2, 13], "x": 14, "y": 2},
+                {"matrix": [2, 14], "x": 15, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+
+                {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
+                {"matrix": [3, 3], "x": 3.5, "y": 3},
+                {"matrix": [3, 4], "x": 4.5, "y": 3},
+                {"matrix": [3, 5], "x": 5.5, "y": 3},
+                {"matrix": [3, 6], "x": 6.5, "y": 3},
+                {"matrix": [3, 7], "x": 7.5, "y": 3},
+
+                {"matrix": [3, 8], "x": 9.5, "y": 3},
+                {"matrix": [3, 9], "x": 10.5, "y": 3},
+                {"matrix": [3, 10], "x": 11.5, "y": 3},
+                {"matrix": [3, 11], "x": 12.5, "y": 3},
+                {"matrix": [3, 12], "x": 13.5, "y": 3},
+                {"matrix": [3, 14], "x": 14.5, "y": 3, "w": 2.75},
+
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 5, "y": 4, "w": 2},
+                {"matrix": [4, 5], "x": 7, "y": 4},
+
+                {"matrix": [4, 8], "x": 9, "y": 4, "w": 2.75},
+                {"matrix": [4, 9], "x": 11.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "x": 13, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 14.25, "y": 4},
+                {"matrix": [4, 12], "x": 15.25, "y": 4},
+                {"matrix": [4, 13], "x": 16.25, "y": 4}
+            ]
+        },
+        "LAYOUT_ansi_split_rshift": {
+            "layout": [
+                {"matrix": [0, 0], "x": 1.25, "y": 0},
+                {"matrix": [0, 1], "x": 2.25, "y": 0},
+                {"matrix": [0, 2], "x": 3.25, "y": 0},
+                {"matrix": [0, 3], "x": 4.25, "y": 0},
+                {"matrix": [0, 4], "x": 5.25, "y": 0},
+                {"matrix": [0, 5], "x": 6.25, "y": 0},
+                {"matrix": [0, 6], "x": 7.25, "y": 0},
+
+                {"matrix": [0, 8], "x": 9.25, "y": 0},
+                {"matrix": [0, 9], "x": 10.25, "y": 0},
+                {"matrix": [0, 10], "x": 11.25, "y": 0},
+                {"matrix": [0, 11], "x": 12.25, "y": 0},
+                {"matrix": [0, 12], "x": 13.25, "y": 0},
+                {"matrix": [0, 13], "x": 14.25, "y": 0},
+                {"matrix": [0, 14], "x": 15.25, "y": 0, "w": 2},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+
+                {"matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 2.75, "y": 1},
+                {"matrix": [1, 3], "x": 3.75, "y": 1},
+                {"matrix": [1, 4], "x": 4.75, "y": 1},
+                {"matrix": [1, 5], "x": 5.75, "y": 1},
+                {"matrix": [1, 6], "x": 6.75, "y": 1},
+
+                {"matrix": [1, 8], "x": 8.75, "y": 1},
+                {"matrix": [1, 9], "x": 9.75, "y": 1},
+                {"matrix": [1, 10], "x": 10.75, "y": 1},
+                {"matrix": [1, 11], "x": 11.75, "y": 1},
+                {"matrix": [1, 12], "x": 12.75, "y": 1},
+                {"matrix": [1, 13], "x": 13.75, "y": 1},
+                {"matrix": [1, 14], "x": 14.75, "y": 1},
+                {"matrix": [1, 15], "x": 15.75, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+
+                {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 3, "y": 2},
+                {"matrix": [2, 3], "x": 4, "y": 2},
+                {"matrix": [2, 4], "x": 5, "y": 2},
+                {"matrix": [2, 5], "x": 6, "y": 2},
+                {"matrix": [2, 6], "x": 7, "y": 2},
+                {"matrix": [2, 8], "x": 9, "y": 2},
+                {"matrix": [2, 9], "x": 10, "y": 2},
+                {"matrix": [2, 10], "x": 11, "y": 2},
+                {"matrix": [2, 11], "x": 12, "y": 2},
+                {"matrix": [2, 12], "x": 13, "y": 2},
+                {"matrix": [2, 13], "x": 14, "y": 2},
+                {"matrix": [2, 14], "x": 15, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+
+                {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
+                {"matrix": [3, 3], "x": 3.5, "y": 3},
+                {"matrix": [3, 4], "x": 4.5, "y": 3},
+                {"matrix": [3, 5], "x": 5.5, "y": 3},
+                {"matrix": [3, 6], "x": 6.5, "y": 3},
+                {"matrix": [3, 7], "x": 7.5, "y": 3},
+                {"matrix": [3, 8], "x": 9.5, "y": 3},
+                {"matrix": [3, 9], "x": 10.5, "y": 3},
+                {"matrix": [3, 10], "x": 11.5, "y": 3},
+                {"matrix": [3, 11], "x": 12.5, "y": 3},
+                {"matrix": [3, 12], "x": 13.5, "y": 3},
+                {"matrix": [3, 13], "x": 14.5, "y": 3, "w": 1.75},
+                {"matrix": [3, 15], "x": 16.25, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4},
+
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 5, "y": 4, "w": 2},
+                {"matrix": [4, 5], "x": 7, "y": 4},
+
+                {"matrix": [4, 8], "x": 9, "y": 4, "w": 2.75},
+                {"matrix": [4, 9], "x": 11.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "x": 13, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 14.25, "y": 4},
+                {"matrix": [4, 12], "x": 15.25, "y": 4},
+                {"matrix": [4, 13], "x": 16.25, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/sx60/rules.mk b/keyboards/sx60/rules.mk
index 2f0d22e49f8..394c3372d21 100755
--- a/keyboards/sx60/rules.mk
+++ b/keyboards/sx60/rules.mk
@@ -1,15 +1,3 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes	# Mouse keys
-EXTRAKEY_ENABLE = yes	# Audio control and System control
-CONSOLE_ENABLE = no	# Console for debug
-COMMAND_ENABLE = no    # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = yes  # Enable keyboard backlight functionality
-AUDIO_ENABLE = no
-RGBLIGHT_ENABLE = no
 CUSTOM_MATRIX = yes
 
 # project specific files
diff --git a/keyboards/system76/launch_1/info.json b/keyboards/system76/launch_1/info.json
deleted file mode 100644
index 536b310cc03..00000000000
--- a/keyboards/system76/launch_1/info.json
+++ /dev/null
@@ -1,144 +0,0 @@
-{
-    "keyboard_name": "Launch Configurable Keyboard (launch_1)",
-    "manufacturer": "System76",
-    "url": "https://system76.com/accessories/launch",
-    "usb": {
-        "vid": "0x3384",
-        "pid": "0x0001",
-        "device_version": "0.0.1"
-    },
-    "ws2812": {
-        "pin": "E2"
-    },
-    "rgb_matrix": {
-        "animations": {
-            "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,
-            "raindrops": true,
-            "splash": true,
-            "multisplash": true
-        },
-        "default": {
-            "animation": "rainbow_moving_chevron",
-            "hue": 142,
-            "sat": 255,
-            "speed": 127
-        },
-        "driver": "ws2812",
-        "max_brightness": 176,
-        "sleep": true
-    },
-    "matrix_pins": {
-        "cols": ["D7", "C7", "C6", "B6", "B5", "B4", "D6", "D4", "E6", "D5", "D3", "D2", "B7", "B0"],
-        "rows": ["F0", "F1", "F4", "F5", "F6", "F7"]
-    },
-    "diode_direction": "COL2ROW",
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-   "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 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": 1.5},
-
-                {"matrix": [3, 13], "x": 14.75, "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": [1, 4], "x": 4, "y": 1},
-                {"matrix": [1, 5], "x": 5, "y": 1},
-                {"matrix": [1, 6], "x": 6, "y": 1},
-                {"matrix": [1, 7], "x": 7, "y": 1},
-                {"matrix": [1, 8], "x": 8, "y": 1},
-                {"matrix": [1, 9], "x": 9, "y": 1},
-                {"matrix": [1, 10], "x": 10, "y": 1},
-                {"matrix": [1, 11], "x": 11, "y": 1},
-                {"matrix": [1, 12], "x": 12, "y": 1},
-                {"matrix": [1, 13], "x": 13, "y": 1, "w": 1.5},
-
-                {"matrix": [4, 13], "x": 14.75, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
-                {"matrix": [2, 1], "x": 1.5, "y": 2},
-                {"matrix": [2, 2], "x": 2.5, "y": 2},
-                {"matrix": [2, 3], "x": 3.5, "y": 2},
-                {"matrix": [2, 4], "x": 4.5, "y": 2},
-                {"matrix": [2, 5], "x": 5.5, "y": 2},
-                {"matrix": [2, 6], "x": 6.5, "y": 2},
-                {"matrix": [2, 7], "x": 7.5, "y": 2},
-                {"matrix": [2, 8], "x": 8.5, "y": 2},
-                {"matrix": [2, 9], "x": 9.5, "y": 2},
-                {"matrix": [2, 10], "x": 10.5, "y": 2},
-                {"matrix": [2, 11], "x": 11.5, "y": 2},
-                {"matrix": [2, 12], "x": 12.5, "y": 2},
-                {"matrix": [2, 13], "x": 13.5, "y": 2},
-
-                {"matrix": [5, 13], "x": 14.75, "y": 2},
-
-                {"matrix": [3, 0], "x": 0.25, "y": 3, "w": 1.5},
-                {"matrix": [3, 1], "x": 1.75, "y": 3},
-                {"matrix": [3, 2], "x": 2.75, "y": 3},
-                {"matrix": [3, 3], "x": 3.75, "y": 3},
-                {"matrix": [3, 4], "x": 4.75, "y": 3},
-                {"matrix": [3, 5], "x": 5.75, "y": 3},
-                {"matrix": [3, 6], "x": 6.75, "y": 3},
-                {"matrix": [3, 7], "x": 7.75, "y": 3},
-                {"matrix": [3, 8], "x": 8.75, "y": 3},
-                {"matrix": [3, 9], "x": 9.75, "y": 3},
-                {"matrix": [3, 10], "x": 10.75, "y": 3},
-                {"matrix": [3, 11], "x": 11.75, "y": 3},
-                {"matrix": [3, 12], "x": 12.75, "y": 3, "w": 1.5},
-
-                {"matrix": [5, 5], "x": 14.75, "y": 3},
-
-                {"matrix": [4, 0], "x": 0.25, "y": 4, "w": 2},
-                {"matrix": [4, 1], "x": 2.25, "y": 4},
-                {"matrix": [4, 2], "x": 3.25, "y": 4},
-                {"matrix": [4, 3], "x": 4.25, "y": 4},
-                {"matrix": [4, 4], "x": 5.25, "y": 4},
-                {"matrix": [4, 5], "x": 6.25, "y": 4},
-                {"matrix": [4, 6], "x": 7.25, "y": 4},
-                {"matrix": [4, 7], "x": 8.25, "y": 4},
-                {"matrix": [4, 8], "x": 9.25, "y": 4},
-                {"matrix": [4, 9], "x": 10.25, "y": 4},
-                {"matrix": [4, 10], "x": 11.25, "y": 4},
-                {"matrix": [4, 11], "x": 12.25, "y": 4, "w": 1.5},
-                {"matrix": [4, 12], "x": 13.75, "y": 4},
-
-                {"matrix": [5, 0], "x": 0.25, "y": 5, "w": 1.5},
-                {"matrix": [5, 1], "x": 1.75, "y": 5},
-                {"matrix": [5, 2], "x": 2.75, "y": 5},
-                {"matrix": [5, 3], "x": 3.75, "y": 5},
-                {"matrix": [5, 4], "x": 4.75, "y": 5, "w": 2},
-                {"matrix": [5, 6], "x": 6.75, "y": 5, "w": 2},
-                {"matrix": [5, 7], "x": 8.75, "y": 5},
-                {"matrix": [5, 8], "x": 9.75, "y": 5},
-                {"matrix": [5, 9], "x": 10.75, "y": 5, "w": 1.5},
-
-                {"matrix": [5, 10], "x": 12.75, "y": 5},
-                {"matrix": [5, 11], "x": 13.75, "y": 5},
-                {"matrix": [5, 12], "x": 14.75, "y": 5}
-            ]
-        }
-    }
-}
diff --git a/keyboards/system76/launch_1/keyboard.json b/keyboards/system76/launch_1/keyboard.json
new file mode 100644
index 00000000000..28a505448ef
--- /dev/null
+++ b/keyboards/system76/launch_1/keyboard.json
@@ -0,0 +1,156 @@
+{
+    "keyboard_name": "Launch Configurable Keyboard (launch_1)",
+    "manufacturer": "System76",
+    "url": "https://system76.com/accessories/launch",
+    "usb": {
+        "vid": "0x3384",
+        "pid": "0x0001",
+        "device_version": "0.0.1"
+    },
+    "build": {
+        "lto": true
+    },
+    "features": {
+        "bootmagic": false,
+        "dynamic_keymap": true,
+        "extrakey": true,
+        "mousekey": false,
+        "nkro": true,
+        "raw": true,
+        "rgb_matrix": true
+    },
+    "ws2812": {
+        "pin": "E2"
+    },
+    "rgb_matrix": {
+        "animations": {
+            "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,
+            "raindrops": true,
+            "splash": true,
+            "multisplash": true
+        },
+        "default": {
+            "animation": "rainbow_moving_chevron",
+            "hue": 142,
+            "sat": 255,
+            "speed": 127
+        },
+        "driver": "ws2812",
+        "max_brightness": 176,
+        "sleep": true
+    },
+    "matrix_pins": {
+        "cols": ["D7", "C7", "C6", "B6", "B5", "B4", "D6", "D4", "E6", "D5", "D3", "D2", "B7", "B0"],
+        "rows": ["F0", "F1", "F4", "F5", "F6", "F7"]
+    },
+    "diode_direction": "COL2ROW",
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+   "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 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": 1.5},
+
+                {"matrix": [3, 13], "x": 14.75, "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": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+                {"matrix": [1, 12], "x": 12, "y": 1},
+                {"matrix": [1, 13], "x": 13, "y": 1, "w": 1.5},
+
+                {"matrix": [4, 13], "x": 14.75, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2},
+                {"matrix": [2, 2], "x": 2.5, "y": 2},
+                {"matrix": [2, 3], "x": 3.5, "y": 2},
+                {"matrix": [2, 4], "x": 4.5, "y": 2},
+                {"matrix": [2, 5], "x": 5.5, "y": 2},
+                {"matrix": [2, 6], "x": 6.5, "y": 2},
+                {"matrix": [2, 7], "x": 7.5, "y": 2},
+                {"matrix": [2, 8], "x": 8.5, "y": 2},
+                {"matrix": [2, 9], "x": 9.5, "y": 2},
+                {"matrix": [2, 10], "x": 10.5, "y": 2},
+                {"matrix": [2, 11], "x": 11.5, "y": 2},
+                {"matrix": [2, 12], "x": 12.5, "y": 2},
+                {"matrix": [2, 13], "x": 13.5, "y": 2},
+
+                {"matrix": [5, 13], "x": 14.75, "y": 2},
+
+                {"matrix": [3, 0], "x": 0.25, "y": 3, "w": 1.5},
+                {"matrix": [3, 1], "x": 1.75, "y": 3},
+                {"matrix": [3, 2], "x": 2.75, "y": 3},
+                {"matrix": [3, 3], "x": 3.75, "y": 3},
+                {"matrix": [3, 4], "x": 4.75, "y": 3},
+                {"matrix": [3, 5], "x": 5.75, "y": 3},
+                {"matrix": [3, 6], "x": 6.75, "y": 3},
+                {"matrix": [3, 7], "x": 7.75, "y": 3},
+                {"matrix": [3, 8], "x": 8.75, "y": 3},
+                {"matrix": [3, 9], "x": 9.75, "y": 3},
+                {"matrix": [3, 10], "x": 10.75, "y": 3},
+                {"matrix": [3, 11], "x": 11.75, "y": 3},
+                {"matrix": [3, 12], "x": 12.75, "y": 3, "w": 1.5},
+
+                {"matrix": [5, 5], "x": 14.75, "y": 3},
+
+                {"matrix": [4, 0], "x": 0.25, "y": 4, "w": 2},
+                {"matrix": [4, 1], "x": 2.25, "y": 4},
+                {"matrix": [4, 2], "x": 3.25, "y": 4},
+                {"matrix": [4, 3], "x": 4.25, "y": 4},
+                {"matrix": [4, 4], "x": 5.25, "y": 4},
+                {"matrix": [4, 5], "x": 6.25, "y": 4},
+                {"matrix": [4, 6], "x": 7.25, "y": 4},
+                {"matrix": [4, 7], "x": 8.25, "y": 4},
+                {"matrix": [4, 8], "x": 9.25, "y": 4},
+                {"matrix": [4, 9], "x": 10.25, "y": 4},
+                {"matrix": [4, 10], "x": 11.25, "y": 4},
+                {"matrix": [4, 11], "x": 12.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 12], "x": 13.75, "y": 4},
+
+                {"matrix": [5, 0], "x": 0.25, "y": 5, "w": 1.5},
+                {"matrix": [5, 1], "x": 1.75, "y": 5},
+                {"matrix": [5, 2], "x": 2.75, "y": 5},
+                {"matrix": [5, 3], "x": 3.75, "y": 5},
+                {"matrix": [5, 4], "x": 4.75, "y": 5, "w": 2},
+                {"matrix": [5, 6], "x": 6.75, "y": 5, "w": 2},
+                {"matrix": [5, 7], "x": 8.75, "y": 5},
+                {"matrix": [5, 8], "x": 9.75, "y": 5},
+                {"matrix": [5, 9], "x": 10.75, "y": 5, "w": 1.5},
+
+                {"matrix": [5, 10], "x": 12.75, "y": 5},
+                {"matrix": [5, 11], "x": 13.75, "y": 5},
+                {"matrix": [5, 12], "x": 14.75, "y": 5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/system76/launch_1/rules.mk b/keyboards/system76/launch_1/rules.mk
index 181976b2ddc..6c4999df373 100644
--- a/keyboards/system76/launch_1/rules.mk
+++ b/keyboards/system76/launch_1/rules.mk
@@ -4,22 +4,7 @@ F_CPU = 8000000
 # External oscillator is 16 MHz
 F_USB = 16000000
 
-# Build options
-#   change yes to no to disable
-BOOTMAGIC_ENABLE = no       # Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and system control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-DYNAMIC_KEYMAP_ENABLE = yes # Reconfigurable keyboard without flashing firmware
-NKRO_ENABLE = yes           # USB N-key rollover
-RAW_ENABLE = yes            # Raw HID commands (used by Keyboard Configurator)
-BACKLIGHT_ENABLE = no       # RGB backlight (conflicts with RGB matrix)
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-RGB_MATRIX_ENABLE = yes     # RGB matrix
 RGB_MATRIX_CUSTOM_KB = yes  # Custom keyboard effects
-AUDIO_ENABLE = no           # Audio output
-LTO_ENABLE = yes            # Link-time optimization for smaller binary
 
 # Add System76 EC command interface as well as I2C and USB mux drivers
 SRC += system76_ec.c usb_mux.c
diff --git a/keyboards/tada68/config.h b/keyboards/tada68/config.h
deleted file mode 100755
index b9449c4714b..00000000000
--- a/keyboards/tada68/config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-Copyright 2012 Jun Wako <wakojun@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
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/tada68/info.json b/keyboards/tada68/info.json
deleted file mode 100644
index 1311017d361..00000000000
--- a/keyboards/tada68/info.json
+++ /dev/null
@@ -1,264 +0,0 @@
-{
-    "keyboard_name": "TADA68",
-    "manufacturer": "TADA",
-    "url": "",
-    "maintainer": "qmk",
-    "usb": {
-        "vid": "0x5441",
-        "pid": "0x0001",
-        "device_version": "0.0.3"
-    },
-    "matrix_pins": {
-        "cols": ["F0", "F1", "E6", "C7", "C6", "B7", "D4", "B1", "B0", "B5", "B4", "D7", "D6", "B3", "F4"],
-        "rows": ["D0", "D1", "F6", "F7", "D5"]
-    },
-    "diode_direction": "COL2ROW",
-    "backlight": {
-        "pin": "B6",
-        "levels": 4,
-        "breathing": true
-    },
-    "indicators": {
-        "caps_lock": "B2",
-        "on_state": 0
-    },
-    "processor": "atmega32u4",
-    "bootloader": "lufa-ms",
-    "community_layouts": ["65_ansi", "65_iso"],
-    "layout_aliases": {
-        "LAYOUT_ansi": "LAYOUT_65_ansi",
-        "LAYOUT_iso": "LAYOUT_65_iso"
-    },
-    "layouts": {
-        "LAYOUT_65_ansi": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-                {"matrix": [0, 14], "x": 15, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-                {"matrix": [1, 14], "x": 15, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
-                {"matrix": [2, 14], "x": 15, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 2], "x": 2.25, "y": 3},
-                {"matrix": [3, 3], "x": 3.25, "y": 3},
-                {"matrix": [3, 4], "x": 4.25, "y": 3},
-                {"matrix": [3, 5], "x": 5.25, "y": 3},
-                {"matrix": [3, 6], "x": 6.25, "y": 3},
-                {"matrix": [3, 7], "x": 7.25, "y": 3},
-                {"matrix": [3, 8], "x": 8.25, "y": 3},
-                {"matrix": [3, 9], "x": 9.25, "y": 3},
-                {"matrix": [3, 10], "x": 10.25, "y": 3},
-                {"matrix": [3, 11], "x": 11.25, "y": 3},
-                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"matrix": [3, 13], "x": 14, "y": 3},
-                {"matrix": [3, 14], "x": 15, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
-                {"matrix": [4, 9], "x": 10, "y": 4},
-                {"matrix": [4, 10], "x": 11, "y": 4},
-                {"matrix": [4, 11], "x": 12, "y": 4},
-                {"matrix": [4, 12], "x": 13, "y": 4},
-                {"matrix": [4, 13], "x": 14, "y": 4},
-                {"matrix": [4, 14], "x": 15, "y": 4}
-            ]
-        },
-        "LAYOUT_65_iso": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-                {"matrix": [0, 14], "x": 15, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 14], "x": 15, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [1, 13], "x": 12.75, "y": 2},
-                {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
-                {"matrix": [2, 14], "x": 15, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
-                {"matrix": [3, 1], "x": 1.25, "y": 3},
-                {"matrix": [3, 2], "x": 2.25, "y": 3},
-                {"matrix": [3, 3], "x": 3.25, "y": 3},
-                {"matrix": [3, 4], "x": 4.25, "y": 3},
-                {"matrix": [3, 5], "x": 5.25, "y": 3},
-                {"matrix": [3, 6], "x": 6.25, "y": 3},
-                {"matrix": [3, 7], "x": 7.25, "y": 3},
-                {"matrix": [3, 8], "x": 8.25, "y": 3},
-                {"matrix": [3, 9], "x": 9.25, "y": 3},
-                {"matrix": [3, 10], "x": 10.25, "y": 3},
-                {"matrix": [3, 11], "x": 11.25, "y": 3},
-                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"matrix": [3, 13], "x": 14, "y": 3},
-                {"matrix": [3, 14], "x": 15, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
-                {"matrix": [4, 9], "x": 10, "y": 4},
-                {"matrix": [4, 10], "x": 11, "y": 4},
-                {"matrix": [4, 11], "x": 12, "y": 4},
-                {"matrix": [4, 12], "x": 13, "y": 4},
-                {"matrix": [4, 13], "x": 14, "y": 4},
-                {"matrix": [4, 14], "x": 15, "y": 4}
-            ]
-        },
-        "LAYOUT_ansi_split_enter": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-                {"matrix": [0, 14], "x": 15, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-                {"matrix": [1, 14], "x": 15, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 12], "x": 12.75, "y": 2},
-                {"matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.25},
-                {"matrix": [2, 14], "x": 15, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 2], "x": 2.25, "y": 3},
-                {"matrix": [3, 3], "x": 3.25, "y": 3},
-                {"matrix": [3, 4], "x": 4.25, "y": 3},
-                {"matrix": [3, 5], "x": 5.25, "y": 3},
-                {"matrix": [3, 6], "x": 6.25, "y": 3},
-                {"matrix": [3, 7], "x": 7.25, "y": 3},
-                {"matrix": [3, 8], "x": 8.25, "y": 3},
-                {"matrix": [3, 9], "x": 9.25, "y": 3},
-                {"matrix": [3, 10], "x": 10.25, "y": 3},
-                {"matrix": [3, 11], "x": 11.25, "y": 3},
-                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"matrix": [3, 13], "x": 14, "y": 3},
-                {"matrix": [3, 14], "x": 15, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
-                {"matrix": [4, 9], "x": 10, "y": 4},
-                {"matrix": [4, 10], "x": 11, "y": 4},
-                {"matrix": [4, 11], "x": 12, "y": 4},
-                {"matrix": [4, 12], "x": 13, "y": 4},
-                {"matrix": [4, 13], "x": 14, "y": 4},
-                {"matrix": [4, 14], "x": 15, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/tada68/keyboard.json b/keyboards/tada68/keyboard.json
new file mode 100644
index 00000000000..641def01a31
--- /dev/null
+++ b/keyboards/tada68/keyboard.json
@@ -0,0 +1,278 @@
+{
+    "keyboard_name": "TADA68",
+    "manufacturer": "TADA",
+    "url": "",
+    "maintainer": "qmk",
+    "usb": {
+        "vid": "0x5441",
+        "pid": "0x0001",
+        "device_version": "0.0.3"
+    },
+    "features": {
+        "backlight": true,
+        "bootmagic": false,
+        "command": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
+    "matrix_pins": {
+        "cols": ["F0", "F1", "E6", "C7", "C6", "B7", "D4", "B1", "B0", "B5", "B4", "D7", "D6", "B3", "F4"],
+        "rows": ["D0", "D1", "F6", "F7", "D5"]
+    },
+    "diode_direction": "COL2ROW",
+    "backlight": {
+        "pin": "B6",
+        "levels": 4,
+        "breathing": true
+    },
+    "indicators": {
+        "caps_lock": "B2",
+        "on_state": 0
+    },
+    "processor": "atmega32u4",
+    "bootloader": "lufa-ms",
+    "community_layouts": ["65_ansi", "65_iso"],
+    "layout_aliases": {
+        "LAYOUT_ansi": "LAYOUT_65_ansi",
+        "LAYOUT_iso": "LAYOUT_65_iso"
+    },
+    "layouts": {
+        "LAYOUT_65_ansi": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4},
+                {"matrix": [4, 10], "x": 11, "y": 4},
+                {"matrix": [4, 11], "x": 12, "y": 4},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_65_iso": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [1, 13], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4},
+                {"matrix": [4, 10], "x": 11, "y": 4},
+                {"matrix": [4, 11], "x": 12, "y": 4},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_ansi_split_enter": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4},
+                {"matrix": [4, 10], "x": 11, "y": 4},
+                {"matrix": [4, 11], "x": 12, "y": 4},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/tada68/keymaps/rgb/config.h b/keyboards/tada68/keymaps/rgb/config.h
index 21ddfa1850e..363a41accd6 100755
--- a/keyboards/tada68/keymaps/rgb/config.h
+++ b/keyboards/tada68/keymaps/rgb/config.h
@@ -1,4 +1,4 @@
-#include "../../config.h"
+#pragma once
 
 /* WS2812B RGB Underglow LED */
 #define WS2812_DI_PIN F5   // See readme.md for wiring your led's
diff --git a/keyboards/tada68/keymaps/rgb/rules.mk b/keyboards/tada68/keymaps/rgb/rules.mk
index 7cffca44fad..c777cb1b9ff 100644
--- a/keyboards/tada68/keymaps/rgb/rules.mk
+++ b/keyboards/tada68/keymaps/rgb/rules.mk
@@ -1,18 +1 @@
-# Build Options
-#   change to "no" to disable the options, or define them in the Makefile in 
-#   the appropriate keymap folder that will get included automatically
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes           # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-BACKLIGHT_ENABLE = yes       # Enable keyboard backlight functionality
-MIDI_ENABLE = no            # MIDI controls
-AUDIO_ENABLE = no           # Audio output on port C6
-UNICODE_ENABLE = no         # Unicode
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 RGBLIGHT_ENABLE = yes        # Enable WS2812 RGB underlight. 
-SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-
diff --git a/keyboards/tada68/rules.mk b/keyboards/tada68/rules.mk
index 01310bd4ea0..e22d5248895 100755
--- a/keyboards/tada68/rules.mk
+++ b/keyboards/tada68/rules.mk
@@ -1,15 +1,2 @@
 # This board uses the older unsafe 6k version of lufa-ms
 BOOTLOADER_SIZE = 6144
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
diff --git a/keyboards/takashicompany/compacx/config.h b/keyboards/takashicompany/compacx/config.h
deleted file mode 100644
index 7b4e38bd964..00000000000
--- a/keyboards/takashicompany/compacx/config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-Copyright 2021 takashicompany
-
-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
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/takashicompany/compacx/info.json b/keyboards/takashicompany/compacx/info.json
deleted file mode 100644
index 08dcbfee54b..00000000000
--- a/keyboards/takashicompany/compacx/info.json
+++ /dev/null
@@ -1,135 +0,0 @@
-{
-    "keyboard_name": "Compacx",
-    "manufacturer": "takashicompany",
-    "url": "https://github.com/takashicompany/compacx",
-    "maintainer": "takashicompany",
-    "usb": {
-        "vid": "0x7463",
-        "pid": "0x0014",
-        "device_version": "0.0.1"
-    },
-    "rgblight": {
-        "saturation_steps": 8,
-        "brightness_steps": 8,
-        "led_count": 12,
-        "sleep": true,
-        "split_count": [6, 6],
-        "animations": {
-            "breathing": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "snake": true,
-            "knight": true,
-            "christmas": true,
-            "static_gradient": true,
-            "rgb_test": true,
-            "alternating": true,
-            "twinkle": true
-        }
-    },
-    "ws2812": {
-        "pin": "D3"
-    },
-    "matrix_pins": {
-        "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"],
-        "rows": ["D1", "D0", "D4", "C6", "D7"]
-    },
-    "diode_direction": "COL2ROW",
-    "encoder": {
-        "rotary": [
-            {"pin_a": "E6", "pin_b": "B4"},
-            {"pin_a": "B6", "pin_b": "B5"}
-        ]
-    },
-    "split": {
-        "enabled": true,
-        "soft_serial_pin": "D2"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [1, 6], "x": 7, "y": 0},
-
-                {"matrix": [5, 0], "x": 9, "y": 0},
-                {"matrix": [5, 1], "x": 10, "y": 0},
-                {"matrix": [5, 2], "x": 11, "y": 0},
-                {"matrix": [5, 3], "x": 12, "y": 0},
-                {"matrix": [5, 4], "x": 13, "y": 0},
-                {"matrix": [5, 5], "x": 14, "y": 0},
-                {"matrix": [5, 6], "x": 15, "y": 0},
-                {"matrix": [6, 6], "x": 16, "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": [2, 6], "x": 6.75, "y": 1, "w": 1.25, "h": 2},
-
-                {"matrix": [6, 0], "x": 9, "y": 1, "w": 1.5},
-                {"matrix": [6, 1], "x": 10.5, "y": 1},
-                {"matrix": [6, 2], "x": 11.5, "y": 1},
-                {"matrix": [6, 3], "x": 12.5, "y": 1},
-                {"matrix": [6, 4], "x": 13.5, "y": 1},
-                {"matrix": [6, 5], "x": 14.5, "y": 1},
-                {"matrix": [7, 6], "x": 15.75, "y": 1, "w": 1.25, "h": 2},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"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": [7, 0], "x": 9, "y": 2, "w": 1.75},
-                {"matrix": [7, 1], "x": 10.75, "y": 2},
-                {"matrix": [7, 2], "x": 11.75, "y": 2},
-                {"matrix": [7, 3], "x": 12.75, "y": 2},
-                {"matrix": [7, 4], "x": 13.75, "y": 2},
-                {"matrix": [7, 5], "x": 14.75, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2},
-                {"matrix": [3, 1], "x": 2, "y": 3},
-                {"matrix": [3, 2], "x": 3, "y": 3},
-                {"matrix": [3, 3], "x": 4, "y": 3},
-                {"matrix": [3, 4], "x": 5, "y": 3},
-                {"matrix": [3, 5], "x": 6, "y": 3},
-                {"matrix": [3, 6], "x": 7, "y": 3},
-
-                {"matrix": [8, 0], "x": 9, "y": 3, "w": 2},
-                {"matrix": [8, 1], "x": 11, "y": 3},
-                {"matrix": [8, 2], "x": 12, "y": 3},
-                {"matrix": [8, 3], "x": 13, "y": 3},
-                {"matrix": [8, 4], "x": 14, "y": 3},
-                {"matrix": [8, 5], "x": 15, "y": 3},
-                {"matrix": [8, 6], "x": 16, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4},
-                {"matrix": [4, 1], "x": 1, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 3], "x": 3.5, "y": 4},
-                {"matrix": [4, 4], "x": 4.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 5], "x": 5.75, "y": 4, "w": 1.25},
-                {"matrix": [4, 6], "x": 7, "y": 4},
-
-                {"matrix": [9, 0], "x": 9, "y": 4},
-                {"matrix": [9, 1], "x": 10, "y": 4, "w": 1.25},
-                {"matrix": [9, 2], "x": 11.25, "y": 4, "w": 1.25},
-                {"matrix": [9, 3], "x": 12.5, "y": 4},
-                {"matrix": [9, 4], "x": 13.5, "y": 4, "w": 1.25},
-                {"matrix": [9, 5], "x": 14.75, "y": 4, "w": 1.25},
-                {"matrix": [9, 6], "x": 16, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/takashicompany/compacx/keyboard.json b/keyboards/takashicompany/compacx/keyboard.json
new file mode 100644
index 00000000000..b4460cce770
--- /dev/null
+++ b/keyboards/takashicompany/compacx/keyboard.json
@@ -0,0 +1,152 @@
+{
+    "keyboard_name": "Compacx",
+    "manufacturer": "takashicompany",
+    "url": "https://github.com/takashicompany/compacx",
+    "maintainer": "takashicompany",
+    "usb": {
+        "vid": "0x7463",
+        "pid": "0x0014",
+        "device_version": "0.0.1"
+    },
+    "build": {
+        "lto": true
+    },
+    "features": {
+        "bootmagic": true,
+        "encoder": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": false,
+        "rgblight": true
+    },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 12,
+        "sleep": true,
+        "split_count": [6, 6],
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": true,
+            "twinkle": true
+        }
+    },
+    "ws2812": {
+        "pin": "D3"
+    },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"],
+        "rows": ["D1", "D0", "D4", "C6", "D7"]
+    },
+    "diode_direction": "COL2ROW",
+    "encoder": {
+        "rotary": [
+            {"pin_a": "E6", "pin_b": "B4"},
+            {"pin_a": "B6", "pin_b": "B5"}
+        ]
+    },
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "D2"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [1, 6], "x": 7, "y": 0},
+
+                {"matrix": [5, 0], "x": 9, "y": 0},
+                {"matrix": [5, 1], "x": 10, "y": 0},
+                {"matrix": [5, 2], "x": 11, "y": 0},
+                {"matrix": [5, 3], "x": 12, "y": 0},
+                {"matrix": [5, 4], "x": 13, "y": 0},
+                {"matrix": [5, 5], "x": 14, "y": 0},
+                {"matrix": [5, 6], "x": 15, "y": 0},
+                {"matrix": [6, 6], "x": 16, "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": [2, 6], "x": 6.75, "y": 1, "w": 1.25, "h": 2},
+
+                {"matrix": [6, 0], "x": 9, "y": 1, "w": 1.5},
+                {"matrix": [6, 1], "x": 10.5, "y": 1},
+                {"matrix": [6, 2], "x": 11.5, "y": 1},
+                {"matrix": [6, 3], "x": 12.5, "y": 1},
+                {"matrix": [6, 4], "x": 13.5, "y": 1},
+                {"matrix": [6, 5], "x": 14.5, "y": 1},
+                {"matrix": [7, 6], "x": 15.75, "y": 1, "w": 1.25, "h": 2},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"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": [7, 0], "x": 9, "y": 2, "w": 1.75},
+                {"matrix": [7, 1], "x": 10.75, "y": 2},
+                {"matrix": [7, 2], "x": 11.75, "y": 2},
+                {"matrix": [7, 3], "x": 12.75, "y": 2},
+                {"matrix": [7, 4], "x": 13.75, "y": 2},
+                {"matrix": [7, 5], "x": 14.75, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2},
+                {"matrix": [3, 1], "x": 2, "y": 3},
+                {"matrix": [3, 2], "x": 3, "y": 3},
+                {"matrix": [3, 3], "x": 4, "y": 3},
+                {"matrix": [3, 4], "x": 5, "y": 3},
+                {"matrix": [3, 5], "x": 6, "y": 3},
+                {"matrix": [3, 6], "x": 7, "y": 3},
+
+                {"matrix": [8, 0], "x": 9, "y": 3, "w": 2},
+                {"matrix": [8, 1], "x": 11, "y": 3},
+                {"matrix": [8, 2], "x": 12, "y": 3},
+                {"matrix": [8, 3], "x": 13, "y": 3},
+                {"matrix": [8, 4], "x": 14, "y": 3},
+                {"matrix": [8, 5], "x": 15, "y": 3},
+                {"matrix": [8, 6], "x": 16, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 3.5, "y": 4},
+                {"matrix": [4, 4], "x": 4.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 5.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 7, "y": 4},
+
+                {"matrix": [9, 0], "x": 9, "y": 4},
+                {"matrix": [9, 1], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [9, 2], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [9, 3], "x": 12.5, "y": 4},
+                {"matrix": [9, 4], "x": 13.5, "y": 4, "w": 1.25},
+                {"matrix": [9, 5], "x": 14.75, "y": 4, "w": 1.25},
+                {"matrix": [9, 6], "x": 16, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/takashicompany/compacx/rules.mk b/keyboards/takashicompany/compacx/rules.mk
deleted file mode 100644
index 25fcdc1a34c..00000000000
--- a/keyboards/takashicompany/compacx/rules.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-ENCODER_ENABLE = yes
-LTO_ENABLE = yes
diff --git a/keyboards/takashicompany/spreadwriter/info.json b/keyboards/takashicompany/spreadwriter/info.json
deleted file mode 100644
index da5a95b8957..00000000000
--- a/keyboards/takashicompany/spreadwriter/info.json
+++ /dev/null
@@ -1,112 +0,0 @@
-{
-    "manufacturer": "takashicompany",
-    "keyboard_name": "Spreadwriter",
-    "maintainer": "takashicompany",
-    "bootloader": "caterina",
-    "diode_direction": "COL2ROW",
-    "features": {
-        "bootmagic": true,
-        "command": false,
-        "console": false,
-        "extrakey": true,
-        "mousekey": true,
-        "nkro": true
-    },
-    "matrix_pins": {
-        "cols": ["D4", "C6", "D7", "E6", "B4", "B5", "D2"],
-        "rows": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6"]
-    },
-    "processor": "atmega32u4",
-    "url": "https://github.com/takashicompany/spreadwriter",
-    "usb": {
-        "device_version": "1.0.0",
-        "pid": "0x0023",
-        "vid": "0x7463"
-    },
-    "encoder": {
-        "rotary": [
-            {"pin_a": "D1", "pin_b": "D0"}
-        ]
-    },
-    "rgblight": {
-        "led_count": 53,
-        "hue_steps": 10,
-        "saturation_steps": 17,
-        "brightness_steps": 17,
-        "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
-        }
-    },
-    "ws2812": {
-        "pin": "D3"
-    },
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0.5},
-                {"matrix": [0, 1], "x": 1, "y": 0.5},
-                {"matrix": [0, 2], "x": 2, "y": 0.25},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [4, 1], "x": 10, "y": 0},
-                {"matrix": [4, 2], "x": 11, "y": 0},
-                {"matrix": [4, 3], "x": 12, "y": 0},
-                {"matrix": [4, 4], "x": 13, "y": 0.25},
-                {"matrix": [4, 5], "x": 14, "y": 0.5},
-                {"matrix": [4, 6], "x": 15, "y": 0.5},
-                {"matrix": [1, 0], "x": 0, "y": 1.5},
-                {"matrix": [1, 1], "x": 1, "y": 1.5},
-                {"matrix": [1, 2], "x": 2, "y": 1.25},
-                {"matrix": [1, 3], "x": 3, "y": 1},
-                {"matrix": [1, 4], "x": 4, "y": 1},
-                {"matrix": [1, 5], "x": 5, "y": 1},
-                {"matrix": [1, 6], "x": 7.5, "y": 1},
-                {"matrix": [5, 1], "x": 10, "y": 1},
-                {"matrix": [5, 2], "x": 11, "y": 1},
-                {"matrix": [5, 3], "x": 12, "y": 1},
-                {"matrix": [5, 4], "x": 13, "y": 1.25},
-                {"matrix": [5, 5], "x": 14, "y": 1.5},
-                {"matrix": [5, 6], "x": 15, "y": 1.5},
-                {"matrix": [2, 0], "x": 0, "y": 2.5},
-                {"matrix": [2, 1], "x": 1, "y": 2.5},
-                {"matrix": [2, 2], "x": 2, "y": 2.25},
-                {"matrix": [2, 3], "x": 3, "y": 2},
-                {"matrix": [2, 4], "x": 4, "y": 2},
-                {"matrix": [2, 5], "x": 5, "y": 2},
-                {"matrix": [2, 6], "x": 6, "y": 2},
-                {"matrix": [6, 0], "x": 9, "y": 2},
-                {"matrix": [6, 1], "x": 10, "y": 2},
-                {"matrix": [6, 2], "x": 11, "y": 2},
-                {"matrix": [6, 3], "x": 12, "y": 2},
-                {"matrix": [6, 4], "x": 13, "y": 2.25},
-                {"matrix": [6, 5], "x": 14, "y": 2.5},
-                {"matrix": [6, 6], "x": 15, "y": 2.5},
-                {"matrix": [3, 0], "x": 0, "y": 3.5},
-                {"matrix": [3, 1], "x": 1, "y": 3.5},
-                {"matrix": [3, 2], "x": 2, "y": 3.25},
-                {"matrix": [3, 3], "x": 3, "y": 3},
-                {"matrix": [3, 4], "x": 4, "y": 3},
-                {"matrix": [3, 5], "x": 5, "y": 3},
-                {"matrix": [3, 6], "x": 6, "y": 3},
-                {"matrix": [5, 0], "x": 7.5, "y": 3},
-                {"matrix": [7, 0], "x": 9, "y": 3},
-                {"matrix": [7, 1], "x": 10, "y": 3},
-                {"matrix": [7, 2], "x": 11, "y": 3},
-                {"matrix": [7, 3], "x": 12, "y": 3},
-                {"matrix": [7, 4], "x": 13, "y": 3.25},
-                {"matrix": [7, 5], "x": 14, "y": 3.5},
-                {"matrix": [7, 6], "x": 15, "y": 3.5}
-            ]
-        }
-    }
-}
diff --git a/keyboards/takashicompany/spreadwriter/keyboard.json b/keyboards/takashicompany/spreadwriter/keyboard.json
new file mode 100644
index 00000000000..2c9fcd1619a
--- /dev/null
+++ b/keyboards/takashicompany/spreadwriter/keyboard.json
@@ -0,0 +1,112 @@
+{
+    "manufacturer": "takashicompany",
+    "keyboard_name": "Spreadwriter",
+    "maintainer": "takashicompany",
+    "bootloader": "caterina",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "encoder": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgblight": true
+    },
+    "matrix_pins": {
+        "cols": ["D4", "C6", "D7", "E6", "B4", "B5", "D2"],
+        "rows": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6"]
+    },
+    "processor": "atmega32u4",
+    "url": "https://github.com/takashicompany/spreadwriter",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x0023",
+        "vid": "0x7463"
+    },
+    "encoder": {
+        "rotary": [
+            {"pin_a": "D1", "pin_b": "D0"}
+        ]
+    },
+    "rgblight": {
+        "led_count": 53,
+        "hue_steps": 10,
+        "saturation_steps": 17,
+        "brightness_steps": 17,
+        "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
+        }
+    },
+    "ws2812": {
+        "pin": "D3"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0.5},
+                {"matrix": [0, 1], "x": 1, "y": 0.5},
+                {"matrix": [0, 2], "x": 2, "y": 0.25},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [4, 1], "x": 10, "y": 0},
+                {"matrix": [4, 2], "x": 11, "y": 0},
+                {"matrix": [4, 3], "x": 12, "y": 0},
+                {"matrix": [4, 4], "x": 13, "y": 0.25},
+                {"matrix": [4, 5], "x": 14, "y": 0.5},
+                {"matrix": [4, 6], "x": 15, "y": 0.5},
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 7.5, "y": 1},
+                {"matrix": [5, 1], "x": 10, "y": 1},
+                {"matrix": [5, 2], "x": 11, "y": 1},
+                {"matrix": [5, 3], "x": 12, "y": 1},
+                {"matrix": [5, 4], "x": 13, "y": 1.25},
+                {"matrix": [5, 5], "x": 14, "y": 1.5},
+                {"matrix": [5, 6], "x": 15, "y": 1.5},
+                {"matrix": [2, 0], "x": 0, "y": 2.5},
+                {"matrix": [2, 1], "x": 1, "y": 2.5},
+                {"matrix": [2, 2], "x": 2, "y": 2.25},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [2, 6], "x": 6, "y": 2},
+                {"matrix": [6, 0], "x": 9, "y": 2},
+                {"matrix": [6, 1], "x": 10, "y": 2},
+                {"matrix": [6, 2], "x": 11, "y": 2},
+                {"matrix": [6, 3], "x": 12, "y": 2},
+                {"matrix": [6, 4], "x": 13, "y": 2.25},
+                {"matrix": [6, 5], "x": 14, "y": 2.5},
+                {"matrix": [6, 6], "x": 15, "y": 2.5},
+                {"matrix": [3, 0], "x": 0, "y": 3.5},
+                {"matrix": [3, 1], "x": 1, "y": 3.5},
+                {"matrix": [3, 2], "x": 2, "y": 3.25},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
+                {"matrix": [3, 6], "x": 6, "y": 3},
+                {"matrix": [5, 0], "x": 7.5, "y": 3},
+                {"matrix": [7, 0], "x": 9, "y": 3},
+                {"matrix": [7, 1], "x": 10, "y": 3},
+                {"matrix": [7, 2], "x": 11, "y": 3},
+                {"matrix": [7, 3], "x": 12, "y": 3},
+                {"matrix": [7, 4], "x": 13, "y": 3.25},
+                {"matrix": [7, 5], "x": 14, "y": 3.5},
+                {"matrix": [7, 6], "x": 15, "y": 3.5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/takashicompany/spreadwriter/rules.mk b/keyboards/takashicompany/spreadwriter/rules.mk
deleted file mode 100644
index 248f19320f0..00000000000
--- a/keyboards/takashicompany/spreadwriter/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-ENCODER_ENABLE = yes
-RGBLIGHT_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/takashiski/hecomi/alpha/config.h b/keyboards/takashiski/hecomi/alpha/config.h
deleted file mode 100644
index 1c14611b2b9..00000000000
--- a/keyboards/takashiski/hecomi/alpha/config.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
-Copyright 2018 takashiski
-
-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 USE_I2C
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
-
-/*
-#define USE_I2C
-#define MASTER_LEFT
-#define EEHANDS
-*/
diff --git a/keyboards/takashiski/hecomi/alpha/info.json b/keyboards/takashiski/hecomi/alpha/info.json
deleted file mode 100644
index 767f787e5e3..00000000000
--- a/keyboards/takashiski/hecomi/alpha/info.json
+++ /dev/null
@@ -1,115 +0,0 @@
-{
-  "keyboard_name": "hecomi_alpha",
-  "manufacturer": "takashiski",
-  "url": "https://skyhigh-works.hatenablog.com/entry/2019/02/25/221959",
-  "maintainer": "takashiski",
-  "usb": {
-    "vid": "0xFEED",
-    "pid": "0x0000",
-    "device_version": "0.0.1"
-  },
-  "matrix_pins": {
-    "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6"],
-    "rows": ["C6", "D7", "E6", "B4", "B5"]
-  },
-  "diode_direction": "COL2ROW",
-  "split": {
-    "enabled": true,
-    "soft_serial_pin": "D1"
-  },
-  "rgblight": {
-    "saturation_steps": 8,
-    "brightness_steps": 8,
-    "led_count": 16,
-    "split_count": [8, 8]
-  },
-  "ws2812": {
-    "pin": "D4"
-  },
-  "processor": "atmega32u4",
-  "bootloader": "caterina",
-  "layouts": {
-    "LAYOUT": {
-      "layout": [
-        {"matrix": [0, 0], "x": 0, "y": 0},
-        {"matrix": [0, 1], "x": 1, "y": 0},
-        {"matrix": [0, 2], "x": 2, "y": 0},
-        {"matrix": [0, 3], "x": 3, "y": 0},
-        {"matrix": [0, 4], "x": 4, "y": 0},
-        {"matrix": [0, 5], "x": 5, "y": 0},
-        {"matrix": [0, 6], "x": 6, "y": 0},
-
-        {"matrix": [5, 0], "x": 8.25, "y": 0},
-        {"matrix": [5, 1], "x": 9.25, "y": 0},
-        {"matrix": [5, 2], "x": 10.25, "y": 0},
-        {"matrix": [5, 3], "x": 11.25, "y": 0},
-        {"matrix": [5, 4], "x": 12.25, "y": 0},
-        {"matrix": [5, 5], "x": 13.25, "y": 0},
-        {"matrix": [5, 6], "x": 14.25, "y": 0},
-        {"matrix": [5, 7], "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": [6, 0], "x": 7.75, "y": 1},
-        {"matrix": [6, 1], "x": 8.75, "y": 1},
-        {"matrix": [6, 2], "x": 9.75, "y": 1},
-        {"matrix": [6, 3], "x": 10.75, "y": 1},
-        {"matrix": [6, 4], "x": 11.75, "y": 1},
-        {"matrix": [6, 5], "x": 12.75, "y": 1},
-        {"matrix": [6, 6], "x": 13.75, "y": 1},
-        {"matrix": [6, 7], "x": 14.75, "y": 1, "w": 1.5},
-
-        {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-        {"matrix": [2, 1], "x": 1.75, "y": 2},
-        {"matrix": [2, 2], "x": 2.75, "y": 2},
-        {"matrix": [2, 3], "x": 3.75, "y": 2},
-        {"matrix": [2, 4], "x": 4.75, "y": 2},
-        {"matrix": [2, 5], "x": 5.75, "y": 2},
-
-        {"matrix": [7, 1], "x": 8, "y": 2},
-        {"matrix": [7, 2], "x": 9, "y": 2},
-        {"matrix": [7, 3], "x": 10, "y": 2},
-        {"matrix": [7, 4], "x": 11, "y": 2},
-        {"matrix": [7, 5], "x": 12, "y": 2},
-        {"matrix": [7, 6], "x": 13, "y": 2},
-        {"matrix": [7, 7], "x": 14, "y": 2, "w": 2.25},
-
-        {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-        {"matrix": [3, 1], "x": 2.25, "y": 3},
-        {"matrix": [3, 2], "x": 3.25, "y": 3},
-        {"matrix": [3, 3], "x": 4.25, "y": 3},
-        {"matrix": [3, 4], "x": 5.25, "y": 3},
-        {"matrix": [3, 5], "x": 6.25, "y": 3},
-
-        {"matrix": [8, 0], "x": 7.5, "y": 3},
-        {"matrix": [8, 1], "x": 8.5, "y": 3},
-        {"matrix": [8, 2], "x": 9.5, "y": 3},
-        {"matrix": [8, 3], "x": 10.5, "y": 3},
-        {"matrix": [8, 4], "x": 11.5, "y": 3},
-        {"matrix": [8, 5], "x": 12.5, "y": 3},
-        {"matrix": [8, 6], "x": 13.5, "y": 3, "w": 1.75},
-        {"matrix": [8, 7], "x": 15.25, "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},
-        {"matrix": [4, 3], "x": 3.5, "y": 4},
-        {"matrix": [4, 4], "x": 4.5, "y": 4},
-        {"matrix": [4, 5], "x": 5.5, "y": 4},
-
-        {"matrix": [9, 2], "x": 7.75, "y": 4},
-        {"matrix": [9, 3], "x": 8.75, "y": 4},
-        {"matrix": [9, 4], "x": 9.75, "y": 4},
-        {"matrix": [9, 5], "x": 10.75, "y": 4},
-        {"matrix": [9, 6], "x": 11.75, "y": 4},
-        {"matrix": [9, 7], "x": 12.75, "y": 4}
-      ]
-    }
-  }
-}
diff --git a/keyboards/takashiski/hecomi/alpha/keyboard.json b/keyboards/takashiski/hecomi/alpha/keyboard.json
new file mode 100644
index 00000000000..0a6bf513f0c
--- /dev/null
+++ b/keyboards/takashiski/hecomi/alpha/keyboard.json
@@ -0,0 +1,130 @@
+{
+  "keyboard_name": "hecomi_alpha",
+  "manufacturer": "takashiski",
+  "url": "https://skyhigh-works.hatenablog.com/entry/2019/02/25/221959",
+  "maintainer": "takashiski",
+  "usb": {
+    "vid": "0xFEED",
+    "pid": "0x0000",
+    "device_version": "0.0.1"
+  },
+  "features": {
+    "bootmagic": false,
+    "command": true,
+    "console": true,
+    "extrakey": true,
+    "mousekey": false,
+    "nkro": false,
+    "rgblight": true
+  },
+  "qmk": {
+    "locking": {
+      "enabled": true,
+      "resync": true
+    }
+  },
+  "matrix_pins": {
+    "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6"],
+    "rows": ["C6", "D7", "E6", "B4", "B5"]
+  },
+  "diode_direction": "COL2ROW",
+  "split": {
+    "enabled": true,
+    "soft_serial_pin": "D1"
+  },
+  "rgblight": {
+    "saturation_steps": 8,
+    "brightness_steps": 8,
+    "led_count": 16,
+    "split_count": [8, 8]
+  },
+  "ws2812": {
+    "pin": "D4"
+  },
+  "processor": "atmega32u4",
+  "bootloader": "caterina",
+  "layouts": {
+    "LAYOUT": {
+      "layout": [
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0},
+        {"matrix": [0, 5], "x": 5, "y": 0},
+        {"matrix": [0, 6], "x": 6, "y": 0},
+
+        {"matrix": [5, 0], "x": 8.25, "y": 0},
+        {"matrix": [5, 1], "x": 9.25, "y": 0},
+        {"matrix": [5, 2], "x": 10.25, "y": 0},
+        {"matrix": [5, 3], "x": 11.25, "y": 0},
+        {"matrix": [5, 4], "x": 12.25, "y": 0},
+        {"matrix": [5, 5], "x": 13.25, "y": 0},
+        {"matrix": [5, 6], "x": 14.25, "y": 0},
+        {"matrix": [5, 7], "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": [6, 0], "x": 7.75, "y": 1},
+        {"matrix": [6, 1], "x": 8.75, "y": 1},
+        {"matrix": [6, 2], "x": 9.75, "y": 1},
+        {"matrix": [6, 3], "x": 10.75, "y": 1},
+        {"matrix": [6, 4], "x": 11.75, "y": 1},
+        {"matrix": [6, 5], "x": 12.75, "y": 1},
+        {"matrix": [6, 6], "x": 13.75, "y": 1},
+        {"matrix": [6, 7], "x": 14.75, "y": 1, "w": 1.5},
+
+        {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+        {"matrix": [2, 1], "x": 1.75, "y": 2},
+        {"matrix": [2, 2], "x": 2.75, "y": 2},
+        {"matrix": [2, 3], "x": 3.75, "y": 2},
+        {"matrix": [2, 4], "x": 4.75, "y": 2},
+        {"matrix": [2, 5], "x": 5.75, "y": 2},
+
+        {"matrix": [7, 1], "x": 8, "y": 2},
+        {"matrix": [7, 2], "x": 9, "y": 2},
+        {"matrix": [7, 3], "x": 10, "y": 2},
+        {"matrix": [7, 4], "x": 11, "y": 2},
+        {"matrix": [7, 5], "x": 12, "y": 2},
+        {"matrix": [7, 6], "x": 13, "y": 2},
+        {"matrix": [7, 7], "x": 14, "y": 2, "w": 2.25},
+
+        {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+        {"matrix": [3, 1], "x": 2.25, "y": 3},
+        {"matrix": [3, 2], "x": 3.25, "y": 3},
+        {"matrix": [3, 3], "x": 4.25, "y": 3},
+        {"matrix": [3, 4], "x": 5.25, "y": 3},
+        {"matrix": [3, 5], "x": 6.25, "y": 3},
+
+        {"matrix": [8, 0], "x": 7.5, "y": 3},
+        {"matrix": [8, 1], "x": 8.5, "y": 3},
+        {"matrix": [8, 2], "x": 9.5, "y": 3},
+        {"matrix": [8, 3], "x": 10.5, "y": 3},
+        {"matrix": [8, 4], "x": 11.5, "y": 3},
+        {"matrix": [8, 5], "x": 12.5, "y": 3},
+        {"matrix": [8, 6], "x": 13.5, "y": 3, "w": 1.75},
+        {"matrix": [8, 7], "x": 15.25, "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},
+        {"matrix": [4, 3], "x": 3.5, "y": 4},
+        {"matrix": [4, 4], "x": 4.5, "y": 4},
+        {"matrix": [4, 5], "x": 5.5, "y": 4},
+
+        {"matrix": [9, 2], "x": 7.75, "y": 4},
+        {"matrix": [9, 3], "x": 8.75, "y": 4},
+        {"matrix": [9, 4], "x": 9.75, "y": 4},
+        {"matrix": [9, 5], "x": 10.75, "y": 4},
+        {"matrix": [9, 6], "x": 11.75, "y": 4},
+        {"matrix": [9, 7], "x": 12.75, "y": 4}
+      ]
+    }
+  }
+}
diff --git a/keyboards/takashiski/hecomi/alpha/rules.mk b/keyboards/takashiski/hecomi/alpha/rules.mk
deleted file mode 100644
index 98c2f6b6a7f..00000000000
--- a/keyboards/takashiski/hecomi/alpha/rules.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = yes        # Console for debug
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
diff --git a/keyboards/teleport/native/info.json b/keyboards/teleport/native/info.json
index 3cd857a55dc..756764ff6f0 100644
--- a/keyboards/teleport/native/info.json
+++ b/keyboards/teleport/native/info.json
@@ -38,7 +38,8 @@
         "console": false,
         "extrakey": true,
         "mousekey": true,
-        "nkro": true
+        "nkro": true,
+        "rgb_matrix": true
     },
     "diode_direction": "ROW2COL",
     "matrix_pins": {
diff --git a/keyboards/teleport/native/rules.mk b/keyboards/teleport/native/rules.mk
index 2a3743fa755..53dc2b17475 100644
--- a/keyboards/teleport/native/rules.mk
+++ b/keyboards/teleport/native/rules.mk
@@ -1,4 +1,3 @@
-RGB_MATRIX_ENABLE = yes
 RGB_MATRIX_CUSTOM_KB = yes
 
 DEFAULT_FOLDER = teleport/native/iso
diff --git a/keyboards/telophase/info.json b/keyboards/telophase/info.json
deleted file mode 100644
index 2dd6c5dc783..00000000000
--- a/keyboards/telophase/info.json
+++ /dev/null
@@ -1,74 +0,0 @@
-{
-    "keyboard_name": "Telophase",
-    "manufacturer": "Unknown",
-    "url": "",
-    "maintainer": "qmk",
-    "usb": {
-        "vid": "0xFEED",
-        "pid": "0x6060",
-        "device_version": "0.0.1"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
-    "community_layouts": ["ortho_4x12"],
-    "layout_aliases": {
-        "LAYOUT": "LAYOUT_ortho_4x12"
-    },
-    "layouts": {
-        "LAYOUT_ortho_4x12": {
-            "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": 7, "y": 0},
-                {"matrix": [0, 7], "x": 8, "y": 0},
-                {"matrix": [0, 8], "x": 9, "y": 0},
-                {"matrix": [0, 9], "x": 10, "y": 0},
-                {"matrix": [0, 10], "x": 11, "y": 0},
-                {"matrix": [0, 11], "x": 12, "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": [1, 4], "x": 4, "y": 1},
-                {"matrix": [1, 5], "x": 5, "y": 1},
-                {"matrix": [1, 6], "x": 7, "y": 1},
-                {"matrix": [1, 7], "x": 8, "y": 1},
-                {"matrix": [1, 8], "x": 9, "y": 1},
-                {"matrix": [1, 9], "x": 10, "y": 1},
-                {"matrix": [1, 10], "x": 11, "y": 1},
-                {"matrix": [1, 11], "x": 12, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2},
-                {"matrix": [2, 1], "x": 1, "y": 2},
-                {"matrix": [2, 2], "x": 2, "y": 2},
-                {"matrix": [2, 3], "x": 3, "y": 2},
-                {"matrix": [2, 4], "x": 4, "y": 2},
-                {"matrix": [2, 5], "x": 5, "y": 2},
-                {"matrix": [2, 6], "x": 7, "y": 2},
-                {"matrix": [2, 7], "x": 8, "y": 2},
-                {"matrix": [2, 8], "x": 9, "y": 2},
-                {"matrix": [2, 9], "x": 10, "y": 2},
-                {"matrix": [2, 10], "x": 11, "y": 2},
-                {"matrix": [2, 11], "x": 12, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3},
-                {"matrix": [3, 1], "x": 1, "y": 3},
-                {"matrix": [3, 2], "x": 2, "y": 3},
-                {"matrix": [3, 3], "x": 3, "y": 3},
-                {"matrix": [3, 4], "x": 4, "y": 3},
-                {"matrix": [3, 5], "x": 5, "y": 3},
-                {"matrix": [3, 6], "x": 7, "y": 3},
-                {"matrix": [3, 7], "x": 8, "y": 3},
-                {"matrix": [3, 8], "x": 9, "y": 3},
-                {"matrix": [3, 9], "x": 10, "y": 3},
-                {"matrix": [3, 10], "x": 11, "y": 3},
-                {"matrix": [3, 11], "x": 12, "y": 3}
-            ]
-        }
-    }
-}
diff --git a/keyboards/telophase/keyboard.json b/keyboards/telophase/keyboard.json
new file mode 100644
index 00000000000..8efbae55195
--- /dev/null
+++ b/keyboards/telophase/keyboard.json
@@ -0,0 +1,82 @@
+{
+    "keyboard_name": "Telophase",
+    "manufacturer": "Unknown",
+    "url": "",
+    "maintainer": "qmk",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0x6060",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": false,
+        "command": true,
+        "console": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
+    "community_layouts": ["ortho_4x12"],
+    "layout_aliases": {
+        "LAYOUT": "LAYOUT_ortho_4x12"
+    },
+    "layouts": {
+        "LAYOUT_ortho_4x12": {
+            "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": 7, "y": 0},
+                {"matrix": [0, 7], "x": 8, "y": 0},
+                {"matrix": [0, 8], "x": 9, "y": 0},
+                {"matrix": [0, 9], "x": 10, "y": 0},
+                {"matrix": [0, 10], "x": 11, "y": 0},
+                {"matrix": [0, 11], "x": 12, "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": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 7, "y": 1},
+                {"matrix": [1, 7], "x": 8, "y": 1},
+                {"matrix": [1, 8], "x": 9, "y": 1},
+                {"matrix": [1, 9], "x": 10, "y": 1},
+                {"matrix": [1, 10], "x": 11, "y": 1},
+                {"matrix": [1, 11], "x": 12, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [2, 6], "x": 7, "y": 2},
+                {"matrix": [2, 7], "x": 8, "y": 2},
+                {"matrix": [2, 8], "x": 9, "y": 2},
+                {"matrix": [2, 9], "x": 10, "y": 2},
+                {"matrix": [2, 10], "x": 11, "y": 2},
+                {"matrix": [2, 11], "x": 12, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
+                {"matrix": [3, 6], "x": 7, "y": 3},
+                {"matrix": [3, 7], "x": 8, "y": 3},
+                {"matrix": [3, 8], "x": 9, "y": 3},
+                {"matrix": [3, 9], "x": 10, "y": 3},
+                {"matrix": [3, 10], "x": 11, "y": 3},
+                {"matrix": [3, 11], "x": 12, "y": 3}
+            ]
+        }
+    }
+}
diff --git a/keyboards/telophase/rules.mk b/keyboards/telophase/rules.mk
index 706d6106538..ae63f87e079 100644
--- a/keyboards/telophase/rules.mk
+++ b/keyboards/telophase/rules.mk
@@ -1,18 +1,4 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = yes        # Console for debug
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
 CUSTOM_MATRIX = lite
-
-# project specific files
 SRC += matrix.c
 UART_DRIVER_REQUIRED = yes
 
diff --git a/keyboards/tkc/portico/info.json b/keyboards/tkc/portico/info.json
deleted file mode 100644
index 4f908c83e62..00000000000
--- a/keyboards/tkc/portico/info.json
+++ /dev/null
@@ -1,135 +0,0 @@
-{
-    "keyboard_name": "Portico",
-    "manufacturer": "TKC",
-    "url": "",
-    "maintainer": "TerryMathews",
-    "usb": {
-        "vid": "0x544B",
-        "pid": "0x0008",
-        "device_version": "0.0.1"
-    },
-    "rgb_matrix": {
-        "animations": {
-            "alphas_mods": true,
-            "gradient_left_right": true,
-            "breathing": true,
-            "band_val": true,
-            "band_pinwheel_val": true,
-            "band_spiral_val": true,
-            "cycle_all": true,
-            "cycle_left_right": true,
-            "cycle_up_down": true,
-            "rainbow_moving_chevron": true,
-            "cycle_out_in": true,
-            "cycle_out_in_dual": 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_rain": true,
-            "pixel_flow": true,
-            "pixel_fractal": true,
-            "typing_heatmap": true
-        },
-        "driver": "is31fl3731",
-        "led_flush_limit": 26,
-        "led_process_limit": 4,
-        "max_brightness": 200,
-        "sleep": true
-    },
-    "matrix_pins": {
-        "cols": ["D3", "D5", "D4", "D6", "D7", "B4", "B5", "F6", "F5", "F4", "F1", "B0", "B1", "B2", "B3"],
-        "rows": ["B6", "C6", "C7", "F7", "D2"]
-    },
-    "diode_direction": "COL2ROW",
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "debounce": 3,
-    "layout_aliases": {
-        "LAYOUT_all": "LAYOUT_65_ansi_blocker"
-    },
-    "community_layouts": ["65_ansi_blocker"],
-    "layouts": {
-        "LAYOUT_65_ansi_blocker": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-                {"matrix": [0, 14], "x": 15, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-                {"matrix": [1, 14], "x": 15, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-                {"matrix": [2, 14], "x": 15, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 2], "x": 2.25, "y": 3},
-                {"matrix": [3, 3], "x": 3.25, "y": 3},
-                {"matrix": [3, 4], "x": 4.25, "y": 3},
-                {"matrix": [3, 5], "x": 5.25, "y": 3},
-                {"matrix": [3, 6], "x": 6.25, "y": 3},
-                {"matrix": [3, 7], "x": 7.25, "y": 3},
-                {"matrix": [3, 8], "x": 8.25, "y": 3},
-                {"matrix": [3, 9], "x": 9.25, "y": 3},
-                {"matrix": [3, 10], "x": 10.25, "y": 3},
-                {"matrix": [3, 11], "x": 11.25, "y": 3},
-                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"matrix": [3, 13], "x": 14, "y": 3},
-                {"matrix": [3, 14], "x": 15, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
-                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
-                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 12], "x": 13, "y": 4},
-                {"matrix": [4, 13], "x": 14, "y": 4},
-                {"matrix": [4, 14], "x": 15, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/tkc/portico/keyboard.json b/keyboards/tkc/portico/keyboard.json
new file mode 100644
index 00000000000..29b7d8246b2
--- /dev/null
+++ b/keyboards/tkc/portico/keyboard.json
@@ -0,0 +1,142 @@
+{
+    "keyboard_name": "Portico",
+    "manufacturer": "TKC",
+    "url": "",
+    "maintainer": "TerryMathews",
+    "usb": {
+        "vid": "0x544B",
+        "pid": "0x0008",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "command": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "rgb_matrix": {
+        "animations": {
+            "alphas_mods": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_val": true,
+            "band_pinwheel_val": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": 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_rain": true,
+            "pixel_flow": true,
+            "pixel_fractal": true,
+            "typing_heatmap": true
+        },
+        "driver": "is31fl3731",
+        "led_flush_limit": 26,
+        "led_process_limit": 4,
+        "max_brightness": 200,
+        "sleep": true
+    },
+    "matrix_pins": {
+        "cols": ["D3", "D5", "D4", "D6", "D7", "B4", "B5", "F6", "F5", "F4", "F1", "B0", "B1", "B2", "B3"],
+        "rows": ["B6", "C6", "C7", "F7", "D2"]
+    },
+    "diode_direction": "COL2ROW",
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "debounce": 3,
+    "layout_aliases": {
+        "LAYOUT_all": "LAYOUT_65_ansi_blocker"
+    },
+    "community_layouts": ["65_ansi_blocker"],
+    "layouts": {
+        "LAYOUT_65_ansi_blocker": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/tkc/portico/rules.mk b/keyboards/tkc/portico/rules.mk
index 6bc05372aff..4263ceb1684 100644
--- a/keyboards/tkc/portico/rules.mk
+++ b/keyboards/tkc/portico/rules.mk
@@ -1,22 +1,8 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes          # Mouse keys
-EXTRAKEY_ENABLE = yes          # Audio control and System control
-CONSOLE_ENABLE = no            # Console for debug
-COMMAND_ENABLE = yes           # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no          # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no           # Enable keyboard RGB underglow
-AUDIO_ENABLE = no              # Audio output
-RGB_MATRIX_ENABLE = no
 CIE1931_CURVE = yes
+I2C_DRIVER_REQUIRED = yes
 
 # project specific files
 SRC += keyboards/wilba_tech/wt_main.c \
        keyboards/wilba_tech/wt_rgb_backlight.c \
        quantum/color.c \
        drivers/led/issi/is31fl3731.c
-
-I2C_DRIVER_REQUIRED = yes
diff --git a/keyboards/tkc/portico75/info.json b/keyboards/tkc/portico75/info.json
deleted file mode 100644
index fa2a24951fa..00000000000
--- a/keyboards/tkc/portico75/info.json
+++ /dev/null
@@ -1,150 +0,0 @@
-{
-    "keyboard_name": "Portico75",
-    "manufacturer": "TKC",
-    "url": "",
-    "maintainer": "TerryMathews",
-    "usb": {
-        "vid": "0x544B",
-        "pid": "0x0011",
-        "device_version": "0.0.1"
-    },
-    "rgb_matrix": {
-        "animations": {
-            "alphas_mods": true,
-            "gradient_left_right": true,
-            "breathing": true,
-            "band_val": true,
-            "band_pinwheel_val": true,
-            "band_spiral_val": true,
-            "cycle_all": true,
-            "cycle_left_right": true,
-            "cycle_up_down": true,
-            "rainbow_moving_chevron": true,
-            "cycle_out_in": true,
-            "cycle_out_in_dual": 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_rain": true,
-            "pixel_flow": true,
-            "pixel_fractal": true,
-            "typing_heatmap": true
-        },
-        "driver": "is31fl3741",
-        "led_flush_limit": 26,
-        "led_process_limit": 4,
-        "max_brightness": 200,
-        "sleep": true
-    },
-    "matrix_pins": {
-        "cols": ["F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "B3", "B7"],
-        "rows": ["B0", "E6", "F0", "F1", "D3", "D2"]
-    },
-    "diode_direction": "COL2ROW",
-    "encoder": {
-        "rotary": [
-            {"pin_a": "B1", "pin_b": "B2", "resolution": 2}
-        ]
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "debounce": 3,
-    "layouts": {
-        "LAYOUT_75_ansi": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1.25, "y": 0},
-                {"matrix": [0, 2], "x": 2.25, "y": 0},
-                {"matrix": [0, 3], "x": 3.25, "y": 0},
-                {"matrix": [0, 4], "x": 4.25, "y": 0},
-                {"matrix": [0, 5], "x": 5.5, "y": 0},
-                {"matrix": [0, 6], "x": 6.5, "y": 0},
-                {"matrix": [0, 7], "x": 7.5, "y": 0},
-                {"matrix": [0, 8], "x": 8.5, "y": 0},
-                {"matrix": [0, 9], "x": 9.75, "y": 0},
-                {"matrix": [0, 10], "x": 10.75, "y": 0},
-                {"matrix": [0, 11], "x": 11.75, "y": 0},
-                {"matrix": [0, 12], "x": 12.75, "y": 0},
-                {"matrix": [0, 13], "x": 14, "y": 0},
-                {"matrix": [0, 14], "x": 15, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1.25},
-                {"matrix": [1, 1], "x": 1, "y": 1.25},
-                {"matrix": [1, 2], "x": 2, "y": 1.25},
-                {"matrix": [1, 3], "x": 3, "y": 1.25},
-                {"matrix": [1, 4], "x": 4, "y": 1.25},
-                {"matrix": [1, 5], "x": 5, "y": 1.25},
-                {"matrix": [1, 6], "x": 6, "y": 1.25},
-                {"matrix": [1, 7], "x": 7, "y": 1.25},
-                {"matrix": [1, 8], "x": 8, "y": 1.25},
-                {"matrix": [1, 9], "x": 9, "y": 1.25},
-                {"matrix": [1, 10], "x": 10, "y": 1.25},
-                {"matrix": [1, 11], "x": 11, "y": 1.25},
-                {"matrix": [1, 12], "x": 12, "y": 1.25},
-                {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
-                {"matrix": [1, 14], "x": 15, "y": 1.25},
-
-                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
-                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
-                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
-                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
-                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
-                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
-                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
-                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
-                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
-                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
-                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
-                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
-                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
-                {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
-                {"matrix": [2, 14], "x": 15, "y": 2.25},
-
-                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
-                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
-                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
-                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
-                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
-                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
-                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
-                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
-                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
-                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
-                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
-                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
-                {"matrix": [3, 12], "x": 12.75, "y": 3.25, "w": 2.25},
-
-                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
-                {"matrix": [4, 1], "x": 2.25, "y": 4.25},
-                {"matrix": [4, 2], "x": 3.25, "y": 4.25},
-                {"matrix": [4, 3], "x": 4.25, "y": 4.25},
-                {"matrix": [4, 4], "x": 5.25, "y": 4.25},
-                {"matrix": [4, 5], "x": 6.25, "y": 4.25},
-                {"matrix": [4, 6], "x": 7.25, "y": 4.25},
-                {"matrix": [4, 7], "x": 8.25, "y": 4.25},
-                {"matrix": [4, 8], "x": 9.25, "y": 4.25},
-                {"matrix": [4, 9], "x": 10.25, "y": 4.25},
-                {"matrix": [4, 10], "x": 11.25, "y": 4.25},
-                {"matrix": [4, 11], "x": 12.25, "y": 4.25, "w": 1.75},
-                {"matrix": [4, 12], "x": 14.25, "y": 4.5},
-
-                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 5], "x": 3.75, "y": 5.25, "w": 6.25},
-                {"matrix": [5, 9], "x": 10, "y": 5.25, "w": 1.5},
-                {"matrix": [5, 10], "x": 11.5, "y": 5.25, "w": 1.5},
-                {"matrix": [5, 11], "x": 13.25, "y": 5.5},
-                {"matrix": [5, 12], "x": 14.25, "y": 5.5},
-                {"matrix": [5, 13], "x": 15.25, "y": 5.5}
-            ]
-        }
-    }
-}
diff --git a/keyboards/tkc/portico75/keyboard.json b/keyboards/tkc/portico75/keyboard.json
new file mode 100644
index 00000000000..79ead697648
--- /dev/null
+++ b/keyboards/tkc/portico75/keyboard.json
@@ -0,0 +1,159 @@
+{
+    "keyboard_name": "Portico75",
+    "manufacturer": "TKC",
+    "url": "",
+    "maintainer": "TerryMathews",
+    "usb": {
+        "vid": "0x544B",
+        "pid": "0x0011",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "command": true,
+        "encoder": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgb_matrix": true
+    },
+    "rgb_matrix": {
+        "animations": {
+            "alphas_mods": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_val": true,
+            "band_pinwheel_val": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": 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_rain": true,
+            "pixel_flow": true,
+            "pixel_fractal": true,
+            "typing_heatmap": true
+        },
+        "driver": "is31fl3741",
+        "led_flush_limit": 26,
+        "led_process_limit": 4,
+        "max_brightness": 200,
+        "sleep": true
+    },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "B3", "B7"],
+        "rows": ["B0", "E6", "F0", "F1", "D3", "D2"]
+    },
+    "diode_direction": "COL2ROW",
+    "encoder": {
+        "rotary": [
+            {"pin_a": "B1", "pin_b": "B2", "resolution": 2}
+        ]
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "debounce": 3,
+    "layouts": {
+        "LAYOUT_75_ansi": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.75, "y": 0},
+                {"matrix": [0, 10], "x": 10.75, "y": 0},
+                {"matrix": [0, 11], "x": 11.75, "y": 0},
+                {"matrix": [0, 12], "x": 12.75, "y": 0},
+                {"matrix": [0, 13], "x": 14, "y": 0},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+                {"matrix": [1, 14], "x": 15, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 14], "x": 15, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 12], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 1], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"matrix": [4, 12], "x": 14.25, "y": 4.5},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 5], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 9], "x": 10, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 10], "x": 11.5, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 11], "x": 13.25, "y": 5.5},
+                {"matrix": [5, 12], "x": 14.25, "y": 5.5},
+                {"matrix": [5, 13], "x": 15.25, "y": 5.5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/tkc/portico75/keymaps/via/rules.mk b/keyboards/tkc/portico75/keymaps/via/rules.mk
index 1706771222e..81628aba6ba 100644
--- a/keyboards/tkc/portico75/keymaps/via/rules.mk
+++ b/keyboards/tkc/portico75/keymaps/via/rules.mk
@@ -10,3 +10,4 @@ SRC += keyboards/wilba_tech/wt_main.c \
        drivers/led/issi/is31fl3741.c
 
 I2C_DRIVER_REQUIRED = yes
+CIE1931_CURVE = yes
diff --git a/keyboards/tkc/portico75/rules.mk b/keyboards/tkc/portico75/rules.mk
deleted file mode 100644
index 36e22b992da..00000000000
--- a/keyboards/tkc/portico75/rules.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes         # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes          # Mouse keys
-EXTRAKEY_ENABLE = yes          # Audio control and System control
-CONSOLE_ENABLE = no            # Console for debug
-COMMAND_ENABLE = yes           # Commands for debug and configuration
-NKRO_ENABLE = yes              # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no          # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no           # Enable keyboard RGB underglow
-AUDIO_ENABLE = no              # Audio output
-RGB_MATRIX_ENABLE = yes        # Use RGB matrix
-CIE1931_CURVE = yes
-ENCODER_ENABLE = yes
diff --git a/keyboards/tkw/grandiceps/info.json b/keyboards/tkw/grandiceps/info.json
index 7700780b2e8..13bc1e7acf5 100644
--- a/keyboards/tkw/grandiceps/info.json
+++ b/keyboards/tkw/grandiceps/info.json
@@ -4,7 +4,19 @@
     "maintainer": "vattern",
     "usb": {
         "vid": "0xFEED",
-        "pid": "0x7812"
+        "pid": "0x7812",
+        "shared_endpoint": {
+            "keyboard": true
+        }
+    },
+    "features": {
+        "bootmagic": true,
+        "encoder": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "oled": true,
+        "rgblight": true
     },
     "ws2812": {
         "pin": "B1",
@@ -51,9 +63,7 @@
     "qmk": {
         "tap_keycode_delay": 10
     },
-    "processor": "STM32F411",
-    "bootloader": "stm32-dfu",
-    "board": "BLACKPILL_STM32_F411",
+    "development_board": "blackpill_f411",
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/tkw/grandiceps/rev2/config.h b/keyboards/tkw/grandiceps/rev2/config.h
index 5810fe75bc9..83f1b561574 100644
--- a/keyboards/tkw/grandiceps/rev2/config.h
+++ b/keyboards/tkw/grandiceps/rev2/config.h
@@ -15,5 +15,4 @@
  */
 #pragma once
 
-#define SPLIT_HAND_PIN B3
 #define EEPROM_I2C_24LC64
diff --git a/keyboards/tkw/grandiceps/rev2/info.json b/keyboards/tkw/grandiceps/rev2/info.json
deleted file mode 100644
index cd809481965..00000000000
--- a/keyboards/tkw/grandiceps/rev2/info.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "keyboard_name": "Grandiceps Split rev2",
-    "usb": {
-        "device_version": "0.0.2"
-    },
-    "eeprom": {
-        "driver": "i2c"
-    }
-}
diff --git a/keyboards/tkw/grandiceps/rev2/keyboard.json b/keyboards/tkw/grandiceps/rev2/keyboard.json
new file mode 100644
index 00000000000..b0f9970bcdc
--- /dev/null
+++ b/keyboards/tkw/grandiceps/rev2/keyboard.json
@@ -0,0 +1,17 @@
+{
+    "keyboard_name": "Grandiceps Split rev2",
+    "usb": {
+        "device_version": "0.0.2"
+    },
+    "eeprom": {
+        "driver": "i2c"
+    },
+    "features": {
+        "pointing_device": true
+    },
+    "split": {
+        "handedness": {
+            "pin": "B3"
+        }
+    }
+}
diff --git a/keyboards/tkw/grandiceps/rev2/rules.mk b/keyboards/tkw/grandiceps/rev2/rules.mk
index 20f28719241..0cac88f7f7d 100644
--- a/keyboards/tkw/grandiceps/rev2/rules.mk
+++ b/keyboards/tkw/grandiceps/rev2/rules.mk
@@ -1,2 +1 @@
-POINTING_DEVICE_ENABLE = yes
 POINTING_DEVICE_DRIVER = pimoroni_trackball
diff --git a/keyboards/tkw/grandiceps/rules.mk b/keyboards/tkw/grandiceps/rules.mk
index 5b78d6fe55c..01fa5217635 100644
--- a/keyboards/tkw/grandiceps/rules.mk
+++ b/keyboards/tkw/grandiceps/rules.mk
@@ -1,20 +1,3 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-ENCODER_ENABLE = yes        # Enable rotary encoder support
-AUDIO_ENABLE = no           # Audio output
-KEYBOARD_SHARED_EP = yes    # Free up some extra endpoints - needed if console+mouse+extra
-
 SERIAL_DRIVER = usart
-OLED_ENABLE = yes
-OPT_DEFS += -DSTM32_DMA_REQUIRED=TRUE
 
 DEFAULT_FOLDER = tkw/grandiceps/rev1
diff --git a/keyboards/tkw/stoutgat/v1/info.json b/keyboards/tkw/stoutgat/v1/info.json
deleted file mode 100644
index 9d7a60a4b97..00000000000
--- a/keyboards/tkw/stoutgat/v1/info.json
+++ /dev/null
@@ -1,264 +0,0 @@
-{
-    "keyboard_name": "stoutgat",
-    "manufacturer": "TKW",
-    "url": "https://github.com/vattern/stoutgat",
-    "maintainer": "vattern",
-    "usb": {
-        "vid": "0xFEED",
-        "pid": "0x7811",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["D6", "D5", "D7", "C0", "C1", "C2", "C3", "C4", "C5", "C6", "C7", "A7", "A6", "A5", "A4"],
-        "rows": ["D1", "D0", "A0", "A1", "A2"]
-    },
-    "diode_direction": "COL2ROW",
-    "encoder": {
-        "rotary": [
-            {"pin_a": "B4", "pin_b": "B3"},
-            {"pin_a": "B0", "pin_b": "B1"}
-        ]
-    },
-    "qmk": {
-        "tap_keycode_delay": 10
-    },
-    "processor": "atmega32a",
-    "bootloader": "usbasploader",
-    "community_layouts": ["65_iso", "65_ansi"],
-    "layouts": {
-        "LAYOUT_65_ansi": {
-            "layout": [
-                {"label": "K00", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "K01", "matrix": [0, 1], "x": 1, "y": 0},
-                {"label": "K02", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "K03", "matrix": [0, 3], "x": 3, "y": 0},
-                {"label": "K04", "matrix": [0, 4], "x": 4, "y": 0},
-                {"label": "K05", "matrix": [0, 5], "x": 5, "y": 0},
-                {"label": "K06", "matrix": [0, 6], "x": 6, "y": 0},
-                {"label": "K07", "matrix": [0, 7], "x": 7, "y": 0},
-                {"label": "K08", "matrix": [0, 8], "x": 8, "y": 0},
-                {"label": "K09", "matrix": [0, 9], "x": 9, "y": 0},
-                {"label": "K0A", "matrix": [0, 10], "x": 10, "y": 0},
-                {"label": "K0B", "matrix": [0, 11], "x": 11, "y": 0},
-                {"label": "K0C", "matrix": [0, 12], "x": 12, "y": 0},
-                {"label": "K0D", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-                {"label": "K0E", "matrix": [0, 14], "x": 15, "y": 0},
-
-                {"label": "K10", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"label": "K11", "matrix": [1, 1], "x": 1.5, "y": 1},
-                {"label": "K12", "matrix": [1, 2], "x": 2.5, "y": 1},
-                {"label": "K13", "matrix": [1, 3], "x": 3.5, "y": 1},
-                {"label": "K14", "matrix": [1, 4], "x": 4.5, "y": 1},
-                {"label": "K15", "matrix": [1, 5], "x": 5.5, "y": 1},
-                {"label": "K16", "matrix": [1, 6], "x": 6.5, "y": 1},
-                {"label": "K17", "matrix": [1, 7], "x": 7.5, "y": 1},
-                {"label": "K18", "matrix": [1, 8], "x": 8.5, "y": 1},
-                {"label": "K19", "matrix": [1, 9], "x": 9.5, "y": 1},
-                {"label": "K1A", "matrix": [1, 10], "x": 10.5, "y": 1},
-                {"label": "K1B", "matrix": [1, 11], "x": 11.5, "y": 1},
-                {"label": "K1C", "matrix": [1, 12], "x": 12.5, "y": 1},
-                {"label": "K1D", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-                {"label": "K1E", "matrix": [1, 14], "x": 15, "y": 1},
-
-                {"label": "K20", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"label": "K21", "matrix": [2, 1], "x": 1.75, "y": 2},
-                {"label": "K22", "matrix": [2, 2], "x": 2.75, "y": 2},
-                {"label": "K23", "matrix": [2, 3], "x": 3.75, "y": 2},
-                {"label": "K24", "matrix": [2, 4], "x": 4.75, "y": 2},
-                {"label": "K25", "matrix": [2, 5], "x": 5.75, "y": 2},
-                {"label": "K26", "matrix": [2, 6], "x": 6.75, "y": 2},
-                {"label": "K27", "matrix": [2, 7], "x": 7.75, "y": 2},
-                {"label": "K28", "matrix": [2, 8], "x": 8.75, "y": 2},
-                {"label": "K29", "matrix": [2, 9], "x": 9.75, "y": 2},
-                {"label": "K2A", "matrix": [2, 10], "x": 10.75, "y": 2},
-                {"label": "K2B", "matrix": [2, 11], "x": 11.75, "y": 2},
-                {"label": "K2D", "matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
-                {"label": "K2E", "matrix": [2, 14], "x": 15, "y": 2},
-
-                {"label": "K30", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"label": "K32", "matrix": [3, 2], "x": 2.25, "y": 3},
-                {"label": "K33", "matrix": [3, 3], "x": 3.25, "y": 3},
-                {"label": "K34", "matrix": [3, 4], "x": 4.25, "y": 3},
-                {"label": "K35", "matrix": [3, 5], "x": 5.25, "y": 3},
-                {"label": "K36", "matrix": [3, 6], "x": 6.25, "y": 3},
-                {"label": "K37", "matrix": [3, 7], "x": 7.25, "y": 3},
-                {"label": "K38", "matrix": [3, 8], "x": 8.25, "y": 3},
-                {"label": "K39", "matrix": [3, 9], "x": 9.25, "y": 3},
-                {"label": "K3A", "matrix": [3, 10], "x": 10.25, "y": 3},
-                {"label": "K3B", "matrix": [3, 11], "x": 11.25, "y": 3},
-                {"label": "K3C", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"label": "K3D", "matrix": [3, 13], "x": 14, "y": 3},
-                {"label": "K3E", "matrix": [3, 14], "x": 15, "y": 3},
-
-                {"label": "K40", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"label": "K41", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"label": "K42", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"label": "K46", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
-                {"label": "K49", "matrix": [4, 9], "x": 10, "y": 4},
-                {"label": "K4A", "matrix": [4, 10], "x": 11, "y": 4},
-                {"label": "K4B", "matrix": [4, 11], "x": 12, "y": 4},
-                {"label": "K4C", "matrix": [4, 12], "x": 13, "y": 4},
-                {"label": "K4D", "matrix": [4, 13], "x": 14, "y": 4},
-                {"label": "K4E", "matrix": [4, 14], "x": 15, "y": 4}
-            ]
-        },
-        "LAYOUT_65_iso": {
-            "layout": [
-                {"label": "K00", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "K01", "matrix": [0, 1], "x": 1, "y": 0},
-                {"label": "K02", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "K03", "matrix": [0, 3], "x": 3, "y": 0},
-                {"label": "K04", "matrix": [0, 4], "x": 4, "y": 0},
-                {"label": "K05", "matrix": [0, 5], "x": 5, "y": 0},
-                {"label": "K06", "matrix": [0, 6], "x": 6, "y": 0},
-                {"label": "K07", "matrix": [0, 7], "x": 7, "y": 0},
-                {"label": "K08", "matrix": [0, 8], "x": 8, "y": 0},
-                {"label": "K09", "matrix": [0, 9], "x": 9, "y": 0},
-                {"label": "K0A", "matrix": [0, 10], "x": 10, "y": 0},
-                {"label": "K0B", "matrix": [0, 11], "x": 11, "y": 0},
-                {"label": "K0C", "matrix": [0, 12], "x": 12, "y": 0},
-                {"label": "K0D", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-                {"label": "K0E", "matrix": [0, 14], "x": 15, "y": 0},
-
-                {"label": "K10", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"label": "K11", "matrix": [1, 1], "x": 1.5, "y": 1},
-                {"label": "K12", "matrix": [1, 2], "x": 2.5, "y": 1},
-                {"label": "K13", "matrix": [1, 3], "x": 3.5, "y": 1},
-                {"label": "K14", "matrix": [1, 4], "x": 4.5, "y": 1},
-                {"label": "K15", "matrix": [1, 5], "x": 5.5, "y": 1},
-                {"label": "K16", "matrix": [1, 6], "x": 6.5, "y": 1},
-                {"label": "K17", "matrix": [1, 7], "x": 7.5, "y": 1},
-                {"label": "K18", "matrix": [1, 8], "x": 8.5, "y": 1},
-                {"label": "K19", "matrix": [1, 9], "x": 9.5, "y": 1},
-                {"label": "K1A", "matrix": [1, 10], "x": 10.5, "y": 1},
-                {"label": "K1B", "matrix": [1, 11], "x": 11.5, "y": 1},
-                {"label": "K1C", "matrix": [1, 12], "x": 12.5, "y": 1},
-                {"label": "K1E", "matrix": [1, 14], "x": 15, "y": 1},
-
-                {"label": "K20", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"label": "K21", "matrix": [2, 1], "x": 1.75, "y": 2},
-                {"label": "K22", "matrix": [2, 2], "x": 2.75, "y": 2},
-                {"label": "K23", "matrix": [2, 3], "x": 3.75, "y": 2},
-                {"label": "K24", "matrix": [2, 4], "x": 4.75, "y": 2},
-                {"label": "K25", "matrix": [2, 5], "x": 5.75, "y": 2},
-                {"label": "K26", "matrix": [2, 6], "x": 6.75, "y": 2},
-                {"label": "K27", "matrix": [2, 7], "x": 7.75, "y": 2},
-                {"label": "K28", "matrix": [2, 8], "x": 8.75, "y": 2},
-                {"label": "K29", "matrix": [2, 9], "x": 9.75, "y": 2},
-                {"label": "K2A", "matrix": [2, 10], "x": 10.75, "y": 2},
-                {"label": "K2B", "matrix": [2, 11], "x": 11.75, "y": 2},
-                {"label": "K2D", "matrix": [2, 13], "x": 12.75, "y": 2},
-                {"label": "K1D", "matrix": [1, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
-                {"label": "K2E", "matrix": [2, 14], "x": 15, "y": 2},
-
-                {"label": "K30", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
-                {"label": "K31", "matrix": [3, 1], "x": 1.25, "y": 3},
-                {"label": "K32", "matrix": [3, 2], "x": 2.25, "y": 3},
-                {"label": "K33", "matrix": [3, 3], "x": 3.25, "y": 3},
-                {"label": "K34", "matrix": [3, 4], "x": 4.25, "y": 3},
-                {"label": "K35", "matrix": [3, 5], "x": 5.25, "y": 3},
-                {"label": "K36", "matrix": [3, 6], "x": 6.25, "y": 3},
-                {"label": "K37", "matrix": [3, 7], "x": 7.25, "y": 3},
-                {"label": "K38", "matrix": [3, 8], "x": 8.25, "y": 3},
-                {"label": "K39", "matrix": [3, 9], "x": 9.25, "y": 3},
-                {"label": "K3A", "matrix": [3, 10], "x": 10.25, "y": 3},
-                {"label": "K3B", "matrix": [3, 11], "x": 11.25, "y": 3},
-                {"label": "K3C", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"label": "K3D", "matrix": [3, 13], "x": 14, "y": 3},
-                {"label": "K3E", "matrix": [3, 14], "x": 15, "y": 3},
-
-                {"label": "K40", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"label": "K41", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"label": "K42", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"label": "K46", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
-                {"label": "K49", "matrix": [4, 9], "x": 10, "y": 4},
-                {"label": "K4A", "matrix": [4, 10], "x": 11, "y": 4},
-                {"label": "K4B", "matrix": [4, 11], "x": 12, "y": 4},
-                {"label": "K4C", "matrix": [4, 12], "x": 13, "y": 4},
-                {"label": "K4D", "matrix": [4, 13], "x": 14, "y": 4},
-                {"label": "K4E", "matrix": [4, 14], "x": 15, "y": 4}
-            ]
-        },
-        "LAYOUT_encoder": {
-            "layout": [
-                {"label": "K44", "matrix": [4, 4], "x": 1, "y": 0},
-
-                {"label": "K48", "matrix": [4, 8], "x": 14, "y": 0},
-
-                {"label": "K00", "matrix": [0, 0], "x": 0, "y": 1},
-                {"label": "K01", "matrix": [0, 1], "x": 1, "y": 1},
-                {"label": "K02", "matrix": [0, 2], "x": 2, "y": 1},
-                {"label": "K03", "matrix": [0, 3], "x": 3, "y": 1},
-                {"label": "K04", "matrix": [0, 4], "x": 4, "y": 1},
-                {"label": "K05", "matrix": [0, 5], "x": 5, "y": 1},
-                {"label": "K06", "matrix": [0, 6], "x": 6, "y": 1},
-                {"label": "K07", "matrix": [0, 7], "x": 7, "y": 1},
-                {"label": "K08", "matrix": [0, 8], "x": 8, "y": 1},
-                {"label": "K09", "matrix": [0, 9], "x": 9, "y": 1},
-                {"label": "K0A", "matrix": [0, 10], "x": 10, "y": 1},
-                {"label": "K0B", "matrix": [0, 11], "x": 11, "y": 1},
-                {"label": "K0C", "matrix": [0, 12], "x": 12, "y": 1},
-                {"label": "K0D", "matrix": [0, 13], "x": 13, "y": 1, "w": 2},
-                {"label": "K0E", "matrix": [0, 14], "x": 15, "y": 1},
-
-                {"label": "K10", "matrix": [1, 0], "x": 0, "y": 2, "w": 1.5},
-                {"label": "K11", "matrix": [1, 1], "x": 1.5, "y": 2},
-                {"label": "K12", "matrix": [1, 2], "x": 2.5, "y": 2},
-                {"label": "K13", "matrix": [1, 3], "x": 3.5, "y": 2},
-                {"label": "K14", "matrix": [1, 4], "x": 4.5, "y": 2},
-                {"label": "K15", "matrix": [1, 5], "x": 5.5, "y": 2},
-                {"label": "K16", "matrix": [1, 6], "x": 6.5, "y": 2},
-                {"label": "K17", "matrix": [1, 7], "x": 7.5, "y": 2},
-                {"label": "K18", "matrix": [1, 8], "x": 8.5, "y": 2},
-                {"label": "K19", "matrix": [1, 9], "x": 9.5, "y": 2},
-                {"label": "K1A", "matrix": [1, 10], "x": 10.5, "y": 2},
-                {"label": "K1B", "matrix": [1, 11], "x": 11.5, "y": 2},
-                {"label": "K1C", "matrix": [1, 12], "x": 12.5, "y": 2},
-                {"label": "K1E", "matrix": [1, 14], "x": 15, "y": 2},
-
-                {"label": "K20", "matrix": [2, 0], "x": 0, "y": 3, "w": 1.75},
-                {"label": "K21", "matrix": [2, 1], "x": 1.75, "y": 3},
-                {"label": "K22", "matrix": [2, 2], "x": 2.75, "y": 3},
-                {"label": "K23", "matrix": [2, 3], "x": 3.75, "y": 3},
-                {"label": "K24", "matrix": [2, 4], "x": 4.75, "y": 3},
-                {"label": "K25", "matrix": [2, 5], "x": 5.75, "y": 3},
-                {"label": "K26", "matrix": [2, 6], "x": 6.75, "y": 3},
-                {"label": "K27", "matrix": [2, 7], "x": 7.75, "y": 3},
-                {"label": "K28", "matrix": [2, 8], "x": 8.75, "y": 3},
-                {"label": "K29", "matrix": [2, 9], "x": 9.75, "y": 3},
-                {"label": "K2A", "matrix": [2, 10], "x": 10.75, "y": 3},
-                {"label": "K2B", "matrix": [2, 11], "x": 11.75, "y": 3},
-                {"label": "K2D", "matrix": [2, 13], "x": 12.75, "y": 3},
-                {"label": "K1D", "matrix": [1, 13], "x": 13.75, "y": 2, "w": 1.25, "h": 2},
-                {"label": "K2E", "matrix": [2, 14], "x": 15, "y": 3},
-
-                {"label": "K30", "matrix": [3, 0], "x": 0, "y": 4, "w": 1.25},
-                {"label": "K31", "matrix": [3, 1], "x": 1.25, "y": 4},
-                {"label": "K32", "matrix": [3, 2], "x": 2.25, "y": 4},
-                {"label": "K33", "matrix": [3, 3], "x": 3.25, "y": 4},
-                {"label": "K34", "matrix": [3, 4], "x": 4.25, "y": 4},
-                {"label": "K35", "matrix": [3, 5], "x": 5.25, "y": 4},
-                {"label": "K36", "matrix": [3, 6], "x": 6.25, "y": 4},
-                {"label": "K37", "matrix": [3, 7], "x": 7.25, "y": 4},
-                {"label": "K38", "matrix": [3, 8], "x": 8.25, "y": 4},
-                {"label": "K39", "matrix": [3, 9], "x": 9.25, "y": 4},
-                {"label": "K3A", "matrix": [3, 10], "x": 10.25, "y": 4},
-                {"label": "K3B", "matrix": [3, 11], "x": 11.25, "y": 4},
-                {"label": "K3C", "matrix": [3, 12], "x": 12.25, "y": 4, "w": 1.75},
-                {"label": "K3D", "matrix": [3, 13], "x": 14, "y": 4},
-                {"label": "K3E", "matrix": [3, 14], "x": 15, "y": 4},
-
-                {"label": "K40", "matrix": [4, 0], "x": 0, "y": 5, "w": 1.25},
-                {"label": "K41", "matrix": [4, 1], "x": 1.25, "y": 5, "w": 1.25},
-                {"label": "K42", "matrix": [4, 2], "x": 2.5, "y": 5, "w": 1.25},
-                {"label": "K46", "matrix": [4, 6], "x": 3.75, "y": 5, "w": 6.25},
-                {"label": "K49", "matrix": [4, 9], "x": 10, "y": 5},
-                {"label": "K4A", "matrix": [4, 10], "x": 11, "y": 5},
-                {"label": "K4B", "matrix": [4, 11], "x": 12, "y": 5},
-                {"label": "K4C", "matrix": [4, 12], "x": 13, "y": 5},
-                {"label": "K4D", "matrix": [4, 13], "x": 14, "y": 5},
-                {"label": "K4E", "matrix": [4, 14], "x": 15, "y": 5}
-            ]
-        }
-    }
-}
diff --git a/keyboards/tkw/stoutgat/v1/keyboard.json b/keyboards/tkw/stoutgat/v1/keyboard.json
new file mode 100644
index 00000000000..2dd46af4947
--- /dev/null
+++ b/keyboards/tkw/stoutgat/v1/keyboard.json
@@ -0,0 +1,271 @@
+{
+    "keyboard_name": "stoutgat",
+    "manufacturer": "TKW",
+    "url": "https://github.com/vattern/stoutgat",
+    "maintainer": "vattern",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0x7811",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "encoder": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": false
+    },
+    "matrix_pins": {
+        "cols": ["D6", "D5", "D7", "C0", "C1", "C2", "C3", "C4", "C5", "C6", "C7", "A7", "A6", "A5", "A4"],
+        "rows": ["D1", "D0", "A0", "A1", "A2"]
+    },
+    "diode_direction": "COL2ROW",
+    "encoder": {
+        "rotary": [
+            {"pin_a": "B4", "pin_b": "B3"},
+            {"pin_a": "B0", "pin_b": "B1"}
+        ]
+    },
+    "qmk": {
+        "tap_keycode_delay": 10
+    },
+    "processor": "atmega32a",
+    "bootloader": "usbasploader",
+    "community_layouts": ["65_iso", "65_ansi"],
+    "layouts": {
+        "LAYOUT_65_ansi": {
+            "layout": [
+                {"label": "K00", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "K01", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "K02", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "K03", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "K04", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "K05", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "K06", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "K07", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "K08", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "K09", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "K0A", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "K0B", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "K0C", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "K0D", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"label": "K0E", "matrix": [0, 14], "x": 15, "y": 0},
+
+                {"label": "K10", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "K11", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "K12", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "K13", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "K14", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "K15", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "K16", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "K17", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "K18", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "K19", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "K1A", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "K1B", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "K1C", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "K1D", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"label": "K1E", "matrix": [1, 14], "x": 15, "y": 1},
+
+                {"label": "K20", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "K21", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "K22", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "K23", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "K24", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "K25", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "K26", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "K27", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K28", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "K29", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": "K2A", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "K2B", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "K2D", "matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"label": "K2E", "matrix": [2, 14], "x": 15, "y": 2},
+
+                {"label": "K30", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"label": "K32", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "K33", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "K34", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "K35", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "K36", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "K37", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "K38", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": "K39", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": "K3A", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "K3B", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "K3C", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "K3D", "matrix": [3, 13], "x": 14, "y": 3},
+                {"label": "K3E", "matrix": [3, 14], "x": 15, "y": 3},
+
+                {"label": "K40", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "K41", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "K42", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "K46", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "K49", "matrix": [4, 9], "x": 10, "y": 4},
+                {"label": "K4A", "matrix": [4, 10], "x": 11, "y": 4},
+                {"label": "K4B", "matrix": [4, 11], "x": 12, "y": 4},
+                {"label": "K4C", "matrix": [4, 12], "x": 13, "y": 4},
+                {"label": "K4D", "matrix": [4, 13], "x": 14, "y": 4},
+                {"label": "K4E", "matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_65_iso": {
+            "layout": [
+                {"label": "K00", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "K01", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "K02", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "K03", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "K04", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "K05", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "K06", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "K07", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "K08", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "K09", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "K0A", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "K0B", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "K0C", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "K0D", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"label": "K0E", "matrix": [0, 14], "x": 15, "y": 0},
+
+                {"label": "K10", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "K11", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "K12", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "K13", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "K14", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "K15", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "K16", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "K17", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "K18", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "K19", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "K1A", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "K1B", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "K1C", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "K1E", "matrix": [1, 14], "x": 15, "y": 1},
+
+                {"label": "K20", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "K21", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "K22", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "K23", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "K24", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "K25", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "K26", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "K27", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K28", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "K29", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": "K2A", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "K2B", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "K2D", "matrix": [2, 13], "x": 12.75, "y": 2},
+                {"label": "K1D", "matrix": [1, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"label": "K2E", "matrix": [2, 14], "x": 15, "y": 2},
+
+                {"label": "K30", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"label": "K31", "matrix": [3, 1], "x": 1.25, "y": 3},
+                {"label": "K32", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "K33", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "K34", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "K35", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "K36", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "K37", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "K38", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": "K39", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": "K3A", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "K3B", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "K3C", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "K3D", "matrix": [3, 13], "x": 14, "y": 3},
+                {"label": "K3E", "matrix": [3, 14], "x": 15, "y": 3},
+
+                {"label": "K40", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "K41", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "K42", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "K46", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "K49", "matrix": [4, 9], "x": 10, "y": 4},
+                {"label": "K4A", "matrix": [4, 10], "x": 11, "y": 4},
+                {"label": "K4B", "matrix": [4, 11], "x": 12, "y": 4},
+                {"label": "K4C", "matrix": [4, 12], "x": 13, "y": 4},
+                {"label": "K4D", "matrix": [4, 13], "x": 14, "y": 4},
+                {"label": "K4E", "matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_encoder": {
+            "layout": [
+                {"label": "K44", "matrix": [4, 4], "x": 1, "y": 0},
+
+                {"label": "K48", "matrix": [4, 8], "x": 14, "y": 0},
+
+                {"label": "K00", "matrix": [0, 0], "x": 0, "y": 1},
+                {"label": "K01", "matrix": [0, 1], "x": 1, "y": 1},
+                {"label": "K02", "matrix": [0, 2], "x": 2, "y": 1},
+                {"label": "K03", "matrix": [0, 3], "x": 3, "y": 1},
+                {"label": "K04", "matrix": [0, 4], "x": 4, "y": 1},
+                {"label": "K05", "matrix": [0, 5], "x": 5, "y": 1},
+                {"label": "K06", "matrix": [0, 6], "x": 6, "y": 1},
+                {"label": "K07", "matrix": [0, 7], "x": 7, "y": 1},
+                {"label": "K08", "matrix": [0, 8], "x": 8, "y": 1},
+                {"label": "K09", "matrix": [0, 9], "x": 9, "y": 1},
+                {"label": "K0A", "matrix": [0, 10], "x": 10, "y": 1},
+                {"label": "K0B", "matrix": [0, 11], "x": 11, "y": 1},
+                {"label": "K0C", "matrix": [0, 12], "x": 12, "y": 1},
+                {"label": "K0D", "matrix": [0, 13], "x": 13, "y": 1, "w": 2},
+                {"label": "K0E", "matrix": [0, 14], "x": 15, "y": 1},
+
+                {"label": "K10", "matrix": [1, 0], "x": 0, "y": 2, "w": 1.5},
+                {"label": "K11", "matrix": [1, 1], "x": 1.5, "y": 2},
+                {"label": "K12", "matrix": [1, 2], "x": 2.5, "y": 2},
+                {"label": "K13", "matrix": [1, 3], "x": 3.5, "y": 2},
+                {"label": "K14", "matrix": [1, 4], "x": 4.5, "y": 2},
+                {"label": "K15", "matrix": [1, 5], "x": 5.5, "y": 2},
+                {"label": "K16", "matrix": [1, 6], "x": 6.5, "y": 2},
+                {"label": "K17", "matrix": [1, 7], "x": 7.5, "y": 2},
+                {"label": "K18", "matrix": [1, 8], "x": 8.5, "y": 2},
+                {"label": "K19", "matrix": [1, 9], "x": 9.5, "y": 2},
+                {"label": "K1A", "matrix": [1, 10], "x": 10.5, "y": 2},
+                {"label": "K1B", "matrix": [1, 11], "x": 11.5, "y": 2},
+                {"label": "K1C", "matrix": [1, 12], "x": 12.5, "y": 2},
+                {"label": "K1E", "matrix": [1, 14], "x": 15, "y": 2},
+
+                {"label": "K20", "matrix": [2, 0], "x": 0, "y": 3, "w": 1.75},
+                {"label": "K21", "matrix": [2, 1], "x": 1.75, "y": 3},
+                {"label": "K22", "matrix": [2, 2], "x": 2.75, "y": 3},
+                {"label": "K23", "matrix": [2, 3], "x": 3.75, "y": 3},
+                {"label": "K24", "matrix": [2, 4], "x": 4.75, "y": 3},
+                {"label": "K25", "matrix": [2, 5], "x": 5.75, "y": 3},
+                {"label": "K26", "matrix": [2, 6], "x": 6.75, "y": 3},
+                {"label": "K27", "matrix": [2, 7], "x": 7.75, "y": 3},
+                {"label": "K28", "matrix": [2, 8], "x": 8.75, "y": 3},
+                {"label": "K29", "matrix": [2, 9], "x": 9.75, "y": 3},
+                {"label": "K2A", "matrix": [2, 10], "x": 10.75, "y": 3},
+                {"label": "K2B", "matrix": [2, 11], "x": 11.75, "y": 3},
+                {"label": "K2D", "matrix": [2, 13], "x": 12.75, "y": 3},
+                {"label": "K1D", "matrix": [1, 13], "x": 13.75, "y": 2, "w": 1.25, "h": 2},
+                {"label": "K2E", "matrix": [2, 14], "x": 15, "y": 3},
+
+                {"label": "K30", "matrix": [3, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "K31", "matrix": [3, 1], "x": 1.25, "y": 4},
+                {"label": "K32", "matrix": [3, 2], "x": 2.25, "y": 4},
+                {"label": "K33", "matrix": [3, 3], "x": 3.25, "y": 4},
+                {"label": "K34", "matrix": [3, 4], "x": 4.25, "y": 4},
+                {"label": "K35", "matrix": [3, 5], "x": 5.25, "y": 4},
+                {"label": "K36", "matrix": [3, 6], "x": 6.25, "y": 4},
+                {"label": "K37", "matrix": [3, 7], "x": 7.25, "y": 4},
+                {"label": "K38", "matrix": [3, 8], "x": 8.25, "y": 4},
+                {"label": "K39", "matrix": [3, 9], "x": 9.25, "y": 4},
+                {"label": "K3A", "matrix": [3, 10], "x": 10.25, "y": 4},
+                {"label": "K3B", "matrix": [3, 11], "x": 11.25, "y": 4},
+                {"label": "K3C", "matrix": [3, 12], "x": 12.25, "y": 4, "w": 1.75},
+                {"label": "K3D", "matrix": [3, 13], "x": 14, "y": 4},
+                {"label": "K3E", "matrix": [3, 14], "x": 15, "y": 4},
+
+                {"label": "K40", "matrix": [4, 0], "x": 0, "y": 5, "w": 1.25},
+                {"label": "K41", "matrix": [4, 1], "x": 1.25, "y": 5, "w": 1.25},
+                {"label": "K42", "matrix": [4, 2], "x": 2.5, "y": 5, "w": 1.25},
+                {"label": "K46", "matrix": [4, 6], "x": 3.75, "y": 5, "w": 6.25},
+                {"label": "K49", "matrix": [4, 9], "x": 10, "y": 5},
+                {"label": "K4A", "matrix": [4, 10], "x": 11, "y": 5},
+                {"label": "K4B", "matrix": [4, 11], "x": 12, "y": 5},
+                {"label": "K4C", "matrix": [4, 12], "x": 13, "y": 5},
+                {"label": "K4D", "matrix": [4, 13], "x": 14, "y": 5},
+                {"label": "K4E", "matrix": [4, 14], "x": 15, "y": 5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/tkw/stoutgat/v1/rules.mk b/keyboards/tkw/stoutgat/v1/rules.mk
index 8dca0665f77..c2ee0bc86f9 100644
--- a/keyboards/tkw/stoutgat/v1/rules.mk
+++ b/keyboards/tkw/stoutgat/v1/rules.mk
@@ -1,16 +1,2 @@
 # Processor frequency
 F_CPU = 16000000
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-ENCODER_ENABLE  = yes
diff --git a/keyboards/tkw/stoutgat/v2/f411/keyboard.json b/keyboards/tkw/stoutgat/v2/f411/keyboard.json
index 2517a82403f..a41c5f4dd14 100644
--- a/keyboards/tkw/stoutgat/v2/f411/keyboard.json
+++ b/keyboards/tkw/stoutgat/v2/f411/keyboard.json
@@ -1,5 +1,3 @@
 {
-    "processor": "STM32F411",
-    "bootloader": "stm32-dfu",
-    "board": "BLACKPILL_STM32_F411"
+    "development_board": "blackpill_f411"
 }
diff --git a/keyboards/tkw/stoutgat/v2/info.json b/keyboards/tkw/stoutgat/v2/info.json
index b1232f6816e..dbb227b0fdc 100644
--- a/keyboards/tkw/stoutgat/v2/info.json
+++ b/keyboards/tkw/stoutgat/v2/info.json
@@ -8,6 +8,14 @@
         "pid": "0x7811",
         "device_version": "0.0.2"
     },
+    "features": {
+        "bootmagic": true,
+        "encoder": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgblight": true
+    },
     "ws2812": {
         "pin": "B1",
         "driver": "pwm"
diff --git a/keyboards/tkw/stoutgat/v2/rules.mk b/keyboards/tkw/stoutgat/v2/rules.mk
index 477d680add8..1a660af26c9 100644
--- a/keyboards/tkw/stoutgat/v2/rules.mk
+++ b/keyboards/tkw/stoutgat/v2/rules.mk
@@ -1,18 +1 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-KEYBOARD_SHARED_EP = yes    # Free up some extra endpoints - needed if console+mouse+extra
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-ENCODER_ENABLE = yes        # Enable rotary encoder support
-AUDIO_ENABLE = no           # Audio output
-
-OPT_DEFS += -DSTM32_DMA_REQUIRED=TRUE
-
 DEFAULT_FOLDER = tkw/stoutgat/v2/f411
diff --git a/keyboards/tokyokeyboard/alix40/info.json b/keyboards/tokyokeyboard/alix40/info.json
deleted file mode 100644
index 7b2f198e596..00000000000
--- a/keyboards/tokyokeyboard/alix40/info.json
+++ /dev/null
@@ -1,106 +0,0 @@
-{
-    "keyboard_name": "alix40",
-    "manufacturer": "quadcube",
-    "url": "https://tokyokeyboard.com/",
-    "maintainer": "qmk",
-    "usb": {
-        "vid": "0x5143",
-        "pid": "0x4134",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["F7", "F6", "F5", "F4", "F1", "F0", "D0", "D1", "D2", "D3", "D5", "D6"],
-        "rows": ["D7", "C6", "C7", "B5"]
-    },
-    "diode_direction": "ROW2COL",
-    "bluetooth": {
-        "driver": "bluefruit_le"
-    },
-    "backlight": {
-        "pin": "B7",
-        "levels": 31,
-        "breathing": true
-    },
-    "rgblight": {
-        "hue_steps": 10,
-        "saturation_steps": 10,
-        "brightness_steps": 10,
-        "led_count": 12,
-        "animations": {
-            "breathing": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "snake": true,
-            "knight": true,
-            "christmas": true,
-            "static_gradient": true,
-            "rgb_test": true,
-            "alternating": true,
-            "twinkle": true
-        }
-    },
-    "ws2812": {
-        "pin": "B0"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "layouts": {
-        "LAYOUT_40_alix": {
-            "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": 7.5, "y": 0},
-                {"matrix": [0, 7], "x": 8.5, "y": 0},
-                {"matrix": [0, 8], "x": 9.5, "y": 0},
-                {"matrix": [0, 9], "x": 10.5, "y": 0},
-                {"matrix": [0, 10], "x": 11.5, "y": 0},
-                {"matrix": [0, 11], "x": 12.5, "y": 0},
-
-                {"matrix": [1, 0], "x": 0.25, "y": 1},
-                {"matrix": [1, 1], "x": 1.25, "y": 1},
-                {"matrix": [1, 2], "x": 2.25, "y": 1},
-                {"matrix": [1, 3], "x": 3.25, "y": 1},
-                {"matrix": [1, 4], "x": 4.25, "y": 1},
-                {"matrix": [1, 5], "x": 5.25, "y": 1},
-
-                {"matrix": [1, 6], "x": 7.75, "y": 1},
-                {"matrix": [1, 7], "x": 8.75, "y": 1},
-                {"matrix": [1, 8], "x": 9.75, "y": 1},
-                {"matrix": [1, 9], "x": 10.75, "y": 1},
-                {"matrix": [1, 10], "x": 11.75, "y": 1},
-                {"matrix": [1, 11], "x": 12.75, "y": 1},
-
-                {"matrix": [2, 0], "x": 0.75, "y": 2},
-                {"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": 7.25, "y": 2},
-                {"matrix": [2, 7], "x": 8.25, "y": 2},
-                {"matrix": [2, 8], "x": 9.25, "y": 2},
-                {"matrix": [2, 9], "x": 10.25, "y": 2},
-                {"matrix": [2, 10], "x": 11.25, "y": 2},
-                {"matrix": [2, 11], "x": 12.25, "y": 2},
-
-                {"matrix": [3, 0], "x": 0.5, "y": 3},
-                {"matrix": [3, 1], "x": 1.5, "y": 3},
-                {"matrix": [3, 3], "x": 3.75, "y": 3},
-                {"matrix": [3, 4], "x": 4.75, "y": 3},
-                {"matrix": [3, 5], "x": 5.75, "y": 3},
-
-                {"matrix": [3, 6], "x": 7.25, "y": 3},
-                {"matrix": [3, 7], "x": 8.25, "y": 3},
-                {"matrix": [3, 8], "x": 9.25, "y": 3},
-                {"matrix": [3, 10], "x": 11.5, "y": 3},
-                {"matrix": [3, 11], "x": 12.5, "y": 3}
-            ]
-        }
-    }
-}
diff --git a/keyboards/tokyokeyboard/alix40/keyboard.json b/keyboards/tokyokeyboard/alix40/keyboard.json
new file mode 100644
index 00000000000..e4c27aaec21
--- /dev/null
+++ b/keyboards/tokyokeyboard/alix40/keyboard.json
@@ -0,0 +1,114 @@
+{
+    "keyboard_name": "alix40",
+    "manufacturer": "quadcube",
+    "url": "https://tokyokeyboard.com/",
+    "maintainer": "qmk",
+    "usb": {
+        "vid": "0x5143",
+        "pid": "0x4134",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bluetooth": true,
+        "bootmagic": true,
+        "command": true,
+        "extrakey": true,
+        "mousekey": false,
+        "nkro": false
+    },
+    "matrix_pins": {
+        "cols": ["F7", "F6", "F5", "F4", "F1", "F0", "D0", "D1", "D2", "D3", "D5", "D6"],
+        "rows": ["D7", "C6", "C7", "B5"]
+    },
+    "diode_direction": "ROW2COL",
+    "bluetooth": {
+        "driver": "bluefruit_le"
+    },
+    "backlight": {
+        "pin": "B7",
+        "levels": 31,
+        "breathing": true
+    },
+    "rgblight": {
+        "hue_steps": 10,
+        "saturation_steps": 10,
+        "brightness_steps": 10,
+        "led_count": 12,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": true,
+            "twinkle": true
+        }
+    },
+    "ws2812": {
+        "pin": "B0"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "layouts": {
+        "LAYOUT_40_alix": {
+            "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": 7.5, "y": 0},
+                {"matrix": [0, 7], "x": 8.5, "y": 0},
+                {"matrix": [0, 8], "x": 9.5, "y": 0},
+                {"matrix": [0, 9], "x": 10.5, "y": 0},
+                {"matrix": [0, 10], "x": 11.5, "y": 0},
+                {"matrix": [0, 11], "x": 12.5, "y": 0},
+
+                {"matrix": [1, 0], "x": 0.25, "y": 1},
+                {"matrix": [1, 1], "x": 1.25, "y": 1},
+                {"matrix": [1, 2], "x": 2.25, "y": 1},
+                {"matrix": [1, 3], "x": 3.25, "y": 1},
+                {"matrix": [1, 4], "x": 4.25, "y": 1},
+                {"matrix": [1, 5], "x": 5.25, "y": 1},
+
+                {"matrix": [1, 6], "x": 7.75, "y": 1},
+                {"matrix": [1, 7], "x": 8.75, "y": 1},
+                {"matrix": [1, 8], "x": 9.75, "y": 1},
+                {"matrix": [1, 9], "x": 10.75, "y": 1},
+                {"matrix": [1, 10], "x": 11.75, "y": 1},
+                {"matrix": [1, 11], "x": 12.75, "y": 1},
+
+                {"matrix": [2, 0], "x": 0.75, "y": 2},
+                {"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": 7.25, "y": 2},
+                {"matrix": [2, 7], "x": 8.25, "y": 2},
+                {"matrix": [2, 8], "x": 9.25, "y": 2},
+                {"matrix": [2, 9], "x": 10.25, "y": 2},
+                {"matrix": [2, 10], "x": 11.25, "y": 2},
+                {"matrix": [2, 11], "x": 12.25, "y": 2},
+
+                {"matrix": [3, 0], "x": 0.5, "y": 3},
+                {"matrix": [3, 1], "x": 1.5, "y": 3},
+                {"matrix": [3, 3], "x": 3.75, "y": 3},
+                {"matrix": [3, 4], "x": 4.75, "y": 3},
+                {"matrix": [3, 5], "x": 5.75, "y": 3},
+
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 11.5, "y": 3},
+                {"matrix": [3, 11], "x": 12.5, "y": 3}
+            ]
+        }
+    }
+}
diff --git a/keyboards/tokyokeyboard/alix40/rules.mk b/keyboards/tokyokeyboard/alix40/rules.mk
index 5d6d78ae10a..3437a35bdf1 100644
--- a/keyboards/tokyokeyboard/alix40/rules.mk
+++ b/keyboards/tokyokeyboard/alix40/rules.mk
@@ -1,16 +1,2 @@
 # Processor frequency
 F_CPU = 8000000
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-BLUETOOTH_ENABLE = yes
diff --git a/keyboards/tominabox1/littlefoot_lx/rev1/info.json b/keyboards/tominabox1/littlefoot_lx/rev1/info.json
deleted file mode 100644
index be22362de21..00000000000
--- a/keyboards/tominabox1/littlefoot_lx/rev1/info.json
+++ /dev/null
@@ -1,121 +0,0 @@
-{
-    "keyboard_name": "Littlefoot LX",
-    "manufacturer": "tominabox1",
-    "url": "",
-    "maintainer": "tominabox1",
-    "usb": {
-        "vid": "0x7431",
-        "pid": "0x6C78",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["D7", "D6", "D4", "E2", "F5", "F6", "F7", "B6", "B5", "B4"],
-        "rows": ["D5", "F4", "D3", "F1", "F0"]
-    },
-    "diode_direction": "COL2ROW",
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 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": [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": [1, 4], "x": 4, "y": 1},
-                {"matrix": [1, 5], "x": 5, "y": 1},
-                {"matrix": [1, 6], "x": 6, "y": 1},
-                {"matrix": [1, 7], "x": 7, "y": 1},
-                {"matrix": [1, 8], "x": 8, "y": 1},
-                {"matrix": [1, 9], "x": 9, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2},
-                {"matrix": [2, 1], "x": 1, "y": 2},
-                {"matrix": [2, 2], "x": 2, "y": 2},
-                {"matrix": [2, 3], "x": 3, "y": 2},
-                {"matrix": [2, 4], "x": 4, "y": 2},
-                {"matrix": [2, 5], "x": 5, "y": 2},
-                {"matrix": [2, 6], "x": 6, "y": 2},
-                {"matrix": [2, 7], "x": 7, "y": 2},
-                {"matrix": [2, 8], "x": 8, "y": 2},
-                {"matrix": [2, 9], "x": 9, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3},
-                {"matrix": [3, 1], "x": 1, "y": 3},
-                {"matrix": [3, 2], "x": 2, "y": 3},
-                {"matrix": [3, 3], "x": 3, "y": 3},
-                {"matrix": [3, 4], "x": 4, "y": 3},
-                {"matrix": [3, 5], "x": 5, "y": 3},
-                {"matrix": [3, 6], "x": 6, "y": 3},
-                {"matrix": [3, 7], "x": 7, "y": 3},
-                {"matrix": [3, 8], "x": 8, "y": 3},
-                {"matrix": [3, 9], "x": 9, "y": 3},
-
-                {"matrix": [4, 5], "x": 1.5, "y": 4, "w": 7}
-            ]
-        },
-        "LAYOUT_split": {
-            "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": [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": [1, 4], "x": 4, "y": 1},
-                {"matrix": [1, 5], "x": 5, "y": 1},
-                {"matrix": [1, 6], "x": 6, "y": 1},
-                {"matrix": [1, 7], "x": 7, "y": 1},
-                {"matrix": [1, 8], "x": 8, "y": 1},
-                {"matrix": [1, 9], "x": 9, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2},
-                {"matrix": [2, 1], "x": 1, "y": 2},
-                {"matrix": [2, 2], "x": 2, "y": 2},
-                {"matrix": [2, 3], "x": 3, "y": 2},
-                {"matrix": [2, 4], "x": 4, "y": 2},
-                {"matrix": [2, 5], "x": 5, "y": 2},
-                {"matrix": [2, 6], "x": 6, "y": 2},
-                {"matrix": [2, 7], "x": 7, "y": 2},
-                {"matrix": [2, 8], "x": 8, "y": 2},
-                {"matrix": [2, 9], "x": 9, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3},
-                {"matrix": [3, 1], "x": 1, "y": 3},
-                {"matrix": [3, 2], "x": 2, "y": 3},
-                {"matrix": [3, 3], "x": 3, "y": 3},
-                {"matrix": [3, 4], "x": 4, "y": 3},
-                {"matrix": [3, 5], "x": 5, "y": 3},
-                {"matrix": [3, 6], "x": 6, "y": 3},
-                {"matrix": [3, 7], "x": 7, "y": 3},
-                {"matrix": [3, 8], "x": 8, "y": 3},
-                {"matrix": [3, 9], "x": 9, "y": 3},
-
-                {"matrix": [4, 2], "x": 1.5, "y": 4, "w": 1.5},
-                {"matrix": [4, 4], "x": 3, "y": 4, "w": 2},
-                {"matrix": [4, 6], "x": 5, "y": 4, "w": 2},
-                {"matrix": [4, 7], "x": 7, "y": 4, "w": 1.5}
-            ]
-        }
-    }
-}
diff --git a/keyboards/tominabox1/littlefoot_lx/rev1/keyboard.json b/keyboards/tominabox1/littlefoot_lx/rev1/keyboard.json
new file mode 100644
index 00000000000..b021ba9c8d4
--- /dev/null
+++ b/keyboards/tominabox1/littlefoot_lx/rev1/keyboard.json
@@ -0,0 +1,127 @@
+{
+    "keyboard_name": "Littlefoot LX",
+    "manufacturer": "tominabox1",
+    "url": "",
+    "maintainer": "tominabox1",
+    "usb": {
+        "vid": "0x7431",
+        "pid": "0x6C78",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "extrakey": false,
+        "mousekey": false,
+        "nkro": true
+    },
+    "matrix_pins": {
+        "cols": ["D7", "D6", "D4", "E2", "F5", "F6", "F7", "B6", "B5", "B4"],
+        "rows": ["D5", "F4", "D3", "F1", "F0"]
+    },
+    "diode_direction": "COL2ROW",
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 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": [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": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [2, 6], "x": 6, "y": 2},
+                {"matrix": [2, 7], "x": 7, "y": 2},
+                {"matrix": [2, 8], "x": 8, "y": 2},
+                {"matrix": [2, 9], "x": 9, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
+                {"matrix": [3, 6], "x": 6, "y": 3},
+                {"matrix": [3, 7], "x": 7, "y": 3},
+                {"matrix": [3, 8], "x": 8, "y": 3},
+                {"matrix": [3, 9], "x": 9, "y": 3},
+
+                {"matrix": [4, 5], "x": 1.5, "y": 4, "w": 7}
+            ]
+        },
+        "LAYOUT_split": {
+            "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": [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": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [2, 6], "x": 6, "y": 2},
+                {"matrix": [2, 7], "x": 7, "y": 2},
+                {"matrix": [2, 8], "x": 8, "y": 2},
+                {"matrix": [2, 9], "x": 9, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
+                {"matrix": [3, 6], "x": 6, "y": 3},
+                {"matrix": [3, 7], "x": 7, "y": 3},
+                {"matrix": [3, 8], "x": 8, "y": 3},
+                {"matrix": [3, 9], "x": 9, "y": 3},
+
+                {"matrix": [4, 2], "x": 1.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 4], "x": 3, "y": 4, "w": 2},
+                {"matrix": [4, 6], "x": 5, "y": 4, "w": 2},
+                {"matrix": [4, 7], "x": 7, "y": 4, "w": 1.5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/tominabox1/littlefoot_lx/rev1/rules.mk b/keyboards/tominabox1/littlefoot_lx/rev1/rules.mk
deleted file mode 100644
index 964fd155399..00000000000
--- a/keyboards/tominabox1/littlefoot_lx/rev1/rules.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = no        # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
diff --git a/keyboards/tominabox1/littlefoot_lx/rev2/info.json b/keyboards/tominabox1/littlefoot_lx/rev2/info.json
deleted file mode 100644
index 6a48b5076b4..00000000000
--- a/keyboards/tominabox1/littlefoot_lx/rev2/info.json
+++ /dev/null
@@ -1,121 +0,0 @@
-{
-    "keyboard_name": "Littlefoot LX",
-    "manufacturer": "tominabox1",
-    "url": "",
-    "maintainer": "tominabox1",
-    "usb": {
-        "vid": "0x7431",
-        "pid": "0x6C78",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["D7", "D6", "D4", "C7", "F5", "F6", "F7", "B6", "B5", "B4"],
-        "rows": ["D5", "F4", "D3", "F1", "F0"]
-    },
-    "diode_direction": "COL2ROW",
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 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": [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": [1, 4], "x": 4, "y": 1},
-                {"matrix": [1, 5], "x": 5, "y": 1},
-                {"matrix": [1, 6], "x": 6, "y": 1},
-                {"matrix": [1, 7], "x": 7, "y": 1},
-                {"matrix": [1, 8], "x": 8, "y": 1},
-                {"matrix": [1, 9], "x": 9, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2},
-                {"matrix": [2, 1], "x": 1, "y": 2},
-                {"matrix": [2, 2], "x": 2, "y": 2},
-                {"matrix": [2, 3], "x": 3, "y": 2},
-                {"matrix": [2, 4], "x": 4, "y": 2},
-                {"matrix": [2, 5], "x": 5, "y": 2},
-                {"matrix": [2, 6], "x": 6, "y": 2},
-                {"matrix": [2, 7], "x": 7, "y": 2},
-                {"matrix": [2, 8], "x": 8, "y": 2},
-                {"matrix": [2, 9], "x": 9, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3},
-                {"matrix": [3, 1], "x": 1, "y": 3},
-                {"matrix": [3, 2], "x": 2, "y": 3},
-                {"matrix": [3, 3], "x": 3, "y": 3},
-                {"matrix": [3, 4], "x": 4, "y": 3},
-                {"matrix": [3, 5], "x": 5, "y": 3},
-                {"matrix": [3, 6], "x": 6, "y": 3},
-                {"matrix": [3, 7], "x": 7, "y": 3},
-                {"matrix": [3, 8], "x": 8, "y": 3},
-                {"matrix": [3, 9], "x": 9, "y": 3},
-
-                {"matrix": [4, 5], "x": 1.5, "y": 4, "w": 7}
-            ]
-        },
-        "LAYOUT_split": {
-            "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": [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": [1, 4], "x": 4, "y": 1},
-                {"matrix": [1, 5], "x": 5, "y": 1},
-                {"matrix": [1, 6], "x": 6, "y": 1},
-                {"matrix": [1, 7], "x": 7, "y": 1},
-                {"matrix": [1, 8], "x": 8, "y": 1},
-                {"matrix": [1, 9], "x": 9, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2},
-                {"matrix": [2, 1], "x": 1, "y": 2},
-                {"matrix": [2, 2], "x": 2, "y": 2},
-                {"matrix": [2, 3], "x": 3, "y": 2},
-                {"matrix": [2, 4], "x": 4, "y": 2},
-                {"matrix": [2, 5], "x": 5, "y": 2},
-                {"matrix": [2, 6], "x": 6, "y": 2},
-                {"matrix": [2, 7], "x": 7, "y": 2},
-                {"matrix": [2, 8], "x": 8, "y": 2},
-                {"matrix": [2, 9], "x": 9, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3},
-                {"matrix": [3, 1], "x": 1, "y": 3},
-                {"matrix": [3, 2], "x": 2, "y": 3},
-                {"matrix": [3, 3], "x": 3, "y": 3},
-                {"matrix": [3, 4], "x": 4, "y": 3},
-                {"matrix": [3, 5], "x": 5, "y": 3},
-                {"matrix": [3, 6], "x": 6, "y": 3},
-                {"matrix": [3, 7], "x": 7, "y": 3},
-                {"matrix": [3, 8], "x": 8, "y": 3},
-                {"matrix": [3, 9], "x": 9, "y": 3},
-
-                {"matrix": [4, 2], "x": 1.5, "y": 4, "w": 1.5},
-                {"matrix": [4, 4], "x": 3, "y": 4, "w": 2},
-                {"matrix": [4, 6], "x": 5, "y": 4, "w": 2},
-                {"matrix": [4, 7], "x": 7, "y": 4, "w": 1.5}
-            ]
-        }
-    }
-}
diff --git a/keyboards/tominabox1/littlefoot_lx/rev2/keyboard.json b/keyboards/tominabox1/littlefoot_lx/rev2/keyboard.json
new file mode 100644
index 00000000000..fe1cf6e5960
--- /dev/null
+++ b/keyboards/tominabox1/littlefoot_lx/rev2/keyboard.json
@@ -0,0 +1,127 @@
+{
+    "keyboard_name": "Littlefoot LX",
+    "manufacturer": "tominabox1",
+    "url": "",
+    "maintainer": "tominabox1",
+    "usb": {
+        "vid": "0x7431",
+        "pid": "0x6C78",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "extrakey": false,
+        "mousekey": false,
+        "nkro": true
+    },
+    "matrix_pins": {
+        "cols": ["D7", "D6", "D4", "C7", "F5", "F6", "F7", "B6", "B5", "B4"],
+        "rows": ["D5", "F4", "D3", "F1", "F0"]
+    },
+    "diode_direction": "COL2ROW",
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 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": [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": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [2, 6], "x": 6, "y": 2},
+                {"matrix": [2, 7], "x": 7, "y": 2},
+                {"matrix": [2, 8], "x": 8, "y": 2},
+                {"matrix": [2, 9], "x": 9, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
+                {"matrix": [3, 6], "x": 6, "y": 3},
+                {"matrix": [3, 7], "x": 7, "y": 3},
+                {"matrix": [3, 8], "x": 8, "y": 3},
+                {"matrix": [3, 9], "x": 9, "y": 3},
+
+                {"matrix": [4, 5], "x": 1.5, "y": 4, "w": 7}
+            ]
+        },
+        "LAYOUT_split": {
+            "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": [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": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [2, 6], "x": 6, "y": 2},
+                {"matrix": [2, 7], "x": 7, "y": 2},
+                {"matrix": [2, 8], "x": 8, "y": 2},
+                {"matrix": [2, 9], "x": 9, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
+                {"matrix": [3, 6], "x": 6, "y": 3},
+                {"matrix": [3, 7], "x": 7, "y": 3},
+                {"matrix": [3, 8], "x": 8, "y": 3},
+                {"matrix": [3, 9], "x": 9, "y": 3},
+
+                {"matrix": [4, 2], "x": 1.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 4], "x": 3, "y": 4, "w": 2},
+                {"matrix": [4, 6], "x": 5, "y": 4, "w": 2},
+                {"matrix": [4, 7], "x": 7, "y": 4, "w": 1.5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/tominabox1/littlefoot_lx/rev2/rules.mk b/keyboards/tominabox1/littlefoot_lx/rev2/rules.mk
deleted file mode 100644
index 964fd155399..00000000000
--- a/keyboards/tominabox1/littlefoot_lx/rev2/rules.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = no        # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
diff --git a/keyboards/tominabox1/underscore33/rev1/config.h b/keyboards/tominabox1/underscore33/rev1/config.h
deleted file mode 100644
index 333d0a100eb..00000000000
--- a/keyboards/tominabox1/underscore33/rev1/config.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/* Copyright 2020 tominabox1
- *
- * 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
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/tominabox1/underscore33/rev1/info.json b/keyboards/tominabox1/underscore33/rev1/info.json
deleted file mode 100644
index c52c1b13730..00000000000
--- a/keyboards/tominabox1/underscore33/rev1/info.json
+++ /dev/null
@@ -1,102 +0,0 @@
-{
-  "keyboard_name": "underscore33",
-  "manufacturer": "tominabox1",
-  "url": "",
-  "maintainer": "tominabox1",
-  "usb": {
-    "vid": "0x7431",
-    "pid": "0x3301",
-    "device_version": "0.0.1"
-  },
-  "matrix_pins": {
-    "cols": ["B4", "B5", "D5", "F7", "B1", "F4", "B3", "D7", "B0", "B2"],
-    "rows": ["F5", "F6", "C6", "D0"]
-  },
-  "diode_direction": "ROW2COL",
-  "processor": "atmega32u4",
-  "bootloader": "atmel-dfu",
-  "layouts": {
-    "LAYOUT_33_big_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": [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": [1, 4], "x": 4, "y": 1},
-        {"matrix": [1, 5], "x": 5, "y": 1},
-        {"matrix": [1, 6], "x": 6, "y": 1},
-        {"matrix": [1, 7], "x": 7, "y": 1},
-        {"matrix": [1, 8], "x": 8, "y": 1},
-        {"matrix": [1, 9], "x": 9, "y": 1},
-
-        {"matrix": [2, 0], "x": 0, "y": 2},
-        {"matrix": [2, 1], "x": 1, "y": 2},
-        {"matrix": [2, 2], "x": 2, "y": 2},
-        {"matrix": [2, 3], "x": 3, "y": 2},
-        {"matrix": [2, 4], "x": 4, "y": 2},
-        {"matrix": [2, 5], "x": 5, "y": 2},
-        {"matrix": [2, 6], "x": 6, "y": 2},
-        {"matrix": [2, 7], "x": 7, "y": 2},
-        {"matrix": [2, 8], "x": 8, "y": 2},
-        {"matrix": [2, 9], "x": 9, "y": 2},
-
-        {"matrix": [3, 1], "x": 0.65, "y": 3, "w": 1.25},
-        {"matrix": [3, 4], "x": 1.9, "y": 3, "w": 6.25},
-        {"matrix": [3, 8], "x": 8.15, "y": 3, "w": 1.25}
-      ]
-    },
-    "LAYOUT_33_split_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": [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": [1, 4], "x": 4, "y": 1},
-        {"matrix": [1, 5], "x": 5, "y": 1},
-        {"matrix": [1, 6], "x": 6, "y": 1},
-        {"matrix": [1, 7], "x": 7, "y": 1},
-        {"matrix": [1, 8], "x": 8, "y": 1},
-        {"matrix": [1, 9], "x": 9, "y": 1},
-
-        {"matrix": [2, 0], "x": 0, "y": 2},
-        {"matrix": [2, 1], "x": 1, "y": 2},
-        {"matrix": [2, 2], "x": 2, "y": 2},
-        {"matrix": [2, 3], "x": 3, "y": 2},
-        {"matrix": [2, 4], "x": 4, "y": 2},
-        {"matrix": [2, 5], "x": 5, "y": 2},
-        {"matrix": [2, 6], "x": 6, "y": 2},
-        {"matrix": [2, 7], "x": 7, "y": 2},
-        {"matrix": [2, 8], "x": 8, "y": 2},
-        {"matrix": [2, 9], "x": 9, "y": 2},
-
-        {"matrix": [3, 1], "x": 0.65, "y": 3, "w": 1.25},
-        {"matrix": [3, 2], "x": 1.9, "y": 3, "w": 2.25},
-        {"matrix": [3, 4], "x": 4.15, "y": 3, "w": 1.75},
-        {"matrix": [3, 6], "x": 5.9, "y": 3, "w": 2.25},
-        {"matrix": [3, 8], "x": 8.15, "y": 3, "w": 1.25}
-      ]
-    }
-  }
-}
diff --git a/keyboards/tominabox1/underscore33/rev1/keyboard.json b/keyboards/tominabox1/underscore33/rev1/keyboard.json
new file mode 100644
index 00000000000..221ecccb041
--- /dev/null
+++ b/keyboards/tominabox1/underscore33/rev1/keyboard.json
@@ -0,0 +1,114 @@
+{
+  "keyboard_name": "underscore33",
+  "manufacturer": "tominabox1",
+  "url": "",
+  "maintainer": "tominabox1",
+  "usb": {
+    "vid": "0x7431",
+    "pid": "0x3301",
+    "device_version": "0.0.1"
+  },
+  "features": {
+    "bootmagic": true,
+    "extrakey": true,
+    "mousekey": true,
+    "nkro": true
+  },
+  "qmk": {
+    "locking": {
+      "enabled": true,
+      "resync": true
+    }
+  },
+  "matrix_pins": {
+    "cols": ["B4", "B5", "D5", "F7", "B1", "F4", "B3", "D7", "B0", "B2"],
+    "rows": ["F5", "F6", "C6", "D0"]
+  },
+  "diode_direction": "ROW2COL",
+  "processor": "atmega32u4",
+  "bootloader": "atmel-dfu",
+  "layouts": {
+    "LAYOUT_33_big_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": [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": [1, 4], "x": 4, "y": 1},
+        {"matrix": [1, 5], "x": 5, "y": 1},
+        {"matrix": [1, 6], "x": 6, "y": 1},
+        {"matrix": [1, 7], "x": 7, "y": 1},
+        {"matrix": [1, 8], "x": 8, "y": 1},
+        {"matrix": [1, 9], "x": 9, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2},
+        {"matrix": [2, 1], "x": 1, "y": 2},
+        {"matrix": [2, 2], "x": 2, "y": 2},
+        {"matrix": [2, 3], "x": 3, "y": 2},
+        {"matrix": [2, 4], "x": 4, "y": 2},
+        {"matrix": [2, 5], "x": 5, "y": 2},
+        {"matrix": [2, 6], "x": 6, "y": 2},
+        {"matrix": [2, 7], "x": 7, "y": 2},
+        {"matrix": [2, 8], "x": 8, "y": 2},
+        {"matrix": [2, 9], "x": 9, "y": 2},
+
+        {"matrix": [3, 1], "x": 0.65, "y": 3, "w": 1.25},
+        {"matrix": [3, 4], "x": 1.9, "y": 3, "w": 6.25},
+        {"matrix": [3, 8], "x": 8.15, "y": 3, "w": 1.25}
+      ]
+    },
+    "LAYOUT_33_split_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": [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": [1, 4], "x": 4, "y": 1},
+        {"matrix": [1, 5], "x": 5, "y": 1},
+        {"matrix": [1, 6], "x": 6, "y": 1},
+        {"matrix": [1, 7], "x": 7, "y": 1},
+        {"matrix": [1, 8], "x": 8, "y": 1},
+        {"matrix": [1, 9], "x": 9, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2},
+        {"matrix": [2, 1], "x": 1, "y": 2},
+        {"matrix": [2, 2], "x": 2, "y": 2},
+        {"matrix": [2, 3], "x": 3, "y": 2},
+        {"matrix": [2, 4], "x": 4, "y": 2},
+        {"matrix": [2, 5], "x": 5, "y": 2},
+        {"matrix": [2, 6], "x": 6, "y": 2},
+        {"matrix": [2, 7], "x": 7, "y": 2},
+        {"matrix": [2, 8], "x": 8, "y": 2},
+        {"matrix": [2, 9], "x": 9, "y": 2},
+
+        {"matrix": [3, 1], "x": 0.65, "y": 3, "w": 1.25},
+        {"matrix": [3, 2], "x": 1.9, "y": 3, "w": 2.25},
+        {"matrix": [3, 4], "x": 4.15, "y": 3, "w": 1.75},
+        {"matrix": [3, 6], "x": 5.9, "y": 3, "w": 2.25},
+        {"matrix": [3, 8], "x": 8.15, "y": 3, "w": 1.25}
+      ]
+    }
+  }
+}
diff --git a/keyboards/tominabox1/underscore33/rev1/rules.mk b/keyboards/tominabox1/underscore33/rev1/rules.mk
deleted file mode 100644
index 3b6a1809db1..00000000000
--- a/keyboards/tominabox1/underscore33/rev1/rules.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
diff --git a/keyboards/tominabox1/underscore33/rev2/config.h b/keyboards/tominabox1/underscore33/rev2/config.h
deleted file mode 100644
index 333d0a100eb..00000000000
--- a/keyboards/tominabox1/underscore33/rev2/config.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/* Copyright 2020 tominabox1
- *
- * 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
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/tominabox1/underscore33/rev2/info.json b/keyboards/tominabox1/underscore33/rev2/info.json
deleted file mode 100644
index b9c8b87b502..00000000000
--- a/keyboards/tominabox1/underscore33/rev2/info.json
+++ /dev/null
@@ -1,121 +0,0 @@
-{
-  "keyboard_name": "underscore33",
-  "manufacturer": "tominabox1",
-  "url": "",
-  "maintainer": "tominabox1",
-  "usb": {
-    "vid": "0x7431",
-    "pid": "0x3302",
-    "device_version": "0.0.2"
-  },
-  "rgblight": {
-    "led_count": 12,
-    "animations": {
-      "breathing": true,
-      "rainbow_mood": true,
-      "rainbow_swirl": true,
-      "snake": true,
-      "knight": true,
-      "christmas": true,
-      "static_gradient": true,
-      "rgb_test": true,
-      "alternating": true,
-      "twinkle": true
-    }
-  },
-  "ws2812": {
-    "pin": "D6"
-  },
-  "matrix_pins": {
-    "cols": ["C5", "C6", "C7", "B7", "B6", "B5", "B4", "B3", "C2", "D0"],
-    "rows": ["C4", "B0", "B1", "B2"]
-  },
-  "diode_direction": "ROW2COL",
-  "processor": "atmega32u2",
-  "bootloader": "atmel-dfu",
-  "layouts": {
-    "LAYOUT_33_big_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": [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": [1, 4], "x": 4, "y": 1},
-        {"matrix": [1, 5], "x": 5, "y": 1},
-        {"matrix": [1, 6], "x": 6, "y": 1},
-        {"matrix": [1, 7], "x": 7, "y": 1},
-        {"matrix": [1, 8], "x": 8, "y": 1},
-        {"matrix": [1, 9], "x": 9, "y": 1},
-
-        {"matrix": [2, 0], "x": 0, "y": 2},
-        {"matrix": [2, 1], "x": 1, "y": 2},
-        {"matrix": [2, 2], "x": 2, "y": 2},
-        {"matrix": [2, 3], "x": 3, "y": 2},
-        {"matrix": [2, 4], "x": 4, "y": 2},
-        {"matrix": [2, 5], "x": 5, "y": 2},
-        {"matrix": [2, 6], "x": 6, "y": 2},
-        {"matrix": [2, 7], "x": 7, "y": 2},
-        {"matrix": [2, 8], "x": 8, "y": 2},
-        {"matrix": [2, 9], "x": 9, "y": 2},
-
-        {"matrix": [3, 1], "x": 0.65, "y": 3, "w": 1.25},
-        {"matrix": [3, 4], "x": 1.9, "y": 3, "w": 6.25},
-        {"matrix": [3, 8], "x": 8.15, "y": 3, "w": 1.25}
-      ]
-    },
-    "LAYOUT_33_split_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": [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": [1, 4], "x": 4, "y": 1},
-        {"matrix": [1, 5], "x": 5, "y": 1},
-        {"matrix": [1, 6], "x": 6, "y": 1},
-        {"matrix": [1, 7], "x": 7, "y": 1},
-        {"matrix": [1, 8], "x": 8, "y": 1},
-        {"matrix": [1, 9], "x": 9, "y": 1},
-
-        {"matrix": [2, 0], "x": 0, "y": 2},
-        {"matrix": [2, 1], "x": 1, "y": 2},
-        {"matrix": [2, 2], "x": 2, "y": 2},
-        {"matrix": [2, 3], "x": 3, "y": 2},
-        {"matrix": [2, 4], "x": 4, "y": 2},
-        {"matrix": [2, 5], "x": 5, "y": 2},
-        {"matrix": [2, 6], "x": 6, "y": 2},
-        {"matrix": [2, 7], "x": 7, "y": 2},
-        {"matrix": [2, 8], "x": 8, "y": 2},
-        {"matrix": [2, 9], "x": 9, "y": 2},
-
-        {"matrix": [3, 1], "x": 0.65, "y": 3},
-        {"matrix": [3, 2], "x": 1.65, "y": 3, "w": 1.25},
-        {"matrix": [3, 3], "x": 2.9, "y": 3, "w": 2.25},
-        {"matrix": [3, 5], "x": 5.15, "y": 3, "w": 2},
-        {"matrix": [3, 7], "x": 7.15, "y": 3, "w": 1.25},
-        {"matrix": [3, 8], "x": 8.4, "y": 3}
-      ]
-    }
-  }
-}
diff --git a/keyboards/tominabox1/underscore33/rev2/keyboard.json b/keyboards/tominabox1/underscore33/rev2/keyboard.json
new file mode 100644
index 00000000000..4375116963f
--- /dev/null
+++ b/keyboards/tominabox1/underscore33/rev2/keyboard.json
@@ -0,0 +1,133 @@
+{
+  "keyboard_name": "underscore33",
+  "manufacturer": "tominabox1",
+  "url": "",
+  "maintainer": "tominabox1",
+  "usb": {
+    "vid": "0x7431",
+    "pid": "0x3302",
+    "device_version": "0.0.2"
+  },
+  "features": {
+    "bootmagic": true,
+    "extrakey": true,
+    "mousekey": false,
+    "nkro": true
+  },
+  "qmk": {
+    "locking": {
+      "enabled": true,
+      "resync": true
+    }
+  },
+  "rgblight": {
+    "led_count": 12,
+    "animations": {
+      "breathing": true,
+      "rainbow_mood": true,
+      "rainbow_swirl": true,
+      "snake": true,
+      "knight": true,
+      "christmas": true,
+      "static_gradient": true,
+      "rgb_test": true,
+      "alternating": true,
+      "twinkle": true
+    }
+  },
+  "ws2812": {
+    "pin": "D6"
+  },
+  "matrix_pins": {
+    "cols": ["C5", "C6", "C7", "B7", "B6", "B5", "B4", "B3", "C2", "D0"],
+    "rows": ["C4", "B0", "B1", "B2"]
+  },
+  "diode_direction": "ROW2COL",
+  "processor": "atmega32u2",
+  "bootloader": "atmel-dfu",
+  "layouts": {
+    "LAYOUT_33_big_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": [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": [1, 4], "x": 4, "y": 1},
+        {"matrix": [1, 5], "x": 5, "y": 1},
+        {"matrix": [1, 6], "x": 6, "y": 1},
+        {"matrix": [1, 7], "x": 7, "y": 1},
+        {"matrix": [1, 8], "x": 8, "y": 1},
+        {"matrix": [1, 9], "x": 9, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2},
+        {"matrix": [2, 1], "x": 1, "y": 2},
+        {"matrix": [2, 2], "x": 2, "y": 2},
+        {"matrix": [2, 3], "x": 3, "y": 2},
+        {"matrix": [2, 4], "x": 4, "y": 2},
+        {"matrix": [2, 5], "x": 5, "y": 2},
+        {"matrix": [2, 6], "x": 6, "y": 2},
+        {"matrix": [2, 7], "x": 7, "y": 2},
+        {"matrix": [2, 8], "x": 8, "y": 2},
+        {"matrix": [2, 9], "x": 9, "y": 2},
+
+        {"matrix": [3, 1], "x": 0.65, "y": 3, "w": 1.25},
+        {"matrix": [3, 4], "x": 1.9, "y": 3, "w": 6.25},
+        {"matrix": [3, 8], "x": 8.15, "y": 3, "w": 1.25}
+      ]
+    },
+    "LAYOUT_33_split_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": [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": [1, 4], "x": 4, "y": 1},
+        {"matrix": [1, 5], "x": 5, "y": 1},
+        {"matrix": [1, 6], "x": 6, "y": 1},
+        {"matrix": [1, 7], "x": 7, "y": 1},
+        {"matrix": [1, 8], "x": 8, "y": 1},
+        {"matrix": [1, 9], "x": 9, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2},
+        {"matrix": [2, 1], "x": 1, "y": 2},
+        {"matrix": [2, 2], "x": 2, "y": 2},
+        {"matrix": [2, 3], "x": 3, "y": 2},
+        {"matrix": [2, 4], "x": 4, "y": 2},
+        {"matrix": [2, 5], "x": 5, "y": 2},
+        {"matrix": [2, 6], "x": 6, "y": 2},
+        {"matrix": [2, 7], "x": 7, "y": 2},
+        {"matrix": [2, 8], "x": 8, "y": 2},
+        {"matrix": [2, 9], "x": 9, "y": 2},
+
+        {"matrix": [3, 1], "x": 0.65, "y": 3},
+        {"matrix": [3, 2], "x": 1.65, "y": 3, "w": 1.25},
+        {"matrix": [3, 3], "x": 2.9, "y": 3, "w": 2.25},
+        {"matrix": [3, 5], "x": 5.15, "y": 3, "w": 2},
+        {"matrix": [3, 7], "x": 7.15, "y": 3, "w": 1.25},
+        {"matrix": [3, 8], "x": 8.4, "y": 3}
+      ]
+    }
+  }
+}
diff --git a/keyboards/tominabox1/underscore33/rev2/rules.mk b/keyboards/tominabox1/underscore33/rev2/rules.mk
deleted file mode 100644
index dd8f1a5ae7d..00000000000
--- a/keyboards/tominabox1/underscore33/rev2/rules.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
diff --git a/keyboards/torn/info.json b/keyboards/torn/info.json
deleted file mode 100644
index c1b83188f06..00000000000
--- a/keyboards/torn/info.json
+++ /dev/null
@@ -1,76 +0,0 @@
-{
-  "keyboard_name": "Torn",
-  "manufacturer": "richard.titmuss",
-  "url": "https://github.com/rtitmuss/torn",
-  "maintainer": "rtitmuss",
-  "usb": {
-    "vid": "0x7274",
-    "pid": "0x0001",
-    "device_version": "0.0.1",
-    "max_power": 100
-  },
-  "encoder": {
-    "rotary": [
-      {"pin_a": "B2", "pin_b": "B1"}
-    ]
-  },
-  "processor": "atmega328p",
-  "bootloader": "usbasploader",
-  "layouts": {
-    "LAYOUT_split_3x6_4": {
-      "layout": [
-        {"matrix": [0, 0], "x": 0, "y": 0.375},
-        {"matrix": [0, 1], "x": 1, "y": 0.375},
-        {"matrix": [0, 2], "x": 2, "y": 0.125},
-        {"matrix": [0, 3], "x": 3, "y": 0},
-        {"matrix": [0, 4], "x": 4, "y": 0.125},
-        {"matrix": [0, 5], "x": 5, "y": 0.25},
-
-        {"matrix": [0, 6], "x": 9, "y": 0.25},
-        {"matrix": [0, 7], "x": 10, "y": 0.125},
-        {"matrix": [0, 8], "x": 11, "y": 0},
-        {"matrix": [0, 9], "x": 12, "y": 0.125},
-        {"matrix": [0, 10], "x": 13, "y": 0.375},
-        {"matrix": [0, 11], "x": 14, "y": 0.375},
-
-        {"matrix": [1, 0], "x": 0, "y": 1.375},
-        {"matrix": [1, 1], "x": 1, "y": 1.375},
-        {"matrix": [1, 2], "x": 2, "y": 1.125},
-        {"matrix": [1, 3], "x": 3, "y": 1},
-        {"matrix": [1, 4], "x": 4, "y": 1.125},
-        {"matrix": [1, 5], "x": 5, "y": 1.25},
-
-        {"matrix": [1, 6], "x": 9, "y": 1.25},
-        {"matrix": [1, 7], "x": 10, "y": 1.125},
-        {"matrix": [1, 8], "x": 11, "y": 1},
-        {"matrix": [1, 9], "x": 12, "y": 1.125},
-        {"matrix": [1, 10], "x": 13, "y": 1.375},
-        {"matrix": [1, 11], "x": 14, "y": 1.375},
-
-        {"matrix": [2, 0], "x": 0, "y": 2.375},
-        {"matrix": [2, 1], "x": 1, "y": 2.375},
-        {"matrix": [2, 2], "x": 2, "y": 2.125},
-        {"matrix": [2, 3], "x": 3, "y": 2},
-        {"matrix": [2, 4], "x": 4, "y": 2.125},
-        {"matrix": [2, 5], "x": 5, "y": 2.25},
-
-        {"matrix": [2, 6], "x": 9, "y": 2.25},
-        {"matrix": [2, 7], "x": 10, "y": 2.125},
-        {"matrix": [2, 8], "x": 11, "y": 2},
-        {"matrix": [2, 9], "x": 12, "y": 2.125},
-        {"matrix": [2, 10], "x": 13, "y": 2.375},
-        {"matrix": [2, 11], "x": 14, "y": 2.375},
-
-        {"matrix": [3, 2], "x": 3, "y": 3.1},
-        {"matrix": [3, 3], "x": 4, "y": 3.25},
-        {"matrix": [3, 4], "x": 5, "y": 3.4},
-        {"matrix": [3, 5], "x": 6, "y": 3.55},
-
-        {"matrix": [3, 6], "x": 8, "y": 3.55},
-        {"matrix": [3, 7], "x": 9, "y": 3.4},
-        {"matrix": [3, 8], "x": 10, "y": 3.25},
-        {"matrix": [3, 9], "x": 11, "y": 3.1}
-      ]
-    }
-  }
-}
diff --git a/keyboards/torn/keyboard.json b/keyboards/torn/keyboard.json
new file mode 100644
index 00000000000..162e7d08c0e
--- /dev/null
+++ b/keyboards/torn/keyboard.json
@@ -0,0 +1,84 @@
+{
+  "keyboard_name": "Torn",
+  "manufacturer": "richard.titmuss",
+  "url": "https://github.com/rtitmuss/torn",
+  "maintainer": "rtitmuss",
+  "usb": {
+    "vid": "0x7274",
+    "pid": "0x0001",
+    "device_version": "0.0.1",
+    "max_power": 100
+  },
+  "features": {
+    "bootmagic": false,
+    "encoder": true,
+    "extrakey": false,
+    "mousekey": false,
+    "oled": true,
+    "wpm": true
+  },
+  "encoder": {
+    "rotary": [
+      {"pin_a": "B2", "pin_b": "B1"}
+    ]
+  },
+  "processor": "atmega328p",
+  "bootloader": "usbasploader",
+  "layouts": {
+    "LAYOUT_split_3x6_4": {
+      "layout": [
+        {"matrix": [0, 0], "x": 0, "y": 0.375},
+        {"matrix": [0, 1], "x": 1, "y": 0.375},
+        {"matrix": [0, 2], "x": 2, "y": 0.125},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0.125},
+        {"matrix": [0, 5], "x": 5, "y": 0.25},
+
+        {"matrix": [0, 6], "x": 9, "y": 0.25},
+        {"matrix": [0, 7], "x": 10, "y": 0.125},
+        {"matrix": [0, 8], "x": 11, "y": 0},
+        {"matrix": [0, 9], "x": 12, "y": 0.125},
+        {"matrix": [0, 10], "x": 13, "y": 0.375},
+        {"matrix": [0, 11], "x": 14, "y": 0.375},
+
+        {"matrix": [1, 0], "x": 0, "y": 1.375},
+        {"matrix": [1, 1], "x": 1, "y": 1.375},
+        {"matrix": [1, 2], "x": 2, "y": 1.125},
+        {"matrix": [1, 3], "x": 3, "y": 1},
+        {"matrix": [1, 4], "x": 4, "y": 1.125},
+        {"matrix": [1, 5], "x": 5, "y": 1.25},
+
+        {"matrix": [1, 6], "x": 9, "y": 1.25},
+        {"matrix": [1, 7], "x": 10, "y": 1.125},
+        {"matrix": [1, 8], "x": 11, "y": 1},
+        {"matrix": [1, 9], "x": 12, "y": 1.125},
+        {"matrix": [1, 10], "x": 13, "y": 1.375},
+        {"matrix": [1, 11], "x": 14, "y": 1.375},
+
+        {"matrix": [2, 0], "x": 0, "y": 2.375},
+        {"matrix": [2, 1], "x": 1, "y": 2.375},
+        {"matrix": [2, 2], "x": 2, "y": 2.125},
+        {"matrix": [2, 3], "x": 3, "y": 2},
+        {"matrix": [2, 4], "x": 4, "y": 2.125},
+        {"matrix": [2, 5], "x": 5, "y": 2.25},
+
+        {"matrix": [2, 6], "x": 9, "y": 2.25},
+        {"matrix": [2, 7], "x": 10, "y": 2.125},
+        {"matrix": [2, 8], "x": 11, "y": 2},
+        {"matrix": [2, 9], "x": 12, "y": 2.125},
+        {"matrix": [2, 10], "x": 13, "y": 2.375},
+        {"matrix": [2, 11], "x": 14, "y": 2.375},
+
+        {"matrix": [3, 2], "x": 3, "y": 3.1},
+        {"matrix": [3, 3], "x": 4, "y": 3.25},
+        {"matrix": [3, 4], "x": 5, "y": 3.4},
+        {"matrix": [3, 5], "x": 6, "y": 3.55},
+
+        {"matrix": [3, 6], "x": 8, "y": 3.55},
+        {"matrix": [3, 7], "x": 9, "y": 3.4},
+        {"matrix": [3, 8], "x": 10, "y": 3.25},
+        {"matrix": [3, 9], "x": 11, "y": 3.1}
+      ]
+    }
+  }
+}
diff --git a/keyboards/torn/rules.mk b/keyboards/torn/rules.mk
index f855a651a55..213b5db8ab8 100644
--- a/keyboards/torn/rules.mk
+++ b/keyboards/torn/rules.mk
@@ -1,16 +1,3 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = no        # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-ENCODER_ENABLE = yes        # Enable rotary encoder
-OLED_ENABLE = yes
-WPM_ENABLE = yes
 CUSTOM_MATRIX = lite
 
 SRC += matrix.c \
diff --git a/keyboards/touchpad/config.h b/keyboards/touchpad/config.h
index d499fb795c3..f6f58cc5a12 100644
--- a/keyboards/touchpad/config.h
+++ b/keyboards/touchpad/config.h
@@ -17,28 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
 /* key matrix size */
 #define MATRIX_ROWS 6
 #define MATRIX_COLS 6
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/touchpad/info.json b/keyboards/touchpad/info.json
deleted file mode 100644
index 7b3cc0950d9..00000000000
--- a/keyboards/touchpad/info.json
+++ /dev/null
@@ -1,60 +0,0 @@
-{
-    "keyboard_name": "TouchPad",
-    "manufacturer": "JacoBurge",
-    "url": "",
-    "maintainer": "qmk",
-    "usb": {
-        "vid": "0x16D0",
-        "pid": "0x0DB8",
-        "device_version": "0.0.1"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
-    "layouts": {
-        "LAYOUT_ortho_6x6": {
-            "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": [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": [1, 4], "x": 4, "y": 1},
-                {"matrix": [1, 5], "x": 5, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2},
-                {"matrix": [2, 1], "x": 1, "y": 2},
-                {"matrix": [2, 2], "x": 2, "y": 2},
-                {"matrix": [2, 3], "x": 3, "y": 2},
-                {"matrix": [2, 4], "x": 4, "y": 2},
-                {"matrix": [2, 5], "x": 5, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3},
-                {"matrix": [3, 1], "x": 1, "y": 3},
-                {"matrix": [3, 2], "x": 2, "y": 3},
-                {"matrix": [3, 3], "x": 3, "y": 3},
-                {"matrix": [3, 4], "x": 4, "y": 3},
-                {"matrix": [3, 5], "x": 5, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4},
-                {"matrix": [4, 1], "x": 1, "y": 4},
-                {"matrix": [4, 2], "x": 2, "y": 4},
-                {"matrix": [4, 3], "x": 3, "y": 4},
-                {"matrix": [4, 4], "x": 4, "y": 4},
-                {"matrix": [4, 5], "x": 5, "y": 4},
-
-                {"matrix": [5, 0], "x": 0, "y": 5},
-                {"matrix": [5, 1], "x": 1, "y": 5},
-                {"matrix": [5, 2], "x": 2, "y": 5},
-                {"matrix": [5, 3], "x": 3, "y": 5},
-                {"matrix": [5, 4], "x": 4, "y": 5},
-                {"matrix": [5, 5], "x": 5, "y": 5}
-            ]
-        }
-    }
-}
diff --git a/keyboards/touchpad/keyboard.json b/keyboards/touchpad/keyboard.json
new file mode 100644
index 00000000000..5429b5844db
--- /dev/null
+++ b/keyboards/touchpad/keyboard.json
@@ -0,0 +1,73 @@
+{
+    "keyboard_name": "TouchPad",
+    "manufacturer": "JacoBurge",
+    "url": "",
+    "maintainer": "qmk",
+    "usb": {
+        "vid": "0x16D0",
+        "pid": "0x0DB8",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": false,
+        "console": true,
+        "extrakey": true,
+        "mousekey": false,
+        "nkro": true
+    },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
+    "layouts": {
+        "LAYOUT_ortho_6x6": {
+            "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": [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": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+                {"matrix": [4, 2], "x": 2, "y": 4},
+                {"matrix": [4, 3], "x": 3, "y": 4},
+                {"matrix": [4, 4], "x": 4, "y": 4},
+                {"matrix": [4, 5], "x": 5, "y": 4},
+
+                {"matrix": [5, 0], "x": 0, "y": 5},
+                {"matrix": [5, 1], "x": 1, "y": 5},
+                {"matrix": [5, 2], "x": 2, "y": 5},
+                {"matrix": [5, 3], "x": 3, "y": 5},
+                {"matrix": [5, 4], "x": 4, "y": 5},
+                {"matrix": [5, 5], "x": 5, "y": 5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/touchpad/rules.mk b/keyboards/touchpad/rules.mk
index b9fb83c48c7..42be966784a 100644
--- a/keyboards/touchpad/rules.mk
+++ b/keyboards/touchpad/rules.mk
@@ -1,15 +1,3 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = yes         # Console for debug
-COMMAND_ENABLE = no        # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no      # Enable keyboard backlight functionality
-AUDIO_ENABLE = no           # Audio output
-RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight.
 CUSTOM_MATRIX = yes
 
 SRC += matrix.c
diff --git a/keyboards/tweetydabird/lotus58/nanoboot/info.json b/keyboards/tweetydabird/lotus58/nanoboot/keyboard.json
similarity index 100%
rename from keyboards/tweetydabird/lotus58/nanoboot/info.json
rename to keyboards/tweetydabird/lotus58/nanoboot/keyboard.json
diff --git a/keyboards/tweetydabird/lotus58/rp2040_ce/info.json b/keyboards/tweetydabird/lotus58/rp2040_ce/keyboard.json
similarity index 100%
rename from keyboards/tweetydabird/lotus58/rp2040_ce/info.json
rename to keyboards/tweetydabird/lotus58/rp2040_ce/keyboard.json
diff --git a/keyboards/tzarc/djinn/info.json b/keyboards/tzarc/djinn/info.json
index fddee1c21fd..be0710ebef4 100644
--- a/keyboards/tzarc/djinn/info.json
+++ b/keyboards/tzarc/djinn/info.json
@@ -31,6 +31,9 @@
     "rows": ["B13", "B14", "B15", "C6", "C7", "C8"],
     "cols": ["C0", "C1", "C2", "C3", "A0", "A1", "A2"]
   },
+  "audio": {
+    "driver": "pwm_software"
+  },
   "backlight": {
     "pin": "A7",
     "levels": 4
diff --git a/keyboards/tzarc/djinn/rules.mk b/keyboards/tzarc/djinn/rules.mk
index 5a4589a86fe..78912d16d05 100644
--- a/keyboards/tzarc/djinn/rules.mk
+++ b/keyboards/tzarc/djinn/rules.mk
@@ -4,8 +4,6 @@ SERIAL_DRIVER = usart
 
 CIE1931_CURVE = yes
 
-AUDIO_DRIVER = pwm_software
-
 QUANTUM_PAINTER_DRIVERS = ili9341_spi
 
 SRC += \
diff --git a/keyboards/ungodly/launch_pad/info.json b/keyboards/ungodly/launch_pad/info.json
deleted file mode 100644
index d9d0ea30edd..00000000000
--- a/keyboards/ungodly/launch_pad/info.json
+++ /dev/null
@@ -1,71 +0,0 @@
-{
-  "keyboard_name": "Launch Pad",
-  "manufacturer": "Ungodly Design",
-  "url": "https://ungodly.design/products/launch-pad",
-  "maintainer": "Ungodly Design",
-  "usb": {
-    "vid": "0x5544",
-    "pid": "0x4C50",
-    "device_version": "99.9.9"
-  },
-  "rgb_matrix": {
-    "animations": {
-      "gradient_left_right": true,
-      "cycle_pinwheel": true
-    },
-    "default": {
-      "animation": "cycle_pinwheel"
-    },
-    "driver": "ws2812",
-    "max_brightness": 150,
-    "sat_steps": 8,
-    "val_steps": 8,
-    "speed_steps": 10,
-    "sleep": true
-  },
-  "matrix_pins": {
-    "cols": ["B0", "B1", "B2", "B3"],
-    "rows": ["D4", "D6", "D7", "B4", "B5"]
-  },
-  "ws2812": {
-    "pin": "F7"
-  },
-  "diode_direction": "COL2ROW",
-  "encoder": {
-    "rotary": [
-      {"pin_a": "C6", "pin_b": "B6", "resolution": 2}
-    ]
-  },
-  "processor": "atmega32u4",
-  "bootloader": "atmel-dfu",
-  "layouts": {
-    "LAYOUT_ortho_5x4": {
-        "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": [2, 3], "x": 3, "y": 2},
-
-            {"matrix": [3, 0], "x": 0, "y": 3},
-            {"matrix": [3, 1], "x": 1, "y": 3},
-            {"matrix": [3, 2], "x": 2, "y": 3},
-            {"matrix": [3, 3], "x": 3, "y": 3},
-
-            {"matrix": [4, 0], "x": 0, "y": 4},
-            {"matrix": [4, 1], "x": 1, "y": 4},
-            {"matrix": [4, 2], "x": 2, "y": 4},
-            {"matrix": [4, 3], "x": 3, "y": 4}
-        ]
-    }
-  }
-}
diff --git a/keyboards/ungodly/launch_pad/keyboard.json b/keyboards/ungodly/launch_pad/keyboard.json
new file mode 100644
index 00000000000..50b6c2bcbf6
--- /dev/null
+++ b/keyboards/ungodly/launch_pad/keyboard.json
@@ -0,0 +1,87 @@
+{
+  "keyboard_name": "Launch Pad",
+  "manufacturer": "Ungodly Design",
+  "url": "https://ungodly.design/products/launch-pad",
+  "maintainer": "Ungodly Design",
+  "usb": {
+    "vid": "0x5544",
+    "pid": "0x4C50",
+    "device_version": "99.9.9"
+  },
+  "build": {
+    "lto": true
+  },
+  "features": {
+    "bootmagic": true,
+    "encoder": true,
+    "extrakey": true,
+    "midi": true,
+    "mousekey": false,
+    "nkro": true,
+    "oled": true,
+    "rgb_matrix": true,
+    "magic": false,
+    "grave_esc": false,
+    "space_cadet": false
+  },
+  "rgb_matrix": {
+    "animations": {
+      "gradient_left_right": true,
+      "cycle_pinwheel": true
+    },
+    "default": {
+      "animation": "cycle_pinwheel"
+    },
+    "driver": "ws2812",
+    "max_brightness": 150,
+    "sat_steps": 8,
+    "val_steps": 8,
+    "speed_steps": 10,
+    "sleep": true
+  },
+  "matrix_pins": {
+    "cols": ["B0", "B1", "B2", "B3"],
+    "rows": ["D4", "D6", "D7", "B4", "B5"]
+  },
+  "ws2812": {
+    "pin": "F7"
+  },
+  "diode_direction": "COL2ROW",
+  "encoder": {
+    "rotary": [
+      {"pin_a": "C6", "pin_b": "B6", "resolution": 2}
+    ]
+  },
+  "processor": "atmega32u4",
+  "bootloader": "atmel-dfu",
+  "layouts": {
+    "LAYOUT_ortho_5x4": {
+        "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": [2, 3], "x": 3, "y": 2},
+
+            {"matrix": [3, 0], "x": 0, "y": 3},
+            {"matrix": [3, 1], "x": 1, "y": 3},
+            {"matrix": [3, 2], "x": 2, "y": 3},
+            {"matrix": [3, 3], "x": 3, "y": 3},
+
+            {"matrix": [4, 0], "x": 0, "y": 4},
+            {"matrix": [4, 1], "x": 1, "y": 4},
+            {"matrix": [4, 2], "x": 2, "y": 4},
+            {"matrix": [4, 3], "x": 3, "y": 4}
+        ]
+    }
+  }
+}
diff --git a/keyboards/ungodly/launch_pad/rules.mk b/keyboards/ungodly/launch_pad/rules.mk
index 31fabc928ca..cc588202788 100644
--- a/keyboards/ungodly/launch_pad/rules.mk
+++ b/keyboards/ungodly/launch_pad/rules.mk
@@ -1,22 +1 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-MIDI_ENABLE = yes
-OLED_ENABLE = yes
-ENCODER_ENABLE = yes
-RGB_MATRIX_ENABLE = yes
-SPACE_CADET_ENABLE = no
-MAGIC_ENABLE = no
-GRAVE_ESC_ENABLE = no
-LTO_ENABLE = yes
-
 ANALOG_DRIVER_REQUIRED = yes
diff --git a/keyboards/unicomp/classic_ultracl_post_2013/info.json b/keyboards/unicomp/classic_ultracl_post_2013/info.json
index f92299e9fa4..98138b87dd7 100644
--- a/keyboards/unicomp/classic_ultracl_post_2013/info.json
+++ b/keyboards/unicomp/classic_ultracl_post_2013/info.json
@@ -5,7 +5,10 @@
     "usb": {
         "vid": "0x16C0",
         "pid": "0x27DB",
-        "device_version": "0.0.1"
+        "device_version": "0.0.1",
+        "shared_endpoint": {
+            "keyboard": true
+        }
     },
     "layouts": {
         "LAYOUT_all": {
diff --git a/keyboards/unicomp/classic_ultracl_post_2013/overnumpad_1xb/info.json b/keyboards/unicomp/classic_ultracl_post_2013/overnumpad_1xb/info.json
deleted file mode 100644
index 13615db22d4..00000000000
--- a/keyboards/unicomp/classic_ultracl_post_2013/overnumpad_1xb/info.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-    "keyboard_name": "Unicomp Classic / Ultra Classic / New M (post-2013)",
-    "manufacturer": "Unicomp/Purdea Andrei",
-    "maintainer": "purdeaandrei",
-    "url": "https://github.com/purdeaandrei/overnumpad_controller_1xb",
-    "indicators": {
-        "caps_lock": "C11",
-        "num_lock": "C12",
-        "scroll_lock": "C10"
-    },
-    "processor": "STM32F446",
-    "bootloader": "stm32-dfu",
-    "diode_direction": "ROW2COL",
-    "matrix_pins": {
-        // The controller to membrane interface has pads left-to-right, as seen on the keyboard, matching
-        // the order listed below: all columns followed by all rows, (also followed by unused gpio "A10"):
-        "cols": ["C3", "C2", "C1", "C0", "A3", "A4", "A5", "A6", "A7", "C4", "C5", "B0", "B1", "B10", "B12", "B13"],
-        "rows": ["B14", "B15", "C6", "C7", "C8", "C9", "A8", "A9"]
-    }
-}
diff --git a/keyboards/unicomp/classic_ultracl_post_2013/overnumpad_1xb/keyboard.json b/keyboards/unicomp/classic_ultracl_post_2013/overnumpad_1xb/keyboard.json
new file mode 100644
index 00000000000..cdc22909c0b
--- /dev/null
+++ b/keyboards/unicomp/classic_ultracl_post_2013/overnumpad_1xb/keyboard.json
@@ -0,0 +1,30 @@
+{
+    "keyboard_name": "Unicomp Classic / Ultra Classic / New M (post-2013)",
+    "manufacturer": "Unicomp/Purdea Andrei",
+    "maintainer": "purdeaandrei",
+    "url": "https://github.com/purdeaandrei/overnumpad_controller_1xb",
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "haptic": true,
+        "mousekey": true,
+        "nkro": false
+    },
+    "indicators": {
+        "caps_lock": "C11",
+        "num_lock": "C12",
+        "scroll_lock": "C10"
+    },
+    "haptic": {
+        "driver": "solenoid"
+    },
+    "processor": "STM32F446",
+    "bootloader": "stm32-dfu",
+    "diode_direction": "ROW2COL",
+    "matrix_pins": {
+        // The controller to membrane interface has pads left-to-right, as seen on the keyboard, matching
+        // the order listed below: all columns followed by all rows, (also followed by unused gpio "A10"):
+        "cols": ["C3", "C2", "C1", "C0", "A3", "A4", "A5", "A6", "A7", "C4", "C5", "B0", "B1", "B10", "B12", "B13"],
+        "rows": ["B14", "B15", "C6", "C7", "C8", "C9", "A8", "A9"]
+    }
+}
diff --git a/keyboards/unicomp/classic_ultracl_post_2013/overnumpad_1xb/rules.mk b/keyboards/unicomp/classic_ultracl_post_2013/overnumpad_1xb/rules.mk
deleted file mode 100644
index 9131708828a..00000000000
--- a/keyboards/unicomp/classic_ultracl_post_2013/overnumpad_1xb/rules.mk
+++ /dev/null
@@ -1,17 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-ENCODER_ENABLE = no         # Enable rotary encoder support
-AUDIO_ENABLE = no           # Audio output
-KEYBOARD_SHARED_EP = yes    # Free up some extra endpoints - needed if console+mouse+extra
-
-HAPTIC_ENABLE = yes
-HAPTIC_DRIVER = solenoid
diff --git a/keyboards/unicomp/classic_ultracl_pre_2013/info.json b/keyboards/unicomp/classic_ultracl_pre_2013/info.json
index a8dcd9418fb..3072222ea6e 100644
--- a/keyboards/unicomp/classic_ultracl_pre_2013/info.json
+++ b/keyboards/unicomp/classic_ultracl_pre_2013/info.json
@@ -5,7 +5,10 @@
     "usb": {
         "vid": "0x16C0",
         "pid": "0x27DB",
-        "device_version": "0.0.1"
+        "device_version": "0.0.1",
+        "shared_endpoint": {
+            "keyboard": true
+        }
     },
     "community_layouts": ["fullsize_ansi", "fullsize_iso"],
     "layouts": {
diff --git a/keyboards/unicomp/classic_ultracl_pre_2013/overnumpad_1xb/info.json b/keyboards/unicomp/classic_ultracl_pre_2013/overnumpad_1xb/info.json
deleted file mode 100644
index 1c2f5b300bd..00000000000
--- a/keyboards/unicomp/classic_ultracl_pre_2013/overnumpad_1xb/info.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-    "keyboard_name": "Unicomp Classic / Ultra Classic (pre-2013)",
-    "manufacturer": "Unicomp/Purdea Andrei",
-    "url": "https://github.com/purdeaandrei/overnumpad_controller_1xb",
-    "maintainer": "purdeaandrei",
-    "indicators": {
-        "caps_lock": "C11",
-        "num_lock": "C12",
-        "scroll_lock": "C10"
-    },
-    "processor": "STM32F446", // RET6
-    "bootloader": "stm32-dfu",
-    "diode_direction": "ROW2COL",
-    "matrix_pins": {
-        // The controller to membrane interface has pads left-to-right, as seen on the keyboard, matching
-        // the order listed below: all columns followed by all rows, (also followed by unused gpio "A10"):
-        "cols": ["C3", "C2", "C1", "C0", "A3", "A4", "A5", "A6", "A7", "C4", "C5", "B0", "B1", "B10", "B12", "B13"],
-        "rows": ["B14", "B15", "C6", "C7", "C8", "C9", "A8", "A9"]
-    }
-}
diff --git a/keyboards/unicomp/classic_ultracl_pre_2013/overnumpad_1xb/keyboard.json b/keyboards/unicomp/classic_ultracl_pre_2013/overnumpad_1xb/keyboard.json
new file mode 100644
index 00000000000..71f706171eb
--- /dev/null
+++ b/keyboards/unicomp/classic_ultracl_pre_2013/overnumpad_1xb/keyboard.json
@@ -0,0 +1,30 @@
+{
+    "keyboard_name": "Unicomp Classic / Ultra Classic (pre-2013)",
+    "manufacturer": "Unicomp/Purdea Andrei",
+    "url": "https://github.com/purdeaandrei/overnumpad_controller_1xb",
+    "maintainer": "purdeaandrei",
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "haptic": true,
+        "mousekey": true,
+        "nkro": false
+    },
+    "haptic": {
+        "driver": "solenoid"
+    },
+    "indicators": {
+        "caps_lock": "C11",
+        "num_lock": "C12",
+        "scroll_lock": "C10"
+    },
+    "processor": "STM32F446", // RET6
+    "bootloader": "stm32-dfu",
+    "diode_direction": "ROW2COL",
+    "matrix_pins": {
+        // The controller to membrane interface has pads left-to-right, as seen on the keyboard, matching
+        // the order listed below: all columns followed by all rows, (also followed by unused gpio "A10"):
+        "cols": ["C3", "C2", "C1", "C0", "A3", "A4", "A5", "A6", "A7", "C4", "C5", "B0", "B1", "B10", "B12", "B13"],
+        "rows": ["B14", "B15", "C6", "C7", "C8", "C9", "A8", "A9"]
+    }
+}
diff --git a/keyboards/unicomp/classic_ultracl_pre_2013/overnumpad_1xb/rules.mk b/keyboards/unicomp/classic_ultracl_pre_2013/overnumpad_1xb/rules.mk
deleted file mode 100644
index 9131708828a..00000000000
--- a/keyboards/unicomp/classic_ultracl_pre_2013/overnumpad_1xb/rules.mk
+++ /dev/null
@@ -1,17 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-ENCODER_ENABLE = no         # Enable rotary encoder support
-AUDIO_ENABLE = no           # Audio output
-KEYBOARD_SHARED_EP = yes    # Free up some extra endpoints - needed if console+mouse+extra
-
-HAPTIC_ENABLE = yes
-HAPTIC_DRIVER = solenoid
diff --git a/keyboards/unicomp/pc122/info.json b/keyboards/unicomp/pc122/info.json
index 162495c25b8..0847f665043 100644
--- a/keyboards/unicomp/pc122/info.json
+++ b/keyboards/unicomp/pc122/info.json
@@ -5,7 +5,10 @@
     "usb": {
         "vid": "0x16C0",
         "pid": "0x27DB",
-        "device_version": "0.0.1"
+        "device_version": "0.0.1",
+        "shared_endpoint": {
+            "keyboard": true
+        }
     },
     "layouts": {
         "LAYOUT_all": {
diff --git a/keyboards/unicomp/pc122/overnumpad_1xb/info.json b/keyboards/unicomp/pc122/overnumpad_1xb/info.json
deleted file mode 100644
index 16e39168231..00000000000
--- a/keyboards/unicomp/pc122/overnumpad_1xb/info.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-    "keyboard_name": "Unicomp PC122",
-    "manufacturer": "Unicomp/Purdea Andrei",
-    "url": "https://github.com/purdeaandrei/overnumpad_controller_1xb",
-    "maintainer": "purdeaandrei",
-    "indicators": {
-        "caps_lock": "C11",
-        "num_lock": "C12",
-        "scroll_lock": "C10"
-    },
-    "processor": "STM32F446", // RET6
-    "bootloader": "stm32-dfu",
-    "diode_direction": "ROW2COL",
-    "matrix_pins": {
-        // The controller to membrane interface has pads left-to-right, as seen on the keyboard, matching
-        // the order listed below: all columns followed by all rows, (also followed by unused gpio "A10"):
-        "cols": ["C3", "C2", "C1", "C0", "A3", "A4", "A5", "A6", "A7", "C4", "C5", "B0", "B1", "B10", "B12", "B13"],
-        "rows": ["B14", "B15", "C6", "C7", "C8", "C9", "A8", "A9"]
-    }
-}
diff --git a/keyboards/unicomp/pc122/overnumpad_1xb/keyboard.json b/keyboards/unicomp/pc122/overnumpad_1xb/keyboard.json
new file mode 100644
index 00000000000..73b79e40473
--- /dev/null
+++ b/keyboards/unicomp/pc122/overnumpad_1xb/keyboard.json
@@ -0,0 +1,30 @@
+{
+    "keyboard_name": "Unicomp PC122",
+    "manufacturer": "Unicomp/Purdea Andrei",
+    "url": "https://github.com/purdeaandrei/overnumpad_controller_1xb",
+    "maintainer": "purdeaandrei",
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "haptic": true,
+        "mousekey": true,
+        "nkro": false
+    },
+    "haptic": {
+        "driver": "solenoid"
+    },
+    "indicators": {
+        "caps_lock": "C11",
+        "num_lock": "C12",
+        "scroll_lock": "C10"
+    },
+    "processor": "STM32F446", // RET6
+    "bootloader": "stm32-dfu",
+    "diode_direction": "ROW2COL",
+    "matrix_pins": {
+        // The controller to membrane interface has pads left-to-right, as seen on the keyboard, matching
+        // the order listed below: all columns followed by all rows, (also followed by unused gpio "A10"):
+        "cols": ["C3", "C2", "C1", "C0", "A3", "A4", "A5", "A6", "A7", "C4", "C5", "B0", "B1", "B10", "B12", "B13"],
+        "rows": ["B14", "B15", "C6", "C7", "C8", "C9", "A8", "A9"]
+    }
+}
diff --git a/keyboards/unicomp/pc122/overnumpad_1xb/rules.mk b/keyboards/unicomp/pc122/overnumpad_1xb/rules.mk
deleted file mode 100644
index 9131708828a..00000000000
--- a/keyboards/unicomp/pc122/overnumpad_1xb/rules.mk
+++ /dev/null
@@ -1,17 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-ENCODER_ENABLE = no         # Enable rotary encoder support
-AUDIO_ENABLE = no           # Audio output
-KEYBOARD_SHARED_EP = yes    # Free up some extra endpoints - needed if console+mouse+extra
-
-HAPTIC_ENABLE = yes
-HAPTIC_DRIVER = solenoid
diff --git a/keyboards/unicomp/spacesaver_m_post_2013/info.json b/keyboards/unicomp/spacesaver_m_post_2013/info.json
index 52eb4d80368..f5d783b1265 100644
--- a/keyboards/unicomp/spacesaver_m_post_2013/info.json
+++ b/keyboards/unicomp/spacesaver_m_post_2013/info.json
@@ -5,7 +5,10 @@
     "usb": {
         "vid": "0x16C0",
         "pid": "0x27DB",
-        "device_version": "0.0.1"
+        "device_version": "0.0.1",
+        "shared_endpoint": {
+            "keyboard": true
+        }
     },
     "layouts": {
         "LAYOUT_all": {
diff --git a/keyboards/unicomp/spacesaver_m_post_2013/overnumpad_1xb/info.json b/keyboards/unicomp/spacesaver_m_post_2013/overnumpad_1xb/info.json
deleted file mode 100644
index cf25addc9e2..00000000000
--- a/keyboards/unicomp/spacesaver_m_post_2013/overnumpad_1xb/info.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "keyboard_name": "Unicomp Spacesaver M (post-2013)",
-    "manufacturer": "Unicomp/Purdea Andrei",
-    "url": "https://github.com/purdeaandrei/overnumpad_controller_1xb",
-    "maintainer": "purdeaandrei",
-    "indicators": {
-        "caps_lock": "C12"
-    },
-    "processor": "STM32F446", // RET6
-    "bootloader": "stm32-dfu",
-    "diode_direction": "ROW2COL",
-    "matrix_pins": {
-        // The controller to membrane interface has pads left-to-right, as seen on the keyboard, matching
-        // the order listed below: all columns followed by all rows, (also followed by unused gpio "A10"):
-        "cols": ["C3", "C2", "C1", "C0", "A3", "A4", "A5", "A6", "A7", "C4", "C5", "B0", "B1", "B10", "B12", "B13"],
-        "rows": ["B14", "B15", "C6", "C7", "C8", "C9", "A8", "A9"]
-    }
-}
diff --git a/keyboards/unicomp/spacesaver_m_post_2013/overnumpad_1xb/keyboard.json b/keyboards/unicomp/spacesaver_m_post_2013/overnumpad_1xb/keyboard.json
new file mode 100644
index 00000000000..e2e6a610434
--- /dev/null
+++ b/keyboards/unicomp/spacesaver_m_post_2013/overnumpad_1xb/keyboard.json
@@ -0,0 +1,28 @@
+{
+    "keyboard_name": "Unicomp Spacesaver M (post-2013)",
+    "manufacturer": "Unicomp/Purdea Andrei",
+    "url": "https://github.com/purdeaandrei/overnumpad_controller_1xb",
+    "maintainer": "purdeaandrei",
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "haptic": true,
+        "mousekey": true,
+        "nkro": false
+    },
+    "haptic": {
+        "driver": "solenoid"
+    },
+    "indicators": {
+        "caps_lock": "C12"
+    },
+    "processor": "STM32F446", // RET6
+    "bootloader": "stm32-dfu",
+    "diode_direction": "ROW2COL",
+    "matrix_pins": {
+        // The controller to membrane interface has pads left-to-right, as seen on the keyboard, matching
+        // the order listed below: all columns followed by all rows, (also followed by unused gpio "A10"):
+        "cols": ["C3", "C2", "C1", "C0", "A3", "A4", "A5", "A6", "A7", "C4", "C5", "B0", "B1", "B10", "B12", "B13"],
+        "rows": ["B14", "B15", "C6", "C7", "C8", "C9", "A8", "A9"]
+    }
+}
diff --git a/keyboards/unicomp/spacesaver_m_post_2013/overnumpad_1xb/rules.mk b/keyboards/unicomp/spacesaver_m_post_2013/overnumpad_1xb/rules.mk
deleted file mode 100644
index 9131708828a..00000000000
--- a/keyboards/unicomp/spacesaver_m_post_2013/overnumpad_1xb/rules.mk
+++ /dev/null
@@ -1,17 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-ENCODER_ENABLE = no         # Enable rotary encoder support
-AUDIO_ENABLE = no           # Audio output
-KEYBOARD_SHARED_EP = yes    # Free up some extra endpoints - needed if console+mouse+extra
-
-HAPTIC_ENABLE = yes
-HAPTIC_DRIVER = solenoid
diff --git a/keyboards/unicomp/spacesaver_m_pre_2013/info.json b/keyboards/unicomp/spacesaver_m_pre_2013/info.json
index 166baaca416..6ac69a66aab 100644
--- a/keyboards/unicomp/spacesaver_m_pre_2013/info.json
+++ b/keyboards/unicomp/spacesaver_m_pre_2013/info.json
@@ -5,7 +5,10 @@
     "usb": {
         "vid": "0x16C0",
         "pid": "0x27DB",
-        "device_version": "0.0.1"
+        "device_version": "0.0.1",
+        "shared_endpoint": {
+            "keyboard": true
+        }
     },
     "layouts": {
         "LAYOUT_all": {
diff --git a/keyboards/unicomp/spacesaver_m_pre_2013/overnumpad_1xb/info.json b/keyboards/unicomp/spacesaver_m_pre_2013/overnumpad_1xb/info.json
deleted file mode 100644
index 31fc97a527f..00000000000
--- a/keyboards/unicomp/spacesaver_m_pre_2013/overnumpad_1xb/info.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "keyboard_name": "Unicomp Spacesaver M (pre-2013)",
-    "manufacturer": "Unicomp/Purdea Andrei",
-    "url": "https://github.com/purdeaandrei/overnumpad_controller_1xb",
-    "maintainer": "purdeaandrei",
-    "indicators": {
-        "caps_lock": "C12"
-    },
-    "processor": "STM32F446", // RET6
-    "bootloader": "stm32-dfu",
-    "diode_direction": "ROW2COL",
-    "matrix_pins": {
-        // The controller to membrane interface has pads left-to-right, as seen on the keyboard, matching
-        // the order listed below: all columns followed by all rows, (also followed by unused gpio "A10"):
-        "cols": ["C3", "C2", "C1", "C0", "A3", "A4", "A5", "A6", "A7", "C4", "C5", "B0", "B1", "B10", "B12", "B13"],
-        "rows": ["B14", "B15", "C6", "C7", "C8", "C9", "A8", "A9"]
-    }
-}
diff --git a/keyboards/unicomp/spacesaver_m_pre_2013/overnumpad_1xb/keyboard.json b/keyboards/unicomp/spacesaver_m_pre_2013/overnumpad_1xb/keyboard.json
new file mode 100644
index 00000000000..111b106f381
--- /dev/null
+++ b/keyboards/unicomp/spacesaver_m_pre_2013/overnumpad_1xb/keyboard.json
@@ -0,0 +1,28 @@
+{
+    "keyboard_name": "Unicomp Spacesaver M (pre-2013)",
+    "manufacturer": "Unicomp/Purdea Andrei",
+    "url": "https://github.com/purdeaandrei/overnumpad_controller_1xb",
+    "maintainer": "purdeaandrei",
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "haptic": true,
+        "mousekey": true,
+        "nkro": false
+    },
+    "indicators": {
+        "caps_lock": "C12"
+    },
+    "haptic": {
+        "driver": "solenoid"
+    },
+    "processor": "STM32F446", // RET6
+    "bootloader": "stm32-dfu",
+    "diode_direction": "ROW2COL",
+    "matrix_pins": {
+        // The controller to membrane interface has pads left-to-right, as seen on the keyboard, matching
+        // the order listed below: all columns followed by all rows, (also followed by unused gpio "A10"):
+        "cols": ["C3", "C2", "C1", "C0", "A3", "A4", "A5", "A6", "A7", "C4", "C5", "B0", "B1", "B10", "B12", "B13"],
+        "rows": ["B14", "B15", "C6", "C7", "C8", "C9", "A8", "A9"]
+    }
+}
diff --git a/keyboards/unicomp/spacesaver_m_pre_2013/overnumpad_1xb/rules.mk b/keyboards/unicomp/spacesaver_m_pre_2013/overnumpad_1xb/rules.mk
deleted file mode 100644
index 9131708828a..00000000000
--- a/keyboards/unicomp/spacesaver_m_pre_2013/overnumpad_1xb/rules.mk
+++ /dev/null
@@ -1,17 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-ENCODER_ENABLE = no         # Enable rotary encoder support
-AUDIO_ENABLE = no           # Audio output
-KEYBOARD_SHARED_EP = yes    # Free up some extra endpoints - needed if console+mouse+extra
-
-HAPTIC_ENABLE = yes
-HAPTIC_DRIVER = solenoid
diff --git a/keyboards/unison/v04/info.json b/keyboards/unison/v04/info.json
deleted file mode 100644
index 7b182df2515..00000000000
--- a/keyboards/unison/v04/info.json
+++ /dev/null
@@ -1,222 +0,0 @@
-{
-    "keyboard_name": "Unison",
-    "manufacturer": "jpskenn",
-    "url": "https://github.com/jpskenn/Unison",
-    "maintainer": "jpskenn",
-    "usb": {
-        "vid": "0xB9DD",
-        "pid": "0x176A",
-        "device_version": "0.4.0"
-    },
-    "matrix_pins": {
-        "cols": ["B3", "E6", "F1", "F5", "F7", "B2", "F0", "F4", "F6", "C7"],
-        "rows": ["B3", "E6", "F1", "F5", "F7", "B2", "F0", "F4", "F6", "C7"]
-    },
-    "rgblight": {
-        "hue_steps": 4,
-        "saturation_steps": 8,
-        "brightness_steps": 8,
-        "led_count": 7,
-        "led_map": [1, 2, 0, 3, 4, 5, 6],
-        "animations": {
-            "breathing": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "twinkle": true
-        }
-    },
-    "ws2812": {
-        "pin": "B7"
-    },
-    "diode_direction": "COL2ROW",
-    "encoder": {
-        "rotary": [
-            {"pin_a": "B0", "pin_b": "B1"},
-            {"pin_a": "D2", "pin_b": "D3"},
-            {"pin_a": "D5", "pin_b": "D4"},
-            {"pin_a": "D6", "pin_b": "D7"},
-            {"pin_a": "B4", "pin_b": "B5"}
-        ]
-    },
-    "bootmagic": {
-        "matrix": [5, 0]
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "layouts": {
-        "LAYOUT_all": {
-            "layout": [
-                {"matrix": [5, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [5, 1], "x": 2, "y": 0},
-                {"matrix": [0, 2], "x": 3, "y": 0},
-                {"matrix": [5, 2], "x": 4, "y": 0},
-                {"matrix": [0, 3], "x": 5, "y": 0},
-                {"matrix": [5, 3], "x": 6, "y": 0},
-                {"matrix": [0, 4], "x": 7, "y": 0},
-                {"matrix": [5, 4], "x": 8, "y": 0},
-                {"matrix": [0, 5], "x": 9, "y": 0},
-                {"matrix": [5, 6], "x": 10, "y": 0},
-                {"matrix": [0, 6], "x": 11, "y": 0},
-                {"matrix": [5, 7], "x": 12, "y": 0},
-                {"matrix": [0, 7], "x": 13, "y": 0},
-                {"matrix": [5, 8], "x": 14, "y": 0},
-                {"matrix": [0, 8], "x": 15, "y": 0},
-                {"matrix": [5, 9], "x": 16, "y": 0},
-
-                {"matrix": [6, 0], "x": 0, "y": 1},
-                {"matrix": [1, 0], "x": 1, "y": 1},
-                {"matrix": [6, 1], "x": 2, "y": 1},
-                {"matrix": [1, 2], "x": 3, "y": 1},
-                {"matrix": [6, 2], "x": 4, "y": 1, "w": 1.5},
-                {"matrix": [1, 3], "x": 5.5, "y": 1},
-                {"matrix": [6, 3], "x": 6.5, "y": 1},
-                {"matrix": [1, 4], "x": 7.5, "y": 1},
-                {"matrix": [6, 4], "x": 8.5, "y": 1},
-                {"matrix": [1, 5], "x": 9.5, "y": 1},
-                {"matrix": [6, 5], "x": 10.5, "y": 1},
-                {"matrix": [1, 6], "x": 11.5, "y": 1},
-                {"matrix": [6, 7], "x": 12.5, "y": 1},
-                {"matrix": [1, 7], "x": 13.5, "y": 1},
-                {"matrix": [6, 8], "x": 14.5, "y": 1},
-                {"matrix": [6, 9], "x": 15.5, "y": 1, "w": 1.5},
-
-                {"matrix": [7, 0], "x": 0, "y": 2},
-                {"matrix": [2, 0], "x": 1, "y": 2},
-                {"matrix": [7, 1], "x": 2, "y": 2},
-                {"matrix": [2, 1], "x": 3, "y": 2},
-                {"matrix": [7, 2], "x": 4, "y": 2, "w": 1.5},
-                {"matrix": [2, 3], "x": 5.5, "y": 2},
-                {"matrix": [7, 3], "x": 6.5, "y": 2},
-                {"matrix": [2, 4], "x": 7.5, "y": 2},
-                {"matrix": [7, 4], "x": 8.5, "y": 2},
-                {"matrix": [2, 5], "x": 9.5, "y": 2},
-                {"matrix": [7, 5], "x": 10.5, "y": 2},
-                {"matrix": [2, 6], "x": 11.5, "y": 2},
-                {"matrix": [7, 6], "x": 12.5, "y": 2},
-                {"matrix": [2, 7], "x": 13.5, "y": 2},
-                {"matrix": [7, 8], "x": 14.5, "y": 2},
-                {"matrix": [7, 9], "x": 15.5, "y": 2, "w": 1.5},
-
-                {"matrix": [8, 0], "x": 0, "y": 3},
-                {"matrix": [3, 0], "x": 1, "y": 3},
-                {"matrix": [8, 1], "x": 2, "y": 3},
-                {"matrix": [3, 1], "x": 3, "y": 3},
-                {"matrix": [8, 2], "x": 4, "y": 3},
-                {"matrix": [3, 2], "x": 5, "y": 3},
-                {"matrix": [8, 3], "x": 6, "y": 3},
-                {"matrix": [3, 4], "x": 7, "y": 3},
-                {"matrix": [8, 4], "x": 8, "y": 3},
-                {"matrix": [3, 5], "x": 9, "y": 3},
-                {"matrix": [8, 5], "x": 10, "y": 3},
-                {"matrix": [3, 6], "x": 11, "y": 3},
-                {"matrix": [8, 6], "x": 12, "y": 3},
-                {"matrix": [3, 7], "x": 13, "y": 3},
-                {"matrix": [8, 7], "x": 14, "y": 3},
-                {"matrix": [3, 8], "x": 15, "y": 3},
-                {"matrix": [8, 9], "x": 16, "y": 3},
-
-                {"matrix": [9, 0], "x": 0, "y": 4},
-                {"matrix": [4, 0], "x": 1, "y": 4},
-                {"matrix": [9, 1], "x": 2, "y": 4},
-                {"matrix": [4, 1], "x": 3, "y": 4},
-                {"matrix": [9, 2], "x": 4, "y": 4},
-                {"matrix": [4, 2], "x": 5, "y": 4},
-                {"matrix": [9, 3], "x": 6, "y": 4},
-                {"matrix": [4, 3], "x": 7, "y": 4},
-                {"matrix": [9, 4], "x": 8, "y": 4},
-                {"matrix": [4, 5], "x": 9, "y": 4},
-                {"matrix": [9, 5], "x": 10, "y": 4},
-                {"matrix": [4, 6], "x": 11, "y": 4},
-                {"matrix": [9, 6], "x": 12, "y": 4},
-                {"matrix": [4, 7], "x": 13, "y": 4},
-                {"matrix": [9, 7], "x": 14, "y": 4},
-                {"matrix": [4, 8], "x": 15, "y": 4},
-                {"matrix": [9, 8], "x": 16, "y": 4}
-            ]
-        },
-        "LAYOUT_music": {
-            "layout": [
-                {"matrix": [5, 1], "x": 2, "y": 0},
-                {"matrix": [5, 2], "x": 4, "y": 0},
-                {"matrix": [0, 3], "x": 5, "y": 0},
-                {"matrix": [5, 3], "x": 6, "y": 0},
-                {"matrix": [0, 4], "x": 7, "y": 0},
-                {"matrix": [0, 5], "x": 9, "y": 0},
-                {"matrix": [0, 6], "x": 11, "y": 0},
-                {"matrix": [0, 7], "x": 13, "y": 0},
-                {"matrix": [0, 8], "x": 15, "y": 0},
-
-                {"matrix": [6, 0], "x": 0, "y": 1.25},
-                {"matrix": [1, 0], "x": 1, "y": 1.25},
-                {"matrix": [6, 1], "x": 2, "y": 1.25},
-                {"matrix": [1, 2], "x": 3, "y": 1.25},
-                {"matrix": [6, 2], "x": 4, "y": 1.25, "w": 1.5},
-                {"matrix": [1, 3], "x": 5.5, "y": 1.25},
-                {"matrix": [6, 3], "x": 6.5, "y": 1.25},
-                {"matrix": [1, 4], "x": 7.5, "y": 1.25},
-                {"matrix": [6, 4], "x": 8.5, "y": 1.25},
-                {"matrix": [1, 5], "x": 9.5, "y": 1.25},
-                {"matrix": [6, 5], "x": 10.5, "y": 1.25},
-                {"matrix": [1, 6], "x": 11.5, "y": 1.25},
-                {"matrix": [6, 7], "x": 12.5, "y": 1.25},
-                {"matrix": [1, 7], "x": 13.5, "y": 1.25},
-                {"matrix": [6, 8], "x": 14.5, "y": 1.25},
-                {"matrix": [6, 9], "x": 15.5, "y": 1.25, "w": 1.5},
-
-                {"matrix": [7, 0], "x": 0, "y": 2.25},
-                {"matrix": [2, 0], "x": 1, "y": 2.25},
-                {"matrix": [7, 1], "x": 2, "y": 2.25},
-                {"matrix": [2, 1], "x": 3, "y": 2.25},
-                {"matrix": [7, 2], "x": 4, "y": 2.25, "w": 1.5},
-                {"matrix": [2, 3], "x": 5.5, "y": 2.25},
-                {"matrix": [7, 3], "x": 6.5, "y": 2.25},
-                {"matrix": [2, 4], "x": 7.5, "y": 2.25},
-                {"matrix": [7, 4], "x": 8.5, "y": 2.25},
-                {"matrix": [2, 5], "x": 9.5, "y": 2.25},
-                {"matrix": [7, 5], "x": 10.5, "y": 2.25},
-                {"matrix": [2, 6], "x": 11.5, "y": 2.25},
-                {"matrix": [7, 6], "x": 12.5, "y": 2.25},
-                {"matrix": [2, 7], "x": 13.5, "y": 2.25},
-                {"matrix": [7, 8], "x": 14.5, "y": 2.25},
-                {"matrix": [7, 9], "x": 15.5, "y": 2.25, "w": 1.5},
-
-                {"matrix": [8, 0], "x": 0, "y": 3.25},
-                {"matrix": [3, 0], "x": 1, "y": 3.25},
-                {"matrix": [8, 1], "x": 2, "y": 3.25},
-                {"matrix": [3, 1], "x": 3, "y": 3.25},
-                {"matrix": [8, 2], "x": 4, "y": 3.25},
-                {"matrix": [3, 2], "x": 5, "y": 3.25},
-                {"matrix": [8, 3], "x": 6, "y": 3.25},
-                {"matrix": [3, 4], "x": 7, "y": 3.25},
-                {"matrix": [8, 4], "x": 8, "y": 3.25},
-                {"matrix": [3, 5], "x": 9, "y": 3.25},
-                {"matrix": [8, 5], "x": 10, "y": 3.25},
-                {"matrix": [3, 6], "x": 11, "y": 3.25},
-                {"matrix": [8, 6], "x": 12, "y": 3.25},
-                {"matrix": [3, 7], "x": 13, "y": 3.25},
-                {"matrix": [8, 7], "x": 14, "y": 3.25},
-                {"matrix": [3, 8], "x": 15, "y": 3.25},
-                {"matrix": [8, 9], "x": 16, "y": 3.25},
-
-                {"matrix": [9, 0], "x": 0, "y": 4.25},
-                {"matrix": [4, 0], "x": 1, "y": 4.25},
-                {"matrix": [9, 1], "x": 2, "y": 4.25},
-                {"matrix": [4, 1], "x": 3, "y": 4.25},
-                {"matrix": [9, 2], "x": 4, "y": 4.25},
-                {"matrix": [4, 2], "x": 5, "y": 4.25},
-                {"matrix": [9, 3], "x": 6, "y": 4.25},
-                {"matrix": [4, 3], "x": 7, "y": 4.25},
-                {"matrix": [9, 4], "x": 8, "y": 4.25},
-                {"matrix": [4, 5], "x": 9, "y": 4.25},
-                {"matrix": [9, 5], "x": 10, "y": 4.25},
-                {"matrix": [4, 6], "x": 11, "y": 4.25},
-                {"matrix": [9, 6], "x": 12, "y": 4.25},
-                {"matrix": [4, 7], "x": 13, "y": 4.25},
-                {"matrix": [9, 7], "x": 14, "y": 4.25},
-                {"matrix": [4, 8], "x": 15, "y": 4.25},
-                {"matrix": [9, 8], "x": 16, "y": 4.25}
-            ]
-        }
-    }
-}
diff --git a/keyboards/unison/v04/keyboard.json b/keyboards/unison/v04/keyboard.json
new file mode 100644
index 00000000000..14f495aa2ca
--- /dev/null
+++ b/keyboards/unison/v04/keyboard.json
@@ -0,0 +1,233 @@
+{
+    "keyboard_name": "Unison",
+    "manufacturer": "jpskenn",
+    "url": "https://github.com/jpskenn/Unison",
+    "maintainer": "jpskenn",
+    "usb": {
+        "vid": "0xB9DD",
+        "pid": "0x176A",
+        "device_version": "0.4.0"
+    },
+    "build": {
+        "lto": true
+    },
+    "features": {
+        "bootmagic": false,
+        "encoder": false,
+        "extrakey": true,
+        "mousekey": false,
+        "nkro": false,
+        "rgblight": true
+    },
+    "matrix_pins": {
+        "cols": ["B3", "E6", "F1", "F5", "F7", "B2", "F0", "F4", "F6", "C7"],
+        "rows": ["B3", "E6", "F1", "F5", "F7", "B2", "F0", "F4", "F6", "C7"]
+    },
+    "rgblight": {
+        "hue_steps": 4,
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 7,
+        "led_map": [1, 2, 0, 3, 4, 5, 6],
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "twinkle": true
+        }
+    },
+    "ws2812": {
+        "pin": "B7"
+    },
+    "diode_direction": "COL2ROW",
+    "encoder": {
+        "rotary": [
+            {"pin_a": "B0", "pin_b": "B1"},
+            {"pin_a": "D2", "pin_b": "D3"},
+            {"pin_a": "D5", "pin_b": "D4"},
+            {"pin_a": "D6", "pin_b": "D7"},
+            {"pin_a": "B4", "pin_b": "B5"}
+        ]
+    },
+    "bootmagic": {
+        "matrix": [5, 0]
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                {"matrix": [5, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [5, 1], "x": 2, "y": 0},
+                {"matrix": [0, 2], "x": 3, "y": 0},
+                {"matrix": [5, 2], "x": 4, "y": 0},
+                {"matrix": [0, 3], "x": 5, "y": 0},
+                {"matrix": [5, 3], "x": 6, "y": 0},
+                {"matrix": [0, 4], "x": 7, "y": 0},
+                {"matrix": [5, 4], "x": 8, "y": 0},
+                {"matrix": [0, 5], "x": 9, "y": 0},
+                {"matrix": [5, 6], "x": 10, "y": 0},
+                {"matrix": [0, 6], "x": 11, "y": 0},
+                {"matrix": [5, 7], "x": 12, "y": 0},
+                {"matrix": [0, 7], "x": 13, "y": 0},
+                {"matrix": [5, 8], "x": 14, "y": 0},
+                {"matrix": [0, 8], "x": 15, "y": 0},
+                {"matrix": [5, 9], "x": 16, "y": 0},
+
+                {"matrix": [6, 0], "x": 0, "y": 1},
+                {"matrix": [1, 0], "x": 1, "y": 1},
+                {"matrix": [6, 1], "x": 2, "y": 1},
+                {"matrix": [1, 2], "x": 3, "y": 1},
+                {"matrix": [6, 2], "x": 4, "y": 1, "w": 1.5},
+                {"matrix": [1, 3], "x": 5.5, "y": 1},
+                {"matrix": [6, 3], "x": 6.5, "y": 1},
+                {"matrix": [1, 4], "x": 7.5, "y": 1},
+                {"matrix": [6, 4], "x": 8.5, "y": 1},
+                {"matrix": [1, 5], "x": 9.5, "y": 1},
+                {"matrix": [6, 5], "x": 10.5, "y": 1},
+                {"matrix": [1, 6], "x": 11.5, "y": 1},
+                {"matrix": [6, 7], "x": 12.5, "y": 1},
+                {"matrix": [1, 7], "x": 13.5, "y": 1},
+                {"matrix": [6, 8], "x": 14.5, "y": 1},
+                {"matrix": [6, 9], "x": 15.5, "y": 1, "w": 1.5},
+
+                {"matrix": [7, 0], "x": 0, "y": 2},
+                {"matrix": [2, 0], "x": 1, "y": 2},
+                {"matrix": [7, 1], "x": 2, "y": 2},
+                {"matrix": [2, 1], "x": 3, "y": 2},
+                {"matrix": [7, 2], "x": 4, "y": 2, "w": 1.5},
+                {"matrix": [2, 3], "x": 5.5, "y": 2},
+                {"matrix": [7, 3], "x": 6.5, "y": 2},
+                {"matrix": [2, 4], "x": 7.5, "y": 2},
+                {"matrix": [7, 4], "x": 8.5, "y": 2},
+                {"matrix": [2, 5], "x": 9.5, "y": 2},
+                {"matrix": [7, 5], "x": 10.5, "y": 2},
+                {"matrix": [2, 6], "x": 11.5, "y": 2},
+                {"matrix": [7, 6], "x": 12.5, "y": 2},
+                {"matrix": [2, 7], "x": 13.5, "y": 2},
+                {"matrix": [7, 8], "x": 14.5, "y": 2},
+                {"matrix": [7, 9], "x": 15.5, "y": 2, "w": 1.5},
+
+                {"matrix": [8, 0], "x": 0, "y": 3},
+                {"matrix": [3, 0], "x": 1, "y": 3},
+                {"matrix": [8, 1], "x": 2, "y": 3},
+                {"matrix": [3, 1], "x": 3, "y": 3},
+                {"matrix": [8, 2], "x": 4, "y": 3},
+                {"matrix": [3, 2], "x": 5, "y": 3},
+                {"matrix": [8, 3], "x": 6, "y": 3},
+                {"matrix": [3, 4], "x": 7, "y": 3},
+                {"matrix": [8, 4], "x": 8, "y": 3},
+                {"matrix": [3, 5], "x": 9, "y": 3},
+                {"matrix": [8, 5], "x": 10, "y": 3},
+                {"matrix": [3, 6], "x": 11, "y": 3},
+                {"matrix": [8, 6], "x": 12, "y": 3},
+                {"matrix": [3, 7], "x": 13, "y": 3},
+                {"matrix": [8, 7], "x": 14, "y": 3},
+                {"matrix": [3, 8], "x": 15, "y": 3},
+                {"matrix": [8, 9], "x": 16, "y": 3},
+
+                {"matrix": [9, 0], "x": 0, "y": 4},
+                {"matrix": [4, 0], "x": 1, "y": 4},
+                {"matrix": [9, 1], "x": 2, "y": 4},
+                {"matrix": [4, 1], "x": 3, "y": 4},
+                {"matrix": [9, 2], "x": 4, "y": 4},
+                {"matrix": [4, 2], "x": 5, "y": 4},
+                {"matrix": [9, 3], "x": 6, "y": 4},
+                {"matrix": [4, 3], "x": 7, "y": 4},
+                {"matrix": [9, 4], "x": 8, "y": 4},
+                {"matrix": [4, 5], "x": 9, "y": 4},
+                {"matrix": [9, 5], "x": 10, "y": 4},
+                {"matrix": [4, 6], "x": 11, "y": 4},
+                {"matrix": [9, 6], "x": 12, "y": 4},
+                {"matrix": [4, 7], "x": 13, "y": 4},
+                {"matrix": [9, 7], "x": 14, "y": 4},
+                {"matrix": [4, 8], "x": 15, "y": 4},
+                {"matrix": [9, 8], "x": 16, "y": 4}
+            ]
+        },
+        "LAYOUT_music": {
+            "layout": [
+                {"matrix": [5, 1], "x": 2, "y": 0},
+                {"matrix": [5, 2], "x": 4, "y": 0},
+                {"matrix": [0, 3], "x": 5, "y": 0},
+                {"matrix": [5, 3], "x": 6, "y": 0},
+                {"matrix": [0, 4], "x": 7, "y": 0},
+                {"matrix": [0, 5], "x": 9, "y": 0},
+                {"matrix": [0, 6], "x": 11, "y": 0},
+                {"matrix": [0, 7], "x": 13, "y": 0},
+                {"matrix": [0, 8], "x": 15, "y": 0},
+
+                {"matrix": [6, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 0], "x": 1, "y": 1.25},
+                {"matrix": [6, 1], "x": 2, "y": 1.25},
+                {"matrix": [1, 2], "x": 3, "y": 1.25},
+                {"matrix": [6, 2], "x": 4, "y": 1.25, "w": 1.5},
+                {"matrix": [1, 3], "x": 5.5, "y": 1.25},
+                {"matrix": [6, 3], "x": 6.5, "y": 1.25},
+                {"matrix": [1, 4], "x": 7.5, "y": 1.25},
+                {"matrix": [6, 4], "x": 8.5, "y": 1.25},
+                {"matrix": [1, 5], "x": 9.5, "y": 1.25},
+                {"matrix": [6, 5], "x": 10.5, "y": 1.25},
+                {"matrix": [1, 6], "x": 11.5, "y": 1.25},
+                {"matrix": [6, 7], "x": 12.5, "y": 1.25},
+                {"matrix": [1, 7], "x": 13.5, "y": 1.25},
+                {"matrix": [6, 8], "x": 14.5, "y": 1.25},
+                {"matrix": [6, 9], "x": 15.5, "y": 1.25, "w": 1.5},
+
+                {"matrix": [7, 0], "x": 0, "y": 2.25},
+                {"matrix": [2, 0], "x": 1, "y": 2.25},
+                {"matrix": [7, 1], "x": 2, "y": 2.25},
+                {"matrix": [2, 1], "x": 3, "y": 2.25},
+                {"matrix": [7, 2], "x": 4, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 3], "x": 5.5, "y": 2.25},
+                {"matrix": [7, 3], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 7.5, "y": 2.25},
+                {"matrix": [7, 4], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 9.5, "y": 2.25},
+                {"matrix": [7, 5], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 11.5, "y": 2.25},
+                {"matrix": [7, 6], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 13.5, "y": 2.25},
+                {"matrix": [7, 8], "x": 14.5, "y": 2.25},
+                {"matrix": [7, 9], "x": 15.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [8, 0], "x": 0, "y": 3.25},
+                {"matrix": [3, 0], "x": 1, "y": 3.25},
+                {"matrix": [8, 1], "x": 2, "y": 3.25},
+                {"matrix": [3, 1], "x": 3, "y": 3.25},
+                {"matrix": [8, 2], "x": 4, "y": 3.25},
+                {"matrix": [3, 2], "x": 5, "y": 3.25},
+                {"matrix": [8, 3], "x": 6, "y": 3.25},
+                {"matrix": [3, 4], "x": 7, "y": 3.25},
+                {"matrix": [8, 4], "x": 8, "y": 3.25},
+                {"matrix": [3, 5], "x": 9, "y": 3.25},
+                {"matrix": [8, 5], "x": 10, "y": 3.25},
+                {"matrix": [3, 6], "x": 11, "y": 3.25},
+                {"matrix": [8, 6], "x": 12, "y": 3.25},
+                {"matrix": [3, 7], "x": 13, "y": 3.25},
+                {"matrix": [8, 7], "x": 14, "y": 3.25},
+                {"matrix": [3, 8], "x": 15, "y": 3.25},
+                {"matrix": [8, 9], "x": 16, "y": 3.25},
+
+                {"matrix": [9, 0], "x": 0, "y": 4.25},
+                {"matrix": [4, 0], "x": 1, "y": 4.25},
+                {"matrix": [9, 1], "x": 2, "y": 4.25},
+                {"matrix": [4, 1], "x": 3, "y": 4.25},
+                {"matrix": [9, 2], "x": 4, "y": 4.25},
+                {"matrix": [4, 2], "x": 5, "y": 4.25},
+                {"matrix": [9, 3], "x": 6, "y": 4.25},
+                {"matrix": [4, 3], "x": 7, "y": 4.25},
+                {"matrix": [9, 4], "x": 8, "y": 4.25},
+                {"matrix": [4, 5], "x": 9, "y": 4.25},
+                {"matrix": [9, 5], "x": 10, "y": 4.25},
+                {"matrix": [4, 6], "x": 11, "y": 4.25},
+                {"matrix": [9, 6], "x": 12, "y": 4.25},
+                {"matrix": [4, 7], "x": 13, "y": 4.25},
+                {"matrix": [9, 7], "x": 14, "y": 4.25},
+                {"matrix": [4, 8], "x": 15, "y": 4.25},
+                {"matrix": [9, 8], "x": 16, "y": 4.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/unison/v04/rules.mk b/keyboards/unison/v04/rules.mk
deleted file mode 100644
index b4fc6e0d29e..00000000000
--- a/keyboards/unison/v04/rules.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-ENCODER_ENABLE = no         # Rotary Encoder
-
-LTO_ENABLE = yes
diff --git a/keyboards/uzu42/rev1/info.json b/keyboards/uzu42/rev1/info.json
deleted file mode 100644
index c7d6f7159bb..00000000000
--- a/keyboards/uzu42/rev1/info.json
+++ /dev/null
@@ -1,96 +0,0 @@
-{
-  "keyboard_name": "uzu42",
-  "manufacturer": "nrtkbb",
-  "url": "https://github.com/nrtkbb/Keyboards/tree/master/uzu42",
-  "maintainer": "nrtkbb",
-  "usb": {
-    "vid": "0xFEED",
-    "pid": "0x3060",
-    "device_version": "0.0.1"
-  },
-  "matrix_pins": {
-    "cols": ["F4", "F5", "F6", "F7", "B1", "B3"],
-    "rows": ["D4", "C6", "D7", "E6"]
-  },
-  "diode_direction": "COL2ROW",
-  "split": {
-    "enabled": true,
-    "soft_serial_pin": "D2"
-  },
-  "ws2812": {
-    "pin": "D3"
-  },
-  "rgblight": {
-    "hue_steps": 10,
-    "led_count": 54,
-    "max_brightness": 120,
-    "split_count": [27, 27],
-    "animations": {
-      "breathing": true,
-      "rainbow_mood": true,
-      "rainbow_swirl": true,
-      "snake": true,
-      "knight": true,
-      "christmas": true,
-      "static_gradient": true,
-      "twinkle": true
-    }
-  },
-  "processor": "atmega32u4",
-  "bootloader": "caterina",
-  "layouts": {
-    "LAYOUT": {
-      "layout": [
-        {"matrix": [0, 0], "x": 0.375, "y": 0},
-        {"matrix": [0, 1], "x": 1.375, "y": 0},
-        {"matrix": [0, 2], "x": 2.375, "y": 0},
-        {"matrix": [0, 3], "x": 3.375, "y": 0.125},
-        {"matrix": [0, 4], "x": 4.375, "y": 0.25},
-
-        {"matrix": [4, 4], "x": 7.625, "y": 0.25},
-        {"matrix": [4, 3], "x": 8.625, "y": 0.125},
-        {"matrix": [4, 2], "x": 9.625, "y": 0},
-        {"matrix": [4, 1], "x": 10.625, "y": 0},
-        {"matrix": [4, 0], "x": 11.625, "y": 0},
-
-        {"matrix": [1, 0], "x": 0.25, "y": 1},
-        {"matrix": [1, 1], "x": 1.25, "y": 1},
-        {"matrix": [1, 2], "x": 2.25, "y": 1},
-        {"matrix": [1, 3], "x": 3.25, "y": 1.125},
-        {"matrix": [1, 4], "x": 4.25, "y": 1.25},
-
-        {"matrix": [5, 4], "x": 7.75, "y": 1.25},
-        {"matrix": [5, 3], "x": 8.75, "y": 1.125},
-        {"matrix": [5, 2], "x": 9.75, "y": 1},
-        {"matrix": [5, 1], "x": 10.75, "y": 1},
-        {"matrix": [5, 0], "x": 11.75, "y": 1},
-
-        {"matrix": [2, 0], "x": 0.125, "y": 2},
-        {"matrix": [2, 1], "x": 1.125, "y": 2},
-        {"matrix": [2, 2], "x": 2.125, "y": 2},
-        {"matrix": [2, 3], "x": 3.125, "y": 2.125},
-        {"matrix": [2, 4], "x": 4.125, "y": 2.25},
-
-        {"matrix": [6, 4], "x": 7.875, "y": 2.25},
-        {"matrix": [6, 3], "x": 8.875, "y": 2.125},
-        {"matrix": [6, 2], "x": 9.875, "y": 2},
-        {"matrix": [6, 1], "x": 10.875, "y": 2},
-        {"matrix": [6, 0], "x": 11.875, "y": 2},
-
-        {"matrix": [3, 0], "x": 0, "y": 3},
-        {"matrix": [3, 1], "x": 1, "y": 3},
-        {"matrix": [3, 2], "x": 2, "y": 3.05},
-        {"matrix": [3, 3], "x": 3, "y": 3.18},
-        {"matrix": [3, 4], "x": 4, "y": 3.3},
-        {"matrix": [3, 5], "x": 5, "y": 3.43},
-
-        {"matrix": [7, 5], "x": 7, "y": 3.43},
-        {"matrix": [7, 4], "x": 8, "y": 3.3},
-        {"matrix": [7, 3], "x": 9, "y": 3.18},
-        {"matrix": [7, 2], "x": 10, "y": 3.05},
-        {"matrix": [7, 1], "x": 11, "y": 3},
-        {"matrix": [7, 0], "x": 12, "y": 3}
-      ]
-    }
-  }
-}
diff --git a/keyboards/uzu42/rev1/keyboard.json b/keyboards/uzu42/rev1/keyboard.json
new file mode 100644
index 00000000000..71d9f424cc8
--- /dev/null
+++ b/keyboards/uzu42/rev1/keyboard.json
@@ -0,0 +1,103 @@
+{
+  "keyboard_name": "uzu42",
+  "manufacturer": "nrtkbb",
+  "url": "https://github.com/nrtkbb/Keyboards/tree/master/uzu42",
+  "maintainer": "nrtkbb",
+  "usb": {
+    "vid": "0xFEED",
+    "pid": "0x3060",
+    "device_version": "0.0.1"
+  },
+  "features": {
+    "bootmagic": false,
+    "extrakey": false,
+    "mousekey": false,
+    "nkro": false,
+    "rgblight": true
+  },
+  "matrix_pins": {
+    "cols": ["F4", "F5", "F6", "F7", "B1", "B3"],
+    "rows": ["D4", "C6", "D7", "E6"]
+  },
+  "diode_direction": "COL2ROW",
+  "split": {
+    "enabled": true,
+    "soft_serial_pin": "D2"
+  },
+  "ws2812": {
+    "pin": "D3"
+  },
+  "rgblight": {
+    "hue_steps": 10,
+    "led_count": 54,
+    "max_brightness": 120,
+    "split_count": [27, 27],
+    "animations": {
+      "breathing": true,
+      "rainbow_mood": true,
+      "rainbow_swirl": true,
+      "snake": true,
+      "knight": true,
+      "christmas": true,
+      "static_gradient": true,
+      "twinkle": true
+    }
+  },
+  "processor": "atmega32u4",
+  "bootloader": "caterina",
+  "layouts": {
+    "LAYOUT": {
+      "layout": [
+        {"matrix": [0, 0], "x": 0.375, "y": 0},
+        {"matrix": [0, 1], "x": 1.375, "y": 0},
+        {"matrix": [0, 2], "x": 2.375, "y": 0},
+        {"matrix": [0, 3], "x": 3.375, "y": 0.125},
+        {"matrix": [0, 4], "x": 4.375, "y": 0.25},
+
+        {"matrix": [4, 4], "x": 7.625, "y": 0.25},
+        {"matrix": [4, 3], "x": 8.625, "y": 0.125},
+        {"matrix": [4, 2], "x": 9.625, "y": 0},
+        {"matrix": [4, 1], "x": 10.625, "y": 0},
+        {"matrix": [4, 0], "x": 11.625, "y": 0},
+
+        {"matrix": [1, 0], "x": 0.25, "y": 1},
+        {"matrix": [1, 1], "x": 1.25, "y": 1},
+        {"matrix": [1, 2], "x": 2.25, "y": 1},
+        {"matrix": [1, 3], "x": 3.25, "y": 1.125},
+        {"matrix": [1, 4], "x": 4.25, "y": 1.25},
+
+        {"matrix": [5, 4], "x": 7.75, "y": 1.25},
+        {"matrix": [5, 3], "x": 8.75, "y": 1.125},
+        {"matrix": [5, 2], "x": 9.75, "y": 1},
+        {"matrix": [5, 1], "x": 10.75, "y": 1},
+        {"matrix": [5, 0], "x": 11.75, "y": 1},
+
+        {"matrix": [2, 0], "x": 0.125, "y": 2},
+        {"matrix": [2, 1], "x": 1.125, "y": 2},
+        {"matrix": [2, 2], "x": 2.125, "y": 2},
+        {"matrix": [2, 3], "x": 3.125, "y": 2.125},
+        {"matrix": [2, 4], "x": 4.125, "y": 2.25},
+
+        {"matrix": [6, 4], "x": 7.875, "y": 2.25},
+        {"matrix": [6, 3], "x": 8.875, "y": 2.125},
+        {"matrix": [6, 2], "x": 9.875, "y": 2},
+        {"matrix": [6, 1], "x": 10.875, "y": 2},
+        {"matrix": [6, 0], "x": 11.875, "y": 2},
+
+        {"matrix": [3, 0], "x": 0, "y": 3},
+        {"matrix": [3, 1], "x": 1, "y": 3},
+        {"matrix": [3, 2], "x": 2, "y": 3.05},
+        {"matrix": [3, 3], "x": 3, "y": 3.18},
+        {"matrix": [3, 4], "x": 4, "y": 3.3},
+        {"matrix": [3, 5], "x": 5, "y": 3.43},
+
+        {"matrix": [7, 5], "x": 7, "y": 3.43},
+        {"matrix": [7, 4], "x": 8, "y": 3.3},
+        {"matrix": [7, 3], "x": 9, "y": 3.18},
+        {"matrix": [7, 2], "x": 10, "y": 3.05},
+        {"matrix": [7, 1], "x": 11, "y": 3},
+        {"matrix": [7, 0], "x": 12, "y": 3}
+      ]
+    }
+  }
+}
diff --git a/keyboards/uzu42/uzu42.c b/keyboards/uzu42/rev1/rev1.c
similarity index 100%
rename from keyboards/uzu42/uzu42.c
rename to keyboards/uzu42/rev1/rev1.c
diff --git a/keyboards/uzu42/rev1/rules.mk b/keyboards/uzu42/rev1/rules.mk
deleted file mode 100644
index 1e3cebb1451..00000000000
--- a/keyboards/uzu42/rev1/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-RGBLIGHT_ENABLE = yes
diff --git a/keyboards/uzu42/rules.mk b/keyboards/uzu42/rules.mk
index 49b64b12745..277e74b7153 100644
--- a/keyboards/uzu42/rules.mk
+++ b/keyboards/uzu42/rules.mk
@@ -1,15 +1 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no       # Mouse keys
-EXTRAKEY_ENABLE = no       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no        # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no      # Enable keyboard backlight functionality
-AUDIO_ENABLE = no           # Audio output
-RGBLIGHT_ENABLE = no       # Enable WS2812 RGB underlight.
-OLED_ENABLE = no      # OLED display
-
 DEFAULT_FOLDER = uzu42/rev1
diff --git a/keyboards/v4n4g0rth0n/v2/info.json b/keyboards/v4n4g0rth0n/v2/info.json
deleted file mode 100644
index 6959188be9a..00000000000
--- a/keyboards/v4n4g0rth0n/v2/info.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-    "usb": {
-        "device_version": "0.0.2"
-    },
-    "matrix_pins": {
-        "cols": ["D3", "D2", "D1", "D0", "D5", "F7", "F6", "E6", "F5", "F4", "F1", "B0"],
-        "rows": ["C7", "C6", "B6", "B5", "B7"]
-    },
-    "diode_direction": "COL2ROW",
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu"
-}
diff --git a/keyboards/v4n4g0rth0n/v2/keyboard.json b/keyboards/v4n4g0rth0n/v2/keyboard.json
new file mode 100644
index 00000000000..c43848178f2
--- /dev/null
+++ b/keyboards/v4n4g0rth0n/v2/keyboard.json
@@ -0,0 +1,19 @@
+{
+    "usb": {
+        "device_version": "0.0.2"
+    },
+    "features": {
+        "bootmagic": true,
+        "console": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": false
+    },
+    "matrix_pins": {
+        "cols": ["D3", "D2", "D1", "D0", "D5", "F7", "F6", "E6", "F5", "F4", "F1", "B0"],
+        "rows": ["C7", "C6", "B6", "B5", "B7"]
+    },
+    "diode_direction": "COL2ROW",
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu"
+}
diff --git a/keyboards/v4n4g0rth0n/v2/rules.mk b/keyboards/v4n4g0rth0n/v2/rules.mk
index 01145044866..cc588202788 100644
--- a/keyboards/v4n4g0rth0n/v2/rules.mk
+++ b/keyboards/v4n4g0rth0n/v2/rules.mk
@@ -1,14 +1 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = yes         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
 ANALOG_DRIVER_REQUIRED = yes
diff --git a/keyboards/vertex/angle65/info.json b/keyboards/vertex/angle65/info.json
deleted file mode 100644
index 096e89555aa..00000000000
--- a/keyboards/vertex/angle65/info.json
+++ /dev/null
@@ -1,116 +0,0 @@
-{
-    "keyboard_name": "ANGLE65",
-    "manufacturer": "vertex",
-    "url": "",
-    "maintainer": "EasonQian1, Vertex-kb",
-    "usb": {
-        "vid": "0x9954",
-        "pid": "0x9970",
-        "device_version": "0.0.1",
-        "force_nkro": true
-    },
-    "processor": "STM32F103",
-    "bootloader": "stm32duino",
-    "matrix_pins": {
-        "rows": ["B10", "B1", "B0", "A7", "A6"],
-        "cols": ["B9", "B8", "B7", "B6", "B5", "B4", "B3", "B11", "A15", "A10", "A9", "B14", "B13", "B12", "A5"]
-    },
-    "diode_direction": "COL2ROW",
-    "indicators": {
-        "caps_lock": "C13",
-        "on_state": 0
-    },
-    "rgblight": {
-        "led_count": 9,
-        "animations": {
-            "breathing": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "snake": true,
-            "knight": true,
-            "christmas": true,
-            "static_gradient": true,
-            "rgb_test": true,
-            "alternating": true,
-            "twinkle": true
-        }
-    },
-    "ws2812": {
-        "pin": "B15"
-    },
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"label": "K00 (B10,B9)", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "K01 (B10,B8)", "matrix": [0, 1], "x": 1, "y": 0},
-                {"label": "K02 (B10,B7)", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "K03 (B10,B6)", "matrix": [0, 3], "x": 3, "y": 0},
-                {"label": "K04 (B10,B5)", "matrix": [0, 4], "x": 4, "y": 0},
-                {"label": "K05 (B10,B4)", "matrix": [0, 5], "x": 5, "y": 0},
-                {"label": "K06 (B10,B3)", "matrix": [0, 6], "x": 6, "y": 0},
-                {"label": "K07 (B10,B11)", "matrix": [0, 7], "x": 7, "y": 0},
-                {"label": "K08 (B10,A15)", "matrix": [0, 8], "x": 8, "y": 0},
-                {"label": "K09 (B10,A10)", "matrix": [0, 9], "x": 9, "y": 0},
-                {"label": "K0A (B10,A9)", "matrix": [0, 10], "x": 10, "y": 0},
-                {"label": "K0B (B10,B14)", "matrix": [0, 11], "x": 11, "y": 0},
-                {"label": "K0C (B10,B13)", "matrix": [0, 12], "x": 12, "y": 0},
-                {"label": "K0D (B10,B12)", "matrix": [0, 13], "x": 13, "y": 0},
-                {"label": "K0E (B10,A5)", "matrix": [0, 14], "x": 14, "y": 0},
-                {"label": "K10 (B1,B9)", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"label": "K11 (B1,B8)", "matrix": [1, 1], "x": 1.5, "y": 1},
-                {"label": "K12 (B1,B7)", "matrix": [1, 2], "x": 2.5, "y": 1},
-                {"label": "K13 (B1,B6)", "matrix": [1, 3], "x": 3.5, "y": 1},
-                {"label": "K14 (B1,B5)", "matrix": [1, 4], "x": 4.5, "y": 1},
-                {"label": "K15 (B1,B4)", "matrix": [1, 5], "x": 5.5, "y": 1},
-                {"label": "K16 (B1,B3)", "matrix": [1, 6], "x": 6.5, "y": 1},
-                {"label": "K17 (B1,B11)", "matrix": [1, 7], "x": 7.5, "y": 1},
-                {"label": "K18 (B1,A15)", "matrix": [1, 8], "x": 8.5, "y": 1},
-                {"label": "K19 (B1,A10)", "matrix": [1, 9], "x": 9.5, "y": 1},
-                {"label": "K1A (B1,A9)", "matrix": [1, 10], "x": 10.5, "y": 1},
-                {"label": "K1B (B1,B14)", "matrix": [1, 11], "x": 11.5, "y": 1},
-                {"label": "K1C (B1,B13)", "matrix": [1, 12], "x": 12.5, "y": 1},
-                {"label": "K1D (B1,B12)", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-                {"label": "K1E (B1,A5)", "matrix": [1, 14], "x": 15, "y": 1},
-                {"label": "K20 (B0,B9)", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"label": "K21 (B0,B8)", "matrix": [2, 1], "x": 1.75, "y": 2},
-                {"label": "K22 (B0,B7)", "matrix": [2, 2], "x": 2.75, "y": 2},
-                {"label": "K23 (B0,B6)", "matrix": [2, 3], "x": 3.75, "y": 2},
-                {"label": "K24 (B0,B5)", "matrix": [2, 4], "x": 4.75, "y": 2},
-                {"label": "K25 (B0,B4)", "matrix": [2, 5], "x": 5.75, "y": 2},
-                {"label": "K26 (B0,B3)", "matrix": [2, 6], "x": 6.75, "y": 2},
-                {"label": "K27 (B0,B11)", "matrix": [2, 7], "x": 7.75, "y": 2},
-                {"label": "K28 (B0,A15)", "matrix": [2, 8], "x": 8.75, "y": 2},
-                {"label": "K29 (B0,A10)", "matrix": [2, 9], "x": 9.75, "y": 2},
-                {"label": "K2A (B0,A9)", "matrix": [2, 10], "x": 10.75, "y": 2},
-                {"label": "K2B (B0,B14)", "matrix": [2, 11], "x": 11.75, "y": 2},
-                {"label": "K2C (B0,B13)", "matrix": [2, 12], "x": 12.75, "y": 2},
-                {"label": "K2D (B0,B12)", "matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.25},
-                {"label": "K2E (B0,A5)", "matrix": [2, 14], "x": 15, "y": 2},
-                {"label": "K30 (A7,B9)", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
-                {"label": "K31 (A7,B8)", "matrix": [3, 1], "x": 1.25, "y": 3},
-                {"label": "K32 (A7,B7)", "matrix": [3, 2], "x": 2.25, "y": 3},
-                {"label": "K33 (A7,B6)", "matrix": [3, 3], "x": 3.25, "y": 3},
-                {"label": "K34 (A7,B5)", "matrix": [3, 4], "x": 4.25, "y": 3},
-                {"label": "K35 (A7,B4)", "matrix": [3, 5], "x": 5.25, "y": 3},
-                {"label": "K36 (A7,B3)", "matrix": [3, 6], "x": 6.25, "y": 3},
-                {"label": "K37 (A7,B11)", "matrix": [3, 7], "x": 7.25, "y": 3},
-                {"label": "K38 (A7,A15)", "matrix": [3, 8], "x": 8.25, "y": 3},
-                {"label": "K39 (A7,A10)", "matrix": [3, 9], "x": 9.25, "y": 3},
-                {"label": "K3A (A7,A9)", "matrix": [3, 10], "x": 10.25, "y": 3},
-                {"label": "K3B (A7,B14)", "matrix": [3, 11], "x": 11.25, "y": 3},
-                {"label": "K3C (A7,B13)", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"label": "K3D (A7,B12)", "matrix": [3, 13], "x": 14, "y": 3},
-                {"label": "K3E (A7,A5)", "matrix": [3, 14], "x": 15, "y": 3},
-                {"label": "K40 (A6,B9)", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"label": "K41 (A6,B8)", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"label": "K42 (A6,B7)", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"label": "K46 (A6,B3)", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
-                {"label": "K4A (A6,A9)", "matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
-                {"label": "K4B (A6,B14)", "matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
-                {"label": "K4C (A6,B13)", "matrix": [4, 12], "x": 13, "y": 4},
-                {"label": "K4D (A6,B12)", "matrix": [4, 13], "x": 14, "y": 4},
-                {"label": "K4E (A6,A5)", "matrix": [4, 14], "x": 15, "y": 4}
-           ]
-        }
-    }
-}
diff --git a/keyboards/vertex/angle65/keyboard.json b/keyboards/vertex/angle65/keyboard.json
new file mode 100644
index 00000000000..ef0aacfef4b
--- /dev/null
+++ b/keyboards/vertex/angle65/keyboard.json
@@ -0,0 +1,129 @@
+{
+    "keyboard_name": "ANGLE65",
+    "manufacturer": "vertex",
+    "url": "",
+    "maintainer": "EasonQian1, Vertex-kb",
+    "usb": {
+        "vid": "0x9954",
+        "pid": "0x9970",
+        "device_version": "0.0.1",
+        "force_nkro": true
+    },
+    "features": {
+        "bootmagic": false,
+        "command": true,
+        "console": true,
+        "extrakey": true,
+        "haptic": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgblight": true
+    },
+    "processor": "STM32F103",
+    "bootloader": "stm32duino",
+    "matrix_pins": {
+        "rows": ["B10", "B1", "B0", "A7", "A6"],
+        "cols": ["B9", "B8", "B7", "B6", "B5", "B4", "B3", "B11", "A15", "A10", "A9", "B14", "B13", "B12", "A5"]
+    },
+    "diode_direction": "COL2ROW",
+    "indicators": {
+        "caps_lock": "C13",
+        "on_state": 0
+    },
+    "haptic": {
+        "driver": "solenoid"
+    },
+    "rgblight": {
+        "led_count": 9,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": true,
+            "twinkle": true
+        }
+    },
+    "ws2812": {
+        "pin": "B15"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"label": "K00 (B10,B9)", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "K01 (B10,B8)", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "K02 (B10,B7)", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "K03 (B10,B6)", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "K04 (B10,B5)", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "K05 (B10,B4)", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "K06 (B10,B3)", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "K07 (B10,B11)", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "K08 (B10,A15)", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "K09 (B10,A10)", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "K0A (B10,A9)", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "K0B (B10,B14)", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "K0C (B10,B13)", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "K0D (B10,B12)", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "K0E (B10,A5)", "matrix": [0, 14], "x": 14, "y": 0},
+                {"label": "K10 (B1,B9)", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "K11 (B1,B8)", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "K12 (B1,B7)", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "K13 (B1,B6)", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "K14 (B1,B5)", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "K15 (B1,B4)", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "K16 (B1,B3)", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "K17 (B1,B11)", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "K18 (B1,A15)", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "K19 (B1,A10)", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "K1A (B1,A9)", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "K1B (B1,B14)", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "K1C (B1,B13)", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "K1D (B1,B12)", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"label": "K1E (B1,A5)", "matrix": [1, 14], "x": 15, "y": 1},
+                {"label": "K20 (B0,B9)", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "K21 (B0,B8)", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "K22 (B0,B7)", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "K23 (B0,B6)", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "K24 (B0,B5)", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "K25 (B0,B4)", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "K26 (B0,B3)", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "K27 (B0,B11)", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K28 (B0,A15)", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "K29 (B0,A10)", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": "K2A (B0,A9)", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "K2B (B0,B14)", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "K2C (B0,B13)", "matrix": [2, 12], "x": 12.75, "y": 2},
+                {"label": "K2D (B0,B12)", "matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.25},
+                {"label": "K2E (B0,A5)", "matrix": [2, 14], "x": 15, "y": 2},
+                {"label": "K30 (A7,B9)", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"label": "K31 (A7,B8)", "matrix": [3, 1], "x": 1.25, "y": 3},
+                {"label": "K32 (A7,B7)", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "K33 (A7,B6)", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "K34 (A7,B5)", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "K35 (A7,B4)", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "K36 (A7,B3)", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "K37 (A7,B11)", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "K38 (A7,A15)", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": "K39 (A7,A10)", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": "K3A (A7,A9)", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "K3B (A7,B14)", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "K3C (A7,B13)", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "K3D (A7,B12)", "matrix": [3, 13], "x": 14, "y": 3},
+                {"label": "K3E (A7,A5)", "matrix": [3, 14], "x": 15, "y": 3},
+                {"label": "K40 (A6,B9)", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "K41 (A6,B8)", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "K42 (A6,B7)", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "K46 (A6,B3)", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "K4A (A6,A9)", "matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"label": "K4B (A6,B14)", "matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"label": "K4C (A6,B13)", "matrix": [4, 12], "x": 13, "y": 4},
+                {"label": "K4D (A6,B12)", "matrix": [4, 13], "x": 14, "y": 4},
+                {"label": "K4E (A6,A5)", "matrix": [4, 14], "x": 15, "y": 4}
+           ]
+        }
+    }
+}
diff --git a/keyboards/vertex/angle65/rules.mk b/keyboards/vertex/angle65/rules.mk
deleted file mode 100644
index 330f6ff76b8..00000000000
--- a/keyboards/vertex/angle65/rules.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = yes        # Console for debug
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no      # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
-HAPTIC_ENABLE = yes
-HAPTIC_DRIVER = solenoid
diff --git a/keyboards/viktus/minne_topre/info.json b/keyboards/viktus/minne_topre/info.json
deleted file mode 100644
index 7928430015d..00000000000
--- a/keyboards/viktus/minne_topre/info.json
+++ /dev/null
@@ -1,256 +0,0 @@
-{
-    "manufacturer": "Viktus Design LLC",
-    "keyboard_name": "Viktus Minne - Topre",
-    "maintainer": "BlindAssassin111",
-    "url": "https://viktus.design",
-    "usb": {
-        "device_version": "1.3.0",
-        "vid": "0x5644",
-        "pid": "0x4D54"
-    },
-    "bootloader": "atmel-dfu",
-    "processor": "atmega32u4",
-    "features": {
-        "bootmagic": true,
-        "command": false,
-        "console": false,
-        "extrakey": true,
-        "mousekey": true,
-        "nkro": true
-    },
-    "bootmagic": {
-        "matrix": [0, 0]
-    },
-    "build": {
-        "lto": true
-    },
-    "diode_direction": "COL2ROW",
-    "matrix_pins": {
-        "cols": ["B7", "D0", "B6", "D6", "C6", "C7", "D7", "F7", "B4", "F6", "F5", "B5"],
-        "rows": ["A0", "A1", "A3", "A4"]
-    },
-    "layouts": {
-        "LAYOUT_all": {
-            "layout": [
-                {"label": "K00", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "K01", "matrix": [0, 1], "x": 1, "y": 0},
-                {"label": "K02", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "K03", "matrix": [0, 3], "x": 3, "y": 0},
-                {"label": "K04", "matrix": [0, 4], "x": 4, "y": 0},
-                {"label": "K05", "matrix": [0, 5], "x": 5, "y": 0},
-                {"label": "K06", "matrix": [0, 6], "x": 6, "y": 0},
-                {"label": "K07", "matrix": [0, 7], "x": 7, "y": 0},
-                {"label": "K08", "matrix": [0, 8], "x": 8, "y": 0},
-                {"label": "K09", "matrix": [0, 9], "x": 9, "y": 0},
-                {"label": "K0A", "matrix": [0, 10], "x": 10, "y": 0},
-                {"label": "K0B", "matrix": [0, 11], "w": 1.75, "x": 11, "y": 0},
-                {"label": "K10", "matrix": [1, 0], "w": 1.25, "x": 0, "y": 1},
-                {"label": "K11", "matrix": [1, 1], "x": 1.25, "y": 1},
-                {"label": "K12", "matrix": [1, 2], "x": 2.25, "y": 1},
-                {"label": "K13", "matrix": [1, 3], "x": 3.25, "y": 1},
-                {"label": "K14", "matrix": [1, 4], "x": 4.25, "y": 1},
-                {"label": "K15", "matrix": [1, 5], "x": 5.25, "y": 1},
-                {"label": "K16", "matrix": [1, 6], "x": 6.25, "y": 1},
-                {"label": "K17", "matrix": [1, 7], "x": 7.25, "y": 1},
-                {"label": "K18", "matrix": [1, 8], "x": 8.25, "y": 1},
-                {"label": "K19", "matrix": [1, 9], "x": 9.25, "y": 1},
-                {"label": "K1A", "matrix": [1, 10], "x": 10.25, "y": 1},
-                {"label": "K1B", "matrix": [1, 11], "w": 1.5, "x": 11.25, "y": 1},
-                {"label": "K20", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2},
-                {"label": "K21", "matrix": [2, 1], "x": 1.75, "y": 2},
-                {"label": "K22", "matrix": [2, 2], "x": 2.75, "y": 2},
-                {"label": "K23", "matrix": [2, 3], "x": 3.75, "y": 2},
-                {"label": "K24", "matrix": [2, 4], "x": 4.75, "y": 2},
-                {"label": "K25", "matrix": [2, 5], "x": 5.75, "y": 2},
-                {"label": "K26", "matrix": [2, 6], "x": 6.75, "y": 2},
-                {"label": "K27", "matrix": [2, 7], "x": 7.75, "y": 2},
-                {"label": "K28", "matrix": [2, 8], "x": 8.75, "y": 2},
-                {"label": "K29", "matrix": [2, 9], "x": 9.75, "y": 2},
-                {"label": "K2A", "matrix": [2, 10], "x": 10.75, "y": 2},
-                {"label": "K2B", "matrix": [2, 11], "x": 11.75, "y": 2},
-                {"label": "K31", "matrix": [3, 1], "x": 1.375, "y": 3},
-                {"label": "K32", "matrix": [3, 2], "x": 2.375, "y": 3},
-                {"label": "K34", "matrix": [3, 4], "w": 2.5, "x": 3.375, "y": 3},
-                {"label": "K35", "matrix": [3, 5], "x": 5.875, "y": 3},
-                {"label": "K37", "matrix": [3, 7], "w": 2.5, "x": 6.875, "y": 3},
-                {"label": "K39", "matrix": [3, 9], "x": 9.375, "y": 3},
-                {"label": "K3A", "matrix": [3, 10], "x": 10.375, "y": 3}
-            ]
-        },
-        "LAYOUT_dual_3u": {
-            "layout": [
-                {"label": "K00", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "K01", "matrix": [0, 1], "x": 1, "y": 0},
-                {"label": "K02", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "K03", "matrix": [0, 3], "x": 3, "y": 0},
-                {"label": "K04", "matrix": [0, 4], "x": 4, "y": 0},
-                {"label": "K05", "matrix": [0, 5], "x": 5, "y": 0},
-                {"label": "K06", "matrix": [0, 6], "x": 6, "y": 0},
-                {"label": "K07", "matrix": [0, 7], "x": 7, "y": 0},
-                {"label": "K08", "matrix": [0, 8], "x": 8, "y": 0},
-                {"label": "K09", "matrix": [0, 9], "x": 9, "y": 0},
-                {"label": "K0A", "matrix": [0, 10], "x": 10, "y": 0},
-                {"label": "K0B", "matrix": [0, 11], "w": 1.75, "x": 11, "y": 0},
-                {"label": "K10", "matrix": [1, 0], "w": 1.25, "x": 0, "y": 1},
-                {"label": "K11", "matrix": [1, 1], "x": 1.25, "y": 1},
-                {"label": "K12", "matrix": [1, 2], "x": 2.25, "y": 1},
-                {"label": "K13", "matrix": [1, 3], "x": 3.25, "y": 1},
-                {"label": "K14", "matrix": [1, 4], "x": 4.25, "y": 1},
-                {"label": "K15", "matrix": [1, 5], "x": 5.25, "y": 1},
-                {"label": "K16", "matrix": [1, 6], "x": 6.25, "y": 1},
-                {"label": "K17", "matrix": [1, 7], "x": 7.25, "y": 1},
-                {"label": "K18", "matrix": [1, 8], "x": 8.25, "y": 1},
-                {"label": "K19", "matrix": [1, 9], "x": 9.25, "y": 1},
-                {"label": "K1A", "matrix": [1, 10], "x": 10.25, "y": 1},
-                {"label": "K1B", "matrix": [1, 11], "w": 1.5, "x": 11.25, "y": 1},
-                {"label": "K20", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2},
-                {"label": "K21", "matrix": [2, 1], "x": 1.75, "y": 2},
-                {"label": "K22", "matrix": [2, 2], "x": 2.75, "y": 2},
-                {"label": "K23", "matrix": [2, 3], "x": 3.75, "y": 2},
-                {"label": "K24", "matrix": [2, 4], "x": 4.75, "y": 2},
-                {"label": "K25", "matrix": [2, 5], "x": 5.75, "y": 2},
-                {"label": "K26", "matrix": [2, 6], "x": 6.75, "y": 2},
-                {"label": "K27", "matrix": [2, 7], "x": 7.75, "y": 2},
-                {"label": "K28", "matrix": [2, 8], "x": 8.75, "y": 2},
-                {"label": "K29", "matrix": [2, 9], "x": 9.75, "y": 2},
-                {"label": "K2A", "matrix": [2, 10], "x": 10.75, "y": 2},
-                {"label": "K2B", "matrix": [2, 11], "x": 11.75, "y": 2},
-                {"label": "K31", "matrix": [3, 1], "x": 1.375, "y": 3},
-                {"label": "K32", "matrix": [3, 2], "x": 2.375, "y": 3},
-                {"label": "K34", "matrix": [3, 4], "w": 3, "x": 3.375, "y": 3},
-                {"label": "K37", "matrix": [3, 7], "w": 3, "x": 6.375, "y": 3},
-                {"label": "K39", "matrix": [3, 9], "x": 9.375, "y": 3},
-                {"label": "K3A", "matrix": [3, 10], "x": 10.375, "y": 3}
-            ]
-        },
-        "LAYOUT_6u": {
-            "layout": [
-                {"label": "K00", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "K01", "matrix": [0, 1], "x": 1, "y": 0},
-                {"label": "K02", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "K03", "matrix": [0, 3], "x": 3, "y": 0},
-                {"label": "K04", "matrix": [0, 4], "x": 4, "y": 0},
-                {"label": "K05", "matrix": [0, 5], "x": 5, "y": 0},
-                {"label": "K06", "matrix": [0, 6], "x": 6, "y": 0},
-                {"label": "K07", "matrix": [0, 7], "x": 7, "y": 0},
-                {"label": "K08", "matrix": [0, 8], "x": 8, "y": 0},
-                {"label": "K09", "matrix": [0, 9], "x": 9, "y": 0},
-                {"label": "K0A", "matrix": [0, 10], "x": 10, "y": 0},
-                {"label": "K0B", "matrix": [0, 11], "w": 1.75, "x": 11, "y": 0},
-                {"label": "K10", "matrix": [1, 0], "w": 1.25, "x": 0, "y": 1},
-                {"label": "K11", "matrix": [1, 1], "x": 1.25, "y": 1},
-                {"label": "K12", "matrix": [1, 2], "x": 2.25, "y": 1},
-                {"label": "K13", "matrix": [1, 3], "x": 3.25, "y": 1},
-                {"label": "K14", "matrix": [1, 4], "x": 4.25, "y": 1},
-                {"label": "K15", "matrix": [1, 5], "x": 5.25, "y": 1},
-                {"label": "K16", "matrix": [1, 6], "x": 6.25, "y": 1},
-                {"label": "K17", "matrix": [1, 7], "x": 7.25, "y": 1},
-                {"label": "K18", "matrix": [1, 8], "x": 8.25, "y": 1},
-                {"label": "K19", "matrix": [1, 9], "x": 9.25, "y": 1},
-                {"label": "K1A", "matrix": [1, 10], "x": 10.25, "y": 1},
-                {"label": "K1B", "matrix": [1, 11], "w": 1.5, "x": 11.25, "y": 1},
-                {"label": "K20", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2},
-                {"label": "K21", "matrix": [2, 1], "x": 1.75, "y": 2},
-                {"label": "K22", "matrix": [2, 2], "x": 2.75, "y": 2},
-                {"label": "K23", "matrix": [2, 3], "x": 3.75, "y": 2},
-                {"label": "K24", "matrix": [2, 4], "x": 4.75, "y": 2},
-                {"label": "K25", "matrix": [2, 5], "x": 5.75, "y": 2},
-                {"label": "K26", "matrix": [2, 6], "x": 6.75, "y": 2},
-                {"label": "K27", "matrix": [2, 7], "x": 7.75, "y": 2},
-                {"label": "K28", "matrix": [2, 8], "x": 8.75, "y": 2},
-                {"label": "K29", "matrix": [2, 9], "x": 9.75, "y": 2},
-                {"label": "K2A", "matrix": [2, 10], "x": 10.75, "y": 2},
-                {"label": "K2B", "matrix": [2, 11], "x": 11.75, "y": 2},
-                {"label": "K31", "matrix": [3, 1], "x": 1.375, "y": 3},
-                {"label": "K32", "matrix": [3, 2], "x": 2.375, "y": 3},
-                {"label": "K35", "matrix": [3, 5], "w": 6, "x": 3.375, "y": 3},
-                {"label": "K39", "matrix": [3, 9], "x": 9.375, "y": 3},
-                {"label": "K3A", "matrix": [3, 10], "x": 10.375, "y": 3}
-            ]
-        },
-        "LAYOUT_7u": {
-            "layout": [
-                {"label": "K00", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "K01", "matrix": [0, 1], "x": 1, "y": 0},
-                {"label": "K02", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "K03", "matrix": [0, 3], "x": 3, "y": 0},
-                {"label": "K04", "matrix": [0, 4], "x": 4, "y": 0},
-                {"label": "K05", "matrix": [0, 5], "x": 5, "y": 0},
-                {"label": "K06", "matrix": [0, 6], "x": 6, "y": 0},
-                {"label": "K07", "matrix": [0, 7], "x": 7, "y": 0},
-                {"label": "K08", "matrix": [0, 8], "x": 8, "y": 0},
-                {"label": "K09", "matrix": [0, 9], "x": 9, "y": 0},
-                {"label": "K0A", "matrix": [0, 10], "x": 10, "y": 0},
-                {"label": "K0B", "matrix": [0, 11], "w": 1.75, "x": 11, "y": 0},
-                {"label": "K10", "matrix": [1, 0], "w": 1.25, "x": 0, "y": 1},
-                {"label": "K11", "matrix": [1, 1], "x": 1.25, "y": 1},
-                {"label": "K12", "matrix": [1, 2], "x": 2.25, "y": 1},
-                {"label": "K13", "matrix": [1, 3], "x": 3.25, "y": 1},
-                {"label": "K14", "matrix": [1, 4], "x": 4.25, "y": 1},
-                {"label": "K15", "matrix": [1, 5], "x": 5.25, "y": 1},
-                {"label": "K16", "matrix": [1, 6], "x": 6.25, "y": 1},
-                {"label": "K17", "matrix": [1, 7], "x": 7.25, "y": 1},
-                {"label": "K18", "matrix": [1, 8], "x": 8.25, "y": 1},
-                {"label": "K19", "matrix": [1, 9], "x": 9.25, "y": 1},
-                {"label": "K1A", "matrix": [1, 10], "x": 10.25, "y": 1},
-                {"label": "K1B", "matrix": [1, 11], "w": 1.5, "x": 11.25, "y": 1},
-                {"label": "K20", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2},
-                {"label": "K21", "matrix": [2, 1], "x": 1.75, "y": 2},
-                {"label": "K22", "matrix": [2, 2], "x": 2.75, "y": 2},
-                {"label": "K23", "matrix": [2, 3], "x": 3.75, "y": 2},
-                {"label": "K24", "matrix": [2, 4], "x": 4.75, "y": 2},
-                {"label": "K25", "matrix": [2, 5], "x": 5.75, "y": 2},
-                {"label": "K26", "matrix": [2, 6], "x": 6.75, "y": 2},
-                {"label": "K27", "matrix": [2, 7], "x": 7.75, "y": 2},
-                {"label": "K28", "matrix": [2, 8], "x": 8.75, "y": 2},
-                {"label": "K29", "matrix": [2, 9], "x": 9.75, "y": 2},
-                {"label": "K2A", "matrix": [2, 10], "x": 10.75, "y": 2},
-                {"label": "K2B", "matrix": [2, 11], "x": 11.75, "y": 2},
-                {"label": "K31", "matrix": [3, 1], "w": 1.5, "x": 1.375, "y": 3},
-                {"label": "K35", "matrix": [3, 5], "w": 7, "x": 2.875, "y": 3},
-                {"label": "K3A", "matrix": [3, 10], "w": 1.5, "x": 9.875, "y": 3}
-            ]
-        },
-        "LAYOUT_10u": {
-            "layout": [
-                {"label": "K00", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "K01", "matrix": [0, 1], "x": 1, "y": 0},
-                {"label": "K02", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "K03", "matrix": [0, 3], "x": 3, "y": 0},
-                {"label": "K04", "matrix": [0, 4], "x": 4, "y": 0},
-                {"label": "K05", "matrix": [0, 5], "x": 5, "y": 0},
-                {"label": "K06", "matrix": [0, 6], "x": 6, "y": 0},
-                {"label": "K07", "matrix": [0, 7], "x": 7, "y": 0},
-                {"label": "K08", "matrix": [0, 8], "x": 8, "y": 0},
-                {"label": "K09", "matrix": [0, 9], "x": 9, "y": 0},
-                {"label": "K0A", "matrix": [0, 10], "x": 10, "y": 0},
-                {"label": "K0B", "matrix": [0, 11], "w": 1.75, "x": 11, "y": 0},
-                {"label": "K10", "matrix": [1, 0], "w": 1.25, "x": 0, "y": 1},
-                {"label": "K11", "matrix": [1, 1], "x": 1.25, "y": 1},
-                {"label": "K12", "matrix": [1, 2], "x": 2.25, "y": 1},
-                {"label": "K13", "matrix": [1, 3], "x": 3.25, "y": 1},
-                {"label": "K14", "matrix": [1, 4], "x": 4.25, "y": 1},
-                {"label": "K15", "matrix": [1, 5], "x": 5.25, "y": 1},
-                {"label": "K16", "matrix": [1, 6], "x": 6.25, "y": 1},
-                {"label": "K17", "matrix": [1, 7], "x": 7.25, "y": 1},
-                {"label": "K18", "matrix": [1, 8], "x": 8.25, "y": 1},
-                {"label": "K19", "matrix": [1, 9], "x": 9.25, "y": 1},
-                {"label": "K1A", "matrix": [1, 10], "x": 10.25, "y": 1},
-                {"label": "K1B", "matrix": [1, 11], "w": 1.5, "x": 11.25, "y": 1},
-                {"label": "K20", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2},
-                {"label": "K21", "matrix": [2, 1], "x": 1.75, "y": 2},
-                {"label": "K22", "matrix": [2, 2], "x": 2.75, "y": 2},
-                {"label": "K23", "matrix": [2, 3], "x": 3.75, "y": 2},
-                {"label": "K24", "matrix": [2, 4], "x": 4.75, "y": 2},
-                {"label": "K25", "matrix": [2, 5], "x": 5.75, "y": 2},
-                {"label": "K26", "matrix": [2, 6], "x": 6.75, "y": 2},
-                {"label": "K27", "matrix": [2, 7], "x": 7.75, "y": 2},
-                {"label": "K28", "matrix": [2, 8], "x": 8.75, "y": 2},
-                {"label": "K29", "matrix": [2, 9], "x": 9.75, "y": 2},
-                {"label": "K2A", "matrix": [2, 10], "x": 10.75, "y": 2},
-                {"label": "K2B", "matrix": [2, 11], "x": 11.75, "y": 2},
-                {"label": "K35", "matrix": [3, 5], "w": 10, "x": 1.375, "y": 3}
-            ]
-        }
-    }
-}
diff --git a/keyboards/viktus/minne_topre/keyboard.json b/keyboards/viktus/minne_topre/keyboard.json
new file mode 100644
index 00000000000..6919e7f9ccd
--- /dev/null
+++ b/keyboards/viktus/minne_topre/keyboard.json
@@ -0,0 +1,253 @@
+{
+    "manufacturer": "Viktus Design LLC",
+    "keyboard_name": "Viktus Minne - Topre",
+    "maintainer": "BlindAssassin111",
+    "url": "https://viktus.design",
+    "usb": {
+        "device_version": "1.3.0",
+        "vid": "0x5644",
+        "pid": "0x4D54"
+    },
+    "bootloader": "atmel-dfu",
+    "processor": "atmega32u4",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "build": {
+        "lto": true
+    },
+    "diode_direction": "COL2ROW",
+    "matrix_pins": {
+        "cols": ["B7", "D0", "B6", "D6", "C6", "C7", "D7", "F7", "B4", "F6", "F5", "B5"],
+        "rows": ["A0", "A1", "A3", "A4"]
+    },
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                {"label": "K00", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "K01", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "K02", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "K03", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "K04", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "K05", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "K06", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "K07", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "K08", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "K09", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "K0A", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "K0B", "matrix": [0, 11], "w": 1.75, "x": 11, "y": 0},
+                {"label": "K10", "matrix": [1, 0], "w": 1.25, "x": 0, "y": 1},
+                {"label": "K11", "matrix": [1, 1], "x": 1.25, "y": 1},
+                {"label": "K12", "matrix": [1, 2], "x": 2.25, "y": 1},
+                {"label": "K13", "matrix": [1, 3], "x": 3.25, "y": 1},
+                {"label": "K14", "matrix": [1, 4], "x": 4.25, "y": 1},
+                {"label": "K15", "matrix": [1, 5], "x": 5.25, "y": 1},
+                {"label": "K16", "matrix": [1, 6], "x": 6.25, "y": 1},
+                {"label": "K17", "matrix": [1, 7], "x": 7.25, "y": 1},
+                {"label": "K18", "matrix": [1, 8], "x": 8.25, "y": 1},
+                {"label": "K19", "matrix": [1, 9], "x": 9.25, "y": 1},
+                {"label": "K1A", "matrix": [1, 10], "x": 10.25, "y": 1},
+                {"label": "K1B", "matrix": [1, 11], "w": 1.5, "x": 11.25, "y": 1},
+                {"label": "K20", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2},
+                {"label": "K21", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "K22", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "K23", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "K24", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "K25", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "K26", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "K27", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K28", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "K29", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": "K2A", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "K2B", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "K31", "matrix": [3, 1], "x": 1.375, "y": 3},
+                {"label": "K32", "matrix": [3, 2], "x": 2.375, "y": 3},
+                {"label": "K34", "matrix": [3, 4], "w": 2.5, "x": 3.375, "y": 3},
+                {"label": "K35", "matrix": [3, 5], "x": 5.875, "y": 3},
+                {"label": "K37", "matrix": [3, 7], "w": 2.5, "x": 6.875, "y": 3},
+                {"label": "K39", "matrix": [3, 9], "x": 9.375, "y": 3},
+                {"label": "K3A", "matrix": [3, 10], "x": 10.375, "y": 3}
+            ]
+        },
+        "LAYOUT_dual_3u": {
+            "layout": [
+                {"label": "K00", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "K01", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "K02", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "K03", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "K04", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "K05", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "K06", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "K07", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "K08", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "K09", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "K0A", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "K0B", "matrix": [0, 11], "w": 1.75, "x": 11, "y": 0},
+                {"label": "K10", "matrix": [1, 0], "w": 1.25, "x": 0, "y": 1},
+                {"label": "K11", "matrix": [1, 1], "x": 1.25, "y": 1},
+                {"label": "K12", "matrix": [1, 2], "x": 2.25, "y": 1},
+                {"label": "K13", "matrix": [1, 3], "x": 3.25, "y": 1},
+                {"label": "K14", "matrix": [1, 4], "x": 4.25, "y": 1},
+                {"label": "K15", "matrix": [1, 5], "x": 5.25, "y": 1},
+                {"label": "K16", "matrix": [1, 6], "x": 6.25, "y": 1},
+                {"label": "K17", "matrix": [1, 7], "x": 7.25, "y": 1},
+                {"label": "K18", "matrix": [1, 8], "x": 8.25, "y": 1},
+                {"label": "K19", "matrix": [1, 9], "x": 9.25, "y": 1},
+                {"label": "K1A", "matrix": [1, 10], "x": 10.25, "y": 1},
+                {"label": "K1B", "matrix": [1, 11], "w": 1.5, "x": 11.25, "y": 1},
+                {"label": "K20", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2},
+                {"label": "K21", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "K22", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "K23", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "K24", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "K25", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "K26", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "K27", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K28", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "K29", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": "K2A", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "K2B", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "K31", "matrix": [3, 1], "x": 1.375, "y": 3},
+                {"label": "K32", "matrix": [3, 2], "x": 2.375, "y": 3},
+                {"label": "K34", "matrix": [3, 4], "w": 3, "x": 3.375, "y": 3},
+                {"label": "K37", "matrix": [3, 7], "w": 3, "x": 6.375, "y": 3},
+                {"label": "K39", "matrix": [3, 9], "x": 9.375, "y": 3},
+                {"label": "K3A", "matrix": [3, 10], "x": 10.375, "y": 3}
+            ]
+        },
+        "LAYOUT_6u": {
+            "layout": [
+                {"label": "K00", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "K01", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "K02", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "K03", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "K04", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "K05", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "K06", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "K07", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "K08", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "K09", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "K0A", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "K0B", "matrix": [0, 11], "w": 1.75, "x": 11, "y": 0},
+                {"label": "K10", "matrix": [1, 0], "w": 1.25, "x": 0, "y": 1},
+                {"label": "K11", "matrix": [1, 1], "x": 1.25, "y": 1},
+                {"label": "K12", "matrix": [1, 2], "x": 2.25, "y": 1},
+                {"label": "K13", "matrix": [1, 3], "x": 3.25, "y": 1},
+                {"label": "K14", "matrix": [1, 4], "x": 4.25, "y": 1},
+                {"label": "K15", "matrix": [1, 5], "x": 5.25, "y": 1},
+                {"label": "K16", "matrix": [1, 6], "x": 6.25, "y": 1},
+                {"label": "K17", "matrix": [1, 7], "x": 7.25, "y": 1},
+                {"label": "K18", "matrix": [1, 8], "x": 8.25, "y": 1},
+                {"label": "K19", "matrix": [1, 9], "x": 9.25, "y": 1},
+                {"label": "K1A", "matrix": [1, 10], "x": 10.25, "y": 1},
+                {"label": "K1B", "matrix": [1, 11], "w": 1.5, "x": 11.25, "y": 1},
+                {"label": "K20", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2},
+                {"label": "K21", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "K22", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "K23", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "K24", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "K25", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "K26", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "K27", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K28", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "K29", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": "K2A", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "K2B", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "K31", "matrix": [3, 1], "x": 1.375, "y": 3},
+                {"label": "K32", "matrix": [3, 2], "x": 2.375, "y": 3},
+                {"label": "K35", "matrix": [3, 5], "w": 6, "x": 3.375, "y": 3},
+                {"label": "K39", "matrix": [3, 9], "x": 9.375, "y": 3},
+                {"label": "K3A", "matrix": [3, 10], "x": 10.375, "y": 3}
+            ]
+        },
+        "LAYOUT_7u": {
+            "layout": [
+                {"label": "K00", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "K01", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "K02", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "K03", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "K04", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "K05", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "K06", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "K07", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "K08", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "K09", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "K0A", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "K0B", "matrix": [0, 11], "w": 1.75, "x": 11, "y": 0},
+                {"label": "K10", "matrix": [1, 0], "w": 1.25, "x": 0, "y": 1},
+                {"label": "K11", "matrix": [1, 1], "x": 1.25, "y": 1},
+                {"label": "K12", "matrix": [1, 2], "x": 2.25, "y": 1},
+                {"label": "K13", "matrix": [1, 3], "x": 3.25, "y": 1},
+                {"label": "K14", "matrix": [1, 4], "x": 4.25, "y": 1},
+                {"label": "K15", "matrix": [1, 5], "x": 5.25, "y": 1},
+                {"label": "K16", "matrix": [1, 6], "x": 6.25, "y": 1},
+                {"label": "K17", "matrix": [1, 7], "x": 7.25, "y": 1},
+                {"label": "K18", "matrix": [1, 8], "x": 8.25, "y": 1},
+                {"label": "K19", "matrix": [1, 9], "x": 9.25, "y": 1},
+                {"label": "K1A", "matrix": [1, 10], "x": 10.25, "y": 1},
+                {"label": "K1B", "matrix": [1, 11], "w": 1.5, "x": 11.25, "y": 1},
+                {"label": "K20", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2},
+                {"label": "K21", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "K22", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "K23", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "K24", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "K25", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "K26", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "K27", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K28", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "K29", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": "K2A", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "K2B", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "K31", "matrix": [3, 1], "w": 1.5, "x": 1.375, "y": 3},
+                {"label": "K35", "matrix": [3, 5], "w": 7, "x": 2.875, "y": 3},
+                {"label": "K3A", "matrix": [3, 10], "w": 1.5, "x": 9.875, "y": 3}
+            ]
+        },
+        "LAYOUT_10u": {
+            "layout": [
+                {"label": "K00", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "K01", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "K02", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "K03", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "K04", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "K05", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "K06", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "K07", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "K08", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "K09", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "K0A", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "K0B", "matrix": [0, 11], "w": 1.75, "x": 11, "y": 0},
+                {"label": "K10", "matrix": [1, 0], "w": 1.25, "x": 0, "y": 1},
+                {"label": "K11", "matrix": [1, 1], "x": 1.25, "y": 1},
+                {"label": "K12", "matrix": [1, 2], "x": 2.25, "y": 1},
+                {"label": "K13", "matrix": [1, 3], "x": 3.25, "y": 1},
+                {"label": "K14", "matrix": [1, 4], "x": 4.25, "y": 1},
+                {"label": "K15", "matrix": [1, 5], "x": 5.25, "y": 1},
+                {"label": "K16", "matrix": [1, 6], "x": 6.25, "y": 1},
+                {"label": "K17", "matrix": [1, 7], "x": 7.25, "y": 1},
+                {"label": "K18", "matrix": [1, 8], "x": 8.25, "y": 1},
+                {"label": "K19", "matrix": [1, 9], "x": 9.25, "y": 1},
+                {"label": "K1A", "matrix": [1, 10], "x": 10.25, "y": 1},
+                {"label": "K1B", "matrix": [1, 11], "w": 1.5, "x": 11.25, "y": 1},
+                {"label": "K20", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2},
+                {"label": "K21", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "K22", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "K23", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "K24", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "K25", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "K26", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "K27", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K28", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "K29", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": "K2A", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "K2B", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "K35", "matrix": [3, 5], "w": 10, "x": 1.375, "y": 3}
+            ]
+        }
+    }
+}
diff --git a/keyboards/viktus/osav2_numpad_topre/info.json b/keyboards/viktus/osav2_numpad_topre/keyboard.json
similarity index 100%
rename from keyboards/viktus/osav2_numpad_topre/info.json
rename to keyboards/viktus/osav2_numpad_topre/keyboard.json
diff --git a/keyboards/viktus/osav2_topre/info.json b/keyboards/viktus/osav2_topre/keyboard.json
similarity index 100%
rename from keyboards/viktus/osav2_topre/info.json
rename to keyboards/viktus/osav2_topre/keyboard.json
diff --git a/keyboards/viktus/sp111/info.json b/keyboards/viktus/sp111/info.json
deleted file mode 100644
index 67f5b63bcaf..00000000000
--- a/keyboards/viktus/sp111/info.json
+++ /dev/null
@@ -1,745 +0,0 @@
-{
-    "keyboard_name": "SP111",
-    "manufacturer": "Viktus Design LLC",
-    "url": "https://thekey.company/products/sp-111",
-    "maintainer": "blindassassin111",
-    "usb": {
-        "vid": "0x5644",
-        "pid": "0x5111",
-        "device_version": "0.0.1"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "layouts": {
-        "LAYOUT_all": {
-            "layout": [
-                {"label": "F13", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "F14", "matrix": [0, 1], "x": 1, "y": 0},
-                {"label": "F15", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "F16", "matrix": [0, 3], "x": 3, "y": 0},
-
-                {"label": "Esc", "matrix": [0, 4], "x": 4.5, "y": 0},
-
-                {"label": "F1", "matrix": [0, 5], "x": 5.75, "y": 0},
-                {"label": "F2", "matrix": [0, 6], "x": 6.75, "y": 0},
-                {"label": "F3", "matrix": [0, 7], "x": 7.75, "y": 0},
-                {"label": "F4", "matrix": [0, 8], "x": 8.75, "y": 0},
-
-                {"label": "F5", "matrix": [0, 9], "x": 10, "y": 0},
-                {"label": "F6", "matrix": [0, 10], "x": 11, "y": 0},
-
-                {"label": "F7", "matrix": [6, 1], "x": 12.75, "y": 0},
-                {"label": "F8", "matrix": [6, 2], "x": 13.75, "y": 0},
-
-                {"label": "F9", "matrix": [6, 3], "x": 15, "y": 0},
-                {"label": "F10", "matrix": [6, 4], "x": 16, "y": 0},
-                {"label": "F11", "matrix": [6, 5], "x": 17, "y": 0},
-                {"label": "F12", "matrix": [6, 6], "x": 18, "y": 0},
-
-                {"label": "Print Screen", "matrix": [6, 7], "x": 19.25, "y": 0},
-
-                {"label": "Scroll Lock", "matrix": [6, 8], "x": 20.5, "y": 0},
-                {"label": "Pause", "matrix": [6, 9], "x": 21.5, "y": 0},
-
-                {"label": "Num Lock", "matrix": [1, 0], "x": 0, "y": 1.5},
-                {"label": "/", "matrix": [1, 1], "x": 1, "y": 1.5},
-                {"label": "*", "matrix": [1, 2], "x": 2, "y": 1.5},
-                {"label": "-", "matrix": [1, 3], "x": 3, "y": 1.5},
-
-                {"label": "`", "matrix": [1, 4], "x": 4.5, "y": 1.5},
-                {"label": "1", "matrix": [1, 5], "x": 5.5, "y": 1.5},
-                {"label": "2", "matrix": [1, 6], "x": 6.5, "y": 1.5},
-                {"label": "3", "matrix": [1, 7], "x": 7.5, "y": 1.5},
-                {"label": "4", "matrix": [1, 8], "x": 8.5, "y": 1.5},
-                {"label": "5", "matrix": [1, 9], "x": 9.5, "y": 1.5},
-                {"label": "6", "matrix": [1, 10], "x": 10.5, "y": 1.5},
-
-                {"label": "7", "matrix": [7, 0], "x": 12.25, "y": 1.5},
-                {"label": "8", "matrix": [7, 1], "x": 13.25, "y": 1.5},
-                {"label": "9", "matrix": [7, 2], "x": 14.25, "y": 1.5},
-                {"label": "0", "matrix": [7, 3], "x": 15.25, "y": 1.5},
-                {"label": "-", "matrix": [7, 4], "x": 16.25, "y": 1.5},
-                {"label": "=", "matrix": [7, 5], "x": 17.25, "y": 1.5},
-                {"label": "Backspace", "matrix": [7, 6], "x": 18.25, "y": 1.5},
-                {"label": "Delete", "matrix": [7, 7], "x": 19.25, "y": 1.5},
-
-                {"label": "Home", "matrix": [7, 8], "x": 20.5, "y": 1.5},
-                {"label": "Insert", "matrix": [7, 9], "x": 21.5, "y": 1.5},
-
-                {"label": "7", "matrix": [2, 0], "x": 0, "y": 2.5},
-                {"label": "8", "matrix": [2, 1], "x": 1, "y": 2.5},
-                {"label": "9", "matrix": [2, 2], "x": 2, "y": 2.5},
-                {"label": "+", "matrix": [2, 3], "x": 3, "y": 2.5},
-
-                {"label": "Tab", "matrix": [2, 4], "x": 4.5, "y": 2.5, "w": 1.5},
-                {"label": "Q", "matrix": [2, 5], "x": 6, "y": 2.5},
-                {"label": "W", "matrix": [2, 6], "x": 7, "y": 2.5},
-                {"label": "E", "matrix": [2, 7], "x": 8, "y": 2.5},
-                {"label": "R", "matrix": [2, 8], "x": 9, "y": 2.5},
-                {"label": "T", "matrix": [2, 9], "x": 10, "y": 2.5},
-
-                {"label": "Y", "matrix": [8, 0], "x": 11.75, "y": 2.5},
-                {"label": "U", "matrix": [8, 1], "x": 12.75, "y": 2.5},
-                {"label": "I", "matrix": [8, 2], "x": 13.75, "y": 2.5},
-                {"label": "O", "matrix": [8, 3], "x": 14.75, "y": 2.5},
-                {"label": "P", "matrix": [8, 4], "x": 15.75, "y": 2.5},
-                {"label": "[", "matrix": [8, 5], "x": 16.75, "y": 2.5},
-                {"label": "]", "matrix": [8, 6], "x": 17.75, "y": 2.5},
-                {"label": "\\", "matrix": [8, 7], "x": 18.75, "y": 2.5, "w": 1.5},
-
-                {"label": "End", "matrix": [8, 8], "x": 20.5, "y": 2.5},
-                {"label": "Delete", "matrix": [8, 9], "x": 21.5, "y": 2.5},
-
-                {"label": "4", "matrix": [3, 0], "x": 0, "y": 3.5},
-                {"label": "5", "matrix": [3, 1], "x": 1, "y": 3.5},
-                {"label": "6", "matrix": [3, 2], "x": 2, "y": 3.5},
-                {"label": "=", "matrix": [3, 3], "x": 3, "y": 3.5},
-
-                {"label": "Caps Lock", "matrix": [3, 4], "x": 4.5, "y": 3.5, "w": 1.75},
-                {"label": "A", "matrix": [3, 5], "x": 6.25, "y": 3.5},
-                {"label": "S", "matrix": [3, 6], "x": 7.25, "y": 3.5},
-                {"label": "D", "matrix": [3, 7], "x": 8.25, "y": 3.5},
-                {"label": "F", "matrix": [3, 8], "x": 9.25, "y": 3.5},
-                {"label": "G", "matrix": [3, 9], "x": 10.25, "y": 3.5},
-
-                {"label": "H", "matrix": [9, 0], "x": 12, "y": 3.5},
-                {"label": "J", "matrix": [9, 1], "x": 13, "y": 3.5},
-                {"label": "K", "matrix": [9, 2], "x": 14, "y": 3.5},
-                {"label": "L", "matrix": [9, 3], "x": 15, "y": 3.5},
-                {"label": ";", "matrix": [9, 4], "x": 16, "y": 3.5},
-                {"label": "'", "matrix": [9, 5], "x": 17, "y": 3.5},
-                {"label": "#", "matrix": [9, 6], "x": 18, "y": 3.5},
-                {"label": "Enter", "matrix": [9, 7], "x": 19, "y": 3.5, "w": 1.25},
-
-                {"label": "Page Up", "matrix": [9, 8], "x": 20.5, "y": 3.5},
-                {"label": "Page Down", "matrix": [9, 9], "x": 21.5, "y": 3.5},
-
-                {"label": "1", "matrix": [4, 0], "x": 0, "y": 4.5},
-                {"label": "2", "matrix": [4, 1], "x": 1, "y": 4.5},
-                {"label": "3", "matrix": [4, 2], "x": 2, "y": 4.5},
-                {"label": "Enter", "matrix": [4, 3], "x": 3, "y": 4.5},
-
-                {"label": "Shift", "matrix": [4, 4], "x": 4.5, "y": 4.5, "w": 1.25},
-                {"label": "\\", "matrix": [4, 5], "x": 5.75, "y": 4.5},
-                {"label": "Z", "matrix": [4, 6], "x": 6.75, "y": 4.5},
-                {"label": "X", "matrix": [4, 7], "x": 7.75, "y": 4.5},
-                {"label": "C", "matrix": [4, 8], "x": 8.75, "y": 4.5},
-                {"label": "V", "matrix": [4, 9], "x": 9.75, "y": 4.5},
-                {"label": "B", "matrix": [4, 10], "x": 10.75, "y": 4.5},
-
-                {"label": "N", "matrix": [10, 1], "x": 12.5, "y": 4.5},
-                {"label": "M", "matrix": [10, 2], "x": 13.5, "y": 4.5},
-                {"label": ",", "matrix": [10, 3], "x": 14.5, "y": 4.5},
-                {"label": ".", "matrix": [10, 4], "x": 15.5, "y": 4.5},
-                {"label": "/", "matrix": [10, 5], "x": 16.5, "y": 4.5},
-                {"label": "Shift", "matrix": [10, 6], "x": 17.5, "y": 4.5, "w": 1.75},
-                {"label": "Fn", "matrix": [10, 7], "x": 19.25, "y": 4.5},
-
-                {"label": "\u2191", "matrix": [10, 8], "x": 20.5, "y": 4.75},
-
-                {"label": "0", "matrix": [5, 0], "x": 0, "y": 5.5},
-                {"label": "0", "matrix": [5, 1], "x": 1, "y": 5.5},
-                {"label": "00", "matrix": [5, 2], "x": 2, "y": 5.5},
-                {"label": ".", "matrix": [5, 3], "x": 3, "y": 5.5},
-
-                {"label": "Ctrl", "matrix": [5, 4], "x": 4.5, "y": 5.5, "w": 1.25},
-                {"label": "GUI", "matrix": [5, 5], "x": 5.75, "y": 5.5, "w": 1.25},
-                {"label": "Alt", "matrix": [5, 6], "x": 7, "y": 5.5, "w": 1.25},
-                {"label": "Mute", "matrix": [5, 7], "x": 8.25, "y": 5.5},
-                {"label": "Space", "matrix": [5, 8], "x": 9.25, "y": 5.5, "w": 2.25},
-
-                {"label": "Space", "matrix": [11, 2], "x": 12.25, "y": 5.5, "w": 2.25},
-                {"label": "Menu", "matrix": [11, 3], "x": 14.5, "y": 5.5},
-                {"label": "Alt", "matrix": [11, 4], "x": 15.5, "y": 5.5, "w": 1.25},
-                {"label": "GUI", "matrix": [11, 5], "x": 16.75, "y": 5.5, "w": 1.25},
-                {"label": "Ctrl", "matrix": [11, 6], "x": 18, "y": 5.5, "w": 1.25},
-
-                {"label": "\u2190", "matrix": [11, 7], "x": 19.5, "y": 5.75},
-                {"label": "\u2193", "matrix": [11, 8], "x": 20.5, "y": 5.75},
-                {"label": "\u2192", "matrix": [11, 9], "x": 21.5, "y": 5.75}
-            ]
-        },
-        "LAYOUT_ansi": {
-            "layout": [
-                {"label": "F13", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "F14", "matrix": [0, 1], "x": 1, "y": 0},
-                {"label": "F15", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "F16", "matrix": [0, 3], "x": 3, "y": 0},
-
-                {"label": "Esc", "matrix": [0, 4], "x": 4.5, "y": 0},
-
-                {"label": "F1", "matrix": [0, 5], "x": 5.75, "y": 0},
-                {"label": "F2", "matrix": [0, 6], "x": 6.75, "y": 0},
-                {"label": "F3", "matrix": [0, 7], "x": 7.75, "y": 0},
-                {"label": "F4", "matrix": [0, 8], "x": 8.75, "y": 0},
-
-                {"label": "F5", "matrix": [0, 9], "x": 10, "y": 0},
-                {"label": "F6", "matrix": [0, 10], "x": 11, "y": 0},
-
-                {"label": "F7", "matrix": [6, 1], "x": 12.75, "y": 0},
-                {"label": "F8", "matrix": [6, 2], "x": 13.75, "y": 0},
-
-                {"label": "F9", "matrix": [6, 3], "x": 15, "y": 0},
-                {"label": "F10", "matrix": [6, 4], "x": 16, "y": 0},
-                {"label": "F11", "matrix": [6, 5], "x": 17, "y": 0},
-                {"label": "F12", "matrix": [6, 6], "x": 18, "y": 0},
-
-                {"label": "Print Screen", "matrix": [6, 7], "x": 19.25, "y": 0},
-
-                {"label": "Scroll Lock", "matrix": [6, 8], "x": 20.5, "y": 0},
-                {"label": "Pause", "matrix": [6, 9], "x": 21.5, "y": 0},
-
-                {"label": "Num Lock", "matrix": [1, 0], "x": 0, "y": 1.5},
-                {"label": "/", "matrix": [1, 1], "x": 1, "y": 1.5},
-                {"label": "*", "matrix": [1, 2], "x": 2, "y": 1.5},
-                {"label": "-", "matrix": [1, 3], "x": 3, "y": 1.5},
-
-                {"label": "`", "matrix": [1, 4], "x": 4.5, "y": 1.5},
-                {"label": "1", "matrix": [1, 5], "x": 5.5, "y": 1.5},
-                {"label": "2", "matrix": [1, 6], "x": 6.5, "y": 1.5},
-                {"label": "3", "matrix": [1, 7], "x": 7.5, "y": 1.5},
-                {"label": "4", "matrix": [1, 8], "x": 8.5, "y": 1.5},
-                {"label": "5", "matrix": [1, 9], "x": 9.5, "y": 1.5},
-                {"label": "6", "matrix": [1, 10], "x": 10.5, "y": 1.5},
-
-                {"label": "7", "matrix": [7, 0], "x": 12.25, "y": 1.5},
-                {"label": "8", "matrix": [7, 1], "x": 13.25, "y": 1.5},
-                {"label": "9", "matrix": [7, 2], "x": 14.25, "y": 1.5},
-                {"label": "0", "matrix": [7, 3], "x": 15.25, "y": 1.5},
-                {"label": "-", "matrix": [7, 4], "x": 16.25, "y": 1.5},
-                {"label": "=", "matrix": [7, 5], "x": 17.25, "y": 1.5},
-                {"label": "Backspace", "matrix": [7, 7], "x": 18.25, "y": 1.5, "w": 2},
-
-                {"label": "Home", "matrix": [7, 8], "x": 20.5, "y": 1.5},
-                {"label": "Insert", "matrix": [7, 9], "x": 21.5, "y": 1.5},
-
-                {"label": "7", "matrix": [2, 0], "x": 0, "y": 2.5},
-                {"label": "8", "matrix": [2, 1], "x": 1, "y": 2.5},
-                {"label": "9", "matrix": [2, 2], "x": 2, "y": 2.5},
-                {"label": "+", "matrix": [2, 3], "x": 3, "y": 2.5},
-
-                {"label": "Tab", "matrix": [2, 4], "x": 4.5, "y": 2.5, "w": 1.5},
-                {"label": "Q", "matrix": [2, 5], "x": 6, "y": 2.5},
-                {"label": "W", "matrix": [2, 6], "x": 7, "y": 2.5},
-                {"label": "E", "matrix": [2, 7], "x": 8, "y": 2.5},
-                {"label": "R", "matrix": [2, 8], "x": 9, "y": 2.5},
-                {"label": "T", "matrix": [2, 9], "x": 10, "y": 2.5},
-
-                {"label": "Y", "matrix": [8, 0], "x": 11.75, "y": 2.5},
-                {"label": "U", "matrix": [8, 1], "x": 12.75, "y": 2.5},
-                {"label": "I", "matrix": [8, 2], "x": 13.75, "y": 2.5},
-                {"label": "O", "matrix": [8, 3], "x": 14.75, "y": 2.5},
-                {"label": "P", "matrix": [8, 4], "x": 15.75, "y": 2.5},
-                {"label": "[", "matrix": [8, 5], "x": 16.75, "y": 2.5},
-                {"label": "]", "matrix": [8, 6], "x": 17.75, "y": 2.5},
-                {"label": "\\", "matrix": [8, 7], "x": 18.75, "y": 2.5, "w": 1.5},
-
-                {"label": "End", "matrix": [8, 8], "x": 20.5, "y": 2.5},
-                {"label": "Delete", "matrix": [8, 9], "x": 21.5, "y": 2.5},
-
-                {"label": "4", "matrix": [3, 0], "x": 0, "y": 3.5},
-                {"label": "5", "matrix": [3, 1], "x": 1, "y": 3.5},
-                {"label": "6", "matrix": [3, 2], "x": 2, "y": 3.5},
-                {"label": "=", "matrix": [3, 3], "x": 3, "y": 3.5},
-
-                {"label": "Caps Lock", "matrix": [3, 4], "x": 4.5, "y": 3.5, "w": 1.75},
-                {"label": "A", "matrix": [3, 5], "x": 6.25, "y": 3.5},
-                {"label": "S", "matrix": [3, 6], "x": 7.25, "y": 3.5},
-                {"label": "D", "matrix": [3, 7], "x": 8.25, "y": 3.5},
-                {"label": "F", "matrix": [3, 8], "x": 9.25, "y": 3.5},
-                {"label": "G", "matrix": [3, 9], "x": 10.25, "y": 3.5},
-
-                {"label": "H", "matrix": [9, 0], "x": 12, "y": 3.5},
-                {"label": "J", "matrix": [9, 1], "x": 13, "y": 3.5},
-                {"label": "K", "matrix": [9, 2], "x": 14, "y": 3.5},
-                {"label": "L", "matrix": [9, 3], "x": 15, "y": 3.5},
-                {"label": ";", "matrix": [9, 4], "x": 16, "y": 3.5},
-                {"label": "'", "matrix": [9, 5], "x": 17, "y": 3.5},
-                {"label": "Enter", "matrix": [9, 7], "x": 18, "y": 3.5, "w": 2.25},
-
-                {"label": "Page Up", "matrix": [9, 8], "x": 20.5, "y": 3.5},
-                {"label": "Page Down", "matrix": [9, 9], "x": 21.5, "y": 3.5},
-
-                {"label": "1", "matrix": [4, 0], "x": 0, "y": 4.5},
-                {"label": "2", "matrix": [4, 1], "x": 1, "y": 4.5},
-                {"label": "3", "matrix": [4, 2], "x": 2, "y": 4.5},
-                {"label": "Enter", "matrix": [4, 3], "x": 3, "y": 4.5},
-
-                {"label": "Shift", "matrix": [4, 4], "x": 4.5, "y": 4.5, "w": 2.25},
-                {"label": "Z", "matrix": [4, 6], "x": 6.75, "y": 4.5},
-                {"label": "X", "matrix": [4, 7], "x": 7.75, "y": 4.5},
-                {"label": "C", "matrix": [4, 8], "x": 8.75, "y": 4.5},
-                {"label": "V", "matrix": [4, 9], "x": 9.75, "y": 4.5},
-                {"label": "B", "matrix": [4, 10], "x": 10.75, "y": 4.5},
-
-                {"label": "N", "matrix": [10, 1], "x": 12.5, "y": 4.5},
-                {"label": "M", "matrix": [10, 2], "x": 13.5, "y": 4.5},
-                {"label": ",", "matrix": [10, 3], "x": 14.5, "y": 4.5},
-                {"label": ".", "matrix": [10, 4], "x": 15.5, "y": 4.5},
-                {"label": "/", "matrix": [10, 5], "x": 16.5, "y": 4.5},
-                {"label": "Shift", "matrix": [10, 6], "x": 17.5, "y": 4.5, "w": 2.75},
-
-                {"label": "\u2191", "matrix": [10, 8], "x": 20.5, "y": 4.75},
-
-                {"label": "0", "matrix": [5, 0], "x": 0, "y": 5.5},
-                {"label": "0", "matrix": [5, 1], "x": 1, "y": 5.5},
-                {"label": "00", "matrix": [5, 2], "x": 2, "y": 5.5},
-                {"label": ".", "matrix": [5, 3], "x": 3, "y": 5.5},
-
-                {"label": "Ctrl", "matrix": [5, 4], "x": 4.5, "y": 5.5, "w": 1.25},
-                {"label": "GUI", "matrix": [5, 5], "x": 5.75, "y": 5.5, "w": 1.25},
-                {"label": "Alt", "matrix": [5, 6], "x": 7, "y": 5.5, "w": 1.25},
-                {"label": "Mute", "matrix": [5, 7], "x": 8.25, "y": 5.5},
-                {"label": "Space", "matrix": [5, 8], "x": 9.25, "y": 5.5, "w": 2.25},
-
-                {"label": "Space", "matrix": [11, 2], "x": 12.25, "y": 5.5, "w": 2.25},
-                {"label": "Menu", "matrix": [11, 3], "x": 14.5, "y": 5.5},
-                {"label": "Alt", "matrix": [11, 4], "x": 15.5, "y": 5.5, "w": 1.25},
-                {"label": "GUI", "matrix": [11, 5], "x": 16.75, "y": 5.5, "w": 1.25},
-                {"label": "Ctrl", "matrix": [11, 6], "x": 18, "y": 5.5, "w": 1.25},
-
-                {"label": "\u2190", "matrix": [11, 7], "x": 19.5, "y": 5.75},
-                {"label": "\u2193", "matrix": [11, 8], "x": 20.5, "y": 5.75},
-                {"label": "\u2192", "matrix": [11, 9], "x": 21.5, "y": 5.75}
-            ]
-        },
-        "LAYOUT_ansi_split_bs_rshift": {
-            "layout": [
-                {"label": "F13", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "F14", "matrix": [0, 1], "x": 1, "y": 0},
-                {"label": "F15", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "F16", "matrix": [0, 3], "x": 3, "y": 0},
-
-                {"label": "Esc", "matrix": [0, 4], "x": 4.5, "y": 0},
-
-                {"label": "F1", "matrix": [0, 5], "x": 5.75, "y": 0},
-                {"label": "F2", "matrix": [0, 6], "x": 6.75, "y": 0},
-                {"label": "F3", "matrix": [0, 7], "x": 7.75, "y": 0},
-                {"label": "F4", "matrix": [0, 8], "x": 8.75, "y": 0},
-
-                {"label": "F5", "matrix": [0, 9], "x": 10, "y": 0},
-                {"label": "F6", "matrix": [0, 10], "x": 11, "y": 0},
-
-                {"label": "F7", "matrix": [6, 1], "x": 12.75, "y": 0},
-                {"label": "F8", "matrix": [6, 2], "x": 13.75, "y": 0},
-
-                {"label": "F9", "matrix": [6, 3], "x": 15, "y": 0},
-                {"label": "F10", "matrix": [6, 4], "x": 16, "y": 0},
-                {"label": "F11", "matrix": [6, 5], "x": 17, "y": 0},
-                {"label": "F12", "matrix": [6, 6], "x": 18, "y": 0},
-
-                {"label": "Print Screen", "matrix": [6, 7], "x": 19.25, "y": 0},
-
-                {"label": "Scroll Lock", "matrix": [6, 8], "x": 20.5, "y": 0},
-                {"label": "Pause", "matrix": [6, 9], "x": 21.5, "y": 0},
-
-                {"label": "Num Lock", "matrix": [1, 0], "x": 0, "y": 1.5},
-                {"label": "/", "matrix": [1, 1], "x": 1, "y": 1.5},
-                {"label": "*", "matrix": [1, 2], "x": 2, "y": 1.5},
-                {"label": "-", "matrix": [1, 3], "x": 3, "y": 1.5},
-
-                {"label": "`", "matrix": [1, 4], "x": 4.5, "y": 1.5},
-                {"label": "1", "matrix": [1, 5], "x": 5.5, "y": 1.5},
-                {"label": "2", "matrix": [1, 6], "x": 6.5, "y": 1.5},
-                {"label": "3", "matrix": [1, 7], "x": 7.5, "y": 1.5},
-                {"label": "4", "matrix": [1, 8], "x": 8.5, "y": 1.5},
-                {"label": "5", "matrix": [1, 9], "x": 9.5, "y": 1.5},
-                {"label": "6", "matrix": [1, 10], "x": 10.5, "y": 1.5},
-
-                {"label": "7", "matrix": [7, 0], "x": 12.25, "y": 1.5},
-                {"label": "8", "matrix": [7, 1], "x": 13.25, "y": 1.5},
-                {"label": "9", "matrix": [7, 2], "x": 14.25, "y": 1.5},
-                {"label": "0", "matrix": [7, 3], "x": 15.25, "y": 1.5},
-                {"label": "-", "matrix": [7, 4], "x": 16.25, "y": 1.5},
-                {"label": "=", "matrix": [7, 5], "x": 17.25, "y": 1.5},
-                {"label": "Backspace", "matrix": [7, 6], "x": 18.25, "y": 1.5},
-                {"label": "Delete", "matrix": [7, 7], "x": 19.25, "y": 1.5},
-
-                {"label": "Home", "matrix": [7, 8], "x": 20.5, "y": 1.5},
-                {"label": "Insert", "matrix": [7, 9], "x": 21.5, "y": 1.5},
-
-                {"label": "7", "matrix": [2, 0], "x": 0, "y": 2.5},
-                {"label": "8", "matrix": [2, 1], "x": 1, "y": 2.5},
-                {"label": "9", "matrix": [2, 2], "x": 2, "y": 2.5},
-                {"label": "+", "matrix": [2, 3], "x": 3, "y": 2.5},
-
-                {"label": "Tab", "matrix": [2, 4], "x": 4.5, "y": 2.5, "w": 1.5},
-                {"label": "Q", "matrix": [2, 5], "x": 6, "y": 2.5},
-                {"label": "W", "matrix": [2, 6], "x": 7, "y": 2.5},
-                {"label": "E", "matrix": [2, 7], "x": 8, "y": 2.5},
-                {"label": "R", "matrix": [2, 8], "x": 9, "y": 2.5},
-                {"label": "T", "matrix": [2, 9], "x": 10, "y": 2.5},
-
-                {"label": "Y", "matrix": [8, 0], "x": 11.75, "y": 2.5},
-                {"label": "U", "matrix": [8, 1], "x": 12.75, "y": 2.5},
-                {"label": "I", "matrix": [8, 2], "x": 13.75, "y": 2.5},
-                {"label": "O", "matrix": [8, 3], "x": 14.75, "y": 2.5},
-                {"label": "P", "matrix": [8, 4], "x": 15.75, "y": 2.5},
-                {"label": "[", "matrix": [8, 5], "x": 16.75, "y": 2.5},
-                {"label": "]", "matrix": [8, 6], "x": 17.75, "y": 2.5},
-                {"label": "\\", "matrix": [8, 7], "x": 18.75, "y": 2.5, "w": 1.5},
-
-                {"label": "End", "matrix": [8, 8], "x": 20.5, "y": 2.5},
-                {"label": "Delete", "matrix": [8, 9], "x": 21.5, "y": 2.5},
-
-                {"label": "4", "matrix": [3, 0], "x": 0, "y": 3.5},
-                {"label": "5", "matrix": [3, 1], "x": 1, "y": 3.5},
-                {"label": "6", "matrix": [3, 2], "x": 2, "y": 3.5},
-                {"label": "=", "matrix": [3, 3], "x": 3, "y": 3.5},
-
-                {"label": "Caps Lock", "matrix": [3, 4], "x": 4.5, "y": 3.5, "w": 1.75},
-                {"label": "A", "matrix": [3, 5], "x": 6.25, "y": 3.5},
-                {"label": "S", "matrix": [3, 6], "x": 7.25, "y": 3.5},
-                {"label": "D", "matrix": [3, 7], "x": 8.25, "y": 3.5},
-                {"label": "F", "matrix": [3, 8], "x": 9.25, "y": 3.5},
-                {"label": "G", "matrix": [3, 9], "x": 10.25, "y": 3.5},
-
-                {"label": "H", "matrix": [9, 0], "x": 12, "y": 3.5},
-                {"label": "J", "matrix": [9, 1], "x": 13, "y": 3.5},
-                {"label": "K", "matrix": [9, 2], "x": 14, "y": 3.5},
-                {"label": "L", "matrix": [9, 3], "x": 15, "y": 3.5},
-                {"label": ";", "matrix": [9, 4], "x": 16, "y": 3.5},
-                {"label": "'", "matrix": [9, 5], "x": 17, "y": 3.5},
-                {"label": "Enter", "matrix": [9, 7], "x": 18, "y": 3.5, "w": 2.25},
-
-                {"label": "Page Up", "matrix": [9, 8], "x": 20.5, "y": 3.5},
-                {"label": "Page Down", "matrix": [9, 9], "x": 21.5, "y": 3.5},
-
-                {"label": "1", "matrix": [4, 0], "x": 0, "y": 4.5},
-                {"label": "2", "matrix": [4, 1], "x": 1, "y": 4.5},
-                {"label": "3", "matrix": [4, 2], "x": 2, "y": 4.5},
-                {"label": "Enter", "matrix": [4, 3], "x": 3, "y": 4.5},
-
-                {"label": "Shift", "matrix": [4, 4], "x": 4.5, "y": 4.5, "w": 2.25},
-                {"label": "Z", "matrix": [4, 6], "x": 6.75, "y": 4.5},
-                {"label": "X", "matrix": [4, 7], "x": 7.75, "y": 4.5},
-                {"label": "C", "matrix": [4, 8], "x": 8.75, "y": 4.5},
-                {"label": "V", "matrix": [4, 9], "x": 9.75, "y": 4.5},
-                {"label": "B", "matrix": [4, 10], "x": 10.75, "y": 4.5},
-
-                {"label": "N", "matrix": [10, 1], "x": 12.5, "y": 4.5},
-                {"label": "M", "matrix": [10, 2], "x": 13.5, "y": 4.5},
-                {"label": ",", "matrix": [10, 3], "x": 14.5, "y": 4.5},
-                {"label": ".", "matrix": [10, 4], "x": 15.5, "y": 4.5},
-                {"label": "/", "matrix": [10, 5], "x": 16.5, "y": 4.5},
-                {"label": "Shift", "matrix": [10, 6], "x": 17.5, "y": 4.5, "w": 1.75},
-                {"label": "Fn", "matrix": [10, 7], "x": 19.25, "y": 4.5},
-
-                {"label": "\u2191", "matrix": [10, 8], "x": 20.5, "y": 4.75},
-
-                {"label": "0", "matrix": [5, 0], "x": 0, "y": 5.5},
-                {"label": "0", "matrix": [5, 1], "x": 1, "y": 5.5},
-                {"label": "00", "matrix": [5, 2], "x": 2, "y": 5.5},
-                {"label": ".", "matrix": [5, 3], "x": 3, "y": 5.5},
-
-                {"label": "Ctrl", "matrix": [5, 4], "x": 4.5, "y": 5.5, "w": 1.25},
-                {"label": "GUI", "matrix": [5, 5], "x": 5.75, "y": 5.5, "w": 1.25},
-                {"label": "Alt", "matrix": [5, 6], "x": 7, "y": 5.5, "w": 1.25},
-                {"label": "Mute", "matrix": [5, 7], "x": 8.25, "y": 5.5},
-                {"label": "Space", "matrix": [5, 8], "x": 9.25, "y": 5.5, "w": 2.25},
-
-                {"label": "Space", "matrix": [11, 2], "x": 12.25, "y": 5.5, "w": 2.25},
-                {"label": "Menu", "matrix": [11, 3], "x": 14.5, "y": 5.5},
-                {"label": "Alt", "matrix": [11, 4], "x": 15.5, "y": 5.5, "w": 1.25},
-                {"label": "GUI", "matrix": [11, 5], "x": 16.75, "y": 5.5, "w": 1.25},
-                {"label": "Ctrl", "matrix": [11, 6], "x": 18, "y": 5.5, "w": 1.25},
-
-                {"label": "\u2190", "matrix": [11, 7], "x": 19.5, "y": 5.75},
-                {"label": "\u2193", "matrix": [11, 8], "x": 20.5, "y": 5.75},
-                {"label": "\u2192", "matrix": [11, 9], "x": 21.5, "y": 5.75}
-            ]
-        },
-        "LAYOUT_iso": {
-            "layout": [
-                {"label": "F13", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "F14", "matrix": [0, 1], "x": 1, "y": 0},
-                {"label": "F15", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "F16", "matrix": [0, 3], "x": 3, "y": 0},
-
-                {"label": "Esc", "matrix": [0, 4], "x": 4.5, "y": 0},
-
-                {"label": "F1", "matrix": [0, 5], "x": 5.75, "y": 0},
-                {"label": "F2", "matrix": [0, 6], "x": 6.75, "y": 0},
-                {"label": "F3", "matrix": [0, 7], "x": 7.75, "y": 0},
-                {"label": "F4", "matrix": [0, 8], "x": 8.75, "y": 0},
-
-                {"label": "F5", "matrix": [0, 9], "x": 10, "y": 0},
-                {"label": "F6", "matrix": [0, 10], "x": 11, "y": 0},
-
-                {"label": "F7", "matrix": [6, 1], "x": 12.75, "y": 0},
-                {"label": "F8", "matrix": [6, 2], "x": 13.75, "y": 0},
-
-                {"label": "F9", "matrix": [6, 3], "x": 15, "y": 0},
-                {"label": "F10", "matrix": [6, 4], "x": 16, "y": 0},
-                {"label": "F11", "matrix": [6, 5], "x": 17, "y": 0},
-                {"label": "F12", "matrix": [6, 6], "x": 18, "y": 0},
-
-                {"label": "Print Screen", "matrix": [6, 7], "x": 19.25, "y": 0},
-
-                {"label": "Scroll Lock", "matrix": [6, 8], "x": 20.5, "y": 0},
-                {"label": "Pause", "matrix": [6, 9], "x": 21.5, "y": 0},
-
-                {"label": "Num Lock", "matrix": [1, 0], "x": 0, "y": 1.5},
-                {"label": "/", "matrix": [1, 1], "x": 1, "y": 1.5},
-                {"label": "*", "matrix": [1, 2], "x": 2, "y": 1.5},
-                {"label": "-", "matrix": [1, 3], "x": 3, "y": 1.5},
-
-                {"label": "`", "matrix": [1, 4], "x": 4.5, "y": 1.5},
-                {"label": "1", "matrix": [1, 5], "x": 5.5, "y": 1.5},
-                {"label": "2", "matrix": [1, 6], "x": 6.5, "y": 1.5},
-                {"label": "3", "matrix": [1, 7], "x": 7.5, "y": 1.5},
-                {"label": "4", "matrix": [1, 8], "x": 8.5, "y": 1.5},
-                {"label": "5", "matrix": [1, 9], "x": 9.5, "y": 1.5},
-                {"label": "6", "matrix": [1, 10], "x": 10.5, "y": 1.5},
-
-                {"label": "7", "matrix": [7, 0], "x": 12.25, "y": 1.5},
-                {"label": "8", "matrix": [7, 1], "x": 13.25, "y": 1.5},
-                {"label": "9", "matrix": [7, 2], "x": 14.25, "y": 1.5},
-                {"label": "0", "matrix": [7, 3], "x": 15.25, "y": 1.5},
-                {"label": "-", "matrix": [7, 4], "x": 16.25, "y": 1.5},
-                {"label": "=", "matrix": [7, 5], "x": 17.25, "y": 1.5},
-                {"label": "Backspace", "matrix": [7, 7], "x": 19.25, "y": 1.5, "w": 2},
-
-                {"label": "Home", "matrix": [7, 8], "x": 20.5, "y": 1.5},
-                {"label": "Insert", "matrix": [7, 9], "x": 21.5, "y": 1.5},
-
-                {"label": "7", "matrix": [2, 0], "x": 0, "y": 2.5},
-                {"label": "8", "matrix": [2, 1], "x": 1, "y": 2.5},
-                {"label": "9", "matrix": [2, 2], "x": 2, "y": 2.5},
-                {"label": "+", "matrix": [2, 3], "x": 3, "y": 2.5},
-
-                {"label": "Tab", "matrix": [2, 4], "x": 4.5, "y": 2.5, "w": 1.5},
-                {"label": "Q", "matrix": [2, 5], "x": 6, "y": 2.5},
-                {"label": "W", "matrix": [2, 6], "x": 7, "y": 2.5},
-                {"label": "E", "matrix": [2, 7], "x": 8, "y": 2.5},
-                {"label": "R", "matrix": [2, 8], "x": 9, "y": 2.5},
-                {"label": "T", "matrix": [2, 9], "x": 10, "y": 2.5},
-
-                {"label": "Y", "matrix": [8, 0], "x": 11.75, "y": 2.5},
-                {"label": "U", "matrix": [8, 1], "x": 12.75, "y": 2.5},
-                {"label": "I", "matrix": [8, 2], "x": 13.75, "y": 2.5},
-                {"label": "O", "matrix": [8, 3], "x": 14.75, "y": 2.5},
-                {"label": "P", "matrix": [8, 4], "x": 15.75, "y": 2.5},
-                {"label": "[", "matrix": [8, 5], "x": 16.75, "y": 2.5},
-                {"label": "]", "matrix": [8, 6], "x": 17.75, "y": 2.5},
-
-                {"label": "End", "matrix": [8, 8], "x": 20.5, "y": 2.5},
-                {"label": "Delete", "matrix": [8, 9], "x": 21.5, "y": 2.5},
-
-                {"label": "4", "matrix": [3, 0], "x": 0, "y": 3.5},
-                {"label": "5", "matrix": [3, 1], "x": 1, "y": 3.5},
-                {"label": "6", "matrix": [3, 2], "x": 2, "y": 3.5},
-                {"label": "=", "matrix": [3, 3], "x": 3, "y": 3.5},
-
-                {"label": "Caps Lock", "matrix": [3, 4], "x": 4.5, "y": 3.5, "w": 1.75},
-                {"label": "A", "matrix": [3, 5], "x": 6.25, "y": 3.5},
-                {"label": "S", "matrix": [3, 6], "x": 7.25, "y": 3.5},
-                {"label": "D", "matrix": [3, 7], "x": 8.25, "y": 3.5},
-                {"label": "F", "matrix": [3, 8], "x": 9.25, "y": 3.5},
-                {"label": "G", "matrix": [3, 9], "x": 10.25, "y": 3.5},
-
-                {"label": "H", "matrix": [9, 0], "x": 12, "y": 3.5},
-                {"label": "J", "matrix": [9, 1], "x": 13, "y": 3.5},
-                {"label": "K", "matrix": [9, 2], "x": 14, "y": 3.5},
-                {"label": "L", "matrix": [9, 3], "x": 15, "y": 3.5},
-                {"label": ";", "matrix": [9, 4], "x": 16, "y": 3.5},
-                {"label": "'", "matrix": [9, 5], "x": 17, "y": 3.5},
-                {"label": "#", "matrix": [9, 6], "x": 18, "y": 3.5},
-                {"label": "Enter", "matrix": [9, 7], "x": 19, "y": 2.5, "w": 1.25, "h": 2},
-
-                {"label": "Page Up", "matrix": [9, 8], "x": 20.5, "y": 3.5},
-                {"label": "Page Down", "matrix": [9, 9], "x": 21.5, "y": 3.5},
-
-                {"label": "1", "matrix": [4, 0], "x": 0, "y": 4.5},
-                {"label": "2", "matrix": [4, 1], "x": 1, "y": 4.5},
-                {"label": "3", "matrix": [4, 2], "x": 2, "y": 4.5},
-                {"label": "Enter", "matrix": [4, 3], "x": 3, "y": 4.5},
-
-                {"label": "Shift", "matrix": [4, 4], "x": 4.5, "y": 4.5, "w": 1.25},
-                {"label": "\\", "matrix": [4, 5], "x": 5.75, "y": 4.5},
-                {"label": "Z", "matrix": [4, 6], "x": 6.75, "y": 4.5},
-                {"label": "X", "matrix": [4, 7], "x": 7.75, "y": 4.5},
-                {"label": "C", "matrix": [4, 8], "x": 8.75, "y": 4.5},
-                {"label": "V", "matrix": [4, 9], "x": 9.75, "y": 4.5},
-                {"label": "B", "matrix": [4, 10], "x": 10.75, "y": 4.5},
-
-                {"label": "N", "matrix": [10, 1], "x": 12.5, "y": 4.5},
-                {"label": "M", "matrix": [10, 2], "x": 13.5, "y": 4.5},
-                {"label": ",", "matrix": [10, 3], "x": 14.5, "y": 4.5},
-                {"label": ".", "matrix": [10, 4], "x": 15.5, "y": 4.5},
-                {"label": "/", "matrix": [10, 5], "x": 16.5, "y": 4.5},
-                {"label": "Shift", "matrix": [10, 6], "x": 17.5, "y": 4.5, "w": 2.75},
-
-                {"label": "\u2191", "matrix": [10, 8], "x": 20.5, "y": 4.75},
-
-                {"label": "0", "matrix": [5, 0], "x": 0, "y": 5.5},
-                {"label": "0", "matrix": [5, 1], "x": 1, "y": 5.5},
-                {"label": "00", "matrix": [5, 2], "x": 2, "y": 5.5},
-                {"label": ".", "matrix": [5, 3], "x": 3, "y": 5.5},
-
-                {"label": "Ctrl", "matrix": [5, 4], "x": 4.5, "y": 5.5, "w": 1.25},
-                {"label": "GUI", "matrix": [5, 5], "x": 5.75, "y": 5.5, "w": 1.25},
-                {"label": "Alt", "matrix": [5, 6], "x": 7, "y": 5.5, "w": 1.25},
-                {"label": "Mute", "matrix": [5, 7], "x": 8.25, "y": 5.5},
-                {"label": "Space", "matrix": [5, 8], "x": 9.25, "y": 5.5, "w": 2.25},
-
-                {"label": "Space", "matrix": [11, 2], "x": 12.25, "y": 5.5, "w": 2.25},
-                {"label": "Menu", "matrix": [11, 3], "x": 14.5, "y": 5.5},
-                {"label": "Alt", "matrix": [11, 4], "x": 15.5, "y": 5.5, "w": 1.25},
-                {"label": "GUI", "matrix": [11, 5], "x": 16.75, "y": 5.5, "w": 1.25},
-                {"label": "Ctrl", "matrix": [11, 6], "x": 18, "y": 5.5, "w": 1.25},
-
-                {"label": "\u2190", "matrix": [11, 7], "x": 19.5, "y": 5.75},
-                {"label": "\u2193", "matrix": [11, 8], "x": 20.5, "y": 5.75},
-                {"label": "\u2192", "matrix": [11, 9], "x": 21.5, "y": 5.75}
-            ]
-        },
-        "LAYOUT_iso_split_bs_rshift": {
-            "layout": [
-                {"label": "F13", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "F14", "matrix": [0, 1], "x": 1, "y": 0},
-                {"label": "F15", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "F16", "matrix": [0, 3], "x": 3, "y": 0},
-
-                {"label": "Esc", "matrix": [0, 4], "x": 4.5, "y": 0},
-
-                {"label": "F1", "matrix": [0, 5], "x": 5.75, "y": 0},
-                {"label": "F2", "matrix": [0, 6], "x": 6.75, "y": 0},
-                {"label": "F3", "matrix": [0, 7], "x": 7.75, "y": 0},
-                {"label": "F4", "matrix": [0, 8], "x": 8.75, "y": 0},
-
-                {"label": "F5", "matrix": [0, 9], "x": 10, "y": 0},
-                {"label": "F6", "matrix": [0, 10], "x": 11, "y": 0},
-
-                {"label": "F7", "matrix": [6, 1], "x": 12.75, "y": 0},
-                {"label": "F8", "matrix": [6, 2], "x": 13.75, "y": 0},
-
-                {"label": "F9", "matrix": [6, 3], "x": 15, "y": 0},
-                {"label": "F10", "matrix": [6, 4], "x": 16, "y": 0},
-                {"label": "F11", "matrix": [6, 5], "x": 17, "y": 0},
-                {"label": "F12", "matrix": [6, 6], "x": 18, "y": 0},
-
-                {"label": "Print Screen", "matrix": [6, 7], "x": 19.25, "y": 0},
-
-                {"label": "Scroll Lock", "matrix": [6, 8], "x": 20.5, "y": 0},
-                {"label": "Pause", "matrix": [6, 9], "x": 21.5, "y": 0},
-
-                {"label": "Num Lock", "matrix": [1, 0], "x": 0, "y": 1.5},
-                {"label": "/", "matrix": [1, 1], "x": 1, "y": 1.5},
-                {"label": "*", "matrix": [1, 2], "x": 2, "y": 1.5},
-                {"label": "-", "matrix": [1, 3], "x": 3, "y": 1.5},
-
-                {"label": "`", "matrix": [1, 4], "x": 4.5, "y": 1.5},
-                {"label": "1", "matrix": [1, 5], "x": 5.5, "y": 1.5},
-                {"label": "2", "matrix": [1, 6], "x": 6.5, "y": 1.5},
-                {"label": "3", "matrix": [1, 7], "x": 7.5, "y": 1.5},
-                {"label": "4", "matrix": [1, 8], "x": 8.5, "y": 1.5},
-                {"label": "5", "matrix": [1, 9], "x": 9.5, "y": 1.5},
-                {"label": "6", "matrix": [1, 10], "x": 10.5, "y": 1.5},
-
-                {"label": "7", "matrix": [7, 0], "x": 12.25, "y": 1.5},
-                {"label": "8", "matrix": [7, 1], "x": 13.25, "y": 1.5},
-                {"label": "9", "matrix": [7, 2], "x": 14.25, "y": 1.5},
-                {"label": "0", "matrix": [7, 3], "x": 15.25, "y": 1.5},
-                {"label": "-", "matrix": [7, 4], "x": 16.25, "y": 1.5},
-                {"label": "=", "matrix": [7, 5], "x": 17.25, "y": 1.5},
-                {"label": "Backspace", "matrix": [7, 6], "x": 18.25, "y": 1.5},
-                {"label": "Delete", "matrix": [7, 7], "x": 19.25, "y": 1.5},
-
-                {"label": "Home", "matrix": [7, 8], "x": 20.5, "y": 1.5},
-                {"label": "Insert", "matrix": [7, 9], "x": 21.5, "y": 1.5},
-
-                {"label": "7", "matrix": [2, 0], "x": 0, "y": 2.5},
-                {"label": "8", "matrix": [2, 1], "x": 1, "y": 2.5},
-                {"label": "9", "matrix": [2, 2], "x": 2, "y": 2.5},
-                {"label": "+", "matrix": [2, 3], "x": 3, "y": 2.5},
-
-                {"label": "Tab", "matrix": [2, 4], "x": 4.5, "y": 2.5, "w": 1.5},
-                {"label": "Q", "matrix": [2, 5], "x": 6, "y": 2.5},
-                {"label": "W", "matrix": [2, 6], "x": 7, "y": 2.5},
-                {"label": "E", "matrix": [2, 7], "x": 8, "y": 2.5},
-                {"label": "R", "matrix": [2, 8], "x": 9, "y": 2.5},
-                {"label": "T", "matrix": [2, 9], "x": 10, "y": 2.5},
-
-                {"label": "Y", "matrix": [8, 0], "x": 11.75, "y": 2.5},
-                {"label": "U", "matrix": [8, 1], "x": 12.75, "y": 2.5},
-                {"label": "I", "matrix": [8, 2], "x": 13.75, "y": 2.5},
-                {"label": "O", "matrix": [8, 3], "x": 14.75, "y": 2.5},
-                {"label": "P", "matrix": [8, 4], "x": 15.75, "y": 2.5},
-                {"label": "[", "matrix": [8, 5], "x": 16.75, "y": 2.5},
-                {"label": "]", "matrix": [8, 6], "x": 17.75, "y": 2.5},
-
-                {"label": "End", "matrix": [8, 8], "x": 20.5, "y": 2.5},
-                {"label": "Delete", "matrix": [8, 9], "x": 21.5, "y": 2.5},
-
-                {"label": "4", "matrix": [3, 0], "x": 0, "y": 3.5},
-                {"label": "5", "matrix": [3, 1], "x": 1, "y": 3.5},
-                {"label": "6", "matrix": [3, 2], "x": 2, "y": 3.5},
-                {"label": "=", "matrix": [3, 3], "x": 3, "y": 3.5},
-
-                {"label": "Caps Lock", "matrix": [3, 4], "x": 4.5, "y": 3.5, "w": 1.75},
-                {"label": "A", "matrix": [3, 5], "x": 6.25, "y": 3.5},
-                {"label": "S", "matrix": [3, 6], "x": 7.25, "y": 3.5},
-                {"label": "D", "matrix": [3, 7], "x": 8.25, "y": 3.5},
-                {"label": "F", "matrix": [3, 8], "x": 9.25, "y": 3.5},
-                {"label": "G", "matrix": [3, 9], "x": 10.25, "y": 3.5},
-
-                {"label": "H", "matrix": [9, 0], "x": 12, "y": 3.5},
-                {"label": "J", "matrix": [9, 1], "x": 13, "y": 3.5},
-                {"label": "K", "matrix": [9, 2], "x": 14, "y": 3.5},
-                {"label": "L", "matrix": [9, 3], "x": 15, "y": 3.5},
-                {"label": ";", "matrix": [9, 4], "x": 16, "y": 3.5},
-                {"label": "'", "matrix": [9, 5], "x": 17, "y": 3.5},
-                {"label": "#", "matrix": [9, 6], "x": 18, "y": 3.5},
-                {"label": "Enter", "matrix": [9, 7], "x": 19, "y": 2.5, "w": 1.25, "h": 2},
-
-                {"label": "Page Up", "matrix": [9, 8], "x": 20.5, "y": 3.5},
-                {"label": "Page Down", "matrix": [9, 9], "x": 21.5, "y": 3.5},
-
-                {"label": "1", "matrix": [4, 0], "x": 0, "y": 4.5},
-                {"label": "2", "matrix": [4, 1], "x": 1, "y": 4.5},
-                {"label": "3", "matrix": [4, 2], "x": 2, "y": 4.5},
-                {"label": "Enter", "matrix": [4, 3], "x": 3, "y": 4.5},
-
-                {"label": "Shift", "matrix": [4, 4], "x": 4.5, "y": 4.5, "w": 1.25},
-                {"label": "\\", "matrix": [4, 5], "x": 5.75, "y": 4.5},
-                {"label": "Z", "matrix": [4, 6], "x": 6.75, "y": 4.5},
-                {"label": "X", "matrix": [4, 7], "x": 7.75, "y": 4.5},
-                {"label": "C", "matrix": [4, 8], "x": 8.75, "y": 4.5},
-                {"label": "V", "matrix": [4, 9], "x": 9.75, "y": 4.5},
-                {"label": "B", "matrix": [4, 10], "x": 10.75, "y": 4.5},
-
-                {"label": "N", "matrix": [10, 1], "x": 12.5, "y": 4.5},
-                {"label": "M", "matrix": [10, 2], "x": 13.5, "y": 4.5},
-                {"label": ",", "matrix": [10, 3], "x": 14.5, "y": 4.5},
-                {"label": ".", "matrix": [10, 4], "x": 15.5, "y": 4.5},
-                {"label": "/", "matrix": [10, 5], "x": 16.5, "y": 4.5},
-                {"label": "Shift", "matrix": [10, 6], "x": 17.5, "y": 4.5, "w": 1.75},
-                {"label": "Fn", "matrix": [10, 7], "x": 19.25, "y": 4.5},
-
-                {"label": "\u2191", "matrix": [10, 8], "x": 20.5, "y": 4.75},
-
-                {"label": "0", "matrix": [5, 0], "x": 0, "y": 5.5},
-                {"label": "0", "matrix": [5, 1], "x": 1, "y": 5.5},
-                {"label": "00", "matrix": [5, 2], "x": 2, "y": 5.5},
-                {"label": ".", "matrix": [5, 3], "x": 3, "y": 5.5},
-
-                {"label": "Ctrl", "matrix": [5, 4], "x": 4.5, "y": 5.5, "w": 1.25},
-                {"label": "GUI", "matrix": [5, 5], "x": 5.75, "y": 5.5, "w": 1.25},
-                {"label": "Alt", "matrix": [5, 6], "x": 7, "y": 5.5, "w": 1.25},
-                {"label": "Mute", "matrix": [5, 7], "x": 8.25, "y": 5.5},
-                {"label": "Space", "matrix": [5, 8], "x": 9.25, "y": 5.5, "w": 2.25},
-
-                {"label": "Space", "matrix": [11, 2], "x": 12.25, "y": 5.5, "w": 2.25},
-                {"label": "Menu", "matrix": [11, 3], "x": 14.5, "y": 5.5},
-                {"label": "Alt", "matrix": [11, 4], "x": 15.5, "y": 5.5, "w": 1.25},
-                {"label": "GUI", "matrix": [11, 5], "x": 16.75, "y": 5.5, "w": 1.25},
-                {"label": "Ctrl", "matrix": [11, 6], "x": 18, "y": 5.5, "w": 1.25},
-
-                {"label": "\u2190", "matrix": [11, 7], "x": 19.5, "y": 5.75},
-                {"label": "\u2193", "matrix": [11, 8], "x": 20.5, "y": 5.75},
-                {"label": "\u2192", "matrix": [11, 9], "x": 21.5, "y": 5.75}
-            ]
-        }
-    }
-}
diff --git a/keyboards/viktus/sp111/keyboard.json b/keyboards/viktus/sp111/keyboard.json
new file mode 100644
index 00000000000..a309c14afe3
--- /dev/null
+++ b/keyboards/viktus/sp111/keyboard.json
@@ -0,0 +1,754 @@
+{
+    "keyboard_name": "SP111",
+    "manufacturer": "Viktus Design LLC",
+    "url": "https://thekey.company/products/sp-111",
+    "maintainer": "blindassassin111",
+    "usb": {
+        "vid": "0x5644",
+        "pid": "0x5111",
+        "device_version": "0.0.1"
+    },
+    "build": {
+        "lto": true
+    },
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                {"label": "F13", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "F14", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "F15", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "F16", "matrix": [0, 3], "x": 3, "y": 0},
+
+                {"label": "Esc", "matrix": [0, 4], "x": 4.5, "y": 0},
+
+                {"label": "F1", "matrix": [0, 5], "x": 5.75, "y": 0},
+                {"label": "F2", "matrix": [0, 6], "x": 6.75, "y": 0},
+                {"label": "F3", "matrix": [0, 7], "x": 7.75, "y": 0},
+                {"label": "F4", "matrix": [0, 8], "x": 8.75, "y": 0},
+
+                {"label": "F5", "matrix": [0, 9], "x": 10, "y": 0},
+                {"label": "F6", "matrix": [0, 10], "x": 11, "y": 0},
+
+                {"label": "F7", "matrix": [6, 1], "x": 12.75, "y": 0},
+                {"label": "F8", "matrix": [6, 2], "x": 13.75, "y": 0},
+
+                {"label": "F9", "matrix": [6, 3], "x": 15, "y": 0},
+                {"label": "F10", "matrix": [6, 4], "x": 16, "y": 0},
+                {"label": "F11", "matrix": [6, 5], "x": 17, "y": 0},
+                {"label": "F12", "matrix": [6, 6], "x": 18, "y": 0},
+
+                {"label": "Print Screen", "matrix": [6, 7], "x": 19.25, "y": 0},
+
+                {"label": "Scroll Lock", "matrix": [6, 8], "x": 20.5, "y": 0},
+                {"label": "Pause", "matrix": [6, 9], "x": 21.5, "y": 0},
+
+                {"label": "Num Lock", "matrix": [1, 0], "x": 0, "y": 1.5},
+                {"label": "/", "matrix": [1, 1], "x": 1, "y": 1.5},
+                {"label": "*", "matrix": [1, 2], "x": 2, "y": 1.5},
+                {"label": "-", "matrix": [1, 3], "x": 3, "y": 1.5},
+
+                {"label": "`", "matrix": [1, 4], "x": 4.5, "y": 1.5},
+                {"label": "1", "matrix": [1, 5], "x": 5.5, "y": 1.5},
+                {"label": "2", "matrix": [1, 6], "x": 6.5, "y": 1.5},
+                {"label": "3", "matrix": [1, 7], "x": 7.5, "y": 1.5},
+                {"label": "4", "matrix": [1, 8], "x": 8.5, "y": 1.5},
+                {"label": "5", "matrix": [1, 9], "x": 9.5, "y": 1.5},
+                {"label": "6", "matrix": [1, 10], "x": 10.5, "y": 1.5},
+
+                {"label": "7", "matrix": [7, 0], "x": 12.25, "y": 1.5},
+                {"label": "8", "matrix": [7, 1], "x": 13.25, "y": 1.5},
+                {"label": "9", "matrix": [7, 2], "x": 14.25, "y": 1.5},
+                {"label": "0", "matrix": [7, 3], "x": 15.25, "y": 1.5},
+                {"label": "-", "matrix": [7, 4], "x": 16.25, "y": 1.5},
+                {"label": "=", "matrix": [7, 5], "x": 17.25, "y": 1.5},
+                {"label": "Backspace", "matrix": [7, 6], "x": 18.25, "y": 1.5},
+                {"label": "Delete", "matrix": [7, 7], "x": 19.25, "y": 1.5},
+
+                {"label": "Home", "matrix": [7, 8], "x": 20.5, "y": 1.5},
+                {"label": "Insert", "matrix": [7, 9], "x": 21.5, "y": 1.5},
+
+                {"label": "7", "matrix": [2, 0], "x": 0, "y": 2.5},
+                {"label": "8", "matrix": [2, 1], "x": 1, "y": 2.5},
+                {"label": "9", "matrix": [2, 2], "x": 2, "y": 2.5},
+                {"label": "+", "matrix": [2, 3], "x": 3, "y": 2.5},
+
+                {"label": "Tab", "matrix": [2, 4], "x": 4.5, "y": 2.5, "w": 1.5},
+                {"label": "Q", "matrix": [2, 5], "x": 6, "y": 2.5},
+                {"label": "W", "matrix": [2, 6], "x": 7, "y": 2.5},
+                {"label": "E", "matrix": [2, 7], "x": 8, "y": 2.5},
+                {"label": "R", "matrix": [2, 8], "x": 9, "y": 2.5},
+                {"label": "T", "matrix": [2, 9], "x": 10, "y": 2.5},
+
+                {"label": "Y", "matrix": [8, 0], "x": 11.75, "y": 2.5},
+                {"label": "U", "matrix": [8, 1], "x": 12.75, "y": 2.5},
+                {"label": "I", "matrix": [8, 2], "x": 13.75, "y": 2.5},
+                {"label": "O", "matrix": [8, 3], "x": 14.75, "y": 2.5},
+                {"label": "P", "matrix": [8, 4], "x": 15.75, "y": 2.5},
+                {"label": "[", "matrix": [8, 5], "x": 16.75, "y": 2.5},
+                {"label": "]", "matrix": [8, 6], "x": 17.75, "y": 2.5},
+                {"label": "\\", "matrix": [8, 7], "x": 18.75, "y": 2.5, "w": 1.5},
+
+                {"label": "End", "matrix": [8, 8], "x": 20.5, "y": 2.5},
+                {"label": "Delete", "matrix": [8, 9], "x": 21.5, "y": 2.5},
+
+                {"label": "4", "matrix": [3, 0], "x": 0, "y": 3.5},
+                {"label": "5", "matrix": [3, 1], "x": 1, "y": 3.5},
+                {"label": "6", "matrix": [3, 2], "x": 2, "y": 3.5},
+                {"label": "=", "matrix": [3, 3], "x": 3, "y": 3.5},
+
+                {"label": "Caps Lock", "matrix": [3, 4], "x": 4.5, "y": 3.5, "w": 1.75},
+                {"label": "A", "matrix": [3, 5], "x": 6.25, "y": 3.5},
+                {"label": "S", "matrix": [3, 6], "x": 7.25, "y": 3.5},
+                {"label": "D", "matrix": [3, 7], "x": 8.25, "y": 3.5},
+                {"label": "F", "matrix": [3, 8], "x": 9.25, "y": 3.5},
+                {"label": "G", "matrix": [3, 9], "x": 10.25, "y": 3.5},
+
+                {"label": "H", "matrix": [9, 0], "x": 12, "y": 3.5},
+                {"label": "J", "matrix": [9, 1], "x": 13, "y": 3.5},
+                {"label": "K", "matrix": [9, 2], "x": 14, "y": 3.5},
+                {"label": "L", "matrix": [9, 3], "x": 15, "y": 3.5},
+                {"label": ";", "matrix": [9, 4], "x": 16, "y": 3.5},
+                {"label": "'", "matrix": [9, 5], "x": 17, "y": 3.5},
+                {"label": "#", "matrix": [9, 6], "x": 18, "y": 3.5},
+                {"label": "Enter", "matrix": [9, 7], "x": 19, "y": 3.5, "w": 1.25},
+
+                {"label": "Page Up", "matrix": [9, 8], "x": 20.5, "y": 3.5},
+                {"label": "Page Down", "matrix": [9, 9], "x": 21.5, "y": 3.5},
+
+                {"label": "1", "matrix": [4, 0], "x": 0, "y": 4.5},
+                {"label": "2", "matrix": [4, 1], "x": 1, "y": 4.5},
+                {"label": "3", "matrix": [4, 2], "x": 2, "y": 4.5},
+                {"label": "Enter", "matrix": [4, 3], "x": 3, "y": 4.5},
+
+                {"label": "Shift", "matrix": [4, 4], "x": 4.5, "y": 4.5, "w": 1.25},
+                {"label": "\\", "matrix": [4, 5], "x": 5.75, "y": 4.5},
+                {"label": "Z", "matrix": [4, 6], "x": 6.75, "y": 4.5},
+                {"label": "X", "matrix": [4, 7], "x": 7.75, "y": 4.5},
+                {"label": "C", "matrix": [4, 8], "x": 8.75, "y": 4.5},
+                {"label": "V", "matrix": [4, 9], "x": 9.75, "y": 4.5},
+                {"label": "B", "matrix": [4, 10], "x": 10.75, "y": 4.5},
+
+                {"label": "N", "matrix": [10, 1], "x": 12.5, "y": 4.5},
+                {"label": "M", "matrix": [10, 2], "x": 13.5, "y": 4.5},
+                {"label": ",", "matrix": [10, 3], "x": 14.5, "y": 4.5},
+                {"label": ".", "matrix": [10, 4], "x": 15.5, "y": 4.5},
+                {"label": "/", "matrix": [10, 5], "x": 16.5, "y": 4.5},
+                {"label": "Shift", "matrix": [10, 6], "x": 17.5, "y": 4.5, "w": 1.75},
+                {"label": "Fn", "matrix": [10, 7], "x": 19.25, "y": 4.5},
+
+                {"label": "\u2191", "matrix": [10, 8], "x": 20.5, "y": 4.75},
+
+                {"label": "0", "matrix": [5, 0], "x": 0, "y": 5.5},
+                {"label": "0", "matrix": [5, 1], "x": 1, "y": 5.5},
+                {"label": "00", "matrix": [5, 2], "x": 2, "y": 5.5},
+                {"label": ".", "matrix": [5, 3], "x": 3, "y": 5.5},
+
+                {"label": "Ctrl", "matrix": [5, 4], "x": 4.5, "y": 5.5, "w": 1.25},
+                {"label": "GUI", "matrix": [5, 5], "x": 5.75, "y": 5.5, "w": 1.25},
+                {"label": "Alt", "matrix": [5, 6], "x": 7, "y": 5.5, "w": 1.25},
+                {"label": "Mute", "matrix": [5, 7], "x": 8.25, "y": 5.5},
+                {"label": "Space", "matrix": [5, 8], "x": 9.25, "y": 5.5, "w": 2.25},
+
+                {"label": "Space", "matrix": [11, 2], "x": 12.25, "y": 5.5, "w": 2.25},
+                {"label": "Menu", "matrix": [11, 3], "x": 14.5, "y": 5.5},
+                {"label": "Alt", "matrix": [11, 4], "x": 15.5, "y": 5.5, "w": 1.25},
+                {"label": "GUI", "matrix": [11, 5], "x": 16.75, "y": 5.5, "w": 1.25},
+                {"label": "Ctrl", "matrix": [11, 6], "x": 18, "y": 5.5, "w": 1.25},
+
+                {"label": "\u2190", "matrix": [11, 7], "x": 19.5, "y": 5.75},
+                {"label": "\u2193", "matrix": [11, 8], "x": 20.5, "y": 5.75},
+                {"label": "\u2192", "matrix": [11, 9], "x": 21.5, "y": 5.75}
+            ]
+        },
+        "LAYOUT_ansi": {
+            "layout": [
+                {"label": "F13", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "F14", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "F15", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "F16", "matrix": [0, 3], "x": 3, "y": 0},
+
+                {"label": "Esc", "matrix": [0, 4], "x": 4.5, "y": 0},
+
+                {"label": "F1", "matrix": [0, 5], "x": 5.75, "y": 0},
+                {"label": "F2", "matrix": [0, 6], "x": 6.75, "y": 0},
+                {"label": "F3", "matrix": [0, 7], "x": 7.75, "y": 0},
+                {"label": "F4", "matrix": [0, 8], "x": 8.75, "y": 0},
+
+                {"label": "F5", "matrix": [0, 9], "x": 10, "y": 0},
+                {"label": "F6", "matrix": [0, 10], "x": 11, "y": 0},
+
+                {"label": "F7", "matrix": [6, 1], "x": 12.75, "y": 0},
+                {"label": "F8", "matrix": [6, 2], "x": 13.75, "y": 0},
+
+                {"label": "F9", "matrix": [6, 3], "x": 15, "y": 0},
+                {"label": "F10", "matrix": [6, 4], "x": 16, "y": 0},
+                {"label": "F11", "matrix": [6, 5], "x": 17, "y": 0},
+                {"label": "F12", "matrix": [6, 6], "x": 18, "y": 0},
+
+                {"label": "Print Screen", "matrix": [6, 7], "x": 19.25, "y": 0},
+
+                {"label": "Scroll Lock", "matrix": [6, 8], "x": 20.5, "y": 0},
+                {"label": "Pause", "matrix": [6, 9], "x": 21.5, "y": 0},
+
+                {"label": "Num Lock", "matrix": [1, 0], "x": 0, "y": 1.5},
+                {"label": "/", "matrix": [1, 1], "x": 1, "y": 1.5},
+                {"label": "*", "matrix": [1, 2], "x": 2, "y": 1.5},
+                {"label": "-", "matrix": [1, 3], "x": 3, "y": 1.5},
+
+                {"label": "`", "matrix": [1, 4], "x": 4.5, "y": 1.5},
+                {"label": "1", "matrix": [1, 5], "x": 5.5, "y": 1.5},
+                {"label": "2", "matrix": [1, 6], "x": 6.5, "y": 1.5},
+                {"label": "3", "matrix": [1, 7], "x": 7.5, "y": 1.5},
+                {"label": "4", "matrix": [1, 8], "x": 8.5, "y": 1.5},
+                {"label": "5", "matrix": [1, 9], "x": 9.5, "y": 1.5},
+                {"label": "6", "matrix": [1, 10], "x": 10.5, "y": 1.5},
+
+                {"label": "7", "matrix": [7, 0], "x": 12.25, "y": 1.5},
+                {"label": "8", "matrix": [7, 1], "x": 13.25, "y": 1.5},
+                {"label": "9", "matrix": [7, 2], "x": 14.25, "y": 1.5},
+                {"label": "0", "matrix": [7, 3], "x": 15.25, "y": 1.5},
+                {"label": "-", "matrix": [7, 4], "x": 16.25, "y": 1.5},
+                {"label": "=", "matrix": [7, 5], "x": 17.25, "y": 1.5},
+                {"label": "Backspace", "matrix": [7, 7], "x": 18.25, "y": 1.5, "w": 2},
+
+                {"label": "Home", "matrix": [7, 8], "x": 20.5, "y": 1.5},
+                {"label": "Insert", "matrix": [7, 9], "x": 21.5, "y": 1.5},
+
+                {"label": "7", "matrix": [2, 0], "x": 0, "y": 2.5},
+                {"label": "8", "matrix": [2, 1], "x": 1, "y": 2.5},
+                {"label": "9", "matrix": [2, 2], "x": 2, "y": 2.5},
+                {"label": "+", "matrix": [2, 3], "x": 3, "y": 2.5},
+
+                {"label": "Tab", "matrix": [2, 4], "x": 4.5, "y": 2.5, "w": 1.5},
+                {"label": "Q", "matrix": [2, 5], "x": 6, "y": 2.5},
+                {"label": "W", "matrix": [2, 6], "x": 7, "y": 2.5},
+                {"label": "E", "matrix": [2, 7], "x": 8, "y": 2.5},
+                {"label": "R", "matrix": [2, 8], "x": 9, "y": 2.5},
+                {"label": "T", "matrix": [2, 9], "x": 10, "y": 2.5},
+
+                {"label": "Y", "matrix": [8, 0], "x": 11.75, "y": 2.5},
+                {"label": "U", "matrix": [8, 1], "x": 12.75, "y": 2.5},
+                {"label": "I", "matrix": [8, 2], "x": 13.75, "y": 2.5},
+                {"label": "O", "matrix": [8, 3], "x": 14.75, "y": 2.5},
+                {"label": "P", "matrix": [8, 4], "x": 15.75, "y": 2.5},
+                {"label": "[", "matrix": [8, 5], "x": 16.75, "y": 2.5},
+                {"label": "]", "matrix": [8, 6], "x": 17.75, "y": 2.5},
+                {"label": "\\", "matrix": [8, 7], "x": 18.75, "y": 2.5, "w": 1.5},
+
+                {"label": "End", "matrix": [8, 8], "x": 20.5, "y": 2.5},
+                {"label": "Delete", "matrix": [8, 9], "x": 21.5, "y": 2.5},
+
+                {"label": "4", "matrix": [3, 0], "x": 0, "y": 3.5},
+                {"label": "5", "matrix": [3, 1], "x": 1, "y": 3.5},
+                {"label": "6", "matrix": [3, 2], "x": 2, "y": 3.5},
+                {"label": "=", "matrix": [3, 3], "x": 3, "y": 3.5},
+
+                {"label": "Caps Lock", "matrix": [3, 4], "x": 4.5, "y": 3.5, "w": 1.75},
+                {"label": "A", "matrix": [3, 5], "x": 6.25, "y": 3.5},
+                {"label": "S", "matrix": [3, 6], "x": 7.25, "y": 3.5},
+                {"label": "D", "matrix": [3, 7], "x": 8.25, "y": 3.5},
+                {"label": "F", "matrix": [3, 8], "x": 9.25, "y": 3.5},
+                {"label": "G", "matrix": [3, 9], "x": 10.25, "y": 3.5},
+
+                {"label": "H", "matrix": [9, 0], "x": 12, "y": 3.5},
+                {"label": "J", "matrix": [9, 1], "x": 13, "y": 3.5},
+                {"label": "K", "matrix": [9, 2], "x": 14, "y": 3.5},
+                {"label": "L", "matrix": [9, 3], "x": 15, "y": 3.5},
+                {"label": ";", "matrix": [9, 4], "x": 16, "y": 3.5},
+                {"label": "'", "matrix": [9, 5], "x": 17, "y": 3.5},
+                {"label": "Enter", "matrix": [9, 7], "x": 18, "y": 3.5, "w": 2.25},
+
+                {"label": "Page Up", "matrix": [9, 8], "x": 20.5, "y": 3.5},
+                {"label": "Page Down", "matrix": [9, 9], "x": 21.5, "y": 3.5},
+
+                {"label": "1", "matrix": [4, 0], "x": 0, "y": 4.5},
+                {"label": "2", "matrix": [4, 1], "x": 1, "y": 4.5},
+                {"label": "3", "matrix": [4, 2], "x": 2, "y": 4.5},
+                {"label": "Enter", "matrix": [4, 3], "x": 3, "y": 4.5},
+
+                {"label": "Shift", "matrix": [4, 4], "x": 4.5, "y": 4.5, "w": 2.25},
+                {"label": "Z", "matrix": [4, 6], "x": 6.75, "y": 4.5},
+                {"label": "X", "matrix": [4, 7], "x": 7.75, "y": 4.5},
+                {"label": "C", "matrix": [4, 8], "x": 8.75, "y": 4.5},
+                {"label": "V", "matrix": [4, 9], "x": 9.75, "y": 4.5},
+                {"label": "B", "matrix": [4, 10], "x": 10.75, "y": 4.5},
+
+                {"label": "N", "matrix": [10, 1], "x": 12.5, "y": 4.5},
+                {"label": "M", "matrix": [10, 2], "x": 13.5, "y": 4.5},
+                {"label": ",", "matrix": [10, 3], "x": 14.5, "y": 4.5},
+                {"label": ".", "matrix": [10, 4], "x": 15.5, "y": 4.5},
+                {"label": "/", "matrix": [10, 5], "x": 16.5, "y": 4.5},
+                {"label": "Shift", "matrix": [10, 6], "x": 17.5, "y": 4.5, "w": 2.75},
+
+                {"label": "\u2191", "matrix": [10, 8], "x": 20.5, "y": 4.75},
+
+                {"label": "0", "matrix": [5, 0], "x": 0, "y": 5.5},
+                {"label": "0", "matrix": [5, 1], "x": 1, "y": 5.5},
+                {"label": "00", "matrix": [5, 2], "x": 2, "y": 5.5},
+                {"label": ".", "matrix": [5, 3], "x": 3, "y": 5.5},
+
+                {"label": "Ctrl", "matrix": [5, 4], "x": 4.5, "y": 5.5, "w": 1.25},
+                {"label": "GUI", "matrix": [5, 5], "x": 5.75, "y": 5.5, "w": 1.25},
+                {"label": "Alt", "matrix": [5, 6], "x": 7, "y": 5.5, "w": 1.25},
+                {"label": "Mute", "matrix": [5, 7], "x": 8.25, "y": 5.5},
+                {"label": "Space", "matrix": [5, 8], "x": 9.25, "y": 5.5, "w": 2.25},
+
+                {"label": "Space", "matrix": [11, 2], "x": 12.25, "y": 5.5, "w": 2.25},
+                {"label": "Menu", "matrix": [11, 3], "x": 14.5, "y": 5.5},
+                {"label": "Alt", "matrix": [11, 4], "x": 15.5, "y": 5.5, "w": 1.25},
+                {"label": "GUI", "matrix": [11, 5], "x": 16.75, "y": 5.5, "w": 1.25},
+                {"label": "Ctrl", "matrix": [11, 6], "x": 18, "y": 5.5, "w": 1.25},
+
+                {"label": "\u2190", "matrix": [11, 7], "x": 19.5, "y": 5.75},
+                {"label": "\u2193", "matrix": [11, 8], "x": 20.5, "y": 5.75},
+                {"label": "\u2192", "matrix": [11, 9], "x": 21.5, "y": 5.75}
+            ]
+        },
+        "LAYOUT_ansi_split_bs_rshift": {
+            "layout": [
+                {"label": "F13", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "F14", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "F15", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "F16", "matrix": [0, 3], "x": 3, "y": 0},
+
+                {"label": "Esc", "matrix": [0, 4], "x": 4.5, "y": 0},
+
+                {"label": "F1", "matrix": [0, 5], "x": 5.75, "y": 0},
+                {"label": "F2", "matrix": [0, 6], "x": 6.75, "y": 0},
+                {"label": "F3", "matrix": [0, 7], "x": 7.75, "y": 0},
+                {"label": "F4", "matrix": [0, 8], "x": 8.75, "y": 0},
+
+                {"label": "F5", "matrix": [0, 9], "x": 10, "y": 0},
+                {"label": "F6", "matrix": [0, 10], "x": 11, "y": 0},
+
+                {"label": "F7", "matrix": [6, 1], "x": 12.75, "y": 0},
+                {"label": "F8", "matrix": [6, 2], "x": 13.75, "y": 0},
+
+                {"label": "F9", "matrix": [6, 3], "x": 15, "y": 0},
+                {"label": "F10", "matrix": [6, 4], "x": 16, "y": 0},
+                {"label": "F11", "matrix": [6, 5], "x": 17, "y": 0},
+                {"label": "F12", "matrix": [6, 6], "x": 18, "y": 0},
+
+                {"label": "Print Screen", "matrix": [6, 7], "x": 19.25, "y": 0},
+
+                {"label": "Scroll Lock", "matrix": [6, 8], "x": 20.5, "y": 0},
+                {"label": "Pause", "matrix": [6, 9], "x": 21.5, "y": 0},
+
+                {"label": "Num Lock", "matrix": [1, 0], "x": 0, "y": 1.5},
+                {"label": "/", "matrix": [1, 1], "x": 1, "y": 1.5},
+                {"label": "*", "matrix": [1, 2], "x": 2, "y": 1.5},
+                {"label": "-", "matrix": [1, 3], "x": 3, "y": 1.5},
+
+                {"label": "`", "matrix": [1, 4], "x": 4.5, "y": 1.5},
+                {"label": "1", "matrix": [1, 5], "x": 5.5, "y": 1.5},
+                {"label": "2", "matrix": [1, 6], "x": 6.5, "y": 1.5},
+                {"label": "3", "matrix": [1, 7], "x": 7.5, "y": 1.5},
+                {"label": "4", "matrix": [1, 8], "x": 8.5, "y": 1.5},
+                {"label": "5", "matrix": [1, 9], "x": 9.5, "y": 1.5},
+                {"label": "6", "matrix": [1, 10], "x": 10.5, "y": 1.5},
+
+                {"label": "7", "matrix": [7, 0], "x": 12.25, "y": 1.5},
+                {"label": "8", "matrix": [7, 1], "x": 13.25, "y": 1.5},
+                {"label": "9", "matrix": [7, 2], "x": 14.25, "y": 1.5},
+                {"label": "0", "matrix": [7, 3], "x": 15.25, "y": 1.5},
+                {"label": "-", "matrix": [7, 4], "x": 16.25, "y": 1.5},
+                {"label": "=", "matrix": [7, 5], "x": 17.25, "y": 1.5},
+                {"label": "Backspace", "matrix": [7, 6], "x": 18.25, "y": 1.5},
+                {"label": "Delete", "matrix": [7, 7], "x": 19.25, "y": 1.5},
+
+                {"label": "Home", "matrix": [7, 8], "x": 20.5, "y": 1.5},
+                {"label": "Insert", "matrix": [7, 9], "x": 21.5, "y": 1.5},
+
+                {"label": "7", "matrix": [2, 0], "x": 0, "y": 2.5},
+                {"label": "8", "matrix": [2, 1], "x": 1, "y": 2.5},
+                {"label": "9", "matrix": [2, 2], "x": 2, "y": 2.5},
+                {"label": "+", "matrix": [2, 3], "x": 3, "y": 2.5},
+
+                {"label": "Tab", "matrix": [2, 4], "x": 4.5, "y": 2.5, "w": 1.5},
+                {"label": "Q", "matrix": [2, 5], "x": 6, "y": 2.5},
+                {"label": "W", "matrix": [2, 6], "x": 7, "y": 2.5},
+                {"label": "E", "matrix": [2, 7], "x": 8, "y": 2.5},
+                {"label": "R", "matrix": [2, 8], "x": 9, "y": 2.5},
+                {"label": "T", "matrix": [2, 9], "x": 10, "y": 2.5},
+
+                {"label": "Y", "matrix": [8, 0], "x": 11.75, "y": 2.5},
+                {"label": "U", "matrix": [8, 1], "x": 12.75, "y": 2.5},
+                {"label": "I", "matrix": [8, 2], "x": 13.75, "y": 2.5},
+                {"label": "O", "matrix": [8, 3], "x": 14.75, "y": 2.5},
+                {"label": "P", "matrix": [8, 4], "x": 15.75, "y": 2.5},
+                {"label": "[", "matrix": [8, 5], "x": 16.75, "y": 2.5},
+                {"label": "]", "matrix": [8, 6], "x": 17.75, "y": 2.5},
+                {"label": "\\", "matrix": [8, 7], "x": 18.75, "y": 2.5, "w": 1.5},
+
+                {"label": "End", "matrix": [8, 8], "x": 20.5, "y": 2.5},
+                {"label": "Delete", "matrix": [8, 9], "x": 21.5, "y": 2.5},
+
+                {"label": "4", "matrix": [3, 0], "x": 0, "y": 3.5},
+                {"label": "5", "matrix": [3, 1], "x": 1, "y": 3.5},
+                {"label": "6", "matrix": [3, 2], "x": 2, "y": 3.5},
+                {"label": "=", "matrix": [3, 3], "x": 3, "y": 3.5},
+
+                {"label": "Caps Lock", "matrix": [3, 4], "x": 4.5, "y": 3.5, "w": 1.75},
+                {"label": "A", "matrix": [3, 5], "x": 6.25, "y": 3.5},
+                {"label": "S", "matrix": [3, 6], "x": 7.25, "y": 3.5},
+                {"label": "D", "matrix": [3, 7], "x": 8.25, "y": 3.5},
+                {"label": "F", "matrix": [3, 8], "x": 9.25, "y": 3.5},
+                {"label": "G", "matrix": [3, 9], "x": 10.25, "y": 3.5},
+
+                {"label": "H", "matrix": [9, 0], "x": 12, "y": 3.5},
+                {"label": "J", "matrix": [9, 1], "x": 13, "y": 3.5},
+                {"label": "K", "matrix": [9, 2], "x": 14, "y": 3.5},
+                {"label": "L", "matrix": [9, 3], "x": 15, "y": 3.5},
+                {"label": ";", "matrix": [9, 4], "x": 16, "y": 3.5},
+                {"label": "'", "matrix": [9, 5], "x": 17, "y": 3.5},
+                {"label": "Enter", "matrix": [9, 7], "x": 18, "y": 3.5, "w": 2.25},
+
+                {"label": "Page Up", "matrix": [9, 8], "x": 20.5, "y": 3.5},
+                {"label": "Page Down", "matrix": [9, 9], "x": 21.5, "y": 3.5},
+
+                {"label": "1", "matrix": [4, 0], "x": 0, "y": 4.5},
+                {"label": "2", "matrix": [4, 1], "x": 1, "y": 4.5},
+                {"label": "3", "matrix": [4, 2], "x": 2, "y": 4.5},
+                {"label": "Enter", "matrix": [4, 3], "x": 3, "y": 4.5},
+
+                {"label": "Shift", "matrix": [4, 4], "x": 4.5, "y": 4.5, "w": 2.25},
+                {"label": "Z", "matrix": [4, 6], "x": 6.75, "y": 4.5},
+                {"label": "X", "matrix": [4, 7], "x": 7.75, "y": 4.5},
+                {"label": "C", "matrix": [4, 8], "x": 8.75, "y": 4.5},
+                {"label": "V", "matrix": [4, 9], "x": 9.75, "y": 4.5},
+                {"label": "B", "matrix": [4, 10], "x": 10.75, "y": 4.5},
+
+                {"label": "N", "matrix": [10, 1], "x": 12.5, "y": 4.5},
+                {"label": "M", "matrix": [10, 2], "x": 13.5, "y": 4.5},
+                {"label": ",", "matrix": [10, 3], "x": 14.5, "y": 4.5},
+                {"label": ".", "matrix": [10, 4], "x": 15.5, "y": 4.5},
+                {"label": "/", "matrix": [10, 5], "x": 16.5, "y": 4.5},
+                {"label": "Shift", "matrix": [10, 6], "x": 17.5, "y": 4.5, "w": 1.75},
+                {"label": "Fn", "matrix": [10, 7], "x": 19.25, "y": 4.5},
+
+                {"label": "\u2191", "matrix": [10, 8], "x": 20.5, "y": 4.75},
+
+                {"label": "0", "matrix": [5, 0], "x": 0, "y": 5.5},
+                {"label": "0", "matrix": [5, 1], "x": 1, "y": 5.5},
+                {"label": "00", "matrix": [5, 2], "x": 2, "y": 5.5},
+                {"label": ".", "matrix": [5, 3], "x": 3, "y": 5.5},
+
+                {"label": "Ctrl", "matrix": [5, 4], "x": 4.5, "y": 5.5, "w": 1.25},
+                {"label": "GUI", "matrix": [5, 5], "x": 5.75, "y": 5.5, "w": 1.25},
+                {"label": "Alt", "matrix": [5, 6], "x": 7, "y": 5.5, "w": 1.25},
+                {"label": "Mute", "matrix": [5, 7], "x": 8.25, "y": 5.5},
+                {"label": "Space", "matrix": [5, 8], "x": 9.25, "y": 5.5, "w": 2.25},
+
+                {"label": "Space", "matrix": [11, 2], "x": 12.25, "y": 5.5, "w": 2.25},
+                {"label": "Menu", "matrix": [11, 3], "x": 14.5, "y": 5.5},
+                {"label": "Alt", "matrix": [11, 4], "x": 15.5, "y": 5.5, "w": 1.25},
+                {"label": "GUI", "matrix": [11, 5], "x": 16.75, "y": 5.5, "w": 1.25},
+                {"label": "Ctrl", "matrix": [11, 6], "x": 18, "y": 5.5, "w": 1.25},
+
+                {"label": "\u2190", "matrix": [11, 7], "x": 19.5, "y": 5.75},
+                {"label": "\u2193", "matrix": [11, 8], "x": 20.5, "y": 5.75},
+                {"label": "\u2192", "matrix": [11, 9], "x": 21.5, "y": 5.75}
+            ]
+        },
+        "LAYOUT_iso": {
+            "layout": [
+                {"label": "F13", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "F14", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "F15", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "F16", "matrix": [0, 3], "x": 3, "y": 0},
+
+                {"label": "Esc", "matrix": [0, 4], "x": 4.5, "y": 0},
+
+                {"label": "F1", "matrix": [0, 5], "x": 5.75, "y": 0},
+                {"label": "F2", "matrix": [0, 6], "x": 6.75, "y": 0},
+                {"label": "F3", "matrix": [0, 7], "x": 7.75, "y": 0},
+                {"label": "F4", "matrix": [0, 8], "x": 8.75, "y": 0},
+
+                {"label": "F5", "matrix": [0, 9], "x": 10, "y": 0},
+                {"label": "F6", "matrix": [0, 10], "x": 11, "y": 0},
+
+                {"label": "F7", "matrix": [6, 1], "x": 12.75, "y": 0},
+                {"label": "F8", "matrix": [6, 2], "x": 13.75, "y": 0},
+
+                {"label": "F9", "matrix": [6, 3], "x": 15, "y": 0},
+                {"label": "F10", "matrix": [6, 4], "x": 16, "y": 0},
+                {"label": "F11", "matrix": [6, 5], "x": 17, "y": 0},
+                {"label": "F12", "matrix": [6, 6], "x": 18, "y": 0},
+
+                {"label": "Print Screen", "matrix": [6, 7], "x": 19.25, "y": 0},
+
+                {"label": "Scroll Lock", "matrix": [6, 8], "x": 20.5, "y": 0},
+                {"label": "Pause", "matrix": [6, 9], "x": 21.5, "y": 0},
+
+                {"label": "Num Lock", "matrix": [1, 0], "x": 0, "y": 1.5},
+                {"label": "/", "matrix": [1, 1], "x": 1, "y": 1.5},
+                {"label": "*", "matrix": [1, 2], "x": 2, "y": 1.5},
+                {"label": "-", "matrix": [1, 3], "x": 3, "y": 1.5},
+
+                {"label": "`", "matrix": [1, 4], "x": 4.5, "y": 1.5},
+                {"label": "1", "matrix": [1, 5], "x": 5.5, "y": 1.5},
+                {"label": "2", "matrix": [1, 6], "x": 6.5, "y": 1.5},
+                {"label": "3", "matrix": [1, 7], "x": 7.5, "y": 1.5},
+                {"label": "4", "matrix": [1, 8], "x": 8.5, "y": 1.5},
+                {"label": "5", "matrix": [1, 9], "x": 9.5, "y": 1.5},
+                {"label": "6", "matrix": [1, 10], "x": 10.5, "y": 1.5},
+
+                {"label": "7", "matrix": [7, 0], "x": 12.25, "y": 1.5},
+                {"label": "8", "matrix": [7, 1], "x": 13.25, "y": 1.5},
+                {"label": "9", "matrix": [7, 2], "x": 14.25, "y": 1.5},
+                {"label": "0", "matrix": [7, 3], "x": 15.25, "y": 1.5},
+                {"label": "-", "matrix": [7, 4], "x": 16.25, "y": 1.5},
+                {"label": "=", "matrix": [7, 5], "x": 17.25, "y": 1.5},
+                {"label": "Backspace", "matrix": [7, 7], "x": 19.25, "y": 1.5, "w": 2},
+
+                {"label": "Home", "matrix": [7, 8], "x": 20.5, "y": 1.5},
+                {"label": "Insert", "matrix": [7, 9], "x": 21.5, "y": 1.5},
+
+                {"label": "7", "matrix": [2, 0], "x": 0, "y": 2.5},
+                {"label": "8", "matrix": [2, 1], "x": 1, "y": 2.5},
+                {"label": "9", "matrix": [2, 2], "x": 2, "y": 2.5},
+                {"label": "+", "matrix": [2, 3], "x": 3, "y": 2.5},
+
+                {"label": "Tab", "matrix": [2, 4], "x": 4.5, "y": 2.5, "w": 1.5},
+                {"label": "Q", "matrix": [2, 5], "x": 6, "y": 2.5},
+                {"label": "W", "matrix": [2, 6], "x": 7, "y": 2.5},
+                {"label": "E", "matrix": [2, 7], "x": 8, "y": 2.5},
+                {"label": "R", "matrix": [2, 8], "x": 9, "y": 2.5},
+                {"label": "T", "matrix": [2, 9], "x": 10, "y": 2.5},
+
+                {"label": "Y", "matrix": [8, 0], "x": 11.75, "y": 2.5},
+                {"label": "U", "matrix": [8, 1], "x": 12.75, "y": 2.5},
+                {"label": "I", "matrix": [8, 2], "x": 13.75, "y": 2.5},
+                {"label": "O", "matrix": [8, 3], "x": 14.75, "y": 2.5},
+                {"label": "P", "matrix": [8, 4], "x": 15.75, "y": 2.5},
+                {"label": "[", "matrix": [8, 5], "x": 16.75, "y": 2.5},
+                {"label": "]", "matrix": [8, 6], "x": 17.75, "y": 2.5},
+
+                {"label": "End", "matrix": [8, 8], "x": 20.5, "y": 2.5},
+                {"label": "Delete", "matrix": [8, 9], "x": 21.5, "y": 2.5},
+
+                {"label": "4", "matrix": [3, 0], "x": 0, "y": 3.5},
+                {"label": "5", "matrix": [3, 1], "x": 1, "y": 3.5},
+                {"label": "6", "matrix": [3, 2], "x": 2, "y": 3.5},
+                {"label": "=", "matrix": [3, 3], "x": 3, "y": 3.5},
+
+                {"label": "Caps Lock", "matrix": [3, 4], "x": 4.5, "y": 3.5, "w": 1.75},
+                {"label": "A", "matrix": [3, 5], "x": 6.25, "y": 3.5},
+                {"label": "S", "matrix": [3, 6], "x": 7.25, "y": 3.5},
+                {"label": "D", "matrix": [3, 7], "x": 8.25, "y": 3.5},
+                {"label": "F", "matrix": [3, 8], "x": 9.25, "y": 3.5},
+                {"label": "G", "matrix": [3, 9], "x": 10.25, "y": 3.5},
+
+                {"label": "H", "matrix": [9, 0], "x": 12, "y": 3.5},
+                {"label": "J", "matrix": [9, 1], "x": 13, "y": 3.5},
+                {"label": "K", "matrix": [9, 2], "x": 14, "y": 3.5},
+                {"label": "L", "matrix": [9, 3], "x": 15, "y": 3.5},
+                {"label": ";", "matrix": [9, 4], "x": 16, "y": 3.5},
+                {"label": "'", "matrix": [9, 5], "x": 17, "y": 3.5},
+                {"label": "#", "matrix": [9, 6], "x": 18, "y": 3.5},
+                {"label": "Enter", "matrix": [9, 7], "x": 19, "y": 2.5, "w": 1.25, "h": 2},
+
+                {"label": "Page Up", "matrix": [9, 8], "x": 20.5, "y": 3.5},
+                {"label": "Page Down", "matrix": [9, 9], "x": 21.5, "y": 3.5},
+
+                {"label": "1", "matrix": [4, 0], "x": 0, "y": 4.5},
+                {"label": "2", "matrix": [4, 1], "x": 1, "y": 4.5},
+                {"label": "3", "matrix": [4, 2], "x": 2, "y": 4.5},
+                {"label": "Enter", "matrix": [4, 3], "x": 3, "y": 4.5},
+
+                {"label": "Shift", "matrix": [4, 4], "x": 4.5, "y": 4.5, "w": 1.25},
+                {"label": "\\", "matrix": [4, 5], "x": 5.75, "y": 4.5},
+                {"label": "Z", "matrix": [4, 6], "x": 6.75, "y": 4.5},
+                {"label": "X", "matrix": [4, 7], "x": 7.75, "y": 4.5},
+                {"label": "C", "matrix": [4, 8], "x": 8.75, "y": 4.5},
+                {"label": "V", "matrix": [4, 9], "x": 9.75, "y": 4.5},
+                {"label": "B", "matrix": [4, 10], "x": 10.75, "y": 4.5},
+
+                {"label": "N", "matrix": [10, 1], "x": 12.5, "y": 4.5},
+                {"label": "M", "matrix": [10, 2], "x": 13.5, "y": 4.5},
+                {"label": ",", "matrix": [10, 3], "x": 14.5, "y": 4.5},
+                {"label": ".", "matrix": [10, 4], "x": 15.5, "y": 4.5},
+                {"label": "/", "matrix": [10, 5], "x": 16.5, "y": 4.5},
+                {"label": "Shift", "matrix": [10, 6], "x": 17.5, "y": 4.5, "w": 2.75},
+
+                {"label": "\u2191", "matrix": [10, 8], "x": 20.5, "y": 4.75},
+
+                {"label": "0", "matrix": [5, 0], "x": 0, "y": 5.5},
+                {"label": "0", "matrix": [5, 1], "x": 1, "y": 5.5},
+                {"label": "00", "matrix": [5, 2], "x": 2, "y": 5.5},
+                {"label": ".", "matrix": [5, 3], "x": 3, "y": 5.5},
+
+                {"label": "Ctrl", "matrix": [5, 4], "x": 4.5, "y": 5.5, "w": 1.25},
+                {"label": "GUI", "matrix": [5, 5], "x": 5.75, "y": 5.5, "w": 1.25},
+                {"label": "Alt", "matrix": [5, 6], "x": 7, "y": 5.5, "w": 1.25},
+                {"label": "Mute", "matrix": [5, 7], "x": 8.25, "y": 5.5},
+                {"label": "Space", "matrix": [5, 8], "x": 9.25, "y": 5.5, "w": 2.25},
+
+                {"label": "Space", "matrix": [11, 2], "x": 12.25, "y": 5.5, "w": 2.25},
+                {"label": "Menu", "matrix": [11, 3], "x": 14.5, "y": 5.5},
+                {"label": "Alt", "matrix": [11, 4], "x": 15.5, "y": 5.5, "w": 1.25},
+                {"label": "GUI", "matrix": [11, 5], "x": 16.75, "y": 5.5, "w": 1.25},
+                {"label": "Ctrl", "matrix": [11, 6], "x": 18, "y": 5.5, "w": 1.25},
+
+                {"label": "\u2190", "matrix": [11, 7], "x": 19.5, "y": 5.75},
+                {"label": "\u2193", "matrix": [11, 8], "x": 20.5, "y": 5.75},
+                {"label": "\u2192", "matrix": [11, 9], "x": 21.5, "y": 5.75}
+            ]
+        },
+        "LAYOUT_iso_split_bs_rshift": {
+            "layout": [
+                {"label": "F13", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "F14", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "F15", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "F16", "matrix": [0, 3], "x": 3, "y": 0},
+
+                {"label": "Esc", "matrix": [0, 4], "x": 4.5, "y": 0},
+
+                {"label": "F1", "matrix": [0, 5], "x": 5.75, "y": 0},
+                {"label": "F2", "matrix": [0, 6], "x": 6.75, "y": 0},
+                {"label": "F3", "matrix": [0, 7], "x": 7.75, "y": 0},
+                {"label": "F4", "matrix": [0, 8], "x": 8.75, "y": 0},
+
+                {"label": "F5", "matrix": [0, 9], "x": 10, "y": 0},
+                {"label": "F6", "matrix": [0, 10], "x": 11, "y": 0},
+
+                {"label": "F7", "matrix": [6, 1], "x": 12.75, "y": 0},
+                {"label": "F8", "matrix": [6, 2], "x": 13.75, "y": 0},
+
+                {"label": "F9", "matrix": [6, 3], "x": 15, "y": 0},
+                {"label": "F10", "matrix": [6, 4], "x": 16, "y": 0},
+                {"label": "F11", "matrix": [6, 5], "x": 17, "y": 0},
+                {"label": "F12", "matrix": [6, 6], "x": 18, "y": 0},
+
+                {"label": "Print Screen", "matrix": [6, 7], "x": 19.25, "y": 0},
+
+                {"label": "Scroll Lock", "matrix": [6, 8], "x": 20.5, "y": 0},
+                {"label": "Pause", "matrix": [6, 9], "x": 21.5, "y": 0},
+
+                {"label": "Num Lock", "matrix": [1, 0], "x": 0, "y": 1.5},
+                {"label": "/", "matrix": [1, 1], "x": 1, "y": 1.5},
+                {"label": "*", "matrix": [1, 2], "x": 2, "y": 1.5},
+                {"label": "-", "matrix": [1, 3], "x": 3, "y": 1.5},
+
+                {"label": "`", "matrix": [1, 4], "x": 4.5, "y": 1.5},
+                {"label": "1", "matrix": [1, 5], "x": 5.5, "y": 1.5},
+                {"label": "2", "matrix": [1, 6], "x": 6.5, "y": 1.5},
+                {"label": "3", "matrix": [1, 7], "x": 7.5, "y": 1.5},
+                {"label": "4", "matrix": [1, 8], "x": 8.5, "y": 1.5},
+                {"label": "5", "matrix": [1, 9], "x": 9.5, "y": 1.5},
+                {"label": "6", "matrix": [1, 10], "x": 10.5, "y": 1.5},
+
+                {"label": "7", "matrix": [7, 0], "x": 12.25, "y": 1.5},
+                {"label": "8", "matrix": [7, 1], "x": 13.25, "y": 1.5},
+                {"label": "9", "matrix": [7, 2], "x": 14.25, "y": 1.5},
+                {"label": "0", "matrix": [7, 3], "x": 15.25, "y": 1.5},
+                {"label": "-", "matrix": [7, 4], "x": 16.25, "y": 1.5},
+                {"label": "=", "matrix": [7, 5], "x": 17.25, "y": 1.5},
+                {"label": "Backspace", "matrix": [7, 6], "x": 18.25, "y": 1.5},
+                {"label": "Delete", "matrix": [7, 7], "x": 19.25, "y": 1.5},
+
+                {"label": "Home", "matrix": [7, 8], "x": 20.5, "y": 1.5},
+                {"label": "Insert", "matrix": [7, 9], "x": 21.5, "y": 1.5},
+
+                {"label": "7", "matrix": [2, 0], "x": 0, "y": 2.5},
+                {"label": "8", "matrix": [2, 1], "x": 1, "y": 2.5},
+                {"label": "9", "matrix": [2, 2], "x": 2, "y": 2.5},
+                {"label": "+", "matrix": [2, 3], "x": 3, "y": 2.5},
+
+                {"label": "Tab", "matrix": [2, 4], "x": 4.5, "y": 2.5, "w": 1.5},
+                {"label": "Q", "matrix": [2, 5], "x": 6, "y": 2.5},
+                {"label": "W", "matrix": [2, 6], "x": 7, "y": 2.5},
+                {"label": "E", "matrix": [2, 7], "x": 8, "y": 2.5},
+                {"label": "R", "matrix": [2, 8], "x": 9, "y": 2.5},
+                {"label": "T", "matrix": [2, 9], "x": 10, "y": 2.5},
+
+                {"label": "Y", "matrix": [8, 0], "x": 11.75, "y": 2.5},
+                {"label": "U", "matrix": [8, 1], "x": 12.75, "y": 2.5},
+                {"label": "I", "matrix": [8, 2], "x": 13.75, "y": 2.5},
+                {"label": "O", "matrix": [8, 3], "x": 14.75, "y": 2.5},
+                {"label": "P", "matrix": [8, 4], "x": 15.75, "y": 2.5},
+                {"label": "[", "matrix": [8, 5], "x": 16.75, "y": 2.5},
+                {"label": "]", "matrix": [8, 6], "x": 17.75, "y": 2.5},
+
+                {"label": "End", "matrix": [8, 8], "x": 20.5, "y": 2.5},
+                {"label": "Delete", "matrix": [8, 9], "x": 21.5, "y": 2.5},
+
+                {"label": "4", "matrix": [3, 0], "x": 0, "y": 3.5},
+                {"label": "5", "matrix": [3, 1], "x": 1, "y": 3.5},
+                {"label": "6", "matrix": [3, 2], "x": 2, "y": 3.5},
+                {"label": "=", "matrix": [3, 3], "x": 3, "y": 3.5},
+
+                {"label": "Caps Lock", "matrix": [3, 4], "x": 4.5, "y": 3.5, "w": 1.75},
+                {"label": "A", "matrix": [3, 5], "x": 6.25, "y": 3.5},
+                {"label": "S", "matrix": [3, 6], "x": 7.25, "y": 3.5},
+                {"label": "D", "matrix": [3, 7], "x": 8.25, "y": 3.5},
+                {"label": "F", "matrix": [3, 8], "x": 9.25, "y": 3.5},
+                {"label": "G", "matrix": [3, 9], "x": 10.25, "y": 3.5},
+
+                {"label": "H", "matrix": [9, 0], "x": 12, "y": 3.5},
+                {"label": "J", "matrix": [9, 1], "x": 13, "y": 3.5},
+                {"label": "K", "matrix": [9, 2], "x": 14, "y": 3.5},
+                {"label": "L", "matrix": [9, 3], "x": 15, "y": 3.5},
+                {"label": ";", "matrix": [9, 4], "x": 16, "y": 3.5},
+                {"label": "'", "matrix": [9, 5], "x": 17, "y": 3.5},
+                {"label": "#", "matrix": [9, 6], "x": 18, "y": 3.5},
+                {"label": "Enter", "matrix": [9, 7], "x": 19, "y": 2.5, "w": 1.25, "h": 2},
+
+                {"label": "Page Up", "matrix": [9, 8], "x": 20.5, "y": 3.5},
+                {"label": "Page Down", "matrix": [9, 9], "x": 21.5, "y": 3.5},
+
+                {"label": "1", "matrix": [4, 0], "x": 0, "y": 4.5},
+                {"label": "2", "matrix": [4, 1], "x": 1, "y": 4.5},
+                {"label": "3", "matrix": [4, 2], "x": 2, "y": 4.5},
+                {"label": "Enter", "matrix": [4, 3], "x": 3, "y": 4.5},
+
+                {"label": "Shift", "matrix": [4, 4], "x": 4.5, "y": 4.5, "w": 1.25},
+                {"label": "\\", "matrix": [4, 5], "x": 5.75, "y": 4.5},
+                {"label": "Z", "matrix": [4, 6], "x": 6.75, "y": 4.5},
+                {"label": "X", "matrix": [4, 7], "x": 7.75, "y": 4.5},
+                {"label": "C", "matrix": [4, 8], "x": 8.75, "y": 4.5},
+                {"label": "V", "matrix": [4, 9], "x": 9.75, "y": 4.5},
+                {"label": "B", "matrix": [4, 10], "x": 10.75, "y": 4.5},
+
+                {"label": "N", "matrix": [10, 1], "x": 12.5, "y": 4.5},
+                {"label": "M", "matrix": [10, 2], "x": 13.5, "y": 4.5},
+                {"label": ",", "matrix": [10, 3], "x": 14.5, "y": 4.5},
+                {"label": ".", "matrix": [10, 4], "x": 15.5, "y": 4.5},
+                {"label": "/", "matrix": [10, 5], "x": 16.5, "y": 4.5},
+                {"label": "Shift", "matrix": [10, 6], "x": 17.5, "y": 4.5, "w": 1.75},
+                {"label": "Fn", "matrix": [10, 7], "x": 19.25, "y": 4.5},
+
+                {"label": "\u2191", "matrix": [10, 8], "x": 20.5, "y": 4.75},
+
+                {"label": "0", "matrix": [5, 0], "x": 0, "y": 5.5},
+                {"label": "0", "matrix": [5, 1], "x": 1, "y": 5.5},
+                {"label": "00", "matrix": [5, 2], "x": 2, "y": 5.5},
+                {"label": ".", "matrix": [5, 3], "x": 3, "y": 5.5},
+
+                {"label": "Ctrl", "matrix": [5, 4], "x": 4.5, "y": 5.5, "w": 1.25},
+                {"label": "GUI", "matrix": [5, 5], "x": 5.75, "y": 5.5, "w": 1.25},
+                {"label": "Alt", "matrix": [5, 6], "x": 7, "y": 5.5, "w": 1.25},
+                {"label": "Mute", "matrix": [5, 7], "x": 8.25, "y": 5.5},
+                {"label": "Space", "matrix": [5, 8], "x": 9.25, "y": 5.5, "w": 2.25},
+
+                {"label": "Space", "matrix": [11, 2], "x": 12.25, "y": 5.5, "w": 2.25},
+                {"label": "Menu", "matrix": [11, 3], "x": 14.5, "y": 5.5},
+                {"label": "Alt", "matrix": [11, 4], "x": 15.5, "y": 5.5, "w": 1.25},
+                {"label": "GUI", "matrix": [11, 5], "x": 16.75, "y": 5.5, "w": 1.25},
+                {"label": "Ctrl", "matrix": [11, 6], "x": 18, "y": 5.5, "w": 1.25},
+
+                {"label": "\u2190", "matrix": [11, 7], "x": 19.5, "y": 5.75},
+                {"label": "\u2193", "matrix": [11, 8], "x": 20.5, "y": 5.75},
+                {"label": "\u2192", "matrix": [11, 9], "x": 21.5, "y": 5.75}
+            ]
+        }
+    }
+}
diff --git a/keyboards/viktus/sp111/rules.mk b/keyboards/viktus/sp111/rules.mk
index 1be8c7ad68a..d9b01484992 100644
--- a/keyboards/viktus/sp111/rules.mk
+++ b/keyboards/viktus/sp111/rules.mk
@@ -1,18 +1,3 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-LTO_ENABLE = yes            # Smaller (and slightly faster) firmware
-
-
 # custom matrix setup
 CUSTOM_MATRIX = lite
 
diff --git a/keyboards/viktus/styrka_topre/info.json b/keyboards/viktus/styrka_topre/keyboard.json
similarity index 100%
rename from keyboards/viktus/styrka_topre/info.json
rename to keyboards/viktus/styrka_topre/keyboard.json
diff --git a/keyboards/vinhcatba/uncertainty/info.json b/keyboards/vinhcatba/uncertainty/keyboard.json
similarity index 100%
rename from keyboards/vinhcatba/uncertainty/info.json
rename to keyboards/vinhcatba/uncertainty/keyboard.json
diff --git a/keyboards/vitamins_included/rev1/info.json b/keyboards/vitamins_included/rev1/keyboard.json
similarity index 100%
rename from keyboards/vitamins_included/rev1/info.json
rename to keyboards/vitamins_included/rev1/keyboard.json
diff --git a/keyboards/vitamins_included/rev1/rules.mk b/keyboards/vitamins_included/rev1/rules.mk
deleted file mode 100644
index 3bbd2614291..00000000000
--- a/keyboards/vitamins_included/rev1/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# File intentionally blank
diff --git a/keyboards/vitamins_included/rev2/info.json b/keyboards/vitamins_included/rev2/keyboard.json
similarity index 100%
rename from keyboards/vitamins_included/rev2/info.json
rename to keyboards/vitamins_included/rev2/keyboard.json
diff --git a/keyboards/westfoxtrot/aanzee/config.h b/keyboards/westfoxtrot/aanzee/config.h
index c024f9d8d91..cd1f84bc1fc 100644
--- a/keyboards/westfoxtrot/aanzee/config.h
+++ b/keyboards/westfoxtrot/aanzee/config.h
@@ -17,8 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define RGBW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/westfoxtrot/aanzee/keyboard.json b/keyboards/westfoxtrot/aanzee/keyboard.json
index 7a12a3e52e3..898fe9e62b3 100644
--- a/keyboards/westfoxtrot/aanzee/keyboard.json
+++ b/keyboards/westfoxtrot/aanzee/keyboard.json
@@ -52,7 +52,8 @@
     }
   },
   "ws2812": {
-    "pin": "E6"
+    "pin": "E6",
+    "rgbw": true
   },
   "processor": "atmega32u4",
   "bootloader": "atmel-dfu",
diff --git a/keyboards/westm/westm68/info.json b/keyboards/westm/westm68/info.json
index c71d47a41d8..85dd61bf86b 100644
--- a/keyboards/westm/westm68/info.json
+++ b/keyboards/westm/westm68/info.json
@@ -7,6 +7,15 @@
         "vid": "0x574D",
         "device_version": "0.0.1"
     },
+    "features": {
+        "bootmagic": true,
+        "command": true,
+        "console": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgblight": true
+    },
     "matrix_pins": {
         "cols": ["B14", "B13", "B12", "B11", "B10", "B2", "B1", "B8", "B7", "B6", "B5", "B4", "B3", "A15", "A14"],
         "rows": ["A13", "B9", "F1", "A10", "A9"]
diff --git a/keyboards/westm/westm68/rules.mk b/keyboards/westm/westm68/rules.mk
index 6174653422b..2a716f41c4a 100644
--- a/keyboards/westm/westm68/rules.mk
+++ b/keyboards/westm/westm68/rules.mk
@@ -1,17 +1,4 @@
 # Wildcard to allow APM32 MCU
 DFU_SUFFIX_ARGS = -v FFFF -p FFFF
 
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = yes        # Console for debug
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
 DEFAULT_FOLDER = westm/westm68/rev2
diff --git a/keyboards/westm/westm9/info.json b/keyboards/westm/westm9/info.json
index 1a132137911..43f12b17add 100644
--- a/keyboards/westm/westm9/info.json
+++ b/keyboards/westm/westm9/info.json
@@ -7,6 +7,14 @@
         "vid": "0x574D",
         "device_version": "0.0.1"
     },
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "oled": true,
+        "rgblight": true
+    },
     "matrix_pins": {
         "cols": ["B8", "B5", "B4"],
         "rows": ["A14", "A15", "B3"]
diff --git a/keyboards/westm/westm9/rules.mk b/keyboards/westm/westm9/rules.mk
index e522c525602..3ff78857b35 100644
--- a/keyboards/westm/westm9/rules.mk
+++ b/keyboards/westm/westm9/rules.mk
@@ -1,19 +1,4 @@
 # Wildcard to allow APM32 MCU
 DFU_SUFFIX_ARGS = -v FFFF -p FFFF
 
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no        # Console for debug
-COMMAND_ENABLE = no        # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
-OLED_ENABLE = yes			# Enable the OLED feature
-
 DEFAULT_FOLDER = westm/westm9/rev2
diff --git a/keyboards/wilba_tech/rama_works_kara/rules.mk b/keyboards/wilba_tech/rama_works_kara/rules.mk
index 34e6eaa45b8..cab0ca57e8c 100644
--- a/keyboards/wilba_tech/rama_works_kara/rules.mk
+++ b/keyboards/wilba_tech/rama_works_kara/rules.mk
@@ -1,7 +1,7 @@
 # Do not put the microcontroller into power saving mode
 # when we get USB suspend event. We want it to keep updating
 # backlight effects.
-OPT_DEFS += -DNO_SUSPEND_POWER_DOWN
+NO_SUSPEND_POWER_DOWN = yes
 
 CIE1931_CURVE = yes
 I2C_DRIVER_REQUIRED = yes
diff --git a/keyboards/wilba_tech/rama_works_koyu/rules.mk b/keyboards/wilba_tech/rama_works_koyu/rules.mk
index 34e6eaa45b8..cab0ca57e8c 100644
--- a/keyboards/wilba_tech/rama_works_koyu/rules.mk
+++ b/keyboards/wilba_tech/rama_works_koyu/rules.mk
@@ -1,7 +1,7 @@
 # Do not put the microcontroller into power saving mode
 # when we get USB suspend event. We want it to keep updating
 # backlight effects.
-OPT_DEFS += -DNO_SUSPEND_POWER_DOWN
+NO_SUSPEND_POWER_DOWN = yes
 
 CIE1931_CURVE = yes
 I2C_DRIVER_REQUIRED = yes
diff --git a/keyboards/wilba_tech/rama_works_m10_c/rules.mk b/keyboards/wilba_tech/rama_works_m10_c/rules.mk
index 34e6eaa45b8..cab0ca57e8c 100644
--- a/keyboards/wilba_tech/rama_works_m10_c/rules.mk
+++ b/keyboards/wilba_tech/rama_works_m10_c/rules.mk
@@ -1,7 +1,7 @@
 # Do not put the microcontroller into power saving mode
 # when we get USB suspend event. We want it to keep updating
 # backlight effects.
-OPT_DEFS += -DNO_SUSPEND_POWER_DOWN
+NO_SUSPEND_POWER_DOWN = yes
 
 CIE1931_CURVE = yes
 I2C_DRIVER_REQUIRED = yes
diff --git a/keyboards/wilba_tech/rama_works_m50_a/rules.mk b/keyboards/wilba_tech/rama_works_m50_a/rules.mk
index 34e6eaa45b8..cab0ca57e8c 100644
--- a/keyboards/wilba_tech/rama_works_m50_a/rules.mk
+++ b/keyboards/wilba_tech/rama_works_m50_a/rules.mk
@@ -1,7 +1,7 @@
 # Do not put the microcontroller into power saving mode
 # when we get USB suspend event. We want it to keep updating
 # backlight effects.
-OPT_DEFS += -DNO_SUSPEND_POWER_DOWN
+NO_SUSPEND_POWER_DOWN = yes
 
 CIE1931_CURVE = yes
 I2C_DRIVER_REQUIRED = yes
diff --git a/keyboards/wilba_tech/rama_works_m60_a/rules.mk b/keyboards/wilba_tech/rama_works_m60_a/rules.mk
index 34e6eaa45b8..cab0ca57e8c 100644
--- a/keyboards/wilba_tech/rama_works_m60_a/rules.mk
+++ b/keyboards/wilba_tech/rama_works_m60_a/rules.mk
@@ -1,7 +1,7 @@
 # Do not put the microcontroller into power saving mode
 # when we get USB suspend event. We want it to keep updating
 # backlight effects.
-OPT_DEFS += -DNO_SUSPEND_POWER_DOWN
+NO_SUSPEND_POWER_DOWN = yes
 
 CIE1931_CURVE = yes
 I2C_DRIVER_REQUIRED = yes
diff --git a/keyboards/wilba_tech/rama_works_m65_b/rules.mk b/keyboards/wilba_tech/rama_works_m65_b/rules.mk
index 34e6eaa45b8..cab0ca57e8c 100644
--- a/keyboards/wilba_tech/rama_works_m65_b/rules.mk
+++ b/keyboards/wilba_tech/rama_works_m65_b/rules.mk
@@ -1,7 +1,7 @@
 # Do not put the microcontroller into power saving mode
 # when we get USB suspend event. We want it to keep updating
 # backlight effects.
-OPT_DEFS += -DNO_SUSPEND_POWER_DOWN
+NO_SUSPEND_POWER_DOWN = yes
 
 CIE1931_CURVE = yes
 I2C_DRIVER_REQUIRED = yes
diff --git a/keyboards/wilba_tech/rama_works_m65_bx/rules.mk b/keyboards/wilba_tech/rama_works_m65_bx/rules.mk
index 34e6eaa45b8..cab0ca57e8c 100644
--- a/keyboards/wilba_tech/rama_works_m65_bx/rules.mk
+++ b/keyboards/wilba_tech/rama_works_m65_bx/rules.mk
@@ -1,7 +1,7 @@
 # Do not put the microcontroller into power saving mode
 # when we get USB suspend event. We want it to keep updating
 # backlight effects.
-OPT_DEFS += -DNO_SUSPEND_POWER_DOWN
+NO_SUSPEND_POWER_DOWN = yes
 
 CIE1931_CURVE = yes
 I2C_DRIVER_REQUIRED = yes
diff --git a/keyboards/wilba_tech/rama_works_m6_a/rules.mk b/keyboards/wilba_tech/rama_works_m6_a/rules.mk
index 806a82e12af..5cde06a483e 100644
--- a/keyboards/wilba_tech/rama_works_m6_a/rules.mk
+++ b/keyboards/wilba_tech/rama_works_m6_a/rules.mk
@@ -1,4 +1,4 @@
 # Do not put the microcontroller into power saving mode
 # when we get USB suspend event. We want it to keep updating
 # backlight effects.
-OPT_DEFS += -DNO_SUSPEND_POWER_DOWN
+NO_SUSPEND_POWER_DOWN = yes
diff --git a/keyboards/wilba_tech/rama_works_m6_b/rules.mk b/keyboards/wilba_tech/rama_works_m6_b/rules.mk
index 4650d7a6ea2..67495c9835f 100644
--- a/keyboards/wilba_tech/rama_works_m6_b/rules.mk
+++ b/keyboards/wilba_tech/rama_works_m6_b/rules.mk
@@ -1,7 +1,7 @@
 # Do not put the microcontroller into power saving mode
 # when we get USB suspend event. We want it to keep updating
 # backlight effects.
-OPT_DEFS += -DNO_SUSPEND_POWER_DOWN
+NO_SUSPEND_POWER_DOWN = yes
 
 CIE1931_CURVE = yes
 I2C_DRIVER_REQUIRED = yes
diff --git a/keyboards/wilba_tech/wt60_b/rules.mk b/keyboards/wilba_tech/wt60_b/rules.mk
index 34e6eaa45b8..cab0ca57e8c 100644
--- a/keyboards/wilba_tech/wt60_b/rules.mk
+++ b/keyboards/wilba_tech/wt60_b/rules.mk
@@ -1,7 +1,7 @@
 # Do not put the microcontroller into power saving mode
 # when we get USB suspend event. We want it to keep updating
 # backlight effects.
-OPT_DEFS += -DNO_SUSPEND_POWER_DOWN
+NO_SUSPEND_POWER_DOWN = yes
 
 CIE1931_CURVE = yes
 I2C_DRIVER_REQUIRED = yes
diff --git a/keyboards/wilba_tech/wt60_bx/rules.mk b/keyboards/wilba_tech/wt60_bx/rules.mk
index 34e6eaa45b8..cab0ca57e8c 100644
--- a/keyboards/wilba_tech/wt60_bx/rules.mk
+++ b/keyboards/wilba_tech/wt60_bx/rules.mk
@@ -1,7 +1,7 @@
 # Do not put the microcontroller into power saving mode
 # when we get USB suspend event. We want it to keep updating
 # backlight effects.
-OPT_DEFS += -DNO_SUSPEND_POWER_DOWN
+NO_SUSPEND_POWER_DOWN = yes
 
 CIE1931_CURVE = yes
 I2C_DRIVER_REQUIRED = yes
diff --git a/keyboards/wilba_tech/wt60_c/rules.mk b/keyboards/wilba_tech/wt60_c/rules.mk
index 34e6eaa45b8..cab0ca57e8c 100644
--- a/keyboards/wilba_tech/wt60_c/rules.mk
+++ b/keyboards/wilba_tech/wt60_c/rules.mk
@@ -1,7 +1,7 @@
 # Do not put the microcontroller into power saving mode
 # when we get USB suspend event. We want it to keep updating
 # backlight effects.
-OPT_DEFS += -DNO_SUSPEND_POWER_DOWN
+NO_SUSPEND_POWER_DOWN = yes
 
 CIE1931_CURVE = yes
 I2C_DRIVER_REQUIRED = yes
diff --git a/keyboards/wilba_tech/zeal60/rules.mk b/keyboards/wilba_tech/zeal60/rules.mk
index 34e6eaa45b8..cab0ca57e8c 100644
--- a/keyboards/wilba_tech/zeal60/rules.mk
+++ b/keyboards/wilba_tech/zeal60/rules.mk
@@ -1,7 +1,7 @@
 # Do not put the microcontroller into power saving mode
 # when we get USB suspend event. We want it to keep updating
 # backlight effects.
-OPT_DEFS += -DNO_SUSPEND_POWER_DOWN
+NO_SUSPEND_POWER_DOWN = yes
 
 CIE1931_CURVE = yes
 I2C_DRIVER_REQUIRED = yes
diff --git a/keyboards/wilba_tech/zeal65/rules.mk b/keyboards/wilba_tech/zeal65/rules.mk
index 34e6eaa45b8..cab0ca57e8c 100644
--- a/keyboards/wilba_tech/zeal65/rules.mk
+++ b/keyboards/wilba_tech/zeal65/rules.mk
@@ -1,7 +1,7 @@
 # Do not put the microcontroller into power saving mode
 # when we get USB suspend event. We want it to keep updating
 # backlight effects.
-OPT_DEFS += -DNO_SUSPEND_POWER_DOWN
+NO_SUSPEND_POWER_DOWN = yes
 
 CIE1931_CURVE = yes
 I2C_DRIVER_REQUIRED = yes
diff --git a/keyboards/woodkeys/meira/featherble/keyboard.json b/keyboards/woodkeys/meira/featherble/keyboard.json
index 8dc946dd571..416b788c904 100644
--- a/keyboards/woodkeys/meira/featherble/keyboard.json
+++ b/keyboards/woodkeys/meira/featherble/keyboard.json
@@ -3,5 +3,8 @@
     "bootloader": "caterina",
     "bluetooth": {
         "driver": "bluefruit_le"
+    },
+    "features": {
+        "bluetooth": true
     }
 }
diff --git a/keyboards/woodkeys/meira/featherble/rules.mk b/keyboards/woodkeys/meira/featherble/rules.mk
index 174947ff399..3437a35bdf1 100644
--- a/keyboards/woodkeys/meira/featherble/rules.mk
+++ b/keyboards/woodkeys/meira/featherble/rules.mk
@@ -1,4 +1,2 @@
 # Processor frequency
 F_CPU = 8000000
-
-BLUETOOTH_ENABLE = yes
diff --git a/keyboards/work_louder/loop/info.json b/keyboards/work_louder/loop/info.json
index 3c395e057a1..771a31d105c 100644
--- a/keyboards/work_louder/loop/info.json
+++ b/keyboards/work_louder/loop/info.json
@@ -8,6 +8,18 @@
         "pid": "0x1DF9",
         "max_power": 100
     },
+    "build": {
+        "lto": true
+    },
+    "features": {
+        "bootmagic": true,
+        "encoder": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgb_matrix": true,
+        "rgblight": true
+    },
     "rgb_matrix": {
         "animations": {
             "alphas_mods": true,
diff --git a/keyboards/work_louder/loop/rules.mk b/keyboards/work_louder/loop/rules.mk
index b68ae20d145..53c3227972d 100644
--- a/keyboards/work_louder/loop/rules.mk
+++ b/keyboards/work_louder/loop/rules.mk
@@ -1,21 +1,3 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-ENCODER_ENABLE = yes
-LTO_ENABLE = yes
-
-RGB_MATRIX_ENABLE = yes
-LTO_ENABLE = yes
-
 SRC += rgb_functions.c
 
 DEFAULT_FOLDER = work_louder/loop/rev3
diff --git a/keyboards/xelus/dawn60/rev1/rules.mk b/keyboards/xelus/dawn60/rev1/rules.mk
index 879710e8e7a..69c283a207d 100644
--- a/keyboards/xelus/dawn60/rev1/rules.mk
+++ b/keyboards/xelus/dawn60/rev1/rules.mk
@@ -1,7 +1,7 @@
 # Do not put the microcontroller into power saving mode
 # when we get USB suspend event. We want it to keep updating
 # backlight effects.
-OPT_DEFS += -DNO_SUSPEND_POWER_DOWN
+NO_SUSPEND_POWER_DOWN = yes
 
 CIE1931_CURVE = yes
 I2C_DRIVER_REQUIRED = yes
diff --git a/keyboards/xelus/dawn60/rev1_qmk/rules.mk b/keyboards/xelus/dawn60/rev1_qmk/rules.mk
index 5a17af39fcd..16816a5bdf0 100644
--- a/keyboards/xelus/dawn60/rev1_qmk/rules.mk
+++ b/keyboards/xelus/dawn60/rev1_qmk/rules.mk
@@ -1,7 +1,7 @@
 # Do not put the microcontroller into power saving mode
 # when we get USB suspend event. We want it to keep updating
 # backlight effects.
-OPT_DEFS += -DNO_SUSPEND_POWER_DOWN
+NO_SUSPEND_POWER_DOWN = yes
 
 I2C_DRIVER_REQUIRED = yes
 WS2812_DRIVER_REQUIRED = yes
diff --git a/keyboards/xw60/keyboard.json b/keyboards/xw60/keyboard.json
index 6316f944e50..3bd11e21c18 100644
--- a/keyboards/xw60/keyboard.json
+++ b/keyboards/xw60/keyboard.json
@@ -20,6 +20,9 @@
           "enabled": true
       }
     },
+    "haptic": {
+      "driver": "solenoid"
+    },
     "matrix_pins": {
       "cols": ["F0", "F1", "E6", "C7", "C6", "B6", "D4", "B1", "B7", "B5", "B4", "D7", "D6", "B3"],
       "rows": ["D0", "D1", "D2", "D3", "D5"]
diff --git a/keyboards/xw60/rules.mk b/keyboards/xw60/rules.mk
deleted file mode 100644
index a521203b326..00000000000
--- a/keyboards/xw60/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-HAPTIC_DRIVER = solenoid
diff --git a/keyboards/yanghu/unicorne/info.json b/keyboards/yanghu/unicorne/info.json
index 26d54c2c827..1b890dcabaf 100644
--- a/keyboards/yanghu/unicorne/info.json
+++ b/keyboards/yanghu/unicorne/info.json
@@ -8,6 +8,19 @@
     "pid": "0x0204",
     "device_version": "0.0.1"
   },
+  "features": {
+    "audio": true,
+    "bootmagic": false,
+    "encoder": true,
+    "extrakey": true,
+    "mousekey": true,
+    "nkro": true,
+    "oled": true,
+    "rgblight": true
+  },
+  "audio": {
+    "driver": "pwm_hardware"
+  },
   "rgblight": {
     "led_count": 8,
     "animations": {
diff --git a/keyboards/yanghu/unicorne/rules.mk b/keyboards/yanghu/unicorne/rules.mk
index 014f5d4d422..96852c8abfe 100644
--- a/keyboards/yanghu/unicorne/rules.mk
+++ b/keyboards/yanghu/unicorne/rules.mk
@@ -1,20 +1 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-AUDIO_ENABLE = yes          # Audio output
-ENCODER_ENABLE = yes
-OLED_ENABLE = yes
-
-AUDIO_DRIVER = pwm_hardware
-
-RGB_MATRIX_ENABLE = no # Do not enable with RGBLIGHT
-
 DEFAULT_FOLDER = yanghu/unicorne/f411
diff --git a/keyboards/ymdk/ymd62/config.h b/keyboards/ymdk/ymd62/config.h
new file mode 100644
index 00000000000..5f1f3f3a2a5
--- /dev/null
+++ b/keyboards/ymdk/ymd62/config.h
@@ -0,0 +1,11 @@
+// Copyright 2021 Mike Tsao
+// Copyright 2024 Richard Dawe (@richdawe)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#define WS2812_PWM_DRIVER PWMD4
+#define WS2812_PWM_CHANNEL 4
+#define WS2812_PWM_PAL_MODE 2
+#define WS2812_DMA_STREAM STM32_DMA1_STREAM7
+#define WS2812_DMA_CHANNEL 7
\ No newline at end of file
diff --git a/keyboards/ymdk/ymd62/halconf.h b/keyboards/ymdk/ymd62/halconf.h
new file mode 100644
index 00000000000..89073b2f3c1
--- /dev/null
+++ b/keyboards/ymdk/ymd62/halconf.h
@@ -0,0 +1,8 @@
+// Copyright 2024 Richard Dawe (@richdawe)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#define HAL_USE_PWM TRUE
+
+#include_next <halconf.h>
diff --git a/keyboards/ymdk/ymd62/info.json b/keyboards/ymdk/ymd62/info.json
new file mode 100644
index 00000000000..92ed13d2606
--- /dev/null
+++ b/keyboards/ymdk/ymd62/info.json
@@ -0,0 +1,217 @@
+{
+    "manufacturer": "YMDK",
+    "keyboard_name": "YMD62 ISO QMK",
+    "maintainer": "richdawe",
+    "bootloader": "uf2boot",
+    "diode_direction": "ROW2COL",
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgb_matrix": true
+    },
+    "matrix_pins": {
+        "cols": ["A7", "B0", "B1", "B2", "B10", "B11", "A5", "A15", "B3", "B12", "B13", "B14", "B15", "A8"],
+        "rows": ["A4", "A3", "A2", "A1", "A0"]
+    },
+    "processor": "STM32F103",
+    "rgb_matrix": {
+        "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,
+            "dual_beacon": true,
+            "flower_blooming": true,
+            "gradient_left_right": true,
+            "gradient_up_down": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "jellybean_raindrops": true,
+            "pixel_flow": true,
+            "pixel_fractal": true,
+            "pixel_rain": true,
+            "rainbow_beacon": true,
+            "rainbow_moving_chevron": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "riverflow": true,
+            "starlight": true,
+            "starlight_dual_hue": true,
+            "starlight_dual_sat": true
+        },
+        "default": {
+            "animation": "rainbow_moving_chevron"
+        },
+        "driver": "ws2812",
+        "layout": [
+            {"matrix": [0, 0], "x": 1, "y": 1, "flags": 4},
+            {"matrix": [0, 1], "x": 14, "y": 1, "flags": 4},
+            {"matrix": [0, 2], "x": 28, "y": 1, "flags": 4},
+            {"matrix": [0, 3], "x": 44, "y": 1, "flags": 4},
+            {"matrix": [0, 4], "x": 58, "y": 1, "flags": 4},
+            {"matrix": [0, 5], "x": 75, "y": 1, "flags": 4},
+            {"matrix": [0, 6], "x": 89, "y": 1, "flags": 4},
+            {"matrix": [0, 7], "x": 103, "y": 1, "flags": 4},
+            {"matrix": [0, 8], "x": 117, "y": 1, "flags": 4},
+            {"matrix": [0, 9], "x": 129, "y": 1, "flags": 4},
+            {"matrix": [0, 10], "x": 147, "y": 1, "flags": 4},
+            {"matrix": [0, 11], "x": 167, "y": 1, "flags": 4},
+            {"matrix": [0, 12], "x": 183, "y": 1, "flags": 4},
+            {"matrix": [0, 13], "x": 200, "y": 1, "flags": 4},
+            {"matrix": [1, 0], "x": 3, "y": 16, "flags": 4},
+            {"matrix": [1, 1], "x": 16, "y": 16, "flags": 4},
+            {"matrix": [1, 2], "x": 33, "y": 16, "flags": 4},
+            {"matrix": [1, 3], "x": 47, "y": 16, "flags": 4},
+            {"matrix": [1, 4], "x": 60, "y": 16, "flags": 4},
+            {"matrix": [1, 5], "x": 77, "y": 16, "flags": 4},
+            {"matrix": [1, 6], "x": 91, "y": 16, "flags": 4},
+            {"matrix": [1, 7], "x": 106, "y": 16, "flags": 4},
+            {"matrix": [1, 8], "x": 120, "y": 16, "flags": 4},
+            {"matrix": [1, 9], "x": 131, "y": 16, "flags": 4},
+            {"matrix": [1, 10], "x": 149, "y": 16, "flags": 4},
+            {"matrix": [1, 11], "x": 169, "y": 16, "flags": 4},
+            {"matrix": [1, 12], "x": 185, "y": 16, "flags": 4},
+            {"matrix": [1, 13], "x": 205, "y": 26, "flags": 4},
+            {"matrix": [2, 0], "x": 5, "y": 32, "flags": 4},
+            {"matrix": [2, 1], "x": 20, "y": 32, "flags": 4},
+            {"matrix": [2, 2], "x": 35, "y": 32, "flags": 4},
+            {"matrix": [2, 3], "x": 49, "y": 32, "flags": 4},
+            {"matrix": [2, 4], "x": 62, "y": 32, "flags": 4},
+            {"matrix": [2, 5], "x": 79, "y": 32, "flags": 4},
+            {"matrix": [2, 6], "x": 93, "y": 32, "flags": 4},
+            {"matrix": [2, 7], "x": 108, "y": 32, "flags": 4},
+            {"matrix": [2, 8], "x": 122, "y": 32, "flags": 4},
+            {"matrix": [2, 9], "x": 133, "y": 32, "flags": 4},
+            {"matrix": [2, 10], "x": 151, "y": 32, "flags": 4},
+            {"matrix": [2, 11], "x": 171, "y": 32, "flags": 4},
+            {"matrix": [2, 13], "x": 199, "y": 32, "flags": 4},
+            {"matrix": [3, 0], "x": 8, "y": 49, "flags": 4},
+            {"matrix": [3, 1], "x": 23, "y": 49, "flags": 4},
+            {"matrix": [3, 2], "x": 38, "y": 49, "flags": 4},
+            {"matrix": [3, 3], "x": 51, "y": 49, "flags": 4},
+            {"matrix": [3, 4], "x": 64, "y": 49, "flags": 4},
+            {"matrix": [3, 5], "x": 81, "y": 49, "flags": 4},
+            {"matrix": [3, 6], "x": 95, "y": 49, "flags": 4},
+            {"matrix": [3, 7], "x": 110, "y": 49, "flags": 4},
+            {"matrix": [3, 8], "x": 124, "y": 49, "flags": 4},
+            {"matrix": [3, 9], "x": 135, "y": 49, "flags": 4},
+            {"matrix": [3, 10], "x": 153, "y": 49, "flags": 4},
+            {"matrix": [3, 11], "x": 189, "y": 49, "flags": 4},
+            {"matrix": [3, 13], "x": 212, "y": 49, "flags": 4},
+            {"matrix": [4, 0], "x": 2, "y": 63, "flags": 4},
+            {"matrix": [4, 1], "x": 15, "y": 63, "flags": 4},
+            {"matrix": [4, 2], "x": 33, "y": 63, "flags": 4},
+            {"matrix": [4, 6], "x": 92, "y": 63, "flags": 4},
+            {"matrix": [4, 9], "x": 149, "y": 63, "flags": 4},
+            {"matrix": [4, 10], "x": 170, "y": 63, "flags": 4},
+            {"matrix": [4, 11], "x": 188, "y": 63, "flags": 4},
+            {"matrix": [4, 13], "x": 200, "y": 63, "flags": 4},
+            {"x": 60, "y": 5, "flags": 2},
+            {"x": 90, "y": 5, "flags": 2},
+            {"x": 120, "y": 5, "flags": 2},
+            {"x": 150, "y": 5, "flags": 2},
+            {"x": 180, "y": 5, "flags": 2},
+            {"x": 210, "y": 5, "flags": 2},
+            {"x": 210, "y": 60, "flags": 2},
+            {"x": 180, "y": 60, "flags": 2},
+            {"x": 150, "y": 60, "flags": 2},
+            {"x": 120, "y": 60, "flags": 2},
+            {"x": 90, "y": 60, "flags": 2},
+            {"x": 60, "y": 60, "flags": 2}
+        ],
+        "max_brightness": 128
+    },
+    "url": "https://ymdkey.com/products/ymd62-iso-rgb-hot-swap-pcb-fully-programmable-support-via-vial",
+    "usb": {
+        "device_version": "0.0.4",
+        "pid": "0x0062",
+        "vid": "0x45D4"
+    },
+    "ws2812": {
+        "driver": "pwm",
+        "pin": "B9"
+    },
+    "community_layouts": ["60_iso"],
+    "layouts": {
+        "LAYOUT_60_iso": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5, "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, 13], "x": 12.25, "y": 3, "w": 2.75},
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/ymdk/ymd62/keymaps/default/keymap.c b/keyboards/ymdk/ymd62/keymaps/default/keymap.c
new file mode 100644
index 00000000000..79c128295ef
--- /dev/null
+++ b/keyboards/ymdk/ymd62/keymaps/default/keymap.c
@@ -0,0 +1,19 @@
+// Copyright 2024 Richard Dawe (@richdawe)
+// SPDX-License-Identifier: GPL-2.0-or-later
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+[0] = LAYOUT_60_iso( /* Base */
+    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,  MO(1)  ,  KC_APP,  KC_RCTL),
+
+[1] = LAYOUT_60_iso( /* FN */
+    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_TRNS,  KC_TRNS,  QK_BOOT  ,
+    KC_TRNS,  KC_LEFT,  KC_DOWN,  KC_RGHT,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,
+    KC_TRNS,  RGB_TOG,  RGB_MOD,  RGB_RMOD, RGB_HUI,  RGB_HUD,  RGB_SAI,  RGB_SAD,  RGB_VAI,  RGB_VAD,  RGB_M_P,  KC_TRNS,            KC_TRNS,
+    KC_VOLU,  KC_VOLD,  KC_MUTE,                                KC_TRNS,                                KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS)
+};
\ No newline at end of file
diff --git a/keyboards/ymdk/ymd62/mcuconf.h b/keyboards/ymdk/ymd62/mcuconf.h
new file mode 100644
index 00000000000..3c076403711
--- /dev/null
+++ b/keyboards/ymdk/ymd62/mcuconf.h
@@ -0,0 +1,9 @@
+// Copyright 2024 Richard Dawe (@richdawe)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include_next <mcuconf.h>
+
+#undef STM32_PWM_USE_TIM4
+#define STM32_PWM_USE_TIM4 TRUE
\ No newline at end of file
diff --git a/keyboards/ymdk/ymd62/readme.md b/keyboards/ymdk/ymd62/readme.md
new file mode 100644
index 00000000000..73eeed3dbb9
--- /dev/null
+++ b/keyboards/ymdk/ymd62/readme.md
@@ -0,0 +1,28 @@
+# YMDK YMD62 ISO
+
+A 60% PCB supporting the ISO layout, with hotswap sockets, backlit keys and underglow.
+
+* Keyboard Maintainer: [Richard Dawe](https://github.com/richdawe)
+* Hardware Supported: YMD62 PCB
+* Hardware Availability: [YMDK](https://ymdkey.com/products/ymd62-iso-rgb-hot-swap-pcb-fully-programmable-support-via-vial)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make ymdk/ymd62:default
+
+Flashing example for this keyboard:
+
+    make ymdk/ymd62: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**: Double-tap the reset button on the back of the PCB
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
+
+Note: The device does not reconnect automatically after the QMK firmware has been flashed.
+Wait for the USB device to disappear after writing firmware, then unplug and re-plug it.
\ No newline at end of file
diff --git a/keyboards/ymdk/ymd62/rules.mk b/keyboards/ymdk/ymd62/rules.mk
new file mode 100644
index 00000000000..ef4364b06ac
--- /dev/null
+++ b/keyboards/ymdk/ymd62/rules.mk
@@ -0,0 +1,2 @@
+# Configure for 128K flash
+MCU_LDSCRIPT = STM32F103xB
\ No newline at end of file
diff --git a/keyboards/yushakobo/navpad/10/info.json b/keyboards/yushakobo/navpad/10/info.json
index ef0cdf5cbed..e28a2e2cb17 100644
--- a/keyboards/yushakobo/navpad/10/info.json
+++ b/keyboards/yushakobo/navpad/10/info.json
@@ -7,6 +7,14 @@
         "vid": "0x3265",
         "pid": "0x0008"
     },
+    "features": {
+        "bootmagic": true,
+        "encoder": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": false,
+        "rgblight": true
+    },
     "encoder": {
         "rotary": [
             {"pin_a": "B5", "pin_b": "B6"}
diff --git a/keyboards/yushakobo/navpad/10/rev0/rules.mk b/keyboards/yushakobo/navpad/10/rev0/rules.mk
new file mode 100644
index 00000000000..e8ffcca7a6d
--- /dev/null
+++ b/keyboards/yushakobo/navpad/10/rev0/rules.mk
@@ -0,0 +1 @@
+SRC += navpad_prefs.c
diff --git a/keyboards/yushakobo/navpad/10/rev1/rules.mk b/keyboards/yushakobo/navpad/10/rev1/rules.mk
new file mode 100644
index 00000000000..e8ffcca7a6d
--- /dev/null
+++ b/keyboards/yushakobo/navpad/10/rev1/rules.mk
@@ -0,0 +1 @@
+SRC += navpad_prefs.c
diff --git a/keyboards/yushakobo/navpad/10/rules.mk b/keyboards/yushakobo/navpad/10/rules.mk
index 61cbbf351dc..32daeef814d 100644
--- a/keyboards/yushakobo/navpad/10/rules.mk
+++ b/keyboards/yushakobo/navpad/10/rules.mk
@@ -1,17 +1 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
-ENCODER_ENABLE = yes
-
-SRC += navpad_prefs.c
 DEFAULT_FOLDER = yushakobo/navpad/10/rev1
diff --git a/keyboards/yushakobo/navpad/10_helix_r/info.json b/keyboards/yushakobo/navpad/10_helix_r/info.json
deleted file mode 100644
index 8084f1f7bd8..00000000000
--- a/keyboards/yushakobo/navpad/10_helix_r/info.json
+++ /dev/null
@@ -1,143 +0,0 @@
-{
-    "keyboard_name": "navpad 1.0 with helix keyboard",
-    "manufacturer": "yushakobo",
-    "url": "",
-    "maintainer": "yushakobo",
-    "usb": {
-        "vid": "0x3265",
-        "pid": "0x0008",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["F5", "F6", "B2", "B3", "B1", "F7", null],
-        "rows": ["D4", "C6", "D7", "E6", "B4", "F4"]
-    },
-    "diode_direction": "COL2ROW",
-    "encoder": {
-        "rotary": [
-            {"pin_a": "B5", "pin_b": "B6"}
-        ]
-    },
-    "split": {
-        "enabled": true,
-        "soft_serial_pin": "D2",
-        "encoder": {
-            "right": {
-                "rotary": [
-                    {"pin_a": "B6", "pin_b": "B5"}
-                ]
-            }
-        },
-        "matrix_pins": {
-            "right": {
-                "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"],
-                "rows": ["D4", "C6", "D7", "E6", "B4"]
-            }
-        }
-    },
-    "tapping": {
-        "term": 132
-    },
-    "ws2812": {
-        "pin": "D3"
-    },
-    "rgblight": {
-        "saturation_steps": 8,
-        "brightness_steps": 8,
-        "led_count": 41,
-        "max_brightness": 120,
-        "led_map": [0, 1, 2, 3, 4, 5, 6, 8, 7, 9, 10, 11, 12, 13, 14, 20, 19, 18, 17, 16, 15, 21, 22, 23, 24, 25, 26, 33, 32, 31, 30, 29, 28, 27, 34, 35, 36, 37, 38, 39, 40],
-        "sleep": true,
-        "split_count": [9, 32],
-        "animations": {
-            "rainbow_swirl": true,
-            "rgb_test": true
-        }
-    },
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [5, 0], "x": 0, "y": 0},
-                {"matrix": [0, 0], "x": 1, "y": 0},
-                {"matrix": [0, 1], "x": 2, "y": 0},
-                {"matrix": [5, 1], "x": 3, "y": 0},
-
-                {"matrix": [5, 2], "x": 0, "y": 1},
-                {"matrix": [1, 0], "x": 1, "y": 1},
-                {"matrix": [1, 1], "x": 2, "y": 1},
-                {"matrix": [0, 2], "x": 3, "y": 1},
-                {"matrix": [0, 3], "x": 4, "y": 1},
-                {"matrix": [0, 4], "x": 5, "y": 1},
-                {"matrix": [0, 5], "x": 6, "y": 1},
-
-                {"matrix": [6, 5], "x": 8, "y": 1},
-                {"matrix": [6, 4], "x": 9, "y": 1},
-                {"matrix": [6, 3], "x": 10, "y": 1},
-                {"matrix": [6, 2], "x": 11, "y": 1},
-                {"matrix": [6, 1], "x": 12, "y": 1},
-                {"matrix": [6, 0], "x": 13, "y": 1},
-
-                {"matrix": [5, 3], "x": 0, "y": 2},
-                {"matrix": [2, 0], "x": 1, "y": 2},
-                {"matrix": [2, 1], "x": 2, "y": 2},
-                {"matrix": [1, 2], "x": 3, "y": 2},
-                {"matrix": [1, 3], "x": 4, "y": 2},
-                {"matrix": [1, 4], "x": 5, "y": 2},
-                {"matrix": [1, 5], "x": 6, "y": 2},
-
-                {"matrix": [7, 5], "x": 8, "y": 2},
-                {"matrix": [7, 4], "x": 9, "y": 2},
-                {"matrix": [7, 3], "x": 10, "y": 2},
-                {"matrix": [7, 2], "x": 11, "y": 2},
-                {"matrix": [7, 1], "x": 12, "y": 2},
-                {"matrix": [7, 0], "x": 13, "y": 2},
-
-                {"matrix": [2, 2], "x": 3, "y": 3},
-                {"matrix": [2, 3], "x": 4, "y": 3},
-                {"matrix": [2, 4], "x": 5, "y": 3},
-                {"matrix": [2, 5], "x": 6, "y": 3},
-
-                {"matrix": [8, 5], "x": 8, "y": 3},
-                {"matrix": [8, 4], "x": 9, "y": 3},
-                {"matrix": [8, 3], "x": 10, "y": 3},
-                {"matrix": [8, 2], "x": 11, "y": 3},
-                {"matrix": [8, 1], "x": 12, "y": 3},
-                {"matrix": [8, 0], "x": 13, "y": 3},
-
-                {"matrix": [5, 4], "x": 0, "y": 4},
-                {"matrix": [3, 0], "x": 1, "y": 4},
-                {"matrix": [3, 1], "x": 2, "y": 4},
-                {"matrix": [3, 2], "x": 3, "y": 4},
-                {"matrix": [3, 3], "x": 4, "y": 4},
-                {"matrix": [3, 4], "x": 5, "y": 4},
-                {"matrix": [3, 5], "x": 6, "y": 4},
-
-                {"matrix": [9, 6], "x": 7, "y": 4},
-                {"matrix": [9, 5], "x": 8, "y": 4},
-                {"matrix": [9, 4], "x": 9, "y": 4},
-                {"matrix": [9, 3], "x": 10, "y": 4},
-                {"matrix": [9, 2], "x": 11, "y": 4},
-                {"matrix": [9, 1], "x": 12, "y": 4},
-                {"matrix": [9, 0], "x": 13, "y": 4},
-
-                {"matrix": [5, 5], "x": 0, "y": 5},
-                {"matrix": [4, 0], "x": 1, "y": 5},
-                {"matrix": [4, 1], "x": 2, "y": 5},
-                {"matrix": [4, 2], "x": 3, "y": 5},
-                {"matrix": [4, 3], "x": 4, "y": 5},
-                {"matrix": [4, 4], "x": 5, "y": 5},
-                {"matrix": [4, 5], "x": 6, "y": 5},
-
-                {"matrix": [10, 6], "x": 7, "y": 5},
-                {"matrix": [10, 5], "x": 8, "y": 5},
-                {"matrix": [10, 4], "x": 9, "y": 5},
-                {"matrix": [10, 3], "x": 10, "y": 5},
-                {"matrix": [10, 2], "x": 11, "y": 5},
-                {"matrix": [10, 1], "x": 12, "y": 5},
-                {"matrix": [10, 0], "x": 13, "y": 5}
-            ]
-        }
-    }
-}
diff --git a/keyboards/yushakobo/navpad/10_helix_r/keyboard.json b/keyboards/yushakobo/navpad/10_helix_r/keyboard.json
new file mode 100644
index 00000000000..81854128da5
--- /dev/null
+++ b/keyboards/yushakobo/navpad/10_helix_r/keyboard.json
@@ -0,0 +1,151 @@
+{
+    "keyboard_name": "navpad 1.0 with helix keyboard",
+    "manufacturer": "yushakobo",
+    "url": "",
+    "maintainer": "yushakobo",
+    "usb": {
+        "vid": "0x3265",
+        "pid": "0x0008",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "encoder": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": false,
+        "rgblight": true
+    },
+    "matrix_pins": {
+        "cols": ["F5", "F6", "B2", "B3", "B1", "F7", null],
+        "rows": ["D4", "C6", "D7", "E6", "B4", "F4"]
+    },
+    "diode_direction": "COL2ROW",
+    "encoder": {
+        "rotary": [
+            {"pin_a": "B5", "pin_b": "B6"}
+        ]
+    },
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "D2",
+        "encoder": {
+            "right": {
+                "rotary": [
+                    {"pin_a": "B6", "pin_b": "B5"}
+                ]
+            }
+        },
+        "matrix_pins": {
+            "right": {
+                "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"],
+                "rows": ["D4", "C6", "D7", "E6", "B4"]
+            }
+        }
+    },
+    "tapping": {
+        "term": 132
+    },
+    "ws2812": {
+        "pin": "D3"
+    },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 41,
+        "max_brightness": 120,
+        "led_map": [0, 1, 2, 3, 4, 5, 6, 8, 7, 9, 10, 11, 12, 13, 14, 20, 19, 18, 17, 16, 15, 21, 22, 23, 24, 25, 26, 33, 32, 31, 30, 29, 28, 27, 34, 35, 36, 37, 38, 39, 40],
+        "sleep": true,
+        "split_count": [9, 32],
+        "animations": {
+            "rainbow_swirl": true,
+            "rgb_test": true
+        }
+    },
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [5, 0], "x": 0, "y": 0},
+                {"matrix": [0, 0], "x": 1, "y": 0},
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [5, 1], "x": 3, "y": 0},
+
+                {"matrix": [5, 2], "x": 0, "y": 1},
+                {"matrix": [1, 0], "x": 1, "y": 1},
+                {"matrix": [1, 1], "x": 2, "y": 1},
+                {"matrix": [0, 2], "x": 3, "y": 1},
+                {"matrix": [0, 3], "x": 4, "y": 1},
+                {"matrix": [0, 4], "x": 5, "y": 1},
+                {"matrix": [0, 5], "x": 6, "y": 1},
+
+                {"matrix": [6, 5], "x": 8, "y": 1},
+                {"matrix": [6, 4], "x": 9, "y": 1},
+                {"matrix": [6, 3], "x": 10, "y": 1},
+                {"matrix": [6, 2], "x": 11, "y": 1},
+                {"matrix": [6, 1], "x": 12, "y": 1},
+                {"matrix": [6, 0], "x": 13, "y": 1},
+
+                {"matrix": [5, 3], "x": 0, "y": 2},
+                {"matrix": [2, 0], "x": 1, "y": 2},
+                {"matrix": [2, 1], "x": 2, "y": 2},
+                {"matrix": [1, 2], "x": 3, "y": 2},
+                {"matrix": [1, 3], "x": 4, "y": 2},
+                {"matrix": [1, 4], "x": 5, "y": 2},
+                {"matrix": [1, 5], "x": 6, "y": 2},
+
+                {"matrix": [7, 5], "x": 8, "y": 2},
+                {"matrix": [7, 4], "x": 9, "y": 2},
+                {"matrix": [7, 3], "x": 10, "y": 2},
+                {"matrix": [7, 2], "x": 11, "y": 2},
+                {"matrix": [7, 1], "x": 12, "y": 2},
+                {"matrix": [7, 0], "x": 13, "y": 2},
+
+                {"matrix": [2, 2], "x": 3, "y": 3},
+                {"matrix": [2, 3], "x": 4, "y": 3},
+                {"matrix": [2, 4], "x": 5, "y": 3},
+                {"matrix": [2, 5], "x": 6, "y": 3},
+
+                {"matrix": [8, 5], "x": 8, "y": 3},
+                {"matrix": [8, 4], "x": 9, "y": 3},
+                {"matrix": [8, 3], "x": 10, "y": 3},
+                {"matrix": [8, 2], "x": 11, "y": 3},
+                {"matrix": [8, 1], "x": 12, "y": 3},
+                {"matrix": [8, 0], "x": 13, "y": 3},
+
+                {"matrix": [5, 4], "x": 0, "y": 4},
+                {"matrix": [3, 0], "x": 1, "y": 4},
+                {"matrix": [3, 1], "x": 2, "y": 4},
+                {"matrix": [3, 2], "x": 3, "y": 4},
+                {"matrix": [3, 3], "x": 4, "y": 4},
+                {"matrix": [3, 4], "x": 5, "y": 4},
+                {"matrix": [3, 5], "x": 6, "y": 4},
+
+                {"matrix": [9, 6], "x": 7, "y": 4},
+                {"matrix": [9, 5], "x": 8, "y": 4},
+                {"matrix": [9, 4], "x": 9, "y": 4},
+                {"matrix": [9, 3], "x": 10, "y": 4},
+                {"matrix": [9, 2], "x": 11, "y": 4},
+                {"matrix": [9, 1], "x": 12, "y": 4},
+                {"matrix": [9, 0], "x": 13, "y": 4},
+
+                {"matrix": [5, 5], "x": 0, "y": 5},
+                {"matrix": [4, 0], "x": 1, "y": 5},
+                {"matrix": [4, 1], "x": 2, "y": 5},
+                {"matrix": [4, 2], "x": 3, "y": 5},
+                {"matrix": [4, 3], "x": 4, "y": 5},
+                {"matrix": [4, 4], "x": 5, "y": 5},
+                {"matrix": [4, 5], "x": 6, "y": 5},
+
+                {"matrix": [10, 6], "x": 7, "y": 5},
+                {"matrix": [10, 5], "x": 8, "y": 5},
+                {"matrix": [10, 4], "x": 9, "y": 5},
+                {"matrix": [10, 3], "x": 10, "y": 5},
+                {"matrix": [10, 2], "x": 11, "y": 5},
+                {"matrix": [10, 1], "x": 12, "y": 5},
+                {"matrix": [10, 0], "x": 13, "y": 5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/yushakobo/navpad/10_helix_r/rules.mk b/keyboards/yushakobo/navpad/10_helix_r/rules.mk
index f30c00650ce..e8ffcca7a6d 100644
--- a/keyboards/yushakobo/navpad/10_helix_r/rules.mk
+++ b/keyboards/yushakobo/navpad/10_helix_r/rules.mk
@@ -1,16 +1 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
-ENCODER_ENABLE = yes
-
 SRC += navpad_prefs.c
diff --git a/keyboards/yushakobo/quick17/info.json b/keyboards/yushakobo/quick17/info.json
deleted file mode 100644
index 51c41a6e82a..00000000000
--- a/keyboards/yushakobo/quick17/info.json
+++ /dev/null
@@ -1,74 +0,0 @@
-{
-    "keyboard_name": "quick17",
-    "manufacturer": "yushakobo",
-    "url": "https://shop.yushakobo.jp/products/quick17",
-    "maintainer": "yushakobo",
-    "usb": {
-        "vid": "0x3265",
-        "pid": "0x0006",
-        "device_version": "0.0.1"
-    },
-    "rgb_matrix": {
-        "driver": "ws2812",
-        "max_brightness": 150,
-        "sat_steps": 8,
-        "sleep": true,
-        "val_steps": 8,
-        "speed_steps": 10
-    },
-    "rgblight": {
-        "saturation_steps": 8,
-        "brightness_steps": 8,
-        "led_count": 18,
-        "max_brightness": 150,
-        "led_map": [6, 7, 12, 13, 14, 15, 16, 17, 11, 10, 9, 8, 0, 1, 2, 3, 4, 5],
-        "animations": {
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "christmas": true,
-            "static_gradient": true,
-            "rgb_test": true
-        }
-    },
-    "matrix_pins": {
-        "cols": ["F5", "D4", "E6", "F7", "C6", "D7"],
-        "rows": ["F4", "B3", "B6"]
-    },
-    "diode_direction": "COL2ROW",
-    "encoder": {
-        "rotary": [
-            {"pin_a": "B4", "pin_b": "B5"}
-        ]
-    },
-    "ws2812": {
-        "pin": "D2"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "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": [1, 4], "x": 4, "y": 1},
-                {"matrix": [1, 5], "x": 5, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2},
-                {"matrix": [2, 1], "x": 1, "y": 2},
-                {"matrix": [2, 2], "x": 2, "y": 2},
-                {"matrix": [2, 3], "x": 3, "y": 2},
-                {"matrix": [2, 4], "x": 4, "y": 2},
-                {"matrix": [2, 5], "x": 5, "y": 2}
-            ]
-        }
-    }
-}
diff --git a/keyboards/yushakobo/quick17/keyboard.json b/keyboards/yushakobo/quick17/keyboard.json
new file mode 100644
index 00000000000..aa0d39756d9
--- /dev/null
+++ b/keyboards/yushakobo/quick17/keyboard.json
@@ -0,0 +1,82 @@
+{
+    "keyboard_name": "quick17",
+    "manufacturer": "yushakobo",
+    "url": "https://shop.yushakobo.jp/products/quick17",
+    "maintainer": "yushakobo",
+    "usb": {
+        "vid": "0x3265",
+        "pid": "0x0006",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "encoder": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": false,
+        "rgb_matrix": true
+    },
+    "rgb_matrix": {
+        "driver": "ws2812",
+        "max_brightness": 150,
+        "sat_steps": 8,
+        "sleep": true,
+        "val_steps": 8,
+        "speed_steps": 10
+    },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 18,
+        "max_brightness": 150,
+        "led_map": [6, 7, 12, 13, 14, 15, 16, 17, 11, 10, 9, 8, 0, 1, 2, 3, 4, 5],
+        "animations": {
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "christmas": true,
+            "static_gradient": true,
+            "rgb_test": true
+        }
+    },
+    "matrix_pins": {
+        "cols": ["F5", "D4", "E6", "F7", "C6", "D7"],
+        "rows": ["F4", "B3", "B6"]
+    },
+    "diode_direction": "COL2ROW",
+    "encoder": {
+        "rotary": [
+            {"pin_a": "B4", "pin_b": "B5"}
+        ]
+    },
+    "ws2812": {
+        "pin": "D2"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "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": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2}
+            ]
+        }
+    }
+}
diff --git a/keyboards/yushakobo/quick17/rules.mk b/keyboards/yushakobo/quick17/rules.mk
index 70ab5e27442..083da9448c6 100644
--- a/keyboards/yushakobo/quick17/rules.mk
+++ b/keyboards/yushakobo/quick17/rules.mk
@@ -1,18 +1,3 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-ENCODER_ENABLE = yes
-
-RGB_MATRIX_ENABLE = yes
 RGB_MATRIX_CUSTOM_KB = yes
 
 SRC += quick17_prefs.c
diff --git a/keyboards/zsa/moonlander/keyboard.json b/keyboards/zsa/moonlander/keyboard.json
index 233cb46bba7..08864fe2d77 100644
--- a/keyboards/zsa/moonlander/keyboard.json
+++ b/keyboards/zsa/moonlander/keyboard.json
@@ -22,6 +22,9 @@
         "rgb_matrix": true,
         "swap_hands": true
     },
+    "audio": {
+        "driver": "dac_additive"
+    },
     "dynamic_keymap": {
         "layer_count": 8
     },
diff --git a/keyboards/zsa/moonlander/rules.mk b/keyboards/zsa/moonlander/rules.mk
index 46375584890..10928ea0611 100644
--- a/keyboards/zsa/moonlander/rules.mk
+++ b/keyboards/zsa/moonlander/rules.mk
@@ -1,4 +1,3 @@
-AUDIO_DRIVER = dac_additive
 CUSTOM_MATRIX = lite
 
 # project specific files
diff --git a/keyboards/zsa/voyager/config.h b/keyboards/zsa/voyager/config.h
new file mode 100644
index 00000000000..630c01fc809
--- /dev/null
+++ b/keyboards/zsa/voyager/config.h
@@ -0,0 +1,14 @@
+// Copyright 2023 ZSA Technology Labs, Inc <@zsa>
+// Copyright 2023 Christopher Courtney, aka Drashna Jael're  (@drashna) <drashna@live.com>
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND
+#define IS31FL3731_I2C_ADDRESS_2 IS31FL3731_I2C_ADDRESS_VCC
+
+#define IS31FL3731_I2C_TIMEOUT 5
+
+#define MOUSEKEY_WHEEL_INTERVAL MOUSEKEY_INTERVAL
+#define MOUSEKEY_WHEEL_MAX_SPEED MOUSEKEY_MAX_SPEED
+#define MOUSEKEY_WHEEL_TIME_TO_MAX MOUSEKEY_TIME_TO_MAX
diff --git a/keyboards/zsa/voyager/halconf.h b/keyboards/zsa/voyager/halconf.h
new file mode 100644
index 00000000000..d9f29a11cb1
--- /dev/null
+++ b/keyboards/zsa/voyager/halconf.h
@@ -0,0 +1,20 @@
+/* Copyright 2021 QMK
+ *
+ *  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 3 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 <https://www.gnu.org/licenses/>.
+ */
+#pragma once
+
+#define HAL_USE_I2C TRUE
+
+#include_next <halconf.h>
diff --git a/keyboards/zsa/voyager/keyboard.json b/keyboards/zsa/voyager/keyboard.json
new file mode 100644
index 00000000000..14e7584f5cc
--- /dev/null
+++ b/keyboards/zsa/voyager/keyboard.json
@@ -0,0 +1,219 @@
+{
+    "manufacturer": "ZSA Technology Labs",
+    "keyboard_name": "Voyager",
+    "maintainer": "ZSA Technology Labs",
+    "url": "zsa.io/voyager",
+    "processor": "STM32F303",
+    "bootloader": "custom",
+    "usb": {
+        "vid": "0x3297",
+        "pid": "0x1977",
+        "device_version": "0.0.1",
+        "shared_endpoint": {
+            "mouse": false
+        }
+    },
+    "features": {
+        "bootmagic": true,
+        "caps_word": true,
+        "deferred_exec": true,
+        "mousekey": true,
+        "extrakey": true,
+        "nkro": true,
+        "swap_hands": true,
+        "rgb_matrix": true
+    },
+    "bootmagic": {
+        "matrix": [0, 1]
+    },
+    "diode_direction": "ROW2COL",
+    "matrix_size": {
+        "cols": 7,
+        "rows": 12
+    },
+    "mousekey": {
+        "delay": 0,
+        "interval": 20,
+        "max_speed": 7,
+        "time_to_max": 60,
+        "wheel_delay": 400
+    },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
+    "rgb_matrix": {
+        "driver": "is31fl3731",
+        "led_flush_limit": 26,
+        "led_process_limit": 5,
+        "max_brightness": 175,
+        "sleep": true,
+        "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,
+            "flower_blooming": 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,
+            "starlight": true,
+            "starlight_dual_sat": true,
+            "starlight_dual_hue": true,
+            "riverflow": true
+        },
+        "layout": [
+            {"matrix": [0, 1], "x": 0, "y": 10, "flags": 1},
+            {"matrix": [0, 2], "x": 17, "y": 10, "flags": 4},
+            {"matrix": [0, 3], "x": 34, "y": 8, "flags": 4},
+            {"matrix": [0, 4], "x": 52, "y": 5, "flags": 4},
+            {"matrix": [0, 5], "x": 69, "y": 8, "flags": 4},
+            {"matrix": [0, 6], "x": 86, "y": 10, "flags": 4},
+            {"matrix": [1, 1], "x": 0, "y": 21, "flags": 1},
+            {"matrix": [1, 2], "x": 17, "y": 21, "flags": 4},
+            {"matrix": [1, 3], "x": 34, "y": 19, "flags": 4},
+            {"matrix": [1, 4], "x": 52, "y": 17, "flags": 4},
+            {"matrix": [1, 5], "x": 69, "y": 19, "flags": 4},
+            {"matrix": [1, 6], "x": 86, "y": 21, "flags": 4},
+            {"matrix": [2, 1], "x": 0, "y": 32, "flags": 1},
+            {"matrix": [2, 2], "x": 17, "y": 32, "flags": 4},
+            {"matrix": [2, 3], "x": 34, "y": 30, "flags": 4},
+            {"matrix": [2, 4], "x": 52, "y": 28, "flags": 4},
+            {"matrix": [2, 5], "x": 69, "y": 30, "flags": 4},
+            {"matrix": [2, 6], "x": 86, "y": 32, "flags": 4},
+            {"matrix": [3, 1], "x": 0, "y": 43, "flags": 1},
+            {"matrix": [3, 2], "x": 17, "y": 43, "flags": 4},
+            {"matrix": [3, 3], "x": 34, "y": 41, "flags": 4},
+            {"matrix": [3, 4], "x": 52, "y": 39, "flags": 4},
+            {"matrix": [3, 5], "x": 69, "y": 41, "flags": 4},
+            {"matrix": [4, 4], "x": 86, "y": 43, "flags": 4},
+            {"matrix": [5, 0], "x": 86, "y": 53, "flags": 1},
+            {"matrix": [5, 1], "x": 96, "y": 58, "flags": 1},
+            {"matrix": [6, 0], "x": 138, "y": 10, "flags": 4},
+            {"matrix": [6, 1], "x": 155, "y": 10, "flags": 4},
+            {"matrix": [6, 2], "x": 172, "y": 8, "flags": 4},
+            {"matrix": [6, 3], "x": 190, "y": 5, "flags": 4},
+            {"matrix": [6, 4], "x": 207, "y": 8, "flags": 4},
+            {"matrix": [6, 5], "x": 224, "y": 10, "flags": 1},
+            {"matrix": [7, 0], "x": 138, "y": 21, "flags": 4},
+            {"matrix": [7, 1], "x": 155, "y": 21, "flags": 4},
+            {"matrix": [7, 2], "x": 172, "y": 19, "flags": 4},
+            {"matrix": [7, 3], "x": 190, "y": 17, "flags": 4},
+            {"matrix": [7, 4], "x": 207, "y": 19, "flags": 4},
+            {"matrix": [7, 5], "x": 224, "y": 21, "flags": 1},
+            {"matrix": [8, 0], "x": 138, "y": 32, "flags": 4},
+            {"matrix": [8, 1], "x": 155, "y": 32, "flags": 4},
+            {"matrix": [8, 2], "x": 172, "y": 30, "flags": 4},
+            {"matrix": [8, 3], "x": 190, "y": 28, "flags": 4},
+            {"matrix": [8, 4], "x": 207, "y": 30, "flags": 4},
+            {"matrix": [8, 5], "x": 224, "y": 32, "flags": 1},
+            {"matrix": [10, 2], "x": 138, "y": 43, "flags": 4},
+            {"matrix": [9, 1], "x": 155, "y": 43, "flags": 4},
+            {"matrix": [9, 2], "x": 172, "y": 41, "flags": 4},
+            {"matrix": [9, 3], "x": 190, "y": 39, "flags": 4},
+            {"matrix": [9, 4], "x": 207, "y": 41, "flags": 4},
+            {"matrix": [9, 5], "x": 224, "y": 43, "flags": 1},
+            {"matrix": [11, 5], "x": 128, "y": 58, "flags": 1},
+            {"matrix": [11, 6], "x": 138, "y": 53, "flags": 1}
+        ]
+    },
+    "layout_aliases": {
+        "LAYOUT_voyager": "LAYOUT"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"label": "k00", "matrix": [0, 1], "x": 3, "y": 0},
+                {"label": "k01", "matrix": [0, 2], "x": 12, "y": 0},
+                {"label": "k02", "matrix": [0, 3], "x": 2, "y": 0.25},
+                {"label": "k03", "matrix": [0, 4], "x": 4, "y": 0.25},
+                {"label": "k04", "matrix": [0, 5], "x": 11, "y": 0.25},
+                {"label": "k05", "matrix": [0, 6], "x": 13, "y": 0.25},
+                {"label": "k26", "matrix": [6, 0], "x": 0, "y": 0.5},
+                {"label": "k27", "matrix": [6, 1], "x": 1, "y": 0.5},
+                {"label": "k28", "matrix": [6, 2], "x": 5, "y": 0.5},
+                {"label": "k29", "matrix": [6, 3], "x": 10, "y": 0.5},
+                {"label": "k30", "matrix": [6, 4], "x": 14, "y": 0.5},
+                {"label": "k31", "matrix": [6, 5], "x": 15, "y": 0.5},
+                {"label": "k06", "matrix": [1, 1], "x": 3, "y": 1},
+                {"label": "k07", "matrix": [1, 2], "x": 12, "y": 1},
+                {"label": "k08", "matrix": [1, 3], "x": 2, "y": 1.25},
+                {"label": "k09", "matrix": [1, 4], "x": 4, "y": 1.25},
+                {"label": "k10", "matrix": [1, 5], "x": 11, "y": 1.25},
+                {"label": "k11", "matrix": [1, 6], "x": 13, "y": 1.25},
+                {"label": "k32", "matrix": [7, 0], "x": 0, "y": 1.5},
+                {"label": "k33", "matrix": [7, 1], "x": 1, "y": 1.5},
+                {"label": "k34", "matrix": [7, 2], "x": 5, "y": 1.5},
+                {"label": "k35", "matrix": [7, 3], "x": 10, "y": 1.5},
+                {"label": "k36", "matrix": [7, 4], "x": 14, "y": 1.5},
+                {"label": "k37", "matrix": [7, 5], "x": 15, "y": 1.5},
+                {"label": "k12", "matrix": [2, 1], "x": 3, "y": 2},
+                {"label": "k13", "matrix": [2, 2], "x": 12, "y": 2},
+                {"label": "k14", "matrix": [2, 3], "x": 2, "y": 2.25},
+                {"label": "k15", "matrix": [2, 4], "x": 4, "y": 2.25},
+                {"label": "k16", "matrix": [2, 5], "x": 11, "y": 2.25},
+                {"label": "k17", "matrix": [2, 6], "x": 13, "y": 2.25},
+                {"label": "k38", "matrix": [8, 0], "x": 0, "y": 2.5},
+                {"label": "k39", "matrix": [8, 1], "x": 1, "y": 2.5},
+                {"label": "k40", "matrix": [8, 2], "x": 5, "y": 2.5},
+                {"label": "k41", "matrix": [8, 3], "x": 10, "y": 2.5},
+                {"label": "k42", "matrix": [8, 4], "x": 14, "y": 2.5},
+                {"label": "k43", "matrix": [8, 5], "x": 15, "y": 2.5},
+                {"label": "k18", "matrix": [3, 1], "x": 3, "y": 3},
+                {"label": "k19", "matrix": [3, 2], "x": 12, "y": 3},
+                {"label": "k20", "matrix": [3, 3], "x": 2, "y": 3.25},
+                {"label": "k21", "matrix": [3, 4], "x": 4, "y": 3.25},
+                {"label": "k22", "matrix": [3, 5], "x": 11, "y": 3.25},
+                {"label": "k23", "matrix": [4, 4], "x": 13, "y": 3.25},
+                {"label": "k44", "matrix": [10, 2], "x": 0, "y": 3.5},
+                {"label": "k45", "matrix": [9, 1], "x": 1, "y": 3.5},
+                {"label": "k46", "matrix": [9, 2], "x": 5, "y": 3.5},
+                {"label": "k47", "matrix": [9, 3], "x": 10, "y": 3.5},
+                {"label": "k48", "matrix": [9, 4], "x": 14, "y": 3.5},
+                {"label": "k49", "matrix": [9, 5], "x": 15, "y": 3.5},
+                {"label": "k24", "matrix": [5, 0], "x": 5, "y": 4.5},
+                {"label": "k25", "matrix": [5, 1], "x": 6, "y": 4.75},
+                {"label": "k50", "matrix": [11, 5], "x": 9, "y": 4.75},
+                {"label": "k51", "matrix": [11, 6], "x": 10, "y": 4.5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/zsa/voyager/keymaps/default/keymap.c b/keyboards/zsa/voyager/keymaps/default/keymap.c
new file mode 100644
index 00000000000..e05794de756
--- /dev/null
+++ b/keyboards/zsa/voyager/keymaps/default/keymap.c
@@ -0,0 +1,29 @@
+// Copyright 2023 ZSA Technology Labs, Inc <@zsa>
+// Copyright 2023 Christopher Courtney, aka Drashna Jael're  (@drashna) <drashna@live.com>
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT(
+        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                         KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,
+        CW_TOGG, KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                         KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSLS,
+        SFT_T(KC_BSPC),KC_A, KC_S, KC_D,    KC_F,    KC_G,                         KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, RSFT_T(KC_QUOT),
+        KC_LGUI, ALT_T(KC_Z),KC_X, KC_C,    KC_V,    KC_B,                         KC_N,    KC_M,    KC_COMMA,KC_DOT,  RALT_T(KC_SLSH), KC_RCTL,
+                                LT(1,KC_ENT), CTL_T(KC_TAB),           SFT_T(KC_BSPC), LT(2,KC_SPC)
+    ),
+    [1] = LAYOUT(
+        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,                        KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,
+        KC_GRV,  KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC,                      KC_7,    KC_8,    KC_9,    KC_MINS, KC_SLSH, KC_F12,
+        _______, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN,                      KC_4,    KC_5,    KC_6,    KC_PLUS, KC_ASTR, KC_BSPC,
+        _______, _______, KC_LBRC, KC_RBRC, KC_LCBR, KC_RCBR,                      KC_1,    KC_2,    KC_3,    KC_DOT,  KC_EQL,  KC_ENT,
+                                                     _______, _______,    _______, KC_0
+    ),
+    [2] = LAYOUT(
+        RGB_TOG, QK_KB,   RGB_MOD, RGB_M_P, RGB_VAD, RGB_VAI,                      _______, _______, _______, _______, _______, QK_BOOT,
+        _______, _______, KC_VOLD, KC_VOLU, KC_MUTE, _______,                      KC_PGUP, KC_HOME, KC_UP,   KC_END,  _______, _______,
+        _______, KC_MPRV, KC_MNXT, KC_MSTP, KC_MPLY, _______,                      KC_PGDN, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______,
+        _______, _______, _______, _______, _______, _______,                      _______, C(S(KC_TAB)), C(KC_TAB), _______, _______, _______,
+                                                     _______, _______,    _______, _______
+    ),
+};
diff --git a/keyboards/zsa/voyager/ld/voyager.ld b/keyboards/zsa/voyager/ld/voyager.ld
new file mode 100644
index 00000000000..0619983beb0
--- /dev/null
+++ b/keyboards/zsa/voyager/ld/voyager.ld
@@ -0,0 +1,85 @@
+/*
+    ChibiOS - Copyright (C) 2006..2018 Giovanni Di Sirio
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+
+/*
+ * STM32F303xC memory setup.
+ */
+MEMORY
+{
+    flash0 (rx) : org = 0x08002000, len = 256k - 0x2000
+    flash1 (rx) : org = 0x00000000, len = 0
+    flash2 (rx) : org = 0x00000000, len = 0
+    flash3 (rx) : org = 0x00000000, len = 0
+    flash4 (rx) : org = 0x00000000, len = 0
+    flash5 (rx) : org = 0x00000000, len = 0
+    flash6 (rx) : org = 0x00000000, len = 0
+    flash7 (rx) : org = 0x00000000, len = 0
+    ram0   (wx) : org = 0x20000000, len = 40k
+    ram1   (wx) : org = 0x00000000, len = 0
+    ram2   (wx) : org = 0x00000000, len = 0
+    ram3   (wx) : org = 0x00000000, len = 0
+    ram4   (wx) : org = 0x10000000, len = 8k
+    ram5   (wx) : org = 0x00000000, len = 0
+    ram6   (wx) : org = 0x00000000, len = 0
+    ram7   (wx) : org = 0x00000000, len = 0
+}
+
+/* For each data/text section two region are defined, a virtual region
+   and a load region (_LMA suffix).*/
+
+/* Flash region to be used for exception vectors.*/
+REGION_ALIAS("VECTORS_FLASH", flash0);
+REGION_ALIAS("VECTORS_FLASH_LMA", flash0);
+
+/* Flash region to be used for constructors and destructors.*/
+REGION_ALIAS("XTORS_FLASH", flash0);
+REGION_ALIAS("XTORS_FLASH_LMA", flash0);
+
+/* Flash region to be used for code text.*/
+REGION_ALIAS("TEXT_FLASH", flash0);
+REGION_ALIAS("TEXT_FLASH_LMA", flash0);
+
+/* Flash region to be used for read only data.*/
+REGION_ALIAS("RODATA_FLASH", flash0);
+REGION_ALIAS("RODATA_FLASH_LMA", flash0);
+
+/* Flash region to be used for various.*/
+REGION_ALIAS("VARIOUS_FLASH", flash0);
+REGION_ALIAS("VARIOUS_FLASH_LMA", flash0);
+
+/* Flash region to be used for RAM(n) initialization data.*/
+REGION_ALIAS("RAM_INIT_FLASH_LMA", flash0);
+
+/* RAM region to be used for Main stack. This stack accommodates the processing
+   of all exceptions and interrupts.*/
+REGION_ALIAS("MAIN_STACK_RAM", ram0);
+
+/* RAM region to be used for the process stack. This is the stack used by
+   the main() function.*/
+REGION_ALIAS("PROCESS_STACK_RAM", ram0);
+
+/* RAM region to be used for data segment.*/
+REGION_ALIAS("DATA_RAM", ram0);
+REGION_ALIAS("DATA_RAM_LMA", flash0);
+
+/* RAM region to be used for BSS segment.*/
+REGION_ALIAS("BSS_RAM", ram0);
+
+/* RAM region to be used for the default heap.*/
+REGION_ALIAS("HEAP_RAM", ram0);
+
+/* Generic rules inclusion.*/
+INCLUDE rules.ld
\ No newline at end of file
diff --git a/keyboards/zsa/voyager/matrix.c b/keyboards/zsa/voyager/matrix.c
new file mode 100644
index 00000000000..614c3ffa041
--- /dev/null
+++ b/keyboards/zsa/voyager/matrix.c
@@ -0,0 +1,204 @@
+// Copyright 2023 ZSA Technology Labs, Inc <@zsa>
+// Copyright 2023 Christopher Courtney, aka Drashna Jael're  (@drashna) <drashna@live.com>
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include <stdint.h>
+#include "voyager.h"
+#include "mcp23018.h"
+
+#pragma GCC push_options
+#pragma GCC optimize("-O3")
+
+extern matrix_row_t matrix[MATRIX_ROWS];     // debounced values
+extern matrix_row_t raw_matrix[MATRIX_ROWS]; // raw values
+static matrix_row_t raw_matrix_right[MATRIX_COLS];
+
+#define MCP_ROWS_PER_HAND (MATRIX_ROWS / 2)
+#ifndef VOYAGER_I2C_TIMEOUT
+#    define VOYAGER_I2C_TIMEOUT 100
+#endif
+// Delay between each i2c io expander ops (in MCU cycles)
+#ifndef IO_EXPANDER_OP_DELAY
+#    define IO_EXPANDER_OP_DELAY 500
+#endif
+
+extern bool mcp23018_leds[2];
+extern bool is_launching;
+
+static uint16_t mcp23018_reset_loop;
+uint8_t         mcp23018_errors;
+
+bool io_expander_ready(void) {
+    uint8_t tx;
+    return mcp23018_readPins(MCP23018_DEFAULT_ADDRESS, mcp23018_PORTA, &tx);
+}
+
+void matrix_init_custom(void) {
+    // outputs
+    gpio_set_pin_output(B10);
+    gpio_set_pin_output(B11);
+    gpio_set_pin_output(B12);
+    gpio_set_pin_output(B13);
+    gpio_set_pin_output(B14);
+    gpio_set_pin_output(B15);
+
+    // inputs
+    gpio_set_pin_input_low(A0);
+    gpio_set_pin_input_low(A1);
+    gpio_set_pin_input_low(A2);
+    gpio_set_pin_input_low(A3);
+    gpio_set_pin_input_low(A6);
+    gpio_set_pin_input_low(A7);
+    gpio_set_pin_input_low(B0);
+
+    mcp23018_init(MCP23018_DEFAULT_ADDRESS);
+    mcp23018_errors += !mcp23018_set_config(MCP23018_DEFAULT_ADDRESS, mcp23018_PORTA, 0b00000000);
+    mcp23018_errors += !mcp23018_set_config(MCP23018_DEFAULT_ADDRESS, mcp23018_PORTB, 0b00111111);
+
+    if (!mcp23018_errors) {
+        is_launching = true;
+    }
+}
+
+bool matrix_scan_custom(matrix_row_t current_matrix[]) {
+    bool changed = false;
+    // Attempt to reset the mcp23018 if it's not initialized
+    if (mcp23018_errors) {
+        if (++mcp23018_reset_loop > 0x1FFF) {
+            if (io_expander_ready()) {
+                // If we managed to initialize the mcp23018 - we need to reinitialize the matrix / layer state. During an electric discharge the i2c peripherals might be in a weird state. Giving a delay and resetting the MCU allows to recover from this.
+                wait_ms(200);
+                mcu_reset();
+            }
+        }
+    }
+
+    // Scanning left and right side of the keyboard for key presses.
+    // Left side is scanned by reading the gpio pins directly, right side is scanned by reading the mcp23018 registers.
+
+    matrix_row_t data = 0;
+    for (uint8_t row = 0; row <= MCP_ROWS_PER_HAND; row++) {
+        // strobe row
+        switch (row) {
+            case 0:
+                gpio_write_pin_high(B10);
+                break;
+            case 1:
+                gpio_write_pin_high(B11);
+                break;
+            case 2:
+                gpio_write_pin_high(B12);
+                break;
+            case 3:
+                gpio_write_pin_high(B13);
+                break;
+            case 4:
+                gpio_write_pin_high(B14);
+                break;
+            case 5:
+                gpio_write_pin_high(B15);
+                break;
+            case 6:
+                break; // Left hand has 6 rows
+        }
+
+        // Selecting the row on the right side of the keyboard.
+        if (!mcp23018_errors) {
+            // select row
+            mcp23018_errors += !mcp23018_set_output(MCP23018_DEFAULT_ADDRESS, mcp23018_PORTA, 0b01111111 & ~(1 << (row)));
+            mcp23018_errors += !mcp23018_set_output(MCP23018_DEFAULT_ADDRESS, mcp23018_PORTB, ((uint8_t)!mcp23018_leds[1] << 6) | ((uint8_t)!mcp23018_leds[0] << 7));
+        }
+        // Reading the left side of the keyboard.
+        if (row < MCP_ROWS_PER_HAND) {
+            // i2c comm incur enough wait time
+            if (mcp23018_errors) {
+                // need wait to settle pin state
+                matrix_io_delay();
+            }
+            // read col data
+            data = ((readPin(A0) << 0) | (readPin(A1) << 1) | (readPin(A2) << 2) | (readPin(A3) << 3) | (readPin(A6) << 4) | (readPin(A7) << 5) | (readPin(B0) << 6));
+            // unstrobe  row
+            switch (row) {
+                case 0:
+                    gpio_write_pin_low(B10);
+                    break;
+                case 1:
+                    gpio_write_pin_low(B11);
+                    break;
+                case 2:
+                    gpio_write_pin_low(B12);
+                    break;
+                case 3:
+                    gpio_write_pin_low(B13);
+                    break;
+                case 4:
+                    gpio_write_pin_low(B14);
+                    break;
+                case 5:
+                    gpio_write_pin_low(B15);
+                    break;
+                case 6:
+                    break;
+            }
+
+            if (current_matrix[row] != data) {
+                current_matrix[row] = data;
+                changed             = true;
+            }
+        }
+
+        // Reading the right side of the keyboard.
+        if (!mcp23018_errors) {
+            for (uint16_t i = 0; i < IO_EXPANDER_OP_DELAY; i++) {
+                __asm__("nop");
+            }
+            uint8_t rx;
+            mcp23018_errors += !mcp23018_readPins(MCP23018_DEFAULT_ADDRESS, mcp23018_PORTB, &rx);
+            data = ~(rx & 0b00111111);
+            for (uint16_t i = 0; i < IO_EXPANDER_OP_DELAY; i++) {
+                __asm__("nop");
+            }
+        } else {
+            data = 0;
+        }
+
+        if (raw_matrix_right[row] != data) {
+            raw_matrix_right[row] = data;
+            changed               = true;
+        }
+    }
+
+    for (uint8_t row = 0; row < MCP_ROWS_PER_HAND; row++) {
+        current_matrix[11 - row] = 0;
+        for (uint8_t col = 0; col < MATRIX_COLS; col++) {
+            current_matrix[11 - row] |= ((raw_matrix_right[6 - col] & (1 << row) ? 1 : 0) << col);
+        }
+    }
+    return changed;
+}
+
+// DO NOT REMOVE
+// Needed for proper wake/sleep
+void matrix_power_up(void) {
+    bool temp_launching = is_launching;
+
+    matrix_init_custom();
+
+    is_launching = temp_launching;
+    if (!temp_launching) {
+        STATUS_LED_1(false);
+        STATUS_LED_2(false);
+        STATUS_LED_3(false);
+        STATUS_LED_4(false);
+    }
+
+    // initialize matrix state: all keys off
+    for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
+        matrix[i] = 0;
+    }
+}
+
+bool is_transport_connected(void) {
+    return (bool)(mcp23018_errors == 0);
+}
+#pragma GCC pop_options
diff --git a/keyboards/zsa/voyager/mcuconf.h b/keyboards/zsa/voyager/mcuconf.h
new file mode 100644
index 00000000000..f75edce3e9b
--- /dev/null
+++ b/keyboards/zsa/voyager/mcuconf.h
@@ -0,0 +1,23 @@
+/* Copyright 2021 QMK
+ *
+ *  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 3 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 <https://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include_next <mcuconf.h>
+
+// for i2c expander, and ISSI
+#undef STM32_I2C_USE_I2C1
+#define STM32_I2C_USE_I2C1 TRUE
diff --git a/keyboards/zsa/voyager/readme.md b/keyboards/zsa/voyager/readme.md
new file mode 100644
index 00000000000..4a602ee1374
--- /dev/null
+++ b/keyboards/zsa/voyager/readme.md
@@ -0,0 +1,40 @@
+# Voyager
+
+A next-gen split, ergonomic keyboard with an active left side, USB type C, and low profile switches.
+
+* Keyboard Maintainer: [drashna](https://github.com/drashna), [ZSA](https://github.com/zsa/)
+* Hardware Supported: Voyager (STM32F303xC)
+* Hardware Availability: [ZSA Store](https://zsa.io/voyager/)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make zsa/voyager:default
+
+Flashing example for this keyboard:
+
+    make zsa/voyager: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).
+
+
+## Voyager Customization
+
+### Indicator LEDs
+
+There are 4 functions for enabling and disabling the LEDs on the top of the boards. The functions are `STATUS_LED_1(bool)` through `STATUS_LED_4(bool)`, with the first LED being the top most LED on the left hand, and the fourth LED being the bottom most LED on the right side.
+
+By default, the Indicator LEDs are used to indicate the layer state for the keyboard.  If you wish to change this (and indicate caps/num/scroll lock status instead), then define `VOYAGER_USER_LEDS` in your `config.h` file.
+
+### Detecting split / Gaming mode
+
+To make it extra gaming friendly, you can configure what happens when you disconnect the right half. This is especially useful when using gaming unfriendly layers or layouts (e.g. home row mods, dvorak, colemak).
+
+Example for enabling a specific layer while right side is disconnected:
+
+```c
+void housekeeping_task_user(void) {
+    if (!is_transport_connected()) {
+        // set layer
+    }
+}
+```
diff --git a/keyboards/zsa/voyager/rules.mk b/keyboards/zsa/voyager/rules.mk
new file mode 100644
index 00000000000..bb95224d2bf
--- /dev/null
+++ b/keyboards/zsa/voyager/rules.mk
@@ -0,0 +1,10 @@
+MCU_LDSCRIPT = voyager
+
+CUSTOM_MATRIX = lite
+PROGRAM_CMD = $(call EXEC_DFU)
+DFU_ARGS = -d 3297:0791 -a 0 -s 0x08002000:leave
+DFU_SUFFIX_ARGS = -v 3297 -p 0791
+
+VPATH += drivers/gpio
+SRC += matrix.c mcp23018.c
+I2C_DRIVER_REQUIRED = yes
diff --git a/keyboards/zsa/voyager/voyager.c b/keyboards/zsa/voyager/voyager.c
new file mode 100644
index 00000000000..d70f1be3eff
--- /dev/null
+++ b/keyboards/zsa/voyager/voyager.c
@@ -0,0 +1,312 @@
+// Copyright 2023 ZSA Technology Labs, Inc <@zsa>
+// Copyright 2023 Christopher Courtney, aka Drashna Jael're  (@drashna) <drashna@live.com>
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "voyager.h"
+
+keyboard_config_t keyboard_config;
+
+bool mcp23018_leds[2] = {0, 0};
+bool is_launching     = false;
+
+#if defined(DEFERRED_EXEC_ENABLE)
+#    if defined(DYNAMIC_MACRO_ENABLE)
+deferred_token dynamic_macro_token = INVALID_DEFERRED_TOKEN;
+
+static uint32_t dynamic_macro_led(uint32_t trigger_time, void *cb_arg) {
+    static bool led_state = true;
+    if (!is_launching) {
+        led_state = !led_state;
+        STATUS_LED_3(led_state);
+    }
+    return 100;
+}
+
+void dynamic_macro_record_start_user(void) {
+    if (my_token == INVALID_DEFERRED_TOKEN) {
+        STATUS_LED_3(true);
+        dynamic_macro_token = defer_exec(100, dynamic_macro_led, NULL);
+    }
+}
+
+void dynamic_macro_record_end_user(int8_t direction) {
+    if (cancel_deferred_exec(dynamic_macro_token)) {
+        dynamic_macro_token = INVALID_DEFERRED_TOKEN;
+        STATUS_LED_3(false);
+    }
+}
+#    endif
+
+static uint32_t startup_exec(uint32_t trigger_time, void *cb_arg) {
+    static uint8_t startup_loop = 0;
+
+    switch (startup_loop++) {
+        case 0:
+            STATUS_LED_1(true);
+            STATUS_LED_2(false);
+            STATUS_LED_3(false);
+            STATUS_LED_4(false);
+            break;
+        case 1:
+            STATUS_LED_2(true);
+            break;
+        case 2:
+            STATUS_LED_3(true);
+            break;
+        case 3:
+            STATUS_LED_4(true);
+            break;
+        case 4:
+            STATUS_LED_1(false);
+            break;
+        case 5:
+            STATUS_LED_2(false);
+            break;
+        case 6:
+            STATUS_LED_3(false);
+            break;
+        case 7:
+            STATUS_LED_4(false);
+            break;
+        case 8:
+            is_launching = false;
+            layer_state_set_kb(layer_state);
+            return 0;
+    }
+    return 250;
+}
+#endif
+
+void keyboard_pre_init_kb(void) {
+    // Initialize Reset pins
+    gpio_set_pin_input(A8);
+    gpio_set_pin_output(A9);
+    gpio_write_pin_low(A9);
+
+    gpio_set_pin_output(B5);
+    gpio_set_pin_output(B4);
+    gpio_set_pin_output(B3);
+
+    gpio_write_pin_low(B5);
+    gpio_write_pin_low(B4);
+    gpio_write_pin_low(B3);
+
+    keyboard_pre_init_user();
+}
+
+#if !defined(VOYAGER_USER_LEDS)
+layer_state_t layer_state_set_kb(layer_state_t state) {
+    state = layer_state_set_user(state);
+    if (is_launching || !keyboard_config.led_level) return state;
+
+    uint8_t layer = get_highest_layer(state);
+
+    STATUS_LED_1(layer & (1 << 0));
+    STATUS_LED_2(layer & (1 << 1));
+    STATUS_LED_3(layer & (1 << 2));
+
+#    if !defined(CAPS_LOCK_STATUS)
+    STATUS_LED_4(layer & (1 << 3));
+#    endif
+    return state;
+}
+#endif
+
+#ifdef RGB_MATRIX_ENABLE
+// clang-format off
+const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
+/* Refer to IS31 manual for these locations
+ *   driver
+ *   |  R location
+ *   |  |      G location
+ *   |  |      |      B location
+ *   |  |      |      | */
+    {0, C2_2,  C1_2,  C4_3},
+    {0, C2_3,  C1_3,  C3_3},
+    {0, C2_4,  C1_4,  C3_4},
+    {0, C2_5,  C1_5,  C3_5},
+    {0, C2_6,  C1_6,  C3_6},
+    {0, C2_7,  C1_7,  C3_7},
+    {0, C2_8,  C1_8,  C3_8},
+    {0, C8_1,  C7_1,  C9_1},
+    {0, C8_2,  C7_2,  C9_2},
+    {0, C8_3,  C7_3,  C9_3},
+    {0, C8_4,  C7_4,  C9_4},
+    {0, C8_5,  C7_5,  C9_5},
+    {0, C8_6,  C7_6,  C9_6},
+    {0, C2_10,  C1_10,  C4_11},
+    {0, C2_11,  C1_11,  C3_11},
+    {0, C2_12,  C1_12,  C3_12},
+    {0, C2_13,  C1_13,  C3_13},
+    {0, C2_14,  C1_14,  C3_14},
+    {0, C2_15,  C1_15,  C3_15},
+    {0, C2_16,  C1_16,  C3_16},
+    {0, C8_9,  C7_9,  C9_9},
+    {0, C8_10,  C7_10,  C9_10},
+    {0, C8_11,  C7_11,  C9_11},
+    {0, C8_12,  C7_12,  C9_12},
+    {0, C8_13,  C7_13,  C9_13},
+    {0, C8_14,  C7_14,  C9_14},
+
+    {1, C2_7,  C1_7,  C3_7},
+    {1, C2_6,  C1_6,  C3_6},
+    {1, C2_5,  C1_5,  C3_5},
+    {1, C2_4,  C1_4,  C3_4},
+    {1, C2_3,  C1_3,  C3_3},
+    {1, C2_2,  C1_2,  C4_3},
+
+    {1, C8_5,  C7_5,  C9_5},
+    {1, C8_4,  C7_4,  C9_4},
+    {1, C8_3,  C7_3,  C9_3},
+    {1, C8_2,  C7_2,  C9_2},
+    {1, C8_1,  C7_1,  C9_1},
+    {1, C2_8,  C1_8,  C3_8},
+
+    {1, C2_14,  C1_14,  C3_14},
+    {1, C2_13,  C1_13,  C3_13},
+    {1, C2_12,  C1_12,  C3_12},
+    {1, C2_11,  C1_11,  C3_11},
+    {1, C2_10,  C1_10,  C4_11},
+    {1, C8_6,  C7_6,  C9_6},
+
+    {1, C8_12,  C7_12,  C9_12},
+    {1, C8_11,  C7_11,  C9_11},
+    {1, C8_10,  C7_10,  C9_10},
+    {1, C8_9,  C7_9,  C9_9},
+    {1, C2_16,  C1_16,  C3_16},
+    {1, C2_15,  C1_15,  C3_15},
+
+    {1, C8_14,  C7_14,  C9_14},
+    {1, C8_13,  C7_13,  C9_13},
+};
+// clang-format on
+#endif
+
+#ifdef SWAP_HANDS_ENABLE
+// swap-hands action needs a matrix to define the swap
+// clang-format off
+const keypos_t PROGMEM hand_swap_config[MATRIX_ROWS][MATRIX_COLS] = {
+    /* Left hand, matrix positions */
+    {{6,6}, {5,6}, {4,6}, {3,6}, {2,6}, {1,6},{0,6}},
+    {{6,7}, {5,7}, {4,7}, {3,7}, {2,7}, {1,7},{0,7}},
+    {{6,8}, {5,8}, {4,8}, {3,8}, {2,8}, {1,8},{0,8}},
+    {{6,9}, {5,9}, {4,9}, {3,9}, {2,9}, {1,9},{0,9}},
+    {{6,10},{5,10},{4,10},{3,10},{2,10},{1,10},{0,10}},
+    {{6,11},{5,11},{4,11},{3,11},{2,11},{1,11},{0,11}},
+    /* Right hand, matrix positions */
+    {{6,0}, {5,0}, {4,0}, {3,0}, {2,0}, {1,0},{0,0}},
+    {{6,1}, {5,1}, {4,1}, {3,1}, {2,1}, {1,1},{0,1}},
+    {{6,2}, {5,2}, {4,2}, {3,2}, {2,2}, {1,2},{0,2}},
+    {{6,3}, {5,3}, {4,3}, {3,3}, {2,3}, {1,3},{0,3}},
+    {{6,4}, {5,4}, {4,4}, {3,4}, {2,4}, {1,4},{0,4}},
+    {{6,5}, {5,5}, {4,5}, {3,5}, {2,5}, {1,5},{0,5}},
+};
+// clang-format on
+#endif
+
+#ifdef CAPS_LOCK_STATUS
+bool led_update_kb(led_t led_state) {
+    bool res = led_update_user(led_state);
+    if (res) {
+        STATUS_LED_4(led_state.caps_lock);
+    }
+    return res;
+}
+#endif
+
+bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
+    if (!process_record_user(keycode, record)) {
+        return false;
+    }
+    switch (keycode) {
+#if !defined(VOYAGER_USER_LEDS)
+        case LED_LEVEL:
+            if (record->event.pressed) {
+                keyboard_config.led_level ^= 1;
+                eeconfig_update_kb(keyboard_config.raw);
+                if (keyboard_config.led_level) {
+                    layer_state_set_kb(layer_state);
+                } else {
+                    STATUS_LED_1(false);
+                    STATUS_LED_2(false);
+                    STATUS_LED_3(false);
+                    STATUS_LED_4(false);
+                }
+            }
+            break;
+#endif
+#ifdef RGB_MATRIX_ENABLE
+        case TOGGLE_LAYER_COLOR:
+            if (record->event.pressed) {
+                keyboard_config.disable_layer_led ^= 1;
+                if (keyboard_config.disable_layer_led) rgb_matrix_set_color_all(0, 0, 0);
+            }
+            break;
+        case RGB_TOG:
+            if (record->event.pressed) {
+                switch (rgb_matrix_get_flags()) {
+                    case LED_FLAG_ALL: {
+                        rgb_matrix_set_flags(LED_FLAG_NONE);
+                        rgb_matrix_set_color_all(0, 0, 0);
+                    } break;
+                    default: {
+                        rgb_matrix_set_flags(LED_FLAG_ALL);
+                    } break;
+                }
+            }
+            return false;
+#endif
+    }
+    return true;
+}
+
+void keyboard_post_init_kb(void) {
+#ifdef RGB_MATRIX_ENABLE
+    rgb_matrix_enable_noeeprom();
+#endif
+
+    keyboard_config.raw = eeconfig_read_kb();
+
+    if (!keyboard_config.led_level && !keyboard_config.led_level_res) {
+        keyboard_config.led_level     = true;
+        keyboard_config.led_level_res = 0b11;
+        eeconfig_update_kb(keyboard_config.raw);
+    }
+#if defined(DEFERRED_EXEC_ENABLE)
+    is_launching = true;
+    defer_exec(500, startup_exec, NULL);
+#endif
+    keyboard_post_init_user();
+}
+
+void eeconfig_init_kb(void) { // EEPROM is getting reset!
+    keyboard_config.raw           = 0;
+    keyboard_config.led_level     = true;
+    keyboard_config.led_level_res = 0b11;
+    eeconfig_update_kb(keyboard_config.raw);
+    eeconfig_init_user();
+}
+
+__attribute__((weak)) void bootloader_jump(void) {
+    // The ignition bootloader is checking for a high signal on A8 for 100ms when powering on the board.
+    // Setting both A8 and A9 high will charge the capacitor quickly.
+    // Setting A9 low before reset will cause the capacitor to discharge
+    // thus making the bootloder unlikely to trigger twice between power cycles.
+    gpio_set_pin_output_push_pull(A9);
+    gpio_set_pin_output_push_pull(A8);
+    gpio_write_pin_high(A9);
+    gpio_write_pin_high(A8);
+    wait_ms(500);
+    gpio_write_pin_low(A9);
+
+    NVIC_SystemReset();
+}
+
+__attribute__((weak)) void mcu_reset(void) {
+    gpio_set_pin_output_push_pull(A9);
+    gpio_set_pin_output_push_pull(A8);
+    gpio_write_pin_low(A8);
+    gpio_write_pin_low(A9);
+
+    NVIC_SystemReset();
+}
diff --git a/keyboards/zsa/voyager/voyager.h b/keyboards/zsa/voyager/voyager.h
new file mode 100644
index 00000000000..a00cc995c62
--- /dev/null
+++ b/keyboards/zsa/voyager/voyager.h
@@ -0,0 +1,35 @@
+// Copyright 2023 ZSA Technology Labs, Inc <@zsa>
+// Copyright 2023 Christopher Courtney, aka Drashna Jael're  (@drashna) <drashna@live.com>
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include "quantum.h"
+
+extern bool mcp23018_leds[];
+
+#define MCP23018_DEFAULT_ADDRESS 0b0100000
+
+#define STATUS_LED_1(status) gpio_write_pin(B5, (bool)(status))
+#define STATUS_LED_2(status) gpio_write_pin(B4, (bool)(status))
+#define STATUS_LED_3(status) mcp23018_leds[0] = (bool)(status)
+#define STATUS_LED_4(status) mcp23018_leds[1] = (bool)(status)
+
+enum voyager_keycodes {
+    TOGGLE_LAYER_COLOR = QK_KB,
+    LED_LEVEL,
+};
+
+typedef union {
+    uint32_t raw;
+    struct {
+        bool    disable_layer_led : 1;
+        bool    placeholder : 1;
+        bool    led_level : 1;
+        uint8_t led_level_res : 2; // DO NOT REMOVE
+    };
+} keyboard_config_t;
+
+extern keyboard_config_t keyboard_config;
+
+bool is_transport_connected(void);
diff --git a/layouts/community/60_ansi_arrow_split_bs_7u_spc/readme.md b/layouts/community/60_ansi_arrow_split_bs_7u_spc/readme.md
deleted file mode 100644
index d60387a000b..00000000000
--- a/layouts/community/60_ansi_arrow_split_bs_7u_spc/readme.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# 60_ansi_arrow_split_bs_7u_spc
-
-    LAYOUT_60_ansi_arrow_split_bs_7u_spc
diff --git a/layouts/community/tkl_ansi_wkl/readme.md b/layouts/community/tkl_ansi_wkl/readme.md
new file mode 100644
index 00000000000..6541a0f23ab
--- /dev/null
+++ b/layouts/community/tkl_ansi_wkl/readme.md
@@ -0,0 +1,3 @@
+# tkl_ansi_wkl
+
+    LAYOUT_tkl_ansi_wkl
diff --git a/layouts/community/tkl_ansi_wkl_split_bs_rshift/readme.md b/layouts/community/tkl_ansi_wkl_split_bs_rshift/readme.md
new file mode 100644
index 00000000000..35235603728
--- /dev/null
+++ b/layouts/community/tkl_ansi_wkl_split_bs_rshift/readme.md
@@ -0,0 +1,3 @@
+# tkl_ansi_wkl_split_bs_rshift
+
+    LAYOUT_tkl_ansi_wkl_split_bs_rshift
diff --git a/layouts/community/tkl_f13_ansi_wkl/readme.md b/layouts/community/tkl_f13_ansi_wkl/readme.md
new file mode 100644
index 00000000000..607692c2392
--- /dev/null
+++ b/layouts/community/tkl_f13_ansi_wkl/readme.md
@@ -0,0 +1,3 @@
+# tkl_f13_ansi_wkl
+
+    LAYOUT_tkl_f13_ansi_wkl
diff --git a/layouts/community/tkl_f13_ansi_wkl_split_bs_rshift/readme.md b/layouts/community/tkl_f13_ansi_wkl_split_bs_rshift/readme.md
new file mode 100644
index 00000000000..614c0913f62
--- /dev/null
+++ b/layouts/community/tkl_f13_ansi_wkl_split_bs_rshift/readme.md
@@ -0,0 +1,3 @@
+# tkl_f13_ansi_wkl_split_bs_rshift
+
+    LAYOUT_tkl_f13_ansi_wkl_split_bs_rshift
diff --git a/layouts/community/tkl_f13_iso_wkl/readme.md b/layouts/community/tkl_f13_iso_wkl/readme.md
new file mode 100644
index 00000000000..46c44195923
--- /dev/null
+++ b/layouts/community/tkl_f13_iso_wkl/readme.md
@@ -0,0 +1,3 @@
+# tkl_f13_iso_wkl
+
+    LAYOUT_tkl_f13_iso_wkl
diff --git a/layouts/community/tkl_f13_iso_wkl_split_bs_rshift/readme.md b/layouts/community/tkl_f13_iso_wkl_split_bs_rshift/readme.md
new file mode 100644
index 00000000000..a9059abfba2
--- /dev/null
+++ b/layouts/community/tkl_f13_iso_wkl_split_bs_rshift/readme.md
@@ -0,0 +1,3 @@
+# tkl_f13_iso_wkl_split_bs_rshift
+
+    LAYOUT_tkl_f13_iso_wkl_split_bs_rshift
diff --git a/layouts/community/tkl_iso_wkl/readme.md b/layouts/community/tkl_iso_wkl/readme.md
new file mode 100644
index 00000000000..56fe1e91473
--- /dev/null
+++ b/layouts/community/tkl_iso_wkl/readme.md
@@ -0,0 +1,3 @@
+# tkl_iso_wkl
+
+    LAYOUT_tkl_iso_wkl
diff --git a/layouts/community/tkl_iso_wkl_split_bs_rshift/readme.md b/layouts/community/tkl_iso_wkl_split_bs_rshift/readme.md
new file mode 100644
index 00000000000..ec820424a5b
--- /dev/null
+++ b/layouts/community/tkl_iso_wkl_split_bs_rshift/readme.md
@@ -0,0 +1,3 @@
+# tkl_iso_wkl_split_bs_rshift
+
+    LAYOUT_tkl_iso_split_bs_rshift
diff --git a/layouts/default/60_ansi_arrow_split_bs_7u_spc/default_60_ansi_arrow_split_bs_7u_spc/keymap.c b/layouts/default/60_ansi_arrow_split_bs_7u_spc/default_60_ansi_arrow_split_bs_7u_spc/keymap.c
deleted file mode 100644
index 409f415318b..00000000000
--- a/layouts/default/60_ansi_arrow_split_bs_7u_spc/default_60_ansi_arrow_split_bs_7u_spc/keymap.c
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright 2020 QMK / Sendy YK
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    /*
-     * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
-     * │Esc│1  │2  │3  │4  │5  │6  │7  │8  │9  │0  │-  │+  │\  │Del│
-     * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤
-     * │Tab  │Q  │W  │E  │R  │T  │Y  │U  │I  │O  │P  │[  │]  │Bspc │
-     * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
-     * │Caps  │A  │S  │D  │F  │G  │H  │J  │K  │L  │;  │'  │Enter   │
-     * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┬───┬───┤
-     * │Shift   │Z  │X  │C  │V  │B  │N  │M  │,  │.  │Shift │↑  │/  │
-     * ├─────┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴──┬───┼───┼───┤
-     * │Ctrl │GUI│Alt  │Space                      │Alt│←  │↓  │→  │
-     * └─────┴───┴─────┴───────────────────────────┴───┴───┴───┴───┘
-     */
-    [0] = LAYOUT_60_ansi_arrow_split_bs_7u_spc(
-        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_DEL,
-        KC_TAB,           KC_Q, KC_W,    KC_E, KC_R, KC_T,   KC_Y, KC_U, KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_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_RSFT, KC_UP,   KC_SLSH,
-        KC_LCTL, KC_LGUI,       KC_LALT,             KC_SPC,                               KC_RALT, KC_LEFT, KC_DOWN, KC_RGHT
-    )
-};
diff --git a/layouts/default/60_ansi_arrow_split_bs_7u_spc/info.json b/layouts/default/60_ansi_arrow_split_bs_7u_spc/info.json
deleted file mode 100644
index bf30205f3d3..00000000000
--- a/layouts/default/60_ansi_arrow_split_bs_7u_spc/info.json
+++ /dev/null
@@ -1,78 +0,0 @@
-{
-    "keyboard_name": "60% ANSI Arrow Split Backspace & 7U Space Layout",
-    "url": "https://mr.sendyyk.com",
-    "maintainer": "Sendy YK <mr@sendyyk.com>",
-    "layouts": {
-        "LAYOUT_60_ansi_arrow_split_bs_7u_spc": {
-            "layout": [
-                {"x": 0, "y": 0},
-                {"x": 1, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0},
-                {"x": 5, "y": 0},
-                {"x": 6, "y": 0},
-                {"x": 7, "y": 0},
-                {"x": 8, "y": 0},
-                {"x": 9, "y": 0},
-                {"x": 10, "y": 0},
-                {"x": 11, "y": 0},
-                {"x": 12, "y": 0},
-                {"x": 13, "y": 0},
-                {"x": 14, "y": 0},
-
-                {"x": 0, "y": 1, "w": 1.5},
-                {"x": 1.5, "y": 1},
-                {"x": 2.5, "y": 1},
-                {"x": 3.5, "y": 1},
-                {"x": 4.5, "y": 1},
-                {"x": 5.5, "y": 1},
-                {"x": 6.5, "y": 1},
-                {"x": 7.5, "y": 1},
-                {"x": 8.5, "y": 1},
-                {"x": 9.5, "y": 1},
-                {"x": 10.5, "y": 1},
-                {"x": 11.5, "y": 1},
-                {"x": 12.5, "y": 1},
-                {"x": 13.5, "y": 1, "w": 1.5},
-
-                {"x": 0, "y": 2, "w": 1.75},
-                {"x": 1.75, "y": 2},
-                {"x": 2.75, "y": 2},
-                {"x": 3.75, "y": 2},
-                {"x": 4.75, "y": 2},
-                {"x": 5.75, "y": 2},
-                {"x": 6.75, "y": 2},
-                {"x": 7.75, "y": 2},
-                {"x": 8.75, "y": 2},
-                {"x": 9.75, "y": 2},
-                {"x": 10.75, "y": 2},
-                {"x": 11.75, "y": 2},
-                {"x": 12.75, "y": 2, "w": 2.25},
-
-                {"x": 0, "y": 3, "w": 2.25},
-                {"x": 2.25, "y": 3},
-                {"x": 3.25, "y": 3},
-                {"x": 4.25, "y": 3},
-                {"x": 5.25, "y": 3},
-                {"x": 6.25, "y": 3},
-                {"x": 7.25, "y": 3},
-                {"x": 8.25, "y": 3},
-                {"x": 9.25, "y": 3},
-                {"x": 10.25, "y": 3},
-                {"x": 11.25, "y": 3, "w": 1.75},
-                {"x": 13, "y": 3},
-                {"x": 14, "y": 3},
-
-                {"x": 0, "y": 4, "w": 1.5},
-                {"x": 1.5, "y": 4},
-                {"x": 2.5, "y": 4, "w": 1.5},
-                {"x": 4, "y": 4, "w": 7},
-                {"x": 11, "y": 4},
-                {"x": 12, "y": 4},
-                {"x": 13, "y": 4},
-                {"x": 14, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/layouts/default/60_ansi_arrow_split_bs_7u_spc/layout.json b/layouts/default/60_ansi_arrow_split_bs_7u_spc/layout.json
deleted file mode 100644
index db9c8d167b5..00000000000
--- a/layouts/default/60_ansi_arrow_split_bs_7u_spc/layout.json
+++ /dev/null
@@ -1,5 +0,0 @@
-[{a:7},"","","","","","","","","","","","","","",""],
-[{w:1.5},"","","","","","","","","","","","","",{w:1.5},""],
-[{w:1.75},"","","","","","","","","","","","",{w:2.25},""],
-[{w:2.25},"","","","","","","","","","",{w:1.75},"","",""],
-[{w:1.5},"","",{w:1.5},"",{w:7},"","","","",""]
diff --git a/layouts/default/60_ansi_arrow_split_bs_7u_spc/readme.md b/layouts/default/60_ansi_arrow_split_bs_7u_spc/readme.md
deleted file mode 100644
index 30292abb90d..00000000000
--- a/layouts/default/60_ansi_arrow_split_bs_7u_spc/readme.md
+++ /dev/null
@@ -1,30 +0,0 @@
-# 60_ansi_arrow_split_bs_7u_spc Keymap
-
-Default 60 ANSI Arrow Split Backspace & 7U Space Keymap by [Sendy YK](https://mr.sendyyk.com).
-
-```c
-    /*
-     * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
-     * │Esc│1  │2  │3  │4  │5  │6  │7  │8  │9  │0  │-  │+  │\  │Del│
-     * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤
-     * │Tab  │Q  │W  │E  │R  │T  │Y  │U  │I  │O  │P  │[  │]  │Bspc │
-     * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
-     * │Caps  │A  │S  │D  │F  │G  │H  │J  │K  │L  │;  │'  │Enter   │
-     * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┬───┬───┤
-     * │Shift   │Z  │X  │C  │V  │B  │N  │M  │,  │.  │Shift │↑  │/  │
-     * ├─────┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴──┬───┼───┼───┤
-     * │Ctrl │GUI│Alt  │Space                      │Alt│←  │↓  │→  │
-     * └─────┴───┴─────┴───────────────────────────┴───┴───┴───┴───┘
-     */
-```
-
-## Build The Firmware
-
-Make example for keyboard (after setting up your build environment):
-
-    make <keyboard_folder>:default_60_ansi_arrow_split_bs_7u_spc
-
-More information:
-* [Setting Up Your QMK Environment](https://docs.qmk.fm/#/getting_started_build_tools)
-* [More Detailed make Instructions](https://docs.qmk.fm/#/getting_started_make_guide)
-* [The Complete Newbs Guide To QMK](https://docs.qmk.fm/#/newbs)
diff --git a/layouts/default/60_jis/info.json b/layouts/default/60_jis/info.json
index 56972148bda..039ced42f4a 100644
--- a/layouts/default/60_jis/info.json
+++ b/layouts/default/60_jis/info.json
@@ -34,7 +34,6 @@
                 {"x": 10.5, "y": 1},
                 {"x": 11.5, "y": 1},
                 {"x": 12.5, "y": 1},
-                {"x": 13.75, "y": 1, "w": 1.25, "h": 2},
 
                 {"x": 0, "y": 2, "w": 1.75},
                 {"x": 1.75, "y": 2},
@@ -49,6 +48,7 @@
                 {"x": 10.75, "y": 2},
                 {"x": 11.75, "y": 2},
                 {"x": 12.75, "y": 2},
+                {"x": 13.75, "y": 1, "w": 1.25, "h": 2},
 
                 {"x": 0, "y": 3, "w": 2.25},
                 {"x": 2.25, "y": 3},
diff --git a/layouts/default/readme.md b/layouts/default/readme.md
index 892dbf1e034..159b339383f 100644
--- a/layouts/default/readme.md
+++ b/layouts/default/readme.md
@@ -49,21 +49,6 @@ LAYOUT_60_ansi_arrow
 └────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┘
 ```
 
-```
-LAYOUT_60_ansi_arrow_split_bs_7u_spc
-┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
-│   │   │   │   │   │   │   │   │   │   │   │   │   │   │   │
-├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤
-│     │   │   │   │   │   │   │   │   │   │   │   │   │     │
-├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
-│      │   │   │   │   │   │   │   │   │   │   │   │        │
-├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┬───┬───┤
-│        │   │   │   │   │   │   │   │   │   │      │   │   │
-├─────┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴──┬───┼───┼───┤
-│     │   │     │                           │   │   │   │   │
-└─────┴───┴─────┴───────────────────────────┴───┴───┴───┴───┘
-```
-
 ```
 LAYOUT_60_ansi_split_bs_rshift
 ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
@@ -641,6 +626,42 @@ LAYOUT_tkl_ansi_tsangan_split_bs_rshift
 └─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘ └───┴───┴───┘
 ```
 
+```
+LAYOUT_tkl_ansi_wkl
+┌───┐   ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┐
+│   │   │   │   │   │   │ │   │   │   │   │ │   │   │   │   │ │   │   │   │
+└───┘   └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┘
+┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ ┌───┬───┬───┐
+│   │   │   │   │   │   │   │   │   │   │   │   │   │       │ │   │   │   │
+├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ ├───┼───┼───┤
+│     │   │   │   │   │   │   │   │   │   │   │   │   │     │ │   │   │   │
+├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ └───┴───┴───┘
+│      │   │   │   │   │   │   │   │   │   │   │   │        │
+├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤     ┌───┐
+│        │   │   │   │   │   │   │   │   │   │   │          │     │   │
+├─────┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬───┬─────┤ ┌───┼───┼───┐
+│     │   │     │                           │     │   │     │ │   │   │   │
+└─────┘   └─────┴───────────────────────────┴─────┘   └─────┘ └───┴───┴───┘
+```
+
+```
+LAYOUT_tkl_ansi_wkl_split_bs_rshift
+┌───┐   ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┐
+│   │   │   │   │   │   │ │   │   │   │   │ │   │   │   │   │ │   │   │   │
+└───┘   └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┘
+┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ ┌───┬───┬───┐
+│   │   │   │   │   │   │   │   │   │   │   │   │   │   │   │ │   │   │   │
+├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ ├───┼───┼───┤
+│     │   │   │   │   │   │   │   │   │   │   │   │   │     │ │   │   │   │
+├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ └───┴───┴───┘
+│      │   │   │   │   │   │   │   │   │   │   │   │        │
+├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤     ┌───┐
+│        │   │   │   │   │   │   │   │   │   │   │      │   │     │   │
+├─────┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬───┬─┴───┤ ┌───┼───┼───┐
+│     │   │     │                           │     │   │     │ │   │   │   │
+└─────┘   └─────┴───────────────────────────┴─────┘   └─────┘ └───┴───┴───┘
+```
+
 ```
 LAYOUT_tkl_iso
 ┌───┐   ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┐
@@ -713,6 +734,42 @@ LAYOUT_tkl_iso_tsangan_split_bs_rshift
 └─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘ └───┴───┴───┘
 ```
 
+```
+LAYOUT_tkl_iso_wkl
+┌───┐   ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┐
+│   │   │   │   │   │   │ │   │   │   │   │ │   │   │   │   │ │   │   │   │
+└───┘   └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┘
+┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ ┌───┬───┬───┐
+│   │   │   │   │   │   │   │   │   │   │   │   │   │       │ │   │   │   │
+├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ ├───┼───┼───┤
+│     │   │   │   │   │   │   │   │   │   │   │   │   │     │ │   │   │   │
+├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐    │ └───┴───┴───┘
+│      │   │   │   │   │   │   │   │   │   │   │   │   │    │
+├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤     ┌───┐
+│    │   │   │   │   │   │   │   │   │   │   │   │          │     │   │
+├────┴┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬───┬─────┤ ┌───┼───┼───┐
+│     │   │     │                           │     │   │     │ │   │   │   │
+└─────┘   └─────┴───────────────────────────┴─────┘   └─────┘ └───┴───┴───┘
+```
+
+```
+LAYOUT_tkl_iso_wkl_split_bs_rshift
+┌───┐   ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┐
+│   │   │   │   │   │   │ │   │   │   │   │ │   │   │   │   │ │   │   │   │
+└───┘   └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┘
+┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ ┌───┬───┬───┐
+│   │   │   │   │   │   │   │   │   │   │   │   │   │   │   │ │   │   │   │
+├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ ├───┼───┼───┤
+│     │   │   │   │   │   │   │   │   │   │   │   │   │     │ │   │   │   │
+├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐    │ └───┴───┴───┘
+│      │   │   │   │   │   │   │   │   │   │   │   │   │    │
+├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┬───┤     ┌───┐
+│    │   │   │   │   │   │   │   │   │   │   │   │      │   │     │   │
+├────┴┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬───┬─┴───┤ ┌───┼───┼───┐
+│     │   │     │                           │     │   │     │ │   │   │   │
+└─────┘   └─────┴───────────────────────────┴─────┘   └─────┘ └───┴───┴───┘
+```
+
 ```
 LAYOUT_tkl_jis
 ┌───┐   ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┐
@@ -787,20 +844,56 @@ LAYOUT_tkl_f13_ansi_tsangan
 
 ```
 LAYOUT_tkl_f13_ansi_tsangan_split_bs_rshift
-┌───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┐┌───┬───┬───┐
-│   ││   │   │   │   ││   │   │   │   ││   │   │   │   ││   ││   │   │   │
-└───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┘└───┴───┴───┘
-┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐┌───┬───┬───┐
-│   │   │   │   │   │   │   │   │   │   │   │   │   │   │   ││   │   │   │
-├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤├───┼───┼───┤
-│     │   │   │   │   │   │   │   │   │   │   │   │   │     ││   │   │   │
-├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤└───┴───┴───┘
+┌───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┐ ┌───┬───┬───┐
+│   ││   │   │   │   ││   │   │   │   ││   │   │   │   ││   │ │   │   │   │
+└───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┘ └───┴───┴───┘
+┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ ┌───┬───┬───┐
+│   │   │   │   │   │   │   │   │   │   │   │   │   │   │   │ │   │   │   │
+├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ ├───┼───┼───┤
+│     │   │   │   │   │   │   │   │   │   │   │   │   │     │ │   │   │   │
+├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ └───┴───┴───┘
 │      │   │   │   │   │   │   │   │   │   │   │   │        │
-├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤    ┌───┐
-│        │   │   │   │   │   │   │   │   │   │   │      │   │    │   │
-├─────┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬───┬─┴───┤┌───┼───┼───┐
-│     │   │     │                           │     │   │     ││   │   │   │
-└─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘└───┴───┴───┘
+├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤     ┌───┐
+│        │   │   │   │   │   │   │   │   │   │   │      │   │     │   │
+├─────┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬───┬─┴───┤ ┌───┼───┼───┐
+│     │   │     │                           │     │   │     │ │   │   │   │
+└─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘ └───┴───┴───┘
+```
+
+```
+LAYOUT_tkl_f13_ansi_wkl
+┌───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┐ ┌───┬───┬───┐
+│   ││   │   │   │   ││   │   │   │   ││   │   │   │   ││   │ │   │   │   │
+└───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┘ └───┴───┴───┘
+┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ ┌───┬───┬───┐
+│   │   │   │   │   │   │   │   │   │   │   │   │   │       │ │   │   │   │
+├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ ├───┼───┼───┤
+│     │   │   │   │   │   │   │   │   │   │   │   │   │     │ │   │   │   │
+├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ └───┴───┴───┘
+│      │   │   │   │   │   │   │   │   │   │   │   │        │
+├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤     ┌───┐
+│        │   │   │   │   │   │   │   │   │   │   │          │     │   │
+├─────┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬───┬─────┤ ┌───┼───┼───┐
+│     │   │     │                           │     │   │     │ │   │   │   │
+└─────┘   └─────┴───────────────────────────┴─────┘   └─────┘ └───┴───┴───┘
+```
+
+```
+LAYOUT_tkl_f13_ansi_wkl_split_bs_rshift
+┌───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┐ ┌───┬───┬───┐
+│   ││   │   │   │   ││   │   │   │   ││   │   │   │   ││   │ │   │   │   │
+└───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┘ └───┴───┴───┘
+┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ ┌───┬───┬───┐
+│   │   │   │   │   │   │   │   │   │   │   │   │   │   │   │ │   │   │   │
+├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ ├───┼───┼───┤
+│     │   │   │   │   │   │   │   │   │   │   │   │   │     │ │   │   │   │
+├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ └───┴───┴───┘
+│      │   │   │   │   │   │   │   │   │   │   │   │        │
+├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤     ┌───┐
+│        │   │   │   │   │   │   │   │   │   │   │      │   │     │   │
+├─────┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬───┬─┴───┤ ┌───┼───┼───┐
+│     │   │     │                           │     │   │     │ │   │   │   │
+└─────┘   └─────┴───────────────────────────┴─────┘   └─────┘ └───┴───┴───┘
 ```
 
 ```
@@ -823,20 +916,20 @@ LAYOUT_tkl_f13_iso
 
 ```
 LAYOUT_tkl_f13_iso_split_bs_rshift
-┌───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┐┌───┬───┬───┐
-│   ││   │   │   │   ││   │   │   │   ││   │   │   │   ││   ││   │   │   │
-└───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┘└───┴───┴───┘
-┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐┌───┬───┬───┐
-│   │   │   │   │   │   │   │   │   │   │   │   │   │   │   ││   │   │   │
-├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤├───┼───┼───┤
-│     │   │   │   │   │   │   │   │   │   │   │   │   │     ││   │   │   │
-├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐    │└───┴───┴───┘
+┌───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┐ ┌───┬───┬───┐
+│   ││   │   │   │   ││   │   │   │   ││   │   │   │   ││   │ │   │   │   │
+└───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┘ └───┴───┴───┘
+┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ ┌───┬───┬───┐
+│   │   │   │   │   │   │   │   │   │   │   │   │   │   │   │ │   │   │   │
+├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ ├───┼───┼───┤
+│     │   │   │   │   │   │   │   │   │   │   │   │   │     │ │   │   │   │
+├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐    │ └───┴───┴───┘
 │      │   │   │   │   │   │   │   │   │   │   │   │   │    │
-├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┬───┤    ┌───┐
-│    │   │   │   │   │   │   │   │   │   │   │   │      │   │    │   │
-├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬┴───┤┌───┼───┼───┐
-│    │    │    │                        │    │    │    │    ││   │   │   │
-└────┴────┴────┴────────────────────────┴────┴────┴────┴────┘└───┴───┴───┘
+├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┬───┤     ┌───┐
+│    │   │   │   │   │   │   │   │   │   │   │   │      │   │     │   │
+├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬┴───┤ ┌───┼───┼───┐
+│    │    │    │                        │    │    │    │    │ │   │   │   │
+└────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ └───┴───┴───┘
 ```
 
 ```
@@ -859,39 +952,74 @@ LAYOUT_tkl_f13_iso_tsangan
 
 ```
 LAYOUT_tkl_f13_iso_tsangan_split_bs_rshift
-┌───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┐┌───┬───┬───┐
-│   ││   │   │   │   ││   │   │   │   ││   │   │   │   ││   ││   │   │   │
-└───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┘└───┴───┴───┘
-┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐┌───┬───┬───┐
-│   │   │   │   │   │   │   │   │   │   │   │   │   │   │   ││   │   │   │
-├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤├───┼───┼───┤
-│     │   │   │   │   │   │   │   │   │   │   │   │   │     ││   │   │   │
-├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐    │└───┴───┴───┘
+┌───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┐ ┌───┬───┬───┐
+│   ││   │   │   │   ││   │   │   │   ││   │   │   │   ││   │ │   │   │   │
+└───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┘ └───┴───┴───┘
+┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ ┌───┬───┬───┐
+│   │   │   │   │   │   │   │   │   │   │   │   │   │   │   │ │   │   │   │
+├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ ├───┼───┼───┤
+│     │   │   │   │   │   │   │   │   │   │   │   │   │     │ │   │   │   │
+├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐    │ └───┴───┴───┘
 │      │   │   │   │   │   │   │   │   │   │   │   │   │    │
-├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┬───┤    ┌───┐
-│    │   │   │   │   │   │   │   │   │   │   │   │      │   │    │   │
-├────┴┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬───┬─┴───┤┌───┼───┼───┐
-│     │   │     │                           │     │   │     ││   │   │   │
-└─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘└───┴───┴───┘
+├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┬───┤     ┌───┐
+│    │   │   │   │   │   │   │   │   │   │   │   │      │   │     │   │
+├────┴┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬───┬─┴───┤ ┌───┼───┼───┐
+│     │   │     │                           │     │   │     │ │   │   │   │
+└─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘ └───┴───┴───┘
+```
+
+```
+LAYOUT_tkl_f13_iso_wkl
+┌───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┐ ┌───┬───┬───┐
+│   ││   │   │   │   ││   │   │   │   ││   │   │   │   ││   │ │   │   │   │
+└───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┘ └───┴───┴───┘
+┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ ┌───┬───┬───┐
+│   │   │   │   │   │   │   │   │   │   │   │   │   │       │ │   │   │   │
+├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ ├───┼───┼───┤
+│     │   │   │   │   │   │   │   │   │   │   │   │   │     │ │   │   │   │
+├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐    │ └───┴───┴───┘
+│      │   │   │   │   │   │   │   │   │   │   │   │   │    │
+├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤     ┌───┐
+│    │   │   │   │   │   │   │   │   │   │   │   │          │     │   │
+├────┴┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬───┬─────┤ ┌───┼───┼───┐
+│     │   │     │                           │     │   │     │ │   │   │   │
+└─────┘   └─────┴───────────────────────────┴─────┘   └─────┘ └───┴───┴───┘
+```
+
+```
+LAYOUT_tkl_f13_iso_wkl_split_bs_rshift
+┌───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┐ ┌───┬───┬───┐
+│   ││   │   │   │   ││   │   │   │   ││   │   │   │   ││   │ │   │   │   │
+└───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┘ └───┴───┴───┘
+┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ ┌───┬───┬───┐
+│   │   │   │   │   │   │   │   │   │   │   │   │   │   │   │ │   │   │   │
+├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ ├───┼───┼───┤
+│     │   │   │   │   │   │   │   │   │   │   │   │   │     │ │   │   │   │
+├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐    │ └───┴───┴───┘
+│      │   │   │   │   │   │   │   │   │   │   │   │   │    │
+├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┬───┤     ┌───┐
+│    │   │   │   │   │   │   │   │   │   │   │   │      │   │     │   │
+├────┴┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬───┬─┴───┤ ┌───┼───┼───┐
+│     │   │     │                           │     │   │     │ │   │   │   │
+└─────┘   └─────┴───────────────────────────┴─────┘   └─────┘ └───┴───┴───┘
 ```
 
 ```
 LAYOUT_tkl_f13_jis
-┌───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┐┌───┬───┬───┐
-│   ││   │   │   │   ││   │   │   │   ││   │   │   │   ││   ││   │   │   │
-└───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┘└───┴───┴───┘
-┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐┌───┬───┬───┐
-│   │   │   │   │   │   │   │   │   │   │   │   │   │   │   ││   │   │   │
-├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤├───┼───┼───┤
-│     │   │   │   │   │   │   │   │   │   │   │   │   │     ││   │   │   │
-├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐    │└───┴───┴───┘
+┌───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┐ ┌───┬───┬───┐
+│   ││   │   │   │   ││   │   │   │   ││   │   │   │   ││   │ │   │   │   │
+└───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┘ └───┴───┴───┘
+┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ ┌───┬───┬───┐
+│   │   │   │   │   │   │   │   │   │   │   │   │   │   │   │ │   │   │   │
+├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ ├───┼───┼───┤
+│     │   │   │   │   │   │   │   │   │   │   │   │   │     │ │   │   │   │
+├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐    │ └───┴───┴───┘
 │      │   │   │   │   │   │   │   │   │   │   │   │   │    │
-├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┤    ┌───┐
-│        │   │   │   │   │   │   │   │   │   │   │   │      │    │   │
-├────┬───┴┬──┴─┬─┴──┬┴───┴───┴───┴─┬─┴──┬┴───┼───┴┬──┴─┬────┤┌───┼───┼───┐
-│    │    │    │    │              │    │    │    │    │    ││   │   │   │
-└────┴────┴────┴────┴──────────────┴────┴────┴────┴────┴────┘└───┴───┴───┘
-
+├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┤     ┌───┐
+│        │   │   │   │   │   │   │   │   │   │   │   │      │     │   │
+├────┬───┴┬──┴─┬─┴──┬┴───┴───┴───┴─┬─┴──┬┴───┼───┴┬──┴─┬────┤ ┌───┼───┼───┐
+│    │    │    │    │              │    │    │    │    │    │ │   │   │   │
+└────┴────┴────┴────┴──────────────┴────┴────┴────┴────┴────┘ └───┴───┴───┘
 ```
 
 ```
diff --git a/layouts/default/tkl_ansi_wkl/default_tkl_ansi_wkl/keymap.c b/layouts/default/tkl_ansi_wkl/default_tkl_ansi_wkl/keymap.c
new file mode 100644
index 00000000000..3d8cef64fc2
--- /dev/null
+++ b/layouts/default/tkl_ansi_wkl/default_tkl_ansi_wkl/keymap.c
@@ -0,0 +1,32 @@
+// Copyright 2022 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /*
+     * ┌───┐   ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┐
+     * │Esc│   │F1 │F2 │F3 │F4 │ │F5 │F6 │F7 │F8 │ │F9 │F10│F11│F12│ │PSc│Scr│Pse│
+     * └───┘   └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┘
+     * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ ┌───┬───┬───┐
+     * │ ` │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │ Backsp│ │Ins│Hom│PgU│
+     * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ ├───┼───┼───┤
+     * │ Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ [ │ ] │  \  │ │Del│End│PgD│
+     * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ └───┴───┴───┘
+     * │ Caps │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │  Enter │
+     * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤     ┌───┐
+     * │ Shift  │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │    Shift │     │ ↑ │
+     * ├─────┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬───┬─────┤ ┌───┼───┼───┐
+     * │Ctrl │   │Alt  │                           │  Alt│   │ Ctrl│ │ ← │ ↓ │ → │
+     * └─────┘   └─────┴───────────────────────────┴─────┘   └─────┘ └───┴───┴───┘
+     */
+    [0] = LAYOUT_tkl_ansi_wkl(
+        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,     KC_PSCR, KC_SCRL, KC_PAUS,
+
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,    KC_INS,  KC_HOME, KC_PGUP,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,    KC_DEL,  KC_END,  KC_PGDN,
+        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_LALT,                            KC_SPC,                                      KC_RALT,          KC_RCTL,    KC_LEFT, KC_DOWN, KC_RGHT
+    )
+};
diff --git a/layouts/default/tkl_ansi_wkl/info.json b/layouts/default/tkl_ansi_wkl/info.json
new file mode 100644
index 00000000000..eb08eacd370
--- /dev/null
+++ b/layouts/default/tkl_ansi_wkl/info.json
@@ -0,0 +1,105 @@
+{
+    "keyboard_name": "Tenkeyless ANSI Windows keyless layout",
+    "url": "",
+    "maintainer": "qmk",
+    "layouts": {
+        "LAYOUT_tkl_ansi_wkl": {
+            "layout": [
+                {"x":0, "y":0},
+                {"x":2, "y":0},
+                {"x":3, "y":0},
+                {"x":4, "y":0},
+                {"x":5, "y":0},
+                {"x":6.5, "y":0},
+                {"x":7.5, "y":0},
+                {"x":8.5, "y":0},
+                {"x":9.5, "y":0},
+                {"x":11, "y":0},
+                {"x":12, "y":0},
+                {"x":13, "y":0},
+                {"x":14, "y":0},
+
+                {"x":15.25, "y":0},
+                {"x":16.25, "y":0},
+                {"x":17.25, "y":0},
+
+                {"x":0, "y":1.25},
+                {"x":1, "y":1.25},
+                {"x":2, "y":1.25},
+                {"x":3, "y":1.25},
+                {"x":4, "y":1.25},
+                {"x":5, "y":1.25},
+                {"x":6, "y":1.25},
+                {"x":7, "y":1.25},
+                {"x":8, "y":1.25},
+                {"x":9, "y":1.25},
+                {"x":10, "y":1.25},
+                {"x":11, "y":1.25},
+                {"x":12, "y":1.25},
+                {"x":13, "y":1.25, "w":2},
+
+                {"x":15.25, "y":1.25},
+                {"x":16.25, "y":1.25},
+                {"x":17.25, "y":1.25},
+
+                {"x":0, "y":2.25, "w":1.5},
+                {"x":1.5, "y":2.25},
+                {"x":2.5, "y":2.25},
+                {"x":3.5, "y":2.25},
+                {"x":4.5, "y":2.25},
+                {"x":5.5, "y":2.25},
+                {"x":6.5, "y":2.25},
+                {"x":7.5, "y":2.25},
+                {"x":8.5, "y":2.25},
+                {"x":9.5, "y":2.25},
+                {"x":10.5, "y":2.25},
+                {"x":11.5, "y":2.25},
+                {"x":12.5, "y":2.25},
+                {"x":13.5, "y":2.25, "w":1.5},
+                
+                {"x":15.25, "y":2.25},
+                {"x":16.25, "y":2.25},
+                {"x":17.25, "y":2.25},
+
+                {"x":0, "y":3.25, "w":1.75},
+                {"x":1.75, "y":3.25},
+                {"x":2.75, "y":3.25},
+                {"x":3.75, "y":3.25},
+                {"x":4.75, "y":3.25},
+                {"x":5.75, "y":3.25},
+                {"x":6.75, "y":3.25},
+                {"x":7.75, "y":3.25},
+                {"x":8.75, "y":3.25},
+                {"x":9.75, "y":3.25},
+                {"x":10.75, "y":3.25},
+                {"x":11.75, "y":3.25},
+                {"x":12.75, "y":3.25, "w":2.25},
+
+                {"x":0, "y":4.25, "w":2.25},
+                {"x":2.25, "y":4.25},
+                {"x":3.25, "y":4.25},
+                {"x":4.25, "y":4.25},
+                {"x":5.25, "y":4.25},
+                {"x":6.25, "y":4.25},
+                {"x":7.25, "y":4.25},
+                {"x":8.25, "y":4.25},
+                {"x":9.25, "y":4.25},
+                {"x":10.25, "y":4.25},
+                {"x":11.25, "y":4.25},
+                {"x":12.25, "y":4.25, "w":2.75},
+
+                {"x":16.25, "y":4.25},
+
+                {"x":0, "y":5.25, "w":1.5},
+                {"x":2.5, "y":5.25, "w":1.5},
+                {"x":4, "y":5.25, "w":7},
+                {"x":11, "y":5.25, "w":1.5},
+                {"x":13.5, "y":5.25, "w":1.5},
+
+                {"x":15.25, "y":5.25},
+                {"x":16.25, "y":5.25},
+                {"x":17.25, "y":5.25}
+            ]
+        }
+    }
+}
diff --git a/layouts/default/tkl_ansi_wkl/layout.json b/layouts/default/tkl_ansi_wkl/layout.json
new file mode 100644
index 00000000000..b6d3505b159
--- /dev/null
+++ b/layouts/default/tkl_ansi_wkl/layout.json
@@ -0,0 +1,6 @@
+[{a:7},"",{x:1},"","","","",{x:0.5},"","","","",{x:0.5},"","","","",{x:0.25},"","",""],
+[{y:0.25},"","","","","","","","","","","","","",{w:2},"",{x:0.25},"","",""],
+[{w:1.5},"","","","","","","","","","","","","",{w:1.5},"",{x:0.25},"","",""],
+[{w:1.75},"","","","","","","","","","","","",{w:2.25},""],
+[{w:2.25},"","","","","","","","","","","",{w:2.75},"",{x:1.25},""],
+[{w:1.5},"",{x:1,w:1.5},"",{w:7},"",{w:1.5},"",{x:1,w:1.5},"",{x:0.25},"","",""]
diff --git a/layouts/default/tkl_ansi_wkl/readme.md b/layouts/default/tkl_ansi_wkl/readme.md
new file mode 100644
index 00000000000..6541a0f23ab
--- /dev/null
+++ b/layouts/default/tkl_ansi_wkl/readme.md
@@ -0,0 +1,3 @@
+# tkl_ansi_wkl
+
+    LAYOUT_tkl_ansi_wkl
diff --git a/layouts/default/tkl_ansi_wkl_split_bs_rshift/default_tkl_ansi_wkl_split_bs_rshift/keymap.c b/layouts/default/tkl_ansi_wkl_split_bs_rshift/default_tkl_ansi_wkl_split_bs_rshift/keymap.c
new file mode 100644
index 00000000000..a5b27ee42bb
--- /dev/null
+++ b/layouts/default/tkl_ansi_wkl_split_bs_rshift/default_tkl_ansi_wkl_split_bs_rshift/keymap.c
@@ -0,0 +1,32 @@
+// Copyright 2023 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /*
+     * ┌───┐   ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┐
+     * │Esc│   │F1 │F2 │F3 │F4 │ │F5 │F6 │F7 │F8 │ │F9 │F10│F11│F12│ │PSc│Scr│Pse│
+     * └───┘   └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┘
+     * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ ┌───┬───┬───┐
+     * │ ` │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │Bsp│Bsp│ │Ins│Hom│PgU│
+     * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ ├───┼───┼───┤
+     * │ Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ [ │ ] │  \  │ │Del│End│PgD│
+     * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ └───┴───┴───┘
+     * │ Caps │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │  Enter │
+     * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤     ┌───┐
+     * │ Shift  │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │ Shift│Sft│     │ ↑ │
+     * ├─────┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬───┬─┴───┤ ┌───┼───┼───┐
+     * │Ctrl │   │Alt  │                           │  Alt│   │ Ctrl│ │ ← │ ↓ │ → │
+     * └─────┘   └─────┴───────────────────────────┴─────┘   └─────┘ └───┴───┴───┘
+     */
+    [0] = LAYOUT_tkl_ansi_wkl_split_bs_rshift(
+        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_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_RSFT,                      KC_UP,
+        KC_LCTL,          KC_LALT,                            KC_SPC,                                      KC_RALT,          KC_RCTL,             KC_LEFT, KC_DOWN, KC_RGHT
+    )
+};
diff --git a/layouts/default/tkl_ansi_wkl_split_bs_rshift/info.json b/layouts/default/tkl_ansi_wkl_split_bs_rshift/info.json
new file mode 100644
index 00000000000..62b48e3bc84
--- /dev/null
+++ b/layouts/default/tkl_ansi_wkl_split_bs_rshift/info.json
@@ -0,0 +1,107 @@
+{
+    "keyboard_name": "Tenkeyless ANSI Windows keyless layout with split Backspace and split Right Shift",
+    "url": "",
+    "maintainer": "qmk",
+    "layouts": {
+        "LAYOUT_tkl_ansi_wkl_split_bs_rshift": {
+            "layout": [
+                {"x":0, "y":0},
+                {"x":2, "y":0},
+                {"x":3, "y":0},
+                {"x":4, "y":0},
+                {"x":5, "y":0},
+                {"x":6.5, "y":0},
+                {"x":7.5, "y":0},
+                {"x":8.5, "y":0},
+                {"x":9.5, "y":0},
+                {"x":11, "y":0},
+                {"x":12, "y":0},
+                {"x":13, "y":0},
+                {"x":14, "y":0},
+
+                {"x":15.25, "y":0},
+                {"x":16.25, "y":0},
+                {"x":17.25, "y":0},
+
+                {"x":0, "y":1.25},
+                {"x":1, "y":1.25},
+                {"x":2, "y":1.25},
+                {"x":3, "y":1.25},
+                {"x":4, "y":1.25},
+                {"x":5, "y":1.25},
+                {"x":6, "y":1.25},
+                {"x":7, "y":1.25},
+                {"x":8, "y":1.25},
+                {"x":9, "y":1.25},
+                {"x":10, "y":1.25},
+                {"x":11, "y":1.25},
+                {"x":12, "y":1.25},
+                {"x":13, "y":1.25},
+                {"x":14, "y":1.25},
+
+                {"x":15.25, "y":1.25},
+                {"x":16.25, "y":1.25},
+                {"x":17.25, "y":1.25},
+
+                {"x":0, "y":2.25, "w":1.5},
+                {"x":1.5, "y":2.25},
+                {"x":2.5, "y":2.25},
+                {"x":3.5, "y":2.25},
+                {"x":4.5, "y":2.25},
+                {"x":5.5, "y":2.25},
+                {"x":6.5, "y":2.25},
+                {"x":7.5, "y":2.25},
+                {"x":8.5, "y":2.25},
+                {"x":9.5, "y":2.25},
+                {"x":10.5, "y":2.25},
+                {"x":11.5, "y":2.25},
+                {"x":12.5, "y":2.25},
+                {"x":13.5, "y":2.25, "w":1.5},
+                
+                {"x":15.25, "y":2.25},
+                {"x":16.25, "y":2.25},
+                {"x":17.25, "y":2.25},
+
+                {"x":0, "y":3.25, "w":1.75},
+                {"x":1.75, "y":3.25},
+                {"x":2.75, "y":3.25},
+                {"x":3.75, "y":3.25},
+                {"x":4.75, "y":3.25},
+                {"x":5.75, "y":3.25},
+                {"x":6.75, "y":3.25},
+                {"x":7.75, "y":3.25},
+                {"x":8.75, "y":3.25},
+                {"x":9.75, "y":3.25},
+                {"x":10.75, "y":3.25},
+                {"x":11.75, "y":3.25},
+                {"x":12.75, "y":3.25, "w":2.25},
+
+                {"x":0, "y":4.25, "w":2.25},
+                {"x":2.25, "y":4.25},
+                {"x":3.25, "y":4.25},
+                {"x":4.25, "y":4.25},
+                {"x":5.25, "y":4.25},
+                {"x":6.25, "y":4.25},
+                {"x":7.25, "y":4.25},
+                {"x":8.25, "y":4.25},
+                {"x":9.25, "y":4.25},
+                {"x":10.25, "y":4.25},
+                {"x":11.25, "y":4.25},
+                {"x":12.25, "y":4.25, "w":1.75},
+                {"x":14, "y":4.25},
+
+                {"x":16.25, "y":4.25},
+
+                {"x":0, "y":5.25, "w":1.5},
+                {"x":2.5, "y":5.25, "w":1.5},
+                {"x":4, "y":5.25, "w":7},
+                {"x":11, "y":5.25, "w":1.5},
+                {"x":13.5, "y":5.25, "w":1.5},
+
+                {"x":15.25, "y":5.25},
+                {"x":16.25, "y":5.25},
+                {"x":17.25, "y":5.25}
+            ]
+        }
+    }
+}
diff --git a/layouts/default/tkl_ansi_wkl_split_bs_rshift/layout.json b/layouts/default/tkl_ansi_wkl_split_bs_rshift/layout.json
new file mode 100644
index 00000000000..0fba13348bb
--- /dev/null
+++ b/layouts/default/tkl_ansi_wkl_split_bs_rshift/layout.json
@@ -0,0 +1,6 @@
+[{a:7},"",{x:1},"","","","",{x:0.5},"","","","",{x:0.5},"","","","",{x:0.25},"","",""],
+[{y:0.25},"","","","","","","","","","","","","","","",{x:0.25},"","",""],
+[{w:1.5},"","","","","","","","","","","","","",{w:1.5},"",{x:0.25},"","",""],
+[{w:1.75},"","","","","","","","","","","","",{w:2.25},""],
+[{w:2.25},"","","","","","","","","","","",{w:1.75},"","",{x:1.25},""],
+[{w:1.5},"",{x:1,w:1.5},"",{w:7},"",{w:1.5},"",{x:1,w:1.5},"",{x:0.25},"","",""]
diff --git a/layouts/default/tkl_ansi_wkl_split_bs_rshift/readme.md b/layouts/default/tkl_ansi_wkl_split_bs_rshift/readme.md
new file mode 100644
index 00000000000..35235603728
--- /dev/null
+++ b/layouts/default/tkl_ansi_wkl_split_bs_rshift/readme.md
@@ -0,0 +1,3 @@
+# tkl_ansi_wkl_split_bs_rshift
+
+    LAYOUT_tkl_ansi_wkl_split_bs_rshift
diff --git a/layouts/default/tkl_f13_ansi_wkl/default_tkl_f13_ansi_wkl/keymap.c b/layouts/default/tkl_f13_ansi_wkl/default_tkl_f13_ansi_wkl/keymap.c
new file mode 100644
index 00000000000..709988ac76d
--- /dev/null
+++ b/layouts/default/tkl_f13_ansi_wkl/default_tkl_f13_ansi_wkl/keymap.c
@@ -0,0 +1,32 @@
+// Copyright 2023 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /*
+     * ┌───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┐ ┌───┬───┬───┐
+     * │Esc││F1 │F2 │F3 │F4 ││F5 │F6 │F7 │F8 ││F9 │F10│F11│F12││F13│ │PSc│Scr│Pse│
+     * └───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┘ └───┴───┴───┘
+     * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ ┌───┬───┬───┐
+     * │ ` │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │ Backsp│ │Ins│Hom│PgU│
+     * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ ├───┼───┼───┤
+     * │ Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ [ │ ] │  \  │ │Del│End│PgD│
+     * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ └───┴───┴───┘
+     * │ Caps │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │  Enter │
+     * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤     ┌───┐
+     * │ Shift  │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │    Shift │     │ ↑ │
+     * ├─────┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬───┬─────┤ ┌───┼───┼───┐
+     * │Ctrl │   │Alt  │                           │  Alt│   │ Ctrl│ │ ← │ ↓ │ → │
+     * └─────┘   └─────┴───────────────────────────┴─────┘   └─────┘ └───┴───┴───┘
+     */
+    [0] = LAYOUT_tkl_f13_ansi_wkl(
+        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,     KC_PSCR, KC_SCRL, KC_PAUS,
+
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,    KC_INS,  KC_HOME, KC_PGUP,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,    KC_DEL,  KC_END,  KC_PGDN,
+        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_LALT,                            KC_SPC,                                      KC_RALT,          KC_RCTL,    KC_LEFT, KC_DOWN, KC_RGHT
+    )
+};
diff --git a/layouts/default/tkl_f13_ansi_wkl/info.json b/layouts/default/tkl_f13_ansi_wkl/info.json
new file mode 100644
index 00000000000..ca03585d00a
--- /dev/null
+++ b/layouts/default/tkl_f13_ansi_wkl/info.json
@@ -0,0 +1,106 @@
+{
+    "keyboard_name": "Tenkeyless ANSI Windows keyless layout with F13 key",
+    "url": "",
+    "maintainer": "qmk",
+    "layouts": {
+        "LAYOUT_tkl_f13_ansi_wkl": {
+            "layout": [
+                {"x":0, "y":0},
+                {"x":1.25, "y":0},
+                {"x":2.25, "y":0},
+                {"x":3.25, "y":0},
+                {"x":4.25, "y":0},
+                {"x":5.5, "y":0},
+                {"x":6.5, "y":0},
+                {"x":7.5, "y":0},
+                {"x":8.5, "y":0},
+                {"x":9.75, "y":0},
+                {"x":10.75, "y":0},
+                {"x":11.75, "y":0},
+                {"x":12.75, "y":0},
+                {"x":14, "y":0},
+                
+                {"x":15.25, "y":0},
+                {"x":16.25, "y":0},
+                {"x":17.25, "y":0},
+
+                {"x":0, "y":1.25},
+                {"x":1, "y":1.25},
+                {"x":2, "y":1.25},
+                {"x":3, "y":1.25},
+                {"x":4, "y":1.25},
+                {"x":5, "y":1.25},
+                {"x":6, "y":1.25},
+                {"x":7, "y":1.25},
+                {"x":8, "y":1.25},
+                {"x":9, "y":1.25},
+                {"x":10, "y":1.25},
+                {"x":11, "y":1.25},
+                {"x":12, "y":1.25},
+                {"x":13, "y":1.25, "w":2},
+
+                {"x":15.25, "y":1.25},
+                {"x":16.25, "y":1.25},
+                {"x":17.25, "y":1.25},
+
+                {"x":0, "y":2.25, "w":1.5},
+                {"x":1.5, "y":2.25},
+                {"x":2.5, "y":2.25},
+                {"x":3.5, "y":2.25},
+                {"x":4.5, "y":2.25},
+                {"x":5.5, "y":2.25},
+                {"x":6.5, "y":2.25},
+                {"x":7.5, "y":2.25},
+                {"x":8.5, "y":2.25},
+                {"x":9.5, "y":2.25},
+                {"x":10.5, "y":2.25},
+                {"x":11.5, "y":2.25},
+                {"x":12.5, "y":2.25},
+                {"x":13.5, "y":2.25, "w":1.5},
+
+                {"x":15.25, "y":2.25},
+                {"x":16.25, "y":2.25},
+                {"x":17.25, "y":2.25},
+
+                {"x":0, "y":3.25, "w":1.75},
+                {"x":1.75, "y":3.25},
+                {"x":2.75, "y":3.25},
+                {"x":3.75, "y":3.25},
+                {"x":4.75, "y":3.25},
+                {"x":5.75, "y":3.25},
+                {"x":6.75, "y":3.25},
+                {"x":7.75, "y":3.25},
+                {"x":8.75, "y":3.25},
+                {"x":9.75, "y":3.25},
+                {"x":10.75, "y":3.25},
+                {"x":11.75, "y":3.25},
+                {"x":12.75, "y":3.25, "w":2.25},
+
+                {"x":0, "y":4.25, "w":2.25},
+                {"x":2.25, "y":4.25},
+                {"x":3.25, "y":4.25},
+                {"x":4.25, "y":4.25},
+                {"x":5.25, "y":4.25},
+                {"x":6.25, "y":4.25},
+                {"x":7.25, "y":4.25},
+                {"x":8.25, "y":4.25},
+                {"x":9.25, "y":4.25},
+                {"x":10.25, "y":4.25},
+                {"x":11.25, "y":4.25},
+                {"x":12.25, "y":4.25, "w":2.75},
+
+                {"x":16.25, "y":4.25},
+
+                {"x":0, "y":5.25, "w":1.5},
+                {"x":2.5, "y":5.25, "w":1.5},
+                {"x":4, "y":5.25, "w":7},
+                {"x":11, "y":5.25, "w":1.5},
+                {"x":13.5, "y":5.25, "w":1.5},
+
+                {"x":15.25, "y":5.25},
+                {"x":16.25, "y":5.25},
+                {"x":17.25, "y":5.25}
+            ]
+        }
+    }
+}
diff --git a/layouts/default/tkl_f13_ansi_wkl/layout.json b/layouts/default/tkl_f13_ansi_wkl/layout.json
new file mode 100644
index 00000000000..850ffc9bdc9
--- /dev/null
+++ b/layouts/default/tkl_f13_ansi_wkl/layout.json
@@ -0,0 +1,6 @@
+[{a:7},"",{x:0.25},"","","","",{x:0.25},"","","","",{x:0.25},"","","","",{x:0.25},"",{x:0.25},"","",""],
+[{y:0.25},"","","","","","","","","","","","","",{w:2},"",{x:0.25},"","",""],
+[{w:1.5},"","","","","","","","","","","","","",{w:1.5},"",{x:0.25},"","",""],
+[{w:1.75},"","","","","","","","","","","","",{w:2.25},""],
+[{w:2.25},"","","","","","","","","","","",{w:2.75},"",{x:1.25},""],
+[{w:1.5},"",{x:1,w:1.5},"",{w:7},"",{w:1.5},"",{x:1,w:1.5},"",{x:0.25},"","",""]
diff --git a/layouts/default/tkl_f13_ansi_wkl/readme.md b/layouts/default/tkl_f13_ansi_wkl/readme.md
new file mode 100644
index 00000000000..607692c2392
--- /dev/null
+++ b/layouts/default/tkl_f13_ansi_wkl/readme.md
@@ -0,0 +1,3 @@
+# tkl_f13_ansi_wkl
+
+    LAYOUT_tkl_f13_ansi_wkl
diff --git a/layouts/default/tkl_f13_ansi_wkl_split_bs_rshift/default_tkl_f13_ansi_wkl_split_bs_rshift/keymap.c b/layouts/default/tkl_f13_ansi_wkl_split_bs_rshift/default_tkl_f13_ansi_wkl_split_bs_rshift/keymap.c
new file mode 100644
index 00000000000..6089b7681f9
--- /dev/null
+++ b/layouts/default/tkl_f13_ansi_wkl_split_bs_rshift/default_tkl_f13_ansi_wkl_split_bs_rshift/keymap.c
@@ -0,0 +1,32 @@
+// Copyright 2023 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /*
+     * ┌───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┐ ┌───┬───┬───┐
+     * │Esc││F1 │F2 │F3 │F4 ││F5 │F6 │F7 │F8 ││F9 │F10│F11│F12││F13│ │PSc│Scr│Pse│
+     * └───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┘ └───┴───┴───┘
+     * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ ┌───┬───┬───┐
+     * │ ` │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │Bsp│Bsp│ │Ins│Hom│PgU│
+     * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ ├───┼───┼───┤
+     * │ Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ [ │ ] │  \  │ │Del│End│PgD│
+     * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ └───┴───┴───┘
+     * │ Caps │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │  Enter │
+     * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤     ┌───┐
+     * │ Shift  │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │Shift │Sft│     │ ↑ │
+     * ├─────┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬───┬─┴───┤ ┌───┼───┼───┐
+     * │Ctrl │   │Alt  │                           │  Alt│   │ Ctrl│ │ ← │ ↓ │ → │
+     * └─────┘   └─────┴───────────────────────────┴─────┘   └─────┘ └───┴───┴───┘
+     */
+    [0] = LAYOUT_tkl_f13_ansi_wkl_split_bs_rshift(
+        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,              KC_PSCR, KC_SCRL, KC_PAUS,
+
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_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_RSFT,                      KC_UP,
+        KC_LCTL,          KC_LALT,                            KC_SPC,                                      KC_RALT,          KC_RCTL,             KC_LEFT, KC_DOWN, KC_RGHT
+    )
+};
diff --git a/layouts/default/tkl_f13_ansi_wkl_split_bs_rshift/info.json b/layouts/default/tkl_f13_ansi_wkl_split_bs_rshift/info.json
new file mode 100644
index 00000000000..755e7a80d78
--- /dev/null
+++ b/layouts/default/tkl_f13_ansi_wkl_split_bs_rshift/info.json
@@ -0,0 +1,108 @@
+{
+    "keyboard_name": "Tenkeyless ANSI Windows keyless layout with F13 key, split Backspace, and split Right Shift",
+    "url": "",
+    "maintainer": "qmk",
+    "layouts": {
+        "LAYOUT_tkl_f13_ansi_wkl_split_bs_rshift": {
+            "layout": [
+                {"x":0, "y":0},
+                {"x":1.25, "y":0},
+                {"x":2.25, "y":0},
+                {"x":3.25, "y":0},
+                {"x":4.25, "y":0},
+                {"x":5.5, "y":0},
+                {"x":6.5, "y":0},
+                {"x":7.5, "y":0},
+                {"x":8.5, "y":0},
+                {"x":9.75, "y":0},
+                {"x":10.75, "y":0},
+                {"x":11.75, "y":0},
+                {"x":12.75, "y":0},
+                {"x":14, "y":0},
+
+                {"x":15.25, "y":0},
+                {"x":16.25, "y":0},
+                {"x":17.25, "y":0},
+
+                {"x":0, "y":1.25},
+                {"x":1, "y":1.25},
+                {"x":2, "y":1.25},
+                {"x":3, "y":1.25},
+                {"x":4, "y":1.25},
+                {"x":5, "y":1.25},
+                {"x":6, "y":1.25},
+                {"x":7, "y":1.25},
+                {"x":8, "y":1.25},
+                {"x":9, "y":1.25},
+                {"x":10, "y":1.25},
+                {"x":11, "y":1.25},
+                {"x":12, "y":1.25},
+                {"x":13, "y":1.25},
+                {"x":14, "y":1.25},
+
+                {"x":15.25, "y":1.25},
+                {"x":16.25, "y":1.25},
+                {"x":17.25, "y":1.25},
+
+                {"x":0, "y":2.25, "w":1.5},
+                {"x":1.5, "y":2.25},
+                {"x":2.5, "y":2.25},
+                {"x":3.5, "y":2.25},
+                {"x":4.5, "y":2.25},
+                {"x":5.5, "y":2.25},
+                {"x":6.5, "y":2.25},
+                {"x":7.5, "y":2.25},
+                {"x":8.5, "y":2.25},
+                {"x":9.5, "y":2.25},
+                {"x":10.5, "y":2.25},
+                {"x":11.5, "y":2.25},
+                {"x":12.5, "y":2.25},
+                {"x":13.5, "y":2.25, "w":1.5},
+
+                {"x":15.25, "y":2.25},
+                {"x":16.25, "y":2.25},
+                {"x":17.25, "y":2.25},
+
+                {"x":0, "y":3.25, "w":1.75},
+                {"x":1.75, "y":3.25},
+                {"x":2.75, "y":3.25},
+                {"x":3.75, "y":3.25},
+                {"x":4.75, "y":3.25},
+                {"x":5.75, "y":3.25},
+                {"x":6.75, "y":3.25},
+                {"x":7.75, "y":3.25},
+                {"x":8.75, "y":3.25},
+                {"x":9.75, "y":3.25},
+                {"x":10.75, "y":3.25},
+                {"x":11.75, "y":3.25},
+                {"x":12.75, "y":3.25, "w":2.25},
+
+                {"x":0, "y":4.25, "w":2.25},
+                {"x":2.25, "y":4.25},
+                {"x":3.25, "y":4.25},
+                {"x":4.25, "y":4.25},
+                {"x":5.25, "y":4.25},
+                {"x":6.25, "y":4.25},
+                {"x":7.25, "y":4.25},
+                {"x":8.25, "y":4.25},
+                {"x":9.25, "y":4.25},
+                {"x":10.25, "y":4.25},
+                {"x":11.25, "y":4.25},
+                {"x":12.25, "y":4.25, "w":1.75},
+                {"x":14, "y":4.25},
+
+                {"x":16.25, "y":4.25},
+
+                {"x":0, "y":5.25, "w":1.5},
+                {"x":2.5, "y":5.25, "w":1.5},
+                {"x":4, "y":5.25, "w":7},
+                {"x":11, "y":5.25, "w":1.5},
+                {"x":13.5, "y":5.25, "w":1.5},
+
+                {"x":15.25, "y":5.25},
+                {"x":16.25, "y":5.25},
+                {"x":17.25, "y":5.25}
+            ]
+        }
+    }
+}
diff --git a/layouts/default/tkl_f13_ansi_wkl_split_bs_rshift/layout.json b/layouts/default/tkl_f13_ansi_wkl_split_bs_rshift/layout.json
new file mode 100644
index 00000000000..6992dff912b
--- /dev/null
+++ b/layouts/default/tkl_f13_ansi_wkl_split_bs_rshift/layout.json
@@ -0,0 +1,6 @@
+[{a:7},"",{x:0.25},"","","","",{x:0.25},"","","","",{x:0.25},"","","","",{x:0.25},"",{x:0.25},"","",""],
+[{y:0.25},"","","","","","","","","","","","","","","",{x:0.25},"","",""],
+[{w:1.5},"","","","","","","","","","","","","",{w:1.5},"",{x:0.25},"","",""],
+[{w:1.75},"","","","","","","","","","","","",{w:2.25},""],
+[{w:2.25},"","","","","","","","","","","",{w:1.75},"","",{x:1.25},""],
+[{w:1.5},"",{x:1,w:1.5},"",{w:7},"",{w:1.5},"",{x:1,w:1.5},"",{x:0.25},"","",""]
diff --git a/layouts/default/tkl_f13_ansi_wkl_split_bs_rshift/readme.md b/layouts/default/tkl_f13_ansi_wkl_split_bs_rshift/readme.md
new file mode 100644
index 00000000000..614c0913f62
--- /dev/null
+++ b/layouts/default/tkl_f13_ansi_wkl_split_bs_rshift/readme.md
@@ -0,0 +1,3 @@
+# tkl_f13_ansi_wkl_split_bs_rshift
+
+    LAYOUT_tkl_f13_ansi_wkl_split_bs_rshift
diff --git a/layouts/default/tkl_f13_iso_wkl/default_tkl_f13_iso_wkl/keymap.c b/layouts/default/tkl_f13_iso_wkl/default_tkl_f13_iso_wkl/keymap.c
new file mode 100644
index 00000000000..5a32e674e8d
--- /dev/null
+++ b/layouts/default/tkl_f13_iso_wkl/default_tkl_f13_iso_wkl/keymap.c
@@ -0,0 +1,32 @@
+// Copyright 2023 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /*
+     * ┌───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┐ ┌───┬───┬───┐
+     * │Esc││F1 │F2 │F3 │F4 ││F5 │F6 │F7 │F8 ││F9 │F10│F11│F12││F13│ │PSc│Scr│Pse│
+     * └───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┘ └───┴───┴───┘
+     * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ ┌───┬───┬───┐
+     * │ ` │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │ Backsp│ │Ins│Hom│PgU│
+     * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ ├───┼───┼───┤
+     * │ Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ [ │ ] │     │ │Del│End│PgD│
+     * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ Ent│ └───┴───┴───┘
+     * │ Caps │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │ # │    │
+     * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤     ┌───┐
+     * │Shft│ \ │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │    Shift │     │ ↑ │
+     * ├────┴┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬───┬─────┤ ┌───┼───┼───┐
+     * │Ctrl │   │Alt  │                           │  Alt│   │ Ctrl│ │ ← │ ↓ │ → │
+     * └─────┘   └─────┴───────────────────────────┴─────┘   └─────┘ └───┴───┴───┘
+     */
+    [0] = LAYOUT_tkl_f13_iso_wkl(
+        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,     KC_PSCR, KC_SCRL, KC_PAUS,
+
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,    KC_INS,  KC_HOME, KC_PGUP,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,             KC_DEL,  KC_END,  KC_PGDN,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,
+        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_UP,
+        KC_LCTL,          KC_LALT,                            KC_SPC,                                      KC_RALT,          KC_RCTL,    KC_LEFT, KC_DOWN, KC_RGHT
+    )
+};
diff --git a/layouts/default/tkl_f13_iso_wkl/info.json b/layouts/default/tkl_f13_iso_wkl/info.json
new file mode 100644
index 00000000000..e597716b5dc
--- /dev/null
+++ b/layouts/default/tkl_f13_iso_wkl/info.json
@@ -0,0 +1,107 @@
+{
+    "keyboard_name": "Tenkeyless ISO Windows keyless layout",
+    "url": "",
+    "maintainer": "qmk",
+    "layouts": {
+        "LAYOUT_tkl_f13_iso_wkl": {
+            "layout": [
+                {"x":0, "y":0},
+                {"x":1.25, "y":0},
+                {"x":2.25, "y":0},
+                {"x":3.25, "y":0},
+                {"x":4.25, "y":0},
+                {"x":5.5, "y":0},
+                {"x":6.5, "y":0},
+                {"x":7.5, "y":0},
+                {"x":8.5, "y":0},
+                {"x":9.75, "y":0},
+                {"x":10.75, "y":0},
+                {"x":11.75, "y":0},
+                {"x":12.75, "y":0},
+                {"x":14, "y":0},
+                
+                {"x":15.25, "y":0},
+                {"x":16.25, "y":0},
+                {"x":17.25, "y":0},
+
+                {"x":0, "y":1.25},
+                {"x":1, "y":1.25},
+                {"x":2, "y":1.25},
+                {"x":3, "y":1.25},
+                {"x":4, "y":1.25},
+                {"x":5, "y":1.25},
+                {"x":6, "y":1.25},
+                {"x":7, "y":1.25},
+                {"x":8, "y":1.25},
+                {"x":9, "y":1.25},
+                {"x":10, "y":1.25},
+                {"x":11, "y":1.25},
+                {"x":12, "y":1.25},
+                {"x":13, "y":1.25, "w":2},
+
+                {"x":15.25, "y":1.25},
+                {"x":16.25, "y":1.25},
+                {"x":17.25, "y":1.25},
+
+                {"x":0, "y":2.25, "w":1.5},
+                {"x":1.5, "y":2.25},
+                {"x":2.5, "y":2.25},
+                {"x":3.5, "y":2.25},
+                {"x":4.5, "y":2.25},
+                {"x":5.5, "y":2.25},
+                {"x":6.5, "y":2.25},
+                {"x":7.5, "y":2.25},
+                {"x":8.5, "y":2.25},
+                {"x":9.5, "y":2.25},
+                {"x":10.5, "y":2.25},
+                {"x":11.5, "y":2.25},
+                {"x":12.5, "y":2.25},
+
+                {"x":15.25, "y":2.25},
+                {"x":16.25, "y":2.25},
+                {"x":17.25, "y":2.25},
+
+                {"x":0, "y":3.25, "w":1.75},
+                {"x":1.75, "y":3.25},
+                {"x":2.75, "y":3.25},
+                {"x":3.75, "y":3.25},
+                {"x":4.75, "y":3.25},
+                {"x":5.75, "y":3.25},
+                {"x":6.75, "y":3.25},
+                {"x":7.75, "y":3.25},
+                {"x":8.75, "y":3.25},
+                {"x":9.75, "y":3.25},
+                {"x":10.75, "y":3.25},
+                {"x":11.75, "y":3.25},
+                {"x":12.75, "y":3.25},
+                {"x":13.75, "y":2.25, "w":1.25, "h":2},
+
+                {"x":0, "y":4.25, "w":1.25},
+                {"x":1.25, "y":4.25},
+                {"x":2.25, "y":4.25},
+                {"x":3.25, "y":4.25},
+                {"x":4.25, "y":4.25},
+                {"x":5.25, "y":4.25},
+                {"x":6.25, "y":4.25},
+                {"x":7.25, "y":4.25},
+                {"x":8.25, "y":4.25},
+                {"x":9.25, "y":4.25},
+                {"x":10.25, "y":4.25},
+                {"x":11.25, "y":4.25},
+                {"x":12.25, "y":4.25, "w":2.75},
+
+                {"x":16.25, "y":4.25},
+
+                {"x":0, "y":5.25, "w":1.5},
+                {"x":2.5, "y":5.25, "w":1.5},
+                {"x":4, "y":5.25, "w":7},
+                {"x":11, "y":5.25, "w":1.5},
+                {"x":13.5, "y":5.25, "w":1.5},
+
+                {"x":15.25, "y":5.25},
+                {"x":16.25, "y":5.25},
+                {"x":17.25, "y":5.25}
+            ]
+        }
+    }
+}
diff --git a/layouts/default/tkl_f13_iso_wkl/layout.json b/layouts/default/tkl_f13_iso_wkl/layout.json
new file mode 100644
index 00000000000..0c6f178b452
--- /dev/null
+++ b/layouts/default/tkl_f13_iso_wkl/layout.json
@@ -0,0 +1,6 @@
+[{a:7},"",{x:0.25},"","","","",{x:0.25},"","","","",{x:0.25},"","","","",{x:0.25},"",{x:0.25},"","",""],
+[{y:0.25},"","","","","","","","","","","","","",{w:2},"",{x:0.25},"","",""],
+[{w:1.5},"","","","","","","","","","","","","",{x:0.25,w:1.25,h:2,w2:1.5,h2:1,x2:-0.25},"",{x:0.25},"","",""],
+[{w:1.75},"","","","","","","","","","","","",""],
+[{w:1.25},"","","","","","","","","","","","",{w:2.75},"",{x:1.25},""],
+[{w:1.5},"",{x:1,w:1.5},"",{w:7},"",{w:1.5},"",{x:1,w:1.5},"",{x:0.25},"","",""]
diff --git a/layouts/default/tkl_f13_iso_wkl/readme.md b/layouts/default/tkl_f13_iso_wkl/readme.md
new file mode 100644
index 00000000000..46c44195923
--- /dev/null
+++ b/layouts/default/tkl_f13_iso_wkl/readme.md
@@ -0,0 +1,3 @@
+# tkl_f13_iso_wkl
+
+    LAYOUT_tkl_f13_iso_wkl
diff --git a/layouts/default/tkl_f13_iso_wkl_split_bs_rshift/default_tkl_f13_iso_wkl_split_bs_rshift/keymap.c b/layouts/default/tkl_f13_iso_wkl_split_bs_rshift/default_tkl_f13_iso_wkl_split_bs_rshift/keymap.c
new file mode 100644
index 00000000000..7642de46e2f
--- /dev/null
+++ b/layouts/default/tkl_f13_iso_wkl_split_bs_rshift/default_tkl_f13_iso_wkl_split_bs_rshift/keymap.c
@@ -0,0 +1,32 @@
+// Copyright 2023 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /*
+     * ┌───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┐ ┌───┬───┬───┐
+     * │Esc││F1 │F2 │F3 │F4 ││F5 │F6 │F7 │F8 ││F9 │F10│F11│F12││F13│ │PSc│Scr│Pse│
+     * └───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┘ └───┴───┴───┘
+     * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ ┌───┬───┬───┐
+     * │ ` │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │Bsp│Bsp│ │Ins│Hom│PgU│
+     * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ ├───┼───┼───┤
+     * │ Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ [ │ ] │     │ │Del│End│PgD│
+     * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ Ent│ └───┴───┴───┘
+     * │ Caps │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │ # │    │
+     * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┬───┤     ┌───┐
+     * │Shft│ \ │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │ Shift│Sft│     │ ↑ │
+     * ├────┴┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬───┬─┴───┤ ┌───┼───┼───┐
+     * │Ctrl │   │Alt  │                           │  Alt│   │ Ctrl│ │ ← │ ↓ │ → │
+     * └─────┘   └─────┴───────────────────────────┴─────┘   └─────┘ └───┴───┴───┘
+     */
+    [0] = LAYOUT_tkl_f13_iso_wkl_split_bs_rshift(
+        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,              KC_PSCR, KC_SCRL, KC_PAUS,
+
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_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_DEL,  KC_END,  KC_PGDN,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,
+        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_RSFT,                      KC_UP,
+        KC_LCTL,          KC_LALT,                            KC_SPC,                                      KC_RALT,          KC_RCTL,             KC_LEFT, KC_DOWN, KC_RGHT
+    )
+};
diff --git a/layouts/default/tkl_f13_iso_wkl_split_bs_rshift/info.json b/layouts/default/tkl_f13_iso_wkl_split_bs_rshift/info.json
new file mode 100644
index 00000000000..4ccde283690
--- /dev/null
+++ b/layouts/default/tkl_f13_iso_wkl_split_bs_rshift/info.json
@@ -0,0 +1,109 @@
+{
+    "keyboard_name": "Tenkeyless ISO Windows keyless layout with F13 key, split Backspace, and split Right Shift",
+    "url": "",
+    "maintainer": "qmk",
+    "layouts": {
+        "LAYOUT_tkl_f13_iso_wkl_split_bs_rshift": {
+            "layout": [
+                {"x":0, "y":0},
+                {"x":1.25, "y":0},
+                {"x":2.25, "y":0},
+                {"x":3.25, "y":0},
+                {"x":4.25, "y":0},
+                {"x":5.5, "y":0},
+                {"x":6.5, "y":0},
+                {"x":7.5, "y":0},
+                {"x":8.5, "y":0},
+                {"x":9.75, "y":0},
+                {"x":10.75, "y":0},
+                {"x":11.75, "y":0},
+                {"x":12.75, "y":0},
+                {"x":14, "y":0},
+                
+                {"x":15.25, "y":0},
+                {"x":16.25, "y":0},
+                {"x":17.25, "y":0},
+
+                {"x":0, "y":1.25},
+                {"x":1, "y":1.25},
+                {"x":2, "y":1.25},
+                {"x":3, "y":1.25},
+                {"x":4, "y":1.25},
+                {"x":5, "y":1.25},
+                {"x":6, "y":1.25},
+                {"x":7, "y":1.25},
+                {"x":8, "y":1.25},
+                {"x":9, "y":1.25},
+                {"x":10, "y":1.25},
+                {"x":11, "y":1.25},
+                {"x":12, "y":1.25},
+                {"x":13, "y":1.25},
+                {"x":14, "y":1.25},
+
+                {"x":15.25, "y":1.25},
+                {"x":16.25, "y":1.25},
+                {"x":17.25, "y":1.25},
+
+                {"x":0, "y":2.25, "w":1.5},
+                {"x":1.5, "y":2.25},
+                {"x":2.5, "y":2.25},
+                {"x":3.5, "y":2.25},
+                {"x":4.5, "y":2.25},
+                {"x":5.5, "y":2.25},
+                {"x":6.5, "y":2.25},
+                {"x":7.5, "y":2.25},
+                {"x":8.5, "y":2.25},
+                {"x":9.5, "y":2.25},
+                {"x":10.5, "y":2.25},
+                {"x":11.5, "y":2.25},
+                {"x":12.5, "y":2.25},
+
+                {"x":15.25, "y":2.25},
+                {"x":16.25, "y":2.25},
+                {"x":17.25, "y":2.25},
+
+                {"x":0, "y":3.25, "w":1.75},
+                {"x":1.75, "y":3.25},
+                {"x":2.75, "y":3.25},
+                {"x":3.75, "y":3.25},
+                {"x":4.75, "y":3.25},
+                {"x":5.75, "y":3.25},
+                {"x":6.75, "y":3.25},
+                {"x":7.75, "y":3.25},
+                {"x":8.75, "y":3.25},
+                {"x":9.75, "y":3.25},
+                {"x":10.75, "y":3.25},
+                {"x":11.75, "y":3.25},
+                {"x":12.75, "y":3.25},
+                {"x":13.75, "y":2.25, "w":1.25, "h":2},
+
+                {"x":0, "y":4.25, "w":1.25},
+                {"x":1.25, "y":4.25},
+                {"x":2.25, "y":4.25},
+                {"x":3.25, "y":4.25},
+                {"x":4.25, "y":4.25},
+                {"x":5.25, "y":4.25},
+                {"x":6.25, "y":4.25},
+                {"x":7.25, "y":4.25},
+                {"x":8.25, "y":4.25},
+                {"x":9.25, "y":4.25},
+                {"x":10.25, "y":4.25},
+                {"x":11.25, "y":4.25},
+                {"x":12.25, "y":4.25, "w":1.75},
+                {"x":14, "y":4.25},
+
+                {"x":16.25, "y":4.25},
+
+                {"x":0, "y":5.25, "w":1.5},
+                {"x":2.5, "y":5.25, "w":1.5},
+                {"x":4, "y":5.25, "w":7},
+                {"x":11, "y":5.25, "w":1.5},
+                {"x":13.5, "y":5.25, "w":1.5},
+
+                {"x":15.25, "y":5.25},
+                {"x":16.25, "y":5.25},
+                {"x":17.25, "y":5.25}
+            ]
+        }
+    }
+}
diff --git a/layouts/default/tkl_f13_iso_wkl_split_bs_rshift/layout.json b/layouts/default/tkl_f13_iso_wkl_split_bs_rshift/layout.json
new file mode 100644
index 00000000000..a07a1307e77
--- /dev/null
+++ b/layouts/default/tkl_f13_iso_wkl_split_bs_rshift/layout.json
@@ -0,0 +1,6 @@
+[{a:7},"",{x:0.25},"","","","",{x:0.25},"","","","",{x:0.25},"","","","",{x:0.25},"",{x:0.25},"","",""],
+[{y:0.25},"","","","","","","","","","","","","","","",{x:0.25},"","",""],
+[{w:1.5},"","","","","","","","","","","","","",{x:0.25,w:1.25,h:2,w2:1.5,h2:1,x2:-0.25},"",{x:0.25},"","",""],
+[{w:1.75},"","","","","","","","","","","","",""],
+[{w:1.25},"","","","","","","","","","","","",{w:1.75},"","",{x:1.25},""],
+[{w:1.5},"",{x:1,w:1.5},"",{w:7},"",{w:1.5},"",{x:1,w:1.5},"",{x:0.25},"","",""]
diff --git a/layouts/default/tkl_f13_iso_wkl_split_bs_rshift/readme.md b/layouts/default/tkl_f13_iso_wkl_split_bs_rshift/readme.md
new file mode 100644
index 00000000000..a9059abfba2
--- /dev/null
+++ b/layouts/default/tkl_f13_iso_wkl_split_bs_rshift/readme.md
@@ -0,0 +1,3 @@
+# tkl_f13_iso_wkl_split_bs_rshift
+
+    LAYOUT_tkl_f13_iso_wkl_split_bs_rshift
diff --git a/layouts/default/tkl_f13_jis/info.json b/layouts/default/tkl_f13_jis/info.json
index 97f5bd3880e..20ff38f6117 100644
--- a/layouts/default/tkl_f13_jis/info.json
+++ b/layouts/default/tkl_f13_jis/info.json
@@ -55,7 +55,6 @@
                 {"x": 10.5, "y": 2.25},
                 {"x": 11.5, "y": 2.25},
                 {"x": 12.5, "y": 2.25},
-                {"x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
                 {"x": 15.25, "y": 2.25},
                 {"x": 16.25, "y": 2.25},
                 {"x": 17.25, "y": 2.25},
@@ -73,6 +72,7 @@
                 {"x": 10.75, "y": 3.25},
                 {"x": 11.75, "y": 3.25},
                 {"x": 12.75, "y": 3.25},
+                {"x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
 
                 {"x": 0, "y": 4.25, "w": 2.25},
                 {"x": 2.25, "y": 4.25},
diff --git a/layouts/default/tkl_iso_wkl/default_tkl_iso_wkl/keymap.c b/layouts/default/tkl_iso_wkl/default_tkl_iso_wkl/keymap.c
new file mode 100644
index 00000000000..940c968917b
--- /dev/null
+++ b/layouts/default/tkl_iso_wkl/default_tkl_iso_wkl/keymap.c
@@ -0,0 +1,32 @@
+// Copyright 2023 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /*
+     * ┌───┐   ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┐
+     * │Esc│   │F1 │F2 │F3 │F4 │ │F5 │F6 │F7 │F8 │ │F9 │F10│F11│F12│ │PSc│Scr│Pse│
+     * └───┘   └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┘
+     * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ ┌───┬───┬───┐
+     * │ ` │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │ Backsp│ │Ins│Hom│PgU│
+     * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ ├───┼───┼───┤
+     * │ Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ [ │ ] │     │ │Del│End│PgD│
+     * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ Ent│ └───┴───┴───┘
+     * │ Caps │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │ # │    │
+     * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤     ┌───┐
+     * │Shft│ \ │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │    Shift │     │ ↑ │
+     * ├────┴┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬───┬─────┤ ┌───┼───┼───┐
+     * │Ctrl │   │Alt  │                           │  Alt│   │ Ctrl│ │ ← │ ↓ │ → │
+     * └─────┘   └─────┴───────────────────────────┴─────┘   └─────┘ └───┴───┴───┘
+     */
+    [0] = LAYOUT_tkl_iso_wkl(
+        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,     KC_PSCR, KC_SCRL, KC_PAUS,
+
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,    KC_INS,  KC_HOME, KC_PGUP,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,             KC_DEL,  KC_END,  KC_PGDN,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,
+        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_UP,
+        KC_LCTL,          KC_LALT,                            KC_SPC,                                      KC_RALT,          KC_RCTL,    KC_LEFT, KC_DOWN, KC_RGHT
+    )
+};
diff --git a/layouts/default/tkl_iso_wkl/info.json b/layouts/default/tkl_iso_wkl/info.json
new file mode 100644
index 00000000000..07f3311296d
--- /dev/null
+++ b/layouts/default/tkl_iso_wkl/info.json
@@ -0,0 +1,106 @@
+{
+    "keyboard_name": "Tenkeyless ISO Windows keyless layout",
+    "url": "",
+    "maintainer": "qmk",
+    "layouts": {
+        "LAYOUT_tkl_iso_wkl": {
+            "layout": [
+                {"x":0, "y":0},
+                {"x":2, "y":0},
+                {"x":3, "y":0},
+                {"x":4, "y":0},
+                {"x":5, "y":0},
+                {"x":6.5, "y":0},
+                {"x":7.5, "y":0},
+                {"x":8.5, "y":0},
+                {"x":9.5, "y":0},
+                {"x":11, "y":0},
+                {"x":12, "y":0},
+                {"x":13, "y":0},
+                {"x":14, "y":0},
+
+                {"x":15.25, "y":0},
+                {"x":16.25, "y":0},
+                {"x":17.25, "y":0},
+
+                {"x":0, "y":1.25},
+                {"x":1, "y":1.25},
+                {"x":2, "y":1.25},
+                {"x":3, "y":1.25},
+                {"x":4, "y":1.25},
+                {"x":5, "y":1.25},
+                {"x":6, "y":1.25},
+                {"x":7, "y":1.25},
+                {"x":8, "y":1.25},
+                {"x":9, "y":1.25},
+                {"x":10, "y":1.25},
+                {"x":11, "y":1.25},
+                {"x":12, "y":1.25},
+                {"x":13, "y":1.25, "w":2},
+
+                {"x":15.25, "y":1.25},
+                {"x":16.25, "y":1.25},
+                {"x":17.25, "y":1.25},
+
+                {"x":0, "y":2.25, "w":1.5},
+                {"x":1.5, "y":2.25},
+                {"x":2.5, "y":2.25},
+                {"x":3.5, "y":2.25},
+                {"x":4.5, "y":2.25},
+                {"x":5.5, "y":2.25},
+                {"x":6.5, "y":2.25},
+                {"x":7.5, "y":2.25},
+                {"x":8.5, "y":2.25},
+                {"x":9.5, "y":2.25},
+                {"x":10.5, "y":2.25},
+                {"x":11.5, "y":2.25},
+                {"x":12.5, "y":2.25},
+
+                {"x":15.25, "y":2.25},
+                {"x":16.25, "y":2.25},
+                {"x":17.25, "y":2.25},
+
+                {"x":0, "y":3.25, "w":1.75},
+                {"x":1.75, "y":3.25},
+                {"x":2.75, "y":3.25},
+                {"x":3.75, "y":3.25},
+                {"x":4.75, "y":3.25},
+                {"x":5.75, "y":3.25},
+                {"x":6.75, "y":3.25},
+                {"x":7.75, "y":3.25},
+                {"x":8.75, "y":3.25},
+                {"x":9.75, "y":3.25},
+                {"x":10.75, "y":3.25},
+                {"x":11.75, "y":3.25},
+                {"x":12.75, "y":3.25},
+                {"x":13.75, "y":2.25, "w":1.25, "h":2},
+
+                {"x":0, "y":4.25, "w":1.25},
+                {"x":1.25, "y":4.25},
+                {"x":2.25, "y":4.25},
+                {"x":3.25, "y":4.25},
+                {"x":4.25, "y":4.25},
+                {"x":5.25, "y":4.25},
+                {"x":6.25, "y":4.25},
+                {"x":7.25, "y":4.25},
+                {"x":8.25, "y":4.25},
+                {"x":9.25, "y":4.25},
+                {"x":10.25, "y":4.25},
+                {"x":11.25, "y":4.25},
+                {"x":12.25, "y":4.25, "w":2.75},
+                
+                {"x":16.25, "y":4.25},
+
+                {"x":0, "y":5.25, "w":1.5},
+                {"x":2.5, "y":5.25, "w":1.5},
+                {"x":4, "y":5.25, "w":7},
+                {"x":11, "y":5.25, "w":1.5},
+                {"x":13.5, "y":5.25, "w":1.5},
+
+                {"x":15.25, "y":5.25},
+                {"x":16.25, "y":5.25},
+                {"x":17.25, "y":5.25}
+            ]
+        }
+    }
+}
diff --git a/layouts/default/tkl_iso_wkl/layout.json b/layouts/default/tkl_iso_wkl/layout.json
new file mode 100644
index 00000000000..8d51a4064da
--- /dev/null
+++ b/layouts/default/tkl_iso_wkl/layout.json
@@ -0,0 +1,6 @@
+[{a:7},"",{x:1},"","","","",{x:0.5},"","","","",{x:0.5},"","","","",{x:0.25},"","",""],
+[{y:0.25},"","","","","","","","","","","","","",{w:2},"",{x:0.25},"","",""],
+[{w:1.5},"","","","","","","","","","","","","",{x:0.25,w:1.25,h:2,w2:1.5,h2:1,x2:-0.25},"",{x:0.25},"","",""],
+[{w:1.75},"","","","","","","","","","","","",""],
+[{w:1.25},"","","","","","","","","","","","",{w:2.75},"",{x:1.25},""],
+[{w:1.5},"",{x:1,w:1.5},"",{w:7},"",{w:1.5},"",{x:1,w:1.5},"",{x:0.25},"","",""]
diff --git a/layouts/default/tkl_iso_wkl/readme.md b/layouts/default/tkl_iso_wkl/readme.md
new file mode 100644
index 00000000000..56fe1e91473
--- /dev/null
+++ b/layouts/default/tkl_iso_wkl/readme.md
@@ -0,0 +1,3 @@
+# tkl_iso_wkl
+
+    LAYOUT_tkl_iso_wkl
diff --git a/layouts/default/tkl_iso_wkl_split_bs_rshift/default_tkl_iso_wkl_split_bs_rshift/keymap.c b/layouts/default/tkl_iso_wkl_split_bs_rshift/default_tkl_iso_wkl_split_bs_rshift/keymap.c
new file mode 100644
index 00000000000..5b9474863bc
--- /dev/null
+++ b/layouts/default/tkl_iso_wkl_split_bs_rshift/default_tkl_iso_wkl_split_bs_rshift/keymap.c
@@ -0,0 +1,32 @@
+// Copyright 2023 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /*
+     * ┌───┐   ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┐
+     * │Esc│   │F1 │F2 │F3 │F4 │ │F5 │F6 │F7 │F8 │ │F9 │F10│F11│F12│ │PSc│Scr│Pse│
+     * └───┘   └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┘
+     * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ ┌───┬───┬───┐
+     * │ ` │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │Bsp│Bsp│ │Ins│Hom│PgU│
+     * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ ├───┼───┼───┤
+     * │ Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ [ │ ] │     │ │Del│End│PgD│
+     * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ Ent│ └───┴───┴───┘
+     * │ Caps │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │ # │    │
+     * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┬───┤     ┌───┐
+     * │Shft│ \ │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │ Shift│Sft│     │ ↑ │
+     * ├────┴┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬───┬─┴───┤ ┌───┼───┼───┐
+     * │Ctrl │   │Alt  │                           │  Alt│   │ Ctrl│ │ ← │ ↓ │ → │
+     * └─────┘   └─────┴───────────────────────────┴─────┘   └─────┘ └───┴───┴───┘
+     */
+    [0] = LAYOUT_tkl_iso_wkl_split_bs_rshift(
+        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_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_DEL,  KC_END,  KC_PGDN,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,
+        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_RSFT,                      KC_UP,
+        KC_LCTL,          KC_LALT,                            KC_SPC,                                      KC_RALT,          KC_RCTL,             KC_LEFT, KC_DOWN, KC_RGHT
+    )
+};
diff --git a/layouts/default/tkl_iso_wkl_split_bs_rshift/info.json b/layouts/default/tkl_iso_wkl_split_bs_rshift/info.json
new file mode 100644
index 00000000000..aa0ebce31ed
--- /dev/null
+++ b/layouts/default/tkl_iso_wkl_split_bs_rshift/info.json
@@ -0,0 +1,108 @@
+{
+    "keyboard_name": "Tenkeyless ISO Windows keyless layout with split Backspace and split Right Shift",
+    "url": "",
+    "maintainer": "qmk",
+    "layouts": {
+        "LAYOUT_tkl_iso_wkl_split_bs_rshift": {
+            "layout": [
+                {"x":0, "y":0},
+                {"x":2, "y":0},
+                {"x":3, "y":0},
+                {"x":4, "y":0},
+                {"x":5, "y":0},
+                {"x":6.5, "y":0},
+                {"x":7.5, "y":0},
+                {"x":8.5, "y":0},
+                {"x":9.5, "y":0},
+                {"x":11, "y":0},
+                {"x":12, "y":0},
+                {"x":13, "y":0},
+                {"x":14, "y":0},
+
+                {"x":15.25, "y":0},
+                {"x":16.25, "y":0},
+                {"x":17.25, "y":0},
+
+                {"x":0, "y":1.25},
+                {"x":1, "y":1.25},
+                {"x":2, "y":1.25},
+                {"x":3, "y":1.25},
+                {"x":4, "y":1.25},
+                {"x":5, "y":1.25},
+                {"x":6, "y":1.25},
+                {"x":7, "y":1.25},
+                {"x":8, "y":1.25},
+                {"x":9, "y":1.25},
+                {"x":10, "y":1.25},
+                {"x":11, "y":1.25},
+                {"x":12, "y":1.25},
+                {"x":13, "y":1.25},
+                {"x":14, "y":1.25},
+
+                {"x":15.25, "y":1.25},
+                {"x":16.25, "y":1.25},
+                {"x":17.25, "y":1.25},
+
+                {"x":0, "y":2.25, "w":1.5},
+                {"x":1.5, "y":2.25},
+                {"x":2.5, "y":2.25},
+                {"x":3.5, "y":2.25},
+                {"x":4.5, "y":2.25},
+                {"x":5.5, "y":2.25},
+                {"x":6.5, "y":2.25},
+                {"x":7.5, "y":2.25},
+                {"x":8.5, "y":2.25},
+                {"x":9.5, "y":2.25},
+                {"x":10.5, "y":2.25},
+                {"x":11.5, "y":2.25},
+                {"x":12.5, "y":2.25},
+
+                {"x":15.25, "y":2.25},
+                {"x":16.25, "y":2.25},
+                {"x":17.25, "y":2.25},
+
+                {"x":0, "y":3.25, "w":1.75},
+                {"x":1.75, "y":3.25},
+                {"x":2.75, "y":3.25},
+                {"x":3.75, "y":3.25},
+                {"x":4.75, "y":3.25},
+                {"x":5.75, "y":3.25},
+                {"x":6.75, "y":3.25},
+                {"x":7.75, "y":3.25},
+                {"x":8.75, "y":3.25},
+                {"x":9.75, "y":3.25},
+                {"x":10.75, "y":3.25},
+                {"x":11.75, "y":3.25},
+                {"x":12.75, "y":3.25},
+                {"x":13.75, "y":2.25, "w":1.25, "h":2},
+
+                {"x":0, "y":4.25, "w":1.25},
+                {"x":1.25, "y":4.25},
+                {"x":2.25, "y":4.25},
+                {"x":3.25, "y":4.25},
+                {"x":4.25, "y":4.25},
+                {"x":5.25, "y":4.25},
+                {"x":6.25, "y":4.25},
+                {"x":7.25, "y":4.25},
+                {"x":8.25, "y":4.25},
+                {"x":9.25, "y":4.25},
+                {"x":10.25, "y":4.25},
+                {"x":11.25, "y":4.25},
+                {"x":12.25, "y":4.25, "w":1.75},
+                {"x":14, "y":4.25},
+
+                {"x":16.25, "y":4.25},
+
+                {"x":0, "y":5.25, "w":1.5},
+                {"x":2.5, "y":5.25, "w":1.5},
+                {"x":4, "y":5.25, "w":7},
+                {"x":11, "y":5.25, "w":1.5},
+                {"x":13.5, "y":5.25, "w":1.5},
+
+                {"x":15.25, "y":5.25},
+                {"x":16.25, "y":5.25},
+                {"x":17.25, "y":5.25}
+            ]
+        }
+    }
+}
diff --git a/layouts/default/tkl_iso_wkl_split_bs_rshift/layout.json b/layouts/default/tkl_iso_wkl_split_bs_rshift/layout.json
new file mode 100644
index 00000000000..09c79e0f4a4
--- /dev/null
+++ b/layouts/default/tkl_iso_wkl_split_bs_rshift/layout.json
@@ -0,0 +1,6 @@
+[{a:7},"",{x:1},"","","","",{x:0.5},"","","","",{x:0.5},"","","","",{x:0.25},"","",""],
+[{y:0.25},"","","","","","","","","","","","","","","",{x:0.25},"","",""],
+[{w:1.5},"","","","","","","","","","","","","",{x:0.25,w:1.25,h:2,w2:1.5,h2:1,x2:-0.25},"",{x:0.25},"","",""],
+[{w:1.75},"","","","","","","","","","","","",""],
+[{w:1.25},"","","","","","","","","","","","",{w:1.75},"","",{x:1.25},""],
+[{w:1.5},"",{x:1,w:1.5},"",{w:7},"",{w:1.5},"",{x:1,w:1.5},"",{x:0.25},"","",""]
diff --git a/layouts/default/tkl_iso_wkl_split_bs_rshift/readme.md b/layouts/default/tkl_iso_wkl_split_bs_rshift/readme.md
new file mode 100644
index 00000000000..ec820424a5b
--- /dev/null
+++ b/layouts/default/tkl_iso_wkl_split_bs_rshift/readme.md
@@ -0,0 +1,3 @@
+# tkl_iso_wkl_split_bs_rshift
+
+    LAYOUT_tkl_iso_split_bs_rshift
diff --git a/layouts/default/tkl_jis/info.json b/layouts/default/tkl_jis/info.json
index 513852193a5..e1d16e2beb7 100644
--- a/layouts/default/tkl_jis/info.json
+++ b/layouts/default/tkl_jis/info.json
@@ -54,7 +54,6 @@
                 {"x": 10.5, "y": 2.25},
                 {"x": 11.5, "y": 2.25},
                 {"x": 12.5, "y": 2.25},
-                {"x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
                 {"x": 15.25, "y": 2.25},
                 {"x": 16.25, "y": 2.25},
                 {"x": 17.25, "y": 2.25},
@@ -72,6 +71,7 @@
                 {"x": 10.75, "y": 3.25},
                 {"x": 11.75, "y": 3.25},
                 {"x": 12.75, "y": 3.25},
+                {"x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
 
                 {"x": 0, "y": 4.25, "w": 2.25},
                 {"x": 2.25, "y": 4.25},
diff --git a/lib/python/qmk/cli/license_check.py b/lib/python/qmk/cli/license_check.py
index 4bda272ec9b..119a228c6d4 100644
--- a/lib/python/qmk/cli/license_check.py
+++ b/lib/python/qmk/cli/license_check.py
@@ -1,9 +1,9 @@
 # Copyright 2023 Nick Brassel (@tzarc)
 # SPDX-License-Identifier: GPL-2.0-or-later
 import re
-from pathlib import Path
 from milc import cli
 from qmk.constants import LICENSE_TEXTS
+from qmk.path import normpath
 
 L_PAREN = re.compile(r'\(\[\{\<')
 R_PAREN = re.compile(r'\)\]\}\>')
@@ -27,7 +27,45 @@ def _simplify_text(input):
     return ' '.join(lines)
 
 
-def _detect_license_from_file_contents(filename, absolute=False):
+def _preformat_license_texts():
+    # Pre-format all the licenses
+    for _, long_licenses in LICENSE_TEXTS:
+        for i in range(len(long_licenses)):
+            long_licenses[i] = _simplify_text(long_licenses[i])
+
+
+def _determine_suffix_condition(extensions):
+    def _default_suffix_condition(s):
+        return s in SUFFIXES
+
+    conditional = _default_suffix_condition
+
+    if extensions is not None and len(extensions) > 0:
+        suffixes = [f'.{s}' if not s.startswith('.') else s for s in extensions]
+
+        def _specific_suffix_condition(s):
+            return s in suffixes
+
+        conditional = _specific_suffix_condition
+
+    return conditional
+
+
+def _determine_file_list(inputs, conditional):
+    check_list = set()
+    for filename in inputs:
+        if filename.is_dir():
+            for file in sorted(filename.rglob('*')):
+                if file.is_file() and conditional(file.suffix):
+                    check_list.add(file)
+        elif filename.is_file():
+            if conditional(filename.suffix):
+                check_list.add(filename)
+
+    return list(sorted(check_list))
+
+
+def _detect_license_from_file_contents(filename, absolute=False, short=False):
     data = filename.read_text(encoding='utf-8', errors='ignore')
     filename_out = str(filename.absolute()) if absolute else str(filename)
 
@@ -42,13 +80,13 @@ def _detect_license_from_file_contents(filename, absolute=False):
                 break
 
         if not found:
-            if cli.args.short:
+            if short:
                 print(f'{filename_out} UNKNOWN')
             else:
                 cli.log.error(f'{{fg_cyan}}{filename_out}{{fg_reset}} -- unknown license, or no license detected!')
             return False
 
-        if cli.args.short:
+        if short:
             print(f'{filename_out} {license}')
         else:
             cli.log.info(f'{{fg_cyan}}{filename_out}{{fg_reset}} -- license detected: {license} (SPDX License Identifier)')
@@ -59,13 +97,13 @@ def _detect_license_from_file_contents(filename, absolute=False):
         for short_license, long_licenses in LICENSE_TEXTS:
             for long_license in long_licenses:
                 if long_license in simple_text:
-                    if cli.args.short:
+                    if short:
                         print(f'{filename_out} {short_license}')
                     else:
                         cli.log.info(f'{{fg_cyan}}{filename_out}{{fg_reset}} -- license detected: {short_license} (Full text)')
                     return True
 
-        if cli.args.short:
+        if short:
             print(f'{filename_out} UNKNOWN')
         else:
             cli.log.error(f'{{fg_cyan}}{filename_out}{{fg_reset}} -- unknown license, or no license detected!')
@@ -73,43 +111,20 @@ def _detect_license_from_file_contents(filename, absolute=False):
     return False
 
 
-@cli.argument('inputs', nargs='*', arg_only=True, type=Path, help='List of input files or directories.')
+@cli.argument('inputs', nargs='*', arg_only=True, type=normpath, help='List of input files or directories.')
 @cli.argument('-s', '--short', action='store_true', help='Short output.')
 @cli.argument('-a', '--absolute', action='store_true', help='Print absolute paths.')
 @cli.argument('-e', '--extension', arg_only=True, action='append', default=[], help='Override list of extensions. Can be specified multiple times for multiple extensions.')
 @cli.subcommand('File license check.', hidden=False if cli.config.user.developer else True)
 def license_check(cli):
-    def _default_suffix_condition(s):
-        return s in SUFFIXES
+    _preformat_license_texts()
 
-    conditional = _default_suffix_condition
-
-    if len(cli.args.extension) > 0:
-        suffixes = [f'.{s}' if not s.startswith('.') else s for s in cli.args.extension]
-
-        def _specific_suffix_condition(s):
-            return s in suffixes
-
-        conditional = _specific_suffix_condition
-
-    # Pre-format all the licenses
-    for _, long_licenses in LICENSE_TEXTS:
-        for i in range(len(long_licenses)):
-            long_licenses[i] = _simplify_text(long_licenses[i])
-
-    check_list = set()
-    for filename in sorted(cli.args.inputs):
-        if filename.is_dir():
-            for file in sorted(filename.rglob('*')):
-                if file.is_file() and conditional(file.suffix):
-                    check_list.add(file)
-        elif filename.is_file():
-            if conditional(filename.suffix):
-                check_list.add(filename)
+    conditional = _determine_suffix_condition(cli.args.extension)
+    check_list = _determine_file_list(cli.args.inputs, conditional)
 
     failed = False
     for filename in sorted(check_list):
-        if not _detect_license_from_file_contents(filename, absolute=cli.args.absolute):
+        if not _detect_license_from_file_contents(filename, absolute=cli.args.absolute, short=cli.args.short):
             failed = True
 
     if failed:
diff --git a/lib/python/qmk/cli/lint.py b/lib/python/qmk/cli/lint.py
index 7ebb0cf9c45..ba0c3f274cf 100644
--- a/lib/python/qmk/cli/lint.py
+++ b/lib/python/qmk/cli/lint.py
@@ -6,9 +6,9 @@ from milc import cli
 
 from qmk.decorators import automagic_keyboard, automagic_keymap
 from qmk.info import info_json
-from qmk.keyboard import keyboard_completer, list_keyboards
+from qmk.keyboard import keyboard_completer, keyboard_folder_or_all, is_all_keyboards, list_keyboards
 from qmk.keymap import locate_keymap, list_keymaps
-from qmk.path import is_keyboard, keyboard
+from qmk.path import keyboard
 from qmk.git import git_get_ignored_files
 from qmk.c_parse import c_source_files
 
@@ -198,39 +198,34 @@ def keyboard_check(kb):
 
 
 @cli.argument('--strict', action='store_true', help='Treat warnings as errors')
-@cli.argument('-kb', '--keyboard', completer=keyboard_completer, help='Comma separated list of keyboards to check')
+@cli.argument('-kb', '--keyboard', action='append', type=keyboard_folder_or_all, completer=keyboard_completer, help='Keyboard to check. May be passed multiple times.')
 @cli.argument('-km', '--keymap', help='The keymap to check')
-@cli.argument('--all-kb', action='store_true', arg_only=True, help='Check all keyboards')
-@cli.argument('--all-km', action='store_true', arg_only=True, help='Check all keymaps')
 @cli.subcommand('Check keyboard and keymap for common mistakes.')
 @automagic_keyboard
 @automagic_keymap
 def lint(cli):
     """Check keyboard and keymap for common mistakes.
     """
-    failed = []
-
     # Determine our keyboard list
-    if cli.args.all_kb:
-        if cli.args.keyboard:
-            cli.log.warning('Both --all-kb and --keyboard passed, --all-kb takes precedence.')
-
-        keyboard_list = list_keyboards()
-    elif not cli.config.lint.keyboard:
-        cli.log.error('Missing required arguments: --keyboard or --all-kb')
+    if not cli.config.lint.keyboard:
+        cli.log.error('Missing required arguments: --keyboard')
         cli.print_help()
         return False
+
+    if isinstance(cli.config.lint.keyboard, str):
+        # if provided via config - string not array
+        keyboard_list = [cli.config.lint.keyboard]
+    elif is_all_keyboards(cli.args.keyboard[0]):
+        keyboard_list = list_keyboards()
     else:
-        keyboard_list = cli.config.lint.keyboard.split(',')
+        keyboard_list = cli.config.lint.keyboard
+
+    failed = []
 
     # Lint each keyboard
     for kb in keyboard_list:
-        if not is_keyboard(kb):
-            cli.log.error('No such keyboard: %s', kb)
-            continue
-
         # Determine keymaps to also check
-        if cli.args.all_km:
+        if cli.args.keymap == 'all':
             keymaps = list_keymaps(kb)
         elif cli.config.lint.keymap:
             keymaps = {cli.config.lint.keymap}
diff --git a/lib/python/qmk/keyboard.py b/lib/python/qmk/keyboard.py
index 0fcc2e868d1..fcf5b5b1588 100644
--- a/lib/python/qmk/keyboard.py
+++ b/lib/python/qmk/keyboard.py
@@ -99,6 +99,8 @@ def find_keyboard_from_dir():
             keymap_index = len(current_path.parts) - current_path.parts.index('keymaps') - 1
             current_path = current_path.parents[keymap_index]
 
+        current_path = resolve_keyboard(current_path)
+
         if qmk.path.is_keyboard(current_path):
             return str(current_path)
 
diff --git a/platforms/avr/drivers/ws2812_i2c.c b/platforms/avr/drivers/ws2812_i2c.c
index 60b466c32a9..86a5ac8394e 100644
--- a/platforms/avr/drivers/ws2812_i2c.c
+++ b/platforms/avr/drivers/ws2812_i2c.c
@@ -1,7 +1,7 @@
 #include "ws2812.h"
 #include "i2c_master.h"
 
-#ifdef RGBW
+#ifdef WS2812_RGBW
 #    error "RGBW not supported"
 #endif
 
diff --git a/platforms/chibios/drivers/vendor/RP/RP2040/ws2812_vendor.c b/platforms/chibios/drivers/vendor/RP/RP2040/ws2812_vendor.c
index 95a827e4b8a..41a5311719f 100644
--- a/platforms/chibios/drivers/vendor/RP/RP2040/ws2812_vendor.c
+++ b/platforms/chibios/drivers/vendor/RP/RP2040/ws2812_vendor.c
@@ -161,7 +161,7 @@ static void ws2812_dma_callback(void* p, uint32_t ct) {
     // FIFO is already empty.
     rtcnt_t time_to_completion = (pio_sm_get_tx_fifo_level(pio, STATE_MACHINE) + 1) * MAX(WS2812_T1H + WS2812_T1L, WS2812_T0H + WS2812_T0L);
 
-#if defined(RGBW)
+#if defined(WS2812_RGBW)
     time_to_completion *= 32;
 #else
     time_to_completion *= 24;
@@ -222,7 +222,7 @@ void ws2812_init(void) {
     sm_config_set_sideset(&config, 1, false, false);
 #endif
 
-#if defined(RGBW)
+#if defined(WS2812_RGBW)
     sm_config_set_out_shift(&config, false, true, 32);
 #else
     sm_config_set_out_shift(&config, false, true, 24);
@@ -270,7 +270,7 @@ void ws2812_setleds(rgb_led_t* ledarray, uint16_t leds) {
     sync_ws2812_transfer();
 
     for (int i = 0; i < leds; i++) {
-#if defined(RGBW)
+#if defined(WS2812_RGBW)
         WS2812_BUFFER[i] = rgbw8888_to_u32(ledarray[i].r, ledarray[i].g, ledarray[i].b, ledarray[i].w);
 #else
         WS2812_BUFFER[i] = rgbw8888_to_u32(ledarray[i].r, ledarray[i].g, ledarray[i].b, 0);
diff --git a/platforms/chibios/drivers/ws2812_bitbang.c b/platforms/chibios/drivers/ws2812_bitbang.c
index 9ed6bacd5ad..96378ec0ac5 100644
--- a/platforms/chibios/drivers/ws2812_bitbang.c
+++ b/platforms/chibios/drivers/ws2812_bitbang.c
@@ -101,7 +101,7 @@ void ws2812_setleds(rgb_led_t *ledarray, uint16_t leds) {
         sendByte(ledarray[i].r);
 #endif
 
-#ifdef RGBW
+#ifdef WS2812_RGBW
         sendByte(ledarray[i].w);
 #endif
     }
diff --git a/platforms/chibios/drivers/ws2812_pwm.c b/platforms/chibios/drivers/ws2812_pwm.c
index 7dc3414eade..1e9d2ebb410 100644
--- a/platforms/chibios/drivers/ws2812_pwm.c
+++ b/platforms/chibios/drivers/ws2812_pwm.c
@@ -16,7 +16,7 @@
 
 /* Adapted from https://github.com/joewa/WS2812-LED-Driver_ChibiOS/ */
 
-#ifdef RGBW
+#ifdef WS2812_RGBW
 #    define WS2812_CHANNELS 4
 #else
 #    define WS2812_CHANNELS 3
@@ -262,7 +262,7 @@
 #    define WS2812_BLUE_BIT(led, bit) WS2812_BIT((led), 0, (bit))
 #endif
 
-#ifdef RGBW
+#ifdef WS2812_RGBW
 /**
  * @brief   Determine the index in @ref ws2812_frame_buffer "the frame buffer" of a given white bit
  *
@@ -381,7 +381,7 @@ void ws2812_write_led_rgbw(uint16_t led_number, uint8_t r, uint8_t g, uint8_t b,
         ws2812_frame_buffer[WS2812_RED_BIT(led_number, bit)]   = ((r >> bit) & 0x01) ? WS2812_DUTYCYCLE_1 : WS2812_DUTYCYCLE_0;
         ws2812_frame_buffer[WS2812_GREEN_BIT(led_number, bit)] = ((g >> bit) & 0x01) ? WS2812_DUTYCYCLE_1 : WS2812_DUTYCYCLE_0;
         ws2812_frame_buffer[WS2812_BLUE_BIT(led_number, bit)]  = ((b >> bit) & 0x01) ? WS2812_DUTYCYCLE_1 : WS2812_DUTYCYCLE_0;
-#ifdef RGBW
+#ifdef WS2812_RGBW
         ws2812_frame_buffer[WS2812_WHITE_BIT(led_number, bit)] = ((w >> bit) & 0x01) ? WS2812_DUTYCYCLE_1 : WS2812_DUTYCYCLE_0;
 #endif
     }
@@ -390,7 +390,7 @@ void ws2812_write_led_rgbw(uint16_t led_number, uint8_t r, uint8_t g, uint8_t b,
 // Setleds for standard RGB
 void ws2812_setleds(rgb_led_t* ledarray, uint16_t leds) {
     for (uint16_t i = 0; i < leds; i++) {
-#ifdef RGBW
+#ifdef WS2812_RGBW
         ws2812_write_led_rgbw(i, ledarray[i].r, ledarray[i].g, ledarray[i].b, ledarray[i].w);
 #else
         ws2812_write_led(i, ledarray[i].r, ledarray[i].g, ledarray[i].b);
diff --git a/platforms/chibios/drivers/ws2812_spi.c b/platforms/chibios/drivers/ws2812_spi.c
index 5b990ccaa06..ad2e87781c4 100644
--- a/platforms/chibios/drivers/ws2812_spi.c
+++ b/platforms/chibios/drivers/ws2812_spi.c
@@ -76,7 +76,7 @@
 #endif
 
 #define BYTES_FOR_LED_BYTE 4
-#ifdef RGBW
+#ifdef WS2812_RGBW
 #    define WS2812_CHANNELS 4
 #else
 #    define WS2812_CHANNELS 3
@@ -131,7 +131,7 @@ static void set_led_color_rgb(rgb_led_t color, int pos) {
     for (int j = 0; j < 4; j++)
         tx_start[BYTES_FOR_LED * pos + BYTES_FOR_LED_BYTE * 2 + j] = get_protocol_eq(color.r, j);
 #endif
-#ifdef RGBW
+#ifdef WS2812_RGBW
     for (int j = 0; j < 4; j++)
         tx_start[BYTES_FOR_LED * pos + BYTES_FOR_LED_BYTE * 4 + j] = get_protocol_eq(color.w, j);
 #endif
diff --git a/quantum/color.c b/quantum/color.c
index 395383f428e..96d548a33cc 100644
--- a/quantum/color.c
+++ b/quantum/color.c
@@ -109,7 +109,7 @@ RGB hsv_to_rgb_nocie(HSV hsv) {
     return hsv_to_rgb_impl(hsv, false);
 }
 
-#ifdef RGBW
+#ifdef WS2812_RGBW
 void convert_rgb_to_rgbw(rgb_led_t *led) {
     // Determine lowest value in all three colors, put that into
     // the white channel and then shift all colors by that amount
diff --git a/quantum/color.h b/quantum/color.h
index 00a3bfb3f84..b6a9dd0641c 100644
--- a/quantum/color.h
+++ b/quantum/color.h
@@ -96,7 +96,7 @@ typedef struct PACKED rgb_led_t {
     uint8_t g;
     uint8_t r;
 #endif
-#ifdef RGBW
+#ifdef WS2812_RGBW
     uint8_t w;
 #endif
 } rgb_led_t;
@@ -111,6 +111,6 @@ typedef struct PACKED HSV {
 
 RGB hsv_to_rgb(HSV hsv);
 RGB hsv_to_rgb_nocie(HSV hsv);
-#ifdef RGBW
+#ifdef WS2812_RGBW
 void convert_rgb_to_rgbw(rgb_led_t *led);
 #endif
diff --git a/quantum/encoder.c b/quantum/encoder.c
index 0a48ac9a07b..2ddbf3ee1e0 100644
--- a/quantum/encoder.c
+++ b/quantum/encoder.c
@@ -83,7 +83,7 @@ bool encoder_task(void) {
 }
 
 bool encoder_queue_full_advanced(encoder_events_t *events) {
-    return events->head == (events->tail - 1) % MAX_QUEUED_ENCODER_EVENTS;
+    return events->tail == (events->head + 1) % MAX_QUEUED_ENCODER_EVENTS;
 }
 
 bool encoder_queue_full(void) {
diff --git a/quantum/keymap_extras/keymap_czech_mac_ansi.h b/quantum/keymap_extras/keymap_czech_mac_ansi.h
new file mode 100644
index 00000000000..ac2f078d980
--- /dev/null
+++ b/quantum/keymap_extras/keymap_czech_mac_ansi.h
@@ -0,0 +1,162 @@
+// Copyright 2024 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+/*******************************************************************************
+  88888888888 888      d8b                .d888 d8b 888               d8b
+      888     888      Y8P               d88P"  Y8P 888               Y8P
+      888     888                        888        888
+      888     88888b.  888 .d8888b       888888 888 888  .d88b.       888 .d8888b
+      888     888 "88b 888 88K           888    888 888 d8P  Y8b      888 88K
+      888     888  888 888 "Y8888b.      888    888 888 88888888      888 "Y8888b.
+      888     888  888 888      X88      888    888 888 Y8b.          888      X88
+      888     888  888 888  88888P'      888    888 888  "Y8888       888  88888P'
+                                                        888                 888
+                                                        888                 888
+                                                        888                 888
+     .d88b.   .d88b.  88888b.   .d88b.  888d888 8888b.  888888 .d88b.   .d88888
+    d88P"88b d8P  Y8b 888 "88b d8P  Y8b 888P"      "88b 888   d8P  Y8b d88" 888
+    888  888 88888888 888  888 88888888 888    .d888888 888   88888888 888  888
+    Y88b 888 Y8b.     888  888 Y8b.     888    888  888 Y88b. Y8b.     Y88b 888
+     "Y88888  "Y8888  888  888  "Y8888  888    "Y888888  "Y888 "Y8888   "Y88888
+         888
+    Y8b d88P
+     "Y88P"
+*******************************************************************************/
+
+#pragma once
+#include "keycodes.h"
+// clang-format off
+
+// Aliases
+#define CZ_BSLS KC_GRV  // (backslash)
+#define CZ_PLUS KC_1    // +
+#define CZ_ECAR KC_2    // ě
+#define CZ_SCAR KC_3    // š
+#define CZ_CCAR KC_4    // č
+#define CZ_RCAR KC_5    // ř
+#define CZ_ZCAR KC_6    // ž
+#define CZ_YACU KC_7    // ý
+#define CZ_AACU KC_8    // á
+#define CZ_IACU KC_9    // í
+#define CZ_EACU KC_0    // é
+#define CZ_EQL  KC_MINS // =
+#define CZ_ACUT KC_EQL  // ' (dead)
+#define CZ_Q    KC_Q    // Q
+#define CZ_W    KC_W    // W
+#define CZ_E    KC_E    // E
+#define CZ_R    KC_R    // R
+#define CZ_T    KC_T    // T
+#define CZ_Z    KC_Y    // Z
+#define CZ_U    KC_U    // U
+#define CZ_I    KC_I    // I
+#define CZ_O    KC_O    // O
+#define CZ_P    KC_P    // P
+#define CZ_UACU KC_LBRC // ú
+#define CZ_RPRN KC_RBRC // )
+#define CZ_DIAE KC_NUHS // ¨ (dead)
+#define CZ_A    KC_A    // A
+#define CZ_S    KC_S    // S
+#define CZ_D    KC_D    // D
+#define CZ_F    KC_F    // F
+#define CZ_G    KC_G    // G
+#define CZ_H    KC_H    // H
+#define CZ_J    KC_J    // J
+#define CZ_K    KC_K    // K
+#define CZ_L    KC_L    // L
+#define CZ_URNG KC_SCLN // ů
+#define CZ_SECT KC_QUOT // §
+#define CZ_Y    KC_Z    // Y
+#define CZ_X    KC_X    // X
+#define CZ_C    KC_C    // C
+#define CZ_V    KC_V    // V
+#define CZ_B    KC_B    // B
+#define CZ_N    KC_N    // N
+#define CZ_M    KC_M    // M
+#define CZ_COMM KC_COMM // ,
+#define CZ_DOT  KC_DOT  // .
+#define CZ_MINS KC_SLSH // -
+#define CZ_PIPE S(CZ_BSLS) // |
+#define CZ_1    S(CZ_PLUS) // 1
+#define CZ_2    S(CZ_ECAR) // 2
+#define CZ_3    S(CZ_SCAR) // 3
+#define CZ_4    S(CZ_CCAR) // 4
+#define CZ_5    S(CZ_RCAR) // 5
+#define CZ_6    S(CZ_ZCAR) // 6
+#define CZ_7    S(CZ_YACU) // 7
+#define CZ_8    S(CZ_AACU) // 8
+#define CZ_9    S(CZ_IACU) // 9
+#define CZ_0    S(CZ_EACU) // 0
+#define CZ_PERC S(CZ_EQL)  // %
+#define CZ_CARN S(CZ_ACUT) // ˇ (dead)
+#define CZ_SLSH S(CZ_UACU) // /
+#define CZ_LPRN S(CZ_RPRN) // (
+#define CZ_GRV  S(CZ_DIAE) // `
+#define CZ_DQUO S(CZ_URNG) // "
+#define CZ_EXLM S(CZ_SECT) // !
+#define CZ_QUES S(CZ_COMM) // ?
+#define CZ_COLN S(CZ_DOT)  // :
+#define CZ_UNDS S(CZ_MINS) // _
+#define CZ_AT   A(CZ_ECAR) // @
+#define CZ_HASH A(CZ_SCAR) // #
+#define CZ_DLR  A(CZ_CCAR) // $
+#define CZ_TILD A(CZ_RCAR) // ~
+#define CZ_CIRC A(CZ_ZCAR) // ^
+#define CZ_AMPR A(CZ_YACU) // &
+#define CZ_ASTR A(CZ_AACU) // *
+#define CZ_LCBR A(CZ_IACU) // {
+#define CZ_RCBR A(CZ_EACU) // }
+#define CZ_RNGA A(CZ_EQL)  // ° (dead)
+#define CZ_DCIR A(CZ_ACUT) // ^ (dead)
+#define CZ_LEDT A(CZ_W)    // ė
+#define CZ_LEOG A(CZ_E)    // ę
+#define CZ_EURO A(CZ_R)    // €
+#define CZ_LZDT A(CZ_Z)    // ż
+#define CZ_LBRC A(CZ_UACU) // [
+#define CZ_RBRC A(CZ_RPRN) // ]
+#define CZ_LAOG A(CZ_A)    // ą
+#define CZ_SS   A(CZ_S)    // ß
+#define CZ_PDIF A(CZ_D)    // ∂
+#define CZ_LSQU A(CZ_H)    // ‘
+#define CZ_RSQU A(CZ_J)    // ’
+#define CZ_LLST A(CZ_L)    // ł
+#define CZ_SCLN A(CZ_URNG) // ;
+#define CZ_QUOT A(CZ_SECT) // '
+#define CZ_SLQU A(CZ_N)    // ‚
+#define CZ_LABK A(CZ_COMM) // <
+#define CZ_RABK A(CZ_DOT)  // >
+#define CZ_NDSH A(CZ_MINS) // –
+#define CZ_NOT  S(A(CZ_1))    // ¬
+#define CZ_BULT S(A(CZ_2))    // •
+#define CZ_NEQL S(A(CZ_3))    // ≠
+#define CZ_PND  S(A(CZ_4))    // £
+#define CZ_LOZN S(A(CZ_5))    // ◊
+#define CZ_DAGG S(A(CZ_6))    // †
+#define CZ_PARA S(A(CZ_7))    // ¶
+#define CZ_DIV  S(A(CZ_8))    // ÷
+#define CZ_LDAQ S(A(CZ_9))    // «
+#define CZ_RDAQ S(A(CZ_0))    // »
+#define CZ_DCOM S(A(CZ_EQL))  // , (dead)
+#define CZ_DHPN S(A(CZ_ACUT)) // - (dead)
+#define CZ_CEDT S(A(CZ_W))    // Ė
+#define CZ_CEOG S(A(CZ_E))    // Ę
+#define CZ_REGD S(A(CZ_R))    // ®
+#define CZ_TM   S(A(CZ_T))    // ™
+#define CZ_CZDT S(A(CZ_Z))    // Ż
+#define CZ_LSAQ S(A(CZ_UACU)) // ‹
+#define CZ_RSAQ S(A(CZ_RPRN)) // ›
+#define CZ_DDQT S(A(CZ_DIAE)) // " (dead)
+#define CZ_CAOG S(A(CZ_A))    // Ą
+#define CZ_NARS S(A(CZ_S))    // ∑
+#define CZ_INCR S(A(CZ_D))    // ∆
+#define CZ_LDQU S(A(CZ_H))    // “
+#define CZ_RDQU S(A(CZ_J))    // ”
+#define CZ_CLST S(A(CZ_L))    // Ł
+#define CZ_ELLP S(A(CZ_URNG)) // …
+#define CZ_DTIL S(A(CZ_SECT)) // ~ (dead)
+#define CZ_COPY S(A(CZ_C))    // ©
+#define CZ_SQRT S(A(CZ_V))    // √
+#define CZ_DLQU S(A(CZ_N))    // „
+#define CZ_LEQL S(A(CZ_COMM)) // ≤
+#define CZ_GEQL S(A(CZ_DOT))  // ≥
+#define CZ_MDSH S(A(CZ_MINS)) // —
+
diff --git a/quantum/keymap_extras/keymap_czech_mac_iso.h b/quantum/keymap_extras/keymap_czech_mac_iso.h
new file mode 100644
index 00000000000..4b56e15df13
--- /dev/null
+++ b/quantum/keymap_extras/keymap_czech_mac_iso.h
@@ -0,0 +1,162 @@
+// Copyright 2024 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+/*******************************************************************************
+  88888888888 888      d8b                .d888 d8b 888               d8b
+      888     888      Y8P               d88P"  Y8P 888               Y8P
+      888     888                        888        888
+      888     88888b.  888 .d8888b       888888 888 888  .d88b.       888 .d8888b
+      888     888 "88b 888 88K           888    888 888 d8P  Y8b      888 88K
+      888     888  888 888 "Y8888b.      888    888 888 88888888      888 "Y8888b.
+      888     888  888 888      X88      888    888 888 Y8b.          888      X88
+      888     888  888 888  88888P'      888    888 888  "Y8888       888  88888P'
+                                                        888                 888
+                                                        888                 888
+                                                        888                 888
+     .d88b.   .d88b.  88888b.   .d88b.  888d888 8888b.  888888 .d88b.   .d88888
+    d88P"88b d8P  Y8b 888 "88b d8P  Y8b 888P"      "88b 888   d8P  Y8b d88" 888
+    888  888 88888888 888  888 88888888 888    .d888888 888   88888888 888  888
+    Y88b 888 Y8b.     888  888 Y8b.     888    888  888 Y88b. Y8b.     Y88b 888
+     "Y88888  "Y8888  888  888  "Y8888  888    "Y888888  "Y888 "Y8888   "Y88888
+         888
+    Y8b d88P
+     "Y88P"
+*******************************************************************************/
+
+#pragma once
+#include "keycodes.h"
+// clang-format off
+
+// Aliases
+#define CZ_PLUS KC_1    // +
+#define CZ_ECAR KC_2    // ě
+#define CZ_SCAR KC_3    // š
+#define CZ_CCAR KC_4    // č
+#define CZ_RCAR KC_5    // ř
+#define CZ_ZCAR KC_6    // ž
+#define CZ_YACU KC_7    // ý
+#define CZ_AACU KC_8    // á
+#define CZ_IACU KC_9    // í
+#define CZ_EACU KC_0    // é
+#define CZ_EQL  KC_MINS // =
+#define CZ_ACUT KC_EQL  // ' (dead)
+#define CZ_Q    KC_Q    // Q
+#define CZ_W    KC_W    // W
+#define CZ_E    KC_E    // E
+#define CZ_R    KC_R    // R
+#define CZ_T    KC_T    // T
+#define CZ_Z    KC_Y    // Z
+#define CZ_U    KC_U    // U
+#define CZ_I    KC_I    // I
+#define CZ_O    KC_O    // O
+#define CZ_P    KC_P    // P
+#define CZ_UACU KC_LBRC // ú
+#define CZ_RPRN KC_RBRC // )
+#define CZ_A    KC_A    // A
+#define CZ_S    KC_S    // S
+#define CZ_D    KC_D    // D
+#define CZ_F    KC_F    // F
+#define CZ_G    KC_G    // G
+#define CZ_H    KC_H    // H
+#define CZ_J    KC_J    // J
+#define CZ_K    KC_K    // K
+#define CZ_L    KC_L    // L
+#define CZ_URNG KC_SCLN // ů
+#define CZ_SECT KC_QUOT // §
+#define CZ_DIAE KC_NUHS // ¨ (dead)
+#define CZ_BSLS KC_NUBS // (backslash)
+#define CZ_Y    KC_Z    // Y
+#define CZ_X    KC_X    // X
+#define CZ_C    KC_C    // C
+#define CZ_V    KC_V    // V
+#define CZ_B    KC_B    // B
+#define CZ_N    KC_N    // N
+#define CZ_M    KC_M    // M
+#define CZ_COMM KC_COMM // ,
+#define CZ_DOT  KC_DOT  // .
+#define CZ_MINS KC_SLSH // -
+#define CZ_1    S(CZ_PLUS) // 1
+#define CZ_2    S(CZ_ECAR) // 2
+#define CZ_3    S(CZ_SCAR) // 3
+#define CZ_4    S(CZ_CCAR) // 4
+#define CZ_5    S(CZ_RCAR) // 5
+#define CZ_6    S(CZ_ZCAR) // 6
+#define CZ_7    S(CZ_YACU) // 7
+#define CZ_8    S(CZ_AACU) // 8
+#define CZ_9    S(CZ_IACU) // 9
+#define CZ_0    S(CZ_EACU) // 0
+#define CZ_PERC S(CZ_EQL)  // %
+#define CZ_CARN S(CZ_ACUT) // ˇ (dead)
+#define CZ_SLSH S(CZ_UACU) // /
+#define CZ_LPRN S(CZ_RPRN) // (
+#define CZ_DQUO S(CZ_URNG) // "
+#define CZ_EXLM S(CZ_SECT) // !
+#define CZ_GRV  S(CZ_DIAE) // `
+#define CZ_PIPE S(CZ_BSLS) // |
+#define CZ_QUES S(CZ_COMM) // ?
+#define CZ_COLN S(CZ_DOT)  // :
+#define CZ_UNDS S(CZ_MINS) // _
+#define CZ_AT   A(CZ_ECAR) // @
+#define CZ_HASH A(CZ_SCAR) // #
+#define CZ_DLR  A(CZ_CCAR) // $
+#define CZ_TILD A(CZ_RCAR) // ~
+#define CZ_CIRC A(CZ_ZCAR) // ^
+#define CZ_AMPR A(CZ_YACU) // &
+#define CZ_ASTR A(CZ_AACU) // *
+#define CZ_LCBR A(CZ_IACU) // {
+#define CZ_RCBR A(CZ_EACU) // }
+#define CZ_RNGA A(CZ_EQL)  // ° (dead)
+#define CZ_DCIR A(CZ_ACUT) // ^ (dead)
+#define CZ_LEDT A(CZ_W)    // ė
+#define CZ_LEOG A(CZ_E)    // ę
+#define CZ_EURO A(CZ_R)    // €
+#define CZ_LZDT A(CZ_Z)    // ż
+#define CZ_LBRC A(CZ_UACU) // [
+#define CZ_RBRC A(CZ_RPRN) // ]
+#define CZ_LAOG A(CZ_A)    // ą
+#define CZ_SS   A(CZ_S)    // ß
+#define CZ_PDIF A(CZ_D)    // ∂
+#define CZ_LSQU A(CZ_H)    // ‘
+#define CZ_RSQU A(CZ_J)    // ’
+#define CZ_LLST A(CZ_L)    // ł
+#define CZ_SCLN A(CZ_URNG) // ;
+#define CZ_QUOT A(CZ_SECT) // '
+#define CZ_SLQU A(CZ_N)    // ‚
+#define CZ_LABK A(CZ_COMM) // <
+#define CZ_RABK A(CZ_DOT)  // >
+#define CZ_NDSH A(CZ_MINS) // –
+#define CZ_NOT  S(A(CZ_1))    // ¬
+#define CZ_BULT S(A(CZ_2))    // •
+#define CZ_NEQL S(A(CZ_3))    // ≠
+#define CZ_PND  S(A(CZ_4))    // £
+#define CZ_LOZN S(A(CZ_5))    // ◊
+#define CZ_DAGG S(A(CZ_6))    // †
+#define CZ_PARA S(A(CZ_7))    // ¶
+#define CZ_DIV  S(A(CZ_8))    // ÷
+#define CZ_LDAQ S(A(CZ_9))    // «
+#define CZ_RDAQ S(A(CZ_0))    // »
+#define CZ_DCOM S(A(CZ_EQL))  // , (dead)
+#define CZ_DHPN S(A(CZ_ACUT)) // - (dead)
+#define CZ_CEDT S(A(CZ_W))    // Ė
+#define CZ_CEOG S(A(CZ_E))    // Ę
+#define CZ_REGD S(A(CZ_R))    // ®
+#define CZ_TM   S(A(CZ_T))    // ™
+#define CZ_CZDT S(A(CZ_Z))    // Ż
+#define CZ_LSAQ S(A(CZ_UACU)) // ‹
+#define CZ_RSAQ S(A(CZ_RPRN)) // ›
+#define CZ_CAOG S(A(CZ_A))    // Ą
+#define CZ_NARS S(A(CZ_S))    // ∑
+#define CZ_INCR S(A(CZ_D))    // ∆
+#define CZ_LDQU S(A(CZ_H))    // “
+#define CZ_RDQU S(A(CZ_J))    // ”
+#define CZ_CLST S(A(CZ_L))    // Ł
+#define CZ_ELLP S(A(CZ_URNG)) // …
+#define CZ_DTIL S(A(CZ_SECT)) // ~ (dead)
+#define CZ_DDQT S(A(CZ_DIAE)) // " (dead)
+#define CZ_COPY S(A(CZ_C))    // ©
+#define CZ_SQRT S(A(CZ_V))    // √
+#define CZ_DLQU S(A(CZ_N))    // „
+#define CZ_LEQL S(A(CZ_COMM)) // ≤
+#define CZ_GEQL S(A(CZ_DOT))  // ≥
+#define CZ_MDSH S(A(CZ_MINS)) // —
+
diff --git a/quantum/keymap_extras/sendstring_czech_mac_ansi.h b/quantum/keymap_extras/sendstring_czech_mac_ansi.h
new file mode 100644
index 00000000000..a60faa3237b
--- /dev/null
+++ b/quantum/keymap_extras/sendstring_czech_mac_ansi.h
@@ -0,0 +1,120 @@
+/* Copyright 2024 Tabonx
+ *
+ * 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/>.
+ */
+
+// Sendstring lookup tables for macOS Czech ANSI layouts
+
+#pragma once
+
+#include "keymap_czech_mac_ansi.h"
+#include "send_string.h"
+
+// clang-format off
+
+const uint8_t ascii_to_shift_lut[16] PROGMEM = {
+    KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0),
+    KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0),
+    KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0),
+    KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0),
+
+    KCLUT_ENTRY(0, 1, 1, 0, 0, 1, 0, 0),
+    KCLUT_ENTRY(1, 0, 0, 0, 0, 0, 0, 1),
+    KCLUT_ENTRY(1, 1, 1, 1, 1, 1, 1, 1),
+    KCLUT_ENTRY(1, 1, 1, 0, 0, 0, 0, 1),
+    KCLUT_ENTRY(0, 1, 1, 1, 1, 1, 1, 1),
+    KCLUT_ENTRY(1, 1, 1, 1, 1, 1, 1, 1),
+    KCLUT_ENTRY(1, 1, 1, 1, 1, 1, 1, 1),
+    KCLUT_ENTRY(1, 1, 1, 0, 0, 0, 0, 1),
+    KCLUT_ENTRY(1, 0, 0, 0, 0, 0, 0, 0),
+    KCLUT_ENTRY(1, 0, 0, 0, 0, 0, 0, 0),
+    KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0),
+    KCLUT_ENTRY(0, 0, 0, 0, 1, 0, 0, 0)
+};
+
+const uint8_t ascii_to_altgr_lut[16] PROGMEM = {
+    KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0),
+    KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0),
+    KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0),
+    KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0),
+
+    KCLUT_ENTRY(0, 0, 0, 1, 1, 0, 1, 1),
+    KCLUT_ENTRY(0, 0, 1, 0, 0, 0, 0, 0),
+    KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0),
+    KCLUT_ENTRY(0, 0, 0, 1, 1, 0, 1, 0),
+    KCLUT_ENTRY(1, 0, 0, 0, 0, 0, 0, 0),
+    KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0),
+    KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0),
+    KCLUT_ENTRY(0, 0, 0, 1, 0, 1, 1, 0),
+    KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0),
+    KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0),
+    KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0),
+    KCLUT_ENTRY(0, 0, 0, 1, 0, 1, 1, 0),
+};
+
+const uint8_t ascii_to_dead_lut[16] PROGMEM = {
+    KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0),
+    KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0),
+    KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0),
+    KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0),
+
+    KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0),
+    KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0),
+    KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0),
+    KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0),
+    KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0),
+    KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0),
+    KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0),
+    KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0),
+    KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0),
+    KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0),
+    KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0),
+    KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0)
+};
+
+const uint8_t ascii_to_keycode_lut[128] PROGMEM = {
+    // NUL   SOH      STX      ETX      EOT      ENQ      ACK      BEL
+    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+    // BS    TAB      LF       VT       FF       CR       SO       SI
+    KC_BSPC, KC_TAB,  KC_ENT,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+    // DLE   DC1      DC2      DC3      DC4      NAK      SYN      ETB
+    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+    // CAN   EM       SUB      ESC      FS       GS       RS       US
+    XXXXXXX, XXXXXXX, XXXXXXX, KC_ESC,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+
+    //       !        "        #        $        %        &        '
+    KC_SPC,  CZ_SECT, CZ_URNG, CZ_SCAR, CZ_CCAR, CZ_EQL,  CZ_YACU, CZ_SECT,
+    // (     )        *        +        ,        -        .        /
+    CZ_RPRN, CZ_RPRN, CZ_AACU, CZ_PLUS, CZ_COMM, CZ_MINS, CZ_DOT,  CZ_UACU,
+    // 0     1        2        3        4        5        6        7
+    CZ_EACU, CZ_PLUS, CZ_ECAR, CZ_SCAR, CZ_CCAR, CZ_RCAR, CZ_ZCAR, CZ_YACU,
+    // 8     9        :        ;        <        =        >        ?
+    CZ_AACU, CZ_IACU, CZ_DOT,  CZ_URNG, CZ_COMM, CZ_EQL,  CZ_DOT,  CZ_COMM,
+    // @     A        B        C        D        E        F        G
+    CZ_ECAR, CZ_A,    CZ_B,    CZ_C,    CZ_D,    CZ_E,    CZ_F,    CZ_G,
+    // H     I        J        K        L        M        N        O
+    CZ_H,    CZ_I,    CZ_J,    CZ_K,    CZ_L,    CZ_M,    CZ_N,    CZ_O,
+    // P     Q        R        S        T        U        V        W
+    CZ_P,    CZ_Q,    CZ_R,    CZ_S,    CZ_T,    CZ_U,    CZ_V,    CZ_W,
+    // X     Y        Z        [        \        ]        ^        _
+    CZ_X,    CZ_Y,    CZ_Z,    CZ_UACU, CZ_BSLS, CZ_RPRN, CZ_ZCAR, CZ_MINS,
+    // `     a        b        c        d        e        f        g
+    CZ_DIAE, CZ_A,    CZ_B,    CZ_C,    CZ_D,    CZ_E,    CZ_F,    CZ_G,
+    // h     i        j        k        l        m        n        o
+    CZ_H,    CZ_I,    CZ_J,    CZ_K,    CZ_L,    CZ_M,    CZ_N,    CZ_O,
+    // p     q        r        s        t        u        v        w
+    CZ_P,    CZ_Q,    CZ_R,    CZ_S,    CZ_T,    CZ_U,    CZ_V,    CZ_W,
+    // x     y        z        {        |        }        ~        DEL
+    CZ_X,    CZ_Y,    CZ_Z,    CZ_IACU, CZ_BSLS, CZ_EACU, CZ_RCAR, KC_DEL
+};
diff --git a/quantum/keymap_extras/sendstring_czech_mac_iso.h b/quantum/keymap_extras/sendstring_czech_mac_iso.h
new file mode 100644
index 00000000000..9d47087da05
--- /dev/null
+++ b/quantum/keymap_extras/sendstring_czech_mac_iso.h
@@ -0,0 +1,120 @@
+/* Copyright 2024 Tabonx
+ *
+ * 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/>.
+ */
+
+// Sendstring lookup tables for macOS Czech ISO layouts
+
+#pragma once
+
+#include "keymap_czech_mac_iso.h"
+#include "send_string.h"
+
+// clang-format off
+
+const uint8_t ascii_to_shift_lut[16] PROGMEM = {
+    KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0),
+    KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0),
+    KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0),
+    KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0),
+
+    KCLUT_ENTRY(0, 1, 1, 0, 0, 1, 0, 0),
+    KCLUT_ENTRY(1, 0, 0, 0, 0, 0, 0, 1),
+    KCLUT_ENTRY(1, 1, 1, 1, 1, 1, 1, 1),
+    KCLUT_ENTRY(1, 1, 1, 0, 0, 0, 0, 1),
+    KCLUT_ENTRY(0, 1, 1, 1, 1, 1, 1, 1),
+    KCLUT_ENTRY(1, 1, 1, 1, 1, 1, 1, 1),
+    KCLUT_ENTRY(1, 1, 1, 1, 1, 1, 1, 1),
+    KCLUT_ENTRY(1, 1, 1, 0, 0, 0, 0, 1),
+    KCLUT_ENTRY(1, 0, 0, 0, 0, 0, 0, 0),
+    KCLUT_ENTRY(1, 0, 0, 0, 0, 0, 0, 0),
+    KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0),
+    KCLUT_ENTRY(0, 0, 0, 0, 1, 0, 0, 0)
+};
+
+const uint8_t ascii_to_altgr_lut[16] PROGMEM = {
+    KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0),
+    KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0),
+    KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0),
+    KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0),
+
+    KCLUT_ENTRY(0, 0, 0, 1, 1, 0, 1, 1),
+    KCLUT_ENTRY(0, 0, 1, 0, 0, 0, 0, 0),
+    KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0),
+    KCLUT_ENTRY(0, 0, 0, 1, 1, 0, 1, 0),
+    KCLUT_ENTRY(1, 0, 0, 0, 0, 0, 0, 0),
+    KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0),
+    KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0),
+    KCLUT_ENTRY(0, 0, 0, 1, 0, 1, 1, 0),
+    KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0),
+    KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0),
+    KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0),
+    KCLUT_ENTRY(0, 0, 0, 1, 0, 1, 1, 0),
+};
+
+const uint8_t ascii_to_dead_lut[16] PROGMEM = {
+    KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0),
+    KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0),
+    KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0),
+    KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0),
+
+    KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0),
+    KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0),
+    KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0),
+    KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0),
+    KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0),
+    KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0),
+    KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0),
+    KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0),
+    KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0),
+    KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0),
+    KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0),
+    KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0)
+};
+
+const uint8_t ascii_to_keycode_lut[128] PROGMEM = {
+    // NUL   SOH      STX      ETX      EOT      ENQ      ACK      BEL
+    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+    // BS    TAB      LF       VT       FF       CR       SO       SI
+    KC_BSPC, KC_TAB,  KC_ENT,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+    // DLE   DC1      DC2      DC3      DC4      NAK      SYN      ETB
+    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+    // CAN   EM       SUB      ESC      FS       GS       RS       US
+    XXXXXXX, XXXXXXX, XXXXXXX, KC_ESC,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+
+    //       !        "        #        $        %        &        '
+    KC_SPC,  CZ_SECT, CZ_URNG, CZ_SCAR, CZ_CCAR, CZ_EQL,  CZ_YACU, CZ_SECT,
+    // (     )        *        +        ,        -        .        /
+    CZ_RPRN, CZ_RPRN, CZ_AACU, CZ_PLUS, CZ_COMM, CZ_MINS, CZ_DOT,  CZ_UACU,
+    // 0     1        2        3        4        5        6        7
+    CZ_EACU, CZ_PLUS, CZ_ECAR, CZ_SCAR, CZ_CCAR, CZ_RCAR, CZ_ZCAR, CZ_YACU,
+    // 8     9        :        ;        <        =        >        ?
+    CZ_AACU, CZ_IACU, CZ_DOT,  CZ_URNG, CZ_COMM, CZ_EQL,  CZ_DOT,  CZ_COMM,
+    // @     A        B        C        D        E        F        G
+    CZ_ECAR, CZ_A,    CZ_B,    CZ_C,    CZ_D,    CZ_E,    CZ_F,    CZ_G,
+    // H     I        J        K        L        M        N        O
+    CZ_H,    CZ_I,    CZ_J,    CZ_K,    CZ_L,    CZ_M,    CZ_N,    CZ_O,
+    // P     Q        R        S        T        U        V        W
+    CZ_P,    CZ_Q,    CZ_R,    CZ_S,    CZ_T,    CZ_U,    CZ_V,    CZ_W,
+    // X     Y        Z        [        \        ]        ^        _
+    CZ_X,    CZ_Y,    CZ_Z,    CZ_UACU, CZ_BSLS, CZ_RPRN, CZ_ZCAR, CZ_MINS,
+    // `     a        b        c        d        e        f        g
+    CZ_DIAE, CZ_A,    CZ_B,    CZ_C,    CZ_D,    CZ_E,    CZ_F,    CZ_G,
+    // h     i        j        k        l        m        n        o
+    CZ_H,    CZ_I,    CZ_J,    CZ_K,    CZ_L,    CZ_M,    CZ_N,    CZ_O,
+    // p     q        r        s        t        u        v        w
+    CZ_P,    CZ_Q,    CZ_R,    CZ_S,    CZ_T,    CZ_U,    CZ_V,    CZ_W,
+    // x     y        z        {        |        }        ~        DEL
+    CZ_X,    CZ_Y,    CZ_Z,    CZ_IACU, CZ_BSLS, CZ_EACU, CZ_RCAR, KC_DEL
+};
diff --git a/quantum/rgb_matrix/rgb_matrix_drivers.c b/quantum/rgb_matrix/rgb_matrix_drivers.c
index 4370996d0e1..db3a2ef9e02 100644
--- a/quantum/rgb_matrix/rgb_matrix_drivers.c
+++ b/quantum/rgb_matrix/rgb_matrix_drivers.c
@@ -185,7 +185,7 @@ static inline void setled(int i, uint8_t r, uint8_t g, uint8_t b) {
     rgb_matrix_ws2812_array[i].r = r;
     rgb_matrix_ws2812_array[i].g = g;
     rgb_matrix_ws2812_array[i].b = b;
-#    ifdef RGBW
+#    ifdef WS2812_RGBW
     convert_rgb_to_rgbw(&rgb_matrix_ws2812_array[i]);
 #    endif
 }
diff --git a/quantum/rgblight/rgblight.c b/quantum/rgblight/rgblight.c
index 62137c020bd..b0f2dfdc1d8 100644
--- a/quantum/rgblight/rgblight.c
+++ b/quantum/rgblight/rgblight.c
@@ -149,7 +149,7 @@ void setrgb(uint8_t r, uint8_t g, uint8_t b, rgb_led_t *led1) {
     led1->r = r;
     led1->g = g;
     led1->b = b;
-#ifdef RGBW
+#ifdef WS2812_RGBW
     led1->w = 0;
 #endif
 }
@@ -652,7 +652,7 @@ void rgblight_setrgb(uint8_t r, uint8_t g, uint8_t b) {
         led[i].r = r;
         led[i].g = g;
         led[i].b = b;
-#ifdef RGBW
+#ifdef WS2812_RGBW
         led[i].w = 0;
 #endif
     }
@@ -667,7 +667,7 @@ void rgblight_setrgb_at(uint8_t r, uint8_t g, uint8_t b, uint8_t index) {
     led[index].r = r;
     led[index].g = g;
     led[index].b = b;
-#ifdef RGBW
+#ifdef WS2812_RGBW
     led[index].w = 0;
 #endif
     rgblight_set();
@@ -704,7 +704,7 @@ void rgblight_setrgb_range(uint8_t r, uint8_t g, uint8_t b, uint8_t start, uint8
         led[i].r = r;
         led[i].g = g;
         led[i].b = b;
-#ifdef RGBW
+#ifdef WS2812_RGBW
         led[i].w = 0;
 #endif
     }
@@ -905,7 +905,7 @@ void rgblight_set(void) {
             led[i].r = 0;
             led[i].g = 0;
             led[i].b = 0;
-#ifdef RGBW
+#ifdef WS2812_RGBW
             led[i].w = 0;
 #endif
         }
@@ -933,7 +933,7 @@ void rgblight_set(void) {
     start_led = led + rgblight_ranges.clipping_start_pos;
 #endif
 
-#ifdef RGBW
+#ifdef WS2812_RGBW
     for (uint8_t i = 0; i < num_leds; i++) {
         convert_rgb_to_rgbw(&start_led[i]);
     }
@@ -1263,7 +1263,7 @@ void rgblight_effect_snake(animation_status_t *anim) {
         ledp->r         = 0;
         ledp->g         = 0;
         ledp->b         = 0;
-#    ifdef RGBW
+#    ifdef WS2812_RGBW
         ledp->w = 0;
 #    endif
         for (j = 0; j < RGBLIGHT_EFFECT_SNAKE_LENGTH; j++) {
@@ -1323,7 +1323,7 @@ void rgblight_effect_knight(animation_status_t *anim) {
         led[i].r = 0;
         led[i].g = 0;
         led[i].b = 0;
-#    ifdef RGBW
+#    ifdef WS2812_RGBW
         led[i].w = 0;
 #    endif
     }
@@ -1337,7 +1337,7 @@ void rgblight_effect_knight(animation_status_t *anim) {
             led[cur].r = 0;
             led[cur].g = 0;
             led[cur].b = 0;
-#    ifdef RGBW
+#    ifdef WS2812_RGBW
             led[cur].w = 0;
 #    endif
         }
diff --git a/tests/basic/test_one_shot_keys.cpp b/tests/basic/test_one_shot_keys.cpp
index 9748dad7daf..64a8673a5cd 100644
--- a/tests/basic/test_one_shot_keys.cpp
+++ b/tests/basic/test_one_shot_keys.cpp
@@ -32,10 +32,7 @@ TEST_F(OneShot, OSMWithoutAdditionalKeypressDoesNothing) {
 
     /* Press and release OSM key*/
     EXPECT_NO_REPORT(driver);
-    osm_key.press();
-    run_one_scan_loop();
-    osm_key.release();
-    run_one_scan_loop();
+    tap_key(osm_key);
     VERIFY_AND_CLEAR(driver);
 
     /* OSM are added when an actual report is send */
@@ -88,10 +85,7 @@ TEST_P(OneShotParametrizedTestFixture, OSMWithAdditionalKeypress) {
 
     /* Press and release OSM */
     EXPECT_NO_REPORT(driver);
-    osm_key.press();
-    run_one_scan_loop();
-    osm_key.release();
-    run_one_scan_loop();
+    tap_key(osm_key);
     VERIFY_AND_CLEAR(driver);
 
     /* Press regular key */
@@ -171,18 +165,12 @@ TEST_F(OneShot, OSMChainingTwoOSMs) {
 
     /* Press and release OSM1 */
     EXPECT_NO_REPORT(driver);
-    osm_key1.press();
-    run_one_scan_loop();
-    osm_key1.release();
-    run_one_scan_loop();
+    tap_key(osm_key1);
     VERIFY_AND_CLEAR(driver);
 
     /* Press and relesea OSM2 */
     EXPECT_NO_REPORT(driver);
-    osm_key2.press();
-    run_one_scan_loop();
-    osm_key2.release();
-    run_one_scan_loop();
+    tap_key(osm_key2);
     VERIFY_AND_CLEAR(driver);
 
     /* Press regular key */
@@ -209,22 +197,13 @@ TEST_F(OneShot, OSMDoubleTapNotLockingOSMs) {
 
     /* Press and release OSM1 */
     EXPECT_NO_REPORT(driver);
-    osm_key1.press();
-    run_one_scan_loop();
-    osm_key1.release();
-    run_one_scan_loop();
+    tap_key(osm_key1);
     VERIFY_AND_CLEAR(driver);
 
     /* Press and release OSM2 twice */
     EXPECT_NO_REPORT(driver);
-    osm_key2.press();
-    run_one_scan_loop();
-    osm_key2.release();
-    run_one_scan_loop();
-    osm_key2.press();
-    run_one_scan_loop();
-    osm_key2.release();
-    run_one_scan_loop();
+    tap_key(osm_key2);
+    tap_key(osm_key2);
     VERIFY_AND_CLEAR(driver);
 
     /* Press regular key */
@@ -263,10 +242,7 @@ TEST_F(OneShot, OSMHoldNotLockingOSMs) {
 
     /* Press and release OSM1 */
     EXPECT_NO_REPORT(driver);
-    osm_key1.press();
-    run_one_scan_loop();
-    osm_key1.release();
-    run_one_scan_loop();
+    tap_key(osm_key1);
     VERIFY_AND_CLEAR(driver);
 
     /* Press and hold OSM2 */
@@ -279,10 +255,7 @@ TEST_F(OneShot, OSMHoldNotLockingOSMs) {
     /* Press and release regular key */
     EXPECT_REPORT(driver, (osm_key1.report_code, osm_key2.report_code, regular_key.report_code)).Times(1);
     EXPECT_REPORT(driver, (osm_key2.report_code)).Times(1);
-    regular_key.press();
-    run_one_scan_loop();
-    regular_key.release();
-    run_one_scan_loop();
+    tap_key(regular_key);
     VERIFY_AND_CLEAR(driver);
 
     /* Release OSM2 */
@@ -362,10 +335,7 @@ TEST_F(OneShot, OSLWithOsmAndAdditionalKeypress) {
 
     /* Press and release OSM */
     EXPECT_NO_REPORT(driver);
-    osm_key.press();
-    run_one_scan_loop();
-    osm_key.release();
-    run_one_scan_loop();
+    tap_key(osm_key);
     EXPECT_TRUE(layer_state_is(1));
     VERIFY_AND_CLEAR(driver);
 
diff --git a/tmk_core/protocol.mk b/tmk_core/protocol.mk
index fd5342d637e..796b4e87871 100644
--- a/tmk_core/protocol.mk
+++ b/tmk_core/protocol.mk
@@ -66,6 +66,10 @@ ifeq ($(strip $(NO_USB_STARTUP_CHECK)), yes)
     OPT_DEFS += -DNO_USB_STARTUP_CHECK
 endif
 
+ifeq ($(strip $(USB_WAIT_FOR_ENUMERATION)), yes)
+    OPT_DEFS += -DUSB_WAIT_FOR_ENUMERATION
+endif
+
 ifeq ($(strip $(JOYSTICK_SHARED_EP)), yes)
     OPT_DEFS += -DJOYSTICK_SHARED_EP
     SHARED_EP_ENABLE = yes
diff --git a/tmk_core/protocol/chibios/chibios.c b/tmk_core/protocol/chibios/chibios.c
index a02097785f4..a249af8d38c 100644
--- a/tmk_core/protocol/chibios/chibios.c
+++ b/tmk_core/protocol/chibios/chibios.c
@@ -51,6 +51,11 @@
 
 #define USB_GETSTATUS_REMOTE_WAKEUP_ENABLED (2U)
 
+#ifdef WAIT_FOR_USB
+// TODO: Remove backwards compatibility with old define
+#    define USB_WAIT_FOR_ENUMERATION
+#endif
+
 /* -------------------------
  *   TMK host driver defs
  * -------------------------
@@ -143,7 +148,7 @@ void protocol_pre_init(void) {
 
     /* Wait until USB is active */
     while (true) {
-#if defined(WAIT_FOR_USB)
+#if defined(USB_WAIT_FOR_ENUMERATION)
         if (USB_DRIVER.state == USB_ACTIVE) {
             driver = &chibios_driver;
             break;
diff --git a/tmk_core/protocol/lufa/lufa.c b/tmk_core/protocol/lufa/lufa.c
index d6f0c69b6b0..2142b04460a 100644
--- a/tmk_core/protocol/lufa/lufa.c
+++ b/tmk_core/protocol/lufa/lufa.c
@@ -67,6 +67,11 @@
 #    include "raw_hid.h"
 #endif
 
+#ifdef WAIT_FOR_USB
+// TODO: Remove backwards compatibility with old define
+#    define USB_WAIT_FOR_ENUMERATION
+#endif
+
 uint8_t keyboard_idle = 0;
 /* 0: Boot Protocol, 1: Report Protocol(default) */
 uint8_t        keyboard_protocol  = 1;
@@ -807,7 +812,7 @@ void protocol_pre_init(void) {
 
     /* wait for USB startup & debug output */
 
-#ifdef WAIT_FOR_USB
+#ifdef USB_WAIT_FOR_ENUMERATION
     while (USB_DeviceState != DEVICE_STATE_Configured) {
 #    if defined(INTERRUPT_CONTROL_ENDPOINT)
         ;